Merge branch 'refs/heads/develop' into fix/325-corrections-diverses

.idea/data_source_mapping.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourcePerFileMappings">
+    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
+    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_1.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
+    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_2.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
+    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_3.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
+    <file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_4.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
+  </component>
+</project>

.idea/workspace.xml

@@ -4,10 +4,28 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : corrections diverses">
+    <list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)">
-      <change beforePath="$PROJECT_DIR$/.idea/data_source_mapping.xml" beforeDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/components/shipment/shipment-form.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/pages/shipment/[[id]].vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/bovin-shipment.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/customer.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/dto/bovin-shipment-data.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/dto/customer-data.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/dto/shipment-data.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/dto/shipment-type-data.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/shipment-type.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/services/shipment.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/frontend/stores/shipment.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/components/ui/UiNumberInput.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/ui/UiNumberInput.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/constants/steps.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/constants/steps.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/i18n/locales/fr.json" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/i18n/locales/fr.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/pages/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/frontend/services/reception.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/reception.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Address.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Address.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/BovinShipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/BovinShipment.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Entity/Shipment.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Shipment.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -32,21 +50,17 @@
       <list>
         <option value="Vue Composition API Component" />
         <option value="TypeScript File" />
-        <option value="PHP File" />
       </list>
     </option>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="feat/276-lister-expeditions-terminees" />
+        <entry key="$PROJECT_DIR$" value="fix/makefile" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="HighlightingSettingsPerFile">
-    <setting file="file://$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" root0="FORCE_HIGHLIGHTING" />
-  </component>
   <component name="McpProjectServerCommands">
     <commands />
     <urls />
