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

Enhance and fix some bugs

Browse Source
This commit is contained in:
Xbird
2022-04-07 19:37:10 +00:00
parent 32adcdaad4
commit b3cf967a4d
16 changed files with 158 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
templates/_cells/directoryCard.html.twig
View File

@@ -7,46 +7,46 @@
<div class="row">
{% set path_directories_uploads = 'uploads/directories' %}
{% if directory.faceImageSize != 0 %}{% set faceImage = path_directories_uploads ~ '/' ~ directory.faceImageName %}{% else %}{% set faceImage = 'img/nophoto.jpg' %}{% endif %}
<div class="col-2">
<a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}title_faceImage{% endtrans %}: {{ directory.faceImageDate ? directory.faceImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_faceImage{% endtrans %}: {{ directory.faceImageDate ? directory.faceImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(faceImage) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(faceImage) }}" alt="{{ directory.fullname}}"></a>
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}title_faceImage{% endtrans %}: {{ directory.faceImageDate ? directory.faceImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_faceImage{% endtrans %}: {{ directory.faceImageDate ? directory.faceImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(faceImage) }}"><img class="img-fluid m-1" src="{{ asset(faceImage) }}" alt="{{ directory.fullname}}"></a>
</div>
{% if directory.backImageSize != 0 %}{% set backImage = path_directories_uploads ~ '/' ~ directory.backImageName %}{% else %}{% set backImage = 'img/nophoto.jpg' %}{% endif %}
<div class="col-2">
<a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}title_backImage{% endtrans %}: {{ directory.backImageDate ? directory.backImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_backImage{% endtrans %}: {{ directory.backImageDate ? directory.backImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(backImage) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(backImage) }}" alt="{{ directory.fullname}}"></a>
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}title_backImage{% endtrans %}: {{ directory.backImageDate ? directory.backImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_backImage{% endtrans %}: {{ directory.backImageDate ? directory.backImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(backImage) }}"><img class="img-fluid m-1" src="{{ asset(backImage) }}" alt="{{ directory.fullname}}"></a>
</div>
{% if directory.rightImageSize != 0 %}{% set rightImage = path_directories_uploads ~ '/' ~ directory.rightImageName %}{% else %}{% set rightImage = 'img/nophoto.jpg' %}{% endif %}
<div class="col-2">
<a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}title_rightImage{% endtrans %}: {{ directory.rightImageDate ? directory.rightImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_rightImage{% endtrans %}: {{ directory.rightImageDate ? directory.rightImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(rightImage) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(rightImage) }}" alt="{{ directory.fullname}}"></a>
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}title_rightImage{% endtrans %}: {{ directory.rightImageDate ? directory.rightImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_rightImage{% endtrans %}: {{ directory.rightImageDate ? directory.rightImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(rightImage) }}"><img class="img-fluid m-1" src="{{ asset(rightImage) }}" alt="{{ directory.fullname}}"></a>
</div>
{% if directory.leftImageSize != 0 %}{% set leftImage = path_directories_uploads ~ '/' ~ directory.leftImageName %}{% else %}{% set leftImage = 'img/nophoto.jpg' %}{% endif %}
<div class="col-2">
<a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}title_leftImage{% endtrans %}: {{ directory.leftImageDate ? directory.leftImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_leftImage{% endtrans %}: {{ directory.leftImageDate ? directory.leftImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(leftImage) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(leftImage) }}" alt="{{ directory.fullname}}"></a>
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" data-bs-toggle="tooltip" data-placement="top" title="{% trans %}title_leftImage{% endtrans %}: {{ directory.leftImageDate ? directory.leftImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" data-caption="{{ directory.fullname}} | {% trans %}title_leftImage{% endtrans %}: {{ directory.leftImageDate ? directory.leftImageDate|date('_datetime.format'|trans) : 'value_no_picture'|trans }}" href="{{ asset(leftImage) }}"><img class="img-fluid m-1" src="{{ asset(leftImage) }}" alt="{{ directory.fullname}}"></a>
</div>
{% if directory.idCardImageSize != 0 %}
<div class="col-2">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.idCardImageName) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(path_directories_uploads ~ '/' ~ directory.idCardImageName) }}" alt="{% trans %}tooltip_id_card{% endtrans %}"></a>
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.idCardImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.idCardImageName) }}" alt="{% trans %}tooltip_id_card{% endtrans %}"></a>
</div>
{% endif %}
{% if app.user.hasPermission('general_legal_view') %}
{% if directory.carLicenceImageSize != 0 %}
<div class="col-2">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.carLicenceImageName) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(path_directories_uploads ~ '/' ~ directory.carLicenceImageName) }}" alt="{% trans %}tooltip_car_licence{% endtrans %}"></a>
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.carLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.carLicenceImageName) }}" alt="{% trans %}tooltip_car_licence{% endtrans %}"></a>
</div>
{% endif %}
{% if directory.motorcycleLicenceImageSize != 0 %}
<div class="col-2">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.motorcycleLicenceImageName) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(path_directories_uploads ~ '/' ~ directory.motorcycleLicenceImageName) }}" alt="{% trans %}tooltip_motorcycle_licence{% endtrans %}"></a>
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.motorcycleLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.motorcycleLicenceImageName) }}" alt="{% trans %}tooltip_motorcycle_licence{% endtrans %}"></a>
</div>
{% endif %}
{% if directory.truckLicenceImageSize != 0 %}
<div class="col-2">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.truckLicenceImageName) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(path_directories_uploads ~ '/' ~ directory.truckLicenceImageName) }}" alt="{% trans %}tooltip_truck_licence{% endtrans %}"></a>
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.truckLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.truckLicenceImageName) }}" alt="{% trans %}tooltip_truck_licence{% endtrans %}"></a>
</div>
{% endif %}
{% if directory.boatLicenceImageSize != 0 %}
<div class="col-2">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.boatLicenceImageName) }}"><img class="img-fluid m-1 wid-80 directory-picture-card" src="{{ asset(path_directories_uploads ~ '/' ~ directory.boatLicenceImageName) }}" alt="{% trans %}tooltip_boat_licence{% endtrans %}"></a>
<div class="col-2 col-xs-4">
<a data-toggle="lightbox" data-gallery="directory" href="{{ asset(path_directories_uploads ~ '/' ~ directory.boatLicenceImageName) }}"><img class="img-fluid m-1" src="{{ asset(path_directories_uploads ~ '/' ~ directory.boatLicenceImageName) }}" alt="{% trans %}tooltip_boat_licence{% endtrans %}"></a>
</div>
{% endif %}
{% endif %}
@@ -58,9 +58,12 @@
<li class="list-group-item"><span class="fa-li"><i class="fas fa-transgender-alt"></i></span>{% trans %}title_gender{% endtrans %} : {{ directory.gender | default('value_no_value'|trans) }}</li>
<li class="list-group-item"><span class="fa-li"><i class="fas fa-arrows-alt-v"></i></span>{% trans %}title_height{% endtrans %} : {{ directory.height | default('value_no_value'|trans) }}</li>
<li class="list-group-item"><span class="fa-li"><i class="fas fa-weight"></i></span>{% trans %}title_weight{% endtrans %} : {{ directory.weight | default('value_no_value'|trans) }}</li>
{% if app.user.hasPermission('general_legal_view') %}
<li class="list-group-item"><span class="fa-li"><i class="fas fa-wheelchair"></i></span>Groupe associé : {% if directory.gang %} <a href="{{ path('document_view', {id: directory.gang.id}) }}">{{ directory.gang.title }}</a> {% endif %}</li>
{% if directory.wanted %}
{% if app.user.hasPermission('general_legal_view') %}
<li class="list-group-item"><span class="fa-li"><i class="fas fa-wheelchair"></i></span>{% trans %}title_gang{% endtrans %} : {% if directory.gang %} <a href="{{ path('document_view', {id: directory.gang.id}) }}">{{ directory.gang.title }}</a> {% endif %}{% if directory.gangInfo %}( {{ directory.gangInfo }} ){% endif %}</li>
{% if directory.hasnopapers %}
<li class="list-group-item"><span class="fa-li"><i class="fas fa-scroll"></i></span>{% trans %}title_hasnopapers{% endtrans %}</li>
{% endif %}
{% if directory.wanted %}
<li class="list-group-item text-danger"><span class="fa-li"><i class="far fa-id-badge"></i></span>{% trans %}title_directory_wanted_light{% endtrans %} : {{ directory.wantedReason | default('value_no_value'|trans) }}</li>
{% endif %}
{% endif %}

