[Mpuls-commits] r196 - in waska/trunk: . waskaweb/controllers waskaweb/i18n/de/LC_MESSAGES waskaweb/templates/casemanagement/evaluation

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu Sep 25 12:44:41 CEST 2008


Author: torsten
Date: 2008-09-25 12:44:40 +0200 (Thu, 25 Sep 2008)
New Revision: 196

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/controllers/evaluate.py
   waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
   waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako
   waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako
   waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako
Log:
Moved evaluation of "verweildauer" to category for finished cases.


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-09-25 10:36:38 UTC (rev 195)
+++ waska/trunk/ChangeLog.txt	2008-09-25 10:44:40 UTC (rev 196)
@@ -1,3 +1,15 @@
+2008-09-25	Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	Moved evaluation of "verweildauer" to category for finished cases.
+
+	* waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+	  waskaweb/controllers/evaluate.py,
+	  waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako,
+	  waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako,
+	  waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:
+	  Mainly adjusted translation strings. Moved evaluation block to
+	  another template adjusted controller code.
+
 2008-09-25	Sascha L. Teichmann <sascha.teichmann at intevation.de>
 
 	Fixed issue 574

Modified: waska/trunk/waskaweb/controllers/evaluate.py
===================================================================
--- waska/trunk/waskaweb/controllers/evaluate.py	2008-09-25 10:36:38 UTC (rev 195)
+++ waska/trunk/waskaweb/controllers/evaluate.py	2008-09-25 10:44:40 UTC (rev 196)
@@ -178,13 +178,6 @@
                 c.eval_12 = e12.perform()
                 page = render('casemanagement/evaluation/evaluation_result_1.mako')
             elif id == '2':
-                # Verweildauer CM
-                e10 = Evaluation_10(self._getCompressedIds(reset))
-                c.eval_10 = e10.perform()
-                c.count_total = e10.getTotal()
-                c.count_total_valid = e10.getTotalValid()
-                e13 = Evaluation_13(self._getCompressedIds(reset))
-                c.eval_13 = e13.perform()
                 # Altersverteilung 
                 e8 = Evaluation_8(self._getCompressedIds(reset)) 
                 c.eval_8 = e8.perform()
@@ -208,6 +201,13 @@
                 c.eval_21 = e21.perform()
                 page = render('casemanagement/evaluation/evaluation_result_2.mako')
             elif id == '3':
+                # Verweildauer CM
+                e10 = Evaluation_10(self._getCompressedIds(reset))
+                c.eval_10 = e10.perform()
+                c.count_total = e10.getTotal()
+                c.count_total_valid = e10.getTotalValid()
+                e13 = Evaluation_13(self._getCompressedIds(reset))
+                c.eval_13 = e13.perform()
                 # Vermittlung
                 e6 = Evaluation_6(self._getCompressedIds(reset))
                 c.eval_6 = e6.perform()

Modified: waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2008-09-25 10:36:38 UTC (rev 195)
+++ waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2008-09-25 10:44:40 UTC (rev 196)
@@ -198,13 +198,13 @@
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:44
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:73
 msgid "cm_eval_summary_header_4"
-msgstr "2.2. Alters- und Geschlechterstruktur in %"
+msgstr "2.1. Alters- und Geschlechterstruktur in %"
 
 #: waskaweb/lib/evaluation.py:285
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:45
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:140
 msgid "cm_eval_summary_header_5"
-msgstr "2.3. Migrationshintergrund"
+msgstr "2.2. Migrationshintergrund"
 
 #: waskaweb/lib/evaluation.py:335
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_1.mako:45
@@ -219,33 +219,33 @@
 #: waskaweb/lib/evaluation.py:431
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:16
 msgid "cm_eval_head_where_to_place_youngster"
-msgstr "3.1.1. Wohin wurden die Jugendlichen vermittlelt?"
+msgstr "3.2.1. Wohin wurden die Jugendlichen vermittlelt?"
 
 #: waskaweb/lib/evaluation.py:477
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:46
 msgid "cm_eval_header_law_changed_after_place"
