[Mpuls-commits] r188 - in waska/trunk: . formed waskaweb/templates/casemanagement/evaluation

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2008-09-23 11:42:42 +0200 (Tue, 23 Sep 2008)
New Revision: 188

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/formed/waska-hilfetexte.xhtml
   waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako
Log:
Added new helptexts on evaluation


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-09-23 09:24:10 UTC (rev 187)
+++ waska/trunk/ChangeLog.txt	2008-09-23 09:42:42 UTC (rev 188)
@@ -11,6 +11,11 @@
 	  Added two new evaluations on unemployment over kids in
 	  case-management.
 
+	Added helptext for one evaluation
+
+	* waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako,
+	  formed/waska-hilfetexte.xhtml: Added new helptexts
+
 2008-09-22	Torsten Irlaender  <torsten.irlaender at intevation.de>
 
 	Set Version number to 1.4.0 

Modified: waska/trunk/formed/waska-hilfetexte.xhtml
===================================================================
--- waska/trunk/formed/waska-hilfetexte.xhtml	2008-09-23 09:24:10 UTC (rev 187)
+++ waska/trunk/formed/waska-hilfetexte.xhtml	2008-09-23 09:42:42 UTC (rev 188)
@@ -567,6 +567,15 @@
       Unterstützungsangebote wird nicht berücksichtigt.
       </p>
     </div>
+    <div id="eval_20_note">
+      <h2>Angaben zu Nicht-Erwerbspersonen</h2>
+      <p>
+	Als Nicht-Erwerbspersonen gelten Personen, die weder arbeitslos noch
+	erwerbstätig sind. Eine schulische Ausbildung wird angenommen, wenn
+	sich der Jugendliche bei der Eingansanamnese noch in der Schule
+	befunden hat.
+      </p>
+    </div>
     <div id="cm_eval_note_taken_over_to_cm">
       <h2>Verhältnis Beratungskunden/Aufnahmen in das Case-Management (CM)</h2>
       <p>

Modified: waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako	2008-09-23 09:24:10 UTC (rev 187)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako	2008-09-23 09:42:42 UTC (rev 188)
@@ -235,7 +235,7 @@
 <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_19/auswertung_2_5.csv">${_('cm_eval_table_export_analysis')}</a>
 </div>
 <div class="evaluation even-row">
-<h3><a name="eval_20">${_('cm_eval_summary_header_20')}</a></h3>
+<h3><a name="eval_20">${_('cm_eval_summary_header_20')}</a>${h.getHelp('eval_20_note')}</h3>
 <table class="evaluation">
   <tr>
     <th class="table_header_h table_width_long">${_('cm_eval_table_category')}</th>
@@ -250,7 +250,7 @@
     <td></td>
   </tr>
   <tr>
-    <td class="table_row_v_12">&nbsp;&nbsp;davon in Ausbildung</td>
+    <td class="table_row_v_12">&nbsp;&nbsp;davon in schulischer Ausbildung</td>
     <td class="table_row_v_12 num">${c.eval_20['schule'][0]| F.NA, h}</td>
     <td class="table_row_v_12 num">(${c.eval_20['schule'][1]| F.NA, h}%)</td>
     <td class="table_row_v_12"></td>