Revision: 4233
Author: janne.t.harkonen
Date: Thu Sep 30 12:09:14 2010
Log: Employee only returns the number of vacation days
http://code.google.com/p/robotframework/source/detail?r=4233
Modified:
/trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/employeestore.py
/trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/ui.py
=======================================
--- /trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/employeestore.py Thu
Sep 30 03:37:06 2010
+++ /trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/employeestore.py Thu
Sep 30 12:09:14 2010
@@ -78,7 +78,7 @@
self.startdate = startdate
def count_vacation(self, year):
- return '%s days ' % self._count_vacation(self.startdate, year)
+ return self._count_vacation(self.startdate, year)
def _count_vacation(self, startdate, year):
if self._has_worked_longer_than_year(startdate, year):
=======================================
--- /trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/ui.py Thu Sep 30
12:08:36 2010
+++ /trunk/proto/atdd-tutorial-berlin-2010/src/vacalc/ui.py Thu Sep 30
12:09:14 2010
@@ -225,7 +225,7 @@
def getValueAt(self, row, col):
if col == 0:
return '2010'
- return self._employee.count_vacation(2010)
+ return '%s days' % self._employee.count_vacation(2010)
def ListenerFactory(interface, func):
