# HG changeset patch
# User Sascha L. Teichmann <teichmann@intevation.de>
# Date 1217771541 -7200
# Node ID 4e8f5545256dc8d56190c62c20478eba4bf67dad
# Parent  20414d892f041bf799a6fa2073a8c33300e1e247
* Applied and completed Stephan Holl's zeiterfassung.bessere-lesbarkeit.patch
* fixed small issue with --project= parameter.

diff -r 20414d892f04 -r 4e8f5545256d ChangeLog
--- a/ChangeLog	Fri Aug 01 18:13:31 2008 +0200
+++ b/ChangeLog	Sun Aug 03 15:52:21 2008 +0200
@@ -1,3 +1,9 @@
+2008-08-03	Sascha L. Teichmann <sascha.teichmann@intevation.de>
+
+	* contrib/zeiterfassung: Applied and completed Stephan Holl's
+	  zeiterfassung.bessere-lesbarkeit.patch, fixed small issue with
+	  --project= parameter.
+
 2008-08-01	Sascha L. Teichmann <sascha.teichmann@intevation.de>
 
 	* contrib/zeiterfassung: New. generates lines for zeiterfassung.txt.
diff -r 20414d892f04 -r 4e8f5545256d contrib/zeiterfassung
--- a/contrib/zeiterfassung	Fri Aug 01 18:13:31 2008 +0200
+++ b/contrib/zeiterfassung	Sun Aug 03 15:52:21 2008 +0200
@@ -28,9 +28,9 @@
 
 USAGE = '''usage: %s <options>
     with <options>
-    [--user=|-u <user>]        : Name of user,   default: $USER
-    [--database=|-d <database>]: getan database, default: time.db
-    [--project|-p]             : Key of output project, default: all
+    [--user=|-u <user>]        : Name of user,          default: $USER
+    [--database=|-d <database>]: getan database,        default: time.db
+    [--project=|-p <key>]      : Key of output project, default: all
     [--list|-l]                : list all projects
     [--help|-h]                : This text'''
 
@@ -39,11 +39,11 @@
 '''
 
 PROJECT_ID_BY_KEY = '''
-SELECT id FROM projects where key = :key
+SELECT id, description FROM projects where key = :key
 '''
 
 ALL_PROJECT_IDS = '''
-SELECT id, key FROM projects;
+SELECT id, key, description FROM projects
 '''
 
 ENTRIES = '''
@@ -103,7 +103,7 @@
     opts, args = getopt.getopt(
         sys.argv[1:],
         'd:u:p:hl',
-        ['database=', 'user=', 'project', 'help', 'list'])
+        ['database=', 'user=', 'project=', 'help', 'list'])
 
     for opt, val in opts:
         if opt in ("--database", "-d"):
@@ -142,13 +142,13 @@
                     row = cur.fetchone()
                     if row is None:
                         raise TermError("There is no project with key '%s'" % project)
-                    project_ids = [[row[0], project]]
+                    project_ids = [[row[0], project, row[1]]]
                 else:
                     cur.execute(ALL_PROJECT_IDS);
                     project_ids = cur.fetchall()
 
-                for project_id, project in project_ids:
-                    print "# project: %s" % project
+                for project_id, project, proj_desc in project_ids:
+                    print "# project: %s (%s)" % (project, proj_desc)
                     cur.execute(ENTRIES, {'project_id': project_id})
                     total = 0
                     while True:
@@ -171,7 +171,7 @@
                             user,
                             workpackage,
                             c)
-                    print "# total: %sh" % human_time(total)
+                    print "# total: %sh\n\n" % human_time(total)
         finally:
             tolerantClose(cur)
             tolerantClose(con)