@@ -142,19 +143,19 @@
:disabled="!hasContractAtSelectedDate(employee.id) || isRowLocked(employee.id) || (!isAdmin && isEveningLockedByAbsence(employee.id))"
/>
-
+
{{
formatMinutes(getRowMetrics(employee.id).dayMinutes)
}}
-
+
{{
formatMinutes(getRowMetrics(employee.id).nightMinutes)
}}
-
+
{{
formatMinutes(getRowMetrics(employee.id).totalMinutes)
}}
@@ -186,6 +187,7 @@
-
+
diff --git a/frontend/components/hours/HoursWeekView.vue b/frontend/components/hours/HoursWeekView.vue
index b570947..99919ec 100644
--- a/frontend/components/hours/HoursWeekView.vue
+++ b/frontend/components/hours/HoursWeekView.vue
@@ -1,9 +1,9 @@
-
+
Chargement de la semaine...
Nom
@@ -16,10 +16,11 @@
Total
récup.
+
@@ -68,6 +69,7 @@
{{ row.trackingMode === 'PRESENCE' || isInterimContract(row.contractType) ? '-' : formatMinutes(row.weeklyRecoveryMinutes ?? 0) }}
+
diff --git a/frontend/composables/useEmployeeDetailPage.ts b/frontend/composables/useEmployeeDetailPage.ts
index 010df49..73a399a 100644
--- a/frontend/composables/useEmployeeDetailPage.ts
+++ b/frontend/composables/useEmployeeDetailPage.ts
@@ -6,7 +6,7 @@ export const useEmployeeDetailPage = () => {
const route = useRoute()
const employee = ref
(null)
const isLoading = ref(false)
- const activeTab = ref<'contract' | 'leave' | 'rtt'>('contract')
+ const activeTab = ref<'contract' | 'leave' | 'rtt' | 'mileage'>('contract')
const showLeaveTab = computed(() => employee.value?.currentContractNature !== 'INTERIM')
const showRttTab = computed(() => employee.value?.contract?.type !== CONTRACT_TYPES.FORFAIT)
@@ -38,11 +38,14 @@ export const useEmployeeDetailPage = () => {
leave.resetLoaded()
rtt.resetLoaded()
+ mileage.resetLoaded()
if (activeTab.value === 'leave' && showLeaveTab.value) {
await leave.loadLeaveData()
} else if (activeTab.value === 'rtt' && showRttTab.value) {
await rtt.loadRttData()
+ } else if (activeTab.value === 'mileage') {
+ await mileage.loadMileageData()
}
} finally {
isLoading.value = false
@@ -52,12 +55,15 @@ export const useEmployeeDetailPage = () => {
const contract = useEmployeeContract(employee, loadEmployee)
const leave = useEmployeeLeave(employee, loadEmployee)
const rtt = useEmployeeRtt(employee, loadEmployee)
+ const mileage = useEmployeeMileage(employee, loadEmployee)
watch(activeTab, (tab) => {
if (tab === 'leave' && !leave.leaveDataLoaded.value && showLeaveTab.value) {
leave.loadLeaveData()
} else if (tab === 'rtt' && !rtt.rttDataLoaded.value && showRttTab.value) {
rtt.loadRttData()
+ } else if (tab === 'mileage' && !mileage.mileageDataLoaded.value) {
+ mileage.loadMileageData()
}
})
@@ -75,6 +81,7 @@ export const useEmployeeDetailPage = () => {
employeeContractWorkLabel,
...contract,
...leave,
- ...rtt
+ ...rtt,
+ ...mileage
}
}
diff --git a/frontend/composables/useEmployeeMileage.ts b/frontend/composables/useEmployeeMileage.ts
new file mode 100644
index 0000000..bd18bfc
--- /dev/null
+++ b/frontend/composables/useEmployeeMileage.ts
@@ -0,0 +1,73 @@
+import type { Ref } from 'vue'
+import type { MileageAllowance } from '~/services/dto/mileage-allowance'
+import type { Employee } from '~/services/dto/employee'
+import {
+ listMileageAllowances,
+ createMileageAllowance,
+ updateMileageAllowance,
+ deleteMileageAllowance,
+ uploadReceipt
+} from '~/services/mileage-allowances'
+
+export const useEmployeeMileage = (employee: Ref, reloadEmployee: () => Promise) => {
+ const config = useRuntimeConfig()
+ const apiBase = (config.public.apiBase as string) ?? '/api'
+
+ const mileageAllowances = ref([])
+ const isMileageLoading = ref(false)
+ const mileageDataLoaded = ref(false)
+
+ const loadMileageData = async () => {
+ if (!employee.value || isMileageLoading.value) return
+ isMileageLoading.value = true
+ try {
+ mileageAllowances.value = await listMileageAllowances(employee.value.id)
+ mileageDataLoaded.value = true
+ } finally {
+ isMileageLoading.value = false
+ }
+ }
+
+ const resetLoaded = () => {
+ mileageDataLoaded.value = false
+ }
+
+ const submitCreateMileage = async (data: { month: string; kilometers: number; comment?: string }, file?: File) => {
+ if (!employee.value) return
+ const result = await createMileageAllowance({
+ employeeId: employee.value.id,
+ month: data.month,
+ kilometers: data.kilometers,
+ comment: data.comment
+ })
+ if (file && result?.id) {
+ await uploadReceipt(apiBase, result.id, file)
+ }
+ await reloadEmployee()
+ }
+
+ const submitUpdateMileage = async (id: number, data: { month: string; kilometers: number; comment?: string }, file?: File) => {
+ await updateMileageAllowance(id, data)
+ if (file) {
+ await uploadReceipt(apiBase, id, file)
+ }
+ await reloadEmployee()
+ }
+
+ const submitDeleteMileage = async (id: number) => {
+ await deleteMileageAllowance(id)
+ await reloadEmployee()
+ }
+
+ return {
+ mileageAllowances,
+ isMileageLoading,
+ mileageDataLoaded,
+ mileageApiBase: apiBase,
+ loadMileageData,
+ resetLoaded,
+ submitCreateMileage,
+ submitUpdateMileage,
+ submitDeleteMileage
+ }
+}
diff --git a/frontend/i18n/locales/fr.json b/frontend/i18n/locales/fr.json
index 4715c24..987b1d8 100644
--- a/frontend/i18n/locales/fr.json
+++ b/frontend/i18n/locales/fr.json
@@ -36,6 +36,11 @@
"create": "Impossible de créer l'utilisateur.",
"update": "Impossible de mettre à jour l'utilisateur.",
"delete": "Impossible de supprimer l'utilisateur."
+ },
+ "mileage": {
+ "create": "Impossible de créer le frais kilométrique.",
+ "update": "Impossible de mettre à jour le frais kilométrique.",
+ "delete": "Impossible de supprimer le frais kilométrique."
}
},
"success": {
@@ -67,6 +72,11 @@
"create": "Utilisateur créé.",
"update": "Utilisateur mis à jour.",
"delete": "Utilisateur supprimé."
+ },
+ "mileage": {
+ "create": "Frais kilométrique créé.",
+ "update": "Frais kilométrique mis à jour.",
+ "delete": "Frais kilométrique supprimé."
}
}
}
diff --git a/frontend/pages/absence-types.vue b/frontend/pages/absence-types.vue
index 63c3ad9..eb09d78 100644
--- a/frontend/pages/absence-types.vue
+++ b/frontend/pages/absence-types.vue
@@ -1,13 +1,13 @@
-
-
+
+
Types d'absence
@@ -18,33 +18,33 @@
Aucun type pour le moment.
-
-
-
Code
-
Libellé
-
Couleur
-
Compte en heures
-
Actions
+
+
+ Code
+ Libellé
+ Couleur
+ Compte en heures
Chargement...
-
+
-
{{ type.code }}
-
{{ type.label }}
-
+
{{ type.code }}
+
{{ type.label }}
+
{{ type.color }}
-
+
-
-
-
-
@@ -145,20 +129,29 @@
La couleur est obligatoire.
-
+
+
+
+
diff --git a/frontend/pages/calendar.vue b/frontend/pages/calendar.vue
index 55a5485..19d5778 100644
--- a/frontend/pages/calendar.vue
+++ b/frontend/pages/calendar.vue
@@ -14,7 +14,7 @@
class="h-10 rounded-lg bg-primary-500 px-4 text-md font-semibold text-white hover:bg-secondary-500"
@click="openCreateFromToday"
>
- Ajouter une absence
+ + Ajouter une absence
RTT
+
@@ -117,6 +127,20 @@
+
@@ -173,7 +197,13 @@ const {
addSuspensionForm,
currentActiveContractPeriodId,
isLeaveLoading,
- isRttLoading
+ isRttLoading,
+ mileageAllowances,
+ isMileageLoading,
+ mileageApiBase,
+ submitCreateMileage,
+ submitUpdateMileage,
+ submitDeleteMileage
} = useEmployeeDetailPage()
useHead(() => ({
diff --git a/frontend/pages/sites.vue b/frontend/pages/sites.vue
index 6779c94..d6000af 100644
--- a/frontend/pages/sites.vue
+++ b/frontend/pages/sites.vue
@@ -1,13 +1,13 @@
-
-
+
+
Sites
@@ -18,26 +18,26 @@
Aucun site pour le moment.
-
-
+
+
Nom
Couleur
- Actions
Chargement...
-
+
-
+
::
{{ site.name }}
@@ -48,22 +48,6 @@
/>
{{ site.color }}
-
-
-
-
@@ -98,20 +82,29 @@
{{ form.color }}
-
+
+
+
+
diff --git a/frontend/pages/users.vue b/frontend/pages/users.vue
index 334e940..b3c2fed 100644
--- a/frontend/pages/users.vue
+++ b/frontend/pages/users.vue
@@ -1,13 +1,13 @@
-
-
+
+
Utilisateurs
@@ -18,42 +18,29 @@
Aucun utilisateur pour le moment.
-
-
+
+
Utilisateur
Employé
Accès
Sites
- Actions
Chargement...
-
+
-
{{ user.username }}
-
+ {{ user.username }}
+
{{ user.employee ? `${user.employee.firstName} ${user.employee.lastName}` : '-' }}
-
- {{ getAccessLabel(user) }}
-
-
- {{ getSiteLabels(user) }}
-
-
-
-
+ {{ getAccessLabel(user) }}
+ {{ getSiteLabels(user) }}
@@ -177,20 +164,13 @@
-
-
+
diff --git a/frontend/services/dto/mileage-allowance.ts b/frontend/services/dto/mileage-allowance.ts
new file mode 100644
index 0000000..1aee089
--- /dev/null
+++ b/frontend/services/dto/mileage-allowance.ts
@@ -0,0 +1,9 @@
+export type MileageAllowance = {
+ id: number
+ month: string
+ kilometers: number
+ comment: string | null
+ receiptPath: string | null
+ receiptName: string | null
+ createdAt: string
+}
diff --git a/frontend/services/mileage-allowances.ts b/frontend/services/mileage-allowances.ts
new file mode 100644
index 0000000..df7f45f
--- /dev/null
+++ b/frontend/services/mileage-allowances.ts
@@ -0,0 +1,69 @@
+import { $fetch } from 'ofetch'
+import type { MileageAllowance } from './dto/mileage-allowance'
+import { extractItems } from '~/utils/api'
+
+export const listMileageAllowances = async (employeeId: number) => {
+ const api = useApi()
+ const data = await api.get
(
+ '/mileage_allowances',
+ { employee: `/api/employees/${employeeId}` },
+ { toast: false }
+ )
+ return extractItems(data)
+}
+
+export const createMileageAllowance = async (data: {
+ employeeId: number
+ month: string
+ kilometers: number
+ comment?: string
+}) => {
+ const api = useApi()
+ return api.post('/mileage_allowances', {
+ employee: `/api/employees/${data.employeeId}`,
+ month: data.month,
+ kilometers: data.kilometers,
+ comment: data.comment
+ }, {
+ toastSuccessKey: 'success.mileage.create',
+ toastErrorKey: 'errors.mileage.create'
+ })
+}
+
+export const updateMileageAllowance = async (id: number, data: {
+ month: string
+ kilometers: number
+ comment?: string
+}) => {
+ const api = useApi()
+ return api.patch(`/mileage_allowances/${id}`, {
+ month: data.month,
+ kilometers: data.kilometers,
+ comment: data.comment
+ }, {
+ toastSuccessKey: 'success.mileage.update',
+ toastErrorKey: 'errors.mileage.update'
+ })
+}
+
+export const deleteMileageAllowance = async (id: number) => {
+ const api = useApi()
+ return api.delete(`/mileage_allowances/${id}`, {}, {
+ toastSuccessKey: 'success.mileage.delete',
+ toastErrorKey: 'errors.mileage.delete'
+ })
+}
+
+export const uploadReceipt = async (baseURL: string, id: number, file: File) => {
+ const formData = new FormData()
+ formData.append('file', file)
+ return $fetch(`${baseURL}/mileage_allowances/${id}/receipt`, {
+ method: 'POST',
+ body: formData,
+ credentials: 'include'
+ })
+}
+
+export const getReceiptUrl = (baseURL: string, id: number): string => {
+ return `${baseURL}/mileage_allowances/${id}/receipt`
+}
diff --git a/migrations/Version20260313125819.php b/migrations/Version20260313125819.php
new file mode 100644
index 0000000..ff98604
--- /dev/null
+++ b/migrations/Version20260313125819.php
@@ -0,0 +1,29 @@
+addSql('CREATE TABLE mileage_allowances (id INT GENERATED BY DEFAULT AS IDENTITY NOT NULL, month DATE NOT NULL, kilometers DOUBLE PRECISION NOT NULL, comment TEXT DEFAULT NULL, receipt_path VARCHAR(255) DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, employee_id INT NOT NULL, PRIMARY KEY (id))');
+ $this->addSql('CREATE INDEX IDX_3B44830E8C03F15C ON mileage_allowances (employee_id)');
+ $this->addSql('ALTER TABLE mileage_allowances ADD CONSTRAINT FK_3B44830E8C03F15C FOREIGN KEY (employee_id) REFERENCES employees (id) NOT DEFERRABLE');
+ }
+
+ public function down(Schema $schema): void
+ {
+ $this->addSql('ALTER TABLE mileage_allowances DROP CONSTRAINT FK_3B44830E8C03F15C');
+ $this->addSql('DROP TABLE mileage_allowances');
+ }
+}
diff --git a/migrations/Version20260313133548.php b/migrations/Version20260313133548.php
new file mode 100644
index 0000000..c8e4b03
--- /dev/null
+++ b/migrations/Version20260313133548.php
@@ -0,0 +1,26 @@
+addSql('ALTER TABLE mileage_allowances ADD receipt_name VARCHAR(255) DEFAULT NULL');
+ }
+
+ public function down(Schema $schema): void
+ {
+ $this->addSql('ALTER TABLE mileage_allowances DROP receipt_name');
+ }
+}
diff --git a/src/Entity/MileageAllowance.php b/src/Entity/MileageAllowance.php
new file mode 100644
index 0000000..ef0ddc6
--- /dev/null
+++ b/src/Entity/MileageAllowance.php
@@ -0,0 +1,192 @@
+ ['mileage_allowance:read', 'employee:read'],
+ 'datetime_format' => 'Y-m-d',
+ ],
+ denormalizationContext: [
+ 'groups' => ['mileage_allowance:write'],
+ 'datetime_format' => 'Y-m-d',
+ ],
+ order: ['month' => 'DESC'],
+ paginationEnabled: false,
+)]
+#[ApiFilter(DateFilter::class, properties: ['month'])]
+#[ApiFilter(SearchFilter::class, properties: ['employee' => 'exact'])]
+#[ORM\Entity(repositoryClass: MileageAllowanceRepository::class)]
+#[ORM\Table(name: 'mileage_allowances')]
+class MileageAllowance
+{
+ #[ORM\Id]
+ #[ORM\GeneratedValue]
+ #[ORM\Column(type: 'integer')]
+ #[Groups(['mileage_allowance:read'])]
+ private ?int $id = null;
+
+ #[ORM\ManyToOne(targetEntity: Employee::class)]
+ #[ORM\JoinColumn(nullable: false)]
+ #[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
+ private ?Employee $employee = null;
+
+ #[ORM\Column(type: 'date_immutable')]
+ #[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
+ private ?DateTimeImmutable $month = null;
+
+ #[ORM\Column(type: 'float')]
+ #[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
+ private float $kilometers = 0;
+
+ #[ORM\Column(type: 'text', nullable: true)]
+ #[Groups(['mileage_allowance:read', 'mileage_allowance:write'])]
+ private ?string $comment = null;
+
+ #[ORM\Column(type: 'string', length: 255, nullable: true)]
+ #[Groups(['mileage_allowance:read'])]
+ private ?string $receiptPath = null;
+
+ #[ORM\Column(type: 'string', length: 255, nullable: true)]
+ #[Groups(['mileage_allowance:read'])]
+ private ?string $receiptName = null;
+
+ #[ORM\Column(type: 'datetime_immutable')]
+ #[Groups(['mileage_allowance:read'])]
+ private DateTimeImmutable $createdAt;
+
+ public function __construct()
+ {
+ $this->createdAt = new DateTimeImmutable();
+ }
+
+ public function getId(): ?int
+ {
+ return $this->id;
+ }
+
+ public function getEmployee(): ?Employee
+ {
+ return $this->employee;
+ }
+
+ public function setEmployee(?Employee $employee): self
+ {
+ $this->employee = $employee;
+
+ return $this;
+ }
+
+ public function getMonth(): ?DateTimeImmutable
+ {
+ return $this->month;
+ }
+
+ public function setMonth(?DateTimeImmutable $month): self
+ {
+ $this->month = $month;
+
+ return $this;
+ }
+
+ public function getKilometers(): float
+ {
+ return $this->kilometers;
+ }
+
+ public function setKilometers(float $kilometers): self
+ {
+ $this->kilometers = $kilometers;
+
+ return $this;
+ }
+
+ public function getComment(): ?string
+ {
+ return $this->comment;
+ }
+
+ public function setComment(?string $comment): self
+ {
+ $this->comment = $comment;
+
+ return $this;
+ }
+
+ public function getReceiptPath(): ?string
+ {
+ return $this->receiptPath;
+ }
+
+ public function setReceiptPath(?string $receiptPath): self
+ {
+ $this->receiptPath = $receiptPath;
+
+ return $this;
+ }
+
+ public function getReceiptName(): ?string
+ {
+ return $this->receiptName;
+ }
+
+ public function setReceiptName(?string $receiptName): self
+ {
+ $this->receiptName = $receiptName;
+
+ return $this;
+ }
+
+ public function getCreatedAt(): DateTimeImmutable
+ {
+ return $this->createdAt;
+ }
+}
diff --git a/src/Repository/MileageAllowanceRepository.php b/src/Repository/MileageAllowanceRepository.php
new file mode 100644
index 0000000..bb951b3
--- /dev/null
+++ b/src/Repository/MileageAllowanceRepository.php
@@ -0,0 +1,20 @@
+
+ */
+final class MileageAllowanceRepository extends ServiceEntityRepository
+{
+ public function __construct(ManagerRegistry $registry)
+ {
+ parent::__construct($registry, MileageAllowance::class);
+ }
+}
diff --git a/src/State/MileageAllowanceDeleteProcessor.php b/src/State/MileageAllowanceDeleteProcessor.php
new file mode 100644
index 0000000..4b23f0e
--- /dev/null
+++ b/src/State/MileageAllowanceDeleteProcessor.php
@@ -0,0 +1,42 @@
+getReceiptPath();
+
+ if (null !== $receiptPath) {
+ $absolutePath = sprintf('%s/%s', $this->uploadDir, $receiptPath);
+
+ if (file_exists($absolutePath)) {
+ unlink($absolutePath);
+ }
+ }
+
+ $this->entityManager->remove($data);
+ $this->entityManager->flush();
+
+ return null;
+ }
+}
diff --git a/src/State/MileageAllowanceReceiptDownloadProvider.php b/src/State/MileageAllowanceReceiptDownloadProvider.php
new file mode 100644
index 0000000..37ba64e
--- /dev/null
+++ b/src/State/MileageAllowanceReceiptDownloadProvider.php
@@ -0,0 +1,53 @@
+entityManager->find(MileageAllowance::class, $uriVariables['id']);
+
+ if (null === $mileageAllowance) {
+ throw new NotFoundHttpException('Mileage allowance not found.');
+ }
+
+ $receiptPath = $mileageAllowance->getReceiptPath();
+
+ if (null === $receiptPath) {
+ throw new NotFoundHttpException('No receipt found for this mileage allowance.');
+ }
+
+ $absolutePath = sprintf('%s/%s', $this->uploadDir, $receiptPath);
+
+ if (!file_exists($absolutePath)) {
+ throw new NotFoundHttpException('Receipt file not found.');
+ }
+
+ $response = new BinaryFileResponse($absolutePath);
+ $disposition = HeaderUtils::makeDisposition(
+ HeaderUtils::DISPOSITION_ATTACHMENT,
+ $mileageAllowance->getReceiptName() ?? 'justificatif.pdf'
+ );
+ $response->headers->set('Content-Disposition', $disposition);
+
+ return $response;
+ }
+}
diff --git a/src/State/MileageAllowanceReceiptUploadProcessor.php b/src/State/MileageAllowanceReceiptUploadProcessor.php
new file mode 100644
index 0000000..f006b92
--- /dev/null
+++ b/src/State/MileageAllowanceReceiptUploadProcessor.php
@@ -0,0 +1,66 @@
+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->setReceiptPath($fullRelative);
+ $data->setReceiptName($originalName);
+ $this->entityManager->flush();
+
+ return new JsonResponse(['path' => $fullRelative, 'name' => $originalName], Response::HTTP_OK);
+ }
+}