feat: ajout malio UI + décompte des jours de présence forfait (#17)
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: #17 Co-authored-by: tristan <tristan@yuno.malio.fr> Co-committed-by: tristan <tristan@yuno.malio.fr>
This commit was merged in pull request #17.
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
<p>Date d'entrée : {{ employee.entryDate ? employee.entryDate.split('-').reverse().join('/') : '-' }}</p>
|
||||
</div>
|
||||
<div class="text-right">
|
||||
<p class="font-bold text-[22px]">{{ contractNatureLabel(employee.currentContractNature) }} {{ employeeContractWorkLabel }}</p>
|
||||
<p class="font-bold text-[22px]">{{ contractNatureLabel(employee.currentContractNature) }} {{ employeeContractWorkLabel }}{{ forfaitRemainingDaysLabel }}</p>
|
||||
<p class="text-[18px]">{{ employee.site?.name ?? '-' }}</p>
|
||||
</div>
|
||||
</div>
|
||||
@@ -257,6 +257,7 @@ const {
|
||||
showRttTab,
|
||||
contractHistory,
|
||||
employeeContractWorkLabel,
|
||||
forfaitRemainingDaysLabel,
|
||||
contractForm,
|
||||
createContractForm,
|
||||
isContractDrawerOpen,
|
||||
|
||||
@@ -4,49 +4,45 @@
|
||||
<div class="flex items-center justify-between">
|
||||
<h1 class="text-4xl font-bold text-primary-500">Employés</h1>
|
||||
<div class="flex items-center gap-3">
|
||||
<button
|
||||
type="button"
|
||||
class="flex items-center gap-2 rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
|
||||
@click="handleLeaveRecapPrint"
|
||||
>
|
||||
Export récap. congés
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="flex items-center gap-2 rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
|
||||
@click="isSalaryRecapOpen = true"
|
||||
>
|
||||
Export récap. salaire
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="flex items-center gap-2 rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
|
||||
@click="isYearlyHoursBulkOpen = true"
|
||||
>
|
||||
Export heures
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="flex items-center gap-2 rounded-lg bg-primary-500 px-4 py-2 text-md font-semibold text-white hover:bg-secondary-500"
|
||||
<MalioButton
|
||||
label="Export"
|
||||
variant="secondary"
|
||||
icon-name="mdi:download"
|
||||
icon-position="left"
|
||||
@click="openExportDrawer"
|
||||
/>
|
||||
<MalioButton
|
||||
label="Ajouter un employé"
|
||||
icon-name="mdi:plus"
|
||||
icon-position="left"
|
||||
@click="openCreate"
|
||||
>
|
||||
+ Ajouter un employé
|
||||
</button>
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex gap-3 py-7">
|
||||
<div class="flex items-center gap-3 py-7">
|
||||
<div class="w-80">
|
||||
<EmployeeNameFilterInput v-model="employeeFilter"/>
|
||||
<MalioInputText
|
||||
v-model="employeeFilter"
|
||||
label="Recherche d'un employé"
|
||||
icon-name="mdi:magnify"
|
||||
/>
|
||||
</div>
|
||||
<SiteFilterSelector v-if="sites.length > 0" v-model="selectedSiteIds" :sites="sites"/>
|
||||
<select
|
||||
<div v-if="sites.length > 0" class="relative z-50 w-80">
|
||||
<MalioSelectCheckbox
|
||||
v-model="selectedSiteIds"
|
||||
:options="siteOptions"
|
||||
groupClass="w-80"
|
||||
label="Sites"
|
||||
display-select-all
|
||||
/>
|
||||
</div>
|
||||
|
||||
<MalioSelect
|
||||
v-model="contractStatusFilter"
|
||||
class="rounded-md border border-primary-500 bg-white px-3 py-2 text-md font-semibold text-primary-500 cursor-pointer"
|
||||
>
|
||||
<option value="active">Avec contrat</option>
|
||||
<option value="inactive">Sans contrat</option>
|
||||
<option value="all">Tous</option>
|
||||
</select>
|
||||
label="Statut contrat"
|
||||
:options="contractStatusOptions"
|
||||
group-class="w-40"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -252,16 +248,58 @@
|
||||
</form>
|
||||
</AppDrawer>
|
||||
|
||||
<SalaryRecapDrawer
|
||||
v-model="isSalaryRecapOpen"
|
||||
@submit="handleSalaryRecapPrint"
|
||||
/>
|
||||
<MalioDrawer v-model="isExportDrawerOpen" title="Export">
|
||||
<div class="space-y-4">
|
||||
<MalioSelect
|
||||
:model-value="exportChoice === '' ? null : exportChoice"
|
||||
:options="exportTypeOptions"
|
||||
label="Type d'export"
|
||||
empty-option-label="Choisir un export"
|
||||
group-class="mt-2"
|
||||
min-width=""
|
||||
@update:model-value="onExportChoiceChange"
|
||||
/>
|
||||
|
||||
<BulkYearlyHoursDrawer
|
||||
v-model="isYearlyHoursBulkOpen"
|
||||
:is-loading="isYearlyHoursBulkLoading"
|
||||
@submit="handleBulkYearlyHoursPrint"
|
||||
/>
|
||||
<div v-if="exportChoice === 'salary-recap'">
|
||||
<label class="text-md font-semibold text-neutral-700" for="export-salary-month">
|
||||
Mois <span class="text-red-600">*</span>
|
||||
</label>
|
||||
<input
|
||||
id="export-salary-month"
|
||||
v-model="exportSalaryMonth"
|
||||
type="month"
|
||||
class="mt-2 w-full rounded-md border border-neutral-300 bg-white px-3 py-2 text-md text-neutral-900"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<template v-else-if="exportChoice === 'yearly-hours'">
|
||||
<MalioSelect
|
||||
:model-value="exportYear"
|
||||
:options="exportYearOptions"
|
||||
label="Année *"
|
||||
min-width=""
|
||||
@update:model-value="(v) => { if (v !== null) exportYear = Number(v) }"
|
||||
/>
|
||||
<MalioSelect
|
||||
:model-value="exportMonth === '' ? null : exportMonth"
|
||||
:options="exportMonthOptions"
|
||||
label="Mois *"
|
||||
empty-option-label="Choisir un mois"
|
||||
min-width=""
|
||||
@update:model-value="(v) => { exportMonth = v === null ? '' : Number(v) }"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<div class="flex justify-center pt-2">
|
||||
<MalioButton
|
||||
label="Valider"
|
||||
button-class="w-[200px]"
|
||||
:disabled="!isExportValid"
|
||||
@click="handleExportValidate"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</MalioDrawer>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -275,9 +313,6 @@ import {listContracts} from '~/services/contracts'
|
||||
import {createEmployee, deleteEmployee, listEmployees, updateEmployee} from '~/services/employees'
|
||||
import {listSites} from '~/services/sites'
|
||||
import {listInterimAgencies, type InterimAgency} from '~/services/interim-agencies'
|
||||
import SiteFilterSelector from '~/components/SiteFilterSelector.vue'
|
||||
import SalaryRecapDrawer from '~/components/SalaryRecapDrawer.vue'
|
||||
import BulkYearlyHoursDrawer from '~/components/BulkYearlyHoursDrawer.vue'
|
||||
import {contractNatureLabel, isContractNature, requiresContractEndDate, showsContractEndDate} from '~/utils/contract'
|
||||
import {usePdfPrinter} from '~/composables/usePdfPrinter'
|
||||
|
||||
@@ -288,9 +323,50 @@ useHead({
|
||||
const isDrawerOpen = ref(false)
|
||||
const isSubmitting = ref(false)
|
||||
const isLoading = ref(false)
|
||||
const isSalaryRecapOpen = ref(false)
|
||||
const isYearlyHoursBulkOpen = ref(false)
|
||||
const isYearlyHoursBulkLoading = ref(false)
|
||||
const isExportDrawerOpen = ref(false)
|
||||
const exportChoice = ref<'leave-recap' | 'salary-recap' | 'yearly-hours' | ''>('')
|
||||
const exportYear = ref<number>(new Date().getFullYear())
|
||||
const exportMonth = ref<number | ''>(new Date().getMonth() + 1)
|
||||
const exportSalaryMonth = ref<string>(`${new Date().getFullYear()}-${String(new Date().getMonth() + 1).padStart(2, '0')}`)
|
||||
|
||||
const exportTypeOptions = [
|
||||
{ label: 'Récap. congés', value: 'leave-recap' },
|
||||
{ label: 'Récap. salaire', value: 'salary-recap' },
|
||||
{ label: 'Heures annuelles', value: 'yearly-hours' }
|
||||
]
|
||||
const exportYearOptions = computed(() => {
|
||||
const current = new Date().getFullYear()
|
||||
return Array.from({ length: 6 }, (_, i) => ({ label: String(current - i), value: current - i }))
|
||||
})
|
||||
const exportMonthOptions = [
|
||||
{ label: 'Janvier', value: 1 },
|
||||
{ label: 'Février', value: 2 },
|
||||
{ label: 'Mars', value: 3 },
|
||||
{ label: 'Avril', value: 4 },
|
||||
{ label: 'Mai', value: 5 },
|
||||
{ label: 'Juin', value: 6 },
|
||||
{ label: 'Juillet', value: 7 },
|
||||
{ label: 'Août', value: 8 },
|
||||
{ label: 'Septembre', value: 9 },
|
||||
{ label: 'Octobre', value: 10 },
|
||||
{ label: 'Novembre', value: 11 },
|
||||
{ label: 'Décembre', value: 12 }
|
||||
]
|
||||
|
||||
const isExportValid = computed(() => {
|
||||
if (!exportChoice.value) return false
|
||||
if (exportChoice.value === 'salary-recap') {
|
||||
return exportSalaryMonth.value.trim() !== ''
|
||||
}
|
||||
if (exportChoice.value === 'yearly-hours') {
|
||||
return exportYear.value > 0 && exportMonth.value !== ''
|
||||
}
|
||||
return true
|
||||
})
|
||||
|
||||
const onExportChoiceChange = (value: string | number | null) => {
|
||||
exportChoice.value = (value === null ? '' : String(value)) as 'leave-recap' | 'salary-recap' | 'yearly-hours' | ''
|
||||
}
|
||||
const { printPdf } = usePdfPrinter()
|
||||
const sitesInitialized = ref(false)
|
||||
const editingEmployee = ref<Employee | null>(null)
|
||||
@@ -304,7 +380,13 @@ const contracts = ref<Contract[]>([])
|
||||
const interimAgencies = ref<InterimAgency[]>([])
|
||||
const employeeFilter = ref('')
|
||||
const contractStatusFilter = ref<'active' | 'inactive' | 'all'>('active')
|
||||
const contractStatusOptions = [
|
||||
{ label: 'Avec contrat', value: 'active' },
|
||||
{ label: 'Sans contrat', value: 'inactive' },
|
||||
{ label: 'Tous', value: 'all' }
|
||||
]
|
||||
const selectedSiteIds = ref<number[]>([])
|
||||
const siteOptions = computed(() => sites.value.map((site) => ({ label: site.name, value: site.id })))
|
||||
|
||||
const filteredEmployees = computed<Employee[]>(() => {
|
||||
if (selectedSiteIds.value.length === 0) return []
|
||||
@@ -617,26 +699,29 @@ const openCreate = () => {
|
||||
isDrawerOpen.value = true
|
||||
}
|
||||
|
||||
const handleLeaveRecapPrint = async () => {
|
||||
await printPdf('/leave-recap/print')
|
||||
const openExportDrawer = () => {
|
||||
exportChoice.value = ''
|
||||
const now = new Date()
|
||||
exportYear.value = now.getFullYear()
|
||||
exportMonth.value = now.getMonth() + 1
|
||||
exportSalaryMonth.value = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}`
|
||||
isExportDrawerOpen.value = true
|
||||
}
|
||||
|
||||
const handleSalaryRecapPrint = async (month: string) => {
|
||||
await printPdf(`/salary-recap/print?month=${month}`)
|
||||
isSalaryRecapOpen.value = false
|
||||
}
|
||||
|
||||
const handleBulkYearlyHoursPrint = async (payload: { year: number; month: number | null }) => {
|
||||
isYearlyHoursBulkLoading.value = true
|
||||
try {
|
||||
const monthParam = null !== payload.month ? `&month=${payload.month}` : ''
|
||||
await printPdf(`/yearly-hours/print-all?year=${payload.year}${monthParam}`)
|
||||
isYearlyHoursBulkOpen.value = false
|
||||
} finally {
|
||||
isYearlyHoursBulkLoading.value = false
|
||||
const handleExportValidate = async () => {
|
||||
if (!isExportValid.value) return
|
||||
const choice = exportChoice.value
|
||||
isExportDrawerOpen.value = false
|
||||
if (choice === 'leave-recap') {
|
||||
await printPdf('/leave-recap/print')
|
||||
} else if (choice === 'salary-recap') {
|
||||
await printPdf(`/salary-recap/print?month=${exportSalaryMonth.value}`)
|
||||
} else if (choice === 'yearly-hours') {
|
||||
await printPdf(`/yearly-hours/print-all?year=${exportYear.value}&month=${exportMonth.value}`)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const confirmDelete = async (employee: Employee) => {
|
||||
const ok = window.confirm(`Supprimer ${employee.firstName} ${employee.lastName} ?`)
|
||||
if (!ok) return
|
||||
|
||||
Reference in New Issue
Block a user