Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3c434d20b2 | ||
| bbb020025a | |||
|
|
640bb42d3a | ||
| 50712ccb00 | |||
| 265b19a9d0 | |||
|
|
13743738fd | ||
| 085fe0c150 | |||
|
|
a1110069b5 | ||
| 4901c58ebf | |||
| 4de891579c | |||
|
|
a17d6a67cf | ||
| 29db3b5025 | |||
|
|
6df9110187 | ||
| f0dfb30566 | |||
| 049e64288e | |||
|
|
9577a70ea3 | ||
| e85f7b6f4c | |||
|
|
834b4cb695 | ||
| 17f871e82d | |||
|
|
3ec1e1f10d | ||
| 24b7512c8a | |||
| f047e3ed4b | |||
|
|
1feedd0381 | ||
| f9cd5a0143 | |||
|
|
ede7decaa7 | ||
| 2cfb05e5de |
@@ -43,8 +43,15 @@
|
|||||||
## Overtime Rules
|
## Overtime Rules
|
||||||
- Contracts <= 35h: +25% from 35h to 43h, +50% beyond
|
- Contracts <= 35h: +25% from 35h to 43h, +50% beyond
|
||||||
- Contracts >= 39h: +25% from 39h to 43h, +50% beyond
|
- Contracts >= 39h: +25% from 39h to 43h, +50% beyond
|
||||||
|
- CUSTOM contracts (weeklyHours ≠ 35 and ≠ 39, not INTERIM/FORFAIT): reference = actual contractual hours, no 25%/50% bonuses (1h overtime = 1h recovery), deficit doesn't impact balance
|
||||||
- INTERIM: no overtime bonuses, no recovery time
|
- INTERIM: no overtime bonuses, no recovery time
|
||||||
- Driver contracts: no overtime calculation
|
- Driver contracts: RTT uses `dayHoursMinutes + nightHoursMinutes + workshopHoursMinutes` instead of morning/afternoon/evening time ranges
|
||||||
|
- FORFAIT weekend/holiday bonus: each weekend or public holiday day worked gives bonus leave (full day if morning+afternoon, 0.5 if only one). Added to acquired days, no cap. PRESENCE mode only.
|
||||||
|
|
||||||
|
## Frais (MileageAllowance)
|
||||||
|
- Onglet "Frais" (anciennement "Frais Kms") sur la fiche employé
|
||||||
|
- Validation: mois obligatoire + au moins `kilometers > 0` ou `amount > 0`
|
||||||
|
- Les deux champs km et montant sont optionnels individuellement mais au moins un requis
|
||||||
|
|
||||||
## Frontend Patterns
|
## Frontend Patterns
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
parameters:
|
parameters:
|
||||||
app.version: '0.1.52'
|
app.version: '0.1.63'
|
||||||
|
|||||||
@@ -122,6 +122,10 @@ Documents complementaires:
|
|||||||
- Semaine en déficit (heures travaillées < heures contrat):
|
- Semaine en déficit (heures travaillées < heures contrat):
|
||||||
- le déficit est déduit du cumul RTT : d'abord des heures à 50%, puis des heures à 25%
|
- le déficit est déduit du cumul RTT : d'abord des heures à 50%, puis des heures à 25%
|
||||||
- si aucun solde 50% ni 25%, les heures à 25% deviennent négatives
|
- si aucun solde 50% ni 25%, les heures à 25% deviennent négatives
|
||||||
|
- Contrats CUSTOM (heures hebdo ≠ 35h et ≠ 39h, hors INTERIM/FORFAIT):
|
||||||
|
- référence heures sup = heures contractuelles réelles (ex: 4h → référence 4h)
|
||||||
|
- pas de bonus 25% ni 50% : 1 heure sup = 1 heure de récupération
|
||||||
|
- le déficit (travail < contrat) ne génère pas de récup mais n'impacte pas le solde
|
||||||
- Nature `INTERIM`:
|
- Nature `INTERIM`:
|
||||||
- pas de bonus 25%
|
- pas de bonus 25%
|
||||||
- pas de bonus 50%
|
- pas de bonus 50%
|
||||||
@@ -150,7 +154,7 @@ Documents complementaires:
|
|||||||
- jour/nuit/atelier par jour + indicateurs repas/dîner/nuitée
|
- jour/nuit/atelier par jour + indicateurs repas/dîner/nuitée
|
||||||
- panier de nuit (PN): affiché par jour si (nightMinutes > dayMinutes) OU (nightMinutes >= 240, soit au moins 4h de travail entre 21h et 6h), et total hebdo dans la colonne Jour/Nuit sem.
|
- panier de nuit (PN): affiché par jour si (nightMinutes > dayMinutes) OU (nightMinutes >= 240, soit au moins 4h de travail entre 21h et 6h), et total hebdo dans la colonne Jour/Nuit sem.
|
||||||
- totaux hebdo: jour, nuit, atelier, total, compteurs petit déj/déjeuner/dîner/nuitée
|
- totaux hebdo: jour, nuit, atelier, total, compteurs petit déj/déjeuner/dîner/nuitée
|
||||||
- pas de calcul d'heures supplémentaires pour les conducteurs
|
- les conducteurs utilisent `dayHoursMinutes + nightHoursMinutes + workshopHoursMinutes` pour le calcul RTT (au lieu des créneaux morning/afternoon/evening)
|
||||||
- Le flag `isDriver` est sur `EmployeeContractPeriod` (un employé peut changer de statut chauffeur selon la période)
|
- Le flag `isDriver` est sur `EmployeeContractPeriod` (un employé peut changer de statut chauffeur selon la période)
|
||||||
- Exposé en API via un getter virtuel sur `Employee` (`employee:read`) qui résout depuis la période active
|
- Exposé en API via un getter virtuel sur `Employee` (`employee:read`) qui résout depuis la période active
|
||||||
|
|
||||||
@@ -190,13 +194,14 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
|
|||||||
- Détail employé:
|
- Détail employé:
|
||||||
- onglet `Suivi contrat` avec affichage de l'historique des périodes de contrat
|
- onglet `Suivi contrat` avec affichage de l'historique des périodes de contrat
|
||||||
- chaque ligne expose: nature (`CDI`/`CDD`/`INTERIM`), contrat/temps de travail, date de début, date de fin (ou "En cours")
|
- chaque ligne expose: nature (`CDI`/`CDD`/`INTERIM`), contrat/temps de travail, date de début, date de fin (ou "En cours")
|
||||||
- action `Clôturer`:
|
- action `Modifier` (clôture/solde de tout compte):
|
||||||
- bouton actif uniquement s'il existe un contrat en cours non déjà clôturé à la date du jour
|
- bouton actif s'il existe un contrat en cours non clôturé, ou si le dernier contrat est terminé (sans contrat actif après)
|
||||||
- ouvre un drawer en lecture seule (type/temps de travail/date de début)
|
- ouvre un drawer en lecture seule (type/temps de travail/date de début)
|
||||||
- champs saisissables:
|
- champs saisissables:
|
||||||
- `contractEndDate` (prérempli à aujourd'hui)
|
- `contractEndDate` (prérempli à aujourd'hui si contrat en cours, à la date de fin existante si contrat terminé)
|
||||||
- `contractPaidLeaveSettled` (checkbox "Soldé dans le solde de tout compte")
|
- `contractPaidLeaveSettled` (checkbox "Soldé dans le solde de tout compte")
|
||||||
- backend: en mode clôture, le flag `contractPaidLeaveSettled` est persisté sur la période clôturée
|
- backend: en mode clôture, le flag `contractPaidLeaveSettled` est persisté sur la période clôturée
|
||||||
|
- cas du contrat déjà terminé: permet de modifier `paidLeaveSettled` et le commentaire sur le dernier contrat terminé (ex: solde de tout compte CDD)
|
||||||
- action `Ajouter`:
|
- action `Ajouter`:
|
||||||
- conserve le flux d'ajout d'un nouveau contrat via drawer dédié
|
- conserve le flux d'ajout d'un nouveau contrat via drawer dédié
|
||||||
- disponible uniquement s'il n'y a pas de contrat en cours, ou si le contrat en cours a déjà une date de fin
|
- disponible uniquement s'il n'y a pas de contrat en cours, ou si le contrat en cours a déjà une date de fin
|
||||||
@@ -227,6 +232,7 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
|
|||||||
- en cas de suspension en cours de mois, l'acquisition est proratisée en jours ouvrés (lun-ven hors fériés) travaillés / 22
|
- en cas de suspension en cours de mois, l'acquisition est proratisée en jours ouvrés (lun-ven hors fériés) travaillés / 22
|
||||||
- contrat `FORFAIT`:
|
- contrat `FORFAIT`:
|
||||||
- base annuelle: `jours ouvrés de l'exercice (lundi-vendredi, hors jours fériés métropole) - 218`
|
- base annuelle: `jours ouvrés de l'exercice (lundi-vendredi, hors jours fériés métropole) - 218`
|
||||||
|
- bonus weekend/férié: chaque jour travaillé un weekend ou jour férié donne 1 jour de congé supplémentaire (journée ≥ 5h = 1.0 jour, demi-journée > 0h et < 5h = 0.5 jour), sans plafond
|
||||||
- prorata: en cas de démarrage/fin de contrat en cours d'année civile, le calcul ne couvre que l'intervalle actif du contrat dans l'année
|
- prorata: en cas de démarrage/fin de contrat en cours d'année civile, le calcul ne couvre que l'intervalle actif du contrat dans l'année
|
||||||
- reste à prendre: `acquis - absences` (toutes absences, demi-journées incluses)
|
- reste à prendre: `acquis - absences` (toutes absences, demi-journées incluses)
|
||||||
- pas de samedi (`0`)
|
- pas de samedi (`0`)
|
||||||
@@ -274,6 +280,7 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
|
|||||||
- base identique aux calculs d'heures supplémentaires de la vue semaine Heures
|
- base identique aux calculs d'heures supplémentaires de la vue semaine Heures
|
||||||
- minutes de récupération hebdomadaires = `HS totales + bonus 25% + bonus 50%`
|
- minutes de récupération hebdomadaires = `HS totales + bonus 25% + bonus 50%`
|
||||||
- contrats `INTERIM` et suivi `PRESENCE`: récupération à `0`
|
- contrats `INTERIM` et suivi `PRESENCE`: récupération à `0`
|
||||||
|
- date limite de calcul: uniquement les semaines terminées (jusqu'au dernier dimanche), **ou** la semaine en cours si tous les jours existants sont validés RH (`isValid = true`). En cas de fin de contrat en milieu de semaine, seuls les jours jusqu'à la date de fin sont vérifiés.
|
||||||
- compteur global:
|
- compteur global:
|
||||||
- affiché en **jours** (1 jour = 7h = 420 minutes)
|
- affiché en **jours** (1 jour = 7h = 420 minutes)
|
||||||
- report:
|
- report:
|
||||||
@@ -344,7 +351,28 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
|
|||||||
| CHAUFFEUR - samedi | WorkHour (samedi) | Samedis travaillés (chauffeurs uniquement) |
|
| CHAUFFEUR - samedi | WorkHour (samedi) | Samedis travaillés (chauffeurs uniquement) |
|
||||||
| Observations | — | Colonne vide pour saisie manuelle |
|
| Observations | — | Colonne vide pour saisie manuelle |
|
||||||
|
|
||||||
## 12) Notifications
|
## 12) Frais
|
||||||
|
|
||||||
|
- Onglet "Frais" sur la fiche employé (icône `mdi:account-cash-outline`)
|
||||||
|
- Entité `MileageAllowance` (table `mileage_allowances`)
|
||||||
|
- Champs:
|
||||||
|
- `month` (mois, obligatoire)
|
||||||
|
- `kilometers` (nombre de km, optionnel)
|
||||||
|
- `amount` (montant en €, optionnel)
|
||||||
|
- `comment` (commentaire, optionnel)
|
||||||
|
- `receiptPath` / `receiptName` (justificatif Km, PDF)
|
||||||
|
- `amountReceiptPath` / `amountReceiptName` (justificatif Montant, PDF)
|
||||||
|
- Règle de validation:
|
||||||
|
- le mois est obligatoire
|
||||||
|
- au moins un des deux champs `kilometers` ou `amount` doit être > 0
|
||||||
|
- les deux peuvent être remplis simultanément
|
||||||
|
- Tableau: colonnes Mois, Nombre de Km, Montant €, Commentaire, Justif. Km, Justif. Montant
|
||||||
|
- Deux justificatifs distincts (upload PDF uniquement):
|
||||||
|
- Justificatif Km : upload via `/mileage_allowances/{id}/receipt`, téléchargement via GET même URL
|
||||||
|
- Justificatif Montant : upload via `/mileage_allowances/{id}/amount-receipt`, téléchargement via GET même URL
|
||||||
|
- La suppression d'un frais supprime les deux fichiers justificatifs du disque
|
||||||
|
|
||||||
|
## 13) Notifications
|
||||||
|
|
||||||
- Icône cloche en topbar:
|
- Icône cloche en topbar:
|
||||||
- badge = nombre de notifications non lues
|
- badge = nombre de notifications non lues
|
||||||
@@ -357,3 +385,31 @@ Tous les filtres checkbox sont cochés par défaut à l'ouverture du drawer.
|
|||||||
- Une notification est créée uniquement quand un chef de site termine la validation complète:
|
- Une notification est créée uniquement quand un chef de site termine la validation complète:
|
||||||
- condition: plus aucune ligne `work_hours` du site à la date concernée avec `isSiteValid = false`
|
- condition: plus aucune ligne `work_hours` du site à la date concernée avec `isSiteValid = false`
|
||||||
- destinataires: utilisateurs `ROLE_ADMIN`
|
- destinataires: utilisateurs `ROLE_ADMIN`
|
||||||
|
|
||||||
|
## 16) Export PDF des heures annuelles
|
||||||
|
|
||||||
|
- Accessible depuis la fiche employé (bouton imprimante à droite du nom)
|
||||||
|
- Ouvre un drawer pour choisir l'année (civile, Jan-Déc)
|
||||||
|
- Génère un PDF avec le détail jour par jour des heures de l'employé
|
||||||
|
- Seuls les jours avec heures saisies ou absence sont affichés
|
||||||
|
|
||||||
|
### Colonnes selon le mode de suivi
|
||||||
|
|
||||||
|
- **TIME (non-chauffeur)**: Date | Absence | Début matin | Fin matin | Début après-midi | Fin après-midi | Début soir | Fin soir | Total
|
||||||
|
- **PRESENCE (forfait)**: Date | Absence | Présence matin | Présence après-midi | Total
|
||||||
|
- **Chauffeur**: Date | Absence | Heures jour | Heures nuit | Heures atelier | Total
|
||||||
|
|
||||||
|
### Changement de contrat en cours d'année
|
||||||
|
|
||||||
|
- Si l'employé change de mode de suivi (TIME/PRESENCE) ou de statut chauffeur en cours d'année, le PDF affiche des sections séparées avec les colonnes adaptées à chaque période
|
||||||
|
- Le nom du contrat est affiché en sous-titre de chaque section
|
||||||
|
|
||||||
|
### Calcul du total
|
||||||
|
|
||||||
|
- TIME non-chauffeur: somme des créneaux matin + après-midi + soir, plus minutes créditées des absences `countAsWorkedHours`
|
||||||
|
- Chauffeur: `dayHoursMinutes + nightHoursMinutes + workshopHoursMinutes` + minutes créditées
|
||||||
|
- PRESENCE: 0.5 par demi-journée présente (matin/après-midi), max 1.0
|
||||||
|
|
||||||
|
### Nom du fichier
|
||||||
|
|
||||||
|
- Format: `{nom}_{prenom}_{annee}.pdf`
|
||||||
|
|||||||
67
frontend/components/EmployeeYearlyHoursDrawer.vue
Normal file
67
frontend/components/EmployeeYearlyHoursDrawer.vue
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
<template>
|
||||||
|
<AppDrawer v-model="drawerOpen" title="Export heures annuelles">
|
||||||
|
<form class="space-y-4" @submit.prevent="handleSubmit">
|
||||||
|
<div>
|
||||||
|
<label class="text-md font-semibold text-neutral-700" for="yearly-hours-year">
|
||||||
|
Année <span class="text-red-600">*</span>
|
||||||
|
</label>
|
||||||
|
<select
|
||||||
|
id="yearly-hours-year"
|
||||||
|
v-model="selectedYear"
|
||||||
|
:class="selectFieldClass"
|
||||||
|
>
|
||||||
|
<option v-for="y in years" :key="y" :value="y">{{ y }}</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex justify-center pt-2">
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
class="flex w-[200px] items-center justify-center gap-2 rounded-md bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
|
||||||
|
>
|
||||||
|
Imprimer
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</AppDrawer>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, ref, watch } from 'vue'
|
||||||
|
import AppDrawer from '~/components/AppDrawer.vue'
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
modelValue: boolean
|
||||||
|
employeeId: number
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(event: 'update:modelValue', value: boolean): void
|
||||||
|
(event: 'submit', year: number): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const drawerOpen = computed({
|
||||||
|
get: () => props.modelValue,
|
||||||
|
set: (value: boolean) => emit('update:modelValue', value)
|
||||||
|
})
|
||||||
|
|
||||||
|
const currentYear = new Date().getFullYear()
|
||||||
|
const years = Array.from({ length: 6 }, (_, i) => currentYear - i)
|
||||||
|
const selectedYear = ref(currentYear)
|
||||||
|
|
||||||
|
const baseInputClass = 'mt-2 w-full rounded-md border px-3 py-2 text-md text-neutral-900'
|
||||||
|
const selectFieldClass = computed(() => `${baseInputClass} border-neutral-300`)
|
||||||
|
|
||||||
|
const handleSubmit = () => {
|
||||||
|
emit('submit', selectedYear.value)
|
||||||
|
}
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => props.modelValue,
|
||||||
|
(isOpen) => {
|
||||||
|
if (!isOpen) {
|
||||||
|
selectedYear.value = currentYear
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
</script>
|
||||||
@@ -1,35 +1,35 @@
|
|||||||
<template>
|
<template>
|
||||||
<section class="flex h-full min-h-0 flex-col overflow-hidden pt-8">
|
<section class="flex h-full min-h-0 flex-col overflow-hidden pt-8">
|
||||||
<div class="grid grid-cols-4 rounded-md bg-tertiary-500 text-primary-500 text-[18px] border border-primary-500">
|
<div class="grid grid-cols-4 rounded-md bg-tertiary-500 text-primary-500 text-[18px] border border-primary-500">
|
||||||
<p class="col-start-1 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">Année acquis :</strong> {{
|
<p class="col-start-1 p-[10px] border-b border-r border-primary-500"><strong class="uppercase font-semibold">Année acquis :</strong> {{
|
||||||
formatCount(summary?.acquiredDays)
|
formatCount(summary?.acquiredDays)
|
||||||
}} Jours
|
}} Jours
|
||||||
</p>
|
</p>
|
||||||
<p class="col-start-2 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">Pris :</strong>
|
<p class="col-start-2 p-[10px] border-b border-r border-primary-500"><strong class="uppercase font-semibold">Pris :</strong>
|
||||||
{{ formatCount(isForfaitRule ? currentYearTakenDays : summary?.takenDays) }} Jours
|
{{ formatCount(isForfaitRule ? currentYearTakenDays : summary?.takenDays) }} Jours
|
||||||
</p>
|
</p>
|
||||||
<p class="col-start-3 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">Reste à prendre :</strong>
|
<p class="col-start-3 p-[10px] border-b border-r border-b-white border-r-primary-500 bg-primary-500 text-white"><strong class="uppercase font-semibold">Reste à prendre :</strong>
|
||||||
{{ formatCount(summary?.remainingDays) }} Jours
|
{{ formatCount(summary?.remainingDays) }} Jours
|
||||||
</p>
|
</p>
|
||||||
<p class="col-start-4 p-[10px] border-b border-b-black"><strong class="uppercase font-semibold">En cours d'acquisition :</strong>
|
<p class="col-start-4 p-[10px] border-b border-primary-500"><strong class="uppercase font-semibold">En cours d'acquisition :</strong>
|
||||||
{{ formatCount(summary?.accruingDays) }} Jours
|
{{ formatCount(summary?.accruingDays) }} Jours
|
||||||
</p>
|
</p>
|
||||||
<p v-if="!isForfaitRule" class="col-start-1 p-[10px]"><span class="uppercase font-semibold">Samedi acquis :</span>
|
<p v-if="!isForfaitRule" class="col-start-1 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Samedi acquis :</span>
|
||||||
{{ formatCount(summary?.acquiredSaturdays) }} Jours
|
{{ formatCount(summary?.acquiredSaturdays) }} Jours
|
||||||
</p>
|
</p>
|
||||||
<p v-else class="col-start-1 p-[10px]"><span class="uppercase font-semibold">Année N-1 acquis :</span>
|
<p v-else class="col-start-1 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Année N-1 acquis :</span>
|
||||||
{{ formatCount(summary?.previousYearAcquiredDays) }} Jours
|
{{ formatCount(summary?.previousYearAcquiredDays) }} Jours
|
||||||
</p>
|
</p>
|
||||||
<p v-if="!isForfaitRule" class="col-start-2 p-[10px]"><span class="uppercase font-semibold">Pris :</span>
|
<p v-if="!isForfaitRule" class="col-start-2 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Pris :</span>
|
||||||
{{ formatCount(summary?.takenSaturdays) }} Jours
|
{{ formatCount(summary?.takenSaturdays) }} Jours
|
||||||
</p>
|
</p>
|
||||||
<p v-if="!isForfaitRule" class="col-start-3 p-[10px]"><span class="uppercase font-semibold">Reste à prendre :</span>
|
<p v-if="!isForfaitRule" class="col-start-3 p-[10px] border-r border-r-primary-500 bg-primary-500 text-white"><span class="uppercase font-semibold">Reste à prendre :</span>
|
||||||
{{ formatCount(summary?.remainingSaturdays) }} Jours
|
{{ formatCount(summary?.remainingSaturdays) }} Jours
|
||||||
</p>
|
</p>
|
||||||
<p v-else class="col-start-2 p-[10px]"><span class="uppercase font-semibold">Pris :</span>
|
<p v-else class="col-start-2 p-[10px] border-r border-primary-500"><span class="uppercase font-semibold">Pris :</span>
|
||||||
{{ formatCount(summary?.previousYearTakenDays) }} Jours
|
{{ formatCount(summary?.previousYearTakenDays) }} Jours
|
||||||
</p>
|
</p>
|
||||||
<p v-if="isForfaitRule" class="col-start-3 p-[10px]"><span class="uppercase font-semibold">Reste à prendre :</span>
|
<p v-if="isForfaitRule" class="col-start-3 p-[10px] border-r-primary-500 bg-primary-500 text-white"><span class="uppercase font-semibold">Reste à prendre :</span>
|
||||||
{{ formatCount(summary?.previousYearRemainingDays) }} Jours
|
{{ formatCount(summary?.previousYearRemainingDays) }} Jours
|
||||||
</p>
|
</p>
|
||||||
<div v-if="!isForfaitRule" class="col-start-4 p-[10px] flex gap-7 items-center">
|
<div v-if="!isForfaitRule" class="col-start-4 p-[10px] flex gap-7 items-center">
|
||||||
|
|||||||
@@ -2,11 +2,13 @@
|
|||||||
<section class="mt-8">
|
<section class="mt-8">
|
||||||
<div class="overflow-hidden bg-white">
|
<div class="overflow-hidden bg-white">
|
||||||
<div
|
<div
|
||||||
class="grid grid-cols-4 border border-black bg-tertiary-500 px-6 py-3 text-[20px] font-semibold text-black rounded-t-md">
|
class="grid grid-cols-6 border border-black bg-tertiary-500 px-6 py-3 text-[20px] font-semibold text-black rounded-t-md">
|
||||||
<p>Mois</p>
|
<p>Mois</p>
|
||||||
<p>Nombre de Km</p>
|
<p>Nombre de Km</p>
|
||||||
|
<p>Montant €</p>
|
||||||
<p>Commentaire</p>
|
<p>Commentaire</p>
|
||||||
<p>Justificatif</p>
|
<p>Justif. Km</p>
|
||||||
|
<p>Justif. Montant</p>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="allowances.length === 0" class="px-6 py-4 text-[20px] font-bold text-primary-500 border-x border-b border-primary-500 rounded-b-md">
|
<div v-if="allowances.length === 0" class="px-6 py-4 text-[20px] font-bold text-primary-500 border-x border-b border-primary-500 rounded-b-md">
|
||||||
Aucun frais kilométrique.
|
Aucun frais kilométrique.
|
||||||
@@ -15,22 +17,36 @@
|
|||||||
<div
|
<div
|
||||||
v-for="item in allowances"
|
v-for="item in allowances"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
class="grid grid-cols-4 border-b border-primary-500 px-6 py-3 text-md font-bold text-primary-500 last:border-b-0 cursor-pointer hover:bg-tertiary-500"
|
class="grid grid-cols-6 border-b border-primary-500 px-6 py-3 text-md font-bold text-primary-500 last:border-b-0 cursor-pointer hover:bg-tertiary-500"
|
||||||
@click="onOpenEditDrawer(item)"
|
@click="onOpenEditDrawer(item)"
|
||||||
>
|
>
|
||||||
<p>{{ formatMonth(item.month) }}</p>
|
<p>{{ formatMonth(item.month) }}</p>
|
||||||
<p>{{ item.kilometers }}</p>
|
<p>{{ item.kilometers }}</p>
|
||||||
|
<p>{{ item.amount ? item.amount + ' €' : '-' }}</p>
|
||||||
<p>{{ item.comment ?? '-' }}</p>
|
<p>{{ item.comment ?? '-' }}</p>
|
||||||
<p>
|
<p class="min-w-0">
|
||||||
<a
|
<a
|
||||||
v-if="item.receiptPath"
|
v-if="item.receiptPath"
|
||||||
:href="getReceiptUrl(props.apiBase, item.id)"
|
:href="getKmReceiptUrl(props.apiBase, item.id)"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
class="text-primary-500 hover:text-secondary-500 flex gap-2 items-center"
|
class="text-primary-500 hover:text-secondary-500 flex gap-2 items-center"
|
||||||
@click.stop
|
@click.stop
|
||||||
>
|
>
|
||||||
<Icon name="mdi:file-download-outline" size="20"/>
|
<Icon name="mdi:file-download-outline" size="20" class="shrink-0"/>
|
||||||
<span>{{ item.receiptName ?? 'Télécharger' }}</span>
|
<span class="truncate">{{ item.receiptName ?? 'Télécharger' }}</span>
|
||||||
|
</a>
|
||||||
|
<span v-else>-</span>
|
||||||
|
</p>
|
||||||
|
<p class="min-w-0">
|
||||||
|
<a
|
||||||
|
v-if="item.amountReceiptPath"
|
||||||
|
:href="getAmountReceiptUrl(props.apiBase, item.id)"
|
||||||
|
target="_blank"
|
||||||
|
class="text-primary-500 hover:text-secondary-500 flex gap-2 items-center"
|
||||||
|
@click.stop
|
||||||
|
>
|
||||||
|
<Icon name="mdi:file-download-outline" size="20" class="shrink-0"/>
|
||||||
|
<span class="truncate">{{ item.amountReceiptName ?? 'Télécharger' }}</span>
|
||||||
</a>
|
</a>
|
||||||
<span v-else>-</span>
|
<span v-else>-</span>
|
||||||
</p>
|
</p>
|
||||||
@@ -48,7 +64,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<AppDrawer v-model="isDrawerOpen" title="Frais Kms">
|
<AppDrawer v-model="isDrawerOpen" title="Frais">
|
||||||
<form class="space-y-4" @submit.prevent="onSubmit">
|
<form class="space-y-4" @submit.prevent="onSubmit">
|
||||||
<div>
|
<div>
|
||||||
<label class="text-md font-semibold text-neutral-700" for="mileage-month">
|
<label class="text-md font-semibold text-neutral-700" for="mileage-month">
|
||||||
@@ -64,7 +80,7 @@
|
|||||||
|
|
||||||
<div>
|
<div>
|
||||||
<label class="text-md font-semibold text-neutral-700" for="mileage-kilometers">
|
<label class="text-md font-semibold text-neutral-700" for="mileage-kilometers">
|
||||||
Nombre de Km <span class="text-red-600">*</span>
|
Nombre de Km
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
id="mileage-kilometers"
|
id="mileage-kilometers"
|
||||||
@@ -77,20 +93,53 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<label class="text-md font-semibold text-neutral-700" for="mileage-receipt">
|
<label class="text-md font-semibold text-neutral-700" for="mileage-amount">
|
||||||
Justificatif
|
Montant (€)
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="mileage-amount"
|
||||||
|
v-model.number="form.amount"
|
||||||
|
type="number"
|
||||||
|
step="0.01"
|
||||||
|
min="0"
|
||||||
|
class="mt-2 w-full rounded-md border border-neutral-300 px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20"
|
||||||
|
/>
|
||||||
|
<p class="mt-1 text-sm text-neutral-500">Au moins un des deux champs doit être rempli</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label class="text-md font-semibold text-neutral-700" for="mileage-km-receipt">
|
||||||
|
Justificatif Km
|
||||||
</label>
|
</label>
|
||||||
<div v-if="isEditing && editingItem?.receiptName" class="mt-1 text-sm text-neutral-500">
|
<div v-if="isEditing && editingItem?.receiptName" class="mt-1 text-sm text-neutral-500">
|
||||||
Fichier actuel : {{ editingItem.receiptName }}
|
Fichier actuel : {{ editingItem.receiptName }}
|
||||||
</div>
|
</div>
|
||||||
<input
|
<input
|
||||||
id="mileage-receipt"
|
id="mileage-km-receipt"
|
||||||
ref="fileInput"
|
ref="kmFileInput"
|
||||||
type="file"
|
type="file"
|
||||||
class="mt-2 w-full rounded-md border border-neutral-300 px-3 py-2 text-base text-neutral-900 file:mr-3 file:rounded file:border-0 file:bg-primary-500 file:px-3 file:py-1 file:text-sm file:text-white"
|
class="mt-2 w-full rounded-md border border-neutral-300 px-3 py-2 text-base text-neutral-900 file:mr-3 file:rounded file:border-0 file:bg-primary-500 file:px-3 file:py-1 file:text-sm file:text-white"
|
||||||
@change="onFileChange"
|
@change="onKmFileChange"
|
||||||
/>
|
/>
|
||||||
<p v-if="fileError" class="mt-1 text-sm text-red-600">{{ fileError }}</p>
|
<p v-if="kmFileError" class="mt-1 text-sm text-red-600">{{ kmFileError }}</p>
|
||||||
|
<p v-else class="mt-1 text-sm text-neutral-500">Fichier au format pdf</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label class="text-md font-semibold text-neutral-700" for="mileage-amount-receipt">
|
||||||
|
Justificatif Montant
|
||||||
|
</label>
|
||||||
|
<div v-if="isEditing && editingItem?.amountReceiptName" class="mt-1 text-sm text-neutral-500">
|
||||||
|
Fichier actuel : {{ editingItem.amountReceiptName }}
|
||||||
|
</div>
|
||||||
|
<input
|
||||||
|
id="mileage-amount-receipt"
|
||||||
|
ref="amountFileInput"
|
||||||
|
type="file"
|
||||||
|
class="mt-2 w-full rounded-md border border-neutral-300 px-3 py-2 text-base text-neutral-900 file:mr-3 file:rounded file:border-0 file:bg-primary-500 file:px-3 file:py-1 file:text-sm file:text-white"
|
||||||
|
@change="onAmountFileChange"
|
||||||
|
/>
|
||||||
|
<p v-if="amountFileError" class="mt-1 text-sm text-red-600">{{ amountFileError }}</p>
|
||||||
<p v-else class="mt-1 text-sm text-neutral-500">Fichier au format pdf</p>
|
<p v-else class="mt-1 text-sm text-neutral-500">Fichier au format pdf</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -139,7 +188,7 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import type {MileageAllowance} from '~/services/dto/mileage-allowance'
|
import type {MileageAllowance} from '~/services/dto/mileage-allowance'
|
||||||
import {getReceiptUrl} from '~/services/mileage-allowances'
|
import {getKmReceiptUrl, getAmountReceiptUrl} from '~/services/mileage-allowances'
|
||||||
import AppDrawer from '~/components/AppDrawer.vue'
|
import AppDrawer from '~/components/AppDrawer.vue'
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
@@ -148,17 +197,20 @@ const props = defineProps<{
|
|||||||
}>()
|
}>()
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
(event: 'create', data: { month: string; kilometers: number; comment?: string }, file?: File): void
|
(event: 'create', data: { month: string; kilometers: number; amount: number; comment?: string }, kmFile?: File, amountFile?: File): void
|
||||||
(event: 'update', id: number, data: { month: string; kilometers: number; comment?: string }, file?: File): void
|
(event: 'update', id: number, data: { month: string; kilometers: number; amount: number; comment?: string }, kmFile?: File, amountFile?: File): void
|
||||||
(event: 'delete', id: number): void
|
(event: 'delete', id: number): void
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const isDrawerOpen = ref(false)
|
const isDrawerOpen = ref(false)
|
||||||
const isEditing = ref(false)
|
const isEditing = ref(false)
|
||||||
const editingItem = ref<MileageAllowance | null>(null)
|
const editingItem = ref<MileageAllowance | null>(null)
|
||||||
const selectedFile = ref<File | undefined>(undefined)
|
const selectedKmFile = ref<File | undefined>(undefined)
|
||||||
const fileInput = ref<HTMLInputElement | null>(null)
|
const selectedAmountFile = ref<File | undefined>(undefined)
|
||||||
const fileError = ref('')
|
const kmFileInput = ref<HTMLInputElement | null>(null)
|
||||||
|
const amountFileInput = ref<HTMLInputElement | null>(null)
|
||||||
|
const kmFileError = ref('')
|
||||||
|
const amountFileError = ref('')
|
||||||
|
|
||||||
const currentYearMonth = () => {
|
const currentYearMonth = () => {
|
||||||
const now = new Date()
|
const now = new Date()
|
||||||
@@ -168,11 +220,12 @@ const currentYearMonth = () => {
|
|||||||
const form = reactive({
|
const form = reactive({
|
||||||
month: currentYearMonth(),
|
month: currentYearMonth(),
|
||||||
kilometers: 0,
|
kilometers: 0,
|
||||||
|
amount: 0,
|
||||||
comment: ''
|
comment: ''
|
||||||
})
|
})
|
||||||
|
|
||||||
const isFormValid = computed(() => {
|
const isFormValid = computed(() => {
|
||||||
return form.month && form.kilometers > 0 && !fileError.value
|
return form.month && (form.kilometers > 0 || form.amount > 0) && !kmFileError.value && !amountFileError.value
|
||||||
})
|
})
|
||||||
|
|
||||||
const monthLabels: Record<number, string> = {
|
const monthLabels: Record<number, string> = {
|
||||||
@@ -201,11 +254,17 @@ const formatMonth = (dateStr: string): string => {
|
|||||||
const resetForm = () => {
|
const resetForm = () => {
|
||||||
form.month = currentYearMonth()
|
form.month = currentYearMonth()
|
||||||
form.kilometers = 0
|
form.kilometers = 0
|
||||||
|
form.amount = 0
|
||||||
form.comment = ''
|
form.comment = ''
|
||||||
selectedFile.value = undefined
|
selectedKmFile.value = undefined
|
||||||
fileError.value = ''
|
selectedAmountFile.value = undefined
|
||||||
if (fileInput.value) {
|
kmFileError.value = ''
|
||||||
fileInput.value.value = ''
|
amountFileError.value = ''
|
||||||
|
if (kmFileInput.value) {
|
||||||
|
kmFileInput.value.value = ''
|
||||||
|
}
|
||||||
|
if (amountFileInput.value) {
|
||||||
|
amountFileInput.value.value = ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -222,38 +281,57 @@ const onOpenEditDrawer = (item: MileageAllowance) => {
|
|||||||
// Extract YYYY-MM from YYYY-MM-DD
|
// Extract YYYY-MM from YYYY-MM-DD
|
||||||
form.month = item.month.substring(0, 7)
|
form.month = item.month.substring(0, 7)
|
||||||
form.kilometers = item.kilometers
|
form.kilometers = item.kilometers
|
||||||
|
form.amount = item.amount
|
||||||
form.comment = item.comment ?? ''
|
form.comment = item.comment ?? ''
|
||||||
selectedFile.value = undefined
|
selectedKmFile.value = undefined
|
||||||
if (fileInput.value) {
|
selectedAmountFile.value = undefined
|
||||||
fileInput.value.value = ''
|
if (kmFileInput.value) {
|
||||||
|
kmFileInput.value.value = ''
|
||||||
|
}
|
||||||
|
if (amountFileInput.value) {
|
||||||
|
amountFileInput.value.value = ''
|
||||||
}
|
}
|
||||||
isDrawerOpen.value = true
|
isDrawerOpen.value = true
|
||||||
}
|
}
|
||||||
|
|
||||||
const onFileChange = (event: Event) => {
|
const onKmFileChange = (event: Event) => {
|
||||||
const target = event.target as HTMLInputElement
|
const target = event.target as HTMLInputElement
|
||||||
const file = target.files?.[0]
|
const file = target.files?.[0]
|
||||||
if (file && file.type !== 'application/pdf') {
|
if (file && file.type !== 'application/pdf') {
|
||||||
fileError.value = 'Seuls les fichiers PDF sont acceptés.'
|
kmFileError.value = 'Seuls les fichiers PDF sont acceptés.'
|
||||||
selectedFile.value = undefined
|
selectedKmFile.value = undefined
|
||||||
target.value = ''
|
target.value = ''
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
fileError.value = ''
|
kmFileError.value = ''
|
||||||
selectedFile.value = file ?? undefined
|
selectedKmFile.value = file ?? undefined
|
||||||
|
}
|
||||||
|
|
||||||
|
const onAmountFileChange = (event: Event) => {
|
||||||
|
const target = event.target as HTMLInputElement
|
||||||
|
const file = target.files?.[0]
|
||||||
|
if (file && file.type !== 'application/pdf') {
|
||||||
|
amountFileError.value = 'Seuls les fichiers PDF sont acceptés.'
|
||||||
|
selectedAmountFile.value = undefined
|
||||||
|
target.value = ''
|
||||||
|
return
|
||||||
|
}
|
||||||
|
amountFileError.value = ''
|
||||||
|
selectedAmountFile.value = file ?? undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
const onSubmit = () => {
|
const onSubmit = () => {
|
||||||
const data = {
|
const data = {
|
||||||
month: `${form.month}-01`,
|
month: `${form.month}-01`,
|
||||||
kilometers: form.kilometers,
|
kilometers: form.kilometers,
|
||||||
|
amount: form.amount,
|
||||||
comment: form.comment || undefined
|
comment: form.comment || undefined
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isEditing.value && editingItem.value) {
|
if (isEditing.value && editingItem.value) {
|
||||||
emit('update', editingItem.value.id, data, selectedFile.value)
|
emit('update', editingItem.value.id, data, selectedKmFile.value, selectedAmountFile.value)
|
||||||
} else {
|
} else {
|
||||||
emit('create', data, selectedFile.value)
|
emit('create', data, selectedKmFile.value, selectedAmountFile.value)
|
||||||
}
|
}
|
||||||
isDrawerOpen.value = false
|
isDrawerOpen.value = false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,8 +22,8 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<p class="text-[16px]">
|
<p class="text-[16px]">
|
||||||
<span class="font-bold">RTT À LA DATE DU JOUR :</span>
|
<span class="font-bold">RTT À LA SEMAINE {{ lastCompleteWeek }} : </span>
|
||||||
{{ formatMinutes(summary?.availableMinutes ?? 0) }}
|
<span class="font-bold">{{ formatMinutes(summary?.availableMinutes ?? 0) }}</span>
|
||||||
</p>
|
</p>
|
||||||
<div class="flex justify-center">
|
<div class="flex justify-center">
|
||||||
<button
|
<button
|
||||||
@@ -67,26 +67,26 @@
|
|||||||
<tr v-if="showCarryRow" class="bg-tertiary-500">
|
<tr v-if="showCarryRow" class="bg-tertiary-500">
|
||||||
<td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Report</td>
|
<td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Report</td>
|
||||||
<td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
|
<td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBase25Minutes) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBase25Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBase25Minutes) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBonus25Minutes) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBonus25Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBonus25Minutes) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(summary!.carryBase25Minutes + summary!.carryBonus25Minutes) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(summary!.carryBase25Minutes + summary!.carryBonus25Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBase25Minutes + summary!.carryBonus25Minutes) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBase50Minutes) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBase50Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBase50Minutes) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBonus50Minutes) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryBonus50Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBonus50Minutes) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(summary!.carryBase50Minutes + summary!.carryBonus50Minutes) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(summary!.carryBase50Minutes + summary!.carryBonus50Minutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryBase50Minutes + summary!.carryBonus50Minutes) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryFromPreviousYearMinutes) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(summary!.carryFromPreviousYearMinutes) }} <span class="text-neutral-400">/ {{ formatCentiemes(summary!.carryFromPreviousYearMinutes) }}</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<!-- Report mois précédent (cumulated balance from previous months, July+) -->
|
<!-- Report mois précédent (cumulated balance from previous months, July+) -->
|
||||||
<tr v-if="showMonthReportRow" class="bg-tertiary-500">
|
<tr v-if="showMonthReportRow" class="bg-tertiary-500">
|
||||||
<td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Report</td>
|
<td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Report</td>
|
||||||
<td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
|
<td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.base25) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.base25) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.base25) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.bonus25) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.bonus25) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.bonus25) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(monthReport.total25) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(monthReport.total25) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.total25) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.base50) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.base50) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.base50) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.bonus50) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.bonus50) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.bonus50) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(monthReport.total50) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(monthReport.total50) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.total50) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.total) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(monthReport.total) }} <span class="text-neutral-400">/ {{ formatCentiemes(monthReport.total) }}</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<!-- Week rows (always 5) -->
|
<!-- Week rows (always 5) -->
|
||||||
@@ -162,13 +162,13 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Reste</td>
|
<td class="px-5 py-[10px] font-bold text-primary-500 border border-primary-500">Reste</td>
|
||||||
<td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
|
<td class="px-4 py-[10px] text-center text-neutral-500 border border-primary-500 border-r-2">-</td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.base25) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.base25) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.base25) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.bonus25) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.bonus25) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.bonus25) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(reste.total25) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(reste.total25) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.total25) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.base50) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.base50) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.base50) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.bonus50) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.bonus50) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.bonus50) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(reste.total50) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500 border-r-2">{{ formatMinutes(reste.total50) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.total50) }}</span></td>
|
||||||
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.total) }}</td>
|
<td class="px-4 py-[10px] text-center font-bold text-primary-500 border border-primary-500">{{ formatMinutes(reste.total) }} <span class="text-neutral-400">/ {{ formatCentiemes(reste.total) }}</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
@@ -258,6 +258,17 @@ const emit = defineEmits<{
|
|||||||
(event: 'submit-rtt-payment', month: number, base25Minutes: number, bonus25Minutes: number, base50Minutes: number, bonus50Minutes: number): void
|
(event: 'submit-rtt-payment', month: number, base25Minutes: number, bonus25Minutes: number, base50Minutes: number, bonus50Minutes: number): void
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
|
// --- Last complete week number ---
|
||||||
|
|
||||||
|
const lastCompleteWeek = computed(() => {
|
||||||
|
const now = new Date()
|
||||||
|
const startOfYear = new Date(now.getFullYear(), 0, 1)
|
||||||
|
const dayOfYear = Math.floor((now.getTime() - startOfYear.getTime()) / 86400000) + 1
|
||||||
|
const dayOfWeek = now.getDay() || 7 // Monday = 1, Sunday = 7
|
||||||
|
const currentWeek = Math.ceil((dayOfYear - dayOfWeek + 10) / 7)
|
||||||
|
return currentWeek - 1
|
||||||
|
})
|
||||||
|
|
||||||
// --- Month navigation ---
|
// --- Month navigation ---
|
||||||
|
|
||||||
const orderedMonths = [6, 7, 8, 9, 10, 11, 12, 1, 2, 3, 4, 5] as const
|
const orderedMonths = [6, 7, 8, 9, 10, 11, 12, 1, 2, 3, 4, 5] as const
|
||||||
@@ -470,6 +481,11 @@ const formatMinutes = (minutes: number): string => {
|
|||||||
return `${sign}${hours} h ${rest} m`
|
return `${sign}${hours} h ${rest} m`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const formatCentiemes = (minutes: number): string => {
|
||||||
|
const value = minutes / 60
|
||||||
|
return value.toFixed(2).replace('.', ',')
|
||||||
|
}
|
||||||
|
|
||||||
// --- Payment drawer ---
|
// --- Payment drawer ---
|
||||||
|
|
||||||
const isPaymentDrawerOpen = ref(false)
|
const isPaymentDrawerOpen = ref(false)
|
||||||
|
|||||||
@@ -71,6 +71,17 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
|
|||||||
return history.find((item) => item.startDate <= today && (!item.endDate || item.endDate >= today)) ?? null
|
return history.find((item) => item.startDate <= today && (!item.endDate || item.endDate >= today)) ?? null
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const lastEndedContractPeriod = computed(() => {
|
||||||
|
if (currentActiveContractPeriod.value) return null
|
||||||
|
const today = getTodayYmd()
|
||||||
|
const history = employee.value?.contractHistory ?? []
|
||||||
|
const ended = history.filter((item) => item.endDate && item.endDate < today)
|
||||||
|
if (ended.length === 0) return null
|
||||||
|
return ended.reduce((latest, item) => (item.endDate! > latest.endDate! ? item : latest))
|
||||||
|
})
|
||||||
|
|
||||||
|
const editableContractPeriod = computed(() => currentActiveContractPeriod.value ?? lastEndedContractPeriod.value)
|
||||||
|
|
||||||
const currentActiveContractPeriodId = computed<number | null>(() => {
|
const currentActiveContractPeriodId = computed<number | null>(() => {
|
||||||
const period = currentActiveContractPeriod.value
|
const period = currentActiveContractPeriod.value
|
||||||
return period?.periodId ?? null
|
return period?.periodId ?? null
|
||||||
@@ -78,13 +89,15 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
|
|||||||
|
|
||||||
const canCloseCurrentContract = computed(() => {
|
const canCloseCurrentContract = computed(() => {
|
||||||
const active = currentActiveContractPeriod.value
|
const active = currentActiveContractPeriod.value
|
||||||
if (!active) return false
|
if (active) {
|
||||||
if (!active.endDate) return true
|
if (!active.endDate) return true
|
||||||
return active.endDate > getTodayYmd()
|
return active.endDate > getTodayYmd()
|
||||||
|
}
|
||||||
|
return !!lastEndedContractPeriod.value
|
||||||
})
|
})
|
||||||
|
|
||||||
const canCreateContract = computed(() => {
|
const canCreateContract = computed(() => {
|
||||||
const active = currentActiveContractPeriod.value
|
const active = editableContractPeriod.value
|
||||||
if (!active) return true
|
if (!active) return true
|
||||||
return !!active.endDate
|
return !!active.endDate
|
||||||
})
|
})
|
||||||
@@ -135,15 +148,15 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
|
|||||||
|
|
||||||
const hydrateContractFormFromCurrent = () => {
|
const hydrateContractFormFromCurrent = () => {
|
||||||
const current = employee.value
|
const current = employee.value
|
||||||
const active = currentActiveContractPeriod.value
|
const period = editableContractPeriod.value
|
||||||
if (!current || !active) return
|
if (!current || !period) return
|
||||||
|
|
||||||
contractForm.contractId = active.contractId ?? current.contract?.id ?? ''
|
contractForm.contractId = period.contractId ?? current.contract?.id ?? ''
|
||||||
contractForm.contractName = active.contractName ?? current.contract?.name ?? ''
|
contractForm.contractName = period.contractName ?? current.contract?.name ?? ''
|
||||||
contractForm.weeklyHours = active.weeklyHours ?? current.contract?.weeklyHours ?? null
|
contractForm.weeklyHours = period.weeklyHours ?? current.contract?.weeklyHours ?? null
|
||||||
contractForm.contractNature = active.contractNature
|
contractForm.contractNature = period.contractNature
|
||||||
contractForm.startDate = active.startDate
|
contractForm.startDate = period.startDate
|
||||||
contractForm.endDate = getTodayYmd()
|
contractForm.endDate = period.endDate ?? getTodayYmd()
|
||||||
contractForm.paidLeaveSettled = false
|
contractForm.paidLeaveSettled = false
|
||||||
contractForm.comment = ''
|
contractForm.comment = ''
|
||||||
}
|
}
|
||||||
@@ -173,8 +186,8 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
|
|||||||
createContractForm.contractNature = 'CDI'
|
createContractForm.contractNature = 'CDI'
|
||||||
createContractForm.endDate = ''
|
createContractForm.endDate = ''
|
||||||
createContractForm.isDriver = false
|
createContractForm.isDriver = false
|
||||||
createContractForm.startDate = currentActiveContractPeriod.value?.endDate
|
createContractForm.startDate = editableContractPeriod.value?.endDate
|
||||||
? (shiftYmd(currentActiveContractPeriod.value.endDate, 1) ?? currentActiveContractPeriod.value.endDate)
|
? (shiftYmd(editableContractPeriod.value.endDate, 1) ?? editableContractPeriod.value.endDate)
|
||||||
: getTodayYmd()
|
: getTodayYmd()
|
||||||
resetCreateValidation()
|
resetCreateValidation()
|
||||||
isCreateContractDrawerOpen.value = true
|
isCreateContractDrawerOpen.value = true
|
||||||
@@ -185,15 +198,16 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
|
|||||||
}
|
}
|
||||||
|
|
||||||
const submitContractUpdate = async () => {
|
const submitContractUpdate = async () => {
|
||||||
if (!employee.value || isContractSubmitting.value || !currentActiveContractPeriod.value) return
|
const period = editableContractPeriod.value
|
||||||
|
if (!employee.value || isContractSubmitting.value || !period) return
|
||||||
|
|
||||||
validationTouched.endDate = true
|
validationTouched.endDate = true
|
||||||
if (!isContractEndDateValid.value) return
|
if (!isContractEndDateValid.value) return
|
||||||
|
|
||||||
if (contractForm.endDate < currentActiveContractPeriod.value.startDate) {
|
if (contractForm.endDate < period.startDate) {
|
||||||
toast.error({
|
toast.error({
|
||||||
title: 'Erreur',
|
title: 'Erreur',
|
||||||
message: `La date de fin doit être postérieure au ${formatDate(currentActiveContractPeriod.value.startDate)}.`
|
message: `La date de fin doit être postérieure au ${formatDate(period.startDate)}.`
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -226,8 +240,8 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
|
|||||||
createValidationTouched.endDate = true
|
createValidationTouched.endDate = true
|
||||||
if (!isCreateContractFormValid.value) return
|
if (!isCreateContractFormValid.value) return
|
||||||
|
|
||||||
if (currentActiveContractPeriod.value?.endDate) {
|
if (editableContractPeriod.value?.endDate) {
|
||||||
const minStartDate = shiftYmd(currentActiveContractPeriod.value.endDate, 1) ?? currentActiveContractPeriod.value.endDate
|
const minStartDate = shiftYmd(editableContractPeriod.value.endDate, 1) ?? editableContractPeriod.value.endDate
|
||||||
if (createContractForm.startDate < minStartDate) {
|
if (createContractForm.startDate < minStartDate) {
|
||||||
toast.error({
|
toast.error({
|
||||||
title: 'Erreur',
|
title: 'Erreur',
|
||||||
|
|||||||
@@ -6,7 +6,8 @@ import {
|
|||||||
createMileageAllowance,
|
createMileageAllowance,
|
||||||
updateMileageAllowance,
|
updateMileageAllowance,
|
||||||
deleteMileageAllowance,
|
deleteMileageAllowance,
|
||||||
uploadReceipt
|
uploadKmReceipt,
|
||||||
|
uploadAmountReceipt
|
||||||
} from '~/services/mileage-allowances'
|
} from '~/services/mileage-allowances'
|
||||||
|
|
||||||
export const useEmployeeMileage = (employee: Ref<Employee | null>, reloadEmployee: () => Promise<void>) => {
|
export const useEmployeeMileage = (employee: Ref<Employee | null>, reloadEmployee: () => Promise<void>) => {
|
||||||
@@ -32,24 +33,33 @@ export const useEmployeeMileage = (employee: Ref<Employee | null>, reloadEmploye
|
|||||||
mileageDataLoaded.value = false
|
mileageDataLoaded.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
const submitCreateMileage = async (data: { month: string; kilometers: number; comment?: string }, file?: File) => {
|
const submitCreateMileage = async (data: { month: string; kilometers: number; amount: number; comment?: string }, kmFile?: File, amountFile?: File) => {
|
||||||
if (!employee.value) return
|
if (!employee.value) return
|
||||||
const result = await createMileageAllowance({
|
const result = await createMileageAllowance({
|
||||||
employeeId: employee.value.id,
|
employeeId: employee.value.id,
|
||||||
month: data.month,
|
month: data.month,
|
||||||
kilometers: data.kilometers,
|
kilometers: data.kilometers,
|
||||||
|
amount: data.amount,
|
||||||
comment: data.comment
|
comment: data.comment
|
||||||
})
|
})
|
||||||
if (file && result?.id) {
|
if (result?.id) {
|
||||||
await uploadReceipt(apiBase, result.id, file)
|
if (kmFile) {
|
||||||
|
await uploadKmReceipt(apiBase, result.id, kmFile)
|
||||||
|
}
|
||||||
|
if (amountFile) {
|
||||||
|
await uploadAmountReceipt(apiBase, result.id, amountFile)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
await reloadEmployee()
|
await reloadEmployee()
|
||||||
}
|
}
|
||||||
|
|
||||||
const submitUpdateMileage = async (id: number, data: { month: string; kilometers: number; comment?: string }, file?: File) => {
|
const submitUpdateMileage = async (id: number, data: { month: string; kilometers: number; amount: number; comment?: string }, kmFile?: File, amountFile?: File) => {
|
||||||
await updateMileageAllowance(id, data)
|
await updateMileageAllowance(id, data)
|
||||||
if (file) {
|
if (kmFile) {
|
||||||
await uploadReceipt(apiBase, id, file)
|
await uploadKmReceipt(apiBase, id, kmFile)
|
||||||
|
}
|
||||||
|
if (amountFile) {
|
||||||
|
await uploadAmountReceipt(apiBase, id, amountFile)
|
||||||
}
|
}
|
||||||
await reloadEmployee()
|
await reloadEmployee()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,16 @@
|
|||||||
<div v-else class="flex min-h-0 flex-1 flex-col">
|
<div v-else class="flex min-h-0 flex-1 flex-col">
|
||||||
<div class="flex items-center justify-between">
|
<div class="flex items-center justify-between">
|
||||||
<div>
|
<div>
|
||||||
<h1 class="text-[32px] font-bold">{{ employee.firstName }} {{ employee.lastName }}</h1>
|
<div class="flex items-center gap-4">
|
||||||
|
<h1 class="text-[32px] font-bold">{{ employee.firstName }} {{ employee.lastName }}</h1>
|
||||||
|
<button
|
||||||
|
class="inline-flex items-center justify-center rounded-md p-1 transition-colors duration-150 focus:outline-none focus-visible:ring-2 bg-primary-500 hover:bg-secondary-500 active:bg-primary-500 text-white cursor-pointer"
|
||||||
|
title="Export heures annuelles"
|
||||||
|
@click="isYearlyHoursDrawerOpen = true"
|
||||||
|
>
|
||||||
|
<Icon name="mdi:printer" size="24" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
<p>Date d'entrée : {{ employee.entryDate ? employee.entryDate.split('-').reverse().join('/') : '-' }}</p>
|
<p>Date d'entrée : {{ employee.entryDate ? employee.entryDate.split('-').reverse().join('/') : '-' }}</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-right">
|
<div class="text-right">
|
||||||
@@ -62,8 +71,8 @@
|
|||||||
: 'border-transparent text-primary-500/50 hover:text-primary-500'"
|
: 'border-transparent text-primary-500/50 hover:text-primary-500'"
|
||||||
@click="activeTab = 'mileage'"
|
@click="activeTab = 'mileage'"
|
||||||
>
|
>
|
||||||
<Icon name="mdi:car-outline" size="24" class="align-self"/>
|
<Icon name="mdi:account-cash-outline" size="24" class="align-self"/>
|
||||||
Frais Kms
|
Frais
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
class="pb-2 border-b-2 flex items-center gap-3"
|
class="pb-2 border-b-2 flex items-center gap-3"
|
||||||
@@ -166,10 +175,24 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<EmployeeYearlyHoursDrawer
|
||||||
|
v-if="employee"
|
||||||
|
v-model="isYearlyHoursDrawerOpen"
|
||||||
|
:employee-id="employee.id"
|
||||||
|
@submit="handleYearlyHoursPrint"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
import { ref } from 'vue'
|
||||||
|
import EmployeeYearlyHoursDrawer from '~/components/EmployeeYearlyHoursDrawer.vue'
|
||||||
|
import { usePdfPrinter } from '~/composables/usePdfPrinter'
|
||||||
|
|
||||||
|
const { printPdf } = usePdfPrinter()
|
||||||
|
const isYearlyHoursDrawerOpen = ref(false)
|
||||||
|
|
||||||
const {
|
const {
|
||||||
employee,
|
employee,
|
||||||
isLoading,
|
isLoading,
|
||||||
@@ -234,6 +257,12 @@ const {
|
|||||||
submitDeleteBonus
|
submitDeleteBonus
|
||||||
} = useEmployeeDetailPage()
|
} = useEmployeeDetailPage()
|
||||||
|
|
||||||
|
const handleYearlyHoursPrint = async (year: number) => {
|
||||||
|
if (!employee.value) return
|
||||||
|
await printPdf(`/yearly-hours/print?employeeId=${employee.value.id}&year=${year}`)
|
||||||
|
isYearlyHoursDrawerOpen.value = false
|
||||||
|
}
|
||||||
|
|
||||||
useHead(() => ({
|
useHead(() => ({
|
||||||
title: employee.value
|
title: employee.value
|
||||||
? `${employee.value.firstName} ${employee.value.lastName}`
|
? `${employee.value.firstName} ${employee.value.lastName}`
|
||||||
|
|||||||
@@ -2,8 +2,11 @@ export type MileageAllowance = {
|
|||||||
id: number
|
id: number
|
||||||
month: string
|
month: string
|
||||||
kilometers: number
|
kilometers: number
|
||||||
|
amount: number
|
||||||
comment: string | null
|
comment: string | null
|
||||||
receiptPath: string | null
|
receiptPath: string | null
|
||||||
receiptName: string | null
|
receiptName: string | null
|
||||||
|
amountReceiptPath: string | null
|
||||||
|
amountReceiptName: string | null
|
||||||
createdAt: string
|
createdAt: string
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ export const createMileageAllowance = async (data: {
|
|||||||
employeeId: number
|
employeeId: number
|
||||||
month: string
|
month: string
|
||||||
kilometers: number
|
kilometers: number
|
||||||
|
amount: number
|
||||||
comment?: string
|
comment?: string
|
||||||
}) => {
|
}) => {
|
||||||
const api = useApi()
|
const api = useApi()
|
||||||
@@ -23,6 +24,7 @@ export const createMileageAllowance = async (data: {
|
|||||||
employee: `/api/employees/${data.employeeId}`,
|
employee: `/api/employees/${data.employeeId}`,
|
||||||
month: data.month,
|
month: data.month,
|
||||||
kilometers: data.kilometers,
|
kilometers: data.kilometers,
|
||||||
|
amount: data.amount,
|
||||||
comment: data.comment
|
comment: data.comment
|
||||||
}, {
|
}, {
|
||||||
toastSuccessKey: 'success.mileage.create',
|
toastSuccessKey: 'success.mileage.create',
|
||||||
@@ -33,12 +35,14 @@ export const createMileageAllowance = async (data: {
|
|||||||
export const updateMileageAllowance = async (id: number, data: {
|
export const updateMileageAllowance = async (id: number, data: {
|
||||||
month: string
|
month: string
|
||||||
kilometers: number
|
kilometers: number
|
||||||
|
amount: number
|
||||||
comment?: string
|
comment?: string
|
||||||
}) => {
|
}) => {
|
||||||
const api = useApi()
|
const api = useApi()
|
||||||
return api.patch<MileageAllowance>(`/mileage_allowances/${id}`, {
|
return api.patch<MileageAllowance>(`/mileage_allowances/${id}`, {
|
||||||
month: data.month,
|
month: data.month,
|
||||||
kilometers: data.kilometers,
|
kilometers: data.kilometers,
|
||||||
|
amount: data.amount,
|
||||||
comment: data.comment
|
comment: data.comment
|
||||||
}, {
|
}, {
|
||||||
toastSuccessKey: 'success.mileage.update',
|
toastSuccessKey: 'success.mileage.update',
|
||||||
@@ -54,7 +58,7 @@ export const deleteMileageAllowance = async (id: number) => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export const uploadReceipt = async (baseURL: string, id: number, file: File) => {
|
export const uploadKmReceipt = async (baseURL: string, id: number, file: File) => {
|
||||||
const formData = new FormData()
|
const formData = new FormData()
|
||||||
formData.append('file', file)
|
formData.append('file', file)
|
||||||
return $fetch(`${baseURL}/mileage_allowances/${id}/receipt`, {
|
return $fetch(`${baseURL}/mileage_allowances/${id}/receipt`, {
|
||||||
@@ -64,6 +68,20 @@ export const uploadReceipt = async (baseURL: string, id: number, file: File) =>
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export const getReceiptUrl = (baseURL: string, id: number): string => {
|
export const uploadAmountReceipt = async (baseURL: string, id: number, file: File) => {
|
||||||
|
const formData = new FormData()
|
||||||
|
formData.append('file', file)
|
||||||
|
return $fetch(`${baseURL}/mileage_allowances/${id}/amount-receipt`, {
|
||||||
|
method: 'POST',
|
||||||
|
body: formData,
|
||||||
|
credentials: 'include'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export const getKmReceiptUrl = (baseURL: string, id: number): string => {
|
||||||
return `${baseURL}/mileage_allowances/${id}/receipt`
|
return `${baseURL}/mileage_allowances/${id}/receipt`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const getAmountReceiptUrl = (baseURL: string, id: number): string => {
|
||||||
|
return `${baseURL}/mileage_allowances/${id}/amount-receipt`
|
||||||
|
}
|
||||||
|
|||||||
26
migrations/Version20260318143503.php
Normal file
26
migrations/Version20260318143503.php
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260318143503 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add amount column to mileage_allowances';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE mileage_allowances ADD COLUMN amount DOUBLE PRECISION DEFAULT 0 NOT NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE mileage_allowances DROP COLUMN amount');
|
||||||
|
}
|
||||||
|
}
|
||||||
28
migrations/Version20260319100000.php
Normal file
28
migrations/Version20260319100000.php
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
final class Version20260319100000 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Add amount receipt fields to mileage_allowances';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE mileage_allowances ADD amount_receipt_path VARCHAR(255) DEFAULT NULL');
|
||||||
|
$this->addSql('ALTER TABLE mileage_allowances ADD amount_receipt_name VARCHAR(255) DEFAULT NULL');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql('ALTER TABLE mileage_allowances DROP COLUMN amount_receipt_path');
|
||||||
|
$this->addSql('ALTER TABLE mileage_allowances DROP COLUMN amount_receipt_name');
|
||||||
|
}
|
||||||
|
}
|
||||||
25
src/ApiResource/EmployeeYearlyHoursPrint.php
Normal file
25
src/ApiResource/EmployeeYearlyHoursPrint.php
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\ApiResource;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\ApiResource;
|
||||||
|
use ApiPlatform\Metadata\Get;
|
||||||
|
use ApiPlatform\Metadata\QueryParameter;
|
||||||
|
use App\State\EmployeeYearlyHoursPrintProvider;
|
||||||
|
|
||||||
|
#[ApiResource(
|
||||||
|
operations: [
|
||||||
|
new Get(
|
||||||
|
uriTemplate: '/yearly-hours/print',
|
||||||
|
provider: EmployeeYearlyHoursPrintProvider::class,
|
||||||
|
parameters: [
|
||||||
|
new QueryParameter(key: 'employeeId', required: true),
|
||||||
|
new QueryParameter(key: 'year', required: true),
|
||||||
|
],
|
||||||
|
security: "is_granted('ROLE_USER')"
|
||||||
|
),
|
||||||
|
]
|
||||||
|
)]
|
||||||
|
final class EmployeeYearlyHoursPrint {}
|
||||||
@@ -14,6 +14,8 @@ use ApiPlatform\Metadata\GetCollection;
|
|||||||
use ApiPlatform\Metadata\Patch;
|
use ApiPlatform\Metadata\Patch;
|
||||||
use ApiPlatform\Metadata\Post;
|
use ApiPlatform\Metadata\Post;
|
||||||
use App\Repository\MileageAllowanceRepository;
|
use App\Repository\MileageAllowanceRepository;
|
||||||
|
use App\State\MileageAllowanceAmountReceiptDownloadProvider;
|
||||||
|
use App\State\MileageAllowanceAmountReceiptUploadProcessor;
|
||||||
use App\State\MileageAllowanceDeleteProcessor;
|
use App\State\MileageAllowanceDeleteProcessor;
|
||||||
use App\State\MileageAllowanceReceiptDownloadProvider;
|
use App\State\MileageAllowanceReceiptDownloadProvider;
|
||||||
use App\State\MileageAllowanceReceiptUploadProcessor;
|
use App\State\MileageAllowanceReceiptUploadProcessor;
|
||||||
@@ -50,6 +52,17 @@ use Symfony\Component\Serializer\Attribute\Groups;
|
|||||||
security: "is_granted('ROLE_ADMIN')",
|
security: "is_granted('ROLE_ADMIN')",
|
||||||
provider: MileageAllowanceReceiptDownloadProvider::class,
|
provider: MileageAllowanceReceiptDownloadProvider::class,
|
||||||
),
|
),
|
||||||
|
new Post(
|
||||||
|
uriTemplate: '/mileage_allowances/{id}/amount-receipt',
|
||||||
|
security: "is_granted('ROLE_ADMIN')",
|
||||||
|
deserialize: false,
|
||||||
|
processor: MileageAllowanceAmountReceiptUploadProcessor::class,
|
||||||
|
),
|
||||||
|
new Get(
|
||||||
|
uriTemplate: '/mileage_allowances/{id}/amount-receipt',
|
||||||
|
security: "is_granted('ROLE_ADMIN')",
|
||||||
|
provider: MileageAllowanceAmountReceiptDownloadProvider::class,
|
||||||
|
),
|
||||||
],
|
],
|
||||||
normalizationContext: [
|
normalizationContext: [
|
||||||
'groups' => ['mileage_allowance:read', 'employee:read'],
|
'groups' => ['mileage_allowance:read', 'employee:read'],
|
||||||
@@ -87,6 +100,10 @@ class MileageAllowance
|
|||||||
#[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
|
#[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
|
||||||
private float $kilometers = 0;
|
private float $kilometers = 0;
|
||||||
|
|
||||||
|
#[ORM\Column(type: 'float', options: ['default' => 0])]
|
||||||
|
#[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
|
||||||
|
private float $amount = 0;
|
||||||
|
|
||||||
#[ORM\Column(type: 'text', nullable: true)]
|
#[ORM\Column(type: 'text', nullable: true)]
|
||||||
#[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
|
#[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
|
||||||
private ?string $comment = null;
|
private ?string $comment = null;
|
||||||
@@ -99,6 +116,14 @@ class MileageAllowance
|
|||||||
#[Groups(['mileage_allowance:read'])]
|
#[Groups(['mileage_allowance:read'])]
|
||||||
private ?string $receiptName = null;
|
private ?string $receiptName = null;
|
||||||
|
|
||||||
|
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||||
|
#[Groups(['mileage_allowance:read'])]
|
||||||
|
private ?string $amountReceiptPath = null;
|
||||||
|
|
||||||
|
#[ORM\Column(type: 'string', length: 255, nullable: true)]
|
||||||
|
#[Groups(['mileage_allowance:read'])]
|
||||||
|
private ?string $amountReceiptName = null;
|
||||||
|
|
||||||
#[ORM\Column(type: 'datetime_immutable')]
|
#[ORM\Column(type: 'datetime_immutable')]
|
||||||
#[Groups(['mileage_allowance:read'])]
|
#[Groups(['mileage_allowance:read'])]
|
||||||
private DateTimeImmutable $createdAt;
|
private DateTimeImmutable $createdAt;
|
||||||
@@ -149,6 +174,18 @@ class MileageAllowance
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getAmount(): float
|
||||||
|
{
|
||||||
|
return $this->amount;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setAmount(float $amount): self
|
||||||
|
{
|
||||||
|
$this->amount = $amount;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
public function getComment(): ?string
|
public function getComment(): ?string
|
||||||
{
|
{
|
||||||
return $this->comment;
|
return $this->comment;
|
||||||
@@ -185,6 +222,30 @@ class MileageAllowance
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getAmountReceiptPath(): ?string
|
||||||
|
{
|
||||||
|
return $this->amountReceiptPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setAmountReceiptPath(?string $amountReceiptPath): self
|
||||||
|
{
|
||||||
|
$this->amountReceiptPath = $amountReceiptPath;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getAmountReceiptName(): ?string
|
||||||
|
{
|
||||||
|
return $this->amountReceiptName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setAmountReceiptName(?string $amountReceiptName): self
|
||||||
|
{
|
||||||
|
$this->amountReceiptName = $amountReceiptName;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
public function getCreatedAt(): DateTimeImmutable
|
public function getCreatedAt(): DateTimeImmutable
|
||||||
{
|
{
|
||||||
return $this->createdAt;
|
return $this->createdAt;
|
||||||
|
|||||||
@@ -11,4 +11,6 @@ use DateTimeImmutable;
|
|||||||
interface EmployeeContractPeriodReadRepositoryInterface
|
interface EmployeeContractPeriodReadRepositoryInterface
|
||||||
{
|
{
|
||||||
public function findOneCoveringDate(Employee $employee, DateTimeImmutable $date): ?EmployeeContractPeriod;
|
public function findOneCoveringDate(Employee $employee, DateTimeImmutable $date): ?EmployeeContractPeriod;
|
||||||
|
|
||||||
|
public function findLatestPeriod(Employee $employee): ?EmployeeContractPeriod;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,6 +60,18 @@ final class EmployeeContractPeriodRepository extends ServiceEntityRepository imp
|
|||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function findLatestPeriod(Employee $employee): ?EmployeeContractPeriod
|
||||||
|
{
|
||||||
|
return $this->createQueryBuilder('p')
|
||||||
|
->andWhere('p.employee = :employee')
|
||||||
|
->setParameter('employee', $employee)
|
||||||
|
->orderBy('p.startDate', 'DESC')
|
||||||
|
->setMaxResults(1)
|
||||||
|
->getQuery()
|
||||||
|
->getOneOrNullResult()
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
public function closeOpenPeriods(Employee $employee, DateTimeImmutable $endDate): int
|
public function closeOpenPeriods(Employee $employee, DateTimeImmutable $endDate): int
|
||||||
{
|
{
|
||||||
return $this->createQueryBuilder('p')
|
return $this->createQueryBuilder('p')
|
||||||
|
|||||||
@@ -191,6 +191,57 @@ final class WorkHourRepository extends ServiceEntityRepository implements WorkHo
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Count weekend and public holiday worked days for forfait bonus leave (PRESENCE mode only).
|
||||||
|
* Morning + afternoon = 1.0 day, one only = 0.5 day.
|
||||||
|
*
|
||||||
|
* @param list<string> $publicHolidayDates Y-m-d formatted weekday public holiday dates
|
||||||
|
*/
|
||||||
|
public function countWeekendAndHolidayWorkedDays(Employee $employee, DateTimeImmutable $from, DateTimeImmutable $to, array $publicHolidayDates = []): float
|
||||||
|
{
|
||||||
|
$targetDates = [];
|
||||||
|
|
||||||
|
// Collect weekend dates in range
|
||||||
|
for ($cursor = $from; $cursor <= $to; $cursor = $cursor->modify('+1 day')) {
|
||||||
|
if ((int) $cursor->format('N') >= 6) {
|
||||||
|
$targetDates[] = $cursor;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add weekday public holidays
|
||||||
|
foreach ($publicHolidayDates as $date) {
|
||||||
|
$targetDates[] = new DateTimeImmutable($date);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([] === $targetDates) {
|
||||||
|
return 0.0;
|
||||||
|
}
|
||||||
|
|
||||||
|
$dateStrings = array_map(static fn (DateTimeImmutable $d): string => $d->format('Y-m-d'), $targetDates);
|
||||||
|
|
||||||
|
/** @var list<WorkHour> $rows */
|
||||||
|
$rows = $this->createQueryBuilder('w')
|
||||||
|
->andWhere('w.employee = :employee')
|
||||||
|
->andWhere('w.workDate IN (:dates)')
|
||||||
|
->andWhere('w.isPresentMorning = true OR w.isPresentAfternoon = true')
|
||||||
|
->setParameter('employee', $employee)
|
||||||
|
->setParameter('dates', $dateStrings)
|
||||||
|
->getQuery()
|
||||||
|
->getResult()
|
||||||
|
;
|
||||||
|
|
||||||
|
$total = 0.0;
|
||||||
|
foreach ($rows as $row) {
|
||||||
|
if ($row->isPresentMorning() && $row->isPresentAfternoon()) {
|
||||||
|
$total += 1.0;
|
||||||
|
} else {
|
||||||
|
$total += 0.5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $total;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the set of Y-m-d dates where the employee has worked hours on the given dates.
|
* Return the set of Y-m-d dates where the employee has worked hours on the given dates.
|
||||||
*
|
*
|
||||||
@@ -228,6 +279,55 @@ final class WorkHourRepository extends ServiceEntityRepository implements WorkHo
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function isWeekFullyValidated(Employee $employee, DateTimeImmutable $from, DateTimeImmutable $to): bool
|
||||||
|
{
|
||||||
|
// Count weekdays (Mon-Fri) in range
|
||||||
|
$expectedWeekdays = 0;
|
||||||
|
for ($d = $from; $d <= $to; $d = $d->modify('+1 day')) {
|
||||||
|
if ((int) $d->format('N') <= 5) {
|
||||||
|
++$expectedWeekdays;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (0 === $expectedWeekdays) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Every weekday must have a work_hour row
|
||||||
|
$totalCount = (int) $this->createQueryBuilder('w')
|
||||||
|
->select('COUNT(w.id)')
|
||||||
|
->andWhere('w.employee = :employee')
|
||||||
|
->andWhere('w.workDate >= :from')
|
||||||
|
->andWhere('w.workDate <= :to')
|
||||||
|
->setParameter('employee', $employee)
|
||||||
|
->setParameter('from', $from)
|
||||||
|
->setParameter('to', $to)
|
||||||
|
->getQuery()
|
||||||
|
->getSingleScalarResult()
|
||||||
|
;
|
||||||
|
|
||||||
|
if ($totalCount < $expectedWeekdays) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// All rows must be validated
|
||||||
|
$nonValidatedCount = (int) $this->createQueryBuilder('w')
|
||||||
|
->select('COUNT(w.id)')
|
||||||
|
->andWhere('w.employee = :employee')
|
||||||
|
->andWhere('w.workDate >= :from')
|
||||||
|
->andWhere('w.workDate <= :to')
|
||||||
|
->andWhere('w.isValid = :isValid')
|
||||||
|
->setParameter('employee', $employee)
|
||||||
|
->setParameter('from', $from)
|
||||||
|
->setParameter('to', $to)
|
||||||
|
->setParameter('isValid', false)
|
||||||
|
->getQuery()
|
||||||
|
->getSingleScalarResult()
|
||||||
|
;
|
||||||
|
|
||||||
|
return 0 === $nonValidatedCount;
|
||||||
|
}
|
||||||
|
|
||||||
public function hasPendingSiteValidationForSiteAndDate(int $siteId, DateTimeInterface $date): bool
|
public function hasPendingSiteValidationForSiteAndDate(int $siteId, DateTimeInterface $date): bool
|
||||||
{
|
{
|
||||||
$workDate = DateTimeImmutable::createFromInterface($date);
|
$workDate = DateTimeImmutable::createFromInterface($date);
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ namespace App\Service;
|
|||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
use RuntimeException;
|
use RuntimeException;
|
||||||
|
use Symfony\Contracts\Cache\CacheInterface;
|
||||||
|
use Symfony\Contracts\Cache\ItemInterface;
|
||||||
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
|
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
|
||||||
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
|
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
|
||||||
use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
|
use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
|
||||||
@@ -17,7 +19,8 @@ final readonly class PublicHolidayService implements PublicHolidayServiceInterfa
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private HttpClientInterface $client,
|
private HttpClientInterface $client,
|
||||||
private string $holidayUrl
|
private string $holidayUrl,
|
||||||
|
private CacheInterface $cache,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -30,24 +33,29 @@ final readonly class PublicHolidayService implements PublicHolidayServiceInterfa
|
|||||||
public function getHolidaysDay(string $zone): array
|
public function getHolidaysDay(string $zone): array
|
||||||
{
|
{
|
||||||
$zone = strtolower(trim($zone));
|
$zone = strtolower(trim($zone));
|
||||||
$url = $this->holidayUrl."{$zone}.json";
|
$key = "public_holidays_{$zone}_all";
|
||||||
|
|
||||||
try {
|
return $this->cache->get($key, function (ItemInterface $item) use ($zone): array {
|
||||||
$response = $this->client->request(
|
$item->expiresAfter(30 * 86400);
|
||||||
'GET',
|
$url = $this->holidayUrl."{$zone}.json";
|
||||||
$url
|
|
||||||
);
|
|
||||||
} catch (TransportExceptionInterface) {
|
|
||||||
throw new RuntimeException('Unable to reach public holidays API.');
|
|
||||||
} catch (ClientExceptionInterface) {
|
|
||||||
throw new RuntimeException('Invalid zone provided for public holidays.');
|
|
||||||
} catch (ServerExceptionInterface) {
|
|
||||||
throw new RuntimeException('Public holidays API is temporarily unavailable.');
|
|
||||||
} catch (Throwable) {
|
|
||||||
throw new RuntimeException('Unexpected error while fetching public holidays.');
|
|
||||||
}
|
|
||||||
|
|
||||||
return json_decode($response->getContent(), true);
|
try {
|
||||||
|
$response = $this->client->request(
|
||||||
|
'GET',
|
||||||
|
$url
|
||||||
|
);
|
||||||
|
} catch (TransportExceptionInterface) {
|
||||||
|
throw new RuntimeException('Unable to reach public holidays API.');
|
||||||
|
} catch (ClientExceptionInterface) {
|
||||||
|
throw new RuntimeException('Invalid zone provided for public holidays.');
|
||||||
|
} catch (ServerExceptionInterface) {
|
||||||
|
throw new RuntimeException('Public holidays API is temporarily unavailable.');
|
||||||
|
} catch (Throwable) {
|
||||||
|
throw new RuntimeException('Unexpected error while fetching public holidays.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return json_decode($response->getContent(), true);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -60,20 +68,25 @@ final readonly class PublicHolidayService implements PublicHolidayServiceInterfa
|
|||||||
{
|
{
|
||||||
$zone = strtolower(trim($zone));
|
$zone = strtolower(trim($zone));
|
||||||
$years = trim($years);
|
$years = trim($years);
|
||||||
$url = $this->holidayUrl."{$zone}/{$years}.json";
|
$key = "public_holidays_{$zone}_{$years}";
|
||||||
|
|
||||||
try {
|
return $this->cache->get($key, function (ItemInterface $item) use ($zone, $years): array {
|
||||||
$response = $this->client->request('GET', $url);
|
$item->expiresAfter(30 * 86400);
|
||||||
} catch (TransportExceptionInterface) {
|
$url = $this->holidayUrl."{$zone}/{$years}.json";
|
||||||
throw new RuntimeException('Unable to reach public holidays API.');
|
|
||||||
} catch (ClientExceptionInterface) {
|
|
||||||
throw new RuntimeException('Invalid zone or year provided for public holidays.');
|
|
||||||
} catch (ServerExceptionInterface) {
|
|
||||||
throw new RuntimeException('Public holidays API is temporarily unavailable.');
|
|
||||||
} catch (Throwable) {
|
|
||||||
throw new RuntimeException('Unexpected error while fetching public holidays.');
|
|
||||||
}
|
|
||||||
|
|
||||||
return json_decode($response->getContent(), true);
|
try {
|
||||||
|
$response = $this->client->request('GET', $url);
|
||||||
|
} catch (TransportExceptionInterface) {
|
||||||
|
throw new RuntimeException('Unable to reach public holidays API.');
|
||||||
|
} catch (ClientExceptionInterface) {
|
||||||
|
throw new RuntimeException('Invalid zone or year provided for public holidays.');
|
||||||
|
} catch (ServerExceptionInterface) {
|
||||||
|
throw new RuntimeException('Public holidays API is temporarily unavailable.');
|
||||||
|
} catch (Throwable) {
|
||||||
|
throw new RuntimeException('Unexpected error while fetching public holidays.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return json_decode($response->getContent(), true);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -206,20 +206,36 @@ final readonly class RttRecoveryComputationService
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$weekAnchorNature = $naturesByDate[$employeeId][$weekDays[0]] ?? ContractNature::CDI;
|
$weekAnchorNature = $naturesByDate[$employeeId][$weekDays[0]] ?? ContractNature::CDI;
|
||||||
$weekAnchorContract = $employeeContractsByDate[$weekDays[0]] ?? null;
|
$weekAnchorContract = $employeeContractsByDate[$weekDays[0]] ?? null;
|
||||||
$isWeekPresenceTracking = TrackingMode::PRESENCE->value === $weekAnchorContract?->getTrackingMode();
|
$isWeekPresenceTracking = TrackingMode::PRESENCE->value === $weekAnchorContract?->getTrackingMode();
|
||||||
$disableOvertimeBonuses = $this->hasDisabledOvertimeBonuses($weekAnchorContract, $weekAnchorNature);
|
$disableOvertimeBonuses = $this->hasDisabledOvertimeBonuses($weekAnchorContract, $weekAnchorNature);
|
||||||
$overtimeReferenceMinutes = $this->computeWeeklyOvertimeReferenceMinutes($weekDays, $employeeContractsByDate);
|
$weekContractType = ContractType::resolve(
|
||||||
|
$weekAnchorContract?->getName(),
|
||||||
|
$weekAnchorContract?->getTrackingMode(),
|
||||||
|
$weekAnchorContract?->getWeeklyHours()
|
||||||
|
);
|
||||||
|
$isCustomContract = ContractType::CUSTOM === $weekContractType;
|
||||||
|
$overtimeReferenceMinutes = $isCustomContract
|
||||||
|
? $this->computeWeeklyCustomReferenceMinutes($weekDays, $employeeContractsByDate)
|
||||||
|
: $this->computeWeeklyOvertimeReferenceMinutes($weekDays, $employeeContractsByDate);
|
||||||
$overtime25StartMinutes = $this->computeWeeklyOvertime25StartMinutes($weekDays, $employeeContractsByDate);
|
$overtime25StartMinutes = $this->computeWeeklyOvertime25StartMinutes($weekDays, $employeeContractsByDate);
|
||||||
$weeklyOvertimeTotalMinutes = $isWeekPresenceTracking
|
$weeklyOvertimeTotalMinutes = $isWeekPresenceTracking
|
||||||
? 0
|
? 0
|
||||||
: $weeklyTotalMinutes - $overtimeReferenceMinutes;
|
: $weeklyTotalMinutes - $overtimeReferenceMinutes;
|
||||||
|
|
||||||
$base25 = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : max(0, min($weeklyTotalMinutes, 43 * 60) - $overtime25StartMinutes);
|
$base25 = ($isWeekPresenceTracking || $disableOvertimeBonuses || $isCustomContract) ? 0 : max(0, min($weeklyTotalMinutes, 43 * 60) - $overtime25StartMinutes);
|
||||||
$bonus25 = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : (int) round($base25 * 0.25);
|
$bonus25 = ($isWeekPresenceTracking || $disableOvertimeBonuses || $isCustomContract) ? 0 : (int) round($base25 * 0.25);
|
||||||
$base50 = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : max(0, $weeklyTotalMinutes - 43 * 60);
|
$base50 = ($isWeekPresenceTracking || $disableOvertimeBonuses || $isCustomContract) ? 0 : max(0, $weeklyTotalMinutes - 43 * 60);
|
||||||
$bonus50 = ($isWeekPresenceTracking || $disableOvertimeBonuses) ? 0 : (int) round($base50 * 0.5);
|
$bonus50 = ($isWeekPresenceTracking || $disableOvertimeBonuses || $isCustomContract) ? 0 : (int) round($base50 * 0.5);
|
||||||
|
|
||||||
|
if ($isWeekPresenceTracking || $disableOvertimeBonuses) {
|
||||||
|
$totalMinutes = 0;
|
||||||
|
} elseif ($isCustomContract) {
|
||||||
|
$totalMinutes = max(0, $weeklyOvertimeTotalMinutes);
|
||||||
|
} else {
|
||||||
|
$totalMinutes = $weeklyOvertimeTotalMinutes + $bonus25 + $bonus50;
|
||||||
|
}
|
||||||
|
|
||||||
$results[$weekKey] = new WeekRecoveryDetail(
|
$results[$weekKey] = new WeekRecoveryDetail(
|
||||||
overtimeMinutes: $weeklyOvertimeTotalMinutes,
|
overtimeMinutes: $weeklyOvertimeTotalMinutes,
|
||||||
@@ -227,9 +243,7 @@ final readonly class RttRecoveryComputationService
|
|||||||
bonus25Minutes: $bonus25,
|
bonus25Minutes: $bonus25,
|
||||||
base50Minutes: $base50,
|
base50Minutes: $base50,
|
||||||
bonus50Minutes: $bonus50,
|
bonus50Minutes: $bonus50,
|
||||||
totalMinutes: ($isWeekPresenceTracking || $disableOvertimeBonuses)
|
totalMinutes: $totalMinutes,
|
||||||
? 0
|
|
||||||
: $weeklyOvertimeTotalMinutes + $bonus25 + $bonus50,
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -238,6 +252,20 @@ final readonly class RttRecoveryComputationService
|
|||||||
|
|
||||||
private function computeMetrics(WorkHour $workHour): WorkMetrics
|
private function computeMetrics(WorkHour $workHour): WorkMetrics
|
||||||
{
|
{
|
||||||
|
$driverDay = $workHour->getDayHoursMinutes() ?? 0;
|
||||||
|
$driverNight = $workHour->getNightHoursMinutes() ?? 0;
|
||||||
|
$driverWorkshop = $workHour->getWorkshopHoursMinutes() ?? 0;
|
||||||
|
|
||||||
|
if ($driverDay > 0 || $driverNight > 0 || $driverWorkshop > 0) {
|
||||||
|
$totalMinutes = $driverDay + $driverNight + $driverWorkshop;
|
||||||
|
|
||||||
|
return new WorkMetrics(
|
||||||
|
dayMinutes: $driverDay + $driverWorkshop,
|
||||||
|
nightMinutes: $driverNight,
|
||||||
|
totalMinutes: $totalMinutes,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
$ranges = [
|
$ranges = [
|
||||||
[$workHour->getMorningFrom(), $workHour->getMorningTo()],
|
[$workHour->getMorningFrom(), $workHour->getMorningTo()],
|
||||||
[$workHour->getAfternoonFrom(), $workHour->getAfternoonTo()],
|
[$workHour->getAfternoonFrom(), $workHour->getAfternoonTo()],
|
||||||
@@ -326,6 +354,23 @@ final readonly class RttRecoveryComputationService
|
|||||||
return max(0, $end - $start);
|
return max(0, $end - $start);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param list<string> $days
|
||||||
|
* @param array<string, ?Contract> $contractsByDate
|
||||||
|
*/
|
||||||
|
private function computeWeeklyCustomReferenceMinutes(array $days, array $contractsByDate): int
|
||||||
|
{
|
||||||
|
$total = 0;
|
||||||
|
foreach ($days as $date) {
|
||||||
|
$isoDay = (int) new DateTimeImmutable($date)->format('N');
|
||||||
|
$contract = $contractsByDate[$date] ?? null;
|
||||||
|
$hours = $contract?->getWeeklyHours();
|
||||||
|
$total += $this->resolveDailyReferenceMinutes($hours, $isoDay);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $total;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param list<string> $days
|
* @param list<string> $days
|
||||||
* @param array<string, ?Contract> $contractsByDate
|
* @param array<string, ?Contract> $contractsByDate
|
||||||
|
|||||||
@@ -535,10 +535,21 @@ final readonly class EmployeeLeaveSummaryProvider implements ProviderInterface
|
|||||||
$type = $employee->getContract()?->getType();
|
$type = $employee->getContract()?->getType();
|
||||||
if (ContractType::FORFAIT === $type) {
|
if (ContractType::FORFAIT === $type) {
|
||||||
$businessDaysInPeriod = $this->countBusinessDays($from, $to);
|
$businessDaysInPeriod = $this->countBusinessDays($from, $to);
|
||||||
|
$publicHolidays = $this->buildPublicHolidayMap($from, $to);
|
||||||
|
$weekdayHolidays = array_filter(
|
||||||
|
array_keys($publicHolidays),
|
||||||
|
static fn (string $date): bool => (int) new DateTimeImmutable($date)->format('N') <= 5
|
||||||
|
);
|
||||||
|
$bonusDays = $this->workHourRepository->countWeekendAndHolidayWorkedDays(
|
||||||
|
$employee,
|
||||||
|
$from,
|
||||||
|
$to,
|
||||||
|
array_values($weekdayHolidays)
|
||||||
|
);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'ruleCode' => LeaveRuleCode::FORFAIT_218->value,
|
'ruleCode' => LeaveRuleCode::FORFAIT_218->value,
|
||||||
'acquiredDays' => (float) max(0, $businessDaysInPeriod - self::FORFAIT_TARGET_WORKED_DAYS),
|
'acquiredDays' => (float) max(0, $businessDaysInPeriod - self::FORFAIT_TARGET_WORKED_DAYS) + $bonusDays,
|
||||||
'acquiredSaturdays' => 0.0,
|
'acquiredSaturdays' => 0.0,
|
||||||
'accrualPerMonth' => 0.0,
|
'accrualPerMonth' => 0.0,
|
||||||
'saturdayAccrualPerMonth' => 0.0,
|
'saturdayAccrualPerMonth' => 0.0,
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ use App\Entity\User;
|
|||||||
use App\Repository\EmployeeRepository;
|
use App\Repository\EmployeeRepository;
|
||||||
use App\Repository\EmployeeRttBalanceRepository;
|
use App\Repository\EmployeeRttBalanceRepository;
|
||||||
use App\Repository\EmployeeRttPaymentRepository;
|
use App\Repository\EmployeeRttPaymentRepository;
|
||||||
|
use App\Repository\WorkHourRepository;
|
||||||
use App\Security\EmployeeScopeService;
|
use App\Security\EmployeeScopeService;
|
||||||
use App\Service\Rtt\RttRecoveryComputationService;
|
use App\Service\Rtt\RttRecoveryComputationService;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
@@ -36,6 +37,7 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
|
|||||||
private EmployeeRttBalanceRepository $rttBalanceRepository,
|
private EmployeeRttBalanceRepository $rttBalanceRepository,
|
||||||
private EmployeeRttPaymentRepository $rttPaymentRepository,
|
private EmployeeRttPaymentRepository $rttPaymentRepository,
|
||||||
private RttRecoveryComputationService $rttRecoveryService,
|
private RttRecoveryComputationService $rttRecoveryService,
|
||||||
|
private WorkHourRepository $workHourRepository,
|
||||||
string $rttStartDate = '',
|
string $rttStartDate = '',
|
||||||
) {
|
) {
|
||||||
$this->rttStartDate = '' !== $rttStartDate ? $rttStartDate : null;
|
$this->rttStartDate = '' !== $rttStartDate ? $rttStartDate : null;
|
||||||
@@ -83,6 +85,16 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
|
|||||||
// Exclude the current (incomplete) week: limit to last Sunday
|
// Exclude the current (incomplete) week: limit to last Sunday
|
||||||
$isoDay = (int) $today->format('N'); // 1=Monday .. 7=Sunday
|
$isoDay = (int) $today->format('N'); // 1=Monday .. 7=Sunday
|
||||||
$limitDate = 7 === $isoDay ? $today : $today->modify('last sunday');
|
$limitDate = 7 === $isoDay ? $today : $today->modify('last sunday');
|
||||||
|
|
||||||
|
// Include the current week if all existing days are admin-validated
|
||||||
|
if (7 !== $isoDay) {
|
||||||
|
$currentWeekStart = $today->modify('monday this week');
|
||||||
|
$currentWeekEnd = $currentWeekStart->modify('+6 days');
|
||||||
|
$checkEnd = $this->resolveWeekEndForEmployee($employee, $currentWeekStart, $currentWeekEnd, $today);
|
||||||
|
if ($this->workHourRepository->isWeekFullyValidated($employee, $currentWeekStart, $checkEnd)) {
|
||||||
|
$limitDate = $currentWeekEnd;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$currentByWeekStart = $this->rttRecoveryService->computeRecoveryByWeek($employee, $weekRanges, $periodFrom, $periodTo, $limitDate);
|
$currentByWeekStart = $this->rttRecoveryService->computeRecoveryByWeek($employee, $weekRanges, $periodFrom, $periodTo, $limitDate);
|
||||||
@@ -236,4 +248,25 @@ final readonly class EmployeeRttSummaryProvider implements ProviderInterface
|
|||||||
|
|
||||||
return $month >= 6 ? $year + 1 : $year;
|
return $month >= 6 ? $year + 1 : $year;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If the employee's contract ends within the current week, cap the check range to that end date.
|
||||||
|
*/
|
||||||
|
private function resolveWeekEndForEmployee(Employee $employee, DateTimeImmutable $weekStart, DateTimeImmutable $weekEnd, DateTimeImmutable $today): DateTimeImmutable
|
||||||
|
{
|
||||||
|
foreach ($employee->getContractPeriods() as $period) {
|
||||||
|
if ($period->getStartDate() > $today) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$endDate = $period->getEndDate();
|
||||||
|
if (null === $endDate) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if ($endDate >= $weekStart && $endDate <= $weekEnd) {
|
||||||
|
return $endDate;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $weekEnd;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,7 +80,8 @@ final readonly class EmployeeWriteProcessor implements ProcessorInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
$todayPeriod = $this->periodRepository->findOneCoveringDate($data, $today);
|
$todayPeriod = $this->periodRepository->findOneCoveringDate($data, $today);
|
||||||
$currentPeriodContract = $todayPeriod?->getContract();
|
$effectivePeriod = $todayPeriod ?? $this->periodRepository->findLatestPeriod($data);
|
||||||
|
$currentPeriodContract = $effectivePeriod?->getContract();
|
||||||
$contractChanged = $currentPeriodContract instanceof Contract
|
$contractChanged = $currentPeriodContract instanceof Contract
|
||||||
? $currentPeriodContract->getId() !== $currentContract->getId()
|
? $currentPeriodContract->getId() !== $currentContract->getId()
|
||||||
: true;
|
: true;
|
||||||
@@ -92,7 +93,7 @@ final readonly class EmployeeWriteProcessor implements ProcessorInterface
|
|||||||
throw new UnprocessableEntityHttpException('contractEndDate is required for close-only request.');
|
throw new UnprocessableEntityHttpException('contractEndDate is required for close-only request.');
|
||||||
}
|
}
|
||||||
$this->periodManager->closeCurrentPeriod(
|
$this->periodManager->closeCurrentPeriod(
|
||||||
$todayPeriod,
|
$effectivePeriod,
|
||||||
$requestedEndDate,
|
$requestedEndDate,
|
||||||
$changeRequest->contractPaidLeaveSettled ?? false,
|
$changeRequest->contractPaidLeaveSettled ?? false,
|
||||||
$changeRequest->contractComment
|
$changeRequest->contractComment
|
||||||
@@ -102,14 +103,14 @@ final readonly class EmployeeWriteProcessor implements ProcessorInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
$startDate = $changeRequest->contractStartDate ?? $today;
|
$startDate = $changeRequest->contractStartDate ?? $today;
|
||||||
$nature = $changeRequest->contractNature ?? $todayPeriod?->getContractNatureEnum() ?? ContractNature::CDI;
|
$nature = $changeRequest->contractNature ?? $effectivePeriod?->getContractNatureEnum() ?? ContractNature::CDI;
|
||||||
$this->periodManager->createNextPeriod(
|
$this->periodManager->createNextPeriod(
|
||||||
employee: $data,
|
employee: $data,
|
||||||
contract: $currentContract,
|
contract: $currentContract,
|
||||||
startDate: $startDate,
|
startDate: $startDate,
|
||||||
endDate: $changeRequest->contractEndDate,
|
endDate: $changeRequest->contractEndDate,
|
||||||
nature: $nature,
|
nature: $nature,
|
||||||
todayPeriod: $todayPeriod,
|
todayPeriod: $effectivePeriod,
|
||||||
isDriver: $changeRequest->isDriver ?? false,
|
isDriver: $changeRequest->isDriver ?? false,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
420
src/State/EmployeeYearlyHoursPrintProvider.php
Normal file
420
src/State/EmployeeYearlyHoursPrintProvider.php
Normal file
@@ -0,0 +1,420 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\State;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\Operation;
|
||||||
|
use ApiPlatform\State\ProviderInterface;
|
||||||
|
use App\Dto\WorkHours\WorkMetrics;
|
||||||
|
use App\Entity\Employee;
|
||||||
|
use App\Entity\WorkHour;
|
||||||
|
use App\Enum\TrackingMode;
|
||||||
|
use App\Repository\AbsenceRepository;
|
||||||
|
use App\Repository\EmployeeRepository;
|
||||||
|
use App\Repository\WorkHourRepository;
|
||||||
|
use App\Service\Contracts\EmployeeContractResolver;
|
||||||
|
use App\Service\WorkHours\AbsenceSegmentsResolver;
|
||||||
|
use App\Service\WorkHours\WorkedHoursCreditPolicy;
|
||||||
|
use DateInterval;
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use Dompdf\Dompdf;
|
||||||
|
use Dompdf\Options;
|
||||||
|
use Symfony\Component\HttpFoundation\RequestStack;
|
||||||
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
|
||||||
|
use Twig\Environment;
|
||||||
|
|
||||||
|
class EmployeeYearlyHoursPrintProvider implements ProviderInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private Environment $twig,
|
||||||
|
private readonly RequestStack $requestStack,
|
||||||
|
private EmployeeRepository $employeeRepository,
|
||||||
|
private WorkHourRepository $workHourRepository,
|
||||||
|
private AbsenceRepository $absenceRepository,
|
||||||
|
private EmployeeContractResolver $contractResolver,
|
||||||
|
private AbsenceSegmentsResolver $absenceSegmentsResolver,
|
||||||
|
private WorkedHoursCreditPolicy $workedHoursCreditPolicy,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
|
||||||
|
{
|
||||||
|
$request = $this->requestStack->getCurrentRequest();
|
||||||
|
if (!$request) {
|
||||||
|
return new Response('Missing request.', Response::HTTP_BAD_REQUEST);
|
||||||
|
}
|
||||||
|
|
||||||
|
$employeeId = (int) $request->query->get('employeeId', '0');
|
||||||
|
if ($employeeId <= 0) {
|
||||||
|
throw new UnprocessableEntityHttpException('employeeId must be a positive integer.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$employee = $this->employeeRepository->find($employeeId);
|
||||||
|
if (!$employee instanceof Employee) {
|
||||||
|
throw new NotFoundHttpException('Employee not found.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$yearRaw = (string) $request->query->get('year');
|
||||||
|
if (!preg_match('/^\d{4}$/', $yearRaw)) {
|
||||||
|
throw new UnprocessableEntityHttpException('year must use YYYY format.');
|
||||||
|
}
|
||||||
|
$year = (int) $yearRaw;
|
||||||
|
|
||||||
|
$from = new DateTimeImmutable("{$year}-01-01");
|
||||||
|
$to = new DateTimeImmutable("{$year}-12-31");
|
||||||
|
$days = $this->buildDays($from, $to);
|
||||||
|
|
||||||
|
$workHours = $this->workHourRepository->findByDateRangeAndEmployees($from, $to, [$employee]);
|
||||||
|
$absences = $this->absenceRepository->findForPrint($from, $to, [$employee]);
|
||||||
|
$contractMap = $this->contractResolver->resolveForEmployeesAndDays([$employee], $days);
|
||||||
|
$driverMap = $this->contractResolver->resolveIsDriverForEmployeesAndDays([$employee], $days);
|
||||||
|
|
||||||
|
$workHourMap = $this->buildWorkHourMap($workHours);
|
||||||
|
$absenceData = $this->buildAbsenceData($absences, $days, $employee);
|
||||||
|
|
||||||
|
$segments = $this->buildSegments(
|
||||||
|
$employee,
|
||||||
|
$days,
|
||||||
|
$contractMap[$employee->getId()] ?? [],
|
||||||
|
$driverMap[$employee->getId()] ?? [],
|
||||||
|
$workHourMap[$employee->getId()] ?? [],
|
||||||
|
$absenceData,
|
||||||
|
);
|
||||||
|
|
||||||
|
$employeeName = trim(($employee->getLastName() ?? '').' '.($employee->getFirstName() ?? ''));
|
||||||
|
|
||||||
|
$options = new Options();
|
||||||
|
$options->set('isRemoteEnabled', true);
|
||||||
|
|
||||||
|
$dompdf = new Dompdf($options);
|
||||||
|
$html = $this->twig->render('employee-yearly-hours/print.html.twig', [
|
||||||
|
'employeeName' => $employeeName,
|
||||||
|
'year' => $year,
|
||||||
|
'segments' => $segments,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$dompdf->loadHtml($html);
|
||||||
|
$dompdf->setPaper('A4', 'portrait');
|
||||||
|
$dompdf->render();
|
||||||
|
|
||||||
|
$filename = sprintf(
|
||||||
|
'%s_%s_%d.pdf',
|
||||||
|
$this->sanitizeFilename($employee->getLastName() ?? ''),
|
||||||
|
$this->sanitizeFilename($employee->getFirstName() ?? ''),
|
||||||
|
$year,
|
||||||
|
);
|
||||||
|
|
||||||
|
return new Response($dompdf->output(), Response::HTTP_OK, [
|
||||||
|
'Content-Type' => 'application/pdf',
|
||||||
|
'Content-Disposition' => 'inline; filename="'.$filename.'"',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return list<string>
|
||||||
|
*/
|
||||||
|
private function buildDays(DateTimeImmutable $from, DateTimeImmutable $to): array
|
||||||
|
{
|
||||||
|
$days = [];
|
||||||
|
$current = $from;
|
||||||
|
|
||||||
|
while ($current <= $to) {
|
||||||
|
$days[] = $current->format('Y-m-d');
|
||||||
|
$current = $current->add(new DateInterval('P1D'));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $days;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<int, array<string, WorkHour>>
|
||||||
|
*/
|
||||||
|
private function buildWorkHourMap(array $workHours): array
|
||||||
|
{
|
||||||
|
$map = [];
|
||||||
|
foreach ($workHours as $wh) {
|
||||||
|
$employeeId = $wh->getEmployee()?->getId();
|
||||||
|
if (!$employeeId) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$date = $wh->getWorkDate()->format('Y-m-d');
|
||||||
|
$map[$employeeId][$date] = $wh;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $map;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array{credited: array<string, int>, labels: array<string, string>, absentMorning: array<string, bool>, absentAfternoon: array<string, bool>, hasDayAbsence: array<string, bool>}
|
||||||
|
*/
|
||||||
|
private function buildAbsenceData(array $absences, array $days, Employee $employee): array
|
||||||
|
{
|
||||||
|
$credited = [];
|
||||||
|
$labels = [];
|
||||||
|
$absentMorning = [];
|
||||||
|
$absentAfternoon = [];
|
||||||
|
$hasDayAbsence = [];
|
||||||
|
|
||||||
|
foreach ($absences as $absence) {
|
||||||
|
$absEmployeeId = $absence->getEmployee()?->getId();
|
||||||
|
if ($absEmployeeId !== $employee->getId()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$start = $absence->getStartDate()->format('Y-m-d');
|
||||||
|
$end = $absence->getEndDate()->format('Y-m-d');
|
||||||
|
|
||||||
|
foreach ($days as $date) {
|
||||||
|
if ($date < $start || $date > $end) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
[$isMorning, $isAfternoon] = $this->absenceSegmentsResolver->resolveForDate($absence, $date);
|
||||||
|
if ($isMorning || $isAfternoon) {
|
||||||
|
$hasDayAbsence[$date] = true;
|
||||||
|
$absentMorning[$date] = ($absentMorning[$date] ?? false) || $isMorning;
|
||||||
|
$absentAfternoon[$date] = ($absentAfternoon[$date] ?? false) || $isAfternoon;
|
||||||
|
if (!isset($labels[$date])) {
|
||||||
|
$labels[$date] = $absence->getType()?->getLabel() ?? '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$credited[$date] = ($credited[$date] ?? 0)
|
||||||
|
+ $this->workedHoursCreditPolicy->computeCreditedMinutes($absence, $date, $isMorning, $isAfternoon);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'credited' => $credited,
|
||||||
|
'labels' => $labels,
|
||||||
|
'absentMorning' => $absentMorning,
|
||||||
|
'absentAfternoon' => $absentAfternoon,
|
||||||
|
'hasDayAbsence' => $hasDayAbsence,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return list<array{mode: string, contractName: ?string, rows: list<array>}>
|
||||||
|
*/
|
||||||
|
private function buildSegments(
|
||||||
|
Employee $employee,
|
||||||
|
array $days,
|
||||||
|
array $contractsByDate,
|
||||||
|
array $driverByDate,
|
||||||
|
array $workHoursByDate,
|
||||||
|
array $absenceData,
|
||||||
|
): array {
|
||||||
|
$segments = [];
|
||||||
|
$currentMode = null;
|
||||||
|
$currentRows = [];
|
||||||
|
$currentName = null;
|
||||||
|
|
||||||
|
foreach ($days as $date) {
|
||||||
|
$contract = $contractsByDate[$date] ?? null;
|
||||||
|
$isDriver = $driverByDate[$date] ?? false;
|
||||||
|
$wh = $workHoursByDate[$date] ?? null;
|
||||||
|
$hasData = null !== $wh || ($absenceData['hasDayAbsence'][$date] ?? false);
|
||||||
|
|
||||||
|
if (!$hasData) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$trackingMode = $contract?->getTrackingMode() ?? TrackingMode::TIME->value;
|
||||||
|
$mode = $this->resolveSegmentMode($trackingMode, $isDriver);
|
||||||
|
$contractName = $contract?->getName();
|
||||||
|
|
||||||
|
if ($mode !== $currentMode) {
|
||||||
|
if (null !== $currentMode && [] !== $currentRows) {
|
||||||
|
$segments[] = [
|
||||||
|
'mode' => $currentMode,
|
||||||
|
'contractName' => $currentName,
|
||||||
|
'rows' => $currentRows,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
$currentMode = $mode;
|
||||||
|
$currentRows = [];
|
||||||
|
$currentName = $contractName;
|
||||||
|
}
|
||||||
|
|
||||||
|
$creditedMinutes = $absenceData['credited'][$date] ?? 0;
|
||||||
|
$absenceLabel = $absenceData['labels'][$date] ?? null;
|
||||||
|
|
||||||
|
$row = [
|
||||||
|
'date' => new DateTimeImmutable($date)->format('d/m/Y'),
|
||||||
|
'absenceLabel' => $absenceLabel,
|
||||||
|
];
|
||||||
|
|
||||||
|
if ('presence' === $mode) {
|
||||||
|
$absentMorning = $absenceData['absentMorning'][$date] ?? false;
|
||||||
|
$absentAfternoon = $absenceData['absentAfternoon'][$date] ?? false;
|
||||||
|
$morning = (($wh?->getIsPresentMorning() ?? false) && !$absentMorning) ? 0.5 : 0.0;
|
||||||
|
$afternoon = (($wh?->getIsPresentAfternoon() ?? false) && !$absentAfternoon) ? 0.5 : 0.0;
|
||||||
|
$total = $morning + $afternoon;
|
||||||
|
|
||||||
|
$row['presentMorning'] = $morning > 0;
|
||||||
|
$row['presentAfternoon'] = $afternoon > 0;
|
||||||
|
$row['total'] = $total > 0 ? (string) $total : '';
|
||||||
|
} elseif ('driver' === $mode) {
|
||||||
|
$dayMin = $wh?->getDayHoursMinutes() ?? 0;
|
||||||
|
$nightMin = $wh?->getNightHoursMinutes() ?? 0;
|
||||||
|
$workshopMin = $wh?->getWorkshopHoursMinutes() ?? 0;
|
||||||
|
$totalMin = $dayMin + $nightMin + $workshopMin + $creditedMinutes;
|
||||||
|
|
||||||
|
$row['dayHours'] = $this->formatMinutes($dayMin);
|
||||||
|
$row['nightHours'] = $this->formatMinutes($nightMin);
|
||||||
|
$row['workshopHours'] = $this->formatMinutes($workshopMin);
|
||||||
|
$row['total'] = $this->formatMinutes($totalMin);
|
||||||
|
} else {
|
||||||
|
$metrics = null !== $wh ? $this->computeMetrics($wh) : new WorkMetrics();
|
||||||
|
$metrics->addCreditedMinutes($creditedMinutes);
|
||||||
|
|
||||||
|
$row['morningFrom'] = $wh?->getMorningFrom() ?? '';
|
||||||
|
$row['morningTo'] = $wh?->getMorningTo() ?? '';
|
||||||
|
$row['afternoonFrom'] = $wh?->getAfternoonFrom() ?? '';
|
||||||
|
$row['afternoonTo'] = $wh?->getAfternoonTo() ?? '';
|
||||||
|
$row['eveningFrom'] = $wh?->getEveningFrom() ?? '';
|
||||||
|
$row['eveningTo'] = $wh?->getEveningTo() ?? '';
|
||||||
|
$row['total'] = $this->formatMinutes($metrics->totalMinutes);
|
||||||
|
}
|
||||||
|
|
||||||
|
$currentRows[] = $row;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (null !== $currentMode && [] !== $currentRows) {
|
||||||
|
$segments[] = [
|
||||||
|
'mode' => $currentMode,
|
||||||
|
'contractName' => $currentName,
|
||||||
|
'rows' => $currentRows,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $segments;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function resolveSegmentMode(string $trackingMode, bool $isDriver): string
|
||||||
|
{
|
||||||
|
if ($isDriver) {
|
||||||
|
return 'driver';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (TrackingMode::PRESENCE->value === $trackingMode) {
|
||||||
|
return 'presence';
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'time';
|
||||||
|
}
|
||||||
|
|
||||||
|
private function computeMetrics(WorkHour $workHour): WorkMetrics
|
||||||
|
{
|
||||||
|
$ranges = [
|
||||||
|
[$workHour->getMorningFrom(), $workHour->getMorningTo()],
|
||||||
|
[$workHour->getAfternoonFrom(), $workHour->getAfternoonTo()],
|
||||||
|
[$workHour->getEveningFrom(), $workHour->getEveningTo()],
|
||||||
|
];
|
||||||
|
|
||||||
|
$totalMinutes = 0;
|
||||||
|
$nightMinutes = 0;
|
||||||
|
|
||||||
|
foreach ($ranges as [$from, $to]) {
|
||||||
|
$totalMinutes += $this->intervalMinutes($from, $to);
|
||||||
|
$nightMinutes += $this->nightIntervalMinutes($from, $to);
|
||||||
|
}
|
||||||
|
|
||||||
|
$dayMinutes = max(0, $totalMinutes - $nightMinutes);
|
||||||
|
|
||||||
|
return new WorkMetrics(
|
||||||
|
dayMinutes: $dayMinutes,
|
||||||
|
nightMinutes: $nightMinutes,
|
||||||
|
totalMinutes: $totalMinutes,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return null|array{int, int}
|
||||||
|
*/
|
||||||
|
private function resolveInterval(?string $from, ?string $to): ?array
|
||||||
|
{
|
||||||
|
$fromMinutes = $this->toMinutes($from);
|
||||||
|
$toMinutes = $this->toMinutes($to);
|
||||||
|
if (null === $fromMinutes || null === $toMinutes) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$end = $toMinutes <= $fromMinutes ? $toMinutes + 1440 : $toMinutes;
|
||||||
|
|
||||||
|
return [$fromMinutes, $end];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function toMinutes(?string $time): ?int
|
||||||
|
{
|
||||||
|
if (null === $time || '' === $time) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
[$hours, $minutes] = array_map('intval', explode(':', $time));
|
||||||
|
|
||||||
|
return ($hours * 60) + $minutes;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function intervalMinutes(?string $from, ?string $to): int
|
||||||
|
{
|
||||||
|
$interval = $this->resolveInterval($from, $to);
|
||||||
|
if (null === $interval) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
[$start, $end] = $interval;
|
||||||
|
|
||||||
|
return max(0, $end - $start);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function nightIntervalMinutes(?string $from, ?string $to): int
|
||||||
|
{
|
||||||
|
$interval = $this->resolveInterval($from, $to);
|
||||||
|
if (null === $interval) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
[$start, $end] = $interval;
|
||||||
|
$windows = [[0, 360], [1260, 1440]];
|
||||||
|
$total = 0;
|
||||||
|
|
||||||
|
for ($dayOffset = 0; $dayOffset <= 1; ++$dayOffset) {
|
||||||
|
$shift = $dayOffset * 1440;
|
||||||
|
foreach ($windows as [$windowStart, $windowEnd]) {
|
||||||
|
$total += $this->overlap($start, $end, $windowStart + $shift, $windowEnd + $shift);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $total;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function overlap(int $startA, int $endA, int $startB, int $endB): int
|
||||||
|
{
|
||||||
|
$start = max($startA, $startB);
|
||||||
|
$end = min($endA, $endB);
|
||||||
|
|
||||||
|
return max(0, $end - $start);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function formatMinutes(int $minutes): string
|
||||||
|
{
|
||||||
|
if (0 === $minutes) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$h = intdiv($minutes, 60);
|
||||||
|
$m = $minutes % 60;
|
||||||
|
|
||||||
|
return 0 === $m ? "{$h}h" : "{$h}h{$m}m";
|
||||||
|
}
|
||||||
|
|
||||||
|
private function sanitizeFilename(string $name): string
|
||||||
|
{
|
||||||
|
$name = str_replace(' ', '_', $name);
|
||||||
|
|
||||||
|
return preg_replace('/[^a-zA-Z0-9_\-]/', '', $name) ?? $name;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,7 @@ use App\Enum\TrackingMode;
|
|||||||
use App\Repository\EmployeeRepository;
|
use App\Repository\EmployeeRepository;
|
||||||
use App\Repository\EmployeeRttBalanceRepository;
|
use App\Repository\EmployeeRttBalanceRepository;
|
||||||
use App\Repository\EmployeeRttPaymentRepository;
|
use App\Repository\EmployeeRttPaymentRepository;
|
||||||
|
use App\Repository\WorkHourRepository;
|
||||||
use App\Service\Rtt\RttRecoveryComputationService;
|
use App\Service\Rtt\RttRecoveryComputationService;
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
@@ -32,6 +33,7 @@ class LeaveRecapPrintProvider implements ProviderInterface
|
|||||||
private EmployeeRttBalanceRepository $rttBalanceRepository,
|
private EmployeeRttBalanceRepository $rttBalanceRepository,
|
||||||
private EmployeeRttPaymentRepository $rttPaymentRepository,
|
private EmployeeRttPaymentRepository $rttPaymentRepository,
|
||||||
private EntityManagerInterface $entityManager,
|
private EntityManagerInterface $entityManager,
|
||||||
|
private WorkHourRepository $workHourRepository,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
|
public function provide(Operation $operation, array $uriVariables = [], array $context = []): Response
|
||||||
@@ -142,6 +144,16 @@ class LeaveRecapPrintProvider implements ProviderInterface
|
|||||||
$isoDay = (int) $today->format('N');
|
$isoDay = (int) $today->format('N');
|
||||||
$limitDate = 7 === $isoDay ? $today : $today->modify('last sunday');
|
$limitDate = 7 === $isoDay ? $today : $today->modify('last sunday');
|
||||||
|
|
||||||
|
// Include the current week if all existing days are admin-validated
|
||||||
|
if (7 !== $isoDay) {
|
||||||
|
$currentWeekStart = $today->modify('monday this week');
|
||||||
|
$currentWeekEnd = $currentWeekStart->modify('+6 days');
|
||||||
|
$checkEnd = $this->resolveWeekEndForEmployee($employee, $currentWeekStart, $currentWeekEnd, $today);
|
||||||
|
if ($this->workHourRepository->isWeekFullyValidated($employee, $currentWeekStart, $checkEnd)) {
|
||||||
|
$limitDate = $currentWeekEnd;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Carry from previous exercise
|
// Carry from previous exercise
|
||||||
$carry = 0;
|
$carry = 0;
|
||||||
$balance = $this->rttBalanceRepository->findOneByEmployeeAndYear($employee, $exerciseYear);
|
$balance = $this->rttBalanceRepository->findOneByEmployeeAndYear($employee, $exerciseYear);
|
||||||
@@ -159,12 +171,31 @@ class LeaveRecapPrintProvider implements ProviderInterface
|
|||||||
$paid = 0;
|
$paid = 0;
|
||||||
$payments = $this->rttPaymentRepository->findByEmployeeAndYear($employee, $exerciseYear);
|
$payments = $this->rttPaymentRepository->findByEmployeeAndYear($employee, $exerciseYear);
|
||||||
foreach ($payments as $payment) {
|
foreach ($payments as $payment) {
|
||||||
$paid += $payment->getBase25Minutes() + $payment->getBase50Minutes();
|
$paid += $payment->getBase25Minutes() + $payment->getBonus25Minutes()
|
||||||
|
+ $payment->getBase50Minutes() + $payment->getBonus50Minutes();
|
||||||
}
|
}
|
||||||
|
|
||||||
return $carry + $current->totalMinutes - $paid;
|
return $carry + $current->totalMinutes - $paid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function resolveWeekEndForEmployee(Employee $employee, DateTimeImmutable $weekStart, DateTimeImmutable $weekEnd, DateTimeImmutable $today): DateTimeImmutable
|
||||||
|
{
|
||||||
|
foreach ($employee->getContractPeriods() as $period) {
|
||||||
|
if ($period->getStartDate() > $today) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$endDate = $period->getEndDate();
|
||||||
|
if (null === $endDate) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if ($endDate >= $weekStart && $endDate <= $weekEnd) {
|
||||||
|
return $endDate;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $weekEnd;
|
||||||
|
}
|
||||||
|
|
||||||
private function formatMinutes(int $minutes): string
|
private function formatMinutes(int $minutes): string
|
||||||
{
|
{
|
||||||
if (0 === $minutes) {
|
if (0 === $minutes) {
|
||||||
|
|||||||
53
src/State/MileageAllowanceAmountReceiptDownloadProvider.php
Normal file
53
src/State/MileageAllowanceAmountReceiptDownloadProvider.php
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\State;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\Operation;
|
||||||
|
use ApiPlatform\State\ProviderInterface;
|
||||||
|
use App\Entity\MileageAllowance;
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||||
|
use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
||||||
|
use Symfony\Component\HttpFoundation\HeaderUtils;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||||
|
|
||||||
|
final readonly class MileageAllowanceAmountReceiptDownloadProvider implements ProviderInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private EntityManagerInterface $entityManager,
|
||||||
|
#[Autowire('%kernel.project_dir%/var/uploads')]
|
||||||
|
private string $uploadDir,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function provide(Operation $operation, array $uriVariables = [], array $context = []): BinaryFileResponse
|
||||||
|
{
|
||||||
|
$mileageAllowance = $this->entityManager->find(MileageAllowance::class, $uriVariables['id']);
|
||||||
|
|
||||||
|
if (null === $mileageAllowance) {
|
||||||
|
throw new NotFoundHttpException('Mileage allowance not found.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$receiptPath = $mileageAllowance->getAmountReceiptPath();
|
||||||
|
|
||||||
|
if (null === $receiptPath) {
|
||||||
|
throw new NotFoundHttpException('No amount receipt found for this mileage allowance.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$absolutePath = sprintf('%s/%s', $this->uploadDir, $receiptPath);
|
||||||
|
|
||||||
|
if (!file_exists($absolutePath)) {
|
||||||
|
throw new NotFoundHttpException('Amount receipt file not found.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$response = new BinaryFileResponse($absolutePath);
|
||||||
|
$disposition = HeaderUtils::makeDisposition(
|
||||||
|
HeaderUtils::DISPOSITION_ATTACHMENT,
|
||||||
|
$mileageAllowance->getAmountReceiptName() ?? 'justificatif.pdf'
|
||||||
|
);
|
||||||
|
$response->headers->set('Content-Disposition', $disposition);
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
}
|
||||||
66
src/State/MileageAllowanceAmountReceiptUploadProcessor.php
Normal file
66
src/State/MileageAllowanceAmountReceiptUploadProcessor.php
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\State;
|
||||||
|
|
||||||
|
use ApiPlatform\Metadata\Operation;
|
||||||
|
use ApiPlatform\State\ProcessorInterface;
|
||||||
|
use App\Entity\MileageAllowance;
|
||||||
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||||
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||||
|
use Symfony\Component\HttpFoundation\RequestStack;
|
||||||
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
|
||||||
|
use Symfony\Component\Uid\Uuid;
|
||||||
|
|
||||||
|
final readonly class MileageAllowanceAmountReceiptUploadProcessor implements ProcessorInterface
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private EntityManagerInterface $entityManager,
|
||||||
|
private RequestStack $requestStack,
|
||||||
|
#[Autowire('%kernel.project_dir%/var/uploads')]
|
||||||
|
private string $uploadDir,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): JsonResponse
|
||||||
|
{
|
||||||
|
if (!$data instanceof MileageAllowance) {
|
||||||
|
throw new BadRequestHttpException('Invalid entity.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$request = $this->requestStack->getCurrentRequest();
|
||||||
|
$file = $request?->files->get('file');
|
||||||
|
|
||||||
|
if (null === $file) {
|
||||||
|
throw new BadRequestHttpException('No file uploaded.');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ('application/pdf' !== $file->getMimeType()) {
|
||||||
|
throw new BadRequestHttpException('Only PDF files are accepted.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$month = $data->getMonth();
|
||||||
|
$year = $month?->format('Y') ?? date('Y');
|
||||||
|
$monthNumber = $month?->format('m') ?? date('m');
|
||||||
|
$relativePath = sprintf('mileage-receipts/%s/%s', $year, $monthNumber);
|
||||||
|
$absoluteDir = sprintf('%s/%s', $this->uploadDir, $relativePath);
|
||||||
|
|
||||||
|
if (!is_dir($absoluteDir)) {
|
||||||
|
mkdir($absoluteDir, 0o755, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
$filename = Uuid::v4()->toRfc4122().'.pdf';
|
||||||
|
$fullRelative = sprintf('%s/%s', $relativePath, $filename);
|
||||||
|
$originalName = $file->getClientOriginalName();
|
||||||
|
|
||||||
|
$file->move($absoluteDir, $filename);
|
||||||
|
|
||||||
|
$data->setAmountReceiptPath($fullRelative);
|
||||||
|
$data->setAmountReceiptName($originalName);
|
||||||
|
$this->entityManager->flush();
|
||||||
|
|
||||||
|
return new JsonResponse(['path' => $fullRelative, 'name' => $originalName], Response::HTTP_OK);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -34,6 +34,16 @@ final readonly class MileageAllowanceDeleteProcessor implements ProcessorInterfa
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$amountReceiptPath = $data->getAmountReceiptPath();
|
||||||
|
|
||||||
|
if (null !== $amountReceiptPath) {
|
||||||
|
$absolutePath = sprintf('%s/%s', $this->uploadDir, $amountReceiptPath);
|
||||||
|
|
||||||
|
if (file_exists($absolutePath)) {
|
||||||
|
unlink($absolutePath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$this->entityManager->remove($data);
|
$this->entityManager->remove($data);
|
||||||
$this->entityManager->flush();
|
$this->entityManager->flush();
|
||||||
|
|
||||||
|
|||||||
151
templates/employee-yearly-hours/print.html.twig
Normal file
151
templates/employee-yearly-hours/print.html.twig
Normal file
@@ -0,0 +1,151 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="fr">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<title>{{ employeeName }} - {{ year }}</title>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
@page { size: A4 portrait; margin: 4mm; }
|
||||||
|
|
||||||
|
html, body {
|
||||||
|
margin: 0;
|
||||||
|
padding: 2mm;
|
||||||
|
font-family: Helvetica, sans-serif;
|
||||||
|
font-size: 9px;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
text-align: center;
|
||||||
|
font-size: 16px;
|
||||||
|
margin: 0 0 4mm 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
h2 {
|
||||||
|
font-size: 12px;
|
||||||
|
margin: 4mm 0 2mm 0;
|
||||||
|
padding: 2px 6px;
|
||||||
|
background: #e8e8e8;
|
||||||
|
}
|
||||||
|
|
||||||
|
table {
|
||||||
|
width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
table-layout: auto;
|
||||||
|
border: 2px solid #0a0a0a;
|
||||||
|
}
|
||||||
|
|
||||||
|
th, td {
|
||||||
|
border: 1px solid #0a0a0a;
|
||||||
|
padding: 2px 4px;
|
||||||
|
vertical-align: middle;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
thead th {
|
||||||
|
text-align: center;
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: 9px;
|
||||||
|
background: #d9e2f3;
|
||||||
|
}
|
||||||
|
|
||||||
|
td { font-size: 9px; }
|
||||||
|
td.date { text-align: left; font-weight: bold; }
|
||||||
|
td.absence { text-align: left; color: #c00; }
|
||||||
|
td.time { text-align: center; }
|
||||||
|
td.presence { text-align: center; }
|
||||||
|
td.total { text-align: center; font-weight: bold; }
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<h1>{{ employeeName }} - {{ year }}</h1>
|
||||||
|
|
||||||
|
{% for segment in segments %}
|
||||||
|
{% if segments|length > 1 %}
|
||||||
|
<h2>{{ segment.contractName ?? 'Contrat inconnu' }}{% if segment.mode == 'driver' %} (Chauffeur){% endif %}</h2>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
{% if segment.mode == 'presence' %}
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Date</th>
|
||||||
|
<th>Absence</th>
|
||||||
|
<th>Présence matin</th>
|
||||||
|
<th>Présence après-midi</th>
|
||||||
|
<th>Total</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for row in segment.rows %}
|
||||||
|
<tr>
|
||||||
|
<td class="date">{{ row.date }}</td>
|
||||||
|
<td class="absence">{{ row.absenceLabel ?? '' }}</td>
|
||||||
|
<td class="presence">{{ row.presentMorning ? 'X' : '' }}</td>
|
||||||
|
<td class="presence">{{ row.presentAfternoon ? 'X' : '' }}</td>
|
||||||
|
<td class="total">{{ row.total }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{% elseif segment.mode == 'driver' %}
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Date</th>
|
||||||
|
<th>Absence</th>
|
||||||
|
<th>Heures jour</th>
|
||||||
|
<th>Heures nuit</th>
|
||||||
|
<th>Heures atelier</th>
|
||||||
|
<th>Total</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for row in segment.rows %}
|
||||||
|
<tr>
|
||||||
|
<td class="date">{{ row.date }}</td>
|
||||||
|
<td class="absence">{{ row.absenceLabel ?? '' }}</td>
|
||||||
|
<td class="time">{{ row.dayHours }}</td>
|
||||||
|
<td class="time">{{ row.nightHours }}</td>
|
||||||
|
<td class="time">{{ row.workshopHours }}</td>
|
||||||
|
<td class="total">{{ row.total }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{% else %}
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Date</th>
|
||||||
|
<th>Absence</th>
|
||||||
|
<th>Début matin</th>
|
||||||
|
<th>Fin matin</th>
|
||||||
|
<th>Début après-midi</th>
|
||||||
|
<th>Fin après-midi</th>
|
||||||
|
<th>Début soir</th>
|
||||||
|
<th>Fin soir</th>
|
||||||
|
<th>Total</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for row in segment.rows %}
|
||||||
|
<tr>
|
||||||
|
<td class="date">{{ row.date }}</td>
|
||||||
|
<td class="absence">{{ row.absenceLabel ?? '' }}</td>
|
||||||
|
<td class="time">{{ row.morningFrom }}</td>
|
||||||
|
<td class="time">{{ row.morningTo }}</td>
|
||||||
|
<td class="time">{{ row.afternoonFrom }}</td>
|
||||||
|
<td class="time">{{ row.afternoonTo }}</td>
|
||||||
|
<td class="time">{{ row.eveningFrom }}</td>
|
||||||
|
<td class="time">{{ row.eveningTo }}</td>
|
||||||
|
<td class="total">{{ row.total }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
Reference in New Issue
Block a user