Compare commits
5 Commits
v0.0.69
...
feat/test-
| Author | SHA1 | Date | |
|---|---|---|---|
| 92354d9060 | |||
| 33563addbe | |||
| 81c2a5802b | |||
| 015a8c49fb | |||
| 505f67d475 |
2
.idea/dataSources.xml
generated
2
.idea/dataSources.xml
generated
@@ -5,7 +5,7 @@
|
|||||||
<driver-ref>postgresql</driver-ref>
|
<driver-ref>postgresql</driver-ref>
|
||||||
<synchronize>true</synchronize>
|
<synchronize>true</synchronize>
|
||||||
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
|
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
|
||||||
<jdbc-url>jdbc:postgresql://localhost:5433/ferme</jdbc-url>
|
<jdbc-url>jdbc:postgresql://localhost:5432/ferme</jdbc-url>
|
||||||
<working-dir>$ProjectFileDir$</working-dir>
|
<working-dir>$ProjectFileDir$</working-dir>
|
||||||
</data-source>
|
</data-source>
|
||||||
<data-source source="LOCAL" name="Ferme recette" uuid="ae622167-c834-4e7b-87a5-c1721036f5dc">
|
<data-source source="LOCAL" name="Ferme recette" uuid="ae622167-c834-4e7b-87a5-c1721036f5dc">
|
||||||
|
|||||||
76
.idea/workspace.xml
generated
76
.idea/workspace.xml
generated
@@ -4,10 +4,15 @@
|
|||||||
<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="feat : mise à jour du bon de réception">
|
<list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" 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$/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/components/reception/reception-bovine-received.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/reception-bovine-received.vue" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/frontend/components/reception/reception-form.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/reception-form.vue" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/frontend/components/reception/reception-product-received.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/reception-product-received.vue" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/frontend/services/dto/reception-data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/dto/reception-data.ts" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Entity/Reception.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/Reception.php" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Entity/ReceptionBovine.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/ReceptionBovine.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" />
|
||||||
@@ -18,6 +23,11 @@
|
|||||||
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
|
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
|
||||||
<execution />
|
<execution />
|
||||||
</component>
|
</component>
|
||||||
|
<component name="CopilotPersistence">
|
||||||
|
<persistenceIdMap>
|
||||||
|
<entry key="_//wsl.localhost/Ubuntu-24.04/home/kevin/Stage/Ferme" value="381AhnCm9yPeOiWgMObKHhtgv2C" />
|
||||||
|
</persistenceIdMap>
|
||||||
|
</component>
|
||||||
<component name="EmbeddingIndexingInfo">
|
<component name="EmbeddingIndexingInfo">
|
||||||
<option name="cachedIndexableFilesCount" value="151" />
|
<option name="cachedIndexableFilesCount" value="151" />
|
||||||
<option name="fileBasedEmbeddingIndicesEnabled" value="true" />
|
<option name="fileBasedEmbeddingIndicesEnabled" value="true" />
|
||||||
@@ -25,8 +35,8 @@
|
|||||||
<component name="FileTemplateManagerImpl">
|
<component name="FileTemplateManagerImpl">
|
||||||
<option name="RECENT_TEMPLATES">
|
<option name="RECENT_TEMPLATES">
|
||||||
<list>
|
<list>
|
||||||
<option value="TypeScript File" />
|
|
||||||
<option value="Vue Composition API Component" />
|
<option value="Vue Composition API Component" />
|
||||||
|
<option value="TypeScript File" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
@@ -51,7 +61,7 @@
|
|||||||
</server>
|
</server>
|
||||||
</servers>
|
</servers>
|
||||||
</component>
|
</component>
|
||||||
<component name="PhpWorkspaceProjectConfiguration" interpreter_name="/bin/php">
|
<component name="PhpWorkspaceProjectConfiguration" interpreter_name="C:/php-8.4.3/php.exe">
|
||||||
<include_path>
|
<include_path>
|
||||||
<path value="$PROJECT_DIR$/vendor/psr/log" />
|
<path value="$PROJECT_DIR$/vendor/psr/log" />
|
||||||
<path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
|
<path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
|
||||||
@@ -221,14 +231,14 @@
|
|||||||
"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": "develop",
|
"git-widget-placeholder": "feat/256-reception-etape-3-bovin",
|
||||||
"last_opened_file_path": "/home/sroy/Documents/test/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": "configurable.group.appearance",
|
"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"
|
||||||
},
|
},
|
||||||
@@ -256,7 +266,6 @@
|
|||||||
<component name="SharedIndexes">
|
<component name="SharedIndexes">
|
||||||
<attachedChunks>
|
<attachedChunks>
|
||||||
<set>
|
<set>
|
||||||
<option value="bundled-js-predefined-d6986cc7102b-9b0f141eb926-JavaScript-PS-253.30387.85" />
|
|
||||||
<option value="bundled-php-predefined-a98d8de5180a-0e0d91225499-com.jetbrains.php.sharedIndexes-PS-253.30387.85" />
|
<option value="bundled-php-predefined-a98d8de5180a-0e0d91225499-com.jetbrains.php.sharedIndexes-PS-253.30387.85" />
|
||||||
</set>
|
</set>
|
||||||
</attachedChunks>
|
</attachedChunks>
|
||||||
@@ -287,6 +296,10 @@
|
|||||||
<workItem from="1770055690365" duration="370000" />
|
<workItem from="1770055690365" duration="370000" />
|
||||||
<workItem from="1770056515646" duration="21000" />
|
<workItem from="1770056515646" duration="21000" />
|
||||||
<workItem from="1770102495553" duration="2280000" />
|
<workItem from="1770102495553" duration="2280000" />
|
||||||
|
<workItem from="1770195604082" duration="90000" />
|
||||||
|
<workItem from="1770195718952" duration="215000" />
|
||||||
|
<workItem from="1770195959162" duration="18915000" />
|
||||||
|
<workItem from="1770274844804" duration="3940000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="feat : Ajout de pinia, création de la table weight et reception mise en place du système de step pour les receptions (WIP)">
|
<task id="LOCAL-00001" summary="feat : Ajout de pinia, création de la table weight et reception mise en place du système de step pour les receptions (WIP)">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
@@ -656,7 +669,31 @@
|
|||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1769782099473</updated>
|
<updated>1769782099473</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="47" />
|
<task id="LOCAL-00047" summary="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1770131226364</created>
|
||||||
|
<option name="number" value="00047" />
|
||||||
|
<option name="presentableId" value="LOCAL-00047" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1770131226364</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00048" summary="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1770206668867</created>
|
||||||
|
<option name="number" value="00048" />
|
||||||
|
<option name="presentableId" value="LOCAL-00048" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1770206668867</updated>
|
||||||
|
</task>
|
||||||
|
<task id="LOCAL-00049" summary="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1770217875423</created>
|
||||||
|
<option name="number" value="00049" />
|
||||||
|
<option name="presentableId" value="LOCAL-00049" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1770217875423</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="50" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
<component name="TypeScriptGeneratedFilesManager">
|
||||||
@@ -706,7 +743,6 @@
|
|||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<MESSAGE value="ci : ajout du script et de la doc déploiement" />
|
|
||||||
<MESSAGE value="fix : correction du path URI pour la création d'un poids dans une réception" />
|
<MESSAGE value="fix : correction du path URI pour la création d'un poids dans une réception" />
|
||||||
<MESSAGE value="feat : Ajout du bundle Monolog pour la gestion des logs" />
|
<MESSAGE value="feat : Ajout du bundle Monolog pour la gestion des logs" />
|
||||||
<MESSAGE value="fix : affiche plus détail dans les logs en recette/prod" />
|
<MESSAGE value="fix : affiche plus détail dans les logs en recette/prod" />
|
||||||
@@ -731,10 +767,30 @@
|
|||||||
<MESSAGE value="feat : ajout de colonne pour les Supplier, Address et modification du numéro de réception" />
|
<MESSAGE value="feat : ajout de colonne pour les Supplier, Address et modification du numéro de réception" />
|
||||||
<MESSAGE value="feat : ajout de colonne pour les Supplier, Address. Modification du numéro de réception et ajout de fixtures" />
|
<MESSAGE value="feat : ajout de colonne pour les Supplier, Address. Modification du numéro de réception et ajout de fixtures" />
|
||||||
<MESSAGE value="feat : mise à jour du bon de réception" />
|
<MESSAGE value="feat : mise à jour du bon de réception" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="feat : mise à jour du bon de réception" />
|
<MESSAGE value="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="feat : Ajout de la sélection des bovins étape 3 d'une réception (WIP)" />
|
||||||
|
</component>
|
||||||
|
<component name="XDebuggerManager">
|
||||||
|
<breakpoint-manager>
|
||||||
|
<breakpoints>
|
||||||
|
<line-breakpoint enabled="true" type="php">
|
||||||
|
<url>file://$PROJECT_DIR$/src/Entity/ReceptionPelletBuilding.php</url>
|
||||||
|
<line>6</line>
|
||||||
|
<option name="timeStamp" value="3" />
|
||||||
|
</line-breakpoint>
|
||||||
|
</breakpoints>
|
||||||
|
</breakpoint-manager>
|
||||||
</component>
|
</component>
|
||||||
<component name="XSLT-Support.FileAssociations.UIState">
|
<component name="XSLT-Support.FileAssociations.UIState">
|
||||||
<expand />
|
<expand />
|
||||||
<select />
|
<select />
|
||||||
</component>
|
</component>
|
||||||
|
<component name="github-copilot-workspace">
|
||||||
|
<instructionFileLocations>
|
||||||
|
<option value=".github/instructions" />
|
||||||
|
</instructionFileLocations>
|
||||||
|
<promptFileLocations>
|
||||||
|
<option value=".github/prompts" />
|
||||||
|
</promptFileLocations>
|
||||||
|
</component>
|
||||||
</project>
|
</project>
|
||||||
203
frontend/components/reception/reception-bovine-received.vue
Normal file
203
frontend/components/reception/reception-bovine-received.vue
Normal file
@@ -0,0 +1,203 @@
|
|||||||
|
<template>
|
||||||
|
<div
|
||||||
|
v-if="receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"
|
||||||
|
class="flex flex-col items-center gap-16">
|
||||||
|
<h1 class="text-4xl uppercase font-bold">Sélection des marchandises réceptionnnées</h1>
|
||||||
|
<div
|
||||||
|
class="flex flex-row gap-8 items-center">
|
||||||
|
<div
|
||||||
|
v-for="type in bovineType"
|
||||||
|
:key="type.id"
|
||||||
|
class="mt-8 flex flex-row mb-2 gap-6">
|
||||||
|
<UiNumberInput
|
||||||
|
:label="type.label"
|
||||||
|
:code="type.code"
|
||||||
|
v-model="bovineQuantities[String(type.id)]"
|
||||||
|
:placeholder="0"
|
||||||
|
:min="0"
|
||||||
|
:max="10"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="mt-8 flex flex-row mb-2 gap-6">
|
||||||
|
<UiNumberInput
|
||||||
|
label="Autres"
|
||||||
|
v-model="otherQuantity"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||||
|
@click="goNext"
|
||||||
|
>Peser
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<script setup lang="ts">
|
||||||
|
import type {BovineTypeData} from "~/services/dto/bovine-type-data";
|
||||||
|
import {getBovineTypeList} from "~/services/bovine-type";
|
||||||
|
import {MERCHANDISE_TYPE_CODES, RECEPTION_TYPE_CODES} from "~/utils/constants";
|
||||||
|
import {useReceptionStore} from '~/stores/reception'
|
||||||
|
import {
|
||||||
|
createReceptionBovine,
|
||||||
|
deleteReceptionBovine,
|
||||||
|
getReceptionBovineList,
|
||||||
|
updateReceptionBovine
|
||||||
|
} from "~/services/reception-bovine";
|
||||||
|
import {computed, onMounted, reactive, ref, watch} from "vue";
|
||||||
|
|
||||||
|
const isLoadingBovineType = ref(false)
|
||||||
|
const bovineType = ref<BovineTypeData[]>([])
|
||||||
|
const receptionStore = useReceptionStore()
|
||||||
|
const bovineQuantities = reactive<Record<string, number | null>>({})
|
||||||
|
const otherQuantity = ref<number | null>(0)
|
||||||
|
const receptionId = computed(() => receptionStore.current?.id ?? null)
|
||||||
|
const receptionIri = computed(() =>
|
||||||
|
receptionId.value ? `/api/receptions/${receptionId.value}` : null
|
||||||
|
)
|
||||||
|
const toast = useToast()
|
||||||
|
const nuxtApp = useNuxtApp()
|
||||||
|
const i18n = nuxtApp.$i18n as { t: (key: string) => string } |
|
||||||
|
undefined
|
||||||
|
const t = (key: string) => (i18n?.t ? String(i18n.t(key)) : key)
|
||||||
|
const totalBovineQuantity = computed(() => {
|
||||||
|
const baseTotal = Object.values(bovineQuantities).reduce((sum, value) => {
|
||||||
|
const n = typeof value === 'number' ? value : 0
|
||||||
|
return sum + n
|
||||||
|
}, 0)
|
||||||
|
const other = typeof otherQuantity.value === 'number' ? otherQuantity.value : 0
|
||||||
|
return baseTotal + other
|
||||||
|
})
|
||||||
|
const loadBovineType = async () => {
|
||||||
|
isLoadingBovineType.value = true
|
||||||
|
try {
|
||||||
|
bovineType.value = await getBovineTypeList()
|
||||||
|
} finally {
|
||||||
|
isLoadingBovineType.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
await loadBovineType()
|
||||||
|
})
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => receptionId.value,
|
||||||
|
async (id) => {
|
||||||
|
if (!id || !receptionIri.value) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const selectionMap: Record<string, number | null> = {}
|
||||||
|
for (const type of bovineType.value) {
|
||||||
|
selectionMap[String(type.id)] = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
const existing = await getReceptionBovineList(receptionIri.value)
|
||||||
|
for (const selection of existing) {
|
||||||
|
const bovineTypeId = String(selection.bovineType.id)
|
||||||
|
selectionMap[bovineTypeId] = selection.quantity ?? 0
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const key of Object.keys(bovineQuantities)) {
|
||||||
|
delete bovineQuantities[key]
|
||||||
|
}
|
||||||
|
Object.assign(bovineQuantities, selectionMap)
|
||||||
|
|
||||||
|
const existingOther = receptionStore.current?.bovineDetail
|
||||||
|
const parsedOther =
|
||||||
|
typeof existingOther === 'string' && existingOther.trim() !== ''
|
||||||
|
? Number(existingOther)
|
||||||
|
: 0
|
||||||
|
otherQuantity.value = Number.isFinite(parsedOther) ? parsedOther : 0
|
||||||
|
},
|
||||||
|
{immediate: true}
|
||||||
|
)
|
||||||
|
|
||||||
|
async function syncBovineSelections(receptionIri: string) {
|
||||||
|
const existing = await getReceptionBovineList(receptionIri)
|
||||||
|
const existingMap = new Map<string, { id: number; quantity: number | null }>()
|
||||||
|
for (const selection of existing) {
|
||||||
|
const bovineTypeId = String(selection.bovineType.id)
|
||||||
|
existingMap.set(bovineTypeId, {
|
||||||
|
id: selection.id,
|
||||||
|
quantity: selection.quantity ?? 0
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Supprime les entrées supprimées ou modifiées
|
||||||
|
for (const [bovineTypeId, entry] of existingMap.entries()) {
|
||||||
|
const selectedQuantity = bovineQuantities[bovineTypeId] ?? 0
|
||||||
|
if (!selectedQuantity) {
|
||||||
|
await deleteReceptionBovine(entry.id)
|
||||||
|
existingMap.delete(bovineTypeId)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if (selectedQuantity !== entry.quantity) {
|
||||||
|
await updateReceptionBovine(entry.id, {quantity: selectedQuantity})
|
||||||
|
existingMap.set(bovineTypeId, {
|
||||||
|
id: entry.id,
|
||||||
|
quantity: selectedQuantity
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Crée les entrées manquantes
|
||||||
|
for (const [bovineTypeId, quantity] of Object.entries(bovineQuantities)) {
|
||||||
|
if (!quantity) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (existingMap.has(bovineTypeId)) {
|
||||||
|
// Déjà à jour
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
await createReceptionBovine({
|
||||||
|
reception: receptionIri,
|
||||||
|
bovineType: `/api/bovine_types/${bovineTypeId}`,
|
||||||
|
quantity
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const hasNegativeQuantity = computed(() => {
|
||||||
|
const anyNegativeInTypes =
|
||||||
|
Object.values(bovineQuantities).some((value) => {
|
||||||
|
return typeof value === 'number' && value < 0
|
||||||
|
})
|
||||||
|
|
||||||
|
const otherNegative =
|
||||||
|
typeof otherQuantity.value === 'number' &&
|
||||||
|
otherQuantity.value < 0
|
||||||
|
|
||||||
|
return anyNegativeInTypes || otherNegative
|
||||||
|
})
|
||||||
|
async function goNext() {
|
||||||
|
if (!receptionStore.current || !receptionIri.value) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (hasNegativeQuantity.value) {
|
||||||
|
toast.error({
|
||||||
|
title: 'Erreur',
|
||||||
|
message: ("La quantité de bovins ne peut pas être négative.")
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Le 52 à vérifier
|
||||||
|
if (totalBovineQuantity.value > 52) {
|
||||||
|
toast.error({
|
||||||
|
title: 'Erreur',
|
||||||
|
message: ('Le total des bovins ne peut pas dépasser 52.')
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const nextStep = receptionStore.current.currentStep + 1
|
||||||
|
await syncBovineSelections(receptionIri.value)
|
||||||
|
|
||||||
|
await receptionStore.updateReception(receptionStore.current.id, {
|
||||||
|
merchandiseType: null,
|
||||||
|
merchandiseDetail: null,
|
||||||
|
bovineDetail: otherQuantity.value ? String(otherQuantity.value) : null,
|
||||||
|
currentStep: nextStep
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -142,7 +142,8 @@ import type {DriverData} from '~/services/dto/driver-data'
|
|||||||
import {getDriverList} from '~/services/driver'
|
import {getDriverList} from '~/services/driver'
|
||||||
import type {VehicleData} from '~/services/dto/vehicle-data'
|
import type {VehicleData} from '~/services/dto/vehicle-data'
|
||||||
import {getVehicleList} from '~/services/vehicle'
|
import {getVehicleList} from '~/services/vehicle'
|
||||||
import {SUPLLIER_CODE} from "~/utils/constants";
|
import {RECEPTION_TYPE_CODES, SUPLLIER_CODE} from "~/utils/constants";
|
||||||
|
import {deleteReceptionBovine, getReceptionBovineList} from "~/services/reception-bovine";
|
||||||
|
|
||||||
type ReceptionFormData = {
|
type ReceptionFormData = {
|
||||||
licensePlate: string
|
licensePlate: string
|
||||||
@@ -221,6 +222,16 @@ const filteredVehicles = computed<VehicleData[]>(() => {
|
|||||||
(!form.truckId || String(vehicle.truck?.id) === form.truckId)
|
(!form.truckId || String(vehicle.truck?.id) === form.truckId)
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
const selectedReceptionType = computed(() =>
|
||||||
|
receptionTypes.value.find((type) => String(type.id) === form.receptionTypeId) ?? null
|
||||||
|
)
|
||||||
|
|
||||||
|
const clearReceptionBovines = async (receptionIri: string) => {
|
||||||
|
const existing = await getReceptionBovineList(receptionIri)
|
||||||
|
for (const selection of existing) {
|
||||||
|
await deleteReceptionBovine(selection.id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Hydrate le formulaire depuis la réception en cours
|
// Hydrate le formulaire depuis la réception en cours
|
||||||
watch(
|
watch(
|
||||||
@@ -460,6 +471,9 @@ async function validate() {
|
|||||||
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 previousTypeCode = receptionStore.current.receptionType?.code ?? null
|
||||||
|
const nextTypeCode = selectedReceptionType.value?.code ?? null
|
||||||
|
const receptionIri = `/api/receptions/${receptionStore.current.id}`
|
||||||
const receptionTypeIri = normalizedReceptionTypeId
|
const receptionTypeIri = normalizedReceptionTypeId
|
||||||
? `/api/reception_types/${normalizedReceptionTypeId}`
|
? `/api/reception_types/${normalizedReceptionTypeId}`
|
||||||
: null
|
: null
|
||||||
@@ -508,7 +522,12 @@ async function validate() {
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if (
|
||||||
|
previousTypeCode === RECEPTION_TYPE_CODES.BOVINS &&
|
||||||
|
nextTypeCode === RECEPTION_TYPE_CODES.MERCHANDISES
|
||||||
|
) {
|
||||||
|
await clearReceptionBovines(receptionIri)
|
||||||
|
}
|
||||||
const nextStep = receptionStore.current.currentStep + 1
|
const nextStep = receptionStore.current.currentStep + 1
|
||||||
await receptionStore.updateReception(receptionStore.current.id, {
|
await receptionStore.updateReception(receptionStore.current.id, {
|
||||||
currentStep: nextStep,
|
currentStep: nextStep,
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="flex flex-col items-center gap-16">
|
<div class="flex flex-col items-center gap-16">
|
||||||
<!-- @TODO voir pour séparer dans un composant au moment de l'implémentation des Bovins -->
|
<!-- @TODO voir pour séparer dans un composant au moment de l'implémentation des Bovins -->
|
||||||
<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">Sélectionner 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"
|
||||||
@@ -12,7 +12,6 @@
|
|||||||
: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]"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
v-if="selectedMerchandiseTypeId && isAutres"
|
v-if="selectedMerchandiseTypeId && isAutres"
|
||||||
class="flex flex-col w-full max-w-[550px]"
|
class="flex flex-col w-full max-w-[550px]"
|
||||||
@@ -69,25 +68,27 @@
|
|||||||
<button
|
<button
|
||||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||||
@click="goNext"
|
@click="goNext"
|
||||||
>Peser</button>
|
>Peser
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, onMounted, ref } from 'vue'
|
import {computed, onMounted, ref} from 'vue'
|
||||||
import { getBuildingList } from '~/services/building'
|
import {getBuildingList} from '~/services/building'
|
||||||
import { getMerchandiseTypeList } from '~/services/merchandise-type'
|
import {getMerchandiseTypeList} from '~/services/merchandise-type'
|
||||||
import type { MerchandiseTypeData } from '~/services/dto/merchandise-type-data'
|
import type {MerchandiseTypeData} from '~/services/dto/merchandise-type-data'
|
||||||
import type { BuildingData } from '~/services/dto/building-data'
|
import type {BuildingData} from '~/services/dto/building-data'
|
||||||
import type { PelletTypeData } from '~/services/dto/pellet-type-data'
|
import type {PelletTypeData} from '~/services/dto/pellet-type-data'
|
||||||
import { getPelletTypeList } from '~/services/pellet-type'
|
import {getPelletTypeList} from '~/services/pellet-type'
|
||||||
import {
|
import {
|
||||||
createReceptionPelletBuilding,
|
createReceptionPelletBuilding,
|
||||||
deleteReceptionPelletBuilding,
|
deleteReceptionPelletBuilding,
|
||||||
getReceptionPelletBuildingList
|
getReceptionPelletBuildingList
|
||||||
} from '~/services/reception-pellet-building'
|
} from '~/services/reception-pellet-building'
|
||||||
import { useReceptionStore } from '~/stores/reception'
|
import {useReceptionStore} from '~/stores/reception'
|
||||||
import { MERCHANDISE_TYPE_CODES, RECEPTION_TYPE_CODES } from '~/utils/constants'
|
import {MERCHANDISE_TYPE_CODES, RECEPTION_TYPE_CODES} from '~/utils/constants'
|
||||||
|
import ReceptionBovineReceived from "~/components/reception/reception-bovine-received.vue";
|
||||||
|
|
||||||
const receptionStore = useReceptionStore()
|
const receptionStore = useReceptionStore()
|
||||||
const merchandiseTypes = ref<MerchandiseTypeData[]>([])
|
const merchandiseTypes = ref<MerchandiseTypeData[]>([])
|
||||||
@@ -98,6 +99,7 @@ const selectedBuildingIds = ref<string[]>([])
|
|||||||
const selectedPelletBuildingIds = ref<Record<string, string[]>>({})
|
const selectedPelletBuildingIds = ref<Record<string, string[]>>({})
|
||||||
const merchandiseDetail = ref('')
|
const merchandiseDetail = ref('')
|
||||||
|
|
||||||
|
|
||||||
// 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 => {
|
||||||
if (!value) {
|
if (!value) {
|
||||||
@@ -173,7 +175,6 @@ onMounted(async () => {
|
|||||||
}
|
}
|
||||||
selectedPelletBuildingIds.value = selectionMap
|
selectedPelletBuildingIds.value = selectionMap
|
||||||
})
|
})
|
||||||
|
|
||||||
// Enregistre les sélections et passe à l'étape suivante
|
// Enregistre les sélections et passe à l'étape suivante
|
||||||
async function goNext() {
|
async function goNext() {
|
||||||
if (!receptionStore.current) {
|
if (!receptionStore.current) {
|
||||||
@@ -191,6 +192,8 @@ async function goNext() {
|
|||||||
buildings: isGranule.value
|
buildings: isGranule.value
|
||||||
? []
|
? []
|
||||||
: selectedBuildingIds.value.map((id) => `/api/buildings/${id}`),
|
: selectedBuildingIds.value.map((id) => `/api/buildings/${id}`),
|
||||||
|
bovineDetail: null,
|
||||||
|
bovinesTypes: null,
|
||||||
currentStep: nextStep
|
currentStep: nextStep
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -208,7 +211,6 @@ async function clearPelletSelections(receptionIri: string) {
|
|||||||
await deleteReceptionPelletBuilding(selection.id)
|
await deleteReceptionPelletBuilding(selection.id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Synchronise les associations granulés/bâtiments avec l'état du formulaire
|
// Synchronise les associations granulés/bâtiments avec l'état du formulaire
|
||||||
async function syncPelletSelections(receptionIri: string) {
|
async function syncPelletSelections(receptionIri: string) {
|
||||||
const existing = await getReceptionPelletBuildingList(receptionIri)
|
const existing = await getReceptionPelletBuildingList(receptionIri)
|
||||||
@@ -227,7 +229,7 @@ async function syncPelletSelections(receptionIri: string) {
|
|||||||
const desiredEntries: Array<{ pelletTypeId: string; buildingId: string }> = []
|
const desiredEntries: Array<{ pelletTypeId: string; buildingId: string }> = []
|
||||||
for (const [pelletTypeId, buildingIds] of Object.entries(selectedPelletBuildingIds.value)) {
|
for (const [pelletTypeId, buildingIds] of Object.entries(selectedPelletBuildingIds.value)) {
|
||||||
for (const buildingId of buildingIds) {
|
for (const buildingId of buildingIds) {
|
||||||
desiredEntries.push({ pelletTypeId, buildingId })
|
desiredEntries.push({pelletTypeId, buildingId})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
84
frontend/components/ui/UiNumberInput.vue
Normal file
84
frontend/components/ui/UiNumberInput.vue
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
<template>
|
||||||
|
<div :class="['flex flex-row items-center gap-2', wrapperClass]">
|
||||||
|
<label
|
||||||
|
v-if="label"
|
||||||
|
:for="id"
|
||||||
|
class="text-xl text-bold flex items-center gap-2"
|
||||||
|
:class="labelClass"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
v-if="label">
|
||||||
|
{{ label }}
|
||||||
|
</span>
|
||||||
|
<span
|
||||||
|
v-if="code" class="text-neutral-600">
|
||||||
|
({{ code }})
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
:id="id"
|
||||||
|
type="number"
|
||||||
|
:value="modelValue ?? ''"
|
||||||
|
:min="min"
|
||||||
|
:max="max"
|
||||||
|
:step="step"
|
||||||
|
:disabled="disabled"
|
||||||
|
v-bind="attrs"
|
||||||
|
class="border-b border-black text-xl bg-transparent w-48"
|
||||||
|
:class="[
|
||||||
|
isEmpty ? 'text-neutral-400' : 'text-black',
|
||||||
|
disabled ? 'cursor-not-allowed' : 'cursor-text',
|
||||||
|
inputClass
|
||||||
|
]"
|
||||||
|
@input="onInput"
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import {computed, useAttrs} from 'vue'
|
||||||
|
|
||||||
|
defineOptions({inheritAttrs: false})
|
||||||
|
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
id?: string
|
||||||
|
label?: string
|
||||||
|
code?: string
|
||||||
|
modelValue: number | string | null | undefined
|
||||||
|
min?: number | string
|
||||||
|
max?: number | string
|
||||||
|
step?: number | string
|
||||||
|
disabled?: boolean
|
||||||
|
wrapperClass?: string
|
||||||
|
labelClass?: string
|
||||||
|
inputClass?: string
|
||||||
|
}>(),
|
||||||
|
{
|
||||||
|
min: undefined,
|
||||||
|
max: undefined,
|
||||||
|
step: undefined,
|
||||||
|
disabled: false,
|
||||||
|
wrapperClass: '',
|
||||||
|
labelClass: '',
|
||||||
|
inputClass: ''
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(event: 'update:modelValue', value: number | null): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const attrs = useAttrs()
|
||||||
|
const isEmpty = computed(() => props.modelValue === null || props.modelValue === undefined || props.modelValue === '')
|
||||||
|
|
||||||
|
const onInput = (event: Event) => {
|
||||||
|
const target = event.target as HTMLInputElement
|
||||||
|
if (target.value === '') {
|
||||||
|
emit('update:modelValue', null)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const numeric = Number(target.value)
|
||||||
|
emit('update:modelValue', Number.isNaN(numeric) ? null : numeric)
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -1,64 +1,72 @@
|
|||||||
{
|
{
|
||||||
"errors": {
|
"errors": {
|
||||||
"http": {
|
"http": {
|
||||||
"get": "Impossible de récupérer les données.",
|
"get": "Impossible de récupérer les données.",
|
||||||
"post": "Impossible de créer la ressource.",
|
"post": "Impossible de créer la ressource.",
|
||||||
"put": "Impossible de mettre à jour la ressource.",
|
"put": "Impossible de mettre à jour la ressource.",
|
||||||
"patch": "Impossible de mettre à jour la ressource.",
|
"patch": "Impossible de mettre à jour la ressource.",
|
||||||
"delete": "Impossible de supprimer la ressource."
|
"delete": "Impossible de supprimer la ressource."
|
||||||
|
},
|
||||||
|
"reception": {
|
||||||
|
"list": "Impossible de récupérer la liste des réceptions.",
|
||||||
|
"fetch": "Impossible de récupérer la réception.",
|
||||||
|
"create": "Impossible de créer la réception.",
|
||||||
|
"update": "Impossible de mettre à jour la réception.",
|
||||||
|
"weigh": "Impossible de récupérer la pesée."
|
||||||
|
},
|
||||||
|
"receptionType": {
|
||||||
|
"list": "Impossible de récupérer la liste des types de réception."
|
||||||
|
},
|
||||||
|
"merchandiseType": {
|
||||||
|
"list": "Impossible de récupérer la liste des types de marchandises."
|
||||||
|
},
|
||||||
|
"building": {
|
||||||
|
"list": "Impossible de récupérer la liste des bâtiments."
|
||||||
|
},
|
||||||
|
"pelletType": {
|
||||||
|
"list": "Impossible de récupérer la liste des types de granulés."
|
||||||
|
},
|
||||||
|
"receptionPelletBuilding": {
|
||||||
|
"list": "Impossible de récupérer la liste des dépôts de granulés.",
|
||||||
|
"create": "Impossible d'enregistrer le dépôt de granulés.",
|
||||||
|
"delete": "Impossible de supprimer le dépôt de granulés."
|
||||||
|
},
|
||||||
|
"receptionBovine": {
|
||||||
|
"list": "Impossible de récupérer la liste des bovins de la réception.",
|
||||||
|
"create": "Impossible d'enregistrer le bovin.",
|
||||||
|
"delete": "Impossible de supprimer le bovin."
|
||||||
|
},
|
||||||
|
"supplier": {
|
||||||
|
"list": "Impossible de récupérer la liste des fournisseurs."
|
||||||
|
},
|
||||||
|
"truck": {
|
||||||
|
"list": "Impossible de récupérer la liste des camions."
|
||||||
|
},
|
||||||
|
"bovin": {
|
||||||
|
"list": "Impossible de récupérer la liste des races de bovins."
|
||||||
|
},
|
||||||
|
"carrier": {
|
||||||
|
"list": "Impossible de récupérer la liste des transporteurs."
|
||||||
|
},
|
||||||
|
"driver": {
|
||||||
|
"list": "Impossible de récupérer la liste des chauffeurs."
|
||||||
|
},
|
||||||
|
"vehicle": {
|
||||||
|
"list": "Impossible de récupérer la liste des immatriculations."
|
||||||
|
},
|
||||||
|
"auth": {
|
||||||
|
"login": "Identifiants invalides.",
|
||||||
|
"users": "Impossible de récupérer les utilisateurs.",
|
||||||
|
"logout": "Impossible de se déconnecter."
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"reception": {
|
"success": {
|
||||||
"list": "Impossible de récupérer la liste des réceptions.",
|
"reception": {
|
||||||
"fetch": "Impossible de récupérer la réception.",
|
"update": "Réception mise à jour avec succès."
|
||||||
"create": "Impossible de créer la réception.",
|
},
|
||||||
"update": "Impossible de mettre à jour la réception.",
|
"auth": {
|
||||||
"weigh": "Impossible de récupérer la pesée."
|
"login": "Connexion réussie.",
|
||||||
},
|
"logout": "Déconnexion réussie."
|
||||||
"receptionType": {
|
}
|
||||||
"list": "Impossible de récupérer la liste des types de réception."
|
|
||||||
},
|
|
||||||
"merchandiseType": {
|
|
||||||
"list": "Impossible de récupérer la liste des types de marchandises."
|
|
||||||
},
|
|
||||||
"building": {
|
|
||||||
"list": "Impossible de récupérer la liste des bâtiments."
|
|
||||||
},
|
|
||||||
"pelletType": {
|
|
||||||
"list": "Impossible de récupérer la liste des types de granulés."
|
|
||||||
},
|
|
||||||
"receptionPelletBuilding": {
|
|
||||||
"list": "Impossible de récupérer la liste des dépôts de granulés.",
|
|
||||||
"create": "Impossible d'enregistrer le dépôt de granulés.",
|
|
||||||
"delete": "Impossible de supprimer le dépôt de granulés."
|
|
||||||
},
|
|
||||||
"supplier": {
|
|
||||||
"list": "Impossible de récupérer la liste des fournisseurs."
|
|
||||||
},
|
|
||||||
"truck": {
|
|
||||||
"list": "Impossible de récupérer la liste des camions."
|
|
||||||
},
|
|
||||||
"carrier": {
|
|
||||||
"list": "Impossible de récupérer la liste des transporteurs."
|
|
||||||
},
|
|
||||||
"driver": {
|
|
||||||
"list": "Impossible de récupérer la liste des chauffeurs."
|
|
||||||
},
|
|
||||||
"vehicle": {
|
|
||||||
"list": "Impossible de récupérer la liste des immatriculations."
|
|
||||||
},
|
|
||||||
"auth": {
|
|
||||||
"login": "Identifiants invalides.",
|
|
||||||
"users": "Impossible de récupérer les utilisateurs.",
|
|
||||||
"logout": "Impossible de se déconnecter."
|
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"success": {
|
|
||||||
"reception": {
|
|
||||||
"update": "Réception mise à jour avec succès."
|
|
||||||
},
|
|
||||||
"auth": {
|
|
||||||
"login": "Connexion réussie.",
|
|
||||||
"logout": "Déconnexion réussie."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
|
<ReceptionForm v-if="!storeReception || storeReception.currentStep === 0"/>
|
||||||
<ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
|
<ReceptionWeight v-if="storeReception?.currentStep === 1" mode="gross"/>
|
||||||
<ReceptionProductReceived v-if="storeReception?.currentStep === 2"/>
|
<ReceptionProductReceived
|
||||||
|
v-if="storeReception?.currentStep === 2 &&
|
||||||
|
receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.MERCHANDISES"/>
|
||||||
|
<ReceptionBovineReceived
|
||||||
|
v-if="storeReception?.currentStep === 2 &&
|
||||||
|
receptionStore.current?.receptionType?.code === RECEPTION_TYPE_CODES.BOVINS"/>
|
||||||
<ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
|
<ReceptionWeight v-if="storeReception?.currentStep !== null && storeReception?.currentStep >= 3" mode="tare"/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -25,6 +30,7 @@
|
|||||||
import {useReceptionStore} from '~/stores/reception'
|
import {useReceptionStore} from '~/stores/reception'
|
||||||
import {storeToRefs} from 'pinia'
|
import {storeToRefs} from 'pinia'
|
||||||
import {RECEPTION_STEP_LABELS} from '~/constants/steps'
|
import {RECEPTION_STEP_LABELS} from '~/constants/steps'
|
||||||
|
import {RECEPTION_TYPE_CODES} from "~/utils/constants";
|
||||||
|
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|||||||
23
frontend/services/bovine-type.ts
Normal file
23
frontend/services/bovine-type.ts
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import { useApi } from '~/composables/useApi'
|
||||||
|
import type {BovineTypeData} from "~/services/dto/bovine-type-data";
|
||||||
|
|
||||||
|
export type BovineTypeListResponse =
|
||||||
|
| BovineTypeData[]
|
||||||
|
| { 'hydra:member'?: BovineTypeData[] }
|
||||||
|
|
||||||
|
export async function getBovineTypeList(): Promise<BovineTypeData[]> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<BovineTypeListResponse>('bovine_types', {}, {
|
||||||
|
toastErrorKey: 'errors.bovin.list'
|
||||||
|
})
|
||||||
|
|
||||||
|
if (Array.isArray(response)) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
|
return response['hydra:member']
|
||||||
|
}
|
||||||
|
|
||||||
|
return []
|
||||||
|
}
|
||||||
5
frontend/services/dto/bovine-type-data.ts
Normal file
5
frontend/services/dto/bovine-type-data.ts
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
export interface BovineTypeData{
|
||||||
|
id: number
|
||||||
|
label: string
|
||||||
|
code: string
|
||||||
|
}
|
||||||
8
frontend/services/dto/reception-bovine-data.ts
Normal file
8
frontend/services/dto/reception-bovine-data.ts
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
import type {BovineTypeData} from "~/services/dto/bovine-type-data";
|
||||||
|
|
||||||
|
export interface ReceptionBovineTypeData{
|
||||||
|
id: number
|
||||||
|
quantity : number
|
||||||
|
reception?: string
|
||||||
|
bovineType: BovineTypeData
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@ import type { AddressData } from '~/services/dto/address-data'
|
|||||||
import type { TruckData } from '~/services/dto/truck-data'
|
import type { TruckData } from '~/services/dto/truck-data'
|
||||||
import type { CarrierData } from '~/services/dto/carrier-data'
|
import type { CarrierData } from '~/services/dto/carrier-data'
|
||||||
import type { DriverData } from '~/services/dto/driver-data'
|
import type { DriverData } from '~/services/dto/driver-data'
|
||||||
|
import type {BovineTypeData} from "~/services/dto/bovine-type-data";
|
||||||
|
|
||||||
export interface ReceptionData {
|
export interface ReceptionData {
|
||||||
id: number
|
id: number
|
||||||
@@ -20,7 +21,9 @@ export interface ReceptionData {
|
|||||||
receptionType?: ReceptionTypeData | null
|
receptionType?: ReceptionTypeData | null
|
||||||
merchandiseType?: MerchandiseTypeData | null
|
merchandiseType?: MerchandiseTypeData | null
|
||||||
merchandiseDetail?: string | null
|
merchandiseDetail?: string | null
|
||||||
|
bovineDetail?: string | null
|
||||||
buildings?: BuildingData[] | null
|
buildings?: BuildingData[] | null
|
||||||
|
bovinesTypes?: BovineTypeData[] | null
|
||||||
pelletBuildings?: ReceptionPelletBuildingData[] | null
|
pelletBuildings?: ReceptionPelletBuildingData[] | null
|
||||||
user?: UserData | null
|
user?: UserData | null
|
||||||
supplier?: SupplierData | null
|
supplier?: SupplierData | null
|
||||||
@@ -46,7 +49,9 @@ export type ReceptionPayload = {
|
|||||||
receptionType?: string | null
|
receptionType?: string | null
|
||||||
merchandiseType?: string | null
|
merchandiseType?: string | null
|
||||||
merchandiseDetail?: string | null
|
merchandiseDetail?: string | null
|
||||||
|
bovineDetail?: string | null
|
||||||
buildings?: string[] | null
|
buildings?: string[] | null
|
||||||
|
bovinesTypes?: string[] | null
|
||||||
user?: string | null
|
user?: string | null
|
||||||
supplier?: string | null
|
supplier?: string | null
|
||||||
address?: string | null
|
address?: string | null
|
||||||
|
|||||||
59
frontend/services/reception-bovine.ts
Normal file
59
frontend/services/reception-bovine.ts
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
import { useApi } from '~/composables/useApi'
|
||||||
|
import type { ReceptionBovineTypeData } from '~/services/dto/reception-bovine-data'
|
||||||
|
|
||||||
|
export type ReceptionBovineListResponse =
|
||||||
|
| ReceptionBovineTypeData[]
|
||||||
|
| { 'hydra:member'?: ReceptionBovineTypeData[] }
|
||||||
|
|
||||||
|
export type ReceptionBovinePayload = {
|
||||||
|
quantity: number
|
||||||
|
reception: string
|
||||||
|
bovineType: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getReceptionBovineList(
|
||||||
|
receptionIri: string
|
||||||
|
): Promise<ReceptionBovineTypeData[]> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<ReceptionBovineListResponse>(
|
||||||
|
'reception_bovines',
|
||||||
|
{ reception: receptionIri },
|
||||||
|
{
|
||||||
|
toastErrorKey: 'errors.receptionBovine.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 createReceptionBovine(
|
||||||
|
payload: ReceptionBovinePayload
|
||||||
|
): Promise<ReceptionBovineTypeData> {
|
||||||
|
const api = useApi()
|
||||||
|
return api.post<ReceptionBovineTypeData>('reception_bovines', payload, {
|
||||||
|
toastErrorKey: 'errors.receptionBovine.create'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function deleteReceptionBovine(id: number): Promise<void> {
|
||||||
|
const api = useApi()
|
||||||
|
await api.delete<void>(`reception_bovines/${id}`, {}, {
|
||||||
|
toastErrorKey: 'errors.receptionBovine.delete'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function updateReceptionBovine(
|
||||||
|
id: number,
|
||||||
|
payload: Partial<ReceptionBovinePayload>
|
||||||
|
): Promise<ReceptionBovineTypeData> {
|
||||||
|
const api = useApi()
|
||||||
|
return api.patch<ReceptionBovineTypeData>(`reception_bovines/${id}`, payload, {
|
||||||
|
toastErrorKey: 'errors.receptionBovine.update'
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
export const RECEPTION_TYPE_CODES = {
|
export const RECEPTION_TYPE_CODES = {
|
||||||
MERCHANDISES: 'MARCHANDISES'
|
MERCHANDISES: 'MARCHANDISES',
|
||||||
|
BOVINS: 'BOVINS'
|
||||||
} as const
|
} as const
|
||||||
|
|
||||||
export const MERCHANDISE_TYPE_CODES = {
|
export const MERCHANDISE_TYPE_CODES = {
|
||||||
|
|||||||
39
migrations/Version20260203123833.php
Normal file
39
migrations/Version20260203123833.php
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Auto-generated Migration: Please modify to your needs!
|
||||||
|
*/
|
||||||
|
final class Version20260203123833 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this up() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('CREATE TABLE bovine_type (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(120) NOT NULL, code VARCHAR(50) NOT NULL, PRIMARY KEY (id))');
|
||||||
|
$this->addSql('CREATE TABLE reception_bovine (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, quantity INT NOT NULL, reception_id INT DEFAULT NULL, bovine_type_id INT NOT NULL, PRIMARY KEY (id))');
|
||||||
|
$this->addSql('CREATE INDEX IDX_636B9DB97C14DF52 ON reception_bovine (reception_id)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_636B9DB97899F32E ON reception_bovine (bovine_type_id)');
|
||||||
|
$this->addSql('ALTER TABLE reception_bovine ADD CONSTRAINT FK_636B9DB97C14DF52 FOREIGN KEY (reception_id) REFERENCES reception (id)');
|
||||||
|
$this->addSql('ALTER TABLE reception_bovine ADD CONSTRAINT FK_636B9DB97899F32E FOREIGN KEY (bovine_type_id) REFERENCES bovine_type (id) NOT DEFERRABLE');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE reception_bovine DROP CONSTRAINT FK_636B9DB97C14DF52');
|
||||||
|
$this->addSql('ALTER TABLE reception_bovine DROP CONSTRAINT FK_636B9DB97899F32E');
|
||||||
|
$this->addSql('DROP TABLE bovine_type');
|
||||||
|
$this->addSql('DROP TABLE reception_bovine');
|
||||||
|
}
|
||||||
|
}
|
||||||
33
migrations/Version20260204141406.php
Normal file
33
migrations/Version20260204141406.php
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Auto-generated Migration: Please modify to your needs!
|
||||||
|
*/
|
||||||
|
final class Version20260204141406 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this up() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE reception_bovine ALTER quantity SET DEFAULT 0');
|
||||||
|
$this->addSql('CREATE UNIQUE INDEX uniq_reception_bovine_type ON reception_bovine (reception_id, bovine_type_id)');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('DROP INDEX uniq_reception_bovine_type');
|
||||||
|
$this->addSql('ALTER TABLE reception_bovine ALTER quantity DROP DEFAULT');
|
||||||
|
}
|
||||||
|
}
|
||||||
31
migrations/Version20260205070819.php
Normal file
31
migrations/Version20260205070819.php
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Auto-generated Migration: Please modify to your needs!
|
||||||
|
*/
|
||||||
|
final class Version20260205070819 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this up() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE reception ADD bovine_detail VARCHAR(255) DEFAULT NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('ALTER TABLE reception DROP bovine_detail');
|
||||||
|
}
|
||||||
|
}
|
||||||
70
src/Entity/BovineType.php
Normal file
70
src/Entity/BovineType.php
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['bovine-type:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['bovine-type:read']],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class BovineType
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['bovine-type:read', 'reception:read', 'reception-bovine:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 120)]
|
||||||
|
#[Groups(['bovine-type:read', 'reception:read', 'reception-bovine:read'])]
|
||||||
|
private ?string $label = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 50)]
|
||||||
|
#[Groups(['bovine-type:read', 'reception:read', 'reception-bovine:read'])]
|
||||||
|
private ?string $code = null;
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getLabel(): ?string
|
||||||
|
{
|
||||||
|
return $this->label;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setLabel(string $label): static
|
||||||
|
{
|
||||||
|
$this->label = $label;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCode(): ?string
|
||||||
|
{
|
||||||
|
return $this->code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCode(string $code): static
|
||||||
|
{
|
||||||
|
$this->code = $code;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -72,27 +72,27 @@ class Reception
|
|||||||
#[ORM\Id]
|
#[ORM\Id]
|
||||||
#[ORM\GeneratedValue]
|
#[ORM\GeneratedValue]
|
||||||
#[ORM\Column]
|
#[ORM\Column]
|
||||||
#[Groups(['reception:read'])]
|
#[Groups(['reception:read', 'reception-bovine:read'])]
|
||||||
private ?int $id = null;
|
private ?int $id = null;
|
||||||
|
|
||||||
#[ORM\Column(length: 20, nullable: true)]
|
#[ORM\Column(length: 20, nullable: true)]
|
||||||
#[Groups(['reception:read', 'reception:write'])]
|
#[Groups(['reception:read', 'reception:write', 'reception-bovine:read'])]
|
||||||
private ?string $licensePlate = null;
|
private ?string $licensePlate = null;
|
||||||
|
|
||||||
#[ORM\Column(length: 20, unique: true, nullable: true)]
|
#[ORM\Column(length: 20, unique: true, nullable: true)]
|
||||||
#[Groups(['reception:read'])]
|
#[Groups(['reception:read', 'reception-bovine:read'])]
|
||||||
private ?string $identificationNumber = null;
|
private ?string $identificationNumber = null;
|
||||||
|
|
||||||
#[ORM\Column(options: ['default' => 0])]
|
#[ORM\Column(options: ['default' => 0])]
|
||||||
#[Groups(['reception:read', 'reception:write'])]
|
#[Groups(['reception:read', 'reception:write', 'reception-bovine:read'])]
|
||||||
private int $currentStep = 0;
|
private int $currentStep = 0;
|
||||||
|
|
||||||
#[ORM\Column(options: ['default' => false])]
|
#[ORM\Column(options: ['default' => false])]
|
||||||
#[Groups(['reception:read', 'reception:write'])]
|
#[Groups(['reception:read', 'reception:write', 'reception-bovine:read'])]
|
||||||
private bool $isValid = false;
|
private bool $isValid = false;
|
||||||
|
|
||||||
#[ORM\Column(name: 'date_reception', type: 'datetime_immutable')]
|
#[ORM\Column(name: 'date_reception', type: 'datetime_immutable')]
|
||||||
#[Groups(['reception:read', 'reception:write'])]
|
#[Groups(['reception:read', 'reception:write', 'reception-bovine:read'])]
|
||||||
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
||||||
private ?DateTimeImmutable $receptionDate = null;
|
private ?DateTimeImmutable $receptionDate = null;
|
||||||
|
|
||||||
@@ -168,6 +168,20 @@ class Reception
|
|||||||
#[ApiProperty(readableLink: true)]
|
#[ApiProperty(readableLink: true)]
|
||||||
private ?Driver $driver = null;
|
private ?Driver $driver = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, ReceptionBovine>
|
||||||
|
*/
|
||||||
|
#[ORM\OneToMany(targetEntity: ReceptionBovine::class, mappedBy: 'reception', cascade: ['persist', 'remove'], orphanRemoval: true)]
|
||||||
|
#[Assert\Range(
|
||||||
|
min: 0
|
||||||
|
)]
|
||||||
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
|
private Collection $bovines_types;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 255, nullable: true)]
|
||||||
|
#[Groups(['reception:read', 'reception:write'])]
|
||||||
|
private ?string $bovineDetail = null;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
?DateTimeImmutable $receptionDate = null,
|
?DateTimeImmutable $receptionDate = null,
|
||||||
) {
|
) {
|
||||||
@@ -175,6 +189,7 @@ class Reception
|
|||||||
$this->weights = new ArrayCollection();
|
$this->weights = new ArrayCollection();
|
||||||
$this->buildings = new ArrayCollection();
|
$this->buildings = new ArrayCollection();
|
||||||
$this->pelletBuildings = new ArrayCollection();
|
$this->pelletBuildings = new ArrayCollection();
|
||||||
|
$this->bovines_types = new ArrayCollection();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getId(): ?int
|
public function getId(): ?int
|
||||||
@@ -469,4 +484,46 @@ class Reception
|
|||||||
)
|
)
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, ReceptionBovine>
|
||||||
|
*/
|
||||||
|
public function getBovinesTypes(): Collection
|
||||||
|
{
|
||||||
|
return $this->bovines_types;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addBovinesType(ReceptionBovine $bovinesType): static
|
||||||
|
{
|
||||||
|
if (!$this->bovines_types->contains($bovinesType)) {
|
||||||
|
$this->bovines_types->add($bovinesType);
|
||||||
|
$bovinesType->setReception($this);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function removeBovinesType(ReceptionBovine $bovinesType): static
|
||||||
|
{
|
||||||
|
if ($this->bovines_types->removeElement($bovinesType)) {
|
||||||
|
// set the owning side to null (unless already changed)
|
||||||
|
if ($bovinesType->getReception() === $this) {
|
||||||
|
$bovinesType->setReception(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getBovineDetail(): ?string
|
||||||
|
{
|
||||||
|
return $this->bovineDetail;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setBovineDetail(?string $bovineDetail): static
|
||||||
|
{
|
||||||
|
$this->bovineDetail = $bovineDetail;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
109
src/Entity/ReceptionBovine.php
Normal file
109
src/Entity/ReceptionBovine.php
Normal file
@@ -0,0 +1,109 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
|
||||||
|
use ApiPlatform\Metadata\ApiFilter;
|
||||||
|
use ApiPlatform\Metadata\ApiProperty;
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Delete;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use ApiPlatform\Metadata\Patch;
|
||||||
|
use ApiPlatform\Metadata\Post;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ApiFilter(SearchFilter::class, properties: ['reception' => 'exact'])]
|
||||||
|
#[ORM\UniqueConstraint(name: 'uniq_reception_bovine_type', columns: ['reception_id', 'bovine_type_id'])]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['reception-bovine:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['reception-bovine:read']],
|
||||||
|
),
|
||||||
|
new Post(
|
||||||
|
normalizationContext: ['groups' => ['reception-bovine:read']],
|
||||||
|
denormalizationContext: ['groups' => ['reception-bovine:write']],
|
||||||
|
),
|
||||||
|
new Patch(
|
||||||
|
normalizationContext: ['groups' => ['reception-bovine:read']],
|
||||||
|
denormalizationContext: ['groups' => ['reception-bovine:write']],
|
||||||
|
),
|
||||||
|
new Delete(),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class ReceptionBovine
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['reception-bovine:read', 'reception:read'])]
|
||||||
|
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'bovines_types')]
|
||||||
|
#[Groups(['reception-bovine:read', 'reception-bovine:write'])]
|
||||||
|
private ?Reception $reception = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne]
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
#[Groups(['reception-bovine:read', 'reception-bovine:write', 'reception:read'])]
|
||||||
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private ?BovineType $bovineType = null;
|
||||||
|
|
||||||
|
#[ORM\Column(options: ['default' => 0])]
|
||||||
|
#[Assert\Range(
|
||||||
|
min: 0
|
||||||
|
)]
|
||||||
|
#[Groups(['reception-bovine:read', 'reception-bovine:write', 'reception:read'])]
|
||||||
|
private ?int $quantity = null;
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getReception(): ?Reception
|
||||||
|
{
|
||||||
|
return $this->reception;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setReception(?Reception $reception): static
|
||||||
|
{
|
||||||
|
$this->reception = $reception;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getBovineType(): ?BovineType
|
||||||
|
{
|
||||||
|
return $this->bovineType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setBovineType(?BovineType $bovineType): static
|
||||||
|
{
|
||||||
|
$this->bovineType = $bovineType;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getQuantity(): ?int
|
||||||
|
{
|
||||||
|
return $this->quantity;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setQuantity(int $quantity): static
|
||||||
|
{
|
||||||
|
$this->quantity = $quantity;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
45
src/Repository/BovineTypeRepository.php
Normal file
45
src/Repository/BovineTypeRepository.php
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Repository;
|
||||||
|
|
||||||
|
use App\Entity\BovineType;
|
||||||
|
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||||
|
use Doctrine\Persistence\ManagerRegistry;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @extends ServiceEntityRepository<BovineType>
|
||||||
|
*/
|
||||||
|
class BovineTypeRepository extends ServiceEntityRepository
|
||||||
|
{
|
||||||
|
public function __construct(ManagerRegistry $registry)
|
||||||
|
{
|
||||||
|
parent::__construct($registry, BovineType::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
// /**
|
||||||
|
// * @return BovineType[] Returns an array of BovineType objects
|
||||||
|
// */
|
||||||
|
// public function findByExampleField($value): array
|
||||||
|
// {
|
||||||
|
// return $this->createQueryBuilder('b')
|
||||||
|
// ->andWhere('b.exampleField = :val')
|
||||||
|
// ->setParameter('val', $value)
|
||||||
|
// ->orderBy('b.id', 'ASC')
|
||||||
|
// ->setMaxResults(10)
|
||||||
|
// ->getQuery()
|
||||||
|
// ->getResult()
|
||||||
|
// ;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// public function findOneBySomeField($value): ?BovineType
|
||||||
|
// {
|
||||||
|
// return $this->createQueryBuilder('b')
|
||||||
|
// ->andWhere('b.exampleField = :val')
|
||||||
|
// ->setParameter('val', $value)
|
||||||
|
// ->getQuery()
|
||||||
|
// ->getOneOrNullResult()
|
||||||
|
// ;
|
||||||
|
// }
|
||||||
|
}
|
||||||
45
src/Repository/ReceptionBovineRepository.php
Normal file
45
src/Repository/ReceptionBovineRepository.php
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Repository;
|
||||||
|
|
||||||
|
use App\Entity\ReceptionBovine;
|
||||||
|
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||||
|
use Doctrine\Persistence\ManagerRegistry;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @extends ServiceEntityRepository<ReceptionBovine>
|
||||||
|
*/
|
||||||
|
class ReceptionBovineRepository extends ServiceEntityRepository
|
||||||
|
{
|
||||||
|
public function __construct(ManagerRegistry $registry)
|
||||||
|
{
|
||||||
|
parent::__construct($registry, ReceptionBovine::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
// /**
|
||||||
|
// * @return ReceptionBovine[] Returns an array of ReceptionBovine objects
|
||||||
|
// */
|
||||||
|
// public function findByExampleField($value): array
|
||||||
|
// {
|
||||||
|
// return $this->createQueryBuilder('r')
|
||||||
|
// ->andWhere('r.exampleField = :val')
|
||||||
|
// ->setParameter('val', $value)
|
||||||
|
// ->orderBy('r.id', 'ASC')
|
||||||
|
// ->setMaxResults(10)
|
||||||
|
// ->getQuery()
|
||||||
|
// ->getResult()
|
||||||
|
// ;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// public function findOneBySomeField($value): ?ReceptionBovine
|
||||||
|
// {
|
||||||
|
// return $this->createQueryBuilder('r')
|
||||||
|
// ->andWhere('r.exampleField = :val')
|
||||||
|
// ->setParameter('val', $value)
|
||||||
|
// ->getQuery()
|
||||||
|
// ->getOneOrNullResult()
|
||||||
|
// ;
|
||||||
|
// }
|
||||||
|
}
|
||||||
102
tests/BovinIdentificationProviderTest.php
Normal file
102
tests/BovinIdentificationProviderTest.php
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Tests\State;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\Operation;
|
||||||
|
use App\State\BovinIdentificationProvider;
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Api\BovinApiInterface;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Dto\AnimalFileDto;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Dto\BovinIdentificationDto;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Dto\BovinRef;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Dto\DateValueDto;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Dto\ExploitationRef;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Dto\MovementDto;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Dto\ParentInfoDto;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Dto\PresencePeriodDto;
|
||||||
|
use Malio\EdnotifBundle\Shared\Dto\StandardResponseDto;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
|
final class BovinIdentificationProviderTest extends TestCase
|
||||||
|
{
|
||||||
|
public function testReturnsNullWhenNumeroNationalMissing(): void
|
||||||
|
{
|
||||||
|
$api = $this->createMock(BovinApiInterface::class);
|
||||||
|
$api->expects(self::never())->method('getAnimalFile');
|
||||||
|
|
||||||
|
$provider = new BovinIdentificationProvider($api);
|
||||||
|
|
||||||
|
$result = $provider->provide($this->createStub(Operation::class), []);
|
||||||
|
|
||||||
|
self::assertNull($result);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testMapsIdentificationAndPresencePeriods(): void
|
||||||
|
{
|
||||||
|
$api = $this->createMock(BovinApiInterface::class);
|
||||||
|
|
||||||
|
$identification = new BovinIdentificationDto(
|
||||||
|
bovin: new BovinRef('FR', 'IGNORED'),
|
||||||
|
sex: 'F',
|
||||||
|
breedType: 'LIM',
|
||||||
|
birthDate: new DateValueDto(new DateTimeImmutable('2024-01-02'), 'Y'),
|
||||||
|
workNumber: 'W123',
|
||||||
|
isFilie: true,
|
||||||
|
motherCarrier: new ParentInfoDto(new BovinRef('FR', 'MOM1'), 'CHA'),
|
||||||
|
fatherIpg: new ParentInfoDto(new BovinRef('FR', 'DAD1'), 'BBB'),
|
||||||
|
birthExploitation: new ExploitationRef('FR', 'EXP1'),
|
||||||
|
);
|
||||||
|
|
||||||
|
$presencePeriods = [
|
||||||
|
new PresencePeriodDto(
|
||||||
|
new MovementDto(new DateTimeImmutable('2024-03-01'), 'ENTRY', null),
|
||||||
|
new MovementDto(new DateTimeImmutable('2024-03-10'), 'EXIT', null),
|
||||||
|
),
|
||||||
|
];
|
||||||
|
|
||||||
|
$animalFile = new AnimalFileDto(
|
||||||
|
new StandardResponseDto(true, null),
|
||||||
|
$identification,
|
||||||
|
$presencePeriods,
|
||||||
|
null
|
||||||
|
);
|
||||||
|
|
||||||
|
$api->expects(self::once())
|
||||||
|
->method('getAnimalFile')
|
||||||
|
->with('FR123', 'FR')
|
||||||
|
->willReturn($animalFile)
|
||||||
|
;
|
||||||
|
|
||||||
|
$provider = new BovinIdentificationProvider($api);
|
||||||
|
|
||||||
|
$result = $provider->provide(
|
||||||
|
$this->createStub(Operation::class),
|
||||||
|
['numeroNational' => 'FR123']
|
||||||
|
);
|
||||||
|
|
||||||
|
self::assertNotNull($result);
|
||||||
|
self::assertSame('FR123', $result->numeroNational);
|
||||||
|
self::assertSame('F', $result->sex);
|
||||||
|
self::assertSame('LIM', $result->breedType);
|
||||||
|
self::assertSame('W123', $result->workNumber);
|
||||||
|
self::assertSame('2024-01-02', $result->birthDate);
|
||||||
|
self::assertSame('Y', $result->birthDateCompletenessFlag);
|
||||||
|
self::assertTrue($result->isFilie);
|
||||||
|
self::assertSame('MOM1', $result->motherNationalNumber);
|
||||||
|
self::assertSame('CHA', $result->motherBreedType);
|
||||||
|
self::assertSame('DAD1', $result->fatherNationalNumber);
|
||||||
|
self::assertSame('BBB', $result->fatherBreedType);
|
||||||
|
self::assertSame('EXP1', $result->birthExploitationNumber);
|
||||||
|
|
||||||
|
self::assertCount(1, $result->presencePeriods);
|
||||||
|
self::assertSame('2024-03-01', $result->presencePeriods[0]->entryDate);
|
||||||
|
self::assertSame('ENTRY', $result->presencePeriods[0]->entryCause);
|
||||||
|
self::assertSame('2024-03-10', $result->presencePeriods[0]->exitDate);
|
||||||
|
self::assertSame('EXIT', $result->presencePeriods[0]->exitCause);
|
||||||
|
}
|
||||||
|
}
|
||||||
48
tests/State/MeProviderTest.php
Normal file
48
tests/State/MeProviderTest.php
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Tests\State;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\Operation;
|
||||||
|
use App\Entity\User;
|
||||||
|
use App\State\MeProvider;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
use Symfony\Bundle\SecurityBundle\Security;
|
||||||
|
use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
|
final class MeProviderTest extends TestCase
|
||||||
|
{
|
||||||
|
public function testProvideReturnUser(): void
|
||||||
|
{
|
||||||
|
$user = new User();
|
||||||
|
|
||||||
|
$security = $this->createStub(Security::class);
|
||||||
|
$security->method('getUser')->willReturn($user);
|
||||||
|
|
||||||
|
$provider = new MeProvider($security);
|
||||||
|
|
||||||
|
$result = $provider->provide($this->createStub(Operation::class));
|
||||||
|
|
||||||
|
self::assertSame($user, $result);
|
||||||
|
self::assertInstanceOf(User::class, $result);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testProvideThrowAccessDeniedException(): void
|
||||||
|
{
|
||||||
|
$user = null;
|
||||||
|
|
||||||
|
$security = $this->createStub(Security::class);
|
||||||
|
$security->method('getUser')->willReturn($user);
|
||||||
|
|
||||||
|
$provider = new MeProvider($security);
|
||||||
|
|
||||||
|
$this->expectException(AccessDeniedException::class);
|
||||||
|
$this->expectExceptionMessage('User not authenticated.');
|
||||||
|
|
||||||
|
$provider->provide($this->createStub(Operation::class));
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user