cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use float value for cost field

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@3600 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2009-10-25 18:46:50 +00:00
parent 12c6855630
commit 8a3d934f53
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
organize/browser/service.py
View file

@ -110,6 +110,14 @@ class BaseView(SchemaBaseView):
def isMultiDay(self, service): def isMultiDay(self, service):
return time.localtime(service.start)[2] != time.localtime(service.end)[2] return time.localtime(service.start)[2] != time.localtime(service.end)[2]
def getCost(self, service=None):
if service is None:
service = self.context
value = service.getCost()
if value:
return ('%.2f Euro' % float(value)).replace('.', ',')
return u''
class ServiceManagerView(BaseView): class ServiceManagerView(BaseView):
@ -252,7 +260,7 @@ class CheckoutView(ServiceManagerView):
number=reg.number, number=reg.number,
numberWaiting=reg.numberWaiting, numberWaiting=reg.numberWaiting,
externalId=service.externalId or '', externalId=service.externalId or '',
cost=service.cost or '', cost=self.getCost(service),
serviceObject=service)) serviceObject=service))
return result return result
@ -310,7 +318,7 @@ class CheckoutView(ServiceManagerView):
'Uhrzeit: ' + info['fromToTime'], 'Uhrzeit: ' + info['fromToTime'],
locationInfo] locationInfo]
if info['cost']: if info['cost']:
lineData.append('Kostenbeitrag: %s,00 Euro' % info['cost']) lineData.append('Kostenbeitrag: %s' % info['cost'])
if info['externalId']: if info['externalId']:
lineData.append('Code: %s' % info['externalId']) lineData.append('Code: %s' % info['externalId'])
if info['serviceObject'].allowRegWithNumber and info['number']: if info['serviceObject'].allowRegWithNumber and info['number']:
@ -362,7 +370,7 @@ class CheckoutView(ServiceManagerView):
result = [] result = []
waitingHeader = costHeader = externalIdHeader = '' waitingHeader = costHeader = externalIdHeader = ''
waitingRow = '<td width="5%%">%i</td>' waitingRow = '<td width="5%%">%i</td>'
costRow = '<td>%s,00 Euro</td>' costRow = '<td>%s</td>'
externalIdRow = '<td>%s</td>' externalIdRow = '<td>%s</td>'
if self.hasWaiting: if self.hasWaiting:
waitingHeader = '<th width="5%%">Warteliste</th>' waitingHeader = '<th width="5%%">Warteliste</th>'