@@ -223,42 +237,37 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
+  <component name="PropertiesComponent"><![CDATA[{
-  &quot;keyToString&quot;: {
+  "keyToString": {
-    &quot;RunOnceActivity.MCP Project settings loaded&quot;: &quot;true&quot;,
+    "RunOnceActivity.MCP Project settings loaded": "true",
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    "RunOnceActivity.ShowReadmeOnStart": "true",
-    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
+    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    "RunOnceActivity.git.unshallow": "true",
-    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
+    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
-    &quot;git-widget-placeholder&quot;: &quot;fix/325-corrections-diverses&quot;,
+    "git-widget-placeholder": "feat/271-expedition-etape-1",
-    &quot;last_opened_file_path&quot;: &quot;//wsl.localhost/Ubuntu-24.04/home/kevin/Stage/Ferme/frontend/pages/shipment&quot;,
+    "last_opened_file_path": "/home/sroy/Documents/test/Ferme",
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    "node.js.detected.package.eslint": "true",
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    "node.js.detected.package.tslint": "true",
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    "node.js.selected.package.eslint": "(autodetect)",
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    "node.js.selected.package.tslint": "(autodetect)",
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    "nodejs_package_manager_path": "npm",
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    "settings.editor.selected.configurable": "configurable.tailwindcss",
-    &quot;ts.external.directory.path&quot;: &quot;/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external&quot;,
+    "ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+    "vue.rearranger.settings.migration": "true"
   },
-  &quot;keyToStringList&quot;: {
+  "keyToStringList": {
-    &quot;DatabaseDriversLRU&quot;: [
+    "DatabaseDriversLRU": [
-      &quot;postgresql&quot;
+      "postgresql"
     ],
-    &quot;com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File&quot;: [
+    "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
-      &quot;TEXT&quot;
+      "TEXT"
     ],
-    &quot;vue.recent.templates&quot;: [
+    "vue.recent.templates": [
-      &quot;Vue Composition API Component&quot;
+      "Vue Composition API Component"
     ]
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\pages\shipment" />
-      <recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\composables" />
-      <recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\components\shipment" />
-    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
       <recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\templates" />
@@ -304,10 +313,54 @@
       <workItem from="1770195718952" duration="215000" />
       <workItem from="1770195959162" duration="18915000" />
       <workItem from="1770274844804" duration="3940000" />
-      <workItem from="1770798536017" duration="20774000" />
+    </task>
-      <workItem from="1770879701502" duration="25805000" />
+    <task id="LOCAL-00001" summary="feat : Ajout de pinia, création de la table weight et reception mise en place du système de step pour les receptions (WIP)">
-      <workItem from="1770966186589" duration="914000" />
+      <option name="closed" value="true" />
-      <workItem from="1770967274060" duration="2388000" />
+      <created>1768237763998</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1768237763998</updated>
+    </task>
+    <task id="LOCAL-00002" summary="feat : Ajout de zod, création d'un composant de chargement loading-dots.vue et finalisation du flow d'une reception">
+      <option name="closed" value="true" />
+      <created>1768316052474</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1768316052474</updated>
+    </task>
+    <task id="LOCAL-00003" summary="feat : Ajout d'un composable pour la pesée qui sera réutilisable pour l'expédition, ajout de contrainte sur les entity de reception et weight pour plus de robustesse et correction de la class active des liens dans la nav">
+      <option name="closed" value="true" />
+      <created>1768316835575</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1768316835575</updated>
+    </task>
+    <task id="LOCAL-00004" summary="feat : update du fichier AGENTS.md">
+      <option name="closed" value="true" />
+      <created>1768316965511</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1768316965511</updated>
+    </task>
+    <task id="LOCAL-00005" summary="feat : update du fichier README.md et CHANGELOG.md">
+      <option name="closed" value="true" />
+      <created>1768317786187</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1768317786187</updated>
+    </task>
+    <task id="LOCAL-00006" summary="fix : correction du useApi pour qu'il n'y ait plus de retry lors d'une erreur 500 par exemple">
+      <option name="closed" value="true" />
+      <created>1768318875533</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1768318875533</updated>
     </task>
     <task id="LOCAL-00007" summary="test : ajout de TU sur les services et providers">
       <option name="closed" value="true" />
@@ -653,55 +706,7 @@
       <option name="project" value="LOCAL" />
       <updated>1770217875423</updated>
     </task>
-    <task id="LOCAL-00050" summary="feat : creer une nouvelle expedtion (WIP)">
+    <option name="localTasksCounter" value="50" />
-      <option name="closed" value="true" />
-      <created>1770736570645</created>
-      <option name="number" value="00050" />
-      <option name="presentableId" value="LOCAL-00050" />
-      <option name="project" value="LOCAL" />
-      <updated>1770736570645</updated>
-    </task>
-    <task id="LOCAL-00051" summary="feat : ajout d'une page de creation d'une expedition">
-      <option name="closed" value="true" />
-      <created>1770880791564</created>
-      <option name="number" value="00051" />
-      <option name="presentableId" value="LOCAL-00051" />
-      <option name="project" value="LOCAL" />
-      <updated>1770880791565</updated>
-    </task>
-    <task id="LOCAL-00052" summary="feat : changelog">
-      <option name="closed" value="true" />
-      <created>1770881437439</created>
-      <option name="number" value="00052" />
-      <option name="presentableId" value="LOCAL-00052" />
-      <option name="project" value="LOCAL" />
-      <updated>1770881437439</updated>
-    </task>
-    <task id="LOCAL-00053" summary="feat : lister les expeditions terminees">
-      <option name="closed" value="true" />
-      <created>1770883114609</created>
-      <option name="number" value="00053" />
-      <option name="presentableId" value="LOCAL-00053" />
-      <option name="project" value="LOCAL" />
-      <updated>1770883114609</updated>
-    </task>
-    <task id="LOCAL-00054" summary="feat : lister les expeditions terminees">
-      <option name="closed" value="true" />
-      <created>1770884154297</created>
-      <option name="number" value="00054" />
-      <option name="presentableId" value="LOCAL-00054" />
-      <option name="project" value="LOCAL" />
-      <updated>1770884154297</updated>
-    </task>
-    <task id="LOCAL-00055" summary="fix : corrections diverses">
-      <option name="closed" value="true" />
-      <created>1770969471135</created>
-      <option name="number" value="00055" />
-      <option name="presentableId" value="LOCAL-00055" />
-      <option name="project" value="LOCAL" />
-      <updated>1770969471135</updated>
-    </task>
-    <option name="localTasksCounter" value="56" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -751,6 +756,12 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
+    <MESSAGE value="fix : correction du path URI pour la création d'un poids dans une réception" />
+    <MESSAGE value="feat : Ajout du bundle Monolog pour la gestion des logs" />
+    <MESSAGE value="fix : affiche plus détail dans les logs en recette/prod" />
+    <MESSAGE value="fix : modification du script de déploiement pour corriger le problème d'écriture des logs de prod" />
+    <MESSAGE value="fix : doc de déploiement" />
+    <MESSAGE value="fix : doc et script de déploiement" />
     <MESSAGE value="fix : gitea workflow" />
     <MESSAGE value="fix : script de déploiement" />
     <MESSAGE value="feat : ajout plus d'information sur la liste des réceptions côté front sur la page d'accueil" />
@@ -770,13 +781,7 @@
     <MESSAGE value="feat : ajout de colonne pour les Supplier, Address. Modification du numéro de réception et ajout de fixtures" />
     <MESSAGE value="feat : mise à jour du bon de réception" />
     <MESSAGE value="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)" />
-    <MESSAGE value="feat : creer une nouvelle expedtion (WIP)" />
+    <option name="LAST_COMMIT_MESSAGE" value="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)" />
-    <MESSAGE value="feat : ajout d'une page de creation d'une expedition" />
-    <MESSAGE value="feat : changelog" />
-    <MESSAGE value="feat : lister les expeditions terminees" />
-    <MESSAGE value="fix: corrections diverses" />
-    <MESSAGE value="fix : corrections diverses" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix : corrections diverses" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -786,19 +791,10 @@
           <line>6</line>
           <option name="timeStamp" value="3" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="php">
-          <url>file://$PROJECT_DIR$/src/Entity/Shipment.php</url>
-          <line>6</line>
-          <option name="timeStamp" value="45" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/frontend/services/dto/shipment-data.ts</url>
+          <url>file://$PROJECT_DIR$/frontend/services/shipment.ts</url>
-          <option name="timeStamp" value="43" />
+          <properties lambdaOrdinal="-1" />
-        </line-breakpoint>
+          <option name="timeStamp" value="37" />
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/frontend/layouts/default.vue</url>
-          <line>72</line>
-          <option name="timeStamp" value="48" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>

CHANGELOG.md

@@ -45,7 +45,6 @@ Ajouter dans le fichier .env du frontend
 * [#276] Lister les expéditions terminées
 * [#324] Creation page admin listing clients
 * [#326] Admin modification creation client
-* [#325] Correction diverses
 
 ### Changed
 

config/version.yaml

@@ -1,2 +1,2 @@
 parameters:
-    app.version: '0.0.44'
+    app.version: '0.0.43'

frontend/components/reception/update-weight.vue

@@ -4,23 +4,29 @@
             <UiTextInput
                 label="Dsd"
                 class="col-start-2"
-                v-model="sharedWeightMeta.dsd"
+                v-model="form.weights[0].dsd"
                 :disabled="!auth.isAdmin"
             />
             <UiDateInput
                 label="Date pesée"
-                v-model="sharedWeightMeta.weighedAt"
+                v-model="form.weights[0].weighedAt"
                 :disabled="!auth.isAdmin"
             />
         </div>
         <div class="grid grid-cols-2 gap-x-40 mb-16">
             <UiNumberInput
-                v-for="weight in form.weights"
+                label="Pesée à vide"
-                :key="weight.type"
-                :label="getWeightLabel(weight.type)"
                 labelClass="font-bold uppercase text-xl"
-                v-model="weight.weight"
+                v-model="form.weights[0].weight"
-                :wrapper-class="weight.type === 'tare' ? 'col-start-1 row-start-1' : 'col-start-2 row-start-1'"
+                wrapper-class="col-start-1 row-start-1"
+                :disabled="!auth.isAdmin"
+            />
+
+            <UiNumberInput
+                label="Pesée à plein"
+                labelClass="font-bold uppercase text-xl"
+                v-model="form.weights[1].weight"
+                wrapper-class="col-start-2 row-start-1"
                 :disabled="!auth.isAdmin"
             />
         </div>
@@ -58,38 +64,13 @@ const form = reactive({
         {id: 0, type: 'gross' as const, weight: 0, dsd: null, weighedAt: null}
     ]
 })
-// DSD et date de pesée sont partagés entre tare et gross dans l'UI.
-const sharedWeightMeta = reactive<{
-    dsd: number | string | null
-    weighedAt: string | null
-}>({
-    dsd: null,
-    weighedAt: null
-})
-
-const getWeightLabel = (type: 'tare' | 'gross'): string => {
-    return type === 'tare' ? 'Pesée à vide' : 'Pesée à plein'
-}
 
 const hydrateFromReception = (reception: ReceptionFormWeight) => {
-    // On hydrate chaque ligne par son type (tare/gross), sans dépendre d'un index.
+    const tare = reception.weights.find(weight => weight.type === 'tare')
-    for (const receptionWeight of reception.weights) {
+    const gross = reception.weights.find(weight => weight.type === 'gross')
-        const formWeight = form.weights.find(weight => weight.type === receptionWeight.type)
-        if (formWeight) {
-            Object.assign(formWeight, receptionWeight)
-        }
-    }
 
-    // On récupère une valeur existante pour préremplir les champs partagés.
+    if (tare) form.weights[0] = {...form.weights[0], ...tare}
-    const weightWithMeta = reception.weights.find(weight =>
+    if (gross) form.weights[1] = {...form.weights[1], ...gross}
-        (weight.dsd !== null && weight.dsd !== undefined)
-        || (weight.weighedAt !== null && weight.weighedAt !== undefined && weight.weighedAt !== '')
-    )
-
-    if (weightWithMeta) {
-        sharedWeightMeta.dsd = weightWithMeta.dsd ?? null
-        sharedWeightMeta.weighedAt = weightWithMeta.weighedAt ?? null
-    }
 }
 
 onMounted(async () => {
@@ -99,13 +80,14 @@ onMounted(async () => {
 
 async function validate() {
     const sharedDsd =
-        sharedWeightMeta.dsd === null || sharedWeightMeta.dsd === undefined || sharedWeightMeta.dsd === ''
+        form.weights[0].dsd === null || form.weights[0].dsd === undefined || form.weights[0].dsd === ''
             ? null
-            : Number(sharedWeightMeta.dsd)
+            : Number(form.weights[0].dsd)
     const sharedWeighedAt =
-        sharedWeightMeta.weighedAt === null || sharedWeightMeta.weighedAt === undefined || sharedWeightMeta.weighedAt === ''
+        form.weights[0].weighedAt === null || form.weights[0].weighedAt === undefined || form.weights[0].weighedAt === ''
             ? null
-            : sharedWeightMeta.weighedAt
+            : form.weights[0].weighedAt
+
     for (const weight of form.weights) {
         if (weight.id) {
             await updateWeight(weight.id, {

frontend/services/dto/weight-data.ts

@@ -2,5 +2,4 @@ export interface WeightData {
     weight: number | null
     dsd: number | null
     weighedAt: string | null
-    type : string | null
 }

src/Entity/Supplier.php

@@ -26,7 +26,7 @@ use Symfony\Component\Serializer\Attribute\Groups;
         ),
         new GetCollection(
             normalizationContext: ['groups' => ['supplier:read']],
-            security: "is_granted('ROLE_ADMIN')"
+            security: "is_granted('ROLE_USER')"
         ),
         new Post(
             normalizationContext: ['groups' => ['supplier:read']],