Compare commits
7 Commits
v0.0.57
...
4075467465
| Author | SHA1 | Date | |
|---|---|---|---|
| 4075467465 | |||
| 4acb54e748 | |||
| 527fb77668 | |||
| 15903a0213 | |||
| 3e05c68c54 | |||
| 30b065b69f | |||
| 7d80795ae3 |
58
.idea/workspace.xml
generated
58
.idea/workspace.xml
generated
@@ -5,10 +5,9 @@
|
||||
</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$/config/reference.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/reference.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/frontend/pages/infrastructure/case.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/pages/infrastructure/case.vue" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/Entity/BuildingCase.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Entity/BuildingCase.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
@@ -40,7 +39,7 @@
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||
<map>
|
||||
<entry key="$PROJECT_DIR$" value="fit/332-refonte-reception-terminee" />
|
||||
<entry key="$PROJECT_DIR$" value="feat/276-lister-expeditions-terminees" />
|
||||
</map>
|
||||
</option>
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
@@ -224,39 +223,38 @@
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<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"
|
||||
<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"
|
||||
},
|
||||
"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,7 +8,6 @@ Project overview
|
||||
Backend conventions
|
||||
- Use English for code identifiers/messages; keep “pont-bascule” as domain term.
|
||||
- API Platform operations are defined on Doctrine entities.
|
||||
- No custom repository classes are used (`src/Repository` removed); use default Doctrine repositories via `EntityManagerInterface`.
|
||||
- Reception entity is in `src/Entity/Reception.php`, with custom weigh endpoint `/receptions/weigh`.
|
||||
- Reception fields: `date_reception`, `license_plate`, `current_step` (default 0), `is_valid` (default false).
|
||||
- Reception also has `identification_number` (auto `N-BR-####`), `merchandise_type`, `merchandise_detail`, `buildings` (M2M), and `pellet_buildings` (via `reception_pellet_building`).
|
||||
@@ -18,13 +17,6 @@ Backend conventions
|
||||
- Custom exception: `App\Exception\PontBasculeException` with French messages, mapped to 500 in provider.
|
||||
- Parsing of pont-bascule payload is in `src/Service/PontBasculePayloadDecoder.php`.
|
||||
- `config/reference.php` is auto-generated; keep it.
|
||||
- Bovine storage:
|
||||
- `src/Entity/Bovine.php` with fields `nationalNumber` (unique), `receivedWeight`, `arrivalDate`, and `buildingCase` (ManyToOne).
|
||||
- `src/Entity/BuildingCase.php` has `bovines` (OneToMany).
|
||||
- Case PDF report:
|
||||
- Endpoint: `GET /building_cases/{id}/weights-report` (provider: `App\State\BuildingCaseWeightsReportProvider`).
|
||||
- Template: `templates/case_weights_report.html.twig`.
|
||||
- Projection logic is done in backend from `arrivalDate`; daily gain is currently fixed at `1.3 kg/day` for all races.
|
||||
|
||||
Frontend conventions
|
||||
- Nuxt SSR disabled; Tailwind used.
|
||||
@@ -44,7 +36,6 @@ Frontend conventions
|
||||
- Service layer lives in `frontend/services/` with typed DTOs in `frontend/services/dto/`.
|
||||
- Reception service uses `receptions`, `receptions/{id}`, `receptions/weigh` and supports success/error toast keys.
|
||||
- Reception receipt endpoint is `receptions/{id}/receipt` (PDF) via `frontend/composables/usePdfPrinter.ts`.
|
||||
- Infrastructure case page prints the case weight report PDF from `frontend/pages/infrastructure/case.vue` using `usePdfPrinter('/building_cases/{id}/weights-report')`.
|
||||
|
||||
Environment & routing
|
||||
- Frontend dev server: `npm run dev` in `frontend/`.
|
||||
@@ -56,11 +47,6 @@ Environment & routing
|
||||
Notes
|
||||
- Do not add a GET that creates resources; use POST + PATCH.
|
||||
- Keep endpoints in plural (API Platform convention).
|
||||
- Seed and fixtures conventions:
|
||||
- `app:seed` now seeds infrastructure (`statut`, `building_layout`, `building_case`, `building_case_position`) and bovines.
|
||||
- `app:seed` uses intermediate flushes (after buildings and after infrastructure) so find queries can resolve just-created records.
|
||||
- Bovine seed rows use a legacy case token mapping to building-case code (`B{building}-C{case}`) before fallback to direct id lookup.
|
||||
- Fixtures include `BuildingInfrastructureFixtures` + `BovineFixtures` (via `AppFixtures` dependencies).
|
||||
- New reference data added:
|
||||
- Reception types (`reception_type`, fields: `label`, `code`), selectable on reception form.
|
||||
- Merchandise types (`merchandise_type`, fields: `label`, `code`) and pellet types (`pellet_type`, fields: `label`, `code`).
|
||||
|
||||
@@ -50,8 +50,6 @@ Ajouter dans le fichier .env du frontend
|
||||
* Creation page admin listing bovins
|
||||
* Creation page admin ajout/modification bovins
|
||||
* [#331] Mettre à jour l'entité Shipment et bovin_shipment
|
||||
* [#278] Plan du site
|
||||
* [#334] Correctifs
|
||||
### Changed
|
||||
|
||||
### Fixed
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
parameters:
|
||||
app.version: '0.0.57'
|
||||
app.version: '0.0.52'
|
||||
|
||||
@@ -8,12 +8,11 @@
|
||||
</div>
|
||||
|
||||
<button
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||
type="submit"
|
||||
:disabled="isLoading"
|
||||
>
|
||||
<Icon :name="props.address ? 'mdi:check' : 'mdi:plus'" size="28" />
|
||||
{{ props.address? "Valider" : "Ajouter" }}
|
||||
{{ props.address? "Sauvegarder" : "Ajouter" }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@@ -23,7 +22,7 @@
|
||||
<UiTextInput id="address-street2" v-model="form.street2" label="Complément" />
|
||||
<UiTextInput id="address-postalCode" v-model="form.postalCode" label="Code postal" />
|
||||
<UiTextInput id="address-city" v-model="form.city" label="Ville" />
|
||||
<UiTextInput id="address-country" v-model="form.countryCode" label="Pays (code)" />
|
||||
<UiTextInput id="address-country" v-model="form.countryCode" label="Pays" />
|
||||
</div>
|
||||
</form>
|
||||
</template>
|
||||
|
||||
@@ -27,14 +27,11 @@
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex justify-center">
|
||||
<UiButton
|
||||
type="submit"
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
|
||||
@click="goNext"
|
||||
>Valider
|
||||
</UiButton>
|
||||
</div>
|
||||
<button
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||
@click="goNext"
|
||||
>Valider
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
|
||||
@@ -64,14 +64,11 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex justify-center">
|
||||
<UiButton
|
||||
type="submit"
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
|
||||
@click="goNext"
|
||||
>Valider
|
||||
</UiButton>
|
||||
</div>
|
||||
<button
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||
@click="goNext"
|
||||
>Valider
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
<!-- Plaque d'immatriculation (hors LIOT) -->
|
||||
<div v-if="!isLiotCarrier" class="col-start-2 row-start-4">
|
||||
<UiLicensePlateInput
|
||||
v-model="form.licensePlate"
|
||||
v-model="form.licencePlate"
|
||||
v-model:allowAny="allowAnyLicensePlate"
|
||||
/>
|
||||
</div>
|
||||
@@ -193,7 +193,7 @@ const form = reactive<ShipmentFormData>({
|
||||
carrierId: '',
|
||||
driverId: '',
|
||||
vehicleId: '',
|
||||
licensePlate: '',
|
||||
licencePlate: '',
|
||||
})
|
||||
// Adresses liées au client sélectionné
|
||||
const customerAddresses = computed<AddressData[]>(() => {
|
||||
@@ -315,7 +315,7 @@ watch(
|
||||
() => shipmentStore.current,
|
||||
(shipment) => {
|
||||
isHydrating.value = true
|
||||
form.licensePlate = shipment?.licensePlate ?? ''
|
||||
form.licencePlate = shipment?.licencePlate ?? ''
|
||||
form.shipmentDate = shipment?.shipmentDate ?? new Date().toISOString().slice(0, 10)
|
||||
form.userId = shipment?.user?.id ? String(shipment.user.id) :
|
||||
form.userId
|
||||
@@ -441,19 +441,19 @@ watch(
|
||||
(vehicle) => String(vehicle.id) === form.vehicleId
|
||||
)
|
||||
if (selected) {
|
||||
form.licensePlate = selected.plate
|
||||
form.licencePlate = selected.plate
|
||||
allowAnyLicensePlate.value = false
|
||||
}
|
||||
}
|
||||
)
|
||||
watch(
|
||||
() => [form.licensePlate, form.carrierId, vehicles.value],
|
||||
() => [form.licencePlate, form.carrierId, vehicles.value],
|
||||
() => {
|
||||
if (!isLiotCarrier.value || form.vehicleId) {
|
||||
return
|
||||
}
|
||||
const match = filteredVehicles.value.find(
|
||||
(vehicle) => vehicle.plate === form.licensePlate
|
||||
(vehicle) => vehicle.plate === form.licencePlate
|
||||
)
|
||||
if (match) {
|
||||
form.vehicleId = String(match.id)
|
||||
@@ -462,7 +462,7 @@ watch(
|
||||
)
|
||||
|
||||
const buildPayload = () => {
|
||||
const normalizedLicensePlate = form.licensePlate.trim()
|
||||
const normalizedLicensePlate = form.licencePlate.trim()
|
||||
const normalizedShipmentDate = form.shipmentDate.trim()
|
||||
const normalizedCustomerId = form.customerId.trim()
|
||||
const normalizedTruckId = form.truckId.trim()
|
||||
@@ -498,7 +498,7 @@ const buildPayload = () => {
|
||||
Math.trunc(rawQuantity)) : 0
|
||||
|
||||
return {
|
||||
licensePlate: normalizedLicensePlate,
|
||||
licencePlate: normalizedLicensePlate,
|
||||
shipmentDate: normalizedShipmentDate,
|
||||
customer: customerIri,
|
||||
truck: truckIri,
|
||||
|
||||
@@ -75,7 +75,7 @@ const printReceipt = async () => {
|
||||
|
||||
await saveWeight()
|
||||
const shipment = shipmentStore.current
|
||||
const filename = `${shipment.identificationNumber ?? shipment.id}_${shipment.customer?.label ?? 'client'}_${shipment.licensePlate ?? 'immat'}.pdf`
|
||||
const filename = `${shipment.identificationNumber ?? shipment.id}_${shipment.customer?.label ?? 'client'}_${shipment.licencePlate ?? 'immat'}.pdf`
|
||||
await printPdf(`/shipments/${shipment.id}/receipt`, filename)
|
||||
|
||||
// Laisse le temps a la boite de dialogue d'impression de s'ouvrir.
|
||||
|
||||
@@ -111,7 +111,7 @@ export const useWeighingShipment = ({
|
||||
|
||||
const displayWeight = computed(() => weightData.value?.weight ?? currentWeightEntry.value?.weight ?? null)
|
||||
const displayDsd = computed(() => weightData.value?.dsd ?? currentWeightEntry.value?.dsd ?? '-')
|
||||
const title = computed(() => (modeShipment === 'gross' ? 'Pesée à vide' : 'Pesée à plein'))
|
||||
const title = computed(() => (modeShipment === 'gross' ? 'Pesée à plein' : 'Pesée à vide'))
|
||||
const showLoadingBox = computed(
|
||||
() => isFetching.value || (displayWeight.value === null && currentWeightEntry.value === null)
|
||||
)
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
<UiButton
|
||||
type="submit"
|
||||
:disabled="isLoading || isHydrating"
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] hover:opacity-80"
|
||||
>
|
||||
<Icon :name="isEdit ? 'mdi:check' : 'mdi:plus'" size="28" />
|
||||
{{ isEdit ? 'Valider' : 'Ajouter' }}
|
||||
<Icon name="mdi:check" size="28" />
|
||||
{{ isEdit ? 'Modifier' : 'Ajouter' }}
|
||||
</UiButton>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -8,10 +8,8 @@
|
||||
|
||||
<UiButton
|
||||
type="submit"
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2 justify-self-end"
|
||||
>
|
||||
<Icon name="mdi:check" size="28" />
|
||||
Valider
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] justify-self-end"
|
||||
>Enregistrer
|
||||
</UiButton>
|
||||
</div>
|
||||
|
||||
@@ -54,6 +52,10 @@ const form = reactive<CarrierFormData>({
|
||||
name:''
|
||||
})
|
||||
|
||||
definePageMeta({
|
||||
layout: 'default'
|
||||
})
|
||||
|
||||
const hydrateFromUser = (carrier: CarrierData | null) => {
|
||||
if (!carrier) {
|
||||
return
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<h1 class="text-3xl font-bold uppercase text-primary-500">listes des transporteurs</h1>
|
||||
<NuxtLink
|
||||
to="/admin/carrier"
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
||||
class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
|
||||
>
|
||||
<Icon name="mdi:plus" size="28" />
|
||||
Ajouter
|
||||
@@ -43,6 +43,10 @@ const goToCarrier = (id: number) => {
|
||||
router.push(`/admin/carrier/${id}`)
|
||||
}
|
||||
|
||||
definePageMeta({
|
||||
layout: 'default'
|
||||
})
|
||||
|
||||
onMounted(async () => {
|
||||
carrierList.value = await getCarrierList(false)
|
||||
})
|
||||
|
||||
@@ -6,12 +6,11 @@
|
||||
</h1>
|
||||
|
||||
<UiButton
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||
type="submit"
|
||||
:disabled="isLoading || !auth.isAdmin"
|
||||
>
|
||||
<Icon :name="customerId ? 'mdi:check' : 'mdi:plus'" size="28" />
|
||||
{{ customerId ? "Valider" : "Ajouter" }}
|
||||
{{ customerId ? "Sauvegarder" : "Ajouter" }}
|
||||
</UiButton>
|
||||
</div>
|
||||
|
||||
@@ -26,11 +25,10 @@
|
||||
<h2 class="text-3xl font-bold uppercase">Adresses client</h2>
|
||||
<UiButton
|
||||
type="button"
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||
:disabled="customerId === null || !auth.isAdmin"
|
||||
@click="goToAddAddress"
|
||||
>
|
||||
<Icon name="mdi:plus" size="28" />
|
||||
Ajouter
|
||||
</UiButton>
|
||||
</div>
|
||||
@@ -82,6 +80,8 @@ import {createCustomer, getCustomer, updateCustomer} from "~/services/customer"
|
||||
import type {CustomerData, CustomerFormData, CustomerPayload} from "~/services/dto/customer-data"
|
||||
import {useAuthStore} from "~/stores/auth"
|
||||
|
||||
definePageMeta({layout: "default"})
|
||||
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
const auth = useAuthStore()
|
||||
|
||||
@@ -8,6 +8,8 @@ import { createAddress, getAddress, updateAddress } from "~/services/address"
|
||||
import { getCustomer, updateCustomer } from "~/services/customer"
|
||||
import type { CustomerData } from "~/services/dto/customer-data"
|
||||
|
||||
definePageMeta({ layout: "default" })
|
||||
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
const customerId = computed(() => Number(route.query.customerId))
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<h1 class="text-3xl font-bold uppercase text-primary-500">Liste des Clients</h1>
|
||||
<NuxtLink
|
||||
to="/admin/customer"
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
||||
class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
|
||||
:class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
|
||||
@click="handleAddClick"
|
||||
>
|
||||
@@ -94,6 +94,8 @@ import { getCustomerList } from "~/services/customer"
|
||||
import type { CustomerData } from "~/services/dto/customer-data"
|
||||
import { useAuthStore } from "~/stores/auth"
|
||||
|
||||
definePageMeta({ layout: "default" })
|
||||
|
||||
const customerList = ref<CustomerData[]>([])
|
||||
const router = useRouter()
|
||||
const auth = useAuthStore()
|
||||
|
||||
7
frontend/pages/admin/dashboard.vue
Normal file
7
frontend/pages/admin/dashboard.vue
Normal file
@@ -0,0 +1,7 @@
|
||||
<template>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
definePageMeta({
|
||||
layout: 'default'
|
||||
})
|
||||
</script>
|
||||
@@ -6,12 +6,11 @@
|
||||
</h1>
|
||||
|
||||
<UiButton
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||
type="submit"
|
||||
:disabled="isLoading || !auth.isAdmin"
|
||||
>
|
||||
<Icon :name="supplierId ? 'mdi:check' : 'mdi:plus'" size="28" />
|
||||
{{ supplierId ? "Valider" : "Ajouter" }}
|
||||
{{ supplierId ? "Sauvegarder" : "Ajouter" }}
|
||||
</UiButton>
|
||||
</div>
|
||||
|
||||
@@ -26,11 +25,10 @@
|
||||
<h2 class="text-3xl font-bold uppercase">Adresses fournisseur</h2>
|
||||
<UiButton
|
||||
type="button"
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||
:disabled="supplierId === null || !auth.isAdmin"
|
||||
@click="goToAddAddress"
|
||||
>
|
||||
<Icon name="mdi:plus" size="28" />
|
||||
Ajouter
|
||||
</UiButton>
|
||||
</div>
|
||||
@@ -82,6 +80,8 @@ import {createSupplier, getSupplier, updateSupplier} from "~/services/supplier"
|
||||
import type {SupplierData, SupplierFormData, SupplierPayload} from "~/services/dto/supplier-data"
|
||||
import {useAuthStore} from "~/stores/auth"
|
||||
|
||||
definePageMeta({layout: "default"})
|
||||
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
const auth = useAuthStore()
|
||||
|
||||
@@ -8,6 +8,8 @@ import {createAddress, getAddress, updateAddress} from "~/services/address";
|
||||
import {getSupplier, updateSupplier} from "~/services/supplier";
|
||||
import type {SupplierData} from "~/services/dto/supplier-data";
|
||||
|
||||
definePageMeta({ layout: "default" })
|
||||
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
const supplierId = computed(() => { return Number(route.query.supplierId) })
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<h1 class="text-3xl font-bold uppercase text-primary-500">Liste des fournisseurs</h1>
|
||||
<NuxtLink
|
||||
to="/admin/supplier"
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
||||
class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded"
|
||||
:class="auth.isAdmin ? '' : 'cursor-not-allowed opacity-60'"
|
||||
@click="handleAddClick"
|
||||
>
|
||||
@@ -90,6 +90,8 @@ import { getSupplierList } from "~/services/supplier"
|
||||
import type { SupplierData } from "~/services/dto/supplier-data"
|
||||
import { useAuthStore } from "~/stores/auth"
|
||||
|
||||
definePageMeta({ layout: "default" })
|
||||
|
||||
const supplierList = ref<SupplierData[]>([])
|
||||
const router = useRouter()
|
||||
const auth = useAuthStore()
|
||||
|
||||
@@ -6,11 +6,10 @@
|
||||
{{ userId ? "Modifications de l'utilisateur" : "Ajout d'un utilisateur" }}
|
||||
</h1>
|
||||
<UiButton
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px]"
|
||||
type="submit"
|
||||
>
|
||||
<Icon :name="userId ? 'mdi:check' : 'mdi:plus'" size="28" />
|
||||
{{ userId ? 'Valider' : 'Ajouter' }}
|
||||
{{ userId ? 'Sauvegarder' : 'Ajouter' }}
|
||||
</UiButton>
|
||||
</div>
|
||||
|
||||
@@ -39,6 +38,10 @@
|
||||
</form>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
definePageMeta({
|
||||
layout: 'default'
|
||||
})
|
||||
|
||||
import {computed, reactive, ref, watch} from 'vue'
|
||||
import {ROLE} from '~/utils/constants'
|
||||
import {createUser, updateUser, getUser} from '~/services/auth'
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
<div class="flex items-center justify-between">
|
||||
<h1 class="text-3xl font-bold uppercase text-primary-500">Liste des utilisateurs</h1>
|
||||
<NuxtLink
|
||||
to="/admin/user"
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2"
|
||||
class="inline-flex items-center justify-center gap-2 text-xl uppercase bg-primary-500 text-white h-[50px] px-8 rounded-md"
|
||||
@click="router.push('/admin/user/')"
|
||||
>
|
||||
<Icon name="mdi:plus" size="28" />
|
||||
Ajouter
|
||||
@@ -38,6 +38,10 @@
|
||||
|
||||
|
||||
<script setup lang="ts">
|
||||
definePageMeta({
|
||||
layout: 'default'
|
||||
})
|
||||
|
||||
import type {UserData} from "~/services/dto/user-data";
|
||||
import {getAdminUsers} from "~/services/auth";
|
||||
import {ROLE} from "~/utils/constants";
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
v-for="entry in buildingLayouts"
|
||||
:key="entry.building.id"
|
||||
>
|
||||
<div class="font-semibold tracking-wide text-primary-500">
|
||||
<div class="font-semibold tracking-wide">
|
||||
{{ entry.building.label || `Bâtiment ${entry.building.id}` }}
|
||||
</div>
|
||||
|
||||
@@ -158,10 +158,7 @@ const buildLayoutView = (layout: BuildingLayoutData): {
|
||||
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)
|
||||
)
|
||||
const positionsSorted = [...positions].sort((a, b) => (a.y ?? 1) - (b.y ?? 1) || (a.x ?? 1) - (b.x ?? 1))
|
||||
for (const position of positionsSorted) {
|
||||
const x = position.x ?? 1
|
||||
const y = position.y ?? 1
|
||||
|
||||
@@ -1,27 +1,6 @@
|
||||
<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>
|
||||
|
||||
@@ -118,10 +118,10 @@
|
||||
<UiButton
|
||||
v-if="auth.isAdmin"
|
||||
type="submit"
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-8 rounded hover:opacity-80 gap-2 mb-16"
|
||||
class="text-xl uppercase bg-primary-500 text-white h-[50px] w-[272px] mb-16"
|
||||
|
||||
>
|
||||
<Icon name="mdi:check" size="28" />
|
||||
Valider
|
||||
Enregistrer
|
||||
</UiButton>
|
||||
</div>
|
||||
<div class="flex justify-evenly gap-y-8 gap-x-40 mb-8 border-b border-slate-400">
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</template>
|
||||
</div>
|
||||
<div>{{ shipment.carrier?.name }}</div>
|
||||
<div>{{ shipment.licensePlate }}</div>
|
||||
<div>{{ shipment.licencePlate }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -12,7 +12,7 @@ export interface ShipmentTypeData {
|
||||
export type ShipmentData = {
|
||||
id: number
|
||||
identificationNumber?: string | null
|
||||
licensePlate: string | null
|
||||
licencePlate: string | null
|
||||
shipmentDate: string
|
||||
currentStep: number
|
||||
isValid: boolean
|
||||
@@ -43,11 +43,11 @@ export type ShipmentFormData = {
|
||||
carrierId: string,
|
||||
driverId: string,
|
||||
vehicleId: string,
|
||||
licensePlate: string,
|
||||
licencePlate: string,
|
||||
}
|
||||
|
||||
export type ShipmentPayload = {
|
||||
licensePlate?: string | null
|
||||
licencePlate?: string | null
|
||||
shipmentDate?: string
|
||||
currentStep?: number
|
||||
isValid?: boolean
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
final class Version20260225110000 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Rename shipment.licence_plate to license_plate';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE shipment RENAME COLUMN licence_plate TO license_plate');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE shipment RENAME COLUMN license_plate TO licence_plate');
|
||||
}
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
final class Version20260225123000 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Create bovine table and relation to building_case.';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql('CREATE TABLE bovine (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, building_case_id INT DEFAULT NULL, national_number VARCHAR(50) NOT NULL, received_weight INT DEFAULT NULL, PRIMARY KEY(id))');
|
||||
$this->addSql('CREATE INDEX IDX_EA9E2A42F8D859DF ON bovine (building_case_id)');
|
||||
$this->addSql('CREATE UNIQUE INDEX uniq_bovine_national_number ON bovine (national_number)');
|
||||
$this->addSql('ALTER TABLE bovine ADD CONSTRAINT FK_EA9E2A42F8D859DF FOREIGN KEY (building_case_id) REFERENCES building_case (id) NOT DEFERRABLE');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE bovine DROP CONSTRAINT FK_EA9E2A42F8D859DF');
|
||||
$this->addSql('DROP TABLE bovine');
|
||||
}
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
final class Version20260225131500 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Add arrival_date column to bovine table.';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE bovine ADD arrival_date DATE DEFAULT NULL');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE bovine DROP arrival_date');
|
||||
}
|
||||
}
|
||||
@@ -5,12 +5,8 @@ declare(strict_types=1);
|
||||
namespace App\Command;
|
||||
|
||||
use App\Entity\Address;
|
||||
use App\Entity\Bovine;
|
||||
use App\Entity\BovineType;
|
||||
use App\Entity\Building;
|
||||
use App\Entity\BuildingCase;
|
||||
use App\Entity\BuildingCasePosition;
|
||||
use App\Entity\BuildingLayout;
|
||||
use App\Entity\Carrier;
|
||||
use App\Entity\Customer;
|
||||
use App\Entity\Driver;
|
||||
@@ -18,11 +14,9 @@ use App\Entity\MerchandiseType;
|
||||
use App\Entity\PelletType;
|
||||
use App\Entity\ReceptionType;
|
||||
use App\Entity\ShipmentType;
|
||||
use App\Entity\Statut;
|
||||
use App\Entity\Supplier;
|
||||
use App\Entity\Truck;
|
||||
use App\Entity\Vehicle;
|
||||
use DateTimeImmutable;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Symfony\Component\Console\Attribute\AsCommand;
|
||||
use Symfony\Component\Console\Command\Command;
|
||||
@@ -58,12 +52,6 @@ class SeedCommand extends Command
|
||||
$this->seedMerchandiseTypes();
|
||||
$this->seedPelletTypes();
|
||||
$this->seedBuildings();
|
||||
$this->entityManager->flush();
|
||||
|
||||
$this->seedBuildingInfrastructure();
|
||||
$this->entityManager->flush();
|
||||
|
||||
$this->seedBovines($io);
|
||||
$this->seedReceptionTypes();
|
||||
$this->seedBovineTypes();
|
||||
$this->seedShipmentTypes();
|
||||
@@ -227,137 +215,6 @@ class SeedCommand extends Command
|
||||
}
|
||||
}
|
||||
|
||||
private function seedBuildingInfrastructure(): void
|
||||
{
|
||||
$statusByCode = [];
|
||||
$statusRows = [
|
||||
['label' => 'Libre', 'code' => 'LB', 'color' => '#A3B18A'],
|
||||
['label' => 'Occupé', 'code' => 'OC', 'color' => '#3A506B'],
|
||||
['label' => 'Malade', 'code' => 'ML', 'color' => '#E07A5F'],
|
||||
];
|
||||
foreach ($statusRows as $statusRow) {
|
||||
/** @var Statut $status */
|
||||
$status = $this->upsertByCode(Statut::class, $statusRow['code'], static function (Statut $entity) use ($statusRow) {
|
||||
$entity
|
||||
->setLabel($statusRow['label'])
|
||||
->setCode($statusRow['code'])
|
||||
->setColor($statusRow['color'])
|
||||
;
|
||||
});
|
||||
$statusByCode[$statusRow['code']] = $status;
|
||||
}
|
||||
|
||||
$buildingRepo = $this->entityManager->getRepository(Building::class);
|
||||
$layoutByBuildingCode = [];
|
||||
$layoutRows = [
|
||||
['buildingCode' => 'B1', 'name' => 'plan1', 'columns' => 23, 'rows' => 2],
|
||||
['buildingCode' => 'B2', 'name' => 'plan2', 'columns' => 23, 'rows' => 2],
|
||||
['buildingCode' => 'B3', 'name' => 'plan3', 'columns' => 23, 'rows' => 2],
|
||||
];
|
||||
foreach ($layoutRows as $layoutRow) {
|
||||
$building = $buildingRepo->findOneBy(['code' => $layoutRow['buildingCode']]);
|
||||
if (!$building instanceof Building) {
|
||||
continue;
|
||||
}
|
||||
|
||||
/** @var BuildingLayout $layout */
|
||||
$layout = $this->upsertByName(BuildingLayout::class, $layoutRow['name'], static function (BuildingLayout $entity) use ($layoutRow, $building) {
|
||||
$entity
|
||||
->setName($layoutRow['name'])
|
||||
->setColumns($layoutRow['columns'])
|
||||
->setRows($layoutRow['rows'])
|
||||
->setIdBuilding($building)
|
||||
;
|
||||
});
|
||||
$layoutByBuildingCode[$layoutRow['buildingCode']] = $layout;
|
||||
}
|
||||
|
||||
$caseRows = [
|
||||
['buildingCode' => 'B1', 'from' => 1, 'to' => 12, 'status' => 'LB'],
|
||||
['buildingCode' => 'B1', 'from' => 13, 'to' => 24, 'status' => 'OC'],
|
||||
['buildingCode' => 'B1', 'from' => 25, 'to' => 32, 'status' => 'ML'],
|
||||
['buildingCode' => 'B1', 'from' => 33, 'to' => 44, 'status' => 'LB'],
|
||||
['buildingCode' => 'B2', 'from' => 1, 'to' => 10, 'status' => 'OC'],
|
||||
['buildingCode' => 'B2', 'from' => 11, 'to' => 22, 'status' => 'LB'],
|
||||
['buildingCode' => 'B2', 'from' => 23, 'to' => 30, 'status' => 'ML'],
|
||||
['buildingCode' => 'B2', 'from' => 31, 'to' => 44, 'status' => 'OC'],
|
||||
['buildingCode' => 'B3', 'from' => 1, 'to' => 8, 'status' => 'ML'],
|
||||
['buildingCode' => 'B3', 'from' => 9, 'to' => 20, 'status' => 'LB'],
|
||||
['buildingCode' => 'B3', 'from' => 21, 'to' => 34, 'status' => 'OC'],
|
||||
['buildingCode' => 'B3', 'from' => 35, 'to' => 44, 'status' => 'ML'],
|
||||
];
|
||||
|
||||
$caseByCode = [];
|
||||
foreach ($caseRows as $caseRow) {
|
||||
$building = $buildingRepo->findOneBy(['code' => $caseRow['buildingCode']]);
|
||||
$status = $statusByCode[$caseRow['status']] ?? null;
|
||||
if (!$building instanceof Building || !$status instanceof Statut) {
|
||||
continue;
|
||||
}
|
||||
|
||||
for ($caseNumber = $caseRow['from']; $caseNumber <= $caseRow['to']; ++$caseNumber) {
|
||||
$code = sprintf('%s-C%d', $caseRow['buildingCode'], $caseNumber);
|
||||
|
||||
/** @var BuildingCase $buildingCase */
|
||||
$buildingCase = $this->upsertByCode(BuildingCase::class, $code, static function (BuildingCase $entity) use ($code, $caseNumber, $building, $status) {
|
||||
$entity
|
||||
->setCode($code)
|
||||
->setCaseNumber($caseNumber)
|
||||
->setCapacity(15)
|
||||
->setIdBuilding($building)
|
||||
->setStatut($status)
|
||||
;
|
||||
});
|
||||
$caseByCode[$code] = $buildingCase;
|
||||
}
|
||||
}
|
||||
|
||||
$slots = $this->buildSlotMap();
|
||||
$positionRepo = $this->entityManager->getRepository(BuildingCasePosition::class);
|
||||
|
||||
foreach (['B1' => 'plan1', 'B2' => 'plan2', 'B3' => 'plan3'] as $buildingCode => $layoutName) {
|
||||
$layout = $layoutByBuildingCode[$buildingCode] ?? null;
|
||||
if (!$layout instanceof BuildingLayout || $layout->getName() !== $layoutName) {
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach ($slots as $slot) {
|
||||
$caseCode = sprintf('%s-C%d', $buildingCode, $slot['caseNumber']);
|
||||
$buildingCase = $caseByCode[$caseCode] ?? null;
|
||||
if (!$buildingCase instanceof BuildingCase) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$position = $positionRepo->findOneBy([
|
||||
'buildingLayout' => $layout,
|
||||
'buildingCase' => $buildingCase,
|
||||
'x' => $slot['x'],
|
||||
'y' => $slot['y'],
|
||||
]);
|
||||
|
||||
if ($position instanceof BuildingCasePosition) {
|
||||
++$this->updated;
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$position = new BuildingCasePosition();
|
||||
$position
|
||||
->setX($slot['x'])
|
||||
->setY($slot['y'])
|
||||
->setW($slot['w'])
|
||||
->setH($slot['h'])
|
||||
->setRenderOrder((string) $slot['renderOrder'])
|
||||
->setBuildingLayout($layout)
|
||||
->setBuildingCase($buildingCase)
|
||||
;
|
||||
|
||||
++$this->created;
|
||||
$this->entityManager->persist($position);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function seedReceptionTypes(): void
|
||||
{
|
||||
$receptionTypes = [
|
||||
@@ -374,134 +231,6 @@ class SeedCommand extends Command
|
||||
}
|
||||
}
|
||||
|
||||
private function seedBovines(SymfonyStyle $io): void
|
||||
{
|
||||
$rows = [
|
||||
[1, 15, '7979580026', 390, '2026-02-25'],
|
||||
[5, 113, '4405604924', 397, '2025-05-22'],
|
||||
[4, 113, '4405604944', 375, '2025-05-22'],
|
||||
[2, 113, '4963291114', 319, '2025-05-22'],
|
||||
[3, 113, '4405604922', 386, '2025-05-22'],
|
||||
[6, 126, '4415811026', 367, '2025-07-02'],
|
||||
[7, 126, '4950971149', 398, '2025-07-02'],
|
||||
[8, 126, '4950971170', 386, '2025-07-02'],
|
||||
[9, 126, '4489751630', 408, '2025-07-02'],
|
||||
[10, 126, '8551323003', 478, '2025-07-02'],
|
||||
[11, 126, '8503833703', 378, '2025-07-02'],
|
||||
[12, 126, '4402104572', 379, '2025-07-02'],
|
||||
[13, 126, '4402104580', 465, '2025-07-02'],
|
||||
[14, 126, '4402104607', 381, '2025-07-02'],
|
||||
[15, 126, '8504059581', 446, '2025-07-02'],
|
||||
[16, 124, '4950971161', 382, '2025-07-02'],
|
||||
[17, 124, '5652911499', 376, '2025-07-02'],
|
||||
[18, 124, '8551323029', 414, '2025-07-02'],
|
||||
[19, 124, '4402104590', 474, '2025-07-02'],
|
||||
[20, 124, '4402104594', 408, '2025-07-02'],
|
||||
[21, 124, '4402104595', 399, '2025-07-02'],
|
||||
[22, 124, '4402104604', 374, '2025-07-02'],
|
||||
[23, 124, '8504059579', 403, '2025-07-02'],
|
||||
[24, 124, '8504059590', 398, '2025-07-02'],
|
||||
[25, 123, '8551782070', 395, '2025-07-02'],
|
||||
[26, 123, '8551782080', 443, '2025-07-02'],
|
||||
[27, 123, '8551782084', 394, '2025-07-02'],
|
||||
[28, 123, '8551782090', 378, '2025-07-02'],
|
||||
[29, 123, '8551782092', 424, '2025-07-02'],
|
||||
[30, 123, '8551782094', 389, '2025-07-02'],
|
||||
[31, 123, '8551782099', 411, '2025-07-02'],
|
||||
[32, 123, '8551323020', 392, '2025-07-02'],
|
||||
[33, 123, '8551323051', 371, '2025-07-02'],
|
||||
[34, 123, '7947673148', 378, '2025-07-02'],
|
||||
[39, 114, '1731177447', 395, '2025-06-19'],
|
||||
[42, 114, '1726167608', 299, '2025-06-19'],
|
||||
[38, 114, '1731177442', 343, '2025-06-19'],
|
||||
[40, 114, '1731177448', 362, '2025-06-19'],
|
||||
[41, 114, '1731177458', 359, '2025-06-19'],
|
||||
[35, 114, '7946282100', 291, '2025-06-19'],
|
||||
[43, 114, '1726167613', 339, '2025-06-19'],
|
||||
[37, 114, '1731177427', 375, '2025-06-19'],
|
||||
[36, 114, '7946282103', 354, '2025-06-19'],
|
||||
];
|
||||
|
||||
$bovineRepo = $this->entityManager->getRepository(Bovine::class);
|
||||
$caseRepo = $this->entityManager->getRepository(BuildingCase::class);
|
||||
|
||||
foreach ($rows as [, $legacyCaseId, $nationalNumber, $receivedWeight, $arrivalDate]) {
|
||||
$buildingCase = $this->resolveBuildingCaseByLegacyId((int) $legacyCaseId);
|
||||
if (!$buildingCase instanceof BuildingCase) {
|
||||
$buildingCase = $caseRepo->find((int) $legacyCaseId);
|
||||
}
|
||||
if (!$buildingCase instanceof BuildingCase) {
|
||||
$io->warning(sprintf(
|
||||
'Bovine %s skipped: building_case token %d not found.',
|
||||
$nationalNumber,
|
||||
$legacyCaseId
|
||||
));
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$bovine = $bovineRepo->findOneBy(['nationalNumber' => $nationalNumber]);
|
||||
if (!$bovine instanceof Bovine) {
|
||||
$bovine = new Bovine();
|
||||
++$this->created;
|
||||
} else {
|
||||
++$this->updated;
|
||||
}
|
||||
|
||||
$bovine
|
||||
->setNationalNumber((string) $nationalNumber)
|
||||
->setBuildingCase($buildingCase)
|
||||
->setReceivedWeight((int) $receivedWeight)
|
||||
->setArrivalDate(new DateTimeImmutable((string) $arrivalDate))
|
||||
;
|
||||
|
||||
$this->entityManager->persist($bovine);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<int, array{x:int,y:int,w:int,h:int,renderOrder:int,caseNumber:int}>
|
||||
*/
|
||||
private function buildSlotMap(): array
|
||||
{
|
||||
$slots = [];
|
||||
|
||||
for ($column = 1; $column <= 12; ++$column) {
|
||||
$slots[] = ['x' => $column, 'y' => 1, 'w' => 1, 'h' => 1, 'renderOrder' => $column, 'caseNumber' => $column + 12];
|
||||
}
|
||||
for ($column = 14; $column <= 23; ++$column) {
|
||||
$slots[] = ['x' => $column, 'y' => 1, 'w' => 1, 'h' => 1, 'renderOrder' => $column - 1, 'caseNumber' => $column + 11];
|
||||
}
|
||||
for ($column = 1; $column <= 12; ++$column) {
|
||||
$slots[] = ['x' => $column, 'y' => 2, 'w' => 1, 'h' => 1, 'renderOrder' => 22 + $column, 'caseNumber' => 13 - $column];
|
||||
}
|
||||
for ($column = 14; $column <= 23; ++$column) {
|
||||
$slots[] = ['x' => $column, 'y' => 2, 'w' => 1, 'h' => 1, 'renderOrder' => 21 + $column, 'caseNumber' => 58 - $column];
|
||||
}
|
||||
|
||||
return $slots;
|
||||
}
|
||||
|
||||
private function resolveBuildingCaseByLegacyId(int $legacyCaseId): ?BuildingCase
|
||||
{
|
||||
if ($legacyCaseId < 1) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$buildingNumber = intdiv($legacyCaseId - 1, 44) + 1;
|
||||
$caseNumber = (($legacyCaseId - 1) % 44) + 1;
|
||||
|
||||
if ($buildingNumber < 1 || $buildingNumber > 3) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$code = sprintf('B%d-C%d', $buildingNumber, $caseNumber);
|
||||
|
||||
$buildingCase = $this->entityManager->getRepository(BuildingCase::class)->findOneBy(['code' => $code]);
|
||||
|
||||
return $buildingCase instanceof BuildingCase ? $buildingCase : null;
|
||||
}
|
||||
|
||||
private function seedBovineTypes(): void
|
||||
{
|
||||
$bovineTypes = [
|
||||
|
||||
@@ -20,8 +20,6 @@ class AppFixtures extends Fixture implements DependentFixtureInterface
|
||||
return [
|
||||
TransportFixtures::class,
|
||||
ReferenceFixtures::class,
|
||||
BuildingInfrastructureFixtures::class,
|
||||
BovineFixtures::class,
|
||||
UserFixtures::class,
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,120 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\DataFixtures;
|
||||
|
||||
use App\Entity\Bovine;
|
||||
use App\Entity\BuildingCase;
|
||||
use DateTimeImmutable;
|
||||
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||
use Doctrine\Common\DataFixtures\DependentFixtureInterface;
|
||||
use Doctrine\Persistence\ObjectManager;
|
||||
|
||||
class BovineFixtures extends Fixture implements DependentFixtureInterface
|
||||
{
|
||||
public function load(ObjectManager $manager): void
|
||||
{
|
||||
$rows = [
|
||||
[1, 15, '7979580026', 390, '2026-02-25'],
|
||||
[5, 113, '4405604924', 397, '2025-05-22'],
|
||||
[4, 113, '4405604944', 375, '2025-05-22'],
|
||||
[2, 113, '4963291114', 319, '2025-05-22'],
|
||||
[3, 113, '4405604922', 386, '2025-05-22'],
|
||||
[6, 126, '4415811026', 367, '2025-07-02'],
|
||||
[7, 126, '4950971149', 398, '2025-07-02'],
|
||||
[8, 126, '4950971170', 386, '2025-07-02'],
|
||||
[9, 126, '4489751630', 408, '2025-07-02'],
|
||||
[10, 126, '8551323003', 478, '2025-07-02'],
|
||||
[11, 126, '8503833703', 378, '2025-07-02'],
|
||||
[12, 126, '4402104572', 379, '2025-07-02'],
|
||||
[13, 126, '4402104580', 465, '2025-07-02'],
|
||||
[14, 126, '4402104607', 381, '2025-07-02'],
|
||||
[15, 126, '8504059581', 446, '2025-07-02'],
|
||||
[16, 124, '4950971161', 382, '2025-07-02'],
|
||||
[17, 124, '5652911499', 376, '2025-07-02'],
|
||||
[18, 124, '8551323029', 414, '2025-07-02'],
|
||||
[19, 124, '4402104590', 474, '2025-07-02'],
|
||||
[20, 124, '4402104594', 408, '2025-07-02'],
|
||||
[21, 124, '4402104595', 399, '2025-07-02'],
|
||||
[22, 124, '4402104604', 374, '2025-07-02'],
|
||||
[23, 124, '8504059579', 403, '2025-07-02'],
|
||||
[24, 124, '8504059590', 398, '2025-07-02'],
|
||||
[25, 123, '8551782070', 395, '2025-07-02'],
|
||||
[26, 123, '8551782080', 443, '2025-07-02'],
|
||||
[27, 123, '8551782084', 394, '2025-07-02'],
|
||||
[28, 123, '8551782090', 378, '2025-07-02'],
|
||||
[29, 123, '8551782092', 424, '2025-07-02'],
|
||||
[30, 123, '8551782094', 389, '2025-07-02'],
|
||||
[31, 123, '8551782099', 411, '2025-07-02'],
|
||||
[32, 123, '8551323020', 392, '2025-07-02'],
|
||||
[33, 123, '8551323051', 371, '2025-07-02'],
|
||||
[34, 123, '7947673148', 378, '2025-07-02'],
|
||||
[39, 114, '1731177447', 395, '2025-06-19'],
|
||||
[42, 114, '1726167608', 299, '2025-06-19'],
|
||||
[38, 114, '1731177442', 343, '2025-06-19'],
|
||||
[40, 114, '1731177448', 362, '2025-06-19'],
|
||||
[41, 114, '1731177458', 359, '2025-06-19'],
|
||||
[35, 114, '7946282100', 291, '2025-06-19'],
|
||||
[43, 114, '1726167613', 339, '2025-06-19'],
|
||||
[37, 114, '1731177427', 375, '2025-06-19'],
|
||||
[36, 114, '7946282103', 354, '2025-06-19'],
|
||||
];
|
||||
|
||||
$bovineRepository = $manager->getRepository(Bovine::class);
|
||||
$caseRepository = $manager->getRepository(BuildingCase::class);
|
||||
|
||||
foreach ($rows as [, $legacyCaseId, $nationalNumber, $receivedWeight, $arrivalDate]) {
|
||||
$buildingCase = $this->resolveBuildingCaseByLegacyId($manager, (int) $legacyCaseId);
|
||||
if (!$buildingCase instanceof BuildingCase) {
|
||||
$buildingCase = $caseRepository->find((int) $legacyCaseId);
|
||||
}
|
||||
if (!$buildingCase instanceof BuildingCase) {
|
||||
continue;
|
||||
}
|
||||
|
||||
/** @var null|Bovine $bovine */
|
||||
$bovine = $bovineRepository->findOneBy(['nationalNumber' => (string) $nationalNumber]);
|
||||
if (!$bovine instanceof Bovine) {
|
||||
$bovine = new Bovine();
|
||||
}
|
||||
|
||||
$bovine
|
||||
->setNationalNumber((string) $nationalNumber)
|
||||
->setBuildingCase($buildingCase)
|
||||
->setReceivedWeight((int) $receivedWeight)
|
||||
->setArrivalDate(new DateTimeImmutable((string) $arrivalDate))
|
||||
;
|
||||
|
||||
$manager->persist($bovine);
|
||||
}
|
||||
|
||||
$manager->flush();
|
||||
}
|
||||
|
||||
public function getDependencies(): array
|
||||
{
|
||||
return [
|
||||
BuildingInfrastructureFixtures::class,
|
||||
];
|
||||
}
|
||||
|
||||
private function resolveBuildingCaseByLegacyId(ObjectManager $manager, int $legacyCaseId): ?BuildingCase
|
||||
{
|
||||
if ($legacyCaseId < 1) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$buildingNumber = intdiv($legacyCaseId - 1, 44) + 1;
|
||||
$caseNumber = (($legacyCaseId - 1) % 44) + 1;
|
||||
|
||||
if ($buildingNumber < 1 || $buildingNumber > 3) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$code = sprintf('B%d-C%d', $buildingNumber, $caseNumber);
|
||||
$buildingCase = $manager->getRepository(BuildingCase::class)->findOneBy(['code' => $code]);
|
||||
|
||||
return $buildingCase instanceof BuildingCase ? $buildingCase : null;
|
||||
}
|
||||
}
|
||||
@@ -1,121 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Entity;
|
||||
|
||||
use ApiPlatform\Metadata\ApiResource;
|
||||
use ApiPlatform\Metadata\Get;
|
||||
use ApiPlatform\Metadata\GetCollection;
|
||||
use ApiPlatform\Metadata\Patch;
|
||||
use ApiPlatform\Metadata\Post;
|
||||
use DateTimeImmutable;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use Symfony\Component\Serializer\Attribute\Context;
|
||||
use Symfony\Component\Serializer\Attribute\Groups;
|
||||
use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
|
||||
|
||||
#[ORM\Entity]
|
||||
#[ORM\Table(name: 'bovine')]
|
||||
#[ORM\UniqueConstraint(name: 'uniq_bovine_national_number', columns: ['national_number'])]
|
||||
#[ApiResource(
|
||||
operations: [
|
||||
new Get(
|
||||
requirements: ['id' => '\d+'],
|
||||
normalizationContext: ['groups' => ['bovine:read']],
|
||||
),
|
||||
new GetCollection(
|
||||
normalizationContext: ['groups' => ['bovine:read']],
|
||||
),
|
||||
new Post(
|
||||
normalizationContext: ['groups' => ['bovine:read']],
|
||||
denormalizationContext: ['groups' => ['bovine:write']],
|
||||
security: "is_granted('ROLE_ADMIN')",
|
||||
),
|
||||
new Patch(
|
||||
requirements: ['id' => '\d+'],
|
||||
normalizationContext: ['groups' => ['bovine:read']],
|
||||
denormalizationContext: ['groups' => ['bovine:write']],
|
||||
security: "is_granted('ROLE_ADMIN')",
|
||||
),
|
||||
],
|
||||
security: "is_granted('ROLE_USER')",
|
||||
)]
|
||||
class Bovine
|
||||
{
|
||||
#[ORM\Id]
|
||||
#[ORM\GeneratedValue]
|
||||
#[ORM\Column]
|
||||
#[Groups(['bovine:read'])]
|
||||
private ?int $id = null;
|
||||
|
||||
#[ORM\Column(length: 50)]
|
||||
#[Groups(['bovine:read', 'bovine:write'])]
|
||||
private string $nationalNumber = '';
|
||||
|
||||
#[ORM\Column(nullable: true)]
|
||||
#[Groups(['bovine:read', 'bovine:write'])]
|
||||
private ?int $receivedWeight = null;
|
||||
|
||||
#[ORM\Column(type: 'date_immutable', nullable: true)]
|
||||
#[Groups(['bovine:read', 'bovine:write'])]
|
||||
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
||||
private ?DateTimeImmutable $arrivalDate = null;
|
||||
|
||||
#[ORM\ManyToOne(inversedBy: 'bovines')]
|
||||
#[Groups(['bovine:read', 'bovine:write'])]
|
||||
private ?BuildingCase $buildingCase = null;
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getNationalNumber(): string
|
||||
{
|
||||
return $this->nationalNumber;
|
||||
}
|
||||
|
||||
public function setNationalNumber(string $nationalNumber): static
|
||||
{
|
||||
$this->nationalNumber = $nationalNumber;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getReceivedWeight(): ?int
|
||||
{
|
||||
return $this->receivedWeight;
|
||||
}
|
||||
|
||||
public function setReceivedWeight(?int $receivedWeight): static
|
||||
{
|
||||
$this->receivedWeight = $receivedWeight;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getArrivalDate(): ?DateTimeImmutable
|
||||
{
|
||||
return $this->arrivalDate;
|
||||
}
|
||||
|
||||
public function setArrivalDate(?DateTimeImmutable $arrivalDate): static
|
||||
{
|
||||
$this->arrivalDate = $arrivalDate;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getBuildingCase(): ?BuildingCase
|
||||
{
|
||||
return $this->buildingCase;
|
||||
}
|
||||
|
||||
public function setBuildingCase(?BuildingCase $buildingCase): static
|
||||
{
|
||||
$this->buildingCase = $buildingCase;
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
@@ -4,32 +4,14 @@ 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 App\Repository\BuildingCaseRepository;
|
||||
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')",
|
||||
)]
|
||||
#[ORM\Entity(repositoryClass: BuildingCaseRepository::class)]
|
||||
class BuildingCase
|
||||
{
|
||||
#[ORM\Id]
|
||||
@@ -64,16 +46,9 @@ class BuildingCase
|
||||
#[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
|
||||
@@ -177,33 +152,4 @@ class BuildingCase
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,11 +4,12 @@ declare(strict_types=1);
|
||||
|
||||
namespace App\Entity;
|
||||
|
||||
use App\Repository\BuildingCasePositionRepository;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
use Symfony\Component\Serializer\Attribute\Groups;
|
||||
use Symfony\Component\Serializer\Attribute\SerializedName;
|
||||
|
||||
#[ORM\Entity]
|
||||
#[ORM\Entity(repositoryClass: BuildingCasePositionRepository::class)]
|
||||
class BuildingCasePosition
|
||||
{
|
||||
#[ORM\Id]
|
||||
|
||||
@@ -4,13 +4,14 @@ declare(strict_types=1);
|
||||
|
||||
namespace App\Entity;
|
||||
|
||||
use App\Repository\BuildingLayoutRepository;
|
||||
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\Entity(repositoryClass: BuildingLayoutRepository::class)]
|
||||
class BuildingLayout
|
||||
{
|
||||
#[ORM\Id]
|
||||
|
||||
@@ -80,7 +80,7 @@ class Shipment
|
||||
|
||||
#[ORM\Column(length: 255)]
|
||||
#[Groups(['shipment:read', 'shipment:write'])]
|
||||
private ?string $licensePlate = null;
|
||||
private ?string $licencePlate = null;
|
||||
|
||||
#[ORM\Column(length: 20, unique: true, nullable: true)]
|
||||
#[Groups(['shipment:read'])]
|
||||
@@ -162,14 +162,14 @@ class Shipment
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getLicensePlate(): ?string
|
||||
public function getLicencePlate(): ?string
|
||||
{
|
||||
return $this->licensePlate;
|
||||
return $this->licencePlate;
|
||||
}
|
||||
|
||||
public function setLicensePlate(?string $licensePlate): void
|
||||
public function setLicencePlate(?string $licencePlate): void
|
||||
{
|
||||
$this->licensePlate = $licensePlate;
|
||||
$this->licencePlate = $licencePlate;
|
||||
}
|
||||
|
||||
public function getIdentificationNumber(): ?string
|
||||
|
||||
@@ -7,13 +7,14 @@ namespace App\Entity;
|
||||
use ApiPlatform\Metadata\ApiResource;
|
||||
use ApiPlatform\Metadata\Get;
|
||||
use ApiPlatform\Metadata\GetCollection;
|
||||
use App\Repository\StatutRepository;
|
||||
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\Entity(repositoryClass: StatutRepository::class)]
|
||||
#[ApiResource(
|
||||
operations: [
|
||||
new Get(
|
||||
|
||||
45
src/Repository/BuildingCasePositionRepository.php
Normal file
45
src/Repository/BuildingCasePositionRepository.php
Normal file
@@ -0,0 +1,45 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Repository;
|
||||
|
||||
use App\Entity\BuildingCasePosition;
|
||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||
use Doctrine\Persistence\ManagerRegistry;
|
||||
|
||||
/**
|
||||
* @extends ServiceEntityRepository<BuildingCasePosition>
|
||||
*/
|
||||
class BuildingCasePositionRepository extends ServiceEntityRepository
|
||||
{
|
||||
public function __construct(ManagerRegistry $registry)
|
||||
{
|
||||
parent::__construct($registry, BuildingCasePosition::class);
|
||||
}
|
||||
|
||||
// /**
|
||||
// * @return BuildingCasePosition[] Returns an array of BuildingCasePosition objects
|
||||
// */
|
||||
// public function findByExampleField($value): array
|
||||
// {
|
||||
// return $this->createQueryBuilder('b')
|
||||
// ->andWhere('b.exampleField = :val')
|
||||
// ->setParameter('val', $value)
|
||||
// ->orderBy('b.id', 'ASC')
|
||||
// ->setMaxResults(10)
|
||||
// ->getQuery()
|
||||
// ->getResult()
|
||||
// ;
|
||||
// }
|
||||
|
||||
// public function findOneBySomeField($value): ?BuildingCasePosition
|
||||
// {
|
||||
// return $this->createQueryBuilder('b')
|
||||
// ->andWhere('b.exampleField = :val')
|
||||
// ->setParameter('val', $value)
|
||||
// ->getQuery()
|
||||
// ->getOneOrNullResult()
|
||||
// ;
|
||||
// }
|
||||
}
|
||||
45
src/Repository/BuildingCaseRepository.php
Normal file
45
src/Repository/BuildingCaseRepository.php
Normal file
@@ -0,0 +1,45 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Repository;
|
||||
|
||||
use App\Entity\BuildingCase;
|
||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||
use Doctrine\Persistence\ManagerRegistry;
|
||||
|
||||
/**
|
||||
* @extends ServiceEntityRepository<BuildingCase>
|
||||
*/
|
||||
class BuildingCaseRepository extends ServiceEntityRepository
|
||||
{
|
||||
public function __construct(ManagerRegistry $registry)
|
||||
{
|
||||
parent::__construct($registry, BuildingCase::class);
|
||||
}
|
||||
|
||||
// /**
|
||||
// * @return BuildingCase[] Returns an array of BuildingCase objects
|
||||
// */
|
||||
// public function findByExampleField($value): array
|
||||
// {
|
||||
// return $this->createQueryBuilder('b')
|
||||
// ->andWhere('b.exampleField = :val')
|
||||
// ->setParameter('val', $value)
|
||||
// ->orderBy('b.id', 'ASC')
|
||||
// ->setMaxResults(10)
|
||||
// ->getQuery()
|
||||
// ->getResult()
|
||||
// ;
|
||||
// }
|
||||
|
||||
// public function findOneBySomeField($value): ?BuildingCase
|
||||
// {
|
||||
// return $this->createQueryBuilder('b')
|
||||
// ->andWhere('b.exampleField = :val')
|
||||
// ->setParameter('val', $value)
|
||||
// ->getQuery()
|
||||
// ->getOneOrNullResult()
|
||||
// ;
|
||||
// }
|
||||
}
|
||||
45
src/Repository/BuildingLayoutRepository.php
Normal file
45
src/Repository/BuildingLayoutRepository.php
Normal file
@@ -0,0 +1,45 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Repository;
|
||||
|
||||
use App\Entity\BuildingLayout;
|
||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||
use Doctrine\Persistence\ManagerRegistry;
|
||||
|
||||
/**
|
||||
* @extends ServiceEntityRepository<BuildingLayout>
|
||||
*/
|
||||
class BuildingLayoutRepository extends ServiceEntityRepository
|
||||
{
|
||||
public function __construct(ManagerRegistry $registry)
|
||||
{
|
||||
parent::__construct($registry, BuildingLayout::class);
|
||||
}
|
||||
|
||||
// /**
|
||||
// * @return BuildingLayout[] Returns an array of BuildingLayout objects
|
||||
// */
|
||||
// public function findByExampleField($value): array
|
||||
// {
|
||||
// return $this->createQueryBuilder('b')
|
||||
// ->andWhere('b.exampleField = :val')
|
||||
// ->setParameter('val', $value)
|
||||
// ->orderBy('b.id', 'ASC')
|
||||
// ->setMaxResults(10)
|
||||
// ->getQuery()
|
||||
// ->getResult()
|
||||
// ;
|
||||
// }
|
||||
|
||||
// public function findOneBySomeField($value): ?BuildingLayout
|
||||
// {
|
||||
// return $this->createQueryBuilder('b')
|
||||
// ->andWhere('b.exampleField = :val')
|
||||
// ->setParameter('val', $value)
|
||||
// ->getQuery()
|
||||
// ->getOneOrNullResult()
|
||||
// ;
|
||||
// }
|
||||
}
|
||||
45
src/Repository/StatutRepository.php
Normal file
45
src/Repository/StatutRepository.php
Normal file
@@ -0,0 +1,45 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Repository;
|
||||
|
||||
use App\Entity\Statut;
|
||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||
use Doctrine\Persistence\ManagerRegistry;
|
||||
|
||||
/**
|
||||
* @extends ServiceEntityRepository<Statut>
|
||||
*/
|
||||
class StatutRepository extends ServiceEntityRepository
|
||||
{
|
||||
public function __construct(ManagerRegistry $registry)
|
||||
{
|
||||
parent::__construct($registry, Statut::class);
|
||||
}
|
||||
|
||||
// /**
|
||||
// * @return Statut[] Returns an array of Statut objects
|
||||
// */
|
||||
// public function findByExampleField($value): array
|
||||
// {
|
||||
// return $this->createQueryBuilder('s')
|
||||
// ->andWhere('s.exampleField = :val')
|
||||
// ->setParameter('val', $value)
|
||||
// ->orderBy('s.id', 'ASC')
|
||||
// ->setMaxResults(10)
|
||||
// ->getQuery()
|
||||
// ->getResult()
|
||||
// ;
|
||||
// }
|
||||
|
||||
// public function findOneBySomeField($value): ?Statut
|
||||
// {
|
||||
// return $this->createQueryBuilder('s')
|
||||
// ->andWhere('s.exampleField = :val')
|
||||
// ->setParameter('val', $value)
|
||||
// ->getQuery()
|
||||
// ->getOneOrNullResult()
|
||||
// ;
|
||||
// }
|
||||
}
|
||||
@@ -1,210 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\State;
|
||||
|
||||
use ApiPlatform\Metadata\Operation;
|
||||
use ApiPlatform\State\ProviderInterface;
|
||||
use App\Entity\Bovine;
|
||||
use App\Entity\BuildingCase;
|
||||
use DateTimeImmutable;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Dompdf\Dompdf;
|
||||
use Malio\EdnotifBundle\Bovin\Api\BovinApiInterface;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
use Throwable;
|
||||
use Twig\Environment;
|
||||
use Twig\Error\LoaderError;
|
||||
use Twig\Error\RuntimeError;
|
||||
use Twig\Error\SyntaxError;
|
||||
|
||||
final readonly class BuildingCaseWeightsReportProvider implements ProviderInterface
|
||||
{
|
||||
private const FRENCH_MONTHS = [
|
||||
1 => 'Janvier',
|
||||
2 => 'Février',
|
||||
3 => 'Mars',
|
||||
4 => 'Avril',
|
||||
5 => 'Mai',
|
||||
6 => 'Juin',
|
||||
7 => 'Juillet',
|
||||
8 => 'Août',
|
||||
9 => 'Septembre',
|
||||
10 => 'Octobre',
|
||||
11 => 'Novembre',
|
||||
12 => 'Décembre',
|
||||
];
|
||||
|
||||
public function __construct(
|
||||
private Environment $twig,
|
||||
private EntityManagerInterface $entityManager,
|
||||
private BovinApiInterface $bovinApi,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @throws RuntimeError
|
||||
* @throws SyntaxError
|
||||
* @throws LoaderError
|
||||
*/
|
||||
public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
|
||||
{
|
||||
$id = $uriVariables['id'] ?? null;
|
||||
if (null === $id) {
|
||||
throw new NotFoundHttpException('Case not found.');
|
||||
}
|
||||
|
||||
$buildingCase = $this->entityManager->getRepository(BuildingCase::class)->find($id);
|
||||
if (!$buildingCase instanceof BuildingCase) {
|
||||
throw new NotFoundHttpException('Case not found.');
|
||||
}
|
||||
|
||||
$rows = [];
|
||||
$firstArrivalDate = null;
|
||||
$headerBreedCode = null;
|
||||
foreach ($buildingCase->getBovines() as $bovine) {
|
||||
if (!$bovine instanceof Bovine) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$workNumber = null;
|
||||
$birthDate = null;
|
||||
$breedCode = null;
|
||||
|
||||
try {
|
||||
$animalFileDto = $this->bovinApi->getAnimalFile(
|
||||
nationalNumber: $bovine->getNationalNumber(),
|
||||
countryCode: 'FR',
|
||||
);
|
||||
|
||||
$workNumber = $animalFileDto->identification?->workNumber;
|
||||
$birthDate = $animalFileDto->identification?->birthDate?->date?->format('d/m/y');
|
||||
$breedCode = $this->normalizeBreedCode($animalFileDto->identification?->breedType);
|
||||
if (null === $headerBreedCode && null !== $breedCode) {
|
||||
$headerBreedCode = $breedCode;
|
||||
}
|
||||
} catch (Throwable) {
|
||||
// Keep row data even if external identification service is unavailable.
|
||||
}
|
||||
|
||||
$arrivalDate = $bovine->getArrivalDate();
|
||||
if ($arrivalDate instanceof DateTimeImmutable && null === $firstArrivalDate) {
|
||||
$firstArrivalDate = $arrivalDate;
|
||||
}
|
||||
|
||||
$projectedWeights = $this->buildProjectedWeights(
|
||||
$bovine->getReceivedWeight(),
|
||||
$arrivalDate,
|
||||
$breedCode,
|
||||
);
|
||||
|
||||
$rows[] = [
|
||||
'nationalNumber' => $bovine->getNationalNumber(),
|
||||
'workNumber' => $workNumber,
|
||||
'birthDate' => $birthDate,
|
||||
'receivedWeight' => $bovine->getReceivedWeight(),
|
||||
'arrivalDate' => $bovine->getArrivalDate()?->format('d/m/Y'),
|
||||
'projectedWeights' => $projectedWeights,
|
||||
];
|
||||
}
|
||||
|
||||
$monthHeaders = $this->buildMonthHeaders($firstArrivalDate, $headerBreedCode);
|
||||
|
||||
$dompdf = new Dompdf();
|
||||
$html = $this->twig->render('case_weights_report.html.twig', [
|
||||
'buildingCase' => $buildingCase,
|
||||
'rows' => $rows,
|
||||
'monthHeaders' => $monthHeaders,
|
||||
'printedAt' => new DateTimeImmutable(),
|
||||
]);
|
||||
|
||||
$dompdf->loadHtml($html);
|
||||
$dompdf->setPaper('A4', 'landscape');
|
||||
$dompdf->render();
|
||||
|
||||
$filename = sprintf('tableau-poids-case-%d.pdf', $buildingCase->getId());
|
||||
|
||||
return new Response($dompdf->output(), Response::HTTP_OK, [
|
||||
'Content-Type' => 'application/pdf',
|
||||
'Content-Disposition' => 'inline; filename="'.$filename.'"',
|
||||
]);
|
||||
}
|
||||
|
||||
private function normalizeBreedCode(mixed $breedType): ?string
|
||||
{
|
||||
if (null === $breedType) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (is_numeric($breedType)) {
|
||||
return (string) $breedType;
|
||||
}
|
||||
|
||||
if (is_string($breedType) && preg_match('/\d+/', $breedType, $matches)) {
|
||||
return $matches[0];
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private function resolveDailyGainKg(?string $breedCode): float
|
||||
{
|
||||
return 1.3;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<int, null|float>
|
||||
*/
|
||||
private function buildProjectedWeights(?int $receivedWeight, ?DateTimeImmutable $arrivalDate, ?string $breedCode): array
|
||||
{
|
||||
$result = array_fill(0, 12, null);
|
||||
if (null === $receivedWeight || !$arrivalDate instanceof DateTimeImmutable) {
|
||||
return $result;
|
||||
}
|
||||
|
||||
$currentWeight = (float) $receivedWeight;
|
||||
$dailyGainKg = $this->resolveDailyGainKg($breedCode);
|
||||
|
||||
for ($i = 0; $i < 12; ++$i) {
|
||||
$monthDate = $arrivalDate->modify('first day of this month')->modify(sprintf('+%d month', $i));
|
||||
$daysInMonth = (int) $monthDate->format('t');
|
||||
|
||||
$daysToApply = 0 === $i
|
||||
? max($daysInMonth - (int) $arrivalDate->format('j'), 0)
|
||||
: $daysInMonth;
|
||||
|
||||
$currentWeight += $daysToApply * $dailyGainKg;
|
||||
$result[$i] = $currentWeight;
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<int, array{name:string,days:string,base:string}>
|
||||
*/
|
||||
private function buildMonthHeaders(?DateTimeImmutable $arrivalDate, ?string $breedCode): array
|
||||
{
|
||||
$referenceDate = $arrivalDate ?? new DateTimeImmutable('first day of january this year');
|
||||
$dailyGainKg = $this->resolveDailyGainKg($breedCode);
|
||||
$headers = [];
|
||||
|
||||
for ($i = 0; $i < 12; ++$i) {
|
||||
$monthDate = $referenceDate->modify('first day of this month')->modify(sprintf('+%d month', $i));
|
||||
$monthIndex = (int) $monthDate->format('n');
|
||||
$daysInMonth = (int) $monthDate->format('t');
|
||||
$daysToApply = 0 === $i
|
||||
? max($daysInMonth - (int) $referenceDate->format('j'), 0)
|
||||
: $daysInMonth;
|
||||
|
||||
$headers[] = [
|
||||
'name' => self::FRENCH_MONTHS[$monthIndex],
|
||||
'days' => sprintf('%d jours', $daysToApply),
|
||||
'baseValue' => $daysToApply * $dailyGainKg,
|
||||
];
|
||||
}
|
||||
|
||||
return $headers;
|
||||
}
|
||||
}
|
||||
@@ -1,378 +0,0 @@
|
||||
<!doctype html>
|
||||
<html lang="fr">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<style>
|
||||
/* =========================
|
||||
DOMPDF FRIENDLY SETTINGS
|
||||
========================= */
|
||||
@page { size: A4 landscape; }
|
||||
|
||||
html, body {
|
||||
margin: 0;
|
||||
padding: 6mm;
|
||||
font-family: Helvetica, sans-serif;
|
||||
font-size: 8px;
|
||||
}
|
||||
|
||||
body {
|
||||
/* DejaVu Sans est très bien géré par dompdf (accents, stabilité) */
|
||||
font-family: Helvetica, sans-serif;
|
||||
font-size: 10px;
|
||||
color: #111;
|
||||
}
|
||||
|
||||
.sheet { width: auto; }
|
||||
|
||||
h1 {
|
||||
margin: 8px 0 16px 0;
|
||||
padding: 0;
|
||||
line-height: 1;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
table-layout: fixed;
|
||||
}
|
||||
|
||||
th, td {
|
||||
border: 2px solid #2b2b2b;
|
||||
padding: 2px 3px;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
line-height: 1.1;
|
||||
white-space: nowrap; /* important pour dompdf */
|
||||
overflow: hidden; /* évite les débordements */
|
||||
text-overflow: clip;
|
||||
}
|
||||
|
||||
/* =========================
|
||||
HEADER (mise en page)
|
||||
========================= */
|
||||
.header-layout,
|
||||
.header-layout td {
|
||||
border: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.header-left td,
|
||||
.header-right td {
|
||||
border: 2px solid #2b2b2b;
|
||||
font-weight: 700;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/* Bloc CASE */
|
||||
.header-left td {
|
||||
height: 34px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.header-left .case-label {
|
||||
width: 34%;
|
||||
letter-spacing: 0.2px;
|
||||
}
|
||||
|
||||
.header-left .case-number {
|
||||
width: 66%;
|
||||
font-size: 18px; /* volontairement compact pour dompdf */
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
/* Bloc PROVENANCE / RACE */
|
||||
.header-right .label {
|
||||
font-size: 11px;
|
||||
height: 18px;
|
||||
letter-spacing: 0;
|
||||
}
|
||||
|
||||
.header-right .mini {
|
||||
height: 18px;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.header-right .mini-empty {
|
||||
height: 18px;
|
||||
font-size: 9px;
|
||||
}
|
||||
|
||||
.header-right .race {
|
||||
height: 24px;
|
||||
font-size: 11px;
|
||||
letter-spacing: 0;
|
||||
}
|
||||
|
||||
.header-right .breed {
|
||||
font-size: 9px;
|
||||
font-weight: 700;
|
||||
padding: 0 2px;
|
||||
}
|
||||
|
||||
/* =========================
|
||||
TABLEAU PRINCIPAL
|
||||
========================= */
|
||||
.main {
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
.main th {
|
||||
background: #ffffff;
|
||||
font-weight: 700;
|
||||
padding: 2px 1px;
|
||||
}
|
||||
|
||||
.main .head-big {
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
white-space: normal; /* permet les <br> */
|
||||
line-height: 1.15;
|
||||
}
|
||||
|
||||
.main .month {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.main .days {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.main .sub-title {
|
||||
font-size: 16px;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0;
|
||||
padding: 8px;
|
||||
}
|
||||
|
||||
.main .base {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
/* Hauteurs de lignes d'en-tête (stables en dompdf) */
|
||||
.main thead tr:nth-child(1) th { height: 24px; }
|
||||
.main thead tr:nth-child(2) th { height: 18px; }
|
||||
.main thead tr:nth-child(3) th { height: 18px; }
|
||||
.main thead tr:nth-child(4) th { height: 18px; }
|
||||
|
||||
/* Lignes data */
|
||||
.data-row td {
|
||||
height: 18px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.row-work {
|
||||
text-align: center;
|
||||
font-size: 18px !important;
|
||||
font-weight: 700;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.row-weight,
|
||||
.row-birth,
|
||||
.row-month {
|
||||
font-size: 9px;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
/* =========================
|
||||
FOOTER VACCINS / NOTES
|
||||
========================= */
|
||||
.footer {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
/* Header droit sans bordures par défaut */
|
||||
.header-right-free,
|
||||
.header-right-free td {
|
||||
padding: 0;
|
||||
width: 6.25%;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
{% set firstArrivalDate = rows is not empty ? rows[0].arrivalDate : null %}
|
||||
{% set monthCount = ((monthHeaders|default([]))|length) > 0 ? ((monthHeaders|default([]))|length) : 12 %}
|
||||
|
||||
<div class="sheet">
|
||||
|
||||
<!-- =========================
|
||||
EN-TÊTE (CASE / PROVENANCE / RACE)
|
||||
========================= -->
|
||||
<h1 style="color: red; text-align: center; width: 100%; font-size: 36px">
|
||||
Arrivage du {{ firstArrivalDate ?? '-' }}
|
||||
</h1>
|
||||
<table style="width:100%; border-collapse:collapse; table-layout:fixed; margin-bottom: 16px">
|
||||
<tr>
|
||||
<td style="width:40%; vertical-align:top; padding-right:2mm; border:0;">
|
||||
<table style="width:100%; border-collapse:collapse; table-layout:fixed;">
|
||||
<tr>
|
||||
<td style="border: 0; height: 20px"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="font-weight:700; text-align: left; border: none; font-size: 24px">CASE N° {{ buildingCase.caseNumber ?? '' }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
|
||||
<td style="width:60%; vertical-align:top; padding-left:2mm; border:0;">
|
||||
<table class="header-right-free" style="width:100%; border-collapse:collapse; table-layout:fixed;">
|
||||
<tr>
|
||||
<td style="border:0; text-align:center; font-weight:700; height: 20px;" colspan="5"></td>
|
||||
<td style="border:0;" colspan="2"></td>
|
||||
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700; height: 20px;">1</td>
|
||||
<td style="border:0; height: 20px;"></td>
|
||||
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700; height: 20px;">2</td>
|
||||
<td style="border:0; height: 20px;"></td>
|
||||
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700; height: 20px;">3</td>
|
||||
<td style="border:0; height: 20px;"></td>
|
||||
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700; height: 20px;">4</td>
|
||||
<td style="border:0;" colspan="2"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="border:0; text-align:left; font-weight:700; font-size: 24px; width:40%; height: 20px;" colspan="5">PROVENANCE</td>
|
||||
<td style="border:0;" colspan="2"></td>
|
||||
<td style="border:1px solid #2b2b2b;"></td>
|
||||
<td style="border:0;"></td>
|
||||
<td style="border:1px solid #2b2b2b;"></td>
|
||||
<td style="border:0;"></td>
|
||||
<td style="border:1px solid #2b2b2b;"></td>
|
||||
<td style="border:0;"></td>
|
||||
<td style="border:1px solid #2b2b2b;"></td>
|
||||
<td style="border: 0; width: 20%;" colspan="2"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="border: 0; height: 20px" colspan="16"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="border: 0; text-align:left; font-weight:700; font-size: 24px" colspan="3">RACE</td>
|
||||
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700;" colspan="3">LIMOUSIN</td>
|
||||
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700;" colspan="1"></td>
|
||||
<td style="border: 0; text-align:center; font-weight:700;" colspan="1"></td>
|
||||
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700;" colspan="3">CHAROLAIS</td>
|
||||
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700;" colspan="1"></td>
|
||||
<td style="border: 0; text-align:center; font-weight:700;" colspan="1"></td>
|
||||
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700;" colspan="2">Autre</td>
|
||||
<td style="border:1px solid #2b2b2b; text-align:center; font-weight:700;" colspan="1"></td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<!-- =========================
|
||||
TABLEAU PRINCIPAL
|
||||
========================= -->
|
||||
<table class="main">
|
||||
<colgroup>
|
||||
<col style="width:8%">
|
||||
<col style="width:4%">
|
||||
<col style="width:7%">
|
||||
{% for month in monthHeaders %}
|
||||
<col style="width:6.75%">
|
||||
{% endfor %}
|
||||
</colgroup>
|
||||
|
||||
<thead>
|
||||
<tr>
|
||||
<th rowspan="4" class="head-big">N° de<br>travail</th>
|
||||
<th rowspan="4" class="head-big head-big-weight">Poids<br>(kg)</th>
|
||||
<th rowspan="4" class="head-big">Date de<br>naissance</th>
|
||||
|
||||
{% for month in monthHeaders|default([]) %}
|
||||
<th class="month">{{ month.name }}</th>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
{% for month in monthHeaders|default([]) %}
|
||||
<th class="days">{{ month.days }}</th>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th colspan="{{ monthHeaders|length }}" class="sub-title">POIDS PAR MOIS</th>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
{% for month in monthHeaders|default([]) %}
|
||||
<th class="base">
|
||||
{% if month.baseValue is defined %}
|
||||
{{ month.baseValue|round(0, 'common') }} kg
|
||||
{% elseif month.base is defined %}
|
||||
{{ month.base }}
|
||||
{% endif %}
|
||||
</th>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
{# 11 lignes comme dans ton code (0..10) #}
|
||||
{% for i in 0..12 %}
|
||||
{% set row = rows[i] ?? null %}
|
||||
{% set baseWeight = row ? (row.receivedWeight ?? null) : null %}
|
||||
|
||||
<tr class="data-row">
|
||||
<td class="row-work">{{ row ? (row.workNumber ?? '') : '' }}</td>
|
||||
<td class="row-weight">{{ baseWeight ?? '' }}</td>
|
||||
<td class="row-birth">
|
||||
{% if row and row.birthDate %}
|
||||
{% set birthParts = row.birthDate|split('/') %}
|
||||
{{ birthParts|length == 3 ? birthParts[1] ~ '/' ~ birthParts[2] : row.birthDate }}
|
||||
{% endif %}
|
||||
</td>
|
||||
{% for idx in 0..(monthCount > 0 ? monthCount - 1 : 0) %}
|
||||
{% set projectedWeight = row and row.projectedWeights is defined ? (row.projectedWeights[idx] ?? null) : null %}
|
||||
<td class="row-month"{% if loop.index0 < 4 %} style="background:#e0e0e0;"{% endif %}>
|
||||
{{ projectedWeight is not null ? projectedWeight|round(0, 'common') : '' }}
|
||||
</td>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
<!-- =========================
|
||||
FOOTER (traitements / vaccins)
|
||||
========================= -->
|
||||
<table class="footer" style="border-collapse:collapse; margin-top: 32px">
|
||||
<tr>
|
||||
<td style="height: 20px; border: 0" colspan="4"></td>
|
||||
<td style="font-weight: 700" colspan="2">Grippe</td>
|
||||
<td style="font-weight: 700" colspan="2">Protivity</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="height: 20px">Date</td>
|
||||
<td>Antibiotique</td>
|
||||
<td>Date</td>
|
||||
<td>Antero</td>
|
||||
<td>Date</td>
|
||||
<td>Intranasale</td>
|
||||
<td>Date</td>
|
||||
<td>Rappel 30 jours</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="height: 20px"></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="height: 20px"></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -275,7 +275,7 @@
|
||||
<div class="meta">
|
||||
<p>Transporteur : {{ shipment.carrier ? shipment.carrier.name : '-' }}</p>
|
||||
<p>Mode d'expédition : {{ shipment.truck ? shipment.truck.name : '-' }}</p>
|
||||
<p>Immatriculation : {{ shipment.licensePlate ?? '-' }}</p>
|
||||
<p>Immatriculation : {{ shipment.licencePlate ?? '-' }}</p>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user