2026-04-24 07:53:06 +00:00
13 changed files with 229 additions and 39 deletions
--- a/frontend/components/ui/UiDateMaskedInput.vue
+++ b/frontend/components/ui/UiDateMaskedInput.vue
@@ -0,0 +1,108 @@
+<template>
+    <div :class="['flex flex-col', wrapperClass]">
+        <label
+            v-if="label"
+            :for="id"
+            class="font-bold uppercase text-xl text-primary-700"
+            :class="labelClass"
+        >
+            {{ label }}
+        </label>
+        <input
+            :id="id"
+            v-maska="'##/##/####'"
+            type="text"
+            inputmode="numeric"
+            :value="displayValue"
+            :placeholder="placeholder"
+            :disabled="disabled"
+            v-bind="attrs"
+            class="w-full min-w-0 border-b border-primary-700 bg-transparent"
+            :class="[
+                sizeClass,
+                isEmpty ? 'text-neutral-400' : 'text-primary-700',
+                disabled ? 'cursor-not-allowed' : 'cursor-text',
+                inputClass
+            ]"
+            @input="onInput"
+        />
+    </div>
+</template>
+
+<script setup lang="ts">
+import { vMaska } from 'maska/vue'
+import { computed, ref, useAttrs, watch } from 'vue'
+
+defineOptions({ inheritAttrs: false })
+
+const props = withDefaults(
+    defineProps<{
+        id?: string
+        label?: string
+        modelValue: string | null | undefined
+        placeholder?: string
+        disabled?: boolean
+        size?: 'default' | 'compact'
+        wrapperClass?: string
+        labelClass?: string
+        inputClass?: string
+    }>(),
+    {
+        placeholder: 'JJ/MM/AAAA',
+        disabled: false,
+        size: 'default',
+        wrapperClass: '',
+        labelClass: '',
+        inputClass: ''
+    }
+)
+
+const emit = defineEmits<{
+    (event: 'update:modelValue', value: string): void
+}>()
+
+const attrs = useAttrs()
+
+const toDisplay = (iso: string | null | undefined): string => {
+    if (!iso) return ''
+    const parts = iso.split('-')
+    if (parts.length !== 3) return ''
+    const [year, month, day] = parts
+    if (year.length !== 4 || month.length !== 2 || day.length !== 2) return ''
+    return `${day}/${month}/${year}`
+}
+
+const toIso = (display: string): string | null => {
+    const match = display.match(/^(\d{2})\/(\d{2})\/(\d{4})$/)
+    if (!match) return null
+    const [, day, month, year] = match
+    return `${year}-${month}-${day}`
+}
+
+const displayValue = ref(toDisplay(props.modelValue))
+
+watch(() => props.modelValue, (newIso) => {
+    const expected = toDisplay(newIso)
+    if (expected !== displayValue.value) {
+        displayValue.value = expected
+    }
+})
+
+const isEmpty = computed(() => !displayValue.value)
+const sizeClass = computed(() =>
+    props.size === 'compact'
+        ? 'text-sm h-8 font-normal normal-case tracking-normal'
+        : 'text-xl py-[6px]'
+)
+
+const onInput = (event: Event) => {
+    const target = event.target as HTMLInputElement
+    displayValue.value = target.value
+    if (target.value === '') {
+        emit('update:modelValue', '')
+        return
+    }
+    const iso = toIso(target.value)
+    emit('update:modelValue', iso ?? '')
+}
+</script>
--- a/frontend/pages/infrastructure/case.vue
+++ b/frontend/pages/infrastructure/case.vue
@@ -59,7 +59,7 @@
                    />
                </template>
                <template #header-arrivalDate>
-                    <UiDateInput v-model="arrivalDateFilter" size="compact" />
+                    <UiDateMaskedInput v-model="arrivalDateFilter" placeholder="Date d'arrivée" size="compact" />
                </template>
                <template #cell-arrivalDate="{ item }">
                    {{ formatDate(item.arrivalDate) }}
--- a/frontend/pages/inventory.vue
+++ b/frontend/pages/inventory.vue
@@ -1,22 +1,27 @@
 <template>
