[Mpuls-commits] r4371 - in waska/trunk: . waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-12-14 12:30:11 +0100 (Tue, 14 Dec 2010)
New Revision: 4371

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

Modified: waska/trunk/ChangeLog
===================================================================
--- waska/trunk/ChangeLog	2010-12-14 11:19:18 UTC (rev 4370)
+++ waska/trunk/ChangeLog	2010-12-14 11:30:11 UTC (rev 4371)
@@ -1,3 +1,9 @@
+2010-12-13  Roland Geider <roland.geider at intevation.de>
+
+	* waskaweb/templates/casemanagement/digest_body.mako: issue1589: don't
+	  try to calculate the age if birthday or date of first contact are
+	  missing
+
 2010-12-14  Bernhard Herzog  <bh at intevation.de>
 
 	* waskaweb/templates/casemanagement/digest_body.mako: When

Modified: waska/trunk/waskaweb/templates/casemanagement/digest_body.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/digest_body.mako	2010-12-14 11:19:18 UTC (rev 4370)
+++ waska/trunk/waskaweb/templates/casemanagement/digest_body.mako	2010-12-14 11:30:11 UTC (rev 4371)
@@ -10,8 +10,8 @@
         <tr class="${num % 2 and 'hl' or ''}">
           <td class="label">${c.case.get_description(field.name)}</td>
           <td>${h.literal(h.nl_to_br(h.convertForDigest(c.case.get_value(field.name))))| F.NA}
-            % if field.name == 'geburtsdatum' and c.case.first_meeting:
-            (${_('Age on first contact: %s years') %h.get_age(c.case.first_meeting - c.case.get_value(field.name)) | F.NA})
+            % 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>
         </tr>