-msgstr "3.1.2. Angaben zum Rechtskreis nach der Vermittlung"
+msgstr "3.2.2. Angaben zum Rechtskreis nach der Vermittlung"
 
 #: waskaweb/lib/evaluation.py:552
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:108
 msgid "cm_eval_header_on_age"
-msgstr "2.2.2. Angaben zur Altersverteilung"
+msgstr "2.1.2. Angaben zur Altersverteilung"
 
 #: waskaweb/lib/evaluation.py:617
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:46
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:170
 msgid "cm_eval_summary_header_6"
-msgstr "2.4. Förderbedarf"
+msgstr "2.3. Förderbedarf"
 
 #: waskaweb/lib/evaluation.py:686
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:14
 msgid "cm_eval_length_cm"
-msgstr "2.1.1. Verweildauer im CM"
+msgstr "3.1.1. Verweildauer im CM"
 
 #: waskaweb/lib/evaluation.py:734
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:44
 msgid "cm_eval_avg_length_cm"
-msgstr "2.1.2. Durchschnittliche Verweildauer in Wochen"
+msgstr "3.1.2. Durchschnittliche Verweildauer in Wochen"
 
 #: waskaweb/lib/evaluation.py:784
 msgid "cm_eval_header_graduation"
@@ -276,19 +276,19 @@
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:47
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:202
 msgid "cm_eval_summary_header_19"
-msgstr "2.5. Gemeldete Arbeitslose"
+msgstr "2.4. Gemeldete Arbeitslose"
 
 #: waskaweb/lib/evaluation.py:1107
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:48
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:238
 msgid "cm_eval_summary_header_20"
-msgstr "2.6. Angaben zu Nicht-Erwerbspersonen"
+msgstr "2.5. Angaben zu Nicht-Erwerbspersonen"
 
 #: waskaweb/lib/evaluation.py:1181
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:49
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:262
 msgid "cm_eval_summary_header_21"
-msgstr "2.7. ESF-Stammblatt"
+msgstr "2.6. ESF-Stammblatt"
 
 #: waskaweb/lib/evaluation.py:1239
 msgid "cm_eval_summary_header_23"
@@ -2150,7 +2150,7 @@
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:43
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:13
 msgid "cm_eval_summary_header_3"
-msgstr "2.1. Verweildauer im CM"
+msgstr "3.1. Verweildauer im CM"
 
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:51
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:10
@@ -2160,12 +2160,12 @@
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:53
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:15
 msgid "cm_eval_summary_header_7"
-msgstr "3.1. Vermittlung"
+msgstr "3.2. Vermittlung"
 
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:55
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:78
 msgid "cm_eval_summary_header_15"
-msgstr "3.2. Zeitaufwände"
+msgstr "3.3. Zeitaufwände"
 
 #: waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako:59
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_0.mako:10
@@ -2314,9 +2314,8 @@
 msgstr ""
 "Diese Auswertung wird nur über Jugendliche geführt, die in das Case-"
 "Management aufgenommen wurden. <strong>Ein Jugendlicher gilt als in das CM "
-"aufgenommen, wenn für den Jugendlichen ein Förderplan im Bereich der "
-"Förderplanung erstellt wurde und ein Bedarf zur Förderung eingetragen wurde</"
-"strong>."
+"aufgenommen, wenn für den Jugendlichen die Phase des Case-Management"
+"begonnen wurde.</strong>."
 
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:17
 msgid "cm_eval_table_month"
@@ -2392,9 +2391,7 @@
 msgstr ""
 "Diese Auswertung wird nur über die Jugendlichen geführt, die das Case-"
 "Management abgeschlossen haben. Das Case-Management gilt in der Auswertung "
-"als abgeschlossen, wenn im Bereich der Abschlußbewertung eine Angabe zum "
-"Punkt 'Art der Beendigung' gemacht wurde. Das CM wird sowohl bei regulären "
-"als auch bei Abbruch als abgeschlossen gewertet."
+"als abgeschlossen, wenn die Phase des Case-Management abgeschlossen wurde."
 
 #: waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako:19
 msgid "cm_eval_table_place"

