add additional field handling for persons

m-bucher · May 4, 2016 · ccdd386 · ccdd386
1 parent 26bfde6
commit ccdd386
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 10 deletions.
diff --git a/emonitor/modules/persons/content_admin.py b/emonitor/modules/persons/content_admin.py
@@ -1,5 +1,6 @@
 import os
 import werkzeug
+import yaml
 from datetime import datetime
 from flask import render_template, request, current_app
 from emonitor.extensions import db
@@ -49,6 +50,11 @@ def getAdminContent(self, **params):
                 pass
             person.identifier = request.form.get('identifier')
             person.remark = request.form.get('remark')
+            _additional = {}
+            for field in Settings.get('persons.settings').get('additional'):
+                if field.split('=')[0] in request.form.keys():
+                    _additional[field.split('=')[0]] = request.form.get(field.split('=')[0])
+            person._options = yaml.safe_dump(_additional, encoding='utf-8')
             db.session.commit()
 
         elif request.form.get('action').startswith('deleteperson_'):
@@ -74,6 +80,14 @@ def getAdminContent(self, **params):
             Settings.set('persons.settings', _settings)
             db.session.commit()
 
+        elif request.form.get('action') == 'updateadditional':
+            _settings = Settings.get('persons.settings')
+            if 'additional' not in _settings.keys():
+                _settings['additional'] = []
+            _settings['additional'] = request.form.get('additional').replace('\r', '').split('\n')
+            Settings.set('persons.settings', _settings)
+            db.session.commit()
+
     if int(module[1]) == 0:
         params.update({'settings': Settings.get('persons.settings')})
         return render_template("admin.persons.settings.html", **params)
@@ -129,7 +143,10 @@ def getAdminData(self):
         for key in vals['persons']:  # item list
             if key['state'] in states:  # import only with correct state
                 if key['state'] == '-1':  # add key
-                    key['birthdate'] = datetime.strptime(key['birthdate'], '%d.%m.%Y')
+                    try:
+                        key['birthdate'] = datetime.strptime(key['birthdate'], '%d.%m.%Y')
+                    except:
+                        print ">>>>", key['birthdate']
                     key['active'] = key['active'] == 'Aktiv'
                     p = Person(key['firstname'], key['lastname'], key['salutation'], key['grade'], key['position'], key['identifier'], key['active'], key['birthdate'], key['remark'], int(request.args.get('department')))
                     db.session.add(p)

