Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changed the value of a flex style to be more or less aligned, but it… #75

Merged
merged 1 commit into from
Mar 19, 2024
Merged

changed the value of a flex style to be more or less aligned, but it… #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/services/efnc/display/archived_efnc_list.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
|
</div>
<div
style="flex: 1; text-align: center;">
style="flex: 2; text-align: center;">
{{ EFNC.nonConformityOrigin.name|upper }}
</div>
<div
Expand Down
2 changes: 1 addition & 1 deletion templates/services/efnc/display/closed_efnc_list.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
|
</div>
<div
style="flex: 1; text-align: center;">
style="flex: 2; text-align: center;">
{{ EFNC.nonConformityOrigin.name|upper }}
</div>
<div
Expand Down
43 changes: 30 additions & 13 deletions templates/services/efnc/display/efnc_list.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,63 @@
{% endblock %}
{% block body %}

<ul class="list-group" style="background-color:azure">
<ul
class="list-group"
style="background-color:azure">

{% for EFNC in EFNCs|sort((a,b) => b.id <=> a.id) %}
{% if EFNC.archived == false or EFNC.archived == null %}

<div class="ml-auto">
<div
class="ml-auto">
<strong>
<a target="_top" href=" {{path('app_form_modification_display', { 'efncID': EFNC.id})}}" class="list-group-item list-group-item-action list-group-item-light">
<a
target="_top"
href=" {{path('app_form_modification_display', { 'efncID': EFNC.id})}}"
class="list-group-item list-group-item-action list-group-item-light">

<div class="d-flex justify-content-between align-items-center" style="display: flex;">
<div style="flex: 1; text-align: center;">
<div
class="d-flex justify-content-between align-items-center"
style="display: flex;">
<div
style="flex: 1; text-align: center;">
{{ EFNC.Title|upper|split('_')|first }}
{{ EFNC.id|upper}}
</div>
<div style="flex: 0;">
<div
style="flex: 0;">
|
</div>
<div style="flex: 2; text-align: center;">
<div
style="flex: 2; text-align: center;">
{{ EFNC.nonConformityOrigin.name|upper }}
</div>
<div style="flex: 0;">
<div
style="flex: 0;">
|
</div>
<div style="flex: 5; text-align: center;">
<div
style="flex: 5; text-align: center;">
{{ EFNC.product.category.name|upper }}
-
{{ EFNC.product.version.name|upper }}
-
{{ EFNC.product.color.name|upper }}
</div>
<div style="flex: 0;">
<div
style="flex: 0;">
|
</div>
<div style="flex: 1; text-align: center;">
<div
style="flex: 1; text-align: center;">
{{EFNC.Project.name|upper }}
</div>
<div style="flex: 0;">
<div
style="flex: 0;">
|
</div>
<div style="flex: 1; text-align: center;">
<div
style="flex: 1; text-align: center;">
{{EFNC.CreatedAt|date('d/m/Y') }}
</div>
</div>
Expand Down
12 changes: 11 additions & 1 deletion templates/services/efnc/modification/form_modification.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
</div>
</div>
<div
class="d-grid gap-2 d-md-flex justify-content-md-center mt-2">
class="d-grid gap-2 d-md-flex justify-content-md-center mt-2 mb-2">
<button
type="submit"
class="btn btn-danger archive-EFNC"
Expand Down Expand Up @@ -252,6 +252,16 @@
avec le commentaire suivant :
{{ EFNC.archivingCommentary }}
</div>
{% if is_granted('ROLE_MASTER_ADMIN') %}
<div
class="d-grid gap-2 d-md-flex justify-content-md-center mt-2 mb-2">
<a
class="btn btn-danger archive-EFNC"
href="{{path('app_close_entity', {entityType: 'efnc', id: EFNC.id})}}">
Cloturer
</a>
</div>
{% endif %}
{% elseif EFNC.archived is same as(true) and EFNC.status is not null %}
<div
class="d-grid gap-2 d-md-flex justify-content-md-center mt-2 mb-2 text-white">
Expand Down
Loading