Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 96e25c2390 | |||
| 02ac151ac0 | |||
| 1991c43f8c | |||
| e9ca00aeb2 | |||
| b13ba41674 | |||
| ac615875f3 | |||
| f8322f8b1e | |||
| cd474d5089 | |||
| 2feba57cb6 | |||
| f74f0e1ad3 | |||
| 6db6d13e76 | |||
| 26fae393cf |
+1
-1
@@ -1,2 +1,2 @@
|
||||
parameters:
|
||||
app.version: '0.4.7'
|
||||
app.version: '0.4.13'
|
||||
|
||||
@@ -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>
|
||||
</template>
|
||||
<form v-if="user" class="grid grid-cols-1 gap-4 sm:grid-cols-2" @submit.prevent="save">
|
||||
<!-- Dates en pleine largeur (1 par ligne) : le popover du calendrier
|
||||
a besoin de toute la largeur pour s'afficher correctement. -->
|
||||
<div class="sm:col-span-2">
|
||||
<MalioDate
|
||||
v-model="form.hireDate"
|
||||
:label="$t('absences.admin.employees.fields.hireDate')"
|
||||
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
|
||||
v-model="form.contractType"
|
||||
:label="$t('absences.admin.employees.fields.contractType')"
|
||||
|
||||
@@ -11,6 +11,16 @@
|
||||
:error="touched.username && !form.username.trim() ? 'Le nom est requis' : ''"
|
||||
@blur="touched.username = true"
|
||||
/>
|
||||
<MalioInputText
|
||||
v-model="form.firstName"
|
||||
label="Prénom"
|
||||
input-class="w-full"
|
||||
/>
|
||||
<MalioInputText
|
||||
v-model="form.lastName"
|
||||
label="Nom"
|
||||
input-class="w-full"
|
||||
/>
|
||||
<MalioInputPassword
|
||||
v-model="form.password"
|
||||
label="Mot de passe"
|
||||
@@ -84,6 +94,8 @@ const isSubmitting = ref(false)
|
||||
|
||||
const form = reactive({
|
||||
username: '',
|
||||
firstName: '',
|
||||
lastName: '',
|
||||
password: '',
|
||||
roles: [] as string[],
|
||||
isEmployee: false,
|
||||
@@ -98,11 +110,15 @@ watch(() => props.modelValue, (open) => {
|
||||
if (open) {
|
||||
if (props.item) {
|
||||
form.username = props.item.username ?? ''
|
||||
form.firstName = props.item.firstName ?? ''
|
||||
form.lastName = props.item.lastName ?? ''
|
||||
form.password = ''
|
||||
form.roles = [...props.item.roles]
|
||||
form.isEmployee = props.item.isEmployee ?? false
|
||||
} else {
|
||||
form.username = ''
|
||||
form.firstName = ''
|
||||
form.lastName = ''
|
||||
form.password = ''
|
||||
form.roles = ['ROLE_USER']
|
||||
form.isEmployee = false
|
||||
@@ -124,6 +140,8 @@ async function handleSubmit() {
|
||||
try {
|
||||
const payload: UserWrite = {
|
||||
username: form.username.trim(),
|
||||
firstName: form.firstName.trim() || null,
|
||||
lastName: form.lastName.trim() || null,
|
||||
roles: form.roles,
|
||||
isEmployee: form.isEmployee,
|
||||
}
|
||||
|
||||
@@ -119,11 +119,14 @@
|
||||
</div>
|
||||
|
||||
<!-- Section : Absences -->
|
||||
<template v-if="isAbsenceSectionVisible">
|
||||
<p v-if="!sidebarIsCollapsed" class="px-4 pt-5 pb-1 text-xs font-semibold uppercase tracking-wider text-neutral-400">
|
||||
Absences
|
||||
</p>
|
||||
<div v-else class="mx-2 my-3 border-t border-secondary-500" />
|
||||
</template>
|
||||
<SidebarLink
|
||||
v-if="isEmployee"
|
||||
to="/absences"
|
||||
icon="mdi:umbrella-beach-outline"
|
||||
label="Mes absences"
|
||||
@@ -211,6 +214,8 @@ const {version} = useAppVersion()
|
||||
const route = useRoute()
|
||||
|
||||
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 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',
|
||||
devtools: {enabled: false},
|
||||
ssr: false,
|
||||
css: ['~/assets/css/dark.css'],
|
||||
css: ['~/assets/css/app.css', '~/assets/css/dark.css'],
|
||||
app: {
|
||||
baseURL: process.env.NODE_ENV === 'production'
|
||||
? (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 }
|
||||
|
||||
definePageMeta({ middleware: ['employee'] })
|
||||
|
||||
const { t } = useI18n()
|
||||
const service = useAbsenceService()
|
||||
const { statusLabel, statusVariant, statusIcon, formatRange, formatDays, formatDate } = useAbsenceHelpers()
|
||||
|
||||
@@ -4,6 +4,8 @@ export type UserData = {
|
||||
id: number
|
||||
'@id'?: string
|
||||
username: string
|
||||
firstName?: string | null
|
||||
lastName?: string | null
|
||||
roles: string[]
|
||||
avatarUrl?: string | null
|
||||
apiToken?: string | null
|
||||
@@ -20,6 +22,8 @@ export type UserData = {
|
||||
|
||||
export type UserWrite = {
|
||||
username: string
|
||||
firstName?: string | null
|
||||
lastName?: string | null
|
||||
plainPassword?: string
|
||||
roles: string[]
|
||||
// HR / absence management
|
||||
|
||||
@@ -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')");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace DoctrineMigrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
/**
|
||||
* Add optional first name / last name to users.
|
||||
*/
|
||||
final class Version20260526120000 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Add user.first_name and user.last_name (nullable)';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE "user" ADD first_name VARCHAR(100) DEFAULT NULL');
|
||||
$this->addSql('ALTER TABLE "user" ADD last_name VARCHAR(100) DEFAULT NULL');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE "user" DROP COLUMN IF EXISTS first_name');
|
||||
$this->addSql('ALTER TABLE "user" DROP COLUMN IF EXISTS last_name');
|
||||
}
|
||||
}
|
||||
@@ -43,6 +43,8 @@ class AppFixtures extends Fixture
|
||||
// Users
|
||||
$admin = new User();
|
||||
$admin->setUsername('admin');
|
||||
$admin->setFirstName('Alex');
|
||||
$admin->setLastName('Martin');
|
||||
$admin->setRoles(['ROLE_ADMIN']);
|
||||
$admin->setPassword($this->passwordHasher->hashPassword($admin, 'admin'));
|
||||
$admin->setApiToken('dev-mcp-token-for-testing-only-do-not-use-in-production');
|
||||
@@ -50,18 +52,24 @@ class AppFixtures extends Fixture
|
||||
|
||||
$userAlice = new User();
|
||||
$userAlice->setUsername('alice');
|
||||
$userAlice->setFirstName('Alice');
|
||||
$userAlice->setLastName('Dupont');
|
||||
$userAlice->setRoles(['ROLE_USER']);
|
||||
$userAlice->setPassword($this->passwordHasher->hashPassword($userAlice, 'alice'));
|
||||
$manager->persist($userAlice);
|
||||
|
||||
$userBob = new User();
|
||||
$userBob->setUsername('bob');
|
||||
$userBob->setFirstName('Bob');
|
||||
$userBob->setLastName('Leroy');
|
||||
$userBob->setRoles(['ROLE_USER']);
|
||||
$userBob->setPassword($this->passwordHasher->hashPassword($userBob, 'bob'));
|
||||
$manager->persist($userBob);
|
||||
|
||||
$userCharlie = new User();
|
||||
$userCharlie->setUsername('charlie');
|
||||
$userCharlie->setFirstName('Charlie');
|
||||
$userCharlie->setLastName('Moreau');
|
||||
$userCharlie->setRoles(['ROLE_USER']);
|
||||
$userCharlie->setPassword($this->passwordHasher->hashPassword($userCharlie, 'charlie'));
|
||||
$manager->persist($userCharlie);
|
||||
|
||||
@@ -55,6 +55,14 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
|
||||
#[Groups(['me:read', 'task:read', 'user:list', 'user:write', 'time_entry:read', 'absence_request:read', 'absence_balance:read'])]
|
||||
private ?string $username = null;
|
||||
|
||||
#[ORM\Column(length: 100, nullable: true)]
|
||||
#[Groups(['me:read', 'user:list', 'user:write'])]
|
||||
private ?string $firstName = null;
|
||||
|
||||
#[ORM\Column(length: 100, nullable: true)]
|
||||
#[Groups(['me:read', 'user:list', 'user:write'])]
|
||||
private ?string $lastName = null;
|
||||
|
||||
/** @var list<string> */
|
||||
#[ORM\Column]
|
||||
#[ApiProperty(security: "is_granted('ROLE_ADMIN') or object == user")]
|
||||
@@ -147,6 +155,30 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getFirstName(): ?string
|
||||
{
|
||||
return $this->firstName;
|
||||
}
|
||||
|
||||
public function setFirstName(?string $firstName): static
|
||||
{
|
||||
$this->firstName = $firstName;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getLastName(): ?string
|
||||
{
|
||||
return $this->lastName;
|
||||
}
|
||||
|
||||
public function setLastName(?string $lastName): static
|
||||
{
|
||||
$this->lastName = $lastName;
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getUserIdentifier(): string
|
||||
{
|
||||
return (string) $this->username;
|
||||
|
||||
Reference in New Issue
Block a user