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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-09-30 10:09:55 +0200 (Wed, 30 Sep 2009)
New Revision: 610

Modified:
   wasko/branches/1.0/ChangeLog.txt
   wasko/branches/1.0/waskaweb/templates/evaluation/evaluate.mako
Log:
Enhanced evaluation interface


Modified: wasko/branches/1.0/ChangeLog.txt
===================================================================
--- wasko/branches/1.0/ChangeLog.txt	2009-09-24 08:47:28 UTC (rev 609)
+++ wasko/branches/1.0/ChangeLog.txt	2009-09-30 08:09:55 UTC (rev 610)
@@ -1,3 +1,13 @@
+2009-09-30	Torsten Irlaender	<torsten.irlaender at intevation.de> 
+
+	Enhance evaluation interface
+
+	* templates/evaluation/evaluate.mako: As using search results as base
+	  for evaluations does not work yet. The evaluation interface was 
+	  enhanced to enabled users to set the start und end dates. This way
+	  the evaluation will work in the same way the Adele evalutions was
+	  performed for the ESF (no search before).
+
 2009-09-24	Torsten Irlaender	<torsten.irlaender at intevation.de> 
 
 	Fixed evaluations on db without rg

Modified: wasko/branches/1.0/waskaweb/templates/evaluation/evaluate.mako
===================================================================
--- wasko/branches/1.0/waskaweb/templates/evaluation/evaluate.mako	2009-09-24 08:47:28 UTC (rev 609)
+++ wasko/branches/1.0/waskaweb/templates/evaluation/evaluate.mako	2009-09-30 08:09:55 UTC (rev 610)
@@ -15,36 +15,51 @@
 <div>
 <form action="/evaluate/evaluateAction" method="POST">
 <input type="hidden" name="id">
-<input type="hidden" name="start_date_field">
-<input type="hidden" name="end_date_field">
 <input type="hidden" name="phase">
 <input type="hidden" name="sql">
 <h2>${_('Setup evaluation')}</h2>
 <table>
   <tr>
     <td class="label">${_('Name')}</td>
-    <td>${c.evalconfig.get_setname()}</td>
+    <td colspan="2">${c.evalconfig.get_setname()}</td>
   </tr>
   <tr>
     <td class="label">${_('Description')}</td>
-    <td>${c.evalconfig.get_setdesc()}</td>
+    <td colspan="2">${c.evalconfig.get_setdesc()}</td>
   </tr>
   <tr>
-    <td class="label">${_('Phase')}</td>
-    <td>${c.evaloptions.get('phase', '-2')}</td>
-  </tr>
   <tr>
-    <td class="label">${_('Interval')}</td>
-    <td>${_('Start datefield: "%s" | End datefield: "%s"') % (c.evaloptions.get('start_date_field'), c.evaloptions.get('end_date_field'))}</td>
+    <td class="label">Start</td>
+    <td>
+      <select name="start_date_field">
+        <option value="m.erstgespraech">Begin Eingansdokumentation</optioen>
+        <option value="coalesce(datum_cm_start, now())">Ende Eingansdokumentation</optioen>
+        <option value="datum_cm_start">Begin Casemenagement</option>
+        <option value="coalesce(datum_cm_ende, now())">Ende Casemanagement</option>
+        <option value="nbetr_start">Begin Nachbetreuung</option>
+        <option value="coalesce(nbetr_ende, now())">Ende Nachbetreuung</option>
+      </select>
+    </td>
+    <td>
+      <input type="text" name="start_date" class="datefield"><form:error name="start_date" format="">
+    </td>
   </tr>
   <tr>
-    <td class="label">${_('Start date')}</td>
-    <td><input type="text" name="start_date" class="datefield"><form:error name="start_date" format=""></td>
+    <td class="label">Ende</td>
+    <td>
+      <select name="end_date_field">
+        <option value="m.erstgespraech">Begin Eingansdokumentation</optioen>
+        <option value="coalesce(datum_cm_start, now())">Ende Eingansdokumentation</optioen>
+        <option value="datum_cm_start">Begin Casemenagement</option>
+        <option value="coalesce(datum_cm_ende, now())">Ende Casemanagement</option>
+        <option value="nbetr_start">Begin Nachbetreuung</option>
+        <option value="coalesce(nbetr_ende, now())">Ende Nachbetreuung</option>
+      </select>
+    </td>
+    <td>
+      <input type="text" name="end_date" class="datefield"><form:error name="end_date" format="">
+    </td>
   </tr>
-  <tr>
-    <td class="label">${_('End date')}</td>
-    <td><input type="text" name="end_date" class="datefield"><form:error name="end_date" format=""></td>
-  </tr>
   % if session.has_key('evaluation.options'):
   <tr>
     <td class="label">${_('Filter')}</td>