[Mpuls-commits] r833 - in wasko/branches/2.0: . waskaweb/model

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-25 16:30:06 +0100 (Mon, 25 Jan 2010)
New Revision: 833

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/model/case.py
Log:
* waskaweb/model/case.py: Remove unused SQL templates.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-22 14:53:54 UTC (rev 832)
+++ wasko/branches/2.0/ChangeLog	2010-01-25 15:30:06 UTC (rev 833)
@@ -1,3 +1,7 @@
+2010-01-25  Bernhard Herzog  <bh at intevation.de>
+
+	* waskaweb/model/case.py: Remove unused SQL templates.
+
 2010-01-22  Bernhard Herzog  <bh at intevation.de>
 
 	* waskaweb/templates/casemanagement/caselist.mako: Move list row

Modified: wasko/branches/2.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/case.py	2010-01-22 14:53:54 UTC (rev 832)
+++ wasko/branches/2.0/waskaweb/model/case.py	2010-01-25 15:30:06 UTC (rev 833)
@@ -135,49 +135,6 @@
     SET phase = %(phase)s
     WHERE id IN (SELECT master_id FROM ka_status_tbl_view WHERE id = %(id)s)"""
 
-#LOAD_CASE_DIGEST_SQL = """
-#SELECT
-#    name as name_1,
-#    vorname as vorname_1,
-#    fn as kundennummer,
-#    date_part('year', age(geburtsdatum::timestamp)) AS alter,
-#    addresse_plz_1 as plz,
-#    addresse_strasse_1 as strasse,
-#    addresse_strassenr_1 as strassenr,
-#    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,
-#    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
-#"""
-LOAD_CASE_DIGEST_SQL = """
-SELECT
-    name as name_1,
-    vorname as vorname_1,
-    fn as kundennummer,
-    date_part('year', age(geburtsdatum::timestamp)) AS alter,
-    einwilligung as einverstaendniserklaerung
-FROM master_tbl_view WHERE id = %(id)s
-"""
-
 LOAD_CASE_SQL = """
 SELECT
     name as name_1,
@@ -190,20 +147,7 @@
 DELETE_CASE_SQL = """select delete_master_ds(%(id)s)"""
 
 CREATE_CASE_SQL = """SELECT create_master_tbl(%(uuid)s)"""
-UPDATE_CASE_ON_CREATE_SQL = """
-UPDATE master_tbl_view
-SET
-    name = %(name)s,
-    vorname = %(vorname)s,
-    mitarb_vv = %(gvorname)s,
-    mitarb_vn = %(gname)s,
-    einwilligung = %(einwilligung)s,
-    addresse_strassenr_1 = %(strassenr)s,
-    addresse_strasse_1 = %(strasse)s,
-    addresse_plz_1 = %(plz)s,
-    addresse_ort_1 = %(ort)s
-WHERE id = %(id)s
-"""
+
 INIT_CASE_SQL = """
 UPDATE master_tbl_view
 SET
@@ -227,9 +171,6 @@
 SET_EDITOR_SQL = """SELECT set_case_editor(%(userid)s, %(caseid)s)"""
 SET_EDITOR_NAME_SQL = """
 SELECT set_case_editor_name(%(firstname)s, %(lastname)s, %(caseid)s)"""
-FETCH_KOMPETENZ_ID = """
-SELECT id from rg_kompetenzfestellung_tbl_view WHERE master_id = %(id)s LIMIT 1
-"""
 
 CASE_EXISTS = "SELECT * FROM case_exists(%(knummer)s)"
 
@@ -900,8 +841,10 @@
         self.city              = unicode(str(result.get('addresse_ort', '')), 'utf-8')
         self.telephone_1       = unicode(str(result.get('addresse_vorwahl', '')), 'utf-8')
         self.telephone_2       = unicode(str(result.get('addresse_telefonnummer', '')), 'utf-8')
+
         self.telephone_3       = ""
         self.telephone_4       = ""
+
         self.telephone_more    = F.NA(unicode(str(result.get('addresse_weiteretelefonnummern', '')), 'utf-8')).replace('\n', '<br>')
 
         self.email             = unicode(str(result.get('addresse_email', '')), 'utf-8')