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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-04-06 12:47:33 +0200 (Wed, 06 Apr 2011)
New Revision: 4869

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdstruktur.json
   jmd/trunk/jmdstrukturweb/public/formed/formedtree.xml
Log:
move the digest property from the JSON file to the formedtree

Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-04-06 10:42:02 UTC (rev 4868)
+++ jmd/trunk/ChangeLog	2011-04-06 10:47:33 UTC (rev 4869)
@@ -1,5 +1,11 @@
 2011-04-06  Roland Geider  <roland.geider at intevation.de>
 
+	* jmdstruktur.json,
+	  jmdstrukturweb/public/formed/formedtree.xml: move the digest property
+	  from the JSON file to the formedtree
+
+2011-04-06  Roland Geider  <roland.geider at intevation.de>
+
 	* jmdstrukturweb/public/formed/formedtree.xml: issue1989:
 	  model the non-KJP-offers analog to the KJP-offers
 

Modified: jmd/trunk/jmdstruktur.json
===================================================================
--- jmd/trunk/jmdstruktur.json	2011-04-06 10:42:02 UTC (rev 4868)
+++ jmd/trunk/jmdstruktur.json	2011-04-06 10:47:33 UTC (rev 4869)
@@ -143,19 +143,6 @@
                 "remindercondition": "FALSE",
 		"reminderconditiondesc": "Die Fallakte kann ungeschr&auml;nkt aufbewahrt werden"
  	},
-
-	"renderer": {
-		"rg_digests": {
-			"rg_kjp_gruppenangebote": {"fields":
-				["kjp_grp_art_angebot", "kjp_grp_weitere_angaben"]
-				},
-			"rg_nichtkjp_gruppenangebote": {"fields":
-				["nichtkjp_grp_art_angebot", "nichtkjp_grp_weitere_angaben"]},
-			"rg_kooperationsbezug": {"fields": ["institution_art",
-			                                    "institution_ist", 
-							    "kooperationspartner_nennung"]}
-		}
-	},
 	"evaluations": {
 		"adele-phases": ["1"],
 		"default-phases": ["1"]

Modified: jmd/trunk/jmdstrukturweb/public/formed/formedtree.xml
===================================================================
--- jmd/trunk/jmdstrukturweb/public/formed/formedtree.xml	2011-04-06 10:42:02 UTC (rev 4868)
+++ jmd/trunk/jmdstrukturweb/public/formed/formedtree.xml	2011-04-06 10:47:33 UTC (rev 4869)
@@ -222,7 +222,7 @@
         </group>
         <textarea description="Mitarbeit in Gremien" name="mitarbeit_gremien" rows="5" target="c"/>
       </page>
-      <repeat description="2.2 Erfassung der vorhandenen Kooperationsbezüge" name="rg_kooperationsbezug">
+      <repeat description="2.2 Erfassung der vorhandenen Kooperationsbezüge" digest="institution_art institution_ist kooperationspartner_nennung" name="rg_kooperationsbezug">
         <page containers="a,b,c,d,e,f" description="Kooperationsbezug" name="page-6" target="b">
           <choice description="Art der Institution" flags="required:phase_1" name="institution_art" size="1" target="a">
             <bool checked="True" description="Keine Angabe" name="keine_angabe" value="-1"/>
@@ -486,7 +486,7 @@
       </repeat>
     </group>
     <group description="3. Gruppenangebote" name="group-2">
-      <repeat description="3.1 KJP-geförderte Gruppenangebote" name="rg_kjp_gruppenangebote">
+      <repeat description="3.1 KJP-geförderte Gruppenangebote" digest="kjp_grp_art_angebot kjp_grp_weitere_angaben" name="rg_kjp_gruppenangebote">
         <page containers="a,b,c,d" description="Angebot" name="page-2">
           <choice description="Art des Angebotes" flags="required:phase_1" name="kjp_grp_art_angebot" size="1" target="a">
             <bool checked="true" description="Keine Angabe" name="keine_angabe" value="-1"/>
@@ -530,7 +530,7 @@
           <rule expr="$kjp_grp_alter -1 == not" mark="warning:kjp_grp_alter" name="required-rule-63" value="Fehlende Pflichtfeldangabe"/>
         </page>
       </repeat>
-      <repeat description="3.2 nicht KJP-geförderte Gruppenangebote" name="rg_nichtkjp_gruppenangebote">
+      <repeat description="3.2 nicht KJP-geförderte Gruppenangebote" digest="nichtkjp_grp_art_angebot nichtkjp_grp_weitere_angaben" name="rg_nichtkjp_gruppenangebote">
         <page containers="a,b,c,d" description="Angebot" name="page-3">
           <choice description="Art des Angebotes" flags="required:phase_1" name="nichtkjp_grp_art_angebot" size="1" target="a">
             <bool checked="true" description="Keine Angabe" name="keine_angabe" value="-1"/>