Author: mac
Date: Tue Mar  6 18:53:32 2007
New Revision: 4557

Log:
added category of "half-work" to count time spent in train doing nothing


Modified:
   gtimelog/trunk/README.txt
   gtimelog/trunk/gtimelog.py
   gtimelog/trunk/hours.py

Modified: gtimelog/trunk/README.txt
==============================================================================
--- gtimelog/trunk/README.txt	(original)
+++ gtimelog/trunk/README.txt	Tue Mar  6 18:53:32 2007
(at)(at) -24,15 +24,23 (at)(at)
 You can click on those to save typing.  Or you can specify a URL in
 ~/.gtimelog/gtimelogrc and download the task list from a wiki or wherever.
 
-There are two broad categories of activities: ones that count as work (coding,
-planning, writing proposals or reports, answering work-related email), and
ones
+There are three broad categories of activities: ones that count as work
(coding,
+planning, writing proposals or reports, answering work-related email), ones
 that don't (browsing the web for fun, reading personal email, chatting with
-a friend on the phone for two hours, going out for a lunch break).  To
indicate
-which activities are not work related add two asterisks to the activity name:
+a friend on the phone for two hours, going out for a lunch break) and ones 
+which count as "half-work" (This are activities where only half of the time 
+spent for is counted as work. Depending on your employer, time spend in train 
+or plane when you do not work as described above, may count as "half-work".)
+
+To indicate which activities are not work related add two asterisks to the 
+activity name. To indicate that an activity is "half-work" add '/2' at the end
+of the activity name. 
+Look at the following examples:
 
   lunch **
   browsing slashdot **
   napping on the couch **
+  in train to Frankfurt/2
 
 GTimeLog displays all the things you've done today, and calculates the total
 time you spent working, and the total time you spent "slacking".  It also

Modified: gtimelog/trunk/gtimelog.py
==============================================================================
--- gtimelog/trunk/gtimelog.py	(original)
+++ gtimelog/trunk/gtimelog.py	Tue Mar  6 18:53:32 2007
(at)(at) -207,6 +207,7 (at)(at)
 
         Returns two list: work entries and slacking entries.  Slacking
         entries are identified by finding two asterisks in the title.
+        The duration of entries ending with '/2' is divided by two.
         Entry lists are sorted, and contain (start, entry, duration) tuples.
         """
         work = {}
(at)(at) -219,6 +220,10 (at)(at)
                 entries = slack
             else:
                 entries = work
+            if entry.endswith('/2'):
+                # if entry endswith /2 count only half of the duration
+                duration /= 2
+            # strip task description away
             entry = ':'.join(entry.split(':')[:2])
             if entry in entries:
                 old_start, old_entry, old_duration = entries[entry]
(at)(at) -238,6 +243,8 (at)(at)
 
         Slacking entries are identified by finding two asterisks in the title.
 
+        The duration of entries ending with '/2' is divided by two.
+
         Assuming that
 
             total_work, total_slacking = self.totals()
(at)(at) -253,6 +260,9 (at)(at)
         """
         total_work = total_slacking = datetime.timedelta(0)
         for start, stop, duration, entry in self.all_entries():
+            if entry.endswith('/2'):
+                # if entry endswith /2 count only half of the duration
+                duration /= 2
             if '**' in entry:
                 total_slacking += duration
             else:

Modified: gtimelog/trunk/hours.py
==============================================================================
--- gtimelog/trunk/hours.py	(original)
+++ gtimelog/trunk/hours.py	Tue Mar  6 18:53:32 2007
(at)(at) -126,6 +126,10 (at)(at)
                 continue
             print "%s -> %s" % (start, stop),
             project, task, desc = self.mapEntry(entry)
+            if desc.endswith('/2'):
+                # if task ends with /2 divide the duration by two
+                duration /= 2
+                desc = desc[:-2]
             print '[%s] [%s] %s %s' % (project, task, duration, desc)
             
             weekday = self.days[start.weekday()]

Author: thomas
Date: Thu Mar  8 10:30:12 2007
New Revision: 4560

