[Mpuls-commits] r68 - in trunk: . ez_setup formed waskaweb waskaweb/config waskaweb/controllers waskaweb/i18n/de/LC_MESSAGES waskaweb/lib waskaweb/model waskaweb/model/io waskaweb/public/images/icons waskaweb/public/styles waskaweb/templates/casemanagement waskaweb/templates/start waskaweb/tests waskaweb/tests/functional
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Aug 13 15:19:54 CEST 2008
Author: thomas
Date: 2008-08-13 15:19:51 +0200 (Wed, 13 Aug 2008)
New Revision: 68
Added:
trunk/LICENSE
Modified:
trunk/ChangeLog.txt
trunk/Changes.txt
trunk/README.txt
trunk/ez_setup/__init__.py
trunk/formed/waska-hilfetexte.xhtml
trunk/setup.py
trunk/waskaweb/__init__.py
trunk/waskaweb/config/__init__.py
trunk/waskaweb/config/environment.py
trunk/waskaweb/config/middleware.py
trunk/waskaweb/config/routing.py
trunk/waskaweb/controllers/CaseBase.py
trunk/waskaweb/controllers/__init__.py
trunk/waskaweb/controllers/administration.py
trunk/waskaweb/controllers/agency_overview.py
trunk/waskaweb/controllers/appointment.py
trunk/waskaweb/controllers/case.py
trunk/waskaweb/controllers/case_overview.py
trunk/waskaweb/controllers/document.py
trunk/waskaweb/controllers/error.py
trunk/waskaweb/controllers/evaluate.py
trunk/waskaweb/controllers/logbook.py
trunk/waskaweb/controllers/navigation.py
trunk/waskaweb/controllers/rg_aid.py
trunk/waskaweb/controllers/statement.py
trunk/waskaweb/controllers/template.py
trunk/waskaweb/controllers/usersettings.py
trunk/waskaweb/controllers/waska.py
trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
trunk/waskaweb/lib/__init__.py
trunk/waskaweb/lib/app_globals.py
trunk/waskaweb/lib/base.py
trunk/waskaweb/lib/casedata.py
trunk/waskaweb/lib/csv.py
trunk/waskaweb/lib/db.py
trunk/waskaweb/lib/evaluation.py
trunk/waskaweb/lib/excel.py
trunk/waskaweb/lib/filters.py
trunk/waskaweb/lib/formular_help.py
trunk/waskaweb/lib/helpers.py
trunk/waskaweb/lib/pdfimporter.py
trunk/waskaweb/lib/renderer.py
trunk/waskaweb/lib/search.py
trunk/waskaweb/lib/security.py
trunk/waskaweb/lib/sql_helper.py
trunk/waskaweb/lib/template.py
trunk/waskaweb/lib/timelog.py
trunk/waskaweb/lib/validators.py
trunk/waskaweb/lib/xmlexport.py
trunk/waskaweb/lib/xmlimport.py
trunk/waskaweb/model/__init__.py
trunk/waskaweb/model/agency.py
trunk/waskaweb/model/agencysettings.py
trunk/waskaweb/model/appointment.py
trunk/waskaweb/model/case.py
trunk/waskaweb/model/casedocument.py
trunk/waskaweb/model/data.py
trunk/waskaweb/model/datapage.py
trunk/waskaweb/model/document.py
trunk/waskaweb/model/expr.py
trunk/waskaweb/model/forms.py
trunk/waskaweb/model/io/__init__.py
trunk/waskaweb/model/io/document.py
trunk/waskaweb/model/io/factories.py
trunk/waskaweb/model/io/parser.py
trunk/waskaweb/model/logbook.py
trunk/waskaweb/model/navigation.py
trunk/waskaweb/model/nodecomponents.py
trunk/waskaweb/model/semantic.py
trunk/waskaweb/model/statement.py
trunk/waskaweb/model/user.py
trunk/waskaweb/model/view.py
trunk/waskaweb/public/images/icons/form_help.png
trunk/waskaweb/public/styles/screen.css
trunk/waskaweb/templates/casemanagement/caselist.mako
trunk/waskaweb/templates/start/responsible.mako
trunk/waskaweb/templates/start/start.mako
trunk/waskaweb/tests/__init__.py
trunk/waskaweb/tests/functional/__init__.py
trunk/waskaweb/tests/functional/test_CaseBase.py
trunk/waskaweb/tests/functional/test_administration.py
trunk/waskaweb/tests/functional/test_agency_overview.py
trunk/waskaweb/tests/functional/test_appointment.py
trunk/waskaweb/tests/functional/test_case.py
trunk/waskaweb/tests/functional/test_case_overview.py
trunk/waskaweb/tests/functional/test_document.py
trunk/waskaweb/tests/functional/test_logbook.py
trunk/waskaweb/tests/functional/test_rg_aid.py
trunk/waskaweb/tests/functional/test_usersettings.py
trunk/waskaweb/tests/functional/test_waska.py
trunk/waskaweb/tests/test_models.py
trunk/waskaweb/websetup.py
Log:
Load dba9daa7e0d5 into trunk.
Modified: trunk/ChangeLog.txt
===================================================================
--- trunk/ChangeLog.txt 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/ChangeLog.txt 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,5 +1,111 @@
+2008-08-06 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Tagged Version 1.0.4
+
+ Issue517:
+
+ * waskaweb/lib/evaluation.py: Fixed WHERE statement in evaluation,
+ which results in wrong evaluation result: Evaluation was based on to
+ much cases.
+
+ Unsorted:
+
+ * Changes.txt: Added issue517
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: Changed date of version
+ string
+
+2008-08-05 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Issue522:
+
+ * waskaweb/lib/evaluation.py: Fixed evaluation on age. The age is now
+ calculated at the time of the first meeting. If the date of the
+ meeting is not present the age at time of last modification will be
+ calculated.
+
+ Issue523:
+
+ * waskaweb/controllers/case_overview.py,
+ waskaweb/templates/casemanagement/caselist.mako: Fixed sorting of
+ cases on base of "Kundennummer"
+
+ Release:
+
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: Adjusted Versionstring to
+ Version 1.0.4
+ * Changes.txt: Added notes vor Version 1.0.4
+
+
+2008-08-04 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Issue516
+
+ * waskaweb/lib/evaluation.py,
+ waskaweb/lib/search.py: Modified Search to handle "Beratungskunden"
+ correctly.
+
+2008-08-04 Sascha L. Teichmann <sascha.teichmann at intevation.de>
+
+ * */**/*.py: An encoding problem once again.
+ find -name \*.py | xargs \
+ sed -i 's/Projekttraeger im Deutschen Zentrum f./Projekttraeger im Deutschen Zentrum fue/g'
+
+2008-08-04 Frank Koormann <frank.koormann at intevation.de>
+
+ * waskaweb/public/images/icons/form_help.png:
+ New, selfbuild image to ensure full copyrights.
+
+ * waskaweb/public/styles/screen.css: Center images by default
+
+2008-07-29 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Fixed Issue509
+
+ * formed/waska-hilfetexte.xhtml: Modified helptext. Changes on the
+ editor of the case are tracked automatically in the case now.
+
+ Issue508
+
+ * formed/waska-hilfetexte.xhtml,
+ waskaweb/templates/start/start.mako: Basically added new helptext in
+ infodialog for inconsistent cases.
+
+2008-07-29 Sascha L. Teichmann <sascha.teichmann at intevation.de>
+
+ * waskaweb/templates/start/responsible.mako: New text.
+
+2008-07-29 Sascha L. Teichmann <sascha.teichmann at intevation.de>
+
+ * LICENSE: New. GNU AFFERO GENERAL PUBLIC LICENSE Version 3
+
+2008-07-29 Sascha L. Teichmann <sascha.teichmann at intevation.de>
+
+ * **/*.py: Added copyright/license header.
+
+2008-07-29 Sascha L. Teichmann <sascha.teichmann at intevation.de>
+
+ * README.txt: Added naming mplus WASKA to README.
+
+2008-07-28 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ Issue513
+
+ * waskaweb/lib/evaluation.py: On evaluation server: If no
+ timeinterval is defined do not filter out inconsistent cases.
+
+ Unsorted:
+
+ * waskaweb/controllers/case_overview.py
+ waskaweb/controllers/waska.py: List inconsistent cases if their state
+ is either marked for deletion or marked for anonymisation. (Was
+ missing)
+
2008-07-23 Torsten Irlaender <torsten.irlaender at intevation.de>
+ Tagged as "1.0.3"
+
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: Changed versionstring
+
Issue312
* waskaweb/controllers/case.py: Added pagebreak after casedigest in
Modified: trunk/Changes.txt
===================================================================
--- trunk/Changes.txt 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/Changes.txt 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,49 @@
+1.0.4:
+
+ Neu:
+
+ * Für die Veröffentlichung von mpuls WASKA als Freie Software wurden
+ in Kopf der Quelldateien entsprechende Hinweise auf Uhrheberschaft
+ und die verwendete GNU AFFERO GENERAL PUBLIC LICENSE in der Version
+ 3 gesetzt.
+
+ Verbessert:
+
+ * Issue516: Die Suche über Zeitintervalle funktioniert nun auch für
+ Beratungskunden. Da diese nicht über ein Abschlussdatum in der
+ Fallakte verfügen, wird hier vorerst näherungsweise das letzte
+ Bearbeitungsdatum der Fallakte als Ende der Bearatung angenommen.
+
+ * Issue517: Korrektur der Auswertung der Verteilung der
+ Förderangebote. Ein Fehler in der Auswertung führte dazu, dass
+ eine falsche Verteilung der Unterstützungsangebote angezeigt wird.
+ Dieser Fehler ist nur in Version 1.0.3 enthalten.
+
+ * Issue522: Korrektur der Auswertung der Alterverteilung. Das Alter
+ der Jugendlichen wird nun im Bezug auf das Erstgespräch berechnet.
+ Ist das Datum des Erstgespräch nicht angegeben, wird näherungsweise
+ das Datum der letzten Bearbeitung verwendet.
+
+ * Issue513: Auf dem Auswerteserver werden inkonsistente Fälle nicht
+ mehr ausgefiltert wenn kein Zeitintervall angegeben wurde.
+
+ * Issue523: In der Fallaktenübersicht funktioniert die Sortierung nun
+ auch nach der Kundennummer.
+
+ * Auflistung von Inkonsistenten Fallakten: In der Auflistung werden
+ nun auch Fallakten gelistet, die zur Anonymisierung, bzw. Löschung
+ freigegeben wurden.
+
+ * Issue509: Die Kontexthilfe bezüglich der Zuständigkeiten wurde
+ angepasst: Bei der Übertragung der Fallakte ist kein manuelles
+ Nachtragen des Bearbeiters in der Fallakte mehr nötig
+
+ * Issue508: Eine weitere Kontexthilfe bezüglich der inkonsistenten
+ Fallakten wurde eingefügt.
+
+ * Das Hilfesymbol für die Kontexthilfe wurde aufgrund ungeklärter
+ Lizenzfragen gegen ein neu erstelltes ausgetauscht.
+
1.0.3:
Neu:
@@ -2,6 +48,14 @@
- * Workflow der Anonymisierung von Fallakten ist nun an das des
- Löschens der Fallakten angepasst. Das Anonymisieren ist nun
- auch 2-stufig realisiert (issue448).
+ * ÄNDERUNG DES WORKFLOWS ZUR BEHANDLUNG VON FALLAKTEN OHNE GRUNDLAGE
+ ZUR SPEICHERUNG VON PERSONENBEZOGENEN DATEN: Fallakten deren
+ Grundlage zur Speicherung von personenbezogenen Daten nicht mehr
+ vorhanden ist, sollen nicht mehr Gelöscht, sondern Anonymisiert
+ werden! So bleiben die Fallakten auch für Auswertungen über
+ einen längeren Zeitraum erhalten (kummulative Auswertungen).
+ Entsprechende Dialoge wurden in der Anwendung angepasst. Der Workflow
+ der Anonymisierung von Fallakten ist an das des Löschens der
+ Fallakten angepasst. Das Anonymisieren ist nun ebenfalls 2-stufig
+ realisiert (issue448).
+
* Falltagebuch verfügbar. Neben den Terminen und Dokumenten
@@ -13,7 +67,7 @@
dokumentieren.
* Beim Exportieren von XML, CSV und XLS wird jetzt angeboten,
- die Daten anonymsiert zu exportieren. Dies ist die Standardvorgabe.
+ die Daten anonymisiert zu exportieren. Dies ist die Standardvorgabe.
* Der XML-Fallaktenexport kann nun auch partiell durchgeführt werden.
Hierzu wurde ein Dialog zur Verfügung gestellt, in dem der
@@ -24,20 +78,20 @@
jetzt in drei Kategorien aufgelistet:
Automatisierte Wiedervorlagen, Eigene Termine, Agenturtermine
- * Auf dem Schwarzen Brett wird jetzt angezeigt, ob es Fälle gibt,
- die inkonsistent im Sinne der Auswertung sind. Hier wird in erster
- Linie geprüft, ob die Zeitintervalle korrekt zueinander passen.
+ * Auf dem Schwarzen Brett wird jetzt angezeigt, ob es Fälle gibt,
+ die inkonsistent im Sinne der Auswertung sind. Hier wird in erster
+ Linie geprüft, ob die Zeitintervalle korrekt zueinander passen.
* Erweiterung und Umstrukturierung der Suchmaske in der
Fallaktenübersicht. Folgende Suchoptionen wurden hinzugefügt:
+ Such nach Geschlecht
- + Suche nach CM-Status (Beratung, CM, Abgschlossen...)
+ + Suche nach CM-Status (Beratung, CM, Abgeschlossen...)
+ Suche über Zeitintervalle ("Aktive" Fälle im 1. Quartal
2008)
- + Suche nach der Filliale für die Administration (issue14)
+ + Suche nach der Filiale für die Administration (issue14)
- Nicht so häfig genutzte Suchoptionen wurden in einen Bereich
+ Nicht so häufig genutzte Suchoptionen wurden in einen Bereich
"erweiterte Suche" verlegt, der auf Wunsch eingeblendet werden
kann.
@@ -52,7 +106,7 @@
* Zwei neue Auswertungen verfügbar. Folgende Auswertungen
wurden in die WASKA-interne Auswertung hinzugefügt (issue417):
- + Arbeitsituation des Jugendlichem beim Zugang
+ + Arbeitssituation des Jugendlichem beim Zugang
+ Höchster erreichte Schulabschluss beim Zugang
* Die Ergebnisseiten wurden um die Angaben eines Zeitintervalls
@@ -89,19 +143,19 @@
der Unterstützungensangebote des selben Typus jetzt mit einen Dollar-Zeichen
voneinander getrennt. (Issue463)
- * Issue426: Tippfehler beseitig
+ * Issue426: Tippfehler beseitigt
* Issue342: Umbruchprobleme in Freitextfelder im Ansichtsmodus
behoben
* Issue333: Bei dem Wechsel des Bearbeiters wird nun automatisch
auch der Name des neuen Bearbeiters in der Fallakte
- anchgetragen.
+ nachgetragen.
* Issue423: Zusätzliches Feld "Art der Unterstützung" in der
- Übersicht der Unterstützungsangebot eingefügt.
+ Übersicht der Unterstützungsangebote eingefügt.
* Issue447: Die voreingestellten Suchoptionen für die
- Adminstration in der Fallaktenübersicht wurden so geändert das
- zunächst die Fälle angezeugt werden, die zur Anonymisierung
+ Adminstration in der Fallaktenübersicht wurden so geändert, dass
+ zunächst die Fälle angezeigt werden, die zur Anonymisierung
oder zur Löschung anstehen.
- * Issue410: Das schwarze Brett (für cm-nutzer) zeigt nun nur
+ * Issue410: Das schwarze Brett (für CM-Nutzer) zeigt nun nur
noch Termine und Erinnerung der eigenen Fälle und nicht mehr
der Vertretungsfälle.
* Issue126: Wenn ein Jugendlicher jünger als 1 Jahr ist wird in
@@ -121,30 +175,30 @@
* Issue479: Fallaktensuche mit 'accept-charset="UTF-8"' formulieren.
* Issue476: Anpassung der Verweise auf WASKA-Anwender
* Issue480: Partieller XML-Export auf dem Auswertungs-Server funktioniert nicht.
- * Issue475: Datenschutz Anpassung relvanter Dokumente an Standardfall "Anonymisierung"
+ * Issue475: Datenschutz Anpassung relevanter Dokumente an Standardfall "Anonymisierung"
* Issue473: Logbuch Ergänzung Termin anlegen/ Ausgabe Ergänung "Thema"
* Issue467: Englische Zeitstempel in deutschsprachiger Anwendung
* Issue466: Automatische Logbuch-Einträge sind bearbeitbar.
* Issue264: ApacheLog: TypeError
* Issue312: PM: Druckausgabe
* Issue371: Tooltipps zeigen .po Referenzen
- * Issue475: Datenschutz Anpassung relvanter Dokumente an Standardfall "Anonymisierung"
+ * Issue475: Datenschutz Anpassung relevanter Dokumente an Standardfall "Anonymisierung"
* Issue477: MarkForAnonymize liefert traceback
* Issue478: Schwebend anonymisierte Akten nicht in Suchergebnissen
* Issue483: Termine: Traceback wenn zu langer Titel (mehr als 128)
* Issue484: Logbuch: 'Dauer in Minuten' wird nicht auf Integer geprüft.
- * Issue487: ISE: Hilfe-Controller mit nicht existententer Hilfe-Id aufgerufen.
+ * Issue487: ISE: Hilfe-Controller mit nicht existenter Hilfe-Id aufgerufen.
* Issue488: Auswerteserver: Gesamtanzahl anzeigen
* Issue489: Unterstützungsangebote: Ausdruck des Förderplans enthält 'None'-Werte
* Issue490: Typo: is groesser als .
* Issue491: statement_print.mako aufräumen
* Issue492: Auswerteserver: Suche über Zeitintervalle
- * Issue495: DB-Logging noch nicht vollständig
+ * Issue495: DB-Logging noch nicht vollständig
Sonstiges:
* Issue427: Entfernen von Debugging Ausgaben in den Serverlogs
- * Issue461: Zahl der Eintraege in apache2/error.log stark angestiegen
+ * Issue461: Zahl der Einträge in apache2/error.log stark angestiegen
Auswertungs-Server:
Added: trunk/LICENSE
===================================================================
--- trunk/LICENSE 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/LICENSE 2008-08-13 13:19:51 UTC (rev 68)
@@ -0,0 +1,661 @@
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU Affero General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
Modified: trunk/README.txt
===================================================================
--- trunk/README.txt 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/README.txt 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,23 @@
+mpuls WASKA (CoMPUter-based case fiLeS -
+Web-Anwendungs-Server fuer Kompetenzagenturen)
+
+mpuls WASKA entstand von 2007-2008 im Rahmen des Förderprogramms
+"Kompetenzagenturen" (Durchführungsphase). Das Programm wurde
+gefördert vom Bundesministerium für Familie, Senioren, Frauen und
+Jugend (BMFSFJ) aus Mitteln des Europäischen Sozialfonds (ESF).
+Verantwortlich für das Programm-Management war der Projektträger im
+Deutschen Zentrum für Luft- und Raumfahrt e.V. (PT-DLR).
+
+mpuls WASKA wurde seitens des PT-DLR von Dr. Olga Burkova, Max Kamp
+und Frank Tönnissen (Projektleitung) entwickelt und eingeführt.
+
+Design und Implementation der Software durch die Intevation GmbH:
+Frank Koormann (Projektleitung), Sascha Teichmann und Torsten Irländer,
+unterstützt durch Bernhard Reiter, Benjamin Kirschner, Bernhard Herzog
+und Sascha Wilde.
+
+Unterstützung beim Datenbankkonzept durch data in transit (Jutta Horstmann).
+
This file is for you to describe the waskaweb application. Typically
you would include information such as the information below:
@@ -17,3 +37,5 @@
paster setup-app config.ini
Then you are ready to go.
+
+vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8
Modified: trunk/ez_setup/__init__.py
===================================================================
--- trunk/ez_setup/__init__.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/ez_setup/__init__.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,4 +1,27 @@
#!python
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
"""Bootstrap setuptools installation
If you want to use setuptools in your package's setup.py, just include this
Modified: trunk/formed/waska-hilfetexte.xhtml
===================================================================
--- trunk/formed/waska-hilfetexte.xhtml 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/formed/waska-hilfetexte.xhtml 2008-08-13 13:19:51 UTC (rev 68)
@@ -515,9 +515,9 @@
Kompetenzagentur und der einzelnen Institutionen abgestimmt werden.
</p>
<p>Falls im Laufe des Case-Managements die zuständige Mitarbeiterin bzw.
- der zuständige Mitarbeiter in der Kompetenzagentur wechselt, soll im
+ der zuständige Mitarbeiter in der Kompetenzagentur wechselt, so wird das
Feld „Name der zuständigen Mitarbeiterin/des zuständigen Mitarbeiters in
- der Kompetenzagentur“ der Name einfach überschrieben werden.</p>
+ der Kompetenzagentur“ automatisch durch WASKA angepasst.</p>
</div>
<div id="help_eval_search_criteria">
<h2>Zeitangabe in der Auswertung</h2>
@@ -590,5 +590,27 @@
Feststellungsbescheid mit Grad der Behinderung (GdB) von mindestens 20%.
</p>
</div>
+ <div id="inconsistent_cases">
+ <h2>Inkonsistente Fälle</h2>
+ <p>
+ Fallakten werden als inkonsistent bezeichnet, wenn die Informationen zum
+ Status des Falls (z.B. Beratungs- oder Case-Management-Kunde,
+ Case-Management beendet), oder Datumsangaben unvollständig sind. Dies
+ kann Auswirkungen auf die entsprechenden Auswertungen haben.
+ </p>
+ <p>
+ Zum Identifizieren von inkonsistenten Fallakten steht im Menü der
+ Punkt "Inkonsistente Fallakten" zur Verfügung. Mit dieser Funktion
+ haben Sie die Möglichkeit, Fallakten in der Übersicht anzeigen zu
+ lassen, die beispielsweise das Datum des Erstgesprächs nicht gesetzt
+ haben. Weitere Arten von Inkonsistenten sind hier möglich.
+ </p>
+ <p>
+ Administratoren können anhand der Übersicht die Fälle der zuständigen
+ Case-Managerinnen und Case-Manager zuordnen und auf die Behebung der
+ Inkonsistenzen hinweisen. Case-Manager können die inkonsistenten Fälle
+ direkt beheben.
+ </p>
+ </div>
</body>
</html>
Modified: trunk/setup.py
===================================================================
--- trunk/setup.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/setup.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
try:
from setuptools import setup, find_packages
except ImportError:
Modified: trunk/waskaweb/__init__.py
===================================================================
--- trunk/waskaweb/__init__.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/__init__.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -0,0 +1,23 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
Modified: trunk/waskaweb/config/__init__.py
===================================================================
--- trunk/waskaweb/config/__init__.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/config/__init__.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -0,0 +1,23 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
Modified: trunk/waskaweb/config/environment.py
===================================================================
--- trunk/waskaweb/config/environment.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/config/environment.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
"""Pylons environment configuration"""
import os
Modified: trunk/waskaweb/config/middleware.py
===================================================================
--- trunk/waskaweb/config/middleware.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/config/middleware.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
"""Pylons middleware initialization"""
#import authkit.authenticate
#import authkit.authorize
Modified: trunk/waskaweb/config/routing.py
===================================================================
--- trunk/waskaweb/config/routing.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/config/routing.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
"""Routes configuration
The more specific and detailed routes should be defined first so they
Modified: trunk/waskaweb/controllers/CaseBase.py
===================================================================
--- trunk/waskaweb/controllers/CaseBase.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/CaseBase.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
#
Modified: trunk/waskaweb/controllers/__init__.py
===================================================================
--- trunk/waskaweb/controllers/__init__.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/__init__.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -0,0 +1,23 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
Modified: trunk/waskaweb/controllers/administration.py
===================================================================
--- trunk/waskaweb/controllers/administration.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/administration.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
# Sascha L. Teichmann <teichmann at intevation.de>
Modified: trunk/waskaweb/controllers/agency_overview.py
===================================================================
--- trunk/waskaweb/controllers/agency_overview.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/agency_overview.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
# Sascha L. Teichmann <teichmann at intevation.de>
Modified: trunk/waskaweb/controllers/appointment.py
===================================================================
--- trunk/waskaweb/controllers/appointment.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/appointment.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
# Sascha L. Teichmann <teichmann at intevation.de>
Modified: trunk/waskaweb/controllers/case.py
===================================================================
--- trunk/waskaweb/controllers/case.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/case.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
# Sascha L. Teichmann <teichmann at intevation.de>
Modified: trunk/waskaweb/controllers/case_overview.py
===================================================================
--- trunk/waskaweb/controllers/case_overview.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/case_overview.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
#
@@ -217,7 +240,7 @@
if sort_field == "zugriff":
search_options.append('sort_field:zugriff')
if sort_field == "kundennummer":
- search_options.append('sort_field:zugriff')
+ search_options.append('sort_field:kundennummer')
if sort_field == "bearbeiter_id":
search_options.append('sort_field:bearbeiter_id')
@@ -273,12 +296,12 @@
@checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
def listBadCases(self):
user = session.get('USER_AUTHORIZED')
- c.type_1_list = CaseOverview().search('state:1;state:2;state:5;own:%s;bad:1' % user.id)
- c.type_2_list = CaseOverview().search('state:1;state:2;state:5;own:%s;bad:2' % user.id)
- c.type_3_list = CaseOverview().search('state:1;state:2;state:5;own:%s;bad:3' % user.id)
- c.type_4_list = CaseOverview().search('state:1;state:2;state:5;own:%s;bad:4' % user.id)
- c.type_5_list = CaseOverview().search('state:1;state:2;state:5;own:%s;bad:5' % user.id)
- c.type_6_list = CaseOverview().search('state:1;state:2;state:5;own:%s;bad:6' % user.id)
+ c.type_1_list = CaseOverview().search('state:1;state:2;state:3;state:4;state:5;own:%s;bad:1' % user.id)
+ c.type_2_list = CaseOverview().search('state:1;state:2;state:3;state:4;state:5;own:%s;bad:2' % user.id)
+ c.type_3_list = CaseOverview().search('state:1;state:2;state:3;state:4;state:5;own:%s;bad:3' % user.id)
+ c.type_4_list = CaseOverview().search('state:1;state:2;state:3;state:4;state:5;own:%s;bad:4' % user.id)
+ c.type_5_list = CaseOverview().search('state:1;state:2;state:3;state:4;state:5;own:%s;bad:5' % user.id)
+ c.type_6_list = CaseOverview().search('state:1;state:2;state:3;state:4;state:5;own:%s;bad:6' % user.id)
return render('/casemanagement/listbadcases.mako')
@checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
@@ -509,7 +532,7 @@
if confirmed == 1:
try:
num = case_bundle.delete()
- c.success_for = DELETE_SUCCESS_ADMIN_HEADER
+ c.success_for = DELETE_SUCCESS_ADMIN_HEADER
c.success_text = DELETE_SUCCESS_ADMIN_TEXT % str(num)
return render ('/casemanagement/dialogs/success_delete_admin.mako')
except StandardError, err:
Modified: trunk/waskaweb/controllers/document.py
===================================================================
--- trunk/waskaweb/controllers/document.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/document.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/controllers/error.py
===================================================================
--- trunk/waskaweb/controllers/error.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/error.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
import os.path
#import paste.fileapp
Modified: trunk/waskaweb/controllers/evaluate.py
===================================================================
--- trunk/waskaweb/controllers/evaluate.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/evaluate.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
# Sascha L. Teichmann <teichmann at intevation.de>
Modified: trunk/waskaweb/controllers/logbook.py
===================================================================
--- trunk/waskaweb/controllers/logbook.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/logbook.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
import logging
from waskaweb.lib.base import *
Modified: trunk/waskaweb/controllers/navigation.py
===================================================================
--- trunk/waskaweb/controllers/navigation.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/navigation.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
# Sascha L. Teichmann <teichmann at intevation.de>
Modified: trunk/waskaweb/controllers/rg_aid.py
===================================================================
--- trunk/waskaweb/controllers/rg_aid.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/rg_aid.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
# Sascha L. Teichmann <teichmann at intevation.de>
Modified: trunk/waskaweb/controllers/statement.py
===================================================================
--- trunk/waskaweb/controllers/statement.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/statement.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,8 +1,32 @@
# -*- coding: utf-8 -*-
#
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Copyright (c) 2007 by Intevation GmbH
# Authors:
-# Torsten Irländer <torsten.irlaender at intevation.de>
+# Torsten Irländer <torsten.irlaender at intevation.de>
#
import logging
Modified: trunk/waskaweb/controllers/template.py
===================================================================
--- trunk/waskaweb/controllers/template.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/template.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
from waskaweb.lib.base import *
class TemplateController(BaseController):
Modified: trunk/waskaweb/controllers/usersettings.py
===================================================================
--- trunk/waskaweb/controllers/usersettings.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/usersettings.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
# Sascha L. Teichmann <teichmann at intevation.de>
Modified: trunk/waskaweb/controllers/waska.py
===================================================================
--- trunk/waskaweb/controllers/waska.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/controllers/waska.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,8 +1,31 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
-# Torsten Irländer <torsten.irlaender at intevation.de>
+# Torsten Irländer <torsten.irlaender at intevation.de>
# Sascha L. Teichmann <teichmann at intevation.de>
#
@@ -59,7 +82,7 @@
#find out if there are cases with errors
user = session['USER_AUTHORIZED']
- search_str = "state:1;state:2;state:5;bad:1;bad:2;bad:3;bad:4;bad:5;bad:6;own:%s" % user.id
+ search_str = "state:1;state:2;state:3;state:4;state:5;bad:1;bad:2;bad:3;bad:4;bad:5;bad:6;own:%s" % user.id
c.num_error_cases = len(CaseOverview().search(search_str))
if c.num_error_cases > 0:
session['hascaseerrors'] = True
Modified: trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:19:51 UTC (rev 68)
@@ -524,7 +524,7 @@
#: waskaweb/templates/main.mako:197
msgid "footer_version"
-msgstr "22.07.2008 | Version 1.0.3rc9"
+msgstr "06.08.2008 | Version 1.0.4"
#: waskaweb/templates/main_login.mako:38
#: waskaweb/templates/start/responsible.mako:149
Modified: trunk/waskaweb/lib/__init__.py
===================================================================
--- trunk/waskaweb/lib/__init__.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/__init__.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -0,0 +1,23 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
Modified: trunk/waskaweb/lib/app_globals.py
===================================================================
--- trunk/waskaweb/lib/app_globals.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/app_globals.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
"""The application's Globals object"""
from pylons import config
Modified: trunk/waskaweb/lib/base.py
===================================================================
--- trunk/waskaweb/lib/base.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/base.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
"""The base Controller API
Provides the BaseController class for subclassing, and other objects
Modified: trunk/waskaweb/lib/casedata.py
===================================================================
--- trunk/waskaweb/lib/casedata.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/casedata.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
# Torsten Irlaender <torsten.irlaender at intevation.de>
Modified: trunk/waskaweb/lib/csv.py
===================================================================
--- trunk/waskaweb/lib/csv.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/csv.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2008 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/lib/db.py
===================================================================
--- trunk/waskaweb/lib/db.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/db.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/lib/evaluation.py
===================================================================
--- trunk/waskaweb/lib/evaluation.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/evaluation.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,4 +1,28 @@
# -*- coding: UTF-8 -*-
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+
import psycopg2
import codecs
import waskaweb.lib.helpers as h
@@ -55,7 +79,7 @@
if c.isEvaluationServer:
return self._build_eval_where_clause(ids)
else:
- return where_ids(ids, field)
+ return "(%s)" % where_ids(ids, field)
def _build_eval_where_clause(self, fkz):
fkz = "fkz IN (%s)" % (", ".join("'%s'" % a.fkz for a in session.get('agencybundle', AgencyBundle()).getAgencys()))
@@ -83,10 +107,15 @@
d = datetime.today()
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}
- 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, now()) AND coalesce(%(end_field)s, now()) >= '%(start_date)s'::date)" % fields
+ 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
# Indicator for inconsistent cases (only for evaluation server)
- if c.isEvaluationServer:
+ if c.isEvaluationServer and time_interval != 'TRUE':
valid_data = "freie_dokumentation_abschlussbewertung IS NULL"
else:
valid_data = "TRUE"
@@ -455,8 +484,12 @@
conn = db.getConnection()
c1 = conn.cursor()
c1.execute(
- """select date_part('year', age(geburtsdatum::timestamp))
- from master_tbl_eval_incm_view m WHERE %s""" % self.where_clause(self.compressed_ids))
+ """select date_part('year',
+ (age(geburtsdatum::timestamp)-age(coalesce(erstgespraech,
+ st.zugriff)::timestamp))) from master_tbl_eval_incm_view m
+ JOIN ka_status_tbl_view st ON m.id = st.master_id WHERE
+ %s""" %
+ self.where_clause(self.compressed_ids, 'm.id'))
if self.total_valid == 0: divisor = 1
else: divisor = self.total_valid_cm
for r in c1.fetchall():
Modified: trunk/waskaweb/lib/excel.py
===================================================================
--- trunk/waskaweb/lib/excel.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/excel.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2008 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/lib/filters.py
===================================================================
--- trunk/waskaweb/lib/filters.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/filters.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/lib/formular_help.py
===================================================================
--- trunk/waskaweb/lib/formular_help.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/formular_help.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: latin1 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/lib/helpers.py
===================================================================
--- trunk/waskaweb/lib/helpers.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/helpers.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
"""Helper functions
Consists of functions to typically be used within templates, but also
Modified: trunk/waskaweb/lib/pdfimporter.py
===================================================================
--- trunk/waskaweb/lib/pdfimporter.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/pdfimporter.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/lib/renderer.py
===================================================================
--- trunk/waskaweb/lib/renderer.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/renderer.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/lib/search.py
===================================================================
--- trunk/waskaweb/lib/search.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/search.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
#
@@ -156,7 +179,12 @@
d = datetime.today()
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}
- 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, now()) AND coalesce(%(end_field)s, now()) >= '%(start_date)s'::date)" % fields
+ 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
sort_field = options.get('sort_field', "name_1")
sort_order = options.get('sort_order', "desc")
@@ -209,9 +237,13 @@
d = datetime.today()
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}
- 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, now()) AND coalesce(%(end_field)s, now()) >= '%(start_date)s'::date)" % fields
+ 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
-
#cm-state
cm = 'TRUE' #default
cm_state = options.get('cm', "all")
Modified: trunk/waskaweb/lib/security.py
===================================================================
--- trunk/waskaweb/lib/security.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/security.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
# Torsten Irlaender <torsten.irlaender at intevation.de>
Modified: trunk/waskaweb/lib/sql_helper.py
===================================================================
--- trunk/waskaweb/lib/sql_helper.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/sql_helper.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2008 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/lib/template.py
===================================================================
--- trunk/waskaweb/lib/template.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/template.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
import pylons
from pylons.templating import Buffet
from pylons import config
Modified: trunk/waskaweb/lib/timelog.py
===================================================================
--- trunk/waskaweb/lib/timelog.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/timelog.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,28 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/lib/validators.py
===================================================================
--- trunk/waskaweb/lib/validators.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/validators.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,4 +1,27 @@
# -*- coding: utf-8 -*-
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
from pylons import session
from waskaweb.lib.db import db
import re
Modified: trunk/waskaweb/lib/xmlexport.py
===================================================================
--- trunk/waskaweb/lib/xmlexport.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/xmlexport.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2008 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/lib/xmlimport.py
===================================================================
--- trunk/waskaweb/lib/xmlimport.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/lib/xmlimport.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2008 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/model/__init__.py
===================================================================
--- trunk/waskaweb/model/__init__.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/__init__.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -0,0 +1,23 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
Modified: trunk/waskaweb/model/agency.py
===================================================================
--- trunk/waskaweb/model/agency.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/agency.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,28 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
# Authors:
# Torsten <irlaender at intevation.de>
#
Modified: trunk/waskaweb/model/agencysettings.py
===================================================================
--- trunk/waskaweb/model/agencysettings.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/agencysettings.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten <irlaender at intevation.de>
#
Modified: trunk/waskaweb/model/appointment.py
===================================================================
--- trunk/waskaweb/model/appointment.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/appointment.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
#
Modified: trunk/waskaweb/model/case.py
===================================================================
--- trunk/waskaweb/model/case.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/case.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,28 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
#
Modified: trunk/waskaweb/model/casedocument.py
===================================================================
--- trunk/waskaweb/model/casedocument.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/casedocument.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
# Sascha L. Teichmann <teichmann at intevation.de>
Modified: trunk/waskaweb/model/data.py
===================================================================
--- trunk/waskaweb/model/data.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/data.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: latin1 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/model/datapage.py
===================================================================
--- trunk/waskaweb/model/datapage.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/datapage.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/model/document.py
===================================================================
--- trunk/waskaweb/model/document.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/document.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/model/expr.py
===================================================================
--- trunk/waskaweb/model/expr.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/expr.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,7 +1,30 @@
#!/usr/bin/env python
# -*- coding: latin1 -*-
#
-# Copyright (c) 2007, 2008 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/model/forms.py
===================================================================
--- trunk/waskaweb/model/forms.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/forms.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
import formencode
class PdfImportForm(formencode.Schema):
Modified: trunk/waskaweb/model/io/__init__.py
===================================================================
--- trunk/waskaweb/model/io/__init__.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/io/__init__.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1 +1,24 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
# do not delete me!
Modified: trunk/waskaweb/model/io/document.py
===================================================================
--- trunk/waskaweb/model/io/document.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/io/document.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: latin1 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/model/io/factories.py
===================================================================
--- trunk/waskaweb/model/io/factories.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/io/factories.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: latin1 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/model/io/parser.py
===================================================================
--- trunk/waskaweb/model/io/parser.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/io/parser.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: latin1 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/model/logbook.py
===================================================================
--- trunk/waskaweb/model/logbook.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/logbook.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <sascha.teichmann at intevation.de>
Modified: trunk/waskaweb/model/navigation.py
===================================================================
--- trunk/waskaweb/model/navigation.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/navigation.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/model/nodecomponents.py
===================================================================
--- trunk/waskaweb/model/nodecomponents.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/nodecomponents.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: latin1 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/model/semantic.py
===================================================================
--- trunk/waskaweb/model/semantic.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/semantic.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/model/statement.py
===================================================================
--- trunk/waskaweb/model/statement.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/statement.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,28 @@
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
# Authors:
# Torsten Irländer <torsten.irlaender at intevation.de>
#
Modified: trunk/waskaweb/model/user.py
===================================================================
--- trunk/waskaweb/model/user.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/user.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
import waskaweb.lib.helpers as h
from waskaweb.lib.security import getDbName
from waskaweb.lib.db import db
Modified: trunk/waskaweb/model/view.py
===================================================================
--- trunk/waskaweb/model/view.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/model/view.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,6 +1,29 @@
# -*- coding: latin1 -*-
#
-# Copyright (c) 2007 by Intevation GmbH
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+#
# Authors:
# Sascha L. Teichmann <teichmann at intevation.de>
#
Modified: trunk/waskaweb/public/images/icons/form_help.png
===================================================================
(Binary files differ)
Modified: trunk/waskaweb/public/styles/screen.css
===================================================================
--- trunk/waskaweb/public/styles/screen.css 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/public/styles/screen.css 2008-08-13 13:19:51 UTC (rev 68)
@@ -89,7 +89,11 @@
text-decoration:none;
}
-a img, td img{
+a img{
+ vertical-align:middle;
+}
+
+td img{
vertical-align:bottom;
}
@@ -631,7 +635,7 @@
}
.help {
- vertical-align:text-bottom;
+ vertical-align:baseline;
}
.help a:hover {
Modified: trunk/waskaweb/templates/casemanagement/caselist.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/caselist.mako 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/templates/casemanagement/caselist.mako 2008-08-13 13:19:51 UTC (rev 68)
@@ -24,7 +24,6 @@
<th class="table_name table_header_h">${_('cm_overview_tbl_header_accesstime')}
<a href="/case_overview/overview/0/zugriff/asc"><img class="sorticon" src="/images/icons/sort_asc.png"></a>
<a href="/case_overview/overview/0/zugriff/desc"><img class="sorticon" src="/images/icons/sort_desc.png"></a>
-
</th>
% endif
<th class="table_status table_header_h">${_('cm_overview_tbl_header_status')}</th>
Modified: trunk/waskaweb/templates/start/responsible.mako
===================================================================
--- trunk/waskaweb/templates/start/responsible.mako 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/templates/start/responsible.mako 2008-08-13 13:19:51 UTC (rev 68)
@@ -3,165 +3,165 @@
<%def name="buildNavipath()">
<li><a href="#" onclick="return checkModification();">${_('sm_menu_link_responsible')}</a></li>
</%def>
+<div class="traeger">
+ <div class="traeger_name">
+ <h2>Förderung</h2>
+ <div class="traeger_name_text">
+ <p>WASKA wurde von 2007-2008 im Auftrag des Projektträgers im Deutschen
+ Zentrum für Luft- und Raumfahrt e.V. (PT-DLR) im Rahmen des Programms
+ "Kompetenzagenturen" (Durchführungsphase) enwickelt. Das Programm
+ "Kompetenzagenturen" (Durchführungsphase) wurde gefördert vom
+ Bundesministerium für Familie, Senioren, Frauen und Jugend (BMFSFJ) aus
+ Mitteln des Europäischen Sozialfonds (ESF)</p>
+ </div>
+ <div class="traeger_name_img">
+ <a href="http://www.bmfsfj.de/" target="_blank">
+ <img class="" title="Logo bmfsj" alt="Logo bmfsj"
+ src="/images/BMFSFJ_C_M_web.jpg" border="0" >
+ </a>
+ <a href="http://ec.europa.eu/employment_social/esf2000/index_de.html" target="_blank">
+ <img class="" title="Logo europäische union - europäischer sozialfonds"
+ alt="Logo europäische union - europäischer sozialfonds"
+ src="/images/eu_logo_4c_pos_web2.jpg" border="0" >
+ </a>
+ </div>
+ </div>
+</div>
+<div class="traeger">
+ <div class="traeger_name">
+ <h2>mpuls WASKA</h2>
+ <div class="traeger_name_text">
+ <p>
+ mpuls WASKA wurde seitens des Projektträgers im Deutschen Zentrum für Luft- und
+ Raumfahrt e.V. (PT-DLR) von Dr. Olga Burkova, Max Kamp und Frank Tönnissen
+ (Projektleitung) entwickelt und eingeführt.
+ </p>
+ </div>
+ <div class="traeger_name_img">
+ <a href="http://www.dlr.de/" target="_blank"><img class="" title="Logo Deutsches Luft- und Raumfahrtzentrum"
+ alt="Logo Deutsches Luft- und Raumfahrtzentrum" src="/images/logo_dlr.png" style="border:0">
+ </a>
+ </div>
+ </div>
+</div>
+<div class="traeger">
+ <div class="traeger_name">
+ <h2>Lizenz</h2>
+ <div class="traeger_name_text">
+ <p>WASKA is free software: you can redistribute it and/or modify it under
+ the terms of the GNU Affero General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.</p>
+ </div>
+ <div class="traeger_name_img">
+ <a href="http://www.gnu.org/licenses/agpl.html" target="_blank">
+ <img src="/images/agplv3-155x51.png" alt="Logo GPL3" style="border:0">
+ </a>
+ </div>
+ </div>
+</div>
+<div class="traeger">
+ <div class="traeger_name">
+ <h2>Technische Umsetzung</h2>
+ <div class="traeger_name_text">
+ <p>Design und Implementation der Software durch die Intevation GmbH:
+ Frank Koormann (Projektleitung), Sascha Teichmann und Torsten Irländer,
+ unterstützt durch Bernhard Reiter, Benjamin Kirschner, Bernhard Herzog
+ und Sascha Wilde.</p>
+ <p>Unterstützung beim Datenbankkonzept durch <a href="http://www.dataintransit.com" target="_blank">data in transit</a> (Jutta Horstmann)</p>
+ </div>
+ <div class="traeger_name_img">
+ <a href="http://www.intevation.de/" target="_blank">
+ <img src="/images/logo_intevation.png" alt="Logo Intevation" style="border:0">
+ </a>
+ </div>
+ </div>
+</div>
+
+##<div>
+##<h1>${_('responsible_info_sponsorship')}</h1>
##<div class="traeger">
-## <div class="traeger_name">
-## <h2>Förderung</h2>
-## <div class="traeger_name_text">
-## <p>WASKA wurde von 2007-2008 im Auftrag des Projektträgers im Deutschen
-## Zentrum für Luft- und Raumfahrt e.V. (PT-DLR) im Rahmen des Programms
-## "Kompetenzagenturen" (Durchführungsphase) enwickelt. Das Programm
-## "Kompetenzagenturen" (Durchführungsphase) wurde gefördert vom
-## Bundesministerium für Familie, Senioren, Frauen und Jugend (BMFSFJ) aus
-## Mitteln des Europäischen Sozialfonds (ESF)</p>
-## </div>
-## <div class="traeger_name_img">
-## <a href="http://www.bmfsfj.de/" target="_blank">
-## <img class="" title="Logo bmfsj" alt="Logo bmfsj"
-## src="/images/BMFSFJ_C_M_web.jpg" border="0" >
-## </a>
-## <a href="http://ec.europa.eu/employment_social/esf2000/index_de.html" target="_blank">
-## <img class="" title="Logo europäische union - europäischer sozialfonds"
-## alt="Logo europäische union - europäischer sozialfonds"
-## src="/images/eu_logo_4c_pos_web2.jpg" border="0" >
-## </a>
-## </div>
+##<div class="traeger_name">
+##<h2>${_('responsible_project_sponsorship')}</h2>
+## <div class="traeger_name_text">
+## Deutsches Zentrum für Luft- undRaumfahrt e. V. (DLR)<br>
+## Projektträger im DLR, Bildungsforschung, Chancengleichheit Bonn
## </div>
+## <div class="traeger_name_img">
+## <a href="http://www.dlr.de/" target="_blank"><img class="" title="Logo Deutsches Luft- und Raumfahrtzentrum"
+## alt="Logo Deutsches Luft- und Raumfahrtzentrum" src="/images/logo_dlr.png" style="border:0">
+## </a>
+## </div>
##</div>
-##<div class="traeger">
-## <div class="traeger_name">
-## <h2>mpuls WASKA</h2>
-## <div class="traeger_name_text">
-## <p>
-## mpuls WASKA wurde seitens des Projektträgers im Deutschen Zentrum für Luft- und
-## Raumfahrt e.V. (PT-DLR) von Dr. Olga Burkova, Max Kamp und Frank Tönnissen
-## (Projektleitung) entwickelt und eingeführt.
-## </p>
-## </div>
-## <div class="traeger_name_img">
-## <a href="http://www.dlr.de/" target="_blank"><img class="" title="Logo Deutsches Luft- und Raumfahrtzentrum"
-## alt="Logo Deutsches Luft- und Raumfahrtzentrum" src="/images/logo_dlr.png" style="border:0">
-## </a>
-## </div>
+##
+##<div class="traeger_contact">
+## <p>Besucheradresse</p>
+## <div class="traeger_contact_field">
+## <p>Heinrich-Konen-Str. 1,
+## 53227 Bonn</p>
## </div>
+## <div class="traeger_contact_field">
+## <p>Tel.: +49 228 3821-600</p>
+## </div>
+## <div class="traeger_contact_field">
+## <p>E-Mail: <a href="mailto:kompetenzagenturen at dlr.de" target=
+## "_blank">kompetenzagenturen at dlr.de</a></p>
+## </div>
##</div>
+##
+##<div class="traeger_contact">
+## <p>Ansprechpartner</p>
+## <div class="traeger_contact_field">
+## <p>Dr. Astrid Fischer, Tel.: +49 228 3821-602</p>
+## </div>
+## <div class="traeger_contact_field">
+## <p>Frank Tönnissen, Tel.: +49 228 3821-603</p>
+## </div>
+##</div>
+##
+##</div>
+##
##<div class="traeger">
-## <div class="traeger_name">
-## <h2>Lizenz</h2>
-## <div class="traeger_name_text">
-## <p>WASKA is free software: you can redistribute it and/or modify it under
-## the terms of the GNU Affero General Public License as published by the
-## Free Software Foundation, either version 3 of the License, or (at your
-## option) any later version.</p>
-## </div>
-## <div class="traeger_name_img">
-## <a href="http://www.gnu.org/licenses/agpl.html" target="_blank">
-## <img src="/images/agplv3-155x51.png" alt="Logo GPL3" style="border:0">
-## </a>
-## </div>
+##<div class="traeger_name">
+##<h2>${_('responsible_realisation')}</h2>
+## <div class="traeger_name_text">
+## <p>Intevation GmbH, Osnabrück</p>
+## <p> Realisation und Programmierung der Webanwendung</p>
## </div>
+## <div class="traeger_name_img">
+## <a href="http://www.intevation.de/" target="_blank">
+## <img src="/images/logo_intevation.png" alt="Logo Intevation" style="border:0">
+## </a>
+## </div>
+##
+##<div class="traeger_contact">
+## <p>Ansprechpartner</p>
+## <div class="traeger_contact_field">
+## <p> Frank Koormann, Tel.: +49 541 33508-30</p>
+## </div>
##</div>
+##</div>
+##</div>
##<div class="traeger">
-## <div class="traeger_name">
-## <h2>Technische Umsetzung</h2>
-## <div class="traeger_name_text">
-## <p>Design und Implementation der Software durch die Intevation GmbH:
-## Frank Koormann (Projektleitung), Sascha Teichmann und Torsten Irländer,
-## unterstützt durch Bernhard Reiter, Benjamin Kirschner, Bernhard Herzog
-## und Sascha Wilde.</p>
-## <p>Unterstützung beim Datenbankkonzept durch <a href="http://www.dataintransit.com" target="_blank">data in transit</a> (Jutta Horstmann)</p>
-## </div>
-## <div class="traeger_name_img">
-## <a href="http://www.intevation.de/" target="_blank">
-## <img src="/images/logo_intevation.png" alt="Logo Intevation" style="border:0">
-## </a>
-## </div>
+##<div class="traeger_name">
+##<h2>Förderung</h2>
+## <div class="traeger_name_text">
+## <p>${_('main_login_bmf_phrase')}</p>
## </div>
+## <div class="traeger_name_img">
+## <a href="http://www.bmfsfj.de/" target="_blank">
+## <img class="" title="Logo bmfsj" alt="Logo bmfsj"
+## src="/images/BMFSFJ_C_M_web.jpg" border="0" >
+## </a>
+## <a href="http://ec.europa.eu/employment_social/esf2000/index_de.html" target="_blank">
+## <img class="" title="Logo europäische union - europäischer sozialfonds"
+## alt="Logo europäische union - europäischer sozialfonds"
+## src="/images/eu_logo_4c_pos_web2.jpg" border="0" >
+## </a>
+## </div>
##</div>
-
-<div>
-<h1>${_('responsible_info_sponsorship')}</h1>
-<div class="traeger">
-<div class="traeger_name">
-<h2>${_('responsible_project_sponsorship')}</h2>
- <div class="traeger_name_text">
- Deutsches Zentrum für Luft- undRaumfahrt e. V. (DLR)<br>
- Projektträger im DLR, Bildungsforschung, Chancengleichheit Bonn
- </div>
- <div class="traeger_name_img">
- <a href="http://www.dlr.de/" target="_blank"><img class="" title="Logo Deutsches Luft- und Raumfahrtzentrum"
- alt="Logo Deutsches Luft- und Raumfahrtzentrum" src="/images/logo_dlr.png" style="border:0">
- </a>
- </div>
-</div>
-
-<div class="traeger_contact">
- <p>Besucheradresse</p>
- <div class="traeger_contact_field">
- <p>Heinrich-Konen-Str. 1,
- 53227 Bonn</p>
- </div>
- <div class="traeger_contact_field">
- <p>Tel.: +49 228 3821-600</p>
- </div>
- <div class="traeger_contact_field">
- <p>E-Mail: <a href="mailto:kompetenzagenturen at dlr.de" target=
- "_blank">kompetenzagenturen at dlr.de</a></p>
- </div>
-</div>
-
-<div class="traeger_contact">
- <p>Ansprechpartner</p>
- <div class="traeger_contact_field">
- <p>Dr. Astrid Fischer, Tel.: +49 228 3821-602</p>
- </div>
- <div class="traeger_contact_field">
- <p>Frank Tönnissen, Tel.: +49 228 3821-603</p>
- </div>
-</div>
-
-</div>
-
-<div class="traeger">
-<div class="traeger_name">
-<h2>${_('responsible_realisation')}</h2>
- <div class="traeger_name_text">
- <p>Intevation GmbH, Osnabrück</p>
- <p> Realisation und Programmierung der Webanwendung</p>
- </div>
- <div class="traeger_name_img">
- <a href="http://www.intevation.de/" target="_blank">
- <img src="/images/logo_intevation.png" alt="Logo Intevation" style="border:0">
- </a>
- </div>
-
-<div class="traeger_contact">
- <p>Ansprechpartner</p>
- <div class="traeger_contact_field">
- <p> Frank Koormann, Tel.: +49 541 33508-30</p>
- </div>
-</div>
-</div>
-</div>
-<div class="traeger">
-<div class="traeger_name">
-<h2>Förderung</h2>
- <div class="traeger_name_text">
- <p>${_('main_login_bmf_phrase')}</p>
- </div>
- <div class="traeger_name_img">
- <a href="http://www.bmfsfj.de/" target="_blank">
- <img class="" title="Logo bmfsj" alt="Logo bmfsj"
- src="/images/BMFSFJ_C_M_web.jpg" border="0" >
- </a>
- <a href="http://ec.europa.eu/employment_social/esf2000/index_de.html" target="_blank">
- <img class="" title="Logo europäische union - europäischer sozialfonds"
- alt="Logo europäische union - europäischer sozialfonds"
- src="/images/eu_logo_4c_pos_web2.jpg" border="0" >
- </a>
- </div>
-</div>
-</div>
-</div>
+##</div>
+##</div>
<div class="clearer"></div>
Modified: trunk/waskaweb/templates/start/start.mako
===================================================================
--- trunk/waskaweb/templates/start/start.mako 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/templates/start/start.mako 2008-08-13 13:19:51 UTC (rev 68)
@@ -31,8 +31,8 @@
% else:
%if session.get('hascaseerrors'):
<div class="form_errors">
- <h1>Inkonsistente Fallakten gefunden!</h1>
- <p>Sie haben aktuell ${c.num_error_cases} Fallakte(n) mit unvollständigen oder widersprüchlichen Angaben. Fallakten deren Daten nicht plausibel sind werden in der Auswertung zu Problemen führen. Bitte nutzen Sie die Funktion zum <a href="${h.url_for(controller='/case_overview', action='listBadCases')}">Aufspüren von inkonsistenten Fallakten.</a></p>
+ <h1>Inkonsistente Fallakten gefunden! ${h.getHelp('inconsistent_cases')}</h1>
+ <p>Es wurden ${c.num_error_cases} Fallakte(n) mit unvollständigen oder widersprüchlichen Angaben gefunden. Fallakten deren Daten nicht plausibel sind werden in der Auswertung zu Problemen führen. Bitte nutzen Sie die Funktion zum <a href="${h.url_for(controller='/case_overview', action='listBadCases')}">Aufspüren von inkonsistenten Fallakten.</a></p>
</div>
%endif
<h2>Automatisierte Wiedervorlagen</h2>
Modified: trunk/waskaweb/tests/__init__.py
===================================================================
--- trunk/waskaweb/tests/__init__.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/__init__.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
"""Pylons application test package
When the test runner finds and executes tests within this directory,
Modified: trunk/waskaweb/tests/functional/__init__.py
===================================================================
--- trunk/waskaweb/tests/functional/__init__.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/functional/__init__.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -0,0 +1,23 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
Modified: trunk/waskaweb/tests/functional/test_CaseBase.py
===================================================================
--- trunk/waskaweb/tests/functional/test_CaseBase.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/functional/test_CaseBase.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
from waskaweb.tests import *
class TestCasebaseController(TestController):
Modified: trunk/waskaweb/tests/functional/test_administration.py
===================================================================
--- trunk/waskaweb/tests/functional/test_administration.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/functional/test_administration.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
from waskaweb.tests import *
class TestAdministrationController(TestController):
Modified: trunk/waskaweb/tests/functional/test_agency_overview.py
===================================================================
--- trunk/waskaweb/tests/functional/test_agency_overview.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/functional/test_agency_overview.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
from waskaweb.tests import *
class TestAgencyOverviewController(TestController):
Modified: trunk/waskaweb/tests/functional/test_appointment.py
===================================================================
--- trunk/waskaweb/tests/functional/test_appointment.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/functional/test_appointment.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
from waskaweb.tests import *
class TestAppointmentController(TestController):
Modified: trunk/waskaweb/tests/functional/test_case.py
===================================================================
--- trunk/waskaweb/tests/functional/test_case.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/functional/test_case.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
from waskaweb.tests import *
class TestCaseController(TestController):
Modified: trunk/waskaweb/tests/functional/test_case_overview.py
===================================================================
--- trunk/waskaweb/tests/functional/test_case_overview.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/functional/test_case_overview.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
from waskaweb.tests import *
class TestCaseOverviewController(TestController):
Modified: trunk/waskaweb/tests/functional/test_document.py
===================================================================
--- trunk/waskaweb/tests/functional/test_document.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/functional/test_document.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
from waskaweb.tests import *
class TestDocumentController(TestController):
Modified: trunk/waskaweb/tests/functional/test_logbook.py
===================================================================
--- trunk/waskaweb/tests/functional/test_logbook.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/functional/test_logbook.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
from waskaweb.tests import *
class TestLogbookController(TestController):
Modified: trunk/waskaweb/tests/functional/test_rg_aid.py
===================================================================
--- trunk/waskaweb/tests/functional/test_rg_aid.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/functional/test_rg_aid.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
from waskaweb.tests import *
class TestRgAidController(TestController):
Modified: trunk/waskaweb/tests/functional/test_usersettings.py
===================================================================
--- trunk/waskaweb/tests/functional/test_usersettings.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/functional/test_usersettings.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
from waskaweb.tests import *
class TestUsersettingsController(TestController):
Modified: trunk/waskaweb/tests/functional/test_waska.py
===================================================================
--- trunk/waskaweb/tests/functional/test_waska.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/functional/test_waska.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
from waskaweb.tests import *
class TestWaskaController(TestController):
Modified: trunk/waskaweb/tests/test_models.py
===================================================================
--- trunk/waskaweb/tests/test_models.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/tests/test_models.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -0,0 +1,24 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
+
Modified: trunk/waskaweb/websetup.py
===================================================================
--- trunk/waskaweb/websetup.py 2008-08-13 13:19:19 UTC (rev 67)
+++ trunk/waskaweb/websetup.py 2008-08-13 13:19:51 UTC (rev 68)
@@ -1,3 +1,26 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+#
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS -
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+#
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# mpuls WASKA is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+#
+# mpuls WASKA has been developed on behalf of the
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and
+# European Social Fund resources.
"""Setup the waskaweb application"""
import logging
More information about the Mpuls-commits
mailing list