Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1991c43f8c | |||
| e9ca00aeb2 | |||
| b13ba41674 | |||
| ac615875f3 | |||
| f8322f8b1e | |||
| cd474d5089 | |||
| 2feba57cb6 | |||
| f74f0e1ad3 | |||
| 6db6d13e76 | |||
| 26fae393cf |
+1
-1
@@ -1,2 +1,2 @@
|
|||||||
parameters:
|
parameters:
|
||||||
app.version: '0.4.7'
|
app.version: '0.4.12'
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
/*
|
||||||
|
* App-level layout fixes (not theme-related).
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* MalioDrawer : donne au corps scrollable un peu d'espace vertical.
|
||||||
|
*
|
||||||
|
* Le body du drawer est `overflow-y-auto` sans padding vertical. Or le label
|
||||||
|
* flottant d'un champ Malio remonte (-1.25rem) au focus/remplissage : pour le
|
||||||
|
* PREMIER champ, collé en haut du body, ce label dépasse le bord supérieur et
|
||||||
|
* se fait rogner (il « grossit et passe sous l'entête »). Le dernier champ
|
||||||
|
* (popover de date, hint) souffre du même rognage en bas.
|
||||||
|
*
|
||||||
|
* On ajoute donc un padding vertical au body de TOUS les drawers via l'API de
|
||||||
|
* test stable de la lib (@malio/layer-ui), sans la modifier ni toucher chaque
|
||||||
|
* drawer un par un. Le sélecteur reste limité au panneau du drawer.
|
||||||
|
*/
|
||||||
|
[data-test="panel"] > [data-test="body"] {
|
||||||
|
padding-top: 1rem;
|
||||||
|
padding-bottom: 1rem;
|
||||||
|
}
|
||||||
@@ -7,16 +7,22 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<form v-if="user" class="grid grid-cols-1 gap-4 sm:grid-cols-2" @submit.prevent="save">
|
<form v-if="user" class="grid grid-cols-1 gap-4 sm:grid-cols-2" @submit.prevent="save">
|
||||||
<MalioDate
|
<!-- Dates en pleine largeur (1 par ligne) : le popover du calendrier
|
||||||
v-model="form.hireDate"
|
a besoin de toute la largeur pour s'afficher correctement. -->
|
||||||
:label="$t('absences.admin.employees.fields.hireDate')"
|
<div class="sm:col-span-2">
|
||||||
group-class="w-full"
|
<MalioDate
|
||||||
/>
|
v-model="form.hireDate"
|
||||||
<MalioDate
|
:label="$t('absences.admin.employees.fields.hireDate')"
|
||||||
v-model="form.endDate"
|
group-class="w-full"
|
||||||
:label="$t('absences.admin.employees.fields.endDate')"
|
/>
|
||||||
group-class="w-full"
|
</div>
|
||||||
/>
|
<div class="sm:col-span-2">
|
||||||
|
<MalioDate
|
||||||
|
v-model="form.endDate"
|
||||||
|
:label="$t('absences.admin.employees.fields.endDate')"
|
||||||
|
group-class="w-full"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
<MalioSelect
|
<MalioSelect
|
||||||
v-model="form.contractType"
|
v-model="form.contractType"
|
||||||
:label="$t('absences.admin.employees.fields.contractType')"
|
:label="$t('absences.admin.employees.fields.contractType')"
|
||||||
|
|||||||
@@ -119,11 +119,14 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Section : Absences -->
|
<!-- Section : Absences -->
|
||||||
<p v-if="!sidebarIsCollapsed" class="px-4 pt-5 pb-1 text-xs font-semibold uppercase tracking-wider text-neutral-400">
|
<template v-if="isAbsenceSectionVisible">
|
||||||
Absences
|
<p v-if="!sidebarIsCollapsed" class="px-4 pt-5 pb-1 text-xs font-semibold uppercase tracking-wider text-neutral-400">
|
||||||
</p>
|
Absences
|
||||||
<div v-else class="mx-2 my-3 border-t border-secondary-500" />
|
</p>
|
||||||
|
<div v-else class="mx-2 my-3 border-t border-secondary-500" />
|
||||||
|
</template>
|
||||||
<SidebarLink
|
<SidebarLink
|
||||||
|
v-if="isEmployee"
|
||||||
to="/absences"
|
to="/absences"
|
||||||
icon="mdi:umbrella-beach-outline"
|
icon="mdi:umbrella-beach-outline"
|
||||||
label="Mes absences"
|
label="Mes absences"
|
||||||
@@ -211,6 +214,8 @@ const {version} = useAppVersion()
|
|||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
|
|
||||||
const isAdmin = computed(() => (auth.user?.roles ?? []).includes('ROLE_ADMIN'))
|
const isAdmin = computed(() => (auth.user?.roles ?? []).includes('ROLE_ADMIN'))
|
||||||
|
const isEmployee = computed(() => Boolean(auth.user?.isEmployee))
|
||||||
|
const isAbsenceSectionVisible = computed(() => isEmployee.value || isAdmin.value)
|
||||||
|
|
||||||
const isMailVisible = computed(() => {
|
const isMailVisible = computed(() => {
|
||||||
const roles: string[] = auth.user?.roles ?? []
|
const roles: string[] = auth.user?.roles ?? []
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
export default defineNuxtRouteMiddleware(() => {
|
||||||
|
const auth = useAuthStore()
|
||||||
|
|
||||||
|
// "Mes absences" is reserved for users flagged as employees (subject to the
|
||||||
|
// absence management). Non-employees are redirected to the home page.
|
||||||
|
if (!auth.isAuthenticated || !auth.user?.isEmployee) {
|
||||||
|
return navigateTo('/')
|
||||||
|
}
|
||||||
|
})
|
||||||
@@ -2,7 +2,7 @@ export default defineNuxtConfig({
|
|||||||
compatibilityDate: '2025-07-15',
|
compatibilityDate: '2025-07-15',
|
||||||
devtools: {enabled: false},
|
devtools: {enabled: false},
|
||||||
ssr: false,
|
ssr: false,
|
||||||
css: ['~/assets/css/dark.css'],
|
css: ['~/assets/css/app.css', '~/assets/css/dark.css'],
|
||||||
app: {
|
app: {
|
||||||
baseURL: process.env.NODE_ENV === 'production'
|
baseURL: process.env.NODE_ENV === 'production'
|
||||||
? (process.env.NUXT_PUBLIC_APP_BASE || '/')
|
? (process.env.NUXT_PUBLIC_APP_BASE || '/')
|
||||||
|
|||||||
@@ -75,6 +75,8 @@ import { useAbsenceHelpers } from '~/composables/useAbsenceHelpers'
|
|||||||
|
|
||||||
type Row = AbsenceRequest & { typeLabelText: string; periodText: string; daysText: string; createdAtText: string }
|
type Row = AbsenceRequest & { typeLabelText: string; periodText: string; daysText: string; createdAtText: string }
|
||||||
|
|
||||||
|
definePageMeta({ middleware: ['employee'] })
|
||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
const service = useAbsenceService()
|
const service = useAbsenceService()
|
||||||
const { statusLabel, statusVariant, statusIcon, formatRange, formatDays, formatDate } = useAbsenceHelpers()
|
const { statusLabel, statusVariant, statusIcon, formatRange, formatDays, formatDate } = useAbsenceHelpers()
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace DoctrineMigrations;
|
||||||
|
|
||||||
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
|
use Doctrine\Migrations\AbstractMigration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Seed the default absence policies (Syntec / IDCC 1486 legal baseline).
|
||||||
|
*
|
||||||
|
* These rows were previously created only by AppFixtures, so they existed in
|
||||||
|
* dev but never in production: the "Politiques d'absence" admin screen was
|
||||||
|
* empty in prod. This data migration seeds the same 6 policies idempotently
|
||||||
|
* (ON CONFLICT on the unique `type` index), so prod gets populated and dev,
|
||||||
|
* where fixtures already created them, is left untouched.
|
||||||
|
*
|
||||||
|
* Values mirror AppFixtures and the legal compliance design
|
||||||
|
* (docs/superpowers/specs/2026-05-22-absence-legal-compliance-fixes-design.md):
|
||||||
|
* - CP: 25 jours ouvrés/an, préavis 30 j, pas de justificatif.
|
||||||
|
* - Mariage/PACS: 4 j/événement ; Naissance: 3 j/événement.
|
||||||
|
* - Décès / Congé parental / Maladie: pas de forfait codé en dur
|
||||||
|
* (montant selon lien de parenté ou suspension), justificatif requis.
|
||||||
|
*/
|
||||||
|
final class Version20260526100000 extends AbstractMigration
|
||||||
|
{
|
||||||
|
public function getDescription(): string
|
||||||
|
{
|
||||||
|
return 'Seed default absence policies (Syntec IDCC 1486) idempotently for prod';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function up(Schema $schema): void
|
||||||
|
{
|
||||||
|
// [type, days_per_year, days_per_event, justification_required, notice_days, count_working_days_only]
|
||||||
|
$policies = [
|
||||||
|
['cp', '25', null, 'false', 30, 'true'],
|
||||||
|
['mariage_pacs', null, '4', 'true', 0, 'true'],
|
||||||
|
['naissance', null, '3', 'true', 0, 'true'],
|
||||||
|
['conge_parental', null, null, 'true', 30, 'true'],
|
||||||
|
['deces', null, null, 'true', 0, 'true'],
|
||||||
|
['maladie', null, null, 'true', 0, 'true'],
|
||||||
|
];
|
||||||
|
|
||||||
|
foreach ($policies as [$type, $daysPerYear, $daysPerEvent, $justif, $notice, $workingOnly]) {
|
||||||
|
$daysPerYear = null === $daysPerYear ? 'NULL' : $daysPerYear;
|
||||||
|
$daysPerEvent = null === $daysPerEvent ? 'NULL' : $daysPerEvent;
|
||||||
|
|
||||||
|
$this->addSql(<<<SQL
|
||||||
|
INSERT INTO absence_policy
|
||||||
|
(type, days_per_year, days_per_event, justification_required, notice_days, count_working_days_only, active)
|
||||||
|
VALUES
|
||||||
|
('{$type}', {$daysPerYear}, {$daysPerEvent}, {$justif}, {$notice}, {$workingOnly}, true)
|
||||||
|
ON CONFLICT (type) DO NOTHING
|
||||||
|
SQL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(Schema $schema): void
|
||||||
|
{
|
||||||
|
$this->addSql("DELETE FROM absence_policy WHERE type IN ('cp', 'mariage_pacs', 'naissance', 'conge_parental', 'deces', 'maladie')");
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user