Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e31bdce713 | ||
| 5d72beaf8d | |||
| 43f34015c6 | |||
|
|
ac5ce07e61 | ||
| e9fb36cc24 | |||
|
|
06a41c5f85 | ||
| f263a11fe8 | |||
|
|
c52f22472d | ||
| e7421e985e | |||
|
|
0d258ae9c6 | ||
| 7dd615ea34 | |||
|
|
6eee0745a7 | ||
| 845f94db8c |
58
.idea/workspace.xml
generated
58
.idea/workspace.xml
generated
@@ -5,9 +5,10 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : corrections diverses">
|
<list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : corrections diverses">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/data_source_mapping.xml" beforeDir="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/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/frontend/pages/infrastructure/case.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/infrastructure/case.vue" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/Entity/BuildingCase.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/BuildingCase.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" />
|
||||||
@@ -39,7 +40,7 @@
|
|||||||
<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="feat/276-lister-expeditions-terminees" />
|
<entry key="$PROJECT_DIR$" value="fit/332-refonte-reception-terminee" />
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
@@ -223,38 +224,39 @@
|
|||||||
<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">{
|
<component name="PropertiesComponent"><![CDATA[{
|
||||||
"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/325-corrections-diverses",
|
"git-widget-placeholder": "feat/278-plan-du-site",
|
||||||
"last_opened_file_path": "//wsl.localhost/Ubuntu-24.04/home/kevin/Stage/Ferme/frontend/pages/shipment",
|
"last_opened_file_path": "//wsl.localhost/Ubuntu-24.04/home/m-tristan/workspace/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": "preferences.pluginManager",
|
"settings.editor.selected.configurable": "preferences.pluginManager",
|
||||||
"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">
|
<key name="CopyFile.RECENT_KEYS">
|
||||||
|
<recent name="\\wsl.localhost\Ubuntu-24.04\home\m-tristan\workspace\Ferme" />
|
||||||
<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\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\composables" />
|
||||||
<recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\components\shipment" />
|
<recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\components\shipment" />
|
||||||
|
|||||||
@@ -47,6 +47,10 @@ Ajouter dans le fichier .env du frontend
|
|||||||
* [#326] Admin modification creation client
|
* [#326] Admin modification creation client
|
||||||
* [#325] Correction diverses
|
* [#325] Correction diverses
|
||||||
* fix layout admin
|
* 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
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
parameters:
|
parameters:
|
||||||
app.version: '0.0.49'
|
app.version: '0.0.55'
|
||||||
|
|||||||
@@ -155,12 +155,6 @@ import {useShipmentStore} from '~/stores/shipment'
|
|||||||
import {computed, reactive, ref, watch, onMounted} from 'vue'
|
import {computed, reactive, ref, watch, onMounted} from 'vue'
|
||||||
import type {ShipmentTypeData} from "~/services/dto/shipment-type-data";
|
import type {ShipmentTypeData} from "~/services/dto/shipment-type-data";
|
||||||
import {getShipmentTypeList} from "~/services/shipment-type";
|
import {getShipmentTypeList} from "~/services/shipment-type";
|
||||||
import {
|
|
||||||
createShipmentBovine,
|
|
||||||
deleteShipmentBovine,
|
|
||||||
getBovinShipmentList,
|
|
||||||
updateShipmentBovine
|
|
||||||
} from "~/services/bovin-shipment";
|
|
||||||
|
|
||||||
const users = ref<UserData[]>([])
|
const users = ref<UserData[]>([])
|
||||||
const customers = ref<CustomerData[]>([])
|
const customers = ref<CustomerData[]>([])
|
||||||
@@ -332,23 +326,15 @@ watch(
|
|||||||
form.carrierId = shipment?.carrier?.id ? String(shipment.carrier.id) : ''
|
form.carrierId = shipment?.carrier?.id ? String(shipment.carrier.id) : ''
|
||||||
form.driverId = shipment?.driver?.id ? String(shipment.driver.id) : ''
|
form.driverId = shipment?.driver?.id ? String(shipment.driver.id) : ''
|
||||||
form.vehicleId = shipment?.vehicle?.id ? String(shipment.vehicle.id) : ''
|
form.vehicleId = shipment?.vehicle?.id ? String(shipment.vehicle.id) : ''
|
||||||
if (!shipment || !shipment.bovinShipments) {
|
|
||||||
selectedShipmentTypeId.value = ''
|
|
||||||
shipmentQuantity.value = 0
|
|
||||||
} else {
|
|
||||||
const selectedEntry = shipment.bovinShipments.find((entry) => {
|
|
||||||
const typeId = entry.shipmentType?.id
|
|
||||||
return Boolean(typeId) && Number(entry.nbBovinSend ?? 0) > 0
|
|
||||||
}) ?? shipment.bovinShipments.find((entry) => Boolean(entry.shipmentType?.id))
|
|
||||||
|
|
||||||
if (!selectedEntry?.shipmentType?.id) {
|
|
||||||
selectedShipmentTypeId.value = ''
|
selectedShipmentTypeId.value = shipment?.shipmentType?.id
|
||||||
shipmentQuantity.value = 0
|
? String(shipment.shipmentType.id)
|
||||||
} else {
|
: ''
|
||||||
selectedShipmentTypeId.value = String(selectedEntry.shipmentType.id)
|
|
||||||
shipmentQuantity.value = selectedEntry.nbBovinSend ?? 0
|
shipmentQuantity.value = shipment?.nbBovinSend ?? 0
|
||||||
}
|
|
||||||
}
|
|
||||||
isHydrating.value = false
|
isHydrating.value = false
|
||||||
},
|
},
|
||||||
{immediate: true}
|
{immediate: true}
|
||||||
@@ -474,68 +460,7 @@ watch(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
const buildDesiredBovinShipments = () => {
|
|
||||||
const typeId = Number(selectedShipmentTypeId.value)
|
|
||||||
if (!Number.isFinite(typeId)) {
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
const type = bovineShipment.value.find((entry) => entry.id === typeId)
|
|
||||||
if (!type) {
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
const raw = shipmentQuantity.value
|
|
||||||
const quantity = raw === null || raw === undefined ? 0 : Number(raw)
|
|
||||||
const normalizedQuantity = Number.isFinite(quantity) ? Math.max(0, Math.trunc(quantity)) : 0
|
|
||||||
if (normalizedQuantity <= 0) {
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
|
|
||||||
return [{type, quantity: normalizedQuantity}]
|
|
||||||
}
|
|
||||||
const syncBovinShipments = async (
|
|
||||||
shipmentId: number,
|
|
||||||
existing: Array<{ id?: number; nbBovinSend: number | null; shipmentType?: unknown }> = []
|
|
||||||
) => {
|
|
||||||
const shipmentIri = `/api/shipments/${shipmentId}`
|
|
||||||
const desired = buildDesiredBovinShipments()
|
|
||||||
const desiredByTypeId = new Map<number, number>()
|
|
||||||
for (const entry of desired) {
|
|
||||||
desiredByTypeId.set(entry.type.id, entry.quantity)
|
|
||||||
}
|
|
||||||
for (const entry of existing) {
|
|
||||||
if (!entry.id) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
const rawType = entry.shipmentType
|
|
||||||
let typeId: number | null = null
|
|
||||||
if (rawType && typeof rawType === 'object' && 'id' in rawType) {
|
|
||||||
typeId = Number((rawType as { id: number }).id)
|
|
||||||
} else if (typeof rawType === 'string') {
|
|
||||||
const match = rawType.match(/\/shipment_types\/(\\d+)$/)
|
|
||||||
typeId = match ? Number(match[1]) : null
|
|
||||||
}
|
|
||||||
if (!typeId) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
const desiredQuantity = desiredByTypeId.get(typeId)
|
|
||||||
if (!desiredQuantity) {
|
|
||||||
await deleteShipmentBovine(entry.id)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if (entry.nbBovinSend !== desiredQuantity) {
|
|
||||||
await updateShipmentBovine(entry.id, {nbBovinSend: desiredQuantity})
|
|
||||||
}
|
|
||||||
desiredByTypeId.delete(typeId)
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const [typeId, quantity] of desiredByTypeId.entries()) {
|
|
||||||
await createShipmentBovine({
|
|
||||||
shipment: shipmentIri,
|
|
||||||
shipmentType: `/api/shipment_types/${typeId}`,
|
|
||||||
nbBovinSend: quantity
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const buildPayload = () => {
|
const buildPayload = () => {
|
||||||
const normalizedLicensePlate = form.licencePlate.trim()
|
const normalizedLicensePlate = form.licencePlate.trim()
|
||||||
const normalizedShipmentDate = form.shipmentDate.trim()
|
const normalizedShipmentDate = form.shipmentDate.trim()
|
||||||
@@ -563,6 +488,14 @@ const buildPayload = () => {
|
|||||||
const addressIri = normalizedAddressId
|
const addressIri = normalizedAddressId
|
||||||
? `/api/addresses/${normalizedAddressId}`
|
? `/api/addresses/${normalizedAddressId}`
|
||||||
: null
|
: 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 {
|
return {
|
||||||
licencePlate: normalizedLicensePlate,
|
licencePlate: normalizedLicensePlate,
|
||||||
@@ -572,20 +505,19 @@ const buildPayload = () => {
|
|||||||
carrier: carrierIri,
|
carrier: carrierIri,
|
||||||
driver: driverIri,
|
driver: driverIri,
|
||||||
user: userIri,
|
user: userIri,
|
||||||
address: addressIri
|
address: addressIri,
|
||||||
|
shipmentType: shipmentTypeIri,
|
||||||
|
nbBovinSend: normalizedQuantity,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const saveDraft = async () => {
|
const saveDraft = async () => {
|
||||||
const payload = buildPayload()
|
const payload = buildPayload()
|
||||||
if (!shipmentStore.current) {
|
if (!shipmentStore.current) {
|
||||||
const created = await shipmentStore.createShipment({
|
await shipmentStore.createShipment({
|
||||||
currentStep: 0,
|
currentStep: 0,
|
||||||
...payload
|
...payload
|
||||||
})
|
})
|
||||||
if (created) {
|
|
||||||
await syncBovinShipments(created.id, [])
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -593,10 +525,6 @@ const saveDraft = async () => {
|
|||||||
currentStep: shipmentStore.current.currentStep,
|
currentStep: shipmentStore.current.currentStep,
|
||||||
...payload
|
...payload
|
||||||
})
|
})
|
||||||
await syncBovinShipments(
|
|
||||||
shipmentStore.current.id,
|
|
||||||
shipmentStore.current?.bovinShipments ?? []
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
defineExpose({saveDraft})
|
defineExpose({saveDraft})
|
||||||
@@ -610,7 +538,6 @@ const validate = async () => {
|
|||||||
})
|
})
|
||||||
if (created) {
|
if (created) {
|
||||||
await shipmentStore.loadShipment(created.id)
|
await shipmentStore.loadShipment(created.id)
|
||||||
await syncBovinShipments(created.id, shipmentStore.current?.bovinShipments ?? [])
|
|
||||||
await router.push(`/shipment/${created.id}`)
|
await router.push(`/shipment/${created.id}`)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
@@ -621,6 +548,5 @@ const validate = async () => {
|
|||||||
...payload
|
...payload
|
||||||
})
|
})
|
||||||
await shipmentStore.loadShipment(shipmentStore.current.id)
|
await shipmentStore.loadShipment(shipmentStore.current.id)
|
||||||
await syncBovinShipments(shipmentStore.current.id, shipmentStore.current?.bovinShipments ?? [])
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="flex flex-col items-center gap-[118px]">
|
<div class="flex flex-col items-center gap-[118px]">
|
||||||
<h1 class="font-bold text-5xl uppercase text-primary-500">Charment des bovins</h1>
|
<h1 class="font-bold text-5xl uppercase text-primary-500">Chargement des bovins</h1>
|
||||||
<div
|
<div
|
||||||
class="w-full flex flex-col items-center justify-center">
|
class="w-full flex flex-col items-center justify-center">
|
||||||
<UiLoadingDots />
|
<UiLoadingDots />
|
||||||
|
|||||||
@@ -105,6 +105,23 @@
|
|||||||
Clients
|
Clients
|
||||||
</a>
|
</a>
|
||||||
</NuxtLink>
|
</NuxtLink>
|
||||||
|
|
||||||
|
<NuxtLink
|
||||||
|
v-if="auth.isAdmin"
|
||||||
|
to="/admin/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>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<!-- Spacer mobile (pour centrer visuellement le header si besoin) -->
|
<!-- Spacer mobile (pour centrer visuellement le header si besoin) -->
|
||||||
@@ -118,7 +135,8 @@
|
|||||||
aria-haspopup="true"
|
aria-haspopup="true"
|
||||||
>
|
>
|
||||||
<span class="capitalize font-bold">{{ userDisplayName }}</span>
|
<span class="capitalize font-bold">{{ userDisplayName }}</span>
|
||||||
<span class="ml-[6px] inline-flex items-center font-bold transition-transform group-hover:rotate-180 group-focus-within:rotate-180">
|
<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"/>
|
<Icon name="mdi:chevron-down" size="20"/>
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
@@ -196,6 +214,9 @@
|
|||||||
<NuxtLink v-if="auth.isAdmin" to="/admin/customer/customer-list" @click="closeMenu">
|
<NuxtLink v-if="auth.isAdmin" to="/admin/customer/customer-list" @click="closeMenu">
|
||||||
Clients
|
Clients
|
||||||
</NuxtLink>
|
</NuxtLink>
|
||||||
|
<NuxtLink v-if="auth.isAdmin" to="/admin/bovin/list" @click="closeMenu">
|
||||||
|
Bovins
|
||||||
|
</NuxtLink>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
|
|||||||
104
frontend/pages/admin/bovin/[[id]].vue
Normal file
104
frontend/pages/admin/bovin/[[id]].vue
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
<template>
|
||||||
|
<form @submit.prevent="validate">
|
||||||
|
<div class="text-primary-500 flex items-center justify-between">
|
||||||
|
<h1 class="text-3xl font-bold uppercase">
|
||||||
|
{{ route.params.id ? 'Modifier bovin' : 'Ajout bovin' }}
|
||||||
|
</h1>
|
||||||
|
|
||||||
|
<UiButton
|
||||||
|
type="submit"
|
||||||
|
:disabled="isLoading || isHydrating"
|
||||||
|
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] hover:opacity-80"
|
||||||
|
>
|
||||||
|
<Icon name="mdi:check" size="28" />
|
||||||
|
{{ isEdit ? 'Modifier' : 'Ajouter' }}
|
||||||
|
</UiButton>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 py-12">
|
||||||
|
<UiTextInput label="Nom du bovin" id="bovin-label" v-model="form.label" />
|
||||||
|
<UiTextInput label="Code bovin" id="code-id" v-model="form.code" />
|
||||||
|
</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)
|
||||||
|
|
||||||
|
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 idBovin = computed(() => resolveId(route.params.id))
|
||||||
|
const isEdit = computed(() => idBovin.value !== 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)
|
||||||
|
}
|
||||||
|
await navigate()
|
||||||
|
} finally {
|
||||||
|
isLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function navigate(){
|
||||||
|
return router.push("/admin/bovin/list")
|
||||||
|
}
|
||||||
|
</script>
|
||||||
72
frontend/pages/admin/bovin/list.vue
Normal file
72
frontend/pages/admin/bovin/list.vue
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
<template>
|
||||||
|
<div class="flex items-center justify-between">
|
||||||
|
<h1 class="text-3xl font-bold text-primary-500 uppercase">Liste des types bovins</h1>
|
||||||
|
<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"
|
||||||
|
@click="handleAddClick"
|
||||||
|
>
|
||||||
|
<Icon name="mdi:plus" size="28" />
|
||||||
|
Ajouter
|
||||||
|
</NuxtLink>
|
||||||
|
</div>
|
||||||
|
<div v-if="auth.isAdmin" class="mt-6 border border-slate-200 mb-16">
|
||||||
|
<div class="max-h-96 overflow-y-auto">
|
||||||
|
<div
|
||||||
|
class="sticky
|
||||||
|
grid grid-cols-2 gap-4
|
||||||
|
bg-slate-100 px-4 py-3
|
||||||
|
font-semibold uppercase
|
||||||
|
tracking-wide"
|
||||||
|
>
|
||||||
|
<div class="col-span-1">Nom</div>
|
||||||
|
<div class="col-span-1">Code</div>
|
||||||
|
</div>
|
||||||
|
<div v-if="bovinList.length === 0" class="px-4 py-6 text-slate-400">
|
||||||
|
Aucun type de bovin.
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
<div
|
||||||
|
v-for="bovin in bovinList"
|
||||||
|
:key="bovin.id"
|
||||||
|
class="grid grid-cols-2 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
|
||||||
|
@click="goToBovin(bovin.id)"
|
||||||
|
>
|
||||||
|
<div class="col-span-1">{{ bovin.label }}</div>
|
||||||
|
<div class="col-span-1">{{ bovin.code }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
|
||||||
|
Accès réservé aux administrateurs.
|
||||||
|
</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>
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
<div class="flex flex-wrap justify-center pb-16 gap-12">
|
<div class="flex flex-wrap justify-center pb-16 gap-12">
|
||||||
<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="/shipment" iconName="mdi:truck-fast-outline" />
|
||||||
<card-link label="PLAN DE SITE" link="/" iconName="material-symbols:warehouse-outline-rounded" />
|
<card-link label="PLAN DE SITE" link="/infrastructure/building" iconName="material-symbols:warehouse-outline-rounded" />
|
||||||
<card-link link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
|
<card-link link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
|
||||||
<template #label>
|
<template #label>
|
||||||
Réceptions<br>EN ATTENTE
|
Réceptions<br>EN ATTENTE
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
EXPÉDITIONS<br>EN ATTENTE
|
EXPÉDITIONS<br>EN ATTENTE
|
||||||
</template>
|
</template>
|
||||||
</card-link>
|
</card-link>
|
||||||
<card-link label="CASES" link="/" iconName="material-symbols:bottom-sheets-outline" />
|
<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="/shipment/finish-shipment" iconName="mdi:truck-delivery-outline" />
|
||||||
<card-link link="/" iconName="mdi:cow">
|
<card-link link="/" iconName="mdi:cow">
|
||||||
|
|||||||
242
frontend/pages/infrastructure/building.vue
Normal file
242
frontend/pages/infrastructure/building.vue
Normal file
@@ -0,0 +1,242 @@
|
|||||||
|
<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>
|
||||||
27
frontend/pages/infrastructure/case.vue
Normal file
27
frontend/pages/infrastructure/case.vue
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
<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 case {{ caseId || '-' }}
|
||||||
|
</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>
|
||||||
@@ -28,9 +28,9 @@
|
|||||||
<div>{{ shipment.customer?.name }}</div>
|
<div>{{ shipment.customer?.name }}</div>
|
||||||
<div>{{ shipment.address?.fullAddress }}</div>
|
<div>{{ shipment.address?.fullAddress }}</div>
|
||||||
<div>
|
<div>
|
||||||
<template v-if="formatBovinShipmentLines(shipment).length">
|
<template v-if="formatShipmentLines(shipment).length">
|
||||||
<div
|
<div
|
||||||
v-for="(line, index) in formatBovinShipmentLines(shipment)"
|
v-for="(line, index) in formatShipmentLines(shipment)"
|
||||||
:key="index"
|
:key="index"
|
||||||
class="leading-5"
|
class="leading-5"
|
||||||
>
|
>
|
||||||
@@ -62,16 +62,17 @@ const formatWeighing = (shipment: ShipmentData) => {
|
|||||||
return `${gross - tare} kg`
|
return `${gross - tare} kg`
|
||||||
}
|
}
|
||||||
|
|
||||||
const formatBovinShipmentLines = (shipment: ShipmentData) => {
|
|
||||||
if (!shipment.bovinShipments?.length) {
|
const formatShipmentLines = (shipment: ShipmentData) => {
|
||||||
|
if (!shipment.shipmentType && shipment.nbBovinSend == null) {
|
||||||
return []
|
return []
|
||||||
}
|
}
|
||||||
return shipment.bovinShipments.map((entry) => {
|
|
||||||
const label = typeof entry.shipmentType === 'string'
|
const label = typeof shipment.shipmentType === 'string'
|
||||||
? entry.shipmentType
|
? shipment.shipmentType
|
||||||
: entry.shipmentType?.label
|
: shipment.shipmentType?.label
|
||||||
return `${label ?? '—'} : ${entry.nbBovinSend ?? '—'}`
|
|
||||||
})
|
return [`${label ?? '—'} : ${shipment.nbBovinSend ?? '—'}`]
|
||||||
}
|
}
|
||||||
|
|
||||||
const goShipment = (id: number) => {
|
const goShipment = (id: number) => {
|
||||||
|
|||||||
@@ -24,12 +24,12 @@
|
|||||||
@click="goToShipment(shipment.id)"
|
@click="goToShipment(shipment.id)"
|
||||||
@keydown.enter="goToShipment(shipment.id)"
|
@keydown.enter="goToShipment(shipment.id)"
|
||||||
>
|
>
|
||||||
<div>{{ shipment.customer?.label }}</div>
|
<div>{{ shipment.customer?.name }}</div>
|
||||||
<div>{{ shipment.address?.fullAddress }}</div>
|
<div>{{ shipment.address?.fullAddress }}</div>
|
||||||
<div>
|
<div>
|
||||||
<template v-if="formatBovinShipmentLines(shipment).length">
|
<template v-if="formatShipmentLines(shipment).length">
|
||||||
<div
|
<div
|
||||||
v-for="(line, index) in formatBovinShipmentLines(shipment)"
|
v-for="(line, index) in formatShipmentLines(shipment)"
|
||||||
:key="index"
|
:key="index"
|
||||||
class="leading-5"
|
class="leading-5"
|
||||||
>
|
>
|
||||||
@@ -55,16 +55,17 @@ const router = useRouter()
|
|||||||
const goToShipment = (id: number) => {
|
const goToShipment = (id: number) => {
|
||||||
router.push(`/shipment/${id}`)
|
router.push(`/shipment/${id}`)
|
||||||
}
|
}
|
||||||
const formatBovinShipmentLines = (shipment: ShipmentData) => {
|
|
||||||
if (!shipment.bovinShipments?.length) {
|
const formatShipmentLines = (shipment: ShipmentData) => {
|
||||||
|
if (!shipment.shipmentType && shipment.nbBovinSend == null) {
|
||||||
return []
|
return []
|
||||||
}
|
}
|
||||||
return shipment.bovinShipments.map((entry) => {
|
|
||||||
const label = typeof entry.shipmentType === 'string'
|
const label = typeof shipment.shipmentType === 'string'
|
||||||
? entry.shipmentType
|
? shipment.shipmentType
|
||||||
: entry.shipmentType?.label
|
: shipment.shipmentType?.label
|
||||||
return `${label ?? '—'} : ${entry.nbBovinSend ?? '—'}`
|
|
||||||
})
|
return [`${label ?? '—'} : ${shipment.nbBovinSend ?? '—'}`]
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
import { useApi } from '~/composables/useApi'
|
|
||||||
import type { BovinShipmentData } from '~/services/dto/bovin-shipment-data'
|
|
||||||
import type { ShipmentBovinePayload, BovinShipmentListResponse } from '~/services/dto/bovin-shipment-data'
|
|
||||||
|
|
||||||
export async function getBovinShipmentList(
|
|
||||||
shipmentIri: string
|
|
||||||
): Promise<BovinShipmentData[]> {
|
|
||||||
const api = useApi()
|
|
||||||
const response = await api.get<BovinShipmentListResponse>(
|
|
||||||
'bovin_shipments',
|
|
||||||
{ shipment: shipmentIri },
|
|
||||||
{
|
|
||||||
toastErrorKey: 'errors.shipmentBovine.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 createShipmentBovine(
|
|
||||||
payload: ShipmentBovinePayload
|
|
||||||
): Promise<BovinShipmentData> {
|
|
||||||
const api = useApi()
|
|
||||||
return api.post<BovinShipmentData>('bovin_shipments', payload, {
|
|
||||||
toastErrorKey: 'errors.shipmentBovine.create'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function deleteShipmentBovine(id: number): Promise<void> {
|
|
||||||
const api = useApi()
|
|
||||||
await api.delete<void>(`bovin_shipments/${id}`, {}, {
|
|
||||||
toastErrorKey: 'errors.shipmentBovine.delete'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function updateShipmentBovine(
|
|
||||||
id: number,
|
|
||||||
payload: Partial<ShipmentBovinePayload>
|
|
||||||
): Promise<BovinShipmentData> {
|
|
||||||
const api = useApi()
|
|
||||||
return api.patch<BovinShipmentData>(`bovin_shipments/${id}`, payload, {
|
|
||||||
toastErrorKey: 'errors.shipmentBovine.update'
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useApi } from '~/composables/useApi'
|
import { useApi } from '~/composables/useApi'
|
||||||
import type {BovineTypeData} from "~/services/dto/bovine-type-data";
|
import type { BovineTypeData, BovinPayload } from "~/services/dto/bovine-type-data";
|
||||||
|
|
||||||
export type BovineTypeListResponse =
|
export type BovineTypeListResponse =
|
||||||
| BovineTypeData[]
|
| BovineTypeData[]
|
||||||
@@ -12,12 +12,41 @@ export async function getBovineTypeList(): Promise<BovineTypeData[]> {
|
|||||||
})
|
})
|
||||||
|
|
||||||
if (Array.isArray(response)) {
|
if (Array.isArray(response)) {
|
||||||
return response
|
return response.map(mapToBovineTypeData)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
return response['hydra:member']
|
return response['hydra:member'].map(mapToBovineTypeData)
|
||||||
}
|
}
|
||||||
|
|
||||||
return []
|
return []
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function getBovin(id: number): Promise<BovineTypeData> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<BovineTypeData>(`bovine_types/${id}`)
|
||||||
|
return mapToBovineTypeData(response)
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function createBovin(payload: BovinPayload = {}): Promise<BovineTypeData> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.post<BovineTypeData>('bovine_types', toBovineTypePayload(payload))
|
||||||
|
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))
|
||||||
|
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,18 +0,0 @@
|
|||||||
import type {ShipmentTypeData} from "~/services/dto/shipment-type-data";
|
|
||||||
|
|
||||||
export interface BovinShipmentData {
|
|
||||||
id: number
|
|
||||||
nbBovinSend: number | null
|
|
||||||
shipment?: string | null
|
|
||||||
shipmentType?: ShipmentTypeData | null
|
|
||||||
}
|
|
||||||
|
|
||||||
export type ShipmentBovinePayload = {
|
|
||||||
nbBovinSend: number
|
|
||||||
shipment: string
|
|
||||||
shipmentType: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export type BovinShipmentListResponse =
|
|
||||||
| BovinShipmentData[]
|
|
||||||
| { 'hydra:member'?: BovinShipmentData[] }
|
|
||||||
@@ -3,3 +3,13 @@ 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
|
||||||
|
}
|
||||||
|
|||||||
9
frontend/services/dto/building-case-data.ts
Normal file
9
frontend/services/dto/building-case-data.ts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
11
frontend/services/dto/building-case-position-data.ts
Normal file
11
frontend/services/dto/building-case-position-data.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
6
frontend/services/dto/building-case-status-data.ts
Normal file
6
frontend/services/dto/building-case-status-data.ts
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
export interface BuildingCaseStatusData {
|
||||||
|
id: number
|
||||||
|
label: string | null
|
||||||
|
code: string | null
|
||||||
|
couleur: string | null
|
||||||
|
}
|
||||||
@@ -1,5 +1,8 @@
|
|||||||
|
import type { BuildingLayoutData } from '~/services/dto/building-layout-data'
|
||||||
|
|
||||||
export interface BuildingData {
|
export interface BuildingData {
|
||||||
id: number
|
id: number
|
||||||
label: string
|
label: string
|
||||||
code: string
|
code: string
|
||||||
|
layouts?: BuildingLayoutData[] | null
|
||||||
}
|
}
|
||||||
|
|||||||
9
frontend/services/dto/building-layout-data.ts
Normal file
9
frontend/services/dto/building-layout-data.ts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
@@ -9,12 +9,6 @@ export interface ShipmentTypeData {
|
|||||||
code: string
|
code: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface BovinShipmentData {
|
|
||||||
id?: number
|
|
||||||
shipmentType?: ShipmentTypeData | string | null
|
|
||||||
nbBovinSend: number | null
|
|
||||||
}
|
|
||||||
|
|
||||||
export type ShipmentData = {
|
export type ShipmentData = {
|
||||||
id: number
|
id: number
|
||||||
identificationNumber?: string | null
|
identificationNumber?: string | null
|
||||||
@@ -26,7 +20,8 @@ export type ShipmentData = {
|
|||||||
carrier?: CarrierData | null
|
carrier?: CarrierData | null
|
||||||
truck?: TruckData | null
|
truck?: TruckData | null
|
||||||
customer?: CustomerData | null
|
customer?: CustomerData | null
|
||||||
bovinShipments?: BovinShipmentData[] | null
|
shipmentType?: ShipmentTypeData | null
|
||||||
|
nbBovinSend?: number | null
|
||||||
weights?: WeightShipmentEntryData[] | null
|
weights?: WeightShipmentEntryData[] | null
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -59,9 +54,9 @@ export type ShipmentPayload = {
|
|||||||
carrier?: string | null
|
carrier?: string | null
|
||||||
truck?: string | null
|
truck?: string | null
|
||||||
customer?: string | null
|
customer?: string | null
|
||||||
bovinShipments?: string[] | null
|
|
||||||
address?: string | null
|
address?: string | null
|
||||||
user?: string | null
|
user?: string | null
|
||||||
driver?: string | null
|
driver?: string | null
|
||||||
|
shipmentType?: string | null
|
||||||
|
nbBovinSend?: number | null
|
||||||
}
|
}
|
||||||
|
|||||||
23
frontend/services/statut.ts
Normal file
23
frontend/services/statut.ts
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import { useApi } from '~/composables/useApi'
|
||||||
|
import type { BuildingCaseStatusData } from '~/services/dto/building-case-status-data'
|
||||||
|
|
||||||
|
export type StatutListResponse =
|
||||||
|
| BuildingCaseStatusData[]
|
||||||
|
| { 'hydra:member'?: BuildingCaseStatusData[] }
|
||||||
|
|
||||||
|
export async function getStatutList(): Promise<BuildingCaseStatusData[]> {
|
||||||
|
const api = useApi()
|
||||||
|
const response = await api.get<StatutListResponse>('statuts', {}, {
|
||||||
|
toastErrorKey: 'errors.http.get'
|
||||||
|
})
|
||||||
|
|
||||||
|
if (Array.isArray(response)) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||||
|
return response['hydra:member']
|
||||||
|
}
|
||||||
|
|
||||||
|
return []
|
||||||
|
}
|
||||||
52
migrations/Version20260218144828.php
Normal file
52
migrations/Version20260218144828.php
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
<?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 Version20260218144828 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 bovin_shipment DROP CONSTRAINT fk_7049f4502ee48a36');
|
||||||
|
$this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT fk_7049f4507be036fc');
|
||||||
|
$this->addSql('DROP TABLE bovin_shipment');
|
||||||
|
$this->addSql('ALTER TABLE shipment ADD nb_bovin_send INT NOT NULL');
|
||||||
|
$this->addSql('ALTER TABLE shipment ADD shipment_type_id INT DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC2EE48A36 FOREIGN KEY (shipment_type_id) REFERENCES shipment_type (id) NOT DEFERRABLE');
|
||||||
|
$this->addSql('CREATE INDEX IDX_2CB20DC2EE48A36 ON shipment (shipment_type_id)');
|
||||||
|
$this->addSql('DROP INDEX uniq_weight_shipment_type');
|
||||||
|
$this->addSql('DROP INDEX uniq_weight_reception_type');
|
||||||
|
$this->addSql('ALTER INDEX idx_weight_shipment RENAME TO IDX_7CD55417BE036FC');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('CREATE TABLE bovin_shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, nb_bovin_send INT NOT NULL, shipment_id INT DEFAULT NULL, shipment_type_id INT DEFAULT NULL, PRIMARY KEY (id))');
|
||||||
|
$this->addSql('CREATE INDEX idx_7049f4507be036fc ON bovin_shipment (shipment_id)');
|
||||||
|
$this->addSql('CREATE INDEX idx_7049f4502ee48a36 ON bovin_shipment (shipment_type_id)');
|
||||||
|
$this->addSql('CREATE UNIQUE INDEX uniq_bovin_shipment_one_type ON bovin_shipment (shipment_id)');
|
||||||
|
$this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT fk_7049f4502ee48a36 FOREIGN KEY (shipment_type_id) REFERENCES shipment_type (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT fk_7049f4507be036fc FOREIGN KEY (shipment_id) REFERENCES shipment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||||
|
$this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC2EE48A36');
|
||||||
|
$this->addSql('DROP INDEX IDX_2CB20DC2EE48A36');
|
||||||
|
$this->addSql('ALTER TABLE shipment DROP nb_bovin_send');
|
||||||
|
$this->addSql('ALTER TABLE shipment DROP shipment_type_id');
|
||||||
|
$this->addSql('CREATE UNIQUE INDEX uniq_weight_shipment_type ON weight (shipment_id, type)');
|
||||||
|
$this->addSql('CREATE UNIQUE INDEX uniq_weight_reception_type ON weight (reception_id, type)');
|
||||||
|
$this->addSql('ALTER INDEX idx_7cd55417be036fc RENAME TO idx_weight_shipment');
|
||||||
|
}
|
||||||
|
}
|
||||||
47
migrations/Version20260219100826.php
Normal file
47
migrations/Version20260219100826.php
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
<?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 Version20260219100826 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 building_case (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, case_number INT NOT NULL, code VARCHAR(255) NOT NULL, capacity INT NOT NULL, id_building_id INT DEFAULT NULL, PRIMARY KEY (id))');
|
||||||
|
$this->addSql('CREATE INDEX IDX_DE2CEE505538B3E5 ON building_case (id_building_id)');
|
||||||
|
$this->addSql('CREATE TABLE building_case_position (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, x INT NOT NULL, y INT NOT NULL, w INT NOT NULL, h INT NOT NULL, render_order VARCHAR(255) NOT NULL, building_layout_id INT NOT NULL, building_case_id INT NOT NULL, PRIMARY KEY (id))');
|
||||||
|
$this->addSql('CREATE INDEX IDX_ACCDF9077040AE67 ON building_case_position (building_layout_id)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_ACCDF907F8D859DF ON building_case_position (building_case_id)');
|
||||||
|
$this->addSql('CREATE TABLE building_layout (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, name VARCHAR(255) NOT NULL, columns INT NOT NULL, rows INT NOT NULL, id_building_id INT NOT NULL, PRIMARY KEY (id))');
|
||||||
|
$this->addSql('CREATE INDEX IDX_2A8CB1095538B3E5 ON building_layout (id_building_id)');
|
||||||
|
$this->addSql('ALTER TABLE building_case ADD CONSTRAINT FK_DE2CEE505538B3E5 FOREIGN KEY (id_building_id) REFERENCES building (id)');
|
||||||
|
$this->addSql('ALTER TABLE building_case_position ADD CONSTRAINT FK_ACCDF9077040AE67 FOREIGN KEY (building_layout_id) REFERENCES building_layout (id) NOT DEFERRABLE');
|
||||||
|
$this->addSql('ALTER TABLE building_case_position ADD CONSTRAINT FK_ACCDF907F8D859DF FOREIGN KEY (building_case_id) REFERENCES building_case (id) NOT DEFERRABLE');
|
||||||
|
$this->addSql('ALTER TABLE building_layout ADD CONSTRAINT FK_2A8CB1095538B3E5 FOREIGN KEY (id_building_id) REFERENCES building (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 building_case DROP CONSTRAINT FK_DE2CEE505538B3E5');
|
||||||
|
$this->addSql('ALTER TABLE building_case_position DROP CONSTRAINT FK_ACCDF9077040AE67');
|
||||||
|
$this->addSql('ALTER TABLE building_case_position DROP CONSTRAINT FK_ACCDF907F8D859DF');
|
||||||
|
$this->addSql('ALTER TABLE building_layout DROP CONSTRAINT FK_2A8CB1095538B3E5');
|
||||||
|
$this->addSql('DROP TABLE building_case');
|
||||||
|
$this->addSql('DROP TABLE building_case_position');
|
||||||
|
$this->addSql('DROP TABLE building_layout');
|
||||||
|
}
|
||||||
|
}
|
||||||
37
migrations/Version20260220101607.php
Normal file
37
migrations/Version20260220101607.php
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
<?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 Version20260220101607 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 statut (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(255) NOT NULL, code VARCHAR(255) NOT NULL, color VARCHAR(255) NOT NULL, PRIMARY KEY (id))');
|
||||||
|
$this->addSql('ALTER TABLE building_case ADD statut_id INT DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE building_case ADD CONSTRAINT FK_DE2CEE50F6203804 FOREIGN KEY (statut_id) REFERENCES statut (id)');
|
||||||
|
$this->addSql('CREATE INDEX IDX_DE2CEE50F6203804 ON building_case (statut_id)');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
// this down() migration is auto-generated, please modify it to your needs
|
||||||
|
$this->addSql('DROP TABLE statut');
|
||||||
|
$this->addSql('ALTER TABLE building_case DROP CONSTRAINT FK_DE2CEE50F6203804');
|
||||||
|
$this->addSql('DROP INDEX IDX_DE2CEE50F6203804');
|
||||||
|
$this->addSql('ALTER TABLE building_case DROP statut_id');
|
||||||
|
}
|
||||||
|
}
|
||||||
30
migrations/Version20260225123000.php
Normal file
30
migrations/Version20260225123000.php
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260225123000 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Create bovine table and relation to building_case.';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('CREATE TABLE bovine (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, building_case_id INT DEFAULT NULL, national_number VARCHAR(50) NOT NULL, received_weight INT DEFAULT NULL, PRIMARY KEY(id))');
|
||||||
|
$this->addSql('CREATE INDEX IDX_EA9E2A42F8D859DF ON bovine (building_case_id)');
|
||||||
|
$this->addSql('CREATE UNIQUE INDEX uniq_bovine_national_number ON bovine (national_number)');
|
||||||
|
$this->addSql('ALTER TABLE bovine ADD CONSTRAINT FK_EA9E2A42F8D859DF FOREIGN KEY (building_case_id) REFERENCES building_case (id) NOT DEFERRABLE');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE bovine DROP CONSTRAINT FK_EA9E2A42F8D859DF');
|
||||||
|
$this->addSql('DROP TABLE bovine');
|
||||||
|
}
|
||||||
|
}
|
||||||
26
migrations/Version20260225131500.php
Normal file
26
migrations/Version20260225131500.php
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260225131500 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add arrival_date column to bovine table.';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE bovine ADD arrival_date DATE DEFAULT NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE bovine DROP arrival_date');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,8 +5,12 @@ declare(strict_types=1);
|
|||||||
namespace App\Command;
|
namespace App\Command;
|
||||||
|
|
||||||
use App\Entity\Address;
|
use App\Entity\Address;
|
||||||
|
use App\Entity\Bovine;
|
||||||
use App\Entity\BovineType;
|
use App\Entity\BovineType;
|
||||||
use App\Entity\Building;
|
use App\Entity\Building;
|
||||||
|
use App\Entity\BuildingCase;
|
||||||
|
use App\Entity\BuildingCasePosition;
|
||||||
|
use App\Entity\BuildingLayout;
|
||||||
use App\Entity\Carrier;
|
use App\Entity\Carrier;
|
||||||
use App\Entity\Customer;
|
use App\Entity\Customer;
|
||||||
use App\Entity\Driver;
|
use App\Entity\Driver;
|
||||||
@@ -14,9 +18,11 @@ use App\Entity\MerchandiseType;
|
|||||||
use App\Entity\PelletType;
|
use App\Entity\PelletType;
|
||||||
use App\Entity\ReceptionType;
|
use App\Entity\ReceptionType;
|
||||||
use App\Entity\ShipmentType;
|
use App\Entity\ShipmentType;
|
||||||
|
use App\Entity\Statut;
|
||||||
use App\Entity\Supplier;
|
use App\Entity\Supplier;
|
||||||
use App\Entity\Truck;
|
use App\Entity\Truck;
|
||||||
use App\Entity\Vehicle;
|
use App\Entity\Vehicle;
|
||||||
|
use DateTimeImmutable;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Component\Console\Attribute\AsCommand;
|
use Symfony\Component\Console\Attribute\AsCommand;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
@@ -52,6 +58,12 @@ class SeedCommand extends Command
|
|||||||
$this->seedMerchandiseTypes();
|
$this->seedMerchandiseTypes();
|
||||||
$this->seedPelletTypes();
|
$this->seedPelletTypes();
|
||||||
$this->seedBuildings();
|
$this->seedBuildings();
|
||||||
|
$this->entityManager->flush();
|
||||||
|
|
||||||
|
$this->seedBuildingInfrastructure();
|
||||||
|
$this->entityManager->flush();
|
||||||
|
|
||||||
|
$this->seedBovines($io);
|
||||||
$this->seedReceptionTypes();
|
$this->seedReceptionTypes();
|
||||||
$this->seedBovineTypes();
|
$this->seedBovineTypes();
|
||||||
$this->seedShipmentTypes();
|
$this->seedShipmentTypes();
|
||||||
@@ -215,6 +227,137 @@ class SeedCommand extends Command
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function seedBuildingInfrastructure(): void
|
||||||
|
{
|
||||||
|
$statusByCode = [];
|
||||||
|
$statusRows = [
|
||||||
|
['label' => 'Libre', 'code' => 'LB', 'color' => '#A3B18A'],
|
||||||
|
['label' => 'Occupé', 'code' => 'OC', 'color' => '#3A506B'],
|
||||||
|
['label' => 'Malade', 'code' => 'ML', 'color' => '#E07A5F'],
|
||||||
|
];
|
||||||
|
foreach ($statusRows as $statusRow) {
|
||||||
|
/** @var Statut $status */
|
||||||
|
$status = $this->upsertByCode(Statut::class, $statusRow['code'], static function (Statut $entity) use ($statusRow) {
|
||||||
|
$entity
|
||||||
|
->setLabel($statusRow['label'])
|
||||||
|
->setCode($statusRow['code'])
|
||||||
|
->setColor($statusRow['color'])
|
||||||
|
;
|
||||||
|
});
|
||||||
|
$statusByCode[$statusRow['code']] = $status;
|
||||||
|
}
|
||||||
|
|
||||||
|
$buildingRepo = $this->entityManager->getRepository(Building::class);
|
||||||
|
$layoutByBuildingCode = [];
|
||||||
|
$layoutRows = [
|
||||||
|
['buildingCode' => 'B1', 'name' => 'plan1', 'columns' => 23, 'rows' => 2],
|
||||||
|
['buildingCode' => 'B2', 'name' => 'plan2', 'columns' => 23, 'rows' => 2],
|
||||||
|
['buildingCode' => 'B3', 'name' => 'plan3', 'columns' => 23, 'rows' => 2],
|
||||||
|
];
|
||||||
|
foreach ($layoutRows as $layoutRow) {
|
||||||
|
$building = $buildingRepo->findOneBy(['code' => $layoutRow['buildingCode']]);
|
||||||
|
if (!$building instanceof Building) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @var BuildingLayout $layout */
|
||||||
|
$layout = $this->upsertByName(BuildingLayout::class, $layoutRow['name'], static function (BuildingLayout $entity) use ($layoutRow, $building) {
|
||||||
|
$entity
|
||||||
|
->setName($layoutRow['name'])
|
||||||
|
->setColumns($layoutRow['columns'])
|
||||||
|
->setRows($layoutRow['rows'])
|
||||||
|
->setIdBuilding($building)
|
||||||
|
;
|
||||||
|
});
|
||||||
|
$layoutByBuildingCode[$layoutRow['buildingCode']] = $layout;
|
||||||
|
}
|
||||||
|
|
||||||
|
$caseRows = [
|
||||||
|
['buildingCode' => 'B1', 'from' => 1, 'to' => 12, 'status' => 'LB'],
|
||||||
|
['buildingCode' => 'B1', 'from' => 13, 'to' => 24, 'status' => 'OC'],
|
||||||
|
['buildingCode' => 'B1', 'from' => 25, 'to' => 32, 'status' => 'ML'],
|
||||||
|
['buildingCode' => 'B1', 'from' => 33, 'to' => 44, 'status' => 'LB'],
|
||||||
|
['buildingCode' => 'B2', 'from' => 1, 'to' => 10, 'status' => 'OC'],
|
||||||
|
['buildingCode' => 'B2', 'from' => 11, 'to' => 22, 'status' => 'LB'],
|
||||||
|
['buildingCode' => 'B2', 'from' => 23, 'to' => 30, 'status' => 'ML'],
|
||||||
|
['buildingCode' => 'B2', 'from' => 31, 'to' => 44, 'status' => 'OC'],
|
||||||
|
['buildingCode' => 'B3', 'from' => 1, 'to' => 8, 'status' => 'ML'],
|
||||||
|
['buildingCode' => 'B3', 'from' => 9, 'to' => 20, 'status' => 'LB'],
|
||||||
|
['buildingCode' => 'B3', 'from' => 21, 'to' => 34, 'status' => 'OC'],
|
||||||
|
['buildingCode' => 'B3', 'from' => 35, 'to' => 44, 'status' => 'ML'],
|
||||||
|
];
|
||||||
|
|
||||||
|
$caseByCode = [];
|
||||||
|
foreach ($caseRows as $caseRow) {
|
||||||
|
$building = $buildingRepo->findOneBy(['code' => $caseRow['buildingCode']]);
|
||||||
|
$status = $statusByCode[$caseRow['status']] ?? null;
|
||||||
|
if (!$building instanceof Building || !$status instanceof Statut) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
for ($caseNumber = $caseRow['from']; $caseNumber <= $caseRow['to']; ++$caseNumber) {
|
||||||
|
$code = sprintf('%s-C%d', $caseRow['buildingCode'], $caseNumber);
|
||||||
|
|
||||||
|
/** @var BuildingCase $buildingCase */
|
||||||
|
$buildingCase = $this->upsertByCode(BuildingCase::class, $code, static function (BuildingCase $entity) use ($code, $caseNumber, $building, $status) {
|
||||||
|
$entity
|
||||||
|
->setCode($code)
|
||||||
|
->setCaseNumber($caseNumber)
|
||||||
|
->setCapacity(15)
|
||||||
|
->setIdBuilding($building)
|
||||||
|
->setStatut($status)
|
||||||
|
;
|
||||||
|
});
|
||||||
|
$caseByCode[$code] = $buildingCase;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$slots = $this->buildSlotMap();
|
||||||
|
$positionRepo = $this->entityManager->getRepository(BuildingCasePosition::class);
|
||||||
|
|
||||||
|
foreach (['B1' => 'plan1', 'B2' => 'plan2', 'B3' => 'plan3'] as $buildingCode => $layoutName) {
|
||||||
|
$layout = $layoutByBuildingCode[$buildingCode] ?? null;
|
||||||
|
if (!$layout instanceof BuildingLayout || $layout->getName() !== $layoutName) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($slots as $slot) {
|
||||||
|
$caseCode = sprintf('%s-C%d', $buildingCode, $slot['caseNumber']);
|
||||||
|
$buildingCase = $caseByCode[$caseCode] ?? null;
|
||||||
|
if (!$buildingCase instanceof BuildingCase) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$position = $positionRepo->findOneBy([
|
||||||
|
'buildingLayout' => $layout,
|
||||||
|
'buildingCase' => $buildingCase,
|
||||||
|
'x' => $slot['x'],
|
||||||
|
'y' => $slot['y'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
if ($position instanceof BuildingCasePosition) {
|
||||||
|
++$this->updated;
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$position = new BuildingCasePosition();
|
||||||
|
$position
|
||||||
|
->setX($slot['x'])
|
||||||
|
->setY($slot['y'])
|
||||||
|
->setW($slot['w'])
|
||||||
|
->setH($slot['h'])
|
||||||
|
->setRenderOrder((string) $slot['renderOrder'])
|
||||||
|
->setBuildingLayout($layout)
|
||||||
|
->setBuildingCase($buildingCase)
|
||||||
|
;
|
||||||
|
|
||||||
|
++$this->created;
|
||||||
|
$this->entityManager->persist($position);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private function seedReceptionTypes(): void
|
private function seedReceptionTypes(): void
|
||||||
{
|
{
|
||||||
$receptionTypes = [
|
$receptionTypes = [
|
||||||
@@ -231,6 +374,134 @@ class SeedCommand extends Command
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function seedBovines(SymfonyStyle $io): void
|
||||||
|
{
|
||||||
|
$rows = [
|
||||||
|
[1, 15, '7979580026', 390, '2026-02-25'],
|
||||||
|
[5, 113, '4405604924', 397, '2025-05-22'],
|
||||||
|
[4, 113, '4405604944', 375, '2025-05-22'],
|
||||||
|
[2, 113, '4963291114', 319, '2025-05-22'],
|
||||||
|
[3, 113, '4405604922', 386, '2025-05-22'],
|
||||||
|
[6, 126, '4415811026', 367, '2025-07-02'],
|
||||||
|
[7, 126, '4950971149', 398, '2025-07-02'],
|
||||||
|
[8, 126, '4950971170', 386, '2025-07-02'],
|
||||||
|
[9, 126, '4489751630', 408, '2025-07-02'],
|
||||||
|
[10, 126, '8551323003', 478, '2025-07-02'],
|
||||||
|
[11, 126, '8503833703', 378, '2025-07-02'],
|
||||||
|
[12, 126, '4402104572', 379, '2025-07-02'],
|
||||||
|
[13, 126, '4402104580', 465, '2025-07-02'],
|
||||||
|
[14, 126, '4402104607', 381, '2025-07-02'],
|
||||||
|
[15, 126, '8504059581', 446, '2025-07-02'],
|
||||||
|
[16, 124, '4950971161', 382, '2025-07-02'],
|
||||||
|
[17, 124, '5652911499', 376, '2025-07-02'],
|
||||||
|
[18, 124, '8551323029', 414, '2025-07-02'],
|
||||||
|
[19, 124, '4402104590', 474, '2025-07-02'],
|
||||||
|
[20, 124, '4402104594', 408, '2025-07-02'],
|
||||||
|
[21, 124, '4402104595', 399, '2025-07-02'],
|
||||||
|
[22, 124, '4402104604', 374, '2025-07-02'],
|
||||||
|
[23, 124, '8504059579', 403, '2025-07-02'],
|
||||||
|
[24, 124, '8504059590', 398, '2025-07-02'],
|
||||||
|
[25, 123, '8551782070', 395, '2025-07-02'],
|
||||||
|
[26, 123, '8551782080', 443, '2025-07-02'],
|
||||||
|
[27, 123, '8551782084', 394, '2025-07-02'],
|
||||||
|
[28, 123, '8551782090', 378, '2025-07-02'],
|
||||||
|
[29, 123, '8551782092', 424, '2025-07-02'],
|
||||||
|
[30, 123, '8551782094', 389, '2025-07-02'],
|
||||||
|
[31, 123, '8551782099', 411, '2025-07-02'],
|
||||||
|
[32, 123, '8551323020', 392, '2025-07-02'],
|
||||||
|
[33, 123, '8551323051', 371, '2025-07-02'],
|
||||||
|
[34, 123, '7947673148', 378, '2025-07-02'],
|
||||||
|
[39, 114, '1731177447', 395, '2025-06-19'],
|
||||||
|
[42, 114, '1726167608', 299, '2025-06-19'],
|
||||||
|
[38, 114, '1731177442', 343, '2025-06-19'],
|
||||||
|
[40, 114, '1731177448', 362, '2025-06-19'],
|
||||||
|
[41, 114, '1731177458', 359, '2025-06-19'],
|
||||||
|
[35, 114, '7946282100', 291, '2025-06-19'],
|
||||||
|
[43, 114, '1726167613', 339, '2025-06-19'],
|
||||||
|
[37, 114, '1731177427', 375, '2025-06-19'],
|
||||||
|
[36, 114, '7946282103', 354, '2025-06-19'],
|
||||||
|
];
|
||||||
|
|
||||||
|
$bovineRepo = $this->entityManager->getRepository(Bovine::class);
|
||||||
|
$caseRepo = $this->entityManager->getRepository(BuildingCase::class);
|
||||||
|
|
||||||
|
foreach ($rows as [, $legacyCaseId, $nationalNumber, $receivedWeight, $arrivalDate]) {
|
||||||
|
$buildingCase = $this->resolveBuildingCaseByLegacyId((int) $legacyCaseId);
|
||||||
|
if (!$buildingCase instanceof BuildingCase) {
|
||||||
|
$buildingCase = $caseRepo->find((int) $legacyCaseId);
|
||||||
|
}
|
||||||
|
if (!$buildingCase instanceof BuildingCase) {
|
||||||
|
$io->warning(sprintf(
|
||||||
|
'Bovine %s skipped: building_case token %d not found.',
|
||||||
|
$nationalNumber,
|
||||||
|
$legacyCaseId
|
||||||
|
));
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$bovine = $bovineRepo->findOneBy(['nationalNumber' => $nationalNumber]);
|
||||||
|
if (!$bovine instanceof Bovine) {
|
||||||
|
$bovine = new Bovine();
|
||||||
|
++$this->created;
|
||||||
|
} else {
|
||||||
|
++$this->updated;
|
||||||
|
}
|
||||||
|
|
||||||
|
$bovine
|
||||||
|
->setNationalNumber((string) $nationalNumber)
|
||||||
|
->setBuildingCase($buildingCase)
|
||||||
|
->setReceivedWeight((int) $receivedWeight)
|
||||||
|
->setArrivalDate(new DateTimeImmutable((string) $arrivalDate))
|
||||||
|
;
|
||||||
|
|
||||||
|
$this->entityManager->persist($bovine);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<int, array{x:int,y:int,w:int,h:int,renderOrder:int,caseNumber:int}>
|
||||||
|
*/
|
||||||
|
private function buildSlotMap(): array
|
||||||
|
{
|
||||||
|
$slots = [];
|
||||||
|
|
||||||
|
for ($column = 1; $column <= 12; ++$column) {
|
||||||
|
$slots[] = ['x' => $column, 'y' => 1, 'w' => 1, 'h' => 1, 'renderOrder' => $column, 'caseNumber' => $column + 12];
|
||||||
|
}
|
||||||
|
for ($column = 14; $column <= 23; ++$column) {
|
||||||
|
$slots[] = ['x' => $column, 'y' => 1, 'w' => 1, 'h' => 1, 'renderOrder' => $column - 1, 'caseNumber' => $column + 11];
|
||||||
|
}
|
||||||
|
for ($column = 1; $column <= 12; ++$column) {
|
||||||
|
$slots[] = ['x' => $column, 'y' => 2, 'w' => 1, 'h' => 1, 'renderOrder' => 22 + $column, 'caseNumber' => 13 - $column];
|
||||||
|
}
|
||||||
|
for ($column = 14; $column <= 23; ++$column) {
|
||||||
|
$slots[] = ['x' => $column, 'y' => 2, 'w' => 1, 'h' => 1, 'renderOrder' => 21 + $column, 'caseNumber' => 58 - $column];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $slots;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function resolveBuildingCaseByLegacyId(int $legacyCaseId): ?BuildingCase
|
||||||
|
{
|
||||||
|
if ($legacyCaseId < 1) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$buildingNumber = intdiv($legacyCaseId - 1, 44) + 1;
|
||||||
|
$caseNumber = (($legacyCaseId - 1) % 44) + 1;
|
||||||
|
|
||||||
|
if ($buildingNumber < 1 || $buildingNumber > 3) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$code = sprintf('B%d-C%d', $buildingNumber, $caseNumber);
|
||||||
|
|
||||||
|
$buildingCase = $this->entityManager->getRepository(BuildingCase::class)->findOneBy(['code' => $code]);
|
||||||
|
|
||||||
|
return $buildingCase instanceof BuildingCase ? $buildingCase : null;
|
||||||
|
}
|
||||||
|
|
||||||
private function seedBovineTypes(): void
|
private function seedBovineTypes(): void
|
||||||
{
|
{
|
||||||
$bovineTypes = [
|
$bovineTypes = [
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ class AppFixtures extends Fixture implements DependentFixtureInterface
|
|||||||
return [
|
return [
|
||||||
TransportFixtures::class,
|
TransportFixtures::class,
|
||||||
ReferenceFixtures::class,
|
ReferenceFixtures::class,
|
||||||
|
BuildingInfrastructureFixtures::class,
|
||||||
|
BovineFixtures::class,
|
||||||
UserFixtures::class,
|
UserFixtures::class,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
120
src/DataFixtures/BovineFixtures.php
Normal file
120
src/DataFixtures/BovineFixtures.php
Normal file
@@ -0,0 +1,120 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\DataFixtures;
|
||||||
|
|
||||||
|
use App\Entity\Bovine;
|
||||||
|
use App\Entity\BuildingCase;
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||||
|
use Doctrine\Common\DataFixtures\DependentFixtureInterface;
|
||||||
|
use Doctrine\Persistence\ObjectManager;
|
||||||
|
|
||||||
|
class BovineFixtures extends Fixture implements DependentFixtureInterface
|
||||||
|
{
|
||||||
|
public function load(ObjectManager $manager): void
|
||||||
|
{
|
||||||
|
$rows = [
|
||||||
|
[1, 15, '7979580026', 390, '2026-02-25'],
|
||||||
|
[5, 113, '4405604924', 397, '2025-05-22'],
|
||||||
|
[4, 113, '4405604944', 375, '2025-05-22'],
|
||||||
|
[2, 113, '4963291114', 319, '2025-05-22'],
|
||||||
|
[3, 113, '4405604922', 386, '2025-05-22'],
|
||||||
|
[6, 126, '4415811026', 367, '2025-07-02'],
|
||||||
|
[7, 126, '4950971149', 398, '2025-07-02'],
|
||||||
|
[8, 126, '4950971170', 386, '2025-07-02'],
|
||||||
|
[9, 126, '4489751630', 408, '2025-07-02'],
|
||||||
|
[10, 126, '8551323003', 478, '2025-07-02'],
|
||||||
|
[11, 126, '8503833703', 378, '2025-07-02'],
|
||||||
|
[12, 126, '4402104572', 379, '2025-07-02'],
|
||||||
|
[13, 126, '4402104580', 465, '2025-07-02'],
|
||||||
|
[14, 126, '4402104607', 381, '2025-07-02'],
|
||||||
|
[15, 126, '8504059581', 446, '2025-07-02'],
|
||||||
|
[16, 124, '4950971161', 382, '2025-07-02'],
|
||||||
|
[17, 124, '5652911499', 376, '2025-07-02'],
|
||||||
|
[18, 124, '8551323029', 414, '2025-07-02'],
|
||||||
|
[19, 124, '4402104590', 474, '2025-07-02'],
|
||||||
|
[20, 124, '4402104594', 408, '2025-07-02'],
|
||||||
|
[21, 124, '4402104595', 399, '2025-07-02'],
|
||||||
|
[22, 124, '4402104604', 374, '2025-07-02'],
|
||||||
|
[23, 124, '8504059579', 403, '2025-07-02'],
|
||||||
|
[24, 124, '8504059590', 398, '2025-07-02'],
|
||||||
|
[25, 123, '8551782070', 395, '2025-07-02'],
|
||||||
|
[26, 123, '8551782080', 443, '2025-07-02'],
|
||||||
|
[27, 123, '8551782084', 394, '2025-07-02'],
|
||||||
|
[28, 123, '8551782090', 378, '2025-07-02'],
|
||||||
|
[29, 123, '8551782092', 424, '2025-07-02'],
|
||||||
|
[30, 123, '8551782094', 389, '2025-07-02'],
|
||||||
|
[31, 123, '8551782099', 411, '2025-07-02'],
|
||||||
|
[32, 123, '8551323020', 392, '2025-07-02'],
|
||||||
|
[33, 123, '8551323051', 371, '2025-07-02'],
|
||||||
|
[34, 123, '7947673148', 378, '2025-07-02'],
|
||||||
|
[39, 114, '1731177447', 395, '2025-06-19'],
|
||||||
|
[42, 114, '1726167608', 299, '2025-06-19'],
|
||||||
|
[38, 114, '1731177442', 343, '2025-06-19'],
|
||||||
|
[40, 114, '1731177448', 362, '2025-06-19'],
|
||||||
|
[41, 114, '1731177458', 359, '2025-06-19'],
|
||||||
|
[35, 114, '7946282100', 291, '2025-06-19'],
|
||||||
|
[43, 114, '1726167613', 339, '2025-06-19'],
|
||||||
|
[37, 114, '1731177427', 375, '2025-06-19'],
|
||||||
|
[36, 114, '7946282103', 354, '2025-06-19'],
|
||||||
|
];
|
||||||
|
|
||||||
|
$bovineRepository = $manager->getRepository(Bovine::class);
|
||||||
|
$caseRepository = $manager->getRepository(BuildingCase::class);
|
||||||
|
|
||||||
|
foreach ($rows as [, $legacyCaseId, $nationalNumber, $receivedWeight, $arrivalDate]) {
|
||||||
|
$buildingCase = $this->resolveBuildingCaseByLegacyId($manager, (int) $legacyCaseId);
|
||||||
|
if (!$buildingCase instanceof BuildingCase) {
|
||||||
|
$buildingCase = $caseRepository->find((int) $legacyCaseId);
|
||||||
|
}
|
||||||
|
if (!$buildingCase instanceof BuildingCase) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @var null|Bovine $bovine */
|
||||||
|
$bovine = $bovineRepository->findOneBy(['nationalNumber' => (string) $nationalNumber]);
|
||||||
|
if (!$bovine instanceof Bovine) {
|
||||||
|
$bovine = new Bovine();
|
||||||
|
}
|
||||||
|
|
||||||
|
$bovine
|
||||||
|
->setNationalNumber((string) $nationalNumber)
|
||||||
|
->setBuildingCase($buildingCase)
|
||||||
|
->setReceivedWeight((int) $receivedWeight)
|
||||||
|
->setArrivalDate(new DateTimeImmutable((string) $arrivalDate))
|
||||||
|
;
|
||||||
|
|
||||||
|
$manager->persist($bovine);
|
||||||
|
}
|
||||||
|
|
||||||
|
$manager->flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getDependencies(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
BuildingInfrastructureFixtures::class,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function resolveBuildingCaseByLegacyId(ObjectManager $manager, int $legacyCaseId): ?BuildingCase
|
||||||
|
{
|
||||||
|
if ($legacyCaseId < 1) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$buildingNumber = intdiv($legacyCaseId - 1, 44) + 1;
|
||||||
|
$caseNumber = (($legacyCaseId - 1) % 44) + 1;
|
||||||
|
|
||||||
|
if ($buildingNumber < 1 || $buildingNumber > 3) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$code = sprintf('B%d-C%d', $buildingNumber, $caseNumber);
|
||||||
|
$buildingCase = $manager->getRepository(BuildingCase::class)->findOneBy(['code' => $code]);
|
||||||
|
|
||||||
|
return $buildingCase instanceof BuildingCase ? $buildingCase : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
299
src/DataFixtures/BuildingInfrastructureFixtures.php
Normal file
299
src/DataFixtures/BuildingInfrastructureFixtures.php
Normal file
@@ -0,0 +1,299 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\DataFixtures;
|
||||||
|
|
||||||
|
use App\Entity\Building;
|
||||||
|
use App\Entity\BuildingCase;
|
||||||
|
use App\Entity\BuildingCasePosition;
|
||||||
|
use App\Entity\BuildingLayout;
|
||||||
|
use App\Entity\Statut;
|
||||||
|
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||||
|
use Doctrine\Common\DataFixtures\DependentFixtureInterface;
|
||||||
|
use Doctrine\Persistence\ObjectManager;
|
||||||
|
use RuntimeException;
|
||||||
|
|
||||||
|
class BuildingInfrastructureFixtures extends Fixture implements DependentFixtureInterface
|
||||||
|
{
|
||||||
|
public function load(ObjectManager $manager): void
|
||||||
|
{
|
||||||
|
$statuts = $this->loadStatuts($manager);
|
||||||
|
$buildings = $this->getBuildingsByCode($manager, ['B1', 'B2', 'B3']);
|
||||||
|
$layouts = $this->loadLayouts($manager, $buildings);
|
||||||
|
$cases = $this->loadBuildingCases($manager, $buildings, $statuts);
|
||||||
|
$this->loadCasePositions($manager, $layouts, $cases);
|
||||||
|
|
||||||
|
$manager->flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getDependencies(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
ReferenceFixtures::class,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, Statut>
|
||||||
|
*/
|
||||||
|
private function loadStatuts(ObjectManager $manager): array
|
||||||
|
{
|
||||||
|
$repo = $manager->getRepository(Statut::class);
|
||||||
|
|
||||||
|
$data = [
|
||||||
|
['label' => 'Libre', 'code' => 'LB', 'color' => '#A3B18A'],
|
||||||
|
['label' => 'Occupé', 'code' => 'OC', 'color' => '#3A506B'],
|
||||||
|
['label' => 'Malade', 'code' => 'ML', 'color' => '#E07A5F'],
|
||||||
|
];
|
||||||
|
|
||||||
|
$result = [];
|
||||||
|
foreach ($data as $row) {
|
||||||
|
/** @var null|Statut $statut */
|
||||||
|
$statut = $repo->findOneBy(['code' => $row['code']]);
|
||||||
|
if (!$statut instanceof Statut) {
|
||||||
|
$statut = new Statut()
|
||||||
|
->setLabel($row['label'])
|
||||||
|
->setCode($row['code'])
|
||||||
|
->setColor($row['color'])
|
||||||
|
;
|
||||||
|
$manager->persist($statut);
|
||||||
|
}
|
||||||
|
|
||||||
|
$result[$row['code']] = $statut;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param list<string> $codes
|
||||||
|
*
|
||||||
|
* @return array<string, Building>
|
||||||
|
*/
|
||||||
|
private function getBuildingsByCode(ObjectManager $manager, array $codes): array
|
||||||
|
{
|
||||||
|
$repo = $manager->getRepository(Building::class);
|
||||||
|
$result = [];
|
||||||
|
|
||||||
|
foreach ($codes as $code) {
|
||||||
|
/** @var null|Building $building */
|
||||||
|
$building = $repo->findOneBy(['code' => $code]);
|
||||||
|
if (!$building instanceof Building) {
|
||||||
|
throw new RuntimeException(sprintf('Building "%s" not found. Load ReferenceFixtures first.', $code));
|
||||||
|
}
|
||||||
|
|
||||||
|
$result[$code] = $building;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<string, Building> $buildings
|
||||||
|
*
|
||||||
|
* @return array<string, BuildingLayout>
|
||||||
|
*/
|
||||||
|
private function loadLayouts(ObjectManager $manager, array $buildings): array
|
||||||
|
{
|
||||||
|
$repo = $manager->getRepository(BuildingLayout::class);
|
||||||
|
|
||||||
|
$data = [
|
||||||
|
['name' => 'plan1', 'columns' => 23, 'rows' => 2, 'buildingCode' => 'B1'],
|
||||||
|
['name' => 'plan2', 'columns' => 23, 'rows' => 2, 'buildingCode' => 'B2'],
|
||||||
|
['name' => 'plan3', 'columns' => 23, 'rows' => 2, 'buildingCode' => 'B3'],
|
||||||
|
];
|
||||||
|
|
||||||
|
$result = [];
|
||||||
|
foreach ($data as $row) {
|
||||||
|
/** @var null|BuildingLayout $layout */
|
||||||
|
$layout = $repo->findOneBy(['name' => $row['name']]);
|
||||||
|
if (!$layout instanceof BuildingLayout) {
|
||||||
|
$layout = new BuildingLayout()
|
||||||
|
->setName($row['name'])
|
||||||
|
->setColumns($row['columns'])
|
||||||
|
->setRows($row['rows'])
|
||||||
|
->setIdBuilding($buildings[$row['buildingCode']])
|
||||||
|
;
|
||||||
|
$manager->persist($layout);
|
||||||
|
}
|
||||||
|
|
||||||
|
$result[$row['buildingCode']] = $layout;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<string, Building> $buildings
|
||||||
|
* @param array<string, Statut> $statuts
|
||||||
|
*
|
||||||
|
* @return array<string, BuildingCase>
|
||||||
|
*/
|
||||||
|
private function loadBuildingCases(ObjectManager $manager, array $buildings, array $statuts): array
|
||||||
|
{
|
||||||
|
$repo = $manager->getRepository(BuildingCase::class);
|
||||||
|
|
||||||
|
$statusRanges = [
|
||||||
|
// B1
|
||||||
|
['buildingCode' => 'B1', 'from' => 1, 'to' => 12, 'statut' => 'LB'],
|
||||||
|
['buildingCode' => 'B1', 'from' => 13, 'to' => 24, 'statut' => 'OC'],
|
||||||
|
['buildingCode' => 'B1', 'from' => 25, 'to' => 32, 'statut' => 'ML'],
|
||||||
|
['buildingCode' => 'B1', 'from' => 33, 'to' => 44, 'statut' => 'LB'],
|
||||||
|
// B2
|
||||||
|
['buildingCode' => 'B2', 'from' => 1, 'to' => 10, 'statut' => 'OC'],
|
||||||
|
['buildingCode' => 'B2', 'from' => 11, 'to' => 22, 'statut' => 'LB'],
|
||||||
|
['buildingCode' => 'B2', 'from' => 23, 'to' => 30, 'statut' => 'ML'],
|
||||||
|
['buildingCode' => 'B2', 'from' => 31, 'to' => 44, 'statut' => 'OC'],
|
||||||
|
// B3
|
||||||
|
['buildingCode' => 'B3', 'from' => 1, 'to' => 8, 'statut' => 'ML'],
|
||||||
|
['buildingCode' => 'B3', 'from' => 9, 'to' => 20, 'statut' => 'LB'],
|
||||||
|
['buildingCode' => 'B3', 'from' => 21, 'to' => 34, 'statut' => 'OC'],
|
||||||
|
['buildingCode' => 'B3', 'from' => 35, 'to' => 44, 'statut' => 'ML'],
|
||||||
|
];
|
||||||
|
|
||||||
|
$result = [];
|
||||||
|
foreach ($statusRanges as $range) {
|
||||||
|
for ($caseNumber = $range['from']; $caseNumber <= $range['to']; ++$caseNumber) {
|
||||||
|
$code = sprintf('%s-C%d', $range['buildingCode'], $caseNumber);
|
||||||
|
|
||||||
|
if (isset($result[$code])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @var null|BuildingCase $buildingCase */
|
||||||
|
$buildingCase = $repo->findOneBy(['code' => $code]);
|
||||||
|
if (!$buildingCase instanceof BuildingCase) {
|
||||||
|
$buildingCase = new BuildingCase()
|
||||||
|
->setCaseNumber($caseNumber)
|
||||||
|
->setCode($code)
|
||||||
|
->setCapacity(15)
|
||||||
|
->setIdBuilding($buildings[$range['buildingCode']])
|
||||||
|
->setStatut($statuts[$range['statut']])
|
||||||
|
;
|
||||||
|
$manager->persist($buildingCase);
|
||||||
|
}
|
||||||
|
|
||||||
|
$result[$code] = $buildingCase;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<string, BuildingLayout> $layouts
|
||||||
|
* @param array<string, BuildingCase> $casesByCode
|
||||||
|
*/
|
||||||
|
private function loadCasePositions(ObjectManager $manager, array $layouts, array $casesByCode): void
|
||||||
|
{
|
||||||
|
$repo = $manager->getRepository(BuildingCasePosition::class);
|
||||||
|
|
||||||
|
$layoutMap = [
|
||||||
|
'B1' => 'plan1',
|
||||||
|
'B2' => 'plan2',
|
||||||
|
'B3' => 'plan3',
|
||||||
|
];
|
||||||
|
|
||||||
|
$slots = $this->buildSlotMap();
|
||||||
|
|
||||||
|
foreach ($layoutMap as $buildingCode => $layoutName) {
|
||||||
|
$layout = $layouts[$buildingCode] ?? null;
|
||||||
|
if (!$layout instanceof BuildingLayout || $layout->getName() !== $layoutName) {
|
||||||
|
throw new RuntimeException(sprintf('Layout "%s" for building "%s" not found.', $layoutName, $buildingCode));
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($slots as $slot) {
|
||||||
|
$caseCode = sprintf('%s-C%d', $buildingCode, $slot['caseNumber']);
|
||||||
|
$buildingCase = $casesByCode[$caseCode] ?? null;
|
||||||
|
|
||||||
|
if (!$buildingCase instanceof BuildingCase) {
|
||||||
|
throw new RuntimeException(sprintf('Building case "%s" not found.', $caseCode));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @var null|BuildingCasePosition $position */
|
||||||
|
$position = $repo->findOneBy([
|
||||||
|
'buildingLayout' => $layout,
|
||||||
|
'buildingCase' => $buildingCase,
|
||||||
|
'x' => $slot['x'],
|
||||||
|
'y' => $slot['y'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
if ($position instanceof BuildingCasePosition) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$position = new BuildingCasePosition()
|
||||||
|
->setX($slot['x'])
|
||||||
|
->setY($slot['y'])
|
||||||
|
->setW($slot['w'])
|
||||||
|
->setH($slot['h'])
|
||||||
|
->setRenderOrder((string) $slot['renderOrder'])
|
||||||
|
->setBuildingLayout($layout)
|
||||||
|
->setBuildingCase($buildingCase)
|
||||||
|
;
|
||||||
|
$manager->persist($position);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reproduit le slot_map SQL (44 emplacements sur 2 lignes avec un gap en colonne 13).
|
||||||
|
*
|
||||||
|
* @return list<array{x:int,y:int,w:int,h:int,renderOrder:int,caseNumber:int}>
|
||||||
|
*/
|
||||||
|
private function buildSlotMap(): array
|
||||||
|
{
|
||||||
|
$slots = [];
|
||||||
|
|
||||||
|
// Ligne 1, colonnes 1..12 => cases 13..24
|
||||||
|
for ($c = 1; $c <= 12; ++$c) {
|
||||||
|
$slots[] = [
|
||||||
|
'x' => $c,
|
||||||
|
'y' => 1,
|
||||||
|
'w' => 1,
|
||||||
|
'h' => 1,
|
||||||
|
'renderOrder' => $c,
|
||||||
|
'caseNumber' => $c + 12,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ligne 1, colonnes 14..23 => cases 25..34
|
||||||
|
for ($c = 14; $c <= 23; ++$c) {
|
||||||
|
$slots[] = [
|
||||||
|
'x' => $c,
|
||||||
|
'y' => 1,
|
||||||
|
'w' => 1,
|
||||||
|
'h' => 1,
|
||||||
|
'renderOrder' => $c - 1,
|
||||||
|
'caseNumber' => $c + 11,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ligne 2, colonnes 1..12 => cases 12..1
|
||||||
|
for ($c = 1; $c <= 12; ++$c) {
|
||||||
|
$slots[] = [
|
||||||
|
'x' => $c,
|
||||||
|
'y' => 2,
|
||||||
|
'w' => 1,
|
||||||
|
'h' => 1,
|
||||||
|
'renderOrder' => 22 + $c,
|
||||||
|
'caseNumber' => 13 - $c,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ligne 2, colonnes 14..23 => cases 44..35
|
||||||
|
for ($c = 14; $c <= 23; ++$c) {
|
||||||
|
$slots[] = [
|
||||||
|
'x' => $c,
|
||||||
|
'y' => 2,
|
||||||
|
'w' => 1,
|
||||||
|
'h' => 1,
|
||||||
|
'renderOrder' => 21 + $c,
|
||||||
|
'caseNumber' => 58 - $c,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $slots;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
<?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: ['shipment' => 'exact'])]
|
|
||||||
#[ORM\UniqueConstraint(name: 'uniq_bovin_shipment_one_type', columns: ['shipment_id'])]
|
|
||||||
#[ORM\Table(name: 'bovin_shipment')]
|
|
||||||
#[ApiResource(
|
|
||||||
operations: [
|
|
||||||
new Get(
|
|
||||||
requirements: ['id' => '\d+'],
|
|
||||||
normalizationContext: ['groups' => ['shipment-bovine:read']],
|
|
||||||
),
|
|
||||||
new GetCollection(
|
|
||||||
normalizationContext: ['groups' => ['shipment-bovine:read']],
|
|
||||||
),
|
|
||||||
|
|
||||||
new Post(
|
|
||||||
normalizationContext: ['groups' => ['shipment-bovine:read']],
|
|
||||||
denormalizationContext: ['groups' => ['shipment-bovine:write']],
|
|
||||||
),
|
|
||||||
new Patch(
|
|
||||||
normalizationContext: ['groups' => ['shipment-bovine:read']],
|
|
||||||
denormalizationContext: ['groups' => ['shipment-bovine:write']],
|
|
||||||
),
|
|
||||||
new Delete(),
|
|
||||||
],
|
|
||||||
security: "is_granted('ROLE_USER')",
|
|
||||||
)]
|
|
||||||
class BovinShipment
|
|
||||||
{
|
|
||||||
#[ORM\Id]
|
|
||||||
#[ORM\GeneratedValue]
|
|
||||||
#[ORM\Column]
|
|
||||||
#[Groups(['shipment:read', 'shipment-bovine:read'])]
|
|
||||||
private ?int $id = null;
|
|
||||||
|
|
||||||
#[ORM\ManyToOne(inversedBy: 'bovinShipments')]
|
|
||||||
#[Groups(['shipment-bovine:read', 'shipment-bovine:write'])]
|
|
||||||
#[ApiProperty(readableLink: true)]
|
|
||||||
private ?Shipment $shipment = null;
|
|
||||||
|
|
||||||
#[ORM\ManyToOne]
|
|
||||||
#[Groups(['shipment:read', 'shipment-bovine:write', 'shipment-bovine:read'])]
|
|
||||||
#[ApiProperty(readableLink: true)]
|
|
||||||
private ?ShipmentType $shipmentType = null;
|
|
||||||
|
|
||||||
#[ORM\Column]
|
|
||||||
#[Groups(['shipment:read', 'shipment-bovine:write', 'shipment-bovine:read'])]
|
|
||||||
private ?int $nbBovinSend = null;
|
|
||||||
|
|
||||||
public function getId(): ?int
|
|
||||||
{
|
|
||||||
return $this->id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getShipment(): ?Shipment
|
|
||||||
{
|
|
||||||
return $this->shipment;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function setShipment(?Shipment $shipment): void
|
|
||||||
{
|
|
||||||
$this->shipment = $shipment;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getShipmentType(): ?ShipmentType
|
|
||||||
{
|
|
||||||
return $this->shipmentType;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function setShipmentType(?ShipmentType $shipmentType): void
|
|
||||||
{
|
|
||||||
$this->shipmentType = $shipmentType;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getNbBovinSend(): ?int
|
|
||||||
{
|
|
||||||
return $this->nbBovinSend;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function setNbBovinSend(?int $nbBovinSend): void
|
|
||||||
{
|
|
||||||
$this->nbBovinSend = $nbBovinSend;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
121
src/Entity/Bovine.php
Normal file
121
src/Entity/Bovine.php
Normal file
@@ -0,0 +1,121 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use ApiPlatform\Metadata\Patch;
|
||||||
|
use ApiPlatform\Metadata\Post;
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Context;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ORM\Table(name: 'bovine')]
|
||||||
|
#[ORM\UniqueConstraint(name: 'uniq_bovine_national_number', columns: ['national_number'])]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['bovine:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['bovine:read']],
|
||||||
|
),
|
||||||
|
new Post(
|
||||||
|
normalizationContext: ['groups' => ['bovine:read']],
|
||||||
|
denormalizationContext: ['groups' => ['bovine:write']],
|
||||||
|
security: "is_granted('ROLE_ADMIN')",
|
||||||
|
),
|
||||||
|
new Patch(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['bovine:read']],
|
||||||
|
denormalizationContext: ['groups' => ['bovine:write']],
|
||||||
|
security: "is_granted('ROLE_ADMIN')",
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class Bovine
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['bovine:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 50)]
|
||||||
|
#[Groups(['bovine:read', 'bovine:write'])]
|
||||||
|
private string $nationalNumber = '';
|
||||||
|
|
||||||
|
#[ORM\Column(nullable: true)]
|
||||||
|
#[Groups(['bovine:read', 'bovine:write'])]
|
||||||
|
private ?int $receivedWeight = null;
|
||||||
|
|
||||||
|
#[ORM\Column(type: 'date_immutable', nullable: true)]
|
||||||
|
#[Groups(['bovine:read', 'bovine:write'])]
|
||||||
|
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
||||||
|
private ?DateTimeImmutable $arrivalDate = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'bovines')]
|
||||||
|
#[Groups(['bovine:read', 'bovine:write'])]
|
||||||
|
private ?BuildingCase $buildingCase = null;
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getNationalNumber(): string
|
||||||
|
{
|
||||||
|
return $this->nationalNumber;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setNationalNumber(string $nationalNumber): static
|
||||||
|
{
|
||||||
|
$this->nationalNumber = $nationalNumber;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getReceivedWeight(): ?int
|
||||||
|
{
|
||||||
|
return $this->receivedWeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setReceivedWeight(?int $receivedWeight): static
|
||||||
|
{
|
||||||
|
$this->receivedWeight = $receivedWeight;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getArrivalDate(): ?DateTimeImmutable
|
||||||
|
{
|
||||||
|
return $this->arrivalDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setArrivalDate(?DateTimeImmutable $arrivalDate): static
|
||||||
|
{
|
||||||
|
$this->arrivalDate = $arrivalDate;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getBuildingCase(): ?BuildingCase
|
||||||
|
{
|
||||||
|
return $this->buildingCase;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setBuildingCase(?BuildingCase $buildingCase): static
|
||||||
|
{
|
||||||
|
$this->buildingCase = $buildingCase;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,6 +7,8 @@ namespace App\Entity;
|
|||||||
use ApiPlatform\Metadata\ApiResource;
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
use ApiPlatform\Metadata\Get;
|
use ApiPlatform\Metadata\Get;
|
||||||
use ApiPlatform\Metadata\GetCollection;
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use ApiPlatform\Metadata\Patch;
|
||||||
|
use ApiPlatform\Metadata\Post;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Symfony\Component\Serializer\Attribute\Groups;
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
@@ -20,6 +22,17 @@ use Symfony\Component\Serializer\Attribute\Groups;
|
|||||||
new GetCollection(
|
new GetCollection(
|
||||||
normalizationContext: ['groups' => ['bovine-type:read']],
|
normalizationContext: ['groups' => ['bovine-type:read']],
|
||||||
),
|
),
|
||||||
|
new Post(
|
||||||
|
normalizationContext: ['groups' => ['bovine-type:read']],
|
||||||
|
denormalizationContext: ['groups' => ['bovine-type:write']],
|
||||||
|
security: "is_granted('ROLE_ADMIN')",
|
||||||
|
),
|
||||||
|
new Patch(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['bovine-type:read']],
|
||||||
|
denormalizationContext: ['groups' => ['bovine-type:write']],
|
||||||
|
security: "is_granted('ROLE_ADMIN')",
|
||||||
|
),
|
||||||
],
|
],
|
||||||
security: "is_granted('ROLE_USER')",
|
security: "is_granted('ROLE_USER')",
|
||||||
)]
|
)]
|
||||||
@@ -32,11 +45,11 @@ class BovineType
|
|||||||
private ?int $id = null;
|
private ?int $id = null;
|
||||||
|
|
||||||
#[ORM\Column(length: 120)]
|
#[ORM\Column(length: 120)]
|
||||||
#[Groups(['bovine-type:read', 'reception:read', 'reception-bovine:read'])]
|
#[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read'])]
|
||||||
private ?string $label = null;
|
private ?string $label = null;
|
||||||
|
|
||||||
#[ORM\Column(length: 50)]
|
#[ORM\Column(length: 50)]
|
||||||
#[Groups(['bovine-type:read', 'reception:read', 'reception-bovine:read'])]
|
#[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read'])]
|
||||||
private ?string $code = null;
|
private ?string $code = null;
|
||||||
|
|
||||||
public function getId(): ?int
|
public function getId(): ?int
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ use Doctrine\Common\Collections\ArrayCollection;
|
|||||||
use Doctrine\Common\Collections\Collection;
|
use Doctrine\Common\Collections\Collection;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Symfony\Component\Serializer\Attribute\Groups;
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
use Symfony\Component\Serializer\Attribute\SerializedName;
|
||||||
|
|
||||||
#[ORM\Entity]
|
#[ORM\Entity]
|
||||||
#[ORM\Table(name: 'building')]
|
#[ORM\Table(name: 'building')]
|
||||||
@@ -48,9 +49,25 @@ class Building
|
|||||||
#[ORM\ManyToMany(targetEntity: Reception::class, mappedBy: 'buildings')]
|
#[ORM\ManyToMany(targetEntity: Reception::class, mappedBy: 'buildings')]
|
||||||
private Collection $receptions;
|
private Collection $receptions;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, BuildingCase>
|
||||||
|
*/
|
||||||
|
#[ORM\OneToMany(targetEntity: BuildingCase::class, mappedBy: 'id_building')]
|
||||||
|
private Collection $buildingCases;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, BuildingLayout>
|
||||||
|
*/
|
||||||
|
#[ORM\OneToMany(targetEntity: BuildingLayout::class, mappedBy: 'id_building')]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
#[SerializedName('layouts')]
|
||||||
|
private Collection $buildingLayout;
|
||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
$this->receptions = new ArrayCollection();
|
$this->receptions = new ArrayCollection();
|
||||||
|
$this->buildingCases = new ArrayCollection();
|
||||||
|
$this->buildingLayout = new ArrayCollection();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getId(): ?int
|
public function getId(): ?int
|
||||||
@@ -89,4 +106,41 @@ class Building
|
|||||||
{
|
{
|
||||||
return $this->receptions;
|
return $this->receptions;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, BuildingCase>
|
||||||
|
*/
|
||||||
|
public function getBuildingCases(): Collection
|
||||||
|
{
|
||||||
|
return $this->buildingCases;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addBuildingCase(BuildingCase $buildingCase): static
|
||||||
|
{
|
||||||
|
if (!$this->buildingCases->contains($buildingCase)) {
|
||||||
|
$this->buildingCases->add($buildingCase);
|
||||||
|
$buildingCase->setIdBuilding($this);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function removeBuildingCase(BuildingCase $buildingCase): static
|
||||||
|
{
|
||||||
|
if ($this->buildingCases->removeElement($buildingCase)) {
|
||||||
|
if ($buildingCase->getIdBuilding() === $this) {
|
||||||
|
$buildingCase->setIdBuilding(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, BuildingLayout>
|
||||||
|
*/
|
||||||
|
public function getBuildingLayout(): Collection
|
||||||
|
{
|
||||||
|
return $this->buildingLayout;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
209
src/Entity/BuildingCase.php
Normal file
209
src/Entity/BuildingCase.php
Normal file
@@ -0,0 +1,209 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\OpenApi\Model\Operation as OpenApiOperation;
|
||||||
|
use App\State\BuildingCaseWeightsReportProvider;
|
||||||
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
|
use Doctrine\Common\Collections\Collection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
use Symfony\Component\Serializer\Attribute\SerializedName;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
uriTemplate: '/building_cases/{id}/weights-report',
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
openapi: new OpenApiOperation(
|
||||||
|
summary: 'Render case weights report',
|
||||||
|
description: 'Returns a PDF report of bovines stored in the selected case.',
|
||||||
|
),
|
||||||
|
output: false,
|
||||||
|
provider: BuildingCaseWeightsReportProvider::class,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class BuildingCase
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
#[SerializedName('caseNumber')]
|
||||||
|
private ?int $case_number = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 255)]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?string $code = null;
|
||||||
|
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?int $capacity = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, BuildingCasePosition>
|
||||||
|
*/
|
||||||
|
#[ORM\OneToMany(targetEntity: BuildingCasePosition::class, mappedBy: 'buildingCase')]
|
||||||
|
private Collection $id_case_position;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'buildingCases')]
|
||||||
|
private ?Building $id_building = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'id_case')]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?Statut $statut = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, Bovine>
|
||||||
|
*/
|
||||||
|
#[ORM\OneToMany(targetEntity: Bovine::class, mappedBy: 'buildingCase')]
|
||||||
|
private Collection $bovines;
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->id_case_position = new ArrayCollection();
|
||||||
|
$this->bovines = new ArrayCollection();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setId(int $id): static
|
||||||
|
{
|
||||||
|
$this->id = $id;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCaseNumber(): ?int
|
||||||
|
{
|
||||||
|
return $this->case_number;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCaseNumber(int $case_number): static
|
||||||
|
{
|
||||||
|
$this->case_number = $case_number;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCode(): ?string
|
||||||
|
{
|
||||||
|
return $this->code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCode(string $code): static
|
||||||
|
{
|
||||||
|
$this->code = $code;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getCapacity(): ?int
|
||||||
|
{
|
||||||
|
return $this->capacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setCapacity(int $capacity): static
|
||||||
|
{
|
||||||
|
$this->capacity = $capacity;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, BuildingCasePosition>
|
||||||
|
*/
|
||||||
|
public function getIdCasePosition(): Collection
|
||||||
|
{
|
||||||
|
return $this->id_case_position;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addIdCasePosition(BuildingCasePosition $idCasePosition): static
|
||||||
|
{
|
||||||
|
if (!$this->id_case_position->contains($idCasePosition)) {
|
||||||
|
$this->id_case_position->add($idCasePosition);
|
||||||
|
$idCasePosition->setBuildingCase($this);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function removeIdCasePosition(BuildingCasePosition $idCasePosition): static
|
||||||
|
{
|
||||||
|
if ($this->id_case_position->removeElement($idCasePosition)) {
|
||||||
|
// set the owning side to null (unless already changed)
|
||||||
|
if ($idCasePosition->getBuildingCase() === $this) {
|
||||||
|
$idCasePosition->setBuildingCase(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getIdBuilding(): ?Building
|
||||||
|
{
|
||||||
|
return $this->id_building;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setIdBuilding(?Building $id_building): static
|
||||||
|
{
|
||||||
|
$this->id_building = $id_building;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getStatut(): ?Statut
|
||||||
|
{
|
||||||
|
return $this->statut;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setStatut(?Statut $statut): static
|
||||||
|
{
|
||||||
|
$this->statut = $statut;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, Bovine>
|
||||||
|
*/
|
||||||
|
public function getBovines(): Collection
|
||||||
|
{
|
||||||
|
return $this->bovines;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addBovine(Bovine $bovine): static
|
||||||
|
{
|
||||||
|
if (!$this->bovines->contains($bovine)) {
|
||||||
|
$this->bovines->add($bovine);
|
||||||
|
$bovine->setBuildingCase($this);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function removeBovine(Bovine $bovine): static
|
||||||
|
{
|
||||||
|
if ($this->bovines->removeElement($bovine)) {
|
||||||
|
if ($bovine->getBuildingCase() === $this) {
|
||||||
|
$bovine->setBuildingCase(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
145
src/Entity/BuildingCasePosition.php
Normal file
145
src/Entity/BuildingCasePosition.php
Normal file
@@ -0,0 +1,145 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
use Symfony\Component\Serializer\Attribute\SerializedName;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
class BuildingCasePosition
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?int $x = null;
|
||||||
|
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?int $y = null;
|
||||||
|
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?int $w = null;
|
||||||
|
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?int $h = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 255)]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
#[SerializedName('renderOrder')]
|
||||||
|
private ?string $render_order = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'id_case_position')]
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
private ?BuildingLayout $buildingLayout = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'id_case_position')]
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?BuildingCase $buildingCase = null;
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setId(int $id): static
|
||||||
|
{
|
||||||
|
$this->id = $id;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getX(): ?int
|
||||||
|
{
|
||||||
|
return $this->x;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setX(int $x): static
|
||||||
|
{
|
||||||
|
$this->x = $x;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getY(): ?int
|
||||||
|
{
|
||||||
|
return $this->y;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setY(int $y): static
|
||||||
|
{
|
||||||
|
$this->y = $y;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getW(): ?int
|
||||||
|
{
|
||||||
|
return $this->w;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setW(int $w): static
|
||||||
|
{
|
||||||
|
$this->w = $w;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getH(): ?int
|
||||||
|
{
|
||||||
|
return $this->h;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setH(int $h): static
|
||||||
|
{
|
||||||
|
$this->h = $h;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getRenderOrder(): ?string
|
||||||
|
{
|
||||||
|
return $this->render_order;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setRenderOrder(string $render_order): static
|
||||||
|
{
|
||||||
|
$this->render_order = $render_order;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getBuildingLayout(): ?BuildingLayout
|
||||||
|
{
|
||||||
|
return $this->buildingLayout;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setBuildingLayout(?BuildingLayout $buildingLayout): static
|
||||||
|
{
|
||||||
|
$this->buildingLayout = $buildingLayout;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getBuildingCase(): ?BuildingCase
|
||||||
|
{
|
||||||
|
return $this->buildingCase;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setBuildingCase(?BuildingCase $buildingCase): static
|
||||||
|
{
|
||||||
|
$this->buildingCase = $buildingCase;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
140
src/Entity/BuildingLayout.php
Normal file
140
src/Entity/BuildingLayout.php
Normal file
@@ -0,0 +1,140 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
|
use Doctrine\Common\Collections\Collection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
use Symfony\Component\Serializer\Attribute\SerializedName;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
class BuildingLayout
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 255)]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?string $name = null;
|
||||||
|
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?int $columns = null;
|
||||||
|
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?int $rows = null;
|
||||||
|
|
||||||
|
#[ORM\ManyToOne(inversedBy: 'buildingLayout')]
|
||||||
|
#[ORM\JoinColumn(nullable: false)]
|
||||||
|
private ?Building $id_building = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, BuildingCasePosition>
|
||||||
|
*/
|
||||||
|
#[ORM\OneToMany(targetEntity: BuildingCasePosition::class, mappedBy: 'buildingLayout')]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
#[SerializedName('casePositions')]
|
||||||
|
private Collection $id_case_position;
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->id_case_position = new ArrayCollection();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setId(int $id): static
|
||||||
|
{
|
||||||
|
$this->id = $id;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getName(): ?string
|
||||||
|
{
|
||||||
|
return $this->name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setName(string $name): static
|
||||||
|
{
|
||||||
|
$this->name = $name;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getColumns(): ?int
|
||||||
|
{
|
||||||
|
return $this->columns;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setColumns(int $columns): static
|
||||||
|
{
|
||||||
|
$this->columns = $columns;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getRows(): ?int
|
||||||
|
{
|
||||||
|
return $this->rows;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setRows(int $rows): static
|
||||||
|
{
|
||||||
|
$this->rows = $rows;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getIdBuilding(): ?Building
|
||||||
|
{
|
||||||
|
return $this->id_building;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setIdBuilding(?Building $id_building): static
|
||||||
|
{
|
||||||
|
$this->id_building = $id_building;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, BuildingCasePosition>
|
||||||
|
*/
|
||||||
|
public function getIdCasePosition(): Collection
|
||||||
|
{
|
||||||
|
return $this->id_case_position;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addIdCasePosition(BuildingCasePosition $idCasePosition): static
|
||||||
|
{
|
||||||
|
if (!$this->id_case_position->contains($idCasePosition)) {
|
||||||
|
$this->id_case_position->add($idCasePosition);
|
||||||
|
$idCasePosition->setBuildingLayout($this);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function removeIdCasePosition(BuildingCasePosition $idCasePosition): static
|
||||||
|
{
|
||||||
|
if ($this->id_case_position->removeElement($idCasePosition)) {
|
||||||
|
// set the owning side to null (unless already changed)
|
||||||
|
if ($idCasePosition->getBuildingLayout() === $this) {
|
||||||
|
$idCasePosition->setBuildingLayout(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -123,17 +123,15 @@ class Shipment
|
|||||||
#[ApiProperty(readableLink: true)]
|
#[ApiProperty(readableLink: true)]
|
||||||
private ?Customer $customer = null;
|
private ?Customer $customer = null;
|
||||||
|
|
||||||
/**
|
#[ORM\ManyToOne(inversedBy: 'shipments')]
|
||||||
* @var Collection<int, BovinShipment>
|
#[ORM\JoinColumn(nullable: true)]
|
||||||
*/
|
|
||||||
#[ORM\OneToMany(
|
|
||||||
targetEntity: BovinShipment::class,
|
|
||||||
mappedBy: 'shipment',
|
|
||||||
cascade: ['persist', 'remove'],
|
|
||||||
orphanRemoval: true
|
|
||||||
)]
|
|
||||||
#[Groups(['shipment:read', 'shipment:write'])]
|
#[Groups(['shipment:read', 'shipment:write'])]
|
||||||
private Collection $bovinShipments;
|
#[ApiProperty(readableLink: true)]
|
||||||
|
private ?ShipmentType $shipmentType = null;
|
||||||
|
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['shipment:read', 'shipment:write'])]
|
||||||
|
private int $nbBovinSend = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var Collection<int, Weight>
|
* @var Collection<int, Weight>
|
||||||
@@ -156,7 +154,6 @@ class Shipment
|
|||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
$this->bovinShipments = new ArrayCollection();
|
|
||||||
$this->weights = new ArrayCollection();
|
$this->weights = new ArrayCollection();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -195,6 +192,26 @@ class Shipment
|
|||||||
$this->currentStep = $currentStep;
|
$this->currentStep = $currentStep;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getShipmentType(): ?ShipmentType
|
||||||
|
{
|
||||||
|
return $this->shipmentType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setShipmentType(?ShipmentType $shipmentType): void
|
||||||
|
{
|
||||||
|
$this->shipmentType = $shipmentType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getNbBovinSend(): int
|
||||||
|
{
|
||||||
|
return $this->nbBovinSend;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setNbBovinSend(int $nbBovinSend): void
|
||||||
|
{
|
||||||
|
$this->nbBovinSend = $nbBovinSend;
|
||||||
|
}
|
||||||
|
|
||||||
public function getIsValid(): ?bool
|
public function getIsValid(): ?bool
|
||||||
{
|
{
|
||||||
return $this->isValid;
|
return $this->isValid;
|
||||||
@@ -261,37 +278,6 @@ class Shipment
|
|||||||
$this->customer = $customer;
|
$this->customer = $customer;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getBovinShipments(): Collection
|
|
||||||
{
|
|
||||||
return $this->bovinShipments;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function setBovinShipments(Collection $bovinShipments): void
|
|
||||||
{
|
|
||||||
$this->bovinShipments = $bovinShipments;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function addBovinShipment(BovinShipment $bovinShipment): self
|
|
||||||
{
|
|
||||||
if (!$this->bovinShipments->contains($bovinShipment)) {
|
|
||||||
$this->bovinShipments->add($bovinShipment);
|
|
||||||
$bovinShipment->setShipment($this);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function removeBovinShipment(BovinShipment $bovinShipment): self
|
|
||||||
{
|
|
||||||
if ($this->bovinShipments->removeElement($bovinShipment)) {
|
|
||||||
if ($bovinShipment->getShipment() === $this) {
|
|
||||||
$bovinShipment->setShipment(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Collection<int, Weight>
|
* @return Collection<int, Weight>
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ namespace App\Entity;
|
|||||||
use ApiPlatform\Metadata\ApiResource;
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
use ApiPlatform\Metadata\Get;
|
use ApiPlatform\Metadata\Get;
|
||||||
use ApiPlatform\Metadata\GetCollection;
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
|
use Doctrine\Common\Collections\Collection;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Symfony\Component\Serializer\Attribute\Groups;
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
|
||||||
@@ -40,6 +42,14 @@ class ShipmentType
|
|||||||
#[Groups(['shipment-type:read', 'shipment:read'])]
|
#[Groups(['shipment-type:read', 'shipment:read'])]
|
||||||
private ?string $code = null;
|
private ?string $code = null;
|
||||||
|
|
||||||
|
#[ORM\OneToMany(mappedBy: 'shipmentType', targetEntity: Shipment::class)]
|
||||||
|
private Collection $shipments;
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->shipments = new ArrayCollection();
|
||||||
|
}
|
||||||
|
|
||||||
public function getId(): ?int
|
public function getId(): ?int
|
||||||
{
|
{
|
||||||
return $this->id;
|
return $this->id;
|
||||||
|
|||||||
138
src/Entity/Statut.php
Normal file
138
src/Entity/Statut.php
Normal file
@@ -0,0 +1,138 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Entity;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\GetCollection;
|
||||||
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
|
use Doctrine\Common\Collections\Collection;
|
||||||
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
use Symfony\Component\Serializer\Attribute\Groups;
|
||||||
|
use Symfony\Component\Serializer\Attribute\SerializedName;
|
||||||
|
|
||||||
|
#[ORM\Entity]
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
requirements: ['id' => '\d+'],
|
||||||
|
normalizationContext: ['groups' => ['building:read']],
|
||||||
|
),
|
||||||
|
new GetCollection(
|
||||||
|
normalizationContext: ['groups' => ['building:read']],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')",
|
||||||
|
)]
|
||||||
|
class Statut
|
||||||
|
{
|
||||||
|
#[ORM\Id]
|
||||||
|
#[ORM\GeneratedValue]
|
||||||
|
#[ORM\Column]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?int $id = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 255)]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?string $label = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 255)]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
private ?string $code = null;
|
||||||
|
|
||||||
|
#[ORM\Column(length: 255)]
|
||||||
|
#[Groups(['building:read'])]
|
||||||
|
#[SerializedName('couleur')]
|
||||||
|
private ?string $color = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Collection<int, BuildingCase>
|
||||||
|
*/
|
||||||
|
#[ORM\OneToMany(targetEntity: BuildingCase::class, mappedBy: 'statut')]
|
||||||
|
private Collection $id_case;
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this->id_case = new ArrayCollection();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getId(): ?int
|
||||||
|
{
|
||||||
|
return $this->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setId(int $id): static
|
||||||
|
{
|
||||||
|
$this->id = $id;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getColor(): ?string
|
||||||
|
{
|
||||||
|
return $this->color;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setColor(string $color): static
|
||||||
|
{
|
||||||
|
$this->color = $color;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, BuildingCase>
|
||||||
|
*/
|
||||||
|
public function getIdCase(): Collection
|
||||||
|
{
|
||||||
|
return $this->id_case;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function addIdCase(BuildingCase $idCase): static
|
||||||
|
{
|
||||||
|
if (!$this->id_case->contains($idCase)) {
|
||||||
|
$this->id_case->add($idCase);
|
||||||
|
$idCase->setStatut($this);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function removeIdCase(BuildingCase $idCase): static
|
||||||
|
{
|
||||||
|
if ($this->id_case->removeElement($idCase)) {
|
||||||
|
// set the owning side to null (unless already changed)
|
||||||
|
if ($idCase->getStatut() === $this) {
|
||||||
|
$idCase->setStatut(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,7 +26,7 @@ use Symfony\Component\Serializer\Attribute\Groups;
|
|||||||
),
|
),
|
||||||
new GetCollection(
|
new GetCollection(
|
||||||
normalizationContext: ['groups' => ['supplier:read']],
|
normalizationContext: ['groups' => ['supplier:read']],
|
||||||
security: "is_granted('ROLE_ADMIN')"
|
security: "is_granted('ROLE_USER')"
|
||||||
),
|
),
|
||||||
new Post(
|
new Post(
|
||||||
normalizationContext: ['groups' => ['supplier:read']],
|
normalizationContext: ['groups' => ['supplier:read']],
|
||||||
|
|||||||
214
src/State/BuildingCaseWeightsReportProvider.php
Normal file
214
src/State/BuildingCaseWeightsReportProvider.php
Normal file
@@ -0,0 +1,214 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\State;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\Operation;
|
||||||
|
use ApiPlatform\State\ProviderInterface;
|
||||||
|
use App\Entity\Bovine;
|
||||||
|
use App\Entity\BuildingCase;
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Dompdf\Dompdf;
|
||||||
|
use Malio\EdnotifBundle\Bovin\Api\BovinApiInterface;
|
||||||
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||||
|
use Throwable;
|
||||||
|
use Twig\Environment;
|
||||||
|
use Twig\Error\LoaderError;
|
||||||
|
use Twig\Error\RuntimeError;
|
||||||
|
use Twig\Error\SyntaxError;
|
||||||
|
|
||||||
|
final readonly class BuildingCaseWeightsReportProvider implements ProviderInterface
|
||||||
|
{
|
||||||
|
private const FRENCH_MONTHS = [
|
||||||
|
1 => 'Janvier',
|
||||||
|
2 => 'Février',
|
||||||
|
3 => 'Mars',
|
||||||
|
4 => 'Avril',
|
||||||
|
5 => 'Mai',
|
||||||
|
6 => 'Juin',
|
||||||
|
7 => 'Juillet',
|
||||||
|
8 => 'Août',
|
||||||
|
9 => 'Septembre',
|
||||||
|
10 => 'Octobre',
|
||||||
|
11 => 'Novembre',
|
||||||
|
12 => 'Décembre',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
private Environment $twig,
|
||||||
|
private EntityManagerInterface $entityManager,
|
||||||
|
private BovinApiInterface $bovinApi,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws RuntimeError
|
||||||
|
* @throws SyntaxError
|
||||||
|
* @throws LoaderError
|
||||||
|
*/
|
||||||
|
public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
|
||||||
|
{
|
||||||
|
$id = $uriVariables['id'] ?? null;
|
||||||
|
if (null === $id) {
|
||||||
|
throw new NotFoundHttpException('Case not found.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$buildingCase = $this->entityManager->getRepository(BuildingCase::class)->find($id);
|
||||||
|
if (!$buildingCase instanceof BuildingCase) {
|
||||||
|
throw new NotFoundHttpException('Case not found.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$rows = [];
|
||||||
|
$firstArrivalDate = null;
|
||||||
|
$headerBreedCode = null;
|
||||||
|
foreach ($buildingCase->getBovines() as $bovine) {
|
||||||
|
if (!$bovine instanceof Bovine) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$workNumber = null;
|
||||||
|
$birthDate = null;
|
||||||
|
$breedCode = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
$animalFileDto = $this->bovinApi->getAnimalFile(
|
||||||
|
nationalNumber: $bovine->getNationalNumber(),
|
||||||
|
countryCode: 'FR',
|
||||||
|
);
|
||||||
|
|
||||||
|
$workNumber = $animalFileDto->identification?->workNumber;
|
||||||
|
$birthDate = $animalFileDto->identification?->birthDate?->date?->format('d/m/y');
|
||||||
|
$breedCode = $this->normalizeBreedCode($animalFileDto->identification?->breedType);
|
||||||
|
if (null === $headerBreedCode && null !== $breedCode) {
|
||||||
|
$headerBreedCode = $breedCode;
|
||||||
|
}
|
||||||
|
} catch (Throwable) {
|
||||||
|
// Keep row data even if external identification service is unavailable.
|
||||||
|
}
|
||||||
|
|
||||||
|
$arrivalDate = $bovine->getArrivalDate();
|
||||||
|
if ($arrivalDate instanceof DateTimeImmutable && null === $firstArrivalDate) {
|
||||||
|
$firstArrivalDate = $arrivalDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
$projectedWeights = $this->buildProjectedWeights(
|
||||||
|
$bovine->getReceivedWeight(),
|
||||||
|
$arrivalDate,
|
||||||
|
$breedCode,
|
||||||
|
);
|
||||||
|
|
||||||
|
$rows[] = [
|
||||||
|
'nationalNumber' => $bovine->getNationalNumber(),
|
||||||
|
'workNumber' => $workNumber,
|
||||||
|
'birthDate' => $birthDate,
|
||||||
|
'receivedWeight' => $bovine->getReceivedWeight(),
|
||||||
|
'arrivalDate' => $bovine->getArrivalDate()?->format('d/m/Y'),
|
||||||
|
'projectedWeights' => $projectedWeights,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
$monthHeaders = $this->buildMonthHeaders($firstArrivalDate, $headerBreedCode);
|
||||||
|
|
||||||
|
$dompdf = new Dompdf();
|
||||||
|
$html = $this->twig->render('case_weights_report.html.twig', [
|
||||||
|
'buildingCase' => $buildingCase,
|
||||||
|
'rows' => $rows,
|
||||||
|
'monthHeaders' => $monthHeaders,
|
||||||
|
'printedAt' => new DateTimeImmutable(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$dompdf->loadHtml($html);
|
||||||
|
$dompdf->setPaper('A4', 'landscape');
|
||||||
|
$dompdf->render();
|
||||||
|
|
||||||
|
$filename = sprintf('tableau-poids-case-%d.pdf', $buildingCase->getId());
|
||||||
|
|
||||||
|
return new Response($dompdf->output(), Response::HTTP_OK, [
|
||||||
|
'Content-Type' => 'application/pdf',
|
||||||
|
'Content-Disposition' => 'inline; filename="'.$filename.'"',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function normalizeBreedCode(mixed $breedType): ?string
|
||||||
|
{
|
||||||
|
if (null === $breedType) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_numeric($breedType)) {
|
||||||
|
return (string) $breedType;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is_string($breedType) && preg_match('/\d+/', $breedType, $matches)) {
|
||||||
|
return $matches[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function resolveDailyGainKg(?string $breedCode): float
|
||||||
|
{
|
||||||
|
return match ($breedCode) {
|
||||||
|
'34' => 1.3, // Limousin
|
||||||
|
'38' => 1.5, // Charolais
|
||||||
|
default => 1.4, // Other breeds
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<int, null|float>
|
||||||
|
*/
|
||||||
|
private function buildProjectedWeights(?int $receivedWeight, ?DateTimeImmutable $arrivalDate, ?string $breedCode): array
|
||||||
|
{
|
||||||
|
$result = array_fill(0, 12, null);
|
||||||
|
if (null === $receivedWeight || !$arrivalDate instanceof DateTimeImmutable) {
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
$currentWeight = (float) $receivedWeight;
|
||||||
|
$dailyGainKg = $this->resolveDailyGainKg($breedCode);
|
||||||
|
|
||||||
|
for ($i = 0; $i < 12; ++$i) {
|
||||||
|
$monthDate = $arrivalDate->modify('first day of this month')->modify(sprintf('+%d month', $i));
|
||||||
|
$daysInMonth = (int) $monthDate->format('t');
|
||||||
|
|
||||||
|
$daysToApply = 0 === $i
|
||||||
|
? max($daysInMonth - (int) $arrivalDate->format('j'), 0)
|
||||||
|
: $daysInMonth;
|
||||||
|
|
||||||
|
$currentWeight += $daysToApply * $dailyGainKg;
|
||||||
|
$result[$i] = $currentWeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<int, array{name:string,days:string,base:string}>
|
||||||
|
*/
|
||||||
|
private function buildMonthHeaders(?DateTimeImmutable $arrivalDate, ?string $breedCode): array
|
||||||
|
{
|
||||||
|
$referenceDate = $arrivalDate ?? new DateTimeImmutable('first day of january this year');
|
||||||
|
$dailyGainKg = $this->resolveDailyGainKg($breedCode);
|
||||||
|
$headers = [];
|
||||||
|
|
||||||
|
for ($i = 0; $i < 12; ++$i) {
|
||||||
|
$monthDate = $referenceDate->modify('first day of this month')->modify(sprintf('+%d month', $i));
|
||||||
|
$monthIndex = (int) $monthDate->format('n');
|
||||||
|
$daysInMonth = (int) $monthDate->format('t');
|
||||||
|
$daysToApply = 0 === $i
|
||||||
|
? max($daysInMonth - (int) $referenceDate->format('j'), 0)
|
||||||
|
: $daysInMonth;
|
||||||
|
|
||||||
|
$headers[] = [
|
||||||
|
'name' => self::FRENCH_MONTHS[$monthIndex],
|
||||||
|
'days' => sprintf('%d jours', $daysToApply),
|
||||||
|
'baseValue' => $daysToApply * $dailyGainKg,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $headers;
|
||||||
|
}
|
||||||
|
}
|
||||||
430
templates/case_weights_report.html.twig
Normal file
430
templates/case_weights_report.html.twig
Normal file
@@ -0,0 +1,430 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="fr">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<style>
|
||||||
|
/* =========================
|
||||||
|
DOMPDF FRIENDLY SETTINGS
|
||||||
|
========================= */
|
||||||
|
@page { size: A4 landscape; }
|
||||||
|
|
||||||
|
html, body {
|
||||||
|
margin: 0;
|
||||||
|
padding: 6mm;
|
||||||
|
font-family: Helvetica, sans-serif;
|
||||||
|
font-size: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
/* DejaVu Sans est très bien géré par dompdf (accents, stabilité) */
|
||||||
|
font-family: Helvetica, sans-serif;
|
||||||
|
font-size: 10px;
|
||||||
|
color: #111;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sheet { width: auto; }
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
margin: 8px 0 16px 0;
|
||||||
|
padding: 0;
|
||||||
|
line-height: 1;
|
||||||
|
text-transform: uppercase;
|
||||||
|
}
|
||||||
|
|
||||||
|
table {
|
||||||
|
width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
table-layout: fixed;
|
||||||
|
}
|
||||||
|
|
||||||
|
th, td {
|
||||||
|
border: 2px solid #2b2b2b;
|
||||||
|
padding: 2px 3px;
|
||||||
|
text-align: center;
|
||||||
|
vertical-align: middle;
|
||||||
|
line-height: 1.1;
|
||||||
|
white-space: nowrap; /* important pour dompdf */
|
||||||
|
overflow: hidden; /* évite les débordements */
|
||||||
|
text-overflow: clip;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* =========================
|
||||||
|
HEADER (mise en page)
|
||||||
|
========================= */
|
||||||
|
.header-layout,
|
||||||
|
.header-layout td {
|
||||||
|
border: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-left td,
|
||||||
|
.header-right td {
|
||||||
|
border: 2px solid #2b2b2b;
|
||||||
|
font-weight: 700;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Bloc CASE */
|
||||||
|
.header-left td {
|
||||||
|
height: 34px;
|
||||||
|
font-size: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-left .case-label {
|
||||||
|
width: 34%;
|
||||||
|
letter-spacing: 0.2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-left .case-number {
|
||||||
|
width: 66%;
|
||||||
|
font-size: 18px; /* volontairement compact pour dompdf */
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Bloc PROVENANCE / RACE */
|
||||||
|
.header-right .label {
|
||||||
|
font-size: 11px;
|
||||||
|
height: 18px;
|
||||||
|
letter-spacing: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-right .mini {
|
||||||
|
height: 18px;
|
||||||
|
font-size: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-right .mini-empty {
|
||||||
|
height: 18px;
|
||||||
|
font-size: 9px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-right .race {
|
||||||
|
height: 24px;
|
||||||
|
font-size: 11px;
|
||||||
|
letter-spacing: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-right .breed {
|
||||||
|
font-size: 9px;
|
||||||
|
font-weight: 700;
|
||||||
|
padding: 0 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* =========================
|
||||||
|
TABLEAU PRINCIPAL
|
||||||
|
========================= */
|
||||||
|
.main {
|
||||||
|
margin-top: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main th {
|
||||||
|
background: #ffffff;
|
||||||
|
font-weight: 700;
|
||||||
|
padding: 2px 1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main .head-big {
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 700;
|
||||||
|
white-space: normal; /* permet les <br> */
|
||||||
|
line-height: 1.15;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main .month {
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main .days {
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main .sub-title {
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 700;
|
||||||
|
letter-spacing: 0;
|
||||||
|
padding: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main .base {
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Hauteurs de lignes d'en-tête (stables en dompdf) */
|
||||||
|
.main thead tr:nth-child(1) th { height: 24px; }
|
||||||
|
.main thead tr:nth-child(2) th { height: 18px; }
|
||||||
|
.main thead tr:nth-child(3) th { height: 18px; }
|
||||||
|
.main thead tr:nth-child(4) th { height: 18px; }
|
||||||
|
|
||||||
|
/* Lignes data */
|
||||||
|
.data-row td {
|
||||||
|
height: 18px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.row-work {
|
||||||
|
text-align: center;
|
||||||
|
font-size: 18px !important;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.row-weight,
|
||||||
|
.row-birth,
|
||||||
|
.row-month {
|
||||||
|
font-size: 9px;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* =========================
|
||||||
|
FOOTER VACCINS / NOTES
|
||||||
|
========================= */
|
||||||
|
.footer {
|
||||||
|
margin-top: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.footer th {
|
||||||
|
background: #ffffff;
|
||||||
|
font-size: 9px;
|
||||||
|
font-weight: 700;
|
||||||
|
padding: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.footer td {
|
||||||
|
font-size: 8px;
|
||||||
|
padding: 2px;
|
||||||
|
height: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.footer .small {
|
||||||
|
font-size: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Ligne méta */
|
||||||
|
.meta {
|
||||||
|
margin-top: 3px;
|
||||||
|
text-align: right;
|
||||||
|
font-size: 8px;
|
||||||
|
color: #444;
|
||||||
|
line-height: 1.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Petits ajustements dompdf */
|
||||||
|
.mt-0 { margin-top: 0; }
|
||||||
|
.mb-0 { margin-bottom: 0; }
|
||||||
|
|
||||||
|
/* Header droit sans bordures par défaut */
|
||||||
|
.header-right-free,
|
||||||
|
.header-right-free td {
|
||||||
|
padding: 0;
|
||||||
|
width: 6.25%;
|
||||||
|
}
|
||||||
|
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
{% set firstArrivalDate = rows is not empty ? rows[0].arrivalDate : null %}
|
||||||
|
{% set monthCount = ((monthHeaders|default([]))|length) > 0 ? ((monthHeaders|default([]))|length) : 12 %}
|
||||||
|
|
||||||
|
<div class="sheet">
|
||||||
|
|
||||||
|
<!-- =========================
|
||||||
|
EN-TÊTE (CASE / PROVENANCE / RACE)
|
||||||
|
========================= -->
|
||||||
|
<h1 style="color: red; text-align: center; width: 100%; font-size: 36px">
|
||||||
|
Arrivage du {{ firstArrivalDate ?? '-' }}
|
||||||
|
</h1>
|
||||||
|
<table style="width:100%; border-collapse:collapse; table-layout:fixed; margin-bottom: 16px">
|
||||||
|
<tr>
|
||||||
|
<td style="width:40%; vertical-align:top; padding-right:2mm; border:0;">
|
||||||
|
<table style="width:100%; border-collapse:collapse; table-layout:fixed;">
|
||||||
|
<tr>
|
||||||
|
<td style="border: 0; height: 20px"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td style="font-weight:700; text-align: left; border: none; font-size: 24px">CASE N° {{ buildingCase.caseNumber ?? '' }}</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td style="width:60%; vertical-align:top; padding-left:2mm; border:0;">
|
||||||
|
<table class="header-right-free" style="width:100%; border-collapse:collapse; table-layout:fixed;">
|
||||||
|
<tr>
|
||||||
|
<td style="border:0; text-align:center; font-weight:700; height: 20px;" colspan="5"></td>
|
||||||
|
<td style="border:0;" colspan="2"></td>
|
||||||
|
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700; height: 20px;">1</td>
|
||||||
|
<td style="border:0; height: 20px;"></td>
|
||||||
|
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700; height: 20px;">2</td>
|
||||||
|
<td style="border:0; height: 20px;"></td>
|
||||||
|
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700; height: 20px;">3</td>
|
||||||
|
<td style="border:0; height: 20px;"></td>
|
||||||
|
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700; height: 20px;">4</td>
|
||||||
|
<td style="border:0;" colspan="2"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td style="border:0; text-align:left; font-weight:700; font-size: 24px; width:40%; height: 20px;" colspan="5">PROVENANCE</td>
|
||||||
|
<td style="border:0;" colspan="2"></td>
|
||||||
|
<td style="border:1px solid #2b2b2b;"></td>
|
||||||
|
<td style="border:0;"></td>
|
||||||
|
<td style="border:1px solid #2b2b2b;"></td>
|
||||||
|
<td style="border:0;"></td>
|
||||||
|
<td style="border:1px solid #2b2b2b;"></td>
|
||||||
|
<td style="border:0;"></td>
|
||||||
|
<td style="border:1px solid #2b2b2b;"></td>
|
||||||
|
<td style="border: 0; width: 20%;" colspan="2"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td style="border: 0; height: 20px" colspan="16"></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td style="border: 0; text-align:left; font-weight:700; font-size: 24px" colspan="3">RACE</td>
|
||||||
|
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700;" colspan="3">LIMOUSIN</td>
|
||||||
|
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700;" colspan="1"></td>
|
||||||
|
<td style="border: 0; text-align:center; font-weight:700;" colspan="1"></td>
|
||||||
|
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700;" colspan="3">CHAROLAIS</td>
|
||||||
|
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700;" colspan="1"></td>
|
||||||
|
<td style="border: 0; text-align:center; font-weight:700;" colspan="1"></td>
|
||||||
|
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700;" colspan="2">Autre</td>
|
||||||
|
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700;" colspan="1"></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<!-- =========================
|
||||||
|
TABLEAU PRINCIPAL
|
||||||
|
========================= -->
|
||||||
|
<table class="main">
|
||||||
|
<colgroup>
|
||||||
|
<col style="width:8%">
|
||||||
|
<col style="width:4%">
|
||||||
|
<col style="width:7%">
|
||||||
|
{% for month in monthHeaders %}
|
||||||
|
<col style="width:6.75%">
|
||||||
|
{% endfor %}
|
||||||
|
</colgroup>
|
||||||
|
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th rowspan="4" class="head-big">N° de<br>travail</th>
|
||||||
|
<th rowspan="4" class="head-big head-big-weight">Poids<br>(kg)</th>
|
||||||
|
<th rowspan="4" class="head-big">Date de<br>naissance</th>
|
||||||
|
|
||||||
|
{% for month in monthHeaders|default([]) %}
|
||||||
|
<th class="month">{{ month.name }}</th>
|
||||||
|
{% endfor %}
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
{% for month in monthHeaders|default([]) %}
|
||||||
|
<th class="days">{{ month.days }}</th>
|
||||||
|
{% endfor %}
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<th colspan="{{ monthHeaders|length }}" class="sub-title">POIDS PAR MOIS</th>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
{% for month in monthHeaders|default([]) %}
|
||||||
|
<th class="base">
|
||||||
|
{% if month.baseValue is defined %}
|
||||||
|
{{ month.baseValue|round(0, 'common') }} kg
|
||||||
|
{% elseif month.base is defined %}
|
||||||
|
{{ month.base }}
|
||||||
|
{% endif %}
|
||||||
|
</th>
|
||||||
|
{% endfor %}
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
|
||||||
|
<tbody>
|
||||||
|
{# 11 lignes comme dans ton code (0..10) #}
|
||||||
|
{% for i in 0..12 %}
|
||||||
|
{% set row = rows[i] ?? null %}
|
||||||
|
{% set baseWeight = row ? (row.receivedWeight ?? null) : null %}
|
||||||
|
|
||||||
|
<tr class="data-row">
|
||||||
|
<td class="row-work">{{ row ? (row.workNumber ?? '') : '' }}</td>
|
||||||
|
<td class="row-weight">{{ baseWeight ?? '' }}</td>
|
||||||
|
<td class="row-birth">
|
||||||
|
{% if row and row.birthDate %}
|
||||||
|
{% set birthParts = row.birthDate|split('/') %}
|
||||||
|
{{ birthParts|length == 3 ? birthParts[1] ~ '/' ~ birthParts[2] : row.birthDate }}
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
|
{% for idx in 0..(monthCount > 0 ? monthCount - 1 : 0) %}
|
||||||
|
{% set projectedWeight = row and row.projectedWeights is defined ? (row.projectedWeights[idx] ?? null) : null %}
|
||||||
|
<td class="row-month"{% if loop.index0 < 4 %} style="background:#e0e0e0;"{% endif %}>
|
||||||
|
{{ projectedWeight is not null ? projectedWeight|round(0, 'common') : '' }}
|
||||||
|
</td>
|
||||||
|
{% endfor %}
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<!-- =========================
|
||||||
|
FOOTER (traitements / vaccins)
|
||||||
|
========================= -->
|
||||||
|
{# <table class="footer">#}
|
||||||
|
{# <colgroup>#}
|
||||||
|
{# #}{# 14 colonnes pour gérer proprement les colspan #}
|
||||||
|
{# <col style="width:12.5%">#}
|
||||||
|
{# <col style="width:8%">#}
|
||||||
|
{# <col style="width:12.5%">#}
|
||||||
|
{# <col style="width:8%">#}
|
||||||
|
{# <col style="width:12.5%">#}
|
||||||
|
{# <col style="width:8%">#}
|
||||||
|
{# <col style="width:12.5%">#}
|
||||||
|
{# <col style="width:8%">#}
|
||||||
|
{# <col style="width:8%">#}
|
||||||
|
{# <col style="width:6%">#}
|
||||||
|
{# <col style="width:8%">#}
|
||||||
|
{# <col style="width:8%">#}
|
||||||
|
{# <col style="width:6%">#}
|
||||||
|
{# <col style="width:8%">#}
|
||||||
|
{# </colgroup>#}
|
||||||
|
|
||||||
|
{# <tr>#}
|
||||||
|
{# <th colspan="2">Date</th>#}
|
||||||
|
{# <th colspan="2">Antibiotique</th>#}
|
||||||
|
{# <th colspan="2">Date</th>#}
|
||||||
|
{# <th colspan="2">Antero</th>#}
|
||||||
|
{# <th colspan="3">Grippe</th>#}
|
||||||
|
{# <th colspan="3">Protivity</th>#}
|
||||||
|
{# </tr>#}
|
||||||
|
|
||||||
|
{# <tr>#}
|
||||||
|
{# <td colspan="2"></td>#}
|
||||||
|
{# <td colspan="2"></td>#}
|
||||||
|
{# <td colspan="2"></td>#}
|
||||||
|
{# <td colspan="2"></td>#}
|
||||||
|
|
||||||
|
{# <td class="small">Date</td>#}
|
||||||
|
{# <td colspan="2" class="small">Intranasale</td>#}
|
||||||
|
|
||||||
|
{# <td class="small">Date</td>#}
|
||||||
|
{# <td colspan="2" class="small">Rappel 30 jours</td>#}
|
||||||
|
{# </tr>#}
|
||||||
|
|
||||||
|
{# <tr>#}
|
||||||
|
{# <td colspan="2"></td>#}
|
||||||
|
{# <td colspan="2"></td>#}
|
||||||
|
{# <td colspan="2"></td>#}
|
||||||
|
{# <td colspan="2" class="small">Rappel 30 jours</td>#}
|
||||||
|
|
||||||
|
{# <td></td>#}
|
||||||
|
{# <td colspan="2" class="small">Rappel 90 jours</td>#}
|
||||||
|
|
||||||
|
{# <td></td>#}
|
||||||
|
{# <td colspan="2" class="small">3 semaines</td>#}
|
||||||
|
{# </tr>#}
|
||||||
|
{# </table>#}
|
||||||
|
|
||||||
|
{# <div class="meta">#}
|
||||||
|
{# Édité le {{ printedAt|date('d/m/Y H:i') }} - Case {{ buildingCase.code ?? '' }}#}
|
||||||
|
{# </div>#}
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -250,13 +250,11 @@
|
|||||||
<td>
|
<td>
|
||||||
<strong>Bovin</strong><br><br>
|
<strong>Bovin</strong><br><br>
|
||||||
<div class="bigtable-notes">
|
<div class="bigtable-notes">
|
||||||
{% if shipment.bovinShipments is not empty %}
|
{% if shipment.shipmentType %}
|
||||||
{% for entry in shipment.bovinShipments %}
|
|
||||||
<p>
|
<p>
|
||||||
{{ entry.shipmentType ? entry.shipmentType.label : '-' }} :
|
{{ shipment.shipmentType.label ?? '-' }} :
|
||||||
{{ entry.nbBovinSend ?? 0 }}
|
{{ shipment.nbBovinSend ?? 0 }}
|
||||||
</p>
|
</p>
|
||||||
{% endfor %}
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<p>-</p>
|
<p>-</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
Reference in New Issue
Block a user