diff options
| -rw-r--r-- | forms.py | 28 | ||||
| -rw-r--r-- | justice_main.py | 4 | ||||
| -rw-r--r-- | main.py | 71 | ||||
| -rw-r--r-- | models.py | 6 | ||||
| -rw-r--r-- | templates/extract-actual.html | 73 | ||||
| -rw-r--r-- | templates/extract.html | 22 | ||||
| -rw-r--r-- | templates/results2.html | 47 | ||||
| -rw-r--r-- | templates/search_form.html | 27 | ||||
| -rw-r--r-- | todolist.html | 4 |
9 files changed, 210 insertions, 72 deletions
@@ -20,18 +20,31 @@ class JusticeSearchForm(Form): ("text_beginning","Začátek výrazu"), ("text_exact","Přesný výraz"), ] + actual_options = [("actual_results","Jen platné"), + ("complete_results","Platné i neplatné"),] nazev_subjektu = StringField(u'Název subjektu:') nazev_subjektu_selection = SelectField('', choices=search_options) + nazev_search_actual = SelectField('', choices=actual_options) + ico_search = StringField(u'Identifikační číslo:') ico_search_selection = SelectField('', choices=search_options) + obec_search = StringField(u'Obec:') - obec_search_selection = SelectField('', choices=search_options) + obec_search_selection = SelectField('', choices=search_options) + obec_search_actual = SelectField('', choices=actual_options) + ulice_search = StringField(u'Ulice:') - ulice_search_selection = SelectField('', choices=search_options) + ulice_search_selection = SelectField('', choices=search_options) + ulice_search_actual = SelectField('', choices=actual_options) + oddil_search = StringField(u'Oddíl:') oddil_search_selection = SelectField('', choices=search_options) + oddil_search_actual = SelectField('', choices=actual_options) + vlozka_search = StringField(u'Vložka:') - vlozka_search_selection = SelectField('', choices=search_options) + vlozka_search_selection = SelectField('', choices=search_options) + vlozka_search_actual = SelectField('', choices=actual_options) + formy = [ ("",""), ('Akciová společnost', 'Akciová společnost'), ('Společnost s ručením omezeným', 'Společnost s ručením omezeným'), @@ -57,6 +70,8 @@ class JusticeSearchForm(Form): ('Evropská družstevní společnost', 'Evropská družstevní společnost'), ] pravni_forma_search = SelectField(u'Právní forma:', choices=formy) + pravni_forma_actual = SelectField('', choices=actual_options) + soudy = [("",""), ("MSPH","Městský soud v Praze"), ("KSCB","Krajský soud v Českých Budějovicích"), @@ -66,7 +81,9 @@ class JusticeSearchForm(Form): ("KSBR","Krajský soud v Brně"), ("KSOS","Krajský soud v Ostravě"), ] - soud_search = SelectField(u'Rejstříkjový soud:', choices=soudy) + soud_search = SelectField(u'Rejstříkjový soud:', choices=soudy) + soud_search_actual = SelectField('', choices=actual_options) + insolvent_only_search = BooleanField("Pouze společnosti s insolvenčním zápisem") zapis_do = DateField(u'Zapsáno do:', format='%Y-%m-%d') zapis_od = DateField(u'Zapsáno od:', format='%Y-%m-%d') @@ -83,5 +100,6 @@ class CompanyForm(Form): oddil = SelectField('oddil', choices=oddil) vlozka = StringField('vlozka') soud = StringField('soud') - + +
\ No newline at end of file diff --git a/justice_main.py b/justice_main.py index f5cf561..38d6cce 100644 --- a/justice_main.py +++ b/justice_main.py @@ -184,7 +184,9 @@ def find_spolecnik(c, ICO, elem2, conn, primary_sql_key, element): zapis_datum = str(get_prop(elem, "zapisDatum"))
vymaz_datum = str(get_prop(elem, "vymazDatum"))
spolecnik_oznaceni = str(get_prop(elem, "hlavicka"))
- if spolecnik_type == "SPOLECNIK_OSOBA" and spolecnik_oznaceni == "Společník":
+ # TODO Chech these conditions, they sometimes cause a person not being stored (IC 27650081)
+ # if spolecnik_type == "SPOLECNIK_OSOBA" and spolecnik_oznaceni == "Společník":
+ if spolecnik_type == "SPOLECNIK_OSOBA":
# TODO alternativy pro None, Spolecny podil a Uvolneny podil
text_spolecnik = str(get_prop(elem, "hodnotaUdaje/textZaOsobu/value"))
nazev = str(get_prop(elem, "osoba/nazev"))
@@ -7,7 +7,7 @@ from flask import flash, render_template, request, redirect from models import Company, Obce, Ulice, Insolvency_Events, Predmet_Podnikani, Predmety_Podnikani_Association, Predmet_Cinnosti, Predmety_Cinnosti_Association from models import Zakladni_Kapital, Akcie, Nazvy, Sidlo, Sidlo_Association, Pravni_Forma_Association_v2, Pravni_Formy, Statutarni_Organ_Association, Statutarni_Organy, Pocty_Clenu_Organu from models import Zpusob_Jednani_Association, Zpusob_Jednani, Statutarni_Organ_Clen_Association, Fyzicka_Osoba, Spolecnici_Association, Podily_Association, Druhy_Podilu, Pravnicka_Osoba -from models import Prokurista_Association, Jediny_Akcionar_Association, Prokura_Common_Text_Association +from models import Prokurista_Association, Jediny_Akcionar_Association, Prokura_Common_Text_Association, Soudni_Zapisy from tables import Results init_db() @@ -24,28 +24,41 @@ def index(): @app.route('/results') def search_results(search): results = [] + ico = search.ico_search.data ico_search_method = search.ico_search_selection.data + nazev = search.nazev_subjektu.data nazev_search_method = search.nazev_subjektu_selection.data + nazev_actual_or_full = search.nazev_search_actual.data + oddil = search.oddil_search.data oddil_search_method = search.oddil_search_selection.data + oddil_actual_or_full = search.oddil_search_actual.data + vlozka = search.vlozka_search.data vlozka_search_method = search.vlozka_search_selection.data + vlozka_actual_or_full = search.vlozka_search_actual.data + obec = search.obec_search.data obec_search_method = search.obec_search_selection.data + ulice = search.ulice_search.data ulice_search_method = search.ulice_search_selection.data + pravni_forma = search.pravni_forma_search.data + pravni_forma_actual_or_full = search.pravni_forma_actual.data + soud = search.soud_search.data + soud_actual_or_full = search.soud_search_actual.data + + insolvent_only = search.insolvent_only_search.data + zapsano_od = search.zapis_od.data zapsano_do = search.zapis_do.data + qry = Company.query - # if insolvent_only == False: - # qry = Company.query.join(Obce, Company.obec).join(Ulice, Company.ulice).join(Pravni_Forma, Company.pravni_forma).join(Insolvency_Events, isouter=True) - # else: - # qry = Company.query.join(Obce, Company.obec).join(Ulice, Company.ulice).join(Pravni_Forma, Company.pravni_forma).join(Insolvency_Events, Company.insolvence) if ico: if ico_search_method == "text_anywhere": qry = qry.filter(Company.ico.contains(ico)) @@ -53,30 +66,40 @@ def search_results(search): qry = qry.filter(Company.ico.like(f'{ico}%')) elif ico_search_method == "text_exact": qry = qry.filter(Company.ico == ico) + if nazev: + qry = qry.join(Nazvy, Company.obchodni_firma) + if nazev_actual_or_full == "actual_results": + qry = qry.filter(Nazvy.vymaz_datum == 0) if nazev_search_method == "text_anywhere": - qry = qry.filter(Company.nazev.contains(nazev)) + qry = qry.filter(Nazvy.nazev_text.contains(nazev)) elif nazev_search_method == "text_beginning": - qry = qry.filter(Company.nazev.like(f'{nazev}%')) + qry = qry.filter(Nazvy.nazev_text.like(f'{nazev}%')) elif nazev_search_method == "text_exact": - qry = qry.filter(Company.nazev == nazev) + qry = qry.filter(Nazvy.nazev_text == nazev) + if oddil: + qry = qry.join(Soudni_Zapisy, Company.soudni_zapis) + if oddil_actual_or_full == "actual_results": + qry = qry.filter(Soudni_Zapisy.vymaz_datum == 0) if oddil_search_method == "text_anywhere": qry = qry.filter(Company.oddil.contains(oddil)) elif oddil_search_method == "text_beginning": qry = qry.filter(Company.oddil.like(f'{oddil}%')) elif oddil_search_method == "text_exact": qry = qry.filter(Company.oddil == oddil) - # qry = qry.filter(Company.oddil.contains(oddil)) + if vlozka: + qry = qry.join(Soudni_Zapisy, Company.soudni_zapis) + if vlozka_actual_or_full == "actual_results": + qry = qry.filter(Soudni_Zapisy.vymaz_datum == 0) if vlozka_search_method == "text_anywhere": - qry = qry.filter(Company.vlozka.contains(vlozka)) + qry = qry.filter(Soudni_Zapisy.vlozka.contains(vlozka)) elif vlozka_search_method == "text_beginning": - qry = qry.filter(Company.vlozka.like(f'{vlozka}%')) + qry = qry.filter(Soudni_Zapisy.vlozka.like(f'{vlozka}%')) elif vlozka_search_method == "text_exact": - qry = qry.filter(Company.vlozka == vlozka) + qry = qry.filter(Soudni_Zapisy.vlozka == vlozka) - # qry = qry.filter(Company.vlozka.contains(vlozka)) if obec: qry = qry.join(Obce, Company.obec) if obec_search_method == "text_anywhere": @@ -85,7 +108,7 @@ def search_results(search): qry = qry.filter(Obce.obec_jmeno.like(f'{obec}%')) elif obec_search_method == "text_exact": qry = qry.filter(Obce.obec_jmeno == obec) - # qry = qry.filter(Obce.obec_jmeno.contains(obec)) + if ulice: qry = qry.join(Ulice, Company.ulice) if ulice_search_method == "text_anywhere": @@ -94,12 +117,24 @@ def search_results(search): qry = qry.filter(Ulice.ulice_jmeno.like(f'{ulice}%')) elif ulice_search_method == "text_exact": qry = qry.filter(Ulice.ulice_jmeno == ulice) - # qry = qry.filter(Ulice.ulice_jmeno.contains(ulice)) + if pravni_forma: - qry = qry.join(Pravni_Forma, Company.pravni_forma) - qry = qry.filter(Pravni_Forma.pravni_forma.contains(pravni_forma)) + qry = qry.join(Pravni_Forma_Association_v2, Company.pravni_forma_text) + if pravni_forma_actual_or_full == "actual_results": + qry = qry.filter(Pravni_Forma_Association_v2.vymaz_datum == 0) + qry = qry.join(Pravni_Formy, Pravni_Forma_Association_v2.pravni_forma_text) + qry = qry.filter(Pravni_Formy.pravni_forma == pravni_forma) + if soud: - qry = qry.filter(Company.soud.contains(soud)) + qry = qry.join(Soudni_Zapisy, Company.soudni_zapis) + if soud_actual_or_full == "actual_results": + qry = qry.filter(Soudni_Zapisy.vymaz_datum == 0) + qry = qry.filter(Soudni_Zapisy.soud == soud) + + # qry = qry.filter(Company.soud.contains(soud)) + + + if zapsano_od: qry = qry.filter(Company.zapis >= zapsano_od) if zapsano_do: @@ -78,8 +78,8 @@ class MyType(types.TypeDecorator): impl = types.Unicode - def process_bind_param(self, value, dialect): - return convert_date_to_string(value) + # def process_bind_param(self, value, dialect): + # return convert_date_to_string(value) def process_result_value(self, value, dialect): # return "PREFIX:" + value @@ -321,7 +321,7 @@ class Company(db.Model): ostatni_skutecnosti = db.relationship("Ostatni_Skutecnosti", backref="companies") akcie = db.relationship("Akcie", backref="companies") obchodni_firma = db.relationship("Nazvy", backref="companies") - soudni_zapis = db.relationship("Soudni_Zapisy", backref="companies") + soudni_zapis = db.relationship("Soudni_Zapisy") sidlo_text = db.relationship("Sidlo_Association", back_populates="company") pravni_forma_text = db.relationship("Pravni_Forma_Association_v2", back_populates="company") statutarni_organ_text = db.relationship("Statutarni_Organ_Association", back_populates="company") diff --git a/templates/extract-actual.html b/templates/extract-actual.html index b782914..e7e2628 100644 --- a/templates/extract-actual.html +++ b/templates/extract-actual.html @@ -28,6 +28,13 @@ {% endif %} {% endfor %} +{% set statutarni_organ_notes = [] %} +{% for i in range (row.statutarni_organ_text|length) %} + {% if row.statutarni_organ_text[i].vymaz_datum == 0 %} + {% set statutarni_organ_notes = statutarni_organ_notes.append(row.statutarni_organ_text[i]) %} + {% endif %} +{% endfor %} + {% set spolecnici_notes = [] %} {% for i in range (row.spolecnici|length) %} {% if row.spolecnici[i].vymaz_datum == 0 %} @@ -249,6 +256,58 @@ <!-- END Display areas of activities --> <!-- Display statutory bodies --> + {% if statutarni_organ_notes|length > 0 %} + {% for i in range (statutarni_organ_notes|length) %} + <tr> + <td>{{ statutarni_organ_notes[i].statutarni_organ_text.statutarni_organ_text }}:</td> + <td></td> + </tr> + + <!-- Display individual members --> + {% if statutarni_organ_notes[i].clenove|length > 0 %} + {% for j in range (statutarni_organ_notes[i].clenove|length) %} + {% if statutarni_organ_notes[i].clenove[j].vymaz_datum == 0 %} + <tr> + <td style = padding-left:2em>{% if statutarni_organ_notes[i].clenove[j].funkce != "0" %} {{ statutarni_organ_notes[i].clenove[j].funkce }} {% endif %}</td> + <td>{% if statutarni_organ_notes[i].clenove[j].jmeno.jmeno != "0" %}{{ statutarni_organ_notes[i].clenove[j].jmeno.jmeno }} {% endif %} + {{ statutarni_organ_notes[i].clenove[j].jmeno.prijmeni }}{% if statutarni_organ_notes[i].clenove[j].jmeno.datum_naroz != "" %}, nar. {{ statutarni_organ_notes[i].clenove[j].jmeno.datum_naroz }}{% endif %} <br> + {{ statutarni_organ_notes[i].clenove[j].adresa.adresa_text }} + {% if statutarni_organ_notes[i].clenove[j].funkce_od != 0 %}<br>Den vzniku funkce: {{ statutarni_organ_notes[i].clenove[j].funkce_od}}{% endif %} + {% if statutarni_organ_notes[i].clenove[j].clenstvi_od != 0 %}<br>Den vzniku členství: {{ statutarni_organ_notes[i].clenove[j].clenstvi_od}}{% endif %}</td> + </tr> + {% endif %} + {% endfor %} + {% endif %} + <!-- END Display individual members --> + + <!-- Display number of members --> + {% if statutarni_organ_notes[i].pocet_clenu|length > 0 %} + {% for j in range (statutarni_organ_notes[i].pocet_clenu|length) %} + {% if statutarni_organ_notes[i].pocet_clenu[j].vymaz_datum == 0 %} + <tr> + <td style = padding-left:2em>Počet členů:</td> + <td>{{ statutarni_organ_notes[i].pocet_clenu[j].pocet_clenu_value }}</td> + </tr> + {% endif %} + {% endfor %} + {% endif %} + <!-- END Display number of members --> + + <!-- Display method of representation --> + {% if statutarni_organ_notes[i].zpusoby_jednani|length > 0 %} + {% for j in range (statutarni_organ_notes[i].zpusoby_jednani|length) %} + {% if statutarni_organ_notes[i].zpusoby_jednani[j].vymaz_datum == 0 %} + <tr> + <td style = padding-left:2em>Způsob jednání:</td> + <td>{{ statutarni_organ_notes[i].zpusoby_jednani[j].zpusob_jednani.zpusob_jednani_text }}</td> + </tr> + {% endif %} + {% endfor %} + {% endif %} + <!-- END Display method of representation --> + + {% endfor %} + {% endif %} <!-- END Display statutory bodies --> <!-- Display supervisory board--> @@ -264,7 +323,8 @@ {% if dozorci_rada_notes[i].clenove[j].vymaz_datum == 0 %} <tr> <td style = padding-left:2em>{% if dozorci_rada_notes[i].clenove[j].funkce != "0" %} {{dozorci_rada_notes[i].clenove[j].funkce }} {% endif %}</td> - <td>{{ dozorci_rada_notes[i].clenove[j].jmeno.jmeno }} {{ dozorci_rada_notes[i].clenove[j].jmeno.prijmeni }}{% if dozorci_rada_notes[i].clenove[j].jmeno.datum_naroz != "" %}, nar. {{ dozorci_rada_notes[i].clenove[j].jmeno.datum_naroz }}{% endif %} <br> + <td>{% if dozorci_rada_notes[i].clenove[j].jmeno.jmeno != 0 %}{{ dozorci_rada_notes[i].clenove[j].jmeno.jmeno }} {% endif %} + {{ dozorci_rada_notes[i].clenove[j].jmeno.prijmeni }}{% if dozorci_rada_notes[i].clenove[j].jmeno.datum_naroz != "" %}, nar. {{ dozorci_rada_notes[i].clenove[j].jmeno.datum_naroz }}{% endif %} <br> {{ dozorci_rada_notes[i].clenove[j].adresa.adresa_text }} {% if dozorci_rada_notes[i].clenove[j].funkce_od != 0 %}<br>Den vzniku funkce: {{ dozorci_rada_notes[i].clenove[j].funkce_od}}{% endif %} {% if dozorci_rada_notes[i].clenove[j].clenstvi_od != 0 %}<br>Den vzniku členství: {{ dozorci_rada_notes[i].clenove[j].clenstvi_od}}{% endif %}</td> @@ -294,7 +354,8 @@ {% for i in range (prokurist_notes|length) %} <tr> <td>{% if i == 0%}Prokura:{% endif %}</td> - <td>{{ prokurist_notes[i].jmeno.jmeno }} {{ prokurist_notes[i].jmeno.prijmeni }}{% if prokurist_notes[i].jmeno.datum_naroz != "" %}, nar. {{ prokurist_notes[i].jmeno.datum_naroz }}{% endif %}<br> + <td>{% if prokurist_notes[i].jmeno.jmeno != "0" %}{{ prokurist_notes[i].jmeno.jmeno }} {% endif %} + {{ prokurist_notes[i].jmeno.prijmeni }}{% if prokurist_notes[i].jmeno.datum_naroz != "" %}, nar. {{ prokurist_notes[i].jmeno.datum_naroz }}{% endif %}<br> {{ prokurist_notes[i].adresa.adresa_text }}{% if prokurist_notes[i].text_prokurista != "0" %}<br>{{ prokurist_notes[i].text_prokurista }}{% endif %}</td> </tr> {% endfor %} @@ -314,7 +375,9 @@ {% for i in range (sole_shareholder_notes|length) %} <tr> <td>{% if i == 0%}Jediný akcionář:{% endif %}</td> - <td>{% if sole_shareholder_notes[i].akcionar_po_id == None %} {{ sole_shareholder_notes[i].jmeno.jmeno }} {{ sole_shareholder_notes[i].jmeno.prijmeni }}{% if sole_shareholder_notes[i].jmeno.datum_naroz != "" %}, nar. {{ sole_shareholder_notes[i].jmeno.datum_naroz }}{% endif %} {% endif %} + <td>{% if sole_shareholder_notes[i].akcionar_po_id == None %} + {% if sole_shareholder_notes[i].jmeno.jmeno != "0" %}{{ sole_shareholder_notes[i].jmeno.jmeno }} {% endif %} + {{ sole_shareholder_notes[i].jmeno.prijmeni }}{% if sole_shareholder_notes[i].jmeno.datum_naroz != "" %}, nar. {{ sole_shareholder_notes[i].jmeno.datum_naroz }}{% endif %} {% endif %} {% if sole_shareholder_notes[i].akcionar_fo_id == None %} {{ sole_shareholder_notes[i].oznaceni_po.nazev }}{% if sole_shareholder_notes[i].oznaceni_po.reg_cislo != 0 %}, reg č. {{ sole_shareholder_notes[i].oznaceni_po.reg_cislo }}{% endif %}{% if sole_shareholder_notes[i].oznaceni_po.ico != 0 %}, IČ {{ sole_shareholder_notes[i].oznaceni_po.ico }}{% endif %} {% endif %} <br>{{sole_shareholder_notes[i].adresa.adresa_text}}</td> </tr> @@ -331,7 +394,9 @@ {% for i in range (spolecnici_notes|length) %} <tr> <td style = padding-left:2em>Společník:</td> - <td>{% if spolecnici_notes[i].spolecnik_po_id == None %} {{ spolecnici_notes[i].jmeno.jmeno }} {{ spolecnici_notes[i].jmeno.prijmeni }}{% if spolecnici_notes[i].jmeno.datum_naroz != "" %}, nar. {{ spolecnici_notes[i].jmeno.datum_naroz }}{% endif %} {% endif %} + <td>{% if spolecnici_notes[i].spolecnik_po_id == None %} + {% if spolecnici_notes[i].jmeno.jmeno != "0" %}{{ spolecnici_notes[i].jmeno.jmeno }} {% endif %} + {{ spolecnici_notes[i].jmeno.prijmeni }}{% if spolecnici_notes[i].jmeno.datum_naroz != "" %}, nar. {{ spolecnici_notes[i].jmeno.datum_naroz }}{% endif %} {% endif %} {% if spolecnici_notes[i].spolecnik_fo_id == None %} {{ spolecnici_notes[i].oznaceni_po.nazev }}{% if spolecnici_notes[i].oznaceni_po.reg_cislo != 0 %}, reg č. {{ spolecnici_notes[i].oznaceni_po.reg_cislo }}{% endif %}{% if spolecnici_notes[i].oznaceni_po.ico != 0 %}, IČ {{ spolecnici_notes[i].oznaceni_po.ico }}{% endif %} {% endif %} <br>{{spolecnici_notes[i].adresa.adresa_text}}</td> </tr> diff --git a/templates/extract.html b/templates/extract.html index 0c35181..512ac22 100644 --- a/templates/extract.html +++ b/templates/extract.html @@ -238,7 +238,9 @@ {% set underlne_style_open = "" %} {% set underlne_style_close = "" %} {% endif %} - <td>{{ underlne_style_open|safe }} {{ row.statutarni_organ_text[i].clenove[j].jmeno.jmeno }} {{ row.statutarni_organ_text[i].clenove[j].jmeno.prijmeni }}{% if row.statutarni_organ_text[i].clenove[j].jmeno.datum_naroz != "" %}, nar. {{ row.statutarni_organ_text[i].clenove[j].jmeno.datum_naroz }}{% endif %} <br> + <td>{{ underlne_style_open|safe }} + {% if row.statutarni_organ_text[i].clenove[j].jmeno.jmeno != "0" %}{{ row.statutarni_organ_text[i].clenove[j].jmeno.jmeno }} {% endif %} + {{ row.statutarni_organ_text[i].clenove[j].jmeno.prijmeni }}{% if row.statutarni_organ_text[i].clenove[j].jmeno.datum_naroz != "" %}, nar. {{ row.statutarni_organ_text[i].clenove[j].jmeno.datum_naroz }}{% endif %} <br> {{ row.statutarni_organ_text[i].clenove[j].adresa.adresa_text }} {% if row.statutarni_organ_text[i].clenove[j].funkce_od != 0 %}<br>Den vzniku funkce: {{ row.statutarni_organ_text[i].clenove[j].funkce_od}}{% endif %} {% if row.statutarni_organ_text[i].clenove[j].funkce_do != 0 %}<br>Den zániku funkce: {{ row.statutarni_organ_text[i].clenove[j].funkce_do}}{% endif %} @@ -255,7 +257,7 @@ {% if row.statutarni_organ_text[i].pocet_clenu|length > 0 %} {% for j in range (row.statutarni_organ_text[i].pocet_clenu|length) %} <tr> - <td style = padding-left:2em>{% if j == 0%}Počet členů orgánů:{% endif %}</td> + <td style = padding-left:2em>{% if j == 0%}Počet členů:{% endif %}</td> {% if row.statutarni_organ_text[i].pocet_clenu[j].vymaz_datum != 0 %} {% set underlne_style_open = undedrline_open_deleted %} {% set underlne_style_close = undedrline_closed_deleted %} @@ -321,7 +323,9 @@ {% set underlne_style_open = "" %} {% set underlne_style_close = "" %} {% endif %} - <td>{{ underlne_style_open|safe }} {{ row.dozorci_rada_text[i].clenove[j].jmeno.jmeno }} {{ row.dozorci_rada_text[i].clenove[j].jmeno.prijmeni }}{% if row.dozorci_rada_text[i].clenove[j].jmeno.datum_naroz != "" %}, nar. {{ row.dozorci_rada_text[i].clenove[j].jmeno.datum_naroz }}{% endif %} <br> + <td>{{ underlne_style_open|safe }} + {% if row.dozorci_rada_text[i].clenove[j].jmeno.jmeno != "0" %}{{ row.dozorci_rada_text[i].clenove[j].jmeno.jmeno }} {% endif %} + {{ row.dozorci_rada_text[i].clenove[j].jmeno.prijmeni }}{% if row.dozorci_rada_text[i].clenove[j].jmeno.datum_naroz != "" %}, nar. {{ row.dozorci_rada_text[i].clenove[j].jmeno.datum_naroz }}{% endif %} <br> {{ row.dozorci_rada_text[i].clenove[j].adresa.adresa_text }} {% if row.dozorci_rada_text[i].clenove[j].funkce_od != 0 %}<br>Den vzniku funkce: {{ row.dozorci_rada_text[i].clenove[j].funkce_od}}{% endif %} {% if row.dozorci_rada_text[i].clenove[j].funkce_do != 0 %}<br>Den zániku funkce: {{ row.dozorci_rada_text[i].clenove[j].funkce_do}}{% endif %} @@ -375,7 +379,9 @@ {% set underlne_style_open = "" %} {% set underlne_style_close = "" %} {% endif %} - <td>{{ underlne_style_open|safe }} {{ row.prokurista[i].jmeno.jmeno }} {{ row.prokurista[i].jmeno.prijmeni }}{% if row.prokurista[i].jmeno.datum_naroz != "" %}, nar. {{ row.prokurista[i].jmeno.datum_naroz }}{% endif %}<br> + <td>{{ underlne_style_open|safe }} + {% if row.prokurista[i].jmeno.jmeno != "0" %}{{ row.prokurista[i].jmeno.jmeno }} {% endif %} + {{ row.prokurista[i].jmeno.prijmeni }}{% if row.prokurista[i].jmeno.datum_naroz != "" %}, nar. {{ row.prokurista[i].jmeno.datum_naroz }}{% endif %}<br> {{ row.prokurista[i].adresa.adresa_text }}{% if row.prokurista[i].text_prokurista != "0" %}<br>{{ row.prokurista[i].text_prokurista }}{% endif %}{{ underlne_style_close|safe }}</td> <td>{{ underlne_style_open|safe }} Zapsáno: {{ row.prokurista[i].zapis_datum }} {% if row.prokurista[i].vymaz_datum != 0 %} <br> Vymazáno: {{ row.prokurista[i].vymaz_datum }} {% endif %} {{ underlne_style_close|safe }}</td> </tr> @@ -416,7 +422,9 @@ {% set underlne_style_open = "" %} {% set underlne_style_close = "" %} {% endif %} - <td>{{ underlne_style_open|safe }} {% if row.jediny_akcionar[i].akcionar_po_id == None %} {{ row.jediny_akcionar[i].jmeno.jmeno }} {{ row.jediny_akcionar[i].jmeno.prijmeni }}{% if row.jediny_akcionar[i].jmeno.datum_naroz != "" %}, nar. {{ row.jediny_akcionar[i].jmeno.datum_naroz }}{% endif %} {% endif %} + <td>{{ underlne_style_open|safe }} {% if row.jediny_akcionar[i].akcionar_po_id == None %} + {% if row.jediny_akcionar[i].jmeno.jmeno != "0" %}{{ row.jediny_akcionar[i].jmeno.jmeno }} {% endif %} + {{ row.jediny_akcionar[i].jmeno.prijmeni }}{% if row.jediny_akcionar[i].jmeno.datum_naroz != "" %}, nar. {{ row.jediny_akcionar[i].jmeno.datum_naroz }}{% endif %} {% endif %} {% if row.jediny_akcionar[i].akcionar_fo_id == None %} {{ row.jediny_akcionar[i].oznaceni_po.nazev }}{% if row.jediny_akcionar[i].oznaceni_po.reg_cislo != 0 %}, reg č. {{ row.jediny_akcionar[i].oznaceni_po.reg_cislo }}{% endif %}{% if row.jediny_akcionar[i].oznaceni_po.ico != 0 %}, IČ {{ row.jediny_akcionar[i].oznaceni_po.ico }}{% endif %} {% endif %} <br>{{row.jediny_akcionar[i].adresa.adresa_text}} {{ underlne_style_close|safe }}</td> <td>{{ underlne_style_open|safe }} Zapsáno: {{ row.jediny_akcionar[i].zapis_datum }} {% if row.jediny_akcionar[i].vymaz_datum != 0 %} <br> Vymazáno: {{ row.jediny_akcionar[i].vymaz_datum }} {% endif %} {{ underlne_style_close|safe }}</td> @@ -442,7 +450,9 @@ {% set underlne_style_open = "" %} {% set underlne_style_close = "" %} {% endif %} - <td>{{ underlne_style_open|safe }} {% if row.spolecnici[i].spolecnik_po_id == None %} {{ row.spolecnici[i].jmeno.jmeno }} {{ row.spolecnici[i].jmeno.prijmeni }}{% if row.spolecnici[i].jmeno.datum_naroz != "" %}, nar. {{ row.spolecnici[i].jmeno.datum_naroz }}{% endif %} {% endif %} + <td>{{ underlne_style_open|safe }} {% if row.spolecnici[i].spolecnik_po_id == None %} + {% if row.spolecnici[i].jmeno.jmeno != "0" %}{{ row.spolecnici[i].jmeno.jmeno }} {% endif %} + {{ row.spolecnici[i].jmeno.prijmeni }}{% if row.spolecnici[i].jmeno.datum_naroz != "" %}, nar. {{ row.spolecnici[i].jmeno.datum_naroz }}{% endif %} {% endif %} {% if row.spolecnici[i].spolecnik_fo_id == None %} {{ row.spolecnici[i].oznaceni_po.nazev }} {% if row.spolecnici[i].oznaceni_po.reg_cislo != 0 %}, reg č. {{ row.spolecnici[i].oznaceni_po.reg_cislo }}{% endif %}{% if row.spolecnici[i].oznaceni_po.ico != 0 %}, IČ {{ row.spolecnici[i].oznaceni_po.ico }}{% endif %} {% endif %} <br>{{row.spolecnici[i].adresa.adresa_text}} {{ underlne_style_close|safe }}</td> <td>{{ underlne_style_open|safe }} Zapsáno: {{ row.spolecnici[i].zapis_datum }} {% if row.spolecnici[i].vymaz_datum != 0 %} <br> Vymazáno: {{ row.spolecnici[i].vymaz_datum }} {% endif %} {{ underlne_style_close|safe }}</td> diff --git a/templates/results2.html b/templates/results2.html index a482de2..4f8bf73 100644 --- a/templates/results2.html +++ b/templates/results2.html @@ -6,28 +6,23 @@ {% for row in results %} {% set insolvency_notes = [] %} - {% for elem in row.insolvence %} - {% set insolvency_notes = insolvency_notes.append(elem.insolvency_event) %} + {% for i in range (row.insolvence|length) %} + {% if row.insolvence[i].vymaz_datum == 0 %} + {% set insolvency_notes = insolvency_notes.append(row.insolvence[i].insolvency_event) %} + {% endif %} + {% endfor %} + + {% set soud = [] %} + {% set oddil = [] %} + {% set vlozka = [] %} + {% for i in range (row.soudni_zapis|length) %} + {% if row.soudni_zapis[i].vymaz_datum == 0 %} + {% set soud = soud.append(row.soudni_zapis[i].soud) %} + {% set oddil = oddil.append(row.soudni_zapis[i].oddil) %} + {% set vlozka = vlozka.append(row.soudni_zapis[i].vlozka) %} + {% endif %} {% endfor %} - - - {% if row.soud == "MSPH" %} - {% set soud = "Městského soudu v Praze" %} - {% elif row.soud == "KSCB" %} - {% set soud = "Krajského soudu v Českých Budějovicích" %} - {% elif row.soud == "KSOS" %} - {% set soud = "Krajského soudu v Ostravě" %} - {% elif row.soud == "KSPL" %} - {% set soud = "Krajského soudu v Plzni" %} - {% elif row.soud == "KSBR" %} - {% set soud = "Krajského soudu v Brně" %} - {% elif row.soud == "KSHK" %} - {% set soud = "Krajského soudu v Hradci Králové" %} - {% elif row.soud == "KSUL" %} - {% set soud = "Krajského soudu v Ústí nad Labem" %} - {% endif %} - {% if insolvency_notes|length > 0 %} {% set table_style = "table table-danger" %} {% elif loop.index % 2 == 0 %} @@ -46,9 +41,13 @@ {% set ico_buffer = "" %} {% endif %} + {% set sidlo = [] %} + {% for i in range (row.sidlo_text|length) %} + {% if row.sidlo_text[i].vymaz_datum == 0 %} + {% set sidlo = sidlo.append(row.sidlo_text[i].sidlo_text.adresa_text) %} + {% endif %} + {% endfor %} - - <table class= "{{table_style}}" style="width: 100%"> <p></p> <tr> @@ -59,13 +58,13 @@ </tr> <tr> <td>Spisová značka:</td> - <td>{{ row.oddil }} {{ row.vlozka }} vedená u {{ soud }}</td> + <td>{{ oddil|join("") }} {{ vlozka|join("") }} vedená u {{ soud|join("") }}</td> <td>Den zápisu:</td> <td>{{row.zapis}}</td> </tr> <tr> <td>Sídlo:</td> - <td>{{ row.sidlo }}</td> + <td>{{ sidlo|join("") }}</td> <td><a href="/{{ row.ico }}">Úplný výpis</a></td> <td><a href="/{{ row.ico }}-actual">Aktuální výpis</a></td> </tr> diff --git a/templates/search_form.html b/templates/search_form.html index cd483e2..1832f87 100644 --- a/templates/search_form.html +++ b/templates/search_form.html @@ -23,7 +23,7 @@ {{ form.nazev_subjektu.label }} </div> <div class="col-sm"> - {{ form.nazev_subjektu()|safe }} {{ form.nazev_subjektu_selection }} + {{ form.nazev_subjektu()|safe }} {{ form.nazev_subjektu_selection }} {{ form.nazev_search_actual }} </div> </div> @@ -41,7 +41,7 @@ {{ form.obec_search.label }} </div> <div class="col-sm"> - {{ form.obec_search()|safe }} {{ form.obec_search_selection }} + {{ form.obec_search()|safe }} {{ form.obec_search_selection }} {{ form.obec_search_actual }} </div> </div> @@ -50,7 +50,7 @@ {{ form.ulice_search.label }} </div> <div class="col-sm"> - {{ form.ulice_search()|safe }} {{ form.ulice_search_selection }} + {{ form.ulice_search()|safe }} {{ form.ulice_search_selection }} {{ form.ulice_search_actual }} </div> </div> @@ -59,7 +59,7 @@ {{ form.oddil_search.label }} </div> <div class="col-sm"> - {{ form.oddil_search()|safe }} {{ form.oddil_search_selection }} + {{ form.oddil_search()|safe }} {{ form.oddil_search_selection }} {{ form.oddil_search_actual }} </div> </div> @@ -68,15 +68,28 @@ {{ form.vlozka_search.label }} </div> <div class="col-sm"> - {{ form.vlozka_search()|safe }} {{ form.vlozka_search_selection }} + {{ form.vlozka_search()|safe }} {{ form.vlozka_search_selection }} {{ form.vlozka_search_actual }} </div> </div> + <div class="row g-2"> - {{ render_field(form.pravni_forma_search) }} + <div class="col-sm-3"> + {{ form.pravni_forma_search.label }} + </div> + <div class="col-sm"> + {{ form.pravni_forma_search()|safe }} {{ form.pravni_forma_actual }} + </div> </div> + <div class="row g-2"> - {{ render_field(form.soud_search) }} + <div class="col-sm-3"> + {{ form.soud_search.label }} + </div> + <div class="col-sm"> + {{ form.soud_search()|safe }} {{ form.soud_search_actual }} + </div> </div> + <div class="row g-2"> {{ render_field(form.insolvent_only_search) }} </div> diff --git a/todolist.html b/todolist.html index 93a2344..eebf0e8 100644 --- a/todolist.html +++ b/todolist.html @@ -1,9 +1,5 @@ <ol> - <li>Remove excessive repetition in the extract.</li> - <li>Update the code of actual extract to make it work again.</li> - <li>Fix how I determine whether a person is a natural person when storing the data about the shareholders.</li> <li>Update the search results to always show the current data.</li> - <li>Update the search results to show only current insolvency events.</li> <li>Change how the address is stored.</li> <li>Update the search to allow for searches by other properties.</li> <li>Add a feature to allow to search based on the data that are no longer relevant.</li> |