1
templates/_cells/directoryTable.html.twig
View File

@@ -22,6 +22,7 @@
{% if nogender is not defined %}<li>{% trans %}title_gender{% endtrans %}: {{i.gender}}</li>{% endif %}
{% if nophone is not defined %}<li>{% trans %}title_phone{% endtrans %}: {{i.phone}}</li>{% endif %}
{% if nodate is not defined %}<li>{% trans %}title_created_at{% endtrans %}: {{i.createdAt |date('_datetime.format'|trans)}}</li>{% endif %}
{% if nopapers is not defined and i.hasNoPapers %}<li>{% trans %}title_hasnopapers{% endtrans %}</li>{% endif %}
</ul>
</td>
{% if noaction is not defined %}

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

@@ -44,7 +44,7 @@
{% endif %}
<td>
<a href="{{ path('document_view', {'id': i.id}) }}" class="text-{{ (i.archive)? 'danger' : 'primary' }}" {% if i.archive %} data-bs-toggle="tooltip" data-placement="top" title="{% trans %}tooltip_archived{% endtrans %}" {% endif %} >`{{i.title | u.truncate(20, '...')}}`</a>
<a href="{{ path('document_view', {'id': i.id}) }}" class="text-{{ (i.archive)? 'danger' : 'primary' }}" {% if i.archive %} data-bs-toggle="tooltip" data-placement="top" title="{% trans %}tooltip_archived{% endtrans %}" {% endif %} >`{{i.title | u.truncate(50, '...')}}`</a>
{% if notype is defined %}
<br /><small>N°: #{{i.id}}</small>
{% endif %}

2
templates/admin/user.html.twig
View File

@@ -7,7 +7,7 @@
<div class="col-5">{{form(searchForm)}}</div>
</div>
<div class="row">
<div class="col-8">
<div class="col-12">
{% include '_cells/adminUserTable.html.twig' with {'users': pagination} %}
</div>
</div>

7
templates/document/types/Gang.html.twig
View File

@@ -18,8 +18,15 @@
<div class="card-body">
<p class="card-text">
<ul>
{% if i.wanted %}
<li class="text-danger">{% trans %}title_directory_wanted_light{% endtrans %} : {{ i.wantedReason | default('value_no_value'|trans) }}</li>
{% endif %}
<li>{% trans %}title_informations{% endtrans %}: {{i.gangInfo}}</li>
<li>{% trans %}title_gender{% endtrans %}: {{i.gender}}</li>
<li>{% trans %}title_phone{% endtrans %}: {{i.phone}}</li>
{% if i.hasnopapers %}
<li>{% trans %}title_hasnopapers{% endtrans %}</li>
{% endif %}
</ul>
</p>
</div>