[Mpuls-commits] r616 - in wasko/branches/1.0: . waskaweb/templates/evaluation waskaweb/templates/logbook

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-10-05 09:33:27 +0200 (Mon, 05 Oct 2009)
New Revision: 616

Added:
   wasko/branches/1.0/waskaweb/templates/evaluation/logbook.mako
Modified:
   wasko/branches/1.0/ChangeLog.txt
   wasko/branches/1.0/waskaweb/templates/logbook/overview.mako
Log:
Fixed logbook evaluation


Modified: wasko/branches/1.0/ChangeLog.txt
===================================================================
--- wasko/branches/1.0/ChangeLog.txt	2009-10-02 13:45:12 UTC (rev 615)
+++ wasko/branches/1.0/ChangeLog.txt	2009-10-05 07:33:27 UTC (rev 616)
@@ -1,3 +1,12 @@
+2009-10-05	Torsten Irlaender	<torsten.irlaender at intevation.de> 
+
+	Fixed logbuch evalauation
+
+	* waskaweb/templates/logbook/overview.mako,
+	  waskaweb/templates/evaluation/logbook.mako: Evaluation of a single
+	  logbook was broken as the whole evaluation thing has changed. Added
+	  new template for logbook evaluations.
+
 2009-10-02	Torsten Irlaender	<torsten.irlaender at intevation.de> 
 
 	Issue438

