Finalisation réception marchandise, ajout de composant UI et ajout de fixtures (!7)
| Numéro du ticket | Titre du ticket | |------------------|-----------------| | | | ## 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: https://gitea.malio.fr/MALIO-DEV/Ferme/pulls/7 Co-authored-by: tristan <tristan@yuno.malio.fr> Co-committed-by: tristan <tristan@yuno.malio.fr>
This commit is contained in:
Generated
+2
@@ -152,6 +152,8 @@
|
|||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/monolog-bridge" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/monolog-bridge" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/monolog-bundle" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/monolog-bundle" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/web-profiler-bundle" />
|
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/web-profiler-bundle" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/data-fixtures" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
|
||||||
<excludePattern pattern="reference.php" />
|
<excludePattern pattern="reference.php" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
|
|||||||
Generated
+2
@@ -158,6 +158,8 @@
|
|||||||
<path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
|
<path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
|
||||||
<path value="$PROJECT_DIR$/vendor/composer" />
|
<path value="$PROJECT_DIR$/vendor/composer" />
|
||||||
<path value="$PROJECT_DIR$/vendor/malio/ednotif-bundle" />
|
<path value="$PROJECT_DIR$/vendor/malio/ednotif-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/data-fixtures" />
|
||||||
</include_path>
|
</include_path>
|
||||||
</component>
|
</component>
|
||||||
<component name="PhpProjectSharedConfiguration" php_language_level="8.4" />
|
<component name="PhpProjectSharedConfiguration" php_language_level="8.4" />
|
||||||
|
|||||||
Generated
+104
-17
@@ -4,8 +4,10 @@
|
|||||||
<option name="autoReloadType" value="SELECTIVE" />
|
<option name="autoReloadType" value="SELECTIVE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : modification de la conf du bundle ednotif">
|
<list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : ajout de colonne pour les Supplier, Address. Modification du numéro de réception et ajout de fixtures">
|
||||||
<change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/templates/reception_voucher.html.twig" beforeDir="false" afterPath="$PROJECT_DIR$/templates/reception_voucher.html.twig" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@@ -197,6 +199,8 @@
|
|||||||
<path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
|
<path value="$PROJECT_DIR$/vendor/thecodingmachine/safe" />
|
||||||
<path value="$PROJECT_DIR$/vendor/composer" />
|
<path value="$PROJECT_DIR$/vendor/composer" />
|
||||||
<path value="$PROJECT_DIR$/vendor/malio/ednotif-bundle" />
|
<path value="$PROJECT_DIR$/vendor/malio/ednotif-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/doctrine-fixtures-bundle" />
|
||||||
|
<path value="$PROJECT_DIR$/vendor/doctrine/data-fixtures" />
|
||||||
</include_path>
|
</include_path>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectColorInfo">{
|
<component name="ProjectColorInfo">{
|
||||||
@@ -216,7 +220,7 @@
|
|||||||
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
|
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
|
||||||
"RunOnceActivity.git.unshallow": "true",
|
"RunOnceActivity.git.unshallow": "true",
|
||||||
"RunOnceActivity.typescript.service.memoryLimit.init": "true",
|
"RunOnceActivity.typescript.service.memoryLimit.init": "true",
|
||||||
"git-widget-placeholder": "feat/installation-soap-bundle",
|
"git-widget-placeholder": "feat/finalisation-reception-marchandise",
|
||||||
"node.js.detected.package.eslint": "true",
|
"node.js.detected.package.eslint": "true",
|
||||||
"node.js.detected.package.tslint": "true",
|
"node.js.detected.package.tslint": "true",
|
||||||
"node.js.selected.package.eslint": "(autodetect)",
|
"node.js.selected.package.eslint": "(autodetect)",
|
||||||
@@ -239,11 +243,11 @@
|
|||||||
}</component>
|
}</component>
|
||||||
<component name="RecentsManager">
|
<component name="RecentsManager">
|
||||||
<key name="MoveFile.RECENT_KEYS">
|
<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" />
|
<recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\templates" />
|
||||||
<recent name="C:\Users\autin\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches" />
|
<recent name="C:\Users\autin\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches" />
|
||||||
<recent name="C:\Users\autin\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches\Ferme_MCD\MCD_DOC" />
|
<recent name="C:\Users\autin\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches\Ferme_MCD\MCD_DOC" />
|
||||||
<recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\frontend\pages\reception" />
|
<recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\frontend\pages\reception" />
|
||||||
<recent name="\\wsl.localhost\Ubuntu-24.04\home\tristan\workspace\ferme\frontend\pages" />
|
|
||||||
</key>
|
</key>
|
||||||
</component>
|
</component>
|
||||||
<component name="SharedIndexes">
|
<component name="SharedIndexes">
|
||||||
@@ -268,7 +272,10 @@
|
|||||||
<workItem from="1768547023783" duration="11371000" />
|
<workItem from="1768547023783" duration="11371000" />
|
||||||
<workItem from="1768894030675" duration="83922000" />
|
<workItem from="1768894030675" duration="83922000" />
|
||||||
<workItem from="1769413136483" duration="58000" />
|
<workItem from="1769413136483" duration="58000" />
|
||||||
<workItem from="1769413279223" duration="12282000" />
|
<workItem from="1769413279223" duration="40490000" />
|
||||||
|
<workItem from="1769612160652" duration="23952000" />
|
||||||
|
<workItem from="1769696465294" duration="8573000" />
|
||||||
|
<workItem from="1769756623432" duration="14442000" />
|
||||||
</task>
|
</task>
|
||||||
<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)">
|
<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)">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
@@ -550,7 +557,87 @@
|
|||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1769434793487</updated>
|
<updated>1769434793487</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="36" />
|
<task id="LOCAL-00036" summary="feat : update du CHANGELOG.md">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769435038236</created>
|
||||||
|
<option name="number" value="00036" />
|
||||||
|
<option name="presentableId" value="LOCAL-00036" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769435038236</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00037" summary="feat : finalisation de l'étape 1 "Réception" (formulaire)">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769529522614</created>
|
||||||
|
<option name="number" value="00037" />
|
||||||
|
<option name="presentableId" value="LOCAL-00037" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769529522614</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00038" summary="feat : ajout du numéro identification des receptions et ajustement du bon de reception">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769676223697</created>
|
||||||
|
<option name="number" value="00038" />
|
||||||
|
<option name="presentableId" value="LOCAL-00038" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769676223697</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00039" summary="feat : ajout de la partie reception des marchandises (étape 3) et modification du bon de réception">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769700808988</created>
|
||||||
|
<option name="number" value="00039" />
|
||||||
|
<option name="presentableId" value="LOCAL-00039" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769700808988</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00040" summary="feat : mise en place de composant UI pour les select, checkbox, date, text">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769705141157</created>
|
||||||
|
<option name="number" value="00040" />
|
||||||
|
<option name="presentableId" value="LOCAL-00040" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769705141157</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00041" summary="feat : update CHANGELOG.md">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769705240487</created>
|
||||||
|
<option name="number" value="00041" />
|
||||||
|
<option name="presentableId" value="LOCAL-00041" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769705240487</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00042" summary="feat : ajout de commentaire">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769760766200</created>
|
||||||
|
<option name="number" value="00042" />
|
||||||
|
<option name="presentableId" value="LOCAL-00042" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769760766200</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00043" summary="fix : correction de l'affichage de l'immatriculation sur une réception en cours + correction css étape 3 d'une réception">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769768517942</created>
|
||||||
|
<option name="number" value="00043" />
|
||||||
|
<option name="presentableId" value="LOCAL-00043" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769768517943</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00044" summary="feat : ajout de colonne pour les Supplier, Address et modification du numéro de réception">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769770092190</created>
|
||||||
|
<option name="number" value="00044" />
|
||||||
|
<option name="presentableId" value="LOCAL-00044" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769770092190</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00045" summary="feat : ajout de colonne pour les Supplier, Address. Modification du numéro de réception et ajout de fixtures">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769770142624</created>
|
||||||
|
<option name="number" value="00045" />
|
||||||
|
<option name="presentableId" value="LOCAL-00045" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769770142624</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="46" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
<component name="TypeScriptGeneratedFilesManager">
|
||||||
@@ -600,16 +687,6 @@
|
|||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<MESSAGE value="feat : ajout d'une gestion d'erreur au global côté front avec la lib toaster et I18n pour centraliser les messages d'erreur" />
|
|
||||||
<MESSAGE value="feat : ajout de l'authentification avec lexik" />
|
|
||||||
<MESSAGE value="feat : update du CHANGELOG.md" />
|
|
||||||
<MESSAGE value="fix : correction de l'accès au swagger en mode dev qui n'était plus accessible" />
|
|
||||||
<MESSAGE value="feat : ajout de la conf pour le déploiement en recette" />
|
|
||||||
<MESSAGE value="fix : fix de la conf pour le déploiement en recette" />
|
|
||||||
<MESSAGE value="fix : migration apache vers nginx pour un déploiement plus simple" />
|
|
||||||
<MESSAGE value="fix : dernière modification pour le déploiement en recette et le changement de conf vers nginx" />
|
|
||||||
<MESSAGE value="ci: auto tag + release artefact" />
|
|
||||||
<MESSAGE value="ci : auto tag + release artefact" />
|
|
||||||
<MESSAGE value="ci : fix release artefact" />
|
<MESSAGE value="ci : fix release artefact" />
|
||||||
<MESSAGE value="ci : ajout du script et de la doc déploiement" />
|
<MESSAGE value="ci : ajout du script et de la doc déploiement" />
|
||||||
<MESSAGE value="fix : correction du path URI pour la création d'un poids dans une réception" />
|
<MESSAGE value="fix : correction du path URI pour la création d'un poids dans une réception" />
|
||||||
@@ -625,7 +702,17 @@
|
|||||||
<MESSAGE value="feat : ajout de la debug bar en mod dev" />
|
<MESSAGE value="feat : ajout de la debug bar en mod dev" />
|
||||||
<MESSAGE value="feat : ajout du bundle Malio ednotif pour l'utilisation des WS" />
|
<MESSAGE value="feat : ajout du bundle Malio ednotif pour l'utilisation des WS" />
|
||||||
<MESSAGE value="fix : modification de la conf du bundle ednotif" />
|
<MESSAGE value="fix : modification de la conf du bundle ednotif" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="fix : modification de la conf du bundle ednotif" />
|
<MESSAGE value="feat : update du CHANGELOG.md" />
|
||||||
|
<MESSAGE value="feat : finalisation de l'étape 1 "Réception" (formulaire)" />
|
||||||
|
<MESSAGE value="feat : ajout du numéro identification des receptions et ajustement du bon de reception" />
|
||||||
|
<MESSAGE value="feat : ajout de la partie reception des marchandises (étape 3) et modification du bon de réception" />
|
||||||
|
<MESSAGE value="feat : mise en place de composant UI pour les select, checkbox, date, text" />
|
||||||
|
<MESSAGE value="feat : update CHANGELOG.md" />
|
||||||
|
<MESSAGE value="feat : ajout de commentaire" />
|
||||||
|
<MESSAGE value="fix : correction de l'affichage de l'immatriculation sur une réception en cours + correction css étape 3 d'une réception" />
|
||||||
|
<MESSAGE value="feat : ajout de colonne pour les Supplier, Address et modification du numéro de réception" />
|
||||||
|
<MESSAGE value="feat : ajout de colonne pour les Supplier, Address. Modification du numéro de réception et ajout de fixtures" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="feat : ajout de colonne pour les Supplier, Address. Modification du numéro de réception et ajout de fixtures" />
|
||||||
</component>
|
</component>
|
||||||
<component name="XSLT-Support.FileAssociations.UIState">
|
<component name="XSLT-Support.FileAssociations.UIState">
|
||||||
<expand />
|
<expand />
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ Backend conventions
|
|||||||
- API Platform operations are defined on Doctrine entities.
|
- API Platform operations are defined on Doctrine entities.
|
||||||
- Reception entity is in `src/Entity/Reception.php`, with custom weigh endpoint `/receptions/weigh`.
|
- Reception entity is in `src/Entity/Reception.php`, with custom weigh endpoint `/receptions/weigh`.
|
||||||
- Reception fields: `date_reception`, `license_plate`, `current_step` (default 0), `is_valid` (default false).
|
- Reception fields: `date_reception`, `license_plate`, `current_step` (default 0), `is_valid` (default false).
|
||||||
|
- Reception also has `identification_number` (auto `N-BR-####`), `merchandise_type`, `merchandise_detail`, `buildings` (M2M), and `pellet_buildings` (via `reception_pellet_building`).
|
||||||
- `date_reception` is set by the UI, stored as `DateTimeImmutable`, serialized as `Y-m-d`.
|
- `date_reception` is set by the UI, stored as `DateTimeImmutable`, serialized as `Y-m-d`.
|
||||||
- Weight entity (`src/Entity/Weight.php`) is 1–N with Reception, each row stores `type` (`gross` or `tare`), `dsd`, `weight`, `weighed_at` (all nullable except `type`).
|
- Weight entity (`src/Entity/Weight.php`) is 1–N with Reception, each row stores `type` (`gross` or `tare`), `dsd`, `weight`, `weighed_at` (all nullable except `type`).
|
||||||
- Weigh endpoint `/receptions/weigh` returns `PontBasculeReading` with `dsd`, `weight`, `weighedAt` (formatted `Y-m-d`).
|
- Weigh endpoint `/receptions/weigh` returns `PontBasculeReading` with `dsd`, `weight`, `weighedAt` (formatted `Y-m-d`).
|
||||||
@@ -21,6 +22,7 @@ Frontend conventions
|
|||||||
- Nuxt SSR disabled; Tailwind used.
|
- Nuxt SSR disabled; Tailwind used.
|
||||||
- Layout in `frontend/layouts/default.vue`: max width `1050px`, header full width.
|
- Layout in `frontend/layouts/default.vue`: max width `1050px`, header full width.
|
||||||
- Tailwind custom color palette is `primary` (e.g. `bg-primary-500`).
|
- Tailwind custom color palette is `primary` (e.g. `bg-primary-500`).
|
||||||
|
- Global font stack uses Helvetica via Tailwind (`font-sans`) and `frontend/assets/css/main.css`.
|
||||||
- API composable in `frontend/composables/useApi.ts` with `get/post/put/patch/delete` and default JSON/PATCH content types.
|
- API composable in `frontend/composables/useApi.ts` with `get/post/put/patch/delete` and default JSON/PATCH content types.
|
||||||
- API errors/success toasts can be customized via `toastErrorMessage`/`toastSuccessMessage` or i18n keys `toastErrorKey`/`toastSuccessKey`. Global method fallbacks use `errors.http.*` keys.
|
- API errors/success toasts can be customized via `toastErrorMessage`/`toastSuccessMessage` or i18n keys `toastErrorKey`/`toastSuccessKey`. Global method fallbacks use `errors.http.*` keys.
|
||||||
- `useApi` uses `useNuxtApp().$i18n` (not `useI18n`) to avoid setup-only constraint in service calls.
|
- `useApi` uses `useNuxtApp().$i18n` (not `useI18n`) to avoid setup-only constraint in service calls.
|
||||||
@@ -28,6 +30,7 @@ Frontend conventions
|
|||||||
- Zod is used for form validation (e.g. `frontend/components/reception/reception-form.vue`); shared helpers live in `frontend/utils/zod-errors.ts`.
|
- Zod is used for form validation (e.g. `frontend/components/reception/reception-form.vue`); shared helpers live in `frontend/utils/zod-errors.ts`.
|
||||||
- Weighing logic is shared via `frontend/composables/useWeighing.ts`.
|
- Weighing logic is shared via `frontend/composables/useWeighing.ts`.
|
||||||
- Reception step UI uses store state (`currentStep`) in `frontend/pages/reception/[[id]].vue`.
|
- Reception step UI uses store state (`currentStep`) in `frontend/pages/reception/[[id]].vue`.
|
||||||
|
- Step 2 uses `frontend/components/reception/reception-product-received.vue` for merchandise selection; type codes in `frontend/utils/constants.ts`.
|
||||||
- Active nav styles in header use `NuxtLink` with `custom` slot.
|
- Active nav styles in header use `NuxtLink` with `custom` slot.
|
||||||
- Reusable UI components live under `frontend/components/ui/` and are auto-imported with `Ui` prefix (e.g. `UiLoadingDots`).
|
- Reusable UI components live under `frontend/components/ui/` and are auto-imported with `Ui` prefix (e.g. `UiLoadingDots`).
|
||||||
- Service layer lives in `frontend/services/` with typed DTOs in `frontend/services/dto/`.
|
- Service layer lives in `frontend/services/` with typed DTOs in `frontend/services/dto/`.
|
||||||
@@ -44,3 +47,13 @@ Environment & routing
|
|||||||
Notes
|
Notes
|
||||||
- Do not add a GET that creates resources; use POST + PATCH.
|
- Do not add a GET that creates resources; use POST + PATCH.
|
||||||
- Keep endpoints in plural (API Platform convention).
|
- Keep endpoints in plural (API Platform convention).
|
||||||
|
- New reference data added:
|
||||||
|
- Reception types (`reception_type`, fields: `label`, `code`), selectable on reception form.
|
||||||
|
- Merchandise types (`merchandise_type`, fields: `label`, `code`) and pellet types (`pellet_type`, fields: `label`, `code`).
|
||||||
|
- Buildings (`building`, fields: `label`, `code`) and reception allocations (`reception_building` M2M, `reception_pellet_building` unique on reception/pellet/building).
|
||||||
|
- Suppliers (`supplier`) with addresses (`address`, fields: `label`, `street`, `postal_code`, `city`, `country_code` ISO2), via `supplier_address` join table.
|
||||||
|
- Trucks (`truck`, field: `name`), linked to receptions.
|
||||||
|
- Carriers (`carrier`, fields: `name`, nullable `code`), Drivers (`driver`, fields: `name`, `carrier_id`), Vehicles (`vehicle`, fields: `plate`, `carrier_id`, `truck_id`) used for LIOT logic.
|
||||||
|
- Reception links: `reception_type_id`, `supplier_id`, `address_id`, `truck_id`, `carrier_id`, `driver_id`, `user_id`.
|
||||||
|
- Address exposes `fullAddress` via getter for display.
|
||||||
|
- LIOT behavior in reception form: if carrier code = `LIOT`, show driver + vehicle selects and hide manual license plate input; vehicle list filters by truck type and carrier; selected vehicle sets `license_plate`.
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ Ajouter dans le fichier .env du frontend
|
|||||||
* [#203] Réceptions — Parcours de pesée multi-étapes (début)
|
* [#203] Réceptions — Parcours de pesée multi-étapes (début)
|
||||||
* [#202] Authentification — Connexion utilisateur (JWT)
|
* [#202] Authentification — Connexion utilisateur (JWT)
|
||||||
* Ajout du bundle malio/ednotif-bundle
|
* Ajout du bundle malio/ednotif-bundle
|
||||||
|
* Ajout de composant UI
|
||||||
|
* Finalisation de la partie réception de marchandise
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
|||||||
@@ -71,6 +71,18 @@ Le frontend ne lit jamais directement le token, le navigateur envoie automatique
|
|||||||
- Le cookie est automatiquement envoyé pour les futures requêtes.
|
- Le cookie est automatiquement envoyé pour les futures requêtes.
|
||||||
- La déconnexion utilise `POST /api/logout` et redirige vers `/login`.
|
- La déconnexion utilise `POST /api/logout` et redirige vers `/login`.
|
||||||
|
|
||||||
|
### Fixtures
|
||||||
|
Pour lancer les fixtures (Attention sa purge la bdd complètement)
|
||||||
|
```bash
|
||||||
|
php bin/console doctrine:fixtures:load
|
||||||
|
```
|
||||||
|
|
||||||
|
Attention cette commande est dangereuse, à utiliser que pour les débuts de la prod ou en recette.
|
||||||
|
Dans un premier temps pour remplir les listes, vous pouvez lancer la commande symfony
|
||||||
|
```bash
|
||||||
|
php bin/console app:seed
|
||||||
|
```
|
||||||
|
La commande va faire une update ou une création en fonction des data existante.
|
||||||
|
|
||||||
## Livraison en recette
|
## Livraison en recette
|
||||||
### Préparatifs
|
### Préparatifs
|
||||||
|
|||||||
@@ -88,6 +88,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
"doctrine/doctrine-fixtures-bundle": "^4.3",
|
||||||
"friendsofphp/php-cs-fixer": "^3.92",
|
"friendsofphp/php-cs-fixer": "^3.92",
|
||||||
"phpunit/phpunit": "^12.5",
|
"phpunit/phpunit": "^12.5",
|
||||||
"symfony/browser-kit": "8.0.*",
|
"symfony/browser-kit": "8.0.*",
|
||||||
|
|||||||
Generated
+170
-1
@@ -4,7 +4,7 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "d66ef6b521a08a262b1c043bb32cafe5",
|
"content-hash": "9c4e168c0540baf5d7d5d54040834d79",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "api-platform/doctrine-common",
|
"name": "api-platform/doctrine-common",
|
||||||
@@ -8615,6 +8615,175 @@
|
|||||||
],
|
],
|
||||||
"time": "2024-05-06T16:37:16+00:00"
|
"time": "2024-05-06T16:37:16+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "doctrine/data-fixtures",
|
||||||
|
"version": "2.2.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/doctrine/data-fixtures.git",
|
||||||
|
"reference": "7a615ba135e45d67674bb623d90f34f6c7b6bd97"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/7a615ba135e45d67674bb623d90f34f6c7b6bd97",
|
||||||
|
"reference": "7a615ba135e45d67674bb623d90f34f6c7b6bd97",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"doctrine/persistence": "^3.1 || ^4.0",
|
||||||
|
"php": "^8.1",
|
||||||
|
"psr/log": "^1.1 || ^2 || ^3"
|
||||||
|
},
|
||||||
|
"conflict": {
|
||||||
|
"doctrine/dbal": "<3.5 || >=5",
|
||||||
|
"doctrine/orm": "<2.14 || >=4",
|
||||||
|
"doctrine/phpcr-odm": "<1.3.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"doctrine/coding-standard": "^14",
|
||||||
|
"doctrine/dbal": "^3.5 || ^4",
|
||||||
|
"doctrine/mongodb-odm": "^1.3.0 || ^2.0.0",
|
||||||
|
"doctrine/orm": "^2.14 || ^3",
|
||||||
|
"ext-sqlite3": "*",
|
||||||
|
"fig/log-test": "^1",
|
||||||
|
"phpstan/phpstan": "2.1.31",
|
||||||
|
"phpunit/phpunit": "10.5.45 || 12.4.0",
|
||||||
|
"symfony/cache": "^6.4 || ^7",
|
||||||
|
"symfony/var-exporter": "^6.4 || ^7"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"alcaeus/mongo-php-adapter": "For using MongoDB ODM 1.3 with PHP 7 (deprecated)",
|
||||||
|
"doctrine/mongodb-odm": "For loading MongoDB ODM fixtures",
|
||||||
|
"doctrine/orm": "For loading ORM fixtures",
|
||||||
|
"doctrine/phpcr-odm": "For loading PHPCR ODM fixtures"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Doctrine\\Common\\DataFixtures\\": "src"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Jonathan Wage",
|
||||||
|
"email": "jonwage@gmail.com"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Data Fixtures for all Doctrine Object Managers",
|
||||||
|
"homepage": "https://www.doctrine-project.org",
|
||||||
|
"keywords": [
|
||||||
|
"database"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/doctrine/data-fixtures/issues",
|
||||||
|
"source": "https://github.com/doctrine/data-fixtures/tree/2.2.0"
|
||||||
|
},
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"url": "https://www.doctrine-project.org/sponsorship.html",
|
||||||
|
"type": "custom"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://www.patreon.com/phpdoctrine",
|
||||||
|
"type": "patreon"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdata-fixtures",
|
||||||
|
"type": "tidelift"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"time": "2025-10-17T20:06:20+00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "doctrine/doctrine-fixtures-bundle",
|
||||||
|
"version": "4.3.1",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/doctrine/DoctrineFixturesBundle.git",
|
||||||
|
"reference": "9e013ed10d49bf7746b07204d336384a7d9b5a4d"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/9e013ed10d49bf7746b07204d336384a7d9b5a4d",
|
||||||
|
"reference": "9e013ed10d49bf7746b07204d336384a7d9b5a4d",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"doctrine/data-fixtures": "^2.2",
|
||||||
|
"doctrine/doctrine-bundle": "^2.2 || ^3.0",
|
||||||
|
"doctrine/orm": "^2.14.0 || ^3.0",
|
||||||
|
"doctrine/persistence": "^2.4 || ^3.0 || ^4.0",
|
||||||
|
"php": "^8.1",
|
||||||
|
"psr/log": "^2 || ^3",
|
||||||
|
"symfony/config": "^6.4 || ^7.0 || ^8.0",
|
||||||
|
"symfony/console": "^6.4 || ^7.0 || ^8.0",
|
||||||
|
"symfony/dependency-injection": "^6.4 || ^7.0 || ^8.0",
|
||||||
|
"symfony/deprecation-contracts": "^2.1 || ^3",
|
||||||
|
"symfony/doctrine-bridge": "^6.4.16 || ^7.1.9 || ^8.0",
|
||||||
|
"symfony/http-kernel": "^6.4 || ^7.0 || ^8.0"
|
||||||
|
},
|
||||||
|
"conflict": {
|
||||||
|
"doctrine/dbal": "< 3"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"doctrine/coding-standard": "14.0.0",
|
||||||
|
"phpstan/phpstan": "2.1.11",
|
||||||
|
"phpunit/phpunit": "^10.5.38 || 11.4.14"
|
||||||
|
},
|
||||||
|
"type": "symfony-bundle",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Doctrine\\Bundle\\FixturesBundle\\": "src"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Fabien Potencier",
|
||||||
|
"email": "fabien@symfony.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Doctrine Project",
|
||||||
|
"homepage": "https://www.doctrine-project.org"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Symfony Community",
|
||||||
|
"homepage": "https://symfony.com/contributors"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Symfony DoctrineFixturesBundle",
|
||||||
|
"homepage": "https://www.doctrine-project.org",
|
||||||
|
"keywords": [
|
||||||
|
"Fixture",
|
||||||
|
"persistence"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/doctrine/DoctrineFixturesBundle/issues",
|
||||||
|
"source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/4.3.1"
|
||||||
|
},
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"url": "https://www.doctrine-project.org/sponsorship.html",
|
||||||
|
"type": "custom"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://www.patreon.com/phpdoctrine",
|
||||||
|
"type": "patreon"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-fixtures-bundle",
|
||||||
|
"type": "tidelift"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"time": "2025-12-03T16:05:42+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "evenement/evenement",
|
"name": "evenement/evenement",
|
||||||
"version": "v3.0.2",
|
"version": "v3.0.2",
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
use ApiPlatform\Symfony\Bundle\ApiPlatformBundle;
|
use ApiPlatform\Symfony\Bundle\ApiPlatformBundle;
|
||||||
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
|
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
|
||||||
|
use Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle;
|
||||||
use Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle;
|
use Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle;
|
||||||
use Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle;
|
use Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle;
|
||||||
use Malio\EdnotifBundle\EdnotifBundle;
|
use Malio\EdnotifBundle\EdnotifBundle;
|
||||||
@@ -26,4 +27,5 @@ return [
|
|||||||
MonologBundle::class => ['all' => true],
|
MonologBundle::class => ['all' => true],
|
||||||
EdnotifBundle::class => ['all' => true],
|
EdnotifBundle::class => ['all' => true],
|
||||||
WebProfilerBundle::class => ['dev' => true],
|
WebProfilerBundle::class => ['dev' => true],
|
||||||
|
DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
@tailwind base;
|
||||||
|
@tailwind components;
|
||||||
|
@tailwind utilities;
|
||||||
|
|
||||||
|
@layer base {
|
||||||
|
body {
|
||||||
|
@apply font-sans;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,23 +1,120 @@
|
|||||||
<template>
|
<template>
|
||||||
<form @submit.prevent="validate">
|
<form @submit.prevent="validate">
|
||||||
<div class="grid grid-cols-1 items-start gap-8 mb-16">
|
<div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
|
||||||
<h1 class="font-bold text-5xl uppercase">Réception</h1>
|
<h1 class="font-bold text-5xl uppercase col-start-1 row-start-1">Réception</h1>
|
||||||
<div>
|
<!-- Nom de l'utilisateur -->
|
||||||
|
<UiSelect
|
||||||
|
id="reception-user"
|
||||||
|
v-model="form.userId"
|
||||||
|
label="Nom de l'utilisateur"
|
||||||
|
:options="users.map((user) => ({
|
||||||
|
value: String(user.id),
|
||||||
|
label: user.username
|
||||||
|
}))"
|
||||||
|
:loading="isLoadingUsers"
|
||||||
|
wrapper-class="col-start-1 row-start-2"
|
||||||
|
/>
|
||||||
|
<!-- Date de réception -->
|
||||||
|
<UiDateInput
|
||||||
|
id="reception-date"
|
||||||
|
v-model="form.receptionDate"
|
||||||
|
label="Date de réception"
|
||||||
|
wrapper-class="col-start-1 row-start-3"
|
||||||
|
/>
|
||||||
|
<!-- Type de réception -->
|
||||||
|
<UiSelect
|
||||||
|
id="reception-type"
|
||||||
|
v-model="form.receptionTypeId"
|
||||||
|
label="Type de réception"
|
||||||
|
:options="receptionTypes.map((type) => ({
|
||||||
|
value: String(type.id),
|
||||||
|
label: type.label
|
||||||
|
}))"
|
||||||
|
wrapper-class="col-start-1 row-start-4"
|
||||||
|
/>
|
||||||
|
<!-- Fournisseur -->
|
||||||
|
<UiSelect
|
||||||
|
id="reception-supplier"
|
||||||
|
v-model="form.supplierId"
|
||||||
|
label="Fournisseur"
|
||||||
|
:options="suppliers.map((supplier) => ({
|
||||||
|
value: String(supplier.id),
|
||||||
|
label: supplier.name
|
||||||
|
}))"
|
||||||
|
:loading="isLoadingSuppliers"
|
||||||
|
wrapper-class="col-start-1 row-start-5"
|
||||||
|
/>
|
||||||
|
<!-- Adresse fournisseur -->
|
||||||
|
<UiSelect
|
||||||
|
id="reception-address"
|
||||||
|
v-model="form.addressId"
|
||||||
|
label="Adresse"
|
||||||
|
:options="supplierAddresses.map((address) => ({
|
||||||
|
value: String(address.id),
|
||||||
|
label: address.fullAddress
|
||||||
|
}))"
|
||||||
|
:disabled="isLoadingSuppliers || supplierAddresses.length === 0"
|
||||||
|
wrapper-class="col-start-2 row-start-1"
|
||||||
|
/>
|
||||||
|
<!-- Camion -->
|
||||||
|
<UiSelect
|
||||||
|
id="reception-truck"
|
||||||
|
v-model="form.truckId"
|
||||||
|
label="Camion"
|
||||||
|
:options="trucks.map((truck) => ({
|
||||||
|
value: String(truck.id),
|
||||||
|
label: truck.name
|
||||||
|
}))"
|
||||||
|
:loading="isLoadingTrucks"
|
||||||
|
wrapper-class="col-start-2 row-start-2"
|
||||||
|
/>
|
||||||
|
<!-- Transporteur -->
|
||||||
|
<UiSelect
|
||||||
|
id="reception-carrier"
|
||||||
|
v-model="form.carrierId"
|
||||||
|
label="Transporteur"
|
||||||
|
:options="carriers.map((carrier) => ({
|
||||||
|
value: String(carrier.id),
|
||||||
|
label: carrier.name
|
||||||
|
}))"
|
||||||
|
:loading="isLoadingCarriers"
|
||||||
|
select-class="h-[34px]"
|
||||||
|
wrapper-class="col-start-2 row-start-3"
|
||||||
|
/>
|
||||||
|
<!-- Chauffeur (LIOT) -->
|
||||||
|
<UiSelect
|
||||||
|
id="reception-driver"
|
||||||
|
v-model="form.driverId"
|
||||||
|
label="Nom du chauffeur si LIOT"
|
||||||
|
:options="filteredDrivers.map((driver) => ({
|
||||||
|
value: String(driver.id),
|
||||||
|
label: driver.name
|
||||||
|
}))"
|
||||||
|
:loading="isLoadingDrivers"
|
||||||
|
wrapper-class="col-start-2 row-start-4"
|
||||||
|
/>
|
||||||
|
<!-- Plaque d'immatriculation -->
|
||||||
|
<div v-if="!isLiotCarrier" class="col-start-2 row-start-5">
|
||||||
<UiLicensePlateInput
|
<UiLicensePlateInput
|
||||||
v-model="form.licensePlate"
|
v-model="form.licensePlate"
|
||||||
v-model:allowAny="allowAnyLicensePlate"
|
v-model:allowAny="allowAnyLicensePlate"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-col">
|
<!-- Immatriculation (LIOT) -->
|
||||||
<label for="reception-date" class="font-bold uppercase text-xl mb-4">Date de reception</label>
|
<UiSelect
|
||||||
<input
|
v-if="isLiotCarrier"
|
||||||
id="reception-date"
|
id="reception-vehicle"
|
||||||
v-model="form.receptionDate"
|
v-model="form.vehicleId"
|
||||||
type="date"
|
label="Immatriculation"
|
||||||
class="border-b border-black justify-self-start text-xl pb-[6px] uppercase"
|
:options="filteredVehicles.map((vehicle) => ({
|
||||||
|
value: String(vehicle.id),
|
||||||
|
label: vehicle.plate
|
||||||
|
}))"
|
||||||
|
:loading="isLoadingVehicles"
|
||||||
|
:disabled="isLoadingVehicles || filteredVehicles.length === 0"
|
||||||
|
wrapper-class="col-start-2 row-start-5"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="flex justify-center">
|
<div class="flex justify-center">
|
||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
@@ -30,38 +127,381 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {useReceptionStore} from '~/stores/reception'
|
import {useReceptionStore} from '~/stores/reception'
|
||||||
|
import type {ReceptionTypeData} from '~/services/dto/reception-type-data'
|
||||||
|
import {getReceptionTypeList} from '~/services/reception-type'
|
||||||
|
import type {UserData} from '~/services/dto/user-data'
|
||||||
|
import {getUsers} from '~/services/auth'
|
||||||
|
import {useAuthStore} from '~/stores/auth'
|
||||||
|
import type {SupplierData} from '~/services/dto/supplier-data'
|
||||||
|
import {getSupplierList} from '~/services/supplier'
|
||||||
|
import type {TruckData} from '~/services/dto/truck-data'
|
||||||
|
import {getTruckList} from '~/services/truck'
|
||||||
|
import type {CarrierData} from '~/services/dto/carrier-data'
|
||||||
|
import {getCarrierList} from '~/services/carrier'
|
||||||
|
import type {DriverData} from '~/services/dto/driver-data'
|
||||||
|
import {getDriverList} from '~/services/driver'
|
||||||
|
import type {VehicleData} from '~/services/dto/vehicle-data'
|
||||||
|
import {getVehicleList} from '~/services/vehicle'
|
||||||
|
import {SUPLLIER_CODE} from "~/utils/constants";
|
||||||
|
|
||||||
type ReceptionFormData = {
|
type ReceptionFormData = {
|
||||||
licensePlate: string
|
licensePlate: string
|
||||||
receptionDate: string
|
receptionDate: string
|
||||||
|
receptionTypeId: string
|
||||||
|
userId: string
|
||||||
|
supplierId: string
|
||||||
|
addressId: string
|
||||||
|
truckId: string
|
||||||
|
carrierId: string
|
||||||
|
driverId: string
|
||||||
|
vehicleId: string
|
||||||
}
|
}
|
||||||
|
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const receptionStore = useReceptionStore()
|
const receptionStore = useReceptionStore()
|
||||||
const form = reactive<ReceptionFormData>({
|
const form = reactive<ReceptionFormData>({
|
||||||
licensePlate: '',
|
licensePlate: '',
|
||||||
receptionDate: new Date().toISOString().slice(0, 10)
|
receptionDate: new Date().toISOString().slice(0, 10),
|
||||||
|
receptionTypeId: '',
|
||||||
|
userId: '',
|
||||||
|
supplierId: '',
|
||||||
|
addressId: '',
|
||||||
|
truckId: '',
|
||||||
|
carrierId: '',
|
||||||
|
driverId: '',
|
||||||
|
vehicleId: ''
|
||||||
})
|
})
|
||||||
const allowAnyLicensePlate = ref(false)
|
const allowAnyLicensePlate = ref(false)
|
||||||
|
const receptionTypes = ref<ReceptionTypeData[]>([])
|
||||||
|
const users = ref<UserData[]>([])
|
||||||
|
const isLoadingUsers = ref(false)
|
||||||
|
const suppliers = ref<SupplierData[]>([])
|
||||||
|
const isLoadingSuppliers = ref(false)
|
||||||
|
const trucks = ref<TruckData[]>([])
|
||||||
|
const isLoadingTrucks = ref(false)
|
||||||
|
const carriers = ref<CarrierData[]>([])
|
||||||
|
const isLoadingCarriers = ref(false)
|
||||||
|
const drivers = ref<DriverData[]>([])
|
||||||
|
const isLoadingDrivers = ref(false)
|
||||||
|
const vehicles = ref<VehicleData[]>([])
|
||||||
|
const isLoadingVehicles = ref(false)
|
||||||
|
const authStore = useAuthStore()
|
||||||
|
// Empêche les watchers de reset des champs pendant le remplissage initial
|
||||||
|
const isHydrating = ref(false)
|
||||||
|
|
||||||
|
// Transporteur sélectionné dans le formulaire
|
||||||
|
const selectedCarrier = computed(() =>
|
||||||
|
carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
|
||||||
|
)
|
||||||
|
// Indique si le transporteur est LIOT
|
||||||
|
const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPLLIER_CODE.LIOT)
|
||||||
|
// Adresses disponibles pour le fournisseur sélectionné
|
||||||
|
const supplierAddresses = computed(() => {
|
||||||
|
const supplierId = Number(form.supplierId)
|
||||||
|
if (!Number.isFinite(supplierId)) {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
return suppliers.value.find((supplier) => supplier.id === supplierId)?.addresses ?? []
|
||||||
|
})
|
||||||
|
// Chauffeurs filtrés par transporteur (LIOT)
|
||||||
|
const filteredDrivers = computed<DriverData[]>(() => {
|
||||||
|
if (!form.carrierId) {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
return drivers.value.filter((driver) => String(driver.carrier?.id) === form.carrierId)
|
||||||
|
})
|
||||||
|
// Véhicules filtrés par transporteur + type de camion
|
||||||
|
const filteredVehicles = computed<VehicleData[]>(() => {
|
||||||
|
if (!form.carrierId) {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
return vehicles.value.filter(
|
||||||
|
(vehicle) =>
|
||||||
|
String(vehicle.carrier?.id) === form.carrierId &&
|
||||||
|
(!form.truckId || String(vehicle.truck?.id) === form.truckId)
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
// Hydrate le formulaire depuis la réception en cours
|
||||||
watch(
|
watch(
|
||||||
() => receptionStore.current,
|
() => receptionStore.current,
|
||||||
(reception) => {
|
(reception) => {
|
||||||
|
isHydrating.value = true
|
||||||
form.licensePlate = reception?.licensePlate ?? ''
|
form.licensePlate = reception?.licensePlate ?? ''
|
||||||
form.receptionDate = reception?.receptionDate ?? new Date().toISOString().slice(0, 10)
|
form.receptionDate = reception?.receptionDate ?? new Date().toISOString().slice(0, 10)
|
||||||
|
form.receptionTypeId = reception?.receptionType?.id
|
||||||
|
? String(reception.receptionType.id)
|
||||||
|
: ''
|
||||||
|
form.userId = reception?.user?.id
|
||||||
|
? String(reception.user.id)
|
||||||
|
: form.userId
|
||||||
|
form.supplierId = reception?.supplier?.id
|
||||||
|
? String(reception.supplier.id)
|
||||||
|
: ''
|
||||||
|
form.addressId = reception?.address?.id
|
||||||
|
? String(reception.address.id)
|
||||||
|
: ''
|
||||||
|
form.truckId = reception?.truck?.id
|
||||||
|
? String(reception.truck.id)
|
||||||
|
: ''
|
||||||
|
form.carrierId = reception?.carrier?.id
|
||||||
|
? String(reception.carrier.id)
|
||||||
|
: ''
|
||||||
|
form.driverId = reception?.driver?.id
|
||||||
|
? String(reception.driver.id)
|
||||||
|
: ''
|
||||||
|
isHydrating.value = false
|
||||||
},
|
},
|
||||||
{immediate: true}
|
{immediate: true}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Charge la liste des users pour le select
|
||||||
|
const loadUsers = async () => {
|
||||||
|
isLoadingUsers.value = true
|
||||||
|
try {
|
||||||
|
users.value = await getUsers()
|
||||||
|
} finally {
|
||||||
|
isLoadingUsers.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Charge la liste des fournisseurs pour le select
|
||||||
|
const loadSuppliers = async () => {
|
||||||
|
isLoadingSuppliers.value = true
|
||||||
|
try {
|
||||||
|
suppliers.value = await getSupplierList()
|
||||||
|
} finally {
|
||||||
|
isLoadingSuppliers.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Charge la liste des camions pour le select
|
||||||
|
const loadTrucks = async () => {
|
||||||
|
isLoadingTrucks.value = true
|
||||||
|
try {
|
||||||
|
trucks.value = await getTruckList()
|
||||||
|
} finally {
|
||||||
|
isLoadingTrucks.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Charge la liste des transporteurs pour le select
|
||||||
|
const loadCarriers = async () => {
|
||||||
|
isLoadingCarriers.value = true
|
||||||
|
try {
|
||||||
|
carriers.value = await getCarrierList()
|
||||||
|
} finally {
|
||||||
|
isLoadingCarriers.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Charge la liste des chauffeurs pour le select
|
||||||
|
const loadDrivers = async () => {
|
||||||
|
isLoadingDrivers.value = true
|
||||||
|
try {
|
||||||
|
drivers.value = await getDriverList()
|
||||||
|
} finally {
|
||||||
|
isLoadingDrivers.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Charge la liste des véhicules pour le select
|
||||||
|
const loadVehicles = async () => {
|
||||||
|
isLoadingVehicles.value = true
|
||||||
|
try {
|
||||||
|
vehicles.value = await getVehicleList()
|
||||||
|
} finally {
|
||||||
|
isLoadingVehicles.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// On met le user connecté par défaut dans le select
|
||||||
|
const setDefaultUser = () => {
|
||||||
|
if (form.userId) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (authStore.user?.id) {
|
||||||
|
form.userId = String(authStore.user.id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// On récupère toutes les données des selects au chargement du composant
|
||||||
|
onMounted(async () => {
|
||||||
|
receptionTypes.value = await getReceptionTypeList()
|
||||||
|
await loadUsers()
|
||||||
|
await loadSuppliers()
|
||||||
|
await loadTrucks()
|
||||||
|
await loadCarriers()
|
||||||
|
await loadDrivers()
|
||||||
|
await loadVehicles()
|
||||||
|
await authStore.ensureSession()
|
||||||
|
setDefaultUser()
|
||||||
|
})
|
||||||
|
|
||||||
|
// Ajuste driver/vehicle quand le transporteur change (logique LIOT)
|
||||||
|
watch(
|
||||||
|
() => [form.supplierId, suppliers.value],
|
||||||
|
() => {
|
||||||
|
if (!form.supplierId) {
|
||||||
|
form.addressId = ''
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!form.addressId && supplierAddresses.value.length === 1) {
|
||||||
|
form.addressId = String(supplierAddresses.value[0].id)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!form.addressId) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const matches = supplierAddresses.value.some(
|
||||||
|
(address) => String(address.id) === form.addressId
|
||||||
|
)
|
||||||
|
if (!matches) {
|
||||||
|
form.addressId = ''
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{immediate: true}
|
||||||
|
)
|
||||||
|
|
||||||
|
// Valide/auto-sélectionne le véhicule selon camion + transporteur (LIOT)
|
||||||
|
watch(
|
||||||
|
() => form.carrierId,
|
||||||
|
() => {
|
||||||
|
if (isHydrating.value) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!form.carrierId) {
|
||||||
|
form.driverId = ''
|
||||||
|
form.vehicleId = ''
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!isLiotCarrier.value) {
|
||||||
|
form.driverId = ''
|
||||||
|
form.vehicleId = ''
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (filteredDrivers.value.length === 1) {
|
||||||
|
form.driverId = String(filteredDrivers.value[0].id)
|
||||||
|
}
|
||||||
|
if (filteredVehicles.value.length === 1) {
|
||||||
|
form.vehicleId = String(filteredVehicles.value[0].id)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{immediate: true}
|
||||||
|
)
|
||||||
|
|
||||||
|
// Récupère la plaque depuis le véhicule choisi (LIOT)
|
||||||
|
watch(
|
||||||
|
() => [form.truckId, form.carrierId, vehicles.value],
|
||||||
|
() => {
|
||||||
|
if (!isLiotCarrier.value) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (filteredVehicles.value.length === 1) {
|
||||||
|
form.vehicleId = String(filteredVehicles.value[0].id)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!form.vehicleId) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const matches = filteredVehicles.value.some(
|
||||||
|
(vehicle) => String(vehicle.id) === form.vehicleId
|
||||||
|
)
|
||||||
|
if (!matches) {
|
||||||
|
form.vehicleId = ''
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{immediate: true}
|
||||||
|
)
|
||||||
|
|
||||||
|
// Auto-renseigne le véhicule si la plaque correspond (LIOT)
|
||||||
|
watch(
|
||||||
|
() => [form.vehicleId, form.carrierId, vehicles.value],
|
||||||
|
() => {
|
||||||
|
if (!isLiotCarrier.value) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (isHydrating.value) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const selected = filteredVehicles.value.find(
|
||||||
|
(vehicle) => String(vehicle.id) === form.vehicleId
|
||||||
|
)
|
||||||
|
if (selected) {
|
||||||
|
form.licensePlate = selected.plate
|
||||||
|
allowAnyLicensePlate.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => [form.licensePlate, form.carrierId, vehicles.value],
|
||||||
|
() => {
|
||||||
|
if (!isLiotCarrier.value || form.vehicleId) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const match = filteredVehicles.value.find(
|
||||||
|
(vehicle) => vehicle.plate === form.licensePlate
|
||||||
|
)
|
||||||
|
if (match) {
|
||||||
|
form.vehicleId = String(match.id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// Valide le formulaire et crée/met à jour la réception
|
||||||
async function validate() {
|
async function validate() {
|
||||||
const normalizedLicensePlate = form.licensePlate.trim()
|
const normalizedLicensePlate = form.licensePlate.trim()
|
||||||
const normalizedReceptionDate = form.receptionDate.trim()
|
const normalizedReceptionDate = form.receptionDate.trim()
|
||||||
|
const normalizedReceptionTypeId = form.receptionTypeId.trim()
|
||||||
|
const normalizedUserId = form.userId.trim()
|
||||||
|
const normalizedSupplierId = form.supplierId.trim()
|
||||||
|
const normalizedAddressId = form.addressId.trim()
|
||||||
|
const normalizedTruckId = form.truckId.trim()
|
||||||
|
const normalizedCarrierId = form.carrierId.trim()
|
||||||
|
const normalizedDriverId = form.driverId.trim()
|
||||||
|
const receptionTypeIri = normalizedReceptionTypeId
|
||||||
|
? `/api/reception_types/${normalizedReceptionTypeId}`
|
||||||
|
: null
|
||||||
|
const userIri = normalizedUserId
|
||||||
|
? `/api/users/${normalizedUserId}`
|
||||||
|
: null
|
||||||
|
const supplierIri = normalizedSupplierId
|
||||||
|
? `/api/suppliers/${normalizedSupplierId}`
|
||||||
|
: null
|
||||||
|
const addressIri = normalizedAddressId
|
||||||
|
? `/api/addresses/${normalizedAddressId}`
|
||||||
|
: null
|
||||||
|
const truckIri = normalizedTruckId
|
||||||
|
? `/api/trucks/${normalizedTruckId}`
|
||||||
|
: null
|
||||||
|
const carrierIri = normalizedCarrierId
|
||||||
|
? `/api/carriers/${normalizedCarrierId}`
|
||||||
|
: null
|
||||||
|
const driverIri = normalizedDriverId
|
||||||
|
? `/api/drivers/${normalizedDriverId}`
|
||||||
|
: null
|
||||||
|
|
||||||
|
const basePayload = {
|
||||||
|
licensePlate: normalizedLicensePlate,
|
||||||
|
receptionDate: normalizedReceptionDate,
|
||||||
|
receptionType: receptionTypeIri,
|
||||||
|
user: userIri,
|
||||||
|
supplier: supplierIri,
|
||||||
|
address: addressIri,
|
||||||
|
truck: truckIri,
|
||||||
|
carrier: carrierIri
|
||||||
|
}
|
||||||
|
|
||||||
|
const payload = {
|
||||||
|
...basePayload,
|
||||||
|
...(isLiotCarrier.value && driverIri ? {driver: driverIri} : {})
|
||||||
|
}
|
||||||
|
|
||||||
if (!receptionStore.current) {
|
if (!receptionStore.current) {
|
||||||
const created = await receptionStore.createReception({
|
const created = await receptionStore.createReception({
|
||||||
currentStep: 1,
|
currentStep: 1,
|
||||||
licensePlate: normalizedLicensePlate,
|
...payload
|
||||||
receptionDate: normalizedReceptionDate
|
|
||||||
})
|
})
|
||||||
if (created) {
|
if (created) {
|
||||||
await router.push(`/reception/${created.id}`)
|
await router.push(`/reception/${created.id}`)
|
||||||
@@ -72,8 +512,7 @@ async function validate() {
|
|||||||
const nextStep = receptionStore.current.currentStep + 1
|
const nextStep = receptionStore.current.currentStep + 1
|
||||||
await receptionStore.updateReception(receptionStore.current.id, {
|
await receptionStore.updateReception(receptionStore.current.id, {
|
||||||
currentStep: nextStep,
|
currentStep: nextStep,
|
||||||
licensePlate: normalizedLicensePlate,
|
...payload
|
||||||
receptionDate: normalizedReceptionDate
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,221 @@
|
|||||||
|
<template>
|
||||||
|
<div class="flex flex-col items-center gap-16">
|
||||||
|
<!-- @TODO voir pour séparer dans un composant au moment de l'implémentation des Bovins -->
|
||||||
|
<div
|
||||||
|
v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"
|
||||||
|
class="flex flex-col gap-16 items-center w-full">
|
||||||
|
<h1 class="text-4xl uppercase font-bold">Sélectionner des marchandises réceptionnnées</h1>
|
||||||
|
<UiSelect
|
||||||
|
id="merchandise-type"
|
||||||
|
v-model="selectedMerchandiseTypeId"
|
||||||
|
label="Type de marchandises"
|
||||||
|
:options="merchandiseTypes.map((type) => ({ value: String(type.id), label: type.label }))"
|
||||||
|
wrapper-class="w-[550px]"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="selectedMerchandiseTypeId && isAutres"
|
||||||
|
class="flex flex-col w-full max-w-[550px]"
|
||||||
|
>
|
||||||
|
<UiTextInput
|
||||||
|
id="merchandise-detail"
|
||||||
|
v-model="merchandiseDetail"
|
||||||
|
label="Préciser"
|
||||||
|
placeholder="Précisions complémentaires"
|
||||||
|
:maxlength="255"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="selectedMerchandiseTypeId && !isGranule"
|
||||||
|
class="flex gap-4 w-[550px] justify-evenly"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
v-for="building in buildings"
|
||||||
|
:key="building.id"
|
||||||
|
>
|
||||||
|
<UiCheckbox
|
||||||
|
v-model="selectedBuildingIds"
|
||||||
|
:value="String(building.id)"
|
||||||
|
:label="building.label"
|
||||||
|
label-class="text-xl"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="selectedMerchandiseTypeId && isGranule"
|
||||||
|
class="flex flex-col gap-10 w-full max-w-[1100px]"
|
||||||
|
>
|
||||||
|
<div class="grid grid-cols-1 gap-10 md:grid-cols-4">
|
||||||
|
<div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4">
|
||||||
|
<p class="font-bold uppercase">{{ type.label }}</p>
|
||||||
|
<div
|
||||||
|
v-for="building in buildings"
|
||||||
|
:key="building.id"
|
||||||
|
class="flex items-center gap-2 text-lg"
|
||||||
|
>
|
||||||
|
<UiCheckbox
|
||||||
|
v-model="selectedPelletBuildingIds[String(type.id)]"
|
||||||
|
:value="String(building.id)"
|
||||||
|
:label="building.label"
|
||||||
|
label-class="text-lg"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||||
|
@click="goNext"
|
||||||
|
>Peser</button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, onMounted, ref } from 'vue'
|
||||||
|
import { getBuildingList } from '~/services/building'
|
||||||
|
import { getMerchandiseTypeList } from '~/services/merchandise-type'
|
||||||
|
import type { MerchandiseTypeData } from '~/services/dto/merchandise-type-data'
|
||||||
|
import type { BuildingData } from '~/services/dto/building-data'
|
||||||
|
import type { PelletTypeData } from '~/services/dto/pellet-type-data'
|
||||||
|
import { getPelletTypeList } from '~/services/pellet-type'
|
||||||
|
import {
|
||||||
|
createReceptionPelletBuilding,
|
||||||
|
deleteReceptionPelletBuilding,
|
||||||
|
getReceptionPelletBuildingList
|
||||||
|
} from '~/services/reception-pellet-building'
|
||||||
|
import { useReceptionStore } from '~/stores/reception'
|
||||||
|
import { MERCHANDISE_TYPE_CODES, RECEPTION_TYPE_CODES } from '~/utils/constants'
|
||||||
|
|
||||||
|
const receptionStore = useReceptionStore()
|
||||||
|
const merchandiseTypes = ref<MerchandiseTypeData[]>([])
|
||||||
|
const buildings = ref<BuildingData[]>([])
|
||||||
|
const pelletTypes = ref<PelletTypeData[]>([])
|
||||||
|
const selectedMerchandiseTypeId = ref('')
|
||||||
|
const selectedBuildingIds = ref<string[]>([])
|
||||||
|
const selectedPelletBuildingIds = ref<Record<string, string[]>>({})
|
||||||
|
const merchandiseDetail = ref('')
|
||||||
|
|
||||||
|
// Type de marchandise sélectionné dans le select
|
||||||
|
const selectedMerchandiseType = computed(() =>
|
||||||
|
merchandiseTypes.value.find((type) => String(type.id) === selectedMerchandiseTypeId.value)
|
||||||
|
)
|
||||||
|
// Indique si le type est "Granulé"
|
||||||
|
const isGranule = computed(() => selectedMerchandiseType.value?.code === MERCHANDISE_TYPE_CODES.GRANULE)
|
||||||
|
// Indique si le type est "Autres"
|
||||||
|
const isAutres = computed(() => selectedMerchandiseType.value?.code === MERCHANDISE_TYPE_CODES.AUTRES)
|
||||||
|
|
||||||
|
// Charge les référentiels et hydrate le formulaire depuis la réception
|
||||||
|
onMounted(async () => {
|
||||||
|
const [merchandiseTypeList, buildingList, pelletTypeList] = await Promise.all([
|
||||||
|
getMerchandiseTypeList(),
|
||||||
|
getBuildingList(),
|
||||||
|
getPelletTypeList()
|
||||||
|
])
|
||||||
|
merchandiseTypes.value = merchandiseTypeList
|
||||||
|
buildings.value = buildingList
|
||||||
|
pelletTypes.value = pelletTypeList
|
||||||
|
|
||||||
|
const currentId = receptionStore.current?.merchandiseType?.id
|
||||||
|
if (currentId) {
|
||||||
|
selectedMerchandiseTypeId.value = String(currentId)
|
||||||
|
}
|
||||||
|
merchandiseDetail.value = receptionStore.current?.merchandiseDetail ?? ''
|
||||||
|
|
||||||
|
selectedBuildingIds.value =
|
||||||
|
receptionStore.current?.buildings?.map((building) => String(building.id)) ?? []
|
||||||
|
|
||||||
|
const existingPelletSelections = receptionStore.current?.pelletBuildings ?? []
|
||||||
|
const selectionMap: Record<string, string[]> = {}
|
||||||
|
for (const selection of existingPelletSelections) {
|
||||||
|
const pelletTypeId = String(selection.pelletType.id)
|
||||||
|
const buildingId = String(selection.building.id)
|
||||||
|
if (!selectionMap[pelletTypeId]) {
|
||||||
|
selectionMap[pelletTypeId] = []
|
||||||
|
}
|
||||||
|
selectionMap[pelletTypeId].push(buildingId)
|
||||||
|
}
|
||||||
|
for (const pelletType of pelletTypes.value) {
|
||||||
|
const key = String(pelletType.id)
|
||||||
|
if (!selectionMap[key]) {
|
||||||
|
selectionMap[key] = []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
selectedPelletBuildingIds.value = selectionMap
|
||||||
|
})
|
||||||
|
|
||||||
|
// Enregistre les sélections et passe à l'étape suivante
|
||||||
|
async function goNext() {
|
||||||
|
if (!receptionStore.current) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const nextStep = receptionStore.current.currentStep + 1
|
||||||
|
const receptionIri = `/api/receptions/${receptionStore.current.id}`
|
||||||
|
|
||||||
|
await receptionStore.updateReception(receptionStore.current.id, {
|
||||||
|
merchandiseType: selectedMerchandiseTypeId.value
|
||||||
|
? `/api/merchandise_types/${selectedMerchandiseTypeId.value}`
|
||||||
|
: null,
|
||||||
|
merchandiseDetail: isAutres.value ? merchandiseDetail.value.trim() : null,
|
||||||
|
buildings: isGranule.value
|
||||||
|
? []
|
||||||
|
: selectedBuildingIds.value.map((id) => `/api/buildings/${id}`),
|
||||||
|
currentStep: nextStep
|
||||||
|
})
|
||||||
|
|
||||||
|
if (isGranule.value) {
|
||||||
|
await syncPelletSelections(receptionIri)
|
||||||
|
} else {
|
||||||
|
await clearPelletSelections(receptionIri)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Supprime toutes les associations granulés/bâtiments existantes
|
||||||
|
async function clearPelletSelections(receptionIri: string) {
|
||||||
|
const existing = await getReceptionPelletBuildingList(receptionIri)
|
||||||
|
for (const selection of existing) {
|
||||||
|
await deleteReceptionPelletBuilding(selection.id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Synchronise les associations granulés/bâtiments avec l'état du formulaire
|
||||||
|
async function syncPelletSelections(receptionIri: string) {
|
||||||
|
const existing = await getReceptionPelletBuildingList(receptionIri)
|
||||||
|
const existingMap = new Map<string, number>()
|
||||||
|
for (const selection of existing) {
|
||||||
|
const key = `${selection.pelletType.id}:${selection.building.id}`
|
||||||
|
existingMap.set(key, selection.id)
|
||||||
|
}
|
||||||
|
|
||||||
|
const desiredEntries: Array<{ pelletTypeId: string; buildingId: string }> = []
|
||||||
|
for (const [pelletTypeId, buildingIds] of Object.entries(selectedPelletBuildingIds.value)) {
|
||||||
|
for (const buildingId of buildingIds) {
|
||||||
|
desiredEntries.push({ pelletTypeId, buildingId })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const desiredKeys = new Set(desiredEntries.map(
|
||||||
|
(entry) => `${entry.pelletTypeId}:${entry.buildingId}`
|
||||||
|
))
|
||||||
|
|
||||||
|
for (const [key, id] of existingMap.entries()) {
|
||||||
|
if (!desiredKeys.has(key)) {
|
||||||
|
await deleteReceptionPelletBuilding(id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const entry of desiredEntries) {
|
||||||
|
const key = `${entry.pelletTypeId}:${entry.buildingId}`
|
||||||
|
if (!existingMap.has(key)) {
|
||||||
|
await createReceptionPelletBuilding({
|
||||||
|
reception: receptionIri,
|
||||||
|
pelletType: `/api/pellet_types/${entry.pelletTypeId}`,
|
||||||
|
building: `/api/buildings/${entry.buildingId}`
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="flex flex-col items-center mt-[164px] gap-32">
|
|
||||||
<div class="flex gap-8 items-center justify-center">
|
|
||||||
<!--@TODO Prendre en compte que l'on peut aussi décharger de la marchandise-->
|
|
||||||
<h1 class="text-4xl uppercase font-bold">Décharger les bêtes</h1>
|
|
||||||
<UiLoadingDots />
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
|
||||||
@click="goNext"
|
|
||||||
>Peser</button>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { useReceptionStore } from '~/stores/reception'
|
|
||||||
|
|
||||||
const receptionStore = useReceptionStore()
|
|
||||||
|
|
||||||
async function goNext() {
|
|
||||||
if (!receptionStore.current) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const nextStep = receptionStore.current.currentStep + 1
|
|
||||||
await receptionStore.updateReception(receptionStore.current.id, {
|
|
||||||
currentStep: nextStep
|
|
||||||
})
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -14,10 +14,6 @@
|
|||||||
class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl">
|
class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl">
|
||||||
{{ displayWeight }} kg
|
{{ displayWeight }} kg
|
||||||
</div>
|
</div>
|
||||||
<!-- <div class="grid grid-cols-2 border border-black text-center">-->
|
|
||||||
<!-- <p class="border-r border-black py-3 text-4xl font-bold">DSD</p>-->
|
|
||||||
<!-- <p class="py-3 text-4xl">{{ displayDsd }}</p>-->
|
|
||||||
<!-- </div>-->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -37,14 +33,13 @@
|
|||||||
@click="printReceipt"
|
@click="printReceipt"
|
||||||
>Générer le bon</button>
|
>Générer le bon</button>
|
||||||
</div>
|
</div>
|
||||||
<UiPdfPrinter ref="pdfPrinter" />
|
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, ref } from 'vue'
|
import { computed } from 'vue'
|
||||||
import { storeToRefs } from 'pinia'
|
import { storeToRefs } from 'pinia'
|
||||||
import { useWeighing } from '~/composables/useWeighing'
|
import { useWeighing } from '~/composables/useWeighing'
|
||||||
|
import { usePdfPrinter } from '~/composables/usePdfPrinter'
|
||||||
import { useReceptionStore } from '~/stores/reception'
|
import { useReceptionStore } from '~/stores/reception'
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
@@ -54,14 +49,9 @@ const props = defineProps<{
|
|||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const receptionStore = useReceptionStore()
|
const receptionStore = useReceptionStore()
|
||||||
const { current: storeReception } = storeToRefs(receptionStore)
|
const { current: storeReception } = storeToRefs(receptionStore)
|
||||||
type PdfPrinterHandle = {
|
const { printPdf } = usePdfPrinter()
|
||||||
print: (url: string) => Promise<void>
|
|
||||||
}
|
|
||||||
// Ref sur le composant d'impression pour déclencher le print() du PDF.
|
|
||||||
const pdfPrinter = ref<PdfPrinterHandle | null>(null)
|
|
||||||
const {
|
const {
|
||||||
displayWeight,
|
displayWeight,
|
||||||
displayDsd,
|
|
||||||
title,
|
title,
|
||||||
showLoadingBox,
|
showLoadingBox,
|
||||||
fetchWeight,
|
fetchWeight,
|
||||||
@@ -72,17 +62,19 @@ const {
|
|||||||
updateReception: receptionStore.updateReception,
|
updateReception: receptionStore.updateReception,
|
||||||
loadReception: receptionStore.loadReception
|
loadReception: receptionStore.loadReception
|
||||||
})
|
})
|
||||||
|
// Affiche le bouton de génération du bon à l'étape tare
|
||||||
const showGenerateReceipt = computed(
|
const showGenerateReceipt = computed(
|
||||||
() => props.mode === 'tare' && displayWeight.value !== null
|
() => props.mode === 'tare' && displayWeight.value !== null
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Génère le bon de réception, puis clôture la réception
|
||||||
const printReceipt = async () => {
|
const printReceipt = async () => {
|
||||||
if (!import.meta.client || !receptionStore.current || !pdfPrinter.value) {
|
if (!import.meta.client || !receptionStore.current) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
await saveWeight()
|
await saveWeight()
|
||||||
await pdfPrinter.value.print(`/receptions/${receptionStore.current.id}/receipt`)
|
await printPdf(`/receptions/${receptionStore.current.id}/receipt`)
|
||||||
|
|
||||||
// Laisse le temps a la boite de dialogue d'impression de s'ouvrir.
|
// Laisse le temps a la boite de dialogue d'impression de s'ouvrir.
|
||||||
await new Promise((resolve) => setTimeout(resolve, 600))
|
await new Promise((resolve) => setTimeout(resolve, 600))
|
||||||
@@ -98,6 +90,7 @@ const printReceipt = async () => {
|
|||||||
await router.push('/')
|
await router.push('/')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Récupère le poids dès l'arrivée sur l'écran
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
fetchWeight()
|
fetchWeight()
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
<template>
|
||||||
|
<div :class="wrapperClass">
|
||||||
|
<label
|
||||||
|
class="flex items-center gap-2"
|
||||||
|
:class="labelClass"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
:checked="checked"
|
||||||
|
:disabled="disabled"
|
||||||
|
:class="inputClass"
|
||||||
|
@change="onChange"
|
||||||
|
>
|
||||||
|
<span v-if="label">{{ label }}</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed } from 'vue'
|
||||||
|
|
||||||
|
type CheckboxValue = string | number
|
||||||
|
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
modelValue: boolean | CheckboxValue[]
|
||||||
|
value?: CheckboxValue
|
||||||
|
label?: string
|
||||||
|
disabled?: boolean
|
||||||
|
wrapperClass?: string
|
||||||
|
labelClass?: string
|
||||||
|
inputClass?: string
|
||||||
|
}>(),
|
||||||
|
{
|
||||||
|
value: undefined,
|
||||||
|
label: '',
|
||||||
|
disabled: false,
|
||||||
|
wrapperClass: '',
|
||||||
|
labelClass: '',
|
||||||
|
inputClass: ''
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(event: 'update:modelValue', value: boolean | CheckboxValue[]): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const checked = computed(() => {
|
||||||
|
if (Array.isArray(props.modelValue)) {
|
||||||
|
if (props.value === undefined) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return props.modelValue.includes(props.value)
|
||||||
|
}
|
||||||
|
return Boolean(props.modelValue)
|
||||||
|
})
|
||||||
|
|
||||||
|
const onChange = (event: Event) => {
|
||||||
|
const target = event.target as HTMLInputElement
|
||||||
|
if (Array.isArray(props.modelValue)) {
|
||||||
|
if (props.value === undefined) {
|
||||||
|
emit('update:modelValue', props.modelValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const next = new Set(props.modelValue)
|
||||||
|
if (target.checked) {
|
||||||
|
next.add(props.value)
|
||||||
|
} else {
|
||||||
|
next.delete(props.value)
|
||||||
|
}
|
||||||
|
emit('update:modelValue', Array.from(next))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
emit('update:modelValue', target.checked)
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
<template>
|
||||||
|
<div :class="['flex flex-col', wrapperClass]">
|
||||||
|
<label
|
||||||
|
v-if="label"
|
||||||
|
:for="id"
|
||||||
|
class="font-bold uppercase text-xl mb-2"
|
||||||
|
:class="labelClass"
|
||||||
|
>
|
||||||
|
{{ label }}
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
:id="id"
|
||||||
|
type="date"
|
||||||
|
:value="modelValue ?? ''"
|
||||||
|
:disabled="disabled"
|
||||||
|
v-bind="attrs"
|
||||||
|
class="border-b border-black justify-self-start text-xl pb-[6px] uppercase bg-transparent appearance-none h-[34px]"
|
||||||
|
:class="[
|
||||||
|
isEmpty ? 'text-neutral-400' : 'text-black',
|
||||||
|
disabled ? 'cursor-not-allowed' : 'cursor-pointer',
|
||||||
|
inputClass
|
||||||
|
]"
|
||||||
|
@input="onInput"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, useAttrs } from 'vue'
|
||||||
|
|
||||||
|
defineOptions({ inheritAttrs: false })
|
||||||
|
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
id?: string
|
||||||
|
label?: string
|
||||||
|
modelValue: string | null | undefined
|
||||||
|
disabled?: boolean
|
||||||
|
wrapperClass?: string
|
||||||
|
labelClass?: string
|
||||||
|
inputClass?: string
|
||||||
|
}>(),
|
||||||
|
{
|
||||||
|
disabled: false,
|
||||||
|
wrapperClass: '',
|
||||||
|
labelClass: '',
|
||||||
|
inputClass: ''
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(event: 'update:modelValue', value: string): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const attrs = useAttrs()
|
||||||
|
const isEmpty = computed(() => !props.modelValue)
|
||||||
|
|
||||||
|
const onInput = (event: Event) => {
|
||||||
|
const target = event.target as HTMLInputElement
|
||||||
|
emit('update:modelValue', target.value)
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
<template>
|
||||||
|
<div :class="['flex flex-col', wrapperClass]">
|
||||||
|
<label
|
||||||
|
v-if="label"
|
||||||
|
:for="id"
|
||||||
|
class="font-bold uppercase text-xl mb-2"
|
||||||
|
:class="labelClass"
|
||||||
|
>
|
||||||
|
{{ label }}
|
||||||
|
</label>
|
||||||
|
<select
|
||||||
|
:id="id"
|
||||||
|
:value="modelValue ?? ''"
|
||||||
|
:disabled="disabled || loading"
|
||||||
|
v-bind="attrs"
|
||||||
|
class="border-b border-black justify-self-start text-xl pb-[6px] bg-transparent"
|
||||||
|
:class="[
|
||||||
|
isEmpty ? 'text-neutral-400' : 'text-black',
|
||||||
|
disabled || loading ? 'cursor-not-allowed' : 'cursor-pointer',
|
||||||
|
selectClass
|
||||||
|
]"
|
||||||
|
@change="onChange"
|
||||||
|
>
|
||||||
|
<option value="" disabled class="text-neutral-400">
|
||||||
|
{{ placeholderText }}
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
v-for="option in options"
|
||||||
|
:key="option.value"
|
||||||
|
:value="option.value"
|
||||||
|
class="text-black"
|
||||||
|
>
|
||||||
|
{{ option.label }}
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, useAttrs } from 'vue'
|
||||||
|
|
||||||
|
type SelectOption = {
|
||||||
|
value: string | number
|
||||||
|
label: string
|
||||||
|
}
|
||||||
|
|
||||||
|
defineOptions({ inheritAttrs: false })
|
||||||
|
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
id?: string
|
||||||
|
label?: string
|
||||||
|
placeholder?: string
|
||||||
|
modelValue: string | number | null | undefined
|
||||||
|
options: SelectOption[]
|
||||||
|
disabled?: boolean
|
||||||
|
loading?: boolean
|
||||||
|
wrapperClass?: string
|
||||||
|
labelClass?: string
|
||||||
|
selectClass?: string
|
||||||
|
}>(),
|
||||||
|
{
|
||||||
|
placeholder: 'Sélectionner',
|
||||||
|
disabled: false,
|
||||||
|
loading: false,
|
||||||
|
wrapperClass: '',
|
||||||
|
labelClass: '',
|
||||||
|
selectClass: ''
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(event: 'update:modelValue', value: string): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const attrs = useAttrs()
|
||||||
|
|
||||||
|
const isEmpty = computed(() => props.modelValue === '' || props.modelValue === null || props.modelValue === undefined)
|
||||||
|
const placeholderText = computed(() => props.placeholder || 'Sélectionner')
|
||||||
|
|
||||||
|
const onChange = (event: Event) => {
|
||||||
|
const target = event.target as HTMLSelectElement
|
||||||
|
emit('update:modelValue', target.value)
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
<template>
|
||||||
|
<div :class="['flex flex-col', wrapperClass]">
|
||||||
|
<label
|
||||||
|
v-if="label"
|
||||||
|
:for="id"
|
||||||
|
class="font-bold uppercase text-xl mb-2"
|
||||||
|
:class="labelClass"
|
||||||
|
>
|
||||||
|
{{ label }}
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
:id="id"
|
||||||
|
type="text"
|
||||||
|
:value="modelValue ?? ''"
|
||||||
|
:placeholder="placeholder"
|
||||||
|
:maxlength="maxlength"
|
||||||
|
:disabled="disabled"
|
||||||
|
v-bind="attrs"
|
||||||
|
class="border-b border-black text-xl pb-[6px] bg-transparent"
|
||||||
|
:class="[
|
||||||
|
isEmpty ? 'text-neutral-400' : 'text-black',
|
||||||
|
disabled ? 'cursor-not-allowed' : 'cursor-text',
|
||||||
|
inputClass
|
||||||
|
]"
|
||||||
|
@input="onInput"
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, useAttrs } from 'vue'
|
||||||
|
|
||||||
|
defineOptions({ inheritAttrs: false })
|
||||||
|
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
id?: string
|
||||||
|
label?: string
|
||||||
|
modelValue: string | null | undefined
|
||||||
|
placeholder?: string
|
||||||
|
maxlength?: number | string
|
||||||
|
disabled?: boolean
|
||||||
|
wrapperClass?: string
|
||||||
|
labelClass?: string
|
||||||
|
inputClass?: string
|
||||||
|
}>(),
|
||||||
|
{
|
||||||
|
placeholder: '',
|
||||||
|
maxlength: undefined,
|
||||||
|
disabled: false,
|
||||||
|
wrapperClass: '',
|
||||||
|
labelClass: '',
|
||||||
|
inputClass: ''
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(event: 'update:modelValue', value: string): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const attrs = useAttrs()
|
||||||
|
const isEmpty = computed(() => !props.modelValue)
|
||||||
|
|
||||||
|
const onInput = (event: Event) => {
|
||||||
|
const target = event.target as HTMLInputElement
|
||||||
|
emit('update:modelValue', target.value)
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<label :for="inputId" class="font-bold uppercase text-xl mb-4">{{ label }}</label>
|
<label :for="inputId" class="font-bold uppercase text-xl mb-2">{{ label }}</label>
|
||||||
|
<div class="flex items-end gap-8">
|
||||||
<input
|
<input
|
||||||
:id="inputId"
|
:id="inputId"
|
||||||
:value="modelValue"
|
:value="modelValue"
|
||||||
@@ -8,19 +9,19 @@
|
|||||||
type="text"
|
type="text"
|
||||||
:maxlength="maxLength"
|
:maxlength="maxLength"
|
||||||
:placeholder="placeholderText"
|
:placeholder="placeholderText"
|
||||||
class="border-b border-black justify-self-start text-xl pb-[6px] uppercase"
|
class="border-b border-black flex-1 min-w-0 text-xl uppercase h-[30px]"
|
||||||
@input="handleInput"
|
@input="handleInput"
|
||||||
/>
|
/>
|
||||||
<label :for="checkboxId" class="mt-3 flex items-center gap-3 text-sm">
|
<UiCheckbox
|
||||||
<input
|
|
||||||
:id="checkboxId"
|
:id="checkboxId"
|
||||||
:checked="allowAny"
|
:model-value="allowAny"
|
||||||
type="checkbox"
|
label="Autoriser un format libre"
|
||||||
class="h-4 w-4 accent-primary-500"
|
wrapper-class="ml-auto"
|
||||||
@change="toggleAllowAny"
|
label-class="gap-3 whitespace-nowrap text-sm"
|
||||||
|
input-class="h-4 w-4 accent-primary-500"
|
||||||
|
@update:modelValue="handleAllowAnyChange"
|
||||||
/>
|
/>
|
||||||
Autoriser un format libre
|
</div>
|
||||||
</label>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -78,13 +79,7 @@ const handleInput = (event: Event) => {
|
|||||||
emit('update:modelValue', target.value)
|
emit('update:modelValue', target.value)
|
||||||
}
|
}
|
||||||
|
|
||||||
const toggleAllowAny = (event: Event) => {
|
const handleAllowAnyChange = (nextValue: boolean) => {
|
||||||
const target = event.target as HTMLInputElement | null
|
|
||||||
if (!target) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const nextValue = target.checked
|
|
||||||
emit('update:allowAny', nextValue)
|
emit('update:allowAny', nextValue)
|
||||||
if (!nextValue) {
|
if (!nextValue) {
|
||||||
emit('update:modelValue', props.modelValue)
|
emit('update:modelValue', props.modelValue)
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
<template>
|
|
||||||
<iframe ref="printFrame" class="hidden" />
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { ref } from 'vue'
|
|
||||||
import { usePdfPrinter } from '~/composables/usePdfPrinter'
|
|
||||||
|
|
||||||
const printFrame = ref<HTMLIFrameElement | null>(null)
|
|
||||||
const { printPdf } = usePdfPrinter()
|
|
||||||
|
|
||||||
// Expose une methode simple pour imprimer un PDF depuis les ecrans.
|
|
||||||
const print = async (url: string): Promise<void> => {
|
|
||||||
return printPdf(url, printFrame)
|
|
||||||
}
|
|
||||||
|
|
||||||
defineExpose({
|
|
||||||
print
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
<template>
|
||||||
|
<div class="relative w-full">
|
||||||
|
<div class="relative h-[18px] text-[16px] uppercase font-bold text-black mb-3">
|
||||||
|
<div
|
||||||
|
v-for="(label, index) in labels"
|
||||||
|
:key="label"
|
||||||
|
class="absolute top-0 whitespace-nowrap"
|
||||||
|
:class="labelClass(index)"
|
||||||
|
:style="positionStyle(index)"
|
||||||
|
>
|
||||||
|
{{ label }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="relative h-[22px]">
|
||||||
|
<div class="absolute left-0 right-0 top-1/2 h-[2px] -translate-y-1/2 bg-black"></div>
|
||||||
|
<div
|
||||||
|
v-for="(_, index) in labels"
|
||||||
|
:key="index"
|
||||||
|
class="absolute top-1/2 h-[22px] w-[22px] -translate-y-1/2 rounded-full border border-black"
|
||||||
|
:class="[
|
||||||
|
dotClass(index),
|
||||||
|
isActive(index) ? 'bg-black' : 'bg-white',
|
||||||
|
isClickable(index) ? 'cursor-pointer' : 'cursor-not-allowed'
|
||||||
|
]"
|
||||||
|
:style="positionStyle(index)"
|
||||||
|
@click="handleClick(index)"
|
||||||
|
></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
type Props = {
|
||||||
|
labels: string[]
|
||||||
|
currentStep: number
|
||||||
|
}
|
||||||
|
|
||||||
|
const props = defineProps<Props>()
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(e: 'select', step: number): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const stepCount = computed(() => Math.max(props.labels.length, 1))
|
||||||
|
|
||||||
|
const positionStyle = (index: number) => {
|
||||||
|
if (stepCount.value <= 1) {
|
||||||
|
return { left: '0%' }
|
||||||
|
}
|
||||||
|
if (index === 0) {
|
||||||
|
return { left: '0%' }
|
||||||
|
}
|
||||||
|
if (index === stepCount.value - 1) {
|
||||||
|
return { right: '0%' }
|
||||||
|
}
|
||||||
|
const percent = (index / (stepCount.value - 1)) * 100
|
||||||
|
return { left: `${percent}%` }
|
||||||
|
}
|
||||||
|
|
||||||
|
const isMiddle = (index: number) => index > 0 && index < stepCount.value - 1
|
||||||
|
const isLast = (index: number) => index === stepCount.value - 1
|
||||||
|
|
||||||
|
const dotClass = (index: number) => (isMiddle(index) ? '-translate-x-1/2' : '')
|
||||||
|
|
||||||
|
const labelClass = (index: number) => {
|
||||||
|
if (isLast(index)) {
|
||||||
|
return 'text-right'
|
||||||
|
}
|
||||||
|
if (isMiddle(index)) {
|
||||||
|
return 'text-center -translate-x-1/2'
|
||||||
|
}
|
||||||
|
return 'text-left'
|
||||||
|
}
|
||||||
|
|
||||||
|
const isActive = (index: number) => index === props.currentStep
|
||||||
|
|
||||||
|
const isClickable = (index: number) => index <= props.currentStep
|
||||||
|
|
||||||
|
const handleClick = (index: number) => {
|
||||||
|
if (!isClickable(index)) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
emit('select', index)
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -1,37 +1,31 @@
|
|||||||
import type { Ref } from 'vue'
|
|
||||||
import {useApi} from '~/composables/useApi'
|
import {useApi} from '~/composables/useApi'
|
||||||
|
|
||||||
type PrintFrameRef = Ref<HTMLIFrameElement | null>
|
|
||||||
|
|
||||||
export const usePdfPrinter = () => {
|
export const usePdfPrinter = () => {
|
||||||
const api = useApi()
|
const api = useApi()
|
||||||
|
const receptionStore = useReceptionStore()
|
||||||
|
const currentReception = receptionStore.current
|
||||||
|
|
||||||
const printPdf = async (url: string, frameRef: PrintFrameRef): Promise<void> => {
|
const printPdf = async (url: string): Promise<void> => {
|
||||||
if (!import.meta.client) {
|
const blob = await api.getBlob(url);
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const frame = frameRef.value
|
const pdfBlob = blob.type === 'application/pdf'
|
||||||
if (!frame) {
|
? blob
|
||||||
return
|
: new Blob([blob], { type: 'application/pdf' });
|
||||||
}
|
|
||||||
|
|
||||||
// On charge le PDF en blob pour rester en same-origin dans l'iframe.
|
const blobUrl = URL.createObjectURL(pdfBlob);
|
||||||
const blob = await api.getBlob(url)
|
|
||||||
const blobUrl = URL.createObjectURL(blob)
|
|
||||||
|
|
||||||
const tryPrint = () => {
|
const filename = `${currentReception.identificationNumber}_${currentReception.supplier.name}_${currentReception.licensePlate}.pdf`;
|
||||||
frame.contentWindow?.focus()
|
|
||||||
frame.contentWindow?.print()
|
|
||||||
}
|
|
||||||
|
|
||||||
frame.onload = () => {
|
const a = document.createElement('a');
|
||||||
tryPrint()
|
a.href = blobUrl;
|
||||||
// On libere l'URL blob apres l'impression.
|
a.download = filename;
|
||||||
setTimeout(() => URL.revokeObjectURL(blobUrl), 2000)
|
a.style.display = 'none';
|
||||||
}
|
document.body.appendChild(a);
|
||||||
frame.src = blobUrl
|
a.click();
|
||||||
setTimeout(tryPrint, 1200)
|
a.remove();
|
||||||
|
|
||||||
|
// L'ouverture dans un nouvel onglet déclenche un 2e PDF sans le nom personnalisé.
|
||||||
|
setTimeout(() => URL.revokeObjectURL(blobUrl), 60_000);
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import type {Ref} from 'vue'
|
import type {Ref} from 'vue'
|
||||||
import {computed, ref} from 'vue'
|
import {computed, ref} from 'vue'
|
||||||
import type {ReceptionData, WeightEntryData} from '~/services/dto/reception-data'
|
import type {ReceptionData, ReceptionPayload, WeightEntryData} from '~/services/dto/reception-data'
|
||||||
import type {WeightData} from '~/services/dto/weight-data'
|
import type {WeightData} from '~/services/dto/weight-data'
|
||||||
import {getWeight} from '~/services/reception'
|
import {getWeight} from '~/services/reception'
|
||||||
import {createWeight, updateWeight} from '~/services/weight'
|
import {createWeight, updateWeight} from '~/services/weight'
|
||||||
@@ -10,7 +10,7 @@ export type WeighingMode = 'gross' | 'tare'
|
|||||||
type UseWeighingOptions = {
|
type UseWeighingOptions = {
|
||||||
mode: WeighingMode
|
mode: WeighingMode
|
||||||
reception: Ref<ReceptionData | null>
|
reception: Ref<ReceptionData | null>
|
||||||
updateReception: (id: number, payload: Partial<ReceptionData>) => Promise<ReceptionData | null>
|
updateReception: (id: number, payload: ReceptionPayload) => Promise<ReceptionData | null>
|
||||||
loadReception?: (id: number) => Promise<ReceptionData | null>
|
loadReception?: (id: number) => Promise<ReceptionData | null>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
export enum StepLabel {
|
||||||
|
Reception = 'Réception',
|
||||||
|
GrossWeighing = 'Pesée à plein',
|
||||||
|
Selection = 'Sélection réceptionnées',
|
||||||
|
TareWeighing = 'Pesée à vide'
|
||||||
|
}
|
||||||
|
|
||||||
|
export const RECEPTION_STEP_LABELS = [
|
||||||
|
StepLabel.Reception,
|
||||||
|
StepLabel.GrossWeighing,
|
||||||
|
StepLabel.Selection,
|
||||||
|
StepLabel.TareWeighing
|
||||||
|
]
|
||||||
@@ -14,6 +14,38 @@
|
|||||||
"update": "Impossible de mettre à jour la réception.",
|
"update": "Impossible de mettre à jour la réception.",
|
||||||
"weigh": "Impossible de récupérer la pesée."
|
"weigh": "Impossible de récupérer la pesée."
|
||||||
},
|
},
|
||||||
|
"receptionType": {
|
||||||
|
"list": "Impossible de récupérer la liste des types de réception."
|
||||||
|
},
|
||||||
|
"merchandiseType": {
|
||||||
|
"list": "Impossible de récupérer la liste des types de marchandises."
|
||||||
|
},
|
||||||
|
"building": {
|
||||||
|
"list": "Impossible de récupérer la liste des bâtiments."
|
||||||
|
},
|
||||||
|
"pelletType": {
|
||||||
|
"list": "Impossible de récupérer la liste des types de granulés."
|
||||||
|
},
|
||||||
|
"receptionPelletBuilding": {
|
||||||
|
"list": "Impossible de récupérer la liste des dépôts de granulés.",
|
||||||
|
"create": "Impossible d'enregistrer le dépôt de granulés.",
|
||||||
|
"delete": "Impossible de supprimer le dépôt de granulés."
|
||||||
|
},
|
||||||
|
"supplier": {
|
||||||
|
"list": "Impossible de récupérer la liste des fournisseurs."
|
||||||
|
},
|
||||||
|
"truck": {
|
||||||
|
"list": "Impossible de récupérer la liste des camions."
|
||||||
|
},
|
||||||
|
"carrier": {
|
||||||
|
"list": "Impossible de récupérer la liste des transporteurs."
|
||||||
|
},
|
||||||
|
"driver": {
|
||||||
|
"list": "Impossible de récupérer la liste des chauffeurs."
|
||||||
|
},
|
||||||
|
"vehicle": {
|
||||||
|
"list": "Impossible de récupérer la liste des immatriculations."
|
||||||
|
},
|
||||||
"auth": {
|
"auth": {
|
||||||
"login": "Identifiants invalides.",
|
"login": "Identifiants invalides.",
|
||||||
"users": "Impossible de récupérer les utilisateurs.",
|
"users": "Impossible de récupérer les utilisateurs.",
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
<main class="mx-auto w-full max-w-[1050px] px-6 pt-[90px] pb-0">
|
<main class="mx-auto w-full max-w-[1280px] px-6 pt-[85px] pb-0">
|
||||||
<slot/>
|
<slot/>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ export default defineNuxtConfig({
|
|||||||
'nuxt-toast',
|
'nuxt-toast',
|
||||||
'@nuxtjs/i18n'
|
'@nuxtjs/i18n'
|
||||||
],
|
],
|
||||||
css: ['~/assets/css/toast.css'],
|
css: ['~/assets/css/main.css', '~/assets/css/toast.css'],
|
||||||
runtimeConfig: {
|
runtimeConfig: {
|
||||||
public: {
|
public: {
|
||||||
apiBase: process.env.NUXT_PUBLIC_API_BASE
|
apiBase: process.env.NUXT_PUBLIC_API_BASE
|
||||||
|
|||||||
@@ -1,7 +1,13 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<div class="flex justify-between h-[52px] mb-[90px]">
|
<div class="flex justify-between h-[52px] mb-[80px]">
|
||||||
<p class="self-center">Indicateur d’étapes</p>
|
<div class="flex flex-1 mr-16">
|
||||||
|
<UiStepper
|
||||||
|
:labels="RECEPTION_STEP_LABELS"
|
||||||
|
:current-step="storeReception?.currentStep ?? 0"
|
||||||
|
@select="handleStepSelect"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
|
class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
|
||||||
@@ -10,7 +16,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
|
<ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
|
||||||
<ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
|
<ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
|
||||||
<ReceptionUnloading v-if="storeReception?.currentStep === 2"/>
|
<ReceptionProductReceived v-if="storeReception?.currentStep === 2"/>
|
||||||
<ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
|
<ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -18,6 +24,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {useReceptionStore} from '~/stores/reception'
|
import {useReceptionStore} from '~/stores/reception'
|
||||||
import {storeToRefs} from 'pinia'
|
import {storeToRefs} from 'pinia'
|
||||||
|
import {RECEPTION_STEP_LABELS} from '~/constants/steps'
|
||||||
|
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
@@ -60,4 +67,19 @@ const saveAndHold = async () => {
|
|||||||
})
|
})
|
||||||
await router.push('/')
|
await router.push('/')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handleStepSelect = async (step: number) => {
|
||||||
|
if (!receptionStore.current) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if (step === receptionStore.current.currentStep) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
await receptionStore.updateReception(receptionStore.current.id, {
|
||||||
|
currentStep: step
|
||||||
|
})
|
||||||
|
await receptionStore.loadReception(receptionStore.current.id)
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { useApi } from '~/composables/useApi'
|
||||||
|
import type { BuildingData } from '~/services/dto/building-data'
|
||||||
|
|
||||||
|
export type BuildingListResponse =
|
||||||
|
| BuildingData[]
|
||||||
|
| { 'hydra:member'?: BuildingData[] }
|
||||||
|
|
||||||
|
export async function getBuildingList(): Promise<BuildingData[]> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<BuildingListResponse>('buildings', {}, {
|
||||||
|
toastErrorKey: 'errors.building.list'
|
||||||
|
})
|
||||||
|
|
||||||
|
if (Array.isArray(response)) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
|
return response['hydra:member']
|
||||||
|
}
|
||||||
|
|
||||||
|
return []
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { useApi } from '~/composables/useApi'
|
||||||
|
import type { CarrierData } from '~/services/dto/carrier-data'
|
||||||
|
|
||||||
|
export type CarrierListResponse =
|
||||||
|
| CarrierData[]
|
||||||
|
| { 'hydra:member'?: CarrierData[] }
|
||||||
|
|
||||||
|
export async function getCarrierList(): Promise<CarrierData[]> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<CarrierListResponse>('carriers', {}, {
|
||||||
|
toastErrorKey: 'errors.carrier.list'
|
||||||
|
})
|
||||||
|
|
||||||
|
if (Array.isArray(response)) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
|
return response['hydra:member']
|
||||||
|
}
|
||||||
|
|
||||||
|
return []
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { useApi } from '~/composables/useApi'
|
||||||
|
import type { DriverData } from '~/services/dto/driver-data'
|
||||||
|
|
||||||
|
export type DriverListResponse =
|
||||||
|
| DriverData[]
|
||||||
|
| { 'hydra:member'?: DriverData[] }
|
||||||
|
|
||||||
|
export async function getDriverList(): Promise<DriverData[]> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<DriverListResponse>('drivers', {}, {
|
||||||
|
toastErrorKey: 'errors.driver.list'
|
||||||
|
})
|
||||||
|
|
||||||
|
if (Array.isArray(response)) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
|
return response['hydra:member']
|
||||||
|
}
|
||||||
|
|
||||||
|
return []
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
export interface AddressData {
|
||||||
|
id: number
|
||||||
|
label: string
|
||||||
|
street: string
|
||||||
|
street2?: string | null
|
||||||
|
postalCode: string
|
||||||
|
city: string
|
||||||
|
countryCode: string
|
||||||
|
fullAddress?: string
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
export interface BuildingData {
|
||||||
|
id: number
|
||||||
|
label: string
|
||||||
|
code: string
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
export interface CarrierData {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
code: string
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
import type { CarrierData } from '~/services/dto/carrier-data'
|
||||||
|
|
||||||
|
export interface DriverData {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
carrier?: CarrierData | null
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
export interface MerchandiseTypeData {
|
||||||
|
id: number
|
||||||
|
label: string
|
||||||
|
code: string
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
export interface PelletTypeData {
|
||||||
|
id: number
|
||||||
|
label: string
|
||||||
|
code: string
|
||||||
|
}
|
||||||
@@ -1,10 +1,33 @@
|
|||||||
|
import type { ReceptionTypeData } from '~/services/dto/reception-type-data'
|
||||||
|
import type { MerchandiseTypeData } from '~/services/dto/merchandise-type-data'
|
||||||
|
import type { BuildingData } from '~/services/dto/building-data'
|
||||||
|
import type { ReceptionPelletBuildingData } from '~/services/dto/reception-pellet-building-data'
|
||||||
|
import type { UserData } from '~/services/dto/user-data'
|
||||||
|
import type { SupplierData } from '~/services/dto/supplier-data'
|
||||||
|
import type { AddressData } from '~/services/dto/address-data'
|
||||||
|
import type { TruckData } from '~/services/dto/truck-data'
|
||||||
|
import type { CarrierData } from '~/services/dto/carrier-data'
|
||||||
|
import type { DriverData } from '~/services/dto/driver-data'
|
||||||
|
|
||||||
export interface ReceptionData {
|
export interface ReceptionData {
|
||||||
id: number
|
id: number
|
||||||
|
identificationNumber?: string | null
|
||||||
licensePlate: string | null
|
licensePlate: string | null
|
||||||
weights?: WeightEntryData[] | null
|
weights?: WeightEntryData[] | null
|
||||||
receptionDate: string
|
receptionDate: string
|
||||||
currentStep: number
|
currentStep: number
|
||||||
isValid: boolean
|
isValid: boolean
|
||||||
|
receptionType?: ReceptionTypeData | null
|
||||||
|
merchandiseType?: MerchandiseTypeData | null
|
||||||
|
merchandiseDetail?: string | null
|
||||||
|
buildings?: BuildingData[] | null
|
||||||
|
pelletBuildings?: ReceptionPelletBuildingData[] | null
|
||||||
|
user?: UserData | null
|
||||||
|
supplier?: SupplierData | null
|
||||||
|
address?: AddressData | null
|
||||||
|
truck?: TruckData | null
|
||||||
|
carrier?: CarrierData | null
|
||||||
|
driver?: DriverData | null
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface WeightEntryData {
|
export interface WeightEntryData {
|
||||||
@@ -14,3 +37,20 @@ export interface WeightEntryData {
|
|||||||
weight: number | null
|
weight: number | null
|
||||||
weighedAt: string | null
|
weighedAt: string | null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type ReceptionPayload = {
|
||||||
|
licensePlate?: string | null
|
||||||
|
receptionDate?: string
|
||||||
|
currentStep?: number
|
||||||
|
isValid?: boolean
|
||||||
|
receptionType?: string | null
|
||||||
|
merchandiseType?: string | null
|
||||||
|
merchandiseDetail?: string | null
|
||||||
|
buildings?: string[] | null
|
||||||
|
user?: string | null
|
||||||
|
supplier?: string | null
|
||||||
|
address?: string | null
|
||||||
|
truck?: string | null
|
||||||
|
carrier?: string | null
|
||||||
|
driver?: string | null
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import type { BuildingData } from '~/services/dto/building-data'
|
||||||
|
import type { PelletTypeData } from '~/services/dto/pellet-type-data'
|
||||||
|
|
||||||
|
export interface ReceptionPelletBuildingData {
|
||||||
|
id: number
|
||||||
|
reception?: string
|
||||||
|
building: BuildingData
|
||||||
|
pelletType: PelletTypeData
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
export interface ReceptionTypeData {
|
||||||
|
id: number
|
||||||
|
label: string
|
||||||
|
code: string
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import type { AddressData } from '~/services/dto/address-data'
|
||||||
|
|
||||||
|
export interface SupplierData {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
email?: string | null
|
||||||
|
phone?: string | null
|
||||||
|
addresses?: AddressData[] | null
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
export interface TruckData {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
export interface UserData {
|
export interface UserData {
|
||||||
|
id: number
|
||||||
username: string
|
username: string
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import type { CarrierData } from '~/services/dto/carrier-data'
|
||||||
|
import type { TruckData } from '~/services/dto/truck-data'
|
||||||
|
|
||||||
|
export interface VehicleData {
|
||||||
|
id: number
|
||||||
|
plate: string
|
||||||
|
carrier?: CarrierData | null
|
||||||
|
truck?: TruckData | null
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { useApi } from '~/composables/useApi'
|
||||||
|
import type { MerchandiseTypeData } from '~/services/dto/merchandise-type-data'
|
||||||
|
|
||||||
|
export type MerchandiseTypeListResponse =
|
||||||
|
| MerchandiseTypeData[]
|
||||||
|
| { 'hydra:member'?: MerchandiseTypeData[] }
|
||||||
|
|
||||||
|
export async function getMerchandiseTypeList(): Promise<MerchandiseTypeData[]> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<MerchandiseTypeListResponse>('merchandise_types', {}, {
|
||||||
|
toastErrorKey: 'errors.merchandiseType.list'
|
||||||
|
})
|
||||||
|
|
||||||
|
if (Array.isArray(response)) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
|
return response['hydra:member']
|
||||||
|
}
|
||||||
|
|
||||||
|
return []
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { useApi } from '~/composables/useApi'
|
||||||
|
import type { PelletTypeData } from '~/services/dto/pellet-type-data'
|
||||||
|
|
||||||
|
export type PelletTypeListResponse =
|
||||||
|
| PelletTypeData[]
|
||||||
|
| { 'hydra:member'?: PelletTypeData[] }
|
||||||
|
|
||||||
|
export async function getPelletTypeList(): Promise<PelletTypeData[]> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<PelletTypeListResponse>('pellet_types', {}, {
|
||||||
|
toastErrorKey: 'errors.pelletType.list'
|
||||||
|
})
|
||||||
|
|
||||||
|
if (Array.isArray(response)) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
|
return response['hydra:member']
|
||||||
|
}
|
||||||
|
|
||||||
|
return []
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
import { useApi } from '~/composables/useApi'
|
||||||
|
import type { ReceptionPelletBuildingData } from '~/services/dto/reception-pellet-building-data'
|
||||||
|
|
||||||
|
export type ReceptionPelletBuildingListResponse =
|
||||||
|
| ReceptionPelletBuildingData[]
|
||||||
|
| { 'hydra:member'?: ReceptionPelletBuildingData[] }
|
||||||
|
|
||||||
|
export type ReceptionPelletBuildingPayload = {
|
||||||
|
reception: string
|
||||||
|
pelletType: string
|
||||||
|
building: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getReceptionPelletBuildingList(
|
||||||
|
receptionIri: string
|
||||||
|
): Promise<ReceptionPelletBuildingData[]> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<ReceptionPelletBuildingListResponse>(
|
||||||
|
'reception_pellet_buildings',
|
||||||
|
{ reception: receptionIri },
|
||||||
|
{
|
||||||
|
toastErrorKey: 'errors.receptionPelletBuilding.list'
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
if (Array.isArray(response)) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
|
return response['hydra:member']
|
||||||
|
}
|
||||||
|
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function createReceptionPelletBuilding(
|
||||||
|
payload: ReceptionPelletBuildingPayload
|
||||||
|
): Promise<ReceptionPelletBuildingData> {
|
||||||
|
const api = useApi()
|
||||||
|
return api.post<ReceptionPelletBuildingData>('reception_pellet_buildings', payload, {
|
||||||
|
toastErrorKey: 'errors.receptionPelletBuilding.create'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function deleteReceptionPelletBuilding(id: number): Promise<void> {
|
||||||
|
const api = useApi()
|
||||||
|
await api.delete<void>(`reception_pellet_buildings/${id}`, {}, {
|
||||||
|
toastErrorKey: 'errors.receptionPelletBuilding.delete'
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { useApi } from '~/composables/useApi'
|
||||||
|
import type { ReceptionTypeData } from '~/services/dto/reception-type-data'
|
||||||
|
|
||||||
|
export type ReceptionTypeListResponse =
|
||||||
|
| ReceptionTypeData[]
|
||||||
|
| { 'hydra:member'?: ReceptionTypeData[] }
|
||||||
|
|
||||||
|
export async function getReceptionTypeList(): Promise<ReceptionTypeData[]> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<ReceptionTypeListResponse>('reception_types', {}, {
|
||||||
|
toastErrorKey: 'errors.receptionType.list'
|
||||||
|
})
|
||||||
|
|
||||||
|
if (Array.isArray(response)) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
|
return response['hydra:member']
|
||||||
|
}
|
||||||
|
|
||||||
|
return []
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import {useApi} from '~/composables/useApi'
|
import {useApi} from '~/composables/useApi'
|
||||||
import type {ReceptionData} from '~/services/dto/reception-data'
|
import type {ReceptionData, ReceptionPayload} from '~/services/dto/reception-data'
|
||||||
import type {WeightData} from '~/services/dto/weight-data'
|
import type {WeightData} from '~/services/dto/weight-data'
|
||||||
|
|
||||||
export async function getReceptionList() {
|
export async function getReceptionList() {
|
||||||
@@ -16,14 +16,14 @@ export async function getReception(id: number) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function createReception(payload: Partial<ReceptionData> = {}) {
|
export async function createReception(payload: ReceptionPayload = {}) {
|
||||||
const api = useApi()
|
const api = useApi()
|
||||||
return api.post<ReceptionData>('receptions', payload, {
|
return api.post<ReceptionData>('receptions', payload, {
|
||||||
toastErrorKey: 'errors.reception.create'
|
toastErrorKey: 'errors.reception.create'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function updateReception(id: number, payload: Partial<ReceptionData>) {
|
export async function updateReception(id: number, payload: ReceptionPayload) {
|
||||||
const api = useApi()
|
const api = useApi()
|
||||||
return api.patch<ReceptionData>(`receptions/${id}`, payload, {
|
return api.patch<ReceptionData>(`receptions/${id}`, payload, {
|
||||||
toastErrorKey: 'errors.reception.update',
|
toastErrorKey: 'errors.reception.update',
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { useApi } from '~/composables/useApi'
|
||||||
|
import type { SupplierData } from '~/services/dto/supplier-data'
|
||||||
|
|
||||||
|
export type SupplierListResponse =
|
||||||
|
| SupplierData[]
|
||||||
|
| { 'hydra:member'?: SupplierData[] }
|
||||||
|
|
||||||
|
export async function getSupplierList(): Promise<SupplierData[]> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<SupplierListResponse>('suppliers', {}, {
|
||||||
|
toastErrorKey: 'errors.supplier.list'
|
||||||
|
})
|
||||||
|
|
||||||
|
if (Array.isArray(response)) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
|
return response['hydra:member']
|
||||||
|
}
|
||||||
|
|
||||||
|
return []
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { useApi } from '~/composables/useApi'
|
||||||
|
import type { TruckData } from '~/services/dto/truck-data'
|
||||||
|
|
||||||
|
export type TruckListResponse =
|
||||||
|
| TruckData[]
|
||||||
|
| { 'hydra:member'?: TruckData[] }
|
||||||
|
|
||||||
|
export async function getTruckList(): Promise<TruckData[]> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<TruckListResponse>('trucks', {}, {
|
||||||
|
toastErrorKey: 'errors.truck.list'
|
||||||
|
})
|
||||||
|
|
||||||
|
if (Array.isArray(response)) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
|
return response['hydra:member']
|
||||||
|
}
|
||||||
|
|
||||||
|
return []
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { useApi } from '~/composables/useApi'
|
||||||
|
import type { VehicleData } from '~/services/dto/vehicle-data'
|
||||||
|
|
||||||
|
export type VehicleListResponse =
|
||||||
|
| VehicleData[]
|
||||||
|
| { 'hydra:member'?: VehicleData[] }
|
||||||
|
|
||||||
|
export async function getVehicleList(): Promise<VehicleData[]> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<VehicleListResponse>('vehicles', {}, {
|
||||||
|
toastErrorKey: 'errors.vehicle.list'
|
||||||
|
})
|
||||||
|
|
||||||
|
if (Array.isArray(response)) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
|
return response['hydra:member']
|
||||||
|
}
|
||||||
|
|
||||||
|
return []
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { defineStore } from 'pinia'
|
import { defineStore } from 'pinia'
|
||||||
import type { ReceptionData } from '~/services/dto/reception-data'
|
import type { ReceptionData, ReceptionPayload } from '~/services/dto/reception-data'
|
||||||
import { createReception, getReception, updateReception } from '~/services/reception'
|
import { createReception, getReception, updateReception } from '~/services/reception'
|
||||||
|
|
||||||
const isReceptionData = (value: unknown): value is ReceptionData => {
|
const isReceptionData = (value: unknown): value is ReceptionData => {
|
||||||
@@ -31,7 +31,7 @@ export const useReceptionStore = defineStore('reception', {
|
|||||||
this.current = result
|
this.current = result
|
||||||
return result
|
return result
|
||||||
},
|
},
|
||||||
async createReception(payload: Partial<ReceptionData> = {}) {
|
async createReception(payload: ReceptionPayload = {}) {
|
||||||
this.isLoading = true
|
this.isLoading = true
|
||||||
const result = await createReception(payload).finally(() => {
|
const result = await createReception(payload).finally(() => {
|
||||||
this.isLoading = false
|
this.isLoading = false
|
||||||
@@ -43,7 +43,7 @@ export const useReceptionStore = defineStore('reception', {
|
|||||||
this.current = result
|
this.current = result
|
||||||
return result
|
return result
|
||||||
},
|
},
|
||||||
async updateReception(id: number, payload: Partial<ReceptionData>) {
|
async updateReception(id: number, payload: ReceptionPayload) {
|
||||||
this.isLoading = true
|
this.isLoading = true
|
||||||
const result = await updateReception(id, payload).finally(() => {
|
const result = await updateReception(id, payload).finally(() => {
|
||||||
this.isLoading = false
|
this.isLoading = false
|
||||||
|
|||||||
@@ -3,6 +3,9 @@ import type { Config } from 'tailwindcss'
|
|||||||
export default <Partial<Config>>{
|
export default <Partial<Config>>{
|
||||||
theme: {
|
theme: {
|
||||||
extend: {
|
extend: {
|
||||||
|
fontFamily: {
|
||||||
|
sans: ['"Helvetica Neue"', 'Helvetica', 'Arial', 'sans-serif']
|
||||||
|
},
|
||||||
colors: {
|
colors: {
|
||||||
primary: {
|
primary: {
|
||||||
50: '#f6f9ea',
|
50: '#f6f9ea',
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
export const RECEPTION_TYPE_CODES = {
|
||||||
|
MERCHANDISES: 'MARCHANDISES'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export const MERCHANDISE_TYPE_CODES = {
|
||||||
|
GRANULE: 'GRANULE',
|
||||||
|
AUTRES: 'AUTRES'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export const SUPLLIER_CODE = {
|
||||||
|
LIOT: 'LIOT'
|
||||||
|
}
|
||||||
@@ -76,6 +76,9 @@ build-without-cache:
|
|||||||
migration-migrate:
|
migration-migrate:
|
||||||
$(SYMFONY_CONSOLE) doctrine:migrations:migrate --no-interaction
|
$(SYMFONY_CONSOLE) doctrine:migrations:migrate --no-interaction
|
||||||
|
|
||||||
|
fixtures:
|
||||||
|
$(SYMFONY_CONSOLE) doctrine:fixtures:load
|
||||||
|
|
||||||
# Attention, supprime votre bdd local
|
# Attention, supprime votre bdd local
|
||||||
db-reset:
|
db-reset:
|
||||||
$(DOCKER_COMPOSE) down -v
|
$(DOCKER_COMPOSE) down -v
|
||||||
@@ -83,6 +86,7 @@ db-reset:
|
|||||||
$(MAKE) wait
|
$(MAKE) wait
|
||||||
$(SYMFONY_CONSOLE) doctrine:database:create --if-not-exists
|
$(SYMFONY_CONSOLE) doctrine:database:create --if-not-exists
|
||||||
$(MAKE) migration-migrate
|
$(MAKE) migration-migrate
|
||||||
|
$(MAKE) fixtures
|
||||||
|
|
||||||
# Restart la bdd
|
# Restart la bdd
|
||||||
db-restart:
|
db-restart:
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260127000100 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add reception types and link receptions to them';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('CREATE TABLE reception_type (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(120) NOT NULL, code VARCHAR(50) NOT NULL, PRIMARY KEY(id))');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD reception_type_id INT DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD CONSTRAINT FK_83DC02E37BD5B5D FOREIGN KEY (reception_type_id) REFERENCES reception_type (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('CREATE INDEX IDX_83DC02E37BD5B5D ON reception (reception_type_id)');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE reception DROP CONSTRAINT FK_83DC02E37BD5B5D');
|
||||||
|
$this->addSql('DROP INDEX IDX_83DC02E37BD5B5D');
|
||||||
|
$this->addSql('ALTER TABLE reception DROP reception_type_id');
|
||||||
|
$this->addSql('DROP TABLE reception_type');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260127000200 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Link receptions to a responsible user';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE reception ADD user_id INT DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD CONSTRAINT FK_83DC02E3A76ED395 FOREIGN KEY (user_id) REFERENCES "user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('CREATE INDEX IDX_83DC02E3A76ED395 ON reception (user_id)');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE reception DROP CONSTRAINT FK_83DC02E3A76ED395');
|
||||||
|
$this->addSql('DROP INDEX IDX_83DC02E3A76ED395');
|
||||||
|
$this->addSql('ALTER TABLE reception DROP user_id');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260127000300 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add suppliers and addresses, link receptions to suppliers';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('CREATE TABLE address (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(120) NOT NULL, street VARCHAR(180) NOT NULL, postal_code VARCHAR(20) NOT NULL, city VARCHAR(120) NOT NULL, country_code VARCHAR(2) NOT NULL, PRIMARY KEY(id))');
|
||||||
|
$this->addSql('CREATE TABLE supplier (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, name VARCHAR(180) NOT NULL, PRIMARY KEY(id))');
|
||||||
|
$this->addSql('CREATE TABLE supplier_address (supplier_id INT NOT NULL, address_id INT NOT NULL, PRIMARY KEY(supplier_id, address_id))');
|
||||||
|
$this->addSql('CREATE INDEX IDX_3DCE3C74F2C1D6A8 ON supplier_address (supplier_id)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_3DCE3C746F9B8A0 ON supplier_address (address_id)');
|
||||||
|
$this->addSql('ALTER TABLE supplier_address ADD CONSTRAINT FK_3DCE3C74F2C1D6A8 FOREIGN KEY (supplier_id) REFERENCES supplier (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('ALTER TABLE supplier_address ADD CONSTRAINT FK_3DCE3C746F9B8A0 FOREIGN KEY (address_id) REFERENCES address (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD supplier_id INT DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD CONSTRAINT FK_83DC02E32ADD6E01 FOREIGN KEY (supplier_id) REFERENCES supplier (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('CREATE INDEX IDX_83DC02E32ADD6E01 ON reception (supplier_id)');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE reception DROP CONSTRAINT FK_83DC02E32ADD6E01');
|
||||||
|
$this->addSql('DROP INDEX IDX_83DC02E32ADD6E01');
|
||||||
|
$this->addSql('ALTER TABLE reception DROP supplier_id');
|
||||||
|
$this->addSql('ALTER TABLE supplier_address DROP CONSTRAINT FK_3DCE3C74F2C1D6A8');
|
||||||
|
$this->addSql('ALTER TABLE supplier_address DROP CONSTRAINT FK_3DCE3C746F9B8A0');
|
||||||
|
$this->addSql('DROP TABLE supplier_address');
|
||||||
|
$this->addSql('DROP TABLE supplier');
|
||||||
|
$this->addSql('DROP TABLE address');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260127000400 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add address_id on reception';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE reception ADD address_id INT DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD CONSTRAINT FK_83DC02E3F5B7AF75 FOREIGN KEY (address_id) REFERENCES address (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('CREATE INDEX IDX_83DC02E3F5B7AF75 ON reception (address_id)');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE reception DROP CONSTRAINT FK_83DC02E3F5B7AF75');
|
||||||
|
$this->addSql('DROP INDEX IDX_83DC02E3F5B7AF75');
|
||||||
|
$this->addSql('ALTER TABLE reception DROP address_id');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260127000500 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add trucks and link receptions to trucks';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('CREATE TABLE truck (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, name VARCHAR(180) NOT NULL, PRIMARY KEY(id))');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD truck_id INT DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD CONSTRAINT FK_83DC02E3F7D15B1A FOREIGN KEY (truck_id) REFERENCES truck (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('CREATE INDEX IDX_83DC02E3F7D15B1A ON reception (truck_id)');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE reception DROP CONSTRAINT FK_83DC02E3F7D15B1A');
|
||||||
|
$this->addSql('DROP INDEX IDX_83DC02E3F7D15B1A');
|
||||||
|
$this->addSql('ALTER TABLE reception DROP truck_id');
|
||||||
|
$this->addSql('DROP TABLE truck');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260127000600 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add carriers, drivers, vehicles and link receptions to carriers/drivers';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('CREATE TABLE carrier (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, name VARCHAR(180) NOT NULL, code VARCHAR(30) DEFAULT NULL, PRIMARY KEY(id))');
|
||||||
|
$this->addSql('CREATE TABLE driver (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, carrier_id INT NOT NULL, name VARCHAR(180) NOT NULL, PRIMARY KEY(id))');
|
||||||
|
$this->addSql('CREATE INDEX IDX_14B3BC5F4C3C5E0A ON driver (carrier_id)');
|
||||||
|
$this->addSql('ALTER TABLE driver ADD CONSTRAINT FK_14B3BC5F4C3C5E0A FOREIGN KEY (carrier_id) REFERENCES carrier (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('CREATE TABLE vehicle (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, carrier_id INT NOT NULL, truck_id INT NOT NULL, plate VARCHAR(20) NOT NULL, PRIMARY KEY(id))');
|
||||||
|
$this->addSql('CREATE INDEX IDX_1B80E4864C3C5E0A ON vehicle (carrier_id)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_1B80E4868BEBB4B ON vehicle (truck_id)');
|
||||||
|
$this->addSql('ALTER TABLE vehicle ADD CONSTRAINT FK_1B80E4864C3C5E0A FOREIGN KEY (carrier_id) REFERENCES carrier (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('ALTER TABLE vehicle ADD CONSTRAINT FK_1B80E4868BEBB4B FOREIGN KEY (truck_id) REFERENCES truck (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD carrier_id INT DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD driver_id INT DEFAULT NULL');
|
||||||
|
$this->addSql('CREATE INDEX IDX_83DC02E34C3C5E0A ON reception (carrier_id)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_83DC02E3F24C741B ON reception (driver_id)');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD CONSTRAINT FK_83DC02E34C3C5E0A FOREIGN KEY (carrier_id) REFERENCES carrier (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD CONSTRAINT FK_83DC02E3F24C741B FOREIGN KEY (driver_id) REFERENCES driver (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE reception DROP CONSTRAINT FK_83DC02E34C3C5E0A');
|
||||||
|
$this->addSql('ALTER TABLE reception DROP CONSTRAINT FK_83DC02E3F24C741B');
|
||||||
|
$this->addSql('DROP INDEX IDX_83DC02E34C3C5E0A');
|
||||||
|
$this->addSql('DROP INDEX IDX_83DC02E3F24C741B');
|
||||||
|
$this->addSql('ALTER TABLE reception DROP carrier_id');
|
||||||
|
$this->addSql('ALTER TABLE reception DROP driver_id');
|
||||||
|
$this->addSql('ALTER TABLE vehicle DROP CONSTRAINT FK_1B80E4864C3C5E0A');
|
||||||
|
$this->addSql('ALTER TABLE vehicle DROP CONSTRAINT FK_1B80E4868BEBB4B');
|
||||||
|
$this->addSql('DROP TABLE vehicle');
|
||||||
|
$this->addSql('ALTER TABLE driver DROP CONSTRAINT FK_14B3BC5F4C3C5E0A');
|
||||||
|
$this->addSql('DROP TABLE driver');
|
||||||
|
$this->addSql('DROP TABLE carrier');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260127000700 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Allow null carrier code';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE carrier ALTER code DROP NOT NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE carrier ALTER code SET NOT NULL');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260128000100 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add identification number to receptions';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE reception ADD identification_number VARCHAR(20) DEFAULT NULL');
|
||||||
|
$this->addSql("UPDATE reception SET identification_number = 'N-BR-' || LPAD(id::text, 4, '0') WHERE identification_number IS NULL");
|
||||||
|
$this->addSql('CREATE UNIQUE INDEX UNIQ_reception_identification_number ON reception (identification_number)');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('DROP INDEX UNIQ_reception_identification_number');
|
||||||
|
$this->addSql('ALTER TABLE reception DROP identification_number');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260128000200 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add merchandise types and link receptions';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('CREATE TABLE merchandise_type (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(120) NOT NULL, code VARCHAR(50) NOT NULL, PRIMARY KEY(id))');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD merchandise_type_id INT DEFAULT NULL');
|
||||||
|
$this->addSql('CREATE INDEX IDX_83DC02E3BCAAA7C0 ON reception (merchandise_type_id)');
|
||||||
|
$this->addSql('ALTER TABLE reception ADD CONSTRAINT FK_83DC02E3BCAAA7C0 FOREIGN KEY (merchandise_type_id) REFERENCES merchandise_type (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE reception DROP CONSTRAINT FK_83DC02E3BCAAA7C0');
|
||||||
|
$this->addSql('DROP INDEX IDX_83DC02E3BCAAA7C0');
|
||||||
|
$this->addSql('ALTER TABLE reception DROP merchandise_type_id');
|
||||||
|
$this->addSql('DROP TABLE merchandise_type');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260128000300 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add buildings, pellet types, and reception allocations';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('CREATE TABLE building (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(120) NOT NULL, code VARCHAR(50) NOT NULL, PRIMARY KEY(id))');
|
||||||
|
$this->addSql('CREATE TABLE pellet_type (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(120) NOT NULL, code VARCHAR(50) NOT NULL, PRIMARY KEY(id))');
|
||||||
|
$this->addSql('CREATE TABLE reception_building (reception_id INT NOT NULL, building_id INT NOT NULL, PRIMARY KEY(reception_id, building_id))');
|
||||||
|
$this->addSql('CREATE INDEX IDX_46E7F9F23E4A2E34 ON reception_building (reception_id)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_46E7F9F24D2A7E12 ON reception_building (building_id)');
|
||||||
|
$this->addSql('ALTER TABLE reception_building ADD CONSTRAINT FK_46E7F9F23E4A2E34 FOREIGN KEY (reception_id) REFERENCES reception (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('ALTER TABLE reception_building ADD CONSTRAINT FK_46E7F9F24D2A7E12 FOREIGN KEY (building_id) REFERENCES building (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('CREATE TABLE reception_pellet_building (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, reception_id INT NOT NULL, pellet_type_id INT NOT NULL, building_id INT NOT NULL, PRIMARY KEY(id))');
|
||||||
|
$this->addSql('CREATE UNIQUE INDEX uniq_reception_pellet_building ON reception_pellet_building (reception_id, pellet_type_id, building_id)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_5DF3AA933E4A2E34 ON reception_pellet_building (reception_id)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_5DF3AA93955258D ON reception_pellet_building (pellet_type_id)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_5DF3AA934D2A7E12 ON reception_pellet_building (building_id)');
|
||||||
|
$this->addSql('ALTER TABLE reception_pellet_building ADD CONSTRAINT FK_5DF3AA933E4A2E34 FOREIGN KEY (reception_id) REFERENCES reception (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('ALTER TABLE reception_pellet_building ADD CONSTRAINT FK_5DF3AA93955258D FOREIGN KEY (pellet_type_id) REFERENCES pellet_type (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('ALTER TABLE reception_pellet_building ADD CONSTRAINT FK_5DF3AA934D2A7E12 FOREIGN KEY (building_id) REFERENCES building (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE reception_pellet_building DROP CONSTRAINT FK_5DF3AA933E4A2E34');
|
||||||
|
$this->addSql('ALTER TABLE reception_pellet_building DROP CONSTRAINT FK_5DF3AA93955258D');
|
||||||
|
$this->addSql('ALTER TABLE reception_pellet_building DROP CONSTRAINT FK_5DF3AA934D2A7E12');
|
||||||
|
$this->addSql('DROP TABLE reception_pellet_building');
|
||||||
|
$this->addSql('ALTER TABLE reception_building DROP CONSTRAINT FK_46E7F9F23E4A2E34');
|
||||||
|
$this->addSql('ALTER TABLE reception_building DROP CONSTRAINT FK_46E7F9F24D2A7E12');
|
||||||
|
$this->addSql('DROP TABLE reception_building');
|
||||||
|
$this->addSql('DROP TABLE pellet_type');
|
||||||
|
$this->addSql('DROP TABLE building');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260128000400 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add merchandise detail to reception';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE reception ADD merchandise_detail VARCHAR(255) DEFAULT NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE reception DROP merchandise_detail');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260130000100 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add address street2 and supplier contact fields';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE address ADD street2 VARCHAR(180) DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE supplier ADD email VARCHAR(180) DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE supplier ADD phone VARCHAR(40) DEFAULT NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE address DROP street2');
|
||||||
|
$this->addSql('ALTER TABLE supplier DROP email');
|
||||||
|
$this->addSql('ALTER TABLE supplier DROP phone');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,256 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Command;
|
||||||
|
|
||||||
|
use App\Entity\Address;
|
||||||
|
use App\Entity\Building;
|
||||||
|
use App\Entity\Carrier;
|
||||||
|
use App\Entity\Driver;
|
||||||
|
use App\Entity\MerchandiseType;
|
||||||
|
use App\Entity\PelletType;
|
||||||
|
use App\Entity\ReceptionType;
|
||||||
|
use App\Entity\Supplier;
|
||||||
|
use App\Entity\Truck;
|
||||||
|
use App\Entity\Vehicle;
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Symfony\Component\Console\Attribute\AsCommand;
|
||||||
|
use Symfony\Component\Console\Command\Command;
|
||||||
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
use Symfony\Component\Console\Output\OutputInterface;
|
||||||
|
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||||
|
|
||||||
|
#[AsCommand(
|
||||||
|
name: 'app:seed',
|
||||||
|
description: 'Seed reference data (idempotent).'
|
||||||
|
)]
|
||||||
|
class SeedCommand extends Command
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly EntityManagerInterface $entityManager
|
||||||
|
) {
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||||
|
{
|
||||||
|
$io = new SymfonyStyle($input, $output);
|
||||||
|
|
||||||
|
$created = 0;
|
||||||
|
$updated = 0;
|
||||||
|
|
||||||
|
$truckRepo = $this->entityManager->getRepository(Truck::class);
|
||||||
|
$carrierRepo = $this->entityManager->getRepository(Carrier::class);
|
||||||
|
$driverRepo = $this->entityManager->getRepository(Driver::class);
|
||||||
|
$vehicleRepo = $this->entityManager->getRepository(Vehicle::class);
|
||||||
|
$merchandiseTypeRepo = $this->entityManager->getRepository(MerchandiseType::class);
|
||||||
|
$pelletTypeRepo = $this->entityManager->getRepository(PelletType::class);
|
||||||
|
$buildingRepo = $this->entityManager->getRepository(Building::class);
|
||||||
|
$receptionTypeRepo = $this->entityManager->getRepository(ReceptionType::class);
|
||||||
|
$addressRepo = $this->entityManager->getRepository(Address::class);
|
||||||
|
$supplierRepo = $this->entityManager->getRepository(Supplier::class);
|
||||||
|
|
||||||
|
$upsertByCode = function (string $entityClass, string $code, callable $apply) use (&$created, &$updated) {
|
||||||
|
$repo = $this->entityManager->getRepository($entityClass);
|
||||||
|
$entity = $repo->findOneBy(['code' => $code]);
|
||||||
|
if (!$entity) {
|
||||||
|
$entity = new $entityClass();
|
||||||
|
++$created;
|
||||||
|
} else {
|
||||||
|
++$updated;
|
||||||
|
}
|
||||||
|
$apply($entity);
|
||||||
|
$this->entityManager->persist($entity);
|
||||||
|
|
||||||
|
return $entity;
|
||||||
|
};
|
||||||
|
|
||||||
|
$upsertByName = function (string $entityClass, string $name, callable $apply) use (&$created, &$updated) {
|
||||||
|
$repo = $this->entityManager->getRepository($entityClass);
|
||||||
|
$entity = $repo->findOneBy(['name' => $name]);
|
||||||
|
if (!$entity) {
|
||||||
|
$entity = new $entityClass();
|
||||||
|
++$created;
|
||||||
|
} else {
|
||||||
|
++$updated;
|
||||||
|
}
|
||||||
|
$apply($entity);
|
||||||
|
$this->entityManager->persist($entity);
|
||||||
|
|
||||||
|
return $entity;
|
||||||
|
};
|
||||||
|
|
||||||
|
$trucks = ['Citerne', 'Porteur'];
|
||||||
|
$citerne = null;
|
||||||
|
$porteur = null;
|
||||||
|
foreach ($trucks as $name) {
|
||||||
|
$truck = $upsertByName(Truck::class, $name, static fn (Truck $truck) => $truck->setName($name));
|
||||||
|
if ('Citerne' === $name) {
|
||||||
|
$citerne = $truck;
|
||||||
|
}
|
||||||
|
if ('Porteur' === $name) {
|
||||||
|
$porteur = $truck;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$carriers = [
|
||||||
|
['name' => 'LIOT', 'code' => 'LIOT'],
|
||||||
|
['name' => 'LUI-MEME', 'code' => 'LUI-MEME'],
|
||||||
|
];
|
||||||
|
$liot = null;
|
||||||
|
foreach ($carriers as $carrierData) {
|
||||||
|
$carrier = $upsertByCode(Carrier::class, $carrierData['code'], static function (Carrier $carrier) use ($carrierData) {
|
||||||
|
$carrier
|
||||||
|
->setName($carrierData['name'])
|
||||||
|
->setCode($carrierData['code'])
|
||||||
|
;
|
||||||
|
});
|
||||||
|
if ('LIOT' === $carrierData['code']) {
|
||||||
|
$liot = $carrier;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($liot && $citerne && $porteur) {
|
||||||
|
$drivers = ['Eddy', 'Jean-Christophe', 'Etienne', 'Hersand'];
|
||||||
|
foreach ($drivers as $name) {
|
||||||
|
$driver = $driverRepo->findOneBy(['name' => $name, 'carrier' => $liot]);
|
||||||
|
if (!$driver) {
|
||||||
|
$driver = new Driver();
|
||||||
|
++$created;
|
||||||
|
} else {
|
||||||
|
++$updated;
|
||||||
|
}
|
||||||
|
$driver
|
||||||
|
->setName($name)
|
||||||
|
->setCarrier($liot)
|
||||||
|
;
|
||||||
|
$this->entityManager->persist($driver);
|
||||||
|
}
|
||||||
|
|
||||||
|
$vehicles = [
|
||||||
|
['plate' => 'GH-684-VZ', 'truck' => $citerne],
|
||||||
|
['plate' => 'FW-363-EC', 'truck' => $porteur],
|
||||||
|
['plate' => 'FW-370-EC', 'truck' => $porteur],
|
||||||
|
['plate' => 'FW-375-EC', 'truck' => $porteur],
|
||||||
|
['plate' => 'FY-952-HS', 'truck' => $porteur],
|
||||||
|
];
|
||||||
|
foreach ($vehicles as $vehicleData) {
|
||||||
|
$vehicle = $vehicleRepo->findOneBy(['plate' => $vehicleData['plate']]);
|
||||||
|
if (!$vehicle) {
|
||||||
|
$vehicle = new Vehicle();
|
||||||
|
++$created;
|
||||||
|
} else {
|
||||||
|
++$updated;
|
||||||
|
}
|
||||||
|
$vehicle
|
||||||
|
->setPlate($vehicleData['plate'])
|
||||||
|
->setCarrier($liot)
|
||||||
|
->setTruck($vehicleData['truck'])
|
||||||
|
;
|
||||||
|
$this->entityManager->persist($vehicle);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$io->warning('Transport data not fully available; drivers/vehicles skipped.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$merchandiseTypes = [
|
||||||
|
['label' => 'Foin', 'code' => 'FOIN'],
|
||||||
|
['label' => 'Paille', 'code' => 'PAILLE'],
|
||||||
|
['label' => 'Granule', 'code' => 'GRANULE'],
|
||||||
|
];
|
||||||
|
foreach ($merchandiseTypes as $type) {
|
||||||
|
$upsertByCode(MerchandiseType::class, $type['code'], static function (MerchandiseType $entity) use ($type) {
|
||||||
|
$entity
|
||||||
|
->setLabel($type['label'])
|
||||||
|
->setCode($type['code'])
|
||||||
|
;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
$pelletTypes = [
|
||||||
|
['label' => 'JB croissance', 'code' => 'K750'],
|
||||||
|
['label' => 'Genisse herbe', 'code' => 'K500'],
|
||||||
|
['label' => 'Bovistart melasse ferme', 'code' => 'K130'],
|
||||||
|
['label' => 'Bovin mise en forme', 'code' => 'K400'],
|
||||||
|
];
|
||||||
|
foreach ($pelletTypes as $type) {
|
||||||
|
$upsertByCode(PelletType::class, $type['code'], static function (PelletType $entity) use ($type) {
|
||||||
|
$entity
|
||||||
|
->setLabel($type['label'])
|
||||||
|
->setCode($type['code'])
|
||||||
|
;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
$buildings = [
|
||||||
|
['label' => 'Bâtiment 1', 'code' => 'B1'],
|
||||||
|
['label' => 'Bâtiment 2', 'code' => 'B2'],
|
||||||
|
['label' => 'Bâtiment 3', 'code' => 'B3'],
|
||||||
|
];
|
||||||
|
foreach ($buildings as $buildingData) {
|
||||||
|
$upsertByCode(Building::class, $buildingData['code'], static function (Building $entity) use ($buildingData) {
|
||||||
|
$entity
|
||||||
|
->setLabel($buildingData['label'])
|
||||||
|
->setCode($buildingData['code'])
|
||||||
|
;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
$receptionTypes = [
|
||||||
|
['label' => 'Marchandises', 'code' => 'MARCHANDISES'],
|
||||||
|
['label' => 'Bovins', 'code' => 'BOVINS'],
|
||||||
|
];
|
||||||
|
foreach ($receptionTypes as $type) {
|
||||||
|
$upsertByCode(ReceptionType::class, $type['code'], static function (ReceptionType $entity) use ($type) {
|
||||||
|
$entity
|
||||||
|
->setLabel($type['label'])
|
||||||
|
->setCode($type['code'])
|
||||||
|
;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
$address = $addressRepo->findOneBy([
|
||||||
|
'label' => 'LIOT CHATELLERAULT',
|
||||||
|
'postalCode' => '86100',
|
||||||
|
]);
|
||||||
|
if (!$address) {
|
||||||
|
$address = new Address();
|
||||||
|
++$created;
|
||||||
|
} else {
|
||||||
|
++$updated;
|
||||||
|
}
|
||||||
|
$address
|
||||||
|
->setLabel('LIOT CHATELLERAULT')
|
||||||
|
->setStreet("14 Allée d'Argenson")
|
||||||
|
->setStreet2('ZI Nord')
|
||||||
|
->setPostalCode('86100')
|
||||||
|
->setCity('CHATELLERAULT')
|
||||||
|
->setCountryCode('FR')
|
||||||
|
;
|
||||||
|
$this->entityManager->persist($address);
|
||||||
|
|
||||||
|
$supplier = $supplierRepo->findOneBy(['name' => 'LIOT']);
|
||||||
|
if (!$supplier) {
|
||||||
|
$supplier = new Supplier();
|
||||||
|
++$created;
|
||||||
|
} else {
|
||||||
|
++$updated;
|
||||||
|
}
|
||||||
|
$supplier
|
||||||
|
->setName('LIOT')
|
||||||
|
->setEmail('lpc.contacts@lpc-liot.fr')
|
||||||
|
->setPhone('05.49.20.09.10')
|
||||||
|
;
|
||||||
|
if (!$supplier->getAddresses()->contains($address)) {
|
||||||
|
$supplier->getAddresses()->add($address);
|
||||||
|
}
|
||||||
|
$this->entityManager->persist($supplier);
|
||||||
|
|
||||||
|
$this->entityManager->flush();
|
||||||
|
|
||||||
|
$io->success(sprintf('Seed completed: %d created, %d updated.', $created, $updated));
|
||||||
|
|
||||||
|
return Command::SUCCESS;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\DataFixtures;
|
||||||
|
|
||||||
|
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||||
|
use Doctrine\Common\DataFixtures\DependentFixtureInterface;
|
||||||
|
use Doctrine\Persistence\ObjectManager;
|
||||||
|
|
||||||
|
class AppFixtures extends Fixture implements DependentFixtureInterface
|
||||||
|
{
|
||||||
|
public function load(ObjectManager $manager): void
|
||||||
|
{
|
||||||
|
$manager->flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getDependencies(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
TransportFixtures::class,
|
||||||
|
ReferenceFixtures::class,
|
||||||
|
SupplierFixtures::class,
|
||||||
|
UserFixtures::class,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\DataFixtures;
|
||||||
|
|
||||||
|
use App\Entity\Building;
|
||||||
|
use App\Entity\MerchandiseType;
|
||||||
|
use App\Entity\PelletType;
|
||||||
|
use App\Entity\ReceptionType;
|
||||||
|
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||||
|
use Doctrine\Persistence\ObjectManager;
|
||||||
|
|
||||||
|
class ReferenceFixtures extends Fixture
|
||||||
|
{
|
||||||
|
public function load(ObjectManager $manager): void
|
||||||
|
{
|
||||||
|
$merchandiseTypes = [
|
||||||
|
['label' => 'Foin', 'code' => 'FOIN'],
|
||||||
|
['label' => 'Paille', 'code' => 'PAILLE'],
|
||||||
|
['label' => 'Granule', 'code' => 'GRANULE'],
|
||||||
|
];
|
||||||
|
foreach ($merchandiseTypes as $type) {
|
||||||
|
$merchandiseType = new MerchandiseType()
|
||||||
|
->setLabel($type['label'])
|
||||||
|
->setCode($type['code'])
|
||||||
|
;
|
||||||
|
$manager->persist($merchandiseType);
|
||||||
|
}
|
||||||
|
|
||||||
|
$pelletTypes = [
|
||||||
|
['label' => 'JB croissance', 'code' => 'K750'],
|
||||||
|
['label' => 'Genisse herbe', 'code' => 'K500'],
|
||||||
|
['label' => 'Bovistart melasse ferme', 'code' => 'K130'],
|
||||||
|
['label' => 'Bovin mise en forme', 'code' => 'K400'],
|
||||||
|
];
|
||||||
|
foreach ($pelletTypes as $type) {
|
||||||
|
$pelletType = new PelletType()
|
||||||
|
->setLabel($type['label'])
|
||||||
|
->setCode($type['code'])
|
||||||
|
;
|
||||||
|
$manager->persist($pelletType);
|
||||||
|
}
|
||||||
|
|
||||||
|
$buildings = [
|
||||||
|
['label' => 'Bâtiment 1', 'code' => 'B1'],
|
||||||
|
['label' => 'Bâtiment 2', 'code' => 'B2'],
|
||||||
|
['label' => 'Bâtiment 3', 'code' => 'B3'],
|
||||||
|
];
|
||||||
|
foreach ($buildings as $buildingData) {
|
||||||
|
$building = new Building()
|
||||||
|
->setLabel($buildingData['label'])
|
||||||
|
->setCode($buildingData['code'])
|
||||||
|
;
|
||||||
|
$manager->persist($building);
|
||||||
|
}
|
||||||
|
|
||||||
|
$receptionTypes = [
|
||||||
|
['label' => 'Marchandises', 'code' => 'MARCHANDISES'],
|
||||||
|
['label' => 'Bovins', 'code' => 'BOVINS'],
|
||||||
|
];
|
||||||
|
foreach ($receptionTypes as $type) {
|
||||||
|
$receptionType = new ReceptionType()
|
||||||
|
->setLabel($type['label'])
|
||||||
|
->setCode($type['code'])
|
||||||
|
;
|
||||||
|
$manager->persist($receptionType);
|
||||||
|
}
|
||||||
|
|
||||||
|
$manager->flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\DataFixtures;
|
||||||
|
|
||||||
|
use App\Entity\Address;
|
||||||
|
use App\Entity\Supplier;
|
||||||
|
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||||
|
use Doctrine\Persistence\ObjectManager;
|
||||||
|
|
||||||
|
class SupplierFixtures extends Fixture
|
||||||
|
{
|
||||||
|
public function load(ObjectManager $manager): void
|
||||||
|
{
|
||||||
|
$address = new Address()
|
||||||
|
->setLabel('LIOT CHATELLERAULT')
|
||||||
|
->setStreet("14 Allée d'Argenson")
|
||||||
|
->setStreet2('ZI Nord')
|
||||||
|
->setPostalCode('86100')
|
||||||
|
->setCity('CHATELLERAULT')
|
||||||
|
->setCountryCode('FR')
|
||||||
|
;
|
||||||
|
|
||||||
|
$supplier = new Supplier()
|
||||||
|
->setName('LIOT')
|
||||||
|
->setEmail('lpc.contacts@lpc-liot.fr')
|
||||||
|
->setPhone('05.49.20.09.10')
|
||||||
|
;
|
||||||
|
|
||||||
|
$supplier->getAddresses()->add($address);
|
||||||
|
|
||||||
|
$manager->persist($address);
|
||||||
|
$manager->persist($supplier);
|
||||||
|
|
||||||
|
$manager->flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\DataFixtures;
|
||||||
|
|
||||||
|
use App\Entity\Carrier;
|
||||||
|
use App\Entity\Driver;
|
||||||
|
use App\Entity\Truck;
|
||||||
|
use App\Entity\Vehicle;
|
||||||
|
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||||
|
use Doctrine\Persistence\ObjectManager;
|
||||||
|
|
||||||
|
class TransportFixtures extends Fixture
|
||||||
|
{
|
||||||
|
public function load(ObjectManager $manager): void
|
||||||
|
{
|
||||||
|
$citerne = new Truck()->setName('Citerne');
|
||||||
|
$porteur = new Truck()->setName('Porteur');
|
||||||
|
|
||||||
|
$manager->persist($citerne);
|
||||||
|
$manager->persist($porteur);
|
||||||
|
|
||||||
|
$liot = new Carrier()
|
||||||
|
->setName('LIOT')
|
||||||
|
->setCode('LIOT')
|
||||||
|
;
|
||||||
|
$luiMeme = new Carrier()
|
||||||
|
->setName('LUI-MEME')
|
||||||
|
->setCode('LUI-MEME')
|
||||||
|
;
|
||||||
|
|
||||||
|
$manager->persist($liot);
|
||||||
|
$manager->persist($luiMeme);
|
||||||
|
|
||||||
|
$drivers = ['Eddy', 'Jean-Christophe', 'Etienne', 'Hersand'];
|
||||||
|
foreach ($drivers as $name) {
|
||||||
|
$driver = new Driver()
|
||||||
|
->setName($name)
|
||||||
|
->setCarrier($liot)
|
||||||
|
;
|
||||||
|
$manager->persist($driver);
|
||||||
|
}
|
||||||
|
|
||||||
|
$citerneVehicle = new Vehicle()
|
||||||
|
->setPlate('GH-684-VZ')
|
||||||
|
->setCarrier($liot)
|
||||||
|
->setTruck($citerne)
|
||||||
|
;
|
||||||
|
$manager->persist($citerneVehicle);
|
||||||
|
|
||||||
|
$porteurPlates = ['FW-363-EC', 'FW-370-EC', 'FW-375-EC', 'FY-952-HS'];
|
||||||
|
foreach ($porteurPlates as $plate) {
|
||||||
|
$vehicle = new Vehicle()
|
||||||
|
->setPlate($plate)
|
||||||
|
->setCarrier($liot)
|
||||||
|
->setTruck($porteur)
|
||||||
|
;
|
||||||
|
$manager->persist($vehicle);
|
||||||
|
}
|
||||||
|
|
||||||
|
$manager->flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\DataFixtures;
|
||||||
|
|
||||||
|
use App\Entity\User;
|
||||||
|
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||||
|
use Doctrine\Persistence\ObjectManager;
|
||||||
|
|
||||||
|
class UserFixtures extends Fixture
|
||||||
|
{
|
||||||
|
public function load(ObjectManager $manager): void
|
||||||
|
{
|
||||||
|
$admin = new User()
|
||||||
|
->setUsername('admin')
|
||||||
|
->setRoles(['ROLE_ADMIN'])
|
||||||
|
;
|
||||||
|
|
||||||
|
$admin->setPassword(
|
||||||
|
'$2y$13$ZuB4LRD1i5Arc34CEO54FeUyQaIf3jamLf6caFK9v8TBMA5RcmIke'
|
||||||
|
);
|
||||||
|
|
||||||
|
$manager->persist($admin);
|
||||||
|
$manager->flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,168 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
|
use Doctrine\Common\Collections\Collection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ORM\Table(name: 'address')]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['address:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['address:read']],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class Address
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['address:read', 'supplier:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 120)]
|
||||||
|
#[Groups(['address:read', 'supplier:read', 'reception:read'])]
|
||||||
|
private string $label = '';
|
||||||
|
|
||||||
|
#[ORM\Column(length: 180)]
|
||||||
|
#[Groups(['address:read', 'supplier:read', 'reception:read'])]
|
||||||
|
private string $street = '';
|
||||||
|
|
||||||
|
#[ORM\Column(name: 'street2', length: 180, nullable: true)]
|
||||||
|
#[Groups(['address:read', 'supplier:read', 'reception:read'])]
|
||||||
|
private ?string $street2 = null;
|
||||||
|
|
||||||
|
#[ORM\Column(name: 'postal_code', length: 20)]
|
||||||
|
#[Groups(['address:read', 'supplier:read', 'reception:read'])]
|
||||||
|
private string $postalCode = '';
|
||||||
|
|
||||||
|
#[ORM\Column(length: 120)]
|
||||||
|
#[Groups(['address:read', 'supplier:read', 'reception:read'])]
|
||||||
|
private string $city = '';
|
||||||
|
|
||||||
|
#[ORM\Column(name: 'country_code', length: 2)]
|
||||||
|
#[Groups(['address:read', 'supplier:read'])]
|
||||||
|
private string $countryCode = '';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, Supplier>
|
||||||
|
*/
|
||||||
|
#[ORM\ManyToMany(targetEntity: Supplier::class, mappedBy: 'addresses')]
|
||||||
|
private Collection $suppliers;
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->suppliers = new ArrayCollection();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getLabel(): string
|
||||||
|
{
|
||||||
|
return $this->label;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setLabel(string $label): self
|
||||||
|
{
|
||||||
|
$this->label = $label;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getStreet(): string
|
||||||
|
{
|
||||||
|
return $this->street;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setStreet(string $street): self
|
||||||
|
{
|
||||||
|
$this->street = $street;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getStreet2(): ?string
|
||||||
|
{
|
||||||
|
return $this->street2;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setStreet2(?string $street2): self
|
||||||
|
{
|
||||||
|
$this->street2 = $street2;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getPostalCode(): string
|
||||||
|
{
|
||||||
|
return $this->postalCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setPostalCode(string $postalCode): self
|
||||||
|
{
|
||||||
|
$this->postalCode = $postalCode;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCity(): string
|
||||||
|
{
|
||||||
|
return $this->city;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCity(string $city): self
|
||||||
|
{
|
||||||
|
$this->city = $city;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCountryCode(): string
|
||||||
|
{
|
||||||
|
return $this->countryCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCountryCode(string $countryCode): self
|
||||||
|
{
|
||||||
|
$this->countryCode = $countryCode;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[Groups(['address:read', 'supplier:read', 'reception:read'])]
|
||||||
|
public function getFullAddress(): string
|
||||||
|
{
|
||||||
|
$parts = array_filter([
|
||||||
|
$this->street,
|
||||||
|
$this->street2,
|
||||||
|
trim(sprintf('%s %s', $this->postalCode, $this->city)),
|
||||||
|
]);
|
||||||
|
|
||||||
|
return implode(', ', $parts);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, Supplier>
|
||||||
|
*/
|
||||||
|
public function getSuppliers(): Collection
|
||||||
|
{
|
||||||
|
return $this->suppliers;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
|
use Doctrine\Common\Collections\Collection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ORM\Table(name: 'building')]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['building:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['building:read']],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class Building
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['building:read', 'reception:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 120)]
|
||||||
|
#[Groups(['building:read', 'reception:read'])]
|
||||||
|
private string $label = '';
|
||||||
|
|
||||||
|
#[ORM\Column(length: 50)]
|
||||||
|
#[Groups(['building:read', 'reception:read'])]
|
||||||
|
private string $code = '';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, Reception>
|
||||||
|
*/
|
||||||
|
#[ORM\ManyToMany(targetEntity: Reception::class, mappedBy: 'buildings')]
|
||||||
|
private Collection $receptions;
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->receptions = new ArrayCollection();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getLabel(): string
|
||||||
|
{
|
||||||
|
return $this->label;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setLabel(string $label): self
|
||||||
|
{
|
||||||
|
$this->label = $label;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCode(): string
|
||||||
|
{
|
||||||
|
return $this->code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCode(string $code): self
|
||||||
|
{
|
||||||
|
$this->code = $code;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, Reception>
|
||||||
|
*/
|
||||||
|
public function getReceptions(): Collection
|
||||||
|
{
|
||||||
|
return $this->receptions;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ORM\Table(name: 'carrier')]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['carrier:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['carrier:read']],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class Carrier
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 180)]
|
||||||
|
#[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read'])]
|
||||||
|
private string $name = '';
|
||||||
|
|
||||||
|
#[ORM\Column(length: 30, nullable: true)]
|
||||||
|
#[Groups(['carrier:read', 'driver:read', 'vehicle:read', 'reception:read'])]
|
||||||
|
private ?string $code = null;
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getName(): string
|
||||||
|
{
|
||||||
|
return $this->name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setName(string $name): self
|
||||||
|
{
|
||||||
|
$this->name = $name;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCode(): ?string
|
||||||
|
{
|
||||||
|
return $this->code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCode(?string $code): self
|
||||||
|
{
|
||||||
|
$this->code = $code;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiProperty;
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ORM\Table(name: 'driver')]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['driver:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['driver:read']],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class Driver
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['driver:read', 'reception:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 180)]
|
||||||
|
#[Groups(['driver:read', 'reception:read'])]
|
||||||
|
private string $name = '';
|
||||||
|
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
#[Groups(['driver:read'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private ?Carrier $carrier = null;
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getName(): string
|
||||||
|
{
|
||||||
|
return $this->name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setName(string $name): self
|
||||||
|
{
|
||||||
|
$this->name = $name;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCarrier(): ?Carrier
|
||||||
|
{
|
||||||
|
return $this->carrier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCarrier(?Carrier $carrier): self
|
||||||
|
{
|
||||||
|
$this->carrier = $carrier;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
|
use Doctrine\Common\Collections\Collection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ORM\Table(name: 'merchandise_type')]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['merchandise-type:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['merchandise-type:read']],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class MerchandiseType
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['reception:read', 'merchandise-type:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 120)]
|
||||||
|
#[Groups(['reception:read', 'merchandise-type:read'])]
|
||||||
|
private string $label = '';
|
||||||
|
|
||||||
|
#[ORM\Column(length: 50)]
|
||||||
|
#[Groups(['reception:read', 'merchandise-type:read'])]
|
||||||
|
private string $code = '';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, Reception>
|
||||||
|
*/
|
||||||
|
#[ORM\OneToMany(mappedBy: 'merchandiseType', targetEntity: Reception::class)]
|
||||||
|
private Collection $receptions;
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->receptions = new ArrayCollection();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getLabel(): string
|
||||||
|
{
|
||||||
|
return $this->label;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setLabel(string $label): self
|
||||||
|
{
|
||||||
|
$this->label = $label;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCode(): string
|
||||||
|
{
|
||||||
|
return $this->code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCode(string $code): self
|
||||||
|
{
|
||||||
|
$this->code = $code;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, Reception>
|
||||||
|
*/
|
||||||
|
public function getReceptions(): Collection
|
||||||
|
{
|
||||||
|
return $this->receptions;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ORM\Table(name: 'pellet_type')]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['pellet-type:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['pellet-type:read']],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class PelletType
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['pellet-type:read', 'reception:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 120)]
|
||||||
|
#[Groups(['pellet-type:read', 'reception:read'])]
|
||||||
|
private string $label = '';
|
||||||
|
|
||||||
|
#[ORM\Column(length: 50)]
|
||||||
|
#[Groups(['pellet-type:read', 'reception:read'])]
|
||||||
|
private string $code = '';
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getLabel(): string
|
||||||
|
{
|
||||||
|
return $this->label;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setLabel(string $label): self
|
||||||
|
{
|
||||||
|
$this->label = $label;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCode(): string
|
||||||
|
{
|
||||||
|
return $this->code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCode(string $code): self
|
||||||
|
{
|
||||||
|
$this->code = $code;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,6 +4,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Entity;
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiProperty;
|
||||||
use ApiPlatform\Metadata\ApiResource;
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
use ApiPlatform\Metadata\Get;
|
use ApiPlatform\Metadata\Get;
|
||||||
use ApiPlatform\Metadata\GetCollection;
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
@@ -16,6 +17,7 @@ use App\State\ReceptionWeighingProvider;
|
|||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\Common\Collections\ArrayCollection;
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
use Doctrine\Common\Collections\Collection;
|
use Doctrine\Common\Collections\Collection;
|
||||||
|
use Doctrine\ORM\Event\PostPersistEventArgs;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Symfony\Component\Serializer\Attribute\Context;
|
use Symfony\Component\Serializer\Attribute\Context;
|
||||||
use Symfony\Component\Serializer\Attribute\Groups;
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
@@ -77,6 +79,10 @@ class Reception
|
|||||||
#[Groups(['reception:read', 'reception:write'])]
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
private ?string $licensePlate = null;
|
private ?string $licensePlate = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 20, unique: true, nullable: true)]
|
||||||
|
#[Groups(['reception:read'])]
|
||||||
|
private ?string $identificationNumber = null;
|
||||||
|
|
||||||
#[ORM\Column(options: ['default' => 0])]
|
#[ORM\Column(options: ['default' => 0])]
|
||||||
#[Groups(['reception:read', 'reception:write'])]
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
private int $currentStep = 0;
|
private int $currentStep = 0;
|
||||||
@@ -90,15 +96,85 @@ class Reception
|
|||||||
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
||||||
private ?DateTimeImmutable $receptionDate = null;
|
private ?DateTimeImmutable $receptionDate = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 255, nullable: true)]
|
||||||
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
|
private ?string $merchandiseDetail = null;
|
||||||
|
|
||||||
#[ORM\OneToMany(targetEntity: Weight::class, mappedBy: 'reception', cascade: ['persist', 'remove'], orphanRemoval: true)]
|
#[ORM\OneToMany(targetEntity: Weight::class, mappedBy: 'reception', cascade: ['persist', 'remove'], orphanRemoval: true)]
|
||||||
#[Groups(['reception:read'])]
|
#[Groups(['reception:read'])]
|
||||||
private Collection $weights;
|
private Collection $weights;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'receptions')]
|
||||||
|
#[ORM\JoinColumn(nullable: true)]
|
||||||
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private ?ReceptionType $receptionType = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'receptions')]
|
||||||
|
#[ORM\JoinColumn(nullable: true)]
|
||||||
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private ?MerchandiseType $merchandiseType = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, Building>
|
||||||
|
*/
|
||||||
|
#[ORM\ManyToMany(targetEntity: Building::class, inversedBy: 'receptions')]
|
||||||
|
#[ORM\JoinTable(name: 'reception_building')]
|
||||||
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private Collection $buildings;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, ReceptionPelletBuilding>
|
||||||
|
*/
|
||||||
|
#[ORM\OneToMany(targetEntity: ReceptionPelletBuilding::class, mappedBy: 'reception', cascade: ['persist', 'remove'], orphanRemoval: true)]
|
||||||
|
#[Groups(['reception:read'])]
|
||||||
|
private Collection $pelletBuildings;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
#[ORM\JoinColumn(nullable: true)]
|
||||||
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private ?User $user = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
#[ORM\JoinColumn(nullable: true)]
|
||||||
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private ?Supplier $supplier = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
#[ORM\JoinColumn(nullable: true)]
|
||||||
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private ?Address $address = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
#[ORM\JoinColumn(nullable: true)]
|
||||||
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private ?Truck $truck = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
#[ORM\JoinColumn(nullable: true)]
|
||||||
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private ?Carrier $carrier = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
#[ORM\JoinColumn(nullable: true)]
|
||||||
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private ?Driver $driver = null;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
?DateTimeImmutable $receptionDate = null,
|
?DateTimeImmutable $receptionDate = null,
|
||||||
) {
|
) {
|
||||||
$this->receptionDate = $receptionDate;
|
$this->receptionDate = $receptionDate;
|
||||||
$this->weights = new ArrayCollection();
|
$this->weights = new ArrayCollection();
|
||||||
|
$this->buildings = new ArrayCollection();
|
||||||
|
$this->pelletBuildings = new ArrayCollection();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getId(): ?int
|
public function getId(): ?int
|
||||||
@@ -112,6 +188,18 @@ class Reception
|
|||||||
return $this->licensePlate;
|
return $this->licensePlate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getIdentificationNumber(): ?string
|
||||||
|
{
|
||||||
|
return $this->identificationNumber;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setIdentificationNumber(?string $identificationNumber): self
|
||||||
|
{
|
||||||
|
$this->identificationNumber = $identificationNumber;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
public function setLicensePlate(?string $licensePlate): self
|
public function setLicensePlate(?string $licensePlate): self
|
||||||
{
|
{
|
||||||
$this->licensePlate = $licensePlate;
|
$this->licensePlate = $licensePlate;
|
||||||
@@ -158,6 +246,18 @@ class Reception
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getMerchandiseDetail(): ?string
|
||||||
|
{
|
||||||
|
return $this->merchandiseDetail;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setMerchandiseDetail(?string $merchandiseDetail): self
|
||||||
|
{
|
||||||
|
$this->merchandiseDetail = $merchandiseDetail;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Collection<int, Weight>
|
* @return Collection<int, Weight>
|
||||||
*/
|
*/
|
||||||
@@ -166,6 +266,155 @@ class Reception
|
|||||||
return $this->weights;
|
return $this->weights;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getReceptionType(): ?ReceptionType
|
||||||
|
{
|
||||||
|
return $this->receptionType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setReceptionType(?ReceptionType $receptionType): self
|
||||||
|
{
|
||||||
|
$this->receptionType = $receptionType;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getMerchandiseType(): ?MerchandiseType
|
||||||
|
{
|
||||||
|
return $this->merchandiseType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setMerchandiseType(?MerchandiseType $merchandiseType): self
|
||||||
|
{
|
||||||
|
$this->merchandiseType = $merchandiseType;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, Building>
|
||||||
|
*/
|
||||||
|
public function getBuildings(): Collection
|
||||||
|
{
|
||||||
|
return $this->buildings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addBuilding(Building $building): self
|
||||||
|
{
|
||||||
|
if (!$this->buildings->contains($building)) {
|
||||||
|
$this->buildings->add($building);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function removeBuilding(Building $building): self
|
||||||
|
{
|
||||||
|
$this->buildings->removeElement($building);
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, ReceptionPelletBuilding>
|
||||||
|
*/
|
||||||
|
public function getPelletBuildings(): Collection
|
||||||
|
{
|
||||||
|
return $this->pelletBuildings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addPelletBuilding(ReceptionPelletBuilding $pelletBuilding): self
|
||||||
|
{
|
||||||
|
if (!$this->pelletBuildings->contains($pelletBuilding)) {
|
||||||
|
$this->pelletBuildings->add($pelletBuilding);
|
||||||
|
$pelletBuilding->setReception($this);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function removePelletBuilding(ReceptionPelletBuilding $pelletBuilding): self
|
||||||
|
{
|
||||||
|
if ($this->pelletBuildings->removeElement($pelletBuilding)) {
|
||||||
|
if ($pelletBuilding->getReception() === $this) {
|
||||||
|
$pelletBuilding->setReception(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getUser(): ?User
|
||||||
|
{
|
||||||
|
return $this->user;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setUser(?User $user): self
|
||||||
|
{
|
||||||
|
$this->user = $user;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getSupplier(): ?Supplier
|
||||||
|
{
|
||||||
|
return $this->supplier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setSupplier(?Supplier $supplier): self
|
||||||
|
{
|
||||||
|
$this->supplier = $supplier;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getAddress(): ?Address
|
||||||
|
{
|
||||||
|
return $this->address;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setAddress(?Address $address): self
|
||||||
|
{
|
||||||
|
$this->address = $address;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getTruck(): ?Truck
|
||||||
|
{
|
||||||
|
return $this->truck;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setTruck(?Truck $truck): self
|
||||||
|
{
|
||||||
|
$this->truck = $truck;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCarrier(): ?Carrier
|
||||||
|
{
|
||||||
|
return $this->carrier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCarrier(?Carrier $carrier): self
|
||||||
|
{
|
||||||
|
$this->carrier = $carrier;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getDriver(): ?Driver
|
||||||
|
{
|
||||||
|
return $this->driver;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setDriver(?Driver $driver): self
|
||||||
|
{
|
||||||
|
$this->driver = $driver;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
public function addWeight(Weight $weight): self
|
public function addWeight(Weight $weight): self
|
||||||
{
|
{
|
||||||
if (!$this->weights->contains($weight)) {
|
if (!$this->weights->contains($weight)) {
|
||||||
@@ -194,4 +443,30 @@ class Reception
|
|||||||
$this->receptionDate = new DateTimeImmutable();
|
$this->receptionDate = new DateTimeImmutable();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[ORM\PostPersist]
|
||||||
|
public function initializeIdentificationNumber(PostPersistEventArgs $args): void
|
||||||
|
{
|
||||||
|
if (null !== $this->identificationNumber) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (null === $this->id) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$number = sprintf('P-BR-%04d', $this->id);
|
||||||
|
$this->identificationNumber = $number;
|
||||||
|
|
||||||
|
$args->getObjectManager()
|
||||||
|
->getConnection()
|
||||||
|
->executeStatement(
|
||||||
|
'UPDATE reception SET identification_number = :number WHERE id = :id',
|
||||||
|
[
|
||||||
|
'number' => $number,
|
||||||
|
'id' => $this->id,
|
||||||
|
]
|
||||||
|
)
|
||||||
|
;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,101 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
|
||||||
|
use ApiPlatform\Metadata\ApiFilter;
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Delete;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use ApiPlatform\Metadata\Post;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ORM\Table(name: 'reception_pellet_building')]
|
||||||
|
#[ORM\UniqueConstraint(name: 'uniq_reception_pellet_building', columns: ['reception_id', 'pellet_type_id', 'building_id'])]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['reception-pellet-building:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['reception-pellet-building:read']],
|
||||||
|
),
|
||||||
|
new Post(
|
||||||
|
normalizationContext: ['groups' => ['reception-pellet-building:read']],
|
||||||
|
denormalizationContext: ['groups' => ['reception-pellet-building:write']],
|
||||||
|
),
|
||||||
|
new Delete(),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
#[ApiFilter(SearchFilter::class, properties: ['reception' => 'exact'])]
|
||||||
|
class ReceptionPelletBuilding
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['reception-pellet-building:read', 'reception:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'pelletBuildings')]
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
#[Groups(['reception-pellet-building:read', 'reception-pellet-building:write'])]
|
||||||
|
private ?Reception $reception = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
#[Groups(['reception-pellet-building:read', 'reception-pellet-building:write', 'reception:read'])]
|
||||||
|
private ?PelletType $pelletType = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
#[Groups(['reception-pellet-building:read', 'reception-pellet-building:write', 'reception:read'])]
|
||||||
|
private ?Building $building = null;
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getReception(): ?Reception
|
||||||
|
{
|
||||||
|
return $this->reception;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setReception(?Reception $reception): self
|
||||||
|
{
|
||||||
|
$this->reception = $reception;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getPelletType(): ?PelletType
|
||||||
|
{
|
||||||
|
return $this->pelletType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setPelletType(?PelletType $pelletType): self
|
||||||
|
{
|
||||||
|
$this->pelletType = $pelletType;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getBuilding(): ?Building
|
||||||
|
{
|
||||||
|
return $this->building;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setBuilding(?Building $building): self
|
||||||
|
{
|
||||||
|
$this->building = $building;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
|
use Doctrine\Common\Collections\Collection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ORM\Table(name: 'reception_type')]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['reception-type:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['reception-type:read']],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class ReceptionType
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['reception:read', 'reception-type:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(name: 'label', length: 120)]
|
||||||
|
#[Groups(['reception:read', 'reception-type:read'])]
|
||||||
|
private string $label = '';
|
||||||
|
|
||||||
|
#[ORM\Column(length: 50)]
|
||||||
|
#[Groups(['reception:read', 'reception-type:read'])]
|
||||||
|
private string $code = '';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, Reception>
|
||||||
|
*/
|
||||||
|
#[ORM\OneToMany(mappedBy: 'receptionType', targetEntity: Reception::class)]
|
||||||
|
private Collection $receptions;
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->receptions = new ArrayCollection();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getLabel(): string
|
||||||
|
{
|
||||||
|
return $this->label;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setLabel(string $label): self
|
||||||
|
{
|
||||||
|
$this->label = $label;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCode(): string
|
||||||
|
{
|
||||||
|
return $this->code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCode(string $code): self
|
||||||
|
{
|
||||||
|
$this->code = $code;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, Reception>
|
||||||
|
*/
|
||||||
|
public function getReceptions(): Collection
|
||||||
|
{
|
||||||
|
return $this->receptions;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,112 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiProperty;
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
|
use Doctrine\Common\Collections\Collection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ORM\Table(name: 'supplier')]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['supplier:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['supplier:read']],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class Supplier
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['supplier:read', 'reception:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 180)]
|
||||||
|
#[Groups(['supplier:read', 'reception:read'])]
|
||||||
|
private string $name = '';
|
||||||
|
|
||||||
|
#[ORM\Column(length: 180, nullable: true)]
|
||||||
|
#[Groups(['supplier:read', 'reception:read'])]
|
||||||
|
private ?string $email = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 40, nullable: true)]
|
||||||
|
#[Groups(['supplier:read', 'reception:read'])]
|
||||||
|
private ?string $phone = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, Address>
|
||||||
|
*/
|
||||||
|
#[ORM\ManyToMany(targetEntity: Address::class, inversedBy: 'suppliers')]
|
||||||
|
#[ORM\JoinTable(name: 'supplier_address')]
|
||||||
|
#[Groups(['supplier:read'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private Collection $addresses;
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->addresses = new ArrayCollection();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getName(): string
|
||||||
|
{
|
||||||
|
return $this->name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setName(string $name): self
|
||||||
|
{
|
||||||
|
$this->name = $name;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getEmail(): ?string
|
||||||
|
{
|
||||||
|
return $this->email;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setEmail(?string $email): self
|
||||||
|
{
|
||||||
|
$this->email = $email;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getPhone(): ?string
|
||||||
|
{
|
||||||
|
return $this->phone;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setPhone(?string $phone): self
|
||||||
|
{
|
||||||
|
$this->phone = $phone;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, Address>
|
||||||
|
*/
|
||||||
|
public function getAddresses(): Collection
|
||||||
|
{
|
||||||
|
return $this->addresses;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ORM\Table(name: 'truck')]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['truck:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['truck:read']],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class Truck
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['truck:read', 'vehicle:read', 'reception:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 180)]
|
||||||
|
#[Groups(['truck:read', 'vehicle:read', 'reception:read'])]
|
||||||
|
private string $name = '';
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getName(): string
|
||||||
|
{
|
||||||
|
return $this->name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setName(string $name): self
|
||||||
|
{
|
||||||
|
$this->name = $name;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
+7
-1
@@ -23,6 +23,11 @@ use Symfony\Component\Serializer\Attribute\Groups;
|
|||||||
security: "is_granted('ROLE_USER')",
|
security: "is_granted('ROLE_USER')",
|
||||||
provider: MeProvider::class
|
provider: MeProvider::class
|
||||||
),
|
),
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['user:read']],
|
||||||
|
security: "is_granted('ROLE_USER')"
|
||||||
|
),
|
||||||
new GetCollection(
|
new GetCollection(
|
||||||
normalizationContext: ['groups' => ['user:read']],
|
normalizationContext: ['groups' => ['user:read']],
|
||||||
security: "is_granted('PUBLIC_ACCESS')"
|
security: "is_granted('PUBLIC_ACCESS')"
|
||||||
@@ -36,10 +41,11 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
|
|||||||
#[ORM\Id]
|
#[ORM\Id]
|
||||||
#[ORM\GeneratedValue]
|
#[ORM\GeneratedValue]
|
||||||
#[ORM\Column(type: 'integer')]
|
#[ORM\Column(type: 'integer')]
|
||||||
|
#[Groups(['user:read', 'reception:read'])]
|
||||||
private ?int $id = null;
|
private ?int $id = null;
|
||||||
|
|
||||||
#[ORM\Column(length: 180, unique: true)]
|
#[ORM\Column(length: 180, unique: true)]
|
||||||
#[Groups(['user:read'])]
|
#[Groups(['user:read', 'reception:read'])]
|
||||||
private string $username = '';
|
private string $username = '';
|
||||||
|
|
||||||
#[ORM\Column(type: 'json')]
|
#[ORM\Column(type: 'json')]
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiProperty;
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ORM\Table(name: 'vehicle')]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['vehicle:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['vehicle:read']],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class Vehicle
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['vehicle:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 20)]
|
||||||
|
#[Groups(['vehicle:read'])]
|
||||||
|
private string $plate = '';
|
||||||
|
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
#[Groups(['vehicle:read'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private ?Carrier $carrier = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
#[Groups(['vehicle:read'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private ?Truck $truck = null;
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getPlate(): string
|
||||||
|
{
|
||||||
|
return $this->plate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setPlate(string $plate): self
|
||||||
|
{
|
||||||
|
$this->plate = $plate;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCarrier(): ?Carrier
|
||||||
|
{
|
||||||
|
return $this->carrier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCarrier(?Carrier $carrier): self
|
||||||
|
{
|
||||||
|
$this->carrier = $carrier;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getTruck(): ?Truck
|
||||||
|
{
|
||||||
|
return $this->truck;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setTruck(?Truck $truck): self
|
||||||
|
{
|
||||||
|
$this->truck = $truck;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -36,6 +36,18 @@
|
|||||||
"src/Repository/.gitignore"
|
"src/Repository/.gitignore"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"doctrine/doctrine-fixtures-bundle": {
|
||||||
|
"version": "4.3",
|
||||||
|
"recipe": {
|
||||||
|
"repo": "github.com/symfony/recipes",
|
||||||
|
"branch": "main",
|
||||||
|
"version": "3.0",
|
||||||
|
"ref": "1f5514cfa15b947298df4d771e694e578d4c204d"
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"src/DataFixtures/AppFixtures.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
"doctrine/doctrine-migrations-bundle": {
|
"doctrine/doctrine-migrations-bundle": {
|
||||||
"version": "4.0",
|
"version": "4.0",
|
||||||
"recipe": {
|
"recipe": {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
@page { margin: 56px 56px; }
|
@page { margin: 56px 56px; }
|
||||||
|
|
||||||
body{
|
body{
|
||||||
font-family: Arial, sans-serif;
|
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
margin:0;
|
margin:0;
|
||||||
color:#000;
|
color:#000;
|
||||||
@@ -16,19 +16,17 @@
|
|||||||
p{ margin:0; }
|
p{ margin:0; }
|
||||||
em{ font-style: normal; }
|
em{ font-style: normal; }
|
||||||
|
|
||||||
.red{ color:red; }
|
|
||||||
|
|
||||||
.company-block{
|
.company-block{
|
||||||
font-size:13px;
|
font-size:14px;
|
||||||
text-align:left;
|
text-align:left;
|
||||||
line-height:1.25;
|
line-height:1.3;
|
||||||
}
|
}
|
||||||
|
|
||||||
.box{
|
.box{
|
||||||
border:1px solid #000;
|
border:1px solid #000;
|
||||||
border-radius:10px;
|
border-radius:10px;
|
||||||
padding:10px;
|
padding:10px;
|
||||||
font-size:13px;
|
font-size:16px;
|
||||||
height: 80px;
|
height: 80px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,56 +34,87 @@
|
|||||||
text-align:center;
|
text-align:center;
|
||||||
font-size: 18pt;
|
font-size: 18pt;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
margin: 0 0 4mm 0;
|
margin: 64px 0 20px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.info-table {
|
||||||
|
margin-bottom: 32px;
|
||||||
|
width:100%;
|
||||||
|
border-collapse:collapse;
|
||||||
|
table-layout:fixed;
|
||||||
|
}
|
||||||
|
|
||||||
|
.info-table th {
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
table{
|
||||||
|
width:100%;
|
||||||
|
border-collapse: collapse;
|
||||||
}
|
}
|
||||||
|
|
||||||
table{ width:100%; border-collapse: collapse; }
|
|
||||||
th, td{
|
th, td{
|
||||||
border:1px solid #333;
|
border:1px solid #333;
|
||||||
padding:4px 6px;
|
padding:4px 6px;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
font-size: 9pt;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
th{ text-align:center; font-weight:700; }
|
th{ text-align:center; font-weight:700; }
|
||||||
|
|
||||||
/* tables de layout (sans bordures) */
|
|
||||||
.layout, .layout td{ border:none !important; padding:0; }
|
.layout, .layout td{ border:none !important; padding:0; }
|
||||||
|
|
||||||
/* GRAND TABLEAU : verrouillage dompdf */
|
.bigtable-wrap{
|
||||||
.bigtable{ table-layout: fixed; }
|
border: 1px solid #000;
|
||||||
|
height: 425px;
|
||||||
/* ligne “filler” pour forcer la hauteur comme l'exemple */
|
margin-bottom: 10px;
|
||||||
.fill td{
|
|
||||||
border-top:none;
|
|
||||||
height: 75mm; /* ajuste si besoin */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Bloc IDTF comme l’exemple */
|
.bigtable{
|
||||||
table.idtf{
|
width: 100%;
|
||||||
width: 350px; /* ou 100% si tu préfères */
|
height: 100%;
|
||||||
|
border: none;
|
||||||
border-collapse: collapse;
|
border-collapse: collapse;
|
||||||
border: 1px solid #333 !important; /* bordure extérieure */
|
|
||||||
margin-top: 12px; /* ~3mm */
|
|
||||||
font-size: 8.5pt;
|
|
||||||
table-layout: fixed;
|
table-layout: fixed;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* IMPORTANT: on cible td DANS table.idtf et on force */
|
.bigtable th,
|
||||||
table.idtf td{
|
.bigtable td{
|
||||||
border: 1px solid #333 !important;
|
font-size: 16px;
|
||||||
padding: 3px 5px;
|
border: 1px solid #333;
|
||||||
vertical-align: top;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Largeurs en % (pas de mm) */
|
.bigtable thead th{ border-top: 0; }
|
||||||
table.idtf td.n{ width: 8%; text-align:center; }
|
.bigtable tbody tr:last-child td{ border-bottom: 0; }
|
||||||
table.idtf td.prod{ width: 52%; }
|
|
||||||
table.idtf td.net{ width: 20%; }
|
|
||||||
table.idtf td.date{ width: 20%; }
|
|
||||||
|
|
||||||
.signature-title{ font-size:9pt; margin-bottom:2mm; }
|
.bigtable tr th:first-child,
|
||||||
.signature-box{ height: 22mm; margin-bottom: 4mm; }
|
.bigtable tr td:first-child{ border-left: 0; }
|
||||||
.meta{ font-size: 9pt; line-height: 1.35; }
|
|
||||||
|
.bigtable tr th:last-child,
|
||||||
|
.bigtable tr td:last-child{ border-right: 0; }
|
||||||
|
|
||||||
|
.bigtable thead th{ border-bottom: 0; }
|
||||||
|
.bigtable tbody tr:first-child td{ border-top: 1px solid #333; }
|
||||||
|
|
||||||
|
.bigtable-notes{
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 1.25;
|
||||||
|
}
|
||||||
|
|
||||||
|
.border-bottom {
|
||||||
|
border-bottom: 1px solid #000;
|
||||||
|
}
|
||||||
|
|
||||||
|
.footer-block{ page-break-inside: avoid; }
|
||||||
|
|
||||||
|
.signature-box {
|
||||||
|
height: 22mm;
|
||||||
|
margin-bottom: 4mm;
|
||||||
|
border: 0.5px solid #000;
|
||||||
|
|
||||||
|
padding: 6px 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.meta{ font-size: 16px; line-height: 1.35; }
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
@@ -95,33 +124,26 @@
|
|||||||
<table class="layout" style="width:100%;">
|
<table class="layout" style="width:100%;">
|
||||||
<tr>
|
<tr>
|
||||||
<td style="width:70%; vertical-align:top;">
|
<td style="width:70%; vertical-align:top;">
|
||||||
<!-- table imbriquée : 1 ligne logo, 1 ligne texte (dompdf-friendly) -->
|
|
||||||
<table class="layout" style="width:100%;">
|
<table class="layout" style="width:100%;">
|
||||||
<tr>
|
|
||||||
<td style="padding:0; border:none;">
|
|
||||||
<img src="https://static.mixsuite.fr/liot/logo.png"
|
|
||||||
style="width:110px; display:block; margin:0 0 4mm 0;">
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td class="company-block" style="padding:0; border:none;">
|
<td class="company-block" style="padding:0; border:none;">
|
||||||
<strong>SA LIOT Châtellerault</strong><br>
|
<strong>SCEA LES NAUDS</strong><br>
|
||||||
Site de <b>Châtellerault</b><br>
|
|
||||||
14 Allée d’Argenson<br>
|
14 Allée d’Argenson<br>
|
||||||
Z.I Nord – Secteur Est<br>
|
Z.I Nord – Secteur Est<br>
|
||||||
86100 CHATELLERAULT<br>
|
86100 CHATELLERAULT<br>
|
||||||
TEL : 05 49 20 09 10 – Fax : 05 49 85 37 82<br>
|
Tel. : 05 49 20 09 10<br>
|
||||||
Email : lpc.contacts@lpc-liot.fr<br>
|
Email : lpc.contacts@lpc-liot.fr<br>
|
||||||
RCS Châtellerault B 339 505 612
|
RCS Châtellerault B 444 262 455
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td style="width:30%; text-align:left; vertical-align:top;">
|
<td style="width:30%; text-align:right; vertical-align:top; font-size: 14px;">
|
||||||
<div class="box" style="display:inline-block; width:75mm;">
|
<div style="display:inline-block; width:75mm; line-height:1.3;">
|
||||||
<strong class="red">Nom de l'entreprise</strong><br><br><br>
|
<strong>{{ reception.supplier.name }}</strong><br>
|
||||||
<span class="red">Adresse de l'entreprise</span>
|
<span>{{ reception.address.street }}</span><br>
|
||||||
|
<span>{{ reception.address.postalCode }} {{ reception.address.city }}</span>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -130,40 +152,37 @@
|
|||||||
<div class="title">BON DE RECEPTION</div>
|
<div class="title">BON DE RECEPTION</div>
|
||||||
|
|
||||||
<!-- INFOS (code/date/num) -->
|
<!-- INFOS (code/date/num) -->
|
||||||
<table style="margin-bottom:3mm; width:100%; border-collapse:collapse; table-layout:fixed;">
|
<table class="info-table">
|
||||||
<tr>
|
<tr>
|
||||||
<th style="width:60%; text-align:center;">Code fournisseur</th>
|
<th style="width:55%; text-align:center;">Code fournisseur</th>
|
||||||
<th style="width:20%; text-align:center; white-space:nowrap;">Date</th>
|
<th style="width:20%; text-align:center; white-space:nowrap;">Date</th>
|
||||||
<th style="width:20%; text-align:center; white-space:nowrap;">N° réception</th>
|
<th style="width:25%; text-align:center; white-space:nowrap;">N° réception</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="red" style="width:60%; text-align:center;">XXX</td>
|
<td style="width:55%; text-align:center;">{{ reception.supplier.name }}</td>
|
||||||
<td style="width:20%; text-align:center; white-space:nowrap;">
|
<td style="width:20%; text-align:center; white-space:nowrap;">
|
||||||
{{ reception.receptionDate|date('d/m/Y') }}
|
{{ reception.receptionDate|date('d/m/Y') }}
|
||||||
</td>
|
</td>
|
||||||
<td class="red" style="width:20%; text-align:center; white-space:nowrap;">86-BR-XXXX</td>
|
<td style="width:25%; text-align:center; white-space:nowrap;">{{ reception.identificationNumber }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
||||||
<!-- GRAND TABLEAU -->
|
<!-- GRAND TABLEAU -->
|
||||||
<table class="bigtable" style="margin-bottom:10px; width:100%; border-collapse:collapse; table-layout:fixed;">
|
<div class="bigtable-wrap">
|
||||||
|
<table class="bigtable">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th style="width:15%; text-align:center;">Code</th>
|
<th style="width:75%; text-align:center;">Désignation</th>
|
||||||
<th style="width:65%; text-align:center;">Désignation</th>
|
<th style="width:25%; text-align:center; white-space:nowrap;">Qté livrée (kg)</th>
|
||||||
<th style="width:20%; text-align:right; white-space:nowrap;">Qté livrée (kg)</th>
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="red" style="width:12%;">M</td>
|
<td style="width:75%;">
|
||||||
|
<strong>{{ reception.receptionType.label }}</strong><br><br>
|
||||||
|
|
||||||
<td style="width:68%;">
|
<div class="bigtable-notes">
|
||||||
<strong class="red">MAÏS sec</strong><br><br>
|
|
||||||
|
|
||||||
<div style="font-size:8.5pt; line-height:1.25;">
|
|
||||||
{% set grossWeight = null %}
|
{% set grossWeight = null %}
|
||||||
{% set tareWeight = null %}
|
{% set tareWeight = null %}
|
||||||
|
|
||||||
@@ -179,7 +198,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td class="red" style="width:20%; text-align:right; white-space:nowrap;">
|
<td style="width:25%; text-align:center; white-space:nowrap;">
|
||||||
{% if grossWeight and tareWeight %}
|
{% if grossWeight and tareWeight %}
|
||||||
{{ grossWeight.weight - tareWeight.weight }}
|
{{ grossWeight.weight - tareWeight.weight }}
|
||||||
{% else %}
|
{% else %}
|
||||||
@@ -188,47 +207,72 @@
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<!-- filler : garde le grand bloc haut comme sur l'exemple -->
|
<tr class="border-bottom">
|
||||||
<tr class="fill">
|
<td>
|
||||||
<td style="width:15%;"></td>
|
<strong>
|
||||||
<td style="width:65%;"></td>
|
{% if reception.merchandiseType %}
|
||||||
<td style="width:20%;"></td>
|
{{ reception.merchandiseType.label }}
|
||||||
|
{% else %}
|
||||||
|
-
|
||||||
|
{% endif %}
|
||||||
|
</strong>
|
||||||
|
<br><br>
|
||||||
|
|
||||||
|
<div class="bigtable-notes">
|
||||||
|
{% if reception.merchandiseType and reception.merchandiseType.code == 'AUTRES' and reception.merchandiseDetail %}
|
||||||
|
<p><strong>Précision</strong> : {{ reception.merchandiseDetail }}</p>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if reception.merchandiseType and reception.merchandiseType.code == 'GRANULE' %}
|
||||||
|
{% set pelletGroups = {} %}
|
||||||
|
{% for selection in reception.pelletBuildings %}
|
||||||
|
{% set pelletLabel = selection.pelletType.label %}
|
||||||
|
{% if pelletGroups[pelletLabel] is not defined %}
|
||||||
|
{% set pelletGroups = pelletGroups|merge({ (pelletLabel): [] }) %}
|
||||||
|
{% endif %}
|
||||||
|
{% set pelletGroups = pelletGroups|merge({
|
||||||
|
(pelletLabel): pelletGroups[pelletLabel]|merge([selection.building.label])
|
||||||
|
}) %}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
{% for pelletLabel, buildingLabels in pelletGroups %}
|
||||||
|
<p><strong>{{ pelletLabel }}</strong> : {{ buildingLabels|join(', ') }}</p>
|
||||||
|
{% else %}
|
||||||
|
<p>Aucun dépôt de granulés renseigné.</p>
|
||||||
|
{% endfor %}
|
||||||
|
{% else %}
|
||||||
|
{% set buildingLabels = [] %}
|
||||||
|
{% for building in reception.buildings %}
|
||||||
|
{% set buildingLabels = buildingLabels|merge([building.label]) %}
|
||||||
|
{% endfor %}
|
||||||
|
{% if buildingLabels %}
|
||||||
|
<p><strong>Ferme</strong> : {{ buildingLabels|join(', ') }}</p>
|
||||||
|
{% else %}
|
||||||
|
<p>Aucun bâtiment renseigné.</p>
|
||||||
|
{% endif %}
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td></td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
||||||
<!-- BAS : meta à gauche / signatures à droite (sans float) -->
|
|
||||||
<table class="layout">
|
|
||||||
<tr>
|
|
||||||
<td style="width:60%; padding-right:8mm; vertical-align:top;">
|
|
||||||
<div class="meta red">
|
|
||||||
Transporteur : <strong class="red">Nom du transporteur</strong><br>
|
|
||||||
Mode de livraison : <strong class="red">Fond-mouvant</strong><br>
|
|
||||||
Immatriculation : <strong class="red">{{ reception.licensePlate }}</strong><br><br>
|
|
||||||
Poids annoncé : <strong class="red">XXXXX kg</strong>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Bloc IDTF -->
|
<!-- BAS : meta à gauche / signatures à droite -->
|
||||||
<table class="idtf">
|
<table class="layout footer-block">
|
||||||
<tr>
|
<tr>
|
||||||
<td class="n">1</td>
|
<td style="width:60%; padding-right:8mm; vertical-align:top;">
|
||||||
<td class="prod red">
|
<div class="meta">
|
||||||
Produit : <span class="red">Nom du produit</span><br>
|
Transporteur : <strong>{{ reception.carrier.name }}</strong><br>
|
||||||
N° IDTF : <span class="red">4000XX</span>
|
Mode de livraison : <strong>{{ reception.truck.name }}</strong><br>
|
||||||
</td>
|
Immatriculation : <strong>{{ reception.licensePlate }}</strong><br><br>
|
||||||
<td class="net red">Nettoyage : <span class="red">A</span></td>
|
</div>
|
||||||
<td class="date red">Date : <span class="red">14/01/2026</span></td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
<!-- répète le <tr> si besoin -->
|
|
||||||
</table>
|
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td style="width:40%; vertical-align:top;">
|
<td style="width:40%; vertical-align:top;">
|
||||||
<div class="signature-title">Signature :</div>
|
<div class="box signature-box">Signature les Nauds :</div>
|
||||||
<div class="box signature-box">Ets Liot :</div>
|
<div class="box signature-box">Signature transporteur :</div>
|
||||||
<div class="box signature-box">Transporteur :</div>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
Reference in New Issue
Block a user