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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-12-13 11:29:45 +0100 (Mon, 13 Dec 2010)
New Revision: 4359

Modified:
   waska/trunk/ChangeLog
   waska/trunk/waska.json
   waska/trunk/waskaweb/templates/casemanagement/digest_body.mako
Log:
issue1550: also show the 'other phone numbers' field in the overview

Modified: waska/trunk/ChangeLog
===================================================================
--- waska/trunk/ChangeLog	2010-12-13 10:29:04 UTC (rev 4358)
+++ waska/trunk/ChangeLog	2010-12-13 10:29:45 UTC (rev 4359)
@@ -1,3 +1,8 @@
+2010-12-13  Roland Geider <roland.geider at intevation.de>
+
+	* waskaweb/templates/casemanagement/digest_body.mako: issue1550: also
+	  show the "other phone numbers" field in the overview
+
 2010-12-10  Roland Geider <roland.geider at intevation.de>
 
 	 * waskaweb/public/formed/formedtree.xml: issue1572: Corrected rules

Modified: waska/trunk/waska.json
===================================================================
--- waska/trunk/waska.json	2010-12-13 10:29:04 UTC (rev 4358)
+++ waska/trunk/waska.json	2010-12-13 10:29:45 UTC (rev 4359)
@@ -210,6 +210,7 @@
          	{"name":"vorwahl", "digest":true},
          	{"name":"telefon_1", "digest":true},
          	{"name":"mobiltelefon", "digest":true},
+         	{"name":"telefon_sonstige", "digest":true},
          	{"name":"email", "digest":true},
          	{"name":"vorname_2", "digest":true},
          	{"name":"email_1", "digest":true},

Modified: waska/trunk/waskaweb/templates/casemanagement/digest_body.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/digest_body.mako	2010-12-13 10:29:04 UTC (rev 4358)
+++ waska/trunk/waskaweb/templates/casemanagement/digest_body.mako	2010-12-13 10:29:45 UTC (rev 4359)
@@ -6,10 +6,10 @@
   <h2>${_('cm_header_digest_youth')}</h2>
   <table>
     % for num, field in enumerate(c.case.get_digest_fields()):
-      % if field.name in ['kundennummer', 'name_1', 'vorname_1', 'geburtsdatum', 'strasse', 'strassenr', 'plz', 'wohnort', 'vorwahl', 'telefon_1', 'mobiltelefon', 'email']:
+      % if field.name in ['kundennummer', 'name_1', 'vorname_1', 'geburtsdatum', 'strasse', 'strassenr', 'plz', 'wohnort', 'vorwahl', 'telefon_1', 'mobiltelefon', 'telefon_sonstige', 'email']:
         <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}
+          <td>${h.literal(h.convertForDigest(h.nl_to_br(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})
             % endif