[Mpuls-commits] r657 - in wasko/branches/1.0: . waskaweb/lib waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-10-26 15:18:02 +0100 (Mon, 26 Oct 2009)
New Revision: 657

Modified:
   wasko/branches/1.0/ChangeLog.txt
   wasko/branches/1.0/waskaweb/lib/search.py
   wasko/branches/1.0/waskaweb/templates/casemanagement/search.mako
Log:
issue466


Modified: wasko/branches/1.0/ChangeLog.txt
===================================================================
--- wasko/branches/1.0/ChangeLog.txt	2009-10-26 09:19:26 UTC (rev 656)
+++ wasko/branches/1.0/ChangeLog.txt	2009-10-26 14:18:02 UTC (rev 657)
@@ -15,7 +15,11 @@
 	  waskaweb/controllers/evaluate.py: Changed translation: Does not
 	  include umlauts anymore (quickfix) 
 
+	Issue466:
 
+	* waskaweb/lib/search.py: Added new migration filter
+
+
 2009-10-23	Torsten Irlaender	<torsten.irlaender at intevation.de> 
 
 	Set version to 1.1.0

Modified: wasko/branches/1.0/waskaweb/lib/search.py
===================================================================
--- wasko/branches/1.0/waskaweb/lib/search.py	2009-10-26 09:19:26 UTC (rev 656)
+++ wasko/branches/1.0/waskaweb/lib/search.py	2009-10-26 14:18:02 UTC (rev 657)
@@ -277,6 +277,8 @@
                 migration = "(nat_muspra not in (18,-1, -3) or nat_staat not in (1,-1,-3) or vater_land not in (29, -1, -3) or mutter_land not in (29,-1, -3))"
             elif options.get('migration') == '0':
                 migration = "(nat_muspra = 18 and nat_staat = 1 and vater_land = 29 and mutter_land = 29)"
+            elif options.get('migration') == '-1':
+                migration = "(not (nat_muspra not in (18,-1, -3) or nat_staat not in (1,-1,-3) or vater_land not in (29, -1, -3) or mutter_land not in (29,-1, -3)) and not (nat_muspra = 18 and nat_staat = 1 and vater_land = 29 and mutter_land = 29))"
             elif options.get('migration') == '2':
                 migration = "(nat_staat = 2 and (vater_staat != 2 or mutter_staat != 2))"
 

Modified: wasko/branches/1.0/waskaweb/templates/casemanagement/search.mako
===================================================================
--- wasko/branches/1.0/waskaweb/templates/casemanagement/search.mako	2009-10-26 09:19:26 UTC (rev 656)
+++ wasko/branches/1.0/waskaweb/templates/casemanagement/search.mako	2009-10-26 14:18:02 UTC (rev 657)
@@ -68,6 +68,7 @@
             <option value="-2">Keine Auswahl</option>
             <option value="1">Ja</option>
             <option value="0">Nein</option>
+            <option value="-1">unbekannt</option>
             <option value="2">Auffällig</option>
           </select>
         </td>