Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e208bcd893 | ||
| 3fe0bbf71e | |||
|
|
d566e5d9f7 | ||
| 5bb0aad620 | |||
|
|
19a29f854e | ||
| c21dcd1869 | |||
|
|
86cb3c276a | ||
| 08a17f91b3 |
@@ -82,7 +82,7 @@ frontend/
|
||||
|
||||
- Code en anglais ; "pont-bascule" est un terme métier conservé tel quel.
|
||||
- Les opérations API Platform sont définies directement sur les entités Doctrine.
|
||||
- Pas de classes Repository custom : utiliser `EntityManagerInterface` avec les repos par défaut.
|
||||
- Repository custom autorisé dès qu'on a une requête métier non-triviale (agrégations, jointures spécifiques, filtres multiples). Toujours via DQL/QueryBuilder, **jamais de SQL brut** (pas de `Connection::executeQuery`, `fetchAssociative`, etc.). Les CRUD basiques restent sur le repo Doctrine par défaut via `EntityManagerInterface`.
|
||||
- `config/reference.php` est auto-généré — ne pas modifier à la main.
|
||||
- Endpoints toujours au pluriel (convention API Platform).
|
||||
- Ne jamais créer de GET qui crée des ressources : utiliser POST + PATCH.
|
||||
|
||||
74
README.md
74
README.md
@@ -178,3 +178,77 @@ Pour suivre les logs en temps réel :
|
||||
|
||||
- tail -f var/log/dev.log
|
||||
- tail -f var/log/prod.log
|
||||
|
||||
## Feed des prix bovins
|
||||
|
||||
Une commande Symfony permet de mettre à jour le **poids à l'arrivée**, le **prix au kilo** et le **fournisseur** des bovins existants à partir d'un fichier XLSX. La commande **ne crée jamais de nouveau bovin** : elle complète seulement ceux déjà présents en BDD.
|
||||
|
||||
### Format du fichier XLSX attendu
|
||||
|
||||
Pas de ligne d'en-tête, 4 colonnes dans cet ordre :
|
||||
|
||||
| Colonne | Champ | Format | Exemple |
|
||||
|---------|-------|--------|---------|
|
||||
| A | Numéro national | Avec ou sans préfixe `FR ` (insensible casse) | `FR 7979580026` ou `7979580026` |
|
||||
| B | Fournisseur | Texte libre, casse ignorée | `TERRENA` |
|
||||
| C | Poids à l'arrivée (kg) | Entier | `368` |
|
||||
| D | Prix au kilo | Décimal | `5.7` |
|
||||
| E | Code bâtiment (optionnel) | `B1`, `B2`, `B3`, `ZT` (casse ignorée) | `B2` |
|
||||
|
||||
### Comportement
|
||||
|
||||
- **Numéro national** : le préfixe `FR` (avec ou sans espace) est retiré s'il est présent. Sinon la valeur est utilisée telle quelle.
|
||||
- **Bovin introuvable** en BDD → ligne ignorée, log warning à la fin avec aperçu.
|
||||
- **Fournisseur introuvable** en BDD → le bovin est mis à jour quand même avec `supplier = null`, log warning.
|
||||
- **Bâtiment** (colonne E) : recherché par `code` (insensible casse). Set uniquement si le bovin n'a pas déjà une `buildingCase` assignée (la case prime sur le bâtiment direct côté affichage). Si code introuvable → log warning, champ non set.
|
||||
- **Cellules `weight` / `price` vides ou non numériques** → champ non modifié.
|
||||
- La commande est **idempotente** : peut être relancée sans effet de bord.
|
||||
|
||||
### Lancement en dev
|
||||
|
||||
Copie le fichier dans la racine du projet (mappée dans le container sous `/var/www/html`), puis :
|
||||
|
||||
```bash
|
||||
# Simulation sans écriture en BDD
|
||||
docker compose exec php bin/console app:feed-bovine-prices /var/www/html/feed_bovin.xlsx --dry-run
|
||||
|
||||
# Persistance effective
|
||||
docker compose exec php bin/console app:feed-bovine-prices /var/www/html/feed_bovin.xlsx
|
||||
```
|
||||
|
||||
### Lancement en prod
|
||||
|
||||
Le user SSH n'a généralement pas les droits d'écriture sur `/var/www/ferme/` ; on passe donc le fichier par `/tmp` et on pointe la commande dessus (le chemin du XLSX est juste un argument).
|
||||
|
||||
```bash
|
||||
# 1. Copier le fichier sur le serveur dans /tmp (accessible en écriture)
|
||||
scp feed_bovin.xlsx <user>@<host>:/tmp/
|
||||
|
||||
# 2. SSH sur le serveur
|
||||
ssh <user>@<host>
|
||||
|
||||
# 3. Se placer dans le dossier de l'app (pour bin/console)
|
||||
cd /var/www/ferme
|
||||
|
||||
# 4. Dry-run pour vérifier sans rien écrire
|
||||
php bin/console app:feed-bovine-prices /tmp/feed_bovin.xlsx --dry-run
|
||||
|
||||
# 5. Persistance effective
|
||||
php bin/console app:feed-bovine-prices /tmp/feed_bovin.xlsx
|
||||
|
||||
# 6. Cleanup
|
||||
rm /tmp/feed_bovin.xlsx
|
||||
```
|
||||
|
||||
> Si à l'étape 4 le user PHP (souvent `www-data`) n'arrive pas à lire le fichier (`Permission denied`), donne-lui les droits de lecture avant : `chmod 644 /tmp/feed_bovin.xlsx`.
|
||||
|
||||
### Sortie attendue
|
||||
|
||||
À la fin, un tableau récapitule :
|
||||
|
||||
- Lignes totales lues
|
||||
- Bovins mis à jour
|
||||
- Bovins introuvables (avec aperçu des 10 premiers numéros)
|
||||
- Lignes invalides (numéro national vide)
|
||||
- Fournisseurs introuvables (avec liste et compte par nom)
|
||||
- Bâtiments introuvables (avec liste des codes inconnus)
|
||||
|
||||
@@ -1,4 +1,11 @@
|
||||
security:
|
||||
# Hiérarchie des rôles : ADMIN inclut BUREAU qui inclut USER.
|
||||
# Ajouter un nouveau rôle = ajouter une ligne ici (et son équivalent côté
|
||||
# front dans utils/roles.ts).
|
||||
role_hierarchy:
|
||||
ROLE_BUREAU: ROLE_USER
|
||||
ROLE_ADMIN: ROLE_BUREAU
|
||||
|
||||
# https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
|
||||
password_hashers:
|
||||
App\Entity\User: 'auto'
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
parameters:
|
||||
app.version: '0.0.89'
|
||||
app.version: '0.0.93'
|
||||
|
||||
96
frontend/components/inventory/inventory-export-modal.vue
Normal file
96
frontend/components/inventory/inventory-export-modal.vue
Normal file
@@ -0,0 +1,96 @@
|
||||
<template>
|
||||
<UiModal v-model="open" title="Exporter l'inventaire bovin" max-width="max-w-2xl">
|
||||
<p class="mb-5 text-sm text-slate-600">
|
||||
Aucun filtre coché : export complet (tous les bovins actifs).
|
||||
</p>
|
||||
|
||||
<div class="mb-5">
|
||||
<h3 class="mb-3 text-sm font-semibold uppercase tracking-wide text-slate-600">
|
||||
Tranches d'âge
|
||||
</h3>
|
||||
<div class="flex flex-col gap-2">
|
||||
<label
|
||||
v-for="bucket in ageBuckets"
|
||||
:key="bucket.value"
|
||||
class="flex items-center gap-3 cursor-pointer text-primary-700"
|
||||
>
|
||||
<input
|
||||
v-model="filters.ageRanges"
|
||||
type="checkbox"
|
||||
:value="bucket.value"
|
||||
class="h-4 w-4 cursor-pointer accent-primary-500"
|
||||
/>
|
||||
<span :class="['inline-block rounded px-2 py-0.5 text-xs font-semibold text-white', bucket.colorClass]">
|
||||
{{ bucket.badge }}
|
||||
</span>
|
||||
<span>{{ bucket.label }}</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<div class="flex justify-center">
|
||||
<button
|
||||
type="button"
|
||||
:disabled="loading"
|
||||
class="inline-flex h-[50px] items-center justify-center gap-2 rounded bg-primary-500 px-6 text-base text-white uppercase hover:opacity-80 disabled:cursor-not-allowed disabled:opacity-60"
|
||||
@click="onSubmit"
|
||||
>
|
||||
<Icon
|
||||
v-if="loading"
|
||||
name="mdi:loading"
|
||||
size="20"
|
||||
class="animate-spin"
|
||||
/>
|
||||
<Icon v-else name="mdi:file-excel-outline" size="20" />
|
||||
Exporter
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
</UiModal>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, reactive, watch } from 'vue'
|
||||
|
||||
export interface InventoryExportFilters {
|
||||
ageRanges: string[]
|
||||
}
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
modelValue: boolean
|
||||
loading?: boolean
|
||||
}>(), {
|
||||
loading: false
|
||||
})
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:modelValue', value: boolean): void
|
||||
(e: 'submit', filters: InventoryExportFilters): void
|
||||
}>()
|
||||
|
||||
const open = computed({
|
||||
get: () => props.modelValue,
|
||||
set: (value: boolean) => emit('update:modelValue', value)
|
||||
})
|
||||
|
||||
const ageBuckets = [
|
||||
{ value: 'over24', label: '≥ 24 mois', badge: '24+', colorClass: 'bg-red-500' },
|
||||
{ value: 'between22And24', label: '22 à 24 mois', badge: '22-24', colorClass: 'bg-orange-500' },
|
||||
{ value: 'between20And22', label: '20 à 22 mois', badge: '20-22', colorClass: 'bg-yellow-500' }
|
||||
]
|
||||
|
||||
const filters = reactive<InventoryExportFilters>({
|
||||
ageRanges: []
|
||||
})
|
||||
|
||||
watch(open, (isOpen) => {
|
||||
if (isOpen) {
|
||||
filters.ageRanges = []
|
||||
}
|
||||
})
|
||||
|
||||
const onSubmit = () => {
|
||||
emit('submit', { ageRanges: [...filters.ageRanges] })
|
||||
}
|
||||
</script>
|
||||
96
frontend/components/ui/UiModal.vue
Normal file
96
frontend/components/ui/UiModal.vue
Normal file
@@ -0,0 +1,96 @@
|
||||
<template>
|
||||
<Teleport to="body">
|
||||
<Transition
|
||||
enter-active-class="transition duration-150 ease-out"
|
||||
enter-from-class="opacity-0"
|
||||
enter-to-class="opacity-100"
|
||||
leave-active-class="transition duration-100 ease-in"
|
||||
leave-from-class="opacity-100"
|
||||
leave-to-class="opacity-0"
|
||||
>
|
||||
<div
|
||||
v-if="modelValue"
|
||||
class="fixed inset-0 z-40 flex items-center justify-center bg-black/50 px-4"
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
@mousedown.self="closeOnBackdrop"
|
||||
>
|
||||
<div
|
||||
class="w-full rounded-md bg-white shadow-2xl"
|
||||
:class="maxWidth"
|
||||
@mousedown.stop
|
||||
>
|
||||
<div class="flex items-center justify-between border-b border-slate-200 px-6 py-4">
|
||||
<h2 class="text-xl font-bold uppercase text-primary-500">{{ title }}</h2>
|
||||
<button
|
||||
type="button"
|
||||
class="text-slate-500 hover:text-primary-500 flex items-center"
|
||||
aria-label="Fermer"
|
||||
@click="close"
|
||||
>
|
||||
<Icon name="mdi:close" size="24" />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="px-6 py-5">
|
||||
<slot />
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="$slots.footer"
|
||||
class="border-t border-slate-200 px-6 py-4"
|
||||
>
|
||||
<slot name="footer" :close="close" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</Transition>
|
||||
</Teleport>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { onMounted, onBeforeUnmount, watch } from 'vue'
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
modelValue: boolean
|
||||
title?: string
|
||||
closeOnBackdropClick?: boolean
|
||||
maxWidth?: string
|
||||
}>(), {
|
||||
title: '',
|
||||
closeOnBackdropClick: true,
|
||||
maxWidth: 'max-w-lg'
|
||||
})
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:modelValue', value: boolean): void
|
||||
}>()
|
||||
|
||||
const close = () => emit('update:modelValue', false)
|
||||
|
||||
const closeOnBackdrop = () => {
|
||||
if (props.closeOnBackdropClick) close()
|
||||
}
|
||||
|
||||
const onKeydown = (event: KeyboardEvent) => {
|
||||
if (event.key === 'Escape' && props.modelValue) close()
|
||||
}
|
||||
|
||||
watch(() => props.modelValue, (open) => {
|
||||
if (typeof document === 'undefined') return
|
||||
document.body.style.overflow = open ? 'hidden' : ''
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
if (typeof document !== 'undefined') {
|
||||
document.addEventListener('keydown', onKeydown)
|
||||
}
|
||||
})
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
if (typeof document !== 'undefined') {
|
||||
document.removeEventListener('keydown', onKeydown)
|
||||
document.body.style.overflow = ''
|
||||
}
|
||||
})
|
||||
</script>
|
||||
88
frontend/composables/useBovineColumns.ts
Normal file
88
frontend/composables/useBovineColumns.ts
Normal file
@@ -0,0 +1,88 @@
|
||||
import { computed } from 'vue'
|
||||
import { useAuthStore } from '~/stores/auth'
|
||||
|
||||
export interface BovineColumn {
|
||||
key: string
|
||||
label: string
|
||||
width?: string
|
||||
}
|
||||
|
||||
export interface UseBovineColumnsOptions {
|
||||
/**
|
||||
* 'inventory' (par défaut) : colonnes complètes incluant Bâtiment + Case.
|
||||
* 'case' : pas de Bâtiment ni Case (déjà dans le titre de la page),
|
||||
* largeurs élargies pour combler l'espace.
|
||||
*/
|
||||
variant?: 'inventory' | 'case'
|
||||
}
|
||||
|
||||
/**
|
||||
* Définition partagée des colonnes des tableaux bovins (inventory + case).
|
||||
* 4 variants : avec/sans colonnes prix × inventory/case.
|
||||
*
|
||||
* Les colonnes Prix/kg et Prix total sont visibles pour les rôles BUREAU
|
||||
* et ADMIN (BUREAU hérite ses droits price-visibility, ADMIN hérite de BUREAU).
|
||||
*/
|
||||
export const useBovineColumns = (options: UseBovineColumnsOptions = {}) => {
|
||||
const auth = useAuthStore()
|
||||
|
||||
const withPricesInventory: BovineColumn[] = [
|
||||
{ key: 'nationalNumber', label: 'N° National', width: '80px' },
|
||||
{ key: 'workNumber', label: 'N° Travail', width: '60px' },
|
||||
{ key: 'sex', label: 'Sexe', width: '70px' },
|
||||
{ key: 'birthDate', label: 'Né le', width: '72px' },
|
||||
{ key: 'age', label: 'Age', width: '110px' },
|
||||
{ key: 'bovineType.label', label: 'Race', width: '90px' },
|
||||
{ key: 'buildingCase.building.label', label: 'Bâtiment', width: '1fr' },
|
||||
{ key: 'buildingCase.caseNumber', label: 'Case', width: '42px' },
|
||||
{ key: 'arrivalDate', label: 'Entrée le', width: '90px' },
|
||||
{ key: 'pricePerKg', label: 'Prix/kg', width: '65px' },
|
||||
{ key: 'finalPrice', label: 'Prix total', width: '80px' }
|
||||
]
|
||||
|
||||
const withoutPricesInventory: BovineColumn[] = [
|
||||
{ key: 'nationalNumber', label: 'N° National', width: '80px' },
|
||||
{ key: 'workNumber', label: 'N° Travail', width: '60px' },
|
||||
{ key: 'sex', label: 'Sexe', width: '70px' },
|
||||
{ key: 'birthDate', label: 'Né le', width: '72px' },
|
||||
{ key: 'age', label: 'Age', width: '110px' },
|
||||
{ key: 'bovineType.label', label: 'Race', width: '1fr' },
|
||||
{ key: 'buildingCase.building.label', label: 'Bâtiment', width: '120px' },
|
||||
{ key: 'buildingCase.caseNumber', label: 'Case', width: '42px' },
|
||||
{ key: 'arrivalDate', label: 'Entrée le', width: '90px' }
|
||||
]
|
||||
|
||||
const withPricesCase: BovineColumn[] = [
|
||||
{ key: 'nationalNumber', label: 'N° National', width: '110px' },
|
||||
{ key: 'workNumber', label: 'N° Travail', width: '85px' },
|
||||
{ key: 'sex', label: 'Sexe', width: '90px' },
|
||||
{ key: 'birthDate', label: 'Né le', width: '100px' },
|
||||
{ key: 'age', label: 'Age', width: '90px' },
|
||||
{ key: 'bovineType.label', label: 'Race', width: '1fr' },
|
||||
{ key: 'arrivalDate', label: 'Entrée le', width: '110px' },
|
||||
{ key: 'pricePerKg', label: 'Prix/kg', width: '85px' },
|
||||
{ key: 'finalPrice', label: 'Prix total', width: '105px' }
|
||||
]
|
||||
|
||||
const withoutPricesCase: BovineColumn[] = [
|
||||
{ key: 'nationalNumber', label: 'N° National', width: '130px' },
|
||||
{ key: 'workNumber', label: 'N° Travail', width: '100px' },
|
||||
{ key: 'sex', label: 'Sexe', width: '110px' },
|
||||
{ key: 'birthDate', label: 'Né le', width: '140px' },
|
||||
{ key: 'age', label: 'Age', width: '130px' },
|
||||
{ key: 'bovineType.label', label: 'Race', width: '1fr' },
|
||||
{ key: 'arrivalDate', label: 'Entrée le', width: '170px' }
|
||||
]
|
||||
|
||||
const columns = computed<BovineColumn[]>(() => {
|
||||
const isCase = options.variant === 'case'
|
||||
const seePrice = auth.isBureau
|
||||
|
||||
if (isCase) {
|
||||
return seePrice ? withPricesCase : withoutPricesCase
|
||||
}
|
||||
return seePrice ? withPricesInventory : withoutPricesInventory
|
||||
})
|
||||
|
||||
return { columns }
|
||||
}
|
||||
27
frontend/middleware/admin-guard.global.ts
Normal file
27
frontend/middleware/admin-guard.global.ts
Normal file
@@ -0,0 +1,27 @@
|
||||
import { useAuthStore } from '~/stores/auth'
|
||||
|
||||
/**
|
||||
* Garde-fou global : empêche les utilisateurs non-admin d'accéder aux pages
|
||||
* sous /admin/*. Renvoie vers la home pour les utilisateurs authentifiés
|
||||
* non-admin, et vers /login pour les non authentifiés.
|
||||
*
|
||||
* L'API back rejette de toute façon les actions admin avec un 403, mais ce
|
||||
* middleware évite l'affichage des pages vides / en erreur quand un user
|
||||
* tape directement l'URL /admin/...
|
||||
*/
|
||||
export default defineNuxtRouteMiddleware(async (to) => {
|
||||
if (!to.path.startsWith('/admin')) {
|
||||
return
|
||||
}
|
||||
|
||||
const auth = useAuthStore()
|
||||
await auth.ensureSession()
|
||||
|
||||
if (!auth.isAuthenticated) {
|
||||
return navigateTo('/login')
|
||||
}
|
||||
|
||||
if (!auth.isAdmin) {
|
||||
return navigateTo('/')
|
||||
}
|
||||
})
|
||||
@@ -33,7 +33,22 @@
|
||||
</NuxtLink>
|
||||
</div>
|
||||
|
||||
<div class="mt-8 mb-16">
|
||||
<div class="flex flex-wrap gap-3 mt-4">
|
||||
<div class="flex items-center gap-3 rounded-md bg-red-500 px-4 py-2">
|
||||
<span class="text-2xl font-bold text-white">{{ stats.over24 }}</span>
|
||||
<span class="text-sm uppercase tracking-wide text-white">≥ 24 mois</span>
|
||||
</div>
|
||||
<div class="flex items-center gap-3 rounded-md bg-orange-500 px-4 py-2">
|
||||
<span class="text-2xl font-bold text-white">{{ stats.between22And24 }}</span>
|
||||
<span class="text-sm uppercase tracking-wide text-white">22 – 24 mois</span>
|
||||
</div>
|
||||
<div class="flex items-center gap-3 rounded-md bg-yellow-500 px-4 py-2">
|
||||
<span class="text-2xl font-bold text-white">{{ stats.between20And22 }}</span>
|
||||
<span class="text-sm uppercase tracking-wide text-white">20 – 22 mois</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mt-6 mb-16">
|
||||
<UiDataTable
|
||||
v-model:page="page"
|
||||
v-model:per-page="perPage"
|
||||
@@ -41,7 +56,6 @@
|
||||
:items="items"
|
||||
:total-items="totalItems"
|
||||
:loading="loading"
|
||||
:row-class="rowClass"
|
||||
:row-clickable="auth.isAdmin"
|
||||
empty-message="Aucun bovin dans cette case."
|
||||
@row-click="goToBovine"
|
||||
@@ -74,19 +88,19 @@
|
||||
<template #header-age>
|
||||
<UiTextInput :model-value="''" placeholder="Age" size="compact" disabled />
|
||||
</template>
|
||||
<template #header-breedCode>
|
||||
<template #header-pricePerKg>
|
||||
<UiTextInput :model-value="''" placeholder="Prix/kg" size="compact" disabled />
|
||||
</template>
|
||||
<template #header-finalPrice>
|
||||
<UiTextInput :model-value="''" placeholder="Prix total" size="compact" disabled />
|
||||
</template>
|
||||
<template #header-bovineType.label>
|
||||
<UiTextInput
|
||||
v-model="filters.breedCode"
|
||||
v-model="filters['bovineType.label']"
|
||||
placeholder="Race"
|
||||
size="compact"
|
||||
/>
|
||||
</template>
|
||||
<template #header-buildingCase.building.label>
|
||||
<UiTextInput :model-value="''" placeholder="Bâtiment" size="compact" disabled />
|
||||
</template>
|
||||
<template #header-buildingCase.caseNumber>
|
||||
<UiTextInput :model-value="''" placeholder="Case" size="compact" disabled />
|
||||
</template>
|
||||
<template #header-arrivalDate>
|
||||
<UiDateMaskedInput v-model="arrivalDateFilter" size="compact" placeholder="Entrée le" />
|
||||
</template>
|
||||
@@ -94,16 +108,21 @@
|
||||
{{ formatDate(item.birthDate) }}
|
||||
</template>
|
||||
<template #cell-age="{ item }">
|
||||
{{ formatAgeLabel(item.ageMonths) }}
|
||||
<span
|
||||
class="inline-block rounded px-2 py-0.5 font-semibold"
|
||||
:class="ageBadgeClass(item.ageMonths)"
|
||||
>
|
||||
{{ formatAgeLabel(item.ageMonths) }}
|
||||
</span>
|
||||
</template>
|
||||
<template #cell-arrivalDate="{ item }">
|
||||
{{ formatDate(item.arrivalDate) }}
|
||||
</template>
|
||||
<template #cell-buildingCase.building.label="{ item }">
|
||||
{{ item.buildingCase?.building?.label ?? '—' }}
|
||||
<template #cell-pricePerKg="{ item }">
|
||||
{{ formatPrice(item.pricePerKg) }}
|
||||
</template>
|
||||
<template #cell-buildingCase.caseNumber="{ item }">
|
||||
{{ item.buildingCase?.caseNumber ?? '—' }}
|
||||
<template #cell-finalPrice="{ item }">
|
||||
{{ formatPrice(item.finalPrice) }}
|
||||
</template>
|
||||
</UiDataTable>
|
||||
</div>
|
||||
@@ -115,7 +134,8 @@ import type { BuildingCaseData } from '~/services/dto/building-case-data'
|
||||
import type { BovineData } from '~/services/dto/bovine-data'
|
||||
import { useAuthStore } from '~/stores/auth'
|
||||
import { useDataTableServerState } from '~/composables/useDataTableServerState'
|
||||
import { formatAgeLabel } from '~/utils/bovine-age'
|
||||
import { useBovineColumns } from '~/composables/useBovineColumns'
|
||||
import { formatAgeLabel, ageBadgeClass } from '~/utils/bovine-age'
|
||||
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
@@ -128,6 +148,34 @@ const hasCaseId = computed(() => Number.isFinite(caseId.value) && caseId.value >
|
||||
|
||||
const buildingCase = ref<BuildingCaseData | null>(null)
|
||||
|
||||
interface InventoryStats {
|
||||
total: number
|
||||
over24: number
|
||||
between22And24: number
|
||||
between20And22: number
|
||||
}
|
||||
|
||||
const stats = ref<InventoryStats>({
|
||||
total: 0,
|
||||
over24: 0,
|
||||
between22And24: 0,
|
||||
between20And22: 0
|
||||
})
|
||||
|
||||
const loadStats = async () => {
|
||||
if (!hasCaseId.value) {
|
||||
stats.value = { total: 0, over24: 0, between22And24: 0, between20And22: 0 }
|
||||
return
|
||||
}
|
||||
try {
|
||||
stats.value = await api.get<InventoryStats>('bovines/inventory-stats', {
|
||||
buildingCaseId: caseId.value
|
||||
}, { toast: false })
|
||||
} catch {
|
||||
// silencieux
|
||||
}
|
||||
}
|
||||
|
||||
const { items, totalItems, page, perPage, filters, loading, reload } =
|
||||
useDataTableServerState<BovineData>(
|
||||
'bovines',
|
||||
@@ -136,7 +184,7 @@ const { items, totalItems, page, perPage, filters, loading, reload } =
|
||||
buildingCase: '',
|
||||
nationalNumber: '',
|
||||
workNumber: '',
|
||||
breedCode: '',
|
||||
'bovineType.label': '',
|
||||
sex: '',
|
||||
'arrivalDate[after]': '',
|
||||
'arrivalDate[strictly_before]': '',
|
||||
@@ -174,17 +222,7 @@ const singleDateFilter = (afterKey: string, beforeKey: string) =>
|
||||
const arrivalDateFilter = singleDateFilter('arrivalDate[after]', 'arrivalDate[strictly_before]')
|
||||
const birthDateFilter = singleDateFilter('birthDate[after]', 'birthDate[strictly_before]')
|
||||
|
||||
const columns = [
|
||||
{ key: 'nationalNumber', label: 'N° National', width: '160px' },
|
||||
{ key: 'workNumber', label: 'N° Travail', width: '85px' },
|
||||
{ key: 'sex', label: 'Sexe', width: '70px' },
|
||||
{ key: 'birthDate', label: 'Né le', width: '120px' },
|
||||
{ key: 'age', label: 'Age', width: '110px' },
|
||||
{ key: 'breedCode', label: 'Race' },
|
||||
{ key: 'buildingCase.building.label', label: 'Bâtiment', width: '1.5fr' },
|
||||
{ key: 'buildingCase.caseNumber', label: 'Case', width: '80px' },
|
||||
{ key: 'arrivalDate', label: 'Entrée le', width: '120px' }
|
||||
]
|
||||
const { columns } = useBovineColumns({ variant: 'case' })
|
||||
|
||||
const title = computed(() => {
|
||||
if (!buildingCase.value) return ''
|
||||
@@ -209,14 +247,12 @@ const formatDate = (date: string | null) => {
|
||||
})
|
||||
}
|
||||
|
||||
const rowClass = (item: BovineData): string => {
|
||||
if (item.ageMonths === null || item.ageMonths === undefined) return ''
|
||||
if (item.ageMonths >= 24) return 'bg-violet-300 hover:bg-violet-400'
|
||||
if (item.ageMonths >= 22) return 'bg-red-300 hover:bg-red-400'
|
||||
if (item.ageMonths >= 20) return 'bg-orange-300 hover:bg-orange-400'
|
||||
return ''
|
||||
const formatPrice = (price: number | null) => {
|
||||
if (price === null || price === undefined) return '—'
|
||||
return `${price.toLocaleString('fr-FR', { minimumFractionDigits: 2, maximumFractionDigits: 2 })} €`
|
||||
}
|
||||
|
||||
|
||||
const loadCase = async () => {
|
||||
if (!hasCaseId.value) {
|
||||
buildingCase.value = null
|
||||
@@ -247,6 +283,7 @@ watch(caseId, (id) => {
|
||||
}
|
||||
filters.value.buildingCase = `/api/building_cases/${id}`
|
||||
loadCase()
|
||||
loadStats()
|
||||
reload()
|
||||
}, { immediate: true })
|
||||
</script>
|
||||
|
||||
@@ -13,16 +13,17 @@
|
||||
<h1 class="font-bold text-3xl uppercase text-primary-500">Inventaire bovins</h1>
|
||||
<span class="text-lg text-slate-500">({{ totalItems }} bovin{{ totalItems > 1 ? 's' : '' }})</span>
|
||||
<div
|
||||
v-if="auth.isBureau"
|
||||
class="bg-primary-500 p-1 rounded-md flex items-center cursor-pointer hover:opacity-80"
|
||||
:class="exporting ? 'cursor-not-allowed opacity-60' : ''"
|
||||
title="Exporter en Excel"
|
||||
@click="exportInventory"
|
||||
@click="showExportModal = true"
|
||||
>
|
||||
<Icon name="mdi:file-excel-outline" size="32" class="text-white" />
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
v-if="auth.isAdmin"
|
||||
v-if="auth.isBureau"
|
||||
type="button"
|
||||
:disabled="syncing"
|
||||
class="inline-flex items-center justify-center text-xl text-white uppercase bg-primary-500 h-[50px] px-6 rounded hover:opacity-80 gap-2 disabled:cursor-not-allowed disabled:opacity-60"
|
||||
@@ -34,17 +35,17 @@
|
||||
</div>
|
||||
|
||||
<div class="flex flex-wrap gap-3 mt-4">
|
||||
<div class="flex items-center gap-3 rounded-md border-2 border-violet-300 px-4 py-2">
|
||||
<span class="text-2xl font-bold text-violet-700">{{ stats.over24 }}</span>
|
||||
<span class="text-sm uppercase tracking-wide text-violet-700">≥ 24 mois</span>
|
||||
<div class="flex items-center gap-3 rounded-md bg-red-500 px-4 py-2">
|
||||
<span class="text-2xl font-bold text-white">{{ stats.over24 }}</span>
|
||||
<span class="text-sm uppercase tracking-wide text-white">≥ 24 mois</span>
|
||||
</div>
|
||||
<div class="flex items-center gap-3 rounded-md border-2 border-red-300 px-4 py-2">
|
||||
<span class="text-2xl font-bold text-red-700">{{ stats.between22And24 }}</span>
|
||||
<span class="text-sm uppercase tracking-wide text-red-700">22 – 24 mois</span>
|
||||
<div class="flex items-center gap-3 rounded-md bg-orange-500 px-4 py-2">
|
||||
<span class="text-2xl font-bold text-white">{{ stats.between22And24 }}</span>
|
||||
<span class="text-sm uppercase tracking-wide text-white">22 – 24 mois</span>
|
||||
</div>
|
||||
<div class="flex items-center gap-3 rounded-md border-2 border-orange-300 px-4 py-2">
|
||||
<span class="text-2xl font-bold text-orange-700">{{ stats.between20And22 }}</span>
|
||||
<span class="text-sm uppercase tracking-wide text-orange-700">20 – 22 mois</span>
|
||||
<div class="flex items-center gap-3 rounded-md bg-yellow-500 px-4 py-2">
|
||||
<span class="text-2xl font-bold text-white">{{ stats.between20And22 }}</span>
|
||||
<span class="text-sm uppercase tracking-wide text-white">20 – 22 mois</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -56,7 +57,6 @@
|
||||
:items="items"
|
||||
:total-items="totalItems"
|
||||
:loading="loading"
|
||||
:row-class="rowClass"
|
||||
>
|
||||
<template #header-nationalNumber>
|
||||
<UiTextInput
|
||||
@@ -83,9 +83,9 @@
|
||||
<template #header-birthDate>
|
||||
<UiDateMaskedInput v-model="birthDateFilter" size="compact" placeholder="Né le" />
|
||||
</template>
|
||||
<template #header-breedCode>
|
||||
<template #header-bovineType.label>
|
||||
<UiTextInput
|
||||
v-model="filters.breedCode"
|
||||
v-model="filters['bovineType.label']"
|
||||
placeholder="Race"
|
||||
size="compact"
|
||||
/>
|
||||
@@ -102,32 +102,57 @@
|
||||
<template #header-age>
|
||||
<UiTextInput :model-value="''" placeholder="Age" size="compact" disabled />
|
||||
</template>
|
||||
<template #header-pricePerKg>
|
||||
<UiTextInput :model-value="''" placeholder="Prix/kg" size="compact" disabled />
|
||||
</template>
|
||||
<template #header-finalPrice>
|
||||
<UiTextInput :model-value="''" placeholder="Prix total" size="compact" disabled />
|
||||
</template>
|
||||
<template #cell-birthDate="{ item }">
|
||||
{{ formatDate(item.birthDate) }}
|
||||
</template>
|
||||
<template #cell-age="{ item }">
|
||||
{{ formatAgeLabel(item.ageMonths) }}
|
||||
<span
|
||||
class="inline-block rounded px-2 py-0.5 font-semibold"
|
||||
:class="ageBadgeClass(item.ageMonths)"
|
||||
>
|
||||
{{ formatAgeLabel(item.ageMonths) }}
|
||||
</span>
|
||||
</template>
|
||||
<template #cell-arrivalDate="{ item }">
|
||||
{{ formatDate(item.arrivalDate) }}
|
||||
</template>
|
||||
<template #cell-buildingCase.building.label="{ item }">
|
||||
{{ item.buildingCase?.building?.label ?? '—' }}
|
||||
{{ item.effectiveBuilding?.label ?? '—' }}
|
||||
</template>
|
||||
<template #cell-buildingCase.caseNumber="{ item }">
|
||||
{{ item.buildingCase?.caseNumber ?? '—' }}
|
||||
</template>
|
||||
<template #cell-pricePerKg="{ item }">
|
||||
{{ formatPrice(item.pricePerKg) }}
|
||||
</template>
|
||||
<template #cell-finalPrice="{ item }">
|
||||
{{ formatPrice(item.finalPrice) }}
|
||||
</template>
|
||||
</UiDataTable>
|
||||
</div>
|
||||
|
||||
<InventoryExportModal
|
||||
v-model="showExportModal"
|
||||
:loading="exporting"
|
||||
@submit="exportInventory"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
<script setup lang="ts">
|
||||
import type { BovineData } from '~/services/dto/bovine-data'
|
||||
import type { InventoryExportFilters } from '~/components/inventory/inventory-export-modal.vue'
|
||||
import { useAuthStore } from '~/stores/auth'
|
||||
import { useDataTableServerState } from '~/composables/useDataTableServerState'
|
||||
import { formatAgeLabel } from '~/utils/bovine-age'
|
||||
import { useBovineColumns } from '~/composables/useBovineColumns'
|
||||
import { formatAgeLabel, ageBadgeClass } from '~/utils/bovine-age'
|
||||
|
||||
const router = useRouter()
|
||||
const auth = useAuthStore()
|
||||
@@ -165,12 +190,17 @@ const loadStats = async () => {
|
||||
|
||||
const syncing = ref(false)
|
||||
const exporting = ref(false)
|
||||
const showExportModal = ref(false)
|
||||
|
||||
const exportInventory = async () => {
|
||||
const exportInventory = async (filters: InventoryExportFilters) => {
|
||||
if (exporting.value) return
|
||||
exporting.value = true
|
||||
try {
|
||||
const blob = await api.getBlob('bovines/inventory-export')
|
||||
const query: Record<string, unknown> = {}
|
||||
if (filters.ageRanges.length > 0) {
|
||||
query.ageRanges = filters.ageRanges.join(',')
|
||||
}
|
||||
const blob = await api.getBlob('bovines/inventory-export', query)
|
||||
const filename = `inventaire_bovins_${new Date().toISOString().slice(0, 10)}.xlsx`
|
||||
const url = URL.createObjectURL(blob)
|
||||
const a = document.createElement('a')
|
||||
@@ -181,6 +211,7 @@ const exportInventory = async () => {
|
||||
a.click()
|
||||
a.remove()
|
||||
setTimeout(() => URL.revokeObjectURL(url), 60_000)
|
||||
showExportModal.value = false
|
||||
} catch {
|
||||
// toast déjà géré par useApi onResponseError
|
||||
} finally {
|
||||
@@ -218,7 +249,7 @@ const { items, totalItems, page, perPage, filters, loading, reload } =
|
||||
'exists[exitedAt]': 'false',
|
||||
nationalNumber: '',
|
||||
workNumber: '',
|
||||
breedCode: '',
|
||||
'bovineType.label': '',
|
||||
sex: '',
|
||||
'arrivalDate[after]': '',
|
||||
'arrivalDate[strictly_before]': '',
|
||||
@@ -255,17 +286,7 @@ const singleDateFilter = (afterKey: string, beforeKey: string) =>
|
||||
const arrivalDateFilter = singleDateFilter('arrivalDate[after]', 'arrivalDate[strictly_before]')
|
||||
const birthDateFilter = singleDateFilter('birthDate[after]', 'birthDate[strictly_before]')
|
||||
|
||||
const columns = [
|
||||
{ key: 'nationalNumber', label: 'N° National', width: '160px' },
|
||||
{ key: 'workNumber', label: 'N° Travail', width: '85px' },
|
||||
{ key: 'sex', label: 'Sexe', width: '70px' },
|
||||
{ key: 'birthDate', label: 'Né le', width: '120px' },
|
||||
{ key: 'age', label: 'Age', width: '110px' },
|
||||
{ key: 'breedCode', label: 'Race' },
|
||||
{ key: 'buildingCase.building.label', label: 'Bâtiment', width: '1.5fr' },
|
||||
{ key: 'buildingCase.caseNumber', label: 'Case', width: '80px' },
|
||||
{ key: 'arrivalDate', label: 'Entrée le', width: '120px' }
|
||||
]
|
||||
const { columns } = useBovineColumns()
|
||||
|
||||
const formatDate = (date: string | null) => {
|
||||
if (!date) return '—'
|
||||
@@ -278,14 +299,12 @@ const formatDate = (date: string | null) => {
|
||||
})
|
||||
}
|
||||
|
||||
const rowClass = (item: BovineData): string => {
|
||||
if (item.ageMonths === null || item.ageMonths === undefined) return ''
|
||||
if (item.ageMonths >= 24) return 'bg-violet-300 hover:bg-violet-400'
|
||||
if (item.ageMonths >= 22) return 'bg-red-300 hover:bg-red-400'
|
||||
if (item.ageMonths >= 20) return 'bg-orange-300 hover:bg-orange-400'
|
||||
return ''
|
||||
const formatPrice = (price: number | null) => {
|
||||
if (price === null || price === undefined) return '—'
|
||||
return `${price.toLocaleString('fr-FR', { minimumFractionDigits: 2, maximumFractionDigits: 2 })} €`
|
||||
}
|
||||
|
||||
|
||||
onMounted(() => {
|
||||
reload()
|
||||
loadStats()
|
||||
|
||||
@@ -1,19 +1,27 @@
|
||||
export interface BovineBuildingRef {
|
||||
label: string
|
||||
}
|
||||
|
||||
export interface BovineBuildingCaseRef {
|
||||
caseNumber: number | null
|
||||
building: { label: string } | null
|
||||
building: BovineBuildingRef | null
|
||||
}
|
||||
|
||||
export interface BovineData {
|
||||
id: number
|
||||
nationalNumber: string
|
||||
receivedWeight: number | null
|
||||
pricePerKg: number | null
|
||||
finalPrice: number | null
|
||||
arrivalDate: string | null
|
||||
exitDate: string | null
|
||||
buildingCase: BovineBuildingCaseRef | null
|
||||
building: BovineBuildingRef | null
|
||||
effectiveBuilding: BovineBuildingRef | null
|
||||
supplier: string | null
|
||||
workNumber: string | null
|
||||
birthDate: string | null
|
||||
breedCode: string | null
|
||||
bovineType: { id: number; label: string; code: string } | null
|
||||
sex: string | null
|
||||
ageMonths: number | null
|
||||
exitedAt: string | null
|
||||
@@ -22,6 +30,7 @@ export interface BovineData {
|
||||
export type BovinePayload = {
|
||||
nationalNumber?: string
|
||||
receivedWeight?: number | null
|
||||
pricePerKg?: number | null
|
||||
arrivalDate?: string | null
|
||||
buildingCase?: string | null
|
||||
supplier?: string | null
|
||||
|
||||
@@ -2,7 +2,7 @@ import {defineStore} from 'pinia'
|
||||
import type {UserData} from '~/services/dto/user-data'
|
||||
import {getCurrentUser, createUser, updateUser, login, logout} from '~/services/auth'
|
||||
import type {UserPayload} from "~/services/dto/user-data";
|
||||
import {ROLE} from '~/utils/constants'
|
||||
import {userHasRole} from '~/utils/roles'
|
||||
|
||||
export const useAuthStore = defineStore('auth', {
|
||||
state: () => ({
|
||||
@@ -12,7 +12,9 @@ export const useAuthStore = defineStore('auth', {
|
||||
}),
|
||||
getters: {
|
||||
isAuthenticated: (state) => Boolean(state.user),
|
||||
isAdmin: (state) => Boolean(state.user?.roles?.includes(ROLE[0].value))
|
||||
hasRole: (state) => (role: string): boolean => userHasRole(state.user?.roles, role),
|
||||
isAdmin: (state) => userHasRole(state.user?.roles, 'ROLE_ADMIN'),
|
||||
isBureau: (state) => userHasRole(state.user?.roles, 'ROLE_BUREAU')
|
||||
},
|
||||
actions: {
|
||||
clearSession() {
|
||||
|
||||
@@ -8,3 +8,11 @@ export const formatAgeLabel = (months: number | null | undefined): string => {
|
||||
if (!label) label = '< 1 mois'
|
||||
return label
|
||||
}
|
||||
|
||||
export const ageBadgeClass = (months: number | null | undefined): string => {
|
||||
if (months === null || months === undefined) return ''
|
||||
if (months >= 24) return 'bg-red-500 text-white'
|
||||
if (months >= 22) return 'bg-orange-500 text-white'
|
||||
if (months >= 20) return 'bg-yellow-500 text-white'
|
||||
return ''
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ export const MERCHANDISE_TYPE_CODES = {
|
||||
|
||||
export const ROLE = [
|
||||
{ label: 'Administrateur', value: 'ROLE_ADMIN' },
|
||||
{ label: 'Bureau', value: 'ROLE_BUREAU' },
|
||||
{ label: 'Utilisateur', value: 'ROLE_USER' }
|
||||
]
|
||||
export const SUPPLIER_CODE = {
|
||||
|
||||
38
frontend/utils/roles.ts
Normal file
38
frontend/utils/roles.ts
Normal file
@@ -0,0 +1,38 @@
|
||||
/**
|
||||
* Hiérarchie des rôles côté front. Doit rester synchronisée avec
|
||||
* `role_hierarchy` dans config/packages/security.yaml côté back.
|
||||
*
|
||||
* Pour ajouter un nouveau rôle :
|
||||
* 1. Ajouter une entrée ici (son rôle parent dans la chaîne)
|
||||
* 2. Ajouter `ROLE_X: ROLE_Y` dans security.yaml côté back
|
||||
* 3. Ajouter le rôle dans `ROLE` (utils/constants.ts) pour le form admin
|
||||
*/
|
||||
export const ROLE_HIERARCHY: Record<string, string[]> = {
|
||||
ROLE_ADMIN: ['ROLE_BUREAU'],
|
||||
ROLE_BUREAU: ['ROLE_USER'],
|
||||
ROLE_USER: []
|
||||
}
|
||||
|
||||
/**
|
||||
* Retourne l'ensemble des rôles effectifs en expansant la hiérarchie.
|
||||
* Ex : ['ROLE_ADMIN'] → Set { 'ROLE_ADMIN', 'ROLE_BUREAU', 'ROLE_USER' }.
|
||||
*/
|
||||
export const expandRoles = (roles: string[]): Set<string> => {
|
||||
const expanded = new Set<string>(roles)
|
||||
const visit = (role: string): void => {
|
||||
const parents = ROLE_HIERARCHY[role] ?? []
|
||||
for (const parent of parents) {
|
||||
if (!expanded.has(parent)) {
|
||||
expanded.add(parent)
|
||||
visit(parent)
|
||||
}
|
||||
}
|
||||
}
|
||||
for (const r of roles) visit(r)
|
||||
return expanded
|
||||
}
|
||||
|
||||
export const userHasRole = (userRoles: string[] | null | undefined, role: string): boolean => {
|
||||
if (!userRoles || userRoles.length === 0) return false
|
||||
return expandRoles(userRoles).has(role)
|
||||
}
|
||||
31
migrations/Version20260424132554.php
Normal file
31
migrations/Version20260424132554.php
Normal file
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
/**
|
||||
* Auto-generated Migration: Please modify to your needs!
|
||||
*/
|
||||
final class Version20260424132554 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 bovine ADD price_per_kg DOUBLE PRECISION DEFAULT NULL');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
// this down() migration is auto-generated, please modify it to your needs
|
||||
$this->addSql('ALTER TABLE bovine DROP price_per_kg');
|
||||
}
|
||||
}
|
||||
35
migrations/Version20260427154952.php
Normal file
35
migrations/Version20260427154952.php
Normal file
@@ -0,0 +1,35 @@
|
||||
<?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 Version20260427154952 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Ajout de la colonne display_order sur building et seed des valeurs par code.';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE building ADD display_order INT DEFAULT NULL');
|
||||
|
||||
$this->addSql("UPDATE building SET display_order = 1 WHERE code = 'B3'");
|
||||
$this->addSql("UPDATE building SET display_order = 2 WHERE code = 'B2'");
|
||||
$this->addSql("UPDATE building SET display_order = 3 WHERE code = 'B1'");
|
||||
$this->addSql("UPDATE building SET display_order = 4 WHERE code = 'ZT'");
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
// this down() migration is auto-generated, please modify it to your needs
|
||||
$this->addSql('ALTER TABLE building DROP display_order');
|
||||
}
|
||||
}
|
||||
35
migrations/Version20260428061801.php
Normal file
35
migrations/Version20260428061801.php
Normal file
@@ -0,0 +1,35 @@
|
||||
<?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 Version20260428061801 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 bovine ADD building_id INT DEFAULT NULL');
|
||||
$this->addSql('ALTER TABLE bovine ADD CONSTRAINT FK_2068337F4D2A7E12 FOREIGN KEY (building_id) REFERENCES building (id)');
|
||||
$this->addSql('CREATE INDEX IDX_2068337F4D2A7E12 ON bovine (building_id)');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
// this down() migration is auto-generated, please modify it to your needs
|
||||
$this->addSql('ALTER TABLE bovine DROP CONSTRAINT FK_2068337F4D2A7E12');
|
||||
$this->addSql('DROP INDEX IDX_2068337F4D2A7E12');
|
||||
$this->addSql('ALTER TABLE bovine DROP building_id');
|
||||
}
|
||||
}
|
||||
50
migrations/Version20260428065800.php
Normal file
50
migrations/Version20260428065800.php
Normal file
@@ -0,0 +1,50 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
/**
|
||||
* Bascule de Bovine.breed_code (string) vers une relation Bovine.bovine_type_id (FK).
|
||||
* Ajoute au passage les BovineType manquants (Aubrac=14, Croisé=39, Blonde d'aquitaine=79).
|
||||
*/
|
||||
final class Version20260428065800 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Migration breedCode -> relation BovineType + ajout des races manquantes.';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
// 1. Insertion des BovineType manquants (idempotent via NOT EXISTS).
|
||||
$this->addSql("INSERT INTO bovine_type (label, code) SELECT 'Aubrac', '14' WHERE NOT EXISTS (SELECT 1 FROM bovine_type WHERE code = '14')");
|
||||
$this->addSql("INSERT INTO bovine_type (label, code) SELECT 'Croisé', '39' WHERE NOT EXISTS (SELECT 1 FROM bovine_type WHERE code = '39')");
|
||||
$this->addSql("INSERT INTO bovine_type (label, code) SELECT 'Blonde d''aquitaine', '79' WHERE NOT EXISTS (SELECT 1 FROM bovine_type WHERE code = '79')");
|
||||
|
||||
// 2. Ajout de la colonne FK + index.
|
||||
$this->addSql('ALTER TABLE bovine ADD bovine_type_id INT DEFAULT NULL');
|
||||
$this->addSql('CREATE INDEX IDX_2068337F7899F32E ON bovine (bovine_type_id)');
|
||||
|
||||
// 3. Backfill : associe chaque bovin à son BovineType via le code.
|
||||
$this->addSql('UPDATE bovine SET bovine_type_id = (SELECT id FROM bovine_type WHERE bovine_type.code = bovine.breed_code) WHERE breed_code IS NOT NULL');
|
||||
|
||||
// 4. Contrainte de clé étrangère (après backfill pour éviter une violation transitoire).
|
||||
$this->addSql('ALTER TABLE bovine ADD CONSTRAINT FK_2068337F7899F32E FOREIGN KEY (bovine_type_id) REFERENCES bovine_type (id)');
|
||||
|
||||
// 5. Drop de l'ancienne colonne string.
|
||||
$this->addSql('ALTER TABLE bovine DROP breed_code');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE bovine ADD breed_code VARCHAR(20) DEFAULT NULL');
|
||||
$this->addSql('UPDATE bovine SET breed_code = (SELECT code FROM bovine_type WHERE bovine_type.id = bovine.bovine_type_id) WHERE bovine_type_id IS NOT NULL');
|
||||
$this->addSql('ALTER TABLE bovine DROP CONSTRAINT FK_2068337F7899F32E');
|
||||
$this->addSql('DROP INDEX IDX_2068337F7899F32E');
|
||||
$this->addSql('ALTER TABLE bovine DROP bovine_type_id');
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,7 @@ use App\State\Bovin\BovineInventoryExportProvider;
|
||||
description: "Retourne un fichier XLSX listant tous les bovins actifs (exitedAt IS NULL) triés par date de naissance croissante, avec colorisation des lignes selon l'âge.",
|
||||
tags: ['Bovines'],
|
||||
),
|
||||
security: "is_granted('ROLE_USER')",
|
||||
security: "is_granted('ROLE_BUREAU')",
|
||||
output: false,
|
||||
provider: BovineInventoryExportProvider::class,
|
||||
),
|
||||
|
||||
@@ -19,7 +19,7 @@ use App\State\Bovin\BovineSyncInventoryProcessor;
|
||||
description: 'Upsert des bovins par numéro national ; marque comme sortis ceux absents de la réponse EDNOTIF.',
|
||||
tags: ['Bovines'],
|
||||
),
|
||||
security: "is_granted('ROLE_ADMIN')",
|
||||
security: "is_granted('ROLE_BUREAU')",
|
||||
input: false,
|
||||
output: self::class,
|
||||
processor: BovineSyncInventoryProcessor::class,
|
||||
|
||||
215
src/Command/FeedBovinePricesCommand.php
Normal file
215
src/Command/FeedBovinePricesCommand.php
Normal file
@@ -0,0 +1,215 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Command;
|
||||
|
||||
use App\Entity\Bovine;
|
||||
use App\Entity\Building;
|
||||
use App\Entity\Supplier;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use PhpOffice\PhpSpreadsheet\IOFactory;
|
||||
use Symfony\Component\Console\Attribute\AsCommand;
|
||||
use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||
use Throwable;
|
||||
|
||||
#[AsCommand(
|
||||
name: 'app:feed-bovine-prices',
|
||||
description: 'Met à jour le poids, le prix au kilo et le fournisseur des bovins existants depuis un fichier XLSX.'
|
||||
)]
|
||||
final class FeedBovinePricesCommand extends Command
|
||||
{
|
||||
public function __construct(
|
||||
private EntityManagerInterface $em,
|
||||
) {
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
protected function configure(): void
|
||||
{
|
||||
$this
|
||||
->addArgument('file', InputArgument::REQUIRED, 'Chemin absolu vers le fichier XLSX')
|
||||
->addOption('dry-run', null, InputOption::VALUE_NONE, 'Simule sans persister en BDD')
|
||||
;
|
||||
}
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output): int
|
||||
{
|
||||
$io = new SymfonyStyle($input, $output);
|
||||
$file = (string) $input->getArgument('file');
|
||||
$dryRun = (bool) $input->getOption('dry-run');
|
||||
|
||||
if (!file_exists($file)) {
|
||||
$io->error(sprintf('Fichier introuvable : %s', $file));
|
||||
|
||||
return Command::FAILURE;
|
||||
}
|
||||
|
||||
$io->title('Feed bovins depuis '.basename($file));
|
||||
if ($dryRun) {
|
||||
$io->warning('Dry-run activé : aucune écriture en BDD.');
|
||||
}
|
||||
|
||||
try {
|
||||
$spreadsheet = IOFactory::load($file);
|
||||
} catch (Throwable $e) {
|
||||
$io->error('Impossible de lire le fichier : '.$e->getMessage());
|
||||
|
||||
return Command::FAILURE;
|
||||
}
|
||||
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
$highestRow = $sheet->getHighestRow();
|
||||
|
||||
// Pré-chargement des fournisseurs pour des lookups rapides (insensible casse).
|
||||
$supplierByName = [];
|
||||
foreach ($this->em->getRepository(Supplier::class)->findAll() as $supplier) {
|
||||
$supplierByName[mb_strtoupper($supplier->getName())] = $supplier;
|
||||
}
|
||||
|
||||
// Pré-chargement des bâtiments par code (insensible casse).
|
||||
$buildingByCode = [];
|
||||
foreach ($this->em->getRepository(Building::class)->findAll() as $building) {
|
||||
$buildingByCode[mb_strtoupper($building->getCode())] = $building;
|
||||
}
|
||||
|
||||
$bovineRepo = $this->em->getRepository(Bovine::class);
|
||||
|
||||
$stats = [
|
||||
'total' => 0,
|
||||
'updated' => 0,
|
||||
'notFound' => 0,
|
||||
'invalid' => 0,
|
||||
'supplierMissing' => 0,
|
||||
'buildingMissing' => 0,
|
||||
];
|
||||
$missingNationalNumbers = [];
|
||||
$missingSuppliers = [];
|
||||
$missingBuildings = [];
|
||||
|
||||
$io->progressStart($highestRow);
|
||||
for ($row = 1; $row <= $highestRow; ++$row) {
|
||||
++$stats['total'];
|
||||
|
||||
$rawNationalNumber = (string) ($sheet->getCell([1, $row])->getValue() ?? '');
|
||||
$rawSupplier = (string) ($sheet->getCell([2, $row])->getValue() ?? '');
|
||||
$rawWeight = $sheet->getCell([3, $row])->getValue();
|
||||
$rawPrice = $sheet->getCell([4, $row])->getValue();
|
||||
$rawBuilding = (string) ($sheet->getCell([5, $row])->getValue() ?? '');
|
||||
|
||||
$rawNationalNumber = trim($rawNationalNumber);
|
||||
if ('' === $rawNationalNumber) {
|
||||
++$stats['invalid'];
|
||||
$io->progressAdvance();
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
// Garde : strip "FR" + espace optionnel uniquement s'il est présent.
|
||||
$nationalNumber = preg_replace('/^FR\s*/i', '', $rawNationalNumber);
|
||||
|
||||
$bovine = $bovineRepo->findOneBy(['nationalNumber' => $nationalNumber]);
|
||||
if (null === $bovine) {
|
||||
++$stats['notFound'];
|
||||
$missingNationalNumbers[] = $nationalNumber;
|
||||
$io->progressAdvance();
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
// Lookup supplier (peut être null si introuvable ou colonne vide).
|
||||
$supplier = null;
|
||||
$supplierName = mb_strtoupper(trim($rawSupplier));
|
||||
if ('' !== $supplierName) {
|
||||
$supplier = $supplierByName[$supplierName] ?? null;
|
||||
if (null === $supplier) {
|
||||
++$stats['supplierMissing'];
|
||||
$missingSuppliers[$supplierName] = ($missingSuppliers[$supplierName] ?? 0) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
$weight = is_numeric($rawWeight) ? (int) $rawWeight : null;
|
||||
$price = is_numeric($rawPrice) ? (float) $rawPrice : null;
|
||||
|
||||
if (null !== $weight) {
|
||||
$bovine->setReceivedWeight($weight);
|
||||
}
|
||||
if (null !== $price) {
|
||||
$bovine->setPricePerKg($price);
|
||||
}
|
||||
$bovine->setSupplier($supplier);
|
||||
|
||||
// Bâtiment direct : on n'écrase pas une affectation à une case existante.
|
||||
$buildingCode = mb_strtoupper(trim($rawBuilding));
|
||||
if ('' !== $buildingCode && null === $bovine->getBuildingCase()) {
|
||||
$building = $buildingByCode[$buildingCode] ?? null;
|
||||
if (null !== $building) {
|
||||
$bovine->setBuilding($building);
|
||||
} else {
|
||||
++$stats['buildingMissing'];
|
||||
$missingBuildings[$buildingCode] = ($missingBuildings[$buildingCode] ?? 0) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
++$stats['updated'];
|
||||
$io->progressAdvance();
|
||||
}
|
||||
$io->progressFinish();
|
||||
|
||||
if (!$dryRun) {
|
||||
$this->em->flush();
|
||||
}
|
||||
|
||||
$io->section('Résultats');
|
||||
$io->table(
|
||||
['Métrique', 'Valeur'],
|
||||
[
|
||||
['Lignes totales', $stats['total']],
|
||||
['Bovins mis à jour', $stats['updated']],
|
||||
['Bovins introuvables', $stats['notFound']],
|
||||
['Lignes invalides', $stats['invalid']],
|
||||
['Fournisseurs introuvables (supplier=null)', $stats['supplierMissing']],
|
||||
['Bâtiments introuvables (building non set)', $stats['buildingMissing']],
|
||||
]
|
||||
);
|
||||
|
||||
if ([] !== $missingNationalNumbers) {
|
||||
$preview = array_slice($missingNationalNumbers, 0, 10);
|
||||
$io->warning(sprintf(
|
||||
'%d bovin(s) introuvable(s). Aperçu : %s%s',
|
||||
count($missingNationalNumbers),
|
||||
implode(', ', $preview),
|
||||
count($missingNationalNumbers) > 10 ? '…' : '',
|
||||
));
|
||||
}
|
||||
|
||||
if ([] !== $missingSuppliers) {
|
||||
$list = [];
|
||||
foreach ($missingSuppliers as $name => $count) {
|
||||
$list[] = sprintf('%s (%d)', $name, $count);
|
||||
}
|
||||
$io->warning('Fournisseurs introuvables (bovins rattachés en null) : '.implode(', ', $list));
|
||||
}
|
||||
|
||||
if ([] !== $missingBuildings) {
|
||||
$list = [];
|
||||
foreach ($missingBuildings as $code => $count) {
|
||||
$list[] = sprintf('%s (%d)', $code, $count);
|
||||
}
|
||||
$io->warning('Bâtiments introuvables (champ non renseigné) : '.implode(', ', $list));
|
||||
}
|
||||
|
||||
if ($dryRun) {
|
||||
$io->success('Dry-run terminé. Relance sans --dry-run pour persister.');
|
||||
} else {
|
||||
$io->success('Feed terminé avec succès.');
|
||||
}
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
}
|
||||
@@ -476,9 +476,12 @@ class SeedCommand extends Command
|
||||
private function seedBovineTypes(): void
|
||||
{
|
||||
$bovineTypes = [
|
||||
['label' => 'Aubrac', 'code' => '14'],
|
||||
['label' => 'Limousine', 'code' => '34'],
|
||||
['label' => 'Charolaise', 'code' => '38'],
|
||||
['label' => 'Croisé', 'code' => '39'],
|
||||
['label' => 'Parthenaise', 'code' => '71'],
|
||||
['label' => "Blonde d'aquitaine", 'code' => '79'],
|
||||
];
|
||||
foreach ($bovineTypes as $type) {
|
||||
$this->upsertByCode(BovineType::class, $type['code'], static function (BovineType $entity) use ($type) {
|
||||
|
||||
@@ -77,9 +77,12 @@ class ReferenceFixtures extends Fixture
|
||||
}
|
||||
|
||||
$bovineTypes = [
|
||||
['label' => 'Aubrac', 'code' => '14'],
|
||||
['label' => 'Limousine', 'code' => '34'],
|
||||
['label' => 'Charolaise', 'code' => '38'],
|
||||
['label' => 'Croisé', 'code' => '39'],
|
||||
['label' => 'Parthenaise', 'code' => '71'],
|
||||
['label' => "Blonde d'aquitaine", 'code' => '79'],
|
||||
];
|
||||
foreach ($bovineTypes as $type) {
|
||||
$bovineType = new BovineType()
|
||||
|
||||
@@ -14,6 +14,7 @@ use ApiPlatform\Metadata\Get;
|
||||
use ApiPlatform\Metadata\GetCollection;
|
||||
use ApiPlatform\Metadata\Patch;
|
||||
use ApiPlatform\Metadata\Post;
|
||||
use App\Repository\BovineRepository;
|
||||
use App\State\Bovin\BovineProcessor;
|
||||
use DateTimeImmutable;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
@@ -21,17 +22,18 @@ use Symfony\Component\Serializer\Attribute\Context;
|
||||
use Symfony\Component\Serializer\Attribute\Groups;
|
||||
use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
|
||||
|
||||
#[ORM\Entity]
|
||||
#[ORM\Entity(repositoryClass: BovineRepository::class)]
|
||||
#[ORM\HasLifecycleCallbacks]
|
||||
#[ORM\Table(name: 'bovine')]
|
||||
#[ORM\UniqueConstraint(name: 'uniq_bovine_national_number', columns: ['national_number'])]
|
||||
#[ApiFilter(SearchFilter::class, properties: [
|
||||
'nationalNumber' => 'ipartial',
|
||||
'workNumber' => 'ipartial',
|
||||
'breedCode' => 'ipartial',
|
||||
'sex' => 'exact',
|
||||
'buildingCase' => 'exact',
|
||||
'receivedWeight' => 'exact',
|
||||
'nationalNumber' => 'ipartial',
|
||||
'workNumber' => 'ipartial',
|
||||
'bovineType.label' => 'ipartial',
|
||||
'bovineType.code' => 'ipartial',
|
||||
'sex' => 'exact',
|
||||
'buildingCase' => 'exact',
|
||||
'receivedWeight' => 'exact',
|
||||
])]
|
||||
#[ApiFilter(DateFilter::class, properties: ['arrivalDate', 'birthDate', 'exitDate'])]
|
||||
#[ApiFilter(ExistsFilter::class, properties: ['exitedAt'])]
|
||||
@@ -77,6 +79,11 @@ class Bovine
|
||||
#[Groups(['bovine:read', 'bovine:write', 'building_case:read'])]
|
||||
private ?int $receivedWeight = null;
|
||||
|
||||
#[ORM\Column(type: 'float', nullable: true)]
|
||||
#[Groups(['bovine:read', 'bovine:write', 'building_case:read'])]
|
||||
#[ApiProperty(security: "is_granted('ROLE_BUREAU')")]
|
||||
private ?float $pricePerKg = null;
|
||||
|
||||
#[ORM\Column(type: 'date_immutable', nullable: true)]
|
||||
#[Groups(['bovine:read', 'bovine:write', 'building_case:read'])]
|
||||
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
||||
@@ -87,6 +94,11 @@ class Bovine
|
||||
#[ApiProperty(readableLink: true)]
|
||||
private ?BuildingCase $buildingCase = null;
|
||||
|
||||
#[ORM\ManyToOne]
|
||||
#[Groups(['bovine:read'])]
|
||||
#[ApiProperty(readableLink: true)]
|
||||
private ?Building $building = null;
|
||||
|
||||
#[ORM\ManyToOne]
|
||||
#[Groups(['bovine:read', 'bovine:write', 'building_case:read'])]
|
||||
private ?Supplier $supplier = null;
|
||||
@@ -100,9 +112,10 @@ class Bovine
|
||||
#[Context([DateTimeNormalizer::FORMAT_KEY => 'Y-m-d'])]
|
||||
private ?DateTimeImmutable $birthDate = null;
|
||||
|
||||
#[ORM\Column(length: 20, nullable: true)]
|
||||
#[ORM\ManyToOne]
|
||||
#[Groups(['bovine:read', 'building_case:read'])]
|
||||
private ?string $breedCode = null;
|
||||
#[ApiProperty(readableLink: true)]
|
||||
private ?BovineType $bovineType = null;
|
||||
|
||||
#[ORM\Column(length: 1, nullable: true)]
|
||||
#[Groups(['bovine:read', 'building_case:read'])]
|
||||
@@ -151,6 +164,29 @@ class Bovine
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getPricePerKg(): ?float
|
||||
{
|
||||
return $this->pricePerKg;
|
||||
}
|
||||
|
||||
public function setPricePerKg(?float $pricePerKg): static
|
||||
{
|
||||
$this->pricePerKg = $pricePerKg;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
#[Groups(['bovine:read', 'building_case:read'])]
|
||||
#[ApiProperty(security: "is_granted('ROLE_BUREAU')")]
|
||||
public function getFinalPrice(): ?float
|
||||
{
|
||||
if (null === $this->receivedWeight || null === $this->pricePerKg) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return $this->receivedWeight * $this->pricePerKg;
|
||||
}
|
||||
|
||||
public function getArrivalDate(): ?DateTimeImmutable
|
||||
{
|
||||
return $this->arrivalDate;
|
||||
@@ -175,6 +211,28 @@ class Bovine
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getBuilding(): ?Building
|
||||
{
|
||||
return $this->building;
|
||||
}
|
||||
|
||||
public function setBuilding(?Building $building): static
|
||||
{
|
||||
$this->building = $building;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Bâtiment effectif d'un bovin : la case affectée si elle existe (logique
|
||||
* historique), sinon le bâtiment direct (fed depuis l'XLSX initial).
|
||||
*/
|
||||
#[Groups(['bovine:read', 'building_case:read'])]
|
||||
public function getEffectiveBuilding(): ?Building
|
||||
{
|
||||
return $this->buildingCase?->getIdBuilding() ?? $this->building;
|
||||
}
|
||||
|
||||
public function getSupplier(): ?Supplier
|
||||
{
|
||||
return $this->supplier;
|
||||
@@ -211,14 +269,14 @@ class Bovine
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getBreedCode(): ?string
|
||||
public function getBovineType(): ?BovineType
|
||||
{
|
||||
return $this->breedCode;
|
||||
return $this->bovineType;
|
||||
}
|
||||
|
||||
public function setBreedCode(?string $breedCode): static
|
||||
public function setBovineType(?BovineType $bovineType): static
|
||||
{
|
||||
$this->breedCode = $breedCode;
|
||||
$this->bovineType = $bovineType;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
@@ -51,11 +51,11 @@ class BovineType
|
||||
private ?int $id = null;
|
||||
|
||||
#[ORM\Column(length: 120)]
|
||||
#[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read'])]
|
||||
#[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read', 'bovine:read', 'building_case:read'])]
|
||||
private ?string $label = null;
|
||||
|
||||
#[ORM\Column(length: 50)]
|
||||
#[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read'])]
|
||||
#[Groups(['bovine-type:read', 'bovine-type:write', 'reception:read', 'reception-bovine:read', 'bovine:read', 'building_case:read'])]
|
||||
private ?string $code = null;
|
||||
|
||||
public function getId(): ?int
|
||||
|
||||
@@ -16,6 +16,7 @@ use Symfony\Component\Serializer\Attribute\SerializedName;
|
||||
#[ORM\Entity]
|
||||
#[ORM\Table(name: 'building')]
|
||||
#[ApiResource(
|
||||
order: ['displayOrder' => 'ASC', 'id' => 'ASC'],
|
||||
operations: [
|
||||
new Get(
|
||||
requirements: ['id' => '\d+'],
|
||||
@@ -43,6 +44,10 @@ class Building
|
||||
#[Groups(['building:read', 'building:summary', 'reception:read'])]
|
||||
private string $code = '';
|
||||
|
||||
#[ORM\Column(name: 'display_order', type: 'integer', nullable: true)]
|
||||
#[Groups(['building:read', 'building:summary'])]
|
||||
private ?int $displayOrder = null;
|
||||
|
||||
/**
|
||||
* @var Collection<int, Reception>
|
||||
*/
|
||||
@@ -101,6 +106,18 @@ class Building
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getDisplayOrder(): ?int
|
||||
{
|
||||
return $this->displayOrder;
|
||||
}
|
||||
|
||||
public function setDisplayOrder(?int $displayOrder): self
|
||||
{
|
||||
$this->displayOrder = $displayOrder;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Collection<int, Reception>
|
||||
*/
|
||||
|
||||
@@ -61,6 +61,7 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
|
||||
),
|
||||
new Delete(
|
||||
requirements: ['id' => '\d+'],
|
||||
security: "is_granted('ROLE_ADMIN')",
|
||||
),
|
||||
new Get(
|
||||
uriTemplate: '/receptions/weigh',
|
||||
@@ -511,14 +512,10 @@ class Reception
|
||||
$this->identificationNumber = $number;
|
||||
|
||||
$args->getObjectManager()
|
||||
->getConnection()
|
||||
->executeStatement(
|
||||
'UPDATE reception SET identification_number = :number WHERE id = :id',
|
||||
[
|
||||
'number' => $number,
|
||||
'id' => $this->id,
|
||||
]
|
||||
)
|
||||
->createQuery(sprintf('UPDATE %s r SET r.identificationNumber = :number WHERE r.id = :id', self::class))
|
||||
->setParameter('number', $number)
|
||||
->setParameter('id', $this->id)
|
||||
->execute()
|
||||
;
|
||||
}
|
||||
|
||||
|
||||
@@ -61,6 +61,7 @@ use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
|
||||
),
|
||||
new Delete(
|
||||
requirements: ['id' => '\d+'],
|
||||
security: "is_granted('ROLE_ADMIN')",
|
||||
),
|
||||
new Get(
|
||||
uriTemplate: '/shipments/weigh',
|
||||
@@ -358,14 +359,10 @@ class Shipment
|
||||
$this->identificationNumber = $number;
|
||||
|
||||
$args->getObjectManager()
|
||||
->getConnection()
|
||||
->executeStatement(
|
||||
'UPDATE shipment SET identification_number = :number WHERE id = :id',
|
||||
[
|
||||
'number' => $number,
|
||||
'id' => $this->id,
|
||||
]
|
||||
)
|
||||
->createQuery(sprintf('UPDATE %s s SET s.identificationNumber = :number WHERE s.id = :id', self::class))
|
||||
->setParameter('number', $number)
|
||||
->setParameter('id', $this->id)
|
||||
->execute()
|
||||
;
|
||||
}
|
||||
|
||||
|
||||
101
src/Repository/BovineRepository.php
Normal file
101
src/Repository/BovineRepository.php
Normal file
@@ -0,0 +1,101 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Repository;
|
||||
|
||||
use App\Entity\Bovine;
|
||||
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
|
||||
use Doctrine\Persistence\ManagerRegistry;
|
||||
|
||||
/**
|
||||
* @extends ServiceEntityRepository<Bovine>
|
||||
*/
|
||||
final class BovineRepository extends ServiceEntityRepository
|
||||
{
|
||||
public const AGE_RANGE_OVER_24 = 'over24';
|
||||
|
||||
public const AGE_RANGE_BETWEEN_22_AND_24 = 'between22And24';
|
||||
|
||||
public const AGE_RANGE_BETWEEN_20_AND_22 = 'between20And22';
|
||||
|
||||
public function __construct(ManagerRegistry $registry)
|
||||
{
|
||||
parent::__construct($registry, Bovine::class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Liste des bovins actifs pour l'export inventaire.
|
||||
*
|
||||
* @param null|list<string> $ageRanges Si null/vide → tous. Sinon filtre OR sur les tranches d'âge demandées.
|
||||
*
|
||||
* @return list<Bovine>
|
||||
*/
|
||||
public function findActiveForInventoryExport(?array $ageRanges = null): array
|
||||
{
|
||||
$qb = $this->createQueryBuilder('b')
|
||||
->where('b.exitedAt IS NULL')
|
||||
->orderBy('b.birthDate', 'ASC')
|
||||
;
|
||||
|
||||
if (null !== $ageRanges && [] !== $ageRanges) {
|
||||
$orX = $qb->expr()->orX();
|
||||
foreach ($ageRanges as $idx => $range) {
|
||||
switch ($range) {
|
||||
case self::AGE_RANGE_OVER_24:
|
||||
$orX->add('b.ageMonths >= 24');
|
||||
|
||||
break;
|
||||
|
||||
case self::AGE_RANGE_BETWEEN_22_AND_24:
|
||||
$orX->add($qb->expr()->andX('b.ageMonths >= 22', 'b.ageMonths < 24'));
|
||||
|
||||
break;
|
||||
|
||||
case self::AGE_RANGE_BETWEEN_20_AND_22:
|
||||
$orX->add($qb->expr()->andX('b.ageMonths >= 20', 'b.ageMonths < 22'));
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ($orX->count() > 0) {
|
||||
$qb->andWhere($orX);
|
||||
}
|
||||
}
|
||||
|
||||
return $qb->getQuery()->getResult();
|
||||
}
|
||||
|
||||
/**
|
||||
* Compteurs des bovins actifs par tranche d'âge.
|
||||
*
|
||||
* @return array{total: int, over24: int, between22And24: int, between20And22: int}
|
||||
*/
|
||||
public function getInventoryStats(?int $buildingCaseId = null): array
|
||||
{
|
||||
$qb = $this->createQueryBuilder('b')
|
||||
->select(
|
||||
'COUNT(b.id) AS total',
|
||||
'SUM(CASE WHEN b.ageMonths >= 24 THEN 1 ELSE 0 END) AS over24',
|
||||
'SUM(CASE WHEN b.ageMonths >= 22 AND b.ageMonths < 24 THEN 1 ELSE 0 END) AS between22And24',
|
||||
'SUM(CASE WHEN b.ageMonths >= 20 AND b.ageMonths < 22 THEN 1 ELSE 0 END) AS between20And22',
|
||||
)
|
||||
->where('b.exitedAt IS NULL')
|
||||
;
|
||||
|
||||
if (null !== $buildingCaseId) {
|
||||
$qb->andWhere('b.buildingCase = :caseId')
|
||||
->setParameter('caseId', $buildingCaseId)
|
||||
;
|
||||
}
|
||||
|
||||
$row = $qb->getQuery()->getSingleResult();
|
||||
|
||||
return [
|
||||
'total' => (int) ($row['total'] ?? 0),
|
||||
'over24' => (int) ($row['over24'] ?? 0),
|
||||
'between22And24' => (int) ($row['between22And24'] ?? 0),
|
||||
'between20And22' => (int) ($row['between20And22'] ?? 0),
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -7,15 +7,18 @@ namespace App\State\Bovin;
|
||||
use ApiPlatform\Metadata\Operation;
|
||||
use ApiPlatform\State\ProviderInterface;
|
||||
use App\Entity\Bovine;
|
||||
use App\Repository\BovineRepository;
|
||||
use DateTimeImmutable;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
|
||||
use PhpOffice\PhpSpreadsheet\IOFactory;
|
||||
use PhpOffice\PhpSpreadsheet\RichText\RichText;
|
||||
use PhpOffice\PhpSpreadsheet\Shared\Date as ExcelDate;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Style\Alignment;
|
||||
use PhpOffice\PhpSpreadsheet\Style\Border;
|
||||
use PhpOffice\PhpSpreadsheet\Style\Fill;
|
||||
use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
|
||||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
|
||||
use Symfony\Component\HttpFoundation\RequestStack;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
|
||||
/**
|
||||
@@ -23,44 +26,62 @@ use Symfony\Component\HttpFoundation\Response;
|
||||
*/
|
||||
final class BovineInventoryExportProvider implements ProviderInterface
|
||||
{
|
||||
private const HEADER_FILL = 'FFF1F5F9';
|
||||
private const FARM_NAME = 'FERME SCEA LES NAUDS';
|
||||
|
||||
private const COLOR_VIOLET = 'FFC4B5FD';
|
||||
private const HEADER_FILL = 'FFCCECFF';
|
||||
|
||||
private const SUBTITLE_TEXT_COLOR = 'FFFF0000';
|
||||
|
||||
// Couleurs pastel pour les lignes de données selon l'âge.
|
||||
private const COLOR_RED = 'FFFCA5A5';
|
||||
|
||||
private const COLOR_ORANGE = 'FFFDBA74';
|
||||
|
||||
private const HEADERS = [
|
||||
'N° National',
|
||||
'N° Travail',
|
||||
'Sexe',
|
||||
'Né le',
|
||||
'Age (mois)',
|
||||
'Race',
|
||||
'Bâtiment',
|
||||
'Case',
|
||||
'Entrée le',
|
||||
private const COLOR_YELLOW = 'FFFEF08A';
|
||||
|
||||
private const BREED_CODE_LIMOUSINE = '34';
|
||||
|
||||
private const BREED_CODE_CHAROLAISE = '38';
|
||||
|
||||
/**
|
||||
* Largeurs de colonnes (A à R).
|
||||
*/
|
||||
private const COLUMN_WIDTHS = [
|
||||
'A' => 3.7,
|
||||
'B' => 6.3,
|
||||
'C' => 3.7,
|
||||
'D' => 15.3,
|
||||
'E' => 3.0,
|
||||
'F' => 3.0,
|
||||
'G' => 3.0,
|
||||
'H' => 6.6,
|
||||
'I' => 13.9,
|
||||
'J' => 11.4,
|
||||
'K' => 11.4,
|
||||
'L' => 7.5,
|
||||
'M' => 6.1,
|
||||
'N' => 6.0,
|
||||
'O' => 11.4,
|
||||
'P' => 5.7,
|
||||
'Q' => 5.0,
|
||||
'R' => 14.4,
|
||||
];
|
||||
|
||||
private const COLUMN_WIDTHS = [18, 12, 10, 12, 12, 12, 30, 8, 12];
|
||||
|
||||
public function __construct(
|
||||
private EntityManagerInterface $em,
|
||||
private BovineRepository $bovineRepository,
|
||||
private RequestStack $requestStack,
|
||||
) {}
|
||||
|
||||
public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
|
||||
{
|
||||
$bovines = $this->em->createQueryBuilder()
|
||||
->select('b')
|
||||
->from(Bovine::class, 'b')
|
||||
->where('b.exitedAt IS NULL')
|
||||
->orderBy('b.birthDate', 'ASC')
|
||||
->getQuery()
|
||||
->getResult()
|
||||
;
|
||||
$request = $this->requestStack->getCurrentRequest();
|
||||
$raw = (string) ($request?->query->get('ageRanges') ?? '');
|
||||
$ageRanges = '' === $raw ? [] : array_values(array_filter(array_map('trim', explode(',', $raw))));
|
||||
|
||||
$spreadsheet = $this->buildSpreadsheet($bovines);
|
||||
$bovines = $this->bovineRepository->findActiveForInventoryExport($ageRanges);
|
||||
$bovines = $this->sortBovines($bovines);
|
||||
|
||||
$spreadsheet = $this->buildSpreadsheet($bovines, $ageRanges);
|
||||
$body = $this->renderXlsx($spreadsheet);
|
||||
$filename = sprintf('inventaire_bovins_%s.xlsx', new DateTimeImmutable()->format('Y-m-d'));
|
||||
|
||||
@@ -73,107 +94,311 @@ final class BovineInventoryExportProvider implements ProviderInterface
|
||||
}
|
||||
|
||||
/**
|
||||
* Tri par âge décroissant puis race (Limousine d'abord, puis Charolaise, puis autres).
|
||||
*
|
||||
* @param list<Bovine> $bovines
|
||||
*
|
||||
* @return list<Bovine>
|
||||
*/
|
||||
private function buildSpreadsheet(array $bovines): Spreadsheet
|
||||
private function sortBovines(array $bovines): array
|
||||
{
|
||||
usort($bovines, function (Bovine $a, Bovine $b): int {
|
||||
$ageDiff = ($b->getAgeMonths() ?? 0) <=> ($a->getAgeMonths() ?? 0);
|
||||
if (0 !== $ageDiff) {
|
||||
return $ageDiff;
|
||||
}
|
||||
|
||||
return $this->breedRank($a) <=> $this->breedRank($b);
|
||||
});
|
||||
|
||||
return array_values($bovines);
|
||||
}
|
||||
|
||||
private function breedRank(Bovine $bovine): int
|
||||
{
|
||||
$code = $bovine->getBovineType()?->getCode();
|
||||
|
||||
return match ($code) {
|
||||
self::BREED_CODE_LIMOUSINE => 0,
|
||||
self::BREED_CODE_CHAROLAISE => 1,
|
||||
default => 2,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* @param list<Bovine> $bovines
|
||||
* @param list<string> $ageRanges
|
||||
*/
|
||||
private function buildSpreadsheet(array $bovines, array $ageRanges): Spreadsheet
|
||||
{
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
$sheet->setTitle('Inventaire');
|
||||
|
||||
// Header row
|
||||
foreach (self::HEADERS as $index => $label) {
|
||||
$sheet->setCellValue([$index + 1, 1], $label);
|
||||
}
|
||||
// Police par défaut sur tout le classeur (en-têtes + data)
|
||||
$spreadsheet->getDefaultStyle()->getFont()->setName('Aptos Narrow')->setSize(11);
|
||||
|
||||
$lastColumn = $sheet->getHighestColumn();
|
||||
$headerRange = sprintf('A1:%s1', $lastColumn);
|
||||
$sheet->getStyle($headerRange)->applyFromArray([
|
||||
'font' => ['bold' => true],
|
||||
'alignment' => ['horizontal' => Alignment::HORIZONTAL_CENTER],
|
||||
'fill' => [
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
$sheet->setTitle('Alerte_Taurillons');
|
||||
|
||||
// Configuration impression : A4 paysage, ajusté à 1 page de large,
|
||||
// lignes 3 et 4 (sous-titre + en-têtes) répétées en haut de chaque page.
|
||||
$pageSetup = $sheet->getPageSetup();
|
||||
$pageSetup->setPaperSize(PageSetup::PAPERSIZE_A4);
|
||||
$pageSetup->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
|
||||
$pageSetup->setFitToWidth(1);
|
||||
$pageSetup->setFitToHeight(0); // illimité en hauteur, on tient juste sur 1 page de large
|
||||
$pageSetup->setRowsToRepeatAtTopByStartAndEnd(3, 4);
|
||||
$pageSetup->setHorizontalCentered(true);
|
||||
$sheet->getPageMargins()->setTop(0.4)->setBottom(0.4)->setLeft(0.3)->setRight(0.3);
|
||||
|
||||
$year = (int) new DateTimeImmutable()->format('Y');
|
||||
|
||||
// Ligne 1 : titre rich text (Arial Black 18 noir + Arial Black 20 rouge pour l'année)
|
||||
$richTitle = new RichText();
|
||||
$first = $richTitle->createTextRun(sprintf('%s - ', self::FARM_NAME));
|
||||
$first->getFont()->setName('Arial Black')->setSize(18)->setBold(true);
|
||||
$second = $richTitle->createTextRun(sprintf('TAURILLONS %d', $year));
|
||||
$second->getFont()->setName('Arial Black')->setSize(20)->setBold(true)
|
||||
->getColor()->setARGB('FFFF0000')
|
||||
;
|
||||
$sheet->getCell('A1')->setValue($richTitle);
|
||||
$sheet->getRowDimension(1)->setRowHeight(32.25);
|
||||
|
||||
// Date du jour à droite
|
||||
$sheet->setCellValue('R1', ExcelDate::PHPToExcel(new DateTimeImmutable()));
|
||||
$sheet->getStyle('R1')->getNumberFormat()->setFormatCode('m/d/yyyy');
|
||||
$sheet->getStyle('R1')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_RIGHT);
|
||||
$sheet->getStyle('R1')->getFont()->setSize(14)->setBold(true);
|
||||
|
||||
// Bordure épaisse en bas du bloc titre (toute la largeur du tableau)
|
||||
$sheet->getStyle('A1:R1')->getBorders()->getBottom()->setBorderStyle(Border::BORDER_THICK);
|
||||
|
||||
// Ligne 3 : sous-titre dynamique fusionné sur toute la largeur du tableau
|
||||
$sheet->setCellValue('A3', $this->computeSubtitle($ageRanges));
|
||||
$sheet->mergeCells('A3:R3');
|
||||
$sheet->getStyle('A3:R3')->applyFromArray([
|
||||
'font' => [
|
||||
'size' => 18,
|
||||
'bold' => true,
|
||||
'color' => ['argb' => self::SUBTITLE_TEXT_COLOR],
|
||||
],
|
||||
'fill' => [
|
||||
'fillType' => Fill::FILL_SOLID,
|
||||
'startColor' => ['argb' => self::HEADER_FILL],
|
||||
],
|
||||
'alignment' => [
|
||||
'horizontal' => Alignment::HORIZONTAL_CENTER,
|
||||
'vertical' => Alignment::VERTICAL_CENTER,
|
||||
],
|
||||
'borders' => [
|
||||
'allBorders' => ['borderStyle' => Border::BORDER_THIN],
|
||||
'top' => ['borderStyle' => Border::BORDER_MEDIUM],
|
||||
'right' => ['borderStyle' => Border::BORDER_MEDIUM],
|
||||
'left' => ['borderStyle' => Border::BORDER_MEDIUM],
|
||||
],
|
||||
]);
|
||||
$sheet->getRowDimension(3)->setRowHeight(24.75);
|
||||
|
||||
// Column widths
|
||||
foreach (self::COLUMN_WIDTHS as $index => $width) {
|
||||
$sheet->getColumnDimension(Coordinate::stringFromColumnIndex($index + 1))->setWidth($width);
|
||||
// Ligne 4 : en-têtes
|
||||
$headers = [
|
||||
'A' => 'Limousin',
|
||||
'B' => 'N° de travail',
|
||||
'C' => 'Charolais',
|
||||
'D' => "N°\nNational",
|
||||
'E' => "Paturelle\n1 2 3",
|
||||
'F' => '',
|
||||
'G' => '',
|
||||
'H' => 'Case',
|
||||
'I' => 'Vendeur',
|
||||
'J' => 'Date de naissance',
|
||||
'K' => "Date\nentrée",
|
||||
'L' => "Age\nentrée",
|
||||
'M' => "Poids\n(kg)",
|
||||
'N' => "Prix\ndu kg",
|
||||
'O' => 'Total €',
|
||||
'P' => "Age\ndu jour",
|
||||
'Q' => 'Trpt',
|
||||
'R' => 'Prix final',
|
||||
];
|
||||
foreach ($headers as $col => $value) {
|
||||
$sheet->setCellValue($col.'4', $value);
|
||||
}
|
||||
$sheet->getRowDimension(4)->setRowHeight(43.5);
|
||||
$sheet->getStyle('A4:R4')->applyFromArray([
|
||||
'font' => ['bold' => true],
|
||||
'alignment' => [
|
||||
'horizontal' => Alignment::HORIZONTAL_CENTER,
|
||||
'vertical' => Alignment::VERTICAL_CENTER,
|
||||
'wrapText' => true,
|
||||
],
|
||||
'fill' => [
|
||||
'fillType' => Fill::FILL_SOLID,
|
||||
'startColor' => ['argb' => self::HEADER_FILL],
|
||||
],
|
||||
]);
|
||||
// Pseudo-merge "Paturelle 1 2 3" via centerContinuous sur E:G
|
||||
$sheet->getStyle('E4:G4')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER_CONTINUOUS);
|
||||
|
||||
// Texte des en-têtes A/B/C en diagonale (60°) comme dans le template,
|
||||
// sans retour à la ligne (le texte peut être tronqué visuellement par la
|
||||
// largeur de colonne, c'est l'effet recherché).
|
||||
$sheet->getStyle('A4:C4')->getAlignment()
|
||||
->setTextRotation(60)
|
||||
->setWrapText(false)
|
||||
;
|
||||
|
||||
// Largeurs de colonnes
|
||||
foreach (self::COLUMN_WIDTHS as $col => $width) {
|
||||
$sheet->getColumnDimension($col)->setWidth($width);
|
||||
}
|
||||
|
||||
// N° National et N° Travail : valeurs numériques mais conservées en string
|
||||
// (leading zeros, format métier) — on force le format texte pour éviter
|
||||
// l'avertissement Excel "nombre stocké sous forme de texte".
|
||||
$sheet->getStyle('A')->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_TEXT);
|
||||
$sheet->getStyle('B')->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_TEXT);
|
||||
|
||||
// Data rows
|
||||
$rowNumber = 2;
|
||||
// Lignes de données
|
||||
$rowNumber = 5;
|
||||
foreach ($bovines as $bovine) {
|
||||
$values = $this->formatRow($bovine);
|
||||
foreach ($values as $colIndex => $value) {
|
||||
$sheet->setCellValue([$colIndex + 1, $rowNumber], $value);
|
||||
}
|
||||
|
||||
$color = $this->ageColor($bovine->getAgeMonths());
|
||||
if (null !== $color) {
|
||||
$rowRange = sprintf('A%d:%s%d', $rowNumber, $lastColumn, $rowNumber);
|
||||
$sheet->getStyle($rowRange)->applyFromArray([
|
||||
'fill' => [
|
||||
'fillType' => Fill::FILL_SOLID,
|
||||
'startColor' => ['argb' => $color],
|
||||
],
|
||||
]);
|
||||
}
|
||||
|
||||
$this->writeBovineRow($sheet, $rowNumber, $bovine);
|
||||
++$rowNumber;
|
||||
}
|
||||
|
||||
// Freeze header row + auto-filter
|
||||
$sheet->freezePane('A2');
|
||||
if ($rowNumber > 2) {
|
||||
$sheet->setAutoFilter(sprintf('%s:%s%d', 'A1', $lastColumn, $rowNumber - 1));
|
||||
} else {
|
||||
$sheet->setAutoFilter($headerRange);
|
||||
// Bordures sur l'ensemble du tableau (header + data)
|
||||
$lastDataRow = $rowNumber - 1;
|
||||
if ($lastDataRow >= 4) {
|
||||
$range = 'A4:R'.$lastDataRow;
|
||||
$sheet->getStyle($range)->getBorders()->applyFromArray([
|
||||
'allBorders' => ['borderStyle' => Border::BORDER_THIN],
|
||||
'top' => ['borderStyle' => Border::BORDER_MEDIUM],
|
||||
'outline' => ['borderStyle' => Border::BORDER_MEDIUM],
|
||||
]);
|
||||
}
|
||||
|
||||
return $spreadsheet;
|
||||
}
|
||||
|
||||
private function writeBovineRow(Worksheet $sheet, int $row, Bovine $bovine): void
|
||||
{
|
||||
$type = $bovine->getBovineType();
|
||||
$isLim = self::BREED_CODE_LIMOUSINE === $type?->getCode();
|
||||
$isCharo = self::BREED_CODE_CHAROLAISE === $type?->getCode();
|
||||
$building = $bovine->getBuildingCase()?->getIdBuilding() ?? $bovine->getBuilding();
|
||||
$code = $building?->getCode();
|
||||
|
||||
$sheet->setCellValue('A'.$row, $isLim ? 'X' : '');
|
||||
$sheet->setCellValue('B'.$row, null !== $bovine->getWorkNumber() && ctype_digit($bovine->getWorkNumber())
|
||||
? (int) $bovine->getWorkNumber()
|
||||
: ($bovine->getWorkNumber() ?? ''));
|
||||
$sheet->setCellValue('C'.$row, $isCharo ? 'X' : '');
|
||||
$sheet->setCellValue('D'.$row, 'FR '.$bovine->getNationalNumber());
|
||||
$sheet->setCellValue('E'.$row, 'B1' === $code ? 'X' : '');
|
||||
$sheet->setCellValue('F'.$row, 'B2' === $code ? 'X' : '');
|
||||
$sheet->setCellValue('G'.$row, 'B3' === $code ? 'X' : '');
|
||||
$sheet->setCellValue('H'.$row, $bovine->getBuildingCase()?->getCaseNumber() ?? '');
|
||||
$sheet->setCellValue('I'.$row, $bovine->getSupplier()?->getName() ?? '');
|
||||
|
||||
$birth = $bovine->getBirthDate();
|
||||
$arrival = $bovine->getArrivalDate();
|
||||
if (null !== $birth) {
|
||||
$sheet->setCellValue('J'.$row, ExcelDate::PHPToExcel($birth));
|
||||
}
|
||||
if (null !== $arrival) {
|
||||
$sheet->setCellValue('K'.$row, ExcelDate::PHPToExcel($arrival));
|
||||
}
|
||||
if (null !== $birth && null !== $arrival) {
|
||||
$diff = $birth->diff($arrival);
|
||||
$sheet->setCellValue('L'.$row, ($diff->y * 12) + $diff->m);
|
||||
}
|
||||
|
||||
if (null !== $bovine->getReceivedWeight()) {
|
||||
$sheet->setCellValue('M'.$row, $bovine->getReceivedWeight());
|
||||
}
|
||||
if (null !== $bovine->getPricePerKg()) {
|
||||
$sheet->setCellValue('N'.$row, $bovine->getPricePerKg());
|
||||
}
|
||||
if (null !== $bovine->getFinalPrice()) {
|
||||
$sheet->setCellValue('O'.$row, $bovine->getFinalPrice());
|
||||
}
|
||||
|
||||
$sheet->setCellValue('P'.$row, $bovine->getAgeMonths() ?? '');
|
||||
// Q (Tport) intentionnellement vide pour l'instant
|
||||
// R = O - Q ; Q vide → R = O
|
||||
if (null !== $bovine->getFinalPrice()) {
|
||||
$sheet->setCellValue('R'.$row, $bovine->getFinalPrice());
|
||||
}
|
||||
|
||||
// Formats par colonne
|
||||
$sheet->getStyle('B'.$row)->getNumberFormat()->setFormatCode('0000');
|
||||
$sheet->getStyle('J'.$row.':K'.$row)->getNumberFormat()->setFormatCode('m/d/yyyy');
|
||||
$sheet->getStyle('M'.$row)->getNumberFormat()->setFormatCode('#,##0');
|
||||
$sheet->getStyle('N'.$row)->getNumberFormat()->setFormatCode('#,##0.00\ "€";\-#,##0.00\ "€"');
|
||||
$sheet->getStyle('O'.$row)->getNumberFormat()->setFormatCode('#,##0.00\ "€";\-#,##0.00\ "€"');
|
||||
$sheet->getStyle('R'.$row)->getNumberFormat()->setFormatCode('#,##0.00\ "€";\-#,##0.00\ "€"');
|
||||
|
||||
// Centrage : A, C, E, F, G, H, P (cellules avec X ou nombres courts)
|
||||
foreach (['A', 'C', 'E', 'F', 'G', 'H', 'P'] as $col) {
|
||||
$sheet->getStyle($col.$row)->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER);
|
||||
}
|
||||
|
||||
// Coloration uniquement de la cellule "Age mois Aujourd'hui" (P) selon l'âge
|
||||
$color = $this->ageColor($bovine->getAgeMonths());
|
||||
if (null !== $color) {
|
||||
$sheet->getStyle('P'.$row)->getFill()->setFillType(Fill::FILL_SOLID)
|
||||
->getStartColor()->setARGB($color)
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return list<null|int|string>
|
||||
* Sous-titre dynamique selon les tranches d'âge cochées.
|
||||
*
|
||||
* @param list<string> $ageRanges
|
||||
*/
|
||||
private function formatRow(Bovine $bovine): array
|
||||
private function computeSubtitle(array $ageRanges): string
|
||||
{
|
||||
return [
|
||||
$bovine->getNationalNumber(),
|
||||
$bovine->getWorkNumber(),
|
||||
$this->formatSex($bovine->getSex()),
|
||||
$this->formatDate($bovine->getBirthDate()),
|
||||
$bovine->getAgeMonths(),
|
||||
$bovine->getBreedCode(),
|
||||
$bovine->getBuildingCase()?->getIdBuilding()?->getLabel(),
|
||||
$bovine->getBuildingCase()?->getCaseNumber(),
|
||||
$this->formatDate($bovine->getArrivalDate()),
|
||||
];
|
||||
}
|
||||
$selected = array_values(array_intersect(
|
||||
$ageRanges,
|
||||
[
|
||||
BovineRepository::AGE_RANGE_BETWEEN_20_AND_22,
|
||||
BovineRepository::AGE_RANGE_BETWEEN_22_AND_24,
|
||||
BovineRepository::AGE_RANGE_OVER_24,
|
||||
]
|
||||
));
|
||||
|
||||
private function formatSex(?string $sex): ?string
|
||||
{
|
||||
return match ($sex) {
|
||||
'M' => 'Mâle',
|
||||
'F' => 'Femelle',
|
||||
default => $sex,
|
||||
};
|
||||
}
|
||||
$hasLow = in_array(BovineRepository::AGE_RANGE_BETWEEN_20_AND_22, $selected, true);
|
||||
$hasMid = in_array(BovineRepository::AGE_RANGE_BETWEEN_22_AND_24, $selected, true);
|
||||
$hasHigh = in_array(BovineRepository::AGE_RANGE_OVER_24, $selected, true);
|
||||
|
||||
private function formatDate(?DateTimeImmutable $date): ?string
|
||||
{
|
||||
return $date?->format('d/m/Y');
|
||||
if ([] === $selected) {
|
||||
return 'Inventaire complet';
|
||||
}
|
||||
|
||||
if ($hasLow && $hasMid && $hasHigh) {
|
||||
return 'Âge SUPÉRIEUR ou ÉGAL à 20 MOIS';
|
||||
}
|
||||
if ($hasMid && $hasHigh && !$hasLow) {
|
||||
return 'Âge SUPÉRIEUR ou ÉGAL à 22 MOIS';
|
||||
}
|
||||
if ($hasHigh && !$hasMid && !$hasLow) {
|
||||
return 'Âge SUPÉRIEUR ou ÉGAL à 24 MOIS';
|
||||
}
|
||||
if ($hasLow && $hasMid && !$hasHigh) {
|
||||
return 'Âge entre 20 et 24 MOIS';
|
||||
}
|
||||
if ($hasMid && !$hasLow && !$hasHigh) {
|
||||
return 'Âge entre 22 et 24 MOIS';
|
||||
}
|
||||
if ($hasLow && !$hasMid && !$hasHigh) {
|
||||
return 'Âge entre 20 et 22 MOIS';
|
||||
}
|
||||
|
||||
// Sélection non contiguë (ex: low + high sans mid) → liste explicite
|
||||
$parts = [];
|
||||
if ($hasLow) {
|
||||
$parts[] = '20 à 22 mois';
|
||||
}
|
||||
if ($hasMid) {
|
||||
$parts[] = '22 à 24 mois';
|
||||
}
|
||||
if ($hasHigh) {
|
||||
$parts[] = '≥ 24 mois';
|
||||
}
|
||||
|
||||
return 'Tranches d\'âge : '.implode(' / ', $parts);
|
||||
}
|
||||
|
||||
private function ageColor(?int $ageMonths): ?string
|
||||
@@ -182,14 +407,14 @@ final class BovineInventoryExportProvider implements ProviderInterface
|
||||
return null;
|
||||
}
|
||||
if ($ageMonths >= 24) {
|
||||
return self::COLOR_VIOLET;
|
||||
}
|
||||
if ($ageMonths >= 22) {
|
||||
return self::COLOR_RED;
|
||||
}
|
||||
if ($ageMonths >= 20) {
|
||||
if ($ageMonths >= 22) {
|
||||
return self::COLOR_ORANGE;
|
||||
}
|
||||
if ($ageMonths >= 20) {
|
||||
return self::COLOR_YELLOW;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,8 @@ namespace App\State\Bovin;
|
||||
use ApiPlatform\Metadata\Operation;
|
||||
use ApiPlatform\State\ProviderInterface;
|
||||
use App\ApiResource\BovineInventoryStats;
|
||||
use Doctrine\DBAL\Connection;
|
||||
use App\Repository\BovineRepository;
|
||||
use Symfony\Component\HttpFoundation\RequestStack;
|
||||
|
||||
/**
|
||||
* @implements ProviderInterface<BovineInventoryStats>
|
||||
@@ -15,26 +16,22 @@ use Doctrine\DBAL\Connection;
|
||||
final class BovineInventoryStatsProvider implements ProviderInterface
|
||||
{
|
||||
public function __construct(
|
||||
private Connection $connection,
|
||||
private BovineRepository $bovineRepository,
|
||||
private RequestStack $requestStack,
|
||||
) {}
|
||||
|
||||
public function provide(Operation $operation, array $uriVariables = [], array $context = []): BovineInventoryStats
|
||||
{
|
||||
$row = $this->connection->fetchAssociative(<<<'SQL'
|
||||
SELECT
|
||||
COUNT(*) AS total,
|
||||
COUNT(*) FILTER (WHERE age_months >= 24) AS over_24,
|
||||
COUNT(*) FILTER (WHERE age_months >= 22 AND age_months < 24) AS between_22_and_24,
|
||||
COUNT(*) FILTER (WHERE age_months >= 20 AND age_months < 22) AS between_20_and_22
|
||||
FROM bovine
|
||||
WHERE exited_at IS NULL
|
||||
SQL);
|
||||
$rawCaseId = $this->requestStack->getCurrentRequest()?->query->get('buildingCaseId');
|
||||
$caseId = null !== $rawCaseId && ctype_digit((string) $rawCaseId) ? (int) $rawCaseId : null;
|
||||
|
||||
$row = $this->bovineRepository->getInventoryStats($caseId);
|
||||
|
||||
$stats = new BovineInventoryStats();
|
||||
$stats->total = (int) ($row['total'] ?? 0);
|
||||
$stats->over24 = (int) ($row['over_24'] ?? 0);
|
||||
$stats->between22And24 = (int) ($row['between_22_and_24'] ?? 0);
|
||||
$stats->between20And22 = (int) ($row['between_20_and_22'] ?? 0);
|
||||
$stats->total = $row['total'];
|
||||
$stats->over24 = $row['over24'];
|
||||
$stats->between22And24 = $row['between22And24'];
|
||||
$stats->between20And22 = $row['between20And22'];
|
||||
|
||||
return $stats;
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ use ApiPlatform\Metadata\Operation;
|
||||
use ApiPlatform\State\ProcessorInterface;
|
||||
use App\ApiResource\BovineSyncInventoryResult;
|
||||
use App\Entity\Bovine;
|
||||
use App\Entity\BovineType;
|
||||
use DateTimeImmutable;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Malio\EdnotifBundle\Bovin\Api\BovinApiInterface;
|
||||
@@ -18,6 +19,11 @@ use Malio\EdnotifBundle\Bovin\Dto\AnimalSummaryDto;
|
||||
*/
|
||||
final class BovineSyncInventoryProcessor implements ProcessorInterface
|
||||
{
|
||||
/**
|
||||
* @var array<string, BovineType>
|
||||
*/
|
||||
private array $bovineTypeCache = [];
|
||||
|
||||
public function __construct(
|
||||
private BovinApiInterface $bovinApi,
|
||||
private EntityManagerInterface $em,
|
||||
@@ -34,6 +40,13 @@ final class BovineSyncInventoryProcessor implements ProcessorInterface
|
||||
$result = new BovineSyncInventoryResult();
|
||||
$result->total = count($inventory->animals);
|
||||
|
||||
$this->bovineTypeCache = [];
|
||||
foreach ($this->em->getRepository(BovineType::class)->findAll() as $bovineType) {
|
||||
if (null !== $bovineType->getCode()) {
|
||||
$this->bovineTypeCache[$bovineType->getCode()] = $bovineType;
|
||||
}
|
||||
}
|
||||
|
||||
$existingByNationalNumber = [];
|
||||
foreach ($this->em->getRepository(Bovine::class)->findAll() as $bovine) {
|
||||
$existingByNationalNumber[$bovine->getNationalNumber()] = $bovine;
|
||||
@@ -83,7 +96,7 @@ final class BovineSyncInventoryProcessor implements ProcessorInterface
|
||||
$identification = $animal->identification;
|
||||
if (null !== $identification) {
|
||||
$bovine->setSex($identification->sex);
|
||||
$bovine->setBreedCode($identification->breedType);
|
||||
$bovine->setBovineType($this->resolveBovineType($identification->breedType));
|
||||
$bovine->setWorkNumber($identification->workNumber);
|
||||
$bovine->setBirthDate($identification->birthDate?->date);
|
||||
}
|
||||
@@ -102,4 +115,28 @@ final class BovineSyncInventoryProcessor implements ProcessorInterface
|
||||
$bovine->setExitDate($latestExit);
|
||||
$bovine->refreshAgeMonths();
|
||||
}
|
||||
|
||||
/**
|
||||
* Trouve un BovineType existant par code, sinon en crée un placeholder
|
||||
* que l'admin pourra renommer dans /admin/bovin/bovin-list.
|
||||
*/
|
||||
private function resolveBovineType(?string $code): ?BovineType
|
||||
{
|
||||
if (null === $code || '' === $code) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (isset($this->bovineTypeCache[$code])) {
|
||||
return $this->bovineTypeCache[$code];
|
||||
}
|
||||
|
||||
$bovineType = new BovineType();
|
||||
$bovineType->setCode($code);
|
||||
$bovineType->setLabel(sprintf('À renommer (%s)', $code));
|
||||
$this->em->persist($bovineType);
|
||||
|
||||
$this->bovineTypeCache[$code] = $bovineType;
|
||||
|
||||
return $bovineType;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ final readonly class BuildingCaseWeightsReportProvider implements ProviderInterf
|
||||
continue;
|
||||
}
|
||||
|
||||
$breedCode = $bovine->getBreedCode();
|
||||
$breedCode = $bovine->getBovineType()?->getCode();
|
||||
if (null === $headerBreedCode && null !== $breedCode) {
|
||||
$headerBreedCode = $breedCode;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user