[Mpuls-commits] r331 - in wasko/trunk: . waskaweb/lib waskaweb/templates/casemanagement
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Mar 5 09:49:32 CET 2009
Author: teichmann
Date: 2009-03-05 09:49:28 +0100 (Thu, 05 Mar 2009)
New Revision: 331
Modified:
wasko/trunk/ChangeLog.txt
wasko/trunk/waskaweb/lib/exportselection.py
wasko/trunk/waskaweb/lib/validators.py
wasko/trunk/waskaweb/templates/casemanagement/overview.mako
wasko/trunk/waskaweb/templates/casemanagement/selectParts.mako
Log:
Enable XML export. Not working yet.
Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt 2009-03-05 06:25:49 UTC (rev 330)
+++ wasko/trunk/ChangeLog.txt 2009-03-05 08:49:28 UTC (rev 331)
@@ -1,7 +1,19 @@
2009-03-05 Sascha L. Teichmann <teichmann at intevation.de>
+ * waskaweb/lib/validators.py: set validators for new fields.
+
+ * waskaweb/lib/exportselection.py: Evaluate selective export.
+
+ * waskaweb/templates/casemanagement/selectParts.mako: generated
+ a new list of items to select for export.
+
+ * waskaweb/templates/casemanagement/overview.mako: enable XML
+ export.
+
+2009-03-05 Sascha L. Teichmann <teichmann at intevation.de>
+
* waskaweb/lib/xmlexport.py, waskaweb/lib/exportselection.py:
- Some adjustments logbook & document struture.
+ Some adjustments logbook & document structure.
2009-03-04 Sascha L. Teichmann <teichmann at intevation.de>
Modified: wasko/trunk/waskaweb/lib/exportselection.py
===================================================================
--- wasko/trunk/waskaweb/lib/exportselection.py 2009-03-05 06:25:49 UTC (rev 330)
+++ wasko/trunk/waskaweb/lib/exportselection.py 2009-03-05 08:49:28 UTC (rev 331)
@@ -35,32 +35,32 @@
FORM_SECTION_RE = re.compile(r"^form_section_(\d+)$")
-#RG_UNTERSTUETZUNG = (
-# "angebote_bildenden_bereich",
-# "angebote_berufsvorbereitung",
-# "angebote_berufliche_qualifizierung",
-# "angebote_lebensbewaeltigung")
-#
-#RG_ALL = (
-# "kompetenzfestellung",
-# "angebote_bildenden_bereich",
-# "angebote_berufsvorbereitung",
-# "angebote_berufliche_qualifizierung",
-# "angebote_lebensbewaeltigung")
-#
+RG_UNTERSTUETZUNG = (
+ "angebote_bildenden_bereich",
+ "angebote_berufsvorbereitung",
+ "angebote_berufliche_qualifizierung",
+ "angebote_lebensbewaeltigung")
+RG_ALL = (
+ "kompetenzfestellung",
+ "angebote_bildenden_bereich",
+ "angebote_berufsvorbereitung",
+ "angebote_berufliche_qualifizierung",
+ "angebote_lebensbewaeltigung")
+
+
SECTION_MAP = {
-'form_section_ee': "ee", # Einwilligungserklärung
-'form_section_01': "page-0", # 1. Zuständigkeiten, Eingangsdaten
-'form_section_02': "page-1", # 2. Externe Ansprechpartner
-'form_section_03': "page-2", # 3.1 Persönliche Angaben
-'form_section_04': "page-3", # 3.2 Angaben zu der Mutter
-'form_section_05': "page-4", # 3.3 Angaben zu dem Vater
-'form_section_06': "page-5", # 3.4 Geschwister
-'form_section_07': "page-6", # 3.5 Familieneinkommen
-'form_section_08': "page-7", # 3.6 Bezugspersonen/soziales Umfeld
-'form_section_09': "page-8", # 3.7 Freie Dokumentation
-'form_section_10': "page-9", # 4.1 Angaben zur Schullaufbahn
+'form_section_ee': "ee", # Einwilligungserklärung
+'form_section_01': "page-0", # 1. Zuständigkeiten, Eingangsdaten
+'form_section_02': "page-1", # 2. Externe Ansprechpartner
+'form_section_03': "page-2", # 3.1 Persönliche Angaben
+'form_section_04': "page-3", # 3.2 Angaben zu der Mutter
+'form_section_05': "page-4", # 3.3 Angaben zu dem Vater
+'form_section_06': "page-5", # 3.4 Geschwister
+'form_section_07': "page-6", # 3.5 Familieneinkommen
+'form_section_08': "page-7", # 3.6 Bezugspersonen/soziales Umfeld
+'form_section_09': "page-8", # 3.7 Freie Dokumentation
+'form_section_10': "page-9", # 4.1 Angaben zur Schullaufbahn
'form_section_11': "page-10", # 4.2 Familiärer Hintergrund und Ressourcen
'form_section_12': "page-11", # 4.3 Unterstützungsleistungen im Vorfeld
'form_section_13': "page-12", # 4.4 Freie Dokumentation
@@ -100,27 +100,10 @@
# Remember to change the formular validator if you change this
# dictionary
#'appointments' : 1,
- self.selections = {
- 'documents' : 0, # keine Dokumente
- 'logbook' : 0, # kein Tagebuch
- 'form_section_0' : 1,
- 'form_section_1' : 1,
- 'form_section_2' : 1,
- 'form_section_3' : 1,
- 'form_section_4' : 1,
- 'form_section_5' : 1,
- 'form_section_6' : 1,
- 'form_section_7' : 1,
- 'form_section_8' : 1,
- 'form_section_9' : 1,
- 'form_section_10': 1,
- 'form_section_11': 1,
- 'form_section_12': 1,
- 'form_section_13': 1,
- 'form_section_14': 1,
- 'form_section_15': 1,
- 'form_section_16': 1,
- 'form_section_17': 1 }
+ selected_sections = dict([
+ ('form_section_%02d' % i, 1) for i in xrange(1, 28)])
+ self.selections['documents'] = 0
+ self.selections['logbook' ] = 0
def numItems(self):
return len(self.selections)
Modified: wasko/trunk/waskaweb/lib/validators.py
===================================================================
--- wasko/trunk/waskaweb/lib/validators.py 2009-03-05 06:25:49 UTC (rev 330)
+++ wasko/trunk/waskaweb/lib/validators.py 2009-03-05 08:49:28 UTC (rev 331)
@@ -234,28 +234,35 @@
login = None
class CasePartSelectionForm(BaseFormValidator):
- documents = formencode.validators.Int(if_missing=0)
+ documents = formencode.validators.Int(if_missing=0)
appointments = formencode.validators.Int(if_missing=1)
- logbook = formencode.validators.Int(if_missing=0)
- form_section_0 = formencode.validators.Int(if_missing=0)
- form_section_1 = formencode.validators.Int(if_missing=0)
- form_section_2 = formencode.validators.Int(if_missing=0)
- form_section_3 = formencode.validators.Int(if_missing=0)
- form_section_4 = formencode.validators.Int(if_missing=0)
- form_section_5 = formencode.validators.Int(if_missing=0)
- form_section_6 = formencode.validators.Int(if_missing=0)
- form_section_7 = formencode.validators.Int(if_missing=0)
- form_section_8 = formencode.validators.Int(if_missing=0)
- form_section_9 = formencode.validators.Int(if_missing=0)
- form_section_10 = formencode.validators.Int(if_missing=0)
- form_section_11 = formencode.validators.Int(if_missing=0)
- form_section_12 = formencode.validators.Int(if_missing=0)
- form_section_13 = formencode.validators.Int(if_missing=0)
- form_section_14 = formencode.validators.Int(if_missing=0)
- form_section_15 = formencode.validators.Int(if_missing=0)
- form_section_16 = formencode.validators.Int(if_missing=0)
- form_section_17 = formencode.validators.Int(if_missing=0)
+ logbook = formencode.validators.Int(if_missing=0)
+for i in xrange(1, 28):
+ setattr(
+ CasePartSelectionForm,
+ 'form_section_%02d' % i,
+ formencode.validators.Int(if_missing=0))
+
+# form_section_0 = formencode.validators.Int(if_missing=0)
+# form_section_1 = formencode.validators.Int(if_missing=0)
+# form_section_2 = formencode.validators.Int(if_missing=0)
+# form_section_3 = formencode.validators.Int(if_missing=0)
+# form_section_4 = formencode.validators.Int(if_missing=0)
+# form_section_5 = formencode.validators.Int(if_missing=0)
+# form_section_6 = formencode.validators.Int(if_missing=0)
+# form_section_7 = formencode.validators.Int(if_missing=0)
+# form_section_8 = formencode.validators.Int(if_missing=0)
+# form_section_9 = formencode.validators.Int(if_missing=0)
+# form_section_10 = formencode.validators.Int(if_missing=0)
+# form_section_11 = formencode.validators.Int(if_missing=0)
+# form_section_12 = formencode.validators.Int(if_missing=0)
+# form_section_13 = formencode.validators.Int(if_missing=0)
+# form_section_14 = formencode.validators.Int(if_missing=0)
+# form_section_15 = formencode.validators.Int(if_missing=0)
+# form_section_16 = formencode.validators.Int(if_missing=0)
+# form_section_17 = formencode.validators.Int(if_missing=0)
+
class NewCaseForm(BaseFormValidator):
name_1 = formencode.validators.String()
vorname_1 = formencode.validators.String()
Modified: wasko/trunk/waskaweb/templates/casemanagement/overview.mako
===================================================================
--- wasko/trunk/waskaweb/templates/casemanagement/overview.mako 2009-03-05 06:25:49 UTC (rev 330)
+++ wasko/trunk/waskaweb/templates/casemanagement/overview.mako 2009-03-05 08:49:28 UTC (rev 331)
@@ -38,7 +38,7 @@
% if h.hasRole(['admin_ka', 'cm_ka']):
<option value="stand-in">Vertretung zuweisen</option>
##<option value="exportXLS">Als Excel-Tabellen exportieren</option>
- ##<option value="exportXML">Als XML-Datei exportieren</option>
+ <option value="exportXML">Als XML-Datei exportieren</option>
##<option value="exportCSV">Als CSV-Datei exportieren</option>
##% if not c.hide_evaluation:
## <option value="evaluate">Auswerten</option>
Modified: wasko/trunk/waskaweb/templates/casemanagement/selectParts.mako
===================================================================
--- wasko/trunk/waskaweb/templates/casemanagement/selectParts.mako 2009-03-05 06:25:49 UTC (rev 330)
+++ wasko/trunk/waskaweb/templates/casemanagement/selectParts.mako 2009-03-05 08:49:28 UTC (rev 331)
@@ -25,98 +25,138 @@
<form action="${c.store_action}" accept-charset="UTF-8" method="POST">
<h2>Formulardaten</h2>
<ul>
- <li>
- <input type="checkbox" name="form_section_0" id="form_section_0" value="1">
- <label for="form_section_0">Zuständigkeiten, Eingangsdaten</label>
- </li>
- <li>
- <input type="checkbox" name="form_section_1" id="form_section_1" value="1">
- <label for="form_section_1">Externe Ansprechpartner</label>
- </li>
- <li><strong>Angaben zur Person</strong>
- <ul>
- <li>
- <input type="checkbox" name="form_section_2" id="form_section_2" value="1">
- <label for="form_section_2">Persönliche Angaben</label>
- </li>
- <li>
- <input type="checkbox" name="form_section_3" id="form_section_3" value="1">
- <label for="form_section_3">Familiäre Situation</label>
- </li>
- <li>
- <input type="checkbox" name="form_section_4" id="form_section_4" value="1">
- <label for="form_section_4">Gesundheitliche Situation</label>
- </li>
- <li>
- <input type="checkbox" name="form_section_5" id="form_section_5" value="1">
- <label for="form_section_5">Soziale Lage</label>
- </li>
- </ul>
- </li>
- <li><strong>Biographische Daten</strong>
- <ul>
- <li>
- <input type="checkbox" name="form_section_6" id="form_section_6" value="1">
- <label for="form_section_6">Schule</label>
- </li>
- <li>
- <input type="checkbox" name="form_section_7" id="form_section_7" value="1">
- <label for="form_section_7">Ausbildung und Arbeit</label>
- </li>
- <li>
- <input type="checkbox" name="form_section_8" id="form_section_8" value="1">
- <label for="form_section_8">Weiterer Verlauf</label>
- </li>
- </ul>
- </li>
- <li><strong>Case-Management</strong>
- <ul>
- <li>
- <input type="checkbox" name="form_section_9" id="form_section_9" value="1" >
- <label for="form_section_9" >Kompetenzfeststellung</label>
- </li>
- <li>
- <input type="checkbox" name="form_section_10" id="form_section_10" value="1">
- <label for="form_section_10">Förderplanung</label>
- </li>
- <li>
- <input type="checkbox" name="form_section_11" id="form_section_11" value="1">
- <label for="form_section_11">Unterstützungsangebote</label>
- </li>
- <li>
- <input type="checkbox" name="form_section_12" id="form_section_12" value="1">
- <label for="form_section_12">Freie Dokumentation</label>
- </li>
- </ul>
- </li>
- <li><strong>Abschlussbewertung</strong>
- <ul>
- <li>
- <input type="checkbox" name="form_section_13" id="form_section_13" value="1">
- <label for="form_section_13">Angaben zum Verlauf und Beendigung des CM</label>
- </li>
- <li><strong>Erreichte Ziele</strong>
- <ul>
- <li>
- <input type="checkbox" name="form_section_14" id="form_section_14" value="1">
- <label for="form_section_14">Berufliche Integration</label>
- </li>
- <li>
- <input type="checkbox" name="form_section_15" id="form_section_15" value="1">
- <label for="form_section_15">Soziale Integration</label>
- </li>
- <li>
- <input type="checkbox" name="form_section_16" id="form_section_16" value="1">
- <label for="form_section_16">Einschätzung des Case-Managers</label>
- </li>
- </ul>
- </li>
- <li>
- <input type="checkbox" id="form_section_17" name="form_section_17" value="1">
- <label for="form_section_17">Freie Dokumentation</label>
- </li>
- </ul>
- </li>
+<li>
+<input type="checkbox" name="form_section_ee" id="form_section_ee" value="1">
+<label for="form_section_ee">Einwilligungserklärung</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_01" id="form_section_01" value="1">
+<label for="form_section_01">1. Zuständigkeiten, Eingangsdaten</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_02" id="form_section_02" value="1">
+<label for="form_section_02">2. Externe Ansprechpartner</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_03" id="form_section_03" value="1">
+<label for="form_section_03">3.1 Persönliche Angaben</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_04" id="form_section_04" value="1">
+<label for="form_section_04">3.2 Angaben zu der Mutter</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_05" id="form_section_05" value="1">
+<label for="form_section_05">3.3 Angaben zu dem Vater</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_06" id="form_section_06" value="1">
+<label for="form_section_06">3.4 Geschwister</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_07" id="form_section_07" value="1">
+<label for="form_section_07">3.5 Familieneinkommen</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_08" id="form_section_08" value="1">
+<label for="form_section_08">3.6 Bezugspersonen/soziales Umfeld</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_09" id="form_section_09" value="1">
+<label for="form_section_09">3.7 Freie Dokumentation</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_10" id="form_section_10" value="1">
+<label for="form_section_10">4.1 Angaben zur Schullaufbahn</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_11" id="form_section_11" value="1">
+<label for="form_section_11">4.2 Familiärer Hintergrund und Ressourcen</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_12" id="form_section_12" value="1">
+<label for="form_section_12">4.3 Unterstützungsleistungen im Vorfeld</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_13" id="form_section_13" value="1">
+<label for="form_section_13">4.4 Freie Dokumentation</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_14" id="form_section_14" value="1">
+<label for="form_section_14">5.1.1 Verfahren der Kompetenzfeststellung</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_15" id="form_section_15" value="1">
+<label for="form_section_15">5.1.2 Ergebnisse der Kompetenzfeststellung</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_16" id="form_section_16" value="1">
+<label for="form_section_16">5.1.3 Entwicklung des jungen Menschen</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_17" id="form_section_17" value="1">
+<label for="form_section_17">5.2.1 Reintegrations-Vorraussetzungen</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_18" id="form_section_18" value="1">
+<label for="form_section_18">5.2.1.5 Erfassung von Fehlzeiten</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_19" id="form_section_19" value="1">
+<label for="form_section_19">5.2.2 Probleme</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_20" id="form_section_20" value="1">
+<label for="form_section_20">5.2.3 Zielsetzung des Case Management</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_21" id="form_section_21" value="1">
+<label for="form_section_21">Unterstützungsmaßnahme 1</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_22" id="form_section_22" value="1">
+<label for="form_section_22">Unterstützungsmaßnahme 2</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_23" id="form_section_23" value="1">
+<label for="form_section_23">Unterstützungsmaßnahme 3</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_24" id="form_section_24" value="1">
+<label for="form_section_24">Weitere Unterstützungsmaßnahmen</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_25" id="form_section_25" value="1">
+<label for="form_section_25">5.3.2 Vereinbarungen</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_26" id="form_section_26" value="1">
+<label for="form_section_26">5.3.3 Elternarbeit</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_27" id="form_section_27" value="1">
+<label for="form_section_27">5.4 Freie Dokumentation</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_28" id="form_section_28" value="1">
+<label for="form_section_28">6.1.1 Verlauf des Case Management</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_29" id="form_section_29" value="1">
+<label for="form_section_29">6.1.2 Beendigung des Case Management</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_30" id="form_section_30" value="1">
+<label for="form_section_30">6.2 Erreichte Ziele</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_31" id="form_section_31" value="1">
+<label for="form_section_31">6.3 Nachbetreuung</label>
+</li>
+<li>
+<input type="checkbox" name="form_section_32" id="form_section_32" value="1">
+<label for="form_section_32">6.4 Freie Dokumentation zur Abschlussbewertung</label>
+</li>
</ul>
% if c.selectLogbook:
<h2>Falltagebuch</h2>
More information about the Mpuls-commits
mailing list