[#322] Page horaire (#4)

| Numéro du ticket | Titre du ticket |
|------------------|-----------------|
|        #322          |        Page horaire         |

## Description de la PR
[#322] Page horaire

## Modification du .env

## Check list

- [ ] Pas de régression
- [ ] TU/TI/TF rédigée
- [ ] TU/TI/TF OK
- [ ] CHANGELOG modifié

Reviewed-on: #4
Co-authored-by: tristan <tristan@yuno.malio.fr>
Co-committed-by: tristan <tristan@yuno.malio.fr>

frontend/pages/absence-types.vue

@@ -19,10 +19,11 @@
     </div>
 
     <div v-else class="overflow-hidden rounded-lg border border-neutral-200 bg-white">
-      <div class="grid grid-cols-[120px_120px_1fr_200px] gap-4 border-b border-neutral-200 bg-tertiary-500 px-6 py-3 text-md font-semibold text-neutral-700">
+      <div class="grid grid-cols-[120px_160px_1fr_220px_200px] gap-4 border-b border-neutral-200 bg-tertiary-500 px-6 py-3 text-md font-semibold text-neutral-700">
         <span class="text-left">Code</span>
         <span class="text-left">Libellé</span>
         <span class="text-left">Couleur</span>
+        <span class="text-left">Compte en heures</span>
         <span class="text-right">Actions</span>
       </div>
       <div v-if="isLoading" class="px-6 py-4 text-md text-neutral-500">
@@ -32,7 +33,7 @@
         <div
           v-for="type in absenceTypes"
           :key="type.id"
-          class="grid grid-cols-[120px_120px_1fr_200px] items-center gap-4 border-b border-neutral-100 px-6 py-3 text-md text-neutral-800 last:border-b-0"
+          class="grid grid-cols-[120px_160px_1fr_220px_200px] items-center gap-4 border-b border-neutral-100 px-6 py-3 text-md text-neutral-800 last:border-b-0"
         >
           <span class="font-semibold text-left">{{ type.code }}</span>
           <span class="text-left">{{ type.label }}</span>
@@ -43,6 +44,14 @@
             />
             <span class="text-md uppercase text-neutral-500">{{ type.color }}</span>
           </div>
+          <div class="text-left">
+            <span
+              class="inline-flex rounded-md px-2 py-1 text-sm font-semibold"
+              :class="type.countAsWorkedHours ? 'bg-emerald-100 text-emerald-700' : 'bg-neutral-100 text-neutral-700'"
+            >
+              {{ type.countAsWorkedHours ? 'Oui' : 'Non' }}
+            </span>
+          </div>
           <div class="flex items-center justify-end gap-2">
             <button
               type="button"
@@ -94,6 +103,31 @@
             Le libellé est obligatoire.
           </p>
         </div>
+        <div>
+          <label class="text-md font-semibold text-neutral-700">
+            Compté comme travaillé
+          </label>
+          <div class="mt-2 flex items-center gap-6">
+            <label class="inline-flex items-center gap-2 text-md text-neutral-800">
+              <input
+                v-model="form.countAsWorkedHours"
+                type="radio"
+                class="h-4 w-4"
+                :value="true"
+              />
+              Oui
+            </label>
+            <label class="inline-flex items-center gap-2 text-md text-neutral-800">
+              <input
+                v-model="form.countAsWorkedHours"
+                type="radio"
+                class="h-4 w-4"
+                :value="false"
+              />
+              Non
+            </label>
+          </div>
+        </div>
         <div>
           <label class="text-md font-semibold text-neutral-700" for="color">
             Couleur <span class="text-red-600">*</span>
@@ -150,7 +184,8 @@ const drawerTitle = computed(() =>
 const form = reactive({
   code: '',
   label: '',
-  color: '#222783'
+  color: '#222783',
+  countAsWorkedHours: true
 })
 
 const validationTouched = reactive({
@@ -171,7 +206,7 @@ const showLabelError = computed(() => validationTouched.label && !isLabelValid.v
 const showColorError = computed(() => validationTouched.color && !isColorValid.value)
 
 const baseInputClass =
-  'mt-2 w-full rounded-md border px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-200'
+  'mt-2 w-full rounded-md border px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20'
 const codeFieldClass = computed(() => {
   if (showCodeError.value) {
     return `${baseInputClass} border-red-500`
@@ -214,6 +249,7 @@ const resetForm = () => {
   form.code = ''
   form.label = ''
   form.color = '#222783'
+  form.countAsWorkedHours = true
 }
 
 const openCreate = () => {
@@ -227,6 +263,7 @@ const openEdit = (type: AbsenceType) => {
   form.code = type.code
   form.label = type.label
   form.color = type.color
+  form.countAsWorkedHours = type.countAsWorkedHours
   isDrawerOpen.value = true
 }
 
@@ -249,13 +286,15 @@ const handleSubmit = async () => {
       await updateAbsenceType(editingType.value.id, {
         code: form.code,
         label: form.label,
-        color: form.color
+        color: form.color,
+        countAsWorkedHours: form.countAsWorkedHours
       })
     } else {
       await createAbsenceType({
         code: form.code,
         label: form.label,
-        color: form.color
+        color: form.color,
+        countAsWorkedHours: form.countAsWorkedHours
       })
     }
 

frontend/pages/calendar.vue

@@ -3,38 +3,10 @@
         <div class="flex flex-wrap items-center justify-between gap-4">
             <h1 class="text-4xl font-bold text-primary-500">Calendrier des absences</h1>
         </div>
-        <div class="py-6">
+        <div class="flex flex-col gap-3 py-6">
             <div class="flex items-center justify-between gap-4">
                 <div class="flex items-center gap-4">
-                    <div class="flex flex-wrap items-center gap-4 rounded-md border border-neutral-300 px-3 py-2">
-                        <div v-for="site in sites" :key="site.id" class="flex items-center gap-2">
-                            <div :style="{ backgroundColor: site.color }" class="h-4 w-4 rounded"></div>
-                            <label class="text-md" :for="`site-${site.id}`">{{ site.name }}</label>
-                            <input
-                                :id="`site-${site.id}`"
-                                v-model="selectedSiteIds"
-                                :value="site.id"
-                                type="checkbox"
-                                class="h-4 w-4"
-                            />
-                        </div>
-                    </div>
-                    <select
-                        v-model="selectedMonth"
-                        class="h-10 rounded-md border border-neutral-300 bg-white px-3 text-md text-neutral-900"
-                    >
-                        <option v-for="month in months" :key="month.value" :value="month.value">
-                            {{ month.label }}
-                        </option>
-                    </select>
-                    <select
-                        v-model="selectedYear"
-                        class="h-10 rounded-md border border-neutral-300 bg-white px-3 text-md text-neutral-900"
-                    >
-                        <option v-for="year in years" :key="year" :value="year">
-                            {{ year }}
-                        </option>
-                    </select>
+                    <SiteFilterSelector v-model="selectedSiteIds" :sites="sites"/>
                 </div>
                 <div class="flex gap-4">
                     <button
@@ -53,24 +25,36 @@
                     </button>
                 </div>
             </div>
-            <div class="flex justify-between mt-3">
-                <div class="flex items-center gap-4 w-80">
-                    <input
-                        v-model="employeeFilter"
-                        type="text"
-                        placeholder="Chercher un employé (nom ou prénom)"
-                        class="h-10 w-full max-w-md rounded-md border border-neutral-300 bg-white px-3 text-md text-neutral-900"
-                    />
-                </div>
-                <div class="flex flex-wrap items-center gap-4 rounded-md border border-neutral-300 px-3 py-2">
-                    <p class="font-bold">Légende :</p>
-                    <div v-for="type in absenceTypes" :key="type.id" class="flex items-center gap-2">
-                        <div :style="{ backgroundColor: type.color }" class="h-4 w-4 rounded"></div>
-                        <p>{{ type.label }}</p>
+            <div class="flex justify-between">
+                <div class="flex items-center gap-4">
+                    <div class="w-80">
+                        <EmployeeNameFilterInput v-model="employeeFilter"/>
                     </div>
+                    <select
+                        v-model="selectedMonth"
+                        class="h-10 rounded-md border border-neutral-300 bg-white px-3 text-md text-neutral-900"
+                    >
+                        <option v-for="month in months" :key="month.value" :value="month.value">
+                            {{ month.label }}
+                        </option>
+                    </select>
+                    <select
+                        v-model="selectedYear"
+                        class="h-10 rounded-md border border-neutral-300 bg-white px-3 text-md text-neutral-900"
+                    >
+                        <option v-for="year in years" :key="year" :value="year">
+                            {{ year }}
+                        </option>
+                    </select>
+                </div>
+            </div>
+            <div class="flex flex-wrap items-center gap-6 py-2">
+                <p class="font-bold">Légende :</p>
+                <div v-for="type in absenceTypes" :key="type.id" class="flex items-center gap-2">
+                    <div :style="{ backgroundColor: type.color }" class="h-4 w-4 rounded"></div>
+                    <p>{{ type.label }}</p>
                 </div>
             </div>
-
         </div>
 
         <div class="flex-1 min-h-0">
@@ -119,10 +103,13 @@ import {listEmployees, updateEmployeeOrder} from '~/services/employees'
 import {listAbsenceTypes} from '~/services/absence-types'
 import {createAbsence, deleteAbsence, listAbsences, updateAbsence} from '~/services/absences'
 import {listPublicHolidays} from '~/services/public-holidays'
-import {getDaysInMonth, normalizeDate, toYmd} from '~/utils/date'
+import {getDaysInMonth, normalizeDate, parseYmd, toYmd} from '~/utils/date'
+import {compareEmployeesInSite, sortEmployeesBySiteAndOrder} from '~/utils/employee'
 import CalendarGrid from '~/components/CalendarGrid.vue'
 import AbsenceFormDrawer from '~/components/AbsenceFormDrawer.vue'
 import AbsencePrintDrawer from '~/components/AbsencePrintDrawer.vue'
+import EmployeeNameFilterInput from '~/components/EmployeeNameFilterInput.vue'
+import SiteFilterSelector from '~/components/SiteFilterSelector.vue'
 
 // Données principales affichées dans la grille.
 const employees = ref<Employee[]>([])
@@ -149,27 +136,11 @@ watch(sites, (next) => {
     if (sitesInitialized.value || next.length === 0) return
     selectedSiteIds.value = next.map((site) => site.id)
     sitesInitialized.value = true
-}, { immediate: true })
+}, {immediate: true})
 
 // Tri stable: site -> nom -> prénom.
 const sortedEmployees = computed(() => {
-  return [...employees.value].sort((employeeA, employeeB) => {
-    const siteOrderA = employeeA.site?.displayOrder ?? 0
-    const siteOrderB = employeeB.site?.displayOrder ?? 0
-    if (siteOrderA !== siteOrderB) return siteOrderA - siteOrderB
-    const siteNameA = employeeA.site?.name ?? ''
-    const siteNameB = employeeB.site?.name ?? ''
-    if (siteNameA !== siteNameB) return siteNameA.localeCompare(siteNameB, 'fr')
-    const orderA = employeeA.displayOrder ?? 0
-    const orderB = employeeB.displayOrder ?? 0
-    if (orderA !== orderB) return orderA - orderB
-    const lastNameA = employeeA.lastName ?? ''
-    const lastNameB = employeeB.lastName ?? ''
-    if (lastNameA !== lastNameB) return lastNameA.localeCompare(lastNameB, 'fr')
-    const firstNameA = employeeA.firstName ?? ''
-    const firstNameB = employeeB.firstName ?? ''
-    return firstNameA.localeCompare(firstNameB, 'fr')
-  })
+    return sortEmployeesBySiteAndOrder(employees.value)
 })
 
 // Employés visibles selon le filtre de sites.
@@ -281,13 +252,6 @@ const closePrint = () => {
     isPrintOpen.value = false
 }
 
-// Parse "YYYY-MM-DD" en Date (ou null).
-const parseYmd = (value: string) => {
-    const [year, month, day] = value.split('-').map(Number)
-    if (!year || !month || !day) return null
-    return new Date(year, month - 1, day)
-}
-
 // Détermine si la journée est une demi-journée (AM/PM) ou complète.
 const getHalfForDate = (
     startDate: string,
@@ -681,7 +645,7 @@ const formatEmployeeName = (employee: Employee) => {
 }
 
 // Impression PDF de l'intervalle sélectionné.
-const { printPdf } = usePdfPrinter()
+const {printPdf} = usePdfPrinter()
 const handlePrint = async () => {
     const params = new URLSearchParams()
     params.set('from', printForm.from)
@@ -703,17 +667,7 @@ const handleReorder = async (payload: { dragId: number; dropId: number }) => {
 
     const siteEmployees = [...employees.value]
         .filter((employee) => employee.site?.id === dragSiteId)
-        .sort((employeeA, employeeB) => {
-            const orderA = employeeA.displayOrder ?? 0
-            const orderB = employeeB.displayOrder ?? 0
-            if (orderA !== orderB) return orderA - orderB
-            const lastNameA = employeeA.lastName ?? ''
-            const lastNameB = employeeB.lastName ?? ''
-            if (lastNameA !== lastNameB) return lastNameA.localeCompare(lastNameB, 'fr')
-            const firstNameA = employeeA.firstName ?? ''
-            const firstNameB = employeeB.firstName ?? ''
-            return firstNameA.localeCompare(firstNameB, 'fr')
-        })
+        .sort(compareEmployeesInSite)
 
     const fromIndex = siteEmployees.findIndex((employee) => employee.id === dragEmployee.id)
     const toIndex = siteEmployees.findIndex((employee) => employee.id === dropEmployee.id)
@@ -726,7 +680,7 @@ const handleReorder = async (payload: { dragId: number; dropId: number }) => {
     siteEmployees.forEach((employee, index) => {
         const nextOrder = index + 1
         if ((employee.displayOrder ?? 0) !== nextOrder) {
-            updates.push({ id: employee.id, displayOrder: nextOrder })
+            updates.push({id: employee.id, displayOrder: nextOrder})
         }
         employee.displayOrder = nextOrder
     })

frontend/pages/employees.vue

@@ -1,57 +1,80 @@
 <template>
-  <div>
-    <div class="flex items-center justify-between pb-12">
-      <h1 class="text-4xl font-bold text-primary-500">Employés</h1>
-      <button
-        type="button"
-        class="rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
-        @click="isDrawerOpen = true"
-      >
-        Ajouter un employé
-      </button>
+  <div class="h-full overflow-hidden flex flex-col">
+    <div class="shrink-0">
+      <div class="flex items-center justify-between">
+          <h1 class="text-4xl font-bold text-primary-500">Employés</h1>
+      </div>
+
+    <div class="flex flex-col gap-3 py-6">
+        <div class="flex justify-between">
+            <SiteFilterSelector v-if="sites.length > 0" v-model="selectedSiteIds" :sites="sites" />
+            <button
+                type="button"
+                class="rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+                @click="isDrawerOpen = true"
+            >
+                Ajouter un employé
+            </button>
+        </div>
+        <div class="w-80">
+            <EmployeeNameFilterInput v-model="employeeFilter" />
+        </div>
+    </div>
     </div>
 
     <div
-      v-if="!isLoading && employees.length === 0"
+      v-if="!isLoading && filteredEmployees.length === 0"
       class="rounded-lg border border-neutral-200 bg-white p-6 text-md text-neutral-600"
     >
       Aucun employé pour le moment.
     </div>
 
-    <div v-else class="max-h-[80vh] overflow-auto rounded-lg border border-neutral-200 bg-white">
-      <div class="grid grid-cols-[120px_1fr_1fr_200px] gap-4 border-b border-neutral-200 bg-tertiary-500 px-6 py-3 text-md font-semibold text-neutral-700">
-        <span class="text-left">Prénom</span>
-        <span class="text-left">Nom</span>
-        <span class="text-left">Site</span>
-        <span class="text-right">Actions</span>
-      </div>
-      <div v-if="isLoading" class="px-6 py-4 text-md text-neutral-500">
-        Chargement...
-      </div>
-      <div v-else>
-        <div
-          v-for="employee in employees"
-          :key="employee.id"
-          class="grid grid-cols-[120px_1fr_1fr_200px] items-center gap-4 border-b border-neutral-100 px-6 py-3 text-md text-neutral-800 last:border-b-0"
-        >
-          <span>{{ employee.firstName }}</span>
-          <span>{{ employee.lastName }}</span>
-          <span>{{ employee.site?.name ?? '-' }}</span>
-          <div class="flex items-center justify-end gap-2">
-            <button
-              type="button"
-              class="rounded-md border border-neutral-200 px-2 py-1 text-md font-semibold text-neutral-700 hover:bg-neutral-100"
-              @click="openEdit(employee)"
+    <div v-else class="flex-1 min-h-0 rounded-lg border border-neutral-200 bg-white overflow-hidden">
+      <div class="h-full overflow-auto">
+        <div class="min-w-[900px]">
+          <div class="grid grid-cols-[120px_1fr_1fr_220px_200px] gap-4 border-b border-neutral-200 bg-tertiary-500 px-6 py-3 text-md font-semibold text-neutral-700 sticky top-0 z-10">
+            <span class="text-left">Prénom</span>
+            <span class="text-left">Nom</span>
+            <span class="text-left">Site</span>
+            <span class="text-left">Contrat</span>
+            <span class="text-right">Actions</span>
+          </div>
+          <div v-if="isLoading" class="px-6 py-4 text-md text-neutral-500">
+            Chargement...
+          </div>
+          <div v-else>
+            <div
+              v-for="employee in filteredEmployees"
+              :key="employee.id"
+              class="grid grid-cols-[120px_1fr_1fr_220px_200px] items-center gap-4 border-b border-neutral-100 px-6 py-3 text-md text-neutral-800 last:border-b-0"
             >
-              Modifier
-            </button>
-            <button
-              type="button"
-              class="rounded-md border border-red-200 px-2 py-1 text-md font-semibold text-red-600 hover:bg-red-50"
-              @click="confirmDelete(employee)"
-            >
-              Supprimer
-            </button>
+              <span>{{ employee.firstName }}</span>
+              <span>{{ employee.lastName }}</span>
+              <span
+                class="inline-flex w-fit max-w-full rounded-md px-2 py-1 text-sm font-semibold"
+                :style="employee.site ? { backgroundColor: employee.site.color, color: '#0f172a' } : {}"
+                :class="employee.site ? '' : 'bg-neutral-100 text-neutral-600'"
+              >
+                {{ employee.site?.name ?? '-' }}
+              </span>
+              <span>{{ employee.contract?.name ?? '-' }}</span>
+              <div class="flex items-center justify-end gap-2">
+                <button
+                  type="button"
+                  class="rounded-md border border-neutral-200 px-2 py-1 text-md font-semibold text-neutral-700 hover:bg-neutral-100"
+                  @click="openEdit(employee)"
+                >
+                  Modifier
+                </button>
+                <button
+                  type="button"
+                  class="rounded-md border border-red-200 px-2 py-1 text-md font-semibold text-red-600 hover:bg-red-50"
+                  @click="confirmDelete(employee)"
+                >
+                  Supprimer
+                </button>
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -105,6 +128,24 @@
             Le site est obligatoire.
           </p>
         </div>
+        <div>
+          <label class="text-md font-semibold text-neutral-700" for="contract">
+            Contrat <span class="text-red-600">*</span>
+          </label>
+          <select
+            id="contract"
+            v-model="form.contractId"
+            :class="contractFieldClass"
+          >
+            <option value="">Sélectionner un contrat</option>
+            <option v-for="contract in contracts" :key="contract.id" :value="contract.id">
+              {{ contract.name }}
+            </option>
+          </select>
+          <p v-if="showContractError" class="mt-1 text-sm text-red-600">
+            Le contrat est obligatoire.
+          </p>
+        </div>
         <div class="flex justify-end gap-3 pt-2">
           <button
             type="button"
@@ -127,14 +168,18 @@
 </template>
 
 <script setup lang="ts">
+import type { Contract } from '~/services/dto/contract'
 import type { Employee } from '~/services/dto/employee'
 import type { Site } from '~/services/dto/site'
+import { listContracts } from '~/services/contracts'
 import { createEmployee, deleteEmployee, listEmployees, updateEmployee } from '~/services/employees'
 import { listSites } from '~/services/sites'
+import SiteFilterSelector from '~/components/SiteFilterSelector.vue'
 
 const isDrawerOpen = ref(false)
 const isSubmitting = ref(false)
 const isLoading = ref(false)
+const sitesInitialized = ref(false)
 const editingEmployee = ref<Employee | null>(null)
 const drawerTitle = computed(() =>
   editingEmployee.value ? 'Modifier un employé' : 'Ajouter un employé'
@@ -142,24 +187,48 @@ const drawerTitle = computed(() =>
 
 const employees = ref<Employee[]>([])
 const sites = ref<Site[]>([])
+const contracts = ref<Contract[]>([])
+const employeeFilter = ref('')
+const selectedSiteIds = ref<number[]>([])
+
+const filteredEmployees = computed(() => {
+  if (selectedSiteIds.value.length === 0) return []
+
+  const filter = employeeFilter.value.trim().toLowerCase()
+  const bySite = employees.value.filter((employee) => {
+    const siteId = employee.site?.id
+    return !!siteId && selectedSiteIds.value.includes(siteId)
+  })
+
+  if (!filter) return bySite
+
+  return bySite.filter((employee) => {
+    const firstName = employee.firstName?.toLowerCase() ?? ''
+    const lastName = employee.lastName?.toLowerCase() ?? ''
+    return firstName.includes(filter) || lastName.includes(filter)
+  })
+})
 
 const form = reactive({
   firstName: '',
   lastName: '',
-  siteId: '' as number | ''
+  siteId: '' as number | '',
+  contractId: '' as number | ''
 })
 
 const validationTouched = reactive({
   firstName: false,
   lastName: false,
-  siteId: false
+  siteId: false,
+  contractId: false
 })
 
 const isFirstNameValid = computed(() => form.firstName.trim() !== '')
 const isLastNameValid = computed(() => form.lastName.trim() !== '')
 const isSiteValid = computed(() => form.siteId !== '')
+const isContractValid = computed(() => form.contractId !== '')
 const isFormValid = computed(
-  () => isFirstNameValid.value && isLastNameValid.value && isSiteValid.value
+  () => isFirstNameValid.value && isLastNameValid.value && isSiteValid.value && isContractValid.value
 )
 
 const showFirstNameError = computed(
@@ -171,9 +240,12 @@ const showLastNameError = computed(
 const showSiteError = computed(
   () => validationTouched.siteId && !isSiteValid.value
 )
+const showContractError = computed(
+  () => validationTouched.contractId && !isContractValid.value
+)
 
 const baseInputClass =
-  'mt-2 w-full rounded-md border px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-200'
+  'mt-2 w-full rounded-md border px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20'
 const firstNameFieldClass = computed(() => {
   if (showFirstNameError.value) {
     return `${baseInputClass} border-red-500`
@@ -194,6 +266,14 @@ const siteFieldClass = computed(() => {
   }
   return `${baseSelectClass} border-neutral-300`
 })
+const contractFieldClass = computed(() => {
+  const baseClass =
+    'mt-2 w-full rounded-md border bg-white px-3 py-2 text-md text-neutral-900'
+  if (showContractError.value) {
+    return `${baseClass} border-red-500`
+  }
+  return `${baseClass} border-neutral-300`
+})
 
 const submitButtonClass = computed(() => {
   if (isSubmitting.value || !isFormValid.value) {
@@ -215,15 +295,33 @@ const loadSites = async () => {
   sites.value = await listSites()
 }
 
+const loadContracts = async () => {
+  contracts.value = await listContracts()
+}
+
 onMounted(async () => {
-  await Promise.all([loadEmployees(), loadSites()])
+  await Promise.all([loadEmployees(), loadSites(), loadContracts()])
 })
 
+watch(sites, (nextSites) => {
+  const currentSiteIds = nextSites.map((site) => site.id)
+
+  if (!sitesInitialized.value) {
+    if (currentSiteIds.length === 0) return
+    selectedSiteIds.value = currentSiteIds
+    sitesInitialized.value = true
+    return
+  }
+
+  selectedSiteIds.value = selectedSiteIds.value.filter((siteId) => currentSiteIds.includes(siteId))
+}, { immediate: true })
+
 const handleSubmit = async () => {
   if (isSubmitting.value) return
   validationTouched.firstName = true
   validationTouched.lastName = true
   validationTouched.siteId = true
+  validationTouched.contractId = true
   if (!isFormValid.value) return
 
   isSubmitting.value = true
@@ -232,19 +330,22 @@ const handleSubmit = async () => {
       await updateEmployee(editingEmployee.value.id, {
         firstName: form.firstName,
         lastName: form.lastName,
-        siteId: form.siteId === '' ? null : Number(form.siteId)
+        siteId: form.siteId === '' ? null : Number(form.siteId),
+        contractId: Number(form.contractId)
       })
     } else {
       await createEmployee({
         firstName: form.firstName,
         lastName: form.lastName,
-        siteId: form.siteId === '' ? null : Number(form.siteId)
+        siteId: form.siteId === '' ? null : Number(form.siteId),
+        contractId: Number(form.contractId)
       })
     }
 
     form.firstName = ''
     form.lastName = ''
     form.siteId = ''
+    form.contractId = ''
     editingEmployee.value = null
     isDrawerOpen.value = false
     await loadEmployees()
@@ -258,6 +359,7 @@ watch(isDrawerOpen, (isOpen) => {
     validationTouched.firstName = false
     validationTouched.lastName = false
     validationTouched.siteId = false
+    validationTouched.contractId = false
   }
 })
 
@@ -266,6 +368,7 @@ const openEdit = (employee: Employee) => {
   form.firstName = employee.firstName
   form.lastName = employee.lastName
   form.siteId = employee.site?.id ?? ''
+  form.contractId = employee.contract?.id ?? ''
   isDrawerOpen.value = true
 }
 

frontend/pages/hours.vue

@@ -0,0 +1,162 @@
+<template>
+    <div class="h-full overflow-hidden flex flex-col">
+        <div class="flex flex-wrap items-center justify-between gap-4">
+            <h1 class="text-4xl font-bold text-primary-500">Heures</h1>
+        </div>
+
+        <HoursToolbar
+            v-model:selected-date="selectedDate"
+            v-model:view-mode="viewMode"
+            v-model:selected-site-ids="selectedSiteIds"
+            v-model:employee-filter="employeeFilter"
+            :is-admin="isAdmin"
+            :sites="sites"
+            :absence-types="absenceTypes"
+            :formatted-selected-date="formattedSelectedDate"
+            :shortcut-button-class="shortcutButtonClass"
+            :week-shortcut-button-class="weekShortcutButtonClass"
+            :get-week-shortcut-label="getWeekShortcutLabel"
+            @set-yesterday="setYesterday"
+            @set-today="setToday"
+            @set-tomorrow="setTomorrow"
+            @set-previous-week="setPreviousWeek"
+            @set-this-week="setThisWeek"
+            @set-next-week="setNextWeek"
+            @shift-date="shiftDate"
+        />
+
+        <div v-if="isLoading" class="rounded-lg border border-neutral-200 bg-white p-6 text-md text-neutral-600">
+            Chargement...
+        </div>
+
+        <div v-else-if="employees.length === 0" class="rounded-lg border border-neutral-200 bg-white p-6 text-md text-neutral-600">
+            Aucun employé accessible.
+        </div>
+
+        <div v-else class="flex flex-1 min-h-0 flex-col gap-4">
+            <div class="flex-1 min-h-0 flex flex-col">
+                <HoursDayView
+                    v-if="viewMode === 'day'"
+                    v-model:rows="rows"
+                    :employees="visibleEmployees"
+                    :is-admin="isAdmin"
+                    :day-grid-cols="dayGridCols"
+                    :contract-label="contractLabel"
+                    :is-time-tracking="isTimeTracking"
+                :is-presence-tracking="isPresenceTracking"
+                :is-row-locked="isRowLocked"
+                :is-half-locked-by-absence="isHalfLockedByAbsence"
+                :is-evening-locked-by-absence="isEveningLockedByAbsence"
+                :is-validation-pending="isValidationPending"
+                :can-toggle-validation="canToggleValidation"
+                :is-bulk-validation-checked="isBulkValidationChecked"
+                :is-bulk-validation-indeterminate="isBulkValidationIndeterminate"
+                :on-toggle-validation="toggleValidation"
+                :on-toggle-validation-bulk="toggleValidationBulk"
+                :get-row-metrics="getRowMetrics"
+                :get-row-absence-label="getRowAbsenceLabel"
+                :get-presence-day-value="getPresenceDayValue"
+                :on-absence-click="openAbsenceDrawer"
+                :format-minutes="formatMinutes"
+                class="max-h-full"
+            />
+
+                <HoursWeekView
+                    v-else-if="isAdmin && viewMode === 'week'"
+                    :is-week-loading="isWeekLoading"
+                    :week-grid-cols="weekGridCols"
+                    :weekly-summary="filteredWeeklySummary"
+                    :week-day-headers="weekDayHeaders"
+                    :format-minutes="formatMinutes"
+                    class="max-h-full"
+                />
+            </div>
+
+            <div v-if="viewMode === 'day'" class="shrink-0 px-4 pt-4 flex justify-center">
+                <button
+                    type="button"
+                    class="rounded-lg bg-primary-500 px-6 py-2 text-md font-semibold text-white hover:bg-secondary-500"
+                    :class="saveButtonClass"
+                    :disabled="isSubmitting || visibleEmployees.length === 0"
+                    @click="handleSave"
+                >
+                    Enregistrer
+                </button>
+            </div>
+        </div>
+
+        <AbsenceFormDrawer
+            v-model="isAbsenceDrawerOpen"
+            :employees="employees"
+            :absence-types="absenceTypes"
+            :form="absenceForm"
+            :editing-absence="editingAbsence"
+            :is-submitting="isAbsenceSubmitting"
+            :lock-employee="true"
+            :lock-dates="true"
+            :show-comment="false"
+            @submit="submitAbsence"
+            @delete="deleteAbsenceFromDrawer"
+            @cancel="closeAbsenceDrawer"
+        />
+    </div>
+</template>
+
+<script setup lang="ts">
+const {
+  isAdmin,
+  viewMode,
+  selectedDate,
+  employeeFilter,
+  sites,
+  selectedSiteIds,
+  employees,
+  visibleEmployees,
+  rows,
+  absenceTypes,
+  absenceForm,
+  isAbsenceDrawerOpen,
+  isAbsenceSubmitting,
+  editingAbsence,
+  filteredWeeklySummary,
+  isLoading,
+  isWeekLoading,
+  isSubmitting,
+  dayGridCols,
+  weekGridCols,
+  saveButtonClass,
+  formattedSelectedDate,
+  weekDayHeaders,
+  shortcutButtonClass,
+  weekShortcutButtonClass,
+  getWeekShortcutLabel,
+  setToday,
+  setYesterday,
+  setTomorrow,
+  setThisWeek,
+  setPreviousWeek,
+  setNextWeek,
+  shiftDate,
+  contractLabel,
+  isTimeTracking,
+  isPresenceTracking,
+  isRowLocked,
+  isHalfLockedByAbsence,
+  isEveningLockedByAbsence,
+  isValidationPending,
+  canToggleValidation,
+  isBulkValidationChecked,
+  isBulkValidationIndeterminate,
+  toggleValidation,
+  toggleValidationBulk,
+  getRowMetrics,
+  getRowAbsenceLabel,
+  getPresenceDayValue,
+  openAbsenceDrawer,
+  submitAbsence,
+  deleteAbsenceFromDrawer,
+  closeAbsenceDrawer,
+  formatMinutes,
+  handleSave
+} = useHoursPage()
+</script>

frontend/pages/login.vue

@@ -18,7 +18,7 @@
                     v-model="username"
                     type="text"
                     autocomplete="username"
-                    class="mt-2 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-200"
+                    class="mt-2 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20"
                 />
             </div>
 
@@ -31,13 +31,13 @@
                     v-model="password"
                     type="password"
                     autocomplete="current-password"
-                    class="mt-2 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-200"
+                    class="mt-2 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20"
                 />
             </div>
 
             <button
                 type="submit"
-                class="w-full rounded-md bg-primary-500 px-4 py-2 text-base font-semibold text-white transition hover:bg-primary-600 disabled:cursor-not-allowed disabled:opacity-60"
+                class="w-full rounded-md bg-primary-500 px-4 py-2 text-base font-semibold text-white transition hover:bg-secondary-500 disabled:cursor-not-allowed disabled:opacity-60"
                 :disabled="isSubmitting"
             >
                 Se connecter

frontend/pages/sites.vue

@@ -150,7 +150,7 @@ const isFormValid = computed(() => isNameValid.value)
 const showNameError = computed(() => validationTouched.name && !isNameValid.value)
 
 const baseInputClass =
-  'mt-2 w-full rounded-md border px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-200'
+  'mt-2 w-full rounded-md border px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20'
 const nameFieldClass = computed(() => {
   if (showNameError.value) {
     return `${baseInputClass} border-red-500`

frontend/pages/users.vue

@@ -103,7 +103,7 @@
             <button
               type="button"
               class="rounded-full border px-3 py-1 text-sm font-semibold"
-              :class="form.accessMode === 'admin' ? 'border-primary-500 bg-primary-50 text-primary-700' : 'border-neutral-200 text-neutral-700'"
+              :class="form.accessMode === 'admin' ? 'border-primary-500 bg-tertiary-500 text-primary-500' : 'border-neutral-200 text-neutral-700'"
               @click="selectAccessMode('admin')"
             >
               Admin
@@ -111,7 +111,7 @@
             <button
               type="button"
               class="rounded-full border px-3 py-1 text-sm font-semibold"
-              :class="form.accessMode === 'self' ? 'border-primary-500 bg-primary-50 text-primary-700' : 'border-neutral-200 text-neutral-700'"
+              :class="form.accessMode === 'self' ? 'border-primary-500 bg-tertiary-500 text-primary-500' : 'border-neutral-200 text-neutral-700'"
               @click="selectAccessMode('self')"
             >
               Accès personnel
@@ -119,7 +119,7 @@
             <button
               type="button"
               class="rounded-full border px-3 py-1 text-sm font-semibold"
-              :class="form.accessMode === 'sites' ? 'border-primary-500 bg-primary-50 text-primary-700' : 'border-neutral-200 text-neutral-700'"
+              :class="form.accessMode === 'sites' ? 'border-primary-500 bg-tertiary-500 text-primary-500' : 'border-neutral-200 text-neutral-700'"
               @click="selectAccessMode('sites')"
             >
               Sites
@@ -288,7 +288,7 @@ const getSiteLabels = (user: User) => {
 }
 
 const baseInputClass =
-  'mt-2 w-full rounded-md border px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-primary-200'
+  'mt-2 w-full rounded-md border px-3 py-2 text-base text-neutral-900 focus:border-primary-500 focus:outline-none focus:ring-2 focus:ring-secondary-500/20'
 const usernameFieldClass = computed(() => {
   if (showUsernameError.value) {
     return `${baseInputClass} border-red-500`