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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-05-30 09:59:01 +0200 (Mon, 30 May 2011)
New Revision: 5021

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdstrukturweb/public/formed/formedtree.xml
   jmd/trunk/jmdstrukturweb/public/xml/eval_netzwerk.xml
Log:
issue2128: Move name of cooperation partner to beginning of overview

Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-05-27 13:29:53 UTC (rev 5020)
+++ jmd/trunk/ChangeLog	2011-05-30 07:59:01 UTC (rev 5021)
@@ -1,3 +1,8 @@
+2011-05-30 Roland Geider  <roland.geider at intevation.de>
+
+	* jmdstrukturweb/public/formed/formedtree.xml: issue2128: Move name
+	  of cooperation partner to beginning of overview
+
 2011-05-27  Ludwig Reiter <ludwig.reiter at intevation.de>
 
 	* jmdweb/templates/phase/dialogs/success_set_phase.mako:

Modified: jmd/trunk/jmdstrukturweb/public/formed/formedtree.xml
===================================================================
--- jmd/trunk/jmdstrukturweb/public/formed/formedtree.xml	2011-05-27 13:29:53 UTC (rev 5020)
+++ jmd/trunk/jmdstrukturweb/public/formed/formedtree.xml	2011-05-30 07:59:01 UTC (rev 5021)
@@ -225,7 +225,7 @@
         <textarea description="Mitarbeit in Gremien" name="mitarbeit_gremien" rows="5" target="d"/>
         <rule expr="$erstellung_netzwerkkarte -1 == not" mark="warning:erstellung_netzwerkkarte" name="required-rule-39" value="Fehlende Pflichtfeldangabe"/>
       </page>
-      <repeat description="2.3 Bewertung der Kooperationsbezüge" digest="institution_art institution_ist kooperationspartner_nennung" name="rg_kooperationsbezug">
+      <repeat description="2.3 Bewertung der Kooperationsbezüge" digest="kooperationspartner_nennung institution_art institution_ist" 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"/>

Modified: jmd/trunk/jmdstrukturweb/public/xml/eval_netzwerk.xml
===================================================================
--- jmd/trunk/jmdstrukturweb/public/xml/eval_netzwerk.xml	2011-05-27 13:29:53 UTC (rev 5020)
+++ jmd/trunk/jmdstrukturweb/public/xml/eval_netzwerk.xml	2011-05-30 07:59:01 UTC (rev 5021)
@@ -159,7 +159,7 @@
           <join>bildungsberatung_garantiefonds</join>
       </xdim>
       -->
-      
+      <!--
       <xdim>
           <label>Vorhandensein der Institution - ZU KLAEREN</label>
           <field>(CASE WHEN (institution_ist NOT IN (-3, -1) OR institution_angaben NOT IN (-3, -1))
@@ -168,6 +168,7 @@
           <table>bildungsberatung_garantiefonds_tbl</table>
           <join>bildungsberatung_garantiefonds</join>
       </xdim>
+      -->
       <xdim>
           <label>Kooperationsbezüge</label>
           <field>institution_ist</field>