ewandor/vision
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Xbird/Fixs' into 'main'

Browse Source 
Fix some issues

See merge request gamexperience/vision!29
This commit is contained in:
Xbird
2022-04-28 18:35:37 +00:00
parent 6687e87d44 e6d3150d3c
commit 4ce623e948
6 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,3 +1,3 @@
{ {
"version": "0.1.4" "version": "0.1.5"
} }

2
src/Form/LicenceWithdrawalType.php → src/Form/LicencewithdrawalType.php
View File

@@ -9,7 +9,7 @@ use App\Form\Type\DateTimeVisionType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
class LicenceWithdrawalType extends DocumentType class LicencewithdrawalType extends DocumentType
{ {
public function buildForm(FormBuilderInterface $builder, array $options): void public function buildForm(FormBuilderInterface $builder, array $options): void
{ {

6
templates/_cells/documentTable.html.twig
View File

@@ -55,11 +55,15 @@
{% if i.removingDate is defined %} {% if i.removingDate is defined %}
<br /><small>{% trans %}title_can_be_removed_at{% endtrans %}:</small> <br /><small>{% trans %}title_can_be_removed_at{% endtrans %}:</small>
<small class="text-{% if date(i.removingDate) < date() %}danger{% endif %}{% if date(i.removingDate) == date() %}warning{% endif %}{% if date(i.removingDate) > date() %}success{% endif %}">{{ i.removingDate|date('_datetime.format'|trans) }}</small> <small class="text-{% if date(i.removingDate) < date() %}danger{% endif %}{% if date(i.removingDate) == date() %}warning{% endif %}{% if date(i.removingDate) > date() %}success{% endif %}">{{ i.removingDate|date('_datetime.format'|trans) }}</small>
{% endif %} {% endif %}
{% if i.type is defined and i.type is not null %} {% if i.type is defined and i.type is not null %}
<br /><small>{% trans %}title_type{% endtrans %}:</small> <br /><small>{% trans %}title_type{% endtrans %}:</small>
<small>{{ i.type|trans }}</small> <small>{{ i.type|trans }}</small>
{% endif %} {% endif %}
{% if i.until is defined %}
<br /><small>{% trans %}title_until{% endtrans %}:</small>
<small class="text-{% if date(i.until) < date() %}danger{% endif %}{% if date(i.until) == date() %}warning{% endif %}{% if date(i.until) > date() %}success{% endif %}">{{ i.until|date('_datetime.format'|trans) }}</small>
{% endif %}
{% if i.numberplate is defined and i.numberplate is not null %} {% if i.numberplate is defined and i.numberplate is not null %}
<br /><small>{% trans %}title_numberplate{% endtrans %}:</small> <br /><small>{% trans %}title_numberplate{% endtrans %}:</small>
<small>{{ i.numberplate }}</small> <small>{{ i.numberplate }}</small>

3
templates/base.html.twig
View File

@@ -123,6 +123,9 @@
<li class="pc-item"> <li class="pc-item">
<a href="{{ path('document_list', {type: 'infringement'}) }}" class="pc-link"><span class="pc-micon"><i class="material-icons-two-tone">paid</i></span><span class="pc-mtext">{% trans %}title_infringements{% endtrans %}</span></a> <a href="{{ path('document_list', {type: 'infringement'}) }}" class="pc-link"><span class="pc-micon"><i class="material-icons-two-tone">paid</i></span><span class="pc-mtext">{% trans %}title_infringements{% endtrans %}</span></a>
</li> </li>
<li class="pc-item">
<a href="{{ path('document_list', {type: 'licencewithdrawal'}) }}" class="pc-link"><span class="pc-micon"><i class="material-icons-two-tone">local_police</i></span><span class="pc-mtext">{% trans %}title_licencewithdrawals{% endtrans %}</span></a>
</li>
<li class="pc-item"> <li class="pc-item">
<a href="{{ path('document_list', {type: 'jail'}) }}" class="pc-link"><span class="pc-micon"><i class="material-icons-two-tone">receipt</i></span><span class="pc-mtext">{% trans %}title_jails{% endtrans %}</span></a> <a href="{{ path('document_list', {type: 'jail'}) }}" class="pc-link"><span class="pc-micon"><i class="material-icons-two-tone">receipt</i></span><span class="pc-mtext">{% trans %}title_jails{% endtrans %}</span></a>
</li> </li>

2
templates/document/types/LicenceWithdrawal.html.twig
View File

@@ -1,4 +1,4 @@
<ul> <ul>
<li>{% trans %}title_type{% endtrans %} : {{ document.type|trans }}</li> <li>{% trans %}title_type{% endtrans %} : {{ document.type|trans }}</li>
<li>{% trans %}title_until{% endtrans %} : {{ document.until|date('_datetime.format'|trans) }} H</li> <li>{% trans %}title_until{% endtrans %} : {{ document.until|date('_datetime.format'|trans) }}</li>
</ul> </ul>

18
templates/document/view.html.twig
View File

@@ -108,6 +108,24 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% if shared is not defined %}
<!-- Modal -->
<div class="modal fade" id="addCommentModal" tabindex="-1" role="dialog" aria-labelledby="addCommentModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-xl" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="addCommentModalTitle">{% trans %}title_add_comment{% endtrans %}</h5>
</div>
<div class="modal-body">
{{ form(formComment) }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">{% trans %}button_cancel{% endtrans %}</button>
</div>
</div>
</div>
</div>
{% endif %}
{% endblock %} {% endblock %}