Compare commits
11 Commits
feat/266-c
...
v0.0.56
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9505201499 | ||
| 624591c096 | |||
|
|
e31bdce713 | ||
| 5d72beaf8d | |||
| 43f34015c6 | |||
|
|
ac5ce07e61 | ||
| e9fb36cc24 | |||
|
|
06a41c5f85 | ||
| f263a11fe8 | |||
|
|
c52f22472d | ||
| e7421e985e |
58
.idea/workspace.xml
generated
58
.idea/workspace.xml
generated
@@ -5,9 +5,10 @@
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="7c107abe-5995-4428-8429-b146aaca8386" name="Changes" comment="fix : corrections diverses">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/data_source_mapping.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/frontend/pages/infrastructure/case.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/infrastructure/case.vue" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/Entity/BuildingCase.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/BuildingCase.php" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@@ -39,7 +40,7 @@
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||
<map>
|
||||
<entry key="$PROJECT_DIR$" value="feat/276-lister-expeditions-terminees" />
|
||||
<entry key="$PROJECT_DIR$" value="fit/332-refonte-reception-terminee" />
|
||||
</map>
|
||||
</option>
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
@@ -223,38 +224,39 @@
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"RunOnceActivity.MCP Project settings loaded": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
|
||||
"RunOnceActivity.git.unshallow": "true",
|
||||
"RunOnceActivity.typescript.service.memoryLimit.init": "true",
|
||||
"git-widget-placeholder": "fix/325-corrections-diverses",
|
||||
"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)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"settings.editor.selected.configurable": "preferences.pluginManager",
|
||||
"ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"RunOnceActivity.MCP Project settings loaded": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"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",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"settings.editor.selected.configurable": "preferences.pluginManager",
|
||||
"ts.external.directory.path": "/opt/phpstorm/plugins/javascript-plugin/jsLanguageServicesImpl/external",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
},
|
||||
"keyToStringList": {
|
||||
"DatabaseDriversLRU": [
|
||||
"postgresql"
|
||||
"keyToStringList": {
|
||||
"DatabaseDriversLRU": [
|
||||
"postgresql"
|
||||
],
|
||||
"com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
|
||||
"TEXT"
|
||||
"com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [
|
||||
"TEXT"
|
||||
],
|
||||
"vue.recent.templates": [
|
||||
"Vue Composition API Component"
|
||||
"vue.recent.templates": [
|
||||
"Vue Composition API Component"
|
||||
]
|
||||
}
|
||||
}</component>
|
||||
}]]></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" />
|
||||
|
||||
14
AGENTS.md
14
AGENTS.md
@@ -8,6 +8,7 @@ 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`).
|
||||
@@ -17,6 +18,13 @@ 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.
|
||||
@@ -36,6 +44,7 @@ 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/`.
|
||||
@@ -47,6 +56,11 @@ 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`).
|
||||
|
||||
@@ -49,6 +49,9 @@ Ajouter dans le fichier .env du frontend
|
||||
* fix layout admin
|
||||
* Creation page admin listing bovins
|
||||
* Creation page admin ajout/modification bovins
|
||||
* [#331] Mettre à jour l'entité Shipment et bovin_shipment
|
||||
* [#278] Plan du site
|
||||
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
@@ -3,8 +3,6 @@ api_platform:
|
||||
version: 1.0.0
|
||||
defaults:
|
||||
stateless: true
|
||||
pagination_client_items_per_page: true
|
||||
pagination_maximum_items_per_page: 100
|
||||
cache_headers:
|
||||
vary: ['Content-Type', 'Authorization', 'Origin']
|
||||
formats:
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
// This file is auto-generated and is for apps only. Bundles SHOULD NOT rely on its content.
|
||||
|
||||
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
|
||||
@@ -1470,7 +1472,7 @@ use Symfony\Component\Config\Loader\ParamConfigurator as Param;
|
||||
* mercure?: bool|array{
|
||||
* enabled?: bool|Param, // Default: false
|
||||
* hub_url?: scalar|Param|null, // The URL sent in the Link HTTP header. If not set, will default to the URL for MercureBundle's default hub. // Default: null
|
||||
* include_type?: bool|Param, // Always include @type in updates (including delete ones). // Default: false
|
||||
* include_type?: bool|Param, // Always include @var in updates (including delete ones). // Default: false
|
||||
* },
|
||||
* messenger?: bool|array{
|
||||
* enabled?: bool|Param, // Default: false
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
parameters:
|
||||
app.version: '0.0.51'
|
||||
app.version: '0.0.56'
|
||||
|
||||
@@ -152,15 +152,9 @@ import type {ShipmentFormData} from '~/services/dto/shipment-data'
|
||||
import {SUPPLIER_CODE} from "~/utils/constants"
|
||||
import {useAuthStore} from '~/stores/auth'
|
||||
import {useShipmentStore} from '~/stores/shipment'
|
||||
import { computed, reactive, ref, watch, onMounted } from 'vue'
|
||||
import {computed, reactive, ref, watch, onMounted} from 'vue'
|
||||
import type {ShipmentTypeData} from "~/services/dto/shipment-type-data";
|
||||
import {getShipmentTypeList} from "~/services/shipment-type";
|
||||
import {
|
||||
createShipmentBovine,
|
||||
deleteShipmentBovine,
|
||||
getBovinShipmentList,
|
||||
updateShipmentBovine
|
||||
} from "~/services/bovin-shipment";
|
||||
|
||||
const users = ref<UserData[]>([])
|
||||
const customers = ref<CustomerData[]>([])
|
||||
@@ -332,23 +326,15 @@ watch(
|
||||
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) : ''
|
||||
if (!shipment || !shipment.bovinShipments) {
|
||||
selectedShipmentTypeId.value = ''
|
||||
shipmentQuantity.value = 0
|
||||
} else {
|
||||
const selectedEntry = shipment.bovinShipments.find((entry) => {
|
||||
const typeId = entry.shipmentType?.id
|
||||
return Boolean(typeId) && Number(entry.nbBovinSend ?? 0) > 0
|
||||
}) ?? shipment.bovinShipments.find((entry) => Boolean(entry.shipmentType?.id))
|
||||
|
||||
if (!selectedEntry?.shipmentType?.id) {
|
||||
selectedShipmentTypeId.value = ''
|
||||
shipmentQuantity.value = 0
|
||||
} else {
|
||||
selectedShipmentTypeId.value = String(selectedEntry.shipmentType.id)
|
||||
shipmentQuantity.value = selectedEntry.nbBovinSend ?? 0
|
||||
}
|
||||
}
|
||||
|
||||
selectedShipmentTypeId.value = shipment?.shipmentType?.id
|
||||
? String(shipment.shipmentType.id)
|
||||
: ''
|
||||
|
||||
shipmentQuantity.value = shipment?.nbBovinSend ?? 0
|
||||
|
||||
|
||||
isHydrating.value = false
|
||||
},
|
||||
{immediate: true}
|
||||
@@ -474,68 +460,7 @@ watch(
|
||||
}
|
||||
}
|
||||
)
|
||||
const buildDesiredBovinShipments = () => {
|
||||
const typeId = Number(selectedShipmentTypeId.value)
|
||||
if (!Number.isFinite(typeId)) {
|
||||
return []
|
||||
}
|
||||
const type = bovineShipment.value.find((entry) => entry.id === typeId)
|
||||
if (!type) {
|
||||
return []
|
||||
}
|
||||
const raw = shipmentQuantity.value
|
||||
const quantity = raw === null || raw === undefined ? 0 : Number(raw)
|
||||
const normalizedQuantity = Number.isFinite(quantity) ? Math.max(0, Math.trunc(quantity)) : 0
|
||||
if (normalizedQuantity <= 0) {
|
||||
return []
|
||||
}
|
||||
|
||||
return [{type, quantity: normalizedQuantity}]
|
||||
}
|
||||
const syncBovinShipments = async (
|
||||
shipmentId: number,
|
||||
existing: Array<{ id?: number; nbBovinSend: number | null; shipmentType?: unknown }> = []
|
||||
) => {
|
||||
const shipmentIri = `/api/shipments/${shipmentId}`
|
||||
const desired = buildDesiredBovinShipments()
|
||||
const desiredByTypeId = new Map<number, number>()
|
||||
for (const entry of desired) {
|
||||
desiredByTypeId.set(entry.type.id, entry.quantity)
|
||||
}
|
||||
for (const entry of existing) {
|
||||
if (!entry.id) {
|
||||
continue
|
||||
}
|
||||
const rawType = entry.shipmentType
|
||||
let typeId: number | null = null
|
||||
if (rawType && typeof rawType === 'object' && 'id' in rawType) {
|
||||
typeId = Number((rawType as { id: number }).id)
|
||||
} else if (typeof rawType === 'string') {
|
||||
const match = rawType.match(/\/shipment_types\/(\\d+)$/)
|
||||
typeId = match ? Number(match[1]) : null
|
||||
}
|
||||
if (!typeId) {
|
||||
continue
|
||||
}
|
||||
const desiredQuantity = desiredByTypeId.get(typeId)
|
||||
if (!desiredQuantity) {
|
||||
await deleteShipmentBovine(entry.id)
|
||||
continue
|
||||
}
|
||||
if (entry.nbBovinSend !== desiredQuantity) {
|
||||
await updateShipmentBovine(entry.id, {nbBovinSend: desiredQuantity})
|
||||
}
|
||||
desiredByTypeId.delete(typeId)
|
||||
}
|
||||
|
||||
for (const [typeId, quantity] of desiredByTypeId.entries()) {
|
||||
await createShipmentBovine({
|
||||
shipment: shipmentIri,
|
||||
shipmentType: `/api/shipment_types/${typeId}`,
|
||||
nbBovinSend: quantity
|
||||
})
|
||||
}
|
||||
}
|
||||
const buildPayload = () => {
|
||||
const normalizedLicensePlate = form.licencePlate.trim()
|
||||
const normalizedShipmentDate = form.shipmentDate.trim()
|
||||
@@ -563,6 +488,14 @@ const buildPayload = () => {
|
||||
const addressIri = normalizedAddressId
|
||||
? `/api/addresses/${normalizedAddressId}`
|
||||
: null
|
||||
const normalizedShipmentTypeId = selectedShipmentTypeId.value.trim()
|
||||
const shipmentTypeIri = normalizedShipmentTypeId
|
||||
? `/api/shipment_types/${normalizedShipmentTypeId}`
|
||||
: null
|
||||
|
||||
const rawQuantity = Number(shipmentQuantity.value ?? 0)
|
||||
const normalizedQuantity = Number.isFinite(rawQuantity) ? Math.max(0,
|
||||
Math.trunc(rawQuantity)) : 0
|
||||
|
||||
return {
|
||||
licencePlate: normalizedLicensePlate,
|
||||
@@ -572,20 +505,19 @@ const buildPayload = () => {
|
||||
carrier: carrierIri,
|
||||
driver: driverIri,
|
||||
user: userIri,
|
||||
address: addressIri
|
||||
address: addressIri,
|
||||
shipmentType: shipmentTypeIri,
|
||||
nbBovinSend: normalizedQuantity,
|
||||
}
|
||||
}
|
||||
|
||||
const saveDraft = async () => {
|
||||
const payload = buildPayload()
|
||||
if (!shipmentStore.current) {
|
||||
const created = await shipmentStore.createShipment({
|
||||
await shipmentStore.createShipment({
|
||||
currentStep: 0,
|
||||
...payload
|
||||
})
|
||||
if (created) {
|
||||
await syncBovinShipments(created.id, [])
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@@ -593,10 +525,6 @@ const saveDraft = async () => {
|
||||
currentStep: shipmentStore.current.currentStep,
|
||||
...payload
|
||||
})
|
||||
await syncBovinShipments(
|
||||
shipmentStore.current.id,
|
||||
shipmentStore.current?.bovinShipments ?? []
|
||||
)
|
||||
}
|
||||
|
||||
defineExpose({saveDraft})
|
||||
@@ -610,7 +538,6 @@ const validate = async () => {
|
||||
})
|
||||
if (created) {
|
||||
await shipmentStore.loadShipment(created.id)
|
||||
await syncBovinShipments(created.id, shipmentStore.current?.bovinShipments ?? [])
|
||||
await router.push(`/shipment/${created.id}`)
|
||||
}
|
||||
return
|
||||
@@ -621,6 +548,5 @@ const validate = async () => {
|
||||
...payload
|
||||
})
|
||||
await shipmentStore.loadShipment(shipmentStore.current.id)
|
||||
await syncBovinShipments(shipmentStore.current.id, shipmentStore.current?.bovinShipments ?? [])
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="flex flex-col items-center gap-[118px]">
|
||||
<h1 class="font-bold text-5xl uppercase text-primary-500">Charment des bovins</h1>
|
||||
<h1 class="font-bold text-5xl uppercase text-primary-500">Chargement des bovins</h1>
|
||||
<div
|
||||
class="w-full flex flex-col items-center justify-center">
|
||||
<UiLoadingDots />
|
||||
|
||||
@@ -1,436 +0,0 @@
|
||||
<template>
|
||||
<div class="mt-6 mx-[6px]">
|
||||
<table class="w-full border border-slate-300 table-fixed">
|
||||
<thead class="bg-slate-100 capitalize tracking-wide">
|
||||
<tr>
|
||||
<th
|
||||
v-for="column in normalizedColumns"
|
||||
:key="column.key"
|
||||
class="border border-slate-300 px-2 py-1"
|
||||
>
|
||||
<div class="flex flex-col gap-1">
|
||||
<UiSelect
|
||||
v-if="column.isSearchable && column.type === 'selectTypeReception'"
|
||||
v-model="searchValues[column.key]"
|
||||
:placeholder="column.label"
|
||||
select-class="w-full !text-sm !py-1"
|
||||
:options="[
|
||||
{ value: '__all__', label: 'Tous' },
|
||||
...receptionTypes.map((type) => ({
|
||||
value: type.label,
|
||||
label: type.label
|
||||
}))
|
||||
]"
|
||||
/>
|
||||
<UiSelect
|
||||
v-else-if="column.isSearchable && column.type === 'selectTypeShipment'"
|
||||
v-model="searchValues[column.key]"
|
||||
:placeholder="column.label"
|
||||
select-class="w-full !text-sm !py-1"
|
||||
:options="[
|
||||
{ value: '__all__', label: 'Tous' },
|
||||
...shipmentTypes.map((type) => ({
|
||||
value: type.label,
|
||||
label: type.label
|
||||
}))
|
||||
]"
|
||||
/>
|
||||
<div v-else-if="column.isSearchable" class="relative">
|
||||
<UiTextInput
|
||||
v-model="searchValues[column.key]"
|
||||
:placeholder="column.label"
|
||||
input-class="min-w-full !text-sm !py-1 !pr-7"
|
||||
/>
|
||||
<Icon
|
||||
name="gg:search"
|
||||
class="pointer-events-none absolute right-2 top-1/2 -translate-y-1/2 text-slate-400"
|
||||
/>
|
||||
</div>
|
||||
<span v-else>{{ column.label }}</span>
|
||||
</div>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-if="loading">
|
||||
<td
|
||||
class="border border-slate-300 px-2 py-2 whitespace-pre-line"
|
||||
:colspan="normalizedColumns.length || 1"
|
||||
>
|
||||
Chargement...
|
||||
</td>
|
||||
</tr>
|
||||
<tr v-else-if="displayedRows.length === 0">
|
||||
<td
|
||||
class="border border-slate-300 px-3 py-2 text-left text-slate-500"
|
||||
:colspan="normalizedColumns.length || 1"
|
||||
>
|
||||
Aucune donnée
|
||||
</td>
|
||||
</tr>
|
||||
<template v-else>
|
||||
<tr
|
||||
v-for="(row, rowIndex) in displayedRows"
|
||||
class="hover:bg-primary-500 hover:bg-opacity-15"
|
||||
:key="rowIndex"
|
||||
:class="props.rowClickable ? 'cursor-pointer' : ''"
|
||||
@click="props.rowClickable ? onRowClick(row) : null"
|
||||
>
|
||||
<td
|
||||
v-for="column in normalizedColumns"
|
||||
:key="column.key"
|
||||
class="border border-slate-300 px-2 py-2 whitespace-pre-line "
|
||||
>
|
||||
{{ formatColumnValue(row, column) }}
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="flex items-center justify-between mt-4">
|
||||
<p class="text-slate-600">
|
||||
{{ pageLabel }}
|
||||
</p>
|
||||
<div class="flex items-center gap-2">
|
||||
<button
|
||||
type="button"
|
||||
class="rounded border border-slate-300 px-2 py-1 disabled:cursor-not-allowed disabled:opacity-50"
|
||||
:disabled="currentPage <= 1 || loading"
|
||||
@click="currentPage = currentPage - 1"
|
||||
>
|
||||
Précédent
|
||||
</button>
|
||||
<button
|
||||
v-for="(item, index) in paginationItems"
|
||||
:key="`${item}-${index}`"
|
||||
type="button"
|
||||
class="min-w-9 rounded border px-2 py-1"
|
||||
:class="item === currentPage
|
||||
? 'border-primary-500 bg-primary-500 text-white'
|
||||
: 'border-slate-300'"
|
||||
:disabled="loading || item === '...'"
|
||||
@click="typeof item === 'number' ? (currentPage = item) : null"
|
||||
>
|
||||
{{ item }}
|
||||
</button>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
class="rounded border border-slate-300 px-2 py-1 disabled:cursor-not-allowed disabled:opacity-50"
|
||||
:disabled="currentPage >= totalPages || loading"
|
||||
@click="currentPage = currentPage + 1"
|
||||
>
|
||||
Suivant
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {Row, ColumnConfig, AnyCollection, PaginationItem} from '~/services/dto/datatable-data'
|
||||
import {useApi} from '~/composables/useApi'
|
||||
import type {ReceptionTypeData} from '~/services/dto/reception-type-data'
|
||||
import {getReceptionTypeList} from '~/services/reception-type'
|
||||
import type {ShipmentTypeData} from "~/services/dto/shipment-data";
|
||||
import {getShipmentTypeList} from "~/services/shipment-type";
|
||||
|
||||
const api = useApi()
|
||||
const receptionTypes = ref<ReceptionTypeData[]>([])
|
||||
const shipmentTypes = ref<ShipmentTypeData[]>([])
|
||||
const loading = ref(false)
|
||||
const currentPage = ref(1)
|
||||
const rows = ref<Row[]>([])
|
||||
const total = ref(0)
|
||||
const searchValues = reactive<Record<string, string>>({})
|
||||
const isNestedMode = computed(() => Boolean(props.responsePath))
|
||||
const effectiveTotal = computed(() => total.value)
|
||||
const emit = defineEmits<{
|
||||
rowClick: [row: Row]
|
||||
}>()
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
url?: string
|
||||
responsePath?: string
|
||||
columns?: ColumnConfig[]
|
||||
query?: Record<string, unknown>
|
||||
itemsPerPage?: number
|
||||
rowClickable?: boolean
|
||||
}>(), {
|
||||
url: '',
|
||||
responsePath: '',
|
||||
columns: () => [],
|
||||
query: () => ({}),
|
||||
itemsPerPage: 10,
|
||||
rowClickable: true
|
||||
})
|
||||
const displayedRows = computed<Row[]>(() => {
|
||||
if (!isNestedMode.value) return rows.value
|
||||
|
||||
const startIndex = (currentPage.value - 1) * props.itemsPerPage
|
||||
const endIndex = startIndex + props.itemsPerPage
|
||||
return rows.value.slice(startIndex, endIndex)
|
||||
})
|
||||
onMounted(async () => {
|
||||
receptionTypes.value = await getReceptionTypeList()
|
||||
shipmentTypes.value = await getShipmentTypeList()
|
||||
|
||||
})
|
||||
const normalizedColumns = computed(() => {
|
||||
if (props.columns.length > 0) {
|
||||
return props.columns.map((column) => ({
|
||||
key: column.key,
|
||||
label: column.label ?? column.key,
|
||||
format: column.format,
|
||||
isSearchable: column.isSearchable ?? false,
|
||||
type: column.type
|
||||
}))
|
||||
}
|
||||
|
||||
if (displayedRows.value.length === 0) {
|
||||
return []
|
||||
}
|
||||
|
||||
return Object.keys(displayedRows.value[0])
|
||||
.filter((key) => !key.startsWith('@'))
|
||||
.map((key) => ({
|
||||
key,
|
||||
label: key
|
||||
}))
|
||||
})
|
||||
|
||||
const totalPages = computed(() => Math.max(1, Math.ceil(effectiveTotal.value / props.itemsPerPage)))
|
||||
|
||||
function getVisiblePages(page: number, lastPage: number): number[] {
|
||||
const candidates = new Set([1, page - 1, page, page + 1, lastPage])
|
||||
return Array.from(candidates)
|
||||
.filter((p) => p >= 1 && p <= lastPage)
|
||||
.sort((a, b) => a - b)
|
||||
}
|
||||
|
||||
function insertEllipses(sortedPages: number[]): PaginationItem[] {
|
||||
const items: PaginationItem[] = []
|
||||
|
||||
for (let i = 0; i < sortedPages.length; i++) {
|
||||
const current = sortedPages[i]
|
||||
const previous = sortedPages[i - 1]
|
||||
if (previous != null && current - previous > 1) {
|
||||
items.push('...')
|
||||
}
|
||||
items.push(current)
|
||||
}
|
||||
return items
|
||||
}
|
||||
|
||||
const paginationItems = computed<PaginationItem[]>(() => {
|
||||
const pages = getVisiblePages(currentPage.value, totalPages.value)
|
||||
return insertEllipses(pages)
|
||||
})
|
||||
|
||||
const pageLabel = computed(() => {
|
||||
if (!effectiveTotal.value) return '0 résultat'
|
||||
|
||||
const start = (currentPage.value - 1) * props.itemsPerPage + 1
|
||||
const end = Math.min(currentPage.value * props.itemsPerPage, effectiveTotal.value)
|
||||
|
||||
return `${start}-${end} sur ${effectiveTotal.value}`
|
||||
})
|
||||
|
||||
watch(
|
||||
() => [props.url, props.itemsPerPage, JSON.stringify(props.query ?? {}), props.responsePath],
|
||||
async () => {
|
||||
if (currentPage.value !== 1) {
|
||||
currentPage.value = 1
|
||||
if (!isNestedMode.value) return
|
||||
}
|
||||
await loadPage()
|
||||
},
|
||||
{immediate: true}
|
||||
)
|
||||
|
||||
let timeout: ReturnType<typeof setTimeout>
|
||||
|
||||
watch(
|
||||
() => ({...searchValues}),
|
||||
() => {
|
||||
clearTimeout(timeout)
|
||||
timeout = setTimeout(() => {
|
||||
currentPage.value = 1
|
||||
if (!isNestedMode.value) loadPage()
|
||||
}, 750)
|
||||
},
|
||||
{deep: true}
|
||||
)
|
||||
|
||||
watch(
|
||||
() => currentPage.value,
|
||||
async () => {
|
||||
if (isNestedMode.value) return
|
||||
await loadPage()
|
||||
}
|
||||
)
|
||||
|
||||
watch(
|
||||
() => [totalPages.value, currentPage.value],
|
||||
() => {
|
||||
if (currentPage.value > totalPages.value) {
|
||||
currentPage.value = totalPages.value
|
||||
}
|
||||
},
|
||||
{immediate: true}
|
||||
)
|
||||
|
||||
function buildDateInterval(value: string): { after: string; before: string } | null {
|
||||
const trimmed = value.trim()
|
||||
|
||||
// YYYY
|
||||
if (/^\d{4}$/.test(trimmed)) {
|
||||
const year = Number(trimmed)
|
||||
return {
|
||||
after: `${year}-01-01`,
|
||||
before: `${year + 1}-01-01`
|
||||
}
|
||||
}
|
||||
|
||||
// YYYY-MM
|
||||
if (/^\d{4}-\d{2}$/.test(trimmed)) {
|
||||
const [year, month] = trimmed.split('-').map(Number)
|
||||
|
||||
const nextMonth = month === 12 ? 1 : month + 1
|
||||
const nextYear = month === 12 ? year + 1 : year
|
||||
|
||||
return {
|
||||
after: `${year}-${String(month).padStart(2, '0')}-01`,
|
||||
before: `${nextYear}-${String(nextMonth).padStart(2, '0')}-01`
|
||||
}
|
||||
}
|
||||
|
||||
// YYYY-MM-DD
|
||||
if (/^\d{4}-\d{2}-\d{2}$/.test(trimmed)) {
|
||||
const date = new Date(`${trimmed}T00:00:00`)
|
||||
const nextDay = new Date(date)
|
||||
nextDay.setDate(date.getDate() + 1)
|
||||
|
||||
const yyyy = nextDay.getFullYear()
|
||||
const mm = String(nextDay.getMonth() + 1).padStart(2, '0')
|
||||
const dd = String(nextDay.getDate()).padStart(2, '0')
|
||||
|
||||
return {
|
||||
after: trimmed,
|
||||
before: `${yyyy}-${mm}-${dd}`
|
||||
}
|
||||
}
|
||||
|
||||
return null
|
||||
}
|
||||
|
||||
|
||||
// Construit la requête, charge les données et normalise la réponse, puis met à jour rows et total
|
||||
async function loadPage(): Promise<void> {
|
||||
if (!props.url) {
|
||||
rows.value = []
|
||||
total.value = 0
|
||||
return
|
||||
}
|
||||
|
||||
loading.value = true
|
||||
|
||||
try {
|
||||
if (isNestedMode.value) {
|
||||
const response = await api.get<Row>(props.url, props.query, {
|
||||
headers: {
|
||||
Accept: 'application/ld+json'
|
||||
}
|
||||
})
|
||||
const nestedRows = readPath(response, props.responsePath)
|
||||
rows.value = Array.isArray(nestedRows) ? nestedRows as Row[] : []
|
||||
total.value = rows.value.length
|
||||
return
|
||||
}
|
||||
const searchQuery: Record<string, string> = {}
|
||||
|
||||
for (const column of normalizedColumns.value) {
|
||||
if (!column.isSearchable) continue
|
||||
|
||||
const rawValue = searchValues[column.key] ?? ''
|
||||
const raw = rawValue === '__all__' ? '' : rawValue.trim()
|
||||
if (!raw) continue
|
||||
|
||||
const paramBase = column.key
|
||||
|
||||
if (column.type === 'date') {
|
||||
const interval = buildDateInterval(raw)
|
||||
|
||||
if (interval) {
|
||||
searchQuery[`${paramBase}[after]`] = interval.after
|
||||
searchQuery[`${paramBase}[before]`] = interval.before
|
||||
}
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
searchQuery[paramBase] = raw
|
||||
}
|
||||
|
||||
const requestQuery: Record<string, unknown> = {
|
||||
...props.query,
|
||||
...searchQuery,
|
||||
page: currentPage.value,
|
||||
itemsPerPage: props.itemsPerPage,
|
||||
}
|
||||
|
||||
const response = await api.get<AnyCollection<Row> | Row[]>(props.url, requestQuery, {
|
||||
headers: {
|
||||
Accept: 'application/ld+json'
|
||||
}
|
||||
})
|
||||
|
||||
if (Array.isArray(response)) {
|
||||
rows.value = response
|
||||
total.value = response.length
|
||||
return
|
||||
}
|
||||
|
||||
const mappedRows = response['hydra:member'] ?? response.member ?? response.items ?? []
|
||||
rows.value = Array.isArray(mappedRows) ? mappedRows : []
|
||||
total.value = Number(response['hydra:totalItems'] ?? response.totalItems ?? rows.value.length)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function onRowClick(row: Row): void {
|
||||
emit('rowClick', row)
|
||||
}
|
||||
|
||||
// Lit une valeur imbriquée dans une ligne à partir d'un chemin de type "objet.sousObjet.cle".
|
||||
function readPath(source: Row, path: string): unknown {
|
||||
return path.split('.').reduce<unknown>((acc, key) => (acc as Row | undefined)?.[key], source)
|
||||
}
|
||||
|
||||
// Formate une valeur brute pour l'affichage dans une cellule (vide, tableau, objet ou valeur simple).
|
||||
function formatCell(value: unknown): string {
|
||||
if (value == null || value === '') return '-'
|
||||
|
||||
if (Array.isArray(value)) return value.length ? value.map(formatCell).join(', ') : '-'
|
||||
|
||||
if (typeof value === 'object') {
|
||||
const objectValue = value as Row
|
||||
return String(objectValue.label ?? objectValue.name ?? objectValue.code ?? objectValue.id ?? '[object]')
|
||||
}
|
||||
return String(value)
|
||||
}
|
||||
|
||||
function formatColumnValue(
|
||||
row: Row,
|
||||
column: { key: string; format?: (value: unknown, row: Row) => string }
|
||||
): string {
|
||||
const value = readPath(row, column.key)
|
||||
if (column.format) {
|
||||
return column.format(value, row)
|
||||
}
|
||||
|
||||
return formatCell(value)
|
||||
}
|
||||
</script>
|
||||
@@ -1,43 +1,53 @@
|
||||
<template>
|
||||
|
||||
<div class="flex items-center justify-between ">
|
||||
<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 gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
|
||||
>
|
||||
<Icon name="mdi:plus" size="28"/>
|
||||
Ajouter
|
||||
</NuxtLink>
|
||||
<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 gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
|
||||
>
|
||||
<Icon name="mdi:plus" size="28" />
|
||||
Ajouter
|
||||
</NuxtLink>
|
||||
</div>
|
||||
|
||||
<UiDataTable
|
||||
:columns="columns"
|
||||
url="carriers"
|
||||
@row-click="onCarrierRowClick"
|
||||
/>
|
||||
<div class="mt-6 border border-slate-200 mb-16 ">
|
||||
<div class="grid grid-cols-2 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
||||
<div>Label</div>
|
||||
<div>Code</div>
|
||||
</div>
|
||||
<div
|
||||
v-for="carrier in carrierList"
|
||||
:key="carrier.id"
|
||||
class="grid grid-cols-2 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
|
||||
role="button"
|
||||
tabindex="0"
|
||||
@click="goToCarrier(carrier.id)"
|
||||
@keydown.enter="goToCarrier(carrier.id)"
|
||||
>
|
||||
<div>{{ carrier.name}}</div>
|
||||
<div>{{ carrier.code }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import type {ColumnConfig, Row} from "~/services/dto/datatable-data";
|
||||
import type {CarrierData} from "~/services/dto/carrier-data";
|
||||
import {getCarrierList} from "~/services/carrier";
|
||||
|
||||
const carrierList = ref<CarrierData[]>()
|
||||
const router = useRouter()
|
||||
|
||||
const columns: ColumnConfig[] = [
|
||||
{key: "name", label: "Label"},
|
||||
{key: "code", label: "Code"},
|
||||
]
|
||||
|
||||
const goToCarrier = (id: number) => {
|
||||
router.push(`/admin/carrier/${id}`)
|
||||
}
|
||||
|
||||
const onCarrierRowClick = (row: Row) => {
|
||||
const id = Number(row.id)
|
||||
if (!Number.isFinite(id)) return
|
||||
goToCarrier(id)
|
||||
}
|
||||
|
||||
definePageMeta({
|
||||
layout: 'default'
|
||||
})
|
||||
|
||||
onMounted(async () => {
|
||||
carrierList.value = await getCarrierList(false)
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -32,15 +32,45 @@
|
||||
Ajouter
|
||||
</UiButton>
|
||||
</div>
|
||||
<UiDataTable
|
||||
class="mb-10"
|
||||
:columns="addressColumns"
|
||||
:url="customerId !== null ? `customers/${customerId}` : ''"
|
||||
response-path="addresses"
|
||||
:items-per-page="5"
|
||||
:row-clickable="auth.isAdmin"
|
||||
@row-click="onAddressRowClick"
|
||||
/>
|
||||
<div class="overflow-x-auto mb-10">
|
||||
<table class="w-full border-collapse">
|
||||
<thead>
|
||||
<tr class="text-left border-b border-gray-200">
|
||||
<th class="py-3 pr-4 text-sm uppercase">Libellé</th>
|
||||
<th class="py-3 pr-4 text-sm uppercase">Rue</th>
|
||||
<th class="py-3 pr-4 text-sm uppercase">Complément</th>
|
||||
<th class="py-3 pr-4 text-sm uppercase">Code postal</th>
|
||||
<th class="py-3 pr-4 text-sm uppercase">Ville</th>
|
||||
<th class="py-3 pr-4 text-sm uppercase">Pays</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<template v-if="form.addresses.length === 0">
|
||||
<tr>
|
||||
<td colspan="6" class="py-4 text-slate-400">
|
||||
Aucune adresse.
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
<template v-else>
|
||||
<tr
|
||||
v-for="(address, index) in form.addresses"
|
||||
:key="address.id ?? index"
|
||||
class="border-b border-gray-100 hover:bg-slate-50"
|
||||
:class="auth.isAdmin ? 'cursor-pointer' : 'cursor-not-allowed opacity-60'"
|
||||
@click="goToEditAddress(address.id ?? null)"
|
||||
>
|
||||
<td class="py-3 pr-4">{{ address.label || "—" }}</td>
|
||||
<td class="py-3 pr-4">{{ address.street || "—" }}</td>
|
||||
<td class="py-3 pr-4">{{ address.street2 || "—" }}</td>
|
||||
<td class="py-3 pr-4">{{ address.postalCode || "—" }}</td>
|
||||
<td class="py-3 pr-4">{{ address.city || "—" }}</td>
|
||||
<td class="py-3 pr-4">{{ address.countryCode || "—" }}</td>
|
||||
</tr>
|
||||
</template>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</form>
|
||||
</template>
|
||||
|
||||
@@ -48,7 +78,6 @@
|
||||
import {computed, reactive, ref, watch} from "vue"
|
||||
import {createCustomer, getCustomer, updateCustomer} from "~/services/customer"
|
||||
import type {CustomerData, CustomerFormData, CustomerPayload} from "~/services/dto/customer-data"
|
||||
import type {ColumnConfig, Row} from "~/services/dto/datatable-data"
|
||||
import {useAuthStore} from "~/stores/auth"
|
||||
|
||||
definePageMeta({layout: "default"})
|
||||
@@ -71,14 +100,6 @@ const form = reactive<CustomerFormData>({
|
||||
email: "",
|
||||
addresses: [],
|
||||
})
|
||||
const addressColumns: ColumnConfig[] = [
|
||||
{key: "label", label: "Libellé"},
|
||||
{key: "street", label: "Rue"},
|
||||
{key: "street2", label: "Complément"},
|
||||
{key: "postalCode", label: "Code postal"},
|
||||
{key: "city", label: "Ville"},
|
||||
{key: "countryCode", label: "Pays"},
|
||||
]
|
||||
|
||||
const goToAddAddress = () => {
|
||||
if (customerId.value === null || !auth.isAdmin) return
|
||||
@@ -101,16 +122,29 @@ const goToEditAddress = (addressId: number | null) => {
|
||||
})
|
||||
}
|
||||
|
||||
const onAddressRowClick = (row: Row) => {
|
||||
const id = Number(row.id)
|
||||
goToEditAddress(Number.isFinite(id) ? id : null)
|
||||
}
|
||||
|
||||
const hydrateFromCustomer = (customer: CustomerData | null) => {
|
||||
if (!customer) return
|
||||
form.name = customer.name ?? ""
|
||||
form.phone = customer.phone ?? ""
|
||||
form.email = customer.email ?? ""
|
||||
if (!Array.isArray(customer.addresses) || customer.addresses.length === 0) {
|
||||
form.addresses = []
|
||||
return
|
||||
}
|
||||
if (typeof customer.addresses[0] === "string") {
|
||||
form.addresses = []
|
||||
return
|
||||
}
|
||||
|
||||
form.addresses = customer.addresses.map((address) => ({
|
||||
id: address.id ?? null,
|
||||
label: address.label ?? "",
|
||||
street: address.street ?? "",
|
||||
street2: address.street2 ?? null,
|
||||
postalCode: address.postalCode ?? "",
|
||||
city: address.city ?? "",
|
||||
countryCode: address.countryCode ?? "",
|
||||
}))
|
||||
}
|
||||
|
||||
watch(
|
||||
|
||||
@@ -12,48 +12,106 @@
|
||||
</NuxtLink>
|
||||
</div>
|
||||
|
||||
<UiDataTable
|
||||
v-if="auth.isAdmin"
|
||||
:columns="columns"
|
||||
url="customers"
|
||||
@row-click="onCustomerRowClick"
|
||||
/>
|
||||
<div v-if="auth.isAdmin" class="mt-6 border border-slate-200 mb-16">
|
||||
<div class="max-h-96 overflow-y-auto">
|
||||
<div
|
||||
class="sticky top-0 z-10 grid grid-cols-8 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
|
||||
>
|
||||
<div>Nom</div>
|
||||
<div>Téléphone</div>
|
||||
<div>Email</div>
|
||||
<div>Rue</div>
|
||||
<div>Complément</div>
|
||||
<div>Code Postal</div>
|
||||
<div>Ville</div>
|
||||
<div>Pays</div>
|
||||
</div>
|
||||
|
||||
<div v-if="customerList.length === 0" class="px-4 py-6 text-slate-400">
|
||||
Aucun client.
|
||||
</div>
|
||||
|
||||
<div v-for="customer in customerList" :key="customer.id">
|
||||
<div
|
||||
v-if="!customer.addresses || customer.addresses.length === 0"
|
||||
class="grid grid-cols-8 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
|
||||
@click="goToCustomer(customer.id)"
|
||||
>
|
||||
<div class="truncate">{{ customer.name || "—" }}</div>
|
||||
<div class="truncate">{{ customer.phone || "—" }}</div>
|
||||
<div class="truncate">{{ customer.email || "—" }}</div>
|
||||
<div class="col-span-1">Pas d'adresse</div>
|
||||
<div class="uppercase truncate">{{"—"}}</div>
|
||||
<div class="uppercase truncate">{{"—"}}</div>
|
||||
<div class="uppercase truncate">{{"—"}}</div>
|
||||
<div class="uppercase truncate">{{"—"}}</div>
|
||||
</div>
|
||||
|
||||
<template v-else-if="customer.addresses.length > 0">
|
||||
<div
|
||||
v-for="(address, idx) in customer.addresses"
|
||||
:key="address.id ?? `${customer.id}-${idx}-${address.street}-${address.postalCode}`"
|
||||
class="grid grid-cols-8 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
|
||||
:class="idx > 0 ? 'pl-4 border-l-4 border-l-slate-200 bg-slate-50' : ''"
|
||||
@click="goToCustomer(customer.id)"
|
||||
>
|
||||
<div class="truncate">
|
||||
{{ idx === 0 ? (customer.name || "—") : "↳" }}
|
||||
</div>
|
||||
<div class="truncate">{{ idx === 0 ? (customer.phone || "—") : "" }}</div>
|
||||
<div class="truncate">{{ idx === 0 ? (customer.email || "—") : "" }}</div>
|
||||
<div class="truncate">{{ address.street || "—" }}</div>
|
||||
<div class="truncate">{{ address.street2 || "—" }}</div>
|
||||
<div>{{ address.postalCode || "—" }}</div>
|
||||
<div class="uppercase truncate">{{ address.city || "—" }}</div>
|
||||
<div class="uppercase truncate">{{ address.countryCode || "—" }}</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template v-else>
|
||||
<div
|
||||
class="grid grid-cols-8 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
|
||||
@click="goToCustomer(customer.id)"
|
||||
>
|
||||
<div class="truncate">{{ customer.name || "—" }}</div>
|
||||
<div class="truncate">{{ customer.phone || "—" }}</div>
|
||||
<div class="truncate">{{ customer.email || "—" }}</div>
|
||||
<div class="col-span-5 text-slate-400">
|
||||
Adresses non chargées
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
|
||||
Accès réservé aux administrateurs.
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import type { ColumnConfig, Row } from "~/services/dto/datatable-data"
|
||||
import { formatAddresses } from "~/utils/datatable-formatters"
|
||||
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()
|
||||
|
||||
const columns: ColumnConfig[] = [
|
||||
{ key: "name", label: "Nom", isSearchable:true},
|
||||
{ key: "phone", label: "Téléphone" },
|
||||
{ key: "email", label: "Email" },
|
||||
{ key: "addresses", label: "Adresses", format: formatAddresses },
|
||||
]
|
||||
|
||||
const goToCustomer = (id: number) => {
|
||||
if (!auth.isAdmin) return
|
||||
router.push(`/admin/customer/${id}`)
|
||||
}
|
||||
|
||||
const onCustomerRowClick = (row: Row) => {
|
||||
const id = Number(row.id)
|
||||
if (!Number.isFinite(id)) return
|
||||
goToCustomer(id)
|
||||
}
|
||||
|
||||
const handleAddClick = (event: Event) => {
|
||||
if (auth.isAdmin) return
|
||||
event.preventDefault()
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
if (!auth.isAdmin) return
|
||||
customerList.value = await getCustomerList()
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -32,15 +32,45 @@
|
||||
Ajouter
|
||||
</UiButton>
|
||||
</div>
|
||||
<UiDataTable
|
||||
class="mb-10"
|
||||
:columns="addressColumns"
|
||||
:url="supplierId !== null ? `suppliers/${supplierId}` : ''"
|
||||
response-path="addresses"
|
||||
:items-per-page="5"
|
||||
:row-clickable="auth.isAdmin"
|
||||
@row-click="onAddressRowClick"
|
||||
/>
|
||||
<div class="overflow-x-auto mb-10">
|
||||
<table class="w-full border-collapse">
|
||||
<thead>
|
||||
<tr class="text-left border-b border-gray-200">
|
||||
<th class="py-3 pr-4 text-sm uppercase">Libellé</th>
|
||||
<th class="py-3 pr-4 text-sm uppercase">Rue</th>
|
||||
<th class="py-3 pr-4 text-sm uppercase">Complément</th>
|
||||
<th class="py-3 pr-4 text-sm uppercase">Code postal</th>
|
||||
<th class="py-3 pr-4 text-sm uppercase">Ville</th>
|
||||
<th class="py-3 pr-4 text-sm uppercase">Pays</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<template v-if="form.addresses.length === 0">
|
||||
<tr>
|
||||
<td colspan="6" class="py-4 text-slate-400">
|
||||
Aucune adresse.
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
<template v-else>
|
||||
<tr
|
||||
v-for="(address, index) in form.addresses"
|
||||
:key="address.id ?? index"
|
||||
class="border-b border-gray-100 hover:bg-slate-50"
|
||||
:class="auth.isAdmin ? 'cursor-pointer' : 'cursor-not-allowed opacity-60'"
|
||||
@click="goToEditAddress(address.id ?? null)"
|
||||
>
|
||||
<td class="py-3 pr-4">{{ address.label || "—" }}</td>
|
||||
<td class="py-3 pr-4">{{ address.street || "—" }}</td>
|
||||
<td class="py-3 pr-4">{{ address.street2 || "—" }}</td>
|
||||
<td class="py-3 pr-4">{{ address.postalCode || "—" }}</td>
|
||||
<td class="py-3 pr-4">{{ address.city || "—" }}</td>
|
||||
<td class="py-3 pr-4">{{ address.countryCode || "—" }}</td>
|
||||
</tr>
|
||||
</template>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</form>
|
||||
</template>
|
||||
|
||||
@@ -48,7 +78,6 @@
|
||||
import {computed, reactive, ref, watch} from "vue"
|
||||
import {createSupplier, getSupplier, updateSupplier} from "~/services/supplier"
|
||||
import type {SupplierData, SupplierFormData, SupplierPayload} from "~/services/dto/supplier-data"
|
||||
import type {ColumnConfig, Row} from "~/services/dto/datatable-data"
|
||||
import {useAuthStore} from "~/stores/auth"
|
||||
|
||||
definePageMeta({layout: "default"})
|
||||
@@ -71,14 +100,6 @@ const form = reactive<SupplierFormData>({
|
||||
phone: "",
|
||||
addresses: [],
|
||||
})
|
||||
const addressColumns: ColumnConfig[] = [
|
||||
{key: "label", label: "Libellé"},
|
||||
{key: "street", label: "Rue"},
|
||||
{key: "street2", label: "Complément"},
|
||||
{key: "postalCode", label: "Code postal"},
|
||||
{key: "city", label: "Ville"},
|
||||
{key: "countryCode", label: "Pays"},
|
||||
]
|
||||
|
||||
const goToAddAddress = () => {
|
||||
if (supplierId.value === null || !auth.isAdmin) return
|
||||
@@ -103,16 +124,29 @@ const goToEditAddress = (addressId: number | null) => {
|
||||
})
|
||||
}
|
||||
|
||||
const onAddressRowClick = (row: Row) => {
|
||||
const id = Number(row.id)
|
||||
goToEditAddress(Number.isFinite(id) ? id : null)
|
||||
}
|
||||
|
||||
const hydrateFromSupplier = (supplier: SupplierData | null) => {
|
||||
if (!supplier) return
|
||||
form.name = supplier.name ?? ""
|
||||
form.email = supplier.email ?? ""
|
||||
form.phone = supplier.phone ?? ""
|
||||
if (!Array.isArray(supplier.addresses) || supplier.addresses.length === 0) {
|
||||
form.addresses = []
|
||||
return
|
||||
}
|
||||
if (typeof supplier.addresses[0] === "string") {
|
||||
form.addresses = []
|
||||
return
|
||||
}
|
||||
|
||||
form.addresses = supplier.addresses.map((address) => ({
|
||||
id: address.id ?? null,
|
||||
label: address.label ?? "",
|
||||
street: address.street ?? "",
|
||||
street2: address.street2 ?? null,
|
||||
postalCode: address.postalCode ?? "",
|
||||
city: address.city ?? "",
|
||||
countryCode: address.countryCode ?? "",
|
||||
}))
|
||||
}
|
||||
|
||||
watch(
|
||||
|
||||
@@ -12,47 +12,102 @@
|
||||
</NuxtLink>
|
||||
</div>
|
||||
|
||||
<UiDataTable
|
||||
v-if="auth.isAdmin"
|
||||
:columns="columns"
|
||||
url="suppliers"
|
||||
@row-click="onSupplierRowClick"
|
||||
/>
|
||||
<div v-if="auth.isAdmin" class="mt-6 border border-slate-200 mb-16">
|
||||
<div class="max-h-96 overflow-y-auto">
|
||||
<div
|
||||
class="sticky top-0 z-10 grid grid-cols-7 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide"
|
||||
>
|
||||
<div>Nom</div>
|
||||
<div>Mail</div>
|
||||
<div>Rue</div>
|
||||
<div>Complément</div>
|
||||
<div>Code Postal</div>
|
||||
<div>Ville</div>
|
||||
<div>Pays</div>
|
||||
</div>
|
||||
|
||||
<div v-if="supplierList.length === 0" class="px-4 py-6 text-slate-400">
|
||||
Aucun fournisseur.
|
||||
</div>
|
||||
|
||||
<div v-for="supplier in supplierList" :key="supplier.id">
|
||||
<div
|
||||
v-if="!supplier.addresses || supplier.addresses.length === 0"
|
||||
class="grid grid-cols-7 border-t gap-4 px-4 py-2 hover:bg-slate-50 cursor-pointer"
|
||||
@click="goToSupplier(supplier.id)"
|
||||
>
|
||||
<div class="truncate">{{ supplier.name }}</div>
|
||||
<div class="truncate">{{ supplier.email }}</div>
|
||||
<div class="col-span-1">Pas d'adresse</div>
|
||||
<div class="uppercase truncate">{{"—"}}</div>
|
||||
<div class="uppercase truncate">{{"—"}}</div>
|
||||
<div class="uppercase truncate">{{"—"}}</div>
|
||||
<div class="uppercase truncate">{{"—"}}</div>
|
||||
</div>
|
||||
|
||||
<template v-else-if="supplier.addresses.length > 0">
|
||||
<div
|
||||
v-for="(address, idx) in supplier.addresses"
|
||||
:key="address.id ?? `${supplier.id}-${idx}-${address.street}-${address.postalCode}`"
|
||||
class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
|
||||
:class="idx > 0 ? 'pl-4 border-l-4 border-l-slate-200 bg-slate-50' : ''"
|
||||
@click="goToSupplier(supplier.id)"
|
||||
>
|
||||
<div class="truncate">
|
||||
{{ idx === 0 ? supplier.name : "↳" }}
|
||||
</div>
|
||||
<div class="truncate">{{ idx === 0 ? supplier.email : "" }}</div>
|
||||
<div class="truncate">{{ address.street || "—" }}</div>
|
||||
<div class="truncate">{{ address.street2 || "—" }}</div>
|
||||
<div>{{ address.postalCode || "—" }}</div>
|
||||
<div class="uppercase truncate">{{ address.city || "—" }}</div>
|
||||
<div class="uppercase truncate">{{ address.countryCode || "—" }}</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template v-else>
|
||||
<div
|
||||
class="grid grid-cols-7 hover:bg-slate-50 border-t gap-4 px-4 py-2 cursor-pointer"
|
||||
@click="goToSupplier(supplier.id)"
|
||||
>
|
||||
<div class="truncate">{{ supplier.name }}</div>
|
||||
<div class="truncate">{{ supplier.email }}</div>
|
||||
<div class="col-span-5 text-slate-400">
|
||||
Adresses non chargées
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="mt-6 border border-slate-200 mb-16 px-4 py-6 text-slate-400">
|
||||
Accès réservé aux administrateurs.
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import type { ColumnConfig, Row } from "~/services/dto/datatable-data"
|
||||
import {formatAddresses} from "~/utils/datatable-formatters"
|
||||
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()
|
||||
|
||||
const columns: ColumnConfig[] = [
|
||||
{ key: "name", label: "Nom", isSearchable:true },
|
||||
{ key: "email", label: "Mail" },
|
||||
{ key: "addresses", label: "Adresses", format: formatAddresses },
|
||||
]
|
||||
|
||||
const goToSupplier = (id: number) => {
|
||||
if (!auth.isAdmin) return
|
||||
router.push(`/admin/supplier/${id}`)
|
||||
}
|
||||
|
||||
const onSupplierRowClick = (row: Row) => {
|
||||
const id = Number(row.id)
|
||||
if (!Number.isFinite(id)) return
|
||||
goToSupplier(id)
|
||||
}
|
||||
|
||||
const handleAddClick = (event: Event) => {
|
||||
if (auth.isAdmin) return
|
||||
event.preventDefault()
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
if (!auth.isAdmin) return
|
||||
supplierList.value = await getSupplierList()
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -11,11 +11,29 @@
|
||||
|
||||
</div>
|
||||
|
||||
<UiDataTable
|
||||
:columns="columns"
|
||||
url="admin/users"
|
||||
@row-click="onUserRowClick"
|
||||
/>
|
||||
<div>
|
||||
<div class="mt-6 border border-slate-200 mb-16 ">
|
||||
<div class="grid grid-cols-3 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
||||
<div>Username</div>
|
||||
<div>Role</div>
|
||||
</div>
|
||||
<div
|
||||
v-for="user in userList"
|
||||
:key="user.id"
|
||||
class="grid grid-cols-3 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t items-center"
|
||||
role="button"
|
||||
tabindex="0"
|
||||
@click="goToUser(user.id)"
|
||||
>
|
||||
<div>
|
||||
{{ user.username }}
|
||||
</div>
|
||||
<div>
|
||||
{{ getRoleLabels(user.roles) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -24,21 +42,29 @@ definePageMeta({
|
||||
layout: 'default'
|
||||
})
|
||||
|
||||
import type {UserData} from "~/services/dto/user-data";
|
||||
import {getAdminUsers} from "~/services/auth";
|
||||
import {ROLE} from "~/utils/constants";
|
||||
import type {ColumnConfig, Row} from "~/services/dto/datatable-data";
|
||||
import {formatRoleLabels} from "~/utils/datatable-formatters";
|
||||
|
||||
const userList = ref<UserData[]>([])
|
||||
const router = useRouter()
|
||||
const roleLabelByValue = new Map(ROLE.map((role) => [role.value, role.label]))
|
||||
|
||||
const columns: ColumnConfig[] = [
|
||||
{ key: "username", label: "Username" },
|
||||
{ key: "roles", label: "Role", format: (value) => formatRoleLabels(value, roleLabelByValue) },
|
||||
]
|
||||
|
||||
const onUserRowClick = (row: Row) => {
|
||||
const id = Number(row.id)
|
||||
if (!Number.isFinite(id)) return
|
||||
const goToUser = (id: number) => {
|
||||
router.push(`/admin/user/${id}`)
|
||||
}
|
||||
|
||||
const getRoleLabels = (roles?: string[]) => {
|
||||
if (!roles || roles.length === 0) {
|
||||
return ' ---'
|
||||
}
|
||||
|
||||
return roles
|
||||
.map((role) => roleLabelByValue.get(role) ?? role)
|
||||
.join(', ')
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
userList.value = await getAdminUsers()
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -4,21 +4,21 @@
|
||||
<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="/" iconName="material-symbols:warehouse-outline-rounded" />
|
||||
<card-link label="" link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
|
||||
<card-link label="PLAN DE SITE" link="/infrastructure/building" iconName="material-symbols:warehouse-outline-rounded" />
|
||||
<card-link link="/reception/waiting-reception" iconName="mdi:truck-remove-outline">
|
||||
<template #label>
|
||||
Réceptions<br>EN ATTENTE
|
||||
</template>
|
||||
</card-link>
|
||||
<card-link label="" link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container">
|
||||
<card-link link="/shipment/waiting-shipment" iconName="mdi:truck-cargo-container">
|
||||
<template #label>
|
||||
EXPÉDITIONS<br>EN ATTENTE
|
||||
</template>
|
||||
</card-link>
|
||||
<card-link label="CASES" link="/" iconName="material-symbols:bottom-sheets-outline" />
|
||||
<card-link label="CASES" link="/infrastructure/case" iconName="material-symbols:bottom-sheets-outline" />
|
||||
<card-link label="RÉCEPTIONS FINIES" link="/reception/finish-reception" iconName="mdi:truck-check-outline" />
|
||||
<card-link label="EXPÉDITIONS FINIES" link="/shipment/finish-shipment" iconName="mdi:truck-delivery-outline" />
|
||||
<card-link label="" link="/" iconName="mdi:cow">
|
||||
<card-link link="/" iconName="mdi:cow">
|
||||
<template #label>
|
||||
PASSEPORT<br>DU BOVIN
|
||||
</template>
|
||||
|
||||
242
frontend/pages/infrastructure/building.vue
Normal file
242
frontend/pages/infrastructure/building.vue
Normal file
@@ -0,0 +1,242 @@
|
||||
<template>
|
||||
<div class="min-h-screen">
|
||||
<!-- En-tête de page avec retour et titre -->
|
||||
<div class="flex items-center justify-between mb-8">
|
||||
<div class="flex items-center gap-10">
|
||||
<Icon
|
||||
@click="router.push('/')"
|
||||
name="gg:arrow-left-o"
|
||||
size="44"
|
||||
class="cursor-pointer text-primary-500"
|
||||
/>
|
||||
<h1 class="text-3xl font-bold uppercase text-primary-500">bâtiments</h1>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="px-[86px] space-y-6">
|
||||
<!-- Liste des bâtiments + rendu du plan de chaque bâtiment -->
|
||||
<div
|
||||
v-for="entry in buildingLayouts"
|
||||
:key="entry.building.id"
|
||||
>
|
||||
<div class="font-semibold tracking-wide text-primary-500">
|
||||
{{ entry.building.label || `Bâtiment ${entry.building.id}` }}
|
||||
</div>
|
||||
|
||||
<div class="py-4">
|
||||
<!-- Aucun layout disponible pour ce bâtiment -->
|
||||
<div v-if="!entry.layout" class="text-sm text-slate-400">
|
||||
Aucun plan de bâtiment.
|
||||
</div>
|
||||
|
||||
<!-- Grille CSS : les cases sont positionnées via spanStyle -->
|
||||
<div v-else class="overflow-auto">
|
||||
<div class="grid" :style="entry.gridStyle">
|
||||
<NuxtLink
|
||||
v-for="cell in entry.cells"
|
||||
:key="cell.key"
|
||||
class="relative text-white flex h-[50px] items-center justify-center border-y-[3px] border-y-black bg-white hover:opacity-85 focus-visible:outline-none"
|
||||
:class="[cell.sideBorderClass, activeLegendStatutId !== null && cell.caseStatusId !== activeLegendStatutId ? 'opacity-35 hover:opacity-70' : '']"
|
||||
:style="[cell.spanStyle, cell.sideBorderStyle]"
|
||||
:to="cell.caseId ? `/infrastructure/case?id=${cell.caseId}` : '/infrastructure/case'"
|
||||
:title="cell.caseStatusLabel ?? undefined"
|
||||
>
|
||||
<!-- Le blanc latéral est géré sur ce bloc interne (conditionnel par voisinage) -->
|
||||
<div
|
||||
class="flex h-full w-full items-center justify-center bg-white"
|
||||
:class="cell.contentInsetClass"
|
||||
:style="cell.caseStyle"
|
||||
>
|
||||
<!-- Numéro de case -->
|
||||
{{ cell.display }}
|
||||
</div>
|
||||
</NuxtLink>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Légende : survol d'un statut => atténue les autres cases -->
|
||||
<div class="py-4">
|
||||
<!-- 3 zones fixes pour forcer gauche / centre / droite sur toute la largeur -->
|
||||
<div class="grid w-full grid-cols-3 gap-3">
|
||||
<div
|
||||
v-for="(statut, index) in statutLegend"
|
||||
:key="statut.id"
|
||||
class="flex min-w-0 cursor-pointer items-center gap-2 py-1"
|
||||
:class="[
|
||||
index === 0 ? 'justify-self-start' : '',
|
||||
index === statutLegend.length - 1 ? 'justify-self-end' : '',
|
||||
index > 0 && index < statutLegend.length - 1 ? 'justify-self-center' : ''
|
||||
]"
|
||||
@mouseenter="activeLegendStatutId = statut.id"
|
||||
@mouseleave="activeLegendStatutId = null"
|
||||
>
|
||||
<span
|
||||
class="h-5 w-5 border border-slate-300"
|
||||
:style="statut.couleur ? { backgroundColor: statut.couleur } : {}"
|
||||
></span>
|
||||
<span class="truncate text-sm uppercase text-slate-700">
|
||||
{{ statut.label }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import type {BuildingData} from "~/services/dto/building-data"
|
||||
import type {BuildingLayoutData} from "~/services/dto/building-layout-data"
|
||||
import type {BuildingCasePositionData} from "~/services/dto/building-case-position-data"
|
||||
import type {BuildingCaseStatusData} from "~/services/dto/building-case-status-data"
|
||||
import {getBuildingList} from "~/services/building"
|
||||
import {getStatutList} from "~/services/statut"
|
||||
|
||||
definePageMeta({layout: "default"})
|
||||
|
||||
const router = useRouter()
|
||||
// Données brutes chargées depuis l'API
|
||||
const buildingList = ref<BuildingData[]>([])
|
||||
const statutLegend = ref<BuildingCaseStatusData[]>([])
|
||||
// Statut actuellement survolé dans la légende (pour filtrage visuel)
|
||||
const activeLegendStatutId = ref<number | null>(null)
|
||||
// Modèle de vue prêt pour le template (layout + cellules + styles de grille)
|
||||
const buildingLayouts = computed(() =>
|
||||
buildingList.value.map((building) => {
|
||||
// On affiche uniquement le premier layout du bâtiment
|
||||
const layout = building.layouts?.[0] ?? null
|
||||
const view = layout ? buildLayoutView(layout) : null
|
||||
return {building, layout, cells: view?.cells ?? [], gridStyle: view?.gridStyle ?? {}}
|
||||
})
|
||||
)
|
||||
|
||||
type GridCell = {
|
||||
key: string
|
||||
caseId: number | null
|
||||
display: string
|
||||
caseStatusId: number | null
|
||||
caseStatusLabel: string | null
|
||||
// Couleur de fond de la case (dépend du statut)
|
||||
caseStyle?: Record<string, string>
|
||||
// Placement dans la grille CSS (colonne/ligne de départ + span)
|
||||
spanStyle: Record<string, string>
|
||||
// Bordures latérales pointillées si la case touche un gap ou le bord du plan
|
||||
sideBorderClass: string
|
||||
// Couleur des bordures pointillées latérales (reprend la couleur de la cellule)
|
||||
sideBorderStyle?: Record<string, string>
|
||||
// Espace blanc interne uniquement côté(s) adjacent(s) à une autre case
|
||||
contentInsetClass: string
|
||||
}
|
||||
// Type intermédiaire : garde des infos utiles au calcul des bordures, retirées ensuite
|
||||
type GridCellDraft = Omit<GridCell, "sideBorderClass" | "sideBorderStyle" | "contentInsetClass"> & { x: number; columnSpan: number }
|
||||
|
||||
// Nettoie la couleur de statut pour éviter les chaînes vides / espaces
|
||||
const normalizeCaseStatusColor = (value: string | null | undefined): string | null => {
|
||||
const color = (value ?? "").trim()
|
||||
return color.length > 0 ? color : null
|
||||
}
|
||||
|
||||
// Styles de base communs à toutes les grilles de bâtiments
|
||||
const BASE_GRID_STYLE = {gridAutoRows: "1fr", rowGap: "18px", columnGap: "0px", width: "100%"} as const
|
||||
|
||||
// Transforme un layout API en structure de rendu (cellules + style de grille)
|
||||
const buildLayoutView = (layout: BuildingLayoutData): {
|
||||
cells: GridCell[];
|
||||
gridStyle: Record<string, string>
|
||||
} | null => {
|
||||
const rows = layout.rows ?? 0, cols = layout.columns ?? 0
|
||||
if (rows <= 0 || cols <= 0) return null
|
||||
|
||||
// Liste des positions de cases (filtre de sécurité sur les valeurs nulles)
|
||||
const positions = (layout.casePositions ?? []).filter(Boolean) as BuildingCasePositionData[]
|
||||
// Colonnes occupées par au moins une case (sert à détecter les gaps)
|
||||
const occupiedColumns = new Set<number>()
|
||||
// Sécurité : si deux positions ont le même x/y, on garde la première
|
||||
const seenCoordinates = new Set<string>()
|
||||
const cellDrafts: GridCellDraft[] = []
|
||||
|
||||
// Tri visuel : de haut en bas, puis de gauche à droite
|
||||
const positionsSorted = [...positions].sort(
|
||||
(leftPosition, rightPosition) =>
|
||||
(leftPosition.y ?? 1) - (rightPosition.y ?? 1) || (leftPosition.x ?? 1) - (rightPosition.x ?? 1)
|
||||
)
|
||||
for (const position of positionsSorted) {
|
||||
const x = position.x ?? 1
|
||||
const y = position.y ?? 1
|
||||
const coordinateKey = `${x}-${y}`
|
||||
if (seenCoordinates.has(coordinateKey)) continue
|
||||
seenCoordinates.add(coordinateKey)
|
||||
|
||||
// w/h = nombre de colonnes / lignes occupées par la case dans la grille
|
||||
const columnSpan = position.w ?? 1
|
||||
const rowSpan = position.h ?? 1
|
||||
|
||||
// Une case peut couvrir plusieurs colonnes : on les marque toutes comme occupées
|
||||
for (let column = x; column < x + columnSpan; column++) {
|
||||
if (column <= cols) occupiedColumns.add(column)
|
||||
}
|
||||
|
||||
// Métadonnées utiles au rendu / navigation / légende
|
||||
const caseId = (position.buildingCase?.id ?? null) as number | null
|
||||
const caseNumber = (position.buildingCase?.caseNumber ?? null) as number | null
|
||||
const caseStatusId = position.buildingCase?.statut?.id ?? null
|
||||
const caseStatusLabel = position.buildingCase?.statut?.label ?? null
|
||||
const statusColor = normalizeCaseStatusColor(position.buildingCase?.statut?.couleur)
|
||||
|
||||
cellDrafts.push({
|
||||
key: `case-${layout.id}-${position.id}`,
|
||||
x,
|
||||
columnSpan,
|
||||
caseId,
|
||||
display: caseNumber !== null ? String(caseNumber) : "Case",
|
||||
caseStatusId,
|
||||
caseStatusLabel,
|
||||
caseStyle: statusColor ? {backgroundColor: statusColor} : undefined,
|
||||
// Exemple : "14 / span 1" => commence en colonne 14 et occupe 1 colonne
|
||||
spanStyle: {gridColumn: `${x} / span ${columnSpan}`, gridRow: `${y} / span ${rowSpan}`}
|
||||
})
|
||||
}
|
||||
|
||||
// Colonnes vides = gaps visuels (plus étroites dans la grille)
|
||||
const gapColumns = Array.from({length: cols}, (_, i) => i + 1).filter((x) => !occupiedColumns.has(x))
|
||||
const gapSet = new Set(gapColumns)
|
||||
|
||||
// Ajoute les bordures latérales pointillées pour les cases au contact d'un gap ou d'un bord
|
||||
const cells: GridCell[] = cellDrafts.map(({x, columnSpan, ...cell}) => {
|
||||
const touchesLeftGapOrEdge = x === 1 || gapSet.has(x - 1)
|
||||
const touchesRightGapOrEdge = x + columnSpan - 1 === cols || gapSet.has(x + columnSpan)
|
||||
const sideBorderClass = [
|
||||
touchesLeftGapOrEdge ? "border-l-[3px] [border-left-style:dashed]" : "",
|
||||
touchesRightGapOrEdge ? "border-r-[3px] [border-right-style:dashed]" : ""
|
||||
].filter(Boolean).join(" ")
|
||||
// Les pointillés latéraux reprennent la couleur de la cellule (si un statut en fournit une)
|
||||
const sideBorderStyle = {
|
||||
...(cell.caseStyle?.backgroundColor && touchesLeftGapOrEdge ? {borderLeftColor: cell.caseStyle.backgroundColor} : {}),
|
||||
...(cell.caseStyle?.backgroundColor && touchesRightGapOrEdge ? {borderRightColor: cell.caseStyle.backgroundColor} : {})
|
||||
}
|
||||
// Le "blanc" n'est ajouté qu'entre deux cellules adjacentes (pas sur bord/gap)
|
||||
const contentInsetClass = [
|
||||
!touchesLeftGapOrEdge ? "ml-[4px]" : "",
|
||||
!touchesRightGapOrEdge ? "mr-[4px]" : ""
|
||||
].filter(Boolean).join(" ")
|
||||
return {...cell, sideBorderClass, sideBorderStyle, contentInsetClass}
|
||||
})
|
||||
|
||||
// Les colonnes de gap sont rendues en 24px, les autres occupent l'espace restant
|
||||
const columnsTemplate = Array.from({length: cols}, (_, i) => (gapSet.has(i + 1) ? "24px" : "minmax(0, 1fr)")).join(" ")
|
||||
return {cells, gridStyle: {gridTemplateColumns: columnsTemplate, ...BASE_GRID_STYLE}}
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
// Chargement initial des bâtiments et de la légende des statuts
|
||||
const buildings = await getBuildingList()
|
||||
const statuts = await getStatutList()
|
||||
buildingList.value = buildings
|
||||
// Tri alphabétique FR pour une légende stable
|
||||
statutLegend.value = [...statuts].sort((a, b) =>
|
||||
(a.label ?? "").localeCompare(b.label ?? "", "fr", {sensitivity: "base"})
|
||||
)
|
||||
})
|
||||
</script>
|
||||
27
frontend/pages/infrastructure/case.vue
Normal file
27
frontend/pages/infrastructure/case.vue
Normal file
@@ -0,0 +1,27 @@
|
||||
<template>
|
||||
<div class="flex justify-center items-center">
|
||||
<UiButton
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||
:disabled="!hasCaseId"
|
||||
@click="printCaseReport"
|
||||
>
|
||||
Imprimer
|
||||
</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>
|
||||
@@ -4,36 +4,59 @@
|
||||
<h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions finie</h1>
|
||||
</div>
|
||||
|
||||
<UiDataTable
|
||||
:columns="columns"
|
||||
url="receptions"
|
||||
class="ps-20"
|
||||
:query="{ isValid: true }"
|
||||
@row-click="goToReception"
|
||||
/>
|
||||
<div class="px-[86px]">
|
||||
<div class="mt-6 border border-slate-200 mb-16 ">
|
||||
<div class="grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
||||
<div>Numéro</div>
|
||||
<div>Date</div>
|
||||
<div>Fournisseur</div>
|
||||
<div>Adresse</div>
|
||||
<div>Type réception</div>
|
||||
<div>Poids</div>
|
||||
</div>
|
||||
<div
|
||||
v-for="reception in receptionList"
|
||||
:key="reception.id"
|
||||
class="grid grid-cols-6 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
|
||||
role="button"
|
||||
tabindex="0"
|
||||
@click="goToReception(reception.id)"
|
||||
>
|
||||
<div>{{ reception.identificationNumber}}</div>
|
||||
<div>{{ reception.receptionDate}}</div>
|
||||
<div>{{ reception.supplier?.name }}</div>
|
||||
<div>{{ reception.address?.fullAddress }}</div>
|
||||
<div>{{ reception.receptionType?.label }}</div>
|
||||
<div>{{ formatWeighing(reception) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import type {ReceptionData} from "~/services/dto/reception-data";
|
||||
import {getReceptionList} from "~/services/reception";
|
||||
import type {ShipmentData} from "~/services/dto/shipment-data";
|
||||
|
||||
import {formatWeights} from "~/utils/datatable-formatters";
|
||||
const receptionList = ref<ReceptionData[]>()
|
||||
const router = useRouter()
|
||||
|
||||
type ReceptionRow = {
|
||||
id?: number | string
|
||||
const formatWeighing = (reception: ReceptionData) => {
|
||||
const gross = reception.weights?.find((weight) => weight.type === 'gross')?.weight
|
||||
const tare = reception.weights?.find((weight) => weight.type === 'tare')?.weight
|
||||
|
||||
if (gross == null || tare == null) {
|
||||
return '—'
|
||||
}
|
||||
|
||||
return `${gross - tare} kg`
|
||||
}
|
||||
|
||||
const router = useRouter()
|
||||
const columns = [
|
||||
{ key: 'identificationNumber', label: 'Numero', isSearchable:true },
|
||||
{ key: 'receptionDate', label: 'Date de livraison', isSearchable: true, type: 'date' },
|
||||
{ key: 'supplier.name', label: 'Fournisseur', isSearchable: true },
|
||||
{ key: 'address.fullAddress', label: 'Adresse', isSearchable: true },
|
||||
{ key: 'receptionType.label', label: 'Type', isSearchable: true, type:'selectTypeReception' },
|
||||
{ key: 'weights', label: 'Poids', format: formatWeights }
|
||||
]
|
||||
|
||||
const goToReception = (row: ReceptionRow) => {
|
||||
const id = Number(row?.id)
|
||||
if (!Number.isFinite(id)) return
|
||||
const goToReception = (id: number) => {
|
||||
router.push(`/reception/update/${id}`)
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
receptionList.value = await getReceptionList(true)
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -1,36 +1,51 @@
|
||||
<template>
|
||||
<div class="flex items-center justify-start gap-10">
|
||||
<div class="flex items-center justify-between">
|
||||
<div class="flex items-center gap-10">
|
||||
<Icon @click="router.push('/')" name="gg:arrow-left-o" size="44" class="cursor-pointer text-primary-500"/>
|
||||
<h1 class="text-3xl font-bold uppercase text-primary-500">listes des réceptions en attente</h1>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="px-[86px]">
|
||||
<div class="mt-6 border border-slate-200 mb-16">
|
||||
<div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
||||
<div>Fournisseur</div>
|
||||
<div>Adresse</div>
|
||||
<div>Type réception</div>
|
||||
<div>Transporteur</div>
|
||||
<div>Immatriculation</div>
|
||||
</div>
|
||||
<div
|
||||
v-for="reception in receptionList"
|
||||
:key="reception.id"
|
||||
class="grid grid-cols-5 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
|
||||
role="button"
|
||||
tabindex="0"
|
||||
@click="goToReception(reception.id)"
|
||||
@keydown.enter="goToReception(reception.id)"
|
||||
>
|
||||
<div>{{ reception.supplier?.name }}</div>
|
||||
<div>{{ reception.address?.fullAddress }}</div>
|
||||
<div>{{ reception.receptionType?.label }}</div>
|
||||
<div>{{ reception.carrier?.name }}</div>
|
||||
<div>{{ reception.licensePlate }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<UiDataTable
|
||||
:columns="columns"
|
||||
url="receptions"
|
||||
:query="{ isValid: false }"
|
||||
@row-click="goToReception"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import type {ReceptionData} from "~/services/dto/reception-data";
|
||||
import {getReceptionList} from "~/services/reception";
|
||||
|
||||
const receptionList = ref<ReceptionData[]>()
|
||||
const router = useRouter()
|
||||
|
||||
|
||||
|
||||
const columns = [
|
||||
{key: 'supplier.name', label: 'Fournisseur', isSearchable:true},
|
||||
{ key: 'address.fullAddress', label: 'Adresse', isSearchable: true },
|
||||
{key: 'carrier.name', label: 'Transporteur', isSearchable:true},
|
||||
{key: 'receptionType.label', label: 'Type', isSearchable:true, type:'selectTypeReception'},
|
||||
{key: 'licensePlate', label: 'Immatriculation', isSearchable:true, type:'licensePlate'},
|
||||
]
|
||||
|
||||
|
||||
type ReceptionRow = {
|
||||
id?: number | string
|
||||
}
|
||||
const goToReception = (row: ReceptionRow) => {
|
||||
const id = Number(row?.id)
|
||||
if (!Number.isFinite(id)) return
|
||||
const goToReception = (id: number) => {
|
||||
router.push(`/reception/${id}`)
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
receptionList.value = await getReceptionList(false)
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -4,32 +4,82 @@
|
||||
<h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions finie</h1>
|
||||
</div>
|
||||
|
||||
<UiDataTable
|
||||
:columns="columns"
|
||||
url="shipments"
|
||||
:query="{ isValid: true }"
|
||||
@row-click="goToShipment"
|
||||
/>
|
||||
<div class="px-[86px]">
|
||||
<div class="mt-6 border border-slate-200 mb-16 ">
|
||||
<div class="grid grid-cols-6 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
||||
<div>Numéro</div>
|
||||
<div>Date</div>
|
||||
<div>Client</div>
|
||||
<div>Adresse</div>
|
||||
<div>Type d'expéditon</div>
|
||||
<div>Poids</div>
|
||||
</div>
|
||||
<div
|
||||
v-for="shipment in shipmentList"
|
||||
:key="shipment
|
||||
.id"
|
||||
class="grid grid-cols-6 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
|
||||
role="button"
|
||||
tabindex="0"
|
||||
@click="goShipment(shipment.id)"
|
||||
>
|
||||
<div>{{ shipment.identificationNumber }}</div>
|
||||
<div>{{ shipment.shipmentDate }}</div>
|
||||
<div>{{ shipment.customer?.name }}</div>
|
||||
<div>{{ shipment.address?.fullAddress }}</div>
|
||||
<div>
|
||||
<template v-if="formatShipmentLines(shipment).length">
|
||||
<div
|
||||
v-for="(line, index) in formatShipmentLines(shipment)"
|
||||
:key="index"
|
||||
class="leading-5"
|
||||
>
|
||||
{{ line }}
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div>{{ formatWeighing(shipment) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {formatBovinShipments, formatWeights} from "~/utils/datatable-formatters";
|
||||
import type {ShipmentData} from "~/services/dto/shipment-data";
|
||||
import {getShipmentList} from "~/services/shipment";
|
||||
|
||||
const shipmentList = ref<ShipmentData[]>()
|
||||
const router = useRouter()
|
||||
const columns = [
|
||||
{key: 'identificationNumber', label: 'Numero',isSearchable:true},
|
||||
{key: 'shipmentDate', label: 'Date de livraison',isSearchable:true, type:'date'},
|
||||
{key: 'customer.name', label: 'Client',isSearchable:true},
|
||||
{key: 'address.fullAddress', label: 'Adresse',isSearchable:true},
|
||||
{key: 'bovinShipments', label: 'Type', format:formatBovinShipments},
|
||||
{key: 'weights', label: 'Poids', format: formatWeights}
|
||||
]
|
||||
type ReceptionRow = {
|
||||
id?: number | string
|
||||
|
||||
const formatWeighing = (shipment: ShipmentData) => {
|
||||
const gross = shipment.weights?.find((weight) => weight.type === 'gross')?.weight
|
||||
const tare = shipment.weights?.find((weight) => weight.type === 'tare')?.weight
|
||||
|
||||
if (gross == null || tare == null) {
|
||||
return '—'
|
||||
}
|
||||
|
||||
return `${gross - tare} kg`
|
||||
}
|
||||
const goToShipment = (row: ReceptionRow) => {
|
||||
const id = Number(row?.id)
|
||||
if (!Number.isFinite(id)) return
|
||||
|
||||
|
||||
const formatShipmentLines = (shipment: ShipmentData) => {
|
||||
if (!shipment.shipmentType && shipment.nbBovinSend == null) {
|
||||
return []
|
||||
}
|
||||
|
||||
const label = typeof shipment.shipmentType === 'string'
|
||||
? shipment.shipmentType
|
||||
: shipment.shipmentType?.label
|
||||
|
||||
return [`${label ?? '—'} : ${shipment.nbBovinSend ?? '—'}`]
|
||||
}
|
||||
|
||||
const goShipment = (id: number) => {
|
||||
router.push(`/shipment/update/${id}`)
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
shipmentList.value = await getShipmentList(true)
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -5,34 +5,70 @@
|
||||
<h1 class="text-3xl font-bold uppercase text-primary-500">listes des expéditions en attente</h1>
|
||||
</div>
|
||||
</div>
|
||||
<UiDataTable
|
||||
:columns="columns"
|
||||
url="shipments"
|
||||
:query="{ isValid: false }"
|
||||
@row-click="goToShipment"
|
||||
/>
|
||||
|
||||
<div class="px-[86px]">
|
||||
<div class="mt-6 border border-slate-200 mb-16 ">
|
||||
<div class="grid grid-cols-5 gap-4 bg-slate-100 px-4 py-3 text-sm font-semibold uppercase tracking-wide">
|
||||
<div>Client</div>
|
||||
<div>Adresse</div>
|
||||
<div>Type d'expéditions</div>
|
||||
<div>Transporteur</div>
|
||||
<div>Immatriculation</div>
|
||||
</div>
|
||||
<div
|
||||
v-for="shipment in shipmentList"
|
||||
:key="shipment.id"
|
||||
class="grid grid-cols-5 gap-4 px-4 py-3 text-sm hover:bg-slate-50 cursor-pointer border-t border-slate-200"
|
||||
role="button"
|
||||
tabindex="0"
|
||||
@click="goToShipment(shipment.id)"
|
||||
@keydown.enter="goToShipment(shipment.id)"
|
||||
>
|
||||
<div>{{ shipment.customer?.name }}</div>
|
||||
<div>{{ shipment.address?.fullAddress }}</div>
|
||||
<div>
|
||||
<template v-if="formatShipmentLines(shipment).length">
|
||||
<div
|
||||
v-for="(line, index) in formatShipmentLines(shipment)"
|
||||
:key="index"
|
||||
class="leading-5"
|
||||
>
|
||||
{{ line }}
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div>{{ shipment.carrier?.name }}</div>
|
||||
<div>{{ shipment.licencePlate }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {formatBovinShipments} from "~/utils/datatable-formatters";
|
||||
|
||||
import type {ShipmentData} from "~/services/dto/shipment-data";
|
||||
import {getShipmentList} from "~/services/shipment";
|
||||
|
||||
const shipmentList = ref<ShipmentData[]>()
|
||||
const router = useRouter()
|
||||
|
||||
const columns = [
|
||||
{key: 'customer.name', label: 'Client', isSearchable:true},
|
||||
{key: 'address.fullAddress', label: 'Adresse', isSearchable:true},
|
||||
{key: 'carrier.name', label: 'Transporteur', isSearchable:true},
|
||||
{key: 'bovinShipments', label: 'Type', format:formatBovinShipments},
|
||||
{key: 'licencePlate', label: 'Immatriculation', isSearchable:true},
|
||||
]
|
||||
|
||||
type ReceptionRow = {
|
||||
id?: number | string
|
||||
}
|
||||
|
||||
const goToShipment = (row: ReceptionRow) => {
|
||||
const id = Number(row?.id)
|
||||
if (!Number.isFinite(id)) return
|
||||
const goToShipment = (id: number) => {
|
||||
router.push(`/shipment/${id}`)
|
||||
}
|
||||
|
||||
const formatShipmentLines = (shipment: ShipmentData) => {
|
||||
if (!shipment.shipmentType && shipment.nbBovinSend == null) {
|
||||
return []
|
||||
}
|
||||
|
||||
const label = typeof shipment.shipmentType === 'string'
|
||||
? shipment.shipmentType
|
||||
: shipment.shipmentType?.label
|
||||
|
||||
return [`${label ?? '—'} : ${shipment.nbBovinSend ?? '—'}`]
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
shipmentList.value = await getShipmentList(false)
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
import { useApi } from '~/composables/useApi'
|
||||
import type { BovinShipmentData } from '~/services/dto/bovin-shipment-data'
|
||||
import type { ShipmentBovinePayload, BovinShipmentListResponse } from '~/services/dto/bovin-shipment-data'
|
||||
|
||||
export async function getBovinShipmentList(
|
||||
shipmentIri: string
|
||||
): Promise<BovinShipmentData[]> {
|
||||
const api = useApi()
|
||||
const response = await api.get<BovinShipmentListResponse>(
|
||||
'bovin_shipments',
|
||||
{ shipment: shipmentIri },
|
||||
{
|
||||
toastErrorKey: 'errors.shipmentBovine.list'
|
||||
}
|
||||
)
|
||||
|
||||
if (Array.isArray(response)) {
|
||||
return response
|
||||
}
|
||||
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||
return response['hydra:member']
|
||||
}
|
||||
return []
|
||||
}
|
||||
|
||||
export async function createShipmentBovine(
|
||||
payload: ShipmentBovinePayload
|
||||
): Promise<BovinShipmentData> {
|
||||
const api = useApi()
|
||||
return api.post<BovinShipmentData>('bovin_shipments', payload, {
|
||||
toastErrorKey: 'errors.shipmentBovine.create'
|
||||
})
|
||||
}
|
||||
|
||||
export async function deleteShipmentBovine(id: number): Promise<void> {
|
||||
const api = useApi()
|
||||
await api.delete<void>(`bovin_shipments/${id}`, {}, {
|
||||
toastErrorKey: 'errors.shipmentBovine.delete'
|
||||
})
|
||||
}
|
||||
|
||||
export async function updateShipmentBovine(
|
||||
id: number,
|
||||
payload: Partial<ShipmentBovinePayload>
|
||||
): Promise<BovinShipmentData> {
|
||||
const api = useApi()
|
||||
return api.patch<BovinShipmentData>(`bovin_shipments/${id}`, payload, {
|
||||
toastErrorKey: 'errors.shipmentBovine.update'
|
||||
})
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
import type {ShipmentTypeData} from "~/services/dto/shipment-type-data";
|
||||
|
||||
export interface BovinShipmentData {
|
||||
id: number
|
||||
nbBovinSend: number | null
|
||||
shipment?: string | null
|
||||
shipmentType?: ShipmentTypeData | null
|
||||
}
|
||||
|
||||
export type ShipmentBovinePayload = {
|
||||
nbBovinSend: number
|
||||
shipment: string
|
||||
shipmentType: string
|
||||
}
|
||||
|
||||
export type BovinShipmentListResponse =
|
||||
| BovinShipmentData[]
|
||||
| { 'hydra:member'?: BovinShipmentData[] }
|
||||
9
frontend/services/dto/building-case-data.ts
Normal file
9
frontend/services/dto/building-case-data.ts
Normal file
@@ -0,0 +1,9 @@
|
||||
import type { BuildingCaseStatusData } from '~/services/dto/building-case-status-data'
|
||||
|
||||
export interface BuildingCaseData {
|
||||
id: number
|
||||
caseNumber: number | null
|
||||
code: string | null
|
||||
capacity: number | null
|
||||
statut?: BuildingCaseStatusData | null
|
||||
}
|
||||
11
frontend/services/dto/building-case-position-data.ts
Normal file
11
frontend/services/dto/building-case-position-data.ts
Normal file
@@ -0,0 +1,11 @@
|
||||
import type { BuildingCaseData } from '~/services/dto/building-case-data'
|
||||
|
||||
export interface BuildingCasePositionData {
|
||||
id: number
|
||||
x: number | null
|
||||
y: number | null
|
||||
w: number | null
|
||||
h: number | null
|
||||
renderOrder: string | null
|
||||
buildingCase: BuildingCaseData | null
|
||||
}
|
||||
6
frontend/services/dto/building-case-status-data.ts
Normal file
6
frontend/services/dto/building-case-status-data.ts
Normal file
@@ -0,0 +1,6 @@
|
||||
export interface BuildingCaseStatusData {
|
||||
id: number
|
||||
label: string | null
|
||||
code: string | null
|
||||
couleur: string | null
|
||||
}
|
||||
@@ -1,5 +1,8 @@
|
||||
import type { BuildingLayoutData } from '~/services/dto/building-layout-data'
|
||||
|
||||
export interface BuildingData {
|
||||
id: number
|
||||
label: string
|
||||
code: string
|
||||
layouts?: BuildingLayoutData[] | null
|
||||
}
|
||||
|
||||
9
frontend/services/dto/building-layout-data.ts
Normal file
9
frontend/services/dto/building-layout-data.ts
Normal file
@@ -0,0 +1,9 @@
|
||||
import type { BuildingCasePositionData } from '~/services/dto/building-case-position-data'
|
||||
|
||||
export interface BuildingLayoutData {
|
||||
id: number
|
||||
name: string | null
|
||||
columns: number | null
|
||||
rows: number | null
|
||||
casePositions?: BuildingCasePositionData[] | null
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
export type Row = Record<string, unknown>
|
||||
|
||||
export type ColumnConfig = {
|
||||
key: string
|
||||
label?: string
|
||||
format?: (value: unknown, row: Row) => string
|
||||
isSearchable?: boolean
|
||||
type?: string
|
||||
}
|
||||
type HydraCollection<T> = {
|
||||
'hydra:member': T[]
|
||||
'hydra:totalItems': number
|
||||
}
|
||||
export type AnyCollection<T> = HydraCollection<T> & {
|
||||
member?: T[]
|
||||
items?: T[]
|
||||
totalItems?: number
|
||||
}
|
||||
|
||||
export type PaginationItem = number | '...'
|
||||
@@ -9,12 +9,6 @@ export interface ShipmentTypeData {
|
||||
code: string
|
||||
}
|
||||
|
||||
export interface BovinShipmentData {
|
||||
id?: number
|
||||
shipmentType?: ShipmentTypeData | string | null
|
||||
nbBovinSend: number | null
|
||||
}
|
||||
|
||||
export type ShipmentData = {
|
||||
id: number
|
||||
identificationNumber?: string | null
|
||||
@@ -26,7 +20,8 @@ export type ShipmentData = {
|
||||
carrier?: CarrierData | null
|
||||
truck?: TruckData | null
|
||||
customer?: CustomerData | null
|
||||
bovinShipments?: BovinShipmentData[] | null
|
||||
shipmentType?: ShipmentTypeData | null
|
||||
nbBovinSend?: number | null
|
||||
weights?: WeightShipmentEntryData[] | null
|
||||
|
||||
}
|
||||
@@ -59,9 +54,9 @@ export type ShipmentPayload = {
|
||||
carrier?: string | null
|
||||
truck?: string | null
|
||||
customer?: string | null
|
||||
bovinShipments?: string[] | null
|
||||
address?: string | null
|
||||
user?: string | null
|
||||
driver?: string | null
|
||||
|
||||
shipmentType?: string | null
|
||||
nbBovinSend?: number | null
|
||||
}
|
||||
|
||||
23
frontend/services/statut.ts
Normal file
23
frontend/services/statut.ts
Normal file
@@ -0,0 +1,23 @@
|
||||
import { useApi } from '~/composables/useApi'
|
||||
import type { BuildingCaseStatusData } from '~/services/dto/building-case-status-data'
|
||||
|
||||
export type StatutListResponse =
|
||||
| BuildingCaseStatusData[]
|
||||
| { 'hydra:member'?: BuildingCaseStatusData[] }
|
||||
|
||||
export async function getStatutList(): Promise<BuildingCaseStatusData[]> {
|
||||
const api = useApi()
|
||||
const response = await api.get<StatutListResponse>('statuts', {}, {
|
||||
toastErrorKey: 'errors.http.get'
|
||||
})
|
||||
|
||||
if (Array.isArray(response)) {
|
||||
return response
|
||||
}
|
||||
|
||||
if (response && typeof response === 'object' && Array.isArray(response['hydra:member'])) {
|
||||
return response['hydra:member']
|
||||
}
|
||||
|
||||
return []
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
export const formatBovinShipments = (value: unknown): string => {
|
||||
if (!Array.isArray(value) || value.length === 0) return '-'
|
||||
return value.map((item: any) => {
|
||||
const label = item?.shipmentType?.label ?? item?.shipmentType?.code ??
|
||||
'Type inconnu'
|
||||
const qty = item?.nbBovinSend ?? '-'
|
||||
return `${label} : ${qty}`
|
||||
}).join(', ')
|
||||
}
|
||||
|
||||
export const formatWeights = (value: unknown): string => {
|
||||
if (!Array.isArray(value) || value.length === 0) return '-'
|
||||
|
||||
let gross = 0
|
||||
let tare = 0
|
||||
|
||||
for (const item of value as Array<{ type?: string; weight?:
|
||||
unknown }>) {
|
||||
const w = Number(item.weight)
|
||||
if (!Number.isFinite(w)) continue
|
||||
if (item.type === 'gross') gross += w
|
||||
else if (item.type === 'tare') tare += w
|
||||
}
|
||||
|
||||
return `${gross - tare} kg`
|
||||
}
|
||||
|
||||
export const formatRoleLabels = (
|
||||
value: unknown,
|
||||
roleLabelByValue: Map<string, string>,
|
||||
): string => {
|
||||
if (!Array.isArray(value) || value.length === 0) {
|
||||
return ' - '
|
||||
}
|
||||
|
||||
return value
|
||||
.map((role) => {
|
||||
const key = String(role)
|
||||
return roleLabelByValue.get(key) ?? key
|
||||
})
|
||||
.join(', ')
|
||||
}
|
||||
|
||||
export const formatAddresses = (value: unknown): string => {
|
||||
if (!Array.isArray(value) || value.length === 0) {
|
||||
return " - "
|
||||
}
|
||||
|
||||
if (typeof value[0] === 'string') {
|
||||
return 'Adresses non chargées'
|
||||
}
|
||||
|
||||
return value
|
||||
.map((item) => {
|
||||
if (!item || typeof item !== 'object') return '-'
|
||||
const address = item as Record<string, unknown>
|
||||
const street = String(address.street ?? '').trim()
|
||||
const street2 = String(address.street2 ?? '').trim()
|
||||
const postalCode = String(address.postalCode ?? '').trim()
|
||||
const city = String(address.city ?? '').trim()
|
||||
const countryCode = String(address.countryCode ?? '').trim().toUpperCase()
|
||||
|
||||
const firstLine = [street, street2].filter(Boolean).join(', ')
|
||||
const secondLine = [postalCode, city].filter(Boolean).join(' ')
|
||||
const finalLine = [firstLine, secondLine, countryCode].filter(Boolean).join(', ')
|
||||
|
||||
return finalLine || '-'
|
||||
})
|
||||
.join('\n')
|
||||
}
|
||||
@@ -1,39 +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 Version20260218093842 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return '';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
// this up() migration is auto-generated, please modify it to your needs
|
||||
$this->addSql('ALTER TABLE address ADD full_address VARCHAR(400)');
|
||||
$this->addSql('DROP INDEX idx_7049f4507be036fc');
|
||||
$this->addSql('DROP INDEX uniq_weight_shipment_type');
|
||||
$this->addSql('DROP INDEX uniq_weight_reception_type');
|
||||
$this->addSql('ALTER INDEX idx_weight_shipment RENAME TO IDX_7CD55417BE036FC');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
// this down() migration is auto-generated, please modify it to your needs
|
||||
$this->addSql('ALTER TABLE address DROP full_address');
|
||||
$this->addSql('CREATE INDEX idx_7049f4507be036fc ON bovin_shipment (shipment_id)');
|
||||
$this->addSql('CREATE UNIQUE INDEX uniq_weight_shipment_type ON weight (shipment_id, type)');
|
||||
$this->addSql('CREATE UNIQUE INDEX uniq_weight_reception_type ON weight (reception_id, type)');
|
||||
$this->addSql('ALTER INDEX idx_7cd55417be036fc RENAME TO idx_weight_shipment');
|
||||
}
|
||||
}
|
||||
52
migrations/Version20260218144828.php
Normal file
52
migrations/Version20260218144828.php
Normal file
@@ -0,0 +1,52 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
/**
|
||||
* Auto-generated Migration: Please modify to your needs!
|
||||
*/
|
||||
final class Version20260218144828 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return '';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
// this up() migration is auto-generated, please modify it to your needs
|
||||
$this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT fk_7049f4502ee48a36');
|
||||
$this->addSql('ALTER TABLE bovin_shipment DROP CONSTRAINT fk_7049f4507be036fc');
|
||||
$this->addSql('DROP TABLE bovin_shipment');
|
||||
$this->addSql('ALTER TABLE shipment ADD nb_bovin_send INT NOT NULL');
|
||||
$this->addSql('ALTER TABLE shipment ADD shipment_type_id INT DEFAULT NULL');
|
||||
$this->addSql('ALTER TABLE shipment ADD CONSTRAINT FK_2CB20DC2EE48A36 FOREIGN KEY (shipment_type_id) REFERENCES shipment_type (id) NOT DEFERRABLE');
|
||||
$this->addSql('CREATE INDEX IDX_2CB20DC2EE48A36 ON shipment (shipment_type_id)');
|
||||
$this->addSql('DROP INDEX uniq_weight_shipment_type');
|
||||
$this->addSql('DROP INDEX uniq_weight_reception_type');
|
||||
$this->addSql('ALTER INDEX idx_weight_shipment RENAME TO IDX_7CD55417BE036FC');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
// this down() migration is auto-generated, please modify it to your needs
|
||||
$this->addSql('CREATE TABLE bovin_shipment (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, nb_bovin_send INT NOT NULL, shipment_id INT DEFAULT NULL, shipment_type_id INT DEFAULT NULL, PRIMARY KEY (id))');
|
||||
$this->addSql('CREATE INDEX idx_7049f4507be036fc ON bovin_shipment (shipment_id)');
|
||||
$this->addSql('CREATE INDEX idx_7049f4502ee48a36 ON bovin_shipment (shipment_type_id)');
|
||||
$this->addSql('CREATE UNIQUE INDEX uniq_bovin_shipment_one_type ON bovin_shipment (shipment_id)');
|
||||
$this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT fk_7049f4502ee48a36 FOREIGN KEY (shipment_type_id) REFERENCES shipment_type (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||
$this->addSql('ALTER TABLE bovin_shipment ADD CONSTRAINT fk_7049f4507be036fc FOREIGN KEY (shipment_id) REFERENCES shipment (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
|
||||
$this->addSql('ALTER TABLE shipment DROP CONSTRAINT FK_2CB20DC2EE48A36');
|
||||
$this->addSql('DROP INDEX IDX_2CB20DC2EE48A36');
|
||||
$this->addSql('ALTER TABLE shipment DROP nb_bovin_send');
|
||||
$this->addSql('ALTER TABLE shipment DROP shipment_type_id');
|
||||
$this->addSql('CREATE UNIQUE INDEX uniq_weight_shipment_type ON weight (shipment_id, type)');
|
||||
$this->addSql('CREATE UNIQUE INDEX uniq_weight_reception_type ON weight (reception_id, type)');
|
||||
$this->addSql('ALTER INDEX idx_7cd55417be036fc RENAME TO idx_weight_shipment');
|
||||
}
|
||||
}
|
||||
47
migrations/Version20260219100826.php
Normal file
47
migrations/Version20260219100826.php
Normal file
@@ -0,0 +1,47 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
/**
|
||||
* Auto-generated Migration: Please modify to your needs!
|
||||
*/
|
||||
final class Version20260219100826 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return '';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
// this up() migration is auto-generated, please modify it to your needs
|
||||
$this->addSql('CREATE TABLE building_case (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, case_number INT NOT NULL, code VARCHAR(255) NOT NULL, capacity INT NOT NULL, id_building_id INT DEFAULT NULL, PRIMARY KEY (id))');
|
||||
$this->addSql('CREATE INDEX IDX_DE2CEE505538B3E5 ON building_case (id_building_id)');
|
||||
$this->addSql('CREATE TABLE building_case_position (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, x INT NOT NULL, y INT NOT NULL, w INT NOT NULL, h INT NOT NULL, render_order VARCHAR(255) NOT NULL, building_layout_id INT NOT NULL, building_case_id INT NOT NULL, PRIMARY KEY (id))');
|
||||
$this->addSql('CREATE INDEX IDX_ACCDF9077040AE67 ON building_case_position (building_layout_id)');
|
||||
$this->addSql('CREATE INDEX IDX_ACCDF907F8D859DF ON building_case_position (building_case_id)');
|
||||
$this->addSql('CREATE TABLE building_layout (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, name VARCHAR(255) NOT NULL, columns INT NOT NULL, rows INT NOT NULL, id_building_id INT NOT NULL, PRIMARY KEY (id))');
|
||||
$this->addSql('CREATE INDEX IDX_2A8CB1095538B3E5 ON building_layout (id_building_id)');
|
||||
$this->addSql('ALTER TABLE building_case ADD CONSTRAINT FK_DE2CEE505538B3E5 FOREIGN KEY (id_building_id) REFERENCES building (id)');
|
||||
$this->addSql('ALTER TABLE building_case_position ADD CONSTRAINT FK_ACCDF9077040AE67 FOREIGN KEY (building_layout_id) REFERENCES building_layout (id) NOT DEFERRABLE');
|
||||
$this->addSql('ALTER TABLE building_case_position ADD CONSTRAINT FK_ACCDF907F8D859DF FOREIGN KEY (building_case_id) REFERENCES building_case (id) NOT DEFERRABLE');
|
||||
$this->addSql('ALTER TABLE building_layout ADD CONSTRAINT FK_2A8CB1095538B3E5 FOREIGN KEY (id_building_id) REFERENCES building (id) NOT DEFERRABLE');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
// this down() migration is auto-generated, please modify it to your needs
|
||||
$this->addSql('ALTER TABLE building_case DROP CONSTRAINT FK_DE2CEE505538B3E5');
|
||||
$this->addSql('ALTER TABLE building_case_position DROP CONSTRAINT FK_ACCDF9077040AE67');
|
||||
$this->addSql('ALTER TABLE building_case_position DROP CONSTRAINT FK_ACCDF907F8D859DF');
|
||||
$this->addSql('ALTER TABLE building_layout DROP CONSTRAINT FK_2A8CB1095538B3E5');
|
||||
$this->addSql('DROP TABLE building_case');
|
||||
$this->addSql('DROP TABLE building_case_position');
|
||||
$this->addSql('DROP TABLE building_layout');
|
||||
}
|
||||
}
|
||||
37
migrations/Version20260220101607.php
Normal file
37
migrations/Version20260220101607.php
Normal file
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
/**
|
||||
* Auto-generated Migration: Please modify to your needs!
|
||||
*/
|
||||
final class Version20260220101607 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return '';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
// this up() migration is auto-generated, please modify it to your needs
|
||||
$this->addSql('CREATE TABLE statut (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, label VARCHAR(255) NOT NULL, code VARCHAR(255) NOT NULL, color VARCHAR(255) NOT NULL, PRIMARY KEY (id))');
|
||||
$this->addSql('ALTER TABLE building_case ADD statut_id INT DEFAULT NULL');
|
||||
$this->addSql('ALTER TABLE building_case ADD CONSTRAINT FK_DE2CEE50F6203804 FOREIGN KEY (statut_id) REFERENCES statut (id)');
|
||||
$this->addSql('CREATE INDEX IDX_DE2CEE50F6203804 ON building_case (statut_id)');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
// this down() migration is auto-generated, please modify it to your needs
|
||||
$this->addSql('DROP TABLE statut');
|
||||
$this->addSql('ALTER TABLE building_case DROP CONSTRAINT FK_DE2CEE50F6203804');
|
||||
$this->addSql('DROP INDEX IDX_DE2CEE50F6203804');
|
||||
$this->addSql('ALTER TABLE building_case DROP statut_id');
|
||||
}
|
||||
}
|
||||
30
migrations/Version20260225123000.php
Normal file
30
migrations/Version20260225123000.php
Normal file
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
final class Version20260225123000 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Create bovine table and relation to building_case.';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql('CREATE TABLE bovine (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, building_case_id INT DEFAULT NULL, national_number VARCHAR(50) NOT NULL, received_weight INT DEFAULT NULL, PRIMARY KEY(id))');
|
||||
$this->addSql('CREATE INDEX IDX_EA9E2A42F8D859DF ON bovine (building_case_id)');
|
||||
$this->addSql('CREATE UNIQUE INDEX uniq_bovine_national_number ON bovine (national_number)');
|
||||
$this->addSql('ALTER TABLE bovine ADD CONSTRAINT FK_EA9E2A42F8D859DF FOREIGN KEY (building_case_id) REFERENCES building_case (id) NOT DEFERRABLE');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE bovine DROP CONSTRAINT FK_EA9E2A42F8D859DF');
|
||||
$this->addSql('DROP TABLE bovine');
|
||||
}
|
||||
}
|
||||
26
migrations/Version20260225131500.php
Normal file
26
migrations/Version20260225131500.php
Normal file
@@ -0,0 +1,26 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
final class Version20260225131500 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Add arrival_date column to bovine table.';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE bovine ADD arrival_date DATE DEFAULT NULL');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE bovine DROP arrival_date');
|
||||
}
|
||||
}
|
||||
@@ -5,8 +5,12 @@ declare(strict_types=1);
|
||||
namespace App\Command;
|
||||
|
||||
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;
|
||||
@@ -14,9 +18,11 @@ 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;
|
||||
@@ -52,6 +58,12 @@ 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();
|
||||
@@ -215,6 +227,137 @@ class SeedCommand extends Command
|
||||
}
|
||||
}
|
||||
|
||||
private function seedBuildingInfrastructure(): void
|
||||
{
|
||||
$statusByCode = [];
|
||||
$statusRows = [
|
||||
['label' => 'Libre', 'code' => 'LB', 'color' => '#A3B18A'],
|
||||
['label' => 'Occupé', 'code' => 'OC', 'color' => '#3A506B'],
|
||||
['label' => 'Malade', 'code' => 'ML', 'color' => '#E07A5F'],
|
||||
];
|
||||
foreach ($statusRows as $statusRow) {
|
||||
/** @var Statut $status */
|
||||
$status = $this->upsertByCode(Statut::class, $statusRow['code'], static function (Statut $entity) use ($statusRow) {
|
||||
$entity
|
||||
->setLabel($statusRow['label'])
|
||||
->setCode($statusRow['code'])
|
||||
->setColor($statusRow['color'])
|
||||
;
|
||||
});
|
||||
$statusByCode[$statusRow['code']] = $status;
|
||||
}
|
||||
|
||||
$buildingRepo = $this->entityManager->getRepository(Building::class);
|
||||
$layoutByBuildingCode = [];
|
||||
$layoutRows = [
|
||||
['buildingCode' => 'B1', 'name' => 'plan1', 'columns' => 23, 'rows' => 2],
|
||||
['buildingCode' => 'B2', 'name' => 'plan2', 'columns' => 23, 'rows' => 2],
|
||||
['buildingCode' => 'B3', 'name' => 'plan3', 'columns' => 23, 'rows' => 2],
|
||||
];
|
||||
foreach ($layoutRows as $layoutRow) {
|
||||
$building = $buildingRepo->findOneBy(['code' => $layoutRow['buildingCode']]);
|
||||
if (!$building instanceof Building) {
|
||||
continue;
|
||||
}
|
||||
|
||||
/** @var BuildingLayout $layout */
|
||||
$layout = $this->upsertByName(BuildingLayout::class, $layoutRow['name'], static function (BuildingLayout $entity) use ($layoutRow, $building) {
|
||||
$entity
|
||||
->setName($layoutRow['name'])
|
||||
->setColumns($layoutRow['columns'])
|
||||
->setRows($layoutRow['rows'])
|
||||
->setIdBuilding($building)
|
||||
;
|
||||
});
|
||||
$layoutByBuildingCode[$layoutRow['buildingCode']] = $layout;
|
||||
}
|
||||
|
||||
$caseRows = [
|
||||
['buildingCode' => 'B1', 'from' => 1, 'to' => 12, 'status' => 'LB'],
|
||||
['buildingCode' => 'B1', 'from' => 13, 'to' => 24, 'status' => 'OC'],
|
||||
['buildingCode' => 'B1', 'from' => 25, 'to' => 32, 'status' => 'ML'],
|
||||
['buildingCode' => 'B1', 'from' => 33, 'to' => 44, 'status' => 'LB'],
|
||||
['buildingCode' => 'B2', 'from' => 1, 'to' => 10, 'status' => 'OC'],
|
||||
['buildingCode' => 'B2', 'from' => 11, 'to' => 22, 'status' => 'LB'],
|
||||
['buildingCode' => 'B2', 'from' => 23, 'to' => 30, 'status' => 'ML'],
|
||||
['buildingCode' => 'B2', 'from' => 31, 'to' => 44, 'status' => 'OC'],
|
||||
['buildingCode' => 'B3', 'from' => 1, 'to' => 8, 'status' => 'ML'],
|
||||
['buildingCode' => 'B3', 'from' => 9, 'to' => 20, 'status' => 'LB'],
|
||||
['buildingCode' => 'B3', 'from' => 21, 'to' => 34, 'status' => 'OC'],
|
||||
['buildingCode' => 'B3', 'from' => 35, 'to' => 44, 'status' => 'ML'],
|
||||
];
|
||||
|
||||
$caseByCode = [];
|
||||
foreach ($caseRows as $caseRow) {
|
||||
$building = $buildingRepo->findOneBy(['code' => $caseRow['buildingCode']]);
|
||||
$status = $statusByCode[$caseRow['status']] ?? null;
|
||||
if (!$building instanceof Building || !$status instanceof Statut) {
|
||||
continue;
|
||||
}
|
||||
|
||||
for ($caseNumber = $caseRow['from']; $caseNumber <= $caseRow['to']; ++$caseNumber) {
|
||||
$code = sprintf('%s-C%d', $caseRow['buildingCode'], $caseNumber);
|
||||
|
||||
/** @var BuildingCase $buildingCase */
|
||||
$buildingCase = $this->upsertByCode(BuildingCase::class, $code, static function (BuildingCase $entity) use ($code, $caseNumber, $building, $status) {
|
||||
$entity
|
||||
->setCode($code)
|
||||
->setCaseNumber($caseNumber)
|
||||
->setCapacity(15)
|
||||
->setIdBuilding($building)
|
||||
->setStatut($status)
|
||||
;
|
||||
});
|
||||
$caseByCode[$code] = $buildingCase;
|
||||
}
|
||||
}
|
||||
|
||||
$slots = $this->buildSlotMap();
|
||||
$positionRepo = $this->entityManager->getRepository(BuildingCasePosition::class);
|
||||
|
||||
foreach (['B1' => 'plan1', 'B2' => 'plan2', 'B3' => 'plan3'] as $buildingCode => $layoutName) {
|
||||
$layout = $layoutByBuildingCode[$buildingCode] ?? null;
|
||||
if (!$layout instanceof BuildingLayout || $layout->getName() !== $layoutName) {
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach ($slots as $slot) {
|
||||
$caseCode = sprintf('%s-C%d', $buildingCode, $slot['caseNumber']);
|
||||
$buildingCase = $caseByCode[$caseCode] ?? null;
|
||||
if (!$buildingCase instanceof BuildingCase) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$position = $positionRepo->findOneBy([
|
||||
'buildingLayout' => $layout,
|
||||
'buildingCase' => $buildingCase,
|
||||
'x' => $slot['x'],
|
||||
'y' => $slot['y'],
|
||||
]);
|
||||
|
||||
if ($position instanceof BuildingCasePosition) {
|
||||
++$this->updated;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$position = new BuildingCasePosition();
|
||||
$position
|
||||
->setX($slot['x'])
|
||||
->setY($slot['y'])
|
||||
->setW($slot['w'])
|
||||
->setH($slot['h'])
|
||||
->setRenderOrder((string) $slot['renderOrder'])
|
||||
->setBuildingLayout($layout)
|
||||
->setBuildingCase($buildingCase)
|
||||
;
|
||||
|
||||
++$this->created;
|
||||
$this->entityManager->persist($position);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function seedReceptionTypes(): void
|
||||
{
|
||||
$receptionTypes = [
|
||||
@@ -231,6 +374,134 @@ class SeedCommand extends Command
|
||||
}
|
||||
}
|
||||
|
||||
private function seedBovines(SymfonyStyle $io): void
|
||||
{
|
||||
$rows = [
|
||||
[1, 15, '7979580026', 390, '2026-02-25'],
|
||||
[5, 113, '4405604924', 397, '2025-05-22'],
|
||||
[4, 113, '4405604944', 375, '2025-05-22'],
|
||||
[2, 113, '4963291114', 319, '2025-05-22'],
|
||||
[3, 113, '4405604922', 386, '2025-05-22'],
|
||||
[6, 126, '4415811026', 367, '2025-07-02'],
|
||||
[7, 126, '4950971149', 398, '2025-07-02'],
|
||||
[8, 126, '4950971170', 386, '2025-07-02'],
|
||||
[9, 126, '4489751630', 408, '2025-07-02'],
|
||||
[10, 126, '8551323003', 478, '2025-07-02'],
|
||||
[11, 126, '8503833703', 378, '2025-07-02'],
|
||||
[12, 126, '4402104572', 379, '2025-07-02'],
|
||||
[13, 126, '4402104580', 465, '2025-07-02'],
|
||||
[14, 126, '4402104607', 381, '2025-07-02'],
|
||||
[15, 126, '8504059581', 446, '2025-07-02'],
|
||||
[16, 124, '4950971161', 382, '2025-07-02'],
|
||||
[17, 124, '5652911499', 376, '2025-07-02'],
|
||||
[18, 124, '8551323029', 414, '2025-07-02'],
|
||||
[19, 124, '4402104590', 474, '2025-07-02'],
|
||||
[20, 124, '4402104594', 408, '2025-07-02'],
|
||||
[21, 124, '4402104595', 399, '2025-07-02'],
|
||||
[22, 124, '4402104604', 374, '2025-07-02'],
|
||||
[23, 124, '8504059579', 403, '2025-07-02'],
|
||||
[24, 124, '8504059590', 398, '2025-07-02'],
|
||||
[25, 123, '8551782070', 395, '2025-07-02'],
|
||||
[26, 123, '8551782080', 443, '2025-07-02'],
|
||||
[27, 123, '8551782084', 394, '2025-07-02'],
|
||||
[28, 123, '8551782090', 378, '2025-07-02'],
|
||||
[29, 123, '8551782092', 424, '2025-07-02'],
|
||||
[30, 123, '8551782094', 389, '2025-07-02'],
|
||||
[31, 123, '8551782099', 411, '2025-07-02'],
|
||||
[32, 123, '8551323020', 392, '2025-07-02'],
|
||||
[33, 123, '8551323051', 371, '2025-07-02'],
|
||||
[34, 123, '7947673148', 378, '2025-07-02'],
|
||||
[39, 114, '1731177447', 395, '2025-06-19'],
|
||||
[42, 114, '1726167608', 299, '2025-06-19'],
|
||||
[38, 114, '1731177442', 343, '2025-06-19'],
|
||||
[40, 114, '1731177448', 362, '2025-06-19'],
|
||||
[41, 114, '1731177458', 359, '2025-06-19'],
|
||||
[35, 114, '7946282100', 291, '2025-06-19'],
|
||||
[43, 114, '1726167613', 339, '2025-06-19'],
|
||||
[37, 114, '1731177427', 375, '2025-06-19'],
|
||||
[36, 114, '7946282103', 354, '2025-06-19'],
|
||||
];
|
||||
|
||||
$bovineRepo = $this->entityManager->getRepository(Bovine::class);
|
||||
$caseRepo = $this->entityManager->getRepository(BuildingCase::class);
|
||||
|
||||
foreach ($rows as [, $legacyCaseId, $nationalNumber, $receivedWeight, $arrivalDate]) {
|
||||
$buildingCase = $this->resolveBuildingCaseByLegacyId((int) $legacyCaseId);
|
||||
if (!$buildingCase instanceof BuildingCase) {
|
||||
$buildingCase = $caseRepo->find((int) $legacyCaseId);
|
||||
}
|
||||
if (!$buildingCase instanceof BuildingCase) {
|
||||
$io->warning(sprintf(
|
||||
'Bovine %s skipped: building_case token %d not found.',
|
||||
$nationalNumber,
|
||||
$legacyCaseId
|
||||
));
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$bovine = $bovineRepo->findOneBy(['nationalNumber' => $nationalNumber]);
|
||||
if (!$bovine instanceof Bovine) {
|
||||
$bovine = new Bovine();
|
||||
++$this->created;
|
||||
} else {
|
||||
++$this->updated;
|
||||
}
|
||||
|
||||
$bovine
|
||||
->setNationalNumber((string) $nationalNumber)
|
||||
->setBuildingCase($buildingCase)
|
||||
->setReceivedWeight((int) $receivedWeight)
|
||||
->setArrivalDate(new DateTimeImmutable((string) $arrivalDate))
|
||||
;
|
||||
|
||||
$this->entityManager->persist($bovine);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<int, array{x:int,y:int,w:int,h:int,renderOrder:int,caseNumber:int}>
|
||||
*/
|
||||
private function buildSlotMap(): array
|
||||
{
|
||||
$slots = [];
|
||||
|
||||
for ($column = 1; $column <= 12; ++$column) {
|
||||
$slots[] = ['x' => $column, 'y' => 1, 'w' => 1, 'h' => 1, 'renderOrder' => $column, 'caseNumber' => $column + 12];
|
||||
}
|
||||
for ($column = 14; $column <= 23; ++$column) {
|
||||
$slots[] = ['x' => $column, 'y' => 1, 'w' => 1, 'h' => 1, 'renderOrder' => $column - 1, 'caseNumber' => $column + 11];
|
||||
}
|
||||
for ($column = 1; $column <= 12; ++$column) {
|
||||
$slots[] = ['x' => $column, 'y' => 2, 'w' => 1, 'h' => 1, 'renderOrder' => 22 + $column, 'caseNumber' => 13 - $column];
|
||||
}
|
||||
for ($column = 14; $column <= 23; ++$column) {
|
||||
$slots[] = ['x' => $column, 'y' => 2, 'w' => 1, 'h' => 1, 'renderOrder' => 21 + $column, 'caseNumber' => 58 - $column];
|
||||
}
|
||||
|
||||
return $slots;
|
||||
}
|
||||
|
||||
private function resolveBuildingCaseByLegacyId(int $legacyCaseId): ?BuildingCase
|
||||
{
|
||||
if ($legacyCaseId < 1) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$buildingNumber = intdiv($legacyCaseId - 1, 44) + 1;
|
||||
$caseNumber = (($legacyCaseId - 1) % 44) + 1;
|
||||
|
||||
if ($buildingNumber < 1 || $buildingNumber > 3) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$code = sprintf('B%d-C%d', $buildingNumber, $caseNumber);
|
||||
|
||||
$buildingCase = $this->entityManager->getRepository(BuildingCase::class)->findOneBy(['code' => $code]);
|
||||
|
||||
return $buildingCase instanceof BuildingCase ? $buildingCase : null;
|
||||
}
|
||||
|
||||
private function seedBovineTypes(): void
|
||||
{
|
||||
$bovineTypes = [
|
||||
|
||||
@@ -20,6 +20,8 @@ class AppFixtures extends Fixture implements DependentFixtureInterface
|
||||
return [
|
||||
TransportFixtures::class,
|
||||
ReferenceFixtures::class,
|
||||
BuildingInfrastructureFixtures::class,
|
||||
BovineFixtures::class,
|
||||
UserFixtures::class,
|
||||
];
|
||||
}
|
||||
|
||||
120
src/DataFixtures/BovineFixtures.php
Normal file
120
src/DataFixtures/BovineFixtures.php
Normal file
@@ -0,0 +1,120 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\DataFixtures;
|
||||
|
||||
use App\Entity\Bovine;
|
||||
use App\Entity\BuildingCase;
|
||||
use DateTimeImmutable;
|
||||
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||
use Doctrine\Common\DataFixtures\DependentFixtureInterface;
|
||||
use Doctrine\Persistence\ObjectManager;
|
||||
|
||||
class BovineFixtures extends Fixture implements DependentFixtureInterface
|
||||
{
|
||||
public function load(ObjectManager $manager): void
|
||||
{
|
||||
$rows = [
|
||||
[1, 15, '7979580026', 390, '2026-02-25'],
|
||||
[5, 113, '4405604924', 397, '2025-05-22'],
|
||||
[4, 113, '4405604944', 375, '2025-05-22'],
|
||||
[2, 113, '4963291114', 319, '2025-05-22'],
|
||||
[3, 113, '4405604922', 386, '2025-05-22'],
|
||||
[6, 126, '4415811026', 367, '2025-07-02'],
|
||||
[7, 126, '4950971149', 398, '2025-07-02'],
|
||||
[8, 126, '4950971170', 386, '2025-07-02'],
|
||||
[9, 126, '4489751630', 408, '2025-07-02'],
|
||||
[10, 126, '8551323003', 478, '2025-07-02'],
|
||||
[11, 126, '8503833703', 378, '2025-07-02'],
|
||||
[12, 126, '4402104572', 379, '2025-07-02'],
|
||||
[13, 126, '4402104580', 465, '2025-07-02'],
|
||||
[14, 126, '4402104607', 381, '2025-07-02'],
|
||||
[15, 126, '8504059581', 446, '2025-07-02'],
|
||||
[16, 124, '4950971161', 382, '2025-07-02'],
|
||||
[17, 124, '5652911499', 376, '2025-07-02'],
|
||||
[18, 124, '8551323029', 414, '2025-07-02'],
|
||||
[19, 124, '4402104590', 474, '2025-07-02'],
|
||||
[20, 124, '4402104594', 408, '2025-07-02'],
|
||||
[21, 124, '4402104595', 399, '2025-07-02'],
|
||||
[22, 124, '4402104604', 374, '2025-07-02'],
|
||||
[23, 124, '8504059579', 403, '2025-07-02'],
|
||||
[24, 124, '8504059590', 398, '2025-07-02'],
|
||||
[25, 123, '8551782070', 395, '2025-07-02'],
|
||||
[26, 123, '8551782080', 443, '2025-07-02'],
|
||||
[27, 123, '8551782084', 394, '2025-07-02'],
|
||||
[28, 123, '8551782090', 378, '2025-07-02'],
|
||||
[29, 123, '8551782092', 424, '2025-07-02'],
|
||||
[30, 123, '8551782094', 389, '2025-07-02'],
|
||||
[31, 123, '8551782099', 411, '2025-07-02'],
|
||||
[32, 123, '8551323020', 392, '2025-07-02'],
|
||||
[33, 123, '8551323051', 371, '2025-07-02'],
|
||||
[34, 123, '7947673148', 378, '2025-07-02'],
|
||||
[39, 114, '1731177447', 395, '2025-06-19'],
|
||||
[42, 114, '1726167608', 299, '2025-06-19'],
|
||||
[38, 114, '1731177442', 343, '2025-06-19'],
|
||||
[40, 114, '1731177448', 362, '2025-06-19'],
|
||||
[41, 114, '1731177458', 359, '2025-06-19'],
|
||||
[35, 114, '7946282100', 291, '2025-06-19'],
|
||||
[43, 114, '1726167613', 339, '2025-06-19'],
|
||||
[37, 114, '1731177427', 375, '2025-06-19'],
|
||||
[36, 114, '7946282103', 354, '2025-06-19'],
|
||||
];
|
||||
|
||||
$bovineRepository = $manager->getRepository(Bovine::class);
|
||||
$caseRepository = $manager->getRepository(BuildingCase::class);
|
||||
|
||||
foreach ($rows as [, $legacyCaseId, $nationalNumber, $receivedWeight, $arrivalDate]) {
|
||||
$buildingCase = $this->resolveBuildingCaseByLegacyId($manager, (int) $legacyCaseId);
|
||||
if (!$buildingCase instanceof BuildingCase) {
|
||||
$buildingCase = $caseRepository->find((int) $legacyCaseId);
|
||||
}
|
||||
if (!$buildingCase instanceof BuildingCase) {
|
||||
continue;
|
||||
}
|
||||
|
||||
/** @var null|Bovine $bovine */
|
||||
$bovine = $bovineRepository->findOneBy(['nationalNumber' => (string) $nationalNumber]);
|
||||
if (!$bovine instanceof Bovine) {
|
||||
$bovine = new Bovine();
|
||||
}
|
||||
|
||||
$bovine
|
||||
->setNationalNumber((string) $nationalNumber)
|
||||
->setBuildingCase($buildingCase)
|
||||
->setReceivedWeight((int) $receivedWeight)
|
||||
->setArrivalDate(new DateTimeImmutable((string) $arrivalDate))
|
||||
;
|
||||
|
||||
$manager->persist($bovine);
|
||||
}
|
||||
|
||||
$manager->flush();
|
||||
}
|
||||
|
||||
public function getDependencies(): array
|
||||
{
|
||||
return [
|
||||
BuildingInfrastructureFixtures::class,
|
||||
];
|
||||
}
|
||||
|
||||
private function resolveBuildingCaseByLegacyId(ObjectManager $manager, int $legacyCaseId): ?BuildingCase
|
||||
{
|
||||
if ($legacyCaseId < 1) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$buildingNumber = intdiv($legacyCaseId - 1, 44) + 1;
|
||||
$caseNumber = (($legacyCaseId - 1) % 44) + 1;
|
||||
|
||||
if ($buildingNumber < 1 || $buildingNumber > 3) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$code = sprintf('B%d-C%d', $buildingNumber, $caseNumber);
|
||||
$buildingCase = $manager->getRepository(BuildingCase::class)->findOneBy(['code' => $code]);
|
||||
|
||||
return $buildingCase instanceof BuildingCase ? $buildingCase : null;
|
||||
}
|
||||
}
|
||||
299
src/DataFixtures/BuildingInfrastructureFixtures.php
Normal file
299
src/DataFixtures/BuildingInfrastructureFixtures.php
Normal file
@@ -0,0 +1,299 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\DataFixtures;
|
||||
|
||||
use App\Entity\Building;
|
||||
use App\Entity\BuildingCase;
|
||||
use App\Entity\BuildingCasePosition;
|
||||
use App\Entity\BuildingLayout;
|
||||
use App\Entity\Statut;
|
||||
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||
use Doctrine\Common\DataFixtures\DependentFixtureInterface;
|
||||
use Doctrine\Persistence\ObjectManager;
|
||||
use RuntimeException;
|
||||
|
||||
class BuildingInfrastructureFixtures extends Fixture implements DependentFixtureInterface
|
||||
{
|
||||
public function load(ObjectManager $manager): void
|
||||
{
|
||||
$statuts = $this->loadStatuts($manager);
|
||||
$buildings = $this->getBuildingsByCode($manager, ['B1', 'B2', 'B3']);
|
||||
$layouts = $this->loadLayouts($manager, $buildings);
|
||||
$cases = $this->loadBuildingCases($manager, $buildings, $statuts);
|
||||
$this->loadCasePositions($manager, $layouts, $cases);
|
||||
|
||||
$manager->flush();
|
||||
}
|
||||
|
||||
public function getDependencies(): array
|
||||
{
|
||||
return [
|
||||
ReferenceFixtures::class,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, Statut>
|
||||
*/
|
||||
private function loadStatuts(ObjectManager $manager): array
|
||||
{
|
||||
$repo = $manager->getRepository(Statut::class);
|
||||
|
||||
$data = [
|
||||
['label' => 'Libre', 'code' => 'LB', 'color' => '#A3B18A'],
|
||||
['label' => 'Occupé', 'code' => 'OC', 'color' => '#3A506B'],
|
||||
['label' => 'Malade', 'code' => 'ML', 'color' => '#E07A5F'],
|
||||
];
|
||||
|
||||
$result = [];
|
||||
foreach ($data as $row) {
|
||||
/** @var null|Statut $statut */
|
||||
$statut = $repo->findOneBy(['code' => $row['code']]);
|
||||
if (!$statut instanceof Statut) {
|
||||
$statut = new Statut()
|
||||
->setLabel($row['label'])
|
||||
->setCode($row['code'])
|
||||
->setColor($row['color'])
|
||||
;
|
||||
$manager->persist($statut);
|
||||
}
|
||||
|
||||
$result[$row['code']] = $statut;
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param list<string> $codes
|
||||
*
|
||||
* @return array<string, Building>
|
||||
*/
|
||||
private function getBuildingsByCode(ObjectManager $manager, array $codes): array
|
||||
{
|
||||
$repo = $manager->getRepository(Building::class);
|
||||
$result = [];
|
||||
|
||||
foreach ($codes as $code) {
|
||||
/** @var null|Building $building */
|
||||
$building = $repo->findOneBy(['code' => $code]);
|
||||
if (!$building instanceof Building) {
|
||||
throw new RuntimeException(sprintf('Building "%s" not found. Load ReferenceFixtures first.', $code));
|
||||
}
|
||||
|
||||
$result[$code] = $building;
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, Building> $buildings
|
||||
*
|
||||
* @return array<string, BuildingLayout>
|
||||
*/
|
||||
private function loadLayouts(ObjectManager $manager, array $buildings): array
|
||||
{
|
||||
$repo = $manager->getRepository(BuildingLayout::class);
|
||||
|
||||
$data = [
|
||||
['name' => 'plan1', 'columns' => 23, 'rows' => 2, 'buildingCode' => 'B1'],
|
||||
['name' => 'plan2', 'columns' => 23, 'rows' => 2, 'buildingCode' => 'B2'],
|
||||
['name' => 'plan3', 'columns' => 23, 'rows' => 2, 'buildingCode' => 'B3'],
|
||||
];
|
||||
|
||||
$result = [];
|
||||
foreach ($data as $row) {
|
||||
/** @var null|BuildingLayout $layout */
|
||||
$layout = $repo->findOneBy(['name' => $row['name']]);
|
||||
if (!$layout instanceof BuildingLayout) {
|
||||
$layout = new BuildingLayout()
|
||||
->setName($row['name'])
|
||||
->setColumns($row['columns'])
|
||||
->setRows($row['rows'])
|
||||
->setIdBuilding($buildings[$row['buildingCode']])
|
||||
;
|
||||
$manager->persist($layout);
|
||||
}
|
||||
|
||||
$result[$row['buildingCode']] = $layout;
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, Building> $buildings
|
||||
* @param array<string, Statut> $statuts
|
||||
*
|
||||
* @return array<string, BuildingCase>
|
||||
*/
|
||||
private function loadBuildingCases(ObjectManager $manager, array $buildings, array $statuts): array
|
||||
{
|
||||
$repo = $manager->getRepository(BuildingCase::class);
|
||||
|
||||
$statusRanges = [
|
||||
// B1
|
||||
['buildingCode' => 'B1', 'from' => 1, 'to' => 12, 'statut' => 'LB'],
|
||||
['buildingCode' => 'B1', 'from' => 13, 'to' => 24, 'statut' => 'OC'],
|
||||
['buildingCode' => 'B1', 'from' => 25, 'to' => 32, 'statut' => 'ML'],
|
||||
['buildingCode' => 'B1', 'from' => 33, 'to' => 44, 'statut' => 'LB'],
|
||||
// B2
|
||||
['buildingCode' => 'B2', 'from' => 1, 'to' => 10, 'statut' => 'OC'],
|
||||
['buildingCode' => 'B2', 'from' => 11, 'to' => 22, 'statut' => 'LB'],
|
||||
['buildingCode' => 'B2', 'from' => 23, 'to' => 30, 'statut' => 'ML'],
|
||||
['buildingCode' => 'B2', 'from' => 31, 'to' => 44, 'statut' => 'OC'],
|
||||
// B3
|
||||
['buildingCode' => 'B3', 'from' => 1, 'to' => 8, 'statut' => 'ML'],
|
||||
['buildingCode' => 'B3', 'from' => 9, 'to' => 20, 'statut' => 'LB'],
|
||||
['buildingCode' => 'B3', 'from' => 21, 'to' => 34, 'statut' => 'OC'],
|
||||
['buildingCode' => 'B3', 'from' => 35, 'to' => 44, 'statut' => 'ML'],
|
||||
];
|
||||
|
||||
$result = [];
|
||||
foreach ($statusRanges as $range) {
|
||||
for ($caseNumber = $range['from']; $caseNumber <= $range['to']; ++$caseNumber) {
|
||||
$code = sprintf('%s-C%d', $range['buildingCode'], $caseNumber);
|
||||
|
||||
if (isset($result[$code])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
/** @var null|BuildingCase $buildingCase */
|
||||
$buildingCase = $repo->findOneBy(['code' => $code]);
|
||||
if (!$buildingCase instanceof BuildingCase) {
|
||||
$buildingCase = new BuildingCase()
|
||||
->setCaseNumber($caseNumber)
|
||||
->setCode($code)
|
||||
->setCapacity(15)
|
||||
->setIdBuilding($buildings[$range['buildingCode']])
|
||||
->setStatut($statuts[$range['statut']])
|
||||
;
|
||||
$manager->persist($buildingCase);
|
||||
}
|
||||
|
||||
$result[$code] = $buildingCase;
|
||||
}
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, BuildingLayout> $layouts
|
||||
* @param array<string, BuildingCase> $casesByCode
|
||||
*/
|
||||
private function loadCasePositions(ObjectManager $manager, array $layouts, array $casesByCode): void
|
||||
{
|
||||
$repo = $manager->getRepository(BuildingCasePosition::class);
|
||||
|
||||
$layoutMap = [
|
||||
'B1' => 'plan1',
|
||||
'B2' => 'plan2',
|
||||
'B3' => 'plan3',
|
||||
];
|
||||
|
||||
$slots = $this->buildSlotMap();
|
||||
|
||||
foreach ($layoutMap as $buildingCode => $layoutName) {
|
||||
$layout = $layouts[$buildingCode] ?? null;
|
||||
if (!$layout instanceof BuildingLayout || $layout->getName() !== $layoutName) {
|
||||
throw new RuntimeException(sprintf('Layout "%s" for building "%s" not found.', $layoutName, $buildingCode));
|
||||
}
|
||||
|
||||
foreach ($slots as $slot) {
|
||||
$caseCode = sprintf('%s-C%d', $buildingCode, $slot['caseNumber']);
|
||||
$buildingCase = $casesByCode[$caseCode] ?? null;
|
||||
|
||||
if (!$buildingCase instanceof BuildingCase) {
|
||||
throw new RuntimeException(sprintf('Building case "%s" not found.', $caseCode));
|
||||
}
|
||||
|
||||
/** @var null|BuildingCasePosition $position */
|
||||
$position = $repo->findOneBy([
|
||||
'buildingLayout' => $layout,
|
||||
'buildingCase' => $buildingCase,
|
||||
'x' => $slot['x'],
|
||||
'y' => $slot['y'],
|
||||
]);
|
||||
|
||||
if ($position instanceof BuildingCasePosition) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$position = new BuildingCasePosition()
|
||||
->setX($slot['x'])
|
||||
->setY($slot['y'])
|
||||
->setW($slot['w'])
|
||||
->setH($slot['h'])
|
||||
->setRenderOrder((string) $slot['renderOrder'])
|
||||
->setBuildingLayout($layout)
|
||||
->setBuildingCase($buildingCase)
|
||||
;
|
||||
$manager->persist($position);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Reproduit le slot_map SQL (44 emplacements sur 2 lignes avec un gap en colonne 13).
|
||||
*
|
||||
* @return list<array{x:int,y:int,w:int,h:int,renderOrder:int,caseNumber:int}>
|
||||
*/
|
||||
private function buildSlotMap(): array
|
||||
{
|
||||
$slots = [];
|
||||
|
||||
// Ligne 1, colonnes 1..12 => cases 13..24
|
||||
for ($c = 1; $c <= 12; ++$c) {
|
||||
$slots[] = [
|
||||
'x' => $c,
|
||||
'y' => 1,
|
||||
'w' => 1,
|
||||
'h' => 1,
|
||||
'renderOrder' => $c,
|
||||
'caseNumber' => $c + 12,
|
||||
];
|
||||
}
|
||||
|
||||
// Ligne 1, colonnes 14..23 => cases 25..34
|
||||
for ($c = 14; $c <= 23; ++$c) {
|
||||
$slots[] = [
|
||||
'x' => $c,
|
||||
'y' => 1,
|
||||
'w' => 1,
|
||||
'h' => 1,
|
||||
'renderOrder' => $c - 1,
|
||||
'caseNumber' => $c + 11,
|
||||
];
|
||||
}
|
||||
|
||||
// Ligne 2, colonnes 1..12 => cases 12..1
|
||||
for ($c = 1; $c <= 12; ++$c) {
|
||||
$slots[] = [
|
||||
'x' => $c,
|
||||
'y' => 2,
|
||||
'w' => 1,
|
||||
'h' => 1,
|
||||
'renderOrder' => 22 + $c,
|
||||
'caseNumber' => 13 - $c,
|
||||
];
|
||||
}
|
||||
|
||||
// Ligne 2, colonnes 14..23 => cases 44..35
|
||||
for ($c = 14; $c <= 23; ++$c) {
|
||||
$slots[] = [
|
||||
'x' => $c,
|
||||
'y' => 2,
|
||||
'w' => 1,
|
||||
'h' => 1,
|
||||
'renderOrder' => 21 + $c,
|
||||
'caseNumber' => 58 - $c,
|
||||
];
|
||||
}
|
||||
|
||||
return $slots;
|
||||
}
|
||||
}
|
||||
@@ -16,7 +16,6 @@ use Symfony\Component\Serializer\Attribute\Groups;
|
||||
|
||||
#[ORM\Entity]
|
||||
#[ORM\Table(name: 'address')]
|
||||
#[ORM\HasLifecycleCallbacks]
|
||||
#[ApiResource(
|
||||
operations: [
|
||||
new Get(
|
||||
@@ -67,10 +66,6 @@ class Address
|
||||
#[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read', 'address:write'])]
|
||||
private string $city = '';
|
||||
|
||||
#[ORM\Column(length: 400)]
|
||||
#[Groups(['address:read', 'supplier:read', 'reception:read', 'customer:read', 'shipment:read', 'address:write'])]
|
||||
private string $fullAddress = '';
|
||||
|
||||
#[ORM\Column(name: 'country_code', length: 2)]
|
||||
#[Groups(['address:read', 'supplier:read', 'customer:read', 'address:write'])]
|
||||
private string $countryCode = '';
|
||||
@@ -170,21 +165,16 @@ class Address
|
||||
return $this;
|
||||
}
|
||||
|
||||
#[Groups(['address:read', 'supplier:read', 'reception:read', 'shipment:read', 'customer:read'])]
|
||||
public function getFullAddress(): string
|
||||
{
|
||||
return $this->fullAddress;
|
||||
}
|
||||
$parts = array_filter([
|
||||
$this->street,
|
||||
$this->street2,
|
||||
trim(sprintf('%s %s', $this->postalCode, $this->city)),
|
||||
]);
|
||||
|
||||
#[ORM\PrePersist]
|
||||
#[ORM\PreUpdate]
|
||||
public function updateFullAddress(): void
|
||||
{
|
||||
$this->fullAddress = trim(sprintf(
|
||||
'%s %s %s',
|
||||
$this->street ?? '',
|
||||
$this->postalCode ?? '',
|
||||
$this->city ?? ''
|
||||
));
|
||||
return implode(', ', $parts);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Entity;
|
||||
|
||||
use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
|
||||
use ApiPlatform\Metadata\ApiFilter;
|
||||
use ApiPlatform\Metadata\ApiProperty;
|
||||
use ApiPlatform\Metadata\ApiResource;
|
||||
use ApiPlatform\Metadata\Delete;
|
||||
use ApiPlatform\Metadata\Get;
|
||||
use ApiPlatform\Metadata\GetCollection;
|
||||
use ApiPlatform\Metadata\Patch;
|
||||
use ApiPlatform\Metadata\Post;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use Symfony\Component\Serializer\Attribute\Groups;
|
||||
|
||||
#[ORM\Entity]
|
||||
#[ApiFilter(SearchFilter::class, properties: ['shipment' => 'exact'])]
|
||||
#[ORM\UniqueConstraint(name: 'uniq_bovin_shipment_one_type', columns: ['shipment_id'])]
|
||||
#[ORM\Table(name: 'bovin_shipment')]
|
||||
#[ApiResource(
|
||||
operations: [
|
||||
new Get(
|
||||
requirements: ['id' => '\d+'],
|
||||
normalizationContext: ['groups' => ['shipment-bovine:read']],
|
||||
),
|
||||
new GetCollection(
|
||||
normalizationContext: ['groups' => ['shipment-bovine:read']],
|
||||
),
|
||||
|
||||
new Post(
|
||||
normalizationContext: ['groups' => ['shipment-bovine:read']],
|
||||
denormalizationContext: ['groups' => ['shipment-bovine:write']],
|
||||
),
|
||||
new Patch(
|
||||
normalizationContext: ['groups' => ['shipment-bovine:read']],
|
||||
denormalizationContext: ['groups' => ['shipment-bovine:write']],
|
||||
),
|
||||
new Delete(),
|
||||
],
|
||||
security: "is_granted('ROLE_USER')",
|
||||
)]
|
||||
class BovinShipment
|
||||
{
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column]
|
||||
#[Groups(['shipment:read', 'shipment-bovine:read'])]
|
||||
private ?int $id = null;
|
||||
|
||||
#[ORM\ManyToOne(inversedBy: 'bovinShipments')]
|
||||
#[Groups(['shipment-bovine:read', 'shipment-bovine:write'])]
|
||||
#[ApiProperty(readableLink: true)]
|
||||
private ?Shipment $shipment = null;
|
||||
|
||||
#[ORM\ManyToOne]
|
||||
#[Groups(['shipment:read', 'shipment-bovine:write', 'shipment-bovine:read'])]
|
||||
#[ApiProperty(readableLink: true)]
|
||||
private ?ShipmentType $shipmentType = null;
|
||||
|
||||
#[ORM\Column]
|
||||
#[Groups(['shipment:read', 'shipment-bovine:write', 'shipment-bovine:read'])]
|
||||
private ?int $nbBovinSend = null;
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getShipment(): ?Shipment
|
||||
{
|
||||
return $this->shipment;
|
||||
}
|
||||
|
||||
public function setShipment(?Shipment $shipment): void
|
||||
{
|
||||
$this->shipment = $shipment;
|
||||
}
|
||||
|
||||
public function getShipmentType(): ?ShipmentType
|
||||
{
|
||||
return $this->shipmentType;
|
||||
}
|
||||
|
||||
public function setShipmentType(?ShipmentType $shipmentType): void
|
||||
{
|
||||
$this->shipmentType = $shipmentType;
|
||||
}
|
||||
|
||||
public function getNbBovinSend(): ?int
|
||||
{
|
||||
return $this->nbBovinSend;
|
||||
}
|
||||
|
||||
public function setNbBovinSend(?int $nbBovinSend): void
|
||||
{
|
||||
$this->nbBovinSend = $nbBovinSend;
|
||||
}
|
||||
}
|
||||
121
src/Entity/Bovine.php
Normal file
121
src/Entity/Bovine.php
Normal file
@@ -0,0 +1,121 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Entity;
|
||||
|
||||
use ApiPlatform\Metadata\ApiResource;
|
||||
use ApiPlatform\Metadata\Get;
|
||||
use ApiPlatform\Metadata\GetCollection;
|
||||
use ApiPlatform\Metadata\Patch;
|
||||
use ApiPlatform\Metadata\Post;
|
||||
use DateTimeImmutable;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use Symfony\Component\Serializer\Attribute\Context;
|
||||
use Symfony\Component\Serializer\Attribute\Groups;
|
||||
use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
|
||||
|
||||
#[ORM\Entity]
|
||||
#[ORM\Table(name: 'bovine')]
|
||||
#[ORM\UniqueConstraint(name: 'uniq_bovine_national_number', columns: ['national_number'])]
|
||||
#[ApiResource(
|
||||
operations: [
|
||||
new Get(
|
||||
requirements: ['id' => '\d+'],
|
||||
normalizationContext: ['groups' => ['bovine:read']],
|
||||
),
|
||||
new GetCollection(
|
||||
normalizationContext: ['groups' => ['bovine:read']],
|
||||
),
|
||||
new Post(
|
||||
normalizationContext: ['groups' => ['bovine:read']],
|
||||
denormalizationContext: ['groups' => ['bovine:write']],
|
||||
security: "is_granted('ROLE_ADMIN')",
|
||||
),
|
||||
new Patch(
|
||||
requirements: ['id' => '\d+'],
|
||||
normalizationContext: ['groups' => ['bovine:read']],
|
||||
denormalizationContext: ['groups' => ['bovine:write']],
|
||||
security: "is_granted('ROLE_ADMIN')",
|
||||
),
|
||||
],
|
||||
security: "is_granted('ROLE_USER')",
|
||||
)]
|
||||
class Bovine
|
||||
{
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column]
|
||||
#[Groups(['bovine:read'])]
|
||||
private ?int $id = null;
|
||||
|
||||
#[ORM\Column(length: 50)]
|
||||
#[Groups(['bovine:read', 'bovine:write'])]
|
||||
private string $nationalNumber = '';
|
||||
|
||||
#[ORM\Column(nullable: true)]
|
||||
#[Groups(['bovine:read', 'bovine:write'])]
|
||||
private ?int $receivedWeight = null;
|
||||
|
||||
#[ORM\Column(type: 'date_immutable', nullable: true)]
|
||||
#[Groups(['bovine:read', 'bovine:write'])]
|
||||
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
||||
private ?DateTimeImmutable $arrivalDate = null;
|
||||
|
||||
#[ORM\ManyToOne(inversedBy: 'bovines')]
|
||||
#[Groups(['bovine:read', 'bovine:write'])]
|
||||
private ?BuildingCase $buildingCase = null;
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getNationalNumber(): string
|
||||
{
|
||||
return $this->nationalNumber;
|
||||
}
|
||||
|
||||
public function setNationalNumber(string $nationalNumber): static
|
||||
{
|
||||
$this->nationalNumber = $nationalNumber;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getReceivedWeight(): ?int
|
||||
{
|
||||
return $this->receivedWeight;
|
||||
}
|
||||
|
||||
public function setReceivedWeight(?int $receivedWeight): static
|
||||
{
|
||||
$this->receivedWeight = $receivedWeight;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getArrivalDate(): ?DateTimeImmutable
|
||||
{
|
||||
return $this->arrivalDate;
|
||||
}
|
||||
|
||||
public function setArrivalDate(?DateTimeImmutable $arrivalDate): static
|
||||
{
|
||||
$this->arrivalDate = $arrivalDate;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getBuildingCase(): ?BuildingCase
|
||||
{
|
||||
return $this->buildingCase;
|
||||
}
|
||||
|
||||
public function setBuildingCase(?BuildingCase $buildingCase): static
|
||||
{
|
||||
$this->buildingCase = $buildingCase;
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,7 @@ 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')]
|
||||
@@ -48,9 +49,25 @@ 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->receptions = new ArrayCollection();
|
||||
$this->buildingCases = new ArrayCollection();
|
||||
$this->buildingLayout = new ArrayCollection();
|
||||
}
|
||||
|
||||
public function getId(): ?int
|
||||
@@ -89,4 +106,41 @@ 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;
|
||||
}
|
||||
}
|
||||
|
||||
209
src/Entity/BuildingCase.php
Normal file
209
src/Entity/BuildingCase.php
Normal file
@@ -0,0 +1,209 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Entity;
|
||||
|
||||
use ApiPlatform\Metadata\ApiResource;
|
||||
use ApiPlatform\Metadata\Get;
|
||||
use ApiPlatform\OpenApi\Model\Operation as OpenApiOperation;
|
||||
use App\State\BuildingCaseWeightsReportProvider;
|
||||
use Doctrine\Common\Collections\ArrayCollection;
|
||||
use Doctrine\Common\Collections\Collection;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use Symfony\Component\Serializer\Attribute\Groups;
|
||||
use Symfony\Component\Serializer\Attribute\SerializedName;
|
||||
|
||||
#[ORM\Entity]
|
||||
#[ApiResource(
|
||||
operations: [
|
||||
new Get(
|
||||
uriTemplate: '/building_cases/{id}/weights-report',
|
||||
requirements: ['id' => '\d+'],
|
||||
openapi: new OpenApiOperation(
|
||||
summary: 'Render case weights report',
|
||||
description: 'Returns a PDF report of bovines stored in the selected case.',
|
||||
),
|
||||
output: false,
|
||||
provider: BuildingCaseWeightsReportProvider::class,
|
||||
),
|
||||
],
|
||||
security: "is_granted('ROLE_USER')",
|
||||
)]
|
||||
class BuildingCase
|
||||
{
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column]
|
||||
#[Groups(['building:read'])]
|
||||
private ?int $id = null;
|
||||
|
||||
#[ORM\Column]
|
||||
#[Groups(['building:read'])]
|
||||
#[SerializedName('caseNumber')]
|
||||
private ?int $case_number = null;
|
||||
|
||||
#[ORM\Column(length: 255)]
|
||||
#[Groups(['building:read'])]
|
||||
private ?string $code = null;
|
||||
|
||||
#[ORM\Column]
|
||||
#[Groups(['building:read'])]
|
||||
private ?int $capacity = null;
|
||||
|
||||
/**
|
||||
* @var Collection<int, BuildingCasePosition>
|
||||
*/
|
||||
#[ORM\OneToMany(targetEntity: BuildingCasePosition::class, mappedBy: 'buildingCase')]
|
||||
private Collection $id_case_position;
|
||||
|
||||
#[ORM\ManyToOne(inversedBy: 'buildingCases')]
|
||||
private ?Building $id_building = null;
|
||||
|
||||
#[ORM\ManyToOne(inversedBy: 'id_case')]
|
||||
#[Groups(['building:read'])]
|
||||
private ?Statut $statut = null;
|
||||
|
||||
/**
|
||||
* @var Collection<int, Bovine>
|
||||
*/
|
||||
#[ORM\OneToMany(targetEntity: Bovine::class, mappedBy: 'buildingCase')]
|
||||
private Collection $bovines;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->id_case_position = new ArrayCollection();
|
||||
$this->bovines = new ArrayCollection();
|
||||
}
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function setId(int $id): static
|
||||
{
|
||||
$this->id = $id;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getCaseNumber(): ?int
|
||||
{
|
||||
return $this->case_number;
|
||||
}
|
||||
|
||||
public function setCaseNumber(int $case_number): static
|
||||
{
|
||||
$this->case_number = $case_number;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getCode(): ?string
|
||||
{
|
||||
return $this->code;
|
||||
}
|
||||
|
||||
public function setCode(string $code): static
|
||||
{
|
||||
$this->code = $code;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getCapacity(): ?int
|
||||
{
|
||||
return $this->capacity;
|
||||
}
|
||||
|
||||
public function setCapacity(int $capacity): static
|
||||
{
|
||||
$this->capacity = $capacity;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Collection<int, BuildingCasePosition>
|
||||
*/
|
||||
public function getIdCasePosition(): Collection
|
||||
{
|
||||
return $this->id_case_position;
|
||||
}
|
||||
|
||||
public function addIdCasePosition(BuildingCasePosition $idCasePosition): static
|
||||
{
|
||||
if (!$this->id_case_position->contains($idCasePosition)) {
|
||||
$this->id_case_position->add($idCasePosition);
|
||||
$idCasePosition->setBuildingCase($this);
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function removeIdCasePosition(BuildingCasePosition $idCasePosition): static
|
||||
{
|
||||
if ($this->id_case_position->removeElement($idCasePosition)) {
|
||||
// set the owning side to null (unless already changed)
|
||||
if ($idCasePosition->getBuildingCase() === $this) {
|
||||
$idCasePosition->setBuildingCase(null);
|
||||
}
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getIdBuilding(): ?Building
|
||||
{
|
||||
return $this->id_building;
|
||||
}
|
||||
|
||||
public function setIdBuilding(?Building $id_building): static
|
||||
{
|
||||
$this->id_building = $id_building;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getStatut(): ?Statut
|
||||
{
|
||||
return $this->statut;
|
||||
}
|
||||
|
||||
public function setStatut(?Statut $statut): static
|
||||
{
|
||||
$this->statut = $statut;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Collection<int, Bovine>
|
||||
*/
|
||||
public function getBovines(): Collection
|
||||
{
|
||||
return $this->bovines;
|
||||
}
|
||||
|
||||
public function addBovine(Bovine $bovine): static
|
||||
{
|
||||
if (!$this->bovines->contains($bovine)) {
|
||||
$this->bovines->add($bovine);
|
||||
$bovine->setBuildingCase($this);
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function removeBovine(Bovine $bovine): static
|
||||
{
|
||||
if ($this->bovines->removeElement($bovine)) {
|
||||
if ($bovine->getBuildingCase() === $this) {
|
||||
$bovine->setBuildingCase(null);
|
||||
}
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
145
src/Entity/BuildingCasePosition.php
Normal file
145
src/Entity/BuildingCasePosition.php
Normal file
@@ -0,0 +1,145 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Entity;
|
||||
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use Symfony\Component\Serializer\Attribute\Groups;
|
||||
use Symfony\Component\Serializer\Attribute\SerializedName;
|
||||
|
||||
#[ORM\Entity]
|
||||
class BuildingCasePosition
|
||||
{
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column]
|
||||
#[Groups(['building:read'])]
|
||||
private ?int $id = null;
|
||||
|
||||
#[ORM\Column]
|
||||
#[Groups(['building:read'])]
|
||||
private ?int $x = null;
|
||||
|
||||
#[ORM\Column]
|
||||
#[Groups(['building:read'])]
|
||||
private ?int $y = null;
|
||||
|
||||
#[ORM\Column]
|
||||
#[Groups(['building:read'])]
|
||||
private ?int $w = null;
|
||||
|
||||
#[ORM\Column]
|
||||
#[Groups(['building:read'])]
|
||||
private ?int $h = null;
|
||||
|
||||
#[ORM\Column(length: 255)]
|
||||
#[Groups(['building:read'])]
|
||||
#[SerializedName('renderOrder')]
|
||||
private ?string $render_order = null;
|
||||
|
||||
#[ORM\ManyToOne(inversedBy: 'id_case_position')]
|
||||
#[ORM\JoinColumn(nullable: false)]
|
||||
private ?BuildingLayout $buildingLayout = null;
|
||||
|
||||
#[ORM\ManyToOne(inversedBy: 'id_case_position')]
|
||||
#[ORM\JoinColumn(nullable: false)]
|
||||
#[Groups(['building:read'])]
|
||||
private ?BuildingCase $buildingCase = null;
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function setId(int $id): static
|
||||
{
|
||||
$this->id = $id;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getX(): ?int
|
||||
{
|
||||
return $this->x;
|
||||
}
|
||||
|
||||
public function setX(int $x): static
|
||||
{
|
||||
$this->x = $x;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getY(): ?int
|
||||
{
|
||||
return $this->y;
|
||||
}
|
||||
|
||||
public function setY(int $y): static
|
||||
{
|
||||
$this->y = $y;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getW(): ?int
|
||||
{
|
||||
return $this->w;
|
||||
}
|
||||
|
||||
public function setW(int $w): static
|
||||
{
|
||||
$this->w = $w;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getH(): ?int
|
||||
{
|
||||
return $this->h;
|
||||
}
|
||||
|
||||
public function setH(int $h): static
|
||||
{
|
||||
$this->h = $h;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getRenderOrder(): ?string
|
||||
{
|
||||
return $this->render_order;
|
||||
}
|
||||
|
||||
public function setRenderOrder(string $render_order): static
|
||||
{
|
||||
$this->render_order = $render_order;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getBuildingLayout(): ?BuildingLayout
|
||||
{
|
||||
return $this->buildingLayout;
|
||||
}
|
||||
|
||||
public function setBuildingLayout(?BuildingLayout $buildingLayout): static
|
||||
{
|
||||
$this->buildingLayout = $buildingLayout;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getBuildingCase(): ?BuildingCase
|
||||
{
|
||||
return $this->buildingCase;
|
||||
}
|
||||
|
||||
public function setBuildingCase(?BuildingCase $buildingCase): static
|
||||
{
|
||||
$this->buildingCase = $buildingCase;
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
140
src/Entity/BuildingLayout.php
Normal file
140
src/Entity/BuildingLayout.php
Normal file
@@ -0,0 +1,140 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Entity;
|
||||
|
||||
use Doctrine\Common\Collections\ArrayCollection;
|
||||
use Doctrine\Common\Collections\Collection;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use Symfony\Component\Serializer\Attribute\Groups;
|
||||
use Symfony\Component\Serializer\Attribute\SerializedName;
|
||||
|
||||
#[ORM\Entity]
|
||||
class BuildingLayout
|
||||
{
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column]
|
||||
#[Groups(['building:read'])]
|
||||
private ?int $id = null;
|
||||
|
||||
#[ORM\Column(length: 255)]
|
||||
#[Groups(['building:read'])]
|
||||
private ?string $name = null;
|
||||
|
||||
#[ORM\Column]
|
||||
#[Groups(['building:read'])]
|
||||
private ?int $columns = null;
|
||||
|
||||
#[ORM\Column]
|
||||
#[Groups(['building:read'])]
|
||||
private ?int $rows = null;
|
||||
|
||||
#[ORM\ManyToOne(inversedBy: 'buildingLayout')]
|
||||
#[ORM\JoinColumn(nullable: false)]
|
||||
private ?Building $id_building = null;
|
||||
|
||||
/**
|
||||
* @var Collection<int, BuildingCasePosition>
|
||||
*/
|
||||
#[ORM\OneToMany(targetEntity: BuildingCasePosition::class, mappedBy: 'buildingLayout')]
|
||||
#[Groups(['building:read'])]
|
||||
#[SerializedName('casePositions')]
|
||||
private Collection $id_case_position;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->id_case_position = new ArrayCollection();
|
||||
}
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function setId(int $id): static
|
||||
{
|
||||
$this->id = $id;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getName(): ?string
|
||||
{
|
||||
return $this->name;
|
||||
}
|
||||
|
||||
public function setName(string $name): static
|
||||
{
|
||||
$this->name = $name;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getColumns(): ?int
|
||||
{
|
||||
return $this->columns;
|
||||
}
|
||||
|
||||
public function setColumns(int $columns): static
|
||||
{
|
||||
$this->columns = $columns;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getRows(): ?int
|
||||
{
|
||||
return $this->rows;
|
||||
}
|
||||
|
||||
public function setRows(int $rows): static
|
||||
{
|
||||
$this->rows = $rows;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getIdBuilding(): ?Building
|
||||
{
|
||||
return $this->id_building;
|
||||
}
|
||||
|
||||
public function setIdBuilding(?Building $id_building): static
|
||||
{
|
||||
$this->id_building = $id_building;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Collection<int, BuildingCasePosition>
|
||||
*/
|
||||
public function getIdCasePosition(): Collection
|
||||
{
|
||||
return $this->id_case_position;
|
||||
}
|
||||
|
||||
public function addIdCasePosition(BuildingCasePosition $idCasePosition): static
|
||||
{
|
||||
if (!$this->id_case_position->contains($idCasePosition)) {
|
||||
$this->id_case_position->add($idCasePosition);
|
||||
$idCasePosition->setBuildingLayout($this);
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function removeIdCasePosition(BuildingCasePosition $idCasePosition): static
|
||||
{
|
||||
if ($this->id_case_position->removeElement($idCasePosition)) {
|
||||
// set the owning side to null (unless already changed)
|
||||
if ($idCasePosition->getBuildingLayout() === $this) {
|
||||
$idCasePosition->setBuildingLayout(null);
|
||||
}
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
@@ -4,8 +4,6 @@ declare(strict_types=1);
|
||||
|
||||
namespace App\Entity;
|
||||
|
||||
use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
|
||||
use ApiPlatform\Metadata\ApiFilter;
|
||||
use ApiPlatform\Metadata\ApiProperty;
|
||||
use ApiPlatform\Metadata\ApiResource;
|
||||
use ApiPlatform\Metadata\Get;
|
||||
@@ -19,9 +17,6 @@ use Symfony\Component\Serializer\Attribute\Groups;
|
||||
|
||||
#[ORM\Entity]
|
||||
#[ORM\Table(name: 'customer')]
|
||||
#[ApiFilter(SearchFilter::class, properties: [
|
||||
'name' => 'ipartial',
|
||||
])]
|
||||
#[ApiResource(
|
||||
operations: [
|
||||
new Get(
|
||||
|
||||
@@ -5,8 +5,6 @@ declare(strict_types=1);
|
||||
namespace App\Entity;
|
||||
|
||||
use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter;
|
||||
use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
|
||||
use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
|
||||
use ApiPlatform\Metadata\ApiFilter;
|
||||
use ApiPlatform\Metadata\ApiProperty;
|
||||
use ApiPlatform\Metadata\ApiResource;
|
||||
@@ -31,15 +29,6 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
|
||||
#[ORM\HasLifecycleCallbacks]
|
||||
#[ORM\Table(name: 'reception')]
|
||||
#[ApiFilter(BooleanFilter::class, properties: ['isValid'])]
|
||||
#[ApiFilter(SearchFilter::class, properties: [
|
||||
'identificationNumber' => 'ipartial',
|
||||
'supplier.name' => 'ipartial',
|
||||
'carrier.name' => 'ipartial',
|
||||
'licensePlate' => 'ipartial',
|
||||
'receptionType.label' => 'ipartial',
|
||||
'address.fullAddress' => 'ipartial',
|
||||
])]
|
||||
#[ApiFilter(DateFilter::class, properties: ['receptionDate'])]
|
||||
#[ApiResource(
|
||||
operations: [
|
||||
new Get(
|
||||
|
||||
@@ -5,8 +5,6 @@ declare(strict_types=1);
|
||||
namespace App\Entity;
|
||||
|
||||
use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter;
|
||||
use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
|
||||
use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
|
||||
use ApiPlatform\Metadata\ApiFilter;
|
||||
use ApiPlatform\Metadata\ApiProperty;
|
||||
use ApiPlatform\Metadata\ApiResource;
|
||||
@@ -31,15 +29,6 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
|
||||
#[ORM\HasLifecycleCallbacks]
|
||||
#[ORM\Table(name: 'shipment')]
|
||||
#[ApiFilter(BooleanFilter::class, properties: ['isValid'])]
|
||||
#[ApiFilter(SearchFilter::class, properties: [
|
||||
'identificationNumber' => 'ipartial',
|
||||
'customer.name' => 'ipartial',
|
||||
'carrier.name' => 'ipartial',
|
||||
'licencePlate' => 'ipartial',
|
||||
'bovinShipments' => 'ipartial',
|
||||
'address.fullAddress' => 'ipartial',
|
||||
])]
|
||||
#[ApiFilter(DateFilter::class, properties: ['receptionDate'])]
|
||||
#[ApiResource(
|
||||
operations: [
|
||||
new Get(
|
||||
@@ -134,17 +123,15 @@ class Shipment
|
||||
#[ApiProperty(readableLink: true)]
|
||||
private ?Customer $customer = null;
|
||||
|
||||
/**
|
||||
* @var Collection<int, BovinShipment>
|
||||
*/
|
||||
#[ORM\OneToMany(
|
||||
targetEntity: BovinShipment::class,
|
||||
mappedBy: 'shipment',
|
||||
cascade: ['persist', 'remove'],
|
||||
orphanRemoval: true
|
||||
)]
|
||||
#[ORM\ManyToOne(inversedBy: 'shipments')]
|
||||
#[ORM\JoinColumn(nullable: true)]
|
||||
#[Groups(['shipment:read', 'shipment:write'])]
|
||||
private Collection $bovinShipments;
|
||||
#[ApiProperty(readableLink: true)]
|
||||
private ?ShipmentType $shipmentType = null;
|
||||
|
||||
#[ORM\Column]
|
||||
#[Groups(['shipment:read', 'shipment:write'])]
|
||||
private int $nbBovinSend = 0;
|
||||
|
||||
/**
|
||||
* @var Collection<int, Weight>
|
||||
@@ -167,8 +154,7 @@ class Shipment
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->bovinShipments = new ArrayCollection();
|
||||
$this->weights = new ArrayCollection();
|
||||
$this->weights = new ArrayCollection();
|
||||
}
|
||||
|
||||
public function getId(): ?int
|
||||
@@ -206,6 +192,26 @@ class Shipment
|
||||
$this->currentStep = $currentStep;
|
||||
}
|
||||
|
||||
public function getShipmentType(): ?ShipmentType
|
||||
{
|
||||
return $this->shipmentType;
|
||||
}
|
||||
|
||||
public function setShipmentType(?ShipmentType $shipmentType): void
|
||||
{
|
||||
$this->shipmentType = $shipmentType;
|
||||
}
|
||||
|
||||
public function getNbBovinSend(): int
|
||||
{
|
||||
return $this->nbBovinSend;
|
||||
}
|
||||
|
||||
public function setNbBovinSend(int $nbBovinSend): void
|
||||
{
|
||||
$this->nbBovinSend = $nbBovinSend;
|
||||
}
|
||||
|
||||
public function getIsValid(): ?bool
|
||||
{
|
||||
return $this->isValid;
|
||||
@@ -272,37 +278,6 @@ class Shipment
|
||||
$this->customer = $customer;
|
||||
}
|
||||
|
||||
public function getBovinShipments(): Collection
|
||||
{
|
||||
return $this->bovinShipments;
|
||||
}
|
||||
|
||||
public function setBovinShipments(Collection $bovinShipments): void
|
||||
{
|
||||
$this->bovinShipments = $bovinShipments;
|
||||
}
|
||||
|
||||
public function addBovinShipment(BovinShipment $bovinShipment): self
|
||||
{
|
||||
if (!$this->bovinShipments->contains($bovinShipment)) {
|
||||
$this->bovinShipments->add($bovinShipment);
|
||||
$bovinShipment->setShipment($this);
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function removeBovinShipment(BovinShipment $bovinShipment): self
|
||||
{
|
||||
if ($this->bovinShipments->removeElement($bovinShipment)) {
|
||||
if ($bovinShipment->getShipment() === $this) {
|
||||
$bovinShipment->setShipment(null);
|
||||
}
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Collection<int, Weight>
|
||||
*/
|
||||
|
||||
@@ -7,6 +7,8 @@ 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;
|
||||
|
||||
@@ -40,6 +42,14 @@ class ShipmentType
|
||||
#[Groups(['shipment-type:read', 'shipment:read'])]
|
||||
private ?string $code = null;
|
||||
|
||||
#[ORM\OneToMany(mappedBy: 'shipmentType', targetEntity: Shipment::class)]
|
||||
private Collection $shipments;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->shipments = new ArrayCollection();
|
||||
}
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
|
||||
138
src/Entity/Statut.php
Normal file
138
src/Entity/Statut.php
Normal file
@@ -0,0 +1,138 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Entity;
|
||||
|
||||
use ApiPlatform\Metadata\ApiResource;
|
||||
use ApiPlatform\Metadata\Get;
|
||||
use ApiPlatform\Metadata\GetCollection;
|
||||
use Doctrine\Common\Collections\ArrayCollection;
|
||||
use Doctrine\Common\Collections\Collection;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use Symfony\Component\Serializer\Attribute\Groups;
|
||||
use Symfony\Component\Serializer\Attribute\SerializedName;
|
||||
|
||||
#[ORM\Entity]
|
||||
#[ApiResource(
|
||||
operations: [
|
||||
new Get(
|
||||
requirements: ['id' => '\d+'],
|
||||
normalizationContext: ['groups' => ['building:read']],
|
||||
),
|
||||
new GetCollection(
|
||||
normalizationContext: ['groups' => ['building:read']],
|
||||
),
|
||||
],
|
||||
security: "is_granted('ROLE_USER')",
|
||||
)]
|
||||
class Statut
|
||||
{
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column]
|
||||
#[Groups(['building:read'])]
|
||||
private ?int $id = null;
|
||||
|
||||
#[ORM\Column(length: 255)]
|
||||
#[Groups(['building:read'])]
|
||||
private ?string $label = null;
|
||||
|
||||
#[ORM\Column(length: 255)]
|
||||
#[Groups(['building:read'])]
|
||||
private ?string $code = null;
|
||||
|
||||
#[ORM\Column(length: 255)]
|
||||
#[Groups(['building:read'])]
|
||||
#[SerializedName('couleur')]
|
||||
private ?string $color = null;
|
||||
|
||||
/**
|
||||
* @var Collection<int, BuildingCase>
|
||||
*/
|
||||
#[ORM\OneToMany(targetEntity: BuildingCase::class, mappedBy: 'statut')]
|
||||
private Collection $id_case;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->id_case = new ArrayCollection();
|
||||
}
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function setId(int $id): static
|
||||
{
|
||||
$this->id = $id;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getLabel(): ?string
|
||||
{
|
||||
return $this->label;
|
||||
}
|
||||
|
||||
public function setLabel(string $label): static
|
||||
{
|
||||
$this->label = $label;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getCode(): ?string
|
||||
{
|
||||
return $this->code;
|
||||
}
|
||||
|
||||
public function setCode(string $code): static
|
||||
{
|
||||
$this->code = $code;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getColor(): ?string
|
||||
{
|
||||
return $this->color;
|
||||
}
|
||||
|
||||
public function setColor(string $color): static
|
||||
{
|
||||
$this->color = $color;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Collection<int, BuildingCase>
|
||||
*/
|
||||
public function getIdCase(): Collection
|
||||
{
|
||||
return $this->id_case;
|
||||
}
|
||||
|
||||
public function addIdCase(BuildingCase $idCase): static
|
||||
{
|
||||
if (!$this->id_case->contains($idCase)) {
|
||||
$this->id_case->add($idCase);
|
||||
$idCase->setStatut($this);
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function removeIdCase(BuildingCase $idCase): static
|
||||
{
|
||||
if ($this->id_case->removeElement($idCase)) {
|
||||
// set the owning side to null (unless already changed)
|
||||
if ($idCase->getStatut() === $this) {
|
||||
$idCase->setStatut(null);
|
||||
}
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
@@ -4,8 +4,6 @@ declare(strict_types=1);
|
||||
|
||||
namespace App\Entity;
|
||||
|
||||
use ApiPlatform\Doctrine\Orm\Filter\SearchFilter;
|
||||
use ApiPlatform\Metadata\ApiFilter;
|
||||
use ApiPlatform\Metadata\ApiProperty;
|
||||
use ApiPlatform\Metadata\ApiResource;
|
||||
use ApiPlatform\Metadata\Get;
|
||||
@@ -19,9 +17,6 @@ use Symfony\Component\Serializer\Attribute\Groups;
|
||||
|
||||
#[ORM\Entity]
|
||||
#[ORM\Table(name: 'supplier')]
|
||||
#[ApiFilter(SearchFilter::class, properties: [
|
||||
'name' => 'ipartial',
|
||||
])]
|
||||
#[ApiResource(
|
||||
operations: [
|
||||
new Get(
|
||||
|
||||
210
src/State/BuildingCaseWeightsReportProvider.php
Normal file
210
src/State/BuildingCaseWeightsReportProvider.php
Normal file
@@ -0,0 +1,210 @@
|
||||
<?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;
|
||||
}
|
||||
}
|
||||
378
templates/case_weights_report.html.twig
Normal file
378
templates/case_weights_report.html.twig
Normal file
@@ -0,0 +1,378 @@
|
||||
<!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>
|
||||
@@ -250,13 +250,11 @@
|
||||
<td>
|
||||
<strong>Bovin</strong><br><br>
|
||||
<div class="bigtable-notes">
|
||||
{% if shipment.bovinShipments is not empty %}
|
||||
{% for entry in shipment.bovinShipments %}
|
||||
<p>
|
||||
{{ entry.shipmentType ? entry.shipmentType.label : '-' }} :
|
||||
{{ entry.nbBovinSend ?? 0 }}
|
||||
</p>
|
||||
{% endfor %}
|
||||
{% if shipment.shipmentType %}
|
||||
<p>
|
||||
{{ shipment.shipmentType.label ?? '-' }} :
|
||||
{{ shipment.nbBovinSend ?? 0 }}
|
||||
</p>
|
||||
{% else %}
|
||||
<p>-</p>
|
||||
{% endif %}
|
||||
|
||||
Reference in New Issue
Block a user