Compare commits
1 Commits
v0.0.81
...
feat/admin
| Author | SHA1 | Date | |
|---|---|---|---|
| 311f523647 |
@@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
"permissions": {
|
|
||||||
"allow": [
|
|
||||||
"Bash(npm run:*)",
|
|
||||||
"WebFetch(domain:geo.api.gouv.fr)",
|
|
||||||
"Bash(pip3 install:*)",
|
|
||||||
"Bash(python3 -c \":*)"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -36,7 +36,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
cd frontend
|
cd frontend
|
||||||
npm ci
|
npm ci
|
||||||
CI=1 NUXT_TELEMETRY_DISABLED=1 NUXT_PUBLIC_API_BASE=/api NUXT_PUBLIC_APP_BASE=/ NUXT_PUBLIC_GEO_API_BASE=https://geo.api.gouv.fr npm run generate
|
CI=1 NUXT_TELEMETRY_DISABLED=1 NUXT_PUBLIC_API_BASE=/api NUXT_PUBLIC_APP_BASE=/ npm run generate
|
||||||
test -f .output/public/index.html
|
test -f .output/public/index.html
|
||||||
|
|
||||||
- name: Build artefact
|
- name: Build artefact
|
||||||
|
|||||||
19
.idea/dataSources.xml
generated
Normal file
19
.idea/dataSources.xml
generated
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
|
||||||
|
<data-source source="LOCAL" name="ferme" uuid="f407a514-c6b4-4b26-9555-445a85892502">
|
||||||
|
<driver-ref>postgresql</driver-ref>
|
||||||
|
<synchronize>true</synchronize>
|
||||||
|
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
|
||||||
|
<jdbc-url>jdbc:postgresql://localhost:5432/ferme</jdbc-url>
|
||||||
|
<working-dir>$ProjectFileDir$</working-dir>
|
||||||
|
</data-source>
|
||||||
|
<data-source source="LOCAL" name="Ferme recette" uuid="ae622167-c834-4e7b-87a5-c1721036f5dc">
|
||||||
|
<driver-ref>postgresql</driver-ref>
|
||||||
|
<synchronize>true</synchronize>
|
||||||
|
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
|
||||||
|
<jdbc-url>jdbc:postgresql://localhost:5432/postgres</jdbc-url>
|
||||||
|
<working-dir>$ProjectFileDir$</working-dir>
|
||||||
|
</data-source>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
10
.idea/data_source_mapping.xml
generated
Normal file
10
.idea/data_source_mapping.xml
generated
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="DataSourcePerFileMappings">
|
||||||
|
<file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
|
||||||
|
<file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_1.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
|
||||||
|
<file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_2.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
|
||||||
|
<file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_3.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
|
||||||
|
<file url="file://$APPLICATION_CONFIG_DIR$/consoles/db/f407a514-c6b4-4b26-9555-445a85892502/console_4.sql" value="f407a514-c6b4-4b26-9555-445a85892502" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
2
.idea/db-forest-config.xml
generated
2
.idea/db-forest-config.xml
generated
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="db-tree-configuration">
|
<component name="db-tree-configuration">
|
||||||
<option name="data" value="---------------------------------------- 1:0:f407a514-c6b4-4b26-9555-445a85892502 2:0:ae622167-c834-4e7b-87a5-c1721036f5dc 3:0:9cad43df-2147-4989-b7a4-443067034884 4:0:09e221b8-067a-488b-9c1d-4e155a333079 " />
|
<option name="data" value="---------------------------------------- 1:0:f407a514-c6b4-4b26-9555-445a85892502 2:0:ae622167-c834-4e7b-87a5-c1721036f5dc " />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
6
.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
6
.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<component name="InspectionProjectProfileManager">
|
||||||
|
<profile version="1.0">
|
||||||
|
<option name="myName" value="Project Default" />
|
||||||
|
<inspection_tool class="PhpCSFixerValidationInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
|
||||||
|
</profile>
|
||||||
|
</component>
|
||||||
1
.idea/php.xml
generated
1
.idea/php.xml
generated
@@ -15,7 +15,6 @@
|
|||||||
<component name="PhpCSFixer">
|
<component name="PhpCSFixer">
|
||||||
<phpcsfixer_settings>
|
<phpcsfixer_settings>
|
||||||
<PhpCSFixerConfiguration tool_path="$PROJECT_DIR$/vendor/bin/php-cs-fixer" />
|
<PhpCSFixerConfiguration tool_path="$PROJECT_DIR$/vendor/bin/php-cs-fixer" />
|
||||||
<phpcs_fixer_by_interpreter asDefaultInterpreter="true" interpreter_id="990ff521-e6e9-4080-9cc9-228367d597f9" tool_path="\\wsl.localhost\Ubuntu-24.04\home\matte\Ferme\vendor\bin\php-cs-fixer" timeout="30000" />
|
|
||||||
</phpcsfixer_settings>
|
</phpcsfixer_settings>
|
||||||
</component>
|
</component>
|
||||||
<component name="PhpCodeSniffer">
|
<component name="PhpCodeSniffer">
|
||||||
|
|||||||
668
.idea/workspace.xml
generated
668
.idea/workspace.xml
generated
@@ -4,12 +4,16 @@
|
|||||||
<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 : les non-admin ne peuvent plus supprimer de réception/expédition en attente">
|
<list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : test auto-tag-develop.yml (auto incrément version)">
|
||||||
|
<change afterPath="$PROJECT_DIR$/frontend/composables/useAppVersion.ts" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/config/packages/security.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/config/packages/security.yaml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/frontend/pages/reception/waiting-reception.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/reception/waiting-reception.vue" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/frontend/app.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/app.vue" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/frontend/pages/shipment/waiting-shipment.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/shipment/waiting-shipment.vue" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/frontend/layouts/default.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/layouts/default.vue" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/frontend/pages/login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/login.vue" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Dto/AppVersion.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/ApiResource/AppVersion.php" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/State/AppVersionProvider.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/State/AppVersionProvider.php" 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" />
|
||||||
@@ -32,23 +36,19 @@
|
|||||||
<component name="FileTemplateManagerImpl">
|
<component name="FileTemplateManagerImpl">
|
||||||
<option name="RECENT_TEMPLATES">
|
<option name="RECENT_TEMPLATES">
|
||||||
<list>
|
<list>
|
||||||
<option value="TypeScript File" />
|
|
||||||
<option value="PHP File" />
|
|
||||||
<option value="Vue Composition API Component" />
|
<option value="Vue Composition API Component" />
|
||||||
|
<option value="TypeScript File" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="Git.Settings">
|
<component name="Git.Settings">
|
||||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||||
<map>
|
<map>
|
||||||
<entry key="$PROJECT_DIR$" value="feature/FER-13-faire-des-recherches-sur-le-scanner-des-betes" />
|
<entry key="$PROJECT_DIR$" value="feat/256-reception-etape-3-bovin" />
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
</component>
|
</component>
|
||||||
<component name="HighlightingSettingsPerFile">
|
|
||||||
<setting file="file://$PROJECT_DIR$/frontend/pages/admin/supplier/supplier-list.vue" root0="FORCE_HIGHLIGHTING" />
|
|
||||||
</component>
|
|
||||||
<component name="McpProjectServerCommands">
|
<component name="McpProjectServerCommands">
|
||||||
<commands />
|
<commands />
|
||||||
<urls />
|
<urls />
|
||||||
@@ -225,60 +225,52 @@
|
|||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
<option name="showLibraryContents" value="true" />
|
<option name="showLibraryContents" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent"><![CDATA[{
|
<component name="PropertiesComponent">{
|
||||||
"keyToString": {
|
"keyToString": {
|
||||||
"RunOnceActivity.MCP Project settings loaded": "true",
|
"RunOnceActivity.MCP Project settings loaded": "true",
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
"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": "fix/FER-15-fix-droit-de-suppression-reception-expedition-util",
|
"git-widget-placeholder": "develop",
|
||||||
"last_opened_file_path": "//wsl.localhost/Ubuntu-24.04/home/m-tristan/workspace/Ferme",
|
"last_opened_file_path": "/home/sroy/Documents/test/Ferme",
|
||||||
"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)",
|
||||||
"node.js.selected.package.tslint": "(autodetect)",
|
"node.js.selected.package.tslint": "(autodetect)",
|
||||||
"nodejs_package_manager_path": "npm",
|
"nodejs_package_manager_path": "npm",
|
||||||
"settings.editor.selected.configurable": "advanced.settings",
|
"settings.editor.selected.configurable": "configurable.tailwindcss",
|
||||||
"ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
|
"ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
|
||||||
"vue.rearranger.settings.migration": "true"
|
"vue.rearranger.settings.migration": "true"
|
||||||
},
|
},
|
||||||
"keyToStringList": {
|
"keyToStringList": {
|
||||||
"DatabaseDriversLRU": [
|
"DatabaseDriversLRU": [
|
||||||
"postgresql"
|
"postgresql"
|
||||||
],
|
],
|
||||||
"com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
|
"com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
|
||||||
"TEXT"
|
"TEXT"
|
||||||
],
|
],
|
||||||
"vue.recent.templates": [
|
"vue.recent.templates": [
|
||||||
"Vue Composition API Component"
|
"Vue Composition API Component"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}]]></component>
|
}</component>
|
||||||
<component name="RecentsManager">
|
<component name="RecentsManager">
|
||||||
<key name="CopyFile.RECENT_KEYS">
|
|
||||||
<recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
|
|
||||||
<recent name="$PROJECT_DIR$/frontend/components/commun" />
|
|
||||||
<recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\pages\shipment" />
|
|
||||||
<recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\composables" />
|
|
||||||
<recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\components\shipment" />
|
|
||||||
</key>
|
|
||||||
<key name="MoveFile.RECENT_KEYS">
|
<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\m-tristan\workspace\Ferme" />
|
||||||
<recent name="C:\Users\m-tristan\AppData\Roaming\JetBrains\PhpStorm2025.3\scratches" />
|
|
||||||
<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" />
|
||||||
</key>
|
</key>
|
||||||
</component>
|
</component>
|
||||||
<component name="SharedIndexes">
|
<component name="SharedIndexes">
|
||||||
<attachedChunks>
|
<attachedChunks>
|
||||||
<set>
|
<set>
|
||||||
<option value="bundled-php-predefined-a98d8de5180a-0e0d91225499-com.jetbrains.php.sharedIndexes-PS-253.32098.40" />
|
<option value="bundled-php-predefined-a98d8de5180a-0e0d91225499-com.jetbrains.php.sharedIndexes-PS-253.30387.85" />
|
||||||
</set>
|
</set>
|
||||||
</attachedChunks>
|
</attachedChunks>
|
||||||
</component>
|
</component>
|
||||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
|
||||||
<component name="TaskManager">
|
<component name="TaskManager">
|
||||||
<task active="true" id="Default" summary="Default task">
|
<task active="true" id="Default" summary="Default task">
|
||||||
<changelist id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="" />
|
<changelist id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="" />
|
||||||
@@ -309,24 +301,230 @@
|
|||||||
<workItem from="1770195718952" duration="215000" />
|
<workItem from="1770195718952" duration="215000" />
|
||||||
<workItem from="1770195959162" duration="18915000" />
|
<workItem from="1770195959162" duration="18915000" />
|
||||||
<workItem from="1770274844804" duration="3940000" />
|
<workItem from="1770274844804" duration="3940000" />
|
||||||
<workItem from="1770798536017" duration="20774000" />
|
</task>
|
||||||
<workItem from="1770879701502" duration="25805000" />
|
<task id="LOCAL-00009" summary="feat : ajout d'une gestion d'erreur au global côté front avec la lib toaster et I18n pour centraliser les messages d'erreur">
|
||||||
<workItem from="1770966186589" duration="914000" />
|
<option name="closed" value="true" />
|
||||||
<workItem from="1770967274060" duration="2388000" />
|
<created>1768555180530</created>
|
||||||
<workItem from="1772466451823" duration="598000" />
|
<option name="number" value="00009" />
|
||||||
<workItem from="1772626984813" duration="969000" />
|
<option name="presentableId" value="LOCAL-00009" />
|
||||||
<workItem from="1772786360430" duration="21000" />
|
<option name="project" value="LOCAL" />
|
||||||
<workItem from="1772786475316" duration="3016000" />
|
<updated>1768555180530</updated>
|
||||||
<workItem from="1773049125640" duration="406000" />
|
</task>
|
||||||
<workItem from="1773049540928" duration="539000" />
|
<task id="LOCAL-00010" summary="feat : ajout de l'authentification avec lexik">
|
||||||
<workItem from="1773050154207" duration="1879000" />
|
<option name="closed" value="true" />
|
||||||
<workItem from="1773212999001" duration="652000" />
|
<created>1768832208350</created>
|
||||||
<workItem from="1773215356754" duration="5754000" />
|
<option name="number" value="00010" />
|
||||||
<workItem from="1773756072697" duration="5450000" />
|
<option name="presentableId" value="LOCAL-00010" />
|
||||||
<workItem from="1773766075191" duration="6202000" />
|
<option name="project" value="LOCAL" />
|
||||||
<workItem from="1773824491213" duration="24805000" />
|
<updated>1768832208350</updated>
|
||||||
<workItem from="1774275549972" duration="51000" />
|
</task>
|
||||||
<workItem from="1774276665015" duration="33750000" />
|
<task id="LOCAL-00011" summary="feat : update du CHANGELOG.md">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1768832516587</created>
|
||||||
|
<option name="number" value="00011" />
|
||||||
|
<option name="presentableId" value="LOCAL-00011" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1768832516587</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00012" summary="fix : correction de l'accès au swagger en mode dev qui n'était plus accessible">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1768940104944</created>
|
||||||
|
<option name="number" value="00012" />
|
||||||
|
<option name="presentableId" value="LOCAL-00012" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1768940104944</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00013" summary="feat : ajout de la conf pour le déploiement en recette">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769005220331</created>
|
||||||
|
<option name="number" value="00013" />
|
||||||
|
<option name="presentableId" value="LOCAL-00013" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769005220331</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00014" summary="fix : fix de la conf pour le déploiement en recette">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769008700008</created>
|
||||||
|
<option name="number" value="00014" />
|
||||||
|
<option name="presentableId" value="LOCAL-00014" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769008700008</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00015" summary="fix : fix de la conf pour le déploiement en recette">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769014602062</created>
|
||||||
|
<option name="number" value="00015" />
|
||||||
|
<option name="presentableId" value="LOCAL-00015" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769014602062</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00016" summary="fix : migration apache vers nginx pour un déploiement plus simple">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769019284586</created>
|
||||||
|
<option name="number" value="00016" />
|
||||||
|
<option name="presentableId" value="LOCAL-00016" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769019284586</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00017" summary="fix : dernière modification pour le déploiement en recette et le changement de conf vers nginx">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769021756823</created>
|
||||||
|
<option name="number" value="00017" />
|
||||||
|
<option name="presentableId" value="LOCAL-00017" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769021756823</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00018" summary="ci : auto tag + release artefact">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769021818384</created>
|
||||||
|
<option name="number" value="00018" />
|
||||||
|
<option name="presentableId" value="LOCAL-00018" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769021818384</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00019" summary="ci : fix release artefact">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769022071620</created>
|
||||||
|
<option name="number" value="00019" />
|
||||||
|
<option name="presentableId" value="LOCAL-00019" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769022071620</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00020" summary="ci : fix release artefact">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769024603812</created>
|
||||||
|
<option name="number" value="00020" />
|
||||||
|
<option name="presentableId" value="LOCAL-00020" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769024603812</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00021" summary="ci : ajout du script et de la doc déploiement">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769026716634</created>
|
||||||
|
<option name="number" value="00021" />
|
||||||
|
<option name="presentableId" value="LOCAL-00021" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769026716634</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00022" summary="fix : correction du path URI pour la création d'un poids dans une réception">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769073690382</created>
|
||||||
|
<option name="number" value="00022" />
|
||||||
|
<option name="presentableId" value="LOCAL-00022" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769073690382</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00023" summary="feat : Ajout du bundle Monolog pour la gestion des logs">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769075990984</created>
|
||||||
|
<option name="number" value="00023" />
|
||||||
|
<option name="presentableId" value="LOCAL-00023" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769075990984</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00024" summary="fix : affiche plus détail dans les logs en recette/prod">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769077633390</created>
|
||||||
|
<option name="number" value="00024" />
|
||||||
|
<option name="presentableId" value="LOCAL-00024" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769077633390</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00025" summary="fix : modification du script de déploiement pour corriger le problème d'écriture des logs de prod">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769079030808</created>
|
||||||
|
<option name="number" value="00025" />
|
||||||
|
<option name="presentableId" value="LOCAL-00025" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769079030808</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00026" summary="fix : doc de déploiement">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769094376813</created>
|
||||||
|
<option name="number" value="00026" />
|
||||||
|
<option name="presentableId" value="LOCAL-00026" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769094376813</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00027" summary="fix : doc et script de déploiement">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769096187792</created>
|
||||||
|
<option name="number" value="00027" />
|
||||||
|
<option name="presentableId" value="LOCAL-00027" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769096187792</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00028" summary="fix : doc et script de déploiement">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769097091268</created>
|
||||||
|
<option name="number" value="00028" />
|
||||||
|
<option name="presentableId" value="LOCAL-00028" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769097091268</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00029" summary="fix : gitea workflow">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769097476629</created>
|
||||||
|
<option name="number" value="00029" />
|
||||||
|
<option name="presentableId" value="LOCAL-00029" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769097476629</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00030" summary="fix : script de déploiement">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769098182184</created>
|
||||||
|
<option name="number" value="00030" />
|
||||||
|
<option name="presentableId" value="LOCAL-00030" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769098182184</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00031" summary="feat : ajout plus d'information sur la liste des réceptions côté front sur la page d'accueil">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769098861988</created>
|
||||||
|
<option name="number" value="00031" />
|
||||||
|
<option name="presentableId" value="LOCAL-00031" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769098861988</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00032" summary="fix : redirige sur le login sur une 401 et reset du auth state + doc + timeout du toaster">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769100048933</created>
|
||||||
|
<option name="number" value="00032" />
|
||||||
|
<option name="presentableId" value="LOCAL-00032" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769100048933</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00033" summary="feat : ajout de la debug bar en mod dev">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769177611987</created>
|
||||||
|
<option name="number" value="00033" />
|
||||||
|
<option name="presentableId" value="LOCAL-00033" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769177611987</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00034" summary="feat : ajout du bundle Malio ednotif pour l'utilisation des WS">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769184861047</created>
|
||||||
|
<option name="number" value="00034" />
|
||||||
|
<option name="presentableId" value="LOCAL-00034" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769184861047</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00035" summary="fix : modification de la conf du bundle ednotif">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1769434793487</created>
|
||||||
|
<option name="number" value="00035" />
|
||||||
|
<option name="presentableId" value="LOCAL-00035" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1769434793487</updated>
|
||||||
|
</task>
|
||||||
|
<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>
|
||||||
<task id="LOCAL-00037" summary="feat : finalisation de l'étape 1 "Réception" (formulaire)">
|
<task id="LOCAL-00037" summary="feat : finalisation de l'étape 1 "Réception" (formulaire)">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
@@ -432,295 +630,71 @@
|
|||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1770217875423</updated>
|
<updated>1770217875423</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00050" summary="feat : creer une nouvelle expedtion (WIP)">
|
<task id="LOCAL-00050" summary="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
<created>1770736570645</created>
|
<created>1770283622425</created>
|
||||||
<option name="number" value="00050" />
|
<option name="number" value="00050" />
|
||||||
<option name="presentableId" value="LOCAL-00050" />
|
<option name="presentableId" value="LOCAL-00050" />
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1770736570645</updated>
|
<updated>1770283622425</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00051" summary="feat : ajout d'une page de creation d'une expedition">
|
<task id="LOCAL-00051" summary="feat : ajout du responsive sur la navbar et la page d'accueil">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
<created>1770880791564</created>
|
<created>1770308927948</created>
|
||||||
<option name="number" value="00051" />
|
<option name="number" value="00051" />
|
||||||
<option name="presentableId" value="LOCAL-00051" />
|
<option name="presentableId" value="LOCAL-00051" />
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1770880791565</updated>
|
<updated>1770308927948</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00052" summary="feat : changelog">
|
<task id="LOCAL-00052" summary="fix : logo centré en mod mobile">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
<created>1770881437439</created>
|
<created>1770310504254</created>
|
||||||
<option name="number" value="00052" />
|
<option name="number" value="00052" />
|
||||||
<option name="presentableId" value="LOCAL-00052" />
|
<option name="presentableId" value="LOCAL-00052" />
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1770881437439</updated>
|
<updated>1770310504254</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00053" summary="feat : lister les expeditions terminees">
|
<task id="LOCAL-00053" summary="feat : ajout d'un numéro de version automatique via la CI">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
<created>1770883114609</created>
|
<created>1770369945257</created>
|
||||||
<option name="number" value="00053" />
|
<option name="number" value="00053" />
|
||||||
<option name="presentableId" value="LOCAL-00053" />
|
<option name="presentableId" value="LOCAL-00053" />
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1770883114609</updated>
|
<updated>1770369945257</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00054" summary="feat : lister les expeditions terminees">
|
<task id="LOCAL-00054" summary="feat : update numéro de version">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
<created>1770884154297</created>
|
<created>1770370216428</created>
|
||||||
<option name="number" value="00054" />
|
<option name="number" value="00054" />
|
||||||
<option name="presentableId" value="LOCAL-00054" />
|
<option name="presentableId" value="LOCAL-00054" />
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1770884154297</updated>
|
<updated>1770370216428</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00055" summary="fix : corrections diverses">
|
<task id="LOCAL-00055" summary="fix : auto-tag-develop.yml">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
<created>1770969471135</created>
|
<created>1770370700697</created>
|
||||||
<option name="number" value="00055" />
|
<option name="number" value="00055" />
|
||||||
<option name="presentableId" value="LOCAL-00055" />
|
<option name="presentableId" value="LOCAL-00055" />
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1770969471135</updated>
|
<updated>1770370700698</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00056" summary="fix : corrections frontend">
|
<task id="LOCAL-00056" summary="fix : auto-tag-develop.yml">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
<created>1772094268366</created>
|
<created>1770370919043</created>
|
||||||
<option name="number" value="00056" />
|
<option name="number" value="00056" />
|
||||||
<option name="presentableId" value="LOCAL-00056" />
|
<option name="presentableId" value="LOCAL-00056" />
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1772094268366</updated>
|
<updated>1770370919043</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00057" summary="feat : affichage et modification expédition et modification bouton valider">
|
<task id="LOCAL-00057" summary="feat : test auto-tag-develop.yml (auto incrément version)">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
<created>1772111964268</created>
|
<created>1770371073055</created>
|
||||||
<option name="number" value="00057" />
|
<option name="number" value="00057" />
|
||||||
<option name="presentableId" value="LOCAL-00057" />
|
<option name="presentableId" value="LOCAL-00057" />
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1772111964268</updated>
|
<updated>1770371073055</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00058" summary="fix : erreur customer adress et bouton valider oublie">
|
<option name="localTasksCounter" value="58" />
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1772112729501</created>
|
|
||||||
<option name="number" value="00058" />
|
|
||||||
<option name="presentableId" value="LOCAL-00058" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1772112729502</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00059" summary="feat : changelog update">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1772112812677</created>
|
|
||||||
<option name="number" value="00059" />
|
|
||||||
<option name="presentableId" value="LOCAL-00059" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1772112812677</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00060" summary="feat : changelog update">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1772177400063</created>
|
|
||||||
<option name="number" value="00060" />
|
|
||||||
<option name="presentableId" value="LOCAL-00060" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1772177400063</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00061" summary="feat : changelog update">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1772177614438</created>
|
|
||||||
<option name="number" value="00061" />
|
|
||||||
<option name="presentableId" value="LOCAL-00061" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1772177614438</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00062" summary="fix : color tab">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1772178540489</created>
|
|
||||||
<option name="number" value="00062" />
|
|
||||||
<option name="presentableId" value="LOCAL-00062" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1772178540489</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00063" summary="feat : modification front de la page admin transporteur">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1772180053740</created>
|
|
||||||
<option name="number" value="00063" />
|
|
||||||
<option name="presentableId" value="LOCAL-00063" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1772180053740</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00064" summary="fix : espacement et changelog">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1772180581178</created>
|
|
||||||
<option name="number" value="00064" />
|
|
||||||
<option name="presentableId" value="LOCAL-00064" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1772180581178</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00065" summary="fix : espacement">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1772180684250</created>
|
|
||||||
<option name="number" value="00065" />
|
|
||||||
<option name="presentableId" value="LOCAL-00065" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1772180684250</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00066" summary="fix : espacement">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1772180972984</created>
|
|
||||||
<option name="number" value="00066" />
|
|
||||||
<option name="presentableId" value="LOCAL-00066" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1772180972984</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00067" summary="fix : text">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1772182545592</created>
|
|
||||||
<option name="number" value="00067" />
|
|
||||||
<option name="presentableId" value="LOCAL-00067" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1772182545592</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00068" summary="feat : front page admin bovin et changelog">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1772182707441</created>
|
|
||||||
<option name="number" value="00068" />
|
|
||||||
<option name="presentableId" value="LOCAL-00068" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1772182707441</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00069" summary="fix : on ne bloque plus le poids max d'une pesée">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1772447581744</created>
|
|
||||||
<option name="number" value="00069" />
|
|
||||||
<option name="presentableId" value="LOCAL-00069" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1772447581744</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00070" summary="feat : ajout de supplier dans la feed et fixtures">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1773761787472</created>
|
|
||||||
<option name="number" value="00070" />
|
|
||||||
<option name="presentableId" value="LOCAL-00070" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1773761787472</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00071" summary="feat : ajout de bâtiment dans les fixtures et seed + organisation du menu">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1773766207721</created>
|
|
||||||
<option name="number" value="00071" />
|
|
||||||
<option name="presentableId" value="LOCAL-00071" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1773766207721</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00072" summary="fix : on ne pèse plus automatiquement + fix message de création réception">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1773826699115</created>
|
|
||||||
<option name="number" value="00072" />
|
|
||||||
<option name="presentableId" value="LOCAL-00072" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1773826699115</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00073" summary="fix : correction des retours de la V0">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1773841634554</created>
|
|
||||||
<option name="number" value="00073" />
|
|
||||||
<option name="presentableId" value="LOCAL-00073" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1773841634554</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00074" summary="feat : ajout de l'api de l'état pour chercher les villes via le CP">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1773842791819</created>
|
|
||||||
<option name="number" value="00074" />
|
|
||||||
<option name="presentableId" value="LOCAL-00074" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1773842791819</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00075" summary="fix : script de déploiement + CI/CD build de l'app">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1773843922376</created>
|
|
||||||
<option name="number" value="00075" />
|
|
||||||
<option name="presentableId" value="LOCAL-00075" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1773843922377</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00076" summary="fix : order navbar + modification création fournisseur et client">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1773852806120</created>
|
|
||||||
<option name="number" value="00076" />
|
|
||||||
<option name="presentableId" value="LOCAL-00076" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1773852806121</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00077" summary="fix : order récéption/expédition + correction style bouton récéption">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1774283204849</created>
|
|
||||||
<option name="number" value="00077" />
|
|
||||||
<option name="presentableId" value="LOCAL-00077" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1774283204849</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00078" summary="fix : style bon de récéption">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1774285464091</created>
|
|
||||||
<option name="number" value="00078" />
|
|
||||||
<option name="presentableId" value="LOCAL-00078" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1774285464091</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00079" summary="fix : bouton de mise en attente">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1774337609427</created>
|
|
||||||
<option name="number" value="00079" />
|
|
||||||
<option name="presentableId" value="LOCAL-00079" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1774337609427</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00080" summary="fix : problème de bearer token">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1774448105945</created>
|
|
||||||
<option name="number" value="00080" />
|
|
||||||
<option name="presentableId" value="LOCAL-00080" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1774448105945</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00081" summary="feat : système de blocage utilisateur">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1774450388149</created>
|
|
||||||
<option name="number" value="00081" />
|
|
||||||
<option name="presentableId" value="LOCAL-00081" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1774450388149</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00082" summary="feat : ajout d'un système de scanner bovin">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1774543296474</created>
|
|
||||||
<option name="number" value="00082" />
|
|
||||||
<option name="presentableId" value="LOCAL-00082" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1774543296474</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00083" summary="feat : mise à jour du CLAUDE.md">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1774543626516</created>
|
|
||||||
<option name="number" value="00083" />
|
|
||||||
<option name="presentableId" value="LOCAL-00083" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1774543626516</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00084" summary="feat : update CHANGELOG.md">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1774543766582</created>
|
|
||||||
<option name="number" value="00084" />
|
|
||||||
<option name="presentableId" value="LOCAL-00084" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1774543766582</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00085" summary="feat : la page de scanner est accessible que pour les admins">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1774543840891</created>
|
|
||||||
<option name="number" value="00085" />
|
|
||||||
<option name="presentableId" value="LOCAL-00085" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1774543840891</updated>
|
|
||||||
</task>
|
|
||||||
<option name="localTasksCounter" value="86" />
|
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
<component name="TypeScriptGeneratedFilesManager">
|
||||||
@@ -770,52 +744,32 @@
|
|||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<MESSAGE value="feat : changelog update" />
|
<MESSAGE value="fix : gitea workflow" />
|
||||||
<MESSAGE value="fix : color tab" />
|
<MESSAGE value="fix : script de déploiement" />
|
||||||
<MESSAGE value="feat : modification front de la page admin transporteur" />
|
<MESSAGE value="feat : ajout plus d'information sur la liste des réceptions côté front sur la page d'accueil" />
|
||||||
<MESSAGE value="fix : espacement et changelog" />
|
<MESSAGE value="fix : redirige sur le login sur une 401 et reset du auth state + doc + timeout du toaster" />
|
||||||
<MESSAGE value="fix : espacement" />
|
<MESSAGE value="feat : ajout de la debug bar en mod dev" />
|
||||||
<MESSAGE value="fix : text" />
|
<MESSAGE value="feat : ajout du bundle Malio ednotif pour l'utilisation des WS" />
|
||||||
<MESSAGE value="feat : front page admin bovin et changelog" />
|
<MESSAGE value="fix : modification de la conf du bundle ednotif" />
|
||||||
<MESSAGE value="fix : on ne bloque plus le poids max d'une pesée" />
|
<MESSAGE value="feat : update du CHANGELOG.md" />
|
||||||
<MESSAGE value="feat : ajout de supplier dans la feed et fixtures" />
|
<MESSAGE value="feat : finalisation de l'étape 1 "Réception" (formulaire)" />
|
||||||
<MESSAGE value="feat : ajout de bâtiment dans les fixtures et seed + organisation du menu" />
|
<MESSAGE value="feat : ajout du numéro identification des receptions et ajustement du bon de reception" />
|
||||||
<MESSAGE value="fix : on ne pèse plus automatiquement + fix message de création réception" />
|
<MESSAGE value="feat : ajout de la partie reception des marchandises (étape 3) et modification du bon de réception" />
|
||||||
<MESSAGE value="fix : correction des retours de la V0" />
|
<MESSAGE value="feat : mise en place de composant UI pour les select, checkbox, date, text" />
|
||||||
<MESSAGE value="feat : ajout de l'api de l'état pour chercher les villes via le CP" />
|
|
||||||
<MESSAGE value="fix : script de déploiement + CI/CD build de l'app" />
|
|
||||||
<MESSAGE value="fix : order navbar + modification création fournisseur et client" />
|
|
||||||
<MESSAGE value="fix : order récéption/expédition + correction style bouton récéption" />
|
|
||||||
<MESSAGE value="fix : style bon de récéption" />
|
|
||||||
<MESSAGE value="fix : bouton de mise en attente" />
|
|
||||||
<MESSAGE value="fix : problème de bearer token" />
|
|
||||||
<MESSAGE value="feat : système de blocage utilisateur" />
|
|
||||||
<MESSAGE value="feat : ajout d'un système de scanner bovin" />
|
|
||||||
<MESSAGE value="feat : mise à jour du CLAUDE.md" />
|
|
||||||
<MESSAGE value="feat : update CHANGELOG.md" />
|
<MESSAGE value="feat : update CHANGELOG.md" />
|
||||||
<MESSAGE value="feat : la page de scanner est accessible que pour les admins" />
|
<MESSAGE value="feat : ajout de commentaire" />
|
||||||
<MESSAGE value="fix : les non-admin ne peuvent plus supprimer de réception/expédition en attente" />
|
<MESSAGE value="fix : correction de l'affichage de l'immatriculation sur une réception en cours + correction css étape 3 d'une réception" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="fix : les non-admin ne peuvent plus supprimer de réception/expédition en attente" />
|
<MESSAGE value="feat : ajout de colonne pour les Supplier, Address et modification du numéro de réception" />
|
||||||
</component>
|
<MESSAGE value="feat : ajout de colonne pour les Supplier, Address. Modification du numéro de réception et ajout de fixtures" />
|
||||||
<component name="XDebuggerManager">
|
<MESSAGE value="feat : mise à jour du bon de réception" />
|
||||||
<breakpoint-manager>
|
<MESSAGE value="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)" />
|
||||||
<breakpoints>
|
<MESSAGE value="feat : ajout du responsive sur la navbar et la page d'accueil" />
|
||||||
<line-breakpoint enabled="true" type="php">
|
<MESSAGE value="fix : logo centré en mod mobile" />
|
||||||
<url>file://$PROJECT_DIR$/src/Entity/ReceptionPelletBuilding.php</url>
|
<MESSAGE value="feat : ajout d'un numéro de version automatique via la CI" />
|
||||||
<line>6</line>
|
<MESSAGE value="feat : update numéro de version" />
|
||||||
<option name="timeStamp" value="3" />
|
<MESSAGE value="fix : auto-tag-develop.yml" />
|
||||||
</line-breakpoint>
|
<MESSAGE value="feat : test auto-tag-develop.yml (auto incrément version)" />
|
||||||
<line-breakpoint enabled="true" type="php">
|
<option name="LAST_COMMIT_MESSAGE" value="feat : test auto-tag-develop.yml (auto incrément version)" />
|
||||||
<url>file://$PROJECT_DIR$/src/Entity/Shipment.php</url>
|
|
||||||
<line>6</line>
|
|
||||||
<option name="timeStamp" value="45" />
|
|
||||||
</line-breakpoint>
|
|
||||||
<line-breakpoint enabled="true" type="javascript">
|
|
||||||
<url>file://$PROJECT_DIR$/frontend/services/dto/shipment-data.ts</url>
|
|
||||||
<option name="timeStamp" value="43" />
|
|
||||||
</line-breakpoint>
|
|
||||||
</breakpoints>
|
|
||||||
</breakpoint-manager>
|
|
||||||
</component>
|
</component>
|
||||||
<component name="XSLT-Support.FileAssociations.UIState">
|
<component name="XSLT-Support.FileAssociations.UIState">
|
||||||
<expand />
|
<expand />
|
||||||
|
|||||||
59
AGENTS.md
Normal file
59
AGENTS.md
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
# AGENTS.md
|
||||||
|
|
||||||
|
Project overview
|
||||||
|
- Symfony 8 + API Platform 4 backend, Nuxt 3 frontend in `frontend/`.
|
||||||
|
- Apache vhost serves API under `/api` and frontend from `frontend/dist`.
|
||||||
|
- API base URL on frontend uses `NUXT_PUBLIC_API_BASE` (see `frontend/.env`).
|
||||||
|
|
||||||
|
Backend conventions
|
||||||
|
- Use English for code identifiers/messages; keep “pont-bascule” as domain term.
|
||||||
|
- API Platform operations are defined on Doctrine entities.
|
||||||
|
- 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 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`.
|
||||||
|
- 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`).
|
||||||
|
- Custom exception: `App\Exception\PontBasculeException` with French messages, mapped to 500 in provider.
|
||||||
|
- Parsing of pont-bascule payload is in `src/Service/PontBasculePayloadDecoder.php`.
|
||||||
|
- `config/reference.php` is auto-generated; keep it.
|
||||||
|
|
||||||
|
Frontend conventions
|
||||||
|
- Nuxt SSR disabled; Tailwind used.
|
||||||
|
- Layout in `frontend/layouts/default.vue`: max width `1050px`, header full width.
|
||||||
|
- 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 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.
|
||||||
|
- Pinia store: `frontend/stores/reception.ts` is the source of truth for the current reception.
|
||||||
|
- 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`.
|
||||||
|
- 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.
|
||||||
|
- 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/`.
|
||||||
|
- Reception service uses `receptions`, `receptions/{id}`, `receptions/weigh` and supports success/error toast keys.
|
||||||
|
- Reception receipt endpoint is `receptions/{id}/receipt` (PDF) via `frontend/composables/usePdfPrinter.ts`.
|
||||||
|
|
||||||
|
Environment & routing
|
||||||
|
- Frontend dev server: `npm run dev` in `frontend/`.
|
||||||
|
- API base for local dev: `http://localhost:8080/api` (set in `frontend/.env` via `NUXT_PUBLIC_API_BASE`).
|
||||||
|
- CORS handled by Nelmio; `.env` includes `CORS_ALLOW_ORIGIN` regex for localhost.
|
||||||
|
- Nuxt i18n locales live in `frontend/i18n/locales` (configured via `langDir: 'locales'`).
|
||||||
|
- Default locale is `fr`; translations in `frontend/i18n/locales/fr.json`.
|
||||||
|
|
||||||
|
Notes
|
||||||
|
- Do not add a GET that creates resources; use POST + PATCH.
|
||||||
|
- 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`.
|
||||||
35
CHANGELOG.md
35
CHANGELOG.md
@@ -29,42 +29,7 @@ Ajouter dans le fichier .env du frontend
|
|||||||
* Finalisation de la partie réception de marchandise
|
* Finalisation de la partie réception de marchandise
|
||||||
* [#267] Lister les réceptions en attente
|
* [#267] Lister les réceptions en attente
|
||||||
* [#268] Lister les réceptions terminées
|
* [#268] Lister les réceptions terminées
|
||||||
* [#316] Admin liste des transporteurs
|
|
||||||
* [#312] Creation administration listing fournisseurs
|
|
||||||
* [#315] Creation page admin utilisateur
|
|
||||||
* [#317] Admin modification creation transporteur
|
|
||||||
* [#318] Affichage modification reception terminée
|
|
||||||
* [#320] Affichage modification reception terminée suite
|
|
||||||
* [#271] Créer une nouvelle expédition (étape 1)
|
|
||||||
* [#272] Créer une nouvelle expédition (étape 2)
|
|
||||||
* [#273] Créer une nouvelle expédition (étape 3)
|
|
||||||
* [#256] Créer une nouvelle réception (étape 3 - bovin)
|
|
||||||
* [#314] Création d'une page d'administration : listing des utilisateurs
|
|
||||||
* [#313] Admin modification creation fournisseur
|
|
||||||
* [#275] Lister les expéditions en attente
|
|
||||||
* [#276] Lister les expéditions terminées
|
|
||||||
* [#324] Creation page admin listing clients
|
|
||||||
* [#326] Admin modification creation client
|
|
||||||
* [#325] Correction diverses
|
|
||||||
* fix layout admin
|
|
||||||
* Creation page admin listing bovins
|
|
||||||
* Creation page admin ajout/modification bovins
|
|
||||||
* [#331] Mettre à jour l'entité Shipment et bovin_shipment
|
|
||||||
* [#278] Plan du site
|
|
||||||
* [#334] Correctifs
|
|
||||||
* [#332] Refonte écran réception terminée
|
|
||||||
* [#327] afficher/modifier écran expédition terminée
|
|
||||||
* [#352] modification front admin fournisseur
|
|
||||||
* [#355] modification front admin transporteur
|
|
||||||
* [#356] front page admin bovin
|
|
||||||
* [#353] modification front admin client
|
|
||||||
* [#353] modification front admin utilisateur
|
|
||||||
* [#FER-11] Corriger le problème de bearer token
|
|
||||||
* [#FER-12] Ajouter un blocage des utilisateurs
|
|
||||||
* [#FER-13] Faire des recherches sur le scanner des bêtes
|
|
||||||
* [#FER-15] Les non-admin ne peuvent plus supprimer de réception/expédition en attente
|
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
|||||||
169
CLAUDE.md
169
CLAUDE.md
@@ -1,169 +0,0 @@
|
|||||||
# CLAUDE.md
|
|
||||||
|
|
||||||
## Stack
|
|
||||||
|
|
||||||
- **Backend:** Symfony 8 + API Platform 4 (PHP 8.4)
|
|
||||||
- **Frontend:** Nuxt 4 (Vue 3, Pinia, Tailwind, Zod) in `frontend/`
|
|
||||||
- **Infra:** Docker (PHP-FPM + Nginx), Apache vhost serves API sous `/api` et frontend depuis `frontend/dist`
|
|
||||||
|
|
||||||
## Commands
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Docker
|
|
||||||
make start # Démarrer les containers
|
|
||||||
make stop # Arrêter les containers
|
|
||||||
make restart # Redémarrer les containers
|
|
||||||
make shell # Shell dans le container PHP
|
|
||||||
|
|
||||||
# Install complet
|
|
||||||
make install # composer install + migrations + build frontend
|
|
||||||
|
|
||||||
# Backend
|
|
||||||
make composer-install # Installer dépendances PHP
|
|
||||||
make migration-migrate # Lancer les migrations
|
|
||||||
make fixtures # Charger les fixtures
|
|
||||||
make cache-clear # Vider le cache Symfony
|
|
||||||
make test # Lancer les tests PHPUnit
|
|
||||||
make test FILES=tests/path/to/TestFile.php # Test spécifique
|
|
||||||
make php-cs-fixer-allow-risky FILES=src/... # Fixer le style
|
|
||||||
|
|
||||||
# Frontend
|
|
||||||
make build-nuxtJS # npm install + build:dist (dans le container)
|
|
||||||
make dev-nuxt # Serveur dev Nuxt (dans le container)
|
|
||||||
# Ou directement dans frontend/ :
|
|
||||||
cd frontend && npm run dev # Dev server (port 3000)
|
|
||||||
cd frontend && npm run build:dist # Build production
|
|
||||||
|
|
||||||
# Base de données
|
|
||||||
make db-reset # ⚠️ Supprime et recrée la BDD + migrations + fixtures
|
|
||||||
```
|
|
||||||
|
|
||||||
## Architecture backend
|
|
||||||
|
|
||||||
```
|
|
||||||
src/
|
|
||||||
├── ApiResource/ # Ressources API Platform custom
|
|
||||||
├── Command/ # Commandes Symfony (dont app:seed)
|
|
||||||
├── DataFixtures/ # Fixtures Doctrine
|
|
||||||
├── Dto/ # DTOs (ex: PontBasculeReading)
|
|
||||||
├── Entity/ # Entités Doctrine (= ressources API Platform)
|
|
||||||
├── Exception/ # Exceptions custom (PontBasculeException)
|
|
||||||
├── Kernel.php
|
|
||||||
├── Service/ # Services métier (PontBasculePayloadDecoder…)
|
|
||||||
└── State/ # State providers/processors API Platform
|
|
||||||
```
|
|
||||||
|
|
||||||
## Architecture frontend
|
|
||||||
|
|
||||||
```
|
|
||||||
frontend/
|
|
||||||
├── components/
|
|
||||||
│ ├── ui/ # Composants réutilisables, auto-importés avec préfixe Ui (ex: UiLoadingDots)
|
|
||||||
│ ├── reception/ # Composants métier réception
|
|
||||||
│ ├── shipment/ # Composants métier expédition
|
|
||||||
│ ├── workflow/ # Composants partagés réception/expédition (workflow-weight, workflow-waiting-list, workflow-liot-fields)
|
|
||||||
│ └── commun/ # Composants communs (update-weight)
|
|
||||||
├── composables/ # useApi, useWeighing, usePdfPrinter, useAppVersion, useLiotHandling, useFormDataLoading, useAddressSync, useWorkflowSteps
|
|
||||||
│ └── steps/ # useWeighingStep (logique étape pesée)
|
|
||||||
├── config/ # reception.config.ts, shipment.config.ts (WorkflowConfig)
|
|
||||||
├── types/ # workflow.ts (interfaces partagées WorkflowEntity, WorkflowConfig, StepDefinition)
|
|
||||||
├── services/ # Couche service avec DTOs typés dans services/dto/
|
|
||||||
│ └── workflow-service.ts # Factory service API (createWorkflowService)
|
|
||||||
├── stores/ # Pinia stores (reception, shipment, auth)
|
|
||||||
│ └── workflow-store.ts # Factory store (useWorkflowStoreLogic)
|
|
||||||
├── pages/ # Pages Nuxt (file-based routing)
|
|
||||||
├── layouts/ # Layout default : max-width 1050px
|
|
||||||
├── i18n/locales/ # Traductions (défaut: fr)
|
|
||||||
├── utils/ # Constants, zod-errors helpers
|
|
||||||
└── assets/css/ # Tailwind config, main.css (font Helvetica)
|
|
||||||
```
|
|
||||||
|
|
||||||
## Conventions backend
|
|
||||||
|
|
||||||
- Code en anglais ; "pont-bascule" est un terme métier conservé tel quel.
|
|
||||||
- Les opérations API Platform sont définies directement sur les entités Doctrine.
|
|
||||||
- Pas de classes Repository custom : utiliser `EntityManagerInterface` avec les repos par défaut.
|
|
||||||
- `config/reference.php` est auto-généré — ne pas modifier à la main.
|
|
||||||
- Endpoints toujours au pluriel (convention API Platform).
|
|
||||||
- Ne jamais créer de GET qui crée des ressources : utiliser POST + PATCH.
|
|
||||||
- Les noms de `Supplier`, `Customer` et `Carrier` sont automatiquement mis en majuscule via `mb_strtoupper` dans `setName()`.
|
|
||||||
|
|
||||||
## Conventions frontend
|
|
||||||
|
|
||||||
- SSR désactivé. Tailwind avec palette custom `primary` (ex: `bg-primary-500`).
|
|
||||||
- `useApi` (`composables/useApi.ts`) : méthodes `get/post/put/patch/delete` avec content-types par défaut.
|
|
||||||
- Toasts personnalisables via `toastErrorMessage`/`toastSuccessMessage` ou clés i18n `toastErrorKey`/`toastSuccessKey`.
|
|
||||||
- Utilise `useNuxtApp().$i18n` (pas `useI18n`) pour fonctionner hors setup.
|
|
||||||
- Validation formulaires avec Zod ; helpers dans `utils/zod-errors.ts`.
|
|
||||||
- Nav active : `NuxtLink` avec slot `custom`.
|
|
||||||
- PDFs : `usePdfPrinter` (receipt réception, rapport poids cases).
|
|
||||||
|
|
||||||
### Validation required & erreurs visuelles
|
|
||||||
- Les champs `required` utilisent l'attribut HTML natif forwardé via `v-bind="attrs"` dans les composants UI.
|
|
||||||
- La bordure rouge n'apparaît qu'après soumission grâce à la classe CSS `submitted` ajoutée sur le `<form>` au clic sur le bouton Valider (`@click="submitted = true"`).
|
|
||||||
- Règles CSS globales dans `main.css` : `.submitted :invalid` (bordure + texte rouge), `.submitted :has(:invalid) > label` et `.submitted label:has(:invalid)` (labels rouges).
|
|
||||||
- Pour les validations manuelles (checkboxes, radio groups), les messages d'erreur utilisent `invisible` (pas `hidden`) pour garder l'espace réservé et éviter les décalages de layout.
|
|
||||||
- Les dates de l'API sont renvoyées au format `Y-m-d H:i` ; les formulaires utilisent `.slice(0, 10)` pour extraire la date seule (compatible `<input type="date">`).
|
|
||||||
|
|
||||||
### Workflow réception/expédition (mutualisé)
|
|
||||||
- Factory service `createWorkflowService` et factory store `useWorkflowStoreLogic` pour éviter la duplication.
|
|
||||||
- Composables partagés : `useLiotHandling` (logique LIOT), `useFormDataLoading` (users, trucks, carriers), `useAddressSync` (sync adresse fournisseur/client).
|
|
||||||
- `useWeighing` : une seule fonction paramétrée pour réception et expédition (remplace `useWeighing` + `useWeighingShipment`).
|
|
||||||
- Configs workflow dans `config/reception.config.ts` et `config/shipment.config.ts` (étapes, labels pesée, filename PDF).
|
|
||||||
- `WorkflowWeight` composant partagé pour les étapes de pesée (remplace `reception-weight.vue` et `shipment-weight.vue`).
|
|
||||||
- `WorkflowWaitingList` composant partagé pour les listes en attente, avec support colonnes dynamiques, slot `actions`, et prop `showActions`.
|
|
||||||
|
|
||||||
## Domaine métier clé
|
|
||||||
|
|
||||||
### Réception (pesée pont-bascule)
|
|
||||||
- Entité principale `Reception` : `date_reception` (DateTimeImmutable, format lecture `Y-m-d H:i`, écriture `Y-m-d`), `identification_number` (auto `N-BR-####`), `current_step` (défaut 0), `is_valid` (défaut false).
|
|
||||||
- `Weight` (1-N avec Reception, cascade remove + orphanRemoval) : `type` (`gross`/`tare`), `dsd`, `weight`, `weighed_at`.
|
|
||||||
- Endpoint pesée : `/receptions/weigh` → `PontBasculeReading` (dsd, weight, weighedAt).
|
|
||||||
- Endpoint suppression : `DELETE /receptions/{id}` — supprime en cascade weights, pelletBuildings, bovines.
|
|
||||||
- Parsing payload pont-bascule : `Service/PontBasculePayloadDecoder.php`.
|
|
||||||
- Exception : `PontBasculeException` (messages en français, mappée 500).
|
|
||||||
- Store Pinia `reception.ts` = source de vérité pour la réception en cours.
|
|
||||||
- UI multi-étapes dans `pages/reception/[[id]].vue` basée sur `currentStep`.
|
|
||||||
- `PrePersist` : injecte l'heure courante sur `receptionDate` à la création ; `setReceptionDate` préserve l'heure existante au PATCH.
|
|
||||||
|
|
||||||
### Expédition
|
|
||||||
- Entité `Shipment` : même pattern que Reception, `shipment_date` (format lecture `Y-m-d H:i`, écriture `Y-m-d`).
|
|
||||||
- Endpoint suppression : `DELETE /shipments/{id}`.
|
|
||||||
- `PrePersist` : injecte l'heure courante sur `shipmentDate` ; `setShipmentDate` préserve l'heure au PATCH.
|
|
||||||
|
|
||||||
### LIOT (transport)
|
|
||||||
- Si carrier code = `LIOT` : afficher sélecteurs driver + vehicle, masquer saisie plaque manuelle.
|
|
||||||
- Liste véhicules filtrée par type de camion et transporteur.
|
|
||||||
- Le véhicule sélectionné alimente `license_plate`.
|
|
||||||
- Logique mutualisée dans `composables/useLiotHandling.ts`.
|
|
||||||
|
|
||||||
### Bovins & infrastructure
|
|
||||||
- `Bovine` : `nationalNumber` (unique), `receivedWeight`, `arrivalDate`, `buildingCase` (ManyToOne).
|
|
||||||
- `BuildingCase` a `bovines` (OneToMany).
|
|
||||||
- Rapport PDF cases : `GET /building_cases/{id}/weights-report` → template Twig, projection depuis `arrivalDate`, gain journalier fixe `1.3 kg/jour`.
|
|
||||||
|
|
||||||
### Scanner boucles auriculaires
|
|
||||||
- Page dédiée `/scan` : scan de codes-barres Code 39/128 (boucles auriculaires bovines) depuis un téléphone Android via Chrome.
|
|
||||||
- Utilise l'API native `BarcodeDetector` (Shape Detection API, Chrome Android 83+) — pas de lib JS, décodage hardware quasi-instantané.
|
|
||||||
- **Non supporté sur iOS** (tous les navigateurs iOS utilisent WebKit, qui n'implémente pas `BarcodeDetector`).
|
|
||||||
- Les 4 premiers caractères du code-barres sont retirés avant enregistrement (`rawValue.slice(4)`).
|
|
||||||
- Composable `useBarcodeScanner` : caméra arrière, anti-doublon 2s, vibration au scan.
|
|
||||||
- Le bovin est créé via `POST /bovines` avec `Content-Type: application/ld+json` (nécessaire pour la résolution d'IRI de `buildingCase`).
|
|
||||||
- Sélection bâtiment → case (filtrées dynamiquement) avant de scanner.
|
|
||||||
|
|
||||||
### Données de référence
|
|
||||||
- `ReceptionType`, `MerchandiseType`, `PelletType`, `Building`, `Supplier` (avec `Address` via join table, `createdBy` → User), `Customer` (avec `Address` via join table, `createdBy` → User), `Truck`, `Carrier`, `Driver`, `Vehicle`.
|
|
||||||
- `Address` : champ `label` nullable (déprécié, retiré du front et du `address:write`), expose `fullAddress` via getter. `countryCode` par défaut `FR` côté front.
|
|
||||||
|
|
||||||
### Seed & fixtures
|
|
||||||
- Commande `app:seed` : seed infrastructure (statut, building_layout, building_case, building_case_position) puis bovins.
|
|
||||||
- Utilise des flush intermédiaires pour que les queries find fonctionnent sur les records fraîchement créés.
|
|
||||||
- `upsertAddress` cherche par `street|postalCode` (plus par `label`).
|
|
||||||
- Fixtures : `BuildingInfrastructureFixtures` + `BovineFixtures` (via dépendances `AppFixtures`).
|
|
||||||
|
|
||||||
## Environnement
|
|
||||||
|
|
||||||
- API base dev : `http://localhost:8080/api` (via `NUXT_PUBLIC_API_BASE` dans `frontend/.env`)
|
|
||||||
- CORS : Nelmio, configurable via `CORS_ALLOW_ORIGIN` dans `.env`
|
|
||||||
- Locale par défaut : `fr` — traductions dans `frontend/i18n/locales/fr.json`
|
|
||||||
- Docker env : `docker/.env.docker` (défaut) avec override possible via `docker/.env.docker.local`
|
|
||||||
@@ -20,7 +20,6 @@ security:
|
|||||||
pattern: ^/login_check
|
pattern: ^/login_check
|
||||||
stateless: true
|
stateless: true
|
||||||
provider: app_user_provider
|
provider: app_user_provider
|
||||||
user_checker: App\Security\UserChecker
|
|
||||||
json_login:
|
json_login:
|
||||||
check_path: /login_check
|
check_path: /login_check
|
||||||
username_path: username
|
username_path: username
|
||||||
@@ -31,7 +30,6 @@ security:
|
|||||||
pattern: ^/
|
pattern: ^/
|
||||||
stateless: true
|
stateless: true
|
||||||
provider: app_user_provider
|
provider: app_user_provider
|
||||||
user_checker: App\Security\UserChecker
|
|
||||||
jwt: ~
|
jwt: ~
|
||||||
logout:
|
logout:
|
||||||
path: /api/logout
|
path: /api/logout
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
parameters:
|
parameters:
|
||||||
app.version: '0.0.81'
|
app.version: '0.0.32'
|
||||||
|
|||||||
@@ -7,17 +7,3 @@
|
|||||||
@apply font-sans;
|
@apply font-sans;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@layer utilities {
|
|
||||||
.submitted :invalid {
|
|
||||||
@apply border-red-500 text-red-500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.submitted :has(:invalid) > label {
|
|
||||||
@apply text-red-500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.submitted label:has(:invalid) {
|
|
||||||
@apply text-red-500;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,149 +0,0 @@
|
|||||||
<template>
|
|
||||||
<form :class="{ submitted }" @submit.prevent="validateForm">
|
|
||||||
<div class="flex items-center mb-11 justify-between relative">
|
|
||||||
<div class="flex flex-row absolute -left-[60px] ">
|
|
||||||
<Icon @click="goBack" name="gg:arrow-left-o" size="40" class="cursor-pointer text-primary-500"/>
|
|
||||||
</div>
|
|
||||||
<h1 class="text-3xl text-primary-500 font-bold uppercase">
|
|
||||||
{{ props.address ? "Modification d'une adresse" : "Ajout d'une adresse" }}
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid grid-cols-2 gap-y-16 gap-x-[200px] mb-16">
|
|
||||||
<UiTextInput id="address-street" v-model="form.street" label="Rue" required />
|
|
||||||
<UiTextInput id="address-street2" v-model="form.street2" label="Complément" />
|
|
||||||
<UiTextInput id="address-postalCode" v-model="form.postalCode" label="Code postal" required />
|
|
||||||
<UiSelect
|
|
||||||
id="address-city"
|
|
||||||
v-model="form.city"
|
|
||||||
label="Ville"
|
|
||||||
:options="communeOptions"
|
|
||||||
:loading="isLoadingCities"
|
|
||||||
:disabled="communes.length === 0"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
<UiTextInput id="address-country" v-model="form.countryCode" label="Pays (code)" />
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-center items-center">
|
|
||||||
<UiButton
|
|
||||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
|
|
||||||
type="submit"
|
|
||||||
:disabled="isLoading"
|
|
||||||
@click="submitted = true"
|
|
||||||
>
|
|
||||||
Valider
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import type { AddressPayload } from "~/services/address"
|
|
||||||
import { getCommunesByPostalCode, type CommuneData } from "~/services/geo"
|
|
||||||
|
|
||||||
const route = useRoute()
|
|
||||||
const router = useRouter()
|
|
||||||
|
|
||||||
const props = defineProps<{
|
|
||||||
type?: "supplier" | "customer",
|
|
||||||
address?: AddressPayload | null
|
|
||||||
}>()
|
|
||||||
|
|
||||||
const isLoading = ref(false)
|
|
||||||
const submitted = ref(false)
|
|
||||||
const communes = ref<CommuneData[]>([])
|
|
||||||
const isLoadingCities = ref(false)
|
|
||||||
|
|
||||||
const communeOptions = computed(() =>
|
|
||||||
communes.value.map(c => ({ value: c.nom, label: c.nom }))
|
|
||||||
)
|
|
||||||
|
|
||||||
const emptyForm = (): AddressPayload => ({
|
|
||||||
street: "",
|
|
||||||
street2: null,
|
|
||||||
postalCode: "",
|
|
||||||
city: "",
|
|
||||||
countryCode: "FR",
|
|
||||||
})
|
|
||||||
|
|
||||||
const form = reactive<AddressPayload>(emptyForm())
|
|
||||||
|
|
||||||
const backPath = computed(() => {
|
|
||||||
if (props.type === "customer") {
|
|
||||||
const customerId = Number(route.query.customerId)
|
|
||||||
return Number.isFinite(customerId) && customerId > 0
|
|
||||||
? `/admin/customer/${customerId}`
|
|
||||||
: "/admin/customer/customer-list"
|
|
||||||
}
|
|
||||||
|
|
||||||
const supplierId = Number(route.query.supplierId)
|
|
||||||
return Number.isFinite(supplierId) && supplierId > 0
|
|
||||||
? `/admin/supplier/${supplierId}`
|
|
||||||
: "/admin/supplier/supplier-list"
|
|
||||||
})
|
|
||||||
|
|
||||||
const hydrateForm = (address?: AddressPayload | null) => {
|
|
||||||
const data = address ?? emptyForm()
|
|
||||||
form.street = data.street ?? ""
|
|
||||||
form.street2 = data.street2 ?? null
|
|
||||||
form.postalCode = data.postalCode ?? ""
|
|
||||||
form.city = data.city ?? ""
|
|
||||||
form.countryCode = data.countryCode || "FR"
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => props.address,
|
|
||||||
(addr) => {
|
|
||||||
hydrateForm(addr)
|
|
||||||
},
|
|
||||||
{ immediate: true }
|
|
||||||
)
|
|
||||||
|
|
||||||
let debounceTimer: ReturnType<typeof setTimeout> | null = null
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => form.postalCode,
|
|
||||||
(cp) => {
|
|
||||||
if (debounceTimer) clearTimeout(debounceTimer)
|
|
||||||
|
|
||||||
if (!cp || cp.length < 5) {
|
|
||||||
communes.value = []
|
|
||||||
form.city = ''
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cp.length === 5) {
|
|
||||||
debounceTimer = setTimeout(async () => {
|
|
||||||
isLoadingCities.value = true
|
|
||||||
const previousCity = form.city
|
|
||||||
try {
|
|
||||||
communes.value = await getCommunesByPostalCode(cp)
|
|
||||||
|
|
||||||
if (communes.value.length === 1) {
|
|
||||||
form.city = communes.value[0].nom
|
|
||||||
} else if (communes.value.some(c => c.nom === previousCity)) {
|
|
||||||
form.city = previousCity
|
|
||||||
} else {
|
|
||||||
form.city = ''
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
isLoadingCities.value = false
|
|
||||||
}
|
|
||||||
}, 300)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
const validateForm = () => {
|
|
||||||
if (isLoading.value) return
|
|
||||||
emit("validate", {...form})
|
|
||||||
}
|
|
||||||
|
|
||||||
const goBack = () => {
|
|
||||||
router.push(backPath.value)
|
|
||||||
}
|
|
||||||
|
|
||||||
const emit = defineEmits<{
|
|
||||||
(event: 'validate', form: AddressPayload): void
|
|
||||||
}>()
|
|
||||||
</script>
|
|
||||||
@@ -2,22 +2,22 @@
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<NuxtLink :to="link">
|
<NuxtLink :to="link">
|
||||||
<div class="w-[300px] h-[216px] border border-primary-700 rounded-lg p-6 flex flex-col justify-between gap-4">
|
<div class="w-[324px] h-[228px] border border-black rounded-md p-6 flex flex-col justify-between">
|
||||||
<div class="flex justify-between">
|
<div class="flex justify-between">
|
||||||
<div class="rounded-full w-[80px] h-[80px] bg-[#D9D9D9] flex justify-center items-center">
|
<div class="rounded-full w-[80px] h-[80px] bg-neutral-400 flex justify-center items-center">
|
||||||
<Icon :name="iconName" class="!text-primary-700" size="44" />
|
<Icon :name="iconName" style="color: black" size="44" />
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<Icon name="mdi:plus" style="color: black" size="44" />
|
<Icon name="mdi:plus" style="color: black" size="44" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="uppercase font-bold">
|
<div class="uppercase font-bold">
|
||||||
<p class="text-3xl text-primary-700">
|
<p class="text-3xl"> {{ label }} </p>
|
||||||
<slot name="label">{{ label }}</slot>
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</NuxtLink>
|
</NuxtLink>
|
||||||
|
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
@@ -27,3 +27,4 @@ const props = defineProps<{
|
|||||||
label: string
|
label: string
|
||||||
}>()
|
}>()
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -1,65 +0,0 @@
|
|||||||
<template>
|
|
||||||
<form>
|
|
||||||
<div class="grid grid-cols-3 gap-x-40 gap-y-8 mb-8">
|
|
||||||
<UiNumberInput
|
|
||||||
:key="localWeight.type"
|
|
||||||
:label="'POIDS'"
|
|
||||||
labelClass="font-bold uppercase text-xl "
|
|
||||||
v-model="localWeight.weight"
|
|
||||||
:disabled="!isAdmin"
|
|
||||||
:min="0"
|
|
||||||
wrapper-class="flex-col"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
|
|
||||||
<UiDateInput
|
|
||||||
label="Date de pesée"
|
|
||||||
v-model="localWeight.weighedAt"
|
|
||||||
:disabled="!isAdmin"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
|
|
||||||
<UiNumberInput
|
|
||||||
label="Dsd"
|
|
||||||
class="col-start-2"
|
|
||||||
labelClass="font-bold uppercase"
|
|
||||||
v-model="localWeight.dsd"
|
|
||||||
:disabled="!isAdmin"
|
|
||||||
wrapper-class="flex-col"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import type {WeightEntryData} from '~/services/dto/weight-data'
|
|
||||||
import {reactive, watch} from "vue";
|
|
||||||
|
|
||||||
const props = defineProps<{
|
|
||||||
modelValue: WeightEntryData
|
|
||||||
isAdmin: boolean
|
|
||||||
}>()
|
|
||||||
|
|
||||||
const emit = defineEmits<{
|
|
||||||
(event: 'update:modelValue', value: WeightEntryData): void
|
|
||||||
}>()
|
|
||||||
|
|
||||||
const localWeight = reactive<WeightEntryData>({...props.modelValue})
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => props.modelValue,
|
|
||||||
(value) => {
|
|
||||||
Object.assign(localWeight, value)
|
|
||||||
},
|
|
||||||
{deep: true}
|
|
||||||
)
|
|
||||||
|
|
||||||
watch(
|
|
||||||
localWeight,
|
|
||||||
(value) => {
|
|
||||||
emit('update:modelValue', {...value})
|
|
||||||
},
|
|
||||||
{deep: true}
|
|
||||||
)
|
|
||||||
</script>
|
|
||||||
@@ -1,26 +1,21 @@
|
|||||||
<template>
|
<template>
|
||||||
<form
|
<div
|
||||||
v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"
|
v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"
|
||||||
class="flex flex-col gap-16"
|
class="flex flex-col items-center gap-16">
|
||||||
@submit.prevent="goNext"
|
<h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
|
||||||
>
|
|
||||||
<h1 class="text-4xl uppercase font-bold text-primary-500">Sélection des races réceptionnées</h1>
|
|
||||||
<div
|
<div
|
||||||
class="flex flex-row gap-8 items-center w-full">
|
class="flex flex-row gap-8 items-center">
|
||||||
<div
|
<div
|
||||||
v-for="type in bovineType"
|
v-for="type in bovineType"
|
||||||
:key="type.id"
|
:key="type.id"
|
||||||
class="mt-8 flex flex-row mb-2 w-full">
|
class="mt-8 flex flex-row mb-2 gap-6">
|
||||||
<UiNumberInput
|
<UiNumberInput
|
||||||
:id="type.id"
|
|
||||||
:label="type.label"
|
:label="type.label"
|
||||||
:code="type.code"
|
:code="type.code"
|
||||||
v-model="bovineQuantities[String(type.id)]"
|
v-model="bovineQuantities[String(type.id)]"
|
||||||
:placeholder="0"
|
:placeholder="0"
|
||||||
:min="0"
|
:min="0"
|
||||||
:max="10"
|
:max="10"
|
||||||
class="max-w-[150px]"
|
|
||||||
wrapper-class="gap-3"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
@@ -28,22 +23,15 @@
|
|||||||
<UiNumberInput
|
<UiNumberInput
|
||||||
label="Autres"
|
label="Autres"
|
||||||
v-model="otherQuantity"
|
v-model="otherQuantity"
|
||||||
class="max-w-[80px]"
|
|
||||||
wrapper-class="gap-3"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p class="text-red-500 text-sm" :class="showBovineError ? '' : 'invisible'">
|
<button
|
||||||
Veuillez saisir au moins une race bovine.
|
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||||
</p>
|
@click="goNext"
|
||||||
<div class="flex justify-center">
|
>Peser
|
||||||
<UiButton
|
</button>
|
||||||
type="submit"
|
</div>
|
||||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
|
|
||||||
>Valider
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import type {BovineTypeData} from "~/services/dto/bovine-type-data";
|
import type {BovineTypeData} from "~/services/dto/bovine-type-data";
|
||||||
@@ -62,7 +50,6 @@ const toast = useToast()
|
|||||||
const isLoadingBovineType = ref(false)
|
const isLoadingBovineType = ref(false)
|
||||||
const bovineType = ref<BovineTypeData[]>([])
|
const bovineType = ref<BovineTypeData[]>([])
|
||||||
const receptionStore = useReceptionStore()
|
const receptionStore = useReceptionStore()
|
||||||
const showBovineError = ref(false)
|
|
||||||
const bovineQuantities = reactive<Record<string, number | null>>({})
|
const bovineQuantities = reactive<Record<string, number | null>>({})
|
||||||
const otherQuantity = ref<number | null>(0)
|
const otherQuantity = ref<number | null>(0)
|
||||||
const receptionId = computed(() => receptionStore.current?.id ?? null)
|
const receptionId = computed(() => receptionStore.current?.id ?? null)
|
||||||
@@ -90,14 +77,14 @@ onMounted(async () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
[() => receptionId.value, () => bovineType.value],
|
() => receptionId.value,
|
||||||
async ([id, types]) => {
|
async (id) => {
|
||||||
if (!id || !receptionIri.value || types.length === 0) {
|
if (!id || !receptionIri.value) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
const selectionMap: Record<string, number | null> = {}
|
const selectionMap: Record<string, number | null> = {}
|
||||||
for (const type of types) {
|
for (const type of bovineType.value) {
|
||||||
selectionMap[String(type.id)] = 0
|
selectionMap[String(type.id)] = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -174,13 +161,7 @@ async function goNext() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
showBovineError.value = false
|
// @TODO Ajouter un composable pour le toaster qui gère les key i18n
|
||||||
|
|
||||||
if (totalBovines.value === 0) {
|
|
||||||
showBovineError.value = true
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (totalBovines.value > 52) {
|
if (totalBovines.value > 52) {
|
||||||
toast.error({
|
toast.error({
|
||||||
title: 'Erreur',
|
title: 'Erreur',
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
<template>
|
<template>
|
||||||
<form ref="formRef" :class="{ submitted }" @submit.prevent="validate">
|
<form @submit.prevent="validate">
|
||||||
<div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 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 col-start-1 row-start-1 text-primary-500">Réception</h1>
|
<h1 class="font-bold text-5xl uppercase col-start-1 row-start-1">Réception</h1>
|
||||||
|
<!-- Nom de l'utilisateur -->
|
||||||
<UiSelect
|
<UiSelect
|
||||||
id="reception-user"
|
id="reception-user"
|
||||||
v-model="form.userId"
|
v-model="form.userId"
|
||||||
@@ -12,15 +13,15 @@
|
|||||||
}))"
|
}))"
|
||||||
:loading="isLoadingUsers"
|
:loading="isLoadingUsers"
|
||||||
wrapper-class="col-start-1 row-start-2"
|
wrapper-class="col-start-1 row-start-2"
|
||||||
required
|
|
||||||
/>
|
/>
|
||||||
|
<!-- Date de réception -->
|
||||||
<UiDateInput
|
<UiDateInput
|
||||||
id="reception-date"
|
id="reception-date"
|
||||||
v-model="form.receptionDate"
|
v-model="form.receptionDate"
|
||||||
label="Date de réception"
|
label="Date de réception"
|
||||||
wrapper-class="col-start-1 row-start-3"
|
wrapper-class="col-start-1 row-start-3"
|
||||||
required
|
|
||||||
/>
|
/>
|
||||||
|
<!-- Type de réception -->
|
||||||
<UiSelect
|
<UiSelect
|
||||||
id="reception-type"
|
id="reception-type"
|
||||||
v-model="form.receptionTypeId"
|
v-model="form.receptionTypeId"
|
||||||
@@ -30,8 +31,8 @@
|
|||||||
label: type.label
|
label: type.label
|
||||||
}))"
|
}))"
|
||||||
wrapper-class="col-start-1 row-start-4"
|
wrapper-class="col-start-1 row-start-4"
|
||||||
required
|
|
||||||
/>
|
/>
|
||||||
|
<!-- Fournisseur -->
|
||||||
<UiSelect
|
<UiSelect
|
||||||
id="reception-supplier"
|
id="reception-supplier"
|
||||||
v-model="form.supplierId"
|
v-model="form.supplierId"
|
||||||
@@ -42,17 +43,20 @@
|
|||||||
}))"
|
}))"
|
||||||
:loading="isLoadingSuppliers"
|
:loading="isLoadingSuppliers"
|
||||||
wrapper-class="col-start-1 row-start-5"
|
wrapper-class="col-start-1 row-start-5"
|
||||||
required
|
|
||||||
/>
|
/>
|
||||||
|
<!-- Adresse fournisseur -->
|
||||||
<UiSelect
|
<UiSelect
|
||||||
id="reception-address"
|
id="reception-address"
|
||||||
v-model="form.addressId"
|
v-model="form.addressId"
|
||||||
label="Adresse"
|
label="Adresse"
|
||||||
:options="addressOptions"
|
:options="supplierAddresses.map((address) => ({
|
||||||
:disabled="isLoadingSuppliers || ownerAddresses.length === 0"
|
value: String(address.id),
|
||||||
|
label: address.fullAddress
|
||||||
|
}))"
|
||||||
|
:disabled="isLoadingSuppliers || supplierAddresses.length === 0"
|
||||||
wrapper-class="col-start-2 row-start-1"
|
wrapper-class="col-start-2 row-start-1"
|
||||||
required
|
|
||||||
/>
|
/>
|
||||||
|
<!-- Camion -->
|
||||||
<UiSelect
|
<UiSelect
|
||||||
id="reception-truck"
|
id="reception-truck"
|
||||||
v-model="form.truckId"
|
v-model="form.truckId"
|
||||||
@@ -63,8 +67,8 @@
|
|||||||
}))"
|
}))"
|
||||||
:loading="isLoadingTrucks"
|
:loading="isLoadingTrucks"
|
||||||
wrapper-class="col-start-2 row-start-2"
|
wrapper-class="col-start-2 row-start-2"
|
||||||
required
|
|
||||||
/>
|
/>
|
||||||
|
<!-- Transporteur -->
|
||||||
<UiSelect
|
<UiSelect
|
||||||
id="reception-carrier"
|
id="reception-carrier"
|
||||||
v-model="form.carrierId"
|
v-model="form.carrierId"
|
||||||
@@ -76,15 +80,27 @@
|
|||||||
:loading="isLoadingCarriers"
|
:loading="isLoadingCarriers"
|
||||||
select-class="h-[34px]"
|
select-class="h-[34px]"
|
||||||
wrapper-class="col-start-2 row-start-3"
|
wrapper-class="col-start-2 row-start-3"
|
||||||
required
|
|
||||||
/>
|
/>
|
||||||
<div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
|
<!-- 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"
|
||||||
required
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- Immatriculation (LIOT) -->
|
||||||
<UiSelect
|
<UiSelect
|
||||||
v-if="isLiotCarrier"
|
v-if="isLiotCarrier"
|
||||||
id="reception-vehicle"
|
id="reception-vehicle"
|
||||||
@@ -96,53 +112,54 @@
|
|||||||
}))"
|
}))"
|
||||||
:loading="isLoadingVehicles"
|
:loading="isLoadingVehicles"
|
||||||
:disabled="isLoadingVehicles || filteredVehicles.length === 0"
|
:disabled="isLoadingVehicles || filteredVehicles.length === 0"
|
||||||
wrapper-class="col-start-2 row-start-4 h-[64px]"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
<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"
|
|
||||||
v-if="isLiotCarrier"
|
|
||||||
wrapper-class="col-start-2 row-start-5"
|
wrapper-class="col-start-2 row-start-5"
|
||||||
required
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex justify-center">
|
<div class="flex justify-center">
|
||||||
<UiButton
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
class="text-xl mb-16 uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
|
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
|
||||||
@click="submitted = true"
|
>Peser
|
||||||
>Valider
|
</button>
|
||||||
</UiButton>
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { useReceptionStore } from '~/stores/reception'
|
import {useReceptionStore} from '~/stores/reception'
|
||||||
import { useFormDataLoading } from '~/composables/useFormDataLoading'
|
import type {ReceptionTypeData} from '~/services/dto/reception-type-data'
|
||||||
import { useLiotHandling } from '~/composables/useLiotHandling'
|
import {getReceptionTypeList} from '~/services/reception-type'
|
||||||
import { useAddressSync } from '~/composables/useAddressSync'
|
import type {UserData} from '~/services/dto/user-data'
|
||||||
import type { ReceptionTypeData } from '~/services/dto/reception-type-data'
|
import {getUsers} from '~/services/auth'
|
||||||
import { getReceptionTypeList } from '~/services/reception-type'
|
import {useAuthStore} from '~/stores/auth'
|
||||||
import type { SupplierData } from '~/services/dto/supplier-data'
|
import type {SupplierData} from '~/services/dto/supplier-data'
|
||||||
import { getSupplierList } from '~/services/supplier'
|
import {getSupplierList} from '~/services/supplier'
|
||||||
import { RECEPTION_TYPE_CODES } from '~/utils/constants'
|
import type {TruckData} from '~/services/dto/truck-data'
|
||||||
import { deleteReceptionBovine, getReceptionBovineList } from '~/services/reception-bovine'
|
import {getTruckList} from '~/services/truck'
|
||||||
import type { ReceptionFormData } from '~/services/dto/reception-data'
|
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 {RECEPTION_TYPE_CODES, SUPLLIER_CODE} from "~/utils/constants";
|
||||||
|
import {deleteReceptionBovine, getReceptionBovineList} from "~/services/reception-bovine";
|
||||||
|
|
||||||
|
type ReceptionFormData = {
|
||||||
|
licensePlate: 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 isHydrating = ref(false)
|
|
||||||
const submitted = ref(false)
|
|
||||||
const formRef = ref<HTMLFormElement | null>(null)
|
|
||||||
|
|
||||||
const form = reactive<ReceptionFormData>({
|
const form = reactive<ReceptionFormData>({
|
||||||
licensePlate: '',
|
licensePlate: '',
|
||||||
receptionDate: new Date().toISOString().slice(0, 10),
|
receptionDate: new Date().toISOString().slice(0, 10),
|
||||||
@@ -155,27 +172,62 @@ const form = reactive<ReceptionFormData>({
|
|||||||
driverId: '',
|
driverId: '',
|
||||||
vehicleId: ''
|
vehicleId: ''
|
||||||
})
|
})
|
||||||
|
const allowAnyLicensePlate = ref(false)
|
||||||
const receptionTypes = ref<ReceptionTypeData[]>([])
|
const receptionTypes = ref<ReceptionTypeData[]>([])
|
||||||
|
const users = ref<UserData[]>([])
|
||||||
|
const isLoadingUsers = ref(false)
|
||||||
const suppliers = ref<SupplierData[]>([])
|
const suppliers = ref<SupplierData[]>([])
|
||||||
const isLoadingSuppliers = ref(false)
|
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)
|
||||||
|
|
||||||
const { users, trucks, carriers, isLoadingUsers, isLoadingTrucks, isLoadingCarriers, loadCommonData } =
|
// Transporteur sélectionné dans le formulaire
|
||||||
useFormDataLoading(form)
|
const selectedCarrier = computed(() =>
|
||||||
|
carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
|
||||||
const {
|
)
|
||||||
isLiotCarrier, filteredDrivers, filteredVehicles,
|
// Indique si le transporteur est LIOT
|
||||||
isLoadingDrivers, isLoadingVehicles, allowAnyLicensePlate,
|
const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPLLIER_CODE.LIOT)
|
||||||
loadDrivers, loadVehicles
|
// Adresses disponibles pour le fournisseur sélectionné
|
||||||
} = useLiotHandling(form, carriers, isHydrating)
|
const supplierAddresses = computed(() => {
|
||||||
|
const supplierId = Number(form.supplierId)
|
||||||
const supplierIdRef = computed(() => form.supplierId)
|
if (!Number.isFinite(supplierId)) {
|
||||||
const { ownerAddresses, addressOptions } = useAddressSync(form, supplierIdRef, suppliers)
|
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)
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
const selectedReceptionType = computed(() =>
|
const selectedReceptionType = computed(() =>
|
||||||
receptionTypes.value.find((type) => String(type.id) === form.receptionTypeId) ?? null
|
receptionTypes.value.find((type) => String(type.id) === form.receptionTypeId) ?? null
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Supprime les données bovines si on change de type de réception
|
||||||
const clearReceptionBovines = async (receptionIri: string) => {
|
const clearReceptionBovines = async (receptionIri: string) => {
|
||||||
const existing = await getReceptionBovineList(receptionIri)
|
const existing = await getReceptionBovineList(receptionIri)
|
||||||
for (const selection of existing) {
|
for (const selection of existing) {
|
||||||
@@ -183,6 +235,50 @@ const clearReceptionBovines = async (receptionIri: string) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Hydrate le formulaire depuis la réception en cours
|
||||||
|
watch(
|
||||||
|
() => receptionStore.current,
|
||||||
|
(reception) => {
|
||||||
|
isHydrating.value = true
|
||||||
|
form.licensePlate = reception?.licensePlate ?? ''
|
||||||
|
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}
|
||||||
|
)
|
||||||
|
|
||||||
|
// 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 () => {
|
const loadSuppliers = async () => {
|
||||||
isLoadingSuppliers.value = true
|
isLoadingSuppliers.value = true
|
||||||
try {
|
try {
|
||||||
@@ -192,33 +288,182 @@ const loadSuppliers = async () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
watch(
|
// Charge la liste des camions pour le select
|
||||||
() => receptionStore.current,
|
const loadTrucks = async () => {
|
||||||
(reception) => {
|
isLoadingTrucks.value = true
|
||||||
isHydrating.value = true
|
try {
|
||||||
form.licensePlate = reception?.licensePlate ?? ''
|
trucks.value = await getTruckList()
|
||||||
form.receptionDate = reception?.receptionDate?.slice(0, 10) ?? new Date().toISOString().slice(0, 10)
|
} finally {
|
||||||
form.receptionTypeId = reception?.receptionType?.id ? String(reception.receptionType.id) : ''
|
isLoadingTrucks.value = false
|
||||||
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 }
|
|
||||||
)
|
|
||||||
|
|
||||||
|
// 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 () => {
|
onMounted(async () => {
|
||||||
receptionTypes.value = await getReceptionTypeList()
|
receptionTypes.value = await getReceptionTypeList()
|
||||||
|
await loadUsers()
|
||||||
await loadSuppliers()
|
await loadSuppliers()
|
||||||
await loadCommonData()
|
await loadTrucks()
|
||||||
|
await loadCarriers()
|
||||||
await loadDrivers()
|
await loadDrivers()
|
||||||
await loadVehicles()
|
await loadVehicles()
|
||||||
|
await authStore.ensureSession()
|
||||||
|
setDefaultUser()
|
||||||
})
|
})
|
||||||
|
|
||||||
const buildPayload = () => {
|
// 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() {
|
||||||
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 normalizedReceptionTypeId = form.receptionTypeId.trim()
|
||||||
@@ -228,16 +473,29 @@ const buildPayload = () => {
|
|||||||
const normalizedTruckId = form.truckId.trim()
|
const normalizedTruckId = form.truckId.trim()
|
||||||
const normalizedCarrierId = form.carrierId.trim()
|
const normalizedCarrierId = form.carrierId.trim()
|
||||||
const normalizedDriverId = form.driverId.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 receptionTypeIri = normalizedReceptionTypeId ? `/api/reception_types/${normalizedReceptionTypeId}` : null
|
const basePayload = {
|
||||||
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
|
|
||||||
|
|
||||||
return {
|
|
||||||
licensePlate: normalizedLicensePlate,
|
licensePlate: normalizedLicensePlate,
|
||||||
receptionDate: normalizedReceptionDate,
|
receptionDate: normalizedReceptionDate,
|
||||||
receptionType: receptionTypeIri,
|
receptionType: receptionTypeIri,
|
||||||
@@ -245,35 +503,13 @@ const buildPayload = () => {
|
|||||||
supplier: supplierIri,
|
supplier: supplierIri,
|
||||||
address: addressIri,
|
address: addressIri,
|
||||||
truck: truckIri,
|
truck: truckIri,
|
||||||
carrier: carrierIri,
|
carrier: carrierIri
|
||||||
...(isLiotCarrier.value && driverIri ? { driver: driverIri } : {})
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
const saveDraft = async () => {
|
const payload = {
|
||||||
const payload = buildPayload()
|
...basePayload,
|
||||||
if (!receptionStore.current) {
|
...(isLiotCarrier.value && driverIri ? {driver: driverIri} : {})
|
||||||
await receptionStore.createReception({
|
|
||||||
currentStep: 0,
|
|
||||||
...payload
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
await receptionStore.updateReception(receptionStore.current.id, {
|
|
||||||
currentStep: receptionStore.current.currentStep,
|
|
||||||
...payload
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
const validateFields = () => {
|
|
||||||
submitted.value = true
|
|
||||||
return formRef.value?.reportValidity() ?? false
|
|
||||||
}
|
|
||||||
|
|
||||||
defineExpose({ saveDraft, validateFields })
|
|
||||||
|
|
||||||
async function validate() {
|
|
||||||
const payload = buildPayload()
|
|
||||||
|
|
||||||
if (!receptionStore.current) {
|
if (!receptionStore.current) {
|
||||||
const created = await receptionStore.createReception({
|
const created = await receptionStore.createReception({
|
||||||
@@ -302,4 +538,5 @@ async function validate() {
|
|||||||
...payload
|
...payload
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,16 +1,15 @@
|
|||||||
<template>
|
<template>
|
||||||
<form :class="['flex flex-col items-center gap-16', { submitted }]" @submit.prevent="goNext">
|
<div class="flex flex-col items-center gap-16">
|
||||||
<div
|
<div
|
||||||
v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"
|
v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"
|
||||||
class="flex flex-col gap-16 items-center w-full">
|
class="flex flex-col gap-16 items-center w-full">
|
||||||
<h1 class="text-4xl uppercase font-bold text-primary-500">Sélection des marchandises réceptionnnées</h1>
|
<h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
|
||||||
<UiSelect
|
<UiSelect
|
||||||
id="merchandise-type"
|
id="merchandise-type"
|
||||||
v-model="selectedMerchandiseTypeId"
|
v-model="selectedMerchandiseTypeId"
|
||||||
label="Type de marchandises"
|
label="Type de marchandises"
|
||||||
:options="merchandiseTypes.map((type) => ({ value: String(type.id), label: type.label }))"
|
:options="merchandiseTypes.map((type) => ({ value: String(type.id), label: type.label }))"
|
||||||
wrapper-class="w-[550px]"
|
wrapper-class="w-[550px]"
|
||||||
required
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
v-if="selectedMerchandiseTypeId && isAutres"
|
v-if="selectedMerchandiseTypeId && isAutres"
|
||||||
@@ -22,30 +21,24 @@
|
|||||||
label="Préciser"
|
label="Préciser"
|
||||||
placeholder="Précisions complémentaires"
|
placeholder="Précisions complémentaires"
|
||||||
:maxlength="255"
|
:maxlength="255"
|
||||||
required
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
v-if="selectedMerchandiseTypeId && !isGranule"
|
v-if="selectedMerchandiseTypeId && !isGranule"
|
||||||
class="flex flex-col gap-4 w-[550px]"
|
class="flex gap-4 w-[550px] justify-evenly"
|
||||||
>
|
>
|
||||||
<div class="flex gap-4 justify-between">
|
<div
|
||||||
<div
|
v-for="building in buildings"
|
||||||
v-for="building in buildings"
|
:key="building.id"
|
||||||
:key="building.id"
|
>
|
||||||
>
|
<UiCheckbox
|
||||||
<UiCheckbox
|
v-model="selectedBuildingIds"
|
||||||
v-model="selectedBuildingIds"
|
:value="String(building.id)"
|
||||||
:value="String(building.id)"
|
:label="building.label"
|
||||||
:label="building.label"
|
label-class="text-xl"
|
||||||
label-class="text-xl"
|
/>
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<p class="text-red-500 text-sm" :class="showBuildingError ? '' : 'invisible'">
|
|
||||||
Veuillez sélectionner au moins un bâtiment.
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@@ -54,35 +47,29 @@
|
|||||||
>
|
>
|
||||||
<div class="grid grid-cols-1 gap-10 md:grid-cols-4">
|
<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">
|
<div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4">
|
||||||
<p class="font-bold uppercase text-primary-500">{{ type.label }}</p>
|
<p class="font-bold uppercase">{{ type.label }}</p>
|
||||||
<div
|
<div
|
||||||
v-for="building in buildings"
|
v-for="building in buildings"
|
||||||
:key="building.id"
|
:key="building.id"
|
||||||
class="flex items-center gap-2 text-lg pl-[2px]"
|
class="flex items-center gap-2 text-lg"
|
||||||
>
|
>
|
||||||
<UiCheckbox
|
<UiCheckbox
|
||||||
v-model="selectedPelletBuildingIds[String(type.id)]"
|
v-model="selectedPelletBuildingIds[String(type.id)]"
|
||||||
:value="String(building.id)"
|
:value="String(building.id)"
|
||||||
:label="building.label"
|
:label="building.label"
|
||||||
label-class="text-xl"
|
label-class="text-lg"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p class="text-red-500 text-sm" :class="showBuildingError ? '' : 'invisible'">
|
|
||||||
Veuillez sélectionner au moins un bâtiment.
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex justify-center">
|
<button
|
||||||
<UiButton
|
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||||
type="submit"
|
@click="goNext"
|
||||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
|
>Peser
|
||||||
@click="submitted = true"
|
</button>
|
||||||
>Valider
|
</div>
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
@@ -110,9 +97,6 @@ const selectedMerchandiseTypeId = ref('')
|
|||||||
const selectedBuildingIds = ref<string[]>([])
|
const selectedBuildingIds = ref<string[]>([])
|
||||||
const selectedPelletBuildingIds = ref<Record<string, string[]>>({})
|
const selectedPelletBuildingIds = ref<Record<string, string[]>>({})
|
||||||
const merchandiseDetail = ref('')
|
const merchandiseDetail = ref('')
|
||||||
const submitted = ref(false)
|
|
||||||
const showBuildingError = ref(false)
|
|
||||||
const showPelletBuildingError = ref(false)
|
|
||||||
|
|
||||||
// Extrait l'ID d'une relation depuis un IRI ou un objet complet.
|
// Extrait l'ID d'une relation depuis un IRI ou un objet complet.
|
||||||
const getRelationId = (value: unknown): string | null => {
|
const getRelationId = (value: unknown): string | null => {
|
||||||
@@ -195,23 +179,6 @@ async function goNext() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
showBuildingError.value = false
|
|
||||||
showPelletBuildingError.value = false
|
|
||||||
|
|
||||||
if (!isGranule.value && !isAutres.value && selectedBuildingIds.value.length === 0) {
|
|
||||||
showBuildingError.value = true
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isGranule.value) {
|
|
||||||
const hasAnyPelletBuilding = Object.values(selectedPelletBuildingIds.value)
|
|
||||||
.some((ids) => ids.length > 0)
|
|
||||||
if (!hasAnyPelletBuilding) {
|
|
||||||
showPelletBuildingError.value = true
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const nextStep = receptionStore.current.currentStep + 1
|
const nextStep = receptionStore.current.currentStep + 1
|
||||||
const receptionIri = `/api/receptions/${receptionStore.current.id}`
|
const receptionIri = `/api/receptions/${receptionStore.current.id}`
|
||||||
|
|
||||||
|
|||||||
99
frontend/components/reception/reception-weight.vue
Normal file
99
frontend/components/reception/reception-weight.vue
Normal file
@@ -0,0 +1,99 @@
|
|||||||
|
<template>
|
||||||
|
<div class="flex justify-center">
|
||||||
|
<div class="flex flex-col items-center w-[660px]">
|
||||||
|
<h1 class="font-bold text-5xl uppercase">{{ title }}</h1>
|
||||||
|
<!--@TODO Voir comment faire pour savoir si le pont-bascule et bien connecté + ajouter un icon comme sur la maquette-->
|
||||||
|
<p class="text-primary-500 uppercase text-2xl mt-2">Pont-bascule connecté</p>
|
||||||
|
<div
|
||||||
|
v-if="showLoadingBox"
|
||||||
|
class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[86px]">
|
||||||
|
<UiLoadingDots />
|
||||||
|
</div>
|
||||||
|
<div v-else-if="displayWeight !== null" class="w-full">
|
||||||
|
<div
|
||||||
|
class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl">
|
||||||
|
{{ displayWeight }} kg
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="flex justify-center mt-[54px]">
|
||||||
|
<button
|
||||||
|
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||||
|
@click="fetchWeight"
|
||||||
|
>{{ displayWeight !== null ? 'refaire une pesee' : 'peser' }}</button>
|
||||||
|
<button
|
||||||
|
v-if="displayWeight !== null && !showGenerateReceipt"
|
||||||
|
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
|
||||||
|
@click="saveWeight"
|
||||||
|
>Valider la pesée</button>
|
||||||
|
<button
|
||||||
|
v-if="showGenerateReceipt"
|
||||||
|
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
|
||||||
|
@click="printReceipt"
|
||||||
|
>Générer le bon</button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed } from 'vue'
|
||||||
|
import { storeToRefs } from 'pinia'
|
||||||
|
import { useWeighing } from '~/composables/useWeighing'
|
||||||
|
import { usePdfPrinter } from '~/composables/usePdfPrinter'
|
||||||
|
import { useReceptionStore } from '~/stores/reception'
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
mode: 'gross' | 'tare'
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const router = useRouter()
|
||||||
|
const receptionStore = useReceptionStore()
|
||||||
|
const { current: storeReception } = storeToRefs(receptionStore)
|
||||||
|
const { printPdf } = usePdfPrinter()
|
||||||
|
const {
|
||||||
|
displayWeight,
|
||||||
|
title,
|
||||||
|
showLoadingBox,
|
||||||
|
fetchWeight,
|
||||||
|
saveWeight
|
||||||
|
} = useWeighing({
|
||||||
|
mode: props.mode,
|
||||||
|
reception: storeReception,
|
||||||
|
updateReception: receptionStore.updateReception,
|
||||||
|
loadReception: receptionStore.loadReception
|
||||||
|
})
|
||||||
|
// Affiche le bouton de génération du bon à l'étape tare
|
||||||
|
const showGenerateReceipt = computed(
|
||||||
|
() => props.mode === 'tare' && displayWeight.value !== null
|
||||||
|
)
|
||||||
|
|
||||||
|
// Génère le bon de réception, puis clôture la réception
|
||||||
|
const printReceipt = async () => {
|
||||||
|
if (!import.meta.client || !receptionStore.current) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
await saveWeight()
|
||||||
|
await printPdf(`/receptions/${receptionStore.current.id}/receipt`)
|
||||||
|
|
||||||
|
// Laisse le temps a la boite de dialogue d'impression de s'ouvrir.
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 600))
|
||||||
|
|
||||||
|
const result = await receptionStore.updateReception(receptionStore.current.id, {
|
||||||
|
isValid: true
|
||||||
|
})
|
||||||
|
if (!result) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
receptionStore.clearCurrent()
|
||||||
|
await router.push('/')
|
||||||
|
}
|
||||||
|
|
||||||
|
// Récupère le poids dès l'arrivée sur l'écran
|
||||||
|
onMounted(() => {
|
||||||
|
if (false === displayWeight.value) {
|
||||||
|
fetchWeight()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
</script>
|
||||||
@@ -1,161 +0,0 @@
|
|||||||
<template>
|
|
||||||
<form>
|
|
||||||
<div class="flex flex-row justify-between gap-x-12 font-bold uppercase mb-8">
|
|
||||||
<div
|
|
||||||
v-for="type in bovineTypes"
|
|
||||||
:key="type.id"
|
|
||||||
>
|
|
||||||
<UiNumberInput
|
|
||||||
:label="type.label"
|
|
||||||
:code="type.code"
|
|
||||||
v-model="localQuantities[String(type.id)]"
|
|
||||||
:disabled="!isAdmin"
|
|
||||||
:placeholder="0"
|
|
||||||
:min="0"
|
|
||||||
:max="10"
|
|
||||||
wrapperClass="w-44 flex-col"
|
|
||||||
inputClass="font-medium"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<UiNumberInput
|
|
||||||
label="Autres"
|
|
||||||
v-model="localOtherQuantity"
|
|
||||||
:disabled="!isAdmin"
|
|
||||||
wrapperClass="w-44 flex-col"
|
|
||||||
inputClass="font-medium"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { onMounted, reactive, ref, watch } from 'vue'
|
|
||||||
import { getBovineTypeList } from '~/services/bovine-type'
|
|
||||||
import type { BovineTypeData } from '~/services/dto/bovine-type-data'
|
|
||||||
import type { ReceptionBovineTypeData } from '~/services/dto/reception-bovine-data'
|
|
||||||
|
|
||||||
const props = defineProps<{
|
|
||||||
modelValue: ReceptionBovineTypeData[]
|
|
||||||
otherQuantity: number | null
|
|
||||||
isAdmin: boolean
|
|
||||||
}>()
|
|
||||||
|
|
||||||
const emit = defineEmits<{
|
|
||||||
(event: 'update:modelValue', value: ReceptionBovineTypeData[]): void
|
|
||||||
(event: 'update:otherQuantity', value: number | null): void
|
|
||||||
}>()
|
|
||||||
|
|
||||||
const bovineTypes = ref<BovineTypeData[]>([])
|
|
||||||
const localQuantities = reactive<Record<string, number | null>>({})
|
|
||||||
const localOtherQuantity = ref<number | null>(props.otherQuantity ?? 0)
|
|
||||||
// Verrou pour éviter les boucles props -> local -> emit -> props.
|
|
||||||
const isSyncing = ref(false)
|
|
||||||
|
|
||||||
function entriesEqualByTypeAndQuantity(
|
|
||||||
left: ReceptionBovineTypeData[],
|
|
||||||
right: ReceptionBovineTypeData[]
|
|
||||||
): boolean {
|
|
||||||
const toMap = (entries: ReceptionBovineTypeData[]) => {
|
|
||||||
const map = new Map<number, number>()
|
|
||||||
for (const entry of entries) {
|
|
||||||
const typeId = entry.bovineType?.id ?? 0
|
|
||||||
map.set(typeId, entry.quantity ?? 0)
|
|
||||||
}
|
|
||||||
|
|
||||||
return map
|
|
||||||
}
|
|
||||||
|
|
||||||
const a = toMap(left)
|
|
||||||
const b = toMap(right)
|
|
||||||
if (a.size !== b.size) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const [typeId, quantity] of a.entries()) {
|
|
||||||
if ((b.get(typeId) ?? 0) !== quantity) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildEntriesFromLocal(): ReceptionBovineTypeData[] {
|
|
||||||
return bovineTypes.value.map((type) => {
|
|
||||||
const existing = props.modelValue.find((entry) => entry.bovineType.id === type.id)
|
|
||||||
return {
|
|
||||||
id: existing?.id ?? 0,
|
|
||||||
bovineType: type,
|
|
||||||
quantity: localQuantities[String(type.id)] ?? 0
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function syncLocalFromProps() {
|
|
||||||
isSyncing.value = true
|
|
||||||
try {
|
|
||||||
for (const key of Object.keys(localQuantities)) {
|
|
||||||
delete localQuantities[key]
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const type of bovineTypes.value) {
|
|
||||||
const existing = props.modelValue.find((entry) => entry.bovineType.id === type.id)
|
|
||||||
localQuantities[String(type.id)] = existing?.quantity ?? 0
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
isSyncing.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => props.otherQuantity,
|
|
||||||
(value) => {
|
|
||||||
if (isSyncing.value) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const next = value ?? 0
|
|
||||||
isSyncing.value = true
|
|
||||||
localOtherQuantity.value = next
|
|
||||||
isSyncing.value = false
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
watch(localOtherQuantity, (value) => {
|
|
||||||
if (isSyncing.value) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const next = value ?? 0
|
|
||||||
emit('update:otherQuantity', next)
|
|
||||||
})
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => props.modelValue,
|
|
||||||
() => {
|
|
||||||
// Hydratation locale uniquement quand le parent change.
|
|
||||||
syncLocalFromProps()
|
|
||||||
},
|
|
||||||
{ immediate: true }
|
|
||||||
)
|
|
||||||
|
|
||||||
watch(
|
|
||||||
localQuantities,
|
|
||||||
() => {
|
|
||||||
if (isSyncing.value) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// N'émet que si les quantités diffèrent réellement du parent.
|
|
||||||
const nextEntries = buildEntriesFromLocal()
|
|
||||||
if (!entriesEqualByTypeAndQuantity(nextEntries, props.modelValue)) {
|
|
||||||
emit('update:modelValue', nextEntries)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{ deep: true }
|
|
||||||
)
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
bovineTypes.value = await getBovineTypeList()
|
|
||||||
syncLocalFromProps()
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -1,265 +0,0 @@
|
|||||||
<template>
|
|
||||||
<form>
|
|
||||||
<div class="flex flex-col">
|
|
||||||
<div class="w-full relative grid grid-cols-[1fr_200px]">
|
|
||||||
<UiRadioGroup
|
|
||||||
id="merchandise-type"
|
|
||||||
v-model="selectedMerchandiseTypeId"
|
|
||||||
label="Type de marchandises"
|
|
||||||
:options="merchandiseTypes.map((type) => ({
|
|
||||||
value: String(type.id),
|
|
||||||
label: type.label
|
|
||||||
}))"
|
|
||||||
input-class="accent-primary-700 focus:ring-primary-700"
|
|
||||||
option-label-class="uppercase"
|
|
||||||
wrapper-class="w-full uppercase"
|
|
||||||
group-class="grid grid-cols-4 mt-9 mb-7"
|
|
||||||
:disabled="!isAdmin"
|
|
||||||
/>
|
|
||||||
<UiTextInput
|
|
||||||
v-if="isAutres"
|
|
||||||
id="merchandise-detail"
|
|
||||||
:disabled="!isAdmin"
|
|
||||||
v-model="merchandiseDetail"
|
|
||||||
placeholder="Préciser"
|
|
||||||
:maxlength="255"
|
|
||||||
wrapper-class="w-[200px] mt-12 mb-7"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="selectedMerchandiseTypeId && !isGranule"
|
|
||||||
class="w-full grid grid-cols-[1fr_200px]"
|
|
||||||
>
|
|
||||||
<div class="grid grid-cols-4 gap-6"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
v-for="building in buildings"
|
|
||||||
:key="building.id"
|
|
||||||
>
|
|
||||||
<UiCheckbox
|
|
||||||
v-model="selectedBuildingIds"
|
|
||||||
:value="String(building.id)"
|
|
||||||
:label="building.label"
|
|
||||||
:disabled="!isAdmin"
|
|
||||||
input-class="accent-primary-700 focus:ring-primary-700"
|
|
||||||
label-class="uppercase"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="selectedMerchandiseTypeId && isGranule"
|
|
||||||
class="grid grid-cols-[1fr_200px] w-full col-start-2 row-start-1"
|
|
||||||
>
|
|
||||||
<div class="grid grid-cols-4 gap-6 justify-between">
|
|
||||||
<div v-for="type in pelletTypes" :key="type.id" class="flex flex-col gap-4">
|
|
||||||
<p class="mb-1 font-medium uppercase">{{ type.label }}</p>
|
|
||||||
<div
|
|
||||||
v-for="building in buildings"
|
|
||||||
:key="building.id"
|
|
||||||
class="flex text-lg"
|
|
||||||
>
|
|
||||||
<UiCheckbox
|
|
||||||
v-model="selectedPelletBuildingIds[String(type.id)]"
|
|
||||||
:value="String(building.id)"
|
|
||||||
:label="building.label"
|
|
||||||
:disabled="!isAdmin"
|
|
||||||
input-class="accent-primary-700 focus:ring-primary-700"
|
|
||||||
label-class="text-lg"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { computed, onMounted, ref, watch } from 'vue'
|
|
||||||
import type { BuildingData } from '~/services/dto/building-data'
|
|
||||||
import type { MerchandiseTypeData } from '~/services/dto/merchandise-type-data'
|
|
||||||
import type { PelletTypeData } from '~/services/dto/pellet-type-data'
|
|
||||||
import type { MerchandiseEntryData } from '~/services/dto/reception-data'
|
|
||||||
import { getBuildingList } from '~/services/building'
|
|
||||||
import { getMerchandiseTypeList } from '~/services/merchandise-type'
|
|
||||||
import { getPelletTypeList } from '~/services/pellet-type'
|
|
||||||
import { MERCHANDISE_TYPE_CODES } from '~/utils/constants'
|
|
||||||
|
|
||||||
const props = defineProps<{
|
|
||||||
modelValue: MerchandiseEntryData
|
|
||||||
isAdmin: boolean
|
|
||||||
}>()
|
|
||||||
|
|
||||||
const emit = defineEmits<{
|
|
||||||
(event: 'update:modelValue', value: MerchandiseEntryData): void
|
|
||||||
}>()
|
|
||||||
|
|
||||||
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('')
|
|
||||||
// Verrou de synchro pour empêcher les aller-retours infinis entre parent et composant.
|
|
||||||
const isSyncing = ref(false)
|
|
||||||
const isReady = ref(false)
|
|
||||||
|
|
||||||
const selectedMerchandiseType = computed(() =>
|
|
||||||
merchandiseTypes.value.find((type) => String(type.id) === selectedMerchandiseTypeId.value) ?? null
|
|
||||||
)
|
|
||||||
const isGranule = computed(
|
|
||||||
() => selectedMerchandiseType.value?.code === MERCHANDISE_TYPE_CODES.GRANULE
|
|
||||||
)
|
|
||||||
const isAutres = computed(
|
|
||||||
() => selectedMerchandiseType.value?.code === MERCHANDISE_TYPE_CODES.AUTRES
|
|
||||||
)
|
|
||||||
|
|
||||||
function clonePelletSelections(value: Record<string, string[]>) {
|
|
||||||
const clone: Record<string, string[]> = {}
|
|
||||||
for (const [key, buildingIds] of Object.entries(value)) {
|
|
||||||
clone[key] = [...buildingIds]
|
|
||||||
}
|
|
||||||
return clone
|
|
||||||
}
|
|
||||||
|
|
||||||
function sorted(values: string[]): string[] {
|
|
||||||
return [...values].sort()
|
|
||||||
}
|
|
||||||
|
|
||||||
function normalizeModel(value: MerchandiseEntryData): MerchandiseEntryData {
|
|
||||||
// Normalisation stable pour comparer deux modèles sans faux positifs (ordre des tableaux).
|
|
||||||
const pellet: Record<string, string[]> = {}
|
|
||||||
const pelletKeys = Object.keys(value.selectedPelletBuildingIds ?? {}).sort()
|
|
||||||
for (const key of pelletKeys) {
|
|
||||||
pellet[key] = sorted(value.selectedPelletBuildingIds[key] ?? [])
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
merchandiseTypeId: value.merchandiseTypeId ?? '',
|
|
||||||
merchandiseDetail: value.merchandiseDetail ?? '',
|
|
||||||
selectedBuildingIds: sorted(value.selectedBuildingIds ?? []),
|
|
||||||
selectedPelletBuildingIds: pellet
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function buildCurrentModel(): MerchandiseEntryData {
|
|
||||||
return {
|
|
||||||
merchandiseTypeId: selectedMerchandiseTypeId.value,
|
|
||||||
merchandiseDetail: merchandiseDetail.value,
|
|
||||||
selectedBuildingIds: [...selectedBuildingIds.value],
|
|
||||||
selectedPelletBuildingIds: clonePelletSelections(selectedPelletBuildingIds.value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function isSameModel(left: MerchandiseEntryData, right: MerchandiseEntryData): boolean {
|
|
||||||
return JSON.stringify(normalizeModel(left)) === JSON.stringify(normalizeModel(right))
|
|
||||||
}
|
|
||||||
|
|
||||||
function ensurePelletKeys() {
|
|
||||||
for (const pelletType of pelletTypes.value) {
|
|
||||||
const key = String(pelletType.id)
|
|
||||||
if (!selectedPelletBuildingIds.value[key]) {
|
|
||||||
selectedPelletBuildingIds.value[key] = []
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function hydrateFromModelValue(value: MerchandiseEntryData) {
|
|
||||||
isSyncing.value = true
|
|
||||||
try {
|
|
||||||
selectedMerchandiseTypeId.value = value.merchandiseTypeId ?? ''
|
|
||||||
merchandiseDetail.value = value.merchandiseDetail ?? ''
|
|
||||||
selectedBuildingIds.value = [...(value.selectedBuildingIds ?? [])]
|
|
||||||
selectedPelletBuildingIds.value = clonePelletSelections(
|
|
||||||
value.selectedPelletBuildingIds ?? {}
|
|
||||||
)
|
|
||||||
ensurePelletKeys()
|
|
||||||
} finally {
|
|
||||||
isSyncing.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function sanitizeLocalState() {
|
|
||||||
if (isGranule.value) {
|
|
||||||
if (selectedBuildingIds.value.length > 0) {
|
|
||||||
selectedBuildingIds.value = []
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for (const key of Object.keys(selectedPelletBuildingIds.value)) {
|
|
||||||
if (selectedPelletBuildingIds.value[key].length > 0) {
|
|
||||||
selectedPelletBuildingIds.value[key] = []
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isAutres.value && merchandiseDetail.value !== '') {
|
|
||||||
merchandiseDetail.value = ''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function emitCurrentModel() {
|
|
||||||
const currentModel = buildCurrentModel()
|
|
||||||
// Ne pas réémettre si rien n'a changé côté métier.
|
|
||||||
if (isSameModel(currentModel, props.modelValue)) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
emit('update:modelValue', currentModel)
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => props.modelValue,
|
|
||||||
(value) => {
|
|
||||||
const currentModel = buildCurrentModel()
|
|
||||||
// Si local == parent, on ignore pour éviter la boucle de réhydratation.
|
|
||||||
if (isSameModel(currentModel, value)) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
hydrateFromModelValue(value)
|
|
||||||
},
|
|
||||||
{ immediate: true }
|
|
||||||
)
|
|
||||||
|
|
||||||
watch(
|
|
||||||
[selectedMerchandiseTypeId, selectedBuildingIds, selectedPelletBuildingIds, merchandiseDetail],
|
|
||||||
() => {
|
|
||||||
if (isSyncing.value || !isReady.value) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const beforeSanitize = buildCurrentModel()
|
|
||||||
isSyncing.value = true
|
|
||||||
// Applique les règles métier (granulé / autres) avant émission.
|
|
||||||
sanitizeLocalState()
|
|
||||||
isSyncing.value = false
|
|
||||||
|
|
||||||
const afterSanitize = buildCurrentModel()
|
|
||||||
// Si la sanitation a modifié l'état, on laisse le watcher repasser proprement.
|
|
||||||
if (!isSameModel(beforeSanitize, afterSanitize)) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
emitCurrentModel()
|
|
||||||
},
|
|
||||||
{ deep: true }
|
|
||||||
)
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
const [merchandiseTypeList, buildingList, pelletTypeList] = await Promise.all([
|
|
||||||
getMerchandiseTypeList(),
|
|
||||||
getBuildingList(),
|
|
||||||
getPelletTypeList()
|
|
||||||
])
|
|
||||||
merchandiseTypes.value = merchandiseTypeList
|
|
||||||
buildings.value = buildingList
|
|
||||||
pelletTypes.value = pelletTypeList
|
|
||||||
|
|
||||||
hydrateFromModelValue(props.modelValue)
|
|
||||||
isReady.value = true
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -1,317 +0,0 @@
|
|||||||
<template>
|
|
||||||
<form ref="formRef" :class="{ submitted }" @submit.prevent="validate">
|
|
||||||
<div class="grid grid-cols-2 h-[461px] items-start gap-y-8 gap-x-40 mb-16">
|
|
||||||
<h1 class="font-bold text-5xl uppercase col-start-1 row-start-1 text-primary-500">Expédition</h1>
|
|
||||||
<UiSelect
|
|
||||||
id="shipment-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"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
<UiDateInput
|
|
||||||
id="shipment-date"
|
|
||||||
v-model="form.shipmentDate"
|
|
||||||
label="Date du jour"
|
|
||||||
wrapper-class="col-start-1 row-start-3"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
<div class="col-start-1 row-start-4 h-[64px]">
|
|
||||||
<div class="flex w-full items-end gap-[104px]">
|
|
||||||
<UiRadioGroup
|
|
||||||
id="shipment-type"
|
|
||||||
name="shipment-type"
|
|
||||||
label="Type d'expédition bovine"
|
|
||||||
input-class="accent-primary-700 focus:ring-primary-700"
|
|
||||||
wrapper-class=""
|
|
||||||
group-class="flex flex-row gap-[104px] w-[160px_160px] h-[32px]"
|
|
||||||
v-model="selectedShipmentTypeId"
|
|
||||||
:options="bovineShipment.map((type) => ({
|
|
||||||
value: String(type.id),
|
|
||||||
label: type.label
|
|
||||||
}))"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
<UiNumberInput
|
|
||||||
id="shipment-type-quantity"
|
|
||||||
v-model="shipmentQuantity"
|
|
||||||
:placeholder="0"
|
|
||||||
:min="0"
|
|
||||||
:max="1200"
|
|
||||||
:disabled="!selectedShipmentTypeId"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<UiSelect
|
|
||||||
id="shipment-customer"
|
|
||||||
v-model="form.customerId"
|
|
||||||
label="Client"
|
|
||||||
:options="customers.map((customer) => ({
|
|
||||||
value: String(customer.id),
|
|
||||||
label: customer.name || `Client #${customer.id}`
|
|
||||||
}))"
|
|
||||||
:loading="isLoadingCustomers"
|
|
||||||
wrapper-class="col-start-1 row-start-5"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
<UiSelect
|
|
||||||
id="shipment-address"
|
|
||||||
v-model="form.addressId"
|
|
||||||
:options="addressOptions"
|
|
||||||
:disabled="isLoadingCustomers || ownerAddresses.length === 0"
|
|
||||||
label="Adresse"
|
|
||||||
wrapper-class="col-start-2 row-start-1"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
<UiSelect
|
|
||||||
id="shipment-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"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
<UiSelect
|
|
||||||
id="shipment-carrier"
|
|
||||||
v-model="form.carrierId"
|
|
||||||
label="Transporteur"
|
|
||||||
:options="carriers.map((carrier) => ({
|
|
||||||
value: String(carrier.id),
|
|
||||||
label: carrier.name
|
|
||||||
}))"
|
|
||||||
wrapper-class="col-start-2 row-start-3"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
<div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
|
|
||||||
<UiLicensePlateInput
|
|
||||||
v-model="form.licensePlate"
|
|
||||||
v-model:allowAny="allowAnyLicensePlate"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<UiSelect
|
|
||||||
v-if="isLiotCarrier"
|
|
||||||
id="shipment-vehicle"
|
|
||||||
v-model="form.vehicleId"
|
|
||||||
label="Immatriculation"
|
|
||||||
: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-4"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
<UiSelect
|
|
||||||
id="shipment-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-5"
|
|
||||||
v-if="isLiotCarrier"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-center">
|
|
||||||
<UiButton
|
|
||||||
type="submit"
|
|
||||||
class="text-xl mb-16 uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
|
|
||||||
@click="submitted = true"
|
|
||||||
>Valider
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { useFormDataLoading } from '~/composables/useFormDataLoading'
|
|
||||||
import { useLiotHandling } from '~/composables/useLiotHandling'
|
|
||||||
import { useAddressSync } from '~/composables/useAddressSync'
|
|
||||||
import type { CustomerData } from '~/services/dto/customer-data'
|
|
||||||
import { getCustomerList } from '~/services/customer'
|
|
||||||
import type { ShipmentFormData } from '~/services/dto/shipment-data'
|
|
||||||
import { useShipmentStore } from '~/stores/shipment'
|
|
||||||
import type { ShipmentTypeData } from '~/services/dto/shipment-type-data'
|
|
||||||
import { getShipmentTypeList } from '~/services/shipment-type'
|
|
||||||
|
|
||||||
const router = useRouter()
|
|
||||||
const shipmentStore = useShipmentStore()
|
|
||||||
const isHydrating = ref(false)
|
|
||||||
const submitted = ref(false)
|
|
||||||
const formRef = ref<HTMLFormElement | null>(null)
|
|
||||||
|
|
||||||
const form = reactive<ShipmentFormData>({
|
|
||||||
userId: '',
|
|
||||||
shipmentDate: new Date().toISOString().slice(0, 10),
|
|
||||||
customerId: '',
|
|
||||||
addressId: '',
|
|
||||||
truckId: '',
|
|
||||||
carrierId: '',
|
|
||||||
driverId: '',
|
|
||||||
vehicleId: '',
|
|
||||||
licensePlate: '',
|
|
||||||
})
|
|
||||||
|
|
||||||
const customers = ref<CustomerData[]>([])
|
|
||||||
const isLoadingCustomers = ref(false)
|
|
||||||
const bovineShipment = ref<ShipmentTypeData[]>([])
|
|
||||||
const selectedShipmentTypeId = ref('')
|
|
||||||
const shipmentQuantity = ref<number | null>(0)
|
|
||||||
|
|
||||||
const { users, trucks, carriers, isLoadingUsers, isLoadingTrucks, isLoadingCarriers, loadCommonData } =
|
|
||||||
useFormDataLoading(form)
|
|
||||||
|
|
||||||
const {
|
|
||||||
isLiotCarrier, filteredDrivers, filteredVehicles,
|
|
||||||
isLoadingDrivers, isLoadingVehicles, allowAnyLicensePlate,
|
|
||||||
loadDrivers, loadVehicles
|
|
||||||
} = useLiotHandling(form, carriers, isHydrating)
|
|
||||||
|
|
||||||
const customerIdRef = computed(() => form.customerId)
|
|
||||||
const { ownerAddresses, addressOptions } = useAddressSync(form, customerIdRef, customers)
|
|
||||||
|
|
||||||
const loadCustomers = async () => {
|
|
||||||
isLoadingCustomers.value = true
|
|
||||||
try {
|
|
||||||
customers.value = await getCustomerList()
|
|
||||||
} finally {
|
|
||||||
isLoadingCustomers.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => shipmentStore.current,
|
|
||||||
(shipment) => {
|
|
||||||
isHydrating.value = true
|
|
||||||
form.licensePlate = shipment?.licensePlate ?? ''
|
|
||||||
form.shipmentDate = shipment?.shipmentDate?.slice(0, 10) ?? new Date().toISOString().slice(0, 10)
|
|
||||||
form.userId = shipment?.user?.id ? String(shipment.user.id) : form.userId
|
|
||||||
form.customerId = shipment?.customer?.id ? String(shipment.customer.id) : ''
|
|
||||||
form.addressId = shipment?.address?.id ? String(shipment.address.id) : ''
|
|
||||||
form.truckId = shipment?.truck?.id ? String(shipment.truck.id) : ''
|
|
||||||
form.carrierId = shipment?.carrier?.id ? String(shipment.carrier.id) : ''
|
|
||||||
form.driverId = shipment?.driver?.id ? String(shipment.driver.id) : ''
|
|
||||||
form.vehicleId = shipment?.vehicle?.id ? String(shipment.vehicle.id) : ''
|
|
||||||
selectedShipmentTypeId.value = shipment?.shipmentType?.id ? String(shipment.shipmentType.id) : ''
|
|
||||||
shipmentQuantity.value = shipment?.nbBovinSend ?? 0
|
|
||||||
isHydrating.value = false
|
|
||||||
},
|
|
||||||
{ immediate: true }
|
|
||||||
)
|
|
||||||
|
|
||||||
// Extra watcher for LIOT defaults after hydration
|
|
||||||
watch(
|
|
||||||
() => isHydrating.value,
|
|
||||||
(value) => {
|
|
||||||
if (!value && isLiotCarrier.value) {
|
|
||||||
if (filteredDrivers.value.length === 1 && !form.driverId) {
|
|
||||||
form.driverId = String(filteredDrivers.value[0].id)
|
|
||||||
}
|
|
||||||
if (filteredVehicles.value.length === 1 && !form.vehicleId) {
|
|
||||||
form.vehicleId = String(filteredVehicles.value[0].id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
bovineShipment.value = await getShipmentTypeList()
|
|
||||||
await loadCustomers()
|
|
||||||
await loadCommonData()
|
|
||||||
await loadVehicles()
|
|
||||||
await loadDrivers()
|
|
||||||
})
|
|
||||||
|
|
||||||
const buildPayload = () => {
|
|
||||||
const normalizedLicensePlate = form.licensePlate.trim()
|
|
||||||
const normalizedShipmentDate = form.shipmentDate.trim()
|
|
||||||
const normalizedCustomerId = form.customerId.trim()
|
|
||||||
const normalizedTruckId = form.truckId.trim()
|
|
||||||
const normalizedCarrierId = form.carrierId.trim()
|
|
||||||
const normalizedDriverId = form.driverId.trim()
|
|
||||||
const normalizedUserId = form.userId.trim()
|
|
||||||
const normalizedAddressId = form.addressId.trim()
|
|
||||||
|
|
||||||
const customerIri = normalizedCustomerId ? `/api/customers/${normalizedCustomerId}` : null
|
|
||||||
const truckIri = normalizedTruckId ? `/api/trucks/${normalizedTruckId}` : null
|
|
||||||
const carrierIri = normalizedCarrierId ? `/api/carriers/${normalizedCarrierId}` : null
|
|
||||||
const userIri = normalizedUserId ? `/api/users/${normalizedUserId}` : null
|
|
||||||
const driverIri = normalizedDriverId ? `/api/drivers/${normalizedDriverId}` : null
|
|
||||||
const addressIri = normalizedAddressId ? `/api/addresses/${normalizedAddressId}` : null
|
|
||||||
const normalizedShipmentTypeId = selectedShipmentTypeId.value.trim()
|
|
||||||
const shipmentTypeIri = normalizedShipmentTypeId ? `/api/shipment_types/${normalizedShipmentTypeId}` : null
|
|
||||||
|
|
||||||
const rawQuantity = Number(shipmentQuantity.value ?? 0)
|
|
||||||
const normalizedQuantity = Number.isFinite(rawQuantity) ? Math.max(0, Math.trunc(rawQuantity)) : 0
|
|
||||||
|
|
||||||
return {
|
|
||||||
licensePlate: normalizedLicensePlate,
|
|
||||||
shipmentDate: normalizedShipmentDate,
|
|
||||||
customer: customerIri,
|
|
||||||
truck: truckIri,
|
|
||||||
carrier: carrierIri,
|
|
||||||
driver: driverIri,
|
|
||||||
user: userIri,
|
|
||||||
address: addressIri,
|
|
||||||
shipmentType: shipmentTypeIri,
|
|
||||||
nbBovinSend: normalizedQuantity,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const saveDraft = async () => {
|
|
||||||
const payload = buildPayload()
|
|
||||||
if (!shipmentStore.current) {
|
|
||||||
await shipmentStore.createShipment({
|
|
||||||
currentStep: 0,
|
|
||||||
...payload
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
await shipmentStore.updateShipment(shipmentStore.current.id, {
|
|
||||||
currentStep: shipmentStore.current.currentStep,
|
|
||||||
...payload
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
const validateFields = () => {
|
|
||||||
submitted.value = true
|
|
||||||
return formRef.value?.reportValidity() ?? false
|
|
||||||
}
|
|
||||||
|
|
||||||
defineExpose({ saveDraft, validateFields })
|
|
||||||
|
|
||||||
const validate = async () => {
|
|
||||||
const payload = buildPayload()
|
|
||||||
if (!shipmentStore.current) {
|
|
||||||
const created = await shipmentStore.createShipment({
|
|
||||||
currentStep: 1,
|
|
||||||
...payload
|
|
||||||
})
|
|
||||||
if (created) {
|
|
||||||
await shipmentStore.loadShipment(created.id)
|
|
||||||
await router.push(`/shipment/${created.id}`)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const nextStep = shipmentStore.current.currentStep + 1
|
|
||||||
await shipmentStore.updateShipment(shipmentStore.current.id, {
|
|
||||||
currentStep: nextStep,
|
|
||||||
...payload
|
|
||||||
})
|
|
||||||
await shipmentStore.loadShipment(shipmentStore.current.id)
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="flex flex-col items-center gap-[150px]">
|
|
||||||
<h1 class="font-bold text-5xl uppercase text-primary-500">Chargement des bovins</h1>
|
|
||||||
<div
|
|
||||||
class="w-full flex flex-col items-center justify-center">
|
|
||||||
<UiLoadingDots />
|
|
||||||
</div>
|
|
||||||
<UiButton
|
|
||||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
|
|
||||||
@click="goNext"
|
|
||||||
>Peser</UiButton>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {useShipmentStore} from "~/stores/shipment";
|
|
||||||
|
|
||||||
const shipmentStore = useShipmentStore()
|
|
||||||
|
|
||||||
const goNext = async () => {
|
|
||||||
const nextStep = shipmentStore.current.currentStep + 1
|
|
||||||
await shipmentStore.updateShipment(shipmentStore.current.id, {
|
|
||||||
currentStep: nextStep
|
|
||||||
})
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
<template>
|
|
||||||
<component
|
|
||||||
:is="'button'"
|
|
||||||
:type="type"
|
|
||||||
:disabled="isDisabled"
|
|
||||||
class="inline-flex min-w-[194px] items-center justify-center rounded-md"
|
|
||||||
:class="[
|
|
||||||
isDisabled ? 'cursor-not-allowed opacity-60' : 'cursor-pointer',
|
|
||||||
buttonClass
|
|
||||||
]"
|
|
||||||
v-bind="attrs"
|
|
||||||
>
|
|
||||||
<slot v-if="!loading" />
|
|
||||||
<UiLoadingDots v-else />
|
|
||||||
</component>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {computed, useAttrs} from 'vue'
|
|
||||||
|
|
||||||
defineOptions({inheritAttrs: false})
|
|
||||||
|
|
||||||
const props = withDefaults(
|
|
||||||
defineProps<{
|
|
||||||
type?: 'button' | 'submit' | 'reset'
|
|
||||||
disabled?: boolean
|
|
||||||
loading?: boolean
|
|
||||||
buttonClass?: string
|
|
||||||
}>(),
|
|
||||||
{
|
|
||||||
disabled: false,
|
|
||||||
loading: false,
|
|
||||||
buttonClass: ''
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
const attrs = useAttrs()
|
|
||||||
const isDisabled = computed(() => props.disabled || props.loading)
|
|
||||||
</script>
|
|
||||||
@@ -1,14 +1,14 @@
|
|||||||
<template>
|
<template>
|
||||||
<div :class="wrapperClass">
|
<div :class="wrapperClass">
|
||||||
<label
|
<label
|
||||||
class="flex items-center gap-2 cursor-pointer text-primary-700"
|
class="flex items-center gap-2"
|
||||||
:class="labelClass"
|
:class="labelClass"
|
||||||
>
|
>
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
:checked="checked"
|
:checked="checked"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
:class="['h-4 w-4 cursor-pointer text-primary-500', inputClass]"
|
:class="inputClass"
|
||||||
@change="onChange"
|
@change="onChange"
|
||||||
>
|
>
|
||||||
<span v-if="label">{{ label }}</span>
|
<span v-if="label">{{ label }}</span>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<label
|
<label
|
||||||
v-if="label"
|
v-if="label"
|
||||||
:for="id"
|
:for="id"
|
||||||
class="font-bold uppercase text-xl text-primary-700"
|
class="font-bold uppercase text-xl mb-2"
|
||||||
:class="labelClass"
|
:class="labelClass"
|
||||||
>
|
>
|
||||||
{{ label }}
|
{{ label }}
|
||||||
@@ -14,9 +14,9 @@
|
|||||||
:value="modelValue ?? ''"
|
:value="modelValue ?? ''"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
v-bind="attrs"
|
v-bind="attrs"
|
||||||
class="border-b border-primary-700 justify-self-start text-xl text-primary-700 py-[6px] uppercase bg-transparent appearance-none h-[34px]"
|
class="border-b border-black justify-self-start text-xl pb-[6px] uppercase bg-transparent appearance-none h-[34px]"
|
||||||
:class="[
|
:class="[
|
||||||
isEmpty ? 'text-neutral-400' : 'text-primary-700',
|
isEmpty ? 'text-neutral-400' : 'text-black',
|
||||||
disabled ? 'cursor-not-allowed' : 'cursor-pointer',
|
disabled ? 'cursor-not-allowed' : 'cursor-pointer',
|
||||||
inputClass
|
inputClass
|
||||||
]"
|
]"
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
// flex row passer en class wraper class flex col ainsi que le wfull 34
|
|
||||||
<template>
|
<template>
|
||||||
<div :class="['flex', wrapperClass]">
|
<div :class="['flex flex-row items-center gap-2', wrapperClass]">
|
||||||
<label
|
<label
|
||||||
v-if="label"
|
v-if="label"
|
||||||
:for="id"
|
:for="id"
|
||||||
class="text-xl flex items-center gap-2 text-primary-700"
|
class="text-xl text-bold flex items-center gap-2"
|
||||||
:class="labelClass"
|
:class="labelClass"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
@@ -12,8 +11,7 @@
|
|||||||
{{ label }}
|
{{ label }}
|
||||||
</span>
|
</span>
|
||||||
<span
|
<span
|
||||||
v-if="code"
|
v-if="code" class="text-neutral-600">
|
||||||
class="text-neutral-600">
|
|
||||||
({{ code }})
|
({{ code }})
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
@@ -26,7 +24,7 @@
|
|||||||
:step="step"
|
:step="step"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
v-bind="attrs"
|
v-bind="attrs"
|
||||||
class="border-b border-primary-700 justify-self-start text-xl text-primary-700 py-[6px] uppercase bg-transparent appearance-none h-[34px]"
|
class="border-b border-black text-xl bg-transparent w-48"
|
||||||
:class="[
|
:class="[
|
||||||
isEmpty ? 'text-neutral-400' : 'text-black',
|
isEmpty ? 'text-neutral-400' : 'text-black',
|
||||||
disabled ? 'cursor-not-allowed' : 'cursor-text',
|
disabled ? 'cursor-not-allowed' : 'cursor-text',
|
||||||
@@ -75,41 +73,14 @@ const emit = defineEmits<{
|
|||||||
const attrs = useAttrs()
|
const attrs = useAttrs()
|
||||||
const isEmpty = computed(() => props.modelValue === null || props.modelValue === undefined || props.modelValue === '')
|
const isEmpty = computed(() => props.modelValue === null || props.modelValue === undefined || props.modelValue === '')
|
||||||
|
|
||||||
const toNumberOrNull = (value: number | string | undefined) => {
|
|
||||||
if (value === undefined || value === '') {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
const parsed = Number(value)
|
|
||||||
return Number.isFinite(parsed) ? parsed : null
|
|
||||||
}
|
|
||||||
|
|
||||||
const onInput = (event: Event) => {
|
const onInput = (event: Event) => {
|
||||||
const target = event.target as HTMLInputElement
|
const target = event.target as HTMLInputElement
|
||||||
if (target.value === '') {
|
if (target.value === '') {
|
||||||
emit('update:modelValue', null)
|
emit('update:modelValue', null)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const parsed = Number(target.value)
|
const numeric = Math.max(0, Number(target.value))
|
||||||
if (!Number.isFinite(parsed)) {
|
emit('update:modelValue', Number.isNaN(numeric) ? null : numeric)
|
||||||
emit('update:modelValue', null)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const min = toNumberOrNull(props.min)
|
|
||||||
const max = toNumberOrNull(props.max)
|
|
||||||
|
|
||||||
let numeric = parsed
|
|
||||||
if (min !== null) {
|
|
||||||
numeric = Math.max(min, numeric)
|
|
||||||
} else {
|
|
||||||
numeric = Math.max(0, numeric)
|
|
||||||
}
|
|
||||||
if (max !== null) {
|
|
||||||
numeric = Math.min(max, numeric)
|
|
||||||
}
|
|
||||||
|
|
||||||
target.value = String(numeric)
|
|
||||||
emit('update:modelValue', numeric)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const onKeydown = (event: KeyboardEvent) => {
|
const onKeydown = (event: KeyboardEvent) => {
|
||||||
|
|||||||
@@ -1,93 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div :class="['flex flex-col', wrapperClass]">
|
|
||||||
<label
|
|
||||||
v-if="label"
|
|
||||||
class="font-bold uppercase text-xl text-primary-700"
|
|
||||||
:class="labelClass"
|
|
||||||
>
|
|
||||||
{{ label }}
|
|
||||||
</label>
|
|
||||||
<div
|
|
||||||
role="radiogroup"
|
|
||||||
:aria-label="label || id || 'radio-group'"
|
|
||||||
:class="['flex items-center gap-6 mt-1', groupClass]"
|
|
||||||
>
|
|
||||||
<label
|
|
||||||
v-for="option in options"
|
|
||||||
:key="String(option.value)"
|
|
||||||
:for="`${id || 'radio'}-${option.value}`"
|
|
||||||
class="flex items-center gap-2 text-primary-700"
|
|
||||||
:class="itemClass"
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
:id="`${id || 'radio'}-${option.value}`"
|
|
||||||
type="radio"
|
|
||||||
:name="name || id || 'radio-group'"
|
|
||||||
:value="String(option.value)"
|
|
||||||
:checked="String(modelValue ?? '') === String(option.value)"
|
|
||||||
:disabled="disabled"
|
|
||||||
v-bind="attrs"
|
|
||||||
class="h-4 w-4 border-primary-700/50 text-primary-700 focus:ring-primary-700"
|
|
||||||
:class="[
|
|
||||||
disabled ? 'cursor-not-allowed' : 'cursor-pointer',
|
|
||||||
inputClass
|
|
||||||
]"
|
|
||||||
@change="onChange"
|
|
||||||
>
|
|
||||||
<span class="text-xl" :class="optionLabelClass">
|
|
||||||
{{ option.label }}
|
|
||||||
</span>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { useAttrs } from 'vue'
|
|
||||||
|
|
||||||
type RadioOption = {
|
|
||||||
value: string | number
|
|
||||||
label: string
|
|
||||||
}
|
|
||||||
|
|
||||||
defineOptions({ inheritAttrs: false })
|
|
||||||
|
|
||||||
const props = withDefaults(
|
|
||||||
defineProps<{
|
|
||||||
id?: string
|
|
||||||
name?: string
|
|
||||||
label?: string
|
|
||||||
modelValue: string | number | null | undefined
|
|
||||||
options: RadioOption[]
|
|
||||||
disabled?: boolean
|
|
||||||
wrapperClass?: string
|
|
||||||
labelClass?: string
|
|
||||||
groupClass?: string
|
|
||||||
itemClass?: string
|
|
||||||
inputClass?: string
|
|
||||||
optionLabelClass?: string
|
|
||||||
}>(),
|
|
||||||
{
|
|
||||||
name: '',
|
|
||||||
label: '',
|
|
||||||
disabled: false,
|
|
||||||
wrapperClass: '',
|
|
||||||
labelClass: '',
|
|
||||||
groupClass: '',
|
|
||||||
itemClass: '',
|
|
||||||
inputClass: '',
|
|
||||||
optionLabelClass: ''
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
const emit = defineEmits<{
|
|
||||||
(event: 'update:modelValue', value: string): void
|
|
||||||
}>()
|
|
||||||
|
|
||||||
const attrs = useAttrs()
|
|
||||||
|
|
||||||
const onChange = (event: Event) => {
|
|
||||||
const target = event.target as HTMLInputElement
|
|
||||||
emit('update:modelValue', target.value)
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
<label
|
<label
|
||||||
v-if="label"
|
v-if="label"
|
||||||
:for="id"
|
:for="id"
|
||||||
class="font-bold uppercase text-xl text-primary-700"
|
class="font-bold uppercase text-xl mb-2"
|
||||||
:class="labelClass"
|
:class="labelClass"
|
||||||
>
|
>
|
||||||
{{ label }}
|
{{ label }}
|
||||||
@@ -13,9 +13,9 @@
|
|||||||
:value="modelValue ?? ''"
|
:value="modelValue ?? ''"
|
||||||
:disabled="disabled || loading"
|
:disabled="disabled || loading"
|
||||||
v-bind="attrs"
|
v-bind="attrs"
|
||||||
class="border-b border-primary-700 justify-self-start text-xl text-primary-700 py-[6px] bg-transparent"
|
class="border-b border-black justify-self-start text-xl pb-[6px] bg-transparent"
|
||||||
:class="[
|
:class="[
|
||||||
isEmpty ? 'text-neutral-400' : 'text-primary-700',
|
isEmpty ? 'text-neutral-400' : 'text-black',
|
||||||
disabled || loading ? 'cursor-not-allowed' : 'cursor-pointer',
|
disabled || loading ? 'cursor-not-allowed' : 'cursor-pointer',
|
||||||
selectClass
|
selectClass
|
||||||
]"
|
]"
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
v-for="option in options"
|
v-for="option in options"
|
||||||
:key="option.value"
|
:key="option.value"
|
||||||
:value="option.value"
|
:value="option.value"
|
||||||
class="text-primary-700"
|
class="text-black"
|
||||||
>
|
>
|
||||||
{{ option.label }}
|
{{ option.label }}
|
||||||
</option>
|
</option>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<label
|
<label
|
||||||
v-if="label"
|
v-if="label"
|
||||||
:for="id"
|
:for="id"
|
||||||
class="font-bold uppercase text-xl text-primary-700"
|
class="font-bold uppercase text-xl mb-2"
|
||||||
:class="labelClass"
|
:class="labelClass"
|
||||||
>
|
>
|
||||||
{{ label }}
|
{{ label }}
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
:maxlength="maxlength"
|
:maxlength="maxlength"
|
||||||
:disabled="disabled"
|
:disabled="disabled"
|
||||||
v-bind="attrs"
|
v-bind="attrs"
|
||||||
class="border-b border-black text-xl py-[6px] bg-transparent text-primary-700"
|
class="border-b border-black text-xl pb-[6px] bg-transparent"
|
||||||
:class="[
|
:class="[
|
||||||
isEmpty ? 'text-neutral-400' : 'text-black',
|
isEmpty ? 'text-neutral-400' : 'text-black',
|
||||||
disabled ? 'cursor-not-allowed' : 'cursor-text',
|
disabled ? 'cursor-not-allowed' : 'cursor-text',
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<label :for="inputId" class="font-bold uppercase text-xl text-primary-500">{{ label }}</label>
|
<label :for="inputId" class="font-bold uppercase text-xl mb-2">{{ label }}</label>
|
||||||
<div class="flex items-end gap-8">
|
<div class="flex items-end gap-8">
|
||||||
<input
|
<input
|
||||||
:id="inputId"
|
:id="inputId"
|
||||||
@@ -9,8 +9,7 @@
|
|||||||
type="text"
|
type="text"
|
||||||
:maxlength="maxLength"
|
:maxlength="maxLength"
|
||||||
:placeholder="placeholderText"
|
:placeholder="placeholderText"
|
||||||
:required="required"
|
class="border-b border-black flex-1 min-w-0 text-xl uppercase h-[30px]"
|
||||||
class="border-b border-black flex-1 min-w-0 text-xl text-primary-500 uppercase h-[36px] py-[6px]"
|
|
||||||
@input="handleInput"
|
@input="handleInput"
|
||||||
/>
|
/>
|
||||||
<UiCheckbox
|
<UiCheckbox
|
||||||
@@ -33,14 +32,12 @@ type Props = {
|
|||||||
allowAny?: boolean
|
allowAny?: boolean
|
||||||
label?: string
|
label?: string
|
||||||
id?: string
|
id?: string
|
||||||
required?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const props = withDefaults(defineProps<Props>(), {
|
const props = withDefaults(defineProps<Props>(), {
|
||||||
allowAny: false,
|
allowAny: false,
|
||||||
label: 'Immatriculation',
|
label: 'Immatriculation',
|
||||||
id: 'license-plate',
|
id: 'license-plate'
|
||||||
required: false
|
|
||||||
})
|
})
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<div
|
<div
|
||||||
v-for="(label, index) in labels"
|
v-for="(label, index) in labels"
|
||||||
:key="label"
|
:key="label"
|
||||||
class="absolute top-0 whitespace-nowrap text-primary-500"
|
class="absolute top-0 whitespace-nowrap"
|
||||||
:class="labelClass(index)"
|
:class="labelClass(index)"
|
||||||
:style="positionStyle(index)"
|
:style="positionStyle(index)"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,57 +0,0 @@
|
|||||||
<template>
|
|
||||||
<template v-if="!isLiotCarrier">
|
|
||||||
<div :class="wrapperClass">
|
|
||||||
<UiLicensePlateInput
|
|
||||||
v-model="form.licensePlate"
|
|
||||||
v-model:allowAny="allowAnyLicensePlate"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<template v-if="isLiotCarrier">
|
|
||||||
<UiSelect
|
|
||||||
:id="`${idPrefix}-vehicle`"
|
|
||||||
v-model="form.vehicleId"
|
|
||||||
label="Immatriculation"
|
|
||||||
:options="filteredVehicles.map((vehicle) => ({
|
|
||||||
value: String(vehicle.id),
|
|
||||||
label: vehicle.plate
|
|
||||||
}))"
|
|
||||||
:loading="isLoadingVehicles"
|
|
||||||
:disabled="isLoadingVehicles || filteredVehicles.length === 0"
|
|
||||||
:wrapper-class="wrapperClass"
|
|
||||||
/>
|
|
||||||
<UiSelect
|
|
||||||
:id="`${idPrefix}-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="driverWrapperClass"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import type { DriverData } from '~/services/dto/driver-data'
|
|
||||||
import type { VehicleData } from '~/services/dto/vehicle-data'
|
|
||||||
|
|
||||||
defineProps<{
|
|
||||||
idPrefix: string
|
|
||||||
form: { licensePlate: string; vehicleId: string; driverId: string }
|
|
||||||
isLiotCarrier: boolean
|
|
||||||
allowAnyLicensePlate: boolean
|
|
||||||
filteredVehicles: VehicleData[]
|
|
||||||
filteredDrivers: DriverData[]
|
|
||||||
isLoadingVehicles: boolean
|
|
||||||
isLoadingDrivers: boolean
|
|
||||||
wrapperClass?: string
|
|
||||||
driverWrapperClass?: string
|
|
||||||
}>()
|
|
||||||
|
|
||||||
defineEmits<{
|
|
||||||
'update:allowAnyLicensePlate': [value: boolean]
|
|
||||||
}>()
|
|
||||||
</script>
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="flex items-center justify-between">
|
|
||||||
<div class="flex items-center gap-10">
|
|
||||||
<Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
|
|
||||||
<h1 class="text-3xl font-bold uppercase text-primary-500">{{ title }}</h1>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="px-[86px]">
|
|
||||||
<div class="mt-6 border border-slate-200 mb-16">
|
|
||||||
<div
|
|
||||||
class="grid gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
|
|
||||||
:style="{ gridTemplateColumns: gridCols }"
|
|
||||||
>
|
|
||||||
<div v-for="col in columns" :key="col.key">{{ col.label }}</div>
|
|
||||||
<div v-if="showActions">Actions</div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-for="item in items"
|
|
||||||
:key="item.id"
|
|
||||||
class="grid gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
|
|
||||||
:style="{ gridTemplateColumns: gridCols }"
|
|
||||||
role="button"
|
|
||||||
tabindex="0"
|
|
||||||
@click="goToItem(item.id)"
|
|
||||||
@keydown.enter="goToItem(item.id)"
|
|
||||||
>
|
|
||||||
<div v-for="col in columns" :key="col.key">
|
|
||||||
<slot :name="`cell-${col.key}`" :item="item">
|
|
||||||
{{ getNestedValue(item, col.key) }}
|
|
||||||
</slot>
|
|
||||||
</div>
|
|
||||||
<div v-if="showActions" @click.stop>
|
|
||||||
<slot name="actions" :item="item" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
interface Column {
|
|
||||||
key: string
|
|
||||||
label: string
|
|
||||||
}
|
|
||||||
|
|
||||||
const props = withDefaults(defineProps<{
|
|
||||||
title: string
|
|
||||||
columns: Column[]
|
|
||||||
items: any[]
|
|
||||||
routePrefix: string
|
|
||||||
showActions?: boolean
|
|
||||||
}>(), {
|
|
||||||
showActions: false
|
|
||||||
})
|
|
||||||
|
|
||||||
const router = useRouter()
|
|
||||||
|
|
||||||
const gridCols = computed(() => {
|
|
||||||
const dataCols = props.columns.map(() => '1fr').join(' ')
|
|
||||||
return props.showActions ? `${dataCols} 60px` : dataCols
|
|
||||||
})
|
|
||||||
|
|
||||||
const goToItem = (id: number) => {
|
|
||||||
router.push(`${props.routePrefix}/${id}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
const getNestedValue = (obj: any, path: string): string => {
|
|
||||||
const value = path.split('.').reduce((acc, key) => acc?.[key], obj)
|
|
||||||
return value || '—'
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="flex justify-center">
|
|
||||||
<div class="flex flex-col items-center w-[660px]">
|
|
||||||
<h1 class="font-bold text-5xl uppercase text-primary-500">{{ title }}</h1>
|
|
||||||
<p class="text-primary-500 uppercase text-2xl mt-2">Pont-bascule connecté</p>
|
|
||||||
<div
|
|
||||||
v-if="!displayWeight"
|
|
||||||
class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[86px]">
|
|
||||||
<UiLoadingDots />
|
|
||||||
</div>
|
|
||||||
<div v-else class="w-full">
|
|
||||||
<div
|
|
||||||
class="w-full flex flex-col items-center justify-center border border-black h-[90px] mt-12 mb-[25px] text-4xl text-primary-500">
|
|
||||||
{{ displayWeight }} kg
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-center mt-[54px]">
|
|
||||||
<UiButton
|
|
||||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
|
||||||
@click="fetchWeight"
|
|
||||||
>{{ displayWeight !== null ? 'refaire une pesée' : 'peser' }}</UiButton>
|
|
||||||
<UiButton
|
|
||||||
v-if="displayWeight !== null && !showGenerateReceipt"
|
|
||||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
|
|
||||||
@click="saveWeight"
|
|
||||||
>Valider la pesée</UiButton>
|
|
||||||
<UiButton
|
|
||||||
v-if="showGenerateReceipt"
|
|
||||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] ml-4"
|
|
||||||
@click="printReceipt"
|
|
||||||
>Générer le bon</UiButton>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { toRef } from 'vue'
|
|
||||||
import { useWeighingStep } from '~/composables/steps/useWeighingStep'
|
|
||||||
import type { WeightData } from '~/services/dto/weight-data'
|
|
||||||
|
|
||||||
const props = defineProps<{
|
|
||||||
mode: 'gross' | 'tare'
|
|
||||||
entityName: 'reception' | 'shipment'
|
|
||||||
apiResource: string
|
|
||||||
titleLabel: string
|
|
||||||
isFinal: boolean
|
|
||||||
entity: any
|
|
||||||
getWeightFromScale: () => Promise<WeightData>
|
|
||||||
updateEntity: (id: number, payload: any) => Promise<any>
|
|
||||||
loadEntity: (id: number) => Promise<any>
|
|
||||||
clearEntity: () => void
|
|
||||||
buildReceiptFilename: (entity: any) => string
|
|
||||||
}>()
|
|
||||||
|
|
||||||
const entityRef = toRef(props, 'entity')
|
|
||||||
|
|
||||||
const {
|
|
||||||
displayWeight,
|
|
||||||
title,
|
|
||||||
fetchWeight,
|
|
||||||
saveWeight,
|
|
||||||
saveWeightDraft,
|
|
||||||
showGenerateReceipt,
|
|
||||||
printReceipt
|
|
||||||
} = useWeighingStep({
|
|
||||||
mode: props.mode,
|
|
||||||
entity: entityRef,
|
|
||||||
entityName: props.entityName,
|
|
||||||
apiResource: props.apiResource,
|
|
||||||
titleLabel: props.titleLabel,
|
|
||||||
isFinal: props.isFinal,
|
|
||||||
getWeightFromScale: props.getWeightFromScale,
|
|
||||||
updateEntity: props.updateEntity,
|
|
||||||
loadEntity: props.loadEntity,
|
|
||||||
clearEntity: props.clearEntity,
|
|
||||||
buildReceiptFilename: props.buildReceiptFilename
|
|
||||||
})
|
|
||||||
|
|
||||||
defineExpose({ saveWeightDraft })
|
|
||||||
</script>
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
import type { Ref } from 'vue'
|
|
||||||
import { useWeighing } from '~/composables/useWeighing'
|
|
||||||
import { usePdfPrinter } from '~/composables/usePdfPrinter'
|
|
||||||
import type { WeightData } from '~/services/dto/weight-data'
|
|
||||||
|
|
||||||
interface UseWeighingStepOptions {
|
|
||||||
mode: 'gross' | 'tare'
|
|
||||||
entity: Ref<any>
|
|
||||||
entityName: 'reception' | 'shipment'
|
|
||||||
apiResource: string
|
|
||||||
titleLabel: string
|
|
||||||
isFinal: boolean
|
|
||||||
getWeightFromScale: () => Promise<WeightData>
|
|
||||||
updateEntity: (id: number, payload: any) => Promise<any>
|
|
||||||
loadEntity: (id: number) => Promise<any>
|
|
||||||
clearEntity: () => void
|
|
||||||
buildReceiptFilename: (entity: any) => string
|
|
||||||
}
|
|
||||||
|
|
||||||
export const useWeighingStep = (options: UseWeighingStepOptions) => {
|
|
||||||
const router = useRouter()
|
|
||||||
const { printPdf } = usePdfPrinter()
|
|
||||||
|
|
||||||
const {
|
|
||||||
weightData,
|
|
||||||
currentWeightEntry,
|
|
||||||
displayWeight,
|
|
||||||
displayDsd,
|
|
||||||
title,
|
|
||||||
showLoadingBox,
|
|
||||||
fetchWeight,
|
|
||||||
saveWeight,
|
|
||||||
saveWeightDraft
|
|
||||||
} = useWeighing({
|
|
||||||
mode: options.mode,
|
|
||||||
entity: options.entity,
|
|
||||||
entityName: options.entityName,
|
|
||||||
apiResource: options.apiResource,
|
|
||||||
titleLabel: options.titleLabel,
|
|
||||||
getWeightFromScale: options.getWeightFromScale,
|
|
||||||
updateEntity: options.updateEntity,
|
|
||||||
loadEntity: options.loadEntity
|
|
||||||
})
|
|
||||||
|
|
||||||
const showGenerateReceipt = computed(
|
|
||||||
() => options.isFinal && displayWeight.value !== null
|
|
||||||
)
|
|
||||||
|
|
||||||
const printReceipt = async () => {
|
|
||||||
if (!import.meta.client || !options.entity.value) return
|
|
||||||
|
|
||||||
await saveWeight()
|
|
||||||
const entity = options.entity.value
|
|
||||||
const filename = options.buildReceiptFilename(entity)
|
|
||||||
await printPdf(`/${options.apiResource}/${entity.id}/receipt`, filename)
|
|
||||||
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, 600))
|
|
||||||
|
|
||||||
const result = await options.updateEntity(entity.id, { isValid: true })
|
|
||||||
if (!result) return
|
|
||||||
|
|
||||||
options.clearEntity()
|
|
||||||
await router.push('/')
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
weightData,
|
|
||||||
currentWeightEntry,
|
|
||||||
displayWeight,
|
|
||||||
displayDsd,
|
|
||||||
title,
|
|
||||||
showLoadingBox,
|
|
||||||
fetchWeight,
|
|
||||||
saveWeight,
|
|
||||||
saveWeightDraft,
|
|
||||||
showGenerateReceipt,
|
|
||||||
printReceipt
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
import type { Ref } from 'vue'
|
|
||||||
import type { AddressData } from '~/services/dto/address-data'
|
|
||||||
|
|
||||||
interface AddressOwner {
|
|
||||||
id: number
|
|
||||||
addresses?: AddressData[]
|
|
||||||
}
|
|
||||||
|
|
||||||
export const useAddressSync = (
|
|
||||||
form: { addressId: string },
|
|
||||||
ownerId: Ref<string>,
|
|
||||||
owners: Ref<AddressOwner[]>
|
|
||||||
) => {
|
|
||||||
const ownerAddresses = computed<AddressData[]>(() => {
|
|
||||||
const id = Number(ownerId.value)
|
|
||||||
if (!Number.isFinite(id)) return []
|
|
||||||
return owners.value.find((owner) => owner.id === id)?.addresses ?? []
|
|
||||||
})
|
|
||||||
|
|
||||||
const addressOptions = computed(() =>
|
|
||||||
ownerAddresses.value.map((address) => ({
|
|
||||||
value: String(address.id),
|
|
||||||
label: address.fullAddress
|
|
||||||
}))
|
|
||||||
)
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => [ownerId.value, form.addressId, owners.value],
|
|
||||||
() => {
|
|
||||||
if (!ownerId.value) {
|
|
||||||
form.addressId = ''
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (!form.addressId && ownerAddresses.value.length === 1) {
|
|
||||||
form.addressId = String(ownerAddresses.value[0].id)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (!form.addressId) return
|
|
||||||
const matches = ownerAddresses.value.some(
|
|
||||||
(address) => String(address.id) === form.addressId
|
|
||||||
)
|
|
||||||
if (!matches) {
|
|
||||||
if (ownerAddresses.value.length === 1) {
|
|
||||||
form.addressId = String(ownerAddresses.value[0].id)
|
|
||||||
} else {
|
|
||||||
form.addressId = ''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{ immediate: true }
|
|
||||||
)
|
|
||||||
|
|
||||||
return { ownerAddresses, addressOptions }
|
|
||||||
}
|
|
||||||
@@ -1,113 +0,0 @@
|
|||||||
import { ref, onUnmounted } from 'vue'
|
|
||||||
|
|
||||||
declare global {
|
|
||||||
interface Window {
|
|
||||||
BarcodeDetector: new (options?: { formats: string[] }) => {
|
|
||||||
detect(source: HTMLVideoElement | ImageBitmapSource): Promise<{ rawValue: string }[]>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const BarcodeDetector: Window['BarcodeDetector'] | undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useBarcodeScanner(onDetected: (code: string) => void) {
|
|
||||||
const isSupported = ref('BarcodeDetector' in globalThis)
|
|
||||||
const isScanning = ref(false)
|
|
||||||
const error = ref<string | null>(null)
|
|
||||||
|
|
||||||
let detector: InstanceType<Window['BarcodeDetector']> | null = null
|
|
||||||
let stream: MediaStream | null = null
|
|
||||||
let animationFrameId: number | null = null
|
|
||||||
let lastDetectedCode = ''
|
|
||||||
let lastDetectedTime = 0
|
|
||||||
|
|
||||||
const COOLDOWN_MS = 2000
|
|
||||||
|
|
||||||
async function start(videoElement: HTMLVideoElement) {
|
|
||||||
if (!isSupported.value) {
|
|
||||||
error.value = 'BarcodeDetector non supporté. Utilisez Chrome sur Android.'
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
detector = new BarcodeDetector({ formats: ['code_39', 'code_128'] })
|
|
||||||
|
|
||||||
stream = await navigator.mediaDevices.getUserMedia({
|
|
||||||
video: {
|
|
||||||
facingMode: 'environment',
|
|
||||||
width: { ideal: 1280 },
|
|
||||||
height: { ideal: 720 }
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
videoElement.srcObject = stream
|
|
||||||
await videoElement.play()
|
|
||||||
isScanning.value = true
|
|
||||||
error.value = null
|
|
||||||
|
|
||||||
scanLoop(videoElement)
|
|
||||||
} catch (e) {
|
|
||||||
error.value = e instanceof Error ? e.message : 'Erreur lors du démarrage de la caméra'
|
|
||||||
isScanning.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function scanLoop(videoElement: HTMLVideoElement) {
|
|
||||||
if (!isScanning.value || !detector) return
|
|
||||||
|
|
||||||
animationFrameId = requestAnimationFrame(async () => {
|
|
||||||
try {
|
|
||||||
if (videoElement.readyState >= HTMLMediaElement.HAVE_ENOUGH_DATA) {
|
|
||||||
const barcodes = await detector!.detect(videoElement)
|
|
||||||
|
|
||||||
if (barcodes.length > 0) {
|
|
||||||
const code = barcodes[0].rawValue.slice(4)
|
|
||||||
const now = Date.now()
|
|
||||||
|
|
||||||
if (code !== lastDetectedCode || now - lastDetectedTime > COOLDOWN_MS) {
|
|
||||||
lastDetectedCode = code
|
|
||||||
lastDetectedTime = now
|
|
||||||
|
|
||||||
if (navigator.vibrate) {
|
|
||||||
navigator.vibrate(100)
|
|
||||||
}
|
|
||||||
|
|
||||||
onDetected(code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
// Detection error on single frame, continue
|
|
||||||
}
|
|
||||||
|
|
||||||
scanLoop(videoElement)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function stop() {
|
|
||||||
isScanning.value = false
|
|
||||||
|
|
||||||
if (animationFrameId !== null) {
|
|
||||||
cancelAnimationFrame(animationFrameId)
|
|
||||||
animationFrameId = null
|
|
||||||
}
|
|
||||||
|
|
||||||
if (stream) {
|
|
||||||
stream.getTracks().forEach(track => track.stop())
|
|
||||||
stream = null
|
|
||||||
}
|
|
||||||
|
|
||||||
detector = null
|
|
||||||
}
|
|
||||||
|
|
||||||
onUnmounted(() => {
|
|
||||||
stop()
|
|
||||||
})
|
|
||||||
|
|
||||||
return {
|
|
||||||
isSupported,
|
|
||||||
isScanning,
|
|
||||||
error,
|
|
||||||
start,
|
|
||||||
stop
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
import type { UserData } from '~/services/dto/user-data'
|
|
||||||
import type { TruckData } from '~/services/dto/truck-data'
|
|
||||||
import type { CarrierData } from '~/services/dto/carrier-data'
|
|
||||||
import { getUsers } from '~/services/auth'
|
|
||||||
import { getTruckList } from '~/services/truck'
|
|
||||||
import { getCarrierList } from '~/services/carrier'
|
|
||||||
import { useAuthStore } from '~/stores/auth'
|
|
||||||
|
|
||||||
export const useFormDataLoading = (form: { userId: string }) => {
|
|
||||||
const users = ref<UserData[]>([])
|
|
||||||
const trucks = ref<TruckData[]>([])
|
|
||||||
const carriers = ref<CarrierData[]>([])
|
|
||||||
const isLoadingUsers = ref(false)
|
|
||||||
const isLoadingTrucks = ref(false)
|
|
||||||
const isLoadingCarriers = ref(false)
|
|
||||||
const authStore = useAuthStore()
|
|
||||||
|
|
||||||
const loadUsers = async () => {
|
|
||||||
isLoadingUsers.value = true
|
|
||||||
try {
|
|
||||||
users.value = await getUsers()
|
|
||||||
} finally {
|
|
||||||
isLoadingUsers.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const loadTrucks = async () => {
|
|
||||||
isLoadingTrucks.value = true
|
|
||||||
try {
|
|
||||||
trucks.value = await getTruckList()
|
|
||||||
} finally {
|
|
||||||
isLoadingTrucks.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const loadCarriers = async () => {
|
|
||||||
isLoadingCarriers.value = true
|
|
||||||
try {
|
|
||||||
carriers.value = await getCarrierList()
|
|
||||||
} finally {
|
|
||||||
isLoadingCarriers.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const setDefaultUser = () => {
|
|
||||||
if (form.userId) return
|
|
||||||
if (authStore.user?.id) {
|
|
||||||
form.userId = String(authStore.user.id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const loadCommonData = async () => {
|
|
||||||
await loadUsers()
|
|
||||||
await loadTrucks()
|
|
||||||
await loadCarriers()
|
|
||||||
await authStore.ensureSession()
|
|
||||||
setDefaultUser()
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
users,
|
|
||||||
trucks,
|
|
||||||
carriers,
|
|
||||||
isLoadingUsers,
|
|
||||||
isLoadingTrucks,
|
|
||||||
isLoadingCarriers,
|
|
||||||
loadUsers,
|
|
||||||
loadTrucks,
|
|
||||||
loadCarriers,
|
|
||||||
setDefaultUser,
|
|
||||||
loadCommonData
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,153 +0,0 @@
|
|||||||
import type { Ref } from 'vue'
|
|
||||||
import type { CarrierData } from '~/services/dto/carrier-data'
|
|
||||||
import type { DriverData } from '~/services/dto/driver-data'
|
|
||||||
import type { VehicleData } from '~/services/dto/vehicle-data'
|
|
||||||
import { getDriverList } from '~/services/driver'
|
|
||||||
import { getVehicleList } from '~/services/vehicle'
|
|
||||||
import { SUPPLIER_CODE } from '~/utils/constants'
|
|
||||||
|
|
||||||
interface LiotForm {
|
|
||||||
carrierId: string
|
|
||||||
truckId: string
|
|
||||||
driverId: string
|
|
||||||
vehicleId: string
|
|
||||||
licensePlate: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export const useLiotHandling = (
|
|
||||||
form: LiotForm,
|
|
||||||
carriers: Ref<CarrierData[]>,
|
|
||||||
isHydrating: Ref<boolean>
|
|
||||||
) => {
|
|
||||||
const drivers = ref<DriverData[]>([])
|
|
||||||
const vehicles = ref<VehicleData[]>([])
|
|
||||||
const isLoadingDrivers = ref(false)
|
|
||||||
const isLoadingVehicles = ref(false)
|
|
||||||
const allowAnyLicensePlate = ref(false)
|
|
||||||
|
|
||||||
const selectedCarrier = computed(() =>
|
|
||||||
carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
|
|
||||||
)
|
|
||||||
|
|
||||||
const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)
|
|
||||||
|
|
||||||
const filteredDrivers = computed<DriverData[]>(() => {
|
|
||||||
if (!form.carrierId) return []
|
|
||||||
return drivers.value.filter((driver) => String(driver.carrier?.id) === form.carrierId)
|
|
||||||
})
|
|
||||||
|
|
||||||
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)
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
const loadDrivers = async () => {
|
|
||||||
isLoadingDrivers.value = true
|
|
||||||
try {
|
|
||||||
drivers.value = await getDriverList()
|
|
||||||
} finally {
|
|
||||||
isLoadingDrivers.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const loadVehicles = async () => {
|
|
||||||
isLoadingVehicles.value = true
|
|
||||||
try {
|
|
||||||
vehicles.value = await getVehicleList()
|
|
||||||
} finally {
|
|
||||||
isLoadingVehicles.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Auto-select driver/vehicle when carrier changes
|
|
||||||
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 }
|
|
||||||
)
|
|
||||||
|
|
||||||
// Validate/auto-select vehicle when truck/carrier changes
|
|
||||||
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 }
|
|
||||||
)
|
|
||||||
|
|
||||||
// Sync license plate from selected vehicle
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
// Auto-select vehicle from license plate
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
return {
|
|
||||||
drivers,
|
|
||||||
vehicles,
|
|
||||||
isLoadingDrivers,
|
|
||||||
isLoadingVehicles,
|
|
||||||
allowAnyLicensePlate,
|
|
||||||
isLiotCarrier,
|
|
||||||
filteredDrivers,
|
|
||||||
filteredVehicles,
|
|
||||||
loadDrivers,
|
|
||||||
loadVehicles
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,26 +1,30 @@
|
|||||||
import { useApi } from '~/composables/useApi'
|
import {useApi} from '~/composables/useApi'
|
||||||
|
|
||||||
export const usePdfPrinter = () => {
|
export const usePdfPrinter = () => {
|
||||||
const api = useApi()
|
const api = useApi()
|
||||||
|
const receptionStore = useReceptionStore()
|
||||||
|
const currentReception = receptionStore.current
|
||||||
|
|
||||||
const printPdf = async (url: string, filename = 'document.pdf'): Promise<void> => {
|
const printPdf = async (url: string): Promise<void> => {
|
||||||
const blob = await api.getBlob(url)
|
const blob = await api.getBlob(url);
|
||||||
|
|
||||||
const pdfBlob = blob.type === 'application/pdf'
|
const pdfBlob = blob.type === 'application/pdf'
|
||||||
? blob
|
? blob
|
||||||
: new Blob([blob], { type: 'application/pdf' })
|
: new Blob([blob], { type: 'application/pdf' });
|
||||||
|
|
||||||
const blobUrl = URL.createObjectURL(pdfBlob)
|
const blobUrl = URL.createObjectURL(pdfBlob);
|
||||||
|
|
||||||
const a = document.createElement('a')
|
const filename = `${currentReception.identificationNumber}_${currentReception.supplier.name}_${currentReception.licensePlate}.pdf`;
|
||||||
a.href = blobUrl
|
|
||||||
a.download = filename
|
const a = document.createElement('a');
|
||||||
a.style.display = 'none'
|
a.href = blobUrl;
|
||||||
document.body.appendChild(a)
|
a.download = filename;
|
||||||
a.click()
|
a.style.display = 'none';
|
||||||
a.remove()
|
document.body.appendChild(a);
|
||||||
|
a.click();
|
||||||
|
a.remove();
|
||||||
// L'ouverture dans un nouvel onglet déclenche un 2e PDF sans le nom personnalisé.
|
// L'ouverture dans un nouvel onglet déclenche un 2e PDF sans le nom personnalisé.
|
||||||
setTimeout(() => URL.revokeObjectURL(blobUrl), 60_000)
|
setTimeout(() => URL.revokeObjectURL(blobUrl), 60_000);
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -1,64 +1,60 @@
|
|||||||
import { computed, ref } from 'vue'
|
import type {Ref} from 'vue'
|
||||||
import type { Ref } from 'vue'
|
import {computed, ref} from 'vue'
|
||||||
import type { 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 { createWeight, updateWeight } from '~/services/weight'
|
import {getWeight} from '~/services/reception'
|
||||||
|
import {createWeight, updateWeight} from '~/services/weight'
|
||||||
|
|
||||||
export type WeighingMode = 'gross' | 'tare'
|
export type WeighingMode = 'gross' | 'tare'
|
||||||
|
|
||||||
export interface UseWeighingOptions {
|
type UseWeighingOptions = {
|
||||||
mode: WeighingMode
|
mode: WeighingMode
|
||||||
entity: Ref<{ id: number; currentStep: number; isValid: boolean; weights?: WeightEntryData[] | null } | null>
|
reception: Ref<ReceptionData | null>
|
||||||
entityName: 'reception' | 'shipment'
|
updateReception: (id: number, payload: ReceptionPayload) => Promise<ReceptionData | null>
|
||||||
apiResource: string
|
loadReception?: (id: number) => Promise<ReceptionData | null>
|
||||||
titleLabel: string
|
|
||||||
getWeightFromScale: () => Promise<WeightData>
|
|
||||||
updateEntity: (id: number, payload: any) => Promise<any>
|
|
||||||
loadEntity?: (id: number) => Promise<any>
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const useWeighing = ({
|
export const useWeighing = ({
|
||||||
mode,
|
mode,
|
||||||
entity,
|
reception,
|
||||||
entityName,
|
updateReception,
|
||||||
apiResource,
|
loadReception
|
||||||
titleLabel,
|
|
||||||
getWeightFromScale,
|
|
||||||
updateEntity,
|
|
||||||
loadEntity
|
|
||||||
}: UseWeighingOptions) => {
|
}: UseWeighingOptions) => {
|
||||||
const weightData = ref<WeightData | null>(null)
|
const weightData = ref<WeightData | null>(null)
|
||||||
const isFetching = ref(false)
|
const isFetching = ref(false)
|
||||||
|
|
||||||
const currentWeightEntry = computed<WeightEntryData | null>(() => {
|
const currentWeightEntry = computed<WeightEntryData | null>(() => {
|
||||||
const weights = entity.value?.weights ?? []
|
const weights = reception.value?.weights ?? []
|
||||||
return weights.find((entry) => entry.type === mode) ?? null
|
return weights.find((entry) => entry.type === mode) ?? null
|
||||||
})
|
})
|
||||||
|
|
||||||
const displayWeight = computed(() => weightData.value?.weight ?? currentWeightEntry.value?.weight ?? null)
|
const displayWeight = computed(() => weightData.value?.weight ?? currentWeightEntry.value?.weight ?? null)
|
||||||
const displayDsd = computed(() => weightData.value?.dsd ?? currentWeightEntry.value?.dsd ?? '-')
|
const displayDsd = computed(() => weightData.value?.dsd ?? currentWeightEntry.value?.dsd ?? '-')
|
||||||
const title = computed(() => titleLabel)
|
const title = computed(() => (mode === 'gross' ? 'Pesée à plein' : 'Pesée à vide'))
|
||||||
const showLoadingBox = computed(() => isFetching.value)
|
const showLoadingBox = computed(
|
||||||
|
() => isFetching.value || (displayWeight.value === null && currentWeightEntry.value === null)
|
||||||
|
)
|
||||||
|
|
||||||
const fetchWeight = async () => {
|
const fetchWeight = async () => {
|
||||||
isFetching.value = true
|
isFetching.value = true
|
||||||
weightData.value = await getWeightFromScale().finally(() => {
|
weightData.value = await getWeight().finally(() => {
|
||||||
isFetching.value = false
|
isFetching.value = false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
const saveWeight = async () => {
|
const saveWeight = async () => {
|
||||||
if (!entity.value) return
|
if (!reception.value) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
const existingEntry = currentWeightEntry.value
|
const existingEntry = currentWeightEntry.value
|
||||||
const baseDsd = weightData.value?.dsd ?? existingEntry?.dsd ?? null
|
const baseDsd = weightData.value?.dsd ?? existingEntry?.dsd ?? null
|
||||||
const baseWeight = weightData.value?.weight ?? existingEntry?.weight ?? null
|
const baseWeight = weightData.value?.weight ?? existingEntry?.weight ?? null
|
||||||
const baseWeighedAt = weightData.value?.weighedAt ?? existingEntry?.weighedAt ?? null
|
const baseWeighedAt = weightData.value?.weighedAt ?? existingEntry?.weighedAt ?? null
|
||||||
|
|
||||||
if (baseWeight === null) return
|
if (baseWeight === null) {
|
||||||
|
return
|
||||||
const relationPayload: Record<string, string> = {}
|
}
|
||||||
relationPayload[entityName] = `/api/${apiResource}/${entity.value.id}`
|
|
||||||
|
|
||||||
if (existingEntry?.id) {
|
if (existingEntry?.id) {
|
||||||
await updateWeight(existingEntry.id, {
|
await updateWeight(existingEntry.id, {
|
||||||
@@ -69,7 +65,7 @@ export const useWeighing = ({
|
|||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
await createWeight({
|
await createWeight({
|
||||||
...relationPayload,
|
reception: `api/receptions/${reception.value.id}`,
|
||||||
type: mode,
|
type: mode,
|
||||||
dsd: baseDsd,
|
dsd: baseDsd,
|
||||||
weight: baseWeight,
|
weight: baseWeight,
|
||||||
@@ -78,47 +74,15 @@ export const useWeighing = ({
|
|||||||
}
|
}
|
||||||
|
|
||||||
const nextStep = mode === 'tare'
|
const nextStep = mode === 'tare'
|
||||||
? entity.value.currentStep
|
? reception.value.currentStep
|
||||||
: entity.value.currentStep + 1
|
: reception.value.currentStep + 1
|
||||||
await updateEntity(entity.value.id, {
|
await updateReception(reception.value.id, {
|
||||||
currentStep: nextStep,
|
currentStep: nextStep,
|
||||||
isValid: entity.value.isValid
|
isValid: reception.value.isValid
|
||||||
})
|
})
|
||||||
|
|
||||||
if (loadEntity) {
|
if (loadReception) {
|
||||||
await loadEntity(entity.value.id)
|
await loadReception(reception.value.id)
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const saveWeightDraft = async () => {
|
|
||||||
if (!entity.value) return
|
|
||||||
if (!weightData.value && !currentWeightEntry.value) return
|
|
||||||
|
|
||||||
const existingEntry = currentWeightEntry.value
|
|
||||||
const baseDsd = weightData.value?.dsd ?? existingEntry?.dsd ?? null
|
|
||||||
const baseWeight = weightData.value?.weight ?? existingEntry?.weight ?? null
|
|
||||||
const baseWeighedAt = weightData.value?.weighedAt ?? existingEntry?.weighedAt ?? null
|
|
||||||
|
|
||||||
if (baseWeight === null) return
|
|
||||||
|
|
||||||
const relationPayload: Record<string, string> = {}
|
|
||||||
relationPayload[entityName] = `/api/${apiResource}/${entity.value.id}`
|
|
||||||
|
|
||||||
if (existingEntry?.id) {
|
|
||||||
await updateWeight(existingEntry.id, {
|
|
||||||
type: mode,
|
|
||||||
dsd: baseDsd,
|
|
||||||
weight: baseWeight,
|
|
||||||
weighedAt: baseWeighedAt
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
await createWeight({
|
|
||||||
...relationPayload,
|
|
||||||
type: mode,
|
|
||||||
dsd: baseDsd,
|
|
||||||
weight: baseWeight,
|
|
||||||
weighedAt: baseWeighedAt
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -130,34 +94,6 @@ export const useWeighing = ({
|
|||||||
title,
|
title,
|
||||||
showLoadingBox,
|
showLoadingBox,
|
||||||
fetchWeight,
|
fetchWeight,
|
||||||
saveWeight,
|
saveWeight
|
||||||
saveWeightDraft
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Backward-compatible aliases
|
|
||||||
export const useWeighingShipment = ({
|
|
||||||
modeShipment,
|
|
||||||
shipment,
|
|
||||||
updateShipment,
|
|
||||||
loadShipment
|
|
||||||
}: {
|
|
||||||
modeShipment: WeighingMode
|
|
||||||
shipment: Ref<any>
|
|
||||||
updateShipment: (id: number, payload: any) => Promise<any>
|
|
||||||
loadShipment?: (id: number) => Promise<any>
|
|
||||||
}) => {
|
|
||||||
return useWeighing({
|
|
||||||
mode: modeShipment,
|
|
||||||
entity: shipment,
|
|
||||||
entityName: 'shipment',
|
|
||||||
apiResource: 'shipments',
|
|
||||||
titleLabel: modeShipment === 'gross' ? 'Pesée à vide' : 'Pesée à plein',
|
|
||||||
getWeightFromScale: async () => {
|
|
||||||
const { getWeightShipment } = await import('~/services/shipment')
|
|
||||||
return getWeightShipment()
|
|
||||||
},
|
|
||||||
updateEntity: updateShipment,
|
|
||||||
loadEntity: loadShipment
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,84 +0,0 @@
|
|||||||
import type { Ref } from 'vue'
|
|
||||||
import type { WorkflowConfig } from '~/types/workflow'
|
|
||||||
|
|
||||||
interface WorkflowStore {
|
|
||||||
current: any
|
|
||||||
isLoading: boolean
|
|
||||||
clearCurrent: () => void
|
|
||||||
[key: string]: any
|
|
||||||
}
|
|
||||||
|
|
||||||
export const useWorkflowSteps = (config: WorkflowConfig, store: WorkflowStore) => {
|
|
||||||
const route = useRoute()
|
|
||||||
const router = useRouter()
|
|
||||||
|
|
||||||
const stepLabels = config.steps.map(s => s.label)
|
|
||||||
|
|
||||||
const currentStep = computed(() => store.current?.currentStep ?? 0)
|
|
||||||
const entity = computed(() => store.current)
|
|
||||||
|
|
||||||
const loadMethod = `load${config.entityName.charAt(0).toUpperCase() + config.entityName.slice(1)}`
|
|
||||||
const updateMethod = `update${config.entityName.charAt(0).toUpperCase() + config.entityName.slice(1)}`
|
|
||||||
|
|
||||||
const resolveId = (param: unknown) => {
|
|
||||||
const idStr = Array.isArray(param) ? param[0] : param
|
|
||||||
if (!idStr) return null
|
|
||||||
const id = Number(idStr)
|
|
||||||
return Number.isFinite(id) ? id : null
|
|
||||||
}
|
|
||||||
|
|
||||||
const init = () => {
|
|
||||||
watch(
|
|
||||||
() => route.params.id,
|
|
||||||
async (param) => {
|
|
||||||
const id = resolveId(param)
|
|
||||||
if (id === null) {
|
|
||||||
store.clearCurrent()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
await store[loadMethod](id)
|
|
||||||
},
|
|
||||||
{ immediate: true }
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
const saveAndHold = async () => {
|
|
||||||
if (!store.current) {
|
|
||||||
await router.push('/')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const datePayload: Record<string, any> = {}
|
|
||||||
const rawDate = store.current[config.dateField]
|
|
||||||
datePayload[config.dateField] = rawDate ? rawDate.slice(0, 10) : rawDate
|
|
||||||
await store[updateMethod](store.current.id, {
|
|
||||||
currentStep: store.current.currentStep,
|
|
||||||
licensePlate: store.current.licensePlate,
|
|
||||||
...datePayload
|
|
||||||
})
|
|
||||||
await router.push('/')
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleStepSelect = async (step: number) => {
|
|
||||||
if (!store.current) return
|
|
||||||
if (step === store.current.currentStep) return
|
|
||||||
await store[updateMethod](store.current.id, { currentStep: step })
|
|
||||||
await store[loadMethod](store.current.id)
|
|
||||||
}
|
|
||||||
|
|
||||||
const advanceStep = async () => {
|
|
||||||
if (!store.current) return
|
|
||||||
const nextStep = store.current.currentStep + 1
|
|
||||||
await store[updateMethod](store.current.id, { currentStep: nextStep })
|
|
||||||
await store[loadMethod](store.current.id)
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
stepLabels,
|
|
||||||
currentStep,
|
|
||||||
entity,
|
|
||||||
init,
|
|
||||||
saveAndHold,
|
|
||||||
handleStepSelect,
|
|
||||||
advanceStep
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
import type { WorkflowConfig, WorkflowEntity } from '~/types/workflow'
|
|
||||||
|
|
||||||
export const receptionConfig: WorkflowConfig = {
|
|
||||||
entityName: 'reception',
|
|
||||||
apiResource: 'receptions',
|
|
||||||
steps: [
|
|
||||||
{ label: 'Réception' },
|
|
||||||
{ label: 'Pesée à plein', weighingMode: 'gross' },
|
|
||||||
{ label: 'Sélection réception' },
|
|
||||||
{ label: 'Pesée à vide', weighingMode: 'tare', isFinal: true }
|
|
||||||
],
|
|
||||||
weighingLabels: {
|
|
||||||
gross: 'Pesée à plein',
|
|
||||||
tare: 'Pesée à vide'
|
|
||||||
},
|
|
||||||
buildReceiptFilename: (entity: WorkflowEntity) => {
|
|
||||||
const rec = entity as any
|
|
||||||
return `${rec.identificationNumber ?? rec.id}_${rec.supplier?.name ?? 'fournisseur'}_${rec.licensePlate ?? 'immat'}.pdf`
|
|
||||||
},
|
|
||||||
routePrefix: '/reception',
|
|
||||||
toastPrefix: 'reception',
|
|
||||||
dateField: 'receptionDate'
|
|
||||||
}
|
|
||||||
|
|
||||||
export const RECEPTION_STEP_LABELS = receptionConfig.steps.map(s => s.label)
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
import type { WorkflowConfig, WorkflowEntity } from '~/types/workflow'
|
|
||||||
|
|
||||||
export const shipmentConfig: WorkflowConfig = {
|
|
||||||
entityName: 'shipment',
|
|
||||||
apiResource: 'shipments',
|
|
||||||
steps: [
|
|
||||||
{ label: 'Expédition' },
|
|
||||||
{ label: 'Pesée à vide', weighingMode: 'gross' },
|
|
||||||
{ label: 'Chargement' },
|
|
||||||
{ label: 'Pesée à plein', weighingMode: 'tare', isFinal: true }
|
|
||||||
],
|
|
||||||
weighingLabels: {
|
|
||||||
gross: 'Pesée à vide',
|
|
||||||
tare: 'Pesée à plein'
|
|
||||||
},
|
|
||||||
buildReceiptFilename: (entity: WorkflowEntity) => {
|
|
||||||
const ship = entity as any
|
|
||||||
return `${ship.identificationNumber ?? ship.id}_${ship.customer?.label ?? 'client'}_${ship.licensePlate ?? 'immat'}.pdf`
|
|
||||||
},
|
|
||||||
routePrefix: '/shipment',
|
|
||||||
toastPrefix: 'shipment',
|
|
||||||
dateField: 'shipmentDate'
|
|
||||||
}
|
|
||||||
|
|
||||||
export const SHIPMENT_STEP_LABELS = shipmentConfig.steps.map(s => s.label)
|
|
||||||
13
frontend/constants/steps.ts
Normal file
13
frontend/constants/steps.ts
Normal file
@@ -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
|
||||||
|
]
|
||||||
@@ -12,29 +12,8 @@
|
|||||||
"fetch": "Impossible de récupérer la réception.",
|
"fetch": "Impossible de récupérer la réception.",
|
||||||
"create": "Impossible de créer la réception.",
|
"create": "Impossible de créer la réception.",
|
||||||
"update": "Impossible de mettre à jour la réception.",
|
"update": "Impossible de mettre à jour la réception.",
|
||||||
"delete": "Impossible de supprimer la réception.",
|
|
||||||
"weight": "Impossible de récupérer la pesée."
|
|
||||||
},
|
|
||||||
"weight": {
|
|
||||||
"update": "Impossible de mettre à jour la pesée"
|
|
||||||
},
|
|
||||||
"shipment": {
|
|
||||||
"list": "Impossible de récupérer la liste des éxpeditions.",
|
|
||||||
"fetch": "Impossible de récupérer l'éxpeditions.",
|
|
||||||
"create": "Impossible de créer l'éxpeditions.",
|
|
||||||
"update": "Impossible de mettre à jour l'éxpeditions.",
|
|
||||||
"delete": "Impossible de supprimer l'expédition.",
|
|
||||||
"weigh": "Impossible de récupérer la pesée."
|
"weigh": "Impossible de récupérer la pesée."
|
||||||
},
|
},
|
||||||
"shipmentBovine": {
|
|
||||||
"list": "Impossible de récupérer la liste des bovins de l'éxpedition.",
|
|
||||||
"create": "Impossible d'enregistrer le bovin.",
|
|
||||||
"delete": "Impossible de supprimer le bovin.",
|
|
||||||
"update": "Impossible de mettre à jour le bovin."
|
|
||||||
},
|
|
||||||
"shipmentType": {
|
|
||||||
"list": "Impossible de récupérer la liste des types d'éxpedition."
|
|
||||||
},
|
|
||||||
"receptionType": {
|
"receptionType": {
|
||||||
"list": "Impossible de récupérer la liste des types de réception."
|
"list": "Impossible de récupérer la liste des types de réception."
|
||||||
},
|
},
|
||||||
@@ -58,45 +37,16 @@
|
|||||||
"delete": "Impossible de supprimer le bovin."
|
"delete": "Impossible de supprimer le bovin."
|
||||||
},
|
},
|
||||||
"supplier": {
|
"supplier": {
|
||||||
"list": "Impossible de récupérer la liste des fournisseurs.",
|
"list": "Impossible de récupérer la liste des fournisseurs."
|
||||||
"fetch": "Impossible de récupérer le fournisseur.",
|
|
||||||
"create": "Impossible de créer le fournisseur.",
|
|
||||||
"update": "Impossible de mettre à jour le fournisseur.",
|
|
||||||
"nameRequired": "Le nom du fournisseur est obligatoire."
|
|
||||||
},
|
|
||||||
"address": {
|
|
||||||
"fetch": "Impossible de récupérer l'adresse.",
|
|
||||||
"create": "Impossible de créer l'adresse.",
|
|
||||||
"update": "Impossible de mettre à jour l'adresse.",
|
|
||||||
"entityNotFound": "Entité introuvable.",
|
|
||||||
"streetRequired": "La rue est obligatoire.",
|
|
||||||
"postalCodeRequired": "Le code postal est obligatoire.",
|
|
||||||
"cityRequired": "La ville est obligatoire.",
|
|
||||||
"countryCodeInvalid": "Le pays doit être un code ISO2 (2 lettres)."
|
|
||||||
},
|
|
||||||
"customer": {
|
|
||||||
"list": "Impossible de récupérer la liste des clients.",
|
|
||||||
"fetch": "Impossible de récupérer le client.",
|
|
||||||
"create": "Impossible de créer le client.",
|
|
||||||
"update": "Impossible de mettre à jour le client."
|
|
||||||
},
|
},
|
||||||
"truck": {
|
"truck": {
|
||||||
"list": "Impossible de récupérer la liste des camions."
|
"list": "Impossible de récupérer la liste des camions."
|
||||||
},
|
},
|
||||||
"bovin": {
|
"bovin": {
|
||||||
"list": "Impossible de récupérer la liste des races de bovins.",
|
"list": "Impossible de récupérer la liste des races de bovins."
|
||||||
"fetch": "Impossible de récupérer le type bovin.",
|
|
||||||
"create": "Impossible de créer le type bovin.",
|
|
||||||
"update": "Impossible de mettre à jour le type bovin."
|
|
||||||
},
|
|
||||||
"bovine": {
|
|
||||||
"create": "Impossible d'enregistrer le bovin."
|
|
||||||
},
|
},
|
||||||
"carrier": {
|
"carrier": {
|
||||||
"list": "Impossible de récupérer la liste des transporteurs.",
|
"list": "Impossible de récupérer la liste des transporteurs."
|
||||||
"fetch": "Impossible de récupérer les données du transporteur",
|
|
||||||
"update": "Impossible de mettre à jour le transporteur",
|
|
||||||
"create": "Impossible de créer le transporteur"
|
|
||||||
},
|
},
|
||||||
"driver": {
|
"driver": {
|
||||||
"list": "Impossible de récupérer la liste des chauffeurs."
|
"list": "Impossible de récupérer la liste des chauffeurs."
|
||||||
@@ -107,53 +57,16 @@
|
|||||||
"auth": {
|
"auth": {
|
||||||
"login": "Identifiants invalides.",
|
"login": "Identifiants invalides.",
|
||||||
"users": "Impossible de récupérer les utilisateurs.",
|
"users": "Impossible de récupérer les utilisateurs.",
|
||||||
"logout": "Impossible de se déconnecter.",
|
"logout": "Impossible de se déconnecter."
|
||||||
"update": "Impossible de mettre à jour l'utilisateur.",
|
|
||||||
"create": "Impossible de créer l'utilisateur."
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"success": {
|
"success": {
|
||||||
"reception": {
|
"reception": {
|
||||||
"create": "Réception créée avec succès",
|
"update": "Réception mise à jour avec succès."
|
||||||
"update": "Réception mise à jour avec succès.",
|
|
||||||
"delete": "Réception supprimée avec succès."
|
|
||||||
},
|
|
||||||
"shipment": {
|
|
||||||
"create": "Éxpedition créée avec succès",
|
|
||||||
"update": "Éxpedition mise à jour avec succès.",
|
|
||||||
"delete": "Expédition supprimée avec succès."
|
|
||||||
},
|
|
||||||
"supplier": {
|
|
||||||
"create": "Fournisseur créé avec succès.",
|
|
||||||
"update": "Fournisseur mis à jour avec succès."
|
|
||||||
},
|
|
||||||
"customer": {
|
|
||||||
"create": "Client créé avec succès.",
|
|
||||||
"update": "Client mis à jour avec succès."
|
|
||||||
},
|
|
||||||
"address": {
|
|
||||||
"create": "Adresse créée avec succès.",
|
|
||||||
"update": "Adresse mise à jour avec succès."
|
|
||||||
},
|
},
|
||||||
"auth": {
|
"auth": {
|
||||||
"update": "Utilisateur mis à jour avec succès.",
|
|
||||||
"create": "Utilisateur créé avec succès.",
|
|
||||||
"login": "Connexion réussie.",
|
"login": "Connexion réussie.",
|
||||||
"logout": "Déconnexion réussie."
|
"logout": "Déconnexion réussie."
|
||||||
},
|
|
||||||
"carrier": {
|
|
||||||
"update": "Transporteur mis à jour",
|
|
||||||
"create": "Transporteur créé"
|
|
||||||
},
|
|
||||||
"bovin": {
|
|
||||||
"update": "Type bovin mis à jour avec succès.",
|
|
||||||
"create": "Type bovin créé avec succès."
|
|
||||||
},
|
|
||||||
"bovine": {
|
|
||||||
"create": "Bovin enregistré avec succès."
|
|
||||||
},
|
|
||||||
"weight": {
|
|
||||||
"update": "Pesée mis à jour"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
71
frontend/layouts/admin.vue
Normal file
71
frontend/layouts/admin.vue
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
<template>
|
||||||
|
<div class="min-h-screen text-neutral-900 grid grid-rows-[85px,1fr]">
|
||||||
|
<!-- HEADER -->
|
||||||
|
<header class="bg-primary-500 z-50 h-[85px]">
|
||||||
|
<div class="h-full w-full px-6 grid grid-cols-[auto,1fr,auto] items-center gap-8">
|
||||||
|
<NuxtLink to="/" class="grid place-items-center">
|
||||||
|
<span class="grid place-items-center bg-white text-xl font-bold uppercase text-primary-500 p-4">
|
||||||
|
LOGO
|
||||||
|
</span>
|
||||||
|
</NuxtLink>
|
||||||
|
|
||||||
|
<nav class="text-2xl font-bold uppercase text-white"></nav>
|
||||||
|
|
||||||
|
<NuxtLink
|
||||||
|
to="/"
|
||||||
|
class="text-xl font-bold uppercase text-white transition hover:opacity-80 justify-self-end"
|
||||||
|
>
|
||||||
|
Quitter le panel admin
|
||||||
|
</NuxtLink>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class="grid grid-cols-[16rem,1fr] h-[calc(100vh-85px)] min-h-0">
|
||||||
|
<aside class="bg-primary-500 text-white min-h-0 grid grid-rows-[auto,1fr,auto]">
|
||||||
|
<div class="p-4 font-semibold">Tableau de bord</div>
|
||||||
|
|
||||||
|
<div class="overflow-y-auto min-h-0 p-4 space-y-3">
|
||||||
|
<!-- Liste des liens à ajouter ci-dessous -->
|
||||||
|
<!--Button pour afficher le component admin-users -->
|
||||||
|
<NuxtLink
|
||||||
|
to="/admin/user-list"
|
||||||
|
class="block px-4 py-2 rounded hover:bg-primary-600 transition"
|
||||||
|
>
|
||||||
|
Utilisateurs
|
||||||
|
</NuxtLink>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="p-4">
|
||||||
|
<p class="font-bold text-white text-left">v{{ version }}</p>
|
||||||
|
<button
|
||||||
|
@click="handleLogout"
|
||||||
|
class="w-full bg-red-600 hover:bg-red-700 py-2 rounded font-bold"
|
||||||
|
>
|
||||||
|
Déconnexion
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</aside>
|
||||||
|
|
||||||
|
<main class="min-h-0 overflow-auto px-12 py-12 ">
|
||||||
|
<div class="w-full ">
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import auth from "~/layouts/auth.vue";
|
||||||
|
|
||||||
|
const { version } = useAppVersion()
|
||||||
|
const handleLogout = async () => {
|
||||||
|
try {
|
||||||
|
await auth.logout()
|
||||||
|
} finally {
|
||||||
|
await navigateTo('/login')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -1,183 +1,50 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="min-h-screen text-neutral-900 flex flex-col">
|
<div class="min-h-screen bg-white text-neutral-900">
|
||||||
<!-- HEADER -->
|
<header class="w-full border-b border-neutral-200 bg-primary-500">
|
||||||
<header class="w-full bg-primary-500 py-5 px-6">
|
<div class="flex w-full items-center justify-center px-6 py-4">
|
||||||
<div class="flex w-full items-center justify-between">
|
|
||||||
<!-- Burger (mobile) -->
|
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="inline-flex items-center justify-center text-3xl text-white md:hidden"
|
class="inline-flex items-center justify-center text-3xl text-white md:hidden"
|
||||||
aria-label="Ouvrir le menu"
|
aria-label="Ouvrir le menu"
|
||||||
@click="toggleMenu"
|
@click="toggleMenu"
|
||||||
>
|
>
|
||||||
<span aria-hidden="true" class="flex items-center">
|
<span aria-hidden="true" class="flex items-center"><Icon name="mdi:menu" size="44"/></span>
|
||||||
<Icon name="mdi:menu" size="44"/>
|
|
||||||
</span>
|
|
||||||
</button>
|
</button>
|
||||||
|
<nav class="ml-4 hidden items-center gap-8 text-2xl font-bold uppercase text-white md:flex">
|
||||||
<!-- Logo -->
|
<NuxtLink to="/" custom v-slot="{ href, navigate, isExactActive }">
|
||||||
<NuxtLink to="/" class="shrink-0">
|
|
||||||
<span class="flex items-center justify-center bg-white text-xl font-bold uppercase px-6 py-4">
|
|
||||||
LOGO
|
|
||||||
</span>
|
|
||||||
</NuxtLink>
|
|
||||||
|
|
||||||
<!-- NAV centré (desktop) -->
|
|
||||||
<nav
|
|
||||||
class="hidden md:flex flex-1 items-center justify-center gap-8 text-xl font-bold uppercase text-white"
|
|
||||||
>
|
|
||||||
<NuxtLink to="/" custom v-slot="{ href, navigate }">
|
|
||||||
<a
|
<a
|
||||||
:href="href"
|
:href="href"
|
||||||
@click="navigate"
|
@click="navigate"
|
||||||
:class="route.path === '/'
|
:class="isExactActive ? 'opacity-100' : 'opacity-50'"
|
||||||
? 'opacity-100'
|
|
||||||
: 'opacity-65 hover:opacity-100 transition'"
|
|
||||||
>
|
>
|
||||||
Accueil
|
Accueil
|
||||||
</a>
|
</a>
|
||||||
</NuxtLink>
|
</NuxtLink>
|
||||||
|
<NuxtLink to="/admin/dashboard" custom v-slot="{ href, navigate, isActive }">
|
||||||
<NuxtLink
|
|
||||||
v-if="auth.isAdmin"
|
|
||||||
to="/admin/user/list"
|
|
||||||
custom
|
|
||||||
v-slot="{ href, navigate }"
|
|
||||||
>
|
|
||||||
<a
|
<a
|
||||||
:href="href"
|
:href="href"
|
||||||
@click="navigate"
|
@click="navigate"
|
||||||
:class="route.path.startsWith('/admin/user')
|
|
||||||
? 'opacity-100'
|
|
||||||
: 'opacity-65 hover:opacity-100 transition'"
|
|
||||||
>
|
>
|
||||||
Utilisateurs
|
Admin
|
||||||
</a>
|
|
||||||
</NuxtLink>
|
|
||||||
|
|
||||||
<NuxtLink
|
|
||||||
v-if="auth.isAdmin"
|
|
||||||
to="/admin/supplier/supplier-list"
|
|
||||||
custom
|
|
||||||
v-slot="{ href, navigate }"
|
|
||||||
>
|
|
||||||
<a
|
|
||||||
:href="href"
|
|
||||||
@click="navigate"
|
|
||||||
:class="route.path.startsWith('/admin/supplier')
|
|
||||||
? 'opacity-100'
|
|
||||||
: 'opacity-65 hover:opacity-100 transition'"
|
|
||||||
>
|
|
||||||
Fournisseurs
|
|
||||||
</a>
|
|
||||||
</NuxtLink>
|
|
||||||
|
|
||||||
<NuxtLink
|
|
||||||
v-if="auth.isAdmin"
|
|
||||||
to="/admin/customer/customer-list"
|
|
||||||
custom
|
|
||||||
v-slot="{ href, navigate }"
|
|
||||||
>
|
|
||||||
<a
|
|
||||||
:href="href"
|
|
||||||
@click="navigate"
|
|
||||||
:class="route.path.startsWith('/admin/customer')
|
|
||||||
? 'opacity-100'
|
|
||||||
: 'opacity-65 hover:opacity-100 transition'"
|
|
||||||
>
|
|
||||||
Clients
|
|
||||||
</a>
|
|
||||||
</NuxtLink>
|
|
||||||
|
|
||||||
<NuxtLink
|
|
||||||
v-if="auth.isAdmin"
|
|
||||||
to="/admin/carrier/carrier-list"
|
|
||||||
custom
|
|
||||||
v-slot="{ href, navigate }"
|
|
||||||
>
|
|
||||||
<a
|
|
||||||
:href="href"
|
|
||||||
@click="navigate"
|
|
||||||
:class="route.path.startsWith('/admin/carrier')
|
|
||||||
? 'opacity-100'
|
|
||||||
: 'opacity-65 hover:opacity-100 transition'"
|
|
||||||
>
|
|
||||||
Transporteurs
|
|
||||||
</a>
|
|
||||||
</NuxtLink>
|
|
||||||
|
|
||||||
<NuxtLink
|
|
||||||
v-if="auth.isAdmin"
|
|
||||||
to="/admin/bovin/bovin-list"
|
|
||||||
custom
|
|
||||||
v-slot="{ href, navigate }"
|
|
||||||
>
|
|
||||||
<a
|
|
||||||
:href="href"
|
|
||||||
@click="navigate"
|
|
||||||
:class="route.path.startsWith('/admin/bovin')
|
|
||||||
? 'opacity-100'
|
|
||||||
: 'opacity-65 hover:opacity-100 transition'"
|
|
||||||
>
|
|
||||||
Bovins
|
|
||||||
</a>
|
|
||||||
</NuxtLink>
|
|
||||||
|
|
||||||
<NuxtLink
|
|
||||||
v-if="auth.isAdmin"
|
|
||||||
to="/scan"
|
|
||||||
custom
|
|
||||||
v-slot="{ href, navigate }"
|
|
||||||
>
|
|
||||||
<a
|
|
||||||
:href="href"
|
|
||||||
@click="navigate"
|
|
||||||
:class="route.path.startsWith('/scan')
|
|
||||||
? 'opacity-100'
|
|
||||||
: 'opacity-65 hover:opacity-100 transition'"
|
|
||||||
>
|
|
||||||
Scanner
|
|
||||||
</a>
|
</a>
|
||||||
</NuxtLink>
|
</NuxtLink>
|
||||||
</nav>
|
</nav>
|
||||||
|
<NuxtLink to="/" class="flex flex-1 items-center justify-center gap-3">
|
||||||
<!-- Spacer mobile (pour centrer visuellement le header si besoin) -->
|
<span
|
||||||
|
class="flex items-center justify-center bg-white text-xl font-bold uppercase text-primary-500 p-4"
|
||||||
|
>
|
||||||
|
LOGO
|
||||||
|
</span>
|
||||||
|
</NuxtLink>
|
||||||
<div class="w-[44px] md:hidden"></div>
|
<div class="w-[44px] md:hidden"></div>
|
||||||
|
<button
|
||||||
<!-- User dropdown à droite (desktop) -->
|
type="button"
|
||||||
<div v-if="auth.isAuthenticated" class="ml-auto relative hidden md:flex items-center text-white group">
|
class="ml-auto hidden text-xl font-bold uppercase text-white transition hover:opacity-80 md:inline-flex"
|
||||||
<button
|
@click="handleLogout"
|
||||||
type="button"
|
>
|
||||||
class="inline-flex items-center py-2 -my-2 text-xl leading-none transition hover:opacity-80"
|
Déconnexion
|
||||||
aria-haspopup="true"
|
</button>
|
||||||
>
|
|
||||||
<Icon name="mdi:account-circle-outline" class="self-center" size="36"/>
|
|
||||||
<span class="capitalize font-bold ml-4">{{ userDisplayName }}</span>
|
|
||||||
<span
|
|
||||||
class="ml-[6px] inline-flex items-center font-bold transition-transform group-hover:rotate-180 group-focus-within:rotate-180">
|
|
||||||
<Icon name="mdi:chevron-down" size="20"/>
|
|
||||||
</span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<div
|
|
||||||
class="absolute right-0 top-full z-10 w-56 rounded-md bg-primary-500 py-2 border-neutral-300 border shadow-lg
|
|
||||||
opacity-0 invisible pointer-events-none transition
|
|
||||||
group-hover:opacity-100 group-hover:visible group-hover:pointer-events-auto
|
|
||||||
group-focus-within:opacity-100 group-focus-within:visible group-focus-within:pointer-events-auto"
|
|
||||||
role="menu"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="w-full px-4 py-2 text-left text-sm font-semibold text-white opacity-85 hover:opacity-100 transition"
|
|
||||||
@click="handleLogout"
|
|
||||||
>
|
|
||||||
Déconnexion
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Overlay (mobile) -->
|
|
||||||
<transition
|
<transition
|
||||||
enter-active-class="transition duration-200 ease-out"
|
enter-active-class="transition duration-200 ease-out"
|
||||||
enter-from-class="opacity-0"
|
enter-from-class="opacity-0"
|
||||||
@@ -192,8 +59,6 @@
|
|||||||
@click="closeMenu"
|
@click="closeMenu"
|
||||||
/>
|
/>
|
||||||
</transition>
|
</transition>
|
||||||
|
|
||||||
<!-- Drawer (mobile) -->
|
|
||||||
<transition
|
<transition
|
||||||
enter-active-class="transition duration-200 ease-out"
|
enter-active-class="transition duration-200 ease-out"
|
||||||
enter-from-class="-translate-x-full"
|
enter-from-class="-translate-x-full"
|
||||||
@@ -204,7 +69,9 @@
|
|||||||
>
|
>
|
||||||
<aside
|
<aside
|
||||||
v-if="isMenuOpen"
|
v-if="isMenuOpen"
|
||||||
class="fixed left-0 top-0 z-50 h-full w-full bg-primary-500 px-6 pb-8 pt-6 text-white shadow-xl md:hidden"
|
class="fixed left-0 top-0 z-50 h-full w-full bg-primary-600 px-6 pb-8 pt-6 text-white shadow-xl md:hidden"
|
||||||
|
role="dialog"
|
||||||
|
aria-modal="true"
|
||||||
>
|
>
|
||||||
<div class="flex items-center justify-between">
|
<div class="flex items-center justify-between">
|
||||||
<span class="text-2xl font-bold uppercase">Menu</span>
|
<span class="text-2xl font-bold uppercase">Menu</span>
|
||||||
@@ -217,33 +84,12 @@
|
|||||||
<Icon name="mdi:close" size="44"/>
|
<Icon name="mdi:close" size="44"/>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<nav class="mt-8 flex flex-col gap-6 text-xl font-bold uppercase">
|
<nav class="mt-8 flex flex-col gap-6 text-xl font-bold uppercase">
|
||||||
<NuxtLink to="/admin/dashboard" @click="closeMenu">Accueil</NuxtLink>
|
<NuxtLink to="/" class="opacity-100" @click="closeMenu">Accueil</NuxtLink>
|
||||||
<NuxtLink v-if="auth.isAdmin" to="/admin/supplier/supplier-list" @click="closeMenu">
|
|
||||||
Fournisseurs
|
|
||||||
</NuxtLink>
|
|
||||||
<NuxtLink v-if="auth.isAdmin" to="/admin/carrier/carrier-list" @click="closeMenu">
|
|
||||||
Transporteurs
|
|
||||||
</NuxtLink>
|
|
||||||
<NuxtLink v-if="auth.isAdmin" to="/admin/user/list" @click="closeMenu">
|
|
||||||
Utilisateurs
|
|
||||||
</NuxtLink>
|
|
||||||
<NuxtLink v-if="auth.isAdmin" to="/admin/customer/customer-list" @click="closeMenu">
|
|
||||||
Clients
|
|
||||||
</NuxtLink>
|
|
||||||
<NuxtLink v-if="auth.isAdmin" to="/admin/bovin/bovin-list" @click="closeMenu">
|
|
||||||
Bovins
|
|
||||||
</NuxtLink>
|
|
||||||
<NuxtLink to="/scan" @click="closeMenu">
|
|
||||||
Scanner
|
|
||||||
</NuxtLink>
|
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
v-if="auth.isAuthenticated"
|
|
||||||
type="button"
|
type="button"
|
||||||
class="mt-6 text-xl font-bold uppercase"
|
class="mt-5 text-xl font-bold uppercase"
|
||||||
@click="handleLogout"
|
@click="handleLogout"
|
||||||
>
|
>
|
||||||
Déconnexion
|
Déconnexion
|
||||||
@@ -251,40 +97,37 @@
|
|||||||
</aside>
|
</aside>
|
||||||
</transition>
|
</transition>
|
||||||
</header>
|
</header>
|
||||||
<main class="md:mx-auto w-full md:max-w-[1280px] mt-4 md:mt-16">
|
<main class="mx-auto w-full max-w-[1280px] pb-0">
|
||||||
<slot/>
|
<slot/>
|
||||||
</main>
|
</main>
|
||||||
<footer class="w-full mt-auto bg-primary-500 px-6 py-3">
|
<footer class="w-full mt-8 bg-primary-500 p-6">
|
||||||
<p class="font-bold text-white text-right">v{{ version }}</p>
|
<p class="font-bold text-white text-right">v{{ version }}</p>
|
||||||
</footer>
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {useAuthStore} from '~/stores/auth'
|
import { useAuthStore } from '~/stores/auth'
|
||||||
|
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const auth = useAuthStore()
|
const auth = useAuthStore()
|
||||||
const {version} = useAppVersion()
|
|
||||||
|
|
||||||
const isMenuOpen = ref(false)
|
const isMenuOpen = ref(false)
|
||||||
|
const { version } = useAppVersion()
|
||||||
const userDisplayName = computed(() => auth.user?.username ?? 'Utilisateur')
|
|
||||||
|
|
||||||
const closeMenu = () => {
|
const closeMenu = () => {
|
||||||
isMenuOpen.value = false
|
isMenuOpen.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
const toggleMenu = () => {
|
const toggleMenu = () => {
|
||||||
isMenuOpen.value = !isMenuOpen.value
|
isMenuOpen.value = !isMenuOpen.value
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleLogout = async () => {
|
const handleLogout = async () => {
|
||||||
try {
|
try {
|
||||||
await auth.logout()
|
await auth.logout()
|
||||||
} finally {
|
} finally {
|
||||||
closeMenu()
|
closeMenu()
|
||||||
await navigateTo('/login')
|
await navigateTo('/login')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -15,8 +15,7 @@ export default defineNuxtConfig({
|
|||||||
css: ['~/assets/css/main.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
|
||||||
geoApiBase: ''
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
toast: {
|
toast: {
|
||||||
|
|||||||
@@ -1,112 +0,0 @@
|
|||||||
<template>
|
|
||||||
<form :class="{ submitted }" @submit.prevent="validate">
|
|
||||||
<div class="flex items-center justify-between relative">
|
|
||||||
<div class="flex flex-row absolute -left-[60px]">
|
|
||||||
<Icon
|
|
||||||
@click="router.push('/admin/bovin/bovin-list')"
|
|
||||||
name="gg:arrow-left-o"
|
|
||||||
size="40"
|
|
||||||
class="cursor-pointer text-primary-500"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<h1 class="text-3xl text-primary-500 font-bold uppercase">
|
|
||||||
{{ route.params.id ? 'Modifications du type bovin' : 'Ajout d\'un type bovin' }}
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid grid-cols-2 items-start pt-7 mb-11 gap-x-[200px]">
|
|
||||||
<UiTextInput label="Nom du bovin" id="bovin-label" v-model="form.label" required />
|
|
||||||
<UiTextInput label="Code bovin" id="code-id" v-model="form.code" required />
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-center items-center">
|
|
||||||
<UiButton
|
|
||||||
type="submit"
|
|
||||||
:disabled="isLoading || isHydrating"
|
|
||||||
class="inline-flex items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
|
|
||||||
@click="submitted = true"
|
|
||||||
>
|
|
||||||
Valider
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {createBovin, getBovin, updateBovin} from "~/services/bovine-type";
|
|
||||||
import type {BovineTypeData, BovinFormData} from "~/services/dto/bovine-type-data";
|
|
||||||
const router = useRouter()
|
|
||||||
const route = useRoute()
|
|
||||||
const isLoading = ref(false)
|
|
||||||
const isHydrating = ref(false)
|
|
||||||
const submitted = ref(false)
|
|
||||||
const idBovin = computed(() => resolveId(route.params.id))
|
|
||||||
const isEdit = computed(() => idBovin.value !== null)
|
|
||||||
|
|
||||||
function resolveId(param: unknown) {
|
|
||||||
const idStr = Array.isArray(param) ? param[0] : param
|
|
||||||
if (!idStr) return null
|
|
||||||
const id = Number(idStr)
|
|
||||||
return Number.isFinite(id) ? id : null
|
|
||||||
}
|
|
||||||
|
|
||||||
const form = reactive<BovinFormData>({
|
|
||||||
label: '',
|
|
||||||
code: ''
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
const hydrateFromBovin = (bovin: BovineTypeData | null) => {
|
|
||||||
if (!bovin) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
isHydrating.value = true
|
|
||||||
form.label = bovin.label ?? ''
|
|
||||||
form.code = bovin.code ?? ''
|
|
||||||
isHydrating.value = false
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => idBovin.value,
|
|
||||||
async (id) => {
|
|
||||||
if (id === null) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
isLoading.value = true
|
|
||||||
try {
|
|
||||||
const bovin = await getBovin(id)
|
|
||||||
hydrateFromBovin(bovin)
|
|
||||||
} finally {
|
|
||||||
isLoading.value = false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{immediate: true}
|
|
||||||
)
|
|
||||||
async function validate() {
|
|
||||||
if (isLoading.value || isHydrating.value) return
|
|
||||||
|
|
||||||
const normalizedBovinCode = form.code.trim()
|
|
||||||
const normalizedBovinLabel = form.label.trim()
|
|
||||||
|
|
||||||
|
|
||||||
const basePayload = {
|
|
||||||
label: normalizedBovinLabel,
|
|
||||||
code: normalizedBovinCode
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
isLoading.value = true
|
|
||||||
try {
|
|
||||||
if (isEdit.value && idBovin.value !== null) {
|
|
||||||
await updateBovin(idBovin.value, basePayload)
|
|
||||||
} else {
|
|
||||||
await createBovin(basePayload)
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
isLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function navigate(){
|
|
||||||
return router.push("/admin/bovin/list")
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="flex items-center justify-between ">
|
|
||||||
<h1 class="text-4xl font-bold uppercase text-primary-500">Liste des types bovins</h1>
|
|
||||||
</div>
|
|
||||||
<div class="mt-7 border border-slate-200 mb-11 ">
|
|
||||||
<div class="grid grid-cols-2 gap-4 text-primary-700 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
|
||||||
<div>Nom</div>
|
|
||||||
<div>Code</div>
|
|
||||||
</div>
|
|
||||||
<div v-if="!auth.isAdmin" class="px-4 py-6 text-slate-400">
|
|
||||||
Accès réservé aux administrateurs.
|
|
||||||
</div>
|
|
||||||
<div v-else-if="bovinList.length === 0" class="px-4 py-6 text-slate-400">
|
|
||||||
Aucun type de bovin.
|
|
||||||
</div>
|
|
||||||
<template v-else>
|
|
||||||
<div
|
|
||||||
v-for="bovin in bovinList"
|
|
||||||
:key="bovin.id"
|
|
||||||
class="grid grid-cols-2 text-primary-700 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
|
|
||||||
role="button"
|
|
||||||
tabindex="0"
|
|
||||||
@click="goToBovin(bovin.id)"
|
|
||||||
@keydown.enter="goToBovin(bovin.id)"
|
|
||||||
>
|
|
||||||
<div>{{ bovin.label }}</div>
|
|
||||||
<div>{{ bovin.code }}</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-center items-center">
|
|
||||||
<NuxtLink
|
|
||||||
to="/admin/bovin"
|
|
||||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
|
||||||
:class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
|
|
||||||
@click="handleAddClick"
|
|
||||||
>
|
|
||||||
<Icon name="mdi:plus" size="28" />
|
|
||||||
Ajouter
|
|
||||||
</NuxtLink>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { getBovineTypeList } from "~/services/bovine-type"
|
|
||||||
import type { BovineTypeData } from "~/services/dto/bovine-type-data"
|
|
||||||
import { useAuthStore } from "~/stores/auth"
|
|
||||||
|
|
||||||
const bovinList = ref<BovineTypeData[]>([])
|
|
||||||
const router = useRouter()
|
|
||||||
const auth = useAuthStore()
|
|
||||||
|
|
||||||
const goToBovin = (id: number) => {
|
|
||||||
if (!auth.isAdmin) return
|
|
||||||
router.push(`/admin/bovin/${id}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleAddClick = (event: Event) => {
|
|
||||||
if (auth.isAdmin) return
|
|
||||||
event.preventDefault()
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
if (!auth.isAdmin) return
|
|
||||||
bovinList.value = await getBovineTypeList()
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -1,117 +0,0 @@
|
|||||||
|
|
||||||
<template>
|
|
||||||
<form :class="{ submitted }" @submit.prevent="validate">
|
|
||||||
<div class="flex items-center justify-between relative">
|
|
||||||
<div class="flex flex-row absolute -left-[60px]">
|
|
||||||
<Icon
|
|
||||||
@click="router.push('/admin/carrier/carrier-list')"
|
|
||||||
name="gg:arrow-left-o"
|
|
||||||
size="40"
|
|
||||||
class="cursor-pointer text-primary-500"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<h1 class="text-3xl text-primary-500 font-bold uppercase">
|
|
||||||
{{ route.params.id ? 'Modification du transporteur' : 'Ajout d\'un transporteur' }}
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid grid-cols-2 items-start pt-7 mb-11 gap-x-[200px]">
|
|
||||||
<UiTextInput
|
|
||||||
label="Nom du transporteur"
|
|
||||||
id="carrier-name"
|
|
||||||
v-model="form.name"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
|
|
||||||
<UiTextInput
|
|
||||||
label="Code transporteur"
|
|
||||||
id="code-id"
|
|
||||||
v-model="form.code"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-center items-center">
|
|
||||||
<UiButton
|
|
||||||
type="submit"
|
|
||||||
class="inline-flex items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
|
|
||||||
@click="submitted = true"
|
|
||||||
>
|
|
||||||
Valider
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {createCarrier, getCarrier, updateCarrier} from "~/services/carrier";
|
|
||||||
import type {CarrierData, CarrierFormData} from "~/services/dto/carrier-data";
|
|
||||||
import {computed} from "vue";
|
|
||||||
const router = useRouter()
|
|
||||||
const route = useRoute()
|
|
||||||
const idCarrier = computed(() => resolveId(route.params.id))
|
|
||||||
const isLoading = ref(false)
|
|
||||||
const isHydrating = ref(false)
|
|
||||||
const submitted = ref(false)
|
|
||||||
|
|
||||||
const resolveId = (param: unknown) => {
|
|
||||||
const idStr = Array.isArray(param) ? param[0] : param
|
|
||||||
if (!idStr) return null
|
|
||||||
const id = Number(idStr)
|
|
||||||
return Number.isFinite(id) ? id : null
|
|
||||||
}
|
|
||||||
|
|
||||||
const form = reactive<CarrierFormData>({
|
|
||||||
code:'',
|
|
||||||
name:''
|
|
||||||
})
|
|
||||||
|
|
||||||
const hydrateFromUser = (carrier: CarrierData | null) => {
|
|
||||||
if (!carrier) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
isHydrating.value = true
|
|
||||||
form.name = carrier.name ?? ''
|
|
||||||
form.code = carrier.code ?? ''
|
|
||||||
isHydrating.value = false
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => idCarrier.value,
|
|
||||||
async (id) => {
|
|
||||||
if (id === null) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
isLoading.value = true
|
|
||||||
try {
|
|
||||||
const user = await getCarrier(id)
|
|
||||||
hydrateFromUser(user)
|
|
||||||
} finally {
|
|
||||||
isLoading.value = false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{immediate: true}
|
|
||||||
)
|
|
||||||
async function validate() {
|
|
||||||
|
|
||||||
const normalizedCarrierCode = form.code.trim()
|
|
||||||
const normalizedCarrierName = form.name.trim()
|
|
||||||
|
|
||||||
const basePayload = {
|
|
||||||
name: normalizedCarrierName,
|
|
||||||
code: normalizedCarrierCode
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if(idCarrier.value){
|
|
||||||
await updateCarrier(idCarrier.value, basePayload)
|
|
||||||
return
|
|
||||||
}else{
|
|
||||||
await createCarrier(basePayload)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function navigate(){
|
|
||||||
router.push("/admin/carrier/carrier-list")
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
<template>
|
|
||||||
|
|
||||||
<div class="flex items-center justify-between ">
|
|
||||||
<h1 class="text-4xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mt-7 border border-slate-200 mb-11 ">
|
|
||||||
<div class="grid grid-cols-2 gap-4 text-primary-700 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
|
||||||
<div>Label</div>
|
|
||||||
<div>Code</div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-for="carrier in carrierList"
|
|
||||||
:key="carrier.id"
|
|
||||||
class="grid grid-cols-2 text-primary-700 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
|
|
||||||
role="button"
|
|
||||||
tabindex="0"
|
|
||||||
@click="goToCarrier(carrier.id)"
|
|
||||||
@keydown.enter="goToCarrier(carrier.id)"
|
|
||||||
>
|
|
||||||
<div>{{ carrier.name}}</div>
|
|
||||||
<div>{{ carrier.code }}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-center items-center">
|
|
||||||
<NuxtLink
|
|
||||||
to="/admin/carrier"
|
|
||||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
|
||||||
>
|
|
||||||
<Icon name="mdi:plus" size="28" />
|
|
||||||
Ajouter
|
|
||||||
</NuxtLink>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import type {CarrierData} from "~/services/dto/carrier-data";
|
|
||||||
import {getCarrierList} from "~/services/carrier";
|
|
||||||
|
|
||||||
const carrierList = ref<CarrierData[]>()
|
|
||||||
const router = useRouter()
|
|
||||||
|
|
||||||
const goToCarrier = (id: number) => {
|
|
||||||
router.push(`/admin/carrier/${id}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
carrierList.value = await getCarrierList(false)
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -1,249 +0,0 @@
|
|||||||
<template>
|
|
||||||
<form :class="{ submitted }" @submit.prevent="validate">
|
|
||||||
<div class="flex items-center relative">
|
|
||||||
<div class="flex flex-row absolute -left-[60px] ">
|
|
||||||
<Icon @click="router.push('/admin/customer/customer-list')" name="gg:arrow-left-o" size="40" class="cursor-pointer text-primary-500"/>
|
|
||||||
</div>
|
|
||||||
<h1 class="text-3xl text-primary-500 font-bold uppercase">
|
|
||||||
{{ customerId ? "Modification du client" : "Ajout d'un client" }}
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex flex-cols-3 justify-between mb-11 pt-7">
|
|
||||||
<UiTextInput id="customer-name" v-model="form.name" label="Nom du client" :disabled="!auth.isAdmin" wrapper-class="w-[280px]" required/>
|
|
||||||
<UiTextInput id="customer-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin" wrapper-class="w-[280px]" required/>
|
|
||||||
<UiTextInput id="customer-email" v-model="form.email" label="Email" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
|
|
||||||
</div>
|
|
||||||
<div v-if="!customerId" class="flex flex-cols-3 justify-between mb-11">
|
|
||||||
<UiTextInput id="address-street" v-model="addressForm.street" label="Rue" wrapper-class="w-[280px]" required />
|
|
||||||
<UiTextInput id="address-street2" v-model="addressForm.street2" label="Complément" wrapper-class="w-[280px]" />
|
|
||||||
<UiTextInput id="address-country" v-model="addressForm.countryCode" label="Pays (code)" wrapper-class="w-[280px]" />
|
|
||||||
</div>
|
|
||||||
<div v-if="!customerId" class="flex flex-cols-3 justify-between mb-11">
|
|
||||||
<UiTextInput id="address-postalCode" v-model="addressForm.postalCode" label="Code postal" wrapper-class="w-[280px]" required />
|
|
||||||
<UiSelect id="address-city" v-model="addressForm.city" label="Ville"
|
|
||||||
:options="communeOptions" :loading="isLoadingCities"
|
|
||||||
wrapper-class="w-[280px]" required />
|
|
||||||
<div class="w-[280px]" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex items-center justify-center">
|
|
||||||
<UiButton
|
|
||||||
class="inline-flex mb-28 items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
|
|
||||||
type="submit"
|
|
||||||
:disabled="isLoading || !auth.isAdmin"
|
|
||||||
@click="submitted = true"
|
|
||||||
>
|
|
||||||
<Icon :name="customerId ? '' : 'mdi:plus'" size="28" />
|
|
||||||
{{ customerId ? "Valider" : "Ajouter" }}
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<template v-if="customerId">
|
|
||||||
<div class="flex items-center justify-between mb-7">
|
|
||||||
<h2 class="text-3xl text-primary-500 font-bold uppercase">Adresses du client</h2>
|
|
||||||
</div>
|
|
||||||
<div class="overflow-x-auto mb-11 text-primary-700">
|
|
||||||
<table class="w-full border-collapse text-primary-700">
|
|
||||||
<thead>
|
|
||||||
<tr class="text-left border bg-slate-100 border-gray-200">
|
|
||||||
<th class="py-3 px-4 text-sm uppercase">Rue</th>
|
|
||||||
<th class="py-3 px-4 text-sm uppercase">Complément</th>
|
|
||||||
<th class="py-3 px-4 text-sm uppercase">Code postal</th>
|
|
||||||
<th class="py-3 px-4 text-sm uppercase">Ville</th>
|
|
||||||
<th class="py-3 px-4 text-sm uppercase">Pays</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<template v-if="form.addresses.length === 0">
|
|
||||||
<tr>
|
|
||||||
<td colspan="5" class="py-4 text-slate-400">
|
|
||||||
Aucune adresse.
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
<tr
|
|
||||||
v-for="(address, index) in form.addresses"
|
|
||||||
:key="address.id ?? index"
|
|
||||||
class="border border-gray-100 hover:bg-slate-50"
|
|
||||||
:class="auth.isAdmin ? 'cursor-pointer' : 'cursor-not-allowed opacity-60'"
|
|
||||||
@click="goToEditAddress(address.id ?? null)"
|
|
||||||
>
|
|
||||||
<td class="py-3 px-4">{{ address.street || "—" }}</td>
|
|
||||||
<td class="py-3 px-4">{{ address.street2 || "—" }}</td>
|
|
||||||
<td class="py-3 px-4">{{ address.postalCode || "—" }}</td>
|
|
||||||
<td class="py-3 px-4">{{ address.city || "—" }}</td>
|
|
||||||
<td class="py-3 px-4">{{ address.countryCode || "—" }}</td>
|
|
||||||
</tr>
|
|
||||||
</template>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-center items-center">
|
|
||||||
<UiButton
|
|
||||||
type="button"
|
|
||||||
class="inline-flex items-center justify-center text-xl gap-2 text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
|
|
||||||
:disabled="customerId === null || !auth.isAdmin"
|
|
||||||
@click="goToAddAddress"
|
|
||||||
>
|
|
||||||
<Icon name="mdi:plus" size="28" />
|
|
||||||
Ajouter
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</form>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {computed, reactive, ref, watch} from "vue"
|
|
||||||
import {createCustomer, getCustomer, updateCustomer} from "~/services/customer"
|
|
||||||
import type {CustomerData, CustomerFormData, CustomerPayload} from "~/services/dto/customer-data"
|
|
||||||
import {createAddress, type AddressPayload} from "~/services/address"
|
|
||||||
import {getCommunesByPostalCode, type CommuneData} from "~/services/geo"
|
|
||||||
import {useAuthStore} from "~/stores/auth"
|
|
||||||
|
|
||||||
const route = useRoute()
|
|
||||||
const router = useRouter()
|
|
||||||
const auth = useAuthStore()
|
|
||||||
|
|
||||||
const resolveId = (param: unknown) => {
|
|
||||||
const idStr = Array.isArray(param) ? param[0] : param
|
|
||||||
if (!idStr) return null
|
|
||||||
const id = Number(idStr)
|
|
||||||
return Number.isFinite(id) ? id : null
|
|
||||||
}
|
|
||||||
const customerId = computed(() => resolveId(route.params.id))
|
|
||||||
const isLoading = ref(false)
|
|
||||||
const submitted = ref(false)
|
|
||||||
const form = reactive<CustomerFormData>({
|
|
||||||
name: "",
|
|
||||||
phone: "",
|
|
||||||
email: "",
|
|
||||||
addresses: [],
|
|
||||||
})
|
|
||||||
|
|
||||||
// Address form (creation mode only)
|
|
||||||
const addressForm = reactive<AddressPayload>({
|
|
||||||
street: "", street2: null, postalCode: "", city: "", countryCode: "FR",
|
|
||||||
})
|
|
||||||
const communes = ref<CommuneData[]>([])
|
|
||||||
const isLoadingCities = ref(false)
|
|
||||||
const communeOptions = computed(() => communes.value.map(c => ({ value: c.nom, label: c.nom })))
|
|
||||||
|
|
||||||
let debounceTimer: ReturnType<typeof setTimeout> | null = null
|
|
||||||
watch(() => addressForm.postalCode, (cp) => {
|
|
||||||
if (debounceTimer) clearTimeout(debounceTimer)
|
|
||||||
if (!cp || cp.length < 5) { communes.value = []; addressForm.city = ''; return }
|
|
||||||
if (cp.length === 5) {
|
|
||||||
debounceTimer = setTimeout(async () => {
|
|
||||||
isLoadingCities.value = true
|
|
||||||
try {
|
|
||||||
communes.value = await getCommunesByPostalCode(cp)
|
|
||||||
if (communes.value.length === 1) addressForm.city = communes.value[0].nom
|
|
||||||
else addressForm.city = ''
|
|
||||||
} finally { isLoadingCities.value = false }
|
|
||||||
}, 300)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
const goToAddAddress = () => {
|
|
||||||
if (customerId.value === null || !auth.isAdmin) return
|
|
||||||
router.push({
|
|
||||||
path: "/admin/customer/address",
|
|
||||||
query: {
|
|
||||||
customerId: String(customerId.value),
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
const goToEditAddress = (addressId: number | null) => {
|
|
||||||
if (customerId.value === null || addressId === null || !auth.isAdmin) return
|
|
||||||
router.push({
|
|
||||||
path: "/admin/customer/address",
|
|
||||||
query: {
|
|
||||||
customerId: String(customerId.value),
|
|
||||||
addressId: String(addressId),
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
const hydrateFromCustomer = (customer: CustomerData | null) => {
|
|
||||||
if (!customer) return
|
|
||||||
form.name = customer.name ?? ""
|
|
||||||
form.phone = customer.phone ?? ""
|
|
||||||
form.email = customer.email ?? ""
|
|
||||||
if (!Array.isArray(customer.addresses) || customer.addresses.length === 0) {
|
|
||||||
form.addresses = []
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (typeof customer.addresses[0] === "string") {
|
|
||||||
form.addresses = []
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
form.addresses = customer.addresses.map((address) => ({
|
|
||||||
id: address.id ?? null,
|
|
||||||
street: address.street ?? "",
|
|
||||||
street2: address.street2 ?? null,
|
|
||||||
postalCode: address.postalCode ?? "",
|
|
||||||
city: address.city ?? "",
|
|
||||||
countryCode: address.countryCode ?? "",
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => customerId.value,
|
|
||||||
async (id) => {
|
|
||||||
if (id === null) return
|
|
||||||
isLoading.value = true
|
|
||||||
try {
|
|
||||||
const customer = await getCustomer(id)
|
|
||||||
hydrateFromCustomer(customer)
|
|
||||||
} finally {
|
|
||||||
isLoading.value = false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{immediate: true}
|
|
||||||
)
|
|
||||||
|
|
||||||
async function validate() {
|
|
||||||
if (isLoading.value) return
|
|
||||||
if (!auth.isAdmin) return
|
|
||||||
isLoading.value = true
|
|
||||||
|
|
||||||
try {
|
|
||||||
const name = form.name.trim()
|
|
||||||
const phone = form.phone?.trim() || null
|
|
||||||
const email = form.email?.trim() || null
|
|
||||||
|
|
||||||
const customerPayload: CustomerPayload = {
|
|
||||||
name,
|
|
||||||
phone,
|
|
||||||
email,
|
|
||||||
}
|
|
||||||
let targetId: number | null = null
|
|
||||||
|
|
||||||
if (customerId.value !== null) {
|
|
||||||
await updateCustomer(customerId.value, customerPayload)
|
|
||||||
targetId = customerId.value
|
|
||||||
} else {
|
|
||||||
const addressData = await createAddress({ ...addressForm })
|
|
||||||
const addressIRI = `/api/addresses/${addressData.id}`
|
|
||||||
const creationPayload = {
|
|
||||||
...customerPayload,
|
|
||||||
addresses: [addressIRI],
|
|
||||||
...(auth.user?.id ? { createdBy: `/api/users/${auth.user.id}` } : {}),
|
|
||||||
}
|
|
||||||
const created = await createCustomer(creationPayload)
|
|
||||||
targetId = created.id
|
|
||||||
}
|
|
||||||
|
|
||||||
if (targetId !== null) {
|
|
||||||
await router.push(`/admin/customer/${targetId}`)
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
isLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
<template>
|
|
||||||
<Address type="customer" :address="address" @validate="validate"/>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import type { AddressData, AddressPayload } from "~/services/address"
|
|
||||||
import { createAddress, getAddress, updateAddress } from "~/services/address"
|
|
||||||
import { getCustomer, updateCustomer } from "~/services/customer"
|
|
||||||
import type { CustomerData } from "~/services/dto/customer-data"
|
|
||||||
|
|
||||||
const route = useRoute()
|
|
||||||
const router = useRouter()
|
|
||||||
const customerId = computed(() => Number(route.query.customerId))
|
|
||||||
const customer = ref<CustomerData | null>(null)
|
|
||||||
const addressId = computed(() => (route.query.addressId !== undefined ? Number(route.query.addressId) : null))
|
|
||||||
const address = ref<AddressData | null>(null)
|
|
||||||
|
|
||||||
const validate = async (payload: AddressPayload) => {
|
|
||||||
if (addressId.value !== null) {
|
|
||||||
await updateAddress(addressId.value, payload)
|
|
||||||
} else {
|
|
||||||
await addAddress(payload)
|
|
||||||
await router.push("/admin/customer/" + customerId.value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const addAddress = async (payload: AddressPayload) => {
|
|
||||||
const response: AddressData = await createAddress(payload)
|
|
||||||
const addressIRI = `/api/addresses/${response.id}`
|
|
||||||
const existingIris = (customer.value?.addresses ?? [])
|
|
||||||
.map((item: any) => (typeof item === "string" ? item : `/api/addresses/${item.id}`))
|
|
||||||
.filter((iri: string | null) => Boolean(iri)) as string[]
|
|
||||||
const next = [...new Set([...existingIris, addressIRI])]
|
|
||||||
|
|
||||||
return await updateCustomer(customerId.value, { addresses: next })
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
customer.value = await getCustomer(customerId.value)
|
|
||||||
if (addressId.value !== null) {
|
|
||||||
address.value = await getAddress(addressId.value)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="flex items-center justify-between">
|
|
||||||
<h1 class="text-4xl font-bold uppercase text-primary-500">Liste des clients</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="auth.isAdmin" class="mt-7 border border-slate-200 mb-11">
|
|
||||||
<div class="max-h-96 overflow-y-auto">
|
|
||||||
<div
|
|
||||||
class="sticky text-primary-700 top-0 z-10 grid grid-cols-4 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
|
|
||||||
>
|
|
||||||
<div>Nom</div>
|
|
||||||
<div>Téléphone</div>
|
|
||||||
<div>Mail</div>
|
|
||||||
<div>Créé par</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="customerList.length === 0" class="px-4 py-6 text-slate-400">
|
|
||||||
Aucun client.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-for="customer in customerList"
|
|
||||||
:key="customer.id"
|
|
||||||
class="grid grid-cols-4 text-primary-700 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
|
|
||||||
@click="goToCustomer(customer.id)"
|
|
||||||
>
|
|
||||||
<div class="truncate">{{ customer.name || "—" }}</div>
|
|
||||||
<div class="truncate">{{ customer.phone || "—" }}</div>
|
|
||||||
<div class="truncate">{{ customer.email || "—" }}</div>
|
|
||||||
<div class="truncate">{{ customer.createdBy?.username || "—" }}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-else class="mt-7 border border-slate-200 mb-11 px-4 py-6 text-slate-400">
|
|
||||||
Accès réservé aux administrateurs.
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-center items-center">
|
|
||||||
<NuxtLink
|
|
||||||
to="/admin/customer"
|
|
||||||
class="inline-flex items-center mb-16 justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
|
||||||
:class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
|
|
||||||
@click="handleAddClick"
|
|
||||||
>
|
|
||||||
<Icon name="mdi:plus" size="28" />
|
|
||||||
Ajouter
|
|
||||||
</NuxtLink>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { getCustomerList } from "~/services/customer"
|
|
||||||
import type { CustomerData } from "~/services/dto/customer-data"
|
|
||||||
import { useAuthStore } from "~/stores/auth"
|
|
||||||
|
|
||||||
const customerList = ref<CustomerData[]>([])
|
|
||||||
const router = useRouter()
|
|
||||||
const auth = useAuthStore()
|
|
||||||
|
|
||||||
const goToCustomer = (id: number) => {
|
|
||||||
if (!auth.isAdmin) return
|
|
||||||
router.push(`/admin/customer/${id}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleAddClick = (event: Event) => {
|
|
||||||
if (auth.isAdmin) return
|
|
||||||
event.preventDefault()
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
if (!auth.isAdmin) return
|
|
||||||
customerList.value = await getCustomerList()
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
13
frontend/pages/admin/dashboard.vue
Normal file
13
frontend/pages/admin/dashboard.vue
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<template>
|
||||||
|
<admin-users v-if="activeCode === 'users'" />
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
definePageMeta({
|
||||||
|
layout: 'admin'
|
||||||
|
})
|
||||||
|
const route = useRoute()
|
||||||
|
|
||||||
|
const activeCode = computed(() => (route.query.code as string))
|
||||||
|
|
||||||
|
</script>
|
||||||
@@ -1,250 +0,0 @@
|
|||||||
<template>
|
|
||||||
<form :class="{ submitted }" @submit.prevent="validate">
|
|
||||||
|
|
||||||
<div class="flex items-center relative">
|
|
||||||
<div class="flex flex-row absolute -left-[60px] ">
|
|
||||||
<Icon @click="router.push('/admin/supplier/supplier-list')" name="gg:arrow-left-o" size="40" class="cursor-pointer text-primary-500"/>
|
|
||||||
</div>
|
|
||||||
<h1 class="text-3xl text-primary-500 font-bold uppercase">
|
|
||||||
{{ supplierId ? "Modification du fournisseur" : "Ajout d'un fournisseur" }}
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex flex-cols-3 justify-between mb-11 pt-7">
|
|
||||||
<UiTextInput id="supplier-name" v-model="form.name" label="Nom du fournisseur" :disabled="!auth.isAdmin" wrapper-class="w-[280px]" required/>
|
|
||||||
<UiTextInput id="supplier-phone" v-model="form.phone" label="Téléphone" :disabled="!auth.isAdmin" wrapper-class="w-[280px]" required/>
|
|
||||||
<UiTextInput id="supplier-email" v-model="form.email" label="Email" :disabled="!auth.isAdmin" wrapper-class="w-[280px]"/>
|
|
||||||
</div>
|
|
||||||
<div v-if="!supplierId" class="flex flex-cols-3 justify-between mb-11">
|
|
||||||
<UiTextInput id="address-street" v-model="addressForm.street" label="Rue" wrapper-class="w-[280px]" required />
|
|
||||||
<UiTextInput id="address-street2" v-model="addressForm.street2" label="Complément" wrapper-class="w-[280px]" />
|
|
||||||
<UiTextInput id="address-country" v-model="addressForm.countryCode" label="Pays (code)" wrapper-class="w-[280px]" />
|
|
||||||
</div>
|
|
||||||
<div v-if="!supplierId" class="flex flex-cols-3 justify-between mb-11">
|
|
||||||
<UiTextInput id="address-postalCode" v-model="addressForm.postalCode" label="Code postal" wrapper-class="w-[280px]" required />
|
|
||||||
<UiSelect id="address-city" v-model="addressForm.city" label="Ville"
|
|
||||||
:options="communeOptions" :loading="isLoadingCities"
|
|
||||||
wrapper-class="w-[280px]" required />
|
|
||||||
<div class="w-[280px]" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex items-center justify-center">
|
|
||||||
<UiButton
|
|
||||||
class="inline-flex mb-28 items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
|
|
||||||
type="submit"
|
|
||||||
:disabled="isLoading || !auth.isAdmin"
|
|
||||||
@click="submitted = true"
|
|
||||||
>
|
|
||||||
<Icon :name="supplierId ? '' : 'mdi:plus'" size="28" />
|
|
||||||
{{ supplierId ? "Valider" : "Ajouter" }}
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<template v-if="supplierId">
|
|
||||||
<div class="flex items-center justify-between mb-7">
|
|
||||||
<h2 class="text-3xl text-primary-500 font-bold uppercase">Adresses du fournisseur</h2>
|
|
||||||
</div>
|
|
||||||
<div class="overflow-x-auto mb-11 text-primary-700">
|
|
||||||
<table class="w-full border-collapse">
|
|
||||||
<thead>
|
|
||||||
<tr class="text-left border bg-slate-100 border-gray-200">
|
|
||||||
<th class="py-3 px-4 text-sm uppercase">Rue</th>
|
|
||||||
<th class="py-3 px-4 text-sm uppercase">Complément</th>
|
|
||||||
<th class="py-3 px-4 text-sm uppercase">Code postal</th>
|
|
||||||
<th class="py-3 px-4 text-sm uppercase">Ville</th>
|
|
||||||
<th class="py-3 px-4 text-sm uppercase">Pays</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<template v-if="form.addresses.length === 0">
|
|
||||||
<tr>
|
|
||||||
<td colspan="5" class="py-4 text-slate-400">
|
|
||||||
Aucune adresse.
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
<tr
|
|
||||||
v-for="(address, index) in form.addresses"
|
|
||||||
:key="address.id ?? index"
|
|
||||||
class="border border-gray-100 hover:bg-slate-50"
|
|
||||||
:class="auth.isAdmin ? 'cursor-pointer' : 'cursor-not-allowed opacity-60'"
|
|
||||||
@click="goToEditAddress(address.id ?? null)"
|
|
||||||
>
|
|
||||||
<td class="py-3 px-4">{{ address.street || "—" }}</td>
|
|
||||||
<td class="py-3 px-4">{{ address.street2 || "—" }}</td>
|
|
||||||
<td class="py-3 px-4">{{ address.postalCode || "—" }}</td>
|
|
||||||
<td class="py-3 px-4">{{ address.city || "—" }}</td>
|
|
||||||
<td class="py-3 px-4">{{ address.countryCode || "—" }}</td>
|
|
||||||
</tr>
|
|
||||||
</template>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-center items-center">
|
|
||||||
<UiButton
|
|
||||||
type="button"
|
|
||||||
class="inline-flex items-center justify-center text-xl gap-2 text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
|
|
||||||
:disabled="supplierId === null || !auth.isAdmin"
|
|
||||||
@click="goToAddAddress"
|
|
||||||
>
|
|
||||||
<Icon name="mdi:plus" size="28" />
|
|
||||||
Ajouter
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</form>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import {computed, reactive, ref, watch} from "vue"
|
|
||||||
import {createSupplier, getSupplier, updateSupplier} from "~/services/supplier"
|
|
||||||
import type {SupplierData, SupplierFormData, SupplierPayload} from "~/services/dto/supplier-data"
|
|
||||||
import {createAddress, type AddressPayload} from "~/services/address"
|
|
||||||
import {getCommunesByPostalCode, type CommuneData} from "~/services/geo"
|
|
||||||
import {useAuthStore} from "~/stores/auth"
|
|
||||||
|
|
||||||
const route = useRoute()
|
|
||||||
const router = useRouter()
|
|
||||||
const auth = useAuthStore()
|
|
||||||
|
|
||||||
const resolveId = (param: unknown) => {
|
|
||||||
const idStr = Array.isArray(param) ? param[0] : param
|
|
||||||
if (!idStr) return null
|
|
||||||
const id = Number(idStr)
|
|
||||||
return Number.isFinite(id) ? id : null
|
|
||||||
}
|
|
||||||
const supplierId = computed(() => resolveId(route.params.id))
|
|
||||||
const isLoading = ref(false)
|
|
||||||
const submitted = ref(false)
|
|
||||||
const form = reactive<SupplierFormData>({
|
|
||||||
name: "",
|
|
||||||
email: "",
|
|
||||||
phone: "",
|
|
||||||
addresses: [],
|
|
||||||
})
|
|
||||||
|
|
||||||
// Address form (creation mode only)
|
|
||||||
const addressForm = reactive<AddressPayload>({
|
|
||||||
street: "", street2: null, postalCode: "", city: "", countryCode: "FR",
|
|
||||||
})
|
|
||||||
const communes = ref<CommuneData[]>([])
|
|
||||||
const isLoadingCities = ref(false)
|
|
||||||
const communeOptions = computed(() => communes.value.map(c => ({ value: c.nom, label: c.nom })))
|
|
||||||
|
|
||||||
let debounceTimer: ReturnType<typeof setTimeout> | null = null
|
|
||||||
watch(() => addressForm.postalCode, (cp) => {
|
|
||||||
if (debounceTimer) clearTimeout(debounceTimer)
|
|
||||||
if (!cp || cp.length < 5) { communes.value = []; addressForm.city = ''; return }
|
|
||||||
if (cp.length === 5) {
|
|
||||||
debounceTimer = setTimeout(async () => {
|
|
||||||
isLoadingCities.value = true
|
|
||||||
try {
|
|
||||||
communes.value = await getCommunesByPostalCode(cp)
|
|
||||||
if (communes.value.length === 1) addressForm.city = communes.value[0].nom
|
|
||||||
else addressForm.city = ''
|
|
||||||
} finally { isLoadingCities.value = false }
|
|
||||||
}, 300)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
const goToAddAddress = () => {
|
|
||||||
if (supplierId.value === null || !auth.isAdmin) return
|
|
||||||
router.push({
|
|
||||||
path: "/admin/supplier/address",
|
|
||||||
query: {
|
|
||||||
supplierId: String(supplierId.value),
|
|
||||||
fromSupplier: "1",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
const goToEditAddress = (addressId: number | null) => {
|
|
||||||
if (supplierId.value === null || addressId === null || !auth.isAdmin) return
|
|
||||||
router.push({
|
|
||||||
path: "/admin/supplier/address",
|
|
||||||
query: {
|
|
||||||
supplierId: String(supplierId.value),
|
|
||||||
addressId: String(addressId),
|
|
||||||
fromSupplier: "1",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
const hydrateFromSupplier = (supplier: SupplierData | null) => {
|
|
||||||
if (!supplier) return
|
|
||||||
form.name = supplier.name ?? ""
|
|
||||||
form.email = supplier.email ?? ""
|
|
||||||
form.phone = supplier.phone ?? ""
|
|
||||||
if (!Array.isArray(supplier.addresses) || supplier.addresses.length === 0) {
|
|
||||||
form.addresses = []
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (typeof supplier.addresses[0] === "string") {
|
|
||||||
form.addresses = []
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
form.addresses = supplier.addresses.map((address) => ({
|
|
||||||
id: address.id ?? null,
|
|
||||||
street: address.street ?? "",
|
|
||||||
street2: address.street2 ?? null,
|
|
||||||
postalCode: address.postalCode ?? "",
|
|
||||||
city: address.city ?? "",
|
|
||||||
countryCode: address.countryCode ?? "",
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => supplierId.value,
|
|
||||||
async (id) => {
|
|
||||||
if (id === null) return
|
|
||||||
isLoading.value = true
|
|
||||||
try {
|
|
||||||
const supplier = await getSupplier(id)
|
|
||||||
hydrateFromSupplier(supplier)
|
|
||||||
} finally {
|
|
||||||
isLoading.value = false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{immediate: true}
|
|
||||||
)
|
|
||||||
|
|
||||||
async function validate() {
|
|
||||||
if (isLoading.value) return
|
|
||||||
if (!auth.isAdmin) return
|
|
||||||
isLoading.value = true
|
|
||||||
|
|
||||||
try {
|
|
||||||
const name = form.name.trim()
|
|
||||||
const email = (form.email ?? "").trim() || null
|
|
||||||
const phone = (form.phone ?? "").trim() || null
|
|
||||||
|
|
||||||
const supplierPayload: SupplierPayload = {
|
|
||||||
name,
|
|
||||||
email,
|
|
||||||
phone,
|
|
||||||
}
|
|
||||||
let targetId: number | null = null
|
|
||||||
|
|
||||||
if (supplierId.value !== null) {
|
|
||||||
await updateSupplier(supplierId.value, supplierPayload)
|
|
||||||
targetId = supplierId.value
|
|
||||||
} else {
|
|
||||||
const addressData = await createAddress({ ...addressForm })
|
|
||||||
const addressIRI = `/api/addresses/${addressData.id}`
|
|
||||||
const creationPayload = {
|
|
||||||
...supplierPayload,
|
|
||||||
addresses: [addressIRI],
|
|
||||||
...(auth.user?.id ? { createdBy: `/api/users/${auth.user.id}` } : {}),
|
|
||||||
}
|
|
||||||
const created = await createSupplier(creationPayload)
|
|
||||||
targetId = created.id
|
|
||||||
}
|
|
||||||
|
|
||||||
await router.push(`/admin/supplier/${targetId}`)
|
|
||||||
} finally {
|
|
||||||
isLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
<template>
|
|
||||||
<Address type="supplier" :address="address" @validate="validate"/>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import type {AddressData, AddressPayload} from "~/services/address";
|
|
||||||
import {createAddress, getAddress, updateAddress} from "~/services/address";
|
|
||||||
import {getSupplier, updateSupplier} from "~/services/supplier";
|
|
||||||
import type {SupplierData} from "~/services/dto/supplier-data";
|
|
||||||
|
|
||||||
const route = useRoute()
|
|
||||||
const router = useRouter()
|
|
||||||
const supplierId = computed(() => { return Number(route.query.supplierId) })
|
|
||||||
const supplier = ref<SupplierData|null>(null);
|
|
||||||
const addressId = computed(() => { return route.query.addressId !== undefined ? Number(route.query.addressId) : null })
|
|
||||||
const address = ref<AddressData|null>(null)
|
|
||||||
|
|
||||||
const validate = async (address: AddressPayload) => {
|
|
||||||
if (addressId.value !== null) {
|
|
||||||
await updateAddress(addressId.value, address)
|
|
||||||
} else {
|
|
||||||
await addAddress(address)
|
|
||||||
await router.push('/admin/supplier/' + supplierId.value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const addAddress = async (address: AddressPayload) => {
|
|
||||||
const response: AddressData = await createAddress(address)
|
|
||||||
const addressIRI = `/api/addresses/${response.id}`
|
|
||||||
const existingIris = (supplier.value.addresses ?? []).map((item: any) => `/api/addresses/${item.id}`)
|
|
||||||
const next = [...new Set([...existingIris, addressIRI])]
|
|
||||||
|
|
||||||
return await updateSupplier(supplierId.value, { addresses: next })
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
supplier.value = await getSupplier(supplierId.value)
|
|
||||||
if (addressId.value !== null) {
|
|
||||||
address.value = await getAddress(addressId.value)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="flex items-center justify-between">
|
|
||||||
<h1 class="text-4xl font-bold uppercase text-primary-500">Liste des fournisseurs</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="auth.isAdmin" class="mt-7 border border-slate-200 mb-11">
|
|
||||||
<div class="max-h-96 overflow-y-auto">
|
|
||||||
<div
|
|
||||||
class="sticky text-primary-700 top-0 z-10 grid grid-cols-4 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
|
|
||||||
>
|
|
||||||
<div>Nom</div>
|
|
||||||
<div>Téléphone</div>
|
|
||||||
<div>Mail</div>
|
|
||||||
<div>Créé par</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="supplierList.length === 0" class="px-4 py-6 text-slate-400">
|
|
||||||
Aucun fournisseur.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-for="supplier in supplierList"
|
|
||||||
:key="supplier.id"
|
|
||||||
class="grid grid-cols-4 text-primary-700 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
|
|
||||||
@click="goToSupplier(supplier.id)"
|
|
||||||
>
|
|
||||||
<div class="truncate">{{ supplier.name || "—" }}</div>
|
|
||||||
<div class="truncate">{{ supplier.phone || "—" }}</div>
|
|
||||||
<div class="truncate">{{ supplier.email || "—" }}</div>
|
|
||||||
<div class="truncate">{{ supplier.createdBy?.username || "—" }}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-else class="mt-7 border border-slate-200 mb-11 px-4 py-6 text-slate-400">
|
|
||||||
Accès réservé aux administrateurs.
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-center items-center">
|
|
||||||
<NuxtLink
|
|
||||||
to="/admin/supplier"
|
|
||||||
class="inline-flex items-center mb-16 justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
|
||||||
:class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
|
|
||||||
@click="handleAddClick"
|
|
||||||
>
|
|
||||||
<Icon name="mdi:plus" size="28" />
|
|
||||||
Ajouter
|
|
||||||
</NuxtLink>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { getSupplierList } from "~/services/supplier"
|
|
||||||
import type { SupplierData } from "~/services/dto/supplier-data"
|
|
||||||
import { useAuthStore } from "~/stores/auth"
|
|
||||||
|
|
||||||
const supplierList = ref<SupplierData[]>([])
|
|
||||||
const router = useRouter()
|
|
||||||
const auth = useAuthStore()
|
|
||||||
|
|
||||||
const goToSupplier = (id: number) => {
|
|
||||||
if (!auth.isAdmin) return
|
|
||||||
router.push(`/admin/supplier/${id}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleAddClick = (event: Event) => {
|
|
||||||
if (auth.isAdmin) return
|
|
||||||
event.preventDefault()
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
if (!auth.isAdmin) return
|
|
||||||
supplierList.value = await getSupplierList()
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
64
frontend/pages/admin/user-list.vue
Normal file
64
frontend/pages/admin/user-list.vue
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
<template>
|
||||||
|
<div class="flex items-center justify-between gap-10">
|
||||||
|
<h1 class="text-3xl font-bold uppercase">Utilisateurs</h1>
|
||||||
|
<button
|
||||||
|
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||||
|
@click="null"
|
||||||
|
>
|
||||||
|
Ajouter
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<div class="mt-6 border border-slate-200 mb-16 ">
|
||||||
|
<div class="grid grid-cols-3 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
||||||
|
<div>Username</div>
|
||||||
|
<div>Role</div>
|
||||||
|
<div>Action</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-for="user in userList"
|
||||||
|
:key="user.id"
|
||||||
|
class="grid grid-cols-3 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200 items-center"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
{{ user.username}}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
{{ user.roles?.join(', ') || ' ---' }}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<div class="p-4">
|
||||||
|
<button
|
||||||
|
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||||
|
@click="null"
|
||||||
|
>
|
||||||
|
Modifier
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
definePageMeta({
|
||||||
|
layout: 'admin'
|
||||||
|
})
|
||||||
|
|
||||||
|
import type {UserData} from "~/services/dto/user-data";
|
||||||
|
import {getUsers} from "~/services/auth";
|
||||||
|
|
||||||
|
const userList = ref<UserData[]>([])
|
||||||
|
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
userList.value = await getUsers()
|
||||||
|
})
|
||||||
|
</script>
|
||||||
@@ -1,164 +0,0 @@
|
|||||||
<template>
|
|
||||||
<form :class="{ submitted }" @submit.prevent="validate">
|
|
||||||
<div class="flex items-center relative">
|
|
||||||
<div class="flex flex-row absolute -left-[60px]">
|
|
||||||
<Icon
|
|
||||||
@click="router.push('/admin/user/list')"
|
|
||||||
name="gg:arrow-left-o"
|
|
||||||
size="40"
|
|
||||||
class="cursor-pointer text-primary-500"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<h1 class="text-3xl text-primary-500 font-bold uppercase">
|
|
||||||
{{ userId ? "Modification de l'utilisateur" : "Ajout d'un utilisateur" }}
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex flex-cols-3 justify-between mb-11 pt-7">
|
|
||||||
<UiTextInput
|
|
||||||
id="user-name"
|
|
||||||
v-model="form.username"
|
|
||||||
label="Nom de l'utilisateur"
|
|
||||||
:disabled="!auth.isAdmin"
|
|
||||||
wrapper-class="w-[280px]"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
|
|
||||||
<UiSelect
|
|
||||||
id="user-role"
|
|
||||||
v-model="form.role"
|
|
||||||
label="Role de l'utilisateur"
|
|
||||||
:options="ROLE"
|
|
||||||
:disabled="!auth.isAdmin"
|
|
||||||
wrapper-class="w-[280px]"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
|
|
||||||
<UiTextInput
|
|
||||||
id="user-password"
|
|
||||||
v-model="form.password"
|
|
||||||
label="Mot de passe"
|
|
||||||
type="password"
|
|
||||||
:disabled="!auth.isAdmin"
|
|
||||||
wrapper-class="w-[280px]"
|
|
||||||
:required="!userId"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex items-center mb-11">
|
|
||||||
<label class="flex items-center gap-2 cursor-pointer">
|
|
||||||
<input
|
|
||||||
id="user-locked"
|
|
||||||
v-model="form.isLocked"
|
|
||||||
type="checkbox"
|
|
||||||
:disabled="!auth.isAdmin"
|
|
||||||
class="w-5 h-5 accent-primary-500"
|
|
||||||
/>
|
|
||||||
<span class="text-sm text-primary-700">Verrouiller le compte</span>
|
|
||||||
</label>
|
|
||||||
<p class="ml-4 text-xs text-slate-400">Un compte verrouillé ne peut plus se connecter.</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex items-center justify-center">
|
|
||||||
<UiButton
|
|
||||||
class="inline-flex mb-28 items-center justify-center text-xl min-w-[194px] text-white uppercase bg-primary-500 h-[50px] rounded hover:opacity-80 justify-self-end"
|
|
||||||
type="submit"
|
|
||||||
:disabled="isLoading || isHydrating || !auth.isAdmin"
|
|
||||||
@click="submitted = true"
|
|
||||||
>
|
|
||||||
<Icon :name="userId ? '' : 'mdi:plus'" size="28" />
|
|
||||||
{{ userId ? 'Valider' : 'Ajouter' }}
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { computed, reactive, ref, watch } from 'vue'
|
|
||||||
import { ROLE } from '~/utils/constants'
|
|
||||||
import { createUser, updateUser, getUser } from '~/services/auth'
|
|
||||||
import type { UserData, UserFormData, UserPayload } from '~/services/dto/user-data'
|
|
||||||
import { useAuthStore } from '~/stores/auth'
|
|
||||||
|
|
||||||
const route = useRoute()
|
|
||||||
const router = useRouter()
|
|
||||||
const auth = useAuthStore()
|
|
||||||
const userId = computed(() => resolveUserId(route.params.id))
|
|
||||||
const isLoading = ref(false)
|
|
||||||
const isHydrating = ref(false)
|
|
||||||
const submitted = ref(false)
|
|
||||||
|
|
||||||
const resolveUserId = (param: unknown) => {
|
|
||||||
const idStr = Array.isArray(param) ? param[0] : param
|
|
||||||
if (!idStr) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
const id = Number(idStr)
|
|
||||||
return Number.isFinite(id) ? id : null
|
|
||||||
}
|
|
||||||
|
|
||||||
const form = reactive<UserFormData>({
|
|
||||||
username: '',
|
|
||||||
password: '',
|
|
||||||
role: '',
|
|
||||||
isLocked: false
|
|
||||||
})
|
|
||||||
|
|
||||||
const hydrateFromUser = (user: UserData | null) => {
|
|
||||||
if (!user) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
isHydrating.value = true
|
|
||||||
form.username = user.username ?? ''
|
|
||||||
const roles = user.roles ?? []
|
|
||||||
const hasAdmin = roles.includes('ROLE_ADMIN')
|
|
||||||
form.role = hasAdmin ? 'ROLE_ADMIN' : 'ROLE_USER'
|
|
||||||
form.password = ''
|
|
||||||
form.isLocked = user.isLocked ?? false
|
|
||||||
isHydrating.value = false
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => userId.value,
|
|
||||||
async (id) => {
|
|
||||||
if (id === null) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
isLoading.value = true
|
|
||||||
try {
|
|
||||||
const user = await getUser(id)
|
|
||||||
hydrateFromUser(user)
|
|
||||||
} finally {
|
|
||||||
isLoading.value = false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{ immediate: true }
|
|
||||||
)
|
|
||||||
|
|
||||||
async function validate() {
|
|
||||||
if (!auth.isAdmin) return
|
|
||||||
|
|
||||||
const normalizedUsername = form.username.trim()
|
|
||||||
const normalizedRole = form.role.trim()
|
|
||||||
const normalizedPassword = form.password.trim()
|
|
||||||
|
|
||||||
const basePayload: UserPayload = {
|
|
||||||
username: normalizedUsername,
|
|
||||||
roles: normalizedRole ? [normalizedRole] : undefined,
|
|
||||||
isLocked: form.isLocked,
|
|
||||||
}
|
|
||||||
if (normalizedPassword) {
|
|
||||||
basePayload.password = normalizedPassword
|
|
||||||
}
|
|
||||||
|
|
||||||
if (userId.value) {
|
|
||||||
await updateUser(userId.value, basePayload)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const created = await createUser(basePayload)
|
|
||||||
if (created) {
|
|
||||||
await router.push('/admin/user/list')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,92 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="flex items-center justify-between">
|
|
||||||
<h1 class="text-4xl font-bold uppercase text-primary-500">Liste des utilisateurs</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="auth.isAdmin" class="mt-7 border border-slate-200 mb-11">
|
|
||||||
<div class="grid grid-cols-3 text-primary-700 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
|
||||||
<div>Utilisateur</div>
|
|
||||||
<div>Role</div>
|
|
||||||
<div>Statut</div>
|
|
||||||
</div>
|
|
||||||
<div v-if="userList.length === 0" class="px-4 py-6 text-slate-400">
|
|
||||||
Aucun utilisateur.
|
|
||||||
</div>
|
|
||||||
<template v-else>
|
|
||||||
<div
|
|
||||||
v-for="user in userList"
|
|
||||||
:key="user.id"
|
|
||||||
class="grid grid-cols-3 text-primary-700 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200 items-center"
|
|
||||||
role="button"
|
|
||||||
tabindex="0"
|
|
||||||
@click="goToUser(user.id)"
|
|
||||||
@keydown.enter="goToUser(user.id)"
|
|
||||||
>
|
|
||||||
<div>{{ user.username }}</div>
|
|
||||||
<div>{{ getRoleLabels(user.roles) }}</div>
|
|
||||||
<div>
|
|
||||||
<span
|
|
||||||
v-if="user.isLocked"
|
|
||||||
class="inline-block px-2 py-0.5 text-xs font-semibold rounded bg-red-100 text-red-700"
|
|
||||||
>Verrouillé</span>
|
|
||||||
<span
|
|
||||||
v-else
|
|
||||||
class="inline-block px-2 py-0.5 text-xs font-semibold rounded bg-green-100 text-green-700"
|
|
||||||
>Actif</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</div>
|
|
||||||
<div v-else class="mt-7 border border-slate-200 mb-11 px-4 py-6 text-slate-400">
|
|
||||||
Acces reserve aux administrateurs.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex justify-center items-center">
|
|
||||||
<NuxtLink
|
|
||||||
to="/admin/user"
|
|
||||||
class="inline-flex items-center mb-16 justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
|
||||||
:class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
|
|
||||||
@click="handleAddClick"
|
|
||||||
>
|
|
||||||
<Icon name="mdi:plus" size="28" />
|
|
||||||
Ajouter
|
|
||||||
</NuxtLink>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import type { UserData } from "~/services/dto/user-data"
|
|
||||||
import { getAdminUsers } from "~/services/auth"
|
|
||||||
import { ROLE } from "~/utils/constants"
|
|
||||||
import { useAuthStore } from "~/stores/auth"
|
|
||||||
|
|
||||||
const userList = ref<UserData[]>([])
|
|
||||||
const router = useRouter()
|
|
||||||
const auth = useAuthStore()
|
|
||||||
const roleLabelByValue = new Map(ROLE.map((role) => [role.value, role.label]))
|
|
||||||
|
|
||||||
const goToUser = (id: number) => {
|
|
||||||
if (!auth.isAdmin) return
|
|
||||||
router.push(`/admin/user/${id}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleAddClick = (event: Event) => {
|
|
||||||
if (auth.isAdmin) return
|
|
||||||
event.preventDefault()
|
|
||||||
}
|
|
||||||
|
|
||||||
const getRoleLabels = (roles?: string[]) => {
|
|
||||||
if (!roles || roles.length === 0) {
|
|
||||||
return '---'
|
|
||||||
}
|
|
||||||
|
|
||||||
return roles
|
|
||||||
.map((role) => roleLabelByValue.get(role) ?? role)
|
|
||||||
.join(', ')
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
if (!auth.isAdmin) return
|
|
||||||
userList.value = await getAdminUsers()
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -1,27 +1,15 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<div class="flex flex-wrap justify-center pb-16 gap-12">
|
<div class="flex flex-wrap justify-center mt-8 gap-8 mb-8 md:mb-0">
|
||||||
<card-link label="NOUVELLE RÉCEPTION" link="/reception" iconName="mdi:truck-outline" />
|
<card-link label="NOUVELLE RÉCEPTION" link="/reception" iconName="mdi:truck-outline" />
|
||||||
<card-link label="NOUVELLE EXPÉDITION" link="/shipment" iconName="mdi:truck-fast-outline" />
|
<card-link label="NOUVELLE EXPÉDITION" link="/" iconName="mdi:truck-fast-outline" />
|
||||||
<card-link label="PLAN DE SITE" link="/infrastructure/building" iconName="material-symbols:warehouse-outline-rounded" />
|
<card-link label="PLAN DE SITE" link="/" iconName="mdi:warehouse" />
|
||||||
<card-link link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
|
<card-link label="RÉCEPTIONS EN ATTENTE" link="/reception/waiting-reception" iconName="mdi:truck-remove-outline" />
|
||||||
<template #label>
|
<card-link label="EXPÉDITIONS EN ATTENTE" link="/" iconName="mdi:truck-cargo-container" />
|
||||||
Réceptions<br>EN ATTENTE
|
<card-link label="CASES" link="/" iconName="mdi:cube-outline" />
|
||||||
</template>
|
|
||||||
</card-link>
|
|
||||||
<card-link link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container">
|
|
||||||
<template #label>
|
|
||||||
EXPÉDITIONS<br>EN ATTENTE
|
|
||||||
</template>
|
|
||||||
</card-link>
|
|
||||||
<card-link label="CASES" link="/infrastructure/case" iconName="material-symbols:bottom-sheets-outline" />
|
|
||||||
<card-link label="RÉCEPTIONS FINIES" link="/reception/finish-reception" iconName="mdi:truck-check-outline" />
|
<card-link label="RÉCEPTIONS FINIES" link="/reception/finish-reception" iconName="mdi:truck-check-outline" />
|
||||||
<card-link label="EXPÉDITIONS FINIES" link="/shipment/finish-shipment" iconName="mdi:truck-delivery-outline" />
|
<card-link label="EXPÉDITIONS FINIES" link="/" iconName="mdi:truck-delivery-outline" />
|
||||||
<card-link link="/" iconName="mdi:cow">
|
<card-link label="PASSEPORT DU BOVIN" link="/" iconName="mdi:cow" />
|
||||||
<template #label>
|
|
||||||
PASSEPORT<br>DU BOVIN
|
|
||||||
</template>
|
|
||||||
</card-link>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,242 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="min-h-screen">
|
|
||||||
<!-- En-tête de page avec retour et titre -->
|
|
||||||
<div class="flex items-center justify-between mb-8">
|
|
||||||
<div class="flex items-center gap-10">
|
|
||||||
<Icon
|
|
||||||
@click="router.push('/')"
|
|
||||||
name="gg:arrow-left-o"
|
|
||||||
size="44"
|
|
||||||
class="cursor-pointer text-primary-500"
|
|
||||||
/>
|
|
||||||
<h1 class="text-3xl font-bold uppercase text-primary-500">bâtiments</h1>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="px-[86px] space-y-6">
|
|
||||||
<!-- Liste des bâtiments + rendu du plan de chaque bâtiment -->
|
|
||||||
<div
|
|
||||||
v-for="entry in buildingLayouts"
|
|
||||||
:key="entry.building.id"
|
|
||||||
>
|
|
||||||
<div class="font-semibold tracking-wide text-primary-500">
|
|
||||||
{{ entry.building.label || `Bâtiment ${entry.building.id}` }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="py-4">
|
|
||||||
<!-- Aucun layout disponible pour ce bâtiment -->
|
|
||||||
<div v-if="!entry.layout" class="text-sm text-slate-400">
|
|
||||||
Aucun plan de bâtiment.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Grille CSS : les cases sont positionnées via spanStyle -->
|
|
||||||
<div v-else class="overflow-auto">
|
|
||||||
<div class="grid" :style="entry.gridStyle">
|
|
||||||
<NuxtLink
|
|
||||||
v-for="cell in entry.cells"
|
|
||||||
:key="cell.key"
|
|
||||||
class="relative text-white flex h-[50px] items-center justify-center border-y-[3px] border-y-black bg-white hover:opacity-85 focus-visible:outline-none"
|
|
||||||
:class="[cell.sideBorderClass, activeLegendStatutId !== null && cell.caseStatusId !== activeLegendStatutId ? 'opacity-35 hover:opacity-70' : '']"
|
|
||||||
:style="[cell.spanStyle, cell.sideBorderStyle]"
|
|
||||||
:to="cell.caseId ? `/infrastructure/case?id=${cell.caseId}` : '/infrastructure/case'"
|
|
||||||
:title="cell.caseStatusLabel ?? undefined"
|
|
||||||
>
|
|
||||||
<!-- Le blanc latéral est géré sur ce bloc interne (conditionnel par voisinage) -->
|
|
||||||
<div
|
|
||||||
class="flex h-full w-full items-center justify-center bg-white"
|
|
||||||
:class="cell.contentInsetClass"
|
|
||||||
:style="cell.caseStyle"
|
|
||||||
>
|
|
||||||
<!-- Numéro de case -->
|
|
||||||
{{ cell.display }}
|
|
||||||
</div>
|
|
||||||
</NuxtLink>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Légende : survol d'un statut => atténue les autres cases -->
|
|
||||||
<div class="py-4">
|
|
||||||
<!-- 3 zones fixes pour forcer gauche / centre / droite sur toute la largeur -->
|
|
||||||
<div class="grid w-full grid-cols-3 gap-3">
|
|
||||||
<div
|
|
||||||
v-for="(statut, index) in statutLegend"
|
|
||||||
:key="statut.id"
|
|
||||||
class="flex min-w-0 cursor-pointer items-center gap-2 py-1"
|
|
||||||
:class="[
|
|
||||||
index === 0 ? 'justify-self-start' : '',
|
|
||||||
index === statutLegend.length - 1 ? 'justify-self-end' : '',
|
|
||||||
index > 0 && index < statutLegend.length - 1 ? 'justify-self-center' : ''
|
|
||||||
]"
|
|
||||||
@mouseenter="activeLegendStatutId = statut.id"
|
|
||||||
@mouseleave="activeLegendStatutId = null"
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
class="h-5 w-5 border border-slate-300"
|
|
||||||
:style="statut.couleur ? { backgroundColor: statut.couleur } : {}"
|
|
||||||
></span>
|
|
||||||
<span class="truncate text-sm uppercase text-slate-700">
|
|
||||||
{{ statut.label }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import type {BuildingData} from "~/services/dto/building-data"
|
|
||||||
import type {BuildingLayoutData} from "~/services/dto/building-layout-data"
|
|
||||||
import type {BuildingCasePositionData} from "~/services/dto/building-case-position-data"
|
|
||||||
import type {BuildingCaseStatusData} from "~/services/dto/building-case-status-data"
|
|
||||||
import {getBuildingList} from "~/services/building"
|
|
||||||
import {getStatutList} from "~/services/statut"
|
|
||||||
|
|
||||||
definePageMeta({layout: "default"})
|
|
||||||
|
|
||||||
const router = useRouter()
|
|
||||||
// Données brutes chargées depuis l'API
|
|
||||||
const buildingList = ref<BuildingData[]>([])
|
|
||||||
const statutLegend = ref<BuildingCaseStatusData[]>([])
|
|
||||||
// Statut actuellement survolé dans la légende (pour filtrage visuel)
|
|
||||||
const activeLegendStatutId = ref<number | null>(null)
|
|
||||||
// Modèle de vue prêt pour le template (layout + cellules + styles de grille)
|
|
||||||
const buildingLayouts = computed(() =>
|
|
||||||
buildingList.value.map((building) => {
|
|
||||||
// On affiche uniquement le premier layout du bâtiment
|
|
||||||
const layout = building.layouts?.[0] ?? null
|
|
||||||
const view = layout ? buildLayoutView(layout) : null
|
|
||||||
return {building, layout, cells: view?.cells ?? [], gridStyle: view?.gridStyle ?? {}}
|
|
||||||
})
|
|
||||||
)
|
|
||||||
|
|
||||||
type GridCell = {
|
|
||||||
key: string
|
|
||||||
caseId: number | null
|
|
||||||
display: string
|
|
||||||
caseStatusId: number | null
|
|
||||||
caseStatusLabel: string | null
|
|
||||||
// Couleur de fond de la case (dépend du statut)
|
|
||||||
caseStyle?: Record<string, string>
|
|
||||||
// Placement dans la grille CSS (colonne/ligne de départ + span)
|
|
||||||
spanStyle: Record<string, string>
|
|
||||||
// Bordures latérales pointillées si la case touche un gap ou le bord du plan
|
|
||||||
sideBorderClass: string
|
|
||||||
// Couleur des bordures pointillées latérales (reprend la couleur de la cellule)
|
|
||||||
sideBorderStyle?: Record<string, string>
|
|
||||||
// Espace blanc interne uniquement côté(s) adjacent(s) à une autre case
|
|
||||||
contentInsetClass: string
|
|
||||||
}
|
|
||||||
// Type intermédiaire : garde des infos utiles au calcul des bordures, retirées ensuite
|
|
||||||
type GridCellDraft = Omit<GridCell, "sideBorderClass" | "sideBorderStyle" | "contentInsetClass"> & { x: number; columnSpan: number }
|
|
||||||
|
|
||||||
// Nettoie la couleur de statut pour éviter les chaînes vides / espaces
|
|
||||||
const normalizeCaseStatusColor = (value: string | null | undefined): string | null => {
|
|
||||||
const color = (value ?? "").trim()
|
|
||||||
return color.length > 0 ? color : null
|
|
||||||
}
|
|
||||||
|
|
||||||
// Styles de base communs à toutes les grilles de bâtiments
|
|
||||||
const BASE_GRID_STYLE = {gridAutoRows: "1fr", rowGap: "18px", columnGap: "0px", width: "100%"} as const
|
|
||||||
|
|
||||||
// Transforme un layout API en structure de rendu (cellules + style de grille)
|
|
||||||
const buildLayoutView = (layout: BuildingLayoutData): {
|
|
||||||
cells: GridCell[];
|
|
||||||
gridStyle: Record<string, string>
|
|
||||||
} | null => {
|
|
||||||
const rows = layout.rows ?? 0, cols = layout.columns ?? 0
|
|
||||||
if (rows <= 0 || cols <= 0) return null
|
|
||||||
|
|
||||||
// Liste des positions de cases (filtre de sécurité sur les valeurs nulles)
|
|
||||||
const positions = (layout.casePositions ?? []).filter(Boolean) as BuildingCasePositionData[]
|
|
||||||
// Colonnes occupées par au moins une case (sert à détecter les gaps)
|
|
||||||
const occupiedColumns = new Set<number>()
|
|
||||||
// Sécurité : si deux positions ont le même x/y, on garde la première
|
|
||||||
const seenCoordinates = new Set<string>()
|
|
||||||
const cellDrafts: GridCellDraft[] = []
|
|
||||||
|
|
||||||
// Tri visuel : de haut en bas, puis de gauche à droite
|
|
||||||
const positionsSorted = [...positions].sort(
|
|
||||||
(leftPosition, rightPosition) =>
|
|
||||||
(leftPosition.y ?? 1) - (rightPosition.y ?? 1) || (leftPosition.x ?? 1) - (rightPosition.x ?? 1)
|
|
||||||
)
|
|
||||||
for (const position of positionsSorted) {
|
|
||||||
const x = position.x ?? 1
|
|
||||||
const y = position.y ?? 1
|
|
||||||
const coordinateKey = `${x}-${y}`
|
|
||||||
if (seenCoordinates.has(coordinateKey)) continue
|
|
||||||
seenCoordinates.add(coordinateKey)
|
|
||||||
|
|
||||||
// w/h = nombre de colonnes / lignes occupées par la case dans la grille
|
|
||||||
const columnSpan = position.w ?? 1
|
|
||||||
const rowSpan = position.h ?? 1
|
|
||||||
|
|
||||||
// Une case peut couvrir plusieurs colonnes : on les marque toutes comme occupées
|
|
||||||
for (let column = x; column < x + columnSpan; column++) {
|
|
||||||
if (column <= cols) occupiedColumns.add(column)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Métadonnées utiles au rendu / navigation / légende
|
|
||||||
const caseId = (position.buildingCase?.id ?? null) as number | null
|
|
||||||
const caseNumber = (position.buildingCase?.caseNumber ?? null) as number | null
|
|
||||||
const caseStatusId = position.buildingCase?.statut?.id ?? null
|
|
||||||
const caseStatusLabel = position.buildingCase?.statut?.label ?? null
|
|
||||||
const statusColor = normalizeCaseStatusColor(position.buildingCase?.statut?.couleur)
|
|
||||||
|
|
||||||
cellDrafts.push({
|
|
||||||
key: `case-${layout.id}-${position.id}`,
|
|
||||||
x,
|
|
||||||
columnSpan,
|
|
||||||
caseId,
|
|
||||||
display: caseNumber !== null ? String(caseNumber) : "Case",
|
|
||||||
caseStatusId,
|
|
||||||
caseStatusLabel,
|
|
||||||
caseStyle: statusColor ? {backgroundColor: statusColor} : undefined,
|
|
||||||
// Exemple : "14 / span 1" => commence en colonne 14 et occupe 1 colonne
|
|
||||||
spanStyle: {gridColumn: `${x} / span ${columnSpan}`, gridRow: `${y} / span ${rowSpan}`}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Colonnes vides = gaps visuels (plus étroites dans la grille)
|
|
||||||
const gapColumns = Array.from({length: cols}, (_, i) => i + 1).filter((x) => !occupiedColumns.has(x))
|
|
||||||
const gapSet = new Set(gapColumns)
|
|
||||||
|
|
||||||
// Ajoute les bordures latérales pointillées pour les cases au contact d'un gap ou d'un bord
|
|
||||||
const cells: GridCell[] = cellDrafts.map(({x, columnSpan, ...cell}) => {
|
|
||||||
const touchesLeftGapOrEdge = x === 1 || gapSet.has(x - 1)
|
|
||||||
const touchesRightGapOrEdge = x + columnSpan - 1 === cols || gapSet.has(x + columnSpan)
|
|
||||||
const sideBorderClass = [
|
|
||||||
touchesLeftGapOrEdge ? "border-l-[3px] [border-left-style:dashed]" : "",
|
|
||||||
touchesRightGapOrEdge ? "border-r-[3px] [border-right-style:dashed]" : ""
|
|
||||||
].filter(Boolean).join(" ")
|
|
||||||
// Les pointillés latéraux reprennent la couleur de la cellule (si un statut en fournit une)
|
|
||||||
const sideBorderStyle = {
|
|
||||||
...(cell.caseStyle?.backgroundColor && touchesLeftGapOrEdge ? {borderLeftColor: cell.caseStyle.backgroundColor} : {}),
|
|
||||||
...(cell.caseStyle?.backgroundColor && touchesRightGapOrEdge ? {borderRightColor: cell.caseStyle.backgroundColor} : {})
|
|
||||||
}
|
|
||||||
// Le "blanc" n'est ajouté qu'entre deux cellules adjacentes (pas sur bord/gap)
|
|
||||||
const contentInsetClass = [
|
|
||||||
!touchesLeftGapOrEdge ? "ml-[4px]" : "",
|
|
||||||
!touchesRightGapOrEdge ? "mr-[4px]" : ""
|
|
||||||
].filter(Boolean).join(" ")
|
|
||||||
return {...cell, sideBorderClass, sideBorderStyle, contentInsetClass}
|
|
||||||
})
|
|
||||||
|
|
||||||
// Les colonnes de gap sont rendues en 24px, les autres occupent l'espace restant
|
|
||||||
const columnsTemplate = Array.from({length: cols}, (_, i) => (gapSet.has(i + 1) ? "24px" : "minmax(0, 1fr)")).join(" ")
|
|
||||||
return {cells, gridStyle: {gridTemplateColumns: columnsTemplate, ...BASE_GRID_STYLE}}
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
// Chargement initial des bâtiments et de la légende des statuts
|
|
||||||
const buildings = await getBuildingList()
|
|
||||||
const statuts = await getStatutList()
|
|
||||||
buildingList.value = buildings
|
|
||||||
// Tri alphabétique FR pour une légende stable
|
|
||||||
statutLegend.value = [...statuts].sort((a, b) =>
|
|
||||||
(a.label ?? "").localeCompare(b.label ?? "", "fr", {sensitivity: "base"})
|
|
||||||
)
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="flex justify-center items-center">
|
|
||||||
<UiButton
|
|
||||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
|
||||||
:disabled="!hasCaseId"
|
|
||||||
@click="printCaseReport"
|
|
||||||
>
|
|
||||||
Imprimer
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<script setup lang="ts">
|
|
||||||
const route = useRoute()
|
|
||||||
const { printPdf } = usePdfPrinter()
|
|
||||||
|
|
||||||
const caseId = computed(() => Number(route.query.id))
|
|
||||||
const hasCaseId = computed(() => Number.isFinite(caseId.value) && caseId.value > 0)
|
|
||||||
|
|
||||||
const printCaseReport = async () => {
|
|
||||||
if (!hasCaseId.value) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const filename = `tableau_poids_case_${caseId.value}.pdf`
|
|
||||||
await printPdf(`/building_cases/${caseId.value}/weights-report`, filename)
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -16,7 +16,6 @@
|
|||||||
<select
|
<select
|
||||||
id="user-select"
|
id="user-select"
|
||||||
v-model="selectedUsername"
|
v-model="selectedUsername"
|
||||||
autocomplete="username"
|
|
||||||
class="mt-2 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-200"
|
class="mt-2 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-200"
|
||||||
:disabled="isLoadingUsers"
|
:disabled="isLoadingUsers"
|
||||||
>
|
>
|
||||||
@@ -40,13 +39,13 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<UiButton
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
class="w-full rounded-md bg-primary-500 px-4 py-2 text-base font-semibold text-white transition hover:bg-primary-600 disabled:cursor-not-allowed disabled:opacity-60"
|
class="w-full rounded-md bg-primary-500 px-4 py-2 text-base font-semibold text-white transition hover:bg-primary-600 disabled:cursor-not-allowed disabled:opacity-60"
|
||||||
:disabled="isSubmitting"
|
:disabled="isSubmitting"
|
||||||
>
|
>
|
||||||
Connexion
|
Connexion
|
||||||
</UiButton>
|
</button>
|
||||||
<p class="font-bold">v{{ version }}</p>
|
<p class="font-bold">v{{ version }}</p>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,102 +1,91 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="flex justify-between h-[52px] mb-[80px]">
|
<div>
|
||||||
<div class="flex flex-1 mr-16">
|
<div class="flex justify-between h-[52px] mb-[80px]">
|
||||||
<UiStepper
|
<div class="flex flex-1 mr-16">
|
||||||
:labels="stepLabels"
|
<UiStepper
|
||||||
:current-step="storeReception?.currentStep ?? 0"
|
:labels="RECEPTION_STEP_LABELS"
|
||||||
@select="handleStepSelect"
|
:current-step="storeReception?.currentStep ?? 0"
|
||||||
/>
|
@select="handleStepSelect"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
|
||||||
|
@click="saveAndHold"
|
||||||
|
>Mettre en attente</button>
|
||||||
</div>
|
</div>
|
||||||
<UiButton
|
<ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
|
||||||
type="button"
|
<ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
|
||||||
class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
|
<ReceptionProductReceived
|
||||||
@click="saveAndHold"
|
v-if="storeReception?.currentStep === 2 &&
|
||||||
>Mettre en attente
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
<ReceptionForm v-if="!storeReception || storeReception.currentStep === 0" ref="receptionFormRef"/>
|
|
||||||
<WorkflowWeight
|
|
||||||
v-if="storeReception?.currentStep === 1"
|
|
||||||
ref="grossWeightRef"
|
|
||||||
mode="gross"
|
|
||||||
entity-name="reception"
|
|
||||||
api-resource="receptions"
|
|
||||||
:title-label="receptionConfig.weighingLabels.gross"
|
|
||||||
:is-final="false"
|
|
||||||
:entity="storeReception"
|
|
||||||
:get-weight-from-scale="getWeight"
|
|
||||||
:update-entity="receptionStore.updateReception"
|
|
||||||
:load-entity="receptionStore.loadReception"
|
|
||||||
:clear-entity="receptionStore.clearCurrent"
|
|
||||||
:build-receipt-filename="receptionConfig.buildReceiptFilename"
|
|
||||||
/>
|
|
||||||
<ReceptionProductReceived
|
|
||||||
v-if="storeReception?.currentStep === 2 &&
|
|
||||||
receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"/>
|
receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"/>
|
||||||
<ReceptionBovineReceived
|
<ReceptionBovineReceived
|
||||||
v-if="storeReception?.currentStep === 2 &&
|
v-if="storeReception?.currentStep === 2 &&
|
||||||
receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"/>
|
receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"/>
|
||||||
<WorkflowWeight
|
<ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
|
||||||
v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3"
|
</div>
|
||||||
ref="tareWeightRef"
|
|
||||||
mode="tare"
|
|
||||||
entity-name="reception"
|
|
||||||
api-resource="receptions"
|
|
||||||
:title-label="receptionConfig.weighingLabels.tare"
|
|
||||||
:is-final="true"
|
|
||||||
:entity="storeReception"
|
|
||||||
:get-weight-from-scale="getWeight"
|
|
||||||
:update-entity="receptionStore.updateReception"
|
|
||||||
:load-entity="receptionStore.loadReception"
|
|
||||||
:clear-entity="receptionStore.clearCurrent"
|
|
||||||
:build-receipt-filename="receptionConfig.buildReceiptFilename"
|
|
||||||
/>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<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 { useWorkflowSteps } from '~/composables/useWorkflowSteps'
|
import {RECEPTION_STEP_LABELS} from '~/constants/steps'
|
||||||
import { receptionConfig } from '~/config/reception.config'
|
import {RECEPTION_TYPE_CODES} from "~/utils/constants";
|
||||||
import { getWeight } from '~/services/reception'
|
|
||||||
import { RECEPTION_TYPE_CODES } from '~/utils/constants'
|
|
||||||
|
|
||||||
const receptionStore = useReceptionStore()
|
|
||||||
const { current: storeReception } = storeToRefs(receptionStore)
|
|
||||||
const receptionFormRef = ref<{ saveDraft: () => Promise<void>, validateFields: () => boolean } | null>(null)
|
|
||||||
const grossWeightRef = ref<{ saveWeightDraft: () => Promise<void> } | null>(null)
|
|
||||||
const tareWeightRef = ref<{ saveWeightDraft: () => Promise<void> } | null>(null)
|
|
||||||
|
|
||||||
const { stepLabels, handleStepSelect } = useWorkflowSteps(receptionConfig, receptionStore)
|
|
||||||
|
|
||||||
|
const route = useRoute()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
const saveAndHold = async () => {
|
const receptionStore = useReceptionStore()
|
||||||
if (receptionFormRef.value) {
|
const {current: storeReception} = storeToRefs(receptionStore)
|
||||||
if (!receptionFormRef.value.validateFields()) return
|
|
||||||
await receptionFormRef.value.saveDraft()
|
const resolveReceptionId = (param: unknown) => {
|
||||||
} else {
|
const idStr = Array.isArray(param) ? param[0] : param
|
||||||
if (grossWeightRef.value) await grossWeightRef.value.saveWeightDraft()
|
if (!idStr) {
|
||||||
if (tareWeightRef.value) await tareWeightRef.value.saveWeightDraft()
|
return null
|
||||||
}
|
}
|
||||||
await router.push('/')
|
const id = Number(idStr)
|
||||||
|
return Number.isFinite(id) ? id : null
|
||||||
}
|
}
|
||||||
|
|
||||||
// Init route watcher
|
|
||||||
const route = useRoute()
|
|
||||||
watch(
|
watch(
|
||||||
() => route.params.id,
|
() => route.params.id,
|
||||||
async (param) => {
|
async (param) => {
|
||||||
const idStr = Array.isArray(param) ? param[0] : param
|
const id = resolveReceptionId(param)
|
||||||
if (!idStr) {
|
if (id === null) {
|
||||||
receptionStore.clearCurrent()
|
receptionStore.clearCurrent()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const id = Number(idStr)
|
await receptionStore.loadReception(id)
|
||||||
if (Number.isFinite(id)) {
|
|
||||||
await receptionStore.loadReception(id)
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
{ immediate: true }
|
{immediate: true}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const saveAndHold = async () => {
|
||||||
|
if (!receptionStore.current) {
|
||||||
|
await router.push('/')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
await receptionStore.updateReception(receptionStore.current.id, {
|
||||||
|
currentStep: receptionStore.current.currentStep,
|
||||||
|
licensePlate: receptionStore.current.licensePlate,
|
||||||
|
receptionDate: receptionStore.current.receptionDate
|
||||||
|
})
|
||||||
|
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>
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="flex items-center justify-start gap-10">
|
<div class="flex items-center justify-start gap-10">
|
||||||
<Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
|
<Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" />
|
||||||
<h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions finie</h1>
|
<h1 class="text-3xl font-bold uppercase">listes des réceptions finie</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="px-[86px]">
|
<div class="ps-20 " >
|
||||||
<div class="mt-6 border border-slate-200 mb-16 ">
|
<div class="mt-6 border border-slate-200 mb-16 ">
|
||||||
<div class="grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
<div class="grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
||||||
<div>Numéro</div>
|
<div>Numéro</div>
|
||||||
<div>Date et heure</div>
|
<div>Date</div>
|
||||||
<div>Fournisseur</div>
|
<div>Fournisseur</div>
|
||||||
<div>Adresse</div>
|
<div>Adresse</div>
|
||||||
<div>Type réception</div>
|
<div>Type réception</div>
|
||||||
@@ -20,14 +20,13 @@
|
|||||||
class="grid grid-cols-6 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
|
class="grid grid-cols-6 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
|
||||||
role="button"
|
role="button"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
@click="goToReception(reception.id)"
|
|
||||||
>
|
>
|
||||||
<div>{{ reception.identificationNumber}}</div>
|
<div>{{ reception.identificationNumber}}</div>
|
||||||
<div>{{ formatDate(reception.receptionDate) }}</div>
|
<div>{{ reception.receptionDate}}</div>
|
||||||
<div>{{ reception.supplier?.name }}</div>
|
<div>{{ reception.supplier?.name }}</div>
|
||||||
<div>{{ reception.address?.fullAddress }}</div>
|
<div>{{ reception.address?.fullAddress }}</div>
|
||||||
<div>{{ reception.receptionType?.label }}</div>
|
<div>{{ reception.receptionType?.label }}</div>
|
||||||
<div>{{ formatWeighing(reception) }}</div>
|
<div>{{ formatWeighing(reception, 'gross') }} | {{ formatWeighing(reception, 'tare') }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -36,37 +35,16 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import type {ReceptionData} from "~/services/dto/reception-data";
|
import type {ReceptionData} from "~/services/dto/reception-data";
|
||||||
import {getReceptionList} from "~/services/reception";
|
import {getReceptionList} from "~/services/reception";
|
||||||
import type {ShipmentData} from "~/services/dto/shipment-data";
|
|
||||||
|
|
||||||
const receptionList = ref<ReceptionData[]>()
|
const receptionList = ref<ReceptionData[]>()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
const formatDate = (date: string | null) => {
|
const formatWeighing = (reception: ReceptionData, type: 'gross' | 'tare') => {
|
||||||
if (!date) return '—'
|
const entry = reception.weights?.find((weight) => weight.type === type)
|
||||||
const d = new Date(date.replace(' ', 'T'))
|
if (!entry || entry.weight == null || entry.dsd == null) {
|
||||||
if (isNaN(d.getTime())) return date
|
|
||||||
return d.toLocaleDateString('fr-FR', {
|
|
||||||
day: '2-digit',
|
|
||||||
month: '2-digit',
|
|
||||||
year: 'numeric',
|
|
||||||
hour: '2-digit',
|
|
||||||
minute: '2-digit'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
const formatWeighing = (reception: ReceptionData) => {
|
|
||||||
const gross = reception.weights?.find((weight) => weight.type === 'gross')?.weight
|
|
||||||
const tare = reception.weights?.find((weight) => weight.type === 'tare')?.weight
|
|
||||||
|
|
||||||
if (gross == null || tare == null) {
|
|
||||||
return '—'
|
return '—'
|
||||||
}
|
}
|
||||||
|
return `${entry.weight} kg`
|
||||||
return `${gross - tare} kg`
|
|
||||||
}
|
|
||||||
|
|
||||||
const goToReception = (id: number) => {
|
|
||||||
router.push(`/reception/update/${id}`)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,64 +1,48 @@
|
|||||||
<template>
|
<template>
|
||||||
<WorkflowWaitingList
|
<div class="flex items-center justify-between ">
|
||||||
title="listes des réceptions en attente"
|
<div class="flex items-center gap-10">
|
||||||
:columns="columns"
|
<Icon @click="router.push('/')" name="gg:arrow-left-o" style="color: black" size="44" />
|
||||||
:items="receptionList ?? []"
|
<h1 class="text-3xl font-bold uppercase">listes des réceptions en attente</h1>
|
||||||
route-prefix="/reception"
|
</div>
|
||||||
:show-actions="auth.isAdmin"
|
</div>
|
||||||
>
|
|
||||||
<template #cell-receptionDate="{ item }">
|
<div class="ps-20 " >
|
||||||
{{ formatDate(item.receptionDate) }}
|
<div class="mt-6 border border-slate-200 mb-16 ">
|
||||||
</template>
|
<div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
||||||
<template #actions="{ item }">
|
<div>Fournisseur</div>
|
||||||
<Icon
|
<div>Adresse</div>
|
||||||
name="mdi:delete-outline"
|
<div>Type réception</div>
|
||||||
size="24"
|
<div>Transporteur</div>
|
||||||
class="cursor-pointer text-red-500 hover:text-red-700"
|
<div>Immatriculation</div>
|
||||||
@click="confirmDelete(item)"
|
</div>
|
||||||
/>
|
<div
|
||||||
</template>
|
v-for="reception in receptionList"
|
||||||
</WorkflowWaitingList>
|
:key="reception.id"
|
||||||
|
class="grid grid-cols-5 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
|
@click="goToReception(reception.id)"
|
||||||
|
@keydown.enter="goToReception(reception.id)"
|
||||||
|
>
|
||||||
|
<div>{{ reception.supplier?.name }}</div>
|
||||||
|
<div>{{ reception.address?.fullAddress }}</div>
|
||||||
|
<div>{{ reception.receptionType?.label }}</div>
|
||||||
|
<div>{{ reception.carrier?.name }}</div>
|
||||||
|
<div>{{ reception.licensePlate }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import type { ReceptionData } from '~/services/dto/reception-data'
|
import type {ReceptionData} from "~/services/dto/reception-data";
|
||||||
import { getReceptionList, deleteReception } from '~/services/reception'
|
import {getReceptionList} from "~/services/reception";
|
||||||
import { useAuthStore } from '~/stores/auth'
|
|
||||||
|
|
||||||
const auth = useAuthStore()
|
|
||||||
|
|
||||||
const columns = [
|
|
||||||
{ key: 'receptionDate', label: 'Date et heure' },
|
|
||||||
{ key: 'supplier.name', label: 'Fournisseur' },
|
|
||||||
{ key: 'address.fullAddress', label: 'Adresse' },
|
|
||||||
{ key: 'receptionType.label', label: 'Type réception' },
|
|
||||||
{ key: 'carrier.name', label: 'Transporteur' },
|
|
||||||
{ key: 'licensePlate', label: 'Immatriculation' }
|
|
||||||
]
|
|
||||||
|
|
||||||
const receptionList = ref<ReceptionData[]>()
|
const receptionList = ref<ReceptionData[]>()
|
||||||
|
const router = useRouter()
|
||||||
|
|
||||||
const formatDate = (date: string | null) => {
|
const goToReception = (id: number) => {
|
||||||
if (!date) return '—'
|
router.push(`/reception/${id}`)
|
||||||
const d = new Date(date.replace(' ', 'T'))
|
|
||||||
if (isNaN(d.getTime())) return date
|
|
||||||
return d.toLocaleDateString('fr-FR', {
|
|
||||||
day: '2-digit',
|
|
||||||
month: '2-digit',
|
|
||||||
year: 'numeric',
|
|
||||||
hour: '2-digit',
|
|
||||||
minute: '2-digit'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
const confirmDelete = async (reception: ReceptionData) => {
|
|
||||||
const confirmed = window.confirm(
|
|
||||||
`Êtes-vous sûr de vouloir supprimer la réception ${reception.identificationNumber ?? `#${reception.id}`} ? Toutes les données liées seront supprimées.`
|
|
||||||
)
|
|
||||||
if (!confirmed) return
|
|
||||||
|
|
||||||
await deleteReception(reception.id)
|
|
||||||
receptionList.value = receptionList.value?.filter(r => r.id !== reception.id)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
|
|||||||
@@ -1,229 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="flex flex-col gap-4 px-4">
|
|
||||||
<h1 class="text-2xl text-primary-500 font-bold uppercase">Scanner des bovins</h1>
|
|
||||||
|
|
||||||
<!-- Message si non supporté -->
|
|
||||||
<div v-if="!scanner.isSupported.value" class="bg-red-50 border border-red-200 rounded p-4 text-red-700 flex flex-col w-full">
|
|
||||||
<p class="font-bold">Scanner non disponible</p>
|
|
||||||
<p class="text-sm mt-1">BarcodeDetector n'est pas supportée par ce navigateur. Utilisez Chrome sur Android.</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Erreur caméra -->
|
|
||||||
<div v-if="scanner.error.value" class="bg-red-50 border border-red-200 rounded p-4 text-red-700">
|
|
||||||
<p>{{ scanner.error.value }}</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex flex-wrap gap-4">
|
|
||||||
<UiSelect
|
|
||||||
id="scan-building"
|
|
||||||
v-model="selectedBuildingId"
|
|
||||||
label="Bâtiment"
|
|
||||||
:options="buildingOptions"
|
|
||||||
wrapper-class="w-full max-w-[280px]"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
|
|
||||||
<UiSelect
|
|
||||||
id="scan-case"
|
|
||||||
v-model="selectedCaseId"
|
|
||||||
label="Case"
|
|
||||||
:options="caseOptions"
|
|
||||||
:disabled="!selectedBuildingId"
|
|
||||||
wrapper-class="w-full max-w-[280px]"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Zone caméra pleine hauteur -->
|
|
||||||
<div v-if="showScanner" class="fixed inset-0 z-50 flex flex-col bg-black overflow-hidden">
|
|
||||||
<!-- Header scanner -->
|
|
||||||
<div class="flex items-center justify-between px-4 py-3 bg-black/90">
|
|
||||||
<div class="text-white text-sm font-semibold">
|
|
||||||
{{ scannedCount }} bovin{{ scannedCount > 1 ? 's' : '' }} scanné{{ scannedCount > 1 ? 's' : '' }}
|
|
||||||
</div>
|
|
||||||
<UiButton
|
|
||||||
type="button"
|
|
||||||
class="text-md font-bold uppercase bg-red-500 text-white h-[40px] px-4"
|
|
||||||
@click="stopScanning"
|
|
||||||
>
|
|
||||||
Arrêter
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
<div class="flex-1 relative">
|
|
||||||
<video
|
|
||||||
ref="videoRef"
|
|
||||||
class="w-full h-full object-cover"
|
|
||||||
playsinline
|
|
||||||
muted
|
|
||||||
/>
|
|
||||||
<!-- Overlay zone de scan -->
|
|
||||||
<div class="absolute inset-0 flex items-center justify-center pointer-events-none">
|
|
||||||
<div class="w-[90%] h-48 border-2 border-white/70 rounded-lg" />
|
|
||||||
</div>
|
|
||||||
<!-- Dernier scan -->
|
|
||||||
<div v-if="lastScanned" class="absolute bottom-4 left-1/2 -translate-x-1/2 bg-green-600/80 text-white px-4 py-2 rounded-full text-sm font-semibold">
|
|
||||||
{{ lastScanned }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Bouton démarrer -->
|
|
||||||
<div v-if="!showScanner" class="flex gap-3">
|
|
||||||
<UiButton
|
|
||||||
type="button"
|
|
||||||
class="text-md font-bold uppercase bg-primary-500 text-white h-[50px] w-full max-w-[272px]"
|
|
||||||
:disabled="!scanner.isSupported.value"
|
|
||||||
@click="startScanning"
|
|
||||||
>
|
|
||||||
Démarrer le scanner
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Liste des numéros scannés -->
|
|
||||||
<div class="flex flex-col gap-3">
|
|
||||||
<p class="text-sm text-slate-500 font-semibold">
|
|
||||||
{{ scannedCount }} bovin{{ scannedCount > 1 ? 's' : '' }} scanné{{ scannedCount > 1 ? 's' : '' }}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-for="(entry, index) in entries"
|
|
||||||
:key="index"
|
|
||||||
class="flex items-center gap-2"
|
|
||||||
>
|
|
||||||
<UiTextInput
|
|
||||||
:id="`scan-entry-${index}`"
|
|
||||||
:ref="(el: any) => setInputRef(el?.$el?.querySelector('input') ?? el, index)"
|
|
||||||
:model-value="entries[index]"
|
|
||||||
placeholder="Numéro national"
|
|
||||||
wrapper-class="flex-1 max-w-md"
|
|
||||||
@update:model-value="(val: string) => entries[index] = val ?? ''"
|
|
||||||
/>
|
|
||||||
<button
|
|
||||||
v-if="entries.length > 1"
|
|
||||||
type="button"
|
|
||||||
class="text-red-400 hover:text-red-600"
|
|
||||||
@click="removeEntry(index)"
|
|
||||||
>
|
|
||||||
<Icon name="mdi:close-circle" size="24" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Actions -->
|
|
||||||
<div class="flex gap-3 mt-4">
|
|
||||||
<UiButton
|
|
||||||
type="button"
|
|
||||||
class="text-md font-bold uppercase bg-primary-500 text-white h-[50px] w-full"
|
|
||||||
:disabled="scannedCount === 0 || isSubmitting || !selectedCaseId"
|
|
||||||
:loading="isSubmitting"
|
|
||||||
@click="submit"
|
|
||||||
>
|
|
||||||
Valider ({{ scannedCount }})
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { ref, computed, nextTick, onMounted, watch } from 'vue'
|
|
||||||
import { useBarcodeScanner } from '~/composables/useBarcodeScanner'
|
|
||||||
import { createBovine } from '~/services/bovine'
|
|
||||||
import { getBuildingList } from '~/services/building'
|
|
||||||
import type { BuildingData } from '~/services/dto/building-data'
|
|
||||||
|
|
||||||
const videoRef = ref<HTMLVideoElement>()
|
|
||||||
const entries = ref<string[]>([''])
|
|
||||||
const inputRefs = ref<(HTMLInputElement | null)[]>([])
|
|
||||||
const isSubmitting = ref(false)
|
|
||||||
const lastScanned = ref('')
|
|
||||||
const showScanner = ref(false)
|
|
||||||
|
|
||||||
const buildings = ref<BuildingData[]>([])
|
|
||||||
const selectedBuildingId = ref<string | number | null>(null)
|
|
||||||
const selectedCaseId = ref<string | number | null>(null)
|
|
||||||
|
|
||||||
const buildingOptions = computed(() =>
|
|
||||||
buildings.value.map(b => ({ value: b.id, label: b.label }))
|
|
||||||
)
|
|
||||||
|
|
||||||
const caseOptions = computed(() => {
|
|
||||||
const building = buildings.value.find(b => b.id === Number(selectedBuildingId.value))
|
|
||||||
if (!building?.buildingCases) return []
|
|
||||||
return [...building.buildingCases]
|
|
||||||
.sort((a, b) => (a.caseNumber ?? 0) - (b.caseNumber ?? 0))
|
|
||||||
.map(c => ({
|
|
||||||
value: c.id,
|
|
||||||
label: `Case ${c.caseNumber ?? c.code ?? c.id}`
|
|
||||||
}))
|
|
||||||
})
|
|
||||||
|
|
||||||
watch(selectedBuildingId, () => {
|
|
||||||
selectedCaseId.value = null
|
|
||||||
})
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
buildings.value = await getBuildingList()
|
|
||||||
})
|
|
||||||
|
|
||||||
const scannedCount = computed(() => entries.value.filter(e => e.trim() !== '').length)
|
|
||||||
|
|
||||||
function setInputRef(el: HTMLInputElement | null, index: number) {
|
|
||||||
inputRefs.value[index] = el
|
|
||||||
}
|
|
||||||
|
|
||||||
const scanner = useBarcodeScanner((code: string) => {
|
|
||||||
if (entries.value.some(e => e.trim() === code)) return
|
|
||||||
|
|
||||||
const emptyIndex = entries.value.findIndex(e => e.trim() === '')
|
|
||||||
if (emptyIndex !== -1) {
|
|
||||||
entries.value[emptyIndex] = code
|
|
||||||
} else {
|
|
||||||
entries.value.push(code)
|
|
||||||
}
|
|
||||||
|
|
||||||
lastScanned.value = code
|
|
||||||
entries.value.push('')
|
|
||||||
})
|
|
||||||
|
|
||||||
function startScanning() {
|
|
||||||
showScanner.value = true
|
|
||||||
nextTick(() => {
|
|
||||||
if (videoRef.value) {
|
|
||||||
scanner.start(videoRef.value)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
function stopScanning() {
|
|
||||||
scanner.stop()
|
|
||||||
showScanner.value = false
|
|
||||||
lastScanned.value = ''
|
|
||||||
}
|
|
||||||
|
|
||||||
function removeEntry(index: number) {
|
|
||||||
entries.value.splice(index, 1)
|
|
||||||
inputRefs.value.splice(index, 1)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function submit() {
|
|
||||||
const numbers = entries.value.filter(e => e.trim() !== '').map(e => e.trim())
|
|
||||||
if (numbers.length === 0 || !selectedCaseId.value) return
|
|
||||||
|
|
||||||
const caseIri = `/api/building_cases/${selectedCaseId.value}`
|
|
||||||
isSubmitting.value = true
|
|
||||||
|
|
||||||
try {
|
|
||||||
let successCount = 0
|
|
||||||
for (const nationalNumber of numbers) {
|
|
||||||
const result = await createBovine({ nationalNumber, buildingCase: caseIri })
|
|
||||||
if (result) successCount++
|
|
||||||
}
|
|
||||||
|
|
||||||
if (successCount > 0) {
|
|
||||||
clearAll()
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
isSubmitting.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div>
|
|
||||||
<div class="flex justify-between h-[52px] mb-[80px]">
|
|
||||||
<div class="flex flex-1 mr-16">
|
|
||||||
<UiStepper
|
|
||||||
:labels="stepLabels"
|
|
||||||
:current-step="storeShipment?.currentStep ?? 0"
|
|
||||||
@select="handleStepSelect"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<UiButton
|
|
||||||
type="button"
|
|
||||||
class="flex flex-col justify-center uppercase text-xl bg-black text-white h-[50px] w-[272px] text-center"
|
|
||||||
@click="saveAndHold"
|
|
||||||
>Mettre en attente
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
<ShipmentForm v-if="!storeShipment || storeShipment.currentStep === 0" ref="shipmentFormRef"/>
|
|
||||||
<WorkflowWeight
|
|
||||||
v-if="storeShipment?.currentStep === 1"
|
|
||||||
ref="grossWeightRef"
|
|
||||||
mode="gross"
|
|
||||||
entity-name="shipment"
|
|
||||||
api-resource="shipments"
|
|
||||||
:title-label="shipmentConfig.weighingLabels.gross"
|
|
||||||
:is-final="false"
|
|
||||||
:entity="storeShipment"
|
|
||||||
:get-weight-from-scale="getWeightShipment"
|
|
||||||
:update-entity="shipmentStore.updateShipment"
|
|
||||||
:load-entity="shipmentStore.loadShipment"
|
|
||||||
:clear-entity="shipmentStore.clearCurrent"
|
|
||||||
:build-receipt-filename="shipmentConfig.buildReceiptFilename"
|
|
||||||
/>
|
|
||||||
<ShipmentLoading v-if="storeShipment?.currentStep === 2"/>
|
|
||||||
<WorkflowWeight
|
|
||||||
v-if="storeShipment?.currentStep === 3"
|
|
||||||
ref="tareWeightRef"
|
|
||||||
mode="tare"
|
|
||||||
entity-name="shipment"
|
|
||||||
api-resource="shipments"
|
|
||||||
:title-label="shipmentConfig.weighingLabels.tare"
|
|
||||||
:is-final="true"
|
|
||||||
:entity="storeShipment"
|
|
||||||
:get-weight-from-scale="getWeightShipment"
|
|
||||||
:update-entity="shipmentStore.updateShipment"
|
|
||||||
:load-entity="shipmentStore.loadShipment"
|
|
||||||
:clear-entity="shipmentStore.clearCurrent"
|
|
||||||
:build-receipt-filename="shipmentConfig.buildReceiptFilename"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { storeToRefs } from 'pinia'
|
|
||||||
import { useShipmentStore } from '~/stores/shipment'
|
|
||||||
import { useWorkflowSteps } from '~/composables/useWorkflowSteps'
|
|
||||||
import { shipmentConfig } from '~/config/shipment.config'
|
|
||||||
import { getWeightShipment } from '~/services/shipment'
|
|
||||||
import { ref, watch } from 'vue'
|
|
||||||
|
|
||||||
const shipmentStore = useShipmentStore()
|
|
||||||
const { current: storeShipment } = storeToRefs(shipmentStore)
|
|
||||||
const shipmentFormRef = ref<{ saveDraft: () => Promise<void>, validateFields: () => boolean } | null>(null)
|
|
||||||
const grossWeightRef = ref<{ saveWeightDraft: () => Promise<void> } | null>(null)
|
|
||||||
const tareWeightRef = ref<{ saveWeightDraft: () => Promise<void> } | null>(null)
|
|
||||||
|
|
||||||
const { stepLabels, handleStepSelect } = useWorkflowSteps(shipmentConfig, shipmentStore)
|
|
||||||
|
|
||||||
const route = useRoute()
|
|
||||||
const router = useRouter()
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => route.params.id,
|
|
||||||
async (param) => {
|
|
||||||
const idStr = Array.isArray(param) ? param[0] : param
|
|
||||||
if (!idStr) {
|
|
||||||
shipmentStore.clearCurrent()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const id = Number(idStr)
|
|
||||||
if (Number.isFinite(id)) {
|
|
||||||
await shipmentStore.loadShipment(id)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{ immediate: true }
|
|
||||||
)
|
|
||||||
|
|
||||||
const saveAndHold = async () => {
|
|
||||||
if (shipmentFormRef.value) {
|
|
||||||
if (!shipmentFormRef.value.validateFields()) return
|
|
||||||
await shipmentFormRef.value.saveDraft()
|
|
||||||
} else {
|
|
||||||
if (grossWeightRef.value) await grossWeightRef.value.saveWeightDraft()
|
|
||||||
if (tareWeightRef.value) await tareWeightRef.value.saveWeightDraft()
|
|
||||||
}
|
|
||||||
await router.push('/')
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@@ -1,85 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="flex items-center justify-start gap-10">
|
|
||||||
<Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
|
|
||||||
<h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions finie</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="px-[86px]">
|
|
||||||
<div class="mt-6 border border-slate-200 mb-16 ">
|
|
||||||
<div class="grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
|
||||||
<div>Numéro</div>
|
|
||||||
<div>Date</div>
|
|
||||||
<div>Client</div>
|
|
||||||
<div>Adresse</div>
|
|
||||||
<div>Type d'expéditon</div>
|
|
||||||
<div>Poids</div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-for="shipment in shipmentList"
|
|
||||||
:key="shipment
|
|
||||||
.id"
|
|
||||||
class="grid grid-cols-6 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
|
|
||||||
role="button"
|
|
||||||
tabindex="0"
|
|
||||||
@click="goShipment(shipment.id)"
|
|
||||||
>
|
|
||||||
<div>{{ shipment.identificationNumber }}</div>
|
|
||||||
<div>{{ shipment.shipmentDate }}</div>
|
|
||||||
<div>{{ shipment.customer?.name }}</div>
|
|
||||||
<div>{{ shipment.address?.fullAddress }}</div>
|
|
||||||
<div>
|
|
||||||
<template v-if="formatShipmentLines(shipment).length">
|
|
||||||
<div
|
|
||||||
v-for="(line, index) in formatShipmentLines(shipment)"
|
|
||||||
:key="index"
|
|
||||||
class="leading-5"
|
|
||||||
>
|
|
||||||
{{ line }}
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</div>
|
|
||||||
<div>{{ formatWeighing(shipment) }}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import type {ShipmentData} from "~/services/dto/shipment-data";
|
|
||||||
import {getShipmentList} from "~/services/shipment";
|
|
||||||
|
|
||||||
const shipmentList = ref<ShipmentData[]>()
|
|
||||||
const router = useRouter()
|
|
||||||
|
|
||||||
const formatWeighing = (shipment: ShipmentData) => {
|
|
||||||
const gross = shipment.weights?.find((weight) => weight.type === 'gross')?.weight
|
|
||||||
const tare = shipment.weights?.find((weight) => weight.type === 'tare')?.weight
|
|
||||||
|
|
||||||
if (gross == null || tare == null) {
|
|
||||||
return '—'
|
|
||||||
}
|
|
||||||
|
|
||||||
return `${gross - tare} kg`
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const formatShipmentLines = (shipment: ShipmentData) => {
|
|
||||||
if (!shipment.shipmentType && shipment.nbBovinSend == null) {
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
|
|
||||||
const label = typeof shipment.shipmentType === 'string'
|
|
||||||
? shipment.shipmentType
|
|
||||||
: shipment.shipmentType?.label
|
|
||||||
|
|
||||||
return [`${label ?? '—'} : ${shipment.nbBovinSend ?? '—'}`]
|
|
||||||
}
|
|
||||||
|
|
||||||
const goShipment = (id: number) => {
|
|
||||||
router.push(`/shipment/update/${id}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
shipmentList.value = await getShipmentList(true)
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -1,675 +0,0 @@
|
|||||||
<template>
|
|
||||||
<form :class="{ submitted }" @submit.prevent="validate">
|
|
||||||
<div class="grid grid-cols-2 h-[461px] items-start gap-y-8 gap-x-40 mb-16">
|
|
||||||
<div class="flex items-center justify-between gap-10 relative col-start-1 row-start-1">
|
|
||||||
<div class="flex flex-row absolute -left-[60px] justify-between">
|
|
||||||
<Icon @click="router.push('/shipment/finish-shipment')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
|
|
||||||
</div>
|
|
||||||
<h1 class="font-bold text-4xl col-start-1 row-start-1 text-primary-500 uppercase">Expédition {{ form.identificationNumber }}</h1>
|
|
||||||
<div class="bg-primary-500 p-1 rounded-md flex items-center" title="Imprimer" @click="printReceipt">
|
|
||||||
<Icon name="mdi:printer-outline" size="32" class="cursor-pointer text-white"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<UiSelect
|
|
||||||
id="shipment-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"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
|
|
||||||
<UiDateInput
|
|
||||||
id="shipment-date"
|
|
||||||
v-model="form.shipmentDate"
|
|
||||||
label="Date d'expédition"
|
|
||||||
wrapper-class="col-start-1 row-start-3"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div class="col-start-1 row-start-4 h-[64px]">
|
|
||||||
<div class="flex w-full items-end gap-[104px]">
|
|
||||||
<UiRadioGroup
|
|
||||||
id="shipment-type"
|
|
||||||
name="shipment-type"
|
|
||||||
label="Type d'expédition bovine"
|
|
||||||
input-class="accent-primary-700 focus:ring-primary-700"
|
|
||||||
group-class="flex flex-row gap-[104px] w-[160px_160px] h-[32px]"
|
|
||||||
v-model="selectedShipmentTypeId"
|
|
||||||
:options="bovineShipment.map((type) => ({
|
|
||||||
value: String(type.id),
|
|
||||||
label: type.label
|
|
||||||
}))"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
<UiNumberInput
|
|
||||||
id="shipment-type-quantity"
|
|
||||||
v-model="shipmentQuantity"
|
|
||||||
:placeholder="0"
|
|
||||||
:min="0"
|
|
||||||
:max="1200"
|
|
||||||
:disabled="!selectedShipmentTypeId"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<UiSelect
|
|
||||||
id="shipment-customer"
|
|
||||||
v-model="form.customerId"
|
|
||||||
label="Client"
|
|
||||||
:options="customers.map((customer) => ({
|
|
||||||
value: String(customer.id),
|
|
||||||
label: customer.name || `Client #${customer.id}`
|
|
||||||
}))"
|
|
||||||
:loading="isLoadingCustomers"
|
|
||||||
wrapper-class="col-start-1 row-start-5"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
|
|
||||||
<UiSelect
|
|
||||||
id="shipment-address"
|
|
||||||
v-model="form.addressId"
|
|
||||||
:options="customerAddressOptions"
|
|
||||||
:disabled="isLoadingCustomers || customerAddresses.length === 0"
|
|
||||||
label="Adresse"
|
|
||||||
wrapper-class="col-start-2 row-start-1"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
|
|
||||||
<UiSelect
|
|
||||||
id="shipment-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"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
|
|
||||||
<UiSelect
|
|
||||||
id="shipment-carrier"
|
|
||||||
v-model="form.carrierId"
|
|
||||||
label="Transporteur"
|
|
||||||
:options="carriers.map((carrier) => ({
|
|
||||||
value: String(carrier.id),
|
|
||||||
label: carrier.name
|
|
||||||
}))"
|
|
||||||
wrapper-class="col-start-2 row-start-3"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
|
|
||||||
<UiLicensePlateInput
|
|
||||||
v-model="form.licensePlate"
|
|
||||||
v-model:allowAny="allowAnyLicensePlate"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<UiSelect
|
|
||||||
v-if="isLiotCarrier"
|
|
||||||
id="shipment-vehicle"
|
|
||||||
v-model="form.vehicleId"
|
|
||||||
label="Immatriculation"
|
|
||||||
: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-4"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div class="col-start-2 row-start-5 min-h-[72px]">
|
|
||||||
<UiSelect
|
|
||||||
v-if="isLiotCarrier"
|
|
||||||
id="shipment-driver"
|
|
||||||
v-model="form.driverId"
|
|
||||||
label="Nom du chauffeur si LIOT"
|
|
||||||
:options="filteredDrivers.map((driver) => ({
|
|
||||||
value: String(driver.id),
|
|
||||||
label: driver.name
|
|
||||||
}))"
|
|
||||||
:loading="isLoadingDrivers"
|
|
||||||
required
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="formIsLoading">
|
|
||||||
<div class="flex justify-evenly gap-y-8 gap-x-41 mb-10 border-b border-primary-500/60">
|
|
||||||
<h1
|
|
||||||
class="font-bold text-3xl uppercase px-12 col-start-1 row-start-1 cursor-pointer"
|
|
||||||
:class="[
|
|
||||||
activeTab === 'weights' ? 'border-b-[6px] border-primary-500 text-primary-500' : 'text-primary-500/50',
|
|
||||||
hasGrossWeightError ? '!text-red-500 !border-red-500' : ''
|
|
||||||
]"
|
|
||||||
@click="activeTab = 'weights'"
|
|
||||||
>
|
|
||||||
pesée à plein
|
|
||||||
</h1>
|
|
||||||
<h1
|
|
||||||
class="font-bold text-3xl uppercase col-start-1 row-start-1 px-12 cursor-pointer"
|
|
||||||
:class="[
|
|
||||||
activeTab === 'weightsEmpty' ? 'border-b-[6px] border-primary-500 text-primary-500' : 'text-primary-500/50',
|
|
||||||
hasTareWeightError ? '!text-red-500 !border-red-500' : ''
|
|
||||||
]"
|
|
||||||
@click="activeTab = 'weightsEmpty'"
|
|
||||||
>
|
|
||||||
pesée à vide
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
<div class="mb-12">
|
|
||||||
<update-weight
|
|
||||||
v-show="activeTab === 'weights'"
|
|
||||||
v-model="grossWeight"
|
|
||||||
v-if="grossWeight"
|
|
||||||
:isAdmin="authStore.isAdmin"
|
|
||||||
/>
|
|
||||||
<update-weight
|
|
||||||
v-show="activeTab === 'weightsEmpty'"
|
|
||||||
v-model="tareWeight"
|
|
||||||
v-if="tareWeight"
|
|
||||||
:isAdmin="authStore.isAdmin"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex justify-center">
|
|
||||||
<UiButton
|
|
||||||
type="submit"
|
|
||||||
class="text-xl mb-16 uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
|
|
||||||
@click="submitted = true"
|
|
||||||
>
|
|
||||||
Valider
|
|
||||||
</UiButton>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { usePdfPrinter } from '#imports'
|
|
||||||
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
|
||||||
import UpdateWeight from '~/components/commun/update-weight.vue'
|
|
||||||
import { getUsers } from '~/services/auth'
|
|
||||||
import { getCarrierList } from '~/services/carrier'
|
|
||||||
import { getCustomerList } from '~/services/customer'
|
|
||||||
import type { AddressData } from '~/services/dto/address-data'
|
|
||||||
import type { CarrierData } from '~/services/dto/carrier-data'
|
|
||||||
import type { CustomerData } from '~/services/dto/customer-data'
|
|
||||||
import type { DriverData } from '~/services/dto/driver-data'
|
|
||||||
import type { ShipmentData, ShipmentFormData } from '~/services/dto/shipment-data'
|
|
||||||
import type { ShipmentTypeData } from '~/services/dto/shipment-type-data'
|
|
||||||
import type { TruckData } from '~/services/dto/truck-data'
|
|
||||||
import type { UserData } from '~/services/dto/user-data'
|
|
||||||
import type { VehicleData } from '~/services/dto/vehicle-data'
|
|
||||||
import type { WeightEntryData } from '~/services/dto/weight-data'
|
|
||||||
import { getDriverList } from '~/services/driver'
|
|
||||||
import { getShipment, updateShipment } from '~/services/shipment'
|
|
||||||
import { getShipmentTypeList } from '~/services/shipment-type'
|
|
||||||
import { getTruckList } from '~/services/truck'
|
|
||||||
import { getVehicleList } from '~/services/vehicle'
|
|
||||||
import { createWeight, updateWeight } from '~/services/weight'
|
|
||||||
import { useAuthStore } from '~/stores/auth'
|
|
||||||
import { SUPPLIER_CODE } from '~/utils/constants'
|
|
||||||
|
|
||||||
const router = useRouter()
|
|
||||||
const route = useRoute()
|
|
||||||
const authStore = useAuthStore()
|
|
||||||
const { printPdf } = usePdfPrinter()
|
|
||||||
|
|
||||||
const users = ref<UserData[]>([])
|
|
||||||
const customers = ref<CustomerData[]>([])
|
|
||||||
const trucks = ref<TruckData[]>([])
|
|
||||||
const carriers = ref<CarrierData[]>([])
|
|
||||||
const drivers = ref<DriverData[]>([])
|
|
||||||
const vehicles = ref<VehicleData[]>([])
|
|
||||||
const bovineShipment = ref<ShipmentTypeData[]>([])
|
|
||||||
const currentShipment = ref<ShipmentData | null>(null)
|
|
||||||
|
|
||||||
const selectedShipmentTypeId = ref('')
|
|
||||||
const shipmentQuantity = ref<number | null>(0)
|
|
||||||
const allowAnyLicensePlate = ref(false)
|
|
||||||
const submitted = ref(false)
|
|
||||||
|
|
||||||
const hasGrossWeightError = computed(() =>
|
|
||||||
submitted.value && (grossWeight.value.weight === null || grossWeight.value.weighedAt === null || grossWeight.value.dsd === null)
|
|
||||||
)
|
|
||||||
const hasTareWeightError = computed(() =>
|
|
||||||
submitted.value && (tareWeight.value.weight === null || tareWeight.value.weighedAt === null || tareWeight.value.dsd === null)
|
|
||||||
)
|
|
||||||
|
|
||||||
const activeTab = ref<'weightsEmpty' | 'weights'>('weights')
|
|
||||||
const grossWeight = ref<WeightEntryData>(createEmptyWeightEntry('gross'))
|
|
||||||
const tareWeight = ref<WeightEntryData>(createEmptyWeightEntry('tare'))
|
|
||||||
const formIsLoading = ref(false)
|
|
||||||
|
|
||||||
const isLoadingUsers = ref(false)
|
|
||||||
const isLoadingShipmentTypes = ref(false)
|
|
||||||
const isLoadingCustomers = ref(false)
|
|
||||||
const isLoadingTrucks = ref(false)
|
|
||||||
const isLoadingCarriers = ref(false)
|
|
||||||
const isLoadingVehicles = ref(false)
|
|
||||||
const isLoadingDrivers = ref(false)
|
|
||||||
const isHydrating = ref(false)
|
|
||||||
|
|
||||||
const form = reactive<ShipmentFormData & { identificationNumber: string | null }>({
|
|
||||||
identificationNumber: null,
|
|
||||||
userId: '',
|
|
||||||
shipmentDate: new Date().toISOString().slice(0, 10),
|
|
||||||
customerId: '',
|
|
||||||
addressId: '',
|
|
||||||
truckId: '',
|
|
||||||
carrierId: '',
|
|
||||||
driverId: '',
|
|
||||||
vehicleId: '',
|
|
||||||
licensePlate: ''
|
|
||||||
})
|
|
||||||
|
|
||||||
const shipmentId = computed(() => {
|
|
||||||
const id = Number(route.params.id)
|
|
||||||
return Number.isFinite(id) ? id : null
|
|
||||||
})
|
|
||||||
|
|
||||||
const selectedCarrier = computed(() =>
|
|
||||||
carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
|
|
||||||
)
|
|
||||||
const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)
|
|
||||||
const isAddressData = (value: unknown): value is AddressData =>
|
|
||||||
typeof value === 'object' &&
|
|
||||||
value !== null &&
|
|
||||||
'id' in value &&
|
|
||||||
'fullAddress' in value
|
|
||||||
|
|
||||||
const customerAddresses = computed<AddressData[]>(() => {
|
|
||||||
if (!form.customerId) return []
|
|
||||||
const customerId = Number(form.customerId)
|
|
||||||
if (!Number.isFinite(customerId) || customerId <= 0) return []
|
|
||||||
|
|
||||||
const addresses = customers.value.find((c) => c.id === customerId)?.addresses ?? []
|
|
||||||
return addresses.filter(isAddressData)
|
|
||||||
})
|
|
||||||
|
|
||||||
const customerAddressOptions = computed(() =>
|
|
||||||
customerAddresses.value.map((address) => ({
|
|
||||||
value: String(address.id),
|
|
||||||
label: address.fullAddress
|
|
||||||
}))
|
|
||||||
)
|
|
||||||
|
|
||||||
const filteredDrivers = computed<DriverData[]>(() => {
|
|
||||||
if (!form.carrierId) {
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
return drivers.value.filter((driver) => String(driver.carrier?.id) === form.carrierId)
|
|
||||||
})
|
|
||||||
|
|
||||||
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)
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
const loadUsers = async () => {
|
|
||||||
isLoadingUsers.value = true
|
|
||||||
try {
|
|
||||||
users.value = await getUsers()
|
|
||||||
} finally {
|
|
||||||
isLoadingUsers.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const loadShipmentType = async () => {
|
|
||||||
isLoadingShipmentTypes.value = true
|
|
||||||
try {
|
|
||||||
bovineShipment.value = await getShipmentTypeList()
|
|
||||||
} finally {
|
|
||||||
isLoadingShipmentTypes.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const loadCustomers = async () => {
|
|
||||||
isLoadingCustomers.value = true
|
|
||||||
try {
|
|
||||||
customers.value = await getCustomerList()
|
|
||||||
} finally {
|
|
||||||
isLoadingCustomers.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const loadTrucks = async () => {
|
|
||||||
isLoadingTrucks.value = true
|
|
||||||
try {
|
|
||||||
trucks.value = await getTruckList()
|
|
||||||
} finally {
|
|
||||||
isLoadingTrucks.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const loadCarriers = async () => {
|
|
||||||
isLoadingCarriers.value = true
|
|
||||||
try {
|
|
||||||
carriers.value = await getCarrierList()
|
|
||||||
} finally {
|
|
||||||
isLoadingCarriers.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const loadVehicles = async () => {
|
|
||||||
isLoadingVehicles.value = true
|
|
||||||
try {
|
|
||||||
vehicles.value = await getVehicleList()
|
|
||||||
} finally {
|
|
||||||
isLoadingVehicles.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const loadDrivers = async () => {
|
|
||||||
isLoadingDrivers.value = true
|
|
||||||
try {
|
|
||||||
drivers.value = await getDriverList()
|
|
||||||
} finally {
|
|
||||||
isLoadingDrivers.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function setDefaultUser() {
|
|
||||||
if (form.userId) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (authStore.user?.id) {
|
|
||||||
form.userId = String(authStore.user.id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function hydrateFromShipment(shipment: ShipmentData | null) {
|
|
||||||
if (!shipment) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
isHydrating.value = true
|
|
||||||
form.identificationNumber = shipment.identificationNumber ?? null
|
|
||||||
form.licensePlate = shipment.licensePlate ?? ''
|
|
||||||
form.shipmentDate = shipment.shipmentDate?.slice(0, 10) ?? new Date().toISOString().slice(0, 10)
|
|
||||||
form.userId = shipment.user?.id ? String(shipment.user.id) : form.userId
|
|
||||||
form.customerId = shipment.customer?.id ? String(shipment.customer.id) : ''
|
|
||||||
form.addressId = shipment.address?.id ? String(shipment.address.id) : ''
|
|
||||||
form.truckId = shipment.truck?.id ? String(shipment.truck.id) : ''
|
|
||||||
form.carrierId = shipment.carrier?.id ? String(shipment.carrier.id) : ''
|
|
||||||
form.driverId = shipment.driver?.id ? String(shipment.driver.id) : ''
|
|
||||||
form.vehicleId = shipment.vehicle?.id ? String(shipment.vehicle.id) : ''
|
|
||||||
selectedShipmentTypeId.value = shipment.shipmentType?.id ? String(shipment.shipmentType.id) : ''
|
|
||||||
shipmentQuantity.value = shipment.nbBovinSend ?? 0
|
|
||||||
const gross = shipment.weights?.find((weight) => weight.type === 'gross') ?? null
|
|
||||||
const tare = shipment.weights?.find((weight) => weight.type === 'tare') ?? null
|
|
||||||
grossWeight.value = gross ? { ...gross } : createEmptyWeightEntry('gross')
|
|
||||||
tareWeight.value = tare ? { ...tare } : createEmptyWeightEntry('tare')
|
|
||||||
isHydrating.value = false
|
|
||||||
}
|
|
||||||
|
|
||||||
async function printReceipt() {
|
|
||||||
if (!import.meta.client || shipmentId.value === null || shipmentId.value <= 0) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const customerName =
|
|
||||||
customers.value.find((customer) => String(customer.id) === form.customerId)?.name ??
|
|
||||||
'client'
|
|
||||||
const filename = `${form.identificationNumber || shipmentId.value}_${customerName}_${form.licensePlate || 'immat'}.pdf`
|
|
||||||
await printPdf(`/shipments/${shipmentId.value}/receipt`, filename)
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, 600))
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadShipmentForUpdate() {
|
|
||||||
if (shipmentId.value === null) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const shipment = await getShipment(shipmentId.value)
|
|
||||||
currentShipment.value = shipment
|
|
||||||
hydrateFromShipment(shipment)
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => [form.customerId, form.addressId, customers.value],
|
|
||||||
() => {
|
|
||||||
if (!form.customerId) {
|
|
||||||
form.addressId = ''
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (!form.addressId && customerAddresses.value.length === 1) {
|
|
||||||
form.addressId = String(customerAddresses.value[0].id)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (!form.addressId) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const matches = customerAddresses.value.some(
|
|
||||||
(address) => String(address.id) === form.addressId
|
|
||||||
)
|
|
||||||
if (!matches) {
|
|
||||||
if (customerAddresses.value.length === 1) {
|
|
||||||
form.addressId = String(customerAddresses.value[0].id)
|
|
||||||
} else {
|
|
||||||
form.addressId = ''
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{ immediate: true }
|
|
||||||
)
|
|
||||||
|
|
||||||
function applyLiotDefaults() {
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => form.carrierId,
|
|
||||||
() => {
|
|
||||||
applyLiotDefaults()
|
|
||||||
},
|
|
||||||
{ immediate: true }
|
|
||||||
)
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => isHydrating.value,
|
|
||||||
(value) => {
|
|
||||||
if (!value) {
|
|
||||||
applyLiotDefaults()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
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 }
|
|
||||||
)
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => [form.vehicleId, form.carrierId, vehicles.value],
|
|
||||||
() => {
|
|
||||||
if (!isLiotCarrier.value || 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, form.vehicleId, 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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
function buildPayload() {
|
|
||||||
const normalizedLicensePlate = form.licensePlate.trim()
|
|
||||||
const normalizedShipmentDate = form.shipmentDate.trim()
|
|
||||||
const normalizedCustomerId = form.customerId.trim()
|
|
||||||
const normalizedTruckId = form.truckId.trim()
|
|
||||||
const normalizedCarrierId = form.carrierId.trim()
|
|
||||||
const normalizedDriverId = form.driverId.trim()
|
|
||||||
const normalizedUserId = form.userId.trim()
|
|
||||||
const normalizedAddressId = form.addressId.trim()
|
|
||||||
const normalizedShipmentTypeId = selectedShipmentTypeId.value.trim()
|
|
||||||
|
|
||||||
const customerIri = normalizedCustomerId ? `/api/customers/${normalizedCustomerId}` : null
|
|
||||||
const truckIri = normalizedTruckId ? `/api/trucks/${normalizedTruckId}` : null
|
|
||||||
const carrierIri = normalizedCarrierId ? `/api/carriers/${normalizedCarrierId}` : null
|
|
||||||
const userIri = normalizedUserId ? `/api/users/${normalizedUserId}` : null
|
|
||||||
const driverIri = normalizedDriverId ? `/api/drivers/${normalizedDriverId}` : null
|
|
||||||
const addressIri = normalizedAddressId ? `/api/addresses/${normalizedAddressId}` : null
|
|
||||||
const shipmentTypeIri = normalizedShipmentTypeId
|
|
||||||
? `/api/shipment_types/${normalizedShipmentTypeId}`
|
|
||||||
: null
|
|
||||||
|
|
||||||
const rawQuantity = Number(shipmentQuantity.value ?? 0)
|
|
||||||
const normalizedQuantity = Number.isFinite(rawQuantity)
|
|
||||||
? Math.max(0, Math.trunc(rawQuantity))
|
|
||||||
: 0
|
|
||||||
|
|
||||||
return {
|
|
||||||
licensePlate: normalizedLicensePlate,
|
|
||||||
shipmentDate: normalizedShipmentDate,
|
|
||||||
customer: customerIri,
|
|
||||||
truck: truckIri,
|
|
||||||
carrier: carrierIri,
|
|
||||||
driver: driverIri,
|
|
||||||
user: userIri,
|
|
||||||
address: addressIri,
|
|
||||||
shipmentType: shipmentTypeIri,
|
|
||||||
nbBovinSend: normalizedQuantity
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function createEmptyWeightEntry(type: 'gross' | 'tare'): WeightEntryData {
|
|
||||||
return {
|
|
||||||
type,
|
|
||||||
dsd: null,
|
|
||||||
weight: null,
|
|
||||||
weighedAt: null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function saveWeightEntry(entry: WeightEntryData) {
|
|
||||||
if (!shipmentId.value || entry.weight === null) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const payload = {
|
|
||||||
type: entry.type,
|
|
||||||
dsd: entry.dsd ?? null,
|
|
||||||
weight: entry.weight,
|
|
||||||
weighedAt: entry.weighedAt ?? null
|
|
||||||
}
|
|
||||||
|
|
||||||
if (entry.id) {
|
|
||||||
await updateWeight(entry.id, payload)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
await createWeight({
|
|
||||||
shipment: `api/shipments/${shipmentId.value}`,
|
|
||||||
...payload
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
async function validate() {
|
|
||||||
if (shipmentId.value === null) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const hasInvalidWeights =
|
|
||||||
grossWeight.value.weight === null || grossWeight.value.weighedAt === null || grossWeight.value.dsd === null ||
|
|
||||||
tareWeight.value.weight === null || tareWeight.value.weighedAt === null || tareWeight.value.dsd === null
|
|
||||||
|
|
||||||
if (hasInvalidWeights) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
await updateShipment(shipmentId.value, {
|
|
||||||
currentStep: currentShipment.value?.currentStep ?? 0,
|
|
||||||
...buildPayload()
|
|
||||||
})
|
|
||||||
await saveWeightEntry(grossWeight.value)
|
|
||||||
await saveWeightEntry(tareWeight.value)
|
|
||||||
|
|
||||||
await loadShipmentForUpdate()
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
await loadShipmentType()
|
|
||||||
await loadUsers()
|
|
||||||
await loadCustomers()
|
|
||||||
await loadTrucks()
|
|
||||||
await loadCarriers()
|
|
||||||
await loadVehicles()
|
|
||||||
await loadDrivers()
|
|
||||||
await authStore.ensureSession()
|
|
||||||
formIsLoading.value = true
|
|
||||||
setDefaultUser()
|
|
||||||
await loadShipmentForUpdate()
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
<template>
|
|
||||||
<WorkflowWaitingList
|
|
||||||
title="listes des expéditions en attente"
|
|
||||||
:columns="columns"
|
|
||||||
:items="shipmentList ?? []"
|
|
||||||
route-prefix="/shipment"
|
|
||||||
:show-actions="auth.isAdmin"
|
|
||||||
>
|
|
||||||
<template #cell-shipmentDate="{ item }">
|
|
||||||
{{ formatDate(item.shipmentDate) }}
|
|
||||||
</template>
|
|
||||||
<template #cell-shipmentType="{ item }">
|
|
||||||
<template v-if="formatShipmentLines(item).length">
|
|
||||||
<div
|
|
||||||
v-for="(line, index) in formatShipmentLines(item)"
|
|
||||||
:key="index"
|
|
||||||
class="leading-5"
|
|
||||||
>
|
|
||||||
{{ line }}
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<template v-else>—</template>
|
|
||||||
</template>
|
|
||||||
<template #actions="{ item }">
|
|
||||||
<Icon
|
|
||||||
name="mdi:delete-outline"
|
|
||||||
size="24"
|
|
||||||
class="cursor-pointer text-red-500 hover:text-red-700"
|
|
||||||
@click="confirmDelete(item)"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
</WorkflowWaitingList>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import type { ShipmentData } from '~/services/dto/shipment-data'
|
|
||||||
import { getShipmentList, deleteShipment } from '~/services/shipment'
|
|
||||||
import { useAuthStore } from '~/stores/auth'
|
|
||||||
|
|
||||||
const auth = useAuthStore()
|
|
||||||
|
|
||||||
const columns = [
|
|
||||||
{ key: 'shipmentDate', label: 'Date et heure' },
|
|
||||||
{ key: 'customer.name', label: 'Client' },
|
|
||||||
{ key: 'address.fullAddress', label: 'Adresse' },
|
|
||||||
{ key: 'shipmentType', label: "Type d'expé." },
|
|
||||||
{ key: 'carrier.name', label: 'Transporteur' },
|
|
||||||
{ key: 'licensePlate', label: 'Immatriculation' }
|
|
||||||
]
|
|
||||||
|
|
||||||
const shipmentList = ref<ShipmentData[]>()
|
|
||||||
|
|
||||||
const formatDate = (date: string | null) => {
|
|
||||||
if (!date) return '—'
|
|
||||||
const d = new Date(date.replace(' ', 'T'))
|
|
||||||
if (isNaN(d.getTime())) return date
|
|
||||||
return d.toLocaleDateString('fr-FR', {
|
|
||||||
day: '2-digit',
|
|
||||||
month: '2-digit',
|
|
||||||
year: 'numeric',
|
|
||||||
hour: '2-digit',
|
|
||||||
minute: '2-digit'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
const formatShipmentLines = (shipment: ShipmentData) => {
|
|
||||||
if (!shipment.shipmentType && shipment.nbBovinSend == null) {
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
const label = typeof shipment.shipmentType === 'string'
|
|
||||||
? shipment.shipmentType
|
|
||||||
: shipment.shipmentType?.label
|
|
||||||
return [`${label ?? '—'} : ${shipment.nbBovinSend ?? '—'}`]
|
|
||||||
}
|
|
||||||
|
|
||||||
const confirmDelete = async (shipment: ShipmentData) => {
|
|
||||||
const confirmed = window.confirm(
|
|
||||||
`Êtes-vous sûr de vouloir supprimer l'expédition ${shipment.identificationNumber ?? `#${shipment.id}`} ? Toutes les données liées seront supprimées.`
|
|
||||||
)
|
|
||||||
if (!confirmed) return
|
|
||||||
|
|
||||||
await deleteShipment(shipment.id)
|
|
||||||
shipmentList.value = shipmentList.value?.filter(s => s.id !== shipment.id)
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(async () => {
|
|
||||||
shipmentList.value = await getShipmentList(false)
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
import { useApi } from '~/composables/useApi'
|
|
||||||
|
|
||||||
export interface AddressPayload {
|
|
||||||
street: string
|
|
||||||
street2?: string | null
|
|
||||||
postalCode: string
|
|
||||||
city: string
|
|
||||||
countryCode: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AddressData extends AddressPayload {
|
|
||||||
id: number
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function createAddress(
|
|
||||||
payload: AddressPayload
|
|
||||||
): Promise<AddressData> {
|
|
||||||
const api = useApi()
|
|
||||||
|
|
||||||
return await api.post<AddressData>('addresses', payload, {
|
|
||||||
toastErrorKey: 'errors.address.create',
|
|
||||||
toastSuccessKey: 'success.address.create',
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function updateAddress(
|
|
||||||
id: number,
|
|
||||||
payload: AddressPayload
|
|
||||||
): Promise<AddressData> {
|
|
||||||
const api = useApi()
|
|
||||||
|
|
||||||
return await api.patch<AddressData>(`addresses/${id}`, payload, {
|
|
||||||
toastErrorKey: 'errors.address.update',
|
|
||||||
toastSuccessKey: 'success.address.update',
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function getAddress(id: number): Promise<AddressData> {
|
|
||||||
const api = useApi()
|
|
||||||
|
|
||||||
return await api.get<AddressData>(`addresses/${id}`, {}, {
|
|
||||||
toastErrorKey: 'errors.address.fetch',
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
import { useApi } from '~/composables/useApi'
|
import { useApi } from '~/composables/useApi'
|
||||||
import type { UserData } from '~/services/dto/user-data'
|
import type { UserData } from '~/services/dto/user-data'
|
||||||
import type {UserPayload} from "~/services/dto/user-data";
|
|
||||||
|
|
||||||
export async function getUsers() {
|
export async function getUsers() {
|
||||||
const api = useApi()
|
const api = useApi()
|
||||||
@@ -13,40 +12,7 @@ export async function getUsers() {
|
|||||||
|
|
||||||
return data['hydra:member'] ?? []
|
return data['hydra:member'] ?? []
|
||||||
}
|
}
|
||||||
export async function getAdminUsers() {
|
|
||||||
const api = useApi()
|
|
||||||
const data = await api.get<UserData[] | { 'hydra:member': UserData[] }>('admin/users', {}, {
|
|
||||||
toastErrorKey: 'errors.auth.users'
|
|
||||||
})
|
|
||||||
if (Array.isArray(data)) {
|
|
||||||
return data
|
|
||||||
}
|
|
||||||
|
|
||||||
return data['hydra:member'] ?? []
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function getUser(id: number) {
|
|
||||||
const api = useApi()
|
|
||||||
return api.get<UserData>(`users/${id}`, {}, {
|
|
||||||
toastErrorKey: 'errors.auth.user'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function createUser(payload: UserPayload = {}) {
|
|
||||||
const api = useApi()
|
|
||||||
return api.post<UserData>('users', payload, {
|
|
||||||
toastErrorKey: 'errors.auth.create',
|
|
||||||
toastSuccessKey : 'success.auth.create'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function updateUser(id : number, playload: UserPayload = {}){
|
|
||||||
const api = useApi()
|
|
||||||
return api.patch<UserData>(`users/${id}`, playload, {
|
|
||||||
toastErrorKey: 'errors.auth.update',
|
|
||||||
toastSuccessKey: 'success.auth.update'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
export async function getCurrentUser() {
|
export async function getCurrentUser() {
|
||||||
const api = useApi()
|
const api = useApi()
|
||||||
return api.get<UserData>('me', {}, {
|
return api.get<UserData>('me', {}, {
|
||||||
@@ -66,6 +32,7 @@ export async function logout() {
|
|||||||
const api = useApi()
|
const api = useApi()
|
||||||
return api.post<void>('logout', {}, {
|
return api.post<void>('logout', {}, {
|
||||||
toastErrorKey: 'errors.auth.logout',
|
toastErrorKey: 'errors.auth.logout',
|
||||||
toastSuccessKey: 'success.auth.logout'
|
toastSuccessKey: 'success.auth.logout',
|
||||||
|
redirect: 'manual'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useApi } from '~/composables/useApi'
|
import { useApi } from '~/composables/useApi'
|
||||||
import type { BovineTypeData, BovinPayload } from "~/services/dto/bovine-type-data";
|
import type {BovineTypeData} from "~/services/dto/bovine-type-data";
|
||||||
|
|
||||||
export type BovineTypeListResponse =
|
export type BovineTypeListResponse =
|
||||||
| BovineTypeData[]
|
| BovineTypeData[]
|
||||||
@@ -12,49 +12,12 @@ export async function getBovineTypeList(): Promise<BovineTypeData[]> {
|
|||||||
})
|
})
|
||||||
|
|
||||||
if (Array.isArray(response)) {
|
if (Array.isArray(response)) {
|
||||||
return response.map(mapToBovineTypeData)
|
return response
|
||||||
}
|
}
|
||||||
|
|
||||||
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
return response['hydra:member'].map(mapToBovineTypeData)
|
return response['hydra:member']
|
||||||
}
|
}
|
||||||
|
|
||||||
return []
|
return []
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getBovin(id: number): Promise<BovineTypeData> {
|
|
||||||
const api = useApi()
|
|
||||||
const response = await api.get<BovineTypeData>(`bovine_types/${id}`, {}, {
|
|
||||||
toastErrorKey: 'errors.bovin.fetch'
|
|
||||||
})
|
|
||||||
return mapToBovineTypeData(response)
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function createBovin(payload: BovinPayload = {}): Promise<BovineTypeData> {
|
|
||||||
const api = useApi()
|
|
||||||
const response = await api.post<BovineTypeData>('bovine_types', toBovineTypePayload(payload), {
|
|
||||||
toastErrorKey: 'errors.bovin.create',
|
|
||||||
toastSuccessKey: 'success.bovin.create'
|
|
||||||
})
|
|
||||||
return mapToBovineTypeData(response)
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function updateBovin(id: number, payload: BovinPayload = {}): Promise<BovineTypeData> {
|
|
||||||
const api = useApi()
|
|
||||||
const response = await api.patch<BovineTypeData>(`bovine_types/${id}`, toBovineTypePayload(payload), {
|
|
||||||
toastErrorKey: 'errors.bovin.update',
|
|
||||||
toastSuccessKey: 'success.bovin.update'
|
|
||||||
})
|
|
||||||
return mapToBovineTypeData(response)
|
|
||||||
}
|
|
||||||
|
|
||||||
const mapToBovineTypeData = (item: BovineTypeData): BovineTypeData => ({
|
|
||||||
id: item.id,
|
|
||||||
label: item.label,
|
|
||||||
code: item.code
|
|
||||||
})
|
|
||||||
|
|
||||||
const toBovineTypePayload = (payload: BovinPayload): Partial<BovineTypeData> => ({
|
|
||||||
label: payload.label ?? undefined,
|
|
||||||
code: payload.code ?? undefined
|
|
||||||
})
|
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
import { useApi } from '~/composables/useApi'
|
|
||||||
import type { BovineData, BovinePayload } from '~/services/dto/bovine-data'
|
|
||||||
|
|
||||||
export async function createBovine(payload: BovinePayload) {
|
|
||||||
const api = useApi()
|
|
||||||
return api.post<BovineData>('bovines', payload, {
|
|
||||||
headers: { 'Content-Type': 'application/ld+json' },
|
|
||||||
toastErrorKey: 'errors.bovine.create',
|
|
||||||
toastSuccessKey: 'success.bovine.create'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function createBovines(nationalNumbers: string[]): Promise<{ created: BovineData[]; errors: string[] }> {
|
|
||||||
const created: BovineData[] = []
|
|
||||||
const errors: string[] = []
|
|
||||||
|
|
||||||
for (const nationalNumber of nationalNumbers) {
|
|
||||||
try {
|
|
||||||
const bovine = await createBovine({ nationalNumber })
|
|
||||||
if (bovine) {
|
|
||||||
created.push(bovine)
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
errors.push(nationalNumber)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return { created, errors }
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useApi } from '~/composables/useApi'
|
import { useApi } from '~/composables/useApi'
|
||||||
import type {CarrierData, CarrierPayload} from "~/services/dto/carrier-data";
|
import type { CarrierData } from '~/services/dto/carrier-data'
|
||||||
|
|
||||||
export type CarrierListResponse =
|
export type CarrierListResponse =
|
||||||
| CarrierData[]
|
| CarrierData[]
|
||||||
@@ -21,26 +21,3 @@ export async function getCarrierList(): Promise<CarrierData[]> {
|
|||||||
|
|
||||||
return []
|
return []
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getCarrier(id: number) {
|
|
||||||
const api = useApi()
|
|
||||||
return api.get<CarrierData>(`carriers/${id}`, {}, {
|
|
||||||
toastErrorKey: 'errors.carrier.fetch'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function updateCarrier(id: number, payload: CarrierPayload) {
|
|
||||||
const api = useApi()
|
|
||||||
return api.patch<CarrierData>(`carriers/${id}`, payload, {
|
|
||||||
toastErrorKey: 'errors.carrier.update',
|
|
||||||
toastSuccessKey: 'success.carrier.update'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function createCarrier(payload: CarrierPayload = {}) {
|
|
||||||
const api = useApi()
|
|
||||||
return api.post<CarrierData>('carriers', payload, {
|
|
||||||
toastErrorKey: 'errors.carrier.create',
|
|
||||||
toastSuccessKey: 'success.carrier.update'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
import { useApi } from "~/composables/useApi"
|
|
||||||
import type { CustomerData, CustomerPayload } from "~/services/dto/customer-data"
|
|
||||||
|
|
||||||
export type CustomerListResponse =
|
|
||||||
| CustomerData[]
|
|
||||||
| { "hydra:member"?: CustomerData[] }
|
|
||||||
|
|
||||||
export async function getCustomerList(): Promise<CustomerData[]> {
|
|
||||||
const api = useApi()
|
|
||||||
const response = await api.get<CustomerListResponse>("customers", {}, {
|
|
||||||
toastErrorKey: "errors.customer.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 getCustomer(id: number): Promise<CustomerData> {
|
|
||||||
const api = useApi()
|
|
||||||
return api.get<CustomerData>(`customers/${id}`, {}, {
|
|
||||||
toastErrorKey: "errors.customer.fetch",
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function updateCustomer(id: number, payload: Partial<CustomerPayload>): Promise<CustomerData> {
|
|
||||||
const api = useApi()
|
|
||||||
return api.patch<CustomerData>(`customers/${id}`, payload, {
|
|
||||||
toastErrorKey: "errors.customer.update",
|
|
||||||
toastSuccessKey: "success.customer.update",
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function createCustomer(payload: CustomerPayload): Promise<CustomerData> {
|
|
||||||
const api = useApi()
|
|
||||||
return api.post<CustomerData>("customers", payload, {
|
|
||||||
toastErrorKey: "errors.customer.create",
|
|
||||||
toastSuccessKey: "success.customer.create",
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,20 +1,10 @@
|
|||||||
export interface AddressData {
|
export interface AddressData {
|
||||||
id: number
|
id: number
|
||||||
label?: string | null
|
label: string
|
||||||
street: string
|
|
||||||
street2?: string | null
|
|
||||||
postalCode: string
|
|
||||||
city: string
|
|
||||||
countryCode: string
|
|
||||||
fullAddress: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface AddressFormData {
|
|
||||||
id?: number | null
|
|
||||||
label?: string | null
|
|
||||||
street: string
|
street: string
|
||||||
street2?: string | null
|
street2?: string | null
|
||||||
postalCode: string
|
postalCode: string
|
||||||
city: string
|
city: string
|
||||||
countryCode: string
|
countryCode: string
|
||||||
|
fullAddress?: string
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
export interface BovineData {
|
|
||||||
id: number
|
|
||||||
nationalNumber: string
|
|
||||||
receivedWeight: number | null
|
|
||||||
arrivalDate: string | null
|
|
||||||
buildingCase: string | null
|
|
||||||
}
|
|
||||||
|
|
||||||
export type BovinePayload = {
|
|
||||||
nationalNumber?: string
|
|
||||||
receivedWeight?: number | null
|
|
||||||
arrivalDate?: string | null
|
|
||||||
buildingCase?: string | null
|
|
||||||
}
|
|
||||||
@@ -3,13 +3,3 @@ export interface BovineTypeData{
|
|||||||
label: string
|
label: string
|
||||||
code: string
|
code: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface BovinFormData {
|
|
||||||
label: string
|
|
||||||
code: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export type BovinPayload = {
|
|
||||||
label?: string | null
|
|
||||||
code?: string | null
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
import type { BuildingCaseStatusData } from '~/services/dto/building-case-status-data'
|
|
||||||
|
|
||||||
export interface BuildingCaseData {
|
|
||||||
id: number
|
|
||||||
caseNumber: number | null
|
|
||||||
code: string | null
|
|
||||||
capacity: number | null
|
|
||||||
statut?: BuildingCaseStatusData | null
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
import type { BuildingCaseData } from '~/services/dto/building-case-data'
|
|
||||||
|
|
||||||
export interface BuildingCasePositionData {
|
|
||||||
id: number
|
|
||||||
x: number | null
|
|
||||||
y: number | null
|
|
||||||
w: number | null
|
|
||||||
h: number | null
|
|
||||||
renderOrder: string | null
|
|
||||||
buildingCase: BuildingCaseData | null
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
export interface BuildingCaseStatusData {
|
|
||||||
id: number
|
|
||||||
label: string | null
|
|
||||||
code: string | null
|
|
||||||
couleur: string | null
|
|
||||||
}
|
|
||||||
@@ -1,10 +1,5 @@
|
|||||||
import type { BuildingLayoutData } from '~/services/dto/building-layout-data'
|
|
||||||
import type { BuildingCaseData } from '~/services/dto/building-case-data'
|
|
||||||
|
|
||||||
export interface BuildingData {
|
export interface BuildingData {
|
||||||
id: number
|
id: number
|
||||||
label: string
|
label: string
|
||||||
code: string
|
code: string
|
||||||
layouts?: BuildingLayoutData[] | null
|
|
||||||
buildingCases?: BuildingCaseData[] | null
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
import type { BuildingCasePositionData } from '~/services/dto/building-case-position-data'
|
|
||||||
|
|
||||||
export interface BuildingLayoutData {
|
|
||||||
id: number
|
|
||||||
name: string | null
|
|
||||||
columns: number | null
|
|
||||||
rows: number | null
|
|
||||||
casePositions?: BuildingCasePositionData[] | null
|
|
||||||
}
|
|
||||||
@@ -3,13 +3,3 @@ export interface CarrierData {
|
|||||||
name: string
|
name: string
|
||||||
code: string
|
code: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface CarrierFormData {
|
|
||||||
name: string
|
|
||||||
code: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export type CarrierPayload = {
|
|
||||||
name?: string | null
|
|
||||||
code?: string
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,27 +0,0 @@
|
|||||||
import type { AddressFormData } from "~/services/dto/address-data"
|
|
||||||
import type { UserData } from "~/services/dto/user-data"
|
|
||||||
|
|
||||||
export type CustomerAddresses = AddressFormData[] | string[]
|
|
||||||
|
|
||||||
export interface CustomerData {
|
|
||||||
id: number
|
|
||||||
name: string
|
|
||||||
phone?: string | null
|
|
||||||
email?: string | null
|
|
||||||
createdBy?: UserData | null
|
|
||||||
addresses: CustomerAddresses
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface CustomerFormData {
|
|
||||||
name: string
|
|
||||||
phone?: string
|
|
||||||
email?: string
|
|
||||||
addresses: AddressFormData[]
|
|
||||||
}
|
|
||||||
|
|
||||||
export type CustomerPayload = {
|
|
||||||
name: string
|
|
||||||
phone?: string | null
|
|
||||||
email?: string | null
|
|
||||||
addresses?: string[]
|
|
||||||
}
|
|
||||||
@@ -41,23 +41,6 @@ export interface WeightEntryData {
|
|||||||
weighedAt: string | null
|
weighedAt: string | null
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface MerchandiseEntryData {
|
|
||||||
merchandiseTypeId: string
|
|
||||||
merchandiseDetail: string
|
|
||||||
selectedBuildingIds: string[]
|
|
||||||
selectedPelletBuildingIds: Record<string, string[]>
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface WeightFormData {
|
|
||||||
id: number
|
|
||||||
weight: number
|
|
||||||
weighedAt : string
|
|
||||||
dsd: number
|
|
||||||
type: 'gross' | 'tare'
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export type ReceptionPayload = {
|
export type ReceptionPayload = {
|
||||||
licensePlate?: string | null
|
licensePlate?: string | null
|
||||||
receptionDate?: string
|
receptionDate?: string
|
||||||
@@ -76,29 +59,3 @@ export type ReceptionPayload = {
|
|||||||
carrier?: string | null
|
carrier?: string | null
|
||||||
driver?: string | null
|
driver?: string | null
|
||||||
}
|
}
|
||||||
|
|
||||||
export type ReceptionFormData = {
|
|
||||||
identificationNumber?: null|string,
|
|
||||||
licensePlate: string
|
|
||||||
receptionDate: string
|
|
||||||
receptionTypeId: string
|
|
||||||
userId: string
|
|
||||||
supplierId: string
|
|
||||||
addressId: string
|
|
||||||
truckId: string
|
|
||||||
carrierId: string
|
|
||||||
driverId: string
|
|
||||||
vehicleId: string
|
|
||||||
weight?: ReceptionFormWeight | null
|
|
||||||
}
|
|
||||||
|
|
||||||
export type ReceptionFormWeight = {
|
|
||||||
weights: WeightFormData[]
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface ReceptionUpdatePayload {
|
|
||||||
weights: {
|
|
||||||
id: number
|
|
||||||
weight: number
|
|
||||||
}[]
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,68 +0,0 @@
|
|||||||
import type {CarrierData} from '~/services/dto/carrier-data'
|
|
||||||
import type {TruckData} from '~/services/dto/truck-data'
|
|
||||||
import type {CustomerData} from '~/services/dto/customer-data'
|
|
||||||
import type {AddressData} from "~/services/dto/address-data";
|
|
||||||
import type {UserData} from '~/services/dto/user-data'
|
|
||||||
import type {DriverData} from '~/services/dto/driver-data'
|
|
||||||
import type {VehicleData} from '~/services/dto/vehicle-data'
|
|
||||||
|
|
||||||
export interface ShipmentTypeData {
|
|
||||||
id: number
|
|
||||||
label: string
|
|
||||||
code: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export type ShipmentData = {
|
|
||||||
id: number
|
|
||||||
identificationNumber?: string | null
|
|
||||||
licensePlate: string | null
|
|
||||||
shipmentDate: string
|
|
||||||
currentStep: number
|
|
||||||
isValid: boolean
|
|
||||||
address?: AddressData | null
|
|
||||||
carrier?: CarrierData | null
|
|
||||||
truck?: TruckData | null
|
|
||||||
customer?: CustomerData | null
|
|
||||||
user?: UserData | null
|
|
||||||
driver?: DriverData | null
|
|
||||||
vehicle?: VehicleData | null
|
|
||||||
shipmentType?: ShipmentTypeData | null
|
|
||||||
nbBovinSend?: number | null
|
|
||||||
weights?: WeightShipmentEntryData[] | null
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface WeightShipmentEntryData {
|
|
||||||
id?: number
|
|
||||||
type: 'gross' | 'tare'
|
|
||||||
dsd: number | null
|
|
||||||
weight: number | null
|
|
||||||
weighedAt: string | null
|
|
||||||
}
|
|
||||||
|
|
||||||
export type ShipmentFormData = {
|
|
||||||
userId: string,
|
|
||||||
shipmentDate: string,
|
|
||||||
customerId: string,
|
|
||||||
addressId: string,
|
|
||||||
truckId: string,
|
|
||||||
carrierId: string,
|
|
||||||
driverId: string,
|
|
||||||
vehicleId: string,
|
|
||||||
licensePlate: string,
|
|
||||||
}
|
|
||||||
|
|
||||||
export type ShipmentPayload = {
|
|
||||||
licensePlate?: string | null
|
|
||||||
shipmentDate?: string
|
|
||||||
currentStep?: number
|
|
||||||
isValid?: boolean
|
|
||||||
carrier?: string | null
|
|
||||||
truck?: string | null
|
|
||||||
customer?: string | null
|
|
||||||
address?: string | null
|
|
||||||
user?: string | null
|
|
||||||
driver?: string | null
|
|
||||||
shipmentType?: string | null
|
|
||||||
nbBovinSend?: number | null
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
export interface ShipmentTypeData {
|
|
||||||
id: number
|
|
||||||
label: string
|
|
||||||
code: string
|
|
||||||
}
|
|
||||||
@@ -1,27 +1,9 @@
|
|||||||
import type { AddressFormData } from "~/services/dto/address-data"
|
import type { AddressData } from '~/services/dto/address-data'
|
||||||
import type { UserData } from "~/services/dto/user-data"
|
|
||||||
|
|
||||||
export type SupplierAddresses = AddressFormData[] | string[]
|
|
||||||
|
|
||||||
export interface SupplierData {
|
export interface SupplierData {
|
||||||
id: number
|
id: number
|
||||||
name: string
|
name: string
|
||||||
email?: string | null
|
email?: string | null
|
||||||
phone?: string | null
|
phone?: string | null
|
||||||
createdBy?: UserData | null
|
addresses?: AddressData[] | null
|
||||||
addresses: SupplierAddresses
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface SupplierFormData {
|
|
||||||
name: string
|
|
||||||
email?: string
|
|
||||||
phone?: string
|
|
||||||
addresses: AddressFormData[]
|
|
||||||
}
|
|
||||||
|
|
||||||
export type SupplierPayload = {
|
|
||||||
name: string
|
|
||||||
email?: string | null
|
|
||||||
phone?: string | null
|
|
||||||
addresses?: string[]
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +1,5 @@
|
|||||||
export interface UserData {
|
export interface UserData {
|
||||||
id: number
|
id: number
|
||||||
username: string
|
username: string
|
||||||
roles: string[]
|
|
||||||
isLocked: boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
export type UserPayload = {
|
|
||||||
username?: string
|
|
||||||
password?: string
|
|
||||||
roles?: string[]
|
roles?: string[]
|
||||||
isLocked?: boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
export type UserFormData = {
|
|
||||||
username: string
|
|
||||||
password: string
|
|
||||||
role: string
|
|
||||||
isLocked: boolean
|
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user