[Mpuls-commits] r4351 - in wasko/trunk: . waskoweb/i18n waskoweb/i18n/de/LC_MESSAGES waskoweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-12-09 16:06:02 +0100 (Thu, 09 Dec 2010)
New Revision: 4351

Modified:
   wasko/trunk/wasko.json
   wasko/trunk/waskoweb/i18n/de/LC_MESSAGES/waskoweb.po
   wasko/trunk/waskoweb/i18n/waskoweb.pot
   wasko/trunk/waskoweb/templates/casemanagement/digest_body.mako
Log:
Issue821: Show age on time of "erstgespraech"


Modified: wasko/trunk/wasko.json
===================================================================
--- wasko/trunk/wasko.json	2010-12-09 14:51:09 UTC (rev 4350)
+++ wasko/trunk/wasko.json	2010-12-09 15:06:02 UTC (rev 4351)
@@ -221,6 +221,8 @@
 		{"name":"vater_email_1", "digest":true},
 		{"name":"cm_end_art", "digest":true},
 		{"name":"cm_end_verm", "digest":true},
+		{"name":"erstgespraech", "session":true,
+         	 "alias":"first_meeting", "alias_force_string":false},
          	{"name":"bearbeiter_id", "search_retrieve":true,
          	 "preload":true, "alias":"editor", "alias_force_string":true}
      		],

Modified: wasko/trunk/waskoweb/i18n/de/LC_MESSAGES/waskoweb.po
===================================================================
--- wasko/trunk/waskoweb/i18n/de/LC_MESSAGES/waskoweb.po	2010-12-09 14:51:09 UTC (rev 4350)
+++ wasko/trunk/waskoweb/i18n/de/LC_MESSAGES/waskoweb.po	2010-12-09 15:06:02 UTC (rev 4351)
@@ -8,8 +8,8 @@
 "Project-Id-Version: waskoweb 2.0.0-pre\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
 "POT-Creation-Date: 2010-11-25 12:27+0100\n"
-"PO-Revision-Date: 2010-11-25 12:28+0100\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"PO-Revision-Date: 2010-12-09 15:56+0100\n"
+"Last-Translator: Torsten Irländer <torsten.irlaender at intevation.de>\n"
 "Language-Team: de <LL at li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
@@ -63,15 +63,20 @@
 msgid "cm_header_digest_youth"
 msgstr ""
 
-#: waskoweb/templates/casemanagement/digest_body.mako:17
+#: waskoweb/templates/casemanagement/digest_body.mako:14
+#, python-format
+msgid "Age on first contact: %s years"
+msgstr "Alter bei dem Erstgespräch: %s Jahre"
+
+#: waskoweb/templates/casemanagement/digest_body.mako:21
 msgid "Angaben zum Erziehungsberechtigten"
 msgstr ""
 
-#: waskoweb/templates/casemanagement/digest_body.mako:18
+#: waskoweb/templates/casemanagement/digest_body.mako:22
 msgid "Angaben zur Mutter"
 msgstr ""
 
-#: waskoweb/templates/casemanagement/digest_body.mako:29
+#: waskoweb/templates/casemanagement/digest_body.mako:33
 msgid "Angaben zum Vater"
 msgstr ""
 

Modified: wasko/trunk/waskoweb/i18n/waskoweb.pot
===================================================================
--- wasko/trunk/waskoweb/i18n/waskoweb.pot	2010-12-09 14:51:09 UTC (rev 4350)
+++ wasko/trunk/waskoweb/i18n/waskoweb.pot	2010-12-09 15:06:02 UTC (rev 4351)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: waskoweb 2.0.0-pre\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2010-11-25 12:27+0100\n"
+"POT-Creation-Date: 2010-12-09 15:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -63,15 +63,20 @@
 msgid "cm_header_digest_youth"
 msgstr ""
 
-#: waskoweb/templates/casemanagement/digest_body.mako:17
+#: waskoweb/templates/casemanagement/digest_body.mako:14
+#, python-format
+msgid "Age on first contact: %s years"
+msgstr ""
+
+#: waskoweb/templates/casemanagement/digest_body.mako:21
 msgid "Angaben zum Erziehungsberechtigten"
 msgstr ""
 
-#: waskoweb/templates/casemanagement/digest_body.mako:18
+#: waskoweb/templates/casemanagement/digest_body.mako:22
 msgid "Angaben zur Mutter"
 msgstr ""
 
-#: waskoweb/templates/casemanagement/digest_body.mako:29
+#: waskoweb/templates/casemanagement/digest_body.mako:33
 msgid "Angaben zum Vater"
 msgstr ""
 

Modified: wasko/trunk/waskoweb/templates/casemanagement/digest_body.mako
===================================================================
--- wasko/trunk/waskoweb/templates/casemanagement/digest_body.mako	2010-12-09 14:51:09 UTC (rev 4350)
+++ wasko/trunk/waskoweb/templates/casemanagement/digest_body.mako	2010-12-09 15:06:02 UTC (rev 4351)
@@ -9,7 +9,11 @@
       % if field.name in ['name', 'vorname', 'geburtsdatum', 'fn', 'addresse_strasse_1', 'addresse_strassenr_1', 'addresse_plz_1', 'addresse_ort_1', 'addresse1_vorwahl_1', 'addresse1_telefonnummer_1', 'addresse2_vorwahl_1', 'addresse2_telefonnummer_2', 'addresse_email_1', 'addresse_weiteretelefonnummern_1']:
         <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>
+          <td>${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})
+            % endif
+          </td>
         </tr>
       %endif 
     % endfor