malé upravy

- funkce DonorsOverrideForm.init_fields nic nevrací - mv DonorsOverrideForm.{_,}get_field_data - funkce DonorsOverrideForm.get_field_data se chová smysluplněji - vrací výslednou hodnotu místo toho, aby ji ukládala - volá se samostatně místo toho, aby se volala automaticky při validaci - byl zkrácen její kod - test pro DonorsOverride získává informace z databáze a ne regexem ze stránky - view donor/get_overrides nevolá zbytečně str() na string - styl pro podbarvení elementu <mark> byl přesunut na sjednocené místo
frenzymadness · Aug 13, 2021 · dd640ff · dd640ff
1 parent a096fb6
commit dd640ff
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 42 deletions.
diff --git a/registry/donor/forms.py b/registry/donor/forms.py
@@ -68,14 +68,6 @@ class DonorsOverrideForm(FlaskForm):
         "kod_pojistovny",
     ]
 
-    def validate(self):
-        initial_validation = super(DonorsOverrideForm, self).validate()
-        if not initial_validation:
-            return False
-
-        self._get_field_data()
-        return True
-
     def init_fields(self, rodne_cislo):
         override = DonorsOverride.query.get(rodne_cislo)
 
@@ -87,13 +79,9 @@ def init_fields(self, rodne_cislo):
 
         self.rodne_cislo.data = rodne_cislo
 
-        return self
-
-    def _get_field_data(self):
-        self.field_data = {}
+    def get_field_data(self):
+        field_data = {}
         for field in self._fields_:
-            data = getattr(self, field).data
-            if data:
-                self.field_data[field] = data
-            else:
-                self.field_data[field] = None
+            field_data[field] = getattr(self, field).data or None
+
+        return field_data
diff --git a/registry/donor/views.py b/registry/donor/views.py
@@ -102,7 +102,8 @@ def detail(rc):
     note_form = NoteForm()
     if overview.note:
         note_form.note.data = overview.note.note
-    donors_override_form = DonorsOverrideForm().init_fields(rc)
+    donors_override_form = DonorsOverrideForm()
+    donors_override_form.init_fields(rc)
 
     return render_template(
         "donor/detail.html",
@@ -260,7 +261,7 @@ def save_override():
     if form.validate_on_submit():
         if not delete:
             # Save the override
-            override = DonorsOverride(**form.field_data)
+            override = DonorsOverride(**form.get_field_data())
             db.session.merge(override)
             db.session.commit()
 
@@ -289,6 +290,6 @@ def get_overrides():
     overrides_dict = {}
 
     for override in DonorsOverride.query.all():
-        overrides_dict[str(override.rodne_cislo)] = override.to_dict()
+        overrides_dict[override.rodne_cislo] = override.to_dict()
 
     return jsonify(overrides_dict)
diff --git a/registry/templates/donor/award_prep.html b/registry/templates/donor/award_prep.html
@@ -50,14 +50,6 @@ <h1>Přehled dárců k ocenění: {{ medal.title }}</h1>
 
 {% endblock %}
 
-{% block css %}
-<style>
-    mark {
-        background-color: #f7ebb1;
-    }
-</style>
-{% endblock %}
-
 {% block js %}
 <script src="/static/donors_override_highlight.js"></script>
 <script type="text/javascript">

diff --git a/registry/templates/donor/overview.html b/registry/templates/donor/overview.html
@@ -20,14 +20,6 @@ <h1>Přehled dárců</h1>
 
 {% endblock %}
 
-{% block css %}
-<style>
-    mark {
-        background-color: #f7ebb1;
-    }
-</style>
-{% endblock %}
-
 {% block js %}
 <script src="/static/donors_override_highlight.js"></script>
 <script type="text/javascript">

diff --git a/registry/templates/layout.html b/registry/templates/layout.html
@@ -15,6 +15,13 @@
       Evidence dárců ČČK Frýdek-Místek
       {% endblock %}
     </title>
+
+    <style>
+      mark {
+        background-color: #f7ebb1;
+      }
+    </style>
+
     {% block css %}{% endblock %}
   </head>
   <body>

diff --git a/tests/test_donor.py b/tests/test_donor.py
@@ -1,4 +1,3 @@
-import re
 from random import randint
 
 import pytest
@@ -96,8 +95,7 @@ def test_override(self, user, testapp, rodne_cislo):
         login(user, testapp)
         res = testapp.get(url_for("donor.detail", rc=rodne_cislo))
 
-        old_first_name = re.search(r"<li>\s*Jméno: (.*)\s*</li>", str(res)).group(1)
-        old_last_name = re.search(r"<li>\s*Příjmení: (.*)\s*</li>", str(res)).group(1)
+        old_data = DonorsOverview.query.get(rodne_cislo)
 
         # Test save
         form = res.forms["donorsOverrideForm"]
@@ -123,13 +121,13 @@ def test_override(self, user, testapp, rodne_cislo):
         res = form.submit("save_btn").follow()
 
         assert "Výjimka uložena" in res
-        assert ("Jméno: " + old_first_name) in res
+        assert ("Jméno: " + str(old_data.first_name)) in res
         assert "Příjmení: --Last--" in res
 
         # Test deleting the override
         form = res.forms["donorsOverrideForm"]
         res = form.submit("delete_btn").follow()
 
         assert "Výjimka smazána" in res
-        assert ("Jméno: " + old_first_name) in res
-        assert ("Příjmení: " + old_last_name) in res
+        assert ("Jméno: " + str(old_data.first_name)) in res
+        assert ("Příjmení: " + str(old_data.last_name)) in res