[Mpuls-commits] r2784 - in waska/branches/1.7: . waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-05-27 17:20:12 +0200 (Thu, 27 May 2010)
New Revision: 2784

Modified:
   waska/branches/1.7/ChangeLog
   waska/branches/1.7/waskaweb/templates/casemanagement/phase.mako
Log:
waskaweb/model/casexml.py

Modified: waska/branches/1.7/ChangeLog
===================================================================
--- waska/branches/1.7/ChangeLog	2010-05-27 15:07:32 UTC (rev 2783)
+++ waska/branches/1.7/ChangeLog	2010-05-27 15:20:12 UTC (rev 2784)
@@ -1,5 +1,9 @@
 2010-03-18 Roland Geider <roland.geider at intevation.de>
 
+	* waskaweb/templates/casemanagement/phase.mako: Show a dialog if the CM phase was aborted
+
+2010-03-18 Roland Geider <roland.geider at intevation.de>
+
 	Add the rules for CM start and end date to the XML import/export functions
 
 	* waskaweb/model/casexml.py: waskaweb/lib/xmlimport.py

Modified: waska/branches/1.7/waskaweb/templates/casemanagement/phase.mako
===================================================================
--- waska/branches/1.7/waskaweb/templates/casemanagement/phase.mako	2010-05-27 15:07:32 UTC (rev 2783)
+++ waska/branches/1.7/waskaweb/templates/casemanagement/phase.mako	2010-05-27 15:20:12 UTC (rev 2784)
@@ -68,7 +68,9 @@
         % if is_allowed:
             % if (p2.isRecursiveComplete() and not p2.isRunning() and p2.isNeighbor(c.current_phase) and not c.current_phase.hasPredecessor(p2)) or not session.get('case').isYoungerThan('2008-09-01'):
                 <input type="submit" value="Ende" name="${p2.getLabel()|h}">
+                <% phase_disabled = False %>
             % else:
+                <% phase_disabled = True %>
                 <input type="submit" value="Ende" name="${p2.getLabel()|h}" 
                   disabled="disabled">
             % endif
@@ -79,6 +81,15 @@
   </table>
 </form>
 </div>
+
+
+% if phase_disabled:
+    <div class="form_errors">
+      <h1>Start der Nachbetreeung wurde deaktiviert</h1>
+        <p>Der Start der Nachbetreeung wurde deaktiviert, weil die Phase Nachbetreeung mit <em>Abbruch</em>
+        beendet wurde.</p>
+      </div>
+% endif
 ##
 ## DAUER DER PHASEN
 ##