fix: address PR review comments for signal immutability and cleanup

Co-authored-by: THoguet <61246905+THoguet@users.noreply.github.com>

package.json

@@ -1,70 +1,71 @@
 {
-	"name": "vac-optimizer",
+  "name": "vac-optimizer",
-	"version": "1.5.0",
+  "version": "1.5.0",
-	"scripts": {
+  "scripts": {
-		"ng": "ng",
+    "ng": "ng",
-		"start": "ng serve",
+    "start": "ng serve",
-		"build": "ng build",
+    "build": "ng build",
-		"watch": "ng build --watch --configuration development",
+    "watch": "ng build --watch --configuration development",
-		"test": "ng test",
+    "test": "ng test",
-		"serve:ssr:vac-optimizer": "node dist/vac-optimizer/server/server.mjs",
+    "serve:ssr:vac-optimizer": "node dist/vac-optimizer/server/server.mjs",
-		"lint": "eslint \"src/**/*.ts\"",
+    "lint": "eslint \"src/**/*.ts\"",
-		"lint:fix": "eslint \"src/**/*.ts\" --fix",
+    "lint:fix": "eslint \"src/**/*.ts\" --fix",
-		"format": "prettier --write \"src/**/*.{ts,html,scss,css,json}\"",
+    "format": "prettier --write \"src/**/*.{ts,html,scss,css,json}\"",
-		"format:check": "prettier --check \"src/**/*.{ts,html,scss,css,json}\""
+    "format:check": "prettier --check \"src/**/*.{ts,html,scss,css,json}\""
-	},
+  },
-	"prettier": {
+  "prettier": {
-		"printWidth": 100,
+    "printWidth": 100,
-		"singleQuote": true,
+    "singleQuote": true,
-		"overrides": [
+    "overrides": [
-			{
+      {
-				"files": "*.html",
+        "files": "*.html",
-				"options": {
+        "options": {
-					"parser": "angular"
+          "parser": "angular"
-				}
+        }
-			}
+      }
-		]
+    ]
-	},
+  },
-	"private": true,
+  "private": true,
-	"dependencies": {
+  "dependencies": {
-		"@angular/cdk": "^20.2.12",
+    "@angular/animations": "^21.0.1",
-		"@angular/common": "^20.3.10",
+    "@angular/cdk": "^21.0.1",
-		"@angular/compiler": "^20.3.10",
+    "@angular/common": "^21.0.1",
-		"@angular/core": "^20.3.10",
+    "@angular/compiler": "^21.0.1",
-		"@angular/forms": "^20.3.10",
+    "@angular/core": "^21.0.1",
-		"@angular/material": "^20.2.12",
+    "@angular/forms": "^21.0.1",
-		"@angular/platform-browser": "^20.3.10",
+    "@angular/material": "^21.0.1",
-		"@angular/platform-server": "^20.3.10",
+    "@angular/platform-browser": "^21.0.1",
-		"@angular/router": "^20.3.10",
+    "@angular/platform-server": "^21.0.1",
-		"@angular/ssr": "^20.3.10",
+    "@angular/router": "^21.0.1",
-		"date-holidays": "^3.26.2",
+    "@angular/ssr": "^21.0.1",
-		"dayjs": "^1.11.19",
+    "date-holidays": "^3.26.2",
-		"express": "^5.1.0",
+    "dayjs": "^1.11.19",
-		"rxjs": "~7.8.0",
+    "express": "^5.1.0",
-		"tslib": "^2.3.0"
+    "rxjs": "~7.8.0",
-	},
+    "tslib": "^2.3.0"
-	"devDependencies": {
+  },
-		"@angular/build": "^20.3.10",
+  "devDependencies": {
-		"@angular/cli": "^20.3.10",
+    "@angular/build": "^21.0.1",
-		"@angular/compiler-cli": "^20.3.10",
+    "@angular/cli": "^21.0.1",
-		"@eslint/js": "^9.39.1",
+    "@angular/compiler-cli": "^21.0.1",
-		"@types/express": "^5.0.1",
+    "@eslint/js": "^9.39.1",
-		"@types/jasmine": "~5.1.0",
+    "@types/express": "^5.0.1",
-		"@types/jest": "^30.0.0",
+    "@types/jasmine": "~5.1.0",
-		"@types/node": "^24.10.0",
+    "@types/jest": "^30.0.0",
-		"eslint": "^9.39.1",
+    "@types/node": "^24.10.0",
-		"eslint-config-prettier": "^10.1.8",
+    "eslint": "^9.39.1",
-		"eslint-plugin-prettier": "^5.5.4",
+    "eslint-config-prettier": "^10.1.8",
-		"jasmine-core": "~5.12.1",
+    "eslint-plugin-prettier": "^5.5.4",
-		"jest": "^30.2.0",
+    "jasmine-core": "~5.12.1",
-		"jest-preset-angular": "^15.0.3",
+    "jest": "^30.2.0",
-		"karma": "~6.4.0",
+    "jest-preset-angular": "^15.0.3",
-		"karma-chrome-launcher": "~3.2.0",
+    "karma": "~6.4.0",
-		"karma-coverage": "~2.2.0",
+    "karma-chrome-launcher": "~3.2.0",
-		"karma-jasmine": "~5.1.0",
+    "karma-coverage": "~2.2.0",
-		"karma-jasmine-html-reporter": "~2.1.0",
+    "karma-jasmine": "~5.1.0",
-		"prettier": "^3.6.2",
+    "karma-jasmine-html-reporter": "~2.1.0",
-		"typescript": "~5.9.2",
+    "prettier": "^3.6.2",
-		"typescript-eslint": "^8.46.4"
+    "typescript": "~5.9.2",
-	}
+    "typescript-eslint": "^8.46.4"
+  }
 }

