Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3c434d20b2 | ||
| bbb020025a | |||
|
|
640bb42d3a | ||
| 50712ccb00 | |||
| 265b19a9d0 | |||
|
|
13743738fd | ||
| 085fe0c150 |
6
.idea/sqldialects.xml
generated
6
.idea/sqldialects.xml
generated
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="SqlDialectMappings">
|
|
||||||
<file url="file://$PROJECT_DIR$/sirh.sql" dialect="GenericSQL" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
- 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
|
- 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.
|
- 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)
|
## Frais (MileageAllowance)
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
parameters:
|
parameters:
|
||||||
app.version: '0.1.60'
|
app.version: '0.1.63'
|
||||||
|
|||||||
@@ -154,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
|
||||||
|
|
||||||
@@ -194,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
|
||||||
@@ -384,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>
|
||||||
@@ -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',
|
||||||
|
|||||||
@@ -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">
|
||||||
@@ -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}`
|
||||||
|
|||||||
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 {}
|
||||||
@@ -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')
|
||||||
|
|||||||
@@ -252,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()],
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -171,7 +171,8 @@ 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;
|
||||||
|
|||||||
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