[Mpuls-commits] r4700 - in jmd/trunk: . jmdweb/public/formed

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-02-24 19:07:46 +0100 (Thu, 24 Feb 2011)
New Revision: 4700

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdweb/public/formed/formedtree.xml
Log:
* jmdweb/public/formed/formedtree.xml: Add digest specifications
to the repeat groups rg_biographie2 and rg_ziele. Port of revision
511:d5610228ed39 from JMD db_xml. When used with libformed
revision 361:4a00dbcb6beb the specification from jmd.json can now
be removed.


Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-02-24 15:45:08 UTC (rev 4699)
+++ jmd/trunk/ChangeLog	2011-02-24 18:07:46 UTC (rev 4700)
@@ -1,3 +1,11 @@
+2011-02-24  Bernhard Herzog  <bh at intevation.de>
+
+	* jmdweb/public/formed/formedtree.xml: Add digest specifications
+	to the repeat groups rg_biographie2 and rg_ziele. Port of revision
+	511:d5610228ed39 from JMD db_xml. When used with libformed
+	revision 361:4a00dbcb6beb the specification from jmd.json can now
+	be removed.
+
 2011-02-24  Ludwig Reiter <ludwig.reiter at intevation.de>
 
 	* jmdweb/i18n/de/LC_MESSAGES/jmdweb.po

Modified: jmd/trunk/jmdweb/public/formed/formedtree.xml
===================================================================
--- jmd/trunk/jmdweb/public/formed/formedtree.xml	2011-02-24 15:45:08 UTC (rev 4699)
+++ jmd/trunk/jmdweb/public/formed/formedtree.xml	2011-02-24 18:07:46 UTC (rev 4700)
@@ -709,7 +709,7 @@
               </group>
             </group>
           </page>
-          <repeat description="2.2.5.2 Schulische und berufliche Biografie" min="0" name="rg_biographie2">
+          <repeat description="2.2.5.2 Schulische und berufliche Biografie" digest="biographie_art biographie_datum_von biographie_datum_bis" min="0" name="rg_biographie2" orderby="biographie_datum_von" reverse="true">
             <page containers="a,b,c,d,e,f,g,h" description="Biographie-Eintrag" name="page-25" target="a">
               <date description="Datum von" name="biographie_datum_von" target="a"/>
               <date description="Datum bis" name="biographie_datum_bis" target="a"/>
@@ -1389,7 +1389,7 @@
         </conditional>
       </page>
     </group>
-    <repeat description="4. Integrationsförderplan" min="0" name="rg_ziele">
+    <repeat description="4. Integrationsförderplan" digest="fp_ziel fp_datum_vereinbarung fp_datum_umsetzung" min="0" name="rg_ziele">
       <page containers="a,b,c,d,e" description="Ziel" name="page-13">
         <choice description="Förderbedarf mit dem Ziel" flags="required:phase_3" name="fp_ziel" size="1" target="a">
           <bool checked="True" description="Keine Angabe" name="bool-52" value="-1"/>