[Mpuls-commits] r1690 - in waska/trunk: . waskaweb/controllers waskaweb/i18n waskaweb/i18n/de/LC_MESSAGES waskaweb/lib waskaweb/templates/administration
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Feb 23 14:02:33 CET 2010
Author: roland
Date: 2010-02-23 14:02:32 +0100 (Tue, 23 Feb 2010)
New Revision: 1690
Modified:
waska/trunk/ChangeLog
waska/trunk/waskaweb/controllers/case.py
waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.mo
waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
waska/trunk/waskaweb/i18n/waskaweb.pot
waska/trunk/waskaweb/lib/renderer.py
waska/trunk/waskaweb/templates/administration/edit_settings.mako
waska/trunk/waskaweb/templates/administration/show_settings.mako
Log:
editing of the agency's evaluation ID
Modified: waska/trunk/ChangeLog
===================================================================
--- waska/trunk/ChangeLog 2010-02-23 12:57:37 UTC (rev 1689)
+++ waska/trunk/ChangeLog 2010-02-23 13:02:32 UTC (rev 1690)
@@ -1,3 +1,13 @@
+2010-02-23 Roland Geider <roland.geider at intevation.de>
+
+ Editing of the agency's evaluation ID
+
+ * waskaweb/controllers/case.py (save): change the autogenerated evaluation number
+ * waskaweb/templates/administration/show_settings.mako:
+ * waskaweb/templates/administration/edit_settings.mako: change templates
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po:
+ * waskaweb/i18n/waskaweb.pot: update translation files
+
2010-02-19 Roland Geider <roland.geider at intevation.de>
Bugfixes
Modified: waska/trunk/waskaweb/controllers/case.py
===================================================================
--- waska/trunk/waskaweb/controllers/case.py 2010-02-23 12:57:37 UTC (rev 1689)
+++ waska/trunk/waskaweb/controllers/case.py 2010-02-23 13:02:32 UTC (rev 1690)
@@ -543,10 +543,8 @@
# Generate the ID (we do not check for uniqueness)
# ID is created from the agency name, the evaluation abbreviation and a number
elif request.params.getone('evaluation_nummer') == '':
- agency = Agency()
- evaluation_id = agency.getEvaluationId()
- evaluation_agency = agency.getName()
- request_data['evaluation_nummer'] = ["%s/%s-" % (evaluation_agency, evaluation_id)]
+ agency = Agency()
+ request_data['evaluation_nummer'] = ["%s-" % (agency.getEvaluationId())]
#print >> sys.stderr, request_data
Modified: waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.mo
===================================================================
(Binary files differ)
Modified: waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2010-02-23 12:57:37 UTC (rev 1689)
+++ waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2010-02-23 13:02:32 UTC (rev 1690)
@@ -705,6 +705,11 @@
msgid "adm_form_settings_fkz"
msgstr "FKZ der Kompetenzagentur"
+#: waskaweb/templates/administration/edit_settings.mako:52
+#: waskaweb/templates/administration/show_settings.mako:38
+msgid "adm_form_settings_evaluation_id"
+msgstr "Evaluationskennzeichen der Kompetenzagentur"
+
#: waskaweb/templates/administration/edit_settings.mako:6
#: waskaweb/templates/administration/edit_settings.mako:55
#: waskaweb/templates/administration/show_settings.mako:34
Modified: waska/trunk/waskaweb/i18n/waskaweb.pot
===================================================================
--- waska/trunk/waskaweb/i18n/waskaweb.pot 2010-02-23 12:57:37 UTC (rev 1689)
+++ waska/trunk/waskaweb/i18n/waskaweb.pot 2010-02-23 13:02:32 UTC (rev 1690)
@@ -659,6 +659,11 @@
msgid "adm_form_settings_fkz"
msgstr ""
+#: waskaweb/templates/administration/edit_settings.mako:52
+#: waskaweb/templates/administration/show_settings.mako:38
+msgid "adm_form_settings_evaluation_id"
+msgstr ""
+
#: waskaweb/templates/administration/edit_settings.mako:6
#: waskaweb/templates/administration/edit_settings.mako:55
#: waskaweb/templates/administration/show_settings.mako:34
Modified: waska/trunk/waskaweb/lib/renderer.py
===================================================================
--- waska/trunk/waskaweb/lib/renderer.py 2010-02-23 12:57:37 UTC (rev 1689)
+++ waska/trunk/waskaweb/lib/renderer.py 2010-02-23 13:02:32 UTC (rev 1690)
@@ -44,8 +44,6 @@
DIALOG_SCHUELER1 = u'''<div class="form_errors"> <h1>Wichtiger Hinweis</h1><p>Schülerinnen/Schüler dürfen nur dann ins Case Managagement aufgenommen werden, wenn sie sich im letzten Schulbesuchsjahr befinden und eine Übergangsprognose vorliegt.</p></div>'''
-DIALOG_EVALUATIONNR1 = u'''<div class="form_errors"> <h1>Wichtiger Hinweis</h1><p>Das Feld "Evaluationsnummer" ist ein Pflichtfeld, wenn die Teilnahmeoption "ist bereit an der Befragung teilzunehmen..." ausgewählt ist.</p></div>'''
-
HELP = \
'''<span class="help"> <a href="%s" target="_blank">
<img src="/images/icons/form_help.png" border="0"
Modified: waska/trunk/waskaweb/templates/administration/edit_settings.mako
===================================================================
--- waska/trunk/waskaweb/templates/administration/edit_settings.mako 2010-02-23 12:57:37 UTC (rev 1689)
+++ waska/trunk/waskaweb/templates/administration/edit_settings.mako 2010-02-23 13:02:32 UTC (rev 1690)
@@ -48,6 +48,14 @@
<input type="text" id="fkz" name="fkz" value="${c.form_result.get('fkz', c.agency.getFKZ())| h}" maxlength="60">
% endif
</div>
+ <div class="waska_form_element w30">
+ <label for="evaluation_id">${_('adm_form_settings_evaluation_id')}</label>
+ <input type="text"
+ id="evaluation_id"
+ name="evaluation_id"
+ value="${c.form_result.get('fkz', c.agency.getEvaluationId())| h}"
+ maxlength="60">
+ </div>
</fieldset>
<fieldset>
<legend>Angaben zu den Fallakten</legend>
Modified: waska/trunk/waskaweb/templates/administration/show_settings.mako
===================================================================
--- waska/trunk/waskaweb/templates/administration/show_settings.mako 2010-02-23 12:57:37 UTC (rev 1689)
+++ waska/trunk/waskaweb/templates/administration/show_settings.mako 2010-02-23 13:02:32 UTC (rev 1690)
@@ -35,8 +35,12 @@
<td class="table_row_v">${c.agency.getMaxSavetime()| F.NA, h}</td>
</tr>
<tr>
- <td class="label table_header">${_('adm_form_settings_anontransfer')}</td>
- <td class="table_row_v_2">
+ <td class="label table_header">${_('adm_form_settings_evaluation_id')}</td>
+ <td class="table_row_v_2">${c.agency.getEvaluationId()| F.NA, h}</td>
+</tr>
+<tr>
+ <td class="label table_header_v">${_('adm_form_settings_anontransfer')}</td>
+ <td class="table_row_v">
% if c.agency.isAnonTransfer():
${_('adm_form_settings_anontransfer_yes')}
% else:
More information about the Mpuls-commits
mailing list