Modified: waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako	2008-09-25 10:36:38 UTC (rev 195)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako	2008-09-25 10:44:40 UTC (rev 196)
@@ -40,7 +40,6 @@
 </ul>
 <h2>${_('eval_group_header_incm')}</h2>
 <ul>
-  <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_3">${_('cm_eval_summary_header_3')}</a></li>
   <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_4">${_('cm_eval_summary_header_4')}</a></li>
   <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_5">${_('cm_eval_summary_header_5')}</a></li>
   <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_6">${_('cm_eval_summary_header_6')}</a></li>
@@ -50,6 +49,7 @@
 </ul>
 <h2>${_('eval_group_header_finished')}</h2>
 <ul>
+  <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=3)}#eval_3">${_('cm_eval_summary_header_3')}</a></li>
   <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=3)}#eval_7">${_('cm_eval_summary_header_7')}</a></li>
   % if not c.isEvaluationServer: 
     <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=3)}#eval_effort">${_('cm_eval_summary_header_15')}</a></li>

Modified: waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako	2008-09-25 10:36:38 UTC (rev 195)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako	2008-09-25 10:44:40 UTC (rev 196)
@@ -9,66 +9,6 @@
 <%include file="/casemanagement/evaluation/evaluation_navigation.mako"/>
 <h1>${_('eval_group_header_incm')}</h1>
 <p>${_('eval_group_note_incm')}</p>
-<div class="evaluation odd-row first-row"> 
-<h3><a name="eval_3">${_('cm_eval_summary_header_3')}</a></h3>
-<h4>${_('cm_eval_length_cm')}</h4>
-<table class="evaluation">
-  <tr>
-    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_month')}</th>
-    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_completed')}</th>
-    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_early_completed')}</th>
-    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_aborted')}</th>
-  </tr>
-  <% idset = 0 %>
-  % for r in c.eval_10:
-   % if idset==0:
-   <tr>
-    <td>${r[0]}</td>
-    <td>${r[1]| F.NA, h} (${r[2]| F.NA, h}%)</td>
-    <td>${r[5]| F.NA, h} (${r[6]| F.NA, h}%)</td>
-    <td>${r[3]| F.NA, h} (${r[4]| F.NA, h}%)</td>
-  </tr>
-  <% idset = 1 %>
-  % else:
-   <tr>
-     <td class="table_row_v_12">${r[0]}</td>
-     <td class="table_row_v_12">${r[1]| F.NA, h} (${r[2]| F.NA, h}%)</td>
-     <td class="table_row_v_12">${r[5]| F.NA, h} (${r[6]| F.NA, h}%)</td>
-     <td class="table_row_v_12">${r[3]| F.NA, h} (${r[4]| F.NA, h}%)</td>
-   </tr>
-  <% idset = 0 %>
-  % endif
-  % endfor
-</table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_10/auswertung_2_1_1.csv">${_('cm_eval_table_export_analysis')}</a>
-<h4>${_('cm_eval_avg_length_cm')}</h4>
-<table class="evaluation">
-  <tr>
-    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_completed')}</th>
-    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_early_completed')}</th>
-    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_aborted')}</th>
-  </tr>
-  <% idset = 0 %>
-  % for r in [c.eval_13]:
-   % if idset==0:
-   <tr>
-    <td>${r[0]| F.NA, h}</td>
-    <td>${r[2]| F.NA, h}</td>
-    <td>${r[4]| F.NA, h}</td>
-  </tr>
-  <% idset = 1 %>
-  % else:
-   <tr>
-     <td class="table_row_v_12">${r[0]| F.NA, h}</td>
-     <td class="table_row_v_12">${r[2]| F.NA, h}</td>
-     <td class="table_row_v_12">${r[4]| F.NA, h}</td>
-   </tr>
-  <% idset = 0 %>
-  % endif
-  % endfor
-</table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_13/auswertung_2_1_2.csv">${_('cm_eval_table_export_analysis')}</a>
-</div>
 <div class="evaluation odd-row ">
 <h3><a name="eval_4">${_('cm_eval_summary_header_4')}</a></h3>
 <h4>${_('cm_eval_header_on_gender')} </h4>
