Compare commits

..

10 Commits

58 changed files with 187 additions and 3601 deletions

39
.idea/workspace.xml generated
View File

@@ -4,11 +4,13 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : corrections diverses">
<list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : correction du retour sur la liste des réceptions + suppression de la redirection après enregistrement">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/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" />
<change beforePath="$PROJECT_DIR$/frontend/components/reception/update-bovin.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/update-bovin.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/frontend/components/reception/update-merchandise.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/components/reception/update-merchandise.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/frontend/pages/reception/update/[[id]].vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/reception/update/[[id]].vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/frontend/services/dto/reception-data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/services/dto/reception-data.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -40,7 +42,7 @@
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="fit/332-refonte-reception-terminee" />
<entry key="$PROJECT_DIR$" value="develop" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -231,8 +233,8 @@
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
"RunOnceActivity.git.unshallow": "true",
"RunOnceActivity.typescript.service.memoryLimit.init": "true",
"git-widget-placeholder": "feat/278-plan-du-site",
"last_opened_file_path": "//wsl.localhost/Ubuntu-24.04/home/m-tristan/workspace/Ferme",
"git-widget-placeholder": "feat/332-refonte-reception-terminee",
"last_opened_file_path": "//wsl.localhost/Ubuntu-24.04/home/kevin/Stage/Ferme/frontend/pages/shipment",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@@ -256,7 +258,6 @@
}]]></component>
<component name="RecentsManager">
<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\composables" />
<recent name="\\wsl.localhost\Ubuntu-24.04\home\kevin\Stage\Ferme\frontend\components\shipment" />
@@ -311,14 +312,6 @@
<workItem from="1770966186589" duration="914000" />
<workItem from="1770967274060" duration="2388000" />
</task>
<task id="LOCAL-00007" summary="test : ajout de TU sur les services et providers">
<option name="closed" value="true" />
<created>1768318921478</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1768318921478</updated>
</task>
<task id="LOCAL-00008" summary="feat : ajout de la génération du bon de reception, correction de la base du formulaire multi-etape de reception et ajout d'une gestion d'erreur global">
<option name="closed" value="true" />
<created>1768498751836</created>
@@ -703,7 +696,15 @@
<option name="project" value="LOCAL" />
<updated>1770969471135</updated>
</task>
<option name="localTasksCounter" value="56" />
<task id="LOCAL-00056" summary="fix : correction du retour sur la liste des réceptions + suppression de la redirection après enregistrement">
<option name="closed" value="true" />
<created>1772008192160</created>
<option name="number" value="00056" />
<option name="presentableId" value="LOCAL-00056" />
<option name="project" value="LOCAL" />
<updated>1772008192161</updated>
</task>
<option name="localTasksCounter" value="57" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -753,7 +754,6 @@
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="fix : gitea workflow" />
<MESSAGE value="fix : script de déploiement" />
<MESSAGE value="feat : ajout plus d'information sur la liste des réceptions côté front sur la page d'accueil" />
<MESSAGE value="fix : redirige sur le login sur une 401 et reset du auth state + doc + timeout du toaster" />
@@ -778,7 +778,8 @@
<MESSAGE value="feat : lister les expeditions terminees" />
<MESSAGE value="fix: corrections diverses" />
<MESSAGE value="fix : corrections diverses" />
<option name="LAST_COMMIT_MESSAGE" value="fix : corrections diverses" />
<MESSAGE value="fix : correction du retour sur la liste des réceptions + suppression de la redirection après enregistrement" />
<option name="LAST_COMMIT_MESSAGE" value="fix : correction du retour sur la liste des réceptions + suppression de la redirection après enregistrement" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -817,4 +818,4 @@
<option value=".github/prompts" />
</promptFileLocations>
</component>
</project>
</project>

View File

@@ -8,7 +8,6 @@ Project overview
Backend conventions
- Use English for code identifiers/messages; keep “pont-bascule” as domain term.
- API Platform operations are defined on Doctrine entities.
- No custom repository classes are used (`src/Repository` removed); use default Doctrine repositories via `EntityManagerInterface`.
- Reception entity is in `src/Entity/Reception.php`, with custom weigh endpoint `/receptions/weigh`.
- Reception fields: `date_reception`, `license_plate`, `current_step` (default 0), `is_valid` (default false).
- Reception also has `identification_number` (auto `N-BR-####`), `merchandise_type`, `merchandise_detail`, `buildings` (M2M), and `pellet_buildings` (via `reception_pellet_building`).
@@ -18,13 +17,6 @@ Backend conventions
- Custom exception: `App\Exception\PontBasculeException` with French messages, mapped to 500 in provider.
- Parsing of pont-bascule payload is in `src/Service/PontBasculePayloadDecoder.php`.
- `config/reference.php` is auto-generated; keep it.
- Bovine storage:
- `src/Entity/Bovine.php` with fields `nationalNumber` (unique), `receivedWeight`, `arrivalDate`, and `buildingCase` (ManyToOne).
- `src/Entity/BuildingCase.php` has `bovines` (OneToMany).
- Case PDF report:
- Endpoint: `GET /building_cases/{id}/weights-report` (provider: `App\State\BuildingCaseWeightsReportProvider`).
- Template: `templates/case_weights_report.html.twig`.
- Projection logic is done in backend from `arrivalDate`; daily gain is currently fixed at `1.3 kg/day` for all races.
Frontend conventions
- Nuxt SSR disabled; Tailwind used.
@@ -44,7 +36,6 @@ Frontend conventions
- Service layer lives in `frontend/services/` with typed DTOs in `frontend/services/dto/`.
- Reception service uses `receptions`, `receptions/{id}`, `receptions/weigh` and supports success/error toast keys.
- Reception receipt endpoint is `receptions/{id}/receipt` (PDF) via `frontend/composables/usePdfPrinter.ts`.
- Infrastructure case page prints the case weight report PDF from `frontend/pages/infrastructure/case.vue` using `usePdfPrinter('/building_cases/{id}/weights-report')`.
Environment & routing
- Frontend dev server: `npm run dev` in `frontend/`.
@@ -56,11 +47,6 @@ Environment & routing
Notes
- Do not add a GET that creates resources; use POST + PATCH.
- Keep endpoints in plural (API Platform convention).
- Seed and fixtures conventions:
- `app:seed` now seeds infrastructure (`statut`, `building_layout`, `building_case`, `building_case_position`) and bovines.
- `app:seed` uses intermediate flushes (after buildings and after infrastructure) so find queries can resolve just-created records.
- Bovine seed rows use a legacy case token mapping to building-case code (`B{building}-C{case}`) before fallback to direct id lookup.
- Fixtures include `BuildingInfrastructureFixtures` + `BovineFixtures` (via `AppFixtures` dependencies).
- New reference data added:
- Reception types (`reception_type`, fields: `label`, `code`), selectable on reception form.
- Merchandise types (`merchandise_type`, fields: `label`, `code`) and pellet types (`pellet_type`, fields: `label`, `code`).

View File

