[Mpuls-commits] r250 - in wasko/trunk: . formed waskaweb/controllers waskaweb/i18n/de/LC_MESSAGES waskaweb/lib waskaweb/model waskaweb/templates waskaweb/templates/casemanagement waskaweb/templates/casemanagement/evaluation
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Feb 9 14:33:56 CET 2009
Author: torsten
Date: 2009-02-09 14:33:54 +0100 (Mon, 09 Feb 2009)
New Revision: 250
Added:
wasko/trunk/waskaweb/lib/adelexml.py
wasko/trunk/waskaweb/lib/evaluation_new.py
wasko/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako
Modified:
wasko/trunk/ChangeLog.txt
wasko/trunk/Changes.txt
wasko/trunk/formed/formedtree_web.xml
wasko/trunk/waskaweb/controllers/administration.py
wasko/trunk/waskaweb/controllers/evaluate.py
wasko/trunk/waskaweb/controllers/waska.py
wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
wasko/trunk/waskaweb/lib/evaluation.py
wasko/trunk/waskaweb/lib/helpers.py
wasko/trunk/waskaweb/lib/search.py
wasko/trunk/waskaweb/model/navigation.py
wasko/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_avg_effort.mako
wasko/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako
wasko/trunk/waskaweb/templates/casemanagement/search.mako
wasko/trunk/waskaweb/templates/main.mako
Log:
Merged with version 1.5.0
Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/ChangeLog.txt 2009-02-09 13:33:54 UTC (rev 250)
@@ -1,3 +1,76 @@
+2009-02-09 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Merged changes from Version 1.5.0
+
+2009-02-05 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Removed some evalautions as they are not relevant yet.
+
+ * waskaweb/lib/adelexml.py: removed some evaluations
+
+2009-02-05 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Fixed issue 708:
+
+ * templates/casemanagement/search.mako: Changed description in
+ selectfield to "Eingangsanamnese"
+
+ Fixed issue 639:
+
+ * waskaweb/model/navigation.py: Fixed Next-Key in the navigation.
+
+ Set version string to 1.5.0
+
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: Modfied version string
+
+ Fixed Issue 662:
+
+ * waskaweb/controllers/administration.py: Changed ordering of first
+ and lastname
+
+ Completed adele evaluation
+
+ * waskaweb/controllers/evaluate.py: Fixed timeframe
+ * waskaweb/lib/adelexml.py: Added descritpions and headers
+ * waskaweb/lib/evaluation.py: Fixed generation of where clauses
+ * waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako,
+ waskaweb/templates/main.mako: Renamed "quartalsbericht" to
+ Zwischenbericht.
+
+ Fixed issue 722
+
+ * waskaweb/lib/search.py: Chaged definition of the timeframe in search
+ strings.
+
+ Fixed issue 726
+
+ * waskaweb/controllers/evaluate.py,
+ waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:
+ Removed again old version of WASKA-Stammblatt evaluation
+
+ Small typo changes:
+
+ * i18n/de/LC_MESSAGES/waskaweb.po,
+ templates/casemanagement/evaluation/evaluation_avg_effort.mako:
+ Fixed numbering in evaluation headers
+
+2009-02-04 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Added new evalution adele stammblatt.
+
+ * waskaweb/controllers/evaluate.py,
+ waskaweb/lib/adelexml.py,
+ waskaweb/lib/helpers.py,
+ waskaweb/lib/evaluation_new.py,
+ waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako,
+ waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako,
+ waskaweb/templates/main.mako: The evaluations is hardcoded and is
+ based on the new mpuls implementation. So do not extect a well
+ integrated evulation.
+
+
2009-01-09 Torsten Irlaender <torsten.irlaender at intevation.de>
Added new favicon
Modified: wasko/trunk/Changes.txt
===================================================================
--- wasko/trunk/Changes.txt 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/Changes.txt 2009-02-09 13:33:54 UTC (rev 250)
@@ -1,3 +1,30 @@
+1.5.0:
+ Neu:
+
+ * Neben den bereits verfügbaren Auswertungen wurde eine weitere
+ Auswertung hinzugefügt, die die für den Zwischenbericht benötigten
+ Zahlen bereitstellt. Diese Auswertung ist identisch mit den
+ Auswertungen, die auf dem zentralen Auswerteserver über die
+ anonymisierten Fallakten durchgeführt werden.
+
+ Verbessert:
+
+ * Issue708: In der Suche wurde die Bezeichnung "Clearing" gegen den
+ gebräuchlicheren Begriff der "Eingangsanamnese" ausgetauscht.
+
+ * Issue639: Das Navigieren durch die Fallakte über die Funktion
+ "Speichern und weiter" funktioniert nun wie gewünscht. Es werden
+ keine Seiten mehr doppelt aufgerufen.
+
+ * Issue662: Im Bestätigungsdialog bei dem zurücksetzen des
+ Benutzerpasswort (Adminfunktion) wird der Name des Benutzers nun
+ konsistent in der Form "Nachname, Vorname" angezeigt.
+
+ * Issue722: Ein Fehler in der Suche bei der Eingabe von Zeiträumen
+ führte dazu das auch Fallakten in angezeigt wurden die eigentlich
+ nicht in dem Zeitraum liegen. Dies betraf vor allem Akten, die
+ nachträglich bearbeitet wurden.
+
1.4.2:
Neu:
Modified: wasko/trunk/formed/formedtree_web.xml
===================================================================
--- wasko/trunk/formed/formedtree_web.xml 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/formed/formedtree_web.xml 2009-02-09 13:33:54 UTC (rev 250)
@@ -3,8 +3,8 @@
<page containers="a,b" description="Zustand der Akte" name="page_einverstaendnis">
<bool description="Einverständniserklärung liegt vor" formularname="Optionsfeldliste" name="einverstaendniserklaerung" target="a"/>
<choice description="Phase im Case-Management" name="phase" size="1" target="b">
- <bool checked="1" description="Keine Angabe" name="keineangabe" value="-1"/>
- <bool description="Klärung läuft" name="klaerung_start" value="0"/>
+ <bool description="Keine Angabe" name="keineangabe" value="-1"/>
+ <bool checked="1" description="Klärung läuft" name="klaerung_start" value="0"/>
<bool description="Klärung beendet" name="klaerung_ende" value="1"/>
<bool description="Case-Management läuft" name="cm_start" value="2"/>
<bool description="Case-Management beendet" name="cm_ende" value="3"/>
@@ -19,7 +19,7 @@
<group containers="a,b,c,d,e,f,g,h,i" description="Zuständigkeiten, Eingangsdaten" invisible="1" name="zustaendigkeiteneingangsdaten" target="b">
<text description="Förderkennzeichen der Kompetenzagentur" formularname="FKZ" function="suppress_value2" maxlength="60" name="fkz" size="50" target="a"/>
<text description="Name der Kompetenzagentur" formularname="Name_Kompetenzagentur" function="suppress_value2" maxlength="60" name="name_kompetenzagentur" size="50" target="b"/>
- <group description="Name des zuständigen Mitarbeiters in der Kompetenzagentur" name="namedeszustaendigenmitarbeitersinderkompetenzagentur" target="c">
+ <group description="Name des/der zuständigen Mitarbeiter/in in der Kompetenzagentur" name="namedeszustaendigenmitarbeitersinderkompetenzagentur" target="c">
<text description="Vorname" formularname="Vorname" function="suppress_value" maxlength="60" name="vorname" size="50"/>
<text description="Name" formularname="Name" function="hash_value:vorname" maxlength="255" name="name" size="40"/>
</group>
Modified: wasko/trunk/waskaweb/controllers/administration.py
===================================================================
--- wasko/trunk/waskaweb/controllers/administration.py 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/waskaweb/controllers/administration.py 2009-02-09 13:33:54 UTC (rev 250)
@@ -209,7 +209,7 @@
else:
c.context = "../main.mako"
c.confirm_for = RESET_PASSWORD_CONFIRM
- c.question = "%s %s, %s" % (RESET_PASSWORD_CONFIRM_QUESTION, c.uo.first_name, c.uo.last_name)
+ c.question = "%s %s, %s" % (RESET_PASSWORD_CONFIRM_QUESTION, c.uo.last_name, c.uo.first_name)
c.url_yes = "/administration/resetUserPassword/%s/1" % id
c.url_no = "/administration/showUser/%s" % id
Modified: wasko/trunk/waskaweb/controllers/evaluate.py
===================================================================
--- wasko/trunk/waskaweb/controllers/evaluate.py 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/waskaweb/controllers/evaluate.py 2009-02-09 13:33:54 UTC (rev 250)
@@ -35,6 +35,9 @@
from waskaweb.lib.sql_helper import range_compress
from waskaweb.lib.base import *
from waskaweb.lib.evaluation import *
+from waskaweb.lib.evaluation_new import Evaluation as NewEvaluation, EvaluationExportXML
+from waskaweb.lib.adelexml import AdeleXML
+from waskaweb.lib.evaluation_new import *
from waskaweb.lib.search import CaseSearch
from waskaweb.lib.validators import SearchCaseForm
from waskaweb.controllers.case_overview import parseSearchOptions
@@ -131,6 +134,15 @@
rc = range_compress(ids)
return rc
+ def evaluateAdele(self):
+ params = {}
+ params['start_date'] = '2008-09-01'
+ params['end_date'] = '2008-12-31'
+ params['agencyid'] = 'inte0002'
+ evaluation = AdeleXML(params)
+ c.eval = evaluation.perform()
+ return render('casemanagement/evaluation/evaluation_adele.mako')
+
@checkRole(('admin_ka', 'cm_ka', 'pt_dlr', 'pb_ka'))
def evaluate(self, id, reset=0):
reset = self._checkBool(reset)
@@ -198,8 +210,8 @@
e20 = Evaluation_20(self._getCompressedIds(reset))
c.eval_20 = e20.perform()
# ESF-Stammblatt
- # e21 = Evaluation_21(self._getCompressedIds(reset))
- # c.eval_21 = e21.perform()
+ #e21 = Evaluation_21(self._getCompressedIds(reset))
+ #c.eval_21 = e21.perform()
page = render('casemanagement/evaluation/evaluation_result_2.mako')
elif id == '3':
# Verweildauer CM
Modified: wasko/trunk/waskaweb/controllers/waska.py
===================================================================
--- wasko/trunk/waskaweb/controllers/waska.py 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/waskaweb/controllers/waska.py 2009-02-09 13:33:54 UTC (rev 250)
@@ -104,6 +104,7 @@
# LOAD NEWS
c.news = NewsList(user)
+ #c.news = []
return render('/start/start.mako')
def markNewsAsRead(self, id, confirmed=0):
Modified: wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2009-02-09 13:33:54 UTC (rev 250)
@@ -552,7 +552,7 @@
#: waskaweb/templates/main.mako:197
msgid "footer_version"
-msgstr "05.01.2009 | Version 1.4.2"
+msgstr "05.02.2009 | Version 1.5.0"
#: waskaweb/templates/main_login.mako:38
msgid "main_login_bmf_phrase"
@@ -2314,8 +2314,8 @@
msgstr ""
"Diese Auswertung wird nur über Jugendliche geführt, die in das Case-"
"Management aufgenommen wurden. <strong>Ein Jugendlicher gilt als in das CM "
-"aufgenommen, wenn für den Jugendlichen die Phase des Case-Management"
-"begonnen wurde.</strong>."
+"aufgenommen, wenn für den Jugendlichen die Phase des Case-Management "
+"begonnen wurde.</strong>"
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:17
msgid "cm_eval_table_month"
@@ -2338,7 +2338,7 @@
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:74
msgid "cm_eval_header_on_gender"
-msgstr "2.2.1. Angaben zur Geschlechtsstruktur"
+msgstr "2.1.1. Angaben zur Geschlechtsstruktur"
#: waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:77
msgid "cm_eval_table_gender"
Copied: wasko/trunk/waskaweb/lib/adelexml.py (from rev 249, waska/trunk/waskaweb/lib/adelexml.py)
Modified: wasko/trunk/waskaweb/lib/evaluation.py
===================================================================
--- wasko/trunk/waskaweb/lib/evaluation.py 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/waskaweb/lib/evaluation.py 2009-02-09 13:33:54 UTC (rev 250)
@@ -52,7 +52,7 @@
try:
conn = db.getConnection()
c1 = conn.cursor()
-
+
# All cases (including invalid)
c1.execute("""SELECT count(id) from master_tbl_eval_total_view m""")
self.allcases = c1.fetchone()[0]
@@ -117,19 +117,22 @@
interval_end_date = options.get('interval_end_date', d.strftime('%Y-%m-%d'))
fields = {'start_field': interval_start_field, 'start_date': interval_start_date, 'end_field': interval_end_field, 'end_date': interval_end_date}
if interval_start_date != '1970-01-01':
- time_interval = "(coalesce(%(start_field)s, '1970-01-01'::date) <= '%(end_date)s'::date AND \
- coalesce(%(start_field)s, '1970-01-01'::date) <= coalesce(%(end_field)s, st.zugriff) AND \
- ((m.id in (SELECT id from master_tbl_incm_view) AND \
- (coalesce(%(end_field)s, now()) >= '%(start_date)s'::date)) OR \
- (st.zugriff >= '%(start_date)s'::date)))" % fields
+ time_interval = "(coalesce(%(start_field)s, '1970-01-01'::date) <= '%(end_date)s'::date \
+ AND (coalesce(%(end_field)s, now()) >= '%(start_date)s'::date))" % fields
+ #time_interval = "(coalesce(%(start_field)s, '1970-01-01'::date) <= '%(end_date)s'::date AND \
+ #coalesce(%(start_field)s, '1970-01-01'::date) <= coalesce(%(end_field)s, st.zugriff) AND \
+ #((m.id in (SELECT id from master_tbl_incm_view) AND \
+ #(coalesce(%(end_field)s, now()) >= '%(start_date)s'::date)) OR \
+ #(st.zugriff >= '%(start_date)s'::date)))" % fields
+
# Indicator for inconsistent cases (only for evaluation server)
if c.isEvaluationServer and time_interval != 'TRUE':
valid_data = "freie_dokumentation_abschlussbewertung IS NULL"
else:
valid_data = "TRUE"
- where = "AND ".join([fkz, '%s ' % gender, '%s ' % phases, '%s ' % time_interval, '%s ' % valid_data])
+ where = " AND ".join([fkz, '%s ' % gender, '%s ' % phases, '%s ' % time_interval, '%s ' % valid_data])
return where
def perform(self):
Copied: wasko/trunk/waskaweb/lib/evaluation_new.py (from rev 249, waska/trunk/waskaweb/lib/evaluation_new.py)
Modified: wasko/trunk/waskaweb/lib/helpers.py
===================================================================
--- wasko/trunk/waskaweb/lib/helpers.py 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/waskaweb/lib/helpers.py 2009-02-09 13:33:54 UTC (rev 250)
@@ -32,12 +32,20 @@
import re
from pylons import c, cache, config, g, request, response, session
from webhelpers import *
+from waskaweb.lib.adelexml import EVAL_NAMES, EVAL_DESCRIPTIONS
+from pylons.i18n import _
import datetime
VALID_DATE = re.compile(r'^([0-9]{1,2})\.([0-9]{1,2})\.([0-9]{4})$')
VALID_TIME = re.compile(r'^([0-9]{1,2}):([0-9]{2})')
+def get_adele_name(id=None):
+ return EVAL_NAMES.get(str(id), 'Auswertung Nr: %s' % id)
+
+def get_adele_description(id):
+ return EVAL_DESCRIPTIONS.get(str(id), 'Keine Beschreibung vorhanden')
+
def hasRole(rolelist):
try:
user = session['USER_AUTHORIZED']
Modified: wasko/trunk/waskaweb/lib/search.py
===================================================================
--- wasko/trunk/waskaweb/lib/search.py 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/waskaweb/lib/search.py 2009-02-09 13:33:54 UTC (rev 250)
@@ -204,12 +204,15 @@
interval_end_date = options.get('interval_end_date', d.strftime('%Y-%m-%d'))
fields = {'start_field': interval_start_field, 'start_date': interval_start_date, 'end_field': interval_end_field, 'end_date': interval_end_date}
if interval_start_date != '1970-01-01':
- time_interval = "(coalesce(%(start_field)s, '1970-01-01'::date) <= '%(end_date)s'::date AND \
- coalesce(%(start_field)s, '1970-01-01'::date) <= coalesce(%(end_field)s, st.zugriff) AND \
- ((m.id in (SELECT id from master_tbl_incm_view) AND \
- (coalesce(%(end_field)s, now()) >= '%(start_date)s'::date)) OR \
- (st.zugriff >= '%(start_date)s'::date)))" % fields
+ time_interval = "(coalesce(%(start_field)s, '1970-01-01'::date) <= '%(end_date)s'::date \
+ AND (coalesce(%(end_field)s, now()) >= '%(start_date)s'::date))" % fields
+ #time_interval = "(coalesce(%(start_field)s, '1970-01-01'::date) <= '%(end_date)s'::date AND \
+ #coalesce(%(start_field)s, '1970-01-01'::date) <= coalesce(%(end_field)s, st.zugriff) AND \
+ #((m.id in (SELECT id from master_tbl_incm_view) AND \
+ #(coalesce(%(end_field)s, now()) >= '%(start_date)s'::date)) OR \
+ #(st.zugriff >= '%(start_date)s'::date)))" % fields
+
sort_field = options.get('sort_field', "name_1")
sort_order = options.get('sort_order', "desc")
fields['needle'] = " ".join(search)
@@ -283,12 +286,15 @@
interval_end_date = options.get('interval_end_date', d.strftime('%Y-%m-%d'))
fields = {'start_field': interval_start_field, 'start_date': interval_start_date, 'end_field': interval_end_field, 'end_date': interval_end_date}
if interval_start_date != '1970-01-01':
- time_interval = "(coalesce(%(start_field)s, '1970-01-01'::date) <= '%(end_date)s'::date AND \
- coalesce(%(start_field)s, '1970-01-01'::date) <= coalesce(%(end_field)s, st.zugriff) AND \
- ((m.id in (SELECT id from master_tbl_incm_view) AND \
- (coalesce(%(end_field)s, now()) >= '%(start_date)s'::date)) OR \
- (st.zugriff >= '%(start_date)s'::date)))" % fields
+ time_interval = "(coalesce(%(start_field)s, '1970-01-01'::date) <= '%(end_date)s'::date \
+ AND (coalesce(%(end_field)s, now()) >= '%(start_date)s'::date))" % fields
+ #time_interval = "(coalesce(%(start_field)s, '1970-01-01'::date) <= '%(end_date)s'::date AND \
+ #coalesce(%(start_field)s, '1970-01-01'::date) <= coalesce(%(end_field)s, st.zugriff) AND \
+ #((m.id in (SELECT id from master_tbl_incm_view) AND \
+ #(coalesce(%(end_field)s, now()) >= '%(start_date)s'::date)) OR \
+ #(st.zugriff >= '%(start_date)s'::date)))" % fields
+
#Phases
phases = 'TRUE' #default
if phaseslist:
Modified: wasko/trunk/waskaweb/model/navigation.py
===================================================================
--- wasko/trunk/waskaweb/model/navigation.py 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/waskaweb/model/navigation.py 2009-02-09 13:33:54 UTC (rev 250)
@@ -37,7 +37,7 @@
"0" : "26",
"26" : "1",
"1" : "3",
- "2" : "6",
+ "2" : "7",
"3" : "4",
"4" : "5",
"5" : "2",
@@ -47,7 +47,7 @@
"9" : "12",
"10" : "12",
"11" : "12",
- "12" : "31",
+ "12" : "32",
"13" : "14",
"14" : "18",
"18" : "20",
Copied: wasko/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako (from rev 249, waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako)
Modified: wasko/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_avg_effort.mako
===================================================================
--- wasko/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_avg_effort.mako 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_avg_effort.mako 2009-02-09 13:33:54 UTC (rev 250)
@@ -5,10 +5,10 @@
<th class="table_header_h table_width_mid_s num">Durchschnitt Aufwand (Minuten)</th>
</tr>
<tr>
- <td>unmittelbare Arbeit mit dem Jugendlichen:</td><td class="num">${c.eval_avg_effort['avg_cat1'][1]}</td>
+ <td>unmittelbare Arbeit mit dem Jugendlichen</td><td class="num">${c.eval_avg_effort['avg_cat1'][1]}</td>
</tr>
<tr class="table_row_v_12">
- <td>Arbeit mit Dritten:</td><td class="num">${c.eval_avg_effort['avg_cat2'][1]}</td>
+ <td>Arbeit mit Dritten</td><td class="num">${c.eval_avg_effort['avg_cat2'][1]}</td>
</tr>
<tr>
<td>Sonstiges</td><td class="num">${c.eval_avg_effort['avg_cat3'][1]}</td>
Modified: wasko/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako
===================================================================
--- wasko/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako 2009-02-09 13:33:54 UTC (rev 250)
@@ -45,7 +45,7 @@
<li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_6">${_('cm_eval_summary_header_6')}</a></li>
<li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_19">${_('cm_eval_summary_header_19')}</a></li>
<li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_20">${_('cm_eval_summary_header_20')}</a></li>
-## <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_21">${_('cm_eval_summary_header_21')}</a></li>
+ ##<li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_21">${_('cm_eval_summary_header_21')}</a></li>
</ul>
<h2>${_('eval_group_header_finished')}</h2>
<ul>
Modified: wasko/trunk/waskaweb/templates/casemanagement/search.mako
===================================================================
--- wasko/trunk/waskaweb/templates/casemanagement/search.mako 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/waskaweb/templates/casemanagement/search.mako 2009-02-09 13:33:54 UTC (rev 250)
@@ -78,7 +78,7 @@
<td valign="top">
<select name="cm_state" id="cm_state">
<option value="all">Alle</option>
- <option value="clearing">Clearing</option>
+ <option value="clearing">Eingangsanamnese</option>
<option value="before">Beratungskunde</option>
<option value="active">CM-Laufend</option>
<option value="finished">CM-Abgeschlossen</option>
Modified: wasko/trunk/waskaweb/templates/main.mako
===================================================================
--- wasko/trunk/waskaweb/templates/main.mako 2009-02-06 16:55:25 UTC (rev 249)
+++ wasko/trunk/waskaweb/templates/main.mako 2009-02-09 13:33:54 UTC (rev 250)
@@ -1,78 +1,4 @@
## -*- coding: utf-8 -*-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
- <head>
- <title>WASKO</title>
- <meta name="generator" content="vim">
- <meta name="author" content="Torsten Irlaender">
- <meta name="date" content="2007-08-07">
- <meta name="copyright" content="">
- <meta name="keywords" content="">
- <meta name="description" content="">
- <meta name="ROBOTS" content="NOINDEX, NOFOLLOW">
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <meta http-equiv="content-style-type" content="text/css">
- <meta http-equiv="expires" content="0">
- <link rel="shortcut icon" type="image/x-icon" href="/images/kompetenz3.ico">
- % if c.print_version:
- <link href="${h.url_for('/styles/all.css')}" media="all" rel="stylesheet" type="text/css">
- <link href="${h.url_for('/styles/print.css')}" media="screen" rel="stylesheet" type="text/css">
- <link href="${h.url_for('/styles/print.css')}" media="print" rel="stylesheet" type="text/css">
- % else:
- <link href="${h.url_for('/styles/all.css')}" media="all" rel="stylesheet" type="text/css">
- <link href="${h.url_for('/styles/screen.css')}" media="screen" rel="stylesheet" type="text/css">
- <link href="${h.url_for('/styles/print.css')}" media="print" rel="stylesheet" type="text/css">
- <!--[if gt IE 5]><link href="${h.url_for('/styles/ie6.css')}" media="screen" rel="stylesheet" type="text/css"><![endif]-->
- % endif
- <script src="/js/check.js" type="text/javascript"></script>
- </head>
- <body onload="clearModification();">
- <span class="skiplink"><a href="#startmenu" title="Direkt zum Hauptmenü springen" tabindex="1">
- Zum Hauptmenü springen</a></span>
- <span class="skiplink"><a href="#navigation" title="Direkt zum Bereichsmenü springen" tabindex="1">Zum Bereichsmenü springen</a></span>
- <span class="skiplink"><a href="#content" title="Direkt zum Inhalt springen" tabindex="2">Zum Inhalt springen</a></span>
- <div id="header">
- <div class="left" id="logo">
- <a href="${h.url_for(controller='/waska', action='start')}" onclick="return checkModification();">
- <img src="${h.url_for('/images/logo_ka_75.png')}" alt="Logo Kompetenzagentur" border="0">
- </a>
- </div>
- <div id="rightheader">
- ${self.buildStartMenu()}
- ${self.buildStatusBar()}
- <div id="navipath">
- <ul>
- ${self.buildNavipath()}
- </ul>
- </div>
- </div>
- </div>
- <div id="main">
- <div class="left">
- <div class="navigation" id="navigation">
- % if h.hasRole(['cm_ka']):
- ${self.buildPrivacyfield()}
- % endif
- ${next.buildNavigation()}
- </div>
- </div>
- <div id="content" class="right">
- <div id="status_str_nofloat">
- % if c.status_msg:
- <span class="redcolor">${c.status_msg}<span>
- % else:
- <strong>Hinweis:</strong> Nach 30 Minuten ohne Aktivität/ohne Speichern wird die Sitzung
- automatisch beendet, ggf. gehen Daten verloren!
- % endif
- </div>
- ${self.buildContentHeader()}
- ${self.body()}
- </div>
- </div>
- ${self.buildFooter()}
- </body>
-</html>
-
<%def name="buildStatusBar()">
<div id="statusbar">
${_('statusbar_logininfo')}:
@@ -144,6 +70,7 @@
<li><a href="${h.url_for(controller='/case', action='new')}"> ${_('menu_cm_link_new')}</a> </li>
<li><a href="${h.url_for(controller='/case', action='importCase')}"> ${_('menu_cm_link_import')}</a> </li>
% endif
+ <li><a href="${h.url_for(controller='/evaluate', action='evaluateAdele')}">Zwischenbericht</a></li>
<li><a href="${h.url_for(controller='/evaluate', action='evaluate', id=1, reset=1)}"> ${_('cm_actions_link_evaluate')}</a></li>
%if session.get('hascaseerrors'):
<li><a href="${h.url_for(controller='/case_overview', action='listBadCases')}">Inkonsistente Fallakten</a></li>
@@ -209,3 +136,78 @@
<%def name="buildModusfield()">
</%def>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+ <head>
+ <title>WASKA</title>
+ <meta name="generator" content="vim">
+ <meta name="author" content="Torsten Irlaender">
+ <meta name="date" content="2007-08-07">
+ <meta name="copyright" content="">
+ <meta name="keywords" content="">
+ <meta name="description" content="">
+ <meta name="ROBOTS" content="NOINDEX, NOFOLLOW">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta http-equiv="content-style-type" content="text/css">
+ <meta http-equiv="expires" content="0">
+ <link rel="shortcut icon" type="image/x-icon" href="/images/kompetenz3.ico">
+ % if c.print_version:
+ <link href="${h.url_for('/styles/all.css')}" media="all" rel="stylesheet" type="text/css">
+ <link href="${h.url_for('/styles/print.css')}" media="screen" rel="stylesheet" type="text/css">
+ <link href="${h.url_for('/styles/print.css')}" media="print" rel="stylesheet" type="text/css">
+ % else:
+ <link href="${h.url_for('/styles/all.css')}" media="all" rel="stylesheet" type="text/css">
+ <link href="${h.url_for('/styles/screen.css')}" media="screen" rel="stylesheet" type="text/css">
+ <link href="${h.url_for('/styles/print.css')}" media="print" rel="stylesheet" type="text/css">
+ <!--[if gt IE 5]><link href="${h.url_for('/styles/ie6.css')}" media="screen" rel="stylesheet" type="text/css"><![endif]-->
+ % endif
+ <script src="/js/check.js" type="text/javascript"></script>
+ </head>
+ <body onload="clearModification();">
+ <span class="skiplink"><a href="#startmenu" title="Direkt zum Hauptmenü springen" tabindex="1">
+ Zum Hauptmenü springen</a></span>
+ <span class="skiplink"><a href="#navigation" title="Direkt zum Bereichsmenü springen" tabindex="1">Zum Bereichsmenü springen</a></span>
+ <span class="skiplink"><a href="#content" title="Direkt zum Inhalt springen" tabindex="2">Zum Inhalt springen</a></span>
+ <div id="header">
+ <div class="left" id="logo">
+ <a href="${h.url_for(controller='/waska', action='start')}" onclick="return checkModification();">
+ <img src="${h.url_for('/images/logo_ka_75.png')}" alt="Logo Kompetenzagentur" border="0">
+ </a>
+ </div>
+ <div id="rightheader">
+ ${self.buildStartMenu()}
+ ${self.buildStatusBar()}
+ <div id="navipath">
+ <ul>
+ ${self.buildNavipath()}
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div id="main">
+ <div class="left">
+ <div class="navigation" id="navigation">
+ % if h.hasRole(['cm_ka']):
+ ${self.buildPrivacyfield()}
+ % endif
+ ${next.buildNavigation()}
+ </div>
+ </div>
+ <div id="content" class="right">
+ <div id="status_str_nofloat">
+ % if c.status_msg:
+ <span class="redcolor">${c.status_msg}<span>
+ % else:
+ <strong>Hinweis:</strong> Nach 30 Minuten ohne Aktivität/ohne Speichern wird die Sitzung
+ automatisch beendet, ggf. gehen Daten verloren!
+ % endif
+ </div>
+ ${self.buildContentHeader()}
+ ${self.body()}
+ </div>
+ </div>
+ ${self.buildFooter()}
+ </body>
+</html>
+
More information about the Mpuls-commits
mailing list