[Pytrainer-svn] SF.net SVN: pytrainer:[393] pytrainer/trunk/pytrainer

[<jb...@us...>]

Revision: 393
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=393&view=rev
Author:   jblance
Date:     2009-11-20 06:44:01 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
Fix for weekview, start of week and localised days

Modified Paths:
--------------
    pytrainer/trunk/pytrainer/gui/windowmain.py
    pytrainer/trunk/pytrainer/lib/date.py
    pytrainer/trunk/pytrainer/main.py
    pytrainer/trunk/pytrainer/weekgraph.py

Modified: pytrainer/trunk/pytrainer/gui/windowmain.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowmain.py	2009-11-19 21:10:35 UTC (rev 392)
+++ pytrainer/trunk/pytrainer/gui/windowmain.py	2009-11-20 06:44:01 UTC (rev 393)
@@ -339,7 +339,7 @@
 	
 	def actualize_weekview(self, record_list, date_ini, date_end):
 		logging.debug(">>")
-		self.drawareaweek.drawgraph(record_list)
+		self.drawareaweek.drawgraph(record_list, date_ini, date_end)
 		logging.debug("<<")
 
 	def actualize_monthview(self,record_list, nameMonth):

Modified: pytrainer/trunk/pytrainer/lib/date.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/date.py	2009-11-19 21:10:35 UTC (rev 392)
+++ pytrainer/trunk/pytrainer/lib/date.py	2009-11-20 06:44:01 UTC (rev 393)
@@ -20,6 +20,7 @@
 
 import time
 import datetime
+import calendar
 
 class Date:
 	def __init__(self, calendar=None):
@@ -50,11 +51,19 @@
 	def time2string(self,date):
 		return "%0.4d-%0.2d-%0.2d" %(int(date[0]),int(date[1]),int(date[2]))
 
-	def getWeekInterval(self,date):
-		weekDate = datetime.datetime.strptime(date, "%Y-%m-%d")
-		dayOfWeek = int(weekDate.strftime("%w"))
-		date_ini = weekDate + datetime.timedelta(days=0-dayOfWeek)
-		date_end = weekDate + datetime.timedelta(days=6-dayOfWeek)
+	def getWeekInterval(self,date, prf_us_system):
+		if prf_us_system == "True":
+			#Sunday is first day of week
+			weekDate = datetime.datetime.strptime(date, "%Y-%m-%d")
+			dayOfWeek = int(weekDate.strftime("%w"))
+			date_ini = weekDate + datetime.timedelta(days=0-dayOfWeek)
+			date_end = weekDate + datetime.timedelta(days=6-dayOfWeek)
+		else:
+			#Monday is first day of week
+			weekDate = datetime.datetime.strptime(date, "%Y-%m-%d")
+			dayOfWeek = int(weekDate.strftime("%w"))
+			date_ini = weekDate + datetime.timedelta(days=1-dayOfWeek)
+			date_end = weekDate + datetime.timedelta(days=7-dayOfWeek)
 		return date_ini.strftime("%Y-%m-%d"), date_end.strftime("%Y-%m-%d")
 	
 	def getMonthInterval(self,date):

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2009-11-19 21:10:35 UTC (rev 392)
+++ pytrainer/trunk/pytrainer/main.py	2009-11-20 06:44:01 UTC (rev 393)
@@ -93,7 +93,7 @@
 	def __init__(self,filename = None, data_path = None): 
 		logging.debug('>>')
 		self.data_path = data_path
-		self.version ="1.6.0.9" # 22.10.2009
+		self.version ="1.6.0.9 svn" # 22.10.2009
 		self.date = Date()
 		main_dir = os.path.realpath(os.path.dirname(__file__)) #why?
 		sys.path.insert(0, main_dir) #why?
@@ -111,6 +111,7 @@
 		self.filename = self.conf.getValue("conffile")
 		logging.debug('retrieving data from '+ self.filename)
 		self.configuration = XMLParser(self.filename)
+		self.prf_us_system = self.configuration.getValue("pytraining","prf_us_system")
 		self.ddbb = DDBB(self.configuration)
 		logging.debug('connecting to DDBB')
 		self.ddbb.connect()		
@@ -222,7 +223,7 @@
 			 selected,iter = self.windowmain.recordTreeView.get_selection().get_selected()
 		elif view=="week":
 			 logging.debug('week view')
-			 date_ini, date_end = self.date.getWeekInterval(date_selected)
+			 date_ini, date_end = self.date.getWeekInterval(date_selected, self.prf_us_system)
 			 record_list = self.record.getrecordPeriod(date_ini, date_end)
 			 self.windowmain.actualize_weekview(record_list, date_ini, date_end)
 		elif view=="month":

Modified: pytrainer/trunk/pytrainer/weekgraph.py
===================================================================
--- pytrainer/trunk/pytrainer/weekgraph.py	2009-11-19 21:10:35 UTC (rev 392)
+++ pytrainer/trunk/pytrainer/weekgraph.py	2009-11-20 06:44:01 UTC (rev 393)
@@ -24,11 +24,17 @@
 	def __init__(self, vbox = None, window = None):
 		self.drawarea = DrawArea(vbox, window)
 
-	def drawgraph(self,values):
+	def drawgraph(self,values, date_ini, date_end):
 		logging.debug(">>")
 		#print "Found %d records" % len(values)
 		logging.debug(str(values))
-		days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
+		#build days list to ensure localised values are used.
+		days = []
+		for day in range(0, 7):
+			dateTemp = datetime.datetime.strptime(date_ini, "%Y-%m-%d")
+			incrementDay = datetime.timedelta(days=day)
+			dateToUse = dateTemp + incrementDay
+			days.append( dateToUse.strftime("%a") )
 		valueDict = {}
 		for record in values:
 			day = datetime.datetime.strptime(record[1], "%Y-%m-%d").strftime("%a") # Gives Sun, Mon etc for this record


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.