@@ -50,12 +50,7 @@ Ajouter dans le fichier .env du frontend
* Creation page admin listing bovins
* Creation page admin ajout/modification bovins
* [#331] Mettre à jour l'entité Shipment et bovin_shipment
* [#278] Plan du site
* [#334] Correctifs
* [#332] Refonte écran réception terminée
* [#327] afficher/modifier écran expédition terminée
### Changed
### Fixed

View File

@@ -1,2 +1,2 @@
parameters:
app.version: '0.0.62'
app.version: '0.0.52'

View File

@@ -8,12 +8,11 @@
</div>
<button
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
type="submit"
:disabled="isLoading"
>
<Icon :name="props.address ? '' : 'mdi:plus'" size="28" />
{{ props.address? "Valider" : "Ajouter" }}
{{ props.address? "Sauvegarder" : "Ajouter" }}
</button>
</div>
@@ -23,13 +22,13 @@
<UiTextInput id="address-street2" v-model="form.street2" label="Complément" />
<UiTextInput id="address-postalCode" v-model="form.postalCode" label="Code postal" />
<UiTextInput id="address-city" v-model="form.city" label="Ville" />
<UiTextInput id="address-country" v-model="form.countryCode" label="Pays (code)" />
<UiTextInput id="address-country" v-model="form.countryCode" label="Pays" />
</div>
</form>
</template>
<script setup lang="ts">
import type { AddressPayload } from "~/services/address"
import { AddressPayload } from "~/services/address"
const route = useRoute()

View File

@@ -31,14 +31,11 @@
/>
</div>
</div>
<div class="flex justify-center">
<UiButton
type="submit"
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
@click="goNext"
>Valider
</UiButton>
</div>
<button
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
@click="goNext"
>Valider
</button>
</div>
</template>
<script setup lang="ts">

View File

@@ -64,14 +64,11 @@
</div>
</div>
</div>
<div class="flex justify-center">
<UiButton
type="submit"
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
@click="goNext"
>Valider
</UiButton>
</div>
<button
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
@click="goNext"
>Valider
</button>
</div>
</template>

View File

@@ -14,7 +14,6 @@
:min="0"
:max="10"
wrapperClass="w-44 flex-col"
inputClass="font-medium"
/>
</div>
<UiNumberInput
@@ -22,7 +21,6 @@
v-model="localOtherQuantity"
:disabled="!isAdmin"
wrapperClass="w-44 flex-col"
inputClass="font-medium"
/>
</div>
</form>
@@ -48,38 +46,8 @@ const emit = defineEmits<{
const bovineTypes = ref<BovineTypeData[]>([])
const localQuantities = reactive<Record<string, number | null>>({})
const localOtherQuantity = ref<number | null>(props.otherQuantity ?? 0)
// Verrou pour éviter les boucles props -> local -> emit -> props.
const isSyncing = ref(false)
function entriesEqualByTypeAndQuantity(
left: ReceptionBovineTypeData[],
right: ReceptionBovineTypeData[]
): boolean {
const toMap = (entries: ReceptionBovineTypeData[]) => {
const map = new Map<number, number>()
for (const entry of entries) {
const typeId = entry.bovineType?.id ?? 0
map.set(typeId, entry.quantity ?? 0)
}
return map
}
const a = toMap(left)
const b = toMap(right)
if (a.size !== b.size) {
return false
}
for (const [typeId, quantity] of a.entries()) {
if ((b.get(typeId) ?? 0) !== quantity) {
return false
}
}
return true
}
function buildEntriesFromLocal(): ReceptionBovineTypeData[] {
return bovineTypes.value.map((type) => {
const existing = props.modelValue.find((entry) => entry.bovineType.id === type.id)
@@ -110,33 +78,20 @@ function syncLocalFromProps() {
watch(
() => props.otherQuantity,
(value) => {
if (isSyncing.value) {
return
}
const next = value ?? 0
isSyncing.value = true
localOtherQuantity.value = next
isSyncing.value = false
localOtherQuantity.value = value ?? 0
}
)
watch(localOtherQuantity, (value) => {
if (isSyncing.value) {
return
}
const next = value ?? 0
emit('update:otherQuantity', next)
emit('update:otherQuantity', value ?? 0)
})
watch(
() => props.modelValue,
() => {
// Hydratation locale uniquement quand le parent change.
syncLocalFromProps()
},
{ immediate: true }
{ deep: true }
)
watch(
@@ -145,11 +100,7 @@ watch(
if (isSyncing.value) {
return
}
// N'émet que si les quantités diffèrent réellement du parent.
const nextEntries = buildEntriesFromLocal()
if (!entriesEqualByTypeAndQuantity(nextEntries, props.modelValue)) {
emit('update:modelValue', nextEntries)
}
emit('update:modelValue', buildEntriesFromLocal())
},
{ deep: true }
)
@@ -157,5 +108,6 @@ watch(
onMounted(async () => {
bovineTypes.value = await getBovineTypeList()
syncLocalFromProps()
emit('update:modelValue', buildEntriesFromLocal())
})
</script>

View File

@@ -109,8 +109,7 @@ const selectedMerchandiseTypeId = ref('')
const selectedBuildingIds = ref<string[]>([])
const selectedPelletBuildingIds = ref<Record<string, string[]>>({})
const merchandiseDetail = ref('')
// Verrou de synchro pour empêcher les aller-retours infinis entre parent et composant.
const isSyncing = ref(false)
const isHydrating = ref(false)
const isReady = ref(false)
const selectedMerchandiseType = computed(() =>
@@ -131,39 +130,6 @@ function clonePelletSelections(value: Record<string, string[]>) {
return clone
}
function sorted(values: string[]): string[] {
return [...values].sort()
}
function normalizeModel(value: MerchandiseEntryData): MerchandiseEntryData {
// Normalisation stable pour comparer deux modèles sans faux positifs (ordre des tableaux).
const pellet: Record<string, string[]> = {}
const pelletKeys = Object.keys(value.selectedPelletBuildingIds ?? {}).sort()
for (const key of pelletKeys) {
pellet[key] = sorted(value.selectedPelletBuildingIds[key] ?? [])
}
return {
merchandiseTypeId: value.merchandiseTypeId ?? '',
merchandiseDetail: value.merchandiseDetail ?? '',
selectedBuildingIds: sorted(value.selectedBuildingIds ?? []),
selectedPelletBuildingIds: pellet
}
}
function buildCurrentModel(): MerchandiseEntryData {
return {
merchandiseTypeId: selectedMerchandiseTypeId.value,
merchandiseDetail: merchandiseDetail.value,
selectedBuildingIds: [...selectedBuildingIds.value],
selectedPelletBuildingIds: clonePelletSelections(selectedPelletBuildingIds.value)
}
}
function isSameModel(left: MerchandiseEntryData, right: MerchandiseEntryData): boolean {
return JSON.stringify(normalizeModel(left)) === JSON.stringify(normalizeModel(right))
}
function ensurePelletKeys() {
for (const pelletType of pelletTypes.value) {
const key = String(pelletType.id)
@@ -174,7 +140,7 @@ function ensurePelletKeys() {
}
function hydrateFromModelValue(value: MerchandiseEntryData) {
isSyncing.value = true
isHydrating.value = true
try {
selectedMerchandiseTypeId.value = value.merchandiseTypeId ?? ''
merchandiseDetail.value = value.merchandiseDetail ?? ''
@@ -184,71 +150,51 @@ function hydrateFromModelValue(value: MerchandiseEntryData) {
)
ensurePelletKeys()
} finally {
isSyncing.value = false
isHydrating.value = false
}
}
function sanitizeLocalState() {
if (isGranule.value) {
if (selectedBuildingIds.value.length > 0) {
selectedBuildingIds.value = []
}
} else {
for (const key of Object.keys(selectedPelletBuildingIds.value)) {
if (selectedPelletBuildingIds.value[key].length > 0) {
selectedPelletBuildingIds.value[key] = []
}
}
}
if (!isAutres.value && merchandiseDetail.value !== '') {
merchandiseDetail.value = ''
}
}
function emitCurrentModel() {
const currentModel = buildCurrentModel()
// Ne pas réémettre si rien n'a changé côté métier.
if (isSameModel(currentModel, props.modelValue)) {
return
}
emit('update:modelValue', currentModel)
function emitModelValue() {
emit('update:modelValue', {
merchandiseTypeId: selectedMerchandiseTypeId.value,
merchandiseDetail: merchandiseDetail.value,
selectedBuildingIds: [...selectedBuildingIds.value],
selectedPelletBuildingIds: clonePelletSelections(selectedPelletBuildingIds.value)
})
}
watch(
() => props.modelValue,
(value) => {
const currentModel = buildCurrentModel()
// Si local == parent, on ignore pour éviter la boucle de réhydratation.
if (isSameModel(currentModel, value)) {
return
}
hydrateFromModelValue(value)
},
{ immediate: true }
{ deep: true }
)
watch(
[selectedMerchandiseTypeId, selectedBuildingIds, selectedPelletBuildingIds, merchandiseDetail],
() => {
if (isSyncing.value || !isReady.value) {
if (isHydrating.value || !isReady.value) {
return
}
const beforeSanitize = buildCurrentModel()
isSyncing.value = true
// Applique les règles métier (granulé / autres) avant émission.
sanitizeLocalState()
isSyncing.value = false
const afterSanitize = buildCurrentModel()
// Si la sanitation a modifié l'état, on laisse le watcher repasser proprement.
if (!isSameModel(beforeSanitize, afterSanitize)) {
return
if (isGranule.value) {
if (selectedBuildingIds.value.length > 0) {
selectedBuildingIds.value = []
}
} else {
for (const key of Object.keys(selectedPelletBuildingIds.value)) {
if (selectedPelletBuildingIds.value[key].length > 0) {
selectedPelletBuildingIds.value[key] = []
}
}
}
emitCurrentModel()
if (!isAutres.value && merchandiseDetail.value !== '') {
merchandiseDetail.value = ''
}
emitModelValue()
},
{ deep: true }
)
@@ -265,5 +211,6 @@ onMounted(async () => {
hydrateFromModelValue(props.modelValue)
isReady.value = true
emitModelValue()
})
</script>

View File

@@ -13,7 +13,7 @@
/>
<UiDateInput
label="Date de pesée"
label="Date pesée"
v-model="localWeight.weighedAt"
:disabled="!isAdmin"
/>
@@ -31,7 +31,7 @@
</template>
<script setup lang="ts">
import type {WeightEntryData} from '~/services/dto/weight-data'
import type {WeightEntryData} from '~/services/dto/reception-data'
import {reactive, watch} from "vue";
const props = defineProps<{

View File

@@ -1,6 +1,6 @@
<template>
<form @submit.prevent="validate">
<div class="grid grid-cols-2 h-[461px] items-start gap-y-8 gap-x-40 mb-16">
<div class="grid grid-cols-2 items-start gap-y-8 gap-x-40 mb-16">
<h1 class="font-bold text-5xl uppercase col-start-1 row-start-1 text-primary-500">Expédition</h1>
<!-- Nom de l'utilisateur -->
<UiSelect
@@ -23,14 +23,11 @@
/>
<!-- Type d'expédition -->
<div class="col-start-1 row-start-4 h-[64px]">
<div class="flex w-full items-end gap-[104px]">
<div class="flex items-end gap-8 justify-between">
<UiRadioGroup
id="shipment-type"
name="shipment-type"
label="Type d'expédition bovine"
input-class="accent-primary-700 focus:ring-primary-700"
wrapper-class=""
group-class="flex flex-row gap-[104px] w-[160px_160px] h-[32px]"
v-model="selectedShipmentTypeId"
:options="bovineShipment.map((type) => ({
value: String(type.id),
@@ -39,6 +36,7 @@
/>
<UiNumberInput
id="shipment-type-quantity"
label="Quantité"
v-model="shipmentQuantity"
:placeholder="0"
:min="0"
@@ -94,7 +92,7 @@
<!-- Plaque d'immatriculation (hors LIOT) -->
<div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
<UiLicensePlateInput
v-model="form.licensePlate"
v-model="form.licencePlate"
v-model:allowAny="allowAnyLicensePlate"
/>
</div>
@@ -129,7 +127,7 @@
<div class="flex justify-center">
<UiButton
type="submit"
class="text-xl mb-16 uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
>Valider
</UiButton>
</div>
@@ -195,7 +193,7 @@ const form = reactive<ShipmentFormData>({
carrierId: '',
driverId: '',
vehicleId: '',
licensePlate: '',
licencePlate: '',
})
// Adresses liées au client sélectionné
const customerAddresses = computed<AddressData[]>(() => {
@@ -317,7 +315,7 @@ watch(
() => shipmentStore.current,
(shipment) => {
isHydrating.value = true
form.licensePlate = shipment?.licensePlate ?? ''
form.licencePlate = shipment?.licencePlate ?? ''
form.shipmentDate = shipment?.shipmentDate ?? new Date().toISOString().slice(0, 10)
form.userId = shipment?.user?.id ? String(shipment.user.id) :
form.userId
@@ -443,19 +441,19 @@ watch(
(vehicle) => String(vehicle.id) === form.vehicleId
)
if (selected) {
form.licensePlate = selected.plate
form.licencePlate = selected.plate
allowAnyLicensePlate.value = false
}
}
)
watch(
() => [form.licensePlate, form.carrierId, form.vehicleId, vehicles.value],
() => [form.licencePlate, form.carrierId, vehicles.value],
() => {
if (!isLiotCarrier.value || form.vehicleId) {
return
}
const match = filteredVehicles.value.find(
(vehicle) => vehicle.plate === form.licensePlate
(vehicle) => vehicle.plate === form.licencePlate
)
if (match) {
form.vehicleId = String(match.id)
@@ -464,7 +462,7 @@ watch(
)
const buildPayload = () => {
const normalizedLicensePlate = form.licensePlate.trim()
const normalizedLicensePlate = form.licencePlate.trim()
const normalizedShipmentDate = form.shipmentDate.trim()
const normalizedCustomerId = form.customerId.trim()
const normalizedTruckId = form.truckId.trim()
@@ -500,7 +498,7 @@ const buildPayload = () => {
Math.trunc(rawQuantity)) : 0
return {
licensePlate: normalizedLicensePlate,
licencePlate: normalizedLicensePlate,
shipmentDate: normalizedShipmentDate,
customer: customerIri,
truck: truckIri,

View File

@@ -75,7 +75,7 @@ const printReceipt = async () => {
await saveWeight()
const shipment = shipmentStore.current
const filename = `${shipment.identificationNumber ?? shipment.id}_${shipment.customer?.label ?? 'client'}_${shipment.licensePlate ?? 'immat'}.pdf`
const filename = `${shipment.identificationNumber ?? shipment.id}_${shipment.customer?.label ?? 'client'}_${shipment.licencePlate ?? 'immat'}.pdf`
await printPdf(`/shipments/${shipment.id}/receipt`, filename)
// Laisse le temps a la boite de dialogue d'impression de s'ouvrir.

View File

@@ -62,7 +62,7 @@ export const useWeighing = ({
})
} else {
await createWeight({
reception: `/api/receptions/${reception.value.id}`,
reception: `api/receptions/${reception.value.id}`,
type: mode,
dsd: baseDsd,
weight: baseWeight,
@@ -111,7 +111,7 @@ export const useWeighingShipment = ({
const displayWeight = computed(() => weightData.value?.weight ?? currentWeightEntry.value?.weight ?? null)
const displayDsd = computed(() => weightData.value?.dsd ?? currentWeightEntry.value?.dsd ?? '-')
const title = computed(() => (modeShipment === 'gross' ? 'Pesée à vide' : 'Pesée à plein'))
const title = computed(() => (modeShipment === 'gross' ? 'Pesée à plein' : 'Pesée à vide'))
const showLoadingBox = computed(
() => isFetching.value || (displayWeight.value === null && currentWeightEntry.value === null)
)
@@ -146,7 +146,7 @@ export const useWeighingShipment = ({
})
} else {
await createWeight({
shipment: `/api/shipments/${shipment.value.id}`,
shipment: `api/shipments/${shipment.value.id}`,
type: modeShipment,
dsd: baseDsd,
weight: baseWeight,

View File

@@ -8,10 +8,10 @@
<UiButton
type="submit"
:disabled="isLoading || isHydrating"
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] hover:opacity-80"
>
<Icon :name="isEdit ? '' : 'mdi:plus'" size="28" />
{{ isEdit ? 'Valider' : 'Ajouter' }}
<Icon name="mdi:check" size="28" />
{{ isEdit ? 'Modifier' : 'Ajouter' }}
</UiButton>
</div>

View File

@@ -8,9 +8,8 @@
<UiButton
type="submit"
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 justify-self-end"
>
Valider
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
>Enregistrer
</UiButton>
</div>
@@ -53,6 +52,10 @@ const form = reactive<CarrierFormData>({
name:''
})
definePageMeta({
layout: 'default'
})
const hydrateFromUser = (carrier: CarrierData | null) => {
if (!carrier) {
return

View File

@@ -4,7 +4,7 @@
<h1 class="text-3xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
<NuxtLink
to="/admin/carrier"
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
>
<Icon name="mdi:plus" size="28" />
Ajouter
@@ -43,6 +43,10 @@ const goToCarrier = (id: number) => {
router.push(`/admin/carrier/${id}`)
}
definePageMeta({
layout: 'default'
})
onMounted(async () => {
carrierList.value = await getCarrierList(false)
})

View File

@@ -6,12 +6,11 @@
</h1>
<UiButton
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
type="submit"
:disabled="isLoading || !auth.isAdmin"
>
<Icon :name="customerId ? '' : 'mdi:plus'" size="28" />
{{ customerId ? "Valider" : "Ajouter" }}
{{ customerId ? "Sauvegarder" : "Ajouter" }}
</UiButton>
</div>
@@ -26,11 +25,10 @@
<h2 class="text-3xl font-bold uppercase">Adresses client</h2>
<UiButton
type="button"
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
:disabled="customerId === null || !auth.isAdmin"
@click="goToAddAddress"
>
<Icon name="mdi:plus" size="28" />
Ajouter
</UiButton>
</div>
@@ -82,6 +80,8 @@ import {createCustomer, getCustomer, updateCustomer} from "~/services/customer"
import type {CustomerData, CustomerFormData, CustomerPayload} from "~/services/dto/customer-data"
import {useAuthStore} from "~/stores/auth"
definePageMeta({layout: "default"})
const route = useRoute()
const router = useRouter()
const auth = useAuthStore()

View File

@@ -8,6 +8,8 @@ import { createAddress, getAddress, updateAddress } from "~/services/address"
import { getCustomer, updateCustomer } from "~/services/customer"
import type { CustomerData } from "~/services/dto/customer-data"
definePageMeta({ layout: "default" })
const route = useRoute()
const router = useRouter()
const customerId = computed(() => Number(route.query.customerId))

View File

@@ -3,7 +3,7 @@
<h1 class="text-3xl font-bold uppercase text-primary-500">Liste des Clients</h1>
<NuxtLink
to="/admin/customer"
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
:class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
@click="handleAddClick"
>
@@ -94,6 +94,8 @@ import { getCustomerList } from "~/services/customer"
import type { CustomerData } from "~/services/dto/customer-data"
import { useAuthStore } from "~/stores/auth"
definePageMeta({ layout: "default" })
const customerList = ref<CustomerData[]>([])
const router = useRouter()
const auth = useAuthStore()

View File

@@ -0,0 +1,7 @@
<template>
</template>
<script setup lang="ts">
definePageMeta({
layout: 'default'
})
</script>

View File

@@ -6,12 +6,11 @@
</h1>
<UiButton
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
type="submit"
:disabled="isLoading || !auth.isAdmin"
>
<Icon :name="supplierId ? '' : 'mdi:plus'" size="28" />
{{ supplierId ? "Valider" : "Ajouter" }}
{{ supplierId ? "Sauvegarder" : "Ajouter" }}
</UiButton>
</div>
@@ -26,11 +25,10 @@
<h2 class="text-3xl font-bold uppercase">Adresses fournisseur</h2>
<UiButton
type="button"
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
:disabled="supplierId === null || !auth.isAdmin"
@click="goToAddAddress"
>
<Icon name="mdi:plus" size="28" />
Ajouter
</UiButton>
</div>
@@ -82,6 +80,8 @@ import {createSupplier, getSupplier, updateSupplier} from "~/services/supplier"
import type {SupplierData, SupplierFormData, SupplierPayload} from "~/services/dto/supplier-data"
import {useAuthStore} from "~/stores/auth"
definePageMeta({layout: "default"})
const route = useRoute()
const router = useRouter()
const auth = useAuthStore()

View File

@@ -8,6 +8,8 @@ import {createAddress, getAddress, updateAddress} from "~/services/address";
import {getSupplier, updateSupplier} from "~/services/supplier";
import type {SupplierData} from "~/services/dto/supplier-data";
definePageMeta({ layout: "default" })
const route = useRoute()
const router = useRouter()
const supplierId = computed(() => { return Number(route.query.supplierId) })

View File

@@ -3,7 +3,7 @@
<h1 class="text-3xl font-bold uppercase text-primary-500">Liste des fournisseurs</h1>
<NuxtLink
to="/admin/supplier"
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
:class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
@click="handleAddClick"
>
@@ -90,6 +90,8 @@ import { getSupplierList } from "~/services/supplier"
import type { SupplierData } from "~/services/dto/supplier-data"
import { useAuthStore } from "~/stores/auth"
definePageMeta({ layout: "default" })
const supplierList = ref<SupplierData[]>([])
const router = useRouter()
const auth = useAuthStore()

View File

@@ -6,11 +6,10 @@
{{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
</h1>
<UiButton
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
type="submit"
>
<Icon :name="userId ? '' : 'mdi:plus'" size="28" />
{{ userId ? 'Valider' : 'Ajouter' }}
{{ userId ? 'Sauvegarder' : 'Ajouter' }}
</UiButton>
</div>
@@ -39,6 +38,10 @@
</form>
</template>
<script setup lang="ts">
definePageMeta({
layout: 'default'
})
import {computed, reactive, ref, watch} from 'vue'
import {ROLE} from '~/utils/constants'
import {createUser, updateUser, getUser} from '~/services/auth'

View File

@@ -2,8 +2,8 @@
<div class="flex items-center justify-between">
<h1 class="text-3xl font-bold uppercase text-primary-500">Liste des utilisateurs</h1>
<NuxtLink
to="/admin/user"
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
@click="router.push('/admin/user/')"
>
<Icon name="mdi:plus" size="28" />
Ajouter
@@ -38,6 +38,10 @@
<script setup lang="ts">
definePageMeta({
layout: 'default'
})
import type {UserData} from "~/services/dto/user-data";
import {getAdminUsers} from "~/services/auth";
import {ROLE} from "~/utils/constants";

View File

@@ -4,7 +4,7 @@
<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 EXPÉDITION" link="/shipment" iconName="mdi:truck-fast-outline" />
<card-link label="PLAN DE SITE" link="/infrastructure/building" iconName="material-symbols:warehouse-outline-rounded" />
<card-link label="PLAN DE SITE" link="/" iconName="material-symbols:warehouse-outline-rounded" />
<card-link link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
<template #label>
Réceptions<br>EN ATTENTE
@@ -15,7 +15,7 @@
EXPÉDITIONS<br>EN ATTENTE
</template>
</card-link>
<card-link label="CASES" link="/infrastructure/case" iconName="material-symbols:bottom-sheets-outline" />
<card-link label="CASES" link="/" iconName="material-symbols:bottom-sheets-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 link="/" iconName="mdi:cow">

View File

@@ -1,242 +0,0 @@
<template>
<div class="min-h-screen">
<!-- En-tête de page avec retour et titre -->
<div class="flex items-center justify-between mb-8">
<div class="flex items-center gap-10">
<Icon
@click="router.push('/')"
name="gg:arrow-left-o"
size="44"
class="cursor-pointer text-primary-500"
/>
<h1 class="text-3xl font-bold uppercase text-primary-500">bâtiments</h1>
</div>
</div>
<div class="px-[86px] space-y-6">
<!-- Liste des bâtiments + rendu du plan de chaque bâtiment -->
<div
v-for="entry in buildingLayouts"
:key="entry.building.id"
>
<div class="font-semibold tracking-wide text-primary-500">
{{ entry.building.label || `Bâtiment ${entry.building.id}` }}
</div>
<div class="py-4">
<!-- Aucun layout disponible pour ce bâtiment -->
<div v-if="!entry.layout" class="text-sm text-slate-400">
Aucun plan de bâtiment.
</div>
<!-- Grille CSS : les cases sont positionnées via spanStyle -->
<div v-else class="overflow-auto">
<div class="grid" :style="entry.gridStyle">
<NuxtLink
v-for="cell in entry.cells"
:key="cell.key"
class="relative text-white flex h-[50px] items-center justify-center border-y-[3px] border-y-black bg-white hover:opacity-85 focus-visible:outline-none"
:class="[cell.sideBorderClass, activeLegendStatutId !== null && cell.caseStatusId !== activeLegendStatutId ? 'opacity-35 hover:opacity-70' : '']"
:style="[cell.spanStyle, cell.sideBorderStyle]"
:to="cell.caseId ? `/infrastructure/case?id=${cell.caseId}` : '/infrastructure/case'"
:title="cell.caseStatusLabel ?? undefined"
>
<!-- Le blanc latéral est géré sur ce bloc interne (conditionnel par voisinage) -->
<div
class="flex h-full w-full items-center justify-center bg-white"
:class="cell.contentInsetClass"
:style="cell.caseStyle"
>
<!-- Numéro de case -->
{{ cell.display }}
</div>
</NuxtLink>
</div>
</div>
</div>
</div>
<!-- Légende : survol d'un statut => atténue les autres cases -->
<div class="py-4">
<!-- 3 zones fixes pour forcer gauche / centre / droite sur toute la largeur -->
<div class="grid w-full grid-cols-3 gap-3">
<div
v-for="(statut, index) in statutLegend"
:key="statut.id"
class="flex min-w-0 cursor-pointer items-center gap-2 py-1"
:class="[
index === 0 ? 'justify-self-start' : '',
index === statutLegend.length - 1 ? 'justify-self-end' : '',
index > 0 && index < statutLegend.length - 1 ? 'justify-self-center' : ''
]"
@mouseenter="activeLegendStatutId = statut.id"
@mouseleave="activeLegendStatutId = null"
>
<span
class="h-5 w-5 border border-slate-300"
:style="statut.couleur ? { backgroundColor: statut.couleur } : {}"
></span>
<span class="truncate text-sm uppercase text-slate-700">
{{ statut.label }}
</span>
</div>
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import type {BuildingData} from "~/services/dto/building-data"
import type {BuildingLayoutData} from "~/services/dto/building-layout-data"
import type {BuildingCasePositionData} from "~/services/dto/building-case-position-data"
import type {BuildingCaseStatusData} from "~/services/dto/building-case-status-data"
import {getBuildingList} from "~/services/building"
import {getStatutList} from "~/services/statut"
definePageMeta({layout: "default"})
const router = useRouter()
// Données brutes chargées depuis l'API
const buildingList = ref<BuildingData[]>([])
const statutLegend = ref<BuildingCaseStatusData[]>([])
// Statut actuellement survolé dans la légende (pour filtrage visuel)
const activeLegendStatutId = ref<number | null>(null)
// Modèle de vue prêt pour le template (layout + cellules + styles de grille)
const buildingLayouts = computed(() =>
buildingList.value.map((building) => {
// On affiche uniquement le premier layout du bâtiment
const layout = building.layouts?.[0] ?? null
const view = layout ? buildLayoutView(layout) : null
return {building, layout, cells: view?.cells ?? [], gridStyle: view?.gridStyle ?? {}}
})
)
type GridCell = {
key: string
caseId: number | null
display: string
caseStatusId: number | null
caseStatusLabel: string | null
// Couleur de fond de la case (dépend du statut)
caseStyle?: Record<string, string>
// Placement dans la grille CSS (colonne/ligne de départ + span)
spanStyle: Record<string, string>
// Bordures latérales pointillées si la case touche un gap ou le bord du plan
sideBorderClass: string
// Couleur des bordures pointillées latérales (reprend la couleur de la cellule)
sideBorderStyle?: Record<string, string>
// Espace blanc interne uniquement côté(s) adjacent(s) à une autre case
contentInsetClass: string
}
// Type intermédiaire : garde des infos utiles au calcul des bordures, retirées ensuite
type GridCellDraft = Omit<GridCell, "sideBorderClass" | "sideBorderStyle" | "contentInsetClass"> & { x: number; columnSpan: number }
// Nettoie la couleur de statut pour éviter les chaînes vides / espaces
const normalizeCaseStatusColor = (value: string | null | undefined): string | null => {
const color = (value ?? "").trim()
return color.length > 0 ? color : null
}
// Styles de base communs à toutes les grilles de bâtiments
const BASE_GRID_STYLE = {gridAutoRows: "1fr", rowGap: "18px", columnGap: "0px", width: "100%"} as const
// Transforme un layout API en structure de rendu (cellules + style de grille)
const buildLayoutView = (layout: BuildingLayoutData): {
cells: GridCell[];
gridStyle: Record<string, string>
} | null => {
const rows = layout.rows ?? 0, cols = layout.columns ?? 0
if (rows <= 0 || cols <= 0) return null
// Liste des positions de cases (filtre de sécurité sur les valeurs nulles)
const positions = (layout.casePositions ?? []).filter(Boolean) as BuildingCasePositionData[]
// Colonnes occupées par au moins une case (sert à détecter les gaps)
const occupiedColumns = new Set<number>()
// Sécurité : si deux positions ont le même x/y, on garde la première
const seenCoordinates = new Set<string>()
const cellDrafts: GridCellDraft[] = []
// Tri visuel : de haut en bas, puis de gauche à droite
const positionsSorted = [...positions].sort(
(leftPosition, rightPosition) =>
(leftPosition.y ?? 1) - (rightPosition.y ?? 1) || (leftPosition.x ?? 1) - (rightPosition.x ?? 1)
)
for (const position of positionsSorted) {
const x = position.x ?? 1
const y = position.y ?? 1
const coordinateKey = `${x}-${y}`
if (seenCoordinates.has(coordinateKey)) continue
seenCoordinates.add(coordinateKey)
// w/h = nombre de colonnes / lignes occupées par la case dans la grille
const columnSpan = position.w ?? 1
const rowSpan = position.h ?? 1
// Une case peut couvrir plusieurs colonnes : on les marque toutes comme occupées
for (let column = x; column < x + columnSpan; column++) {
if (column <= cols) occupiedColumns.add(column)
}
// Métadonnées utiles au rendu / navigation / légende
const caseId = (position.buildingCase?.id ?? null) as number | null
const caseNumber = (position.buildingCase?.caseNumber ?? null) as number | null
const caseStatusId = position.buildingCase?.statut?.id ?? null
const caseStatusLabel = position.buildingCase?.statut?.label ?? null
const statusColor = normalizeCaseStatusColor(position.buildingCase?.statut?.couleur)
cellDrafts.push({
key: `case-${layout.id}-${position.id}`,
x,
columnSpan,
caseId,
display: caseNumber !== null ? String(caseNumber) : "Case",
caseStatusId,
caseStatusLabel,
caseStyle: statusColor ? {backgroundColor: statusColor} : undefined,
// Exemple : "14 / span 1" => commence en colonne 14 et occupe 1 colonne
spanStyle: {gridColumn: `${x} / span ${columnSpan}`, gridRow: `${y} / span ${rowSpan}`}
})
}
// Colonnes vides = gaps visuels (plus étroites dans la grille)
const gapColumns = Array.from({length: cols}, (_, i) => i + 1).filter((x) => !occupiedColumns.has(x))
const gapSet = new Set(gapColumns)
// Ajoute les bordures latérales pointillées pour les cases au contact d'un gap ou d'un bord
const cells: GridCell[] = cellDrafts.map(({x, columnSpan, ...cell}) => {
const touchesLeftGapOrEdge = x === 1 || gapSet.has(x - 1)
const touchesRightGapOrEdge = x + columnSpan - 1 === cols || gapSet.has(x + columnSpan)
const sideBorderClass = [
touchesLeftGapOrEdge ? "border-l-[3px] [border-left-style:dashed]" : "",
touchesRightGapOrEdge ? "border-r-[3px] [border-right-style:dashed]" : ""
].filter(Boolean).join(" ")
// Les pointillés latéraux reprennent la couleur de la cellule (si un statut en fournit une)
const sideBorderStyle = {
...(cell.caseStyle?.backgroundColor && touchesLeftGapOrEdge ? {borderLeftColor: cell.caseStyle.backgroundColor} : {}),
...(cell.caseStyle?.backgroundColor && touchesRightGapOrEdge ? {borderRightColor: cell.caseStyle.backgroundColor} : {})
}
// Le "blanc" n'est ajouté qu'entre deux cellules adjacentes (pas sur bord/gap)
const contentInsetClass = [
!touchesLeftGapOrEdge ? "ml-[4px]" : "",
!touchesRightGapOrEdge ? "mr-[4px]" : ""
].filter(Boolean).join(" ")
return {...cell, sideBorderClass, sideBorderStyle, contentInsetClass}
})
// Les colonnes de gap sont rendues en 24px, les autres occupent l'espace restant
const columnsTemplate = Array.from({length: cols}, (_, i) => (gapSet.has(i + 1) ? "24px" : "minmax(0, 1fr)")).join(" ")
return {cells, gridStyle: {gridTemplateColumns: columnsTemplate, ...BASE_GRID_STYLE}}
}
onMounted(async () => {
// Chargement initial des bâtiments et de la légende des statuts
const buildings = await getBuildingList()
const statuts = await getStatutList()
buildingList.value = buildings
// Tri alphabétique FR pour une légende stable
statutLegend.value = [...statuts].sort((a, b) =>
(a.label ?? "").localeCompare(b.label ?? "", "fr", {sensitivity: "base"})
)
})
</script>

View File

@@ -1,27 +0,0 @@
<template>
<div class="flex justify-center items-center">
<UiButton
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
:disabled="!hasCaseId"
@click="printCaseReport"
>
Imprimer
</UiButton>
</div>
</template>
<script setup lang="ts">
const route = useRoute()
const { printPdf } = usePdfPrinter()
const caseId = computed(() => Number(route.query.id))
const hasCaseId = computed(() => Number.isFinite(caseId.value) && caseId.value > 0)
const printCaseReport = async () => {
if (!hasCaseId.value) {
return
}
const filename = `tableau_poids_case_${caseId.value}.pdf`
await printPdf(`/building_cases/${caseId.value}/weights-report`, filename)
}
</script>

View File

@@ -172,27 +172,28 @@
/>
<update-merchandise
v-if="activeTab === 'merchandise' && isMerchandise"
v-show="activeTab === 'merchandise' && isMerchandise"
v-model="merchandiseForm"
:isAdmin="auth.isAdmin"
/>
<update-bovin
v-if="activeTab === 'merchandise' && !isMerchandise"
v-show="activeTab === 'merchandise' && !isMerchandise"
v-model="bovineEntries"
v-model:otherQuantity="bovineOtherQuantity"
:isAdmin="auth.isAdmin"
/>
</div>
<div class="flex justify-center">
<UiButton
v-if="auth.isAdmin"
type="submit"
class="inline-flex mb-16 items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2 justify-self-end"
>
Valider
</UiButton>
</div>
<UiButton
v-if="auth.isAdmin"
type="submit"
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] mb-16"
>
Enregistrer
</UiButton>
</div>
</div>
</form>
</template>
@@ -202,7 +203,7 @@ import { usePdfPrinter } from '#imports'
import { computed } from 'vue'
import UpdateBovin from '~/components/reception/update-bovin.vue'
import UpdateMerchandise from '~/components/reception/update-merchandise.vue'
import UpdateWeight from '~/components/commun/update-weight.vue'
import UpdateWeight from '~/components/reception/update-weight.vue'
import { getUsers } from '~/services/auth'
import { getCarrierList } from '~/services/carrier'
import type { CarrierData } from '~/services/dto/carrier-data'
@@ -212,8 +213,8 @@ import type {
MerchandiseEntryData,
ReceptionData,
ReceptionFormData,
WeightEntryData
} from '~/services/dto/reception-data'
import type { WeightEntryData } from '~/services/dto/weight-data'
import type { ReceptionTypeData } from '~/services/dto/reception-type-data'
import type { SupplierData } from '~/services/dto/supplier-data'
import type { TruckData } from '~/services/dto/truck-data'
@@ -278,25 +279,9 @@ const isLoadingVehicles = ref(false)
const formIsLoading = ref(false)
const isMerchandise = ref(false)
const isHydrating = ref(false)
const vehicleSyncLock = ref(false)
const idReception = Number(route.params.id)
function runWithVehicleSyncLock(mutator: () => void) {
if (vehicleSyncLock.value) {
return
}
vehicleSyncLock.value = true
try {
mutator()
} finally {
queueMicrotask(() => {
vehicleSyncLock.value = false
})
}
}
const form = reactive<ReceptionFormData>({
identificationNumber: null,
licensePlate: '',
@@ -342,7 +327,7 @@ const filteredVehicles = computed<VehicleData[]>(() => {
watch(
() => idReception,
async (id) => {
if (!Number.isFinite(id) || id <= 0) {
if (id === null) {
return
}
isLoading.value = true
@@ -515,7 +500,7 @@ async function loadTypes() {
try {
receptionTypes.value = await getReceptionTypeList()
} finally {
isLoadingTypes.value = false
isLoadingSuppliers.value = false
}
}
@@ -596,16 +581,8 @@ async function saveWeightEntry(entry: WeightEntryData) {
return
}
// Fallback: if id is missing in local state, reuse existing weight by type.
const reception = await getReception(idReception)
const existingEntry = reception?.weights?.find((weight) => weight.type === entry.type) ?? null
if (existingEntry?.id) {
await updateWeight(existingEntry.id, payload)
return
}
await createWeight({
reception: `/api/receptions/${idReception}`,
reception: `api/receptions/${idReception}`,
...payload
})
}
@@ -808,11 +785,8 @@ async function validate() {
})
}
// Évite une réhydratation complète après save (source de cascades de watchers).
// On recharge uniquement les bovins quand on est en mode bovins.
if (!isMerchandise.value) {
await loadBovineEntries(idReception)
}
const refreshedReception = await getReception(idReception)
hydrateFromReception(refreshedReception)
return
}
@@ -835,20 +809,12 @@ onMounted(async () => {
watch(
() => [form.supplierId, form.addressId, suppliers.value],
() => {
if (isHydrating.value) {
return
}
if (!form.supplierId) {
if (form.addressId !== '') {
form.addressId = ''
}
form.addressId = ''
return
}
if (!form.addressId && supplierAddresses.value.length === 1) {
const nextAddressId = String(supplierAddresses.value[0].id)
if (form.addressId !== nextAddressId) {
form.addressId = nextAddressId
}
form.addressId = String(supplierAddresses.value[0].id)
return
}
if (!form.addressId) {
@@ -859,14 +825,9 @@ watch(
)
if (!matches) {
if (supplierAddresses.value.length === 1) {
const nextAddressId = String(supplierAddresses.value[0].id)
if (form.addressId !== nextAddressId) {
form.addressId = nextAddressId
}
form.addressId = String(supplierAddresses.value[0].id)
} else {
if (form.addressId !== '') {
form.addressId = ''
}
form.addressId = ''
}
}
},
@@ -876,36 +837,24 @@ watch(
watch(
() => form.carrierId,
() => {
if (isHydrating.value || vehicleSyncLock.value) {
if (isHydrating.value) {
return
}
if (!form.carrierId && idReception == null) {
runWithVehicleSyncLock(() => {
form.driverId = ''
form.vehicleId = ''
})
form.driverId = ''
form.vehicleId = ''
return
}
if (!isLiotCarrier.value && idReception == null) {
runWithVehicleSyncLock(() => {
form.driverId = ''
form.vehicleId = ''
})
form.driverId = ''
form.vehicleId = ''
return
}
if (filteredDrivers.value.length === 1) {
const nextDriverId = String(filteredDrivers.value[0].id)
if (form.driverId !== nextDriverId) {
form.driverId = nextDriverId
}
form.driverId = String(filteredDrivers.value[0].id)
}
if (filteredVehicles.value.length === 1) {
const nextVehicleId = String(filteredVehicles.value[0].id)
if (form.vehicleId !== nextVehicleId) {
runWithVehicleSyncLock(() => {
form.vehicleId = nextVehicleId
})
}
form.vehicleId = String(filteredVehicles.value[0].id)
}
},
{ immediate: true }
@@ -914,19 +863,11 @@ watch(
watch(
() => [form.truckId, form.carrierId, vehicles.value],
() => {
if (isHydrating.value || vehicleSyncLock.value) {
return
}
if (!isLiotCarrier.value) {
return
}
if (filteredVehicles.value.length === 1) {
const nextVehicleId = String(filteredVehicles.value[0].id)
if (form.vehicleId !== nextVehicleId) {
runWithVehicleSyncLock(() => {
form.vehicleId = nextVehicleId
})
}
form.vehicleId = String(filteredVehicles.value[0].id)
return
}
if (!form.vehicleId) {
@@ -936,11 +877,7 @@ watch(
(vehicle) => String(vehicle.id) === form.vehicleId
)
if (!matches) {
if (form.vehicleId !== '') {
runWithVehicleSyncLock(() => {
form.vehicleId = ''
})
}
form.vehicleId = ''
}
},
{ immediate: true }
@@ -949,9 +886,6 @@ watch(
watch(
() => [form.vehicleId, form.carrierId, vehicles.value],
() => {
if (vehicleSyncLock.value) {
return
}
if (!isLiotCarrier.value) {
return
}
@@ -961,11 +895,9 @@ watch(
const selected = filteredVehicles.value.find(
(vehicle) => String(vehicle.id) === form.vehicleId
)
if (selected && form.licensePlate !== selected.plate) {
runWithVehicleSyncLock(() => {
form.licensePlate = selected.plate
allowAnyLicensePlate.value = false
})
if (selected) {
form.licensePlate = selected.plate
allowAnyLicensePlate.value = false
}
}
)
@@ -973,12 +905,6 @@ watch(
watch(
() => [form.licensePlate, form.carrierId, vehicles.value],
() => {
if (vehicleSyncLock.value) {
return
}
if (isHydrating.value) {
return
}
if (!isLiotCarrier.value || form.vehicleId) {
return
}
@@ -986,12 +912,7 @@ watch(
(vehicle) => vehicle.plate === form.licensePlate
)
if (match) {
const nextVehicleId = String(match.id)
if (form.vehicleId !== nextVehicleId) {
runWithVehicleSyncLock(() => {
form.vehicleId = nextVehicleId
})
}
form.vehicleId = String(match.id)
}
}
)

View File

@@ -1,639 +0,0 @@
<template>
<form @submit.prevent="validate">
<div class="grid grid-cols-2 h-[461px] items-start gap-y-8 gap-x-40 mb-16">
<div class="flex items-center justify-between gap-10 relative col-start-1 row-start-1">
<div class="flex flex-row absolute -left-[60px] justify-between">
<Icon @click="router.push('/shipment/finish-shipment')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
</div>
<h1 class="font-bold text-4xl col-start-1 row-start-1 text-primary-500 uppercase">Expédition {{ form.identificationNumber }}</h1>
<Icon @click="printReceipt" name="mdi:printer-outline" size="44" class="cursor-pointer text-primary-500"/>
</div>
<UiSelect
id="shipment-user"
v-model="form.userId"
label="Nom de l'utilisateur"
:options="users.map((user) => ({
value: String(user.id),
label: user.username
}))"
:loading="isLoadingUsers"
wrapper-class="col-start-1 row-start-2"
/>
<UiDateInput
id="shipment-date"
v-model="form.shipmentDate"
label="Date d'expédition"
wrapper-class="col-start-1 row-start-3"
/>
<div class="col-start-1 row-start-4 h-[64px]">
<div class="flex w-full items-end gap-[104px]">
<UiRadioGroup
id="shipment-type"
name="shipment-type"
label="Type d'expédition bovine"
input-class="accent-primary-700 focus:ring-primary-700"
group-class="flex flex-row gap-[104px] w-[160px_160px] h-[32px]"
v-model="selectedShipmentTypeId"
:options="bovineShipment.map((type) => ({
value: String(type.id),
label: type.label
}))"
/>
<UiNumberInput
id="shipment-type-quantity"
v-model="shipmentQuantity"
:placeholder="0"
:min="0"
:max="1200"
:disabled="!selectedShipmentTypeId"
/>
</div>
</div>
<UiSelect
id="shipment-customer"
v-model="form.customerId"
label="Client"
:options="customers.map((customer) => ({
value: String(customer.id),
label: customer.name || `Client #${customer.id}`
}))"
:loading="isLoadingCustomers"
wrapper-class="col-start-1 row-start-5"
/>
<UiSelect
id="shipment-address"
v-model="form.addressId"
:options="customerAddressOptions"
:disabled="isLoadingCustomers || customerAddresses.length === 0"
label="Adresse"
wrapper-class="col-start-2 row-start-1"
/>
<UiSelect
id="shipment-truck"
v-model="form.truckId"
label="Camion"
:options="trucks.map((truck) => ({
value: String(truck.id),
label: truck.name
}))"
:loading="isLoadingTrucks"
wrapper-class="col-start-2 row-start-2"
/>
<UiSelect
id="shipment-carrier"
v-model="form.carrierId"
label="Transporteur"
:options="carriers.map((carrier) => ({
value: String(carrier.id),
label: carrier.name
}))"
wrapper-class="col-start-2 row-start-3"
/>
<div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
<UiLicensePlateInput
v-model="form.licensePlate"
v-model:allowAny="allowAnyLicensePlate"
/>
</div>
<UiSelect
v-if="isLiotCarrier"
id="shipment-vehicle"
v-model="form.vehicleId"
label="Immatriculation"
:options="filteredVehicles.map((vehicle) => ({
value: String(vehicle.id),
label: vehicle.plate
}))"
:loading="isLoadingVehicles"
:disabled="isLoadingVehicles || filteredVehicles.length === 0"
wrapper-class="col-start-2 row-start-4"
/>
<div class="col-start-2 row-start-5 min-h-[72px]">
<UiSelect
v-if="isLiotCarrier"
id="shipment-driver"
v-model="form.driverId"
label="Nom du chauffeur si LIOT"
:options="filteredDrivers.map((driver) => ({
value: String(driver.id),
label: driver.name
}))"
:loading="isLoadingDrivers"
/>
</div>
</div>
<div v-if="formIsLoading">
<div class="flex justify-evenly gap-y-8 gap-x-41 mb-10 border-b border-primary-500/60">
<h1
class="font-bold text-3xl uppercase px-12 col-start-1 row-start-1 cursor-pointer"
:class="activeTab === 'weights' ? 'border-b-[6px] border-primary-500 text-primary-500' : 'text-primary-500/50'"
@click="activeTab = 'weights'"
>
pesée à plein
</h1>
<h1
class="font-bold text-3xl uppercase col-start-1 row-start-1 px-12 cursor-pointer"
:class="activeTab === 'weightsEmpty' ? 'border-b-[6px] border-primary-500 text-primary-500' : 'text-primary-500/50'"
@click="activeTab = 'weightsEmpty'"
>
pesée à vide
</h1>
</div>
<div class="mb-12">
<update-weight
v-show="activeTab === 'weights'"
v-model="grossWeight"
v-if="grossWeight"
:isAdmin="authStore.isAdmin"
/>
<update-weight
v-show="activeTab === 'weightsEmpty'"
v-model="tareWeight"
v-if="tareWeight"
:isAdmin="authStore.isAdmin"
/>
</div>
</div>
<div class="flex justify-center">
<UiButton
type="submit"
class="text-xl mb-16 uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
>
Valider
</UiButton>
</div>
</form>
</template>
<script setup lang="ts">
import { usePdfPrinter } from '#imports'
import { computed, onMounted, reactive, ref, watch } from 'vue'
import UpdateWeight from '~/components/commun/update-weight.vue'
import { getUsers } from '~/services/auth'
import { getCarrierList } from '~/services/carrier'
import { getCustomerList } from '~/services/customer'
import type { AddressData } from '~/services/dto/address-data'
import type { CarrierData } from '~/services/dto/carrier-data'
import type { CustomerData } from '~/services/dto/customer-data'
import type { DriverData } from '~/services/dto/driver-data'
import type { ShipmentData, ShipmentFormData } from '~/services/dto/shipment-data'
import type { ShipmentTypeData } from '~/services/dto/shipment-type-data'
import type { TruckData } from '~/services/dto/truck-data'
import type { UserData } from '~/services/dto/user-data'
import type { VehicleData } from '~/services/dto/vehicle-data'
import type { WeightEntryData } from '~/services/dto/weight-data'
import { getDriverList } from '~/services/driver'
import { getShipment, updateShipment } from '~/services/shipment'
import { getShipmentTypeList } from '~/services/shipment-type'
import { getTruckList } from '~/services/truck'
import { getVehicleList } from '~/services/vehicle'
import { createWeight, updateWeight } from '~/services/weight'
import { useAuthStore } from '~/stores/auth'
import { SUPPLIER_CODE } from '~/utils/constants'
const router = useRouter()
const route = useRoute()
const authStore = useAuthStore()
const { printPdf } = usePdfPrinter()
const users = ref<UserData[]>([])
const customers = ref<CustomerData[]>([])
const trucks = ref<TruckData[]>([])
const carriers = ref<CarrierData[]>([])
const drivers = ref<DriverData[]>([])
const vehicles = ref<VehicleData[]>([])
const bovineShipment = ref<ShipmentTypeData[]>([])
const currentShipment = ref<ShipmentData | null>(null)
const selectedShipmentTypeId = ref('')
const shipmentQuantity = ref<number | null>(0)
const allowAnyLicensePlate = ref(false)
const activeTab = ref<'weightsEmpty' | 'weights'>('weights')
const grossWeight = ref<WeightEntryData>(createEmptyWeightEntry('gross'))
const tareWeight = ref<WeightEntryData>(createEmptyWeightEntry('tare'))
const formIsLoading = ref(false)
const isLoadingUsers = ref(false)
const isLoadingShipmentTypes = ref(false)
const isLoadingCustomers = ref(false)
const isLoadingTrucks = ref(false)
const isLoadingCarriers = ref(false)
const isLoadingVehicles = ref(false)
const isLoadingDrivers = ref(false)
const isHydrating = ref(false)
const form = reactive<ShipmentFormData & { identificationNumber: string | null }>({
identificationNumber: null,
userId: '',
shipmentDate: new Date().toISOString().slice(0, 10),
customerId: '',
addressId: '',
truckId: '',
carrierId: '',
driverId: '',
vehicleId: '',
licensePlate: ''
})
const shipmentId = computed(() => {
const id = Number(route.params.id)
return Number.isFinite(id) ? id : null
})
const selectedCarrier = computed(() =>
carriers.value.find((carrier) => String(carrier.id) === form.carrierId) ?? null
)
const isLiotCarrier = computed(() => selectedCarrier.value?.code === SUPPLIER_CODE.LIOT)
const isAddressData = (value: unknown): value is AddressData =>
typeof value === 'object' &&
value !== null &&
'id' in value &&
'fullAddress' in value
const customerAddresses = computed<AddressData[]>(() => {
if (!form.customerId) return []
const customerId = Number(form.customerId)
if (!Number.isFinite(customerId) || customerId <= 0) return []
const addresses = customers.value.find((c) => c.id === customerId)?.addresses ?? []
return addresses.filter(isAddressData)
})
const customerAddressOptions = computed(() =>
customerAddresses.value.map((address) => ({
value: String(address.id),
label: address.fullAddress
}))
)
const filteredDrivers = computed<DriverData[]>(() => {
if (!form.carrierId) {
return []
}
return drivers.value.filter((driver) => String(driver.carrier?.id) === form.carrierId)
})
const filteredVehicles = computed<VehicleData[]>(() => {
if (!form.carrierId) {
return []
}
return vehicles.value.filter(
(vehicle) =>
String(vehicle.carrier?.id) === form.carrierId &&
(!form.truckId || String(vehicle.truck?.id) === form.truckId)
)
})
const loadUsers = async () => {
isLoadingUsers.value = true
try {
users.value = await getUsers()
} finally {
isLoadingUsers.value = false
}
}
const loadShipmentType = async () => {
isLoadingShipmentTypes.value = true
try {
bovineShipment.value = await getShipmentTypeList()
} finally {
isLoadingShipmentTypes.value = false
}
}
const loadCustomers = async () => {
isLoadingCustomers.value = true
try {
customers.value = await getCustomerList()
} finally {
isLoadingCustomers.value = false
}
}
const loadTrucks = async () => {
isLoadingTrucks.value = true
try {
trucks.value = await getTruckList()
} finally {
isLoadingTrucks.value = false
}
}
const loadCarriers = async () => {
isLoadingCarriers.value = true
try {
carriers.value = await getCarrierList()
} finally {
isLoadingCarriers.value = false
}
}
const loadVehicles = async () => {
isLoadingVehicles.value = true
try {
vehicles.value = await getVehicleList()
} finally {
isLoadingVehicles.value = false
}
}
const loadDrivers = async () => {
isLoadingDrivers.value = true
try {
drivers.value = await getDriverList()
} finally {
isLoadingDrivers.value = false
}
}
function setDefaultUser() {
if (form.userId) {
return
}
if (authStore.user?.id) {
form.userId = String(authStore.user.id)
}
}
function hydrateFromShipment(shipment: ShipmentData | null) {
if (!shipment) {
return
}
isHydrating.value = true
form.identificationNumber = shipment.identificationNumber ?? null
form.licensePlate = shipment.licensePlate ?? ''
form.shipmentDate = shipment.shipmentDate ?? new Date().toISOString().slice(0, 10)
form.userId = shipment.user?.id ? String(shipment.user.id) : form.userId
form.customerId = shipment.customer?.id ? String(shipment.customer.id) : ''
form.addressId = shipment.address?.id ? String(shipment.address.id) : ''
form.truckId = shipment.truck?.id ? String(shipment.truck.id) : ''
form.carrierId = shipment.carrier?.id ? String(shipment.carrier.id) : ''
form.driverId = shipment.driver?.id ? String(shipment.driver.id) : ''
form.vehicleId = shipment.vehicle?.id ? String(shipment.vehicle.id) : ''
selectedShipmentTypeId.value = shipment.shipmentType?.id ? String(shipment.shipmentType.id) : ''
shipmentQuantity.value = shipment.nbBovinSend ?? 0
const gross = shipment.weights?.find((weight) => weight.type === 'gross') ?? null
const tare = shipment.weights?.find((weight) => weight.type === 'tare') ?? null
grossWeight.value = gross ? { ...gross } : createEmptyWeightEntry('gross')
tareWeight.value = tare ? { ...tare } : createEmptyWeightEntry('tare')
isHydrating.value = false
}
async function printReceipt() {
if (!import.meta.client || shipmentId.value === null || shipmentId.value <= 0) {
return
}
const customerName =
customers.value.find((customer) => String(customer.id) === form.customerId)?.name ??
'client'
const filename = `${form.identificationNumber || shipmentId.value}_${customerName}_${form.licensePlate || 'immat'}.pdf`
await printPdf(`/shipments/${shipmentId.value}/receipt`, filename)
await new Promise((resolve) => setTimeout(resolve, 600))
}
async function loadShipmentForUpdate() {
if (shipmentId.value === null) {
return
}
const shipment = await getShipment(shipmentId.value)
currentShipment.value = shipment
hydrateFromShipment(shipment)
}
watch(
() => [form.customerId, form.addressId, customers.value],
() => {
if (!form.customerId) {
form.addressId = ''
return
}
if (!form.addressId && customerAddresses.value.length === 1) {
form.addressId = String(customerAddresses.value[0].id)
return
}
if (!form.addressId) {
return
}
const matches = customerAddresses.value.some(
(address) => String(address.id) === form.addressId
)
if (!matches) {
if (customerAddresses.value.length === 1) {
form.addressId = String(customerAddresses.value[0].id)
} else {
form.addressId = ''
}
}
},
{ immediate: true }
)
function applyLiotDefaults() {
if (isHydrating.value) {
return
}
if (!form.carrierId) {
form.driverId = ''
form.vehicleId = ''
return
}
if (!isLiotCarrier.value) {
form.driverId = ''
form.vehicleId = ''
return
}
if (filteredDrivers.value.length === 1) {
form.driverId = String(filteredDrivers.value[0].id)
}
if (filteredVehicles.value.length === 1) {
form.vehicleId = String(filteredVehicles.value[0].id)
}
}
watch(
() => form.carrierId,
() => {
applyLiotDefaults()
},
{ immediate: true }
)
watch(
() => isHydrating.value,
(value) => {
if (!value) {
applyLiotDefaults()
}
}
)
watch(
() => [form.truckId, form.carrierId, vehicles.value],
() => {
if (!isLiotCarrier.value) {
return
}
if (filteredVehicles.value.length === 1) {
form.vehicleId = String(filteredVehicles.value[0].id)
return
}
if (!form.vehicleId) {
return
}
const matches = filteredVehicles.value.some(
(vehicle) => String(vehicle.id) === form.vehicleId
)
if (!matches) {
form.vehicleId = ''
}
},
{ immediate: true }
)
watch(
() => [form.vehicleId, form.carrierId, vehicles.value],
() => {
if (!isLiotCarrier.value || isHydrating.value) {
return
}
const selected = filteredVehicles.value.find(
(vehicle) => String(vehicle.id) === form.vehicleId
)
if (selected) {
form.licensePlate = selected.plate
allowAnyLicensePlate.value = false
}
}
)
watch(
() => [form.licensePlate, form.carrierId, form.vehicleId, vehicles.value],
() => {
if (!isLiotCarrier.value || form.vehicleId) {
return
}
const match = filteredVehicles.value.find(
(vehicle) => vehicle.plate === form.licensePlate
)
if (match) {
form.vehicleId = String(match.id)
}
}
)
function buildPayload() {
const normalizedLicensePlate = form.licensePlate.trim()
const normalizedShipmentDate = form.shipmentDate.trim()
const normalizedCustomerId = form.customerId.trim()
const normalizedTruckId = form.truckId.trim()
const normalizedCarrierId = form.carrierId.trim()
const normalizedDriverId = form.driverId.trim()
const normalizedUserId = form.userId.trim()
const normalizedAddressId = form.addressId.trim()
const normalizedShipmentTypeId = selectedShipmentTypeId.value.trim()
const customerIri = normalizedCustomerId ? `/api/customers/${normalizedCustomerId}` : null
const truckIri = normalizedTruckId ? `/api/trucks/${normalizedTruckId}` : null
const carrierIri = normalizedCarrierId ? `/api/carriers/${normalizedCarrierId}` : null
const userIri = normalizedUserId ? `/api/users/${normalizedUserId}` : null
const driverIri = normalizedDriverId ? `/api/drivers/${normalizedDriverId}` : null
const addressIri = normalizedAddressId ? `/api/addresses/${normalizedAddressId}` : null
const shipmentTypeIri = normalizedShipmentTypeId
? `/api/shipment_types/${normalizedShipmentTypeId}`
: null
const rawQuantity = Number(shipmentQuantity.value ?? 0)
const normalizedQuantity = Number.isFinite(rawQuantity)
? Math.max(0, Math.trunc(rawQuantity))
: 0
return {
licensePlate: normalizedLicensePlate,
shipmentDate: normalizedShipmentDate,
customer: customerIri,
truck: truckIri,
carrier: carrierIri,
driver: driverIri,
user: userIri,
address: addressIri,
shipmentType: shipmentTypeIri,
nbBovinSend: normalizedQuantity
}
}
function createEmptyWeightEntry(type: 'gross' | 'tare'): WeightEntryData {
return {
type,
dsd: null,
weight: null,
weighedAt: null
}
}
async function saveWeightEntry(entry: WeightEntryData) {
if (!shipmentId.value || entry.weight === null) {
return
}
const payload = {
type: entry.type,
dsd: entry.dsd ?? null,
weight: entry.weight,
weighedAt: entry.weighedAt ?? null
}
if (entry.id) {
await updateWeight(entry.id, payload)
return
}
await createWeight({
shipment: `api/shipments/${shipmentId.value}`,
...payload
})
}
async function validate() {
if (shipmentId.value === null) {
return
}
await updateShipment(shipmentId.value, {
currentStep: currentShipment.value?.currentStep ?? 0,
...buildPayload()
})
await saveWeightEntry(grossWeight.value)
await saveWeightEntry(tareWeight.value)
await loadShipmentForUpdate()
}
onMounted(async () => {
await loadShipmentType()
await loadUsers()
await loadCustomers()
await loadTrucks()
await loadCarriers()
await loadVehicles()
await loadDrivers()
await authStore.ensureSession()
formIsLoading.value = true
setDefaultUser()
await loadShipmentForUpdate()
})
</script>

View File

@@ -38,7 +38,7 @@
</template>
</div>
<div>{{ shipment.carrier?.name }}</div>
<div>{{ shipment.licensePlate }}</div>
<div>{{ shipment.licencePlate }}</div>
</div>
</div>
</div>

View File

@@ -1,9 +0,0 @@
import type { BuildingCaseStatusData } from '~/services/dto/building-case-status-data'
export interface BuildingCaseData {
id: number
caseNumber: number | null
code: string | null
capacity: number | null
statut?: BuildingCaseStatusData | null
}

View File

@@ -1,11 +0,0 @@
import type { BuildingCaseData } from '~/services/dto/building-case-data'
export interface BuildingCasePositionData {
id: number
x: number | null
y: number | null
w: number | null
h: number | null
renderOrder: string | null
buildingCase: BuildingCaseData | null
}

View File

@@ -1,6 +0,0 @@
export interface BuildingCaseStatusData {
id: number
label: string | null
code: string | null
couleur: string | null
}

View File

@@ -1,8 +1,5 @@
import type { BuildingLayoutData } from '~/services/dto/building-layout-data'
export interface BuildingData {
id: number
label: string
code: string
layouts?: BuildingLayoutData[] | null
}

View File

@@ -1,9 +0,0 @@
import type { BuildingCasePositionData } from '~/services/dto/building-case-position-data'
export interface BuildingLayoutData {
id: number
name: string | null
columns: number | null
rows: number | null
casePositions?: BuildingCasePositionData[] | null
}

View File

@@ -2,9 +2,6 @@ import type {CarrierData} from '~/services/dto/carrier-data'
import type {TruckData} from '~/services/dto/truck-data'
import type {CustomerData} from '~/services/dto/customer-data'
import type {AddressData} from "~/services/dto/address-data";
import type {UserData} from '~/services/dto/user-data'
import type {DriverData} from '~/services/dto/driver-data'
import type {VehicleData} from '~/services/dto/vehicle-data'
export interface ShipmentTypeData {
id: number
@@ -15,7 +12,7 @@ export interface ShipmentTypeData {
export type ShipmentData = {
id: number
identificationNumber?: string | null
licensePlate: string | null
licencePlate: string | null
shipmentDate: string
currentStep: number
isValid: boolean
@@ -23,9 +20,6 @@ export type ShipmentData = {
carrier?: CarrierData | null
truck?: TruckData | null
customer?: CustomerData | null
user?: UserData | null
driver?: DriverData | null
vehicle?: VehicleData | null
shipmentType?: ShipmentTypeData | null
nbBovinSend?: number | null
weights?: WeightShipmentEntryData[] | null
@@ -49,11 +43,11 @@ export type ShipmentFormData = {
carrierId: string,
driverId: string,
vehicleId: string,
licensePlate: string,
licencePlate: string,
}
export type ShipmentPayload = {
licensePlate?: string | null
licencePlate?: string | null
shipmentDate?: string
currentStep?: number
isValid?: boolean

View File

@@ -4,11 +4,3 @@ export interface WeightData {
weighedAt: string | null
type : string | null
}
export interface WeightEntryData {
id?: number
type: 'gross' | 'tare'
dsd: number | null
weight: number | null
weighedAt: string | null
}

View File

@@ -1,23 +0,0 @@
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 []
}

View File

@@ -1,47 +0,0 @@
<?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');
}
}

View File

@@ -1,37 +0,0 @@
<?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');
}
}

View File

@@ -1,26 +0,0 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
final class Version20260225110000 extends AbstractMigration
{
public function getDescription(): string
{
return 'Rename shipment.licence_plate to license_plate';
}
public function up(Schema $schema): void
{
$this->addSql('ALTER TABLE shipment RENAME COLUMN licence_plate TO license_plate');
}
public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE shipment RENAME COLUMN license_plate TO licence_plate');
}
}

View File

@@ -1,30 +0,0 @@
<?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');
}
}

View File

@@ -1,26 +0,0 @@
<?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');
}
}

View File

@@ -5,12 +5,8 @@ declare(strict_types=1);
namespace App\Command;
use App\Entity\Address;
use App\Entity\Bovine;
use App\Entity\BovineType;
use App\Entity\Building;
use App\Entity\BuildingCase;
use App\Entity\BuildingCasePosition;
use App\Entity\BuildingLayout;
use App\Entity\Carrier;
use App\Entity\Customer;
use App\Entity\Driver;
@@ -18,11 +14,9 @@ use App\Entity\MerchandiseType;
use App\Entity\PelletType;
use App\Entity\ReceptionType;
use App\Entity\ShipmentType;
use App\Entity\Statut;
use App\Entity\Supplier;
use App\Entity\Truck;
use App\Entity\Vehicle;
use DateTimeImmutable;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command;
@@ -58,12 +52,6 @@ class SeedCommand extends Command
$this->seedMerchandiseTypes();
$this->seedPelletTypes();
$this->seedBuildings();
$this->entityManager->flush();
$this->seedBuildingInfrastructure();
$this->entityManager->flush();
$this->seedBovines($io);
$this->seedReceptionTypes();
$this->seedBovineTypes();
$this->seedShipmentTypes();
@@ -227,137 +215,6 @@ 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
{
$receptionTypes = [
@@ -374,134 +231,6 @@ 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
{
$bovineTypes = [

View File

@@ -20,8 +20,6 @@ class AppFixtures extends Fixture implements DependentFixtureInterface
return [
TransportFixtures::class,
ReferenceFixtures::class,
BuildingInfrastructureFixtures::class,
BovineFixtures::class,
UserFixtures::class,
];
}

View File

@@ -1,120 +0,0 @@
<?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;
}
}

View File

@@ -1,299 +0,0 @@
<?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;
}
}

View File

@@ -1,121 +0,0 @@
<?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;
}
}

View File

@@ -11,7 +11,6 @@ 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]
#[ORM\Table(name: 'building')]
@@ -49,25 +48,9 @@ class Building
#[ORM\ManyToMany(targetEntity: Reception::class, mappedBy: 'buildings')]
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()
{
$this->receptions = new ArrayCollection();
$this->buildingCases = new ArrayCollection();
$this->buildingLayout = new ArrayCollection();
$this->receptions = new ArrayCollection();
}
public function getId(): ?int
@@ -106,41 +89,4 @@ class Building
{
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;
}
}

View File

@@ -1,209 +0,0 @@
<?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;
}
}

View File

@@ -1,145 +0,0 @@
<?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;
}
}

View File

@@ -1,140 +0,0 @@
<?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;
}
}

View File

@@ -80,7 +80,7 @@ class Shipment
#[ORM\Column(length: 255)]
#[Groups(['shipment:read', 'shipment:write'])]
private ?string $licensePlate = null;
private ?string $licencePlate = null;
#[ORM\Column(length: 20, unique: true, nullable: true)]
#[Groups(['shipment:read'])]
@@ -162,14 +162,14 @@ class Shipment
return $this->id;
}
public function getLicensePlate(): ?string
public function getLicencePlate(): ?string
{
return $this->licensePlate;
return $this->licencePlate;
}
public function setLicensePlate(?string $licensePlate): void
public function setLicencePlate(?string $licencePlate): void
{
$this->licensePlate = $licensePlate;
$this->licencePlate = $licencePlate;
}
public function getIdentificationNumber(): ?string

View File

@@ -1,138 +0,0 @@
<?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;
}
}

View File

@@ -1,210 +0,0 @@
<?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 1.3;
}
/**
* @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;
}
}

View File

@@ -1,378 +0,0 @@
<!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 {
font-size: 12px;
}
/* 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" style="border-collapse:collapse; margin-top: 32px">
<tr>
<td style="height: 20px; border: 0" colspan="4"></td>
<td style="font-weight: 700" colspan="2">Grippe</td>
<td style="font-weight: 700" colspan="2">Protivity</td>
</tr>
<tr>
<td style="height: 20px">Date</td>
<td>Antibiotique</td>
<td>Date</td>
<td>Antero</td>
<td>Date</td>
<td>Intranasale</td>
<td>Date</td>
<td>Rappel 30 jours</td>
</tr>
<tr>
<td style="height: 20px"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td style="height: 20px"></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</table>
</div>
</body>
</html>

View File

@@ -275,7 +275,7 @@
<div class="meta">
<p>Transporteur : {{ shipment.carrier ? shipment.carrier.name : '-' }}</p>
<p>Mode d'expédition : {{ shipment.truck ? shipment.truck.name : '-' }}</p>
<p>Immatriculation : {{ shipment.licensePlate ?? '-' }}</p>
<p>Immatriculation : {{ shipment.licencePlate ?? '-' }}</p>
</div>
</td>