diff --git a/emonitor/modules/persons/persons.py b/emonitor/modules/persons/persons.py
@@ -56,6 +56,10 @@ def birthday(self):
         """
         return int((datetime(1904, *self.birthdate.timetuple()[1:-2])).strftime('%j'))
 
+    @property
+    def options(self):
+        return yaml.load(self._options)
+
     @staticmethod
     def getPersons(id=0, identifier=0, dept=0, onlyactive=False):
         if id != 0:

diff --git a/emonitor/modules/persons/templates/admin.persons.settings.html b/emonitor/modules/persons/templates/admin.persons.settings.html
@@ -66,6 +66,21 @@ <h2>{{ _('persons.header.settings') }}</h2>
         </form>
     </fieldset>
 
+    <fieldset>
+        <legend>{{ _('persons.additional.label') }}</legend>
+        <small>{{ _('persons.additional.info') }}</small>
+        <form method="post" name="additional" action="" style="padding-bottom:30px;">
+            <p>
+                <label>{{ _('persons.additional.field') }}:<br/>
+                    <textarea name="additional" style="width:99%;height:150px;">{{ settings.additional | join('\n') }}</textarea>
+                </label>
+            </p>
+            <p>
+                <button type="submit" name="action" value="updateadditional" class="save"><i class="fa fa-check"></i> {{ _('persons.save') }}</button>
+            </p>
+        </form>
+    </fieldset>
+
 {% endblock %}
 
 {% block script_end %}

diff --git a/emonitor/modules/persons/templates/admin.persons_edit.html b/emonitor/modules/persons/templates/admin.persons_edit.html
@@ -65,6 +65,16 @@ <h2>{{ _('persons.header.edit') }}</h2>
             <textarea name="remark" style="width:99%;height:50px;">{{ person.remark }}</textarea>
             </label>
         </p>
+        <p>
+            <fieldset>
+                <legend>{{ _('persons.additional.fields') }}</legend>
+                {% for f in settings.additional %}
+                <label>{{ f.split('=')[1] }}:<br/>
+                    <input type="text" name="{{ f.split('=')[0] }}" value="{{ person.options[f.split('=')[0]] }}" style="width:100%;">
+                </label><br/>
+                {% endfor %}
+            </fieldset>
+        </p>
         <p>
             <label>
                 <input type="checkbox" name="active"{%- if person.active %} checked="checked"{%- endif %}/>

diff --git a/emonitor/modules/translations/de/LC_MESSAGES/modules.mo b/emonitor/modules/translations/de/LC_MESSAGES/modules.mo
diff --git a/emonitor/modules/translations/de/LC_MESSAGES/modules.po b/emonitor/modules/translations/de/LC_MESSAGES/modules.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-04-23 23:30+0200\n"
-"PO-Revision-Date: 2016-04-23 23:32+0200\n"
+"POT-Creation-Date: 2016-05-04 20:12+0200\n"
+"PO-Revision-Date: 2016-05-04 20:15+0200\n"
 "Last-Translator: Arne Seifert <[email protected]>\n"
 "Language-Team: de <[email protected]>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -3401,7 +3401,7 @@ msgid "persons.remark"
 msgstr "Bemerkung"
 
 #: emonitor/modules/persons/templates/admin.persons.html:44
-#: emonitor/modules/persons/templates/admin.persons_edit.html:71
+#: emonitor/modules/persons/templates/admin.persons_edit.html:81
 msgid "persons.active"
 msgstr "Aktiv"
 
@@ -3460,7 +3460,8 @@ msgstr "Dienstgrad"
 
 #: emonitor/modules/persons/templates/admin.persons.settings.html:48
 #: emonitor/modules/persons/templates/admin.persons.settings.html:64
-#: emonitor/modules/persons/templates/admin.persons_edit.html:75
+#: emonitor/modules/persons/templates/admin.persons.settings.html:79
+#: emonitor/modules/persons/templates/admin.persons_edit.html:85
 msgid "persons.save"
 msgstr "Speichern"
 
@@ -3474,6 +3475,22 @@ msgstr ""
 "Jedes Mitglied hat in der aktiven Mannschaft eine Dienststellung. Diese wird "
 "für die erweiterte Personalerfassung bei Einsätzen herangezogen."
 
+#: emonitor/modules/persons/templates/admin.persons.settings.html:70
+msgid "persons.additional.label"
+msgstr "Zusätzliche Felder"
+
+#: emonitor/modules/persons/templates/admin.persons.settings.html:71
+msgid "persons.additional.info"
+msgstr ""
+"Für Mitglieder können zusätzliche Felder definiert werden, die individuell "
+"gefüllt werden können.<br/>Die Definition erfolgt zeilenweise in der Form:<br/"
+">'<em>Parametername</em>=<em>Parameter Label</em>'"
+
+#: emonitor/modules/persons/templates/admin.persons.settings.html:74
+#, fuzzy
+msgid "persons.additional.field"
+msgstr "Mitglied hinzufügen"
+
 #: emonitor/modules/persons/templates/admin.persons.upload.html:22
 msgid "persons.upload.headtitle"
 msgstr "Mitgliedersdatei hochladen"
@@ -3632,7 +3649,11 @@ msgstr "Identifikator"
 msgid "persons.birthdate"
 msgstr "Geburtsdatum"
 
-#: emonitor/modules/persons/templates/admin.persons_edit.html:76
+#: emonitor/modules/persons/templates/admin.persons_edit.html:70
+msgid "persons.additional.fields"
+msgstr "Zusatzfelder"
+
+#: emonitor/modules/persons/templates/admin.persons_edit.html:86
 msgid "persons.cancel"
 msgstr "Abbrechen"
 

diff --git a/emonitor/modules/translations/modules.pot b/emonitor/modules/translations/modules.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-04-23 23:30+0200\n"
+"POT-Creation-Date: 2016-05-04 20:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -3209,7 +3209,7 @@ msgid "persons.remark"
 msgstr ""
 
 #: emonitor/modules/persons/templates/admin.persons.html:44
-#: emonitor/modules/persons/templates/admin.persons_edit.html:71
+#: emonitor/modules/persons/templates/admin.persons_edit.html:81
 msgid "persons.active"
 msgstr ""
 
@@ -3263,7 +3263,8 @@ msgstr ""
 
 #: emonitor/modules/persons/templates/admin.persons.settings.html:48
 #: emonitor/modules/persons/templates/admin.persons.settings.html:64
-#: emonitor/modules/persons/templates/admin.persons_edit.html:75
+#: emonitor/modules/persons/templates/admin.persons.settings.html:79
+#: emonitor/modules/persons/templates/admin.persons_edit.html:85
 msgid "persons.save"
 msgstr ""
 
@@ -3275,6 +3276,18 @@ msgstr ""
 msgid "persons.position.info"
 msgstr ""
 
+#: emonitor/modules/persons/templates/admin.persons.settings.html:70
+msgid "persons.additional.label"
+msgstr ""
+
+#: emonitor/modules/persons/templates/admin.persons.settings.html:71
+msgid "persons.additional.info"
+msgstr ""
+
+#: emonitor/modules/persons/templates/admin.persons.settings.html:74
+msgid "persons.additional.field"
+msgstr ""
+
 #: emonitor/modules/persons/templates/admin.persons.upload.html:22
 msgid "persons.upload.headtitle"
 msgstr ""
@@ -3429,7 +3442,11 @@ msgstr ""
 msgid "persons.birthdate"
 msgstr ""
 
-#: emonitor/modules/persons/templates/admin.persons_edit.html:76
+#: emonitor/modules/persons/templates/admin.persons_edit.html:70
+msgid "persons.additional.fields"
+msgstr ""
+
+#: emonitor/modules/persons/templates/admin.persons_edit.html:86
 msgid "persons.cancel"
 msgstr ""