[#SIRH-12] Export des heures d'un employé sur une année (#7)
Some checks failed
Auto Tag Develop / tag (push) Has been cancelled
Some checks failed
Auto Tag Develop / tag (push) Has been cancelled
| Numéro du ticket | Titre du ticket | |------------------|-----------------| | | | ## Description de la PR ## Modification du .env ## Check list - [ ] Pas de régression - [ ] TU/TI/TF rédigée - [ ] TU/TI/TF OK - [ ] CHANGELOG modifié Reviewed-on: #7 Co-authored-by: tristan <tristan@yuno.malio.fr> Co-committed-by: tristan <tristan@yuno.malio.fr>
This commit was merged in pull request #7.
This commit is contained in:
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
|
||||
})
|
||||
|
||||
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 period = currentActiveContractPeriod.value
|
||||
return period?.periodId ?? null
|
||||
@@ -78,13 +89,15 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
|
||||
|
||||
const canCloseCurrentContract = computed(() => {
|
||||
const active = currentActiveContractPeriod.value
|
||||
if (!active) return false
|
||||
if (!active.endDate) return true
|
||||
return active.endDate > getTodayYmd()
|
||||
if (active) {
|
||||
if (!active.endDate) return true
|
||||
return active.endDate > getTodayYmd()
|
||||
}
|
||||
return !!lastEndedContractPeriod.value
|
||||
})
|
||||
|
||||
const canCreateContract = computed(() => {
|
||||
const active = currentActiveContractPeriod.value
|
||||
const active = editableContractPeriod.value
|
||||
if (!active) return true
|
||||
return !!active.endDate
|
||||
})
|
||||
@@ -135,15 +148,15 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
|
||||
|
||||
const hydrateContractFormFromCurrent = () => {
|
||||
const current = employee.value
|
||||
const active = currentActiveContractPeriod.value
|
||||
if (!current || !active) return
|
||||
const period = editableContractPeriod.value
|
||||
if (!current || !period) return
|
||||
|
||||
contractForm.contractId = active.contractId ?? current.contract?.id ?? ''
|
||||
contractForm.contractName = active.contractName ?? current.contract?.name ?? ''
|
||||
contractForm.weeklyHours = active.weeklyHours ?? current.contract?.weeklyHours ?? null
|
||||
contractForm.contractNature = active.contractNature
|
||||
contractForm.startDate = active.startDate
|
||||
contractForm.endDate = getTodayYmd()
|
||||
contractForm.contractId = period.contractId ?? current.contract?.id ?? ''
|
||||
contractForm.contractName = period.contractName ?? current.contract?.name ?? ''
|
||||
contractForm.weeklyHours = period.weeklyHours ?? current.contract?.weeklyHours ?? null
|
||||
contractForm.contractNature = period.contractNature
|
||||
contractForm.startDate = period.startDate
|
||||
contractForm.endDate = period.endDate ?? getTodayYmd()
|
||||
contractForm.paidLeaveSettled = false
|
||||
contractForm.comment = ''
|
||||
}
|
||||
@@ -173,8 +186,8 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
|
||||
createContractForm.contractNature = 'CDI'
|
||||
createContractForm.endDate = ''
|
||||
createContractForm.isDriver = false
|
||||
createContractForm.startDate = currentActiveContractPeriod.value?.endDate
|
||||
? (shiftYmd(currentActiveContractPeriod.value.endDate, 1) ?? currentActiveContractPeriod.value.endDate)
|
||||
createContractForm.startDate = editableContractPeriod.value?.endDate
|
||||
? (shiftYmd(editableContractPeriod.value.endDate, 1) ?? editableContractPeriod.value.endDate)
|
||||
: getTodayYmd()
|
||||
resetCreateValidation()
|
||||
isCreateContractDrawerOpen.value = true
|
||||
@@ -185,15 +198,16 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
|
||||
}
|
||||
|
||||
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
|
||||
if (!isContractEndDateValid.value) return
|
||||
|
||||
if (contractForm.endDate < currentActiveContractPeriod.value.startDate) {
|
||||
if (contractForm.endDate < period.startDate) {
|
||||
toast.error({
|
||||
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
|
||||
}
|
||||
@@ -226,8 +240,8 @@ export const useEmployeeContract = (employee: Ref<Employee | null>, reloadEmploy
|
||||
createValidationTouched.endDate = true
|
||||
if (!isCreateContractFormValid.value) return
|
||||
|
||||
if (currentActiveContractPeriod.value?.endDate) {
|
||||
const minStartDate = shiftYmd(currentActiveContractPeriod.value.endDate, 1) ?? currentActiveContractPeriod.value.endDate
|
||||
if (editableContractPeriod.value?.endDate) {
|
||||
const minStartDate = shiftYmd(editableContractPeriod.value.endDate, 1) ?? editableContractPeriod.value.endDate
|
||||
if (createContractForm.startDate < minStartDate) {
|
||||
toast.error({
|
||||
title: 'Erreur',
|
||||
|
||||
@@ -13,7 +13,16 @@
|
||||
<div v-else class="flex min-h-0 flex-1 flex-col">
|
||||
<div class="flex items-center justify-between">
|
||||
<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>
|
||||
</div>
|
||||
<div class="text-right">
|
||||
@@ -166,10 +175,24 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<EmployeeYearlyHoursDrawer
|
||||
v-if="employee"
|
||||
v-model="isYearlyHoursDrawerOpen"
|
||||
:employee-id="employee.id"
|
||||
@submit="handleYearlyHoursPrint"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<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 {
|
||||
employee,
|
||||
isLoading,
|
||||
@@ -234,6 +257,12 @@ const {
|
||||
submitDeleteBonus
|
||||
} = 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(() => ({
|
||||
title: employee.value
|
||||
? `${employee.value.firstName} ${employee.value.lastName}`
|
||||
|
||||
Reference in New Issue
Block a user