sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

implemented from_db_value in PowerZOnes model

Browse Source
This commit is contained in:
Sander Roosendaal
2017-02-05 15:46:15 +01:00
parent 2a3bfbadee
commit 0b183053ba
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/models.py
View File

@@ -53,7 +53,7 @@ if settings.DEBUG or user=='':
# model for Power Zone names # model for Power Zone names
class PowerZonesField(models.TextField): class PowerZonesField(models.TextField):
__metaclass__ = models.SubfieldBase # __metaclass__ = models.SubfieldBase
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.token = kwargs.pop('token',',') self.token = kwargs.pop('token',',')
@@ -65,6 +65,13 @@ class PowerZonesField(models.TextField):
return value return value
return value.split(self.token) return value.split(self.token)
def from_db_value(self,value, expression, connection, context):
if value is None:
return value
if isinstance(value, list):
return value
return value.split(self.token)
def get_db_prep_value(self, value, connection, prepared=False): def get_db_prep_value(self, value, connection, prepared=False):
if not value: return if not value: return
assert(isinstance(value, list) or isinstance(value, tuple)) assert(isinstance(value, list) or isinstance(value, tuple))

16
rowers/views.py
View File

@@ -4596,11 +4596,15 @@ def rower_edit_view(request,message=""):
successmessage = "Your Heart Rate data were changed" successmessage = "Your Heart Rate data were changed"
form = RowerForm(instance=r) form = RowerForm(instance=r)
powerform = RowerPowerForm(instance=r) powerform = RowerPowerForm(instance=r)
powerzonesform = RowerPowerZonesForm(instance=r)
accountform = AccountRowerForm(instance=r)
userform = UserForm(instance=request.user) userform = UserForm(instance=request.user)
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{'form':form, {'form':form,
'powerzonesform':powerzonesform, 'powerzonesform':powerzonesform,
'powerform':powerform, 'powerform':powerform,
'rower':r,
'accountform':accountform,
'userform':userform, 'userform':userform,
'successmessage':successmessage, 'successmessage':successmessage,
}) })
@@ -4612,9 +4616,13 @@ def rower_edit_view(request,message=""):
message = HttpResponse("invalid form") message = HttpResponse("invalid form")
#form = RowerForm(instance=r) #form = RowerForm(instance=r)
powerform = RowerPowerForm(instance=r) powerform = RowerPowerForm(instance=r)
powerzonesform = RowerPowerZonesForm(instance=r)
userform = UserForm(instance=request.user)
accountform = AccountRowerForm(instance=r) accountform = AccountRowerForm(instance=r)
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{'form':form, {'form':form,
'powerzonesform':powerzonesform,
'userform':userform,
'accountform':accountform, 'accountform':accountform,
'powerform':powerform, 'powerform':powerform,
'rower':r, 'rower':r,
@@ -4654,10 +4662,14 @@ def rower_edit_view(request,message=""):
message = HttpResponse("invalid form") message = HttpResponse("invalid form")
form = RowerForm(instance=r) form = RowerForm(instance=r)
#powerform = RowerPowerForm(instance=r) #powerform = RowerPowerForm(instance=r)
powerzonesform = RowerPowerZonesForm(instance=r)
userform = UserForm(instance=request.user)
accountform = AccountRowerForm(instance=r) accountform = AccountRowerForm(instance=r)
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{'form':form, {'form':form,
'powerform':powerform, 'powerform':powerform,
'rower':r,
'userform':userform,
'accountform':accountform, 'accountform':accountform,
}) })
@@ -4689,12 +4701,16 @@ def rower_edit_view(request,message=""):
r.powerzones = powerzones r.powerzones = powerzones
r.save() r.save()
successmessage = "Your Power Zone data were changed" successmessage = "Your Power Zone data were changed"
form = RowerForm(instance=r)
accountform = AccountRowerForm(instance=r)
userform = UserForm(instance=request.user) userform = UserForm(instance=request.user)
powerform = RowerPowerForm(instance=r) powerform = RowerPowerForm(instance=r)
powerzonesform = RowerPowerZonesForm(instance=r) powerzonesform = RowerPowerZonesForm(instance=r)
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{'form':form, {'form':form,
'powerzonesform':powerzonesform, 'powerzonesform':powerzonesform,
'powerform':powerform,
'userform':userform,
'accountform':accountform, 'accountform':accountform,
'rower':r, 'rower':r,
'successmessage':successmessage, 'successmessage':successmessage,