[Mpuls-commits] r151 - in waska/trunk: . waskaweb/controllers waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2008-09-12 12:03:47 +0200 (Fri, 12 Sep 2008)
New Revision: 151

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/controllers/case_overview.py
   waska/trunk/waskaweb/templates/casemanagement/selectParts.mako
Log:
Make export selection of documents and logbook optional.


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-09-12 09:13:58 UTC (rev 150)
+++ waska/trunk/ChangeLog.txt	2008-09-12 10:03:47 UTC (rev 151)
@@ -1,5 +1,14 @@
 2008-09-12  Sascha L. Teichmann <sascha.teichmann at intevation.de>
 
+	* waskaweb/templates/casemanagement/selectParts.mako: make selection
+	  of logbook and documents optional because CSV and Excel do not have
+	  the ability to export these.
+
+	* waskaweb/controllers/case_overview.py: XML is able to export logbook
+	  and documents.
+
+2008-09-12  Sascha L. Teichmann <sascha.teichmann at intevation.de>
+
 	* waskaweb/controllers/agency_overview.py
 	  waskaweb/controllers/case_overview.py: Added selection from session
 	  to call. TODO: Adjust GUI.

Modified: waska/trunk/waskaweb/controllers/case_overview.py
===================================================================
--- waska/trunk/waskaweb/controllers/case_overview.py	2008-09-12 09:13:58 UTC (rev 150)
+++ waska/trunk/waskaweb/controllers/case_overview.py	2008-09-12 10:03:47 UTC (rev 151)
@@ -741,6 +741,8 @@
         c.store_action       = h.url_for(action="storeSelectedXMLParts")
         c.back_url           = h.url_for(controller='/case_overview', action='exportXML', confirmed=1)
         c.back_title         = "XML Export"
+        c.selectLogbook      = True
+        c.selectDocuments    = True
         page = render('casemanagement/selectParts.mako')
         return formencode.htmlfill.render(unicode(page, 'utf-8'),defaults=selection_checker.selections)
 

Modified: waska/trunk/waskaweb/templates/casemanagement/selectParts.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/selectParts.mako	2008-09-12 09:13:58 UTC (rev 150)
+++ waska/trunk/waskaweb/templates/casemanagement/selectParts.mako	2008-09-12 10:03:47 UTC (rev 151)
@@ -118,12 +118,16 @@
         </ul>
     </li>
 </ul>
+% if c.selectLogbook:
 <h2>Falltagebuch</h2>
 <input type="checkbox" name="logbook" id="loogbook" value="1">
 <label for="logbook">Falltagebuch exportieren</label>
+% endif
+%if c.selectDocuments:
 <h2>Anlagen</h2>
 <input type="checkbox" name="documents" id="documents" value="1">
 <label for="documents">Anlagen des Falls exportieren</label>
+%endif
 <br>
 <input type="submit" value="Auswählen und zurück">
 <%doc>