[Mpuls-commits] r3419 - in jmd/trunk: . jmdstrukturweb/public/formed

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-08-17 15:39:07 +0200 (Tue, 17 Aug 2010)
New Revision: 3419

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdstrukturweb/public/formed/formedtree.xml
Log:
* jmdstrukturweb/public/formed/formedtree.xml: Update to new
formed description with time flags on the date fields so that
searching for date-ranges will work.


Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2010-08-17 12:45:11 UTC (rev 3418)
+++ jmd/trunk/ChangeLog	2010-08-17 13:39:07 UTC (rev 3419)
@@ -1,5 +1,11 @@
 2010-08-17  Bernhard Herzog  <bh at intevation.de>
 
+	* jmdstrukturweb/public/formed/formedtree.xml: Update to new
+	formed description with time flags on the date fields so that
+	searching for date-ranges will work.
+
+2010-08-17  Bernhard Herzog  <bh at intevation.de>
+
 	* jmdweb/lib/search.py (CaseSearch.get_where): Removed.  The
 	base-class version is enough now.
 	(SEARCH_WHERE): Removed. No longer needed.

Modified: jmd/trunk/jmdstrukturweb/public/formed/formedtree.xml
===================================================================
--- jmd/trunk/jmdstrukturweb/public/formed/formedtree.xml	2010-08-17 12:45:11 UTC (rev 3418)
+++ jmd/trunk/jmdstrukturweb/public/formed/formedtree.xml	2010-08-17 13:39:07 UTC (rev 3419)
@@ -16,8 +16,8 @@
     <group description="Strukturdaten" name="group-0">
       <page containers="a,b" description="Zuständigkeitsbereich und Struktur" name="page-0">
         <group containers="a" description="Erfassungszeitraum" name="group-4" target="a">
-          <date description="Datum Begin Zeitraum" flags="required:phase_0" name="datum_begin_zeitraum" order=";datum_ende_zeitraum" target="a"/>
-          <date description="Datum Ende Zeitraum" flags="required:phase_1" name="datum_ende_zeitraum" order="datum_begin_zeitraum;" target="a"/>
+          <date description="Datum Begin Zeitraum" flags="required:phase_0;time:phase_0" name="datum_begin_zeitraum" order=";datum_ende_zeitraum" target="a"/>
+          <date description="Datum Ende Zeitraum" flags="required:phase_1;time:phase_1" name="datum_ende_zeitraum" order="datum_begin_zeitraum;" target="a"/>
           <rule expr="$datum_begin_zeitraum isset" mark="warning:datum_begin_zeitraum" name="required-rule-0" value="Fehlende Pflichtfeldangabe"/>
           <rule expr="$datum_ende_zeitraum isset" mark="warning:datum_ende_zeitraum" name="required-rule-1" value="Fehlende Pflichtfeldangabe"/>
           <rule description="'datum_begin_zeitraum' muss vor 'datum_ende_zeitraum' liegen." expr="$datum_begin_zeitraum isset $datum_begin_zeitraum known and $datum_ende_zeitraum isset $datum_ende_zeitraum known and and $datum_begin_zeitraum $datum_ende_zeitraum &gt; and not" mark="error:datum_begin_zeitraum" name="date-sequence-rule-0-1" value="'Datum Begin Zeitraum' darf zeitlich nicht nach 'Datum Ende Zeitraum' liegen."/>