more prototype

jobclock.bbprojectd/Scratchpad.txt

@@ -46,15 +46,13 @@ http://www.b-list.org/weblog/2007/nov/04/working-models/
   bindery manager marks job as complete, system moves job data to next report and archive.
 
 
- dates = ClockPunch.objects.dates('timestamp','day')
- >>> import datetime
->>> dates[6] + datetime.timedelta(1)
-datetime.datetime(2012, 3, 31, 0, 0)
->>> dates[6] + datetime.timedelta(2)
-datetime.datetime(2012, 4, 1, 0, 0)
->>> 
->>> for day in dates:
-...   print "%s - %d " % (day , ClockPunch.objects.filter(timestamp__range=(day, day + datetime.timedelta(1))).count())
+for wp in wpa:
+...   if wp.worker in total:
+...     total[wp.worker] = total[wp.worker] + wp.duration
+...   else:
+...     total[wp.worker] = wp.duration
+... 
+
 
 
 import datetime

timeclock/urls.py

@@ -7,7 +7,8 @@
 urlpatterns = patterns('',
     url(r'^$', ClockPunchView.as_view(), name='clockpunch-view'),
     url(r'summary', ClockPunchSums.as_view(), name='clockpunchsums'),
-    url(r'workperiods/(?P<workername>.*)', WorkPeriodView.as_view(), name='workperiods'),
+    url(r'workperiods/(?P<workername>\w*)/$', WorkPeriodView.as_view(), name='workperiods'),
+    url(r'workperiods/(?P<workername>\w*)/(?P<startdate>\d{8}/$)', WorkPeriodView.as_view(), name='workperiod_startdate'),
     # Examples:
     # url(r'^$', 'jobclockproj.views.home', name='home'),
     # url(r'^jobclockproj/', include('jobclockproj.foo.urls')),

timeclock/views.py

@@ -53,16 +53,16 @@ class WorkPeriodView(TemplateView):
   template_name = 'timeclock/work_period_view.html'
   cp = ClockPunch()
   cp.matches()
-  
+
   def _get_work_periods(self, **kwargs):
-    workername = self.kwargs['workername']
-    work_periods = WorkPeriod.objects.filter(start_punch__worker__name=workername)
+    #workername = self.kwargs['workername']
+    work_periods = WorkPeriod.objects.all()
+    #wp_by_worker =
     return work_periods
 
-    
+
   def get_context_data(self, **kwargs):
     context = super(WorkPeriodView, self).get_context_data(**kwargs)
     context['workername'] = self.kwargs['workername']
     context['work_periods'] = self._get_work_periods() #workername=self.kwargs['workername'])
-    return context      
-
+    return context