From 8a3d934f5369f8bf37ef1eae858c6a1be58b1b65 Mon Sep 17 00:00:00 2001 From: helmutm Date: Sun, 25 Oct 2009 18:46:50 +0000 Subject: [PATCH] use float value for cost field git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@3600 fd906abe-77d9-0310-91a1-e0d9ade77398 --- organize/browser/service.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/organize/browser/service.py b/organize/browser/service.py index 59ab023..43a54e1 100644 --- a/organize/browser/service.py +++ b/organize/browser/service.py @@ -110,6 +110,14 @@ class BaseView(SchemaBaseView): def isMultiDay(self, service): 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): @@ -252,7 +260,7 @@ class CheckoutView(ServiceManagerView): number=reg.number, numberWaiting=reg.numberWaiting, externalId=service.externalId or '', - cost=service.cost or '', + cost=self.getCost(service), serviceObject=service)) return result @@ -310,7 +318,7 @@ class CheckoutView(ServiceManagerView): 'Uhrzeit: ' + info['fromToTime'], locationInfo] if info['cost']: - lineData.append('Kostenbeitrag: %s,00 Euro' % info['cost']) + lineData.append('Kostenbeitrag: %s' % info['cost']) if info['externalId']: lineData.append('Code: %s' % info['externalId']) if info['serviceObject'].allowRegWithNumber and info['number']: @@ -362,7 +370,7 @@ class CheckoutView(ServiceManagerView): result = [] waitingHeader = costHeader = externalIdHeader = '' waitingRow = '%i' - costRow = '%s,00 Euro' + costRow = '%s' externalIdRow = '%s' if self.hasWaiting: waitingHeader = 'Warteliste'