diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/extract-actual.html | 3 | ||||
| -rw-r--r-- | templates/extract.html | 3 | ||||
| -rw-r--r-- | templates/results_entities.html | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/templates/extract-actual.html b/templates/extract-actual.html index 791b260..6bf6087 100644 --- a/templates/extract-actual.html +++ b/templates/extract-actual.html @@ -325,7 +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>{{ dozorci_rada_notes[i].clenove[j].jmeno }}<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> diff --git a/templates/extract.html b/templates/extract.html index 034bdb2..3600cd5 100644 --- a/templates/extract.html +++ b/templates/extract.html @@ -341,7 +341,8 @@ {% set underlne_style_close = "" %} {% endif %} <td>{{ underlne_style_open|safe }} - {{ row.dozorci_rada_text[i].clenove[j].jmeno }}<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 %} diff --git a/templates/results_entities.html b/templates/results_entities.html index 3b87fc5..b45b65f 100644 --- a/templates/results_entities.html +++ b/templates/results_entities.html @@ -59,8 +59,7 @@ {% endif %} {% endfor %} - <!-- Insert once data on supervisory board members (natural persons) are available --> - <!-- {% for elem in row.supervisory_board_member_association %} + {% for elem in row.supervisory_board_member_association %} {% if selection_method == "actual_results" and elem.vymaz_datum != 0 %} {% set xxx = [] %} {% else %} @@ -75,7 +74,7 @@ {% set x = my_dict.__setitem__("zapis", elem.dozorci_rada.company.zapis) %} {% set test_list = test_list.append(my_dict) %} {% endif %} - {% endfor %} --> + {% endfor %} {% for elem in test_list %} {% if count.value % 2 == 0 %} |