src/app/app.config.ts

@@ -11,6 +11,7 @@ import {
 	withEventReplay,
 	withIncrementalHydration,
 } from '@angular/platform-browser';
+import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
 
 export const appConfig: ApplicationConfig = {
 	providers: [
@@ -18,5 +19,6 @@ export const appConfig: ApplicationConfig = {
 		provideZonelessChangeDetection(),
 		provideRouter(routes),
 		provideClientHydration(withEventReplay(), withIncrementalHydration()),
+		provideAnimationsAsync(),
 	],
 };

src/app/components/calendar-year/calendar-year.ts

@@ -3,14 +3,14 @@ import { UserInputService } from '../../services/user-input-service';
 import { MatCard, MatCardContent } from '@angular/material/card';
 import { CalendarMonth } from '../calendar-month/calendar-month';
 import { CalendarService, SelectedDates } from '../../services/calendar-service';
-import { CommonModule } from '@angular/common';
+
 import { MatProgressSpinner } from '@angular/material/progress-spinner';
 import { CalendarSettingsService } from '../../services/calendar-settings-service';
 import { DateCacheService } from '../../services/date-cache.service';
 
 @Component({
 	selector: 'app-calendar-year',
-	imports: [MatCard, CalendarMonth, MatCardContent, CommonModule, MatProgressSpinner],
+	imports: [MatCard, CalendarMonth, MatCardContent, MatProgressSpinner],
 	templateUrl: './calendar-year.html',
 	styleUrl: './calendar-year.scss',
 })
@@ -45,9 +45,10 @@ export class CalendarYear {
 			queueMicrotask(() => {
 				void (async () => {
 					if (this.selectedDates) {
-						// Create a copy to avoid mutating the original signal data
+						// Create a deep copy to avoid mutating the original signal data
+						const vacationDaysCopy = vacationData.map((vd) => ({ ...vd }));
 						const remainingDays = await this.selectedDates.optimizeVacations(
-							{ ...vacationData },
+							vacationDaysCopy,
 							this.calendarSettingsService,
 							this.calendarService,
 							(progress: number) => {

src/app/components/user-input/user-input.html

@@ -1,29 +1,40 @@
 <div class="user-input">
 	<p>Optimisez vos jours de vacances en fonction des jours fériés et des week-ends !</p>
-	<form [formGroup]="userInputForm">
+	<div class="listOfDays">
-		<mat-form-field appearance="fill">
+		@for (day of daysOff; track day.id) {
-			<mat-label>Combien de CP par an ?</mat-label>
+			<div class="day-input-wrapper" animate.enter="day-enter" animate.leave="day-leave">
-			<input matInput type="number" max="365" min="0" formControlName="CP" />
+				<app-day-input [day]="day" (dayChange)="updateDay($index, $event)" (deleteEntry)="removeFromList($index)"></app-day-input>
-		</mat-form-field>
+			</div>
-		<mat-form-field appearance="fill">
+		}
-			<mat-label>Combien de jours de RTT par an ?</mat-label>
+		<mat-card class="add-day-card mat-elevation-z2" (click)="addDay()">
-			<input matInput type="number" max="365" min="0" formControlName="RTT" />
+			<button matFab aria-label="Add entry">
-		</mat-form-field>
+				<mat-icon>add</mat-icon>
-		<mat-form-field appearance="fill">
+			</button>
-			<mat-label>Autres jours</mat-label>
+			<h3>Ajouter un jour de vacances</h3>
-			<input matInput type="number" max="365" min="0" formControlName="Others" />
+		</mat-card>
-		</mat-form-field>
+	</div>
-	</form>
+	<div class="action-buttons">
+		<button matFab extended (click)="triggerComputation()">
+			<mat-icon>calculate</mat-icon>
+			Calculer
+		</button>
+		<app-calendar-settings></app-calendar-settings>
+	</div>
 	@if (hasRemainingDays()) {
 		<mat-card class="mat-elevation-z2 warning-card">
 			<mat-card-content class="warning-content">
-				<mat-icon color="warn" aria-hidden="true">warning</mat-icon>
+				<mat-icon color="warn">warning</mat-icon>
-				<span>
+				<div class="warning">
-					{{ remainingDays() }} jour{{ remainingDays() > 1 ? 's' : '' }} de vacances non
+					<span>
-					placé{{ remainingDays() > 1 ? 's' : '' }}. Veuillez les placer manuellement.
+						{{ remainingDays() }} jour{{ remainingDays() > 1 ? 's' : '' }} de vacances
-				</span>
+						non placé{{ remainingDays() > 1 ? 's' : '' }}:
+					</span>
+					@for (day of remainingDaysDetails(); track $index) {
+						<span class="remaining-day-detail">- {{ day }}</span>
+					}
+					<span> Veuillez les placer manuellement. </span>
+				</div>
 			</mat-card-content>
 		</mat-card>
 	}
-	<app-calendar-settings></app-calendar-settings>
 </div>

src/app/components/user-input/user-input.scss

@@ -25,7 +25,79 @@
 	}
 }
 
+.listOfDays {
+	display: flex;
+	flex-direction: column;
+	gap: 0.5rem;
+}
+
+.day-input-wrapper {
+	animation: slide-fade-in 200ms ease-out;
+
+	@starting-style {
+		opacity: 0;
+		transform: translateX(-20px);
+	}
+}
+
+.day-enter {
+	animation: slide-fade-in 200ms ease-out;
+}
+
+.day-leave {
+	opacity: 0;
+	transform: translateX(20px);
+	transition:
+		opacity 200ms ease-in,
+		transform 200ms ease-in;
+}
+
+@keyframes slide-fade-in {
+	from {
+		opacity: 0;
+		transform: translateX(-20px);
+	}
+	to {
+		opacity: 1;
+		transform: translateX(0);
+	}
+}
+
 form {
 	display: flex;
 	flex-direction: column;
 }
+
+.add-day-card {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	padding: 16px;
+	gap: 1rem;
+	margin-bottom: 1rem;
+	cursor: pointer;
+}
+
+.add-day-card h3 {
+	flex-grow: 1;
+	margin: 0;
+	font-weight: normal;
+}
+
+.action-buttons {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 1rem;
+	gap: 1rem;
+}
+
+.warning {
+	display: flex;
+	flex-direction: column;
+}
+
+:host {
+	max-width: 100%;
+}

src/app/components/user-input/user-input.spec.ts

@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { provideZonelessChangeDetection } from '@angular/core';
 import { UserInput } from './user-input';
+import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
 
 describe('UserInput', () => {
 	let component: UserInput;
@@ -9,7 +10,7 @@ describe('UserInput', () => {
 	beforeEach(async () => {
 		await TestBed.configureTestingModule({
 			imports: [UserInput],
-			providers: [provideZonelessChangeDetection()],
+			providers: [provideZonelessChangeDetection(), provideAnimationsAsync()],
 		}).compileComponents();
 
 		fixture = TestBed.createComponent(UserInput);

src/app/components/user-input/user-input.ts

@@ -1,79 +1,78 @@
-import { Component, OnInit, OnDestroy, effect, computed } from '@angular/core';
+import { Component, computed, inject, ChangeDetectionStrategy } from '@angular/core';
-import { MatFormField, MatLabel } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
-import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { UserInputService } from '../../services/user-input-service';
-import { VacationsNumber } from '../../services/calendar-service';
-import { debounceTime, takeUntil, Subject } from 'rxjs';
 import { CalendarSettings } from '../calendar-settings/calendar-settings';
 import { MatCard, MatCardContent } from '@angular/material/card';
 import { MatIcon } from '@angular/material/icon';
+import { DayInput } from '../userInput/day-input/day-input';
+import { MatButtonModule } from '@angular/material/button';
+import { tooltipTypeMapping, DayType, VacDay } from '../../services/calendar-service';
 
 @Component({
 	selector: 'app-user-input',
 	imports: [
-		MatFormField,
-		MatLabel,
 		MatInputModule,
-		ReactiveFormsModule,
 		CalendarSettings,
 		MatCard,
 		MatCardContent,
 		MatIcon,
+		MatButtonModule,
+		DayInput,
 	],
 	templateUrl: './user-input.html',
 	styleUrl: './user-input.scss',
+	changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class UserInput implements OnInit, OnDestroy {
+export class UserInput {
-	constructor(private userInputService: UserInputService) {
+	private userInputService: UserInputService = inject(UserInputService);
-		// Watch for signal changes and update form
-		effect(() => {
-			const vacationData = this.userInputService.vacationNumberSignal();
-			this.userInputForm.patchValue(
-				{
-					CP: vacationData.cp,
-					RTT: vacationData.rtt,
-					Others: vacationData.other,
-				},
-				{ emitEvent: false },
-			);
-		});
-	}
-
-	private destroy$ = new Subject<void>();
-
-	userInputForm: FormGroup = new FormGroup({
-		CP: new FormControl<number | null>(null),
-		RTT: new FormControl<number | null>(null),
-		Others: new FormControl<number | null>(null),
-	});
 
 	protected remainingDays = computed(() => {
 		const remaining = this.userInputService.remainingVacationDaysSignal();
-		return remaining.cp + remaining.rtt + remaining.other;
+		return remaining.reduce((acc, day) => acc + day.numberOfDays, 0);
+	});
+
+	protected remainingDaysDetails = computed(() => {
+		const remaining = this.userInputService.remainingVacationDaysSignal();
+		return remaining
+			.filter((day) => day.numberOfDays > 0)
+			.map((day) => {
+				const typeName = tooltipTypeMapping[day.type as unknown as DayType];
+				const expiryDate = day.expiryDate.toLocaleDateString('fr-FR', {
+					day: 'numeric',
+					month: 'short',
+					year: 'numeric',
+				});
+				return `${day.numberOfDays} ${typeName} (exp. ${expiryDate})`;
+			});
 	});
 
 	protected hasRemainingDays = computed(() => this.remainingDays() > 0);
 
-	ngOnInit() {
+	protected get daysOff() {
-		this.userInputForm.valueChanges
+		return this.userInputService.vacationNumberSignal();
-			.pipe(debounceTime(1500), takeUntil(this.destroy$))
-			.subscribe(() => this.submitForm());
 	}
 
-	ngOnDestroy() {
+	public addDay() {
-		this.destroy$.next();
+		this.userInputService.vacationNumberSignal.update((days) => [
-		this.destroy$.complete();
+			...days,
+			this.userInputService.createVacationDay(),
+		]);
 	}
 
-	private submitForm() {
+	public removeFromList(index: number) {
-		if (this.userInputForm.valid) {
+		this.userInputService.vacationNumberSignal.update((days) =>
-			const vacationData: VacationsNumber = {
+			days.filter((_, i) => i !== index),
-				cp: this.userInputForm.get('CP')?.value || 0,
+		);
-				rtt: this.userInputForm.get('RTT')?.value || 0,
+	}
-				other: this.userInputForm.get('Others')?.value || 0,
+
-			};
+	public updateDay(index: number, updatedDay: VacDay) {
-			this.userInputService.vacationNumberSignal.set(vacationData);
+		this.userInputService.vacationNumberSignal.update((days) =>
-		}
+			days.map((day, i) => (i === index ? updatedDay : day)),
+		);
+	}
+
+	public triggerComputation() {
+		// Trigger signal update by setting a new array reference
+		this.userInputService.vacationNumberSignal.update((days) => [...days]);
 	}
 }

src/app/components/userInput/day-input/day-input.html

@@ -0,0 +1,36 @@
+<!-- <mat-list-item role="listitem"> -->
+<mat-card class="card">
+	<mat-form-field class="numberInput">
+		<input
+			matInput
+			type="number"
+			min="0"
+			[value]="day().numberOfDays"
+			(input)="onInput($event)"
+		/>
+	</mat-form-field>
+	<mat-form-field class="dayTypeInput">
+		<mat-select (valueChange)="onTypeChange($event)" [value]="day().type">
+			<mat-option></mat-option>
+			@for (dayType of selectableDayTypes; track $index) {
+				<mat-option [value]="dayType">{{ tooltipTypeMapping[dayType] }}</mat-option>
+			}
+		</mat-select>
+	</mat-form-field>
+	<mat-form-field class="dateInput">
+		<mat-label>Choose a date</mat-label>
+		<input
+			matInput
+			type="datetime"
+			[matDatepicker]="picker"
+			[value]="day().expiryDate"
+			(dateChange)="addEvent($event)"
+		/>
+		<mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle>
+		<mat-datepicker #picker></mat-datepicker>
+	</mat-form-field>
+	<button matFab aria-label="Delete entry" (click)="deleteEntry.emit()">
+		<mat-icon>close</mat-icon>
+	</button>
+</mat-card>
+<!-- </mat-list-item> -->

src/app/components/userInput/day-input/day-input.scss

@@ -0,0 +1,21 @@
+.card {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+	padding: 16px;
+	gap: 16px;
+	flex-wrap: wrap;
+}
+
+.dateInput {
+	flex-grow: 1;
+}
+
+.numberInput {
+	width: 80px;
+}
+
+::ng-deep .mat-mdc-form-field-subscript-wrapper {
+	display: none;
+}

src/app/components/userInput/day-input/day-input.spec.ts

@@ -0,0 +1,33 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
+
+import { DayInput } from './day-input';
+import { SelectableDayType, VacDay } from '../../../services/calendar-service';
+
+describe('DayInput', () => {
+	let component: DayInput;
+	let fixture: ComponentFixture<DayInput>;
+
+	const mockVacDay: VacDay = {
+		id: 'test-id',
+		type: SelectableDayType.CP,
+		numberOfDays: 5,
+		expiryDate: new Date('2025-12-31'),
+	};
+
+	beforeEach(async () => {
+		await TestBed.configureTestingModule({
+			imports: [DayInput],
+			providers: [provideAnimationsAsync()],
+		}).compileComponents();
+
+		fixture = TestBed.createComponent(DayInput);
+		component = fixture.componentInstance;
+		fixture.componentRef.setInput('day', mockVacDay);
+		fixture.detectChanges();
+	});
+
+	it('should create', () => {
+		expect(component).toBeTruthy();
+	});
+});

src/app/components/userInput/day-input/day-input.ts

@@ -0,0 +1,103 @@
+import { Component, input, output, ChangeDetectionStrategy } from '@angular/core';
+import { SelectableDayType, tooltipTypeMapping, VacDay } from '../../../services/calendar-service';
+import { MatCard } from '@angular/material/card';
+import { MatOption, MatSelect } from '@angular/material/select';
+import { MatInput, MatInputModule, MatLabel } from '@angular/material/input';
+import {
+	MatDatepicker,
+	MatDatepickerInput,
+	MatDatepickerInputEvent,
+	MatDatepickerToggle,
+} from '@angular/material/datepicker';
+import {
+	DateAdapter,
+	MAT_DATE_FORMATS,
+	MAT_DATE_LOCALE,
+	NativeDateAdapter,
+} from '@angular/material/core';
+import { MatIconModule } from '@angular/material/icon';
+import { MatButtonModule } from '@angular/material/button';
+
+class CustomDateAdapter extends NativeDateAdapter {
+	override format(date: Date, displayFormat: unknown): string {
+		if (displayFormat === 'input') {
+			const day = date.getDate().toString().padStart(2, '0');
+			const month = (date.getMonth() + 1).toString().padStart(2, '0');
+			const year = date.getFullYear();
+			return `${day}/${month}/${year}`;
+		}
+		return super.format(date, displayFormat as object);
+	}
+
+	override parse(value: string): Date | null {
+		if (!value) return null;
+		const parts = value.split('/');
+		if (parts.length === 3) {
+			const day = parseInt(parts[0], 10);
+			const month = parseInt(parts[1], 10) - 1;
+			const year = parseInt(parts[2], 10);
+			if (!isNaN(day) && !isNaN(month) && !isNaN(year)) {
+				return new Date(year, month, day);
+			}
+		}
+		return null;
+	}
+}
+
+const MY_DATE_FORMATS = {
+	parse: {
+		dateInput: 'input',
+	},
+	display: {
+		dateInput: 'input',
+		monthYearLabel: { year: 'numeric', month: 'short' },
+		dateA11yLabel: { year: 'numeric', month: 'long', day: 'numeric' },
+		monthYearA11yLabel: { year: 'numeric', month: 'long' },
+	},
+};
+
+@Component({
+	selector: 'app-day-input',
+	imports: [
+		MatIconModule,
+		MatCard,
+		MatSelect,
+		MatOption,
+		MatInput,
+		MatDatepicker,
+		MatLabel,
+		MatDatepickerToggle,
+		MatDatepickerInput,
+		MatInputModule,
+		MatButtonModule,
+	],
+	templateUrl: './day-input.html',
+	styleUrl: './day-input.scss',
+	changeDetection: ChangeDetectionStrategy.OnPush,
+	providers: [
+		{ provide: DateAdapter, useClass: CustomDateAdapter },
+		{ provide: MAT_DATE_LOCALE, useValue: 'en-GB' },
+		{ provide: MAT_DATE_FORMATS, useValue: MY_DATE_FORMATS },
+	],
+})
+export class DayInput {
+	public day = input.required<VacDay>();
+	public dayChange = output<VacDay>();
+	public deleteEntry = output<void>();
+
+	protected readonly selectableDayTypes = Object.values(SelectableDayType);
+	protected readonly tooltipTypeMapping = tooltipTypeMapping;
+
+	onInput(event: Event) {
+		const value = Number((event.target as HTMLInputElement).value);
+		this.dayChange.emit({ ...this.day(), numberOfDays: value });
+	}
+
+	onTypeChange(type: SelectableDayType) {
+		this.dayChange.emit({ ...this.day(), type });
+	}
+
+	addEvent(event: MatDatepickerInputEvent<Date>) {
+		this.dayChange.emit({ ...this.day(), expiryDate: event.value! });
+	}
+}

src/app/services/calendar-service.ts

@@ -184,10 +184,11 @@ export class CalendarService {
 	}
 }
 
-export type VacationsNumber = {
+export type VacDay = {
-	rtt: number;
+	id: string;
-	cp: number;
+	type: SelectableDayType;
-	other: number;
+	numberOfDays: number;
+	expiryDate: Date;
 };
 
 export type Week = (Date | null)[];
@@ -203,6 +204,12 @@ export enum DayType {
 	TODAY = 'today',
 }
 
+export enum SelectableDayType {
+	CP = DayType.CP,
+	RTT = DayType.RTT,
+	OTHER = DayType.OTHER,
+}
+
 export const tooltipTypeMapping: { [key in DayType]: string } = {
 	[DayType.WEEKEND]: 'Weekend',
 	[DayType.CLOSED_DAY]: 'Jour Férié',
@@ -537,15 +544,15 @@ export class SelectedDates implements SelectedDateInterface {
 	}
 
 	async optimizeVacations(
-		vacationsNumber: VacationsNumber,
+		vacationDays: VacDay[],
 		calendarSettingsService: CalendarSettingsService,
 		calendarService: CalendarService,
 		progressCallback?: (progress: number) => void,
-	): Promise<VacationsNumber> {
+	): Promise<VacDay[]> {
-		if (calendarSettingsService.get('samediMalin')()) this.samediMalin(vacationsNumber);
+		if (calendarSettingsService.get('samediMalin')()) this.samediMalin(vacationDays);
 
-		const initialVacations = { ...vacationsNumber };
+		// Calculate total days to process
-		const totalDays = initialVacations.cp + initialVacations.rtt + initialVacations.other;
+		const totalDays = vacationDays.reduce((sum, vd) => sum + vd.numberOfDays, 0);
 		let processedDays = 0;
 
 		// Helper function to update progress, throttled to every 5%
@@ -565,30 +572,30 @@ export class SelectedDates implements SelectedDateInterface {
 
 		await updateProgress();
 
-		while (vacationsNumber.cp > 0) {
+		// Track VacDays that can't find valid placements
-			const result = this.lookForVacation(DayType.CP, calendarService);
+		const exhaustedVacDayIds = new Set<string>();
-			if (result.heuristic === SelectedDates.NO_VALID_STRATEGY_HEURISTIC) {
+
+		// Process vacation days ordered by expiration date (earliest first)
+		while (vacationDays.some((vd) => vd.numberOfDays > 0 && !exhaustedVacDayIds.has(vd.id))) {
+			// Sort by expiration date to use days that expire first, excluding exhausted ones
+			const sortedVacDays = [...vacationDays]
+				.filter((vd) => vd.numberOfDays > 0 && !exhaustedVacDayIds.has(vd.id))
+				.sort((a, b) => a.expiryDate.getTime() - b.expiryDate.getTime());
+
+			if (sortedVacDays.length === 0) {
 				break;
 			}
-			vacationsNumber.cp -= 1;
+
-			processedDays++;
+			const vacDayToUse = sortedVacDays[0];
-			await updateProgress();
+			const result = this.lookForVacation(vacDayToUse, calendarService);
-		}
+
-		while (vacationsNumber.rtt > 0) {
-			const result = this.lookForVacation(DayType.RTT, calendarService);
 			if (result.heuristic === SelectedDates.NO_VALID_STRATEGY_HEURISTIC) {
-				break;
+				// Mark this VacDay as exhausted and try other vacation days
+				exhaustedVacDayIds.add(vacDayToUse.id);
+				continue;
 			}
-			vacationsNumber.rtt -= 1;
+
-			processedDays++;
+			vacDayToUse.numberOfDays -= 1;
-			await updateProgress();
-		}
-		while (vacationsNumber.other > 0) {
-			const result = this.lookForVacation(DayType.OTHER, calendarService);
-			if (result.heuristic === SelectedDates.NO_VALID_STRATEGY_HEURISTIC) {
-				break;
-			}
-			vacationsNumber.other -= 1;
 			processedDays++;
 			await updateProgress();
 		}
@@ -599,7 +606,7 @@ export class SelectedDates implements SelectedDateInterface {
 		}
 
 		// Inform user if not all days were placed
-		const remainingDays = vacationsNumber.cp + vacationsNumber.rtt + vacationsNumber.other;
+		const remainingDays = vacationDays.reduce((sum, vd) => sum + vd.numberOfDays, 0);
 		if (remainingDays > 0) {
 			console.warn(
 				`Optimization stopped: ${remainingDays} of ${totalDays} vacation days remain unplaced. ` +
@@ -607,10 +614,10 @@ export class SelectedDates implements SelectedDateInterface {
 			);
 		}
 
-		return vacationsNumber;
+		return vacationDays;
 	}
 
-	samediMalin(vacationsNumber: VacationsNumber): void {
+	samediMalin(vacationDays: VacDay[]): void {
 		const now = new Date();
 		now.setHours(0, 0, 0, 0);
 		const nowTime = now.getTime();
@@ -619,14 +626,63 @@ export class SelectedDates implements SelectedDateInterface {
 			(date) => date.type === DayType.CLOSED_DAY && date.range.start?.getDay() === 6,
 		);
 
+		// Helper function to get available CP days that don't expire before a given date (ordered by expiry date)
+		const getAvailableCpDaysForDate = (useByDate: Date): VacDay[] => {
+			const useByTime = useByDate.getTime();
+			return vacationDays
+				.filter(
+					(vd) =>
+						vd.type === SelectableDayType.CP &&
+						vd.numberOfDays > 0 &&
+						vd.expiryDate.getTime() >= useByTime,
+				)
+				.sort((a, b) => a.expiryDate.getTime() - b.expiryDate.getTime());
+		};
+
+		// Helper function to get total available CP days that don't expire before a given date
+		const getTotalCpDaysForDate = (useByDate: Date): number => {
+			const useByTime = useByDate.getTime();
+			return vacationDays
+				.filter(
+					(vd) =>
+						vd.type === SelectableDayType.CP && vd.expiryDate.getTime() >= useByTime,
+				)
+				.reduce((sum, vd) => sum + vd.numberOfDays, 0);
+		};
+
+		// Helper function to consume 2 CP days from the available pool for a specific date
+		const consume2CpDaysForDate = (useByDate: Date): boolean => {
+			let daysToConsume = 2;
+			const cpDays = getAvailableCpDaysForDate(useByDate);
+			for (const cpDay of cpDays) {
+				if (daysToConsume === 0) break;
+				const toConsume = Math.min(cpDay.numberOfDays, daysToConsume);
+				cpDay.numberOfDays -= toConsume;
+				daysToConsume -= toConsume;
+			}
+			return daysToConsume === 0;
+		};
+
+		// Helper function to add 1 OTHER day as reward
+		const addOtherDayReward = (): void => {
+			// Find an existing OTHER VacDay or create a new one
+			const otherDay = vacationDays.find((vd) => vd.type === SelectableDayType.OTHER);
+			if (otherDay) {
+				otherDay.numberOfDays += 1;
+			} else {
+				// Create a new OTHER VacDay with a far future expiry date
+				vacationDays.push({
+					id: crypto.randomUUID(),
+					type: SelectableDayType.OTHER,
+					numberOfDays: 1,
+					expiryDate: new Date(now.getFullYear() + 10, 11, 31),
+				});
+			}
+		};
+
 		for (const holiday of samedi_ferie) {
 			if (!holiday.range.start) continue;
 
-			// Skip if no CP days available
-			if (vacationsNumber.cp < 2) {
-				continue;
-			}
-
 			// Get the Saturday date (holiday) and the following Sunday
 			const saturdayDate = new Date(holiday.range.start);
 			const sundayDate = new Date(saturdayDate);
@@ -651,21 +707,24 @@ export class SelectedDates implements SelectedDateInterface {
 			const oneDayAfter = new Date(sundayDate);
 			oneDayAfter.setDate(sundayDate.getDate() + 1);
 
-			// Check if we can apply each strategy (and not in the past)
+			// Check if we can apply each strategy (not in the past, not already selected, and have non-expired CP days)
 			const canApplyTwoBeforeStrategy =
 				twoDaysBefore1.getTime() >= nowTime &&
 				!this.isSelected(twoDaysBefore1) &&
-				!this.isSelected(twoDaysBefore2);
+				!this.isSelected(twoDaysBefore2) &&
+				getTotalCpDaysForDate(twoDaysBefore2) >= 2; // Check expiry against the latest date used
 
 			const canApplyTwoAfterStrategy =
 				twoDaysAfter1.getTime() >= nowTime &&
 				!this.isSelected(twoDaysAfter1) &&
-				!this.isSelected(twoDaysAfter2);
+				!this.isSelected(twoDaysAfter2) &&
+				getTotalCpDaysForDate(twoDaysAfter2) >= 2; // Check expiry against the latest date used
 
 			const canApplyMixedStrategy =
 				oneDayBefore.getTime() >= nowTime &&
 				!this.isSelected(oneDayBefore) &&
-				!this.isSelected(oneDayAfter);
+				!this.isSelected(oneDayAfter) &&
+				getTotalCpDaysForDate(oneDayAfter) >= 2; // Check expiry against the latest date used
 
 			// Test all applicable strategies and choose the one with the best heuristic score
 			const strategies: { apply: () => void; heuristic: number }[] = [];
@@ -688,8 +747,8 @@ export class SelectedDates implements SelectedDateInterface {
 								new DateRange<Date>(twoDaysBefore1, twoDaysBefore2),
 							),
 						);
-						vacationsNumber.cp -= 2;
+						consume2CpDaysForDate(twoDaysBefore2);
-						vacationsNumber.other += 1; // Reward: gain 1 other day
+						addOtherDayReward();
 					},
 					heuristic: heuristic,
 				});
@@ -712,8 +771,8 @@ export class SelectedDates implements SelectedDateInterface {
 								new DateRange<Date>(twoDaysAfter1, twoDaysAfter2),
 							),
 						);
-						vacationsNumber.cp -= 2;
+						consume2CpDaysForDate(twoDaysAfter2);
-						vacationsNumber.other += 1; // Reward: gain 1 other day
+						addOtherDayReward();
 					},
 					heuristic: heuristic,
 				});
@@ -745,8 +804,8 @@ export class SelectedDates implements SelectedDateInterface {
 								new DateRange<Date>(oneDayAfter, oneDayAfter),
 							),
 						);
-						vacationsNumber.cp -= 2;
+						consume2CpDaysForDate(oneDayAfter);
-						vacationsNumber.other += 1; // Reward: gain 1 other day
+						addOtherDayReward();
 					},
 					heuristic: heuristic,
 				});
@@ -766,22 +825,24 @@ export class SelectedDates implements SelectedDateInterface {
 	}
 
 	lookForVacation(
-		vacType: DayType,
+		vacDay: VacDay,
 		calendarService: CalendarService,
 	): { apply: () => void; heuristic: number } {
 		const daysOfYear = calendarService.monthsInAYearFromNow();
 		const now = new Date();
 		now.setHours(0, 0, 0, 0);
 		const nowTime = now.getTime();
+		const expiryTime = vacDay.expiryDate.getTime();
 
-		// Preprocess: filter out past days and already selected days in one pass
+		// Preprocess: filter out past days, already selected days, and days after expiry date
 		const candidateDays: Date[] = [];
 		for (const month of daysOfYear) {
 			for (const week of month) {
 				for (const day of week) {
 					if (day) {
 						day.setHours(0, 0, 0, 0);
-						if (day.getTime() >= nowTime && !this.isSelected(day)) {
+						const dayTime = day.getTime();
+						if (dayTime >= nowTime && dayTime <= expiryTime && !this.isSelected(day)) {
 							candidateDays.push(day);
 						}
 					}
@@ -794,6 +855,7 @@ export class SelectedDates implements SelectedDateInterface {
 			return { apply: () => {}, heuristic: SelectedDates.NO_VALID_STRATEGY_HEURISTIC };
 		}
 
+		const vacType = vacDay.type as unknown as DayType;
 		const tempDatesBackup = [...this._datesSelected];
 		let bestStrategy: { apply: () => void; heuristic: number; value: Date } | null = null;
 		let bestHeuristic = -Infinity;

src/app/services/user-input-service.ts

@@ -1,5 +1,5 @@
 import { Injectable, signal } from '@angular/core';
-import { VacationsNumber } from './calendar-service';
+import { SelectableDayType, VacDay } from './calendar-service';
 
 @Injectable({
 	providedIn: 'root',
@@ -9,18 +9,39 @@ export class UserInputService {
 		return Math.floor(Math.random() * 9) + 1;
 	}
 
-	private getInitialValues(): VacationsNumber {
+	private getInitialValues(): VacDay[] {
+		return [
+			{
+				id: crypto.randomUUID(),
+				type: SelectableDayType.CP,
+				numberOfDays: this.getRandomNumber(),
+				// today + 365 days
+				expiryDate: new Date(new Date().setFullYear(new Date().getFullYear() + 1)),
+			},
+			{
+				id: crypto.randomUUID(),
+				type: SelectableDayType.RTT,
+				numberOfDays: this.getRandomNumber(),
+				expiryDate: new Date(new Date().setFullYear(new Date().getFullYear() + 1)),
+			},
+			{
+				id: crypto.randomUUID(),
+				type: SelectableDayType.OTHER,
+				numberOfDays: this.getRandomNumber(),
+				expiryDate: new Date(new Date().setFullYear(new Date().getFullYear() + 1)),
+			},
+		];
+	}
+
+	public createVacationDay(): VacDay {
 		return {
-			cp: this.getRandomNumber(),
+			id: crypto.randomUUID(),
-			rtt: this.getRandomNumber(),
+			type: SelectableDayType.CP,
-			other: this.getRandomNumber(),
+			numberOfDays: 1,
+			expiryDate: new Date(new Date().setFullYear(new Date().getFullYear() + 1)),
 		};
 	}
 
-	readonly vacationNumberSignal = signal<VacationsNumber>(this.getInitialValues());
+	readonly vacationNumberSignal = signal<VacDay[]>(this.getInitialValues());
-	readonly remainingVacationDaysSignal = signal<VacationsNumber>({
+	readonly remainingVacationDaysSignal = signal<VacDay[]>([]);
-		cp: 0,
-		rtt: 0,
-		other: 0,
-	});
 }