Added: wasko/branches/1.0/waskaweb/templates/evaluation/logbook.mako
===================================================================
--- wasko/branches/1.0/waskaweb/templates/evaluation/logbook.mako	2009-10-02 13:45:12 UTC (rev 615)
+++ wasko/branches/1.0/waskaweb/templates/evaluation/logbook.mako	2009-10-05 07:33:27 UTC (rev 616)
@@ -0,0 +1,84 @@
+## -*- coding: utf-8 -*-
+<table class="evaluation">
+  <tr>
+    <th class="table_header_h ">Aktivität</th>
+    <th class="table_header_h table_width_mid_s num">Anzahl</th>
+    <th class="table_header_h table_width_mid_s num">Aufwand (Minuten)</th>
+  </tr>
+  ## Unmittelbare Arbeit mit dem Jugendlichen
+  <tr>
+    <td><b>unmittelbare Arbeit mit dem Jugendlichen:</b></td><td class="num"><b>${c.eval_effort['sum_cat1'][0]}</b></td><td class="num"><b>${c.eval_effort['sum_cat1'][1]}</b></td>
+  </tr>
+  <tr>
+    <td style="padding-left:1em;">Gespräch mit dem/der Jugendlichen</td><td class="num">${c.eval_effort['1'][0]}</td><td class="num">${c.eval_effort['1'][1]}</td>
+  </tr>
+  <tr>
+    <td style="padding-left:1em;">Kompetenzfeststellung</td><td class="num">${c.eval_effort['2'][0]}</td><td class="num">${c.eval_effort['2'][1]}</td>
+  </tr>
+  <tr>
+    <td style="padding-left:1em;">Korrespondenz mit dem/der Jugendlichen (Telefonate/Schriftverkehr)</td><td class="num">${c.eval_effort['3'][0]}</td><td class="num">${c.eval_effort['3'][1]}</td>
+  </tr>
+  <tr>
+    <td style="padding-left:1em;">Begleitung des/der Jugendlichen zu externen Stellen</td><td class="num">${c.eval_effort['4'][0]}</td><td class="num">${c.eval_effort['4'][1]}</td>
+  </tr>
+  <tr>
+    <td style="padding-left:1em;">Sonstige Betreuung des Jugendlichen</td><td class="num">${c.eval_effort['5'][0]}</td><td class="num">${c.eval_effort['5'][1]}</td>
+  </tr>
+  <tr class="table_row_v_12">
+    <td><b>Arbeit mit Eltern/Personensorgeberechtigte:</b></td><td class="num"><b>${c.eval_effort['sum_cat2'][0]}</b></td><td class="num"><b>${c.eval_effort['sum_cat2'][1]}</b></td>
+  </tr>
+  <tr class="table_row_v_12">
+    <td style="padding-left:1em;">Gespräch mit Eltern/Personensorgeberechtigten</td><td class="num">${c.eval_effort['6'][0]}</td><td class="num">${c.eval_effort['6'][1]}</td>
+  </tr>
+  <tr class="table_row_v_12">
+    <td style="padding-left:1em;">Korrespondenz mit Eltern/Personensorgeberechtigten (Telefonat/Schriftverkehr)</td><td class="num">${c.eval_effort['7'][0]}</td><td class="num">${c.eval_effort['7'][1]}</td>
+  </tr>
+  <tr class="table_row_v_12">
+    <td style="padding-left:1em;">Sonstige Maßnahmen der Elternarbeit</td><td class="num">${c.eval_effort['8'][0]}</td><td class="num">${c.eval_effort['8'][1]}</td>
+  </tr>
+  <tr>
+    <td><b>Arbeit mit Dritten:</b></td><td class="num"><b>${c.eval_effort['sum_cat3'][0]}</b></td><td class="num"><b>${c.eval_effort['sum_cat3'][1]}</b></td>
+  </tr>
+  <tr>
+    <td style="padding-left:1em;">Gespräch mit schulischen Mitarbeiter/-innen</td><td class="num">${c.eval_effort['9'][0]}</td><td class="num">${c.eval_effort['9'][1]}</td>
+  </tr>
+  <tr>
+    <td style="padding-left:1em;">Korrespondenz mit Schule (Telefonat/Schriftverkehr)</td><td class="num">${c.eval_effort['10'][0]}</td><td class="num">${c.eval_effort['10'][1]}</td>
+  </tr>
+  <tr>
+    <td style="padding-left:1em;">Gespräch mit Mitarbeiter/-innen der Jugendhilfe</td><td class="num">${c.eval_effort['18'][0]}</td><td class="num">${c.eval_effort['18'][1]}</td>
+  </tr>
+  <tr>
+    <td style="padding-left:1em;">Korrespondenz mit Jugendhilfe (Telefonat/Schriftverkehr)</td><td class="num">${c.eval_effort['11'][0]}</td><td class="num">${c.eval_effort['11'][1]}</td>
+  </tr>
+  <tr>
+    <td style="padding-left:1em;">Gespräch mit beteiligten Dritten/Kooperationspartnern</td><td class="num">${c.eval_effort['12'][0]}</td><td class="num">${c.eval_effort['12'][1]}</td>
+  </tr>
+  <tr>
+    <td style="padding-left:1em;">Korrespondenz mit beteiligten Dritten/Kooperationspartnern (Telefonat/Schriftverkehr)</td><td class="num">${c.eval_effort['13'][0]}</td><td class="num">${c.eval_effort['13'][1]}</td>
+  </tr>
+  <tr>
+    <td style="padding-left:1em;">Förder- und Fallkonferenz</td><td class="num">${c.eval_effort['14'][0]}</td><td class="num">${c.eval_effort['14'][1]}</td>
+  </tr>
+  <tr class="table_row_v_12">
+    <td><b>Sonstiges:</b></td><td class="num"><b>${c.eval_effort['sum_cat4'][0]}</b></td><td class="num"><b>${c.eval_effort['sum_cat4'][1]}</b></td>
+  </tr>
+  <tr class="table_row_v_12">
+    <td style="padding-left:1em;">Fahrtwege</td><td class="num">${c.eval_effort['15'][0]}</td><td class="num">${c.eval_effort['15'][1]}</td>
+  </tr>
+  <tr class="table_row_v_12">
+    <td style="padding-left:1em;">Dokumentation WASKO</td><td class="num">${c.eval_effort['16'][0]}</td><td class="num">${c.eval_effort['16'][1]}</td>
+  </tr>
+  <tr class="table_row_v_12">
+    <td style="padding-left:1em;">Teambesprechung</td><td class="num">${c.eval_effort['17'][0]}</td><td class="num">${c.eval_effort['17'][1]}</td>
+  </tr>
+  <tr class="table_row_v_12">
+    <td style="padding-left:1em;">Sonstige Angaben</td><td class="num">${c.eval_effort['-2'][0]}</td><td class="num">${c.eval_effort['-2'][1]}</td>
+  </tr>
+  <tr>
+    <td><b>Keine Angabe:</b></td><td class="num"><b>${c.eval_effort['sum_cat5'][0]}</b></td><td class="num"><b>${c.eval_effort['sum_cat5'][1]}</b></td>
+  </tr>
+  <tr class="table_row_v_12">
+    <td><b>GESAMT</b></td><td class="num"><b>${c.eval_effort['sum_all'][0]}</b></td><td class="num"><b>${c.eval_effort['sum_all'][1]}</b></td>
+  </tr>
+</table>

Modified: wasko/branches/1.0/waskaweb/templates/logbook/overview.mako
===================================================================
--- wasko/branches/1.0/waskaweb/templates/logbook/overview.mako	2009-10-02 13:45:12 UTC (rev 615)
+++ wasko/branches/1.0/waskaweb/templates/logbook/overview.mako	2009-10-05 07:33:27 UTC (rev 616)
@@ -70,4 +70,4 @@
 % endif
 </table>
 <h3>Auswertung</h3>
-<%include file="/casemanagement/evaluation/evaluation_effort.mako"/>
+<%include file="/evaluation/logbook.mako"/>