-    <div class="flex items-center justify-between gap-4">
-        <div class="flex items-center gap-10">
-            <Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
-            <h1 class="text-3xl font-bold uppercase text-primary-500">Inventaire bovins</h1>
-        </div>
-        <button
-            v-if="auth.isAdmin"
-            type="button"
-            :disabled="syncing"
-            class="inline-flex items-center gap-2 rounded bg-primary-500 px-4 h-[50px] text-white uppercase text-lg hover:opacity-80 disabled:cursor-not-allowed disabled:opacity-60"
-            @click="syncInventory"
-        >
-            <Icon name="mdi:sync" size="24" :class="syncing ? 'animate-spin' : ''" />
-            {{ syncing ? 'Synchronisation…' : 'Rafraîchir' }}
-        </button>
-    </div>
-
    <div class="px-[86px]">
+        <div class="flex items-center justify-between relative">
+            <div class="flex flex-row absolute -left-[60px]">
+                <Icon
+                    @click="router.push('/')"
+                    name="gg:arrow-left-o"
+                    size="44"
+                    class="cursor-pointer text-primary-500"
+                />
+            </div>
+            <h1 class="font-bold text-3xl uppercase text-primary-500">Inventaire bovins</h1>
+            <button
+                v-if="auth.isAdmin"
+                type="button"
+                :disabled="syncing"
+                class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-6 rounded hover:opacity-80 gap-2 disabled:cursor-not-allowed disabled:opacity-60"
+                @click="syncInventory"
+            >
+                <Icon name="mdi:sync" size="28" :class="syncing ? 'animate-spin' : ''" />
+                Rafraîchir
+            </button>
+        </div>
+
        <div class="mt-6 mb-16">
            <UiDataTable
                v-model:page="page"
@@ -43,13 +48,13 @@
                <template #header-sex>
                    <UiSelect
                        v-model="filters.sex"
-                        placeholder="Sex"
+                        placeholder="Sexe"
                        :options="sexOptions"
                        size="compact"
                    />
                </template>
                <template #header-birthDate>
-                    <UiDateInput v-model="birthDateFilter" size="compact" />
+                    <UiDateMaskedInput v-model="birthDateFilter" size="compact" placeholder="Né le" />
                </template>
                <template #header-breedCode>
                    <UiTextInput
@@ -59,7 +64,13 @@
                    />
                </template>
                <template #header-arrivalDate>
-                    <UiDateInput v-model="arrivalDateFilter" size="compact" />
+                    <UiDateMaskedInput v-model="arrivalDateFilter" size="compact" placeholder="Entrée le" />
+                </template>
+                <template #header-buildingCase.building.label>
+                    <UiTextInput :model-value="''" placeholder="Bâtiment" size="compact" disabled />
+                </template>
+                <template #header-buildingCase.caseNumber>
+                    <UiTextInput :model-value="''" placeholder="Case" size="compact" disabled />
                </template>
                <template #cell-birthDate="{ item }">
                    {{ formatDate(item.birthDate) }}
@@ -67,11 +78,18 @@
                <template #cell-arrivalDate="{ item }">
                    {{ formatDate(item.arrivalDate) }}
                </template>
+                <template #cell-buildingCase.building.label="{ item }">
+                    {{ item.buildingCase?.building?.label ?? '—' }}
+                </template>
+                <template #cell-buildingCase.caseNumber="{ item }">
+                    {{ item.buildingCase?.caseNumber ?? '—' }}
+                </template>
            </UiDataTable>
        </div>
    </div>
 </template>

+
 <script setup lang="ts">
 import type { BovineData } from '~/services/dto/bovine-data'
 import { useAuthStore } from '~/stores/auth'
