[Mpuls-commits] r342 - in wasko/trunk: . waskaweb/i18n/de/LC_MESSAGES waskaweb/model

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-03-09 10:37:11 +0100 (Mon, 09 Mar 2009)
New Revision: 342

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
   wasko/trunk/waskaweb/model/case.py
Log:
Adopted digest for WASKO


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-03-09 09:35:20 UTC (rev 341)
+++ wasko/trunk/ChangeLog.txt	2009-03-09 09:37:11 UTC (rev 342)
@@ -3,6 +3,10 @@
 	* formed/privacy_statement.html: Replaced "Kompetenzagentur" with
 	  "Koordinierungsstelle"
 	* formed/annotations.xhtml: Added helptexts.
+	* waskaweb/model/case.py, 
+	  waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+	  waskaweb/templates/casemanagement/digest_body.mako: Adjusted digest
+	  for WASKO
 
 2009-03-06	Torsten Irlaender  <torsten.irlaender at intevation.de> 
 

Modified: wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-03-09 09:35:20 UTC (rev 341)
+++ wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-03-09 09:37:11 UTC (rev 342)
@@ -1736,7 +1736,7 @@
 #: waskaweb/templates/casemanagement/digest_body.mako:92
 #: waskaweb/templates/casemanagement/digest_body.mako:126
 msgid "cm_digest_tbl_label_telephone"
-msgstr "Festnetz"
+msgstr "Telefon"
 
 #: waskaweb/templates/casemanagement/digest_body.mako:96
 #: waskaweb/templates/casemanagement/digest_body.mako:130

Modified: wasko/trunk/waskaweb/model/case.py
===================================================================
--- wasko/trunk/waskaweb/model/case.py	2009-03-09 09:35:20 UTC (rev 341)
+++ wasko/trunk/waskaweb/model/case.py	2009-03-09 09:37:11 UTC (rev 342)
@@ -101,14 +101,25 @@
     addresse_ort_1 as wohnort, 
     addresse1_vorwahl_1 as vorwahl, 
     addresse1_telefonnummer_1 as telefon_1,
+    addresse2_vorwahl_1 as vorwahl_2, 
+    addresse2_telefonnummer_2 as telefon_2,
     addresse_weiteretelefonnummern_1 as telefon_sonstige, 
     addresse_email_1 as email, 
     einwilligung as einverstaendniserklaerung, 
-    mutter_n as name_2, 
-    mutter_vn as vorname_2, 
-    mutter_vorwahl1_1 as vorwahl_1, 
-    mutter_telefonnummer1_1 as telefon_1_1, 
-    mutter_email_1 as email_1 
+    mutter_n, 
+    mutter_vn, 
+    mutter_vorwahl1_1, 
+    mutter_telefonnummer1_1, 
+    mutter_vorwahl2_1, 
+    mutter_telefonnummer2_1, 
+    mutter_email_1,
+    vater_n , 
+    vater_vn , 
+    vater_vorwahl1_1 , 
+    vater_telefonnummer1_1 , 
+    vater_vorwahl2_1 , 
+    vater_telefonnummer2_1 , 
+    vater_email_1 
 FROM master_tbl_view WHERE id = %(id)s
 """
 
@@ -716,6 +727,8 @@
             self.city              = unicode(str(result.get('wohnort', '')), 'utf-8')
             self.telephone_1       = unicode(str(result.get('vorwahl', '')), 'utf-8')
             self.telephone_2       = unicode(str(result.get('telefon_1', '')), 'utf-8')
+            self.telephone_3       = unicode(str(result.get('vorwahl_2', '')), 'utf-8')
+            self.telephone_4       = unicode(str(result.get('telefon_2', '')), 'utf-8')
             self.mobiletel         = unicode(str(result.get('mobiltelefon', '')), 'utf-8')
             self.telephone_more    = F.NA(unicode(str(result.get('telefon_sonstige', '')), 'utf-8')).replace('\n', '<br>')
 
@@ -724,13 +737,22 @@
             self.statement         = (result.get('einverstaendniserklaerung') >= 0)
 
             # Parents of the kids
-            self.parent_first_name  = unicode(str(result.get('vorname_2', '')), 'utf-8')
-            self.parent_last_name   = unicode(str(result.get('name_2', '')), 'utf-8')
-            self.parent_telephone_1 = unicode(str(result.get('vorwahl_1', '')), 'utf-8')
-            self.parent_telephone_2 = unicode(str(result.get('telefon_1_1', '')), 'utf-8')
-            self.parent_mobiletel   = unicode(str(result.get('mobiltelefon_1', '')), 'utf-8')
-            self.parent_email       = unicode(str(result.get('email_1', '')), 'utf-8')
+            self.mother_first_name  = unicode(str(result.get('mutter_vn', '')), 'utf-8')
+            self.mother_last_name   = unicode(str(result.get('mutter_n', '')), 'utf-8')
+            self.mother_telephone_1 = unicode(str(result.get('mutter_vorwahl1_1', '')), 'utf-8')
+            self.mother_telephone_2 = unicode(str(result.get('mutter_telefonnummer1_1', '')), 'utf-8')
+            self.mother_telephone_3 = unicode(str(result.get('mutter_vorwahl2_1', '')), 'utf-8')
+            self.mother_telephone_4 = unicode(str(result.get('mutter_telefonnummer2_1', '')), 'utf-8')
+            self.mother_email       = unicode(str(result.get('muttler_email_1', '')), 'utf-8')
 
+            self.father_first_name  = unicode(str(result.get('vater_vn', '')), 'utf-8')
+            self.father_last_name   = unicode(str(result.get('vater_n', '')), 'utf-8')
+            self.father_telephone_1 = unicode(str(result.get('vater_vorwahl1_1', '')), 'utf-8')
+            self.father_telephone_2 = unicode(str(result.get('vater_telefonnummer1_1', '')), 'utf-8')
+            self.father_telephone_3 = unicode(str(result.get('vater_vorwahl2_1', '')), 'utf-8')
+            self.father_telephone_4 = unicode(str(result.get('vater_telefonnummer2_1', '')), 'utf-8')
+            self.father_email       = unicode(str(result.get('vater_email_1', '')), 'utf-8')
+
         except:
             traceback.print_exc(file=sys.stderr)