Merge pull request #75 from kiloutyg/64-update-the-archived-and-close…

…d-lists-to-be-mor-consistent changed the value of a flex style to be more or less aligned, but it…
kiloutyg · Mar 19, 2024 · c854d95 · c854d95
2 parents 530f912 + c6a7754
commit c854d95
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 16 deletions.
diff --git a/templates/services/efnc/display/archived_efnc_list.html.twig b/templates/services/efnc/display/archived_efnc_list.html.twig
@@ -33,7 +33,7 @@
 									|
 								</div>
 								<div
-									style="flex: 1; text-align: center;">
+									style="flex: 2; text-align: center;">
 									{{ EFNC.nonConformityOrigin.name|upper }}
 								</div>
 								<div

diff --git a/templates/services/efnc/display/closed_efnc_list.html.twig b/templates/services/efnc/display/closed_efnc_list.html.twig
@@ -33,7 +33,7 @@
 									|
 								</div>
 								<div
-									style="flex: 1; text-align: center;">
+									style="flex: 2; text-align: center;">
 									{{ EFNC.nonConformityOrigin.name|upper }}
 								</div>
 								<div

diff --git a/templates/services/efnc/display/efnc_list.html.twig b/templates/services/efnc/display/efnc_list.html.twig
@@ -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>

diff --git a/templates/services/efnc/modification/form_modification.html.twig b/templates/services/efnc/modification/form_modification.html.twig
@@ -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"
@@ -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">
-Original file 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 @@