@@ -160,9 +178,11 @@ const birthDateFilter = singleDateFilter('birthDate[after]', 'birthDate[strictly
 const columns = [
    { key: 'nationalNumber', label: 'N° National', width: '160px' },
    { key: 'workNumber', label: 'N° Travail', width: '110px' },
-    { key: 'sex', label: 'Sex', width: '90px' },
+    { key: 'sex', label: 'Sexe', width: '90px' },
    { key: 'birthDate', label: 'Né le', width: '120px' },
    { key: 'breedCode', label: 'Race' },
+    { key: 'buildingCase.building.label', label: 'Bâtiment' },
+    { key: 'buildingCase.caseNumber', label: 'Case', width: '80px' },
    { key: 'arrivalDate', label: 'Entrée le', width: '120px' }
 ]

--- a/frontend/pages/reception/finish-reception.vue
+++ b/frontend/pages/reception/finish-reception.vue
@@ -24,8 +24,9 @@
                    />
                </template>
                <template #header-receptionDate>
-                    <UiDateInput
+                    <UiDateMaskedInput
                        v-model="receptionDateFilter"
+                        placeholder="Date"
                        size="compact"
                    />
                </template>
@@ -119,7 +120,7 @@ const receptionDateFilter = computed<string>({

 const columns = [
    { key: 'identificationNumber', label: 'Numéro', width: '75px' },
-    { key: 'receptionDate', label: 'Date et heure', width: '120px' },
+    { key: 'receptionDate', label: 'Date', width: '120px' },
    { key: 'supplier.name', label: 'Fournisseur', width: '1.5fr' },
    { key: 'address.fullAddress', label: 'Adresse', width: '2fr' },
    { key: 'receptionType.label', label: 'Type réception', width: '0.9fr' },
--- a/frontend/pages/reception/waiting-reception.vue
+++ b/frontend/pages/reception/waiting-reception.vue
@@ -18,7 +18,7 @@
                @row-click="goToReception"
            >
                <template #header-receptionDate>
-                    <UiDateInput v-model="receptionDateFilter" size="compact" />
+                    <UiDateMaskedInput v-model="receptionDateFilter" placeholder="Date" size="compact" />
                </template>
                <template #header-supplier.name>
                    <UiTextInput
@@ -122,7 +122,7 @@ const receptionDateFilter = computed<string>({
 })

 const columns = [
-    { key: 'receptionDate', label: 'Date et heure', width: '120px' },
+    { key: 'receptionDate', label: 'Date', width: '120px' },
    { key: 'supplier.name', label: 'Fournisseur', width: '1.5fr' },
    { key: 'address.fullAddress', label: 'Adresse', width: '2fr' },
    { key: 'receptionType.label', label: 'Type réception', width: '1.1fr' },
--- a/frontend/pages/shipment/finish-shipment.vue
+++ b/frontend/pages/shipment/finish-shipment.vue
@@ -24,7 +24,7 @@
                    />
                </template>
                <template #header-shipmentDate>
-                    <UiDateInput v-model="shipmentDateFilter" size="compact" />
+                    <UiDateMaskedInput v-model="shipmentDateFilter" placeholder="Date" size="compact" />
                </template>
                <template #header-customer.name>
                    <UiTextInput
--- a/frontend/pages/shipment/waiting-shipment.vue
+++ b/frontend/pages/shipment/waiting-shipment.vue
@@ -18,7 +18,7 @@
                @row-click="goToShipment"
            >
                <template #header-shipmentDate>
-                    <UiDateInput v-model="shipmentDateFilter" size="compact" />
+                    <UiDateMaskedInput v-model="shipmentDateFilter" placeholder="Date" size="compact" />
                </template>
                <template #header-customer.name>
                    <UiTextInput
@@ -134,7 +134,7 @@ const shipmentDateFilter = computed<string>({
 })

 const columns = [
-    { key: 'shipmentDate', label: 'Date et heure', width: '120px' },
+    { key: 'shipmentDate', label: 'Date', width: '120px' },
    { key: 'customer.name', label: 'Client', width: '1.5fr' },
    { key: 'address.fullAddress', label: 'Adresse', width: '2fr' },
    { key: 'shipmentType.label', label: "Type d'expé.", width: '1.1fr' },
--- a/frontend/services/dto/bovine-data.ts
+++ b/frontend/services/dto/bovine-data.ts
@@ -1,9 +1,15 @@
+export interface BovineBuildingCaseRef {
+    caseNumber: number | null
+    building: { label: string } | null
+}
+
 export interface BovineData {
    id: number
    nationalNumber: string
    receivedWeight: number | null
    arrivalDate: string | null
-    buildingCase: string | null
+    exitDate: string | null
+    buildingCase: BovineBuildingCaseRef | null
    supplier: string | null
    workNumber: string | null
    birthDate: string | null
--- a/migrations/Version20260423062250.php
+++ b/migrations/Version20260423062250.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260423062250 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE bovine ADD exit_date DATE DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE bovine DROP exit_date');
+    }
+}
--- a/src/Entity/Bovine.php
+++ b/src/Entity/Bovine.php
@@ -8,6 +8,7 @@ use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
 use ApiPlatform\Doctrine\Orm\Filter\ExistsFilter;
 use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
 use ApiPlatform\Metadata\ApiFilter;
+use ApiPlatform\Metadata\ApiProperty;
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
 use ApiPlatform\Metadata\GetCollection;
@@ -31,7 +32,7 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
    'buildingCase'   => 'exact',
    'receivedWeight' => 'exact',
 ])]
-#[ApiFilter(DateFilter::class, properties: ['arrivalDate', 'birthDate'])]
+#[ApiFilter(DateFilter::class, properties: ['arrivalDate', 'birthDate', 'exitDate'])]
 #[ApiFilter(ExistsFilter::class, properties: ['exitedAt'])]
 #[ApiResource(
    operations: [
@@ -81,6 +82,7 @@ class Bovine

    #[ORM\ManyToOne(inversedBy: 'bovines')]
    #[Groups(['bovine:read', 'bovine:write'])]
+    #[ApiProperty(readableLink: true)]
    private ?BuildingCase $buildingCase = null;

    #[ORM\ManyToOne]
@@ -104,6 +106,11 @@ class Bovine
    #[Groups(['bovine:read', 'building_case:read'])]
    private ?string $sex = null;

+    #[ORM\Column(type: 'date_immutable', nullable: true)]
+    #[Groups(['bovine:read', 'building_case:read'])]
+    #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
+    private ?DateTimeImmutable $exitDate = null;
+
    #[ORM\Column(type: 'datetime_immutable', nullable: true)]
    #[Groups(['bovine:read', 'building_case:read'])]
    #[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
@@ -222,6 +229,18 @@ class Bovine
        return $this;
    }

+    public function getExitDate(): ?DateTimeImmutable
+    {
+        return $this->exitDate;
+    }
+
+    public function setExitDate(?DateTimeImmutable $exitDate): static
+    {
+        $this->exitDate = $exitDate;
+
+        return $this;
+    }
+
    public function getExitedAt(): ?DateTimeImmutable
    {
        return $this->exitedAt;
--- a/src/Entity/Building.php
+++ b/src/Entity/Building.php
@@ -36,7 +36,7 @@ class Building
    private ?int $id = null;

    #[ORM\Column(length: 120)]
-    #[Groups(['building:read', 'building:summary', 'reception:read'])]
+    #[Groups(['building:read', 'building:summary', 'reception:read', 'bovine:read'])]
    private string $label = '';

    #[ORM\Column(length: 50)]
--- a/src/Entity/BuildingCase.php
+++ b/src/Entity/BuildingCase.php
@@ -43,7 +43,7 @@ class BuildingCase
    private ?int $id = null;

    #[ORM\Column]
-    #[Groups(['building:read', 'building_case:read'])]
+    #[Groups(['building:read', 'building_case:read', 'bovine:read'])]
    #[SerializedName('caseNumber')]
    private ?int $case_number = null;

@@ -62,7 +62,7 @@ class BuildingCase
    private Collection $id_case_position;

    #[ORM\ManyToOne(inversedBy: 'buildingCases')]
-    #[Groups(['building_case:read'])]
+    #[Groups(['building_case:read', 'bovine:read'])]
    #[SerializedName('building')]
    private ?Building $id_building = null;

--- a/src/State/Bovin/BovineSyncInventoryProcessor.php
+++ b/src/State/Bovin/BovineSyncInventoryProcessor.php
@@ -29,7 +29,7 @@ final class BovineSyncInventoryProcessor implements ProcessorInterface
        array $uriVariables = [],
        array $context = [],
    ): BovineSyncInventoryResult {
-        $inventory = $this->bovinApi->getInventory(new DateTimeImmutable('2000-01-01'));
+        $inventory = $this->bovinApi->getInventory(new DateTimeImmutable('today'));

        $result        = new BovineSyncInventoryResult();
        $result->total = count($inventory->animals);
@@ -88,12 +88,17 @@ final class BovineSyncInventoryProcessor implements ProcessorInterface
            $bovine->setBirthDate($identification->birthDate?->date);
        }

+        $latestEntry = null;
+        $latestExit  = null;
        foreach ($animal->presencePeriods as $period) {
-            if (null === $period->exit && null !== $period->entry?->date) {
-                $bovine->setArrivalDate($period->entry->date);
-
-                break;
+            if (null !== $period->entry?->date && (null === $latestEntry || $period->entry->date > $latestEntry)) {
+                $latestEntry = $period->entry->date;
+            }
+            if (null !== $period->exit?->date && (null === $latestExit || $period->exit->date > $latestExit)) {
+                $latestExit = $period->exit->date;
            }
        }
+        $bovine->setArrivalDate($latestEntry);
+        $bovine->setExitDate($latestExit);
    }
 }