chore: bump version to v0.0.42

| 324 | Création d'une page d'administration : listing des customers |
|------------------|-----------------|
|                  |                 |

## Description de la PR

## Modification du .env

## Check list

- [x] Pas de régression
- [ ] TU/TI/TF rédigée
- [x] TU/TI/TF OK
- [x] CHANGELOG modifié

Reviewed-on: #24
Reviewed-by: Autin <tristan@yuno.malio.fr>
Co-authored-by: Matteo <matteo@yuno.malio.fr>
Co-committed-by: Matteo <matteo@yuno.malio.fr>

CHANGELOG.md

@@ -41,6 +41,9 @@ Ajouter dans le fichier .env du frontend
 * [#256] Créer une nouvelle réception (étape 3 - bovin)
 * [#314] Création d'une page d'administration : listing des utilisateurs
 * [#313] Admin modification creation fournisseur
+* [#275] Lister les expéditions en attente
+* [#276] Lister les expéditions terminées
+* [#324] Creation page admin listing clients
 
 ### Changed
 

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.40'
+    app.version: '0.0.42'

frontend/layouts/admin.vue

@@ -36,6 +36,9 @@
                     <NuxtLink to="/admin/user/list">
                         Utilisateurs
                     </NuxtLink>
+                    <NuxtLink to="/admin/customer/customer-list">
+                        Client
+                    </NuxtLink>
                 </div>
 
                 <div class="p-4">

frontend/pages/admin/customer/[[id]].vue

@@ -0,0 +1,12 @@
+<template>
+
+</template>
+
+<script setup lang="ts">
+definePageMeta({layout: "admin"})
+
+const route = useRoute()
+const router = useRouter()
+const auth = useAuthStore()
+
+</script>

frontend/pages/admin/customer/customer-list.vue

@@ -0,0 +1,112 @@
+<template>
+    <div class="flex items-center justify-between">
+        <h1 class="text-3xl font-bold uppercase">Client</h1>
+        <NuxtLink
+            to="/admin/customer"
+            class="flex items-center justify-center text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
+            :class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
+            @click="handleAddClick"
+        >
+            Ajouter
+        </NuxtLink>
+    </div>
+
+    <div v-if="auth.isAdmin" class="mt-6 border border-slate-200 mb-16">
+        <div class="max-h-96 overflow-y-auto">
+            <div
+                class="sticky top-0 z-10 grid grid-cols-7 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
+            >
+                <div>Nom</div>
+                <div>Code</div>
+                <div>Rue</div>
+                <div>Complément</div>
+                <div>Code Postal</div>
+                <div>Ville</div>
+                <div>Pays</div>
+            </div>
+
+            <div v-if="customerList.length === 0" class="px-4 py-6 text-slate-400">
+                Aucun fournisseur.
+            </div>
+
+            <div v-for="customer in customerList" :key="customer.id">
+                <div
+                    v-if="!customer.addresses || customer.addresses.length === 0"
+                    class="grid grid-cols-7 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
+                    @click="goToCustomer(customer.id)"
+                >
+                    <div class="truncate">{{ customer.label }}</div>
+                    <div class="truncate">{{ customer.code }}</div>
+                    <div class="col-span-1">Pas d'adresse</div>
+                    <div class="uppercase truncate">{{"—"}}</div>
+                    <div class="uppercase truncate">{{"—"}}</div>
+                    <div class="uppercase truncate">{{"—"}}</div>
+                    <div class="uppercase truncate">{{"—"}}</div>
+                </div>
+
+                <template v-else-if="customer.addresses.length > 0">
+                    <div
+                        v-for="(address, idx) in customer.addresses"
+                        :key="address.id ?? `${customer.id}-${idx}-${address.street}-${address.postalCode}`"
+                        class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                        :class="idx > 0 ? 'pl-4 border-l-4 border-l-slate-200 bg-slate-50' : ''"
+                        @click="goToCustomer(customer.id)"
+                    >
+                        <div class="truncate">
+                            {{ idx === 0 ? customer.label : "↳" }}
+                        </div>
+                        <div class="truncate">{{ idx === 0 ? customer.code : ""  }}</div>
+                        <div class="truncate">{{ address.street || "—" }}</div>
+                        <div class="truncate">{{ address.street2 || "—" }}</div>
+                        <div>{{ address.postalCode || "—"  }}</div>
+                        <div class="uppercase truncate">{{ address.city || "—"  }}</div>
+                        <div class="uppercase truncate">{{ address.countryCode || "—" }}</div>
+                    </div>
+                </template>
+
+                <template v-else>
+                    <div
+                        class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
+                        @click="goToCustomer(customer.id)"
+                    >
+                        <div class="truncate">{{ customer.label }}</div>
+                        <div class="truncate">{{ customer.code }}</div>
+                        <div class="col-span-5 text-slate-400">
+                            Adresses non chargées
+                        </div>
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+    <div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
+        Accès réservé aux administrateurs.
+    </div>
+</template>
+
+<script setup lang="ts">
+import { getCustomerList } from "~/services/customer"
+import type { CustomerData } from "~/services/dto/customer-data"
+import { useAuthStore } from "~/stores/auth"
+
+definePageMeta({ layout: "admin" })
+
+const customerList = ref<CustomerData[]>([])
+const router = useRouter()
+const auth = useAuthStore()
+
+const goToCustomer = (id: number) => {
+    if (!auth.isAdmin) return
+    router.push(`/admin/customer/${id}`)
+}
+
+const handleAddClick = (event: Event) => {
+    if (auth.isAdmin) return
+    event.preventDefault()
+}
+
+onMounted(async () => {
+    if (!auth.isAdmin) return
+    customerList.value = await getCustomerList()
+})
+</script>

frontend/pages/index.vue

@@ -6,10 +6,10 @@
         <card-link label="NOUVELLE EXPÉDITION" link="/shipment" iconName="mdi:truck-fast-outline" />
         <card-link label="PLAN DE SITE" link="/" iconName="mdi:warehouse" />
         <card-link label="RÉCEPTIONS EN ATTENTE" link="/reception/waiting-reception" iconName="mdi:truck-remove-outline" />
-        <card-link label="EXPÉDITIONS EN ATTENTE" link="/" iconName="mdi:truck-cargo-container" />
+        <card-link label="EXPÉDITIONS EN ATTENTE" link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container" />
         <card-link label="CASES" link="/" iconName="mdi:cube-outline" />
         <card-link label="RÉCEPTIONS FINIES" link="/reception/finish-reception" iconName="mdi:truck-check-outline" />
-        <card-link label="EXPÉDITIONS FINIES" link="/" iconName="mdi:truck-delivery-outline" />
+        <card-link label="EXPÉDITIONS FINIES" link="/shipment/finish-shipment" iconName="mdi:truck-delivery-outline" />
         <card-link label="PASSEPORT DU BOVIN" link="/" iconName="mdi:cow" />
     </div>
 </template>

frontend/pages/shipment/finish-shipment.vue

@@ -0,0 +1,81 @@
+<template>
+    <div class="flex items-center justify-start gap-10">
+        <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44"/>
+        <h1 class="text-3xl font-bold uppercase">listes des expéditions finie</h1>
+    </div>
+
+    <div class="ps-20 ">
+        <div class="mt-6 border border-slate-200 mb-16 ">
+            <div class="grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
+                <div>Numéro</div>
+                <div>Date</div>
+                <div>Client</div>
+                <div>Adresse</div>
+                <div>Type d'expéditon</div>
+                <div>Poids</div>
+            </div>
+            <div
+                v-for="shipment in shipmentList"
+                :key="shipment
+               .id"
+                class="grid grid-cols-6 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
+                role="button"
+                tabindex="0"
+                @click="goToshipment(shipment.id)"
+            >
+                <div>{{ shipment.identificationNumber }}</div>
+                <div>{{ shipment.shipmentDate }}</div>
+                <div>{{ shipment.customer?.label }}</div>
+                <div>{{ shipment.address?.fullAddress }}</div>
+                <div>
+                    <template v-if="formatBovinShipmentLines(shipment).length">
+                        <div
+                            v-for="(line, index) in formatBovinShipmentLines(shipment)"
+                            :key="index"
+                            class="leading-5"
+                        >
+                            {{ line }}
+                        </div>
+                    </template>
+                </div>
+                <div>{{ formatWeighing(shipment, 'gross') }} | {{ formatWeighing(shipment, 'tare') }}</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import type {ShipmentData} from "~/services/dto/shipment-data";
+import {getShipmentList} from "~/services/shipment";
+
+const shipmentList = ref<ShipmentData[]>()
+const router = useRouter()
+
+const formatWeighing = (shipment: ShipmentData, type: 'gross' | 'tare') => {
+    const entry = shipment.weights?.find((weight) => weight.type === type)
+    if (!entry || entry.weight == null || entry.dsd == null) {
+        return '—'
+    }
+    return `${entry.weight} kg`
+}
+
+const formatBovinShipmentLines = (shipment: ShipmentData) => {
+    if (!shipment.bovinShipments?.length) {
+        return []
+    }
+    return shipment.bovinShipments.map((entry) => {
+        const label = typeof entry.shipmentType === 'string'
+            ? entry.shipmentType
+            : entry.shipmentType?.label
+        return `${label ?? '—'} : ${entry.nbBovinSend ?? '—'}`
+    })
+}
+
+const goToshipment = (id: number) => {
+    //router.push(`/shipment/update/${id}`)
+}
+
+onMounted(async () => {
+    shipmentList.value = await getShipmentList(true)
+})
+</script>

frontend/pages/shipment/waiting-shipment.vue

@@ -0,0 +1,73 @@
+<template>
+    <div class="flex items-center justify-between ">
+        <div class="flex items-center gap-10">
+            <Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44"/>
+            <h1 class="text-3xl font-bold uppercase">listes des expéditions en attente</h1>
+        </div>
+    </div>
+
+    <div class="ps-20 ">
+        <div class="mt-6 border border-slate-200 mb-16 ">
+            <div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
+                <div>Client</div>
+                <div>Adresse</div>
+                <div>Type d'expéditions</div>
+                <div>Transporteur</div>
+                <div>Immatriculation</div>
+            </div>
+            <div
+                v-for="shipment in shipmentList"
+                :key="shipment.id"
+                class="grid grid-cols-5 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
+                role="button"
+                tabindex="0"
+                @click="goToShipment(shipment.id)"
+                @keydown.enter="goToShipment(shipment.id)"
+            >
+                <div>{{ shipment.customer?.label }}</div>
+                <div>{{ shipment.address?.fullAddress }}</div>
+                <div>
+                    <template v-if="formatBovinShipmentLines(shipment).length">
+                        <div
+                            v-for="(line, index) in formatBovinShipmentLines(shipment)"
+                            :key="index"
+                            class="leading-5"
+                        >
+                            {{ line }}
+                        </div>
+                    </template>
+                </div>
+                <div>{{ shipment.carrier?.name }}</div>
+                <div>{{ shipment.licencePlate }}</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+
+import type {ShipmentData} from "~/services/dto/shipment-data";
+import {getShipmentList} from "~/services/shipment";
+
+const shipmentList = ref<ShipmentData[]>()
+const router = useRouter()
+
+const goToShipment = (id: number) => {
+    router.push(`/shipment/${id}`)
+}
+const formatBovinShipmentLines = (shipment: ShipmentData) => {
+    if (!shipment.bovinShipments?.length) {
+        return []
+    }
+    return shipment.bovinShipments.map((entry) => {
+        const label = typeof entry.shipmentType === 'string'
+            ? entry.shipmentType
+            : entry.shipmentType?.label
+        return `${label ?? '—'} : ${entry.nbBovinSend ?? '—'}`
+    })
+}
+
+onMounted(async () => {
+    shipmentList.value = await getShipmentList(false)
+})
+</script>

frontend/services/dto/shipment-data.ts

@@ -1,6 +1,7 @@
 import type {CarrierData} from '~/services/dto/carrier-data'
 import type {TruckData} from '~/services/dto/truck-data'
 import type {CustomerData} from '~/services/dto/customer-data'
+import type {AddressData} from "~/services/dto/address-data";
 
 export interface ShipmentTypeData {
     id: number
@@ -21,6 +22,7 @@ export type ShipmentData = {
     shipmentDate: string
     currentStep: number
     isValid: boolean
+    address?: AddressData | null
     carrier?: CarrierData | null
     truck?: TruckData | null
     customer?: CustomerData | null

src/Entity/Shipment.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace App\Entity;
 
+use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter;
+use ApiPlatform\Metadata\ApiFilter;
 use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
@@ -26,6 +28,7 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 #[ORM\Entity]
 #[ORM\HasLifecycleCallbacks]
 #[ORM\Table(name: 'shipment')]
+#[ApiFilter(BooleanFilter::class, properties: ['isValid'])]
 #[ApiResource(
     operations: [
         new Get(