Adding columns on Criminal to track sentences progression

This commit is contained in:
2023-07-08 02:45:16 +02:00
parent 30995316ae
commit 545f7facaf
5 changed files with 152 additions and 6 deletions

View File

@@ -78,15 +78,21 @@
{% endif %}
{% if i.amountMoney is defined %}
<br /><small>{% trans %}title_amount{% endtrans %}:</small>
<small>{{ i.amountMoney ? i.amountMoney ~ ' ' ~'currency_symbol'|trans :'value_no_value'|trans }}</small>
<small>{{ i.amountMoney ? i.amountMoney ~ ' ' ~'currency_symbol'|trans : 'value_no_value'|trans }}
{{ i.amountMoney == i.amountMoneySettled ? '&#x2705;' : '&#x274C;'}}
</small>
{% endif %}
{% if i.amountTime is defined %}
<br /><small>{% trans %}title_hours{% endtrans %}:</small>
<small>{{ i.amountTime ? i.amountTime ~ ' h' :'value_no_value'|trans}}</small>
<small>{{ i.amountTime ? i.amountTime ~ 'h' : 'value_no_value'|trans}}
{{ i.amountTime == i.amountTimeSettled ? '&#x2705;' : '&#x274C;'}}
</small>
{% endif %}
{% if i.amountCommunityWork is defined %}
<br /><small>{% trans %}title_community_work{% endtrans %}:</small>
<small>{{ i.amountCommunityWork ? i.amountCommunityWork ~ ' h' :'value_no_value'|trans}}</small>
<small>{{ i.amountCommunityWork ? i.amountCommunityWork ~ 'h' : 'value_no_value'|trans}}
{{ i.amountCommunityWork == i.amountCommunityWorkSettled ? '&#x2705;' : '&#x274C;'}}
</small>
{% endif %}
{% if i.accessorySentence is defined and i.accessorySentence is not null %}
<br /><small data-bs-toggle="tooltip" data-placement="top" title="{{ i.accessorySentence|striptags }}">{% trans %}title_accessorySentence{% endtrans %} : {{ 'value_yes'|trans}}</small>

View File

@@ -5,7 +5,31 @@
</div>
<hr>
<ul>
<li>{% trans %}title_amount{% endtrans %} : {{ document.amountMoney }} {{'currency_symbol'|trans}}</li>
<li>{% trans %}title_hours{% endtrans %} : {{ document.amountTime }} {{ 'title_hours'| trans }}</li>
<li>{% trans %}title_community_work{% endtrans %} : {{ document.amountCommunityWork }} {{ 'title_hours'| trans }}</li>
<li>{% trans %}title_amount{% endtrans %} : {{ document.amountMoney ? document.amountMoney ~ ' ' ~ 'currency_symbol'|trans : 'value_no_value'|trans }}
{% if document.amountMoney %}
{% if document.amountMoney == document.amountMoneySettled %}
&#x2705;
{% else %}
&#x274C; {% trans %}title_missing{% endtrans %}: {{ document.amountMoney - document.amountMoneySettled }}{{'currency_symbol'|trans}}
{% endif %}
{% endif %}
</li>
<li>{% trans %}title_hours{% endtrans %} : {{ document.amountTime ? document.amountTime ~ ' ' ~ 'title_hours'|trans : 'value_no_value'|trans }}
{% if document.amountTime %}
{% if document.amountTime == document.amountTimeSettled %}
&#x2705;
{% else %}
&#x274C; {% trans %}title_missing{% endtrans %}: {{ document.amountTime - document.amountTimeSettled }} {{'title_hours'|trans}}
{% endif %}
{% endif %}
</li>
<li>{% trans %}title_community_work{% endtrans %} : {{ document.amountCommunityWork ? document.amountCommunityWork ~ ' ' ~ 'title_hours'|trans : 'value_no_value'|trans }}
{% if document.amountCommunityWork %}
{% if document.amountCommunityWork == document.amountCommunityWorkSettled %}
&#x2705;
{% else %}
&#x274C; {% trans %}title_missing{% endtrans %}: {{ document.amountCommunityWork - document.amountCommunityWorkSettled }} {{'title_hours'|trans}}
{% endif %}
{% endif %}
</li>
</ul>