diff options
| -rw-r--r-- | forms.py | 5 | ||||
| -rw-r--r-- | main.py | 33 | ||||
| -rw-r--r-- | templates/search_form_entity.html | 13 |
3 files changed, 26 insertions, 25 deletions
@@ -116,12 +116,9 @@ class EntitySearchForm(Form): entity_name_search_selection = SelectField('', choices=search_options) entity_name_search_actual = SelectField('', choices=actual_options) - entity_number_search = StringField(u'Identifikační číslo:') + entity_number_search = StringField(u'IČO nebo zahraniční registrační číslo:') entity_number_search_selection = SelectField('', choices=search_options) - foreign_entity_number_search = StringField(u'Zahraniční registrační číslo:') - foreign_entity_number_search_selection = SelectField('', choices=search_options) - entity_actual_selection = SelectField('', choices=actual_options) class CompanyForm(Form): @@ -94,28 +94,41 @@ def search_results_entity(search): entity_number = search.entity_number_search.data entity_number_search_method = search.entity_number_search_selection.data - foreign_entity_number = search.foreign_entity_number_search.data - foreign_entity_number_search_method = search.foreign_entity_number_search_selection.data + # foreign_entity_number = search.foreign_entity_number_search.data + # foreign_entity_number_search_method = search.foreign_entity_number_search_selection.data actual_selection = search.entity_actual_selection.data qry = Pravnicka_Osoba.query if entity_number: + qry1 = Pravnicka_Osoba.query if entity_number_search_method == "text_anywhere": qry = qry.filter(Pravnicka_Osoba.ico.contains(entity_number)) + qry1 = qry1.filter(Pravnicka_Osoba.reg_cislo.contains(entity_number)) elif entity_number_search_method == "text_beginning": qry = qry.filter(Pravnicka_Osoba.ico.like(f'{entity_number}%')) + qry1 = qry1.filter(Pravnicka_Osoba.reg_cislo.like(f'{entity_number}%')) elif entity_number_search_method == "text_exact": qry = qry.filter(Pravnicka_Osoba.ico == entity_number) - - if foreign_entity_number: - if foreign_entity_number_search_method == "text_anywhere": - qry = qry.filter(Pravnicka_Osoba.reg_cislo.contains(foreign_entity_number)) - elif foreign_entity_number_search_method == "text_beginning": - qry = qry.filter(Pravnicka_Osoba.reg_cislo.like(f'{foreign_entity_number}%')) - elif foreign_entity_number_search_method == "text_exact": - qry = qry.filter(Pravnicka_Osoba.reg_cislo == foreign_entity_number) + qry1 = qry1.filter(Pravnicka_Osoba.reg_cislo == entity_number) + qry = qry.union(qry1) + + # if entity_number: + # if entity_number_search_method == "text_anywhere": + # qry = qry.filter(Pravnicka_Osoba.ico.contains(entity_number)) + # elif entity_number_search_method == "text_beginning": + # qry = qry.filter(Pravnicka_Osoba.ico.like(f'{entity_number}%')) + # elif entity_number_search_method == "text_exact": + # qry = qry.filter(Pravnicka_Osoba.ico == entity_number) + + # if foreign_entity_number: + # if foreign_entity_number_search_method == "text_anywhere": + # qry = qry.filter(Pravnicka_Osoba.reg_cislo.contains(foreign_entity_number)) + # elif foreign_entity_number_search_method == "text_beginning": + # qry = qry.filter(Pravnicka_Osoba.reg_cislo.like(f'{foreign_entity_number}%')) + # elif foreign_entity_number_search_method == "text_exact": + # qry = qry.filter(Pravnicka_Osoba.reg_cislo == foreign_entity_number) if entity_name: if entity_name_search_method == "text_anywhere": diff --git a/templates/search_form_entity.html b/templates/search_form_entity.html index 70f0b5c..7d3d0ed 100644 --- a/templates/search_form_entity.html +++ b/templates/search_form_entity.html @@ -29,23 +29,14 @@ </div> </div> -<!-- ID No. --> - <div class="row g-2"> - <div class="col-sm-3"> - {{ form.entity_number_search.label }} - </div> - <div class="col-sm"> - {{ form.entity_number_search()|safe }} {{ form.entity_number_search_selection }} - </div> - </div> <!-- Foreign ID No. --> <div class="row g-2"> <div class="col-sm-3"> - {{ form.foreign_entity_number_search.label }} + {{ form.entity_number_search.label }} </div> <div class="col-sm"> - {{ form.foreign_entity_number_search()|safe }} {{ form.foreign_entity_number_search_selection }} + {{ form.entity_number_search()|safe }} {{ form.entity_number_search_selection }} </div> </div> |