Merge branch 'Xbird/Fixs' into 'main'

Fix some issues

See merge request gamexperience/vision!29

package.json

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

src/Form/LicencewithdrawalType.php

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

templates/_cells/documentTable.html.twig

@@ -60,6 +60,10 @@
                 <br /><small>{% trans %}title_type{% endtrans %}:</small>
                 <small>{{ i.type|trans }}</small>
               {% 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 %}
                 <br /><small>{% trans %}title_numberplate{% endtrans %}:</small>
                 <small>{{ i.numberplate }}</small>

templates/base.html.twig

@@ -123,6 +123,9 @@
               <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>
               </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">
                 <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>

templates/document/types/LicenceWithdrawal.html.twig

@@ -1,4 +1,4 @@
 <ul>
     <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>

templates/document/view.html.twig

@@ -108,6 +108,24 @@
     {% endif %}
   </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 %}