Merge pull request #3 from SveterCZE/new-features-branch

New features branch

16 files changed, 648 insertions, 158 deletions

diff --git a/templates/extract-actual.html b/templates/extract-actual.html
index ab19efc..6bf6087 100644
--- a/templates/extract-actual.html
+++ b/templates/extract-actual.html
@@ -21,6 +21,13 @@
     {% endif %}
 {% endfor %}
 
+{% set ucel_notes = [] %}
+{% for i in range (row.ucel|length) %}
+    {% if row.ucel[i].vymaz_datum == 0 %}
+        {% set ucel_notes = ucel_notes.append(row.ucel[i].ucel.ucel) %}
+    {% endif %}
+{% endfor %}
+
 {% set zakladni_kapital_notes = [] %}
 {% for i in range (row.zakladni_kapital|length) %}
     {% if row.zakladni_kapital[i].vymaz_datum == 0 %}
@@ -98,22 +105,6 @@
     {% 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 %}
@@ -255,6 +246,17 @@
     {% endif %}
     <!-- END Display areas of activities -->
 
+    <!-- Display purpose -->
+    {% if ucel_notes|length > 0 %}
+    {% for i in range (ucel_notes|length) %}
+    <tr>
+        <td>{% if i == 0%}Účel:{% endif %}</td>
+        <td>{{ ucel_notes[i] }}</td>
+    </tr>    
+    {% endfor %}
+    {% endif %}
+    <!-- END Display purpose -->    
+
     <!-- Display statutory bodies -->
     {% if statutarni_organ_notes|length > 0 %}
     {% for i in range (statutarni_organ_notes|length) %}
