[Getan-commits] [PATCH 2 of 2] Scanning for workpackage string is now closer to what zeitvertexung does

Wald Commits scm-commit at wald.intevation.org
Mon Nov 30 17:00:00 CET 2015


# HG changeset patch
# User Bernhard Reiter <bernhard at intevation.de>
# Date 1448899192 -3600
# Node ID 5f557bd2cfe0fa78bcdd720019d284674a138684
# Parent  03f3a73350efcda51ea24c785f8158827af15c08
Scanning for workpackage string is now closer to what zeitvertexung does.

diff -r 03f3a73350ef -r 5f557bd2cfe0 TODO
--- a/TODO	Mon Nov 30 12:43:08 2015 +0100
+++ b/TODO	Mon Nov 30 16:59:52 2015 +0100
@@ -1,8 +1,8 @@
-20151130 BER: Think about the workpackage regex, right now workpackages with
- points are not possible.
 20151130 BER: templates/zeiterfassung2: Really sort by date, right now the 
   sorting it sometimes skewed if the week wraps around the end of the month.
 
+Older:
+
 - Create a 'Help-Widget' to give the user an information about all possible
   keys.
 
diff -r 03f3a73350ef -r 5f557bd2cfe0 getan/project.py
--- a/getan/project.py	Mon Nov 30 12:43:08 2015 +0100
+++ b/getan/project.py	Mon Nov 30 16:59:52 2015 +0100
@@ -82,7 +82,7 @@
 
 class Entry(object):
 
-    WORKPACKAGE = re.compile("^\[(\w*)(\s|\])")
+    WORKPACKAGE = re.compile("^\[([^\s\]]+)(\s|\])")
 
     def __init__(self, id, project_id, start, end, desc):
         self.id = id


More information about the Getan-commits mailing list