[Mpuls-commits] r4372 - in wasko/trunk: . waskoweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-12-14 12:31:52 +0100 (Tue, 14 Dec 2010)
New Revision: 4372

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/templates/casemanagement/digest_body.mako
Log:
issue1589: calculate age if birthday and date of 1st contact set

Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2010-12-14 11:30:11 UTC (rev 4371)
+++ wasko/trunk/ChangeLog	2010-12-14 11:31:52 UTC (rev 4372)
@@ -1,5 +1,11 @@
 2010-12-10  Roland Geider <roland.geider at intevation.de>
 
+	* waskoweb/templates/casemanagement/digest_body.mako: issue1589: don't
+	  try to calculate the age if birthday or date of first contact are
+	  missing
+
+2010-12-10  Roland Geider <roland.geider at intevation.de>
+
 	* tagging.xml,
 	  waskoweb/public/formed/formedtree.xml: issue1572: Corrected rules,
 	  generated new tagging.xml

Modified: wasko/trunk/waskoweb/templates/casemanagement/digest_body.mako
===================================================================
--- wasko/trunk/waskoweb/templates/casemanagement/digest_body.mako	2010-12-14 11:30:11 UTC (rev 4371)
+++ wasko/trunk/waskoweb/templates/casemanagement/digest_body.mako	2010-12-14 11:31:52 UTC (rev 4372)
@@ -10,7 +10,7 @@
         <tr class="${num % 2 and 'hl' or ''}">
           <td class="label">${c.case.get_description(field.name)}</td>
           <td>${h.convertForDigest(c.case.get_value(field.name))| F.NA}
-            % if field.name == 'geburtsdatum' and c.case.first_meeting:
+            % if field.name == 'geburtsdatum' and c.case.first_meeting and c.case.get_value(field.name):
             (${_('Age on first contact: %s years') %h.get_age(c.case.first_meeting - c.case.get_value(field.name)) | F.NA})
             % endif
           </td>