@@ -269,8 +271,8 @@
             {% 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> 
+                <td>{% if statutarni_organ_notes[i].clenove[j].jmeno != None %}{{ statutarni_organ_notes[i].clenove[j].jmeno }}
+                    {% else %}{{ statutarni_organ_notes[i].clenove[j].jmeno_po.nazev}}{% if statutarni_organ_notes[i].clenove[j].jmeno_po.reg_cislo != 0 %}, reg č. {{ statutarni_organ_notes[i].clenove[j].jmeno_po.reg_cislo }}{% endif %}{% if statutarni_organ_notes[i].clenove[j].jmeno_po.ico != 0 %}, IČ <a href="/{{ statutarni_organ_notes[i].clenove[j].jmeno_po.ico }}">{{ statutarni_organ_notes[i].clenove[j].jmeno_po.ico }}</a>{% endif %} {% endif %}<br> 
                     {{ statutarni_organ_notes[i].clenove[j].adresa }} 
                     {% 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>
@@ -323,8 +325,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>{% 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> 
+                <td>{% if dozorci_rada_notes[i].clenove[j].jmeno != None %}{{ dozorci_rada_notes[i].clenove[j].jmeno }}
+                    {% else %}{{ dozorci_rada_notes[i].clenove[j].jmeno_po.nazev}}{% if dozorci_rada_notes[i].clenove[j].jmeno_po.reg_cislo != 0 %}, reg č. {{ dozorci_rada_notes[i].clenove[j].jmeno_po.reg_cislo }}{% endif %}{% if dozorci_rada_notes[i].clenove[j].jmeno_po.ico != 0 %}, IČ <a href="/{{ dozorci_rada_notes[i].clenove[j].jmeno_po.ico }}">{{ dozorci_rada_notes[i].clenove[j].jmeno_po.ico }}</a>{% endif %} {% endif %}<br> 
                     {{ dozorci_rada_notes[i].clenove[j].adresa }} 
                     {% 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>
@@ -354,8 +356,7 @@
     {% for i in range (prokurist_notes|length) %}
     <tr>
         <td>{% if i == 0%}Prokura:{% endif %}</td>
-        <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> 
+        <td>{{ prokurist_notes[i].jmeno}}<br> 
             {{ prokurist_notes[i].adresa }}{% if prokurist_notes[i].text_prokurista != "0" %}<br>{{ prokurist_notes[i].text_prokurista }}{% endif %}</td>
     </tr>    
     {% endfor %}
@@ -375,9 +376,7 @@
         {% 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 %} 
-                {% 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 %}   
+            <td>{% if sole_shareholder_notes[i].akcionar_po_id == None %}{{ sole_shareholder_notes[i].jmeno }}{% 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Č <a href="/{{ sole_shareholder_notes[i].oznaceni_po.ico }}-actual">{{ sole_shareholder_notes[i].oznaceni_po.ico }}</a>{% endif %} {% endif %} 
                 <br>{{sole_shareholder_notes[i].adresa}}</td>
         </tr>   
@@ -394,9 +393,7 @@
         {% 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 %} 
-                {% 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 %}   
+            <td>{% if spolecnici_notes[i].spolecnik_po_id == None %}{{ spolecnici_notes[i].jmeno }}{% 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Č <a href="/{{ spolecnici_notes[i].oznaceni_po.ico }}-actual">{{ spolecnici_notes[i].oznaceni_po.ico }}</a>{% endif %} {% endif %} 
                 <br>{{spolecnici_notes[i].adresa}}</td>
         </tr>
@@ -452,44 +449,7 @@
         {% for i in range (shares_notes|length) %}
         <tr>
             <td>{% if i == 0%}Akcie:{% endif %}</td>
-            {% if shares_notes[i].akcie_podoba == "LISTINNA" %}
-                {% set akcie_podoba_description = "v listinné podobě" %}
-            {% elif shares_notes[i].akcie_podoba == "ZAKNIHOVANA" %}
-                {% set akcie_podoba_description = "v zaknihované podobě" %}
-            {% elif shares_notes[i].akcie_podoba == "IMOBILIZOVANA" %}
-                {% set akcie_podoba_description = "v imobilizované podobě" %}            
-            {% else %}
-                {% set akcie_podoba_description = "" %}    
-            {% endif %}
-            
-            {% if shares_notes[i].akcie_typ == "KMENOVE_NA_JMENO" %}
-                {% set akcie_typ_description = "kmenové akcie na jméno" %}
-            {% elif shares_notes[i].akcie_typ == "KMENOVE_NA_MAJITELE" %}
-                {% set akcie_typ_description = "kmenové akcie na majitele" %}
-            {% elif shares_notes[i].akcie_typ == "KUSOVE_NA_JMENO" %}
-                {% set akcie_typ_description = "kusové akcie" %}
-            {% elif shares_notes[i].akcie_typ == "NA_JMENO" %}
-                {% set akcie_typ_description = "akcie na jméno" %}
-            {% elif shares_notes[i].akcie_typ == "NA_MAJITELE" %}
-                {% set akcie_typ_description = "akcie na majitele" %}
-            {% elif shares_notes[i].akcie_typ == "PRIORITNI_NA_JMENO" %}
-                {% set akcie_typ_description = "prioritní akcie na jméno" %}                   
-            {% elif shares_notes[i].akcie_typ == "ZAMESTNANECKE_NA_JMENO" %}
-                {% set akcie_typ_description = "zaměstnanecké akcie na jméno" %}
-            {% elif shares_notes[i].akcie_typ == "ZVLASTNI_PRAVA" %}
-                {% set akcie_typ_description = "akcie se zvláštními právy" %}
-            {% else %}
-                {% set akcie_typ_description = "" %}    
-            {% endif %}  
-
-            {% if shares_notes[i].akcie_hodnota_typ == "KORUNY" %}
-                {% set akcie_hodnota_typ_symbol = "Kč" %}
-            {% elif shares_notes[i].akcie_hodnota_typ == "EURA" %}
-                {% set akcie_hodnota_typ_symbol = "euro" %}  
-            {% else %}
-                {% set akcie_hodnota_typ_symbol = "" %}
-            {% endif %}
-            <td>{{ shares_notes[i].akcie_pocet }} ks {{ akcie_typ_description }} {{ akcie_podoba_description }}  ve jmenovité hodnotě {{ shares_notes[i].akcie_hodnota_value }} {{ akcie_hodnota_typ_symbol }} {% if shares_notes[i].akcie_text != "0"  %} <br> {{ shares_notes[i].akcie_text }} {% endif %}</td>
+            <td>{{ shares_notes[i] }} {% if shares_notes[i].akcie_text != "0"  %} <br> {{ shares_notes[i].akcie_text }} {% endif %}</td>
         </tr>   
         {% endfor %}
     {% endif %}
diff --git a/templates/extract.html b/templates/extract.html
index 2bacb06..3600cd5 100644
--- a/templates/extract.html
+++ b/templates/extract.html
@@ -163,7 +163,7 @@
             {% set splaceni_typ_description = row.zakladni_kapital[i].splaceni_hodnota %}
         {% endif %}  
 
-        <td>{{ underlne_style_open|safe }} {{ vklad_typ_description }} {{ vklad_typ_symbol }} {% if splaceni_typ_description != "0" %} <br> Splaceno: {{ splaceni_typ_description }} {{ splaceni_typ_symbol }} {% endif %} {{ underlne_style_close|safe }}</td>
+        <td>{{ underlne_style_open|safe }} {% for elem in row.zakladni_kapital[i].my_rep() %} {{elem}}<br>{% endfor %} {{ underlne_style_close|safe }}</td>
         <td>{{ underlne_style_open|safe }} Zapsáno: {{ row.zakladni_kapital[i].zapis_datum }} {% if row.zakladni_kapital[i].vymaz_datum != 0 %} <br> Vymazáno: {{ row.zakladni_kapital[i].vymaz_datum }} {% endif %} {{ underlne_style_close|safe }}</td>
     </tr>    
     {% endfor %}
@@ -208,6 +208,25 @@
     {% endif %}
     <!-- END Display areas of activities -->
 
+    <!-- Display purpose -->
+    {% if row.ucel|length > 0 %}
+    {% for i in range (row.ucel|length) %}
+    <tr>
+        <td>{% if i == 0%}Účel:{% endif %}</td>
+        {% if row.ucel[i].vymaz_datum != 0 %}
+            {% set underlne_style_open = undedrline_open_deleted %}
+            {% set underlne_style_close = undedrline_closed_deleted %}
+        {% else %}
+            {% set underlne_style_open = "" %}
+            {% set underlne_style_close = "" %}
+        {% endif %}
+        <td>{{ underlne_style_open|safe }} {{ row.ucel[i].ucel.ucel }} {{ underlne_style_close|safe }}</td>
+        <td>{{ underlne_style_open|safe }} Zapsáno: {{ row.ucel[i].zapis_datum }} {% if row.ucel[i].vymaz_datum != 0 %} <br>   Vymazáno: {{ row.ucel[i].vymaz_datum }} {% endif %} {{ underlne_style_close|safe }}</td>
+    </tr>    
+    {% endfor %}
+    {% endif %}
+    <!-- END Display purpose -->
+
     <!-- Display statutory bodies -->
     {% if row.statutarni_organ_text|length > 0 %}
     {% for i in range (row.statutarni_organ_text|length) %}
@@ -237,8 +256,8 @@
             {% set underlne_style_close = "" %}
         {% endif %}          
         <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> 
+            {% if row.statutarni_organ_text[i].clenove[j].jmeno != None %}{{ row.statutarni_organ_text[i].clenove[j].jmeno }}
+            {% else %}{{ row.statutarni_organ_text[i].clenove[j].jmeno_po.nazev}}{% if row.statutarni_organ_text[i].clenove[j].jmeno_po.reg_cislo != 0 %}, reg č. {{ row.statutarni_organ_text[i].clenove[j].jmeno_po.reg_cislo }}{% endif %}{% if row.statutarni_organ_text[i].clenove[j].jmeno_po.ico != 0 %}, IČ <a href="/{{ row.statutarni_organ_text[i].clenove[j].jmeno_po.ico }}">{{ row.statutarni_organ_text[i].clenove[j].jmeno_po.ico }}</a>{% endif %} {% endif %}<br> 
             {{ row.statutarni_organ_text[i].clenove[j].adresa }} 
             {% 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 %}
@@ -322,8 +341,8 @@
             {% set underlne_style_close = "" %}
         {% endif %}          
         <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> 
+            {% if row.dozorci_rada_text[i].clenove[j].jmeno != None %}{{ row.dozorci_rada_text[i].clenove[j].jmeno }}
+            {% else %}{{ row.dozorci_rada_text[i].clenove[j].jmeno_po.nazev}}{% if row.dozorci_rada_text[i].clenove[j].jmeno_po.reg_cislo != 0 %}, reg č. {{ row.dozorci_rada_text[i].clenove[j].jmeno_po.reg_cislo }}{% endif %}{% if row.dozorci_rada_text[i].clenove[j].jmeno_po.ico != 0 %}, IČ <a href="/{{ row.dozorci_rada_text[i].clenove[j].jmeno_po.ico }}">{{ row.dozorci_rada_text[i].clenove[j].jmeno_po.ico }}</a>{% endif %} {% endif %}<br>
             {{ row.dozorci_rada_text[i].clenove[j].adresa }} 
             {% 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 %}
@@ -378,8 +397,7 @@
             {% set underlne_style_close = "" %}
         {% endif %}
         <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].jmeno }}<br> 
             {{ row.prokurista[i].adresa }}{% 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>
@@ -420,9 +438,7 @@
             {% set underlne_style_open = "" %}
             {% set underlne_style_close = "" %}
         {% 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 %}   
+        <td>{{ underlne_style_open|safe }} {% if row.jediny_akcionar[i].akcionar_po_id == None %}{{ row.jediny_akcionar[i].jmeno }}{% 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Č <a href="/{{ row.jediny_akcionar[i].oznaceni_po.ico }}">{{ row.jediny_akcionar[i].oznaceni_po.ico }}</a>{% endif %} {% endif %} 
             <br>{{row.jediny_akcionar[i].adresa}} {{ 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>
@@ -448,9 +464,7 @@
             {% set underlne_style_open = "" %}
             {% set underlne_style_close = "" %}
         {% 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 %}   
+        <td>{{ underlne_style_open|safe }} {% if row.spolecnici[i].spolecnik_po_id == None %}{{ row.spolecnici[i].jmeno }}{% 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Č <a href="/{{ row.spolecnici[i].oznaceni_po.ico }}">{{ row.spolecnici[i].oznaceni_po.ico }}</a>{% endif %} {% endif %} 
             <br>{{row.spolecnici[i].adresa}} {{ 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>
@@ -458,34 +472,6 @@
         {% if row.spolecnici[i].podily|length > 0 %}
             
             {% for j in range (row.spolecnici[i].podily|length) %}
-                <!-- Set type of deposit -->
-                {% if row.spolecnici[i].podily[j].vklad_typ == "KORUNY" %}
-                    {% set vklad_typ_string = "Kč" %}
-                {% elif row.spolecnici[i].podily[j].vklad_typ == "EURA" %}
-                    {% set vklad_typ_string = "Euro" %}
-                {% else %}
-                    {% set vklad_typ_string = "" %}
-                {% endif %}
-
-                <!-- Set type of repaid contribution -->
-                {% if row.spolecnici[i].podily[j].splaceni_typ == "KORUNY" %}
-                    {% set splaceni_typ_string = "Kč" %}
-                {% elif row.spolecnici[i].podily[j].splaceni_typ == "PROCENTA" %}
-                    {% set splaceni_typ_string = "%" %}                      
-                {% elif row.spolecnici[i].podily[j].splaceni_typ == "EURA" %}
-                    {% set splaceni_typ_string = "Euro" %}
-                {% else %}
-                    {% set splaceni_typ_string = "" %}
-                {% endif %}
-                
-                <!-- Set type of share -->
-                {% if row.spolecnici[i].podily[j].souhrn_typ == "PROCENTA" %}
-                    {% set souhrn_typ_string = "%" %}
-                {% else %}
-                    {% set souhrn_typ_string = "" %}
-                {% endif %}
-
-
             <tr>
                 <td style = padding-left:4em>Podíl:</td>
                 {% if row.spolecnici[i].podily[j].vymaz_datum != 0 %}
@@ -495,10 +481,11 @@
                     {% set underlne_style_open = "" %}
                     {% set underlne_style_close = "" %}
                 {% endif %}
-                <td>{{ underlne_style_open|safe }}Vklad: {{ row.spolecnici[i].podily[j].vklad_text }} {{ vklad_typ_string }}<br>
-                    Splaceno: {{ row.spolecnici[i].podily[j].splaceni_text }} {{ splaceni_typ_string }}<br>
-                    {% if row.spolecnici[i].podily[j].souhrn_text != "0"%}Podíl: {{ row.spolecnici[i].podily[j].souhrn_text }} {{ souhrn_typ_string }}{% endif %}
-                    {% if row.spolecnici[i].podily[j].druh_podilu.druh_podilu != "0" %}<br>Druh podílu: {{ row.spolecnici[i].podily[j].druh_podilu.druh_podilu }}{% endif %}{{ underlne_style_close|safe }}
+                <td>{{ underlne_style_open|safe }} 
+                        {% for elem in row.spolecnici[i].podily[j].my_rep() %}
+                            {{ elem }}<br>
+                        {% endfor %}
+                    {{ underlne_style_close|safe }}
                 </td>
                 <td>{{ underlne_style_open|safe }}Zapsáno: {{ row.spolecnici[i].podily[j].zapis_datum }} {% if row.spolecnici[i].podily[j].vymaz_datum != 0 %}<br>Vymazáno: {{ row.spolecnici[i].podily[j].vymaz_datum }}{% endif %}{{ underlne_style_close|safe }}</td>
             </tr>
@@ -523,46 +510,7 @@
             {% set underlne_style_open = "" %}
             {% set underlne_style_close = "" %}
         {% endif %}
-
-        {% if row.akcie[i].akcie_podoba == "LISTINNA" %}
-            {% set akcie_podoba_description = "v listinné podobě" %}
-        {% elif row.akcie[i].akcie_podoba == "ZAKNIHOVANA" %}
-            {% set akcie_podoba_description = "v zaknihované podobě" %}
-        {% elif row.akcie[i].akcie_podoba == "IMOBILIZOVANA" %}
-            {% set akcie_podoba_description = "v imobilizované podobě" %}            
-        {% else %}
-            {% set akcie_podoba_description = "" %}    
-        {% endif %}
-        
-        {% if row.akcie[i].akcie_typ == "KMENOVE_NA_JMENO" %}
-            {% set akcie_typ_description = "kmenové akcie na jméno" %}
-        {% elif row.akcie[i].akcie_typ == "KMENOVE_NA_MAJITELE" %}
-            {% set akcie_typ_description = "kmenové akcie na majitele" %}
-        {% elif row.akcie[i].akcie_typ == "KUSOVE_NA_JMENO" %}
-            {% set akcie_typ_description = "kusové akcie" %}
-        {% elif row.akcie[i].akcie_typ == "NA_JMENO" %}
-            {% set akcie_typ_description = "akcie na jméno" %}
-        {% elif row.akcie[i].akcie_typ == "NA_MAJITELE" %}
-            {% set akcie_typ_description = "akcie na majitele" %}
-        {% elif row.akcie[i].akcie_typ == "PRIORITNI_NA_JMENO" %}
-            {% set akcie_typ_description = "prioritní akcie na jméno" %}                   
-        {% elif row.akcie[i].akcie_typ == "ZAMESTNANECKE_NA_JMENO" %}
-            {% set akcie_typ_description = "zaměstnanecké akcie na jméno" %}
-        {% elif row.akcie[i].akcie_typ == "ZVLASTNI_PRAVA" %}
-            {% set akcie_typ_description = "akcie se zvláštními právy" %}
-        {% else %}
-            {% set akcie_typ_description = "" %}    
-        {% endif %}  
-
-        {% if row.akcie[i].akcie_hodnota_typ == "KORUNY" %}
-            {% set akcie_hodnota_typ_symbol = "Kč" %}
-        {% elif row.akcie[i].akcie_hodnota_typ == "EURA" %}
-            {% set akcie_hodnota_typ_symbol = "euro" %}  
-        {% else %}
-            {% set akcie_hodnota_typ_symbol = "" %}
-        {% endif %}  
-
-        <td>{{ underlne_style_open|safe }} {{ row.akcie[i].akcie_pocet }} ks {{ akcie_typ_description }} {{ akcie_podoba_description }}  ve jmenovité hodnotě {{ row.akcie[i].akcie_hodnota_value }} {{ akcie_hodnota_typ_symbol }} {% if row.akcie[i].akcie_text != "0"  %} <br> {{ row.akcie[i].akcie_text }} {% endif %} {{ underlne_style_close|safe }}</td>
+        <td>{{ underlne_style_open|safe }} {{ row.akcie[i] }} {% if row.akcie[i].akcie_text != "0"  %} <br> {{ row.akcie[i].akcie_text }} {% endif %} {{ underlne_style_close|safe }}</td>
         <td>{{ underlne_style_open|safe }} Zapsáno: {{ row.akcie[i].zapis_datum }} {% if row.akcie[i].vymaz_datum != 0 %} <br> Vymazáno: {{ row.akcie[i].vymaz_datum }} {% endif %} {{ underlne_style_close|safe }}</td>
     </tr>    
     {% endfor %}
diff --git a/templates/header.html b/templates/header.html
index 30a4ebd..5b50d1a 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -8,4 +8,12 @@
     <!-- Bootstrap CSS -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-giJF6kkoqNQ00vy+HMDP7azOuL0xtbfIcaT9wjKHr8RbDVddVHyTfAAsrekwKmP1" crossorigin="anonymous">
 <title>Search Results - Flask Justice Database</title>
-<body>
\ No newline at end of file
+<body>
+<table class="table">
+  <tr>
+    <td><a href="/">Veřejný rejstřík podle subjektů</a></td>
+    <td><a href="/osoby">Veřejný rejstřík podle fyzických osob v angažmá</a></td>
+    <td><a href="/entity">Veřejný rejstřík podle právnických osob v angažmá</a></td>
+    <td><a href="/trivia">Zajímavosti z obchodního rejstříku</a></td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/templates/most_common_activity.html b/templates/most_common_activity.html
new file mode 100644
index 0000000..dd73b41
--- /dev/null
+++ b/templates/most_common_activity.html
@@ -0,0 +1,24 @@
+{% include 'header.html' %}
+
+<h1>Nejčastější předmět činnosti:</h1>
+
+<table class="table table-hover" style="width: auto">
+    <thead class="thead-dark">
+    <tr class="table-info">
+        <th scope="col">#</th>
+        <th scope="col">Předmět činnosti</th>
+        <th scope="col">Frekvence</th>
+    </tr>
+    </thead>
+    <tbody>
+    {% for i in range (most_common_activity|length) %}
+    <tr>
+        <th scope = "row">{{ i + 1 }}</th>
+        <td>{{ most_common_activity[i][0] }}</td>
+        <td>{{ most_common_activity[i][1] }}</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+</table>
+
+{% include 'footer.html' %}
\ No newline at end of file
diff --git a/templates/most_common_addresses.html b/templates/most_common_addresses.html
new file mode 100644
index 0000000..4ee45ed
--- /dev/null
+++ b/templates/most_common_addresses.html
@@ -0,0 +1,23 @@
+{% include 'header.html' %}
+
+<h1>Nejčastější sídla:</h1>
+<table class="table table-hover" style="width: auto">
+    <thead class="thead-dark">
+    <tr class="table-info">
+        <th scope="col">#</th>
+        <th scope="col">Adresa</th>
+        <th scope="col">Frekvence</th>
+    </tr>
+    </thead>
+    <tbody>
+    {% for i in range (most_common_addresses|length) %}
+    <tr>
+        <th scope = "row">{{ i + 1 }}</th>
+        <td><a href="/results-sidlo-{{most_common_addresses[i][2]}}">{{ most_common_addresses[i][0] }}</a></td>
+        <td>{{ most_common_addresses[i][1] }}</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+</table>
+
+{% include 'footer.html' %}
\ No newline at end of file
diff --git a/templates/most_common_business.html b/templates/most_common_business.html
new file mode 100644
index 0000000..56822a5
--- /dev/null
+++ b/templates/most_common_business.html
@@ -0,0 +1,24 @@
+{% include 'header.html' %}
+
+<h1>Nejčastější předmět podnikání:</h1>
+
+<table class="table table-hover"  style="width: auto">
+    <thead class="thead-dark">
+    <tr class="table-info">
+        <th scope="col">#</th>
+        <th scope="col">Předmět podnikání</th>
+        <th scope="col">Frekvence</th>
+    </tr>
+    </thead>
+    <tbody>
+    {% for i in range (most_common_business|length) %}
+    <tr>
+        <th scope = "row">{{ i + 1 }}</th>
+        <td>{{ most_common_business[i][0] }}</td>
+        <td>{{ most_common_business[i][1] }}</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+</table>
+
+{% include 'footer.html' %}
\ No newline at end of file
diff --git a/templates/most_common_degree.html b/templates/most_common_degree.html
new file mode 100644
index 0000000..72ac5b2
--- /dev/null
+++ b/templates/most_common_degree.html
@@ -0,0 +1,28 @@
+{% include 'header.html' %}
+
+<h1>Nejčastější tituly:</h1>
+
+<table class="table table-hover" style="width: auto">
+    <thead class="thead-dark">
+    <tr class="table-info">
+        <th scope="col">#</th>
+        <th scope="col">Titul před jménem</th>
+        <th scope="col">Frekvence</th>
+        <th scope="col">Titul za jménem</th>
+        <th scope="col">Frekvence</th>        
+    </tr>
+    </thead>
+    <tbody>
+    {% for i in range (most_common_degree_before|length) %}
+    <tr>
+        <th scope = "row">{{ i + 1 }}</th>
+        <td>{{ most_common_degree_before[i][0] }}</td>
+        <td>{{ most_common_degree_before[i][1] }}</td>
+        <td>{{ most_common_degree_after[i][0] }}</td>
+        <td>{{ most_common_degree_after[i][1] }}</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+</table>
+
+{% include 'footer.html' %}
\ No newline at end of file
diff --git a/templates/most_common_purpose.html b/templates/most_common_purpose.html
new file mode 100644
index 0000000..a5e17a7
--- /dev/null
+++ b/templates/most_common_purpose.html
@@ -0,0 +1,24 @@
+{% include 'header.html' %}
+
+<h1>Nejčastější účel:</h1>
+
+<table class="table table-hover" style="width: auto">
+    <thead class="thead-dark">
+    <tr class="table-info">
+        <th scope="col">#</th>
+        <th scope="col">Účel</th>
+        <th scope="col">Frekvence</th>
+    </tr>
+    </thead>
+    <tbody>
+    {% for i in range (most_common_purpose|length) %}
+    <tr>
+        <th scope = "row">{{ i + 1 }}</th>
+        <td>{{ most_common_purpose[i][0] }}</td>
+        <td>{{ most_common_purpose[i][1] }}</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+</table>
+
+{% include 'footer.html' %}
\ No newline at end of file
diff --git a/templates/oldest_companies.html b/templates/oldest_companies.html
new file mode 100644
index 0000000..f79e954
--- /dev/null
+++ b/templates/oldest_companies.html
@@ -0,0 +1,23 @@
+{% include 'header.html' %}
+
+<h1>Nejstarší právnické osoby:</h1>
+<table class="table table-hover" style="width: auto">
+    <thead class="thead-dark">
+    <tr class="table-info">
+        <th scope="col">#</th>
+        <th scope="col">Název</th>
+        <th scope="col">Datum založení</th>
+    </tr>
+    </thead>
+    <tbody>
+    {% for i in range (oldest_companies|length) %}
+    <tr>
+        <th scope = "row">{{ i + 1 }}</th>
+        <td><a href="{{ oldest_companies[i][2] }}">{{ oldest_companies[i][0] }}</a></td>
+        <td>{{ oldest_companies[i][1] }}</td>
+    </tr>
+    {% endfor %}
+    </tbody>
+</table>
+
+{% include 'footer.html' %}
\ No newline at end of file
diff --git a/templates/results2.html b/templates/results2.html
index 84b8326..9f41c18 100644
--- a/templates/results2.html
+++ b/templates/results2.html
@@ -1,6 +1,8 @@
-{% include 'header.html' %}
-
-{% include 'search_form.html' %}
+{% if show_form == True %}
+    {% include 'search_form.html' %}
+{% else %}
+    {% include 'header.html' %}
+{% endif %}  
 
     <p><b>Počet nalezených subjektů: {{ results|length }}</b></p>
     {% for row in results %}
@@ -42,8 +44,6 @@
             {% endif %}    
         {% endfor %}        
 
-
-
     <table class= "{{table_style}}" style="width: 100%">
     <p></p>
     <tr>
diff --git a/templates/results_entities.html b/templates/results_entities.html
new file mode 100644
index 0000000..b45b65f
--- /dev/null
+++ b/templates/results_entities.html
@@ -0,0 +1,128 @@
+{% if show_form == True %}
+    {% include 'search_form_entity.html' %}
+{% else %}
+    {% include 'header.html' %}
+{% endif %}  
+
+{% set count = namespace(value=0) %}
+    {% for row in results %}
+    {% set test_list = [] %}
+
+    {% for elem in row.spolecnik_association %}
+        {% if selection_method == "actual_results" and elem.vymaz_datum != 0 %}
+            {% set xxx = [] %}
+        {% else %}        
+            {% set my_dict = {} %}
+            {% set x = my_dict.__setitem__("adresa", elem.adresa) %}
+            {% set x = my_dict.__setitem__("funkce", "společník") %}
+            {% set x = my_dict.__setitem__("nazev", elem.company.nazev) %}
+            {% set x = my_dict.__setitem__("ico", elem.company.ico) %}
+            {% set x = my_dict.__setitem__("oddil", elem.company.oddil) %}
+            {% set x = my_dict.__setitem__("vlozka", elem.company.vlozka) %}
+            {% set x = my_dict.__setitem__("soud", elem.company.soud) %}
+            {% set x = my_dict.__setitem__("zapis", elem.company.zapis) %}
+            {% set test_list = test_list.append(my_dict) %}
+        {% endif %}
+    {% endfor %}    
+
+    {% for elem in row.sole_shareholder_association %}
+        {% if selection_method == "actual_results" and elem.vymaz_datum != 0 %}
+            {% set xxx = [] %}
+        {% else %}            
+            {% set my_dict = {} %}
+            {% set x = my_dict.__setitem__("adresa", elem.adresa) %}
+            {% set x = my_dict.__setitem__("funkce", "jediný akcionář") %}
+            {% set x = my_dict.__setitem__("nazev", elem.company.nazev) %}
+            {% set x = my_dict.__setitem__("ico", elem.company.ico) %}
+            {% set x = my_dict.__setitem__("oddil", elem.company.oddil) %}
+            {% set x = my_dict.__setitem__("vlozka", elem.company.vlozka) %}
+            {% set x = my_dict.__setitem__("soud", elem.company.soud) %}
+            {% set x = my_dict.__setitem__("zapis", elem.company.zapis) %}
+            {% set test_list = test_list.append(my_dict) %}
+        {% endif %}
+    {% endfor %}
+
+    {% for elem in row.statut_org_association %}
+        {% if selection_method == "actual_results" and elem.vymaz_datum != 0 %}
+            {% set xxx = [] %}
+        {% else %}
+            {% set my_dict = {} %}
+            {% set x = my_dict.__setitem__("adresa", elem.adresa) %}
+            {% set x = my_dict.__setitem__("funkce", elem.funkce) %}
+            {% set x = my_dict.__setitem__("nazev", elem.statutarni_organ.company.nazev) %}
+            {% set x = my_dict.__setitem__("ico", elem.statutarni_organ.company.ico) %}
+            {% set x = my_dict.__setitem__("oddil", elem.statutarni_organ.company.oddil) %}
+            {% set x = my_dict.__setitem__("vlozka", elem.statutarni_organ.company.vlozka) %}
+            {% set x = my_dict.__setitem__("soud", elem.statutarni_organ.company.soud) %}
+            {% set x = my_dict.__setitem__("zapis", elem.statutarni_organ.company.zapis) %}
+            {% set test_list = test_list.append(my_dict) %}
+        {% endif %}
+    {% endfor %}
+
+    {% for elem in row.supervisory_board_member_association %}
+        {% if selection_method == "actual_results" and elem.vymaz_datum != 0 %}
+            {% set xxx = [] %}
+        {% else %}    
+            {% set my_dict = {} %}
+            {% set x = my_dict.__setitem__("adresa", elem.adresa) %}
+            {% set x = my_dict.__setitem__("funkce", elem.funkce) %}
+            {% set x = my_dict.__setitem__("nazev", elem.dozorci_rada.company.nazev) %}
+            {% set x = my_dict.__setitem__("ico", elem.dozorci_rada.company.ico) %}
+            {% set x = my_dict.__setitem__("oddil", elem.dozorci_rada.company.oddil) %}
+            {% set x = my_dict.__setitem__("vlozka", elem.dozorci_rada.company.vlozka) %}
+            {% set x = my_dict.__setitem__("soud", elem.dozorci_rada.company.soud) %}
+            {% set x = my_dict.__setitem__("zapis", elem.dozorci_rada.company.zapis) %}
+            {% set test_list = test_list.append(my_dict) %}
+        {% endif %}
+    {% endfor %}
+
+    {% for elem in test_list %}
+        {% if count.value % 2 == 0 %}
+            {% set table_style = "table table-light" %}
+        {% else %}
+            {% set table_style = "table table-secondary" %}
+        {% endif %}
+
+        <table class= "{{table_style}}" style="width: 100%">
+            <p></p>
+            <tr>
+                <td style="width:20%">Název:</td>
+                <td style="width:40%"><b>{{ row.nazev }}</b></td>
+                <td style="width:15%">IČO:</td>
+                <td style="width:25%"><b>{{ row.ico }}</b></td>
+            </tr>
+
+            <tr>
+                <td>Adresa:</td>
+                <td>{{ elem.adresa }}</td>
+                <td>Angažmá:</td>
+                <td>{{ elem.funkce }}</td>
+            </tr>
+
+            <tr>
+                <td><i>ve společnosti:</i></td>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+
+            <tr>
+                <td>Název subjektu:</td>
+                <td><b>{{ elem.nazev }}</b></td>
+                <td>IČO:</td>
+                <td><a href="/{{ elem.ico }}"><b>{{ elem.ico }}</b></a></td>
+            </tr>
+
+            <tr>
+                <td>Spisová značka:</td>
+                <td>{{elem.oddil}} {{elem.vlozka}} vedená u {{elem.soud}}</td>
+                <td>Den zápisu:</td>
+                <td>{{elem.zapis}}</td>
+            </tr>
+
+        </table>
+        {% set count.value = count.value + 1 %}
+    {% endfor %}
+{% endfor %}
+
+{% include 'footer.html' %}
\ No newline at end of file
diff --git a/templates/results_persons.html b/templates/results_persons.html
new file mode 100644
index 0000000..abb4387
--- /dev/null
+++ b/templates/results_persons.html
@@ -0,0 +1,145 @@
+{% if show_form == True %}
+    {% include 'search_form_person.html' %}
+{% else %}
+    {% include 'header.html' %}
+{% endif %}  
+
+{% set count = namespace(value=0) %}
+    {% for row in results %}
+    {% set test_list = [] %}
+    {% for elem in row.statut_org_association %}
+        {% if selection_method == "actual_results" and elem.vymaz_datum != 0 %}
+            {% set xxx = [] %}
+        {% else %}
+            {% set my_dict = {} %}
+            {% set x = my_dict.__setitem__("adresa", elem.adresa) %}
+            {% set x = my_dict.__setitem__("funkce", elem.funkce) %}
+            {% set x = my_dict.__setitem__("nazev", elem.statutarni_organ.company.nazev) %}
+            {% set x = my_dict.__setitem__("ico", elem.statutarni_organ.company.ico) %}
+            {% set x = my_dict.__setitem__("oddil", elem.statutarni_organ.company.oddil) %}
+            {% set x = my_dict.__setitem__("vlozka", elem.statutarni_organ.company.vlozka) %}
+            {% set x = my_dict.__setitem__("soud", elem.statutarni_organ.company.soud) %}
+            {% set x = my_dict.__setitem__("zapis", elem.statutarni_organ.company.zapis) %}
+            {% set test_list = test_list.append(my_dict) %}
+        {% endif %}
+    {% endfor %}
+
+    {% for elem in row.supervisory_board_member_association %}
+        {% if selection_method == "actual_results" and elem.vymaz_datum != 0 %}
+            {% set xxx = [] %}
+        {% else %}    
+            {% set my_dict = {} %}
+            {% set x = my_dict.__setitem__("adresa", elem.adresa) %}
+            {% set x = my_dict.__setitem__("funkce", elem.funkce) %}
+            {% set x = my_dict.__setitem__("nazev", elem.dozorci_rada.company.nazev) %}
+            {% set x = my_dict.__setitem__("ico", elem.dozorci_rada.company.ico) %}
+            {% set x = my_dict.__setitem__("oddil", elem.dozorci_rada.company.oddil) %}
+            {% set x = my_dict.__setitem__("vlozka", elem.dozorci_rada.company.vlozka) %}
+            {% set x = my_dict.__setitem__("soud", elem.dozorci_rada.company.soud) %}
+            {% set x = my_dict.__setitem__("zapis", elem.dozorci_rada.company.zapis) %}
+            {% set test_list = test_list.append(my_dict) %}
+        {% endif %}
+    {% endfor %}    
+
+    {% for elem in row.spolecnik_association %}
+        {% if selection_method == "actual_results" and elem.vymaz_datum != 0 %}
+            {% set xxx = [] %}
+        {% else %}        
+            {% set my_dict = {} %}
+            {% set x = my_dict.__setitem__("adresa", elem.adresa) %}
+            {% set x = my_dict.__setitem__("funkce", "společník") %}
+            {% set x = my_dict.__setitem__("nazev", elem.company.nazev) %}
+            {% set x = my_dict.__setitem__("ico", elem.company.ico) %}
+            {% set x = my_dict.__setitem__("oddil", elem.company.oddil) %}
+            {% set x = my_dict.__setitem__("vlozka", elem.company.vlozka) %}
+            {% set x = my_dict.__setitem__("soud", elem.company.soud) %}
+            {% set x = my_dict.__setitem__("zapis", elem.company.zapis) %}
+            {% set test_list = test_list.append(my_dict) %}
+        {% endif %}
+    {% endfor %}    
+
+    {% for elem in row.sole_shareholder_association %}
+        {% if selection_method == "actual_results" and elem.vymaz_datum != 0 %}
+            {% set xxx = [] %}
+        {% else %}            
+            {% set my_dict = {} %}
+            {% set x = my_dict.__setitem__("adresa", elem.adresa) %}
+            {% set x = my_dict.__setitem__("funkce", "jediný akcionář") %}
+            {% set x = my_dict.__setitem__("nazev", elem.company.nazev) %}
+            {% set x = my_dict.__setitem__("ico", elem.company.ico) %}
+            {% set x = my_dict.__setitem__("oddil", elem.company.oddil) %}
+            {% set x = my_dict.__setitem__("vlozka", elem.company.vlozka) %}
+            {% set x = my_dict.__setitem__("soud", elem.company.soud) %}
+            {% set x = my_dict.__setitem__("zapis", elem.company.zapis) %}
+            {% set test_list = test_list.append(my_dict) %}
+        {% endif %}
+    {% endfor %}
+    
+    {% for elem in row.prokurista_association %}
+        {% if selection_method == "actual_results" and elem.vymaz_datum != 0 %}
+            {% set xxx = [] %}
+        {% else %}     
+            {% set my_dict = {} %}
+            {% set x = my_dict.__setitem__("adresa", elem.adresa) %}
+            {% set x = my_dict.__setitem__("funkce", "prokurista") %}
+            {% set x = my_dict.__setitem__("nazev", elem.company.nazev) %}
+            {% set x = my_dict.__setitem__("ico", elem.company.ico) %}
+            {% set x = my_dict.__setitem__("oddil", elem.company.oddil) %}
+            {% set x = my_dict.__setitem__("vlozka", elem.company.vlozka) %}
+            {% set x = my_dict.__setitem__("soud", elem.company.soud) %}
+            {% set x = my_dict.__setitem__("zapis", elem.company.zapis) %}
+            {% set test_list = test_list.append(my_dict) %}
+        {% endif %}
+    {% endfor %}    
+
+    {% for elem in test_list %}
+        {% if count.value % 2 == 0 %}
+            {% set table_style = "table table-light" %}
+        {% else %}
+            {% set table_style = "table table-secondary" %}
+        {% endif %}
+
+        <table class= "{{table_style}}" style="width: 100%">
+            <p></p>
+            <tr>
+                <td style="width:20%">Jméno:</td>
+                <td style="width:40%"><b>{{ row.get_name() }}</b></td>
+                <td style="width:15%">Datum narození:</td>
+                <td style="width:25%"><b>{{ row.datum_naroz }}</b></td>
+            </tr>
+
+            <tr>
+                <td>Adresa:</td>
+                <td>{{ elem.adresa }}</td>
+                <td>Angažmá:</td>
+                <td>{{ elem.funkce }}</td>
+            </tr>
+
+            <tr>
+                <td><i>ve společnosti:</i></td>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+            
+            <tr>
+                <td>Název subjektu:</td>
+                <td><b>{{ elem.nazev }}</b></td>
+                <td>IČO:</td>
+                <td><a href="/{{ elem.ico }}"><b>{{ elem.ico }}</b></a></td>
+            </tr>
+
+            <tr>
+                <td>Spisová značka:</td>
+                <td>{{elem.oddil}} {{elem.vlozka}} vedená u {{elem.soud}}</td>
+                <td>Den zápisu:</td>
+                <td>{{elem.zapis}}</td>
+            </tr>
+
+        </table>
+        {% set count.value = count.value + 1 %}
+    {% endfor %}
+{% endfor %}
+
+
+{% include 'footer.html' %}
\ No newline at end of file
diff --git a/templates/search_form.html b/templates/search_form.html
index 1832f87..83ae305 100644
--- a/templates/search_form.html
+++ b/templates/search_form.html
@@ -1,3 +1,4 @@
+{% include 'header.html' %}
 <title>Justice Database</title>
 
 <h2>Justice Database</h2>
@@ -102,4 +103,7 @@
   </p>
   <p><input type="submit" value="Search">
   </p>
-</form>
\ No newline at end of file
+</form>
+
+<p><a href="/trivia">Další zajímvavé údaje z obchodního resjtříku.</a></p>
+{% include 'footer.html' %}
\ No newline at end of file
diff --git a/templates/search_form_entity.html b/templates/search_form_entity.html
new file mode 100644
index 0000000..70f0b5c
--- /dev/null
+++ b/templates/search_form_entity.html
@@ -0,0 +1,68 @@
+{% include 'header.html' %}
+<title>Justice Database</title>
+
+<h2>Justice Database</h2>
+
+<p></p><p>
+
+{% with messages = get_flashed_messages() %}
+  {% if messages %}
+    <ul class="flashes">
+    {% for message in messages %}
+      <li>{{ message }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+{% endwith %}
+
+
+{% from "_formhelpers.html" import render_field %}
+
+<!-- NAME -->
+<form method="post">
+    <div class="row g-2">
+      <div class="col-sm-3">
+        {{ form.entity_name_search.label }}
+      </div>
+      <div class="col-sm">
+        {{ form.entity_name_search()|safe }} {{ form.entity_name_search_selection }}
+      </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 }}
+        </div>
+        <div class="col-sm">
+          {{ form.foreign_entity_number_search()|safe }} {{ form.foreign_entity_number_search_selection }}
+        </div>
+      </div>
+
+<!-- Search -->
+      <div class="row g-2">
+        <div class="col-sm-3">
+          Vyhledávat údaje:
+        </div>
+        <div class="col-sm">
+          {{ form.entity_actual_selection }}
+        </div>
+      </div>
+  </p>
+  <p><input type="submit" value="Search">
+  </p>
+</form>
+
+{% include 'footer.html' %}
+
+
diff --git a/templates/search_form_person.html b/templates/search_form_person.html
new file mode 100644
index 0000000..30d4865
--- /dev/null
+++ b/templates/search_form_person.html
@@ -0,0 +1,69 @@
+{% include 'header.html' %}
+<title>Justice Database</title>
+
+<h2>Justice Database</h2>
+
+<p></p><p>
+
+{% with messages = get_flashed_messages() %}
+  {% if messages %}
+    <ul class="flashes">
+    {% for message in messages %}
+      <li>{{ message }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+{% endwith %}
+
+
+{% from "_formhelpers.html" import render_field %}
+
+<!-- NAME -->
+<form method="post">
+    <div class="row g-2">
+      <div class="col-sm-3">
+        {{ form.fist_name_search.label }}
+      </div>
+      <div class="col-sm">
+        {{ form.fist_name_search()|safe }} {{ form.fist_name_search_selection }}
+      </div>
+    </div>
+
+<!-- SURNAME -->
+    <div class="row g-2">
+      <div class="col-sm-3">
+        {{ form.surname_search.label }}
+      </div>
+      <div class="col-sm">
+        {{ form.surname_search()|safe }} {{ form.surname_search_selection }}
+      </div>
+    </div>
+
+<!-- BIRTHDAY -->    
+    <div class="row g-2">
+      <div class="col-sm-3">
+        {{ form.birthday.label }}
+      </div>
+      <div class="col-sm">
+        {{ form.birthday }}
+      </div>
+    </div>
+
+    <div class="row g-2">
+      <div class="col-sm-3">
+        Vyhledávat údaje:
+      </div>
+      <div class="col-sm">
+        {{ form.person_actual_selection }}
+      </div>
+    </div>
+
+
+  </p>
+  <p><input type="submit" value="Search">
+  </p>
+</form>
+
+{% include 'footer.html' %}
+
+
diff --git a/templates/trivia.html b/templates/trivia.html
new file mode 100644
index 0000000..750706c
--- /dev/null
+++ b/templates/trivia.html
@@ -0,0 +1,14 @@
+{% include 'header.html' %}
+
+<h1>Zajímavosti z rejstříku</h1>
+
+<p>Počet registrovaných osob: {{ number_entities }}</p>
+<p>Další zajímvavé údaje z obchodního resjtříku:</p>
+<p><a href="/most_common_addresses">Seznam nejčastějších sídel</a></p>
+<p><a href="/oldest_companies">Seznam nejstarších společností</a></p>
+<p><a href="/most_common_purpose">Seznam nejčastějších účelů</a></p>
+<p><a href="/most_common_business">Seznam nejčastějších předmětů podnikání</a></p>
+<p><a href="/most_common_activity">Seznam nejčastějších předmětů činnosti</a></p>
+<p><a href="/most_common_degree">Seznam nejčastějších titulů</a></p>
+
+{% include 'footer.html' %}
\ No newline at end of file