@@ -104,7 +44,7 @@
     <td class="table_row_v_12 table_width_long">&nbsp;</td>
   </tr>
 </table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_2/auswertung_2_2_1.csv">${_('cm_eval_table_export_analysis')}</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_2/auswertung_2_1_1.csv">${_('cm_eval_table_export_analysis')}</a>
 <h4>${_('cm_eval_header_on_age')}</h4>
 <table class="evaluation">
   <tr>
@@ -134,7 +74,7 @@
   % endif
 % endfor
 </table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_8/auswertung_2_2_2.csv">${_('cm_eval_table_export_analysis')}</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_8/auswertung_2_1_2.csv">${_('cm_eval_table_export_analysis')}</a>
 </div>
 <div class="evaluation odd-row">
 <h3><a name="eval_5">${_('cm_eval_summary_header_5')| F.NA, h}</a>${h.getHelp('cm_eval_note_ka_migration_background')}</h3>
@@ -164,7 +104,7 @@
     <td class="table_width_mid_s"></td>
   </tr>
 </table>
-  <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_3/auswertung_2_3.csv">${_('cm_eval_table_export_analysis')}</a>
+  <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_3/auswertung_2_2.csv">${_('cm_eval_table_export_analysis')}</a>
 </div>
 <div class="evaluation even-row">
 <h3><a name="eval_6">${_('cm_eval_summary_header_6')}</a>${h.getHelp('eval_6_note')}</h3>
@@ -196,7 +136,7 @@
   % endif
 % endfor 
 </table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_9/auswertung_2_4.csv">${_('cm_eval_table_export_analysis')}</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_9/auswertung_2_3.csv">${_('cm_eval_table_export_analysis')}</a>
 </div>
 <div class="evaluation odd-row">
 <h3><a name="eval_19">${_('cm_eval_summary_header_19')}</a></h3>
@@ -232,7 +172,7 @@
     <td class="table_row_v_12"></td>
   </tr>
 </table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_19/auswertung_2_5.csv">${_('cm_eval_table_export_analysis')}</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_19/auswertung_2_4.csv">${_('cm_eval_table_export_analysis')}</a>
 </div>
 <div class="evaluation even-row">
 <h3><a name="eval_20">${_('cm_eval_summary_header_20')}</a>${h.getHelp('eval_20_note')}</h3>
@@ -256,10 +196,10 @@
     <td class="table_row_v_12"></td>
   </tr>
 </table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_20/auswertung_2_6.csv">${_('cm_eval_table_export_analysis')}</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_20/auswertung_2_5.csv">${_('cm_eval_table_export_analysis')}</a>
 </div>
-<div class="evaluation even-row">
+<div class="evaluation odd-row">
 <h3><a name="eval_21">${_('cm_eval_summary_header_21')}</a></h3>
   <%include file="/casemanagement/evaluation/evaluation_esfstammblatt.mako"/>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_21/auswertung_2_7.csv">${_('cm_eval_table_export_analysis')}</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_21/auswertung_2_6.csv">${_('cm_eval_table_export_analysis')}</a>
 </div>

Modified: waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako	2008-09-25 10:36:38 UTC (rev 195)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_3.mako	2008-09-25 10:44:40 UTC (rev 196)
@@ -11,7 +11,67 @@
 <p>
 ${_('eval_group_note_finished')}
 </p>
