Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7e32e4c013 | |||
| 8fb5b80d8d | |||
| 96e25c2390 | |||
| 02ac151ac0 |
+1
-1
@@ -1,2 +1,2 @@
|
|||||||
parameters:
|
parameters:
|
||||||
app.version: '0.4.12'
|
app.version: '0.4.14'
|
||||||
|
|||||||
@@ -102,7 +102,8 @@ const others = computed<AbsenceBalance[]>(() =>
|
|||||||
)
|
)
|
||||||
|
|
||||||
function formatNumber(n: number): string {
|
function formatNumber(n: number): string {
|
||||||
return (Math.round(n * 2) / 2).toString()
|
// Valeur réelle avec décimales (ex. 8,75) : pas d'arrondi qui gonflerait le solde.
|
||||||
|
return new Intl.NumberFormat('fr-FR', { maximumFractionDigits: 2 }).format(n)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Total entitlement = acquired (N-1) + in-progress (N); falls back to the
|
// Total entitlement = acquired (N-1) + in-progress (N); falls back to the
|
||||||
|
|||||||
@@ -11,6 +11,16 @@
|
|||||||
:error="touched.username && !form.username.trim() ? 'Le nom est requis' : ''"
|
:error="touched.username && !form.username.trim() ? 'Le nom est requis' : ''"
|
||||||
@blur="touched.username = true"
|
@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
|
<MalioInputPassword
|
||||||
v-model="form.password"
|
v-model="form.password"
|
||||||
label="Mot de passe"
|
label="Mot de passe"
|
||||||
@@ -84,6 +94,8 @@ const isSubmitting = ref(false)
|
|||||||
|
|
||||||
const form = reactive({
|
const form = reactive({
|
||||||
username: '',
|
username: '',
|
||||||
|
firstName: '',
|
||||||
|
lastName: '',
|
||||||
password: '',
|
password: '',
|
||||||
roles: [] as string[],
|
roles: [] as string[],
|
||||||
isEmployee: false,
|
isEmployee: false,
|
||||||
@@ -98,11 +110,15 @@ watch(() => props.modelValue, (open) => {
|
|||||||
if (open) {
|
if (open) {
|
||||||
if (props.item) {
|
if (props.item) {
|
||||||
form.username = props.item.username ?? ''
|
form.username = props.item.username ?? ''
|
||||||
|
form.firstName = props.item.firstName ?? ''
|
||||||
|
form.lastName = props.item.lastName ?? ''
|
||||||
form.password = ''
|
form.password = ''
|
||||||
form.roles = [...props.item.roles]
|
form.roles = [...props.item.roles]
|
||||||
form.isEmployee = props.item.isEmployee ?? false
|
form.isEmployee = props.item.isEmployee ?? false
|
||||||
} else {
|
} else {
|
||||||
form.username = ''
|
form.username = ''
|
||||||
|
form.firstName = ''
|
||||||
|
form.lastName = ''
|
||||||
form.password = ''
|
form.password = ''
|
||||||
form.roles = ['ROLE_USER']
|
form.roles = ['ROLE_USER']
|
||||||
form.isEmployee = false
|
form.isEmployee = false
|
||||||
@@ -124,6 +140,8 @@ async function handleSubmit() {
|
|||||||
try {
|
try {
|
||||||
const payload: UserWrite = {
|
const payload: UserWrite = {
|
||||||
username: form.username.trim(),
|
username: form.username.trim(),
|
||||||
|
firstName: form.firstName.trim() || null,
|
||||||
|
lastName: form.lastName.trim() || null,
|
||||||
roles: form.roles,
|
roles: form.roles,
|
||||||
isEmployee: form.isEmployee,
|
isEmployee: form.isEmployee,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,9 +75,11 @@ export function useAbsenceHelpers() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function formatDays(days: number): string {
|
function formatDays(days: number): string {
|
||||||
const rounded = Math.round(days * 2) / 2
|
// Affiche la valeur réelle avec décimales (ex. 8,75) : un solde de CP se
|
||||||
const unit = rounded > 1 ? t('absences.daysPlural') : t('absences.daySingular')
|
// gère en demi/quart de journée, arrondir masquerait des droits réels.
|
||||||
return `${rounded} ${unit}`
|
const value = new Intl.NumberFormat('fr-FR', { maximumFractionDigits: 2 }).format(days)
|
||||||
|
const unit = days >= 2 ? t('absences.daysPlural') : t('absences.daySingular')
|
||||||
|
return `${value} ${unit}`
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ export type UserData = {
|
|||||||
id: number
|
id: number
|
||||||
'@id'?: string
|
'@id'?: string
|
||||||
username: string
|
username: string
|
||||||
|
firstName?: string | null
|
||||||
|
lastName?: string | null
|
||||||
roles: string[]
|
roles: string[]
|
||||||
avatarUrl?: string | null
|
avatarUrl?: string | null
|
||||||
apiToken?: string | null
|
apiToken?: string | null
|
||||||
@@ -20,6 +22,8 @@ export type UserData = {
|
|||||||
|
|
||||||
export type UserWrite = {
|
export type UserWrite = {
|
||||||
username: string
|
username: string
|
||||||
|
firstName?: string | null
|
||||||
|
lastName?: string | null
|
||||||
plainPassword?: string
|
plainPassword?: string
|
||||||
roles: string[]
|
roles: string[]
|
||||||
// HR / absence management
|
// HR / absence management
|
||||||
|
|||||||
@@ -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
|
// Users
|
||||||
$admin = new User();
|
$admin = new User();
|
||||||
$admin->setUsername('admin');
|
$admin->setUsername('admin');
|
||||||
|
$admin->setFirstName('Alex');
|
||||||
|
$admin->setLastName('Martin');
|
||||||
$admin->setRoles(['ROLE_ADMIN']);
|
$admin->setRoles(['ROLE_ADMIN']);
|
||||||
$admin->setPassword($this->passwordHasher->hashPassword($admin, 'admin'));
|
$admin->setPassword($this->passwordHasher->hashPassword($admin, 'admin'));
|
||||||
$admin->setApiToken('dev-mcp-token-for-testing-only-do-not-use-in-production');
|
$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 = new User();
|
||||||
$userAlice->setUsername('alice');
|
$userAlice->setUsername('alice');
|
||||||
|
$userAlice->setFirstName('Alice');
|
||||||
|
$userAlice->setLastName('Dupont');
|
||||||
$userAlice->setRoles(['ROLE_USER']);
|
$userAlice->setRoles(['ROLE_USER']);
|
||||||
$userAlice->setPassword($this->passwordHasher->hashPassword($userAlice, 'alice'));
|
$userAlice->setPassword($this->passwordHasher->hashPassword($userAlice, 'alice'));
|
||||||
$manager->persist($userAlice);
|
$manager->persist($userAlice);
|
||||||
|
|
||||||
$userBob = new User();
|
$userBob = new User();
|
||||||
$userBob->setUsername('bob');
|
$userBob->setUsername('bob');
|
||||||
|
$userBob->setFirstName('Bob');
|
||||||
|
$userBob->setLastName('Leroy');
|
||||||
$userBob->setRoles(['ROLE_USER']);
|
$userBob->setRoles(['ROLE_USER']);
|
||||||
$userBob->setPassword($this->passwordHasher->hashPassword($userBob, 'bob'));
|
$userBob->setPassword($this->passwordHasher->hashPassword($userBob, 'bob'));
|
||||||
$manager->persist($userBob);
|
$manager->persist($userBob);
|
||||||
|
|
||||||
$userCharlie = new User();
|
$userCharlie = new User();
|
||||||
$userCharlie->setUsername('charlie');
|
$userCharlie->setUsername('charlie');
|
||||||
|
$userCharlie->setFirstName('Charlie');
|
||||||
|
$userCharlie->setLastName('Moreau');
|
||||||
$userCharlie->setRoles(['ROLE_USER']);
|
$userCharlie->setRoles(['ROLE_USER']);
|
||||||
$userCharlie->setPassword($this->passwordHasher->hashPassword($userCharlie, 'charlie'));
|
$userCharlie->setPassword($this->passwordHasher->hashPassword($userCharlie, 'charlie'));
|
||||||
$manager->persist($userCharlie);
|
$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'])]
|
#[Groups(['me:read', 'task:read', 'user:list', 'user:write', 'time_entry:read', 'absence_request:read', 'absence_balance:read'])]
|
||||||
private ?string $username = null;
|
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> */
|
/** @var list<string> */
|
||||||
#[ORM\Column]
|
#[ORM\Column]
|
||||||
#[ApiProperty(security: "is_granted('ROLE_ADMIN') or object == user")]
|
#[ApiProperty(security: "is_granted('ROLE_ADMIN') or object == user")]
|
||||||
@@ -147,6 +155,30 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
|
|||||||
return $this;
|
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
|
public function getUserIdentifier(): string
|
||||||
{
|
{
|
||||||
return (string) $this->username;
|
return (string) $this->username;
|
||||||
|
|||||||
Reference in New Issue
Block a user