Log:
fixing documentation of development steps


Modified:
   grok-workshop/trunk/doc/steps.txt

Modified: grok-workshop/trunk/doc/steps.txt
==============================================================================
--- grok-workshop/trunk/doc/steps.txt	(original)
+++ grok-workshop/trunk/doc/steps.txt	Thu Mar  8 10:30:12 2007
(at)(at) -8,13 +8,13 (at)(at)
 
 grok.Application
 grok.Model
-grok.Container
 index.pt
 
 
 2 - Persons in the office
 =========================
 
+grok.Container
 self-submitting forms, update
 Navigation: view.url

Author: thomas
Date: Mon Mar 12 16:45:53 2007
New Revision: 4562

Log:
run python2.4 explicitly, doesn't work otherwise if system Python is 2.5


Modified:
   AlphaFlow/trunk/tests/runAllTests.py

Modified: AlphaFlow/trunk/tests/runAllTests.py
==============================================================================
--- AlphaFlow/trunk/tests/runAllTests.py	(original)
+++ AlphaFlow/trunk/tests/runAllTests.py	Mon Mar 12 16:45:53 2007
(at)(at) -1,4 +1,4 (at)(at)
-#! /usr/bin/python
+#! /usr/bin/env python2.4
 #
 # Runs all tests in the current directory
 #

Author: thomas
Date: Tue Mar 20 09:01:00 2007
New Revision: 4597

Log:
checkpoints have IDs


Modified:
   AlphaFlow/trunk/interfaces.py
   AlphaFlow/trunk/workitem.py

Modified: AlphaFlow/trunk/interfaces.py
==============================================================================
--- AlphaFlow/trunk/interfaces.py	(original)
+++ AlphaFlow/trunk/interfaces.py	Tue Mar 20 09:01:00 2007
(at)(at) -626,6 +626,8 (at)(at)
     exit.
     """
 
+    id = zope.interface.Attribute("ID")
+
     def __call__(self):
         """Executes all aspects of the checkpoint.
 
(at)(at) -637,8 +639,6 (at)(at)
     """An exit of a work item.
     """
 
-    id = zope.interface.Attribute("ID")
-
     title = zope.interface.Attribute("Title")
 
     activities = zope.interface.Attribute("List of activity IDs")

Modified: AlphaFlow/trunk/workitem.py
==============================================================================
--- AlphaFlow/trunk/workitem.py	(original)
+++ AlphaFlow/trunk/workitem.py	Tue Mar 20 09:01:00 2007
(at)(at) -39,13 +39,13 (at)(at)
 
     zope.interface.implements(ICheckpoint)
 
-    def __init__(self, workitem, name):
+    def __init__(self, workitem, id):
         self.workitem = workitem
-        self.name = name
+        self.id = id
 
     def __call__(self):
         """Execute aspects."""
-        for aspect in self.workitem.getAspects(self.name):
+        for aspect in self.workitem.getAspects(self.id):
             aspect.execute()

Author: ctheune
Date: Thu Mar 29 14:43:58 2007
New Revision: 4615

Log:
 - whitespace



Modified:
   AlphaFlow/trunk/__init__.py

Modified: AlphaFlow/trunk/__init__.py
==============================================================================
--- AlphaFlow/trunk/__init__.py	(original)
+++ AlphaFlow/trunk/__init__.py	Thu Mar 29 14:43:58 2007
(at)(at) -39,11 +39,11 (at)(at)
         listTypes(config.PROJECTNAME),
         config.PROJECTNAME)
     cmfcoreutils.ContentInit(
-        config.PROJECTNAME + ' Content',
-        content_types      = content_types,
-        permission         = config.ADD_CONTENT_PERMISSION,
-        extra_constructors = constructors,
-        fti                = ftis,
+        config.PROJECTNAME+' Content',
+        content_types=content_types,
+        permission=config.ADD_CONTENT_PERMISSION,
+        extra_constructors=constructors,
+        fti=ftis,
         ).initialize(context)