-<div class="evaluation odd-row first-row">
+<div class="evaluation odd-row first-row"> 
+<h3><a name="eval_3">${_('cm_eval_summary_header_3')}</a></h3>
+<h4>${_('cm_eval_length_cm')}</h4>
+<table class="evaluation">
+  <tr>
+    <th class="table_header_h table_width_mid_s">${_('cm_eval_table_month')}</th>
+    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_completed')}</th>
+    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_early_completed')}</th>
+    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_aborted')}</th>
+  </tr>
+  <% idset = 0 %>
+  % for r in c.eval_10:
+   % if idset==0:
+   <tr>
+    <td>${r[0]}</td>
+    <td>${r[1]| F.NA, h} (${r[2]| F.NA, h}%)</td>
+    <td>${r[5]| F.NA, h} (${r[6]| F.NA, h}%)</td>
+    <td>${r[3]| F.NA, h} (${r[4]| F.NA, h}%)</td>
+  </tr>
+  <% idset = 1 %>
+  % else:
+   <tr>
+     <td class="table_row_v_12">${r[0]}</td>
+     <td class="table_row_v_12">${r[1]| F.NA, h} (${r[2]| F.NA, h}%)</td>
+     <td class="table_row_v_12">${r[5]| F.NA, h} (${r[6]| F.NA, h}%)</td>
+     <td class="table_row_v_12">${r[3]| F.NA, h} (${r[4]| F.NA, h}%)</td>
+   </tr>
+  <% idset = 0 %>
+  % endif
+  % endfor
+</table>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_10/auswertung_3_1_1.csv">${_('cm_eval_table_export_analysis')}</a>
+<h4>${_('cm_eval_avg_length_cm')}</h4>
+<table class="evaluation">
+  <tr>
+    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_completed')}</th>
+    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_early_completed')}</th>
+    <th class="table_header_h table_width_mid_l">${_('cm_eval_table_aborted')}</th>
+  </tr>
+  <% idset = 0 %>
+  % for r in [c.eval_13]:
+   % if idset==0:
+   <tr>
+    <td>${r[0]| F.NA, h}</td>
+    <td>${r[2]| F.NA, h}</td>
+    <td>${r[4]| F.NA, h}</td>
+  </tr>
+  <% idset = 1 %>
+  % else:
+   <tr>
+     <td class="table_row_v_12">${r[0]| F.NA, h}</td>
+     <td class="table_row_v_12">${r[2]| F.NA, h}</td>
+     <td class="table_row_v_12">${r[4]| F.NA, h}</td>
+   </tr>
+  <% idset = 0 %>
+  % endif
+  % endfor
+</table>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_13/auswertung_3_1_2.csv">${_('cm_eval_table_export_analysis')}</a>
+</div>
+<div class="evaluation odd-row">
 <h3><a name="eval_7">${_('cm_eval_summary_header_7')}</a></h3>
 <h4>${_('cm_eval_head_where_to_place_youngster')}</h4>
 <table class="evaluation">
@@ -42,7 +102,7 @@
  % endif
 % endfor 
 </table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_6/auswertung_3_1_1.csv">${_('cm_eval_table_export_analysis')}</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_6/auswertung_3_2_1.csv">${_('cm_eval_table_export_analysis')}</a>
 <h4>${_('cm_eval_header_law_changed_after_place')}</h4>
 <table class="evaluation">
    <tr>
@@ -72,14 +132,14 @@
  % endif
 % endfor 
 </table>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_7/auswertung_3_1_2.csv">${_('cm_eval_table_export_analysis')}</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_7/auswertung_3_2_2.csv">${_('cm_eval_table_export_analysis')}</a>
 </div>
 <div class="evaluation odd-row">
 <h3><a name="eval_effort">${_('cm_eval_summary_header_15')}</a></h3>
-<h4>3.2.1. Aufschlüsselung der einzelnen Tätigkeiten von ${c.eval_effort['avg_all'][0]} Fällen</h4>
+<h4>3.3.1. Aufschlüsselung der einzelnen Tätigkeiten von ${c.eval_effort['avg_all'][0]} Fällen</h4>
 <%include file="/casemanagement/evaluation/evaluation_effort.mako"/>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_15/auswertung_3.2.1.csv">${_('cm_eval_table_export_analysis')}</a>
-<h4>3.2.2. Durchschnittliche Dauer bei ${c.eval_avg_effort['avg_all'][0]} Fällen</h4>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_15/auswertung_3_3_1.csv">${_('cm_eval_table_export_analysis')}</a>
+<h4>3.3.2. Durchschnittliche Dauer bei ${c.eval_avg_effort['avg_all'][0]} Fällen</h4>
 <%include file="/casemanagement/evaluation/evaluation_avg_effort.mako"/>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_17/auswertung_3.2.2.csv">${_('cm_eval_table_export_analysis')}</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_17/auswertung_3_3_2.csv">${_('cm_eval_table_export_analysis')}</a>
 </div>



More information about the Mpuls-commits mailing list