feat: implement equipment order export and tracking status
This commit is contained in:
+36
-11
@@ -21,7 +21,7 @@
|
||||
|
||||
<div class="bg-white p-6 rounded-lg border border-gray-200 shadow-sm mb-6">
|
||||
<form th:action="@{/admin/equipements/recherche}" method="get" class="space-y-4">
|
||||
<div class="grid grid-cols-1 md:grid-cols-3 gap-4">
|
||||
<div class="grid grid-cols-1 md:grid-cols-4 gap-4">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Équipement</label>
|
||||
<select name="equipementId" class="w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500 sm:text-sm px-3 py-2 border">
|
||||
@@ -44,10 +44,28 @@
|
||||
<option value="false" th:selected="${fourni != null && !fourni}">Non</option>
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Commandé</label>
|
||||
<select name="commandee" class="w-full border-gray-300 rounded-md shadow-sm focus:ring-blue-500 focus:border-blue-500 sm:text-sm px-3 py-2 border">
|
||||
<option value="">Tous</option>
|
||||
<option value="false" th:selected="${commandee != null && !commandee}">Non commandé</option>
|
||||
<option value="true" th:selected="${commandee != null && commandee}">Commandé</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex justify-end space-x-3">
|
||||
<button type="submit" class="bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-blue-700">Rechercher</button>
|
||||
<a th:href="@{/admin/equipements/recherche/export(equipementId=${equipementId},categorieId=${categorieId},fourni=${fourni})}" class="bg-green-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-green-700">Exporter</a>
|
||||
<div class="flex justify-between items-center pt-2">
|
||||
<a th:href="@{/admin/equipements/export-commande}"
|
||||
onclick="return confirm('Exporter les équipements non encore commandés et les marquer comme commandés ?');"
|
||||
class="bg-indigo-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-indigo-700 flex items-center space-x-1 shadow-sm">
|
||||
<svg class="w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"/>
|
||||
</svg>
|
||||
Exporter Commande Équipementier (Regroupé)
|
||||
</a>
|
||||
<div class="flex space-x-3">
|
||||
<button type="submit" class="bg-blue-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-blue-700">Rechercher</button>
|
||||
<a th:href="@{/admin/equipements/recherche/export(equipementId=${equipementId},categorieId=${categorieId},fourni=${fourni},commandee=${commandee})}" class="bg-green-600 text-white px-4 py-2 rounded-lg text-sm font-medium hover:bg-green-700">Exporter Recherche</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
@@ -62,12 +80,13 @@
|
||||
<th class="py-3 px-4 font-medium text-left">Équipement</th>
|
||||
<th class="py-3 px-4 font-medium text-left">Référence</th>
|
||||
<th class="py-3 px-4 font-medium text-left">Taille / Floc.</th>
|
||||
<th class="py-3 px-4 font-medium text-center">Commandé</th>
|
||||
<th class="py-3 px-4 font-medium text-center">Fourni</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="divide-y divide-gray-200 text-sm">
|
||||
<tr th:if="${#lists.isEmpty(dotations)}">
|
||||
<td colspan="7" class="py-8 text-center text-gray-500">Aucun résultat trouvé pour cette recherche.</td>
|
||||
<td colspan="8" class="py-8 text-center text-gray-500">Aucun résultat trouvé pour cette recherche.</td>
|
||||
</tr>
|
||||
<tr th:each="dotation : ${dotations}" class="hover:bg-gray-50">
|
||||
<td class="py-3 px-4 font-medium text-gray-900">
|
||||
@@ -85,6 +104,12 @@
|
||||
<div th:if="${dotation.flocage != null && !dotation.flocage.isEmpty()}" th:text="'F: ' + ${dotation.flocage}">Flocage</div>
|
||||
<div th:if="${dotation.numero != null && !dotation.numero.isEmpty()}" th:text="'N: ' + ${dotation.numero}">N°</div>
|
||||
</td>
|
||||
<td class="py-3 px-4 text-center">
|
||||
<span th:if="${dotation.commandee}" class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-blue-100 text-blue-800" th:title="${dotation.dateCommande != null ? #temporals.format(dotation.dateCommande, 'dd/MM/yyyy HH:mm') : ''}">
|
||||
Oui <span th:if="${dotation.dateCommande != null}" class="ml-1 text-[10px] text-blue-600" th:text="'(' + ${#temporals.format(dotation.dateCommande, 'dd/MM')} + ')'"></span>
|
||||
</span>
|
||||
<span th:unless="${dotation.commandee}" class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-gray-100 text-gray-600">Non</span>
|
||||
</td>
|
||||
<td class="py-3 px-4 text-center">
|
||||
<span th:if="${dotation.fourni}" class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-green-100 text-green-800">Oui</span>
|
||||
<span th:unless="${dotation.fourni}" class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-red-100 text-red-800">Non</span>
|
||||
@@ -106,12 +131,12 @@
|
||||
<div class="flex items-center space-x-2" th:if="${totalPages > 1}">
|
||||
<!-- Page Précédente -->
|
||||
<a th:if="${currentPage > 0}"
|
||||
th:href="@{/admin/equipements/recherche(equipementId=${equipementId},categorieId=${categorieId},fourni=${fourni},page=${currentPage - 1})}"
|
||||
th:href="@{/admin/equipements/recherche(equipementId=${equipementId},categorieId=${categorieId},fourni=${fourni},commandee=${commandee},page=${currentPage - 1})}"
|
||||
hx-get="/admin/equipements/recherche"
|
||||
hx-target="#equipements-table-container"
|
||||
hx-select="#equipements-table-container"
|
||||
hx-push-url="true"
|
||||
th:attr="hx-vals=|{"equipementId": "${equipementId != null ? equipementId : ''}", "categorieId": "${categorieId != null ? categorieId : ''}", "fourni": "${fourni != null ? fourni : ''}", "page": ${currentPage - 1}}|"
|
||||
th:attr="hx-vals=|{"equipementId": "${equipementId != null ? equipementId : ''}", "categorieId": "${categorieId != null ? categorieId : ''}", "fourni": "${fourni != null ? fourni : ''}", "commandee": "${commandee != null ? commandee : ''}", "page": ${currentPage - 1}}|"
|
||||
class="px-3 py-1 border border-gray-300 rounded hover:bg-gray-100 transition-colors">
|
||||
Précédent
|
||||
</a>
|
||||
@@ -121,12 +146,12 @@
|
||||
|
||||
<!-- Numéros de pages -->
|
||||
<th:block th:each="pageNum : ${#numbers.sequence(0, totalPages - 1)}" th:if="${totalPages > 0}">
|
||||
<a th:href="@{/admin/equipements/recherche(equipementId=${equipementId},categorieId=${categorieId},fourni=${fourni},page=${pageNum})}"
|
||||
<a th:href="@{/admin/equipements/recherche(equipementId=${equipementId},categorieId=${categorieId},fourni=${fourni},commandee=${commandee},page=${pageNum})}"
|
||||
hx-get="/admin/equipements/recherche"
|
||||
hx-target="#equipements-table-container"
|
||||
hx-select="#equipements-table-container"
|
||||
hx-push-url="true"
|
||||
th:attr="hx-vals=|{"equipementId": "${equipementId != null ? equipementId : ''}", "categorieId": "${categorieId != null ? categorieId : ''}", "fourni": "${fourni != null ? fourni : ''}", "page": ${pageNum}}|"
|
||||
th:attr="hx-vals=|{"equipementId": "${equipementId != null ? equipementId : ''}", "categorieId": "${categorieId != null ? categorieId : ''}", "fourni": "${fourni != null ? fourni : ''}", "commandee": "${commandee != null ? commandee : ''}", "page": ${pageNum}}|"
|
||||
th:text="${pageNum + 1}"
|
||||
class="px-3 py-1 rounded transition-colors"
|
||||
th:classappend="${currentPage == pageNum ? 'bg-blue-600 text-white' : 'border border-gray-300 hover:bg-gray-100'}">
|
||||
@@ -136,12 +161,12 @@
|
||||
|
||||
<!-- Page Suivante -->
|
||||
<a th:if="${currentPage < totalPages - 1}"
|
||||
th:href="@{/admin/equipements/recherche(equipementId=${equipementId},categorieId=${categorieId},fourni=${fourni},page=${currentPage + 1})}"
|
||||
th:href="@{/admin/equipements/recherche(equipementId=${equipementId},categorieId=${categorieId},fourni=${fourni},commandee=${commandee},page=${currentPage + 1})}"
|
||||
hx-get="/admin/equipements/recherche"
|
||||
hx-target="#equipements-table-container"
|
||||
hx-select="#equipements-table-container"
|
||||
hx-push-url="true"
|
||||
th:attr="hx-vals=|{"equipementId": "${equipementId != null ? equipementId : ''}", "categorieId": "${categorieId != null ? categorieId : ''}", "fourni": "${fourni != null ? fourni : ''}", "page": ${currentPage + 1}}|"
|
||||
th:attr="hx-vals=|{"equipementId": "${equipementId != null ? equipementId : ''}", "categorieId": "${categorieId != null ? categorieId : ''}", "fourni": "${fourni != null ? fourni : ''}", "commandee": "${commandee != null ? commandee : ''}", "page": ${currentPage + 1}}|"
|
||||
class="px-3 py-1 border border-gray-300 rounded hover:bg-gray-100 transition-colors">
|
||||
Suivant
|
||||
</a>
|
||||
|
||||
Reference in New Issue
Block a user