Add logging service and refactor console.warn to use it

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

.github/dependabot.yml

@@ -0,0 +1,34 @@
+version: 2
+updates:
+    # Enable version updates for npm
+    - package-ecosystem: 'npm'
+      directory: '/'
+      schedule:
+          interval: 'weekly'
+          day: 'monday'
+      open-pull-requests-limit: 10
+      groups:
+          angular:
+              patterns:
+                  - '@angular/*'
+          development-dependencies:
+              dependency-type: 'development'
+              update-types:
+                  - 'minor'
+                  - 'patch'
+
+    # Enable version updates for GitHub Actions
+    - package-ecosystem: 'github-actions'
+      directory: '/'
+      schedule:
+          interval: 'weekly'
+          day: 'monday'
+      open-pull-requests-limit: 5
+
+    # Enable version updates for Docker
+    - package-ecosystem: 'docker'
+      directory: '/'
+      schedule:
+          interval: 'weekly'
+          day: 'monday'
+      open-pull-requests-limit: 5

.github/workflows/codeql.yml

@@ -1,101 +1,41 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL Advanced"
+name: CodeQL Security Analysis
 
 on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-  schedule:
-    - cron: '27 7 * * 2'
+    push:
+        branches: [main]
+    pull_request:
+        branches: [main]
+    schedule:
+        - cron: '0 0 * * 1' # Run every Monday at midnight UTC
 
 jobs:
-  analyze:
-    name: Analyze (${{ matrix.language }})
-    # Runner size impacts CodeQL analysis time. To learn more, please see:
-    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-    #   - https://gh.io/supported-runners-and-hardware-resources
-    #   - https://gh.io/using-larger-runners (GitHub.com only)
-    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-    permissions:
-      # required for all workflows
-      security-events: write
+    analyze:
+        name: Analyze Code
+        runs-on: ubuntu-latest
+        permissions:
+            security-events: write
+            actions: read
+            contents: read
 
-      # required to fetch internal or private CodeQL packs
-      packages: read
+        strategy:
+            fail-fast: false
+            matrix:
+                language: ['javascript-typescript']
 
-      # only required for workflows in private repositories
-      actions: read
-      contents: read
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
 
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - language: actions
-          build-mode: none
-        - language: javascript-typescript
-          build-mode: none
-        # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
-        # Use `c-cpp` to analyze code written in C, C++ or both
-        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
-        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
-        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
-        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
-        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
-        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
+            - name: Initialize CodeQL
+              uses: github/codeql-action/init@v4
+              with:
+                  languages: ${{ matrix.language }}
+                  queries: security-extended,security-and-quality
 
-    # Add any setup steps before running the `github/codeql-action/init` action.
-    # This includes steps like installing compilers or runtimes (`actions/setup-node`
-    # or others). This is typically only required for manual builds.
-    # - name: Setup runtime (example)
-    #   uses: actions/setup-example@v1
+            - name: Autobuild
+              uses: github/codeql-action/autobuild@v4
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
-      with:
-        languages: ${{ matrix.language }}
-        build-mode: ${{ matrix.build-mode }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-    # If the analyze step fails for one of the languages you are analyzing with
-    # "We were unable to automatically build your code", modify the matrix above
-    # to set the build mode to "manual" for that language. Then modify this step
-    # to build your code.
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-    - name: Run manual build steps
-      if: matrix.build-mode == 'manual'
-      shell: bash
-      run: |
-        echo 'If you are using a "manual" build mode for one or more of the' \
-          'languages you are analyzing, replace this with the commands to build' \
-          'your code, for example:'
-        echo '  make bootstrap'
-        echo '  make release'
-        exit 1
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
-      with:
-        category: "/language:${{matrix.language}}"
+            - name: Perform CodeQL Analysis
+              uses: github/codeql-action/analyze@v4
+              with:
+                  category: '/language:${{matrix.language}}'

.github/workflows/docker-build-push.yml

@@ -5,6 +5,7 @@ on:
         branches: [main]
     release:
         types: [published]
+    workflow_dispatch:
 
 jobs:
     build-and-push:
@@ -12,10 +13,14 @@ jobs:
         permissions:
             contents: read
             packages: write
+            security-events: write
 
         steps:
             - uses: actions/checkout@v4
 
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v3
+
             - name: Log in to GitHub Container Registry
               uses: docker/login-action@v3
               with:
@@ -33,11 +38,28 @@ jobs:
                       type=semver,pattern={{version}}
                       type=semver,pattern={{major}}.{{minor}}
                       type=sha
+                      type=raw,value=latest,enable={{is_default_branch}}
 
             - name: Build and push
-              uses: docker/build-push-action@v5
+              id: build
+              uses: docker/build-push-action@v6
               with:
                   context: .
                   push: true
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}
+                  cache-from: type=gha
+                  cache-to: type=gha,mode=max
+
+            - name: Run Trivy vulnerability scanner
+              uses: aquasecurity/trivy-action@0.33.1
+              with:
+                  image-ref: ghcr.io/thoguet/vac-optimizer@${{ steps.build.outputs.digest }}
+                  format: 'sarif'
+                  output: 'trivy-results.sarif'
+
+            - name: Upload Trivy results to GitHub Security tab
+              uses: github/codeql-action/upload-sarif@v4
+              if: always()
+              with:
+                  sarif_file: 'trivy-results.sarif'

.github/workflows/pr-validation.yml

@@ -0,0 +1,105 @@
+name: PR Validation
+
+on:
+    pull_request:
+        branches: [main]
+    push:
+        branches: [main]
+
+jobs:
+    lint:
+        name: Lint Check
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v6
+              with:
+                  node-version: '20'
+                  cache: 'npm'
+
+            - name: Install dependencies
+              run: npm ci
+
+            - name: Check code formatting with Prettier
+              run: npx prettier --check "src/**/*.{ts,html,scss,css,json}"
+
+            - name: Run ESLint
+              run: npx eslint "src/**/*.ts"
+
+    type-check:
+        name: TypeScript Type Check
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v6
+              with:
+                  node-version: '20'
+                  cache: 'npm'
+
+            - name: Install dependencies
+              run: npm ci
+
+            - name: Run TypeScript compiler
+              run: npx tsc --noEmit
+
+    test:
+        name: Unit Tests
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v6
+              with:
+                  node-version: '20'
+                  cache: 'npm'
+
+            - name: Install dependencies
+              run: npm ci
+
+            - name: Run unit tests
+              run: npm test -- --watch=false --browsers=ChromeHeadless --code-coverage
+
+            - name: Upload coverage reports
+              uses: codecov/codecov-action@v5
+              if: always()
+              with:
+                  token: ${{ secrets.CODECOV_TOKEN }}
+                  files: ./coverage/vac-optimizer/lcov.info
+                  fail_ci_if_error: false
+
+    build:
+        name: Build Application
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v6
+              with:
+                  node-version: '20'
+                  cache: 'npm'
+
+            - name: Install dependencies
+              run: npm ci
+
+            - name: Build production bundle
+              run: npm run build -- --configuration production
+              env:
+                  NG_BUILD_CACHE: '.angular/cache'
+
+            - name: Check bundle size
+              run: |
+                  du -sh dist/vac-optimizer/browser
+                  echo "Build completed successfully"
+
+            - name: Upload build artifacts
+              uses: actions/upload-artifact@v5
+              with:
+                  name: build-artifacts
+                  path: dist/
+                  retention-days: 7

Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Build the Angular application
-FROM node:20-alpine AS builder
+FROM node:25-alpine AS builder
 
 # Set working directory
 WORKDIR /app
@@ -17,7 +17,7 @@ COPY . .
 RUN npm run build
 
 # Stage 2: Production image
-FROM node:20-alpine AS production
+FROM node:25-alpine AS production
 
 # Set working directory
 WORKDIR /app

README.md

@@ -12,6 +12,38 @@ ng serve
 
 Once the server is running, open your browser and navigate to `http://localhost:4200/`. The application will automatically reload whenever you modify any of the source files.
 
+## Code Quality
+
+This project uses ESLint and Prettier to maintain code quality and consistency.
+
+### Linting
+
+Check for linting errors:
+
+```bash
+npm run lint
+```
+
+Auto-fix linting issues:
+
+```bash
+npm run lint:fix
+```
+
+### Formatting
+
+Check code formatting:
+
+```bash
+npm run format:check
+```
+
+Format code:
+
+```bash
+npm run format
+```
+
 ## Code scaffolding
 
 Angular CLI includes powerful code scaffolding tools. To generate a new component, run:
@@ -54,6 +86,15 @@ ng e2e
 
 Angular CLI does not come with an end-to-end testing framework by default. You can choose one that suits your needs.
 
+## CI/CD
+
+This project uses GitHub Actions for continuous integration and deployment:
+
+- **PR Validation**: Automatically runs on pull requests to validate code quality, run tests, and build the application
+- **Docker Build & Push**: Builds and publishes Docker images to GitHub Container Registry on main branch pushes and releases
+- **CodeQL Analysis**: Runs security analysis weekly and on pull requests
+- **Dependabot**: Automatically updates dependencies weekly
+
 ## Additional Resources
 
 For more information on using the Angular CLI, including detailed command references, visit the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.

angular.json

@@ -52,7 +52,10 @@
 									"maximumError": "16kB"
 								}
 							],
-							"outputHashing": "all"
+							"outputHashing": "all",
+							"optimization": {
+								"fonts": false
+							}
 						},
 						"development": {
 							"optimization": false,

eslint.config.mjs

@@ -0,0 +1,34 @@
+import eslintJs from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import prettier from 'eslint-config-prettier';
+import prettierPlugin from 'eslint-plugin-prettier';
+
+export default [
+    eslintJs.configs.recommended,
+    ...tseslint.configs.recommended,
+    prettier,
+    {
+        files: ['**/*.ts'],
+        plugins: {
+            prettier: prettierPlugin,
+        },
+        languageOptions: {
+            parserOptions: {
+                projectService: true,
+                tsconfigRootDir: import.meta.dirname,
+            },
+        },
+        rules: {
+            'prettier/prettier': 'error',
+            '@typescript-eslint/no-explicit-any': 'warn',
+            '@typescript-eslint/explicit-function-return-type': 'off',
+            '@typescript-eslint/no-unused-vars': [
+                'error',
+                { argsIgnorePattern: '^_', varsIgnorePattern: '^_' },
+            ],
+        },
+    },
+    {
+        ignores: ['dist/**', 'node_modules/**', '.angular/**', 'coverage/**'],
+    },
+];

package.json

@@ -7,7 +7,11 @@
 		"build": "ng build",
 		"watch": "ng build --watch --configuration development",
 		"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:fix": "eslint \"src/**/*.ts\" --fix",
+		"format": "prettier --write \"src/**/*.{ts,html,scss,css,json}\"",
+		"format:check": "prettier --check \"src/**/*.{ts,html,scss,css,json}\""
 	},
 	"prettier": {
 		"printWidth": 100,
@@ -23,16 +27,16 @@
 	},
 	"private": true,
 	"dependencies": {
-		"@angular/cdk": "^20.2.10",
-		"@angular/common": "^20.3.0",
-		"@angular/compiler": "^20.3.0",
-		"@angular/core": "^20.3.7",
-		"@angular/forms": "^20.3.0",
-		"@angular/material": "^20.2.10",
-		"@angular/platform-browser": "^20.3.0",
-		"@angular/platform-server": "^20.3.0",
-		"@angular/router": "^20.3.0",
-		"@angular/ssr": "^20.3.7",
+		"@angular/cdk": "^20.2.12",
+		"@angular/common": "^20.3.10",
+		"@angular/compiler": "^20.3.10",
+		"@angular/core": "^20.3.10",
+		"@angular/forms": "^20.3.10",
+		"@angular/material": "^20.2.12",
+		"@angular/platform-browser": "^20.3.10",
+		"@angular/platform-server": "^20.3.10",
+		"@angular/router": "^20.3.10",
+		"@angular/ssr": "^20.3.10",
 		"date-holidays": "^3.26.2",
 		"dayjs": "^1.11.19",
 		"express": "^5.1.0",
@@ -40,17 +44,18 @@
 		"tslib": "^2.3.0"
 	},
 	"devDependencies": {
-		"@angular/build": "^20.3.7",
-		"@angular/cli": "^20.3.7",
-		"@angular/compiler-cli": "^20.3.0",
+		"@angular/build": "^20.3.10",
+		"@angular/cli": "^20.3.10",
+		"@angular/compiler-cli": "^20.3.10",
+		"@eslint/js": "^9.39.1",
 		"@types/express": "^5.0.1",
 		"@types/jasmine": "~5.1.0",
 		"@types/jest": "^30.0.0",
-		"@types/node": "^20.17.19",
-		"eslint": "^9.38.0",
+		"@types/node": "^24.10.0",
+		"eslint": "^9.39.1",
 		"eslint-config-prettier": "^10.1.8",
 		"eslint-plugin-prettier": "^5.5.4",
-		"jasmine-core": "~5.9.0",
+		"jasmine-core": "~5.12.1",
 		"jest": "^30.2.0",
 		"jest-preset-angular": "^15.0.3",
 		"karma": "~6.4.0",
@@ -59,6 +64,7 @@
 		"karma-jasmine": "~5.1.0",
 		"karma-jasmine-html-reporter": "~2.1.0",
 		"prettier": "^3.6.2",
-		"typescript": "~5.9.2"
+		"typescript": "~5.9.2",
+		"typescript-eslint": "^8.46.4"
 	}
 }

src/app/app.config.server.ts

@@ -4,9 +4,7 @@ import { appConfig } from './app.config';
 import { serverRoutes } from './app.routes.server';
 
 const serverConfig: ApplicationConfig = {
-	providers: [
-		provideServerRendering(withRoutes(serverRoutes))
-	]
+	providers: [provideServerRendering(withRoutes(serverRoutes))],
 };
 
 export const config = mergeApplicationConfig(appConfig, serverConfig);

src/app/app.routes.server.ts

@@ -3,6 +3,6 @@ import { RenderMode, ServerRoute } from '@angular/ssr';
 export const serverRoutes: ServerRoute[] = [
 	{
 		path: '**',
-		renderMode: RenderMode.Client
-	}
+		renderMode: RenderMode.Client,
+	},
 ];

src/app/app.spec.ts

@@ -6,7 +6,7 @@ describe('App', () => {
 	beforeEach(async () => {
 		await TestBed.configureTestingModule({
 			imports: [App],
-			providers: [provideZonelessChangeDetection()]
+			providers: [provideZonelessChangeDetection()],
 		}).compileComponents();
 	});
 

src/app/app.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, model, signal } from '@angular/core';
+import { ChangeDetectionStrategy, Component, signal } from '@angular/core';
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { provideNativeDateAdapter } from '@angular/material/core';
 import { MatDivider } from '@angular/material/divider';

src/app/components/calendar-month/calendar-month.html

@@ -2,7 +2,7 @@
 	<h3>{{ getMonthName() }} {{ year }}</h3>
 	<div>
 		<div class="row header">
-			@if (calendarSettingsService.showWeekNumbers()) {
+			@if (calendarSettingsService.get('showWeekNumbers')()) {
 				<p class="day empty week-number"></p>
 			}
 			<p class="day">L</p>
@@ -16,7 +16,7 @@
 		<div class="cols">
 			@for (week of weeksInAMonth; track $index) {
 				<div class="row week">
-					@if (calendarSettingsService.showWeekNumbers()) {
+					@if (calendarSettingsService.get('showWeekNumbers')()) {
 						<p
 							class="day week-number"
 							[class.start]="$index === 0"
@@ -38,7 +38,6 @@
 								class="day number"
 								[matTooltip]="selectedDates.getTooltip(day)"
 								[matTooltipShowDelay]="500"
-								[matTooltipTouchGestures]="'on'"
 							>
 								{{ day.getDate() }}
 							</p>

src/app/components/calendar-month/calendar-month.spec.ts

@@ -3,22 +3,21 @@ import { provideZonelessChangeDetection } from '@angular/core';
 import { CalendarMonth } from './calendar-month';
 
 describe('CalendarMonth', () => {
-  let component: CalendarMonth;
-  let fixture: ComponentFixture<CalendarMonth>;
+	let component: CalendarMonth;
+	let fixture: ComponentFixture<CalendarMonth>;
 
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [CalendarMonth],
-      providers: [provideZonelessChangeDetection()]
-    })
-    .compileComponents();
+	beforeEach(async () => {
+		await TestBed.configureTestingModule({
+			imports: [CalendarMonth],
+			providers: [provideZonelessChangeDetection()],
+		}).compileComponents();
 
-    fixture = TestBed.createComponent(CalendarMonth);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+		fixture = TestBed.createComponent(CalendarMonth);
+		component = fixture.componentInstance;
+		fixture.detectChanges();
+	});
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+	it('should create', () => {
+		expect(component).toBeTruthy();
+	});
 });

src/app/components/calendar-settings/calendar-settings.spec.ts

@@ -3,22 +3,21 @@ import { provideZonelessChangeDetection } from '@angular/core';
 import { CalendarSettings } from './calendar-settings';
 
 describe('CalendarSettings', () => {
-  let component: CalendarSettings;
-  let fixture: ComponentFixture<CalendarSettings>;
+	let component: CalendarSettings;
+	let fixture: ComponentFixture<CalendarSettings>;
 
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [CalendarSettings],
-      providers: [provideZonelessChangeDetection()]
-    })
-    .compileComponents();
+	beforeEach(async () => {
+		await TestBed.configureTestingModule({
+			imports: [CalendarSettings],
+			providers: [provideZonelessChangeDetection()],
+		}).compileComponents();
 
-    fixture = TestBed.createComponent(CalendarSettings);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+		fixture = TestBed.createComponent(CalendarSettings);
+		component = fixture.componentInstance;
+		fixture.detectChanges();
+	});
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+	it('should create', () => {
+		expect(component).toBeTruthy();
+	});
 });

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

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { MatButton, MatButtonModule } from '@angular/material/button';
+import { MatButtonModule } from '@angular/material/button';
 import { MatDialog } from '@angular/material/dialog';
-import { MatIcon, MatIconModule } from '@angular/material/icon';
+import { MatIconModule } from '@angular/material/icon';
 import { CalendarSettingsDialog } from '../dialog/calendar-settings-dialog/calendar-settings-dialog';
 import { MatDividerModule } from '@angular/material/divider';
 

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

@@ -1,17 +1,24 @@
 <div class="calendar-year">
 	@if (isLoading()) {
-	<div class="loading-overlay">
-		<div class="loading-spinner">
-			<mat-spinner></mat-spinner>
-			<p>Calcul en cours...</p>
+		<div class="loading-overlay">
+			<div class="loading-spinner">
+				<div class="spinner-container">
+					<mat-spinner [mode]="'determinate'" [value]="loadingProgress()"></mat-spinner>
+					<div class="spinner-text">{{ loadingProgress() }}%</div>
+				</div>
+				<p>Calcul en cours...</p>
+			</div>
 		</div>
-	</div>
 	}
 	@for (month of months; track $index) {
-	<mat-card class="card">
-		<mat-card-content>
-			<app-calendar-month [monthIndex]="month" [year]="getYear(month)" [selectedDates]="selectedDates"></app-calendar-month>
-		</mat-card-content>
-	</mat-card>
+		<mat-card class="card">
+			<mat-card-content>
+				<app-calendar-month
+					[monthIndex]="month"
+					[year]="getYear(month)"
+					[selectedDates]="selectedDates"
+				></app-calendar-month>
+			</mat-card-content>
+		</mat-card>
 	}
 </div>

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

@@ -51,20 +51,32 @@
 	}
 }
 
+.spinner-container {
+	position: relative;
+	display: inline-block;
+
+	::ng-deep .mat-mdc-progress-spinner {
+		// Override Material spinner size
+		width: 100px;
+		height: 100px;
+	}
+
+	.spinner-text {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		font-size: 20px;
+		font-weight: bold;
+		color: #333;
+		pointer-events: none;
+
+		@media (prefers-color-scheme: dark) {
+			color: #ddd;
+		}
+	}
+}
+
 .card {
 	margin: 16px;
 }
-
-@keyframes spin {
-	0% {
-		transform: rotate(0deg);
-	}
-
-	100% {
-		transform: rotate(360deg);
-	}
-}
-
-:root {
-	@include mat.progress-spinner-overrides((size: 0.5rem, active-indicator-width: 0.25rem));
-}

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

@@ -3,22 +3,21 @@ import { provideZonelessChangeDetection } from '@angular/core';
 import { CalendarYear } from './calendar-year';
 
 describe('CalendarYear', () => {
-  let component: CalendarYear;
-  let fixture: ComponentFixture<CalendarYear>;
+	let component: CalendarYear;
+	let fixture: ComponentFixture<CalendarYear>;
 
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [CalendarYear],
-      providers: [provideZonelessChangeDetection()]
-    })
-    .compileComponents();
+	beforeEach(async () => {
+		await TestBed.configureTestingModule({
+			imports: [CalendarYear],
+			providers: [provideZonelessChangeDetection()],
+		}).compileComponents();
 
-    fixture = TestBed.createComponent(CalendarYear);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+		fixture = TestBed.createComponent(CalendarYear);
+		component = fixture.componentInstance;
+		fixture.detectChanges();
+	});
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+	it('should create', () => {
+		expect(component).toBeTruthy();
+	});
 });

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

@@ -7,6 +7,7 @@ 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';
+import { LoggerService } from '../../services/logger.service';
 
 @Component({
 	selector: 'app-calendar-year',
@@ -19,8 +20,10 @@ export class CalendarYear {
 	private userInput = inject(UserInputService);
 	private calendarService = inject(CalendarService);
 	private calendarSettingsService = inject(CalendarSettingsService);
+	private logger = inject(LoggerService);
 
 	protected isLoading = signal(true);
+	protected loadingProgress = signal(0);
 
 	// Use DateCacheService instead of creating Date objects
 	private get currentMonth() {
@@ -35,22 +38,31 @@ export class CalendarYear {
 		effect(() => {
 			this.selectedDates = this.calendarService.getSelectedDatesForYear();
 			const vacationData = this.userInput.vacationNumberSignal();
-			const c = this.calendarSettingsService.samediMalin();
+			const c = this.calendarSettingsService.get('samediMalin')();
 			console.log('Samedi Malin setting:', c);
 			console.log('Optimizing vacations with data:', vacationData);
 			this.isLoading.set(true);
-			// Simulate server-side calculation with a small delay
-			setTimeout(() => {
-				if (this.selectedDates) {
-					// Create a copy to avoid mutating the original signal data
-					this.selectedDates.optimizeVacations(
-						{ ...vacationData },
-						this.calendarSettingsService,
-						this.calendarService,
-					);
-				}
-				this.isLoading.set(false);
-			}, 1);
+			this.loadingProgress.set(0);
+			// Defer execution to allow UI to update
+			queueMicrotask(() => {
+				void (async () => {
+					if (this.selectedDates) {
+						// Create a copy to avoid mutating the original signal data
+						const remainingDays = await this.selectedDates.optimizeVacations(
+							{ ...vacationData },
+							this.calendarSettingsService,
+							this.calendarService,
+							(progress: number) => {
+								this.loadingProgress.set(progress);
+							},
+							this.logger,
+						);
+						// Update the remaining vacation days signal
+						this.userInput.remainingVacationDaysSignal.set(remainingDays);
+					}
+					this.isLoading.set(false);
+				})();
+			});
 		});
 	}
 

src/app/components/dialog/calendar-settings-dialog/calendar-settings-dialog.html

@@ -4,26 +4,18 @@
 		<p>Configure your calendar settings here.</p>
 	</div>
 	<div style="display: flex; flex-direction: column; gap: 1rem">
-		<div style="align-self: flex-start">
-			<mat-slide-toggle
-				id="showWeekNumbers"
-				name="showWeekNumbers"
-				[checked]="calendarSettingsService.showWeekNumbers()"
-				(change)="calendarSettingsService.showWeekNumbers.set($event.checked)"
-			>
-				Afficher les numéros de semaine
-			</mat-slide-toggle>
-		</div>
-		<div style="align-self: flex-start">
-			<mat-slide-toggle
-				id="samediMalin"
-				name="samediMalin"
-				[checked]="calendarSettingsService.samediMalin()"
-				(change)="calendarSettingsService.samediMalin.set($event.checked)"
-			>
-				Activer le Samedi Malin
-			</mat-slide-toggle>
-		</div>
+		@for (setting of calendarSettingsService.settingsArray; track setting.id) {
+			<div style="align-self: flex-start">
+				<mat-slide-toggle
+					[id]="setting.id"
+					[name]="setting.id"
+					[checked]="setting.signal()"
+					(change)="setting.signal.set($event.checked)"
+				>
+					{{ setting.description }}
+				</mat-slide-toggle>
+			</div>
+		}
 	</div>
 	<button mat-button (click)="closeDialog()">Fermer</button>
 </div>

src/app/components/dialog/calendar-settings-dialog/calendar-settings-dialog.spec.ts

@@ -4,39 +4,38 @@ import { MatDialogRef } from '@angular/material/dialog';
 import { CalendarSettingsDialog } from './calendar-settings-dialog';
 
 describe('CalendarSettingsDialog', () => {
-  let component: CalendarSettingsDialog;
-  let fixture: ComponentFixture<CalendarSettingsDialog>;
+	let component: CalendarSettingsDialog;
+	let fixture: ComponentFixture<CalendarSettingsDialog>;
 
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [CalendarSettingsDialog],
-      providers: [
-        provideZonelessChangeDetection(),
-        {
-          provide: MatDialogRef,
-          useValue: {
-            close: jasmine.createSpy('close')
-          }
-        }
-      ]
-    })
-    .compileComponents();
+	beforeEach(async () => {
+		await TestBed.configureTestingModule({
+			imports: [CalendarSettingsDialog],
+			providers: [
+				provideZonelessChangeDetection(),
+				{
+					provide: MatDialogRef,
+					useValue: {
+						close: jasmine.createSpy('close'),
+					},
+				},
+			],
+		}).compileComponents();
 
-    fixture = TestBed.createComponent(CalendarSettingsDialog);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+		fixture = TestBed.createComponent(CalendarSettingsDialog);
+		component = fixture.componentInstance;
+		fixture.detectChanges();
+	});
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+	it('should create', () => {
+		expect(component).toBeTruthy();
+	});
 
-  it('should have calendar settings service', () => {
-    expect(component['calendarSettingsService']).toBeDefined();
-  });
+	it('should have calendar settings service', () => {
+		expect(component['calendarSettingsService']).toBeDefined();
+	});
 
-  it('should close dialog when closeDialog is called', () => {
-    component.closeDialog();
-    expect(component.dialogRef.close).toHaveBeenCalled();
-  });
+	it('should close dialog when closeDialog is called', () => {
+		component.closeDialog();
+		expect(component.dialogRef.close).toHaveBeenCalled();
+	});
 });

src/app/components/dialog/calendar-settings-dialog/calendar-settings-dialog.ts

@@ -1,10 +1,8 @@
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
 import { MatButton } from '@angular/material/button';
-import { MatCheckbox } from '@angular/material/checkbox';
 import { MatDialogRef } from '@angular/material/dialog';
 import { CalendarSettingsService } from '../../../services/calendar-settings-service';
 import { MatSlideToggle } from '@angular/material/slide-toggle';
-import { CdkFixedSizeVirtualScroll } from '@angular/cdk/scrolling';
 
 @Component({
 	selector: 'app-calendar-settings-dialog',
@@ -13,10 +11,8 @@ import { CdkFixedSizeVirtualScroll } from '@angular/cdk/scrolling';
 	styleUrl: './calendar-settings-dialog.scss',
 })
 export class CalendarSettingsDialog {
-	constructor(
-		public dialogRef: MatDialogRef<CalendarSettingsDialog>,
-		protected calendarSettingsService: CalendarSettingsService,
-	) {}
+	public readonly dialogRef = inject<MatDialogRef<CalendarSettingsDialog>>(MatDialogRef);
+	protected readonly calendarSettingsService = inject(CalendarSettingsService);
 
 	closeDialog() {
 		this.dialogRef.close();

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

@@ -14,5 +14,16 @@
 			<input matInput type="number" max="365" min="0" formControlName="Others" />
 		</mat-form-field>
 	</form>
+	@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>
+				<span>
+					{{ remainingDays() }} jour{{ remainingDays() > 1 ? 's' : '' }} de vacances non
+					placé{{ remainingDays() > 1 ? 's' : '' }}. Veuillez les placer manuellement.
+				</span>
+			</mat-card-content>
+		</mat-card>
+	}
 	<app-calendar-settings></app-calendar-settings>
 </div>

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

@@ -13,6 +13,16 @@
 		font-size: 0.875rem;
 		margin-top: 0.25rem;
 	}
+
+	.warning-card {
+		margin-bottom: 1rem;
+	}
+
+	.warning-content {
+		display: flex;
+		align-items: center;
+		gap: 0.5rem;
+	}
 }
 
 form {

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

@@ -3,39 +3,38 @@ import { provideZonelessChangeDetection } from '@angular/core';
 import { UserInput } from './user-input';
 
 describe('UserInput', () => {
-  let component: UserInput;
-  let fixture: ComponentFixture<UserInput>;
+	let component: UserInput;
+	let fixture: ComponentFixture<UserInput>;
 
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [UserInput],
-      providers: [provideZonelessChangeDetection()]
-    })
-    .compileComponents();
+	beforeEach(async () => {
+		await TestBed.configureTestingModule({
+			imports: [UserInput],
+			providers: [provideZonelessChangeDetection()],
+		}).compileComponents();
 
-    fixture = TestBed.createComponent(UserInput);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+		fixture = TestBed.createComponent(UserInput);
+		component = fixture.componentInstance;
+		fixture.detectChanges();
+	});
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+	it('should create', () => {
+		expect(component).toBeTruthy();
+	});
 
-  it('should initialize form with values from service', () => {
-    expect(component.userInputForm).toBeDefined();
-    expect(component.userInputForm.get('CP')).toBeDefined();
-    expect(component.userInputForm.get('RTT')).toBeDefined();
-    expect(component.userInputForm.get('Others')).toBeDefined();
-  });
+	it('should initialize form with values from service', () => {
+		expect(component.userInputForm).toBeDefined();
+		expect(component.userInputForm.get('CP')).toBeDefined();
+		expect(component.userInputForm.get('RTT')).toBeDefined();
+		expect(component.userInputForm.get('Others')).toBeDefined();
+	});
 
-  it('should have valid form controls', () => {
-    const cpControl = component.userInputForm.get('CP');
-    const rttControl = component.userInputForm.get('RTT');
-    const othersControl = component.userInputForm.get('Others');
+	it('should have valid form controls', () => {
+		const cpControl = component.userInputForm.get('CP');
+		const rttControl = component.userInputForm.get('RTT');
+		const othersControl = component.userInputForm.get('Others');
 
-    expect(cpControl).toBeTruthy();
-    expect(rttControl).toBeTruthy();
-    expect(othersControl).toBeTruthy();
-  });
+		expect(cpControl).toBeTruthy();
+		expect(rttControl).toBeTruthy();
+		expect(othersControl).toBeTruthy();
+	});
 });

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

@@ -1,11 +1,13 @@
-import { Component, OnInit, OnDestroy, effect } from '@angular/core';
+import { Component, OnInit, OnDestroy, effect, computed } from '@angular/core';
 import { MatFormField, MatLabel } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
-import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
+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';
 
 @Component({
 	selector: 'app-user-input',
@@ -15,7 +17,9 @@ import { CalendarSettings } from '../calendar-settings/calendar-settings';
 		MatInputModule,
 		ReactiveFormsModule,
 		CalendarSettings,
-		CalendarSettings,
+		MatCard,
+		MatCardContent,
+		MatIcon,
 	],
 	templateUrl: './user-input.html',
 	styleUrl: './user-input.scss',
@@ -44,6 +48,13 @@ export class UserInput implements OnInit, OnDestroy {
 		Others: new FormControl<number | null>(null),
 	});
 
+	protected remainingDays = computed(() => {
+		const remaining = this.userInputService.remainingVacationDaysSignal();
+		return remaining.cp + remaining.rtt + remaining.other;
+	});
+
+	protected hasRemainingDays = computed(() => this.remainingDays() > 0);
+
 	ngOnInit() {
 		this.userInputForm.valueChanges
 			.pipe(debounceTime(1500), takeUntil(this.destroy$))

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

@@ -3,22 +3,21 @@ import { provideZonelessChangeDetection } from '@angular/core';
 import { UserSettings } from './user-settings';
 
 describe('UserSettings', () => {
-  let component: UserSettings;
-  let fixture: ComponentFixture<UserSettings>;
+	let component: UserSettings;
+	let fixture: ComponentFixture<UserSettings>;
 
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [UserSettings],
-      providers: [provideZonelessChangeDetection()]
-    })
-    .compileComponents();
+	beforeEach(async () => {
+		await TestBed.configureTestingModule({
+			imports: [UserSettings],
+			providers: [provideZonelessChangeDetection()],
+		}).compileComponents();
 
-    fixture = TestBed.createComponent(UserSettings);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+		fixture = TestBed.createComponent(UserSettings);
+		component = fixture.componentInstance;
+		fixture.detectChanges();
+	});
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+	it('should create', () => {
+		expect(component).toBeTruthy();
+	});
 });

src/app/services/calendar-service.spec.ts

@@ -1,11 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { provideZonelessChangeDetection } from '@angular/core';
-import {
-	CalendarService,
-	DayType,
-	SelectedDate,
-	SelectedDates,
-} from './calendar-service';
+import { CalendarService, DayType, SelectedDate, SelectedDates } from './calendar-service';
 import { DateRange } from '@angular/material/datepicker';
 
 describe('CalendarService', () => {
@@ -111,47 +106,32 @@ describe('CalendarService', () => {
 describe('SelectedDate', () => {
 	it('should check if date is selected', () => {
 		const date = new Date(2024, 0, 1);
-		const selectedDate = new SelectedDate(
-			DayType.CP,
-			new DateRange<Date>(date, date),
-		);
+		const selectedDate = new SelectedDate(DayType.CP, new DateRange<Date>(date, date));
 		expect(selectedDate.isSelected(date)).toBe(true);
 	});
 
 	it('should check if date is start', () => {
 		const date = new Date(2024, 0, 1);
-		const selectedDate = new SelectedDate(
-			DayType.CP,
-			new DateRange<Date>(date, date),
-		);
+		const selectedDate = new SelectedDate(DayType.CP, new DateRange<Date>(date, date));
 		expect(selectedDate.isStart(date)).toBe(true);
 	});
 
 	it('should check if date is end', () => {
 		const date = new Date(2024, 0, 1);
-		const selectedDate = new SelectedDate(
-			DayType.CP,
-			new DateRange<Date>(date, date),
-		);
+		const selectedDate = new SelectedDate(DayType.CP, new DateRange<Date>(date, date));
 		expect(selectedDate.isEnd(date)).toBe(true);
 	});
 
 	it('should return correct classes for date', () => {
 		const date = new Date(2024, 0, 1);
-		const selectedDate = new SelectedDate(
-			DayType.CP,
-			new DateRange<Date>(date, date),
-		);
+		const selectedDate = new SelectedDate(DayType.CP, new DateRange<Date>(date, date));
 		const classes = selectedDate.getClasses(date);
 		expect(classes).toContain(DayType.CP);
 	});
 
 	it('should return tooltip for selected date', () => {
 		const date = new Date(2024, 0, 1);
-		const selectedDate = new SelectedDate(
-			DayType.CP,
-			new DateRange<Date>(date, date),
-		);
+		const selectedDate = new SelectedDate(DayType.CP, new DateRange<Date>(date, date));
 		const tooltip = selectedDate.getTooltip(date);
 		expect(tooltip).toBeTruthy();
 	});
@@ -159,19 +139,13 @@ describe('SelectedDate', () => {
 	it('should calculate length in days', () => {
 		const startDate = new Date(2024, 0, 1);
 		const endDate = new Date(2024, 0, 3);
-		const selectedDate = new SelectedDate(
-			DayType.CP,
-			new DateRange<Date>(startDate, endDate),
-		);
+		const selectedDate = new SelectedDate(DayType.CP, new DateRange<Date>(startDate, endDate));
 		expect(selectedDate.getLengthInDays()).toBe(3);
 	});
 
 	it('should not mark TODAY as selected', () => {
 		const date = new Date(2024, 0, 1);
-		const selectedDate = new SelectedDate(
-			DayType.TODAY,
-			new DateRange<Date>(date, date),
-		);
+		const selectedDate = new SelectedDate(DayType.TODAY, new DateRange<Date>(date, date));
 		expect(selectedDate.isSelected(date)).toBe(false);
 	});
 });
@@ -180,18 +154,14 @@ describe('SelectedDates', () => {
 	it('should push selected dates', () => {
 		const selectedDates = new SelectedDates();
 		const date = new Date(2024, 0, 1);
-		selectedDates.push(
-			new SelectedDate(DayType.CP, new DateRange<Date>(date, date)),
-		);
+		selectedDates.push(new SelectedDate(DayType.CP, new DateRange<Date>(date, date)));
 		expect(selectedDates._datesSelected.length).toBe(1);
 	});
 
 	it('should check if date is selected', () => {
 		const selectedDates = new SelectedDates();
 		const date = new Date(2024, 0, 1);
-		selectedDates.push(
-			new SelectedDate(DayType.CP, new DateRange<Date>(date, date)),
-		);
+		selectedDates.push(new SelectedDate(DayType.CP, new DateRange<Date>(date, date)));
 		expect(selectedDates.isSelected(date)).toBe(true);
 	});
 
@@ -212,9 +182,7 @@ describe('SelectedDates', () => {
 	it('should compute heuristics', () => {
 		const selectedDates = new SelectedDates();
 		const date = new Date(2024, 0, 1);
-		selectedDates.push(
-			new SelectedDate(DayType.CP, new DateRange<Date>(date, date)),
-		);
+		selectedDates.push(new SelectedDate(DayType.CP, new DateRange<Date>(date, date)));
 		const heuristic = selectedDates.computeHeuristics();
 		expect(typeof heuristic).toBe('number');
 	});
@@ -222,9 +190,7 @@ describe('SelectedDates', () => {
 	it('should return correct classes', () => {
 		const selectedDates = new SelectedDates();
 		const date = new Date(2024, 0, 1);
-		selectedDates.push(
-			new SelectedDate(DayType.CP, new DateRange<Date>(date, date)),
-		);
+		selectedDates.push(new SelectedDate(DayType.CP, new DateRange<Date>(date, date)));
 		const classes = selectedDates.getClasses(date);
 		expect(classes).toContain(DayType.CP);
 	});
@@ -232,9 +198,7 @@ describe('SelectedDates', () => {
 	it('should return tooltip', () => {
 		const selectedDates = new SelectedDates();
 		const date = new Date(2024, 0, 1);
-		selectedDates.push(
-			new SelectedDate(DayType.CP, new DateRange<Date>(date, date)),
-		);
+		selectedDates.push(new SelectedDate(DayType.CP, new DateRange<Date>(date, date)));
 		const tooltip = selectedDates.getTooltip(date);
 		expect(tooltip).toBeTruthy();
 	});

src/app/services/calendar-service.ts

@@ -6,6 +6,7 @@ import weekOfYear from 'dayjs/plugin/weekOfYear';
 import isoWeek from 'dayjs/plugin/isoWeek';
 import { CalendarSettingsService } from './calendar-settings-service';
 import { DateCacheService } from './date-cache.service';
+import { LoggerService } from './logger.service';
 
 dayjs.extend(weekOfYear);
 dayjs.extend(isoWeek);
@@ -21,6 +22,7 @@ const allTypesOptions: HolidaysTypes.Options = {
 })
 export class CalendarService {
 	private dateCache = inject(DateCacheService);
+	private logger = inject(LoggerService);
 
 	// Cache for holiday timestamps
 	private holidayTimestampsCache: Set<number> | null = null;
@@ -28,8 +30,8 @@ export class CalendarService {
 
 	// Get selected dates from current date to the next year
 	getSelectedDatesFromNow(): SelectedDates {
-		const holidays = this.getHolidays();
-		let selectedDates: SelectedDates = new SelectedDates();
+		const _holidays = this.getHolidays();
+		const selectedDates: SelectedDates = new SelectedDates();
 		// Logic to populate selectedDates from now until the next year
 		return selectedDates;
 	}
@@ -37,7 +39,7 @@ export class CalendarService {
 	getSelectedDatesForYear(): SelectedDates {
 		const holidays = this.getHolidays();
 		const monthInAYear = this.monthsInAYearFromNow();
-		let selectedDates: SelectedDates = new SelectedDates();
+		const selectedDates: SelectedDates = new SelectedDates();
 
 		// Use DateCacheService to get today's date components
 		const {
@@ -298,6 +300,7 @@ export class SelectedDates implements SelectedDateInterface {
 
 	// Constant to indicate no valid strategy was found
 	private static readonly NO_VALID_STRATEGY_HEURISTIC = -1;
+	private static readonly MAX_DAYS_WITH_SAME_HEURISTIC = 9;
 
 	update(): void {
 		this.datesSelected = this._datesSelected.slice();
@@ -501,7 +504,7 @@ export class SelectedDates implements SelectedDateInterface {
 
 			// Check if adjacent (next day) - this is the best case!
 			if (nextStartTime - currentEndTime === oneDayInMs) {
-				totalScore += 10; // Big bonus for adjacency
+				totalScore += 15; // 50% increased bonus for adjacency; adjacency is highly valued in the scoring system
 			} else if (nextStartTime > currentEndTime) {
 				// Penalty based on days between the two dates
 				const daysBetween = Math.floor((nextStartTime - currentEndTime) / oneDayInMs) - 1;
@@ -519,7 +522,7 @@ export class SelectedDates implements SelectedDateInterface {
 			const daysInRange = selectedDate.getLengthInDays();
 
 			// For each day in the range, add it to the appropriate month
-			let currentDate = new Date(selectedDate.range.start);
+			const currentDate = new Date(selectedDate.range.start);
 			for (let i = 0; i < daysInRange; i++) {
 				const monthKey = currentDate.getFullYear() * 12 + currentDate.getMonth();
 				monthCounts.set(monthKey, (monthCounts.get(monthKey) ?? 0) + 1);
@@ -535,18 +538,44 @@ export class SelectedDates implements SelectedDateInterface {
 		return totalScore;
 	}
 
-	optimizeVacations(
+	async optimizeVacations(
 		vacationsNumber: VacationsNumber,
 		calendarSettingsService: CalendarSettingsService,
 		calendarService: CalendarService,
-	): void {
-		if (calendarSettingsService.samediMalin()) this.samediMalin(vacationsNumber);
+		progressCallback?: (progress: number) => void,
+		logger?: LoggerService,
+	): Promise<VacationsNumber> {
+		if (calendarSettingsService.get('samediMalin')()) this.samediMalin(vacationsNumber);
+
+		const initialVacations = { ...vacationsNumber };
+		const totalDays = initialVacations.cp + initialVacations.rtt + initialVacations.other;
+		let processedDays = 0;
+
+		// Helper function to update progress, throttled to every 5%
+		let lastReportedProgress = 0;
+		const PROGRESS_STEP = 5; // percent
+		const updateProgress = async () => {
+			if (progressCallback && totalDays > 0) {
+				const progress = Math.round((processedDays / totalDays) * 100);
+				if (progress - lastReportedProgress >= PROGRESS_STEP || progress === 100) {
+					progressCallback(progress);
+					lastReportedProgress = progress;
+					// Allow UI to update with a microtask
+					await new Promise((resolve) => setTimeout(resolve, 0));
+				}
+			}
+		};
+
+		await updateProgress();
+
 		while (vacationsNumber.cp > 0) {
 			const result = this.lookForVacation(DayType.CP, calendarService);
 			if (result.heuristic === SelectedDates.NO_VALID_STRATEGY_HEURISTIC) {
 				break;
 			}
 			vacationsNumber.cp -= 1;
+			processedDays++;
+			await updateProgress();
 		}
 		while (vacationsNumber.rtt > 0) {
 			const result = this.lookForVacation(DayType.RTT, calendarService);
@@ -554,6 +583,8 @@ export class SelectedDates implements SelectedDateInterface {
 				break;
 			}
 			vacationsNumber.rtt -= 1;
+			processedDays++;
+			await updateProgress();
 		}
 		while (vacationsNumber.other > 0) {
 			const result = this.lookForVacation(DayType.OTHER, calendarService);
@@ -561,7 +592,25 @@ export class SelectedDates implements SelectedDateInterface {
 				break;
 			}
 			vacationsNumber.other -= 1;
+			processedDays++;
+			await updateProgress();
 		}
+
+		// Final progress update (100%)
+		if (progressCallback) {
+			progressCallback(100);
+		}
+
+		// Inform user if not all days were placed
+		const remainingDays = vacationsNumber.cp + vacationsNumber.rtt + vacationsNumber.other;
+		if (remainingDays > 0 && logger) {
+			logger.warn(
+				`Optimization stopped: ${remainingDays} of ${totalDays} vacation days remain unplaced. ` +
+					`Too many days have equivalent placement quality - please place remaining days manually.`,
+			);
+		}
+
+		return vacationsNumber;
 	}
 
 	samediMalin(vacationsNumber: VacationsNumber): void {
@@ -719,7 +768,10 @@ export class SelectedDates implements SelectedDateInterface {
 		}
 	}
 
-	lookForVacation(vacType: DayType, calendarService: CalendarService): { apply: () => void; heuristic: number } {
+	lookForVacation(
+		vacType: DayType,
+		calendarService: CalendarService,
+	): { apply: () => void; heuristic: number } {
 		const daysOfYear = calendarService.monthsInAYearFromNow();
 		const now = new Date();
 		now.setHours(0, 0, 0, 0);
@@ -748,6 +800,7 @@ export class SelectedDates implements SelectedDateInterface {
 		const tempDatesBackup = [...this._datesSelected];
 		let bestStrategy: { apply: () => void; heuristic: number; value: Date } | null = null;
 		let bestHeuristic = -Infinity;
+		let daysWithBestHeuristic = 0;
 
 		// Evaluate each candidate day
 		for (const day of candidateDays) {
@@ -764,6 +817,7 @@ export class SelectedDates implements SelectedDateInterface {
 			// Track only if better than current best
 			if (heuristic > bestHeuristic) {
 				bestHeuristic = heuristic;
+				daysWithBestHeuristic = 1;
 				const capturedDay = day;
 				bestStrategy = {
 					apply: () => {
@@ -778,9 +832,25 @@ export class SelectedDates implements SelectedDateInterface {
 					heuristic: heuristic,
 					value: capturedDay,
 				};
+			} else if (heuristic === bestHeuristic) {
+				daysWithBestHeuristic++;
 			}
 		}
 
+		// Check if too many days have the same best heuristic after evaluating all days
+		if (daysWithBestHeuristic > SelectedDates.MAX_DAYS_WITH_SAME_HEURISTIC) {
+			// Restore backup before stopping
+			this._datesSelected = [...tempDatesBackup];
+			this.datesSelected = this._datesSelected.slice();
+			this.grouping();
+
+			// Stop optimization - let user decide manually
+			return {
+				apply: () => {},
+				heuristic: SelectedDates.NO_VALID_STRATEGY_HEURISTIC,
+			};
+		}
+
 		// Restore backup before returning
 		this._datesSelected = [...tempDatesBackup];
 		this.datesSelected = this._datesSelected.slice();

src/app/services/calendar-settings-service.spec.ts

@@ -17,17 +17,29 @@ describe('CalendarSettingsService', () => {
 	});
 
 	it('should initialize with default values', () => {
-		expect(service.showWeekNumbers()).toBe(false);
-		expect(service.samediMalin()).toBe(true);
+		expect(service.get('showWeekNumbers')()).toBe(false);
+		expect(service.get('samediMalin')()).toBe(true);
 	});
 
 	it('should allow updating showWeekNumbers', () => {
-		service.showWeekNumbers.set(true);
-		expect(service.showWeekNumbers()).toBe(true);
+		service.get('showWeekNumbers').set(true);
+		expect(service.get('showWeekNumbers')()).toBe(true);
 	});
 
 	it('should allow updating samediMalin', () => {
-		service.samediMalin.set(false);
-		expect(service.samediMalin()).toBe(false);
+		service.get('samediMalin').set(false);
+		expect(service.get('samediMalin')()).toBe(false);
+	});
+
+	it('should provide settings array for UI iteration', () => {
+		const settingsArray = service.settingsArray;
+		expect(settingsArray.length).toBe(2);
+		expect(settingsArray[0].id).toBe('showWeekNumbers');
+		expect(settingsArray[1].id).toBe('samediMalin');
+	});
+
+	it('should return correct descriptions', () => {
+		expect(service.getDescription('showWeekNumbers')).toBe('Afficher les numéros de semaine');
+		expect(service.getDescription('samediMalin')).toBe('Activer le Samedi Malin');
 	});
 });

src/app/services/calendar-settings-service.ts

@@ -1,9 +1,68 @@
-import { Injectable, signal } from '@angular/core';
+import { Injectable, WritableSignal, inject, Injector } from '@angular/core';
+import { storedSignal } from '../shared/utils/stored-signal';
+
+interface SettingDefinition {
+	defaultValue: boolean;
+	description: string;
+}
 
 @Injectable({
 	providedIn: 'root',
 })
 export class CalendarSettingsService {
-	readonly showWeekNumbers = signal(false);
-	readonly samediMalin = signal(true);
+	private readonly injector = inject(Injector);
+
+	private readonly definitions = new Map<string, SettingDefinition>([
+		[
+			'showWeekNumbers',
+			{
+				defaultValue: false,
+				description: 'Afficher les numéros de semaine',
+			},
+		],
+		[
+			'samediMalin',
+			{
+				defaultValue: true,
+				description: 'Activer le Samedi Malin',
+			},
+		],
+	]);
+
+	private readonly signals = new Map<string, WritableSignal<boolean>>();
+
+	readonly settingsArray: ReadonlyArray<{
+		id: string;
+		signal: WritableSignal<boolean>;
+		description: string;
+	}>;
+
+	constructor() {
+		for (const [id, def] of this.definitions) {
+			const storageKey = `calendarSettings.${id}`;
+			this.signals.set(id, storedSignal(storageKey, def.defaultValue, this.injector));
+		}
+
+		this.settingsArray = Array.from(this.definitions.entries()).map(([id, def]) => ({
+			id,
+			signal: this.signals.get(id)!,
+			description: def.description,
+		}));
+	}
+
+	/**
+	 * Returns the signal for the given setting ID.
+	 * @throws Error if the setting ID doesn't exist
+	 */
+	get(id: string): WritableSignal<boolean> {
+		const signal = this.signals.get(id);
+		if (!signal) {
+			throw new Error(`Setting with id "${id}" does not exist`);
+		}
+		return signal;
+	}
+
+	getDescription(id: string): string {
+		return this.definitions.get(id)?.description ?? '';
+	}
 }

src/app/services/logger.service.spec.ts

@@ -0,0 +1,52 @@
+import { TestBed } from '@angular/core/testing';
+import { LoggerService } from './logger.service';
+
+describe('LoggerService', () => {
+	let service: LoggerService;
+	let consoleLogSpy: jasmine.Spy;
+	let consoleWarnSpy: jasmine.Spy;
+	let consoleErrorSpy: jasmine.Spy;
+	let consoleDebugSpy: jasmine.Spy;
+
+	beforeEach(() => {
+		TestBed.configureTestingModule({});
+		service = TestBed.inject(LoggerService);
+
+		// Spy on console methods
+		consoleLogSpy = spyOn(console, 'log');
+		consoleWarnSpy = spyOn(console, 'warn');
+		consoleErrorSpy = spyOn(console, 'error');
+		consoleDebugSpy = spyOn(console, 'debug');
+	});
+
+	it('should be created', () => {
+		expect(service).toBeTruthy();
+	});
+
+	it('should log messages', () => {
+		service.log('test message');
+		expect(consoleLogSpy).toHaveBeenCalledWith('test message');
+	});
+
+	it('should log warnings', () => {
+		service.warn('test warning');
+		expect(consoleWarnSpy).toHaveBeenCalledWith('test warning');
+	});
+
+	it('should log errors', () => {
+		service.error('test error');
+		expect(consoleErrorSpy).toHaveBeenCalledWith('test error');
+	});
+
+	it('should log debug messages', () => {
+		service.debug('test debug');
+		expect(consoleDebugSpy).toHaveBeenCalledWith('test debug');
+	});
+
+	it('should pass additional arguments to console methods', () => {
+		const arg1 = { key: 'value' };
+		const arg2 = [1, 2, 3];
+		service.log('test', arg1, arg2);
+		expect(consoleLogSpy).toHaveBeenCalledWith('test', arg1, arg2);
+	});
+});

src/app/services/logger.service.ts

@@ -0,0 +1,47 @@
+import { Injectable } from '@angular/core';
+
+/**
+ * Logger service that wraps console methods.
+ * Can be configured to disable logging in production environments.
+ */
+@Injectable({
+	providedIn: 'root',
+})
+export class LoggerService {
+	private isProduction = false; // Can be configured based on environment
+
+	/**
+	 * Log an informational message
+	 */
+	log(message: string, ...args: unknown[]): void {
+		if (!this.isProduction) {
+			console.log(message, ...args);
+		}
+	}
+
+	/**
+	 * Log a warning message
+	 */
+	warn(message: string, ...args: unknown[]): void {
+		if (!this.isProduction) {
+			console.warn(message, ...args);
+		}
+	}
+
+	/**
+	 * Log an error message
+	 */
+	error(message: string, ...args: unknown[]): void {
+		// Always log errors, even in production
+		console.error(message, ...args);
+	}
+
+	/**
+	 * Log a debug message
+	 */
+	debug(message: string, ...args: unknown[]): void {
+		if (!this.isProduction) {
+			console.debug(message, ...args);
+		}
+	}
+}

src/app/services/theme-service.spec.ts

@@ -3,40 +3,40 @@ import { provideZonelessChangeDetection } from '@angular/core';
 import { ThemeService } from './theme-service';
 
 describe('ThemeService', () => {
-  let service: ThemeService;
+	let service: ThemeService;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [provideZonelessChangeDetection()],
-    });
-    service = TestBed.inject(ThemeService);
-  });
+	beforeEach(() => {
+		TestBed.configureTestingModule({
+			providers: [provideZonelessChangeDetection()],
+		});
+		service = TestBed.inject(ThemeService);
+	});
 
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
+	it('should be created', () => {
+		expect(service).toBeTruthy();
+	});
 
-  it('should initialize with system preference', () => {
-    expect(service.isLightMode()).toBeDefined();
-  });
+	it('should initialize with system preference', () => {
+		expect(service.isLightMode()).toBeDefined();
+	});
 
-  it('should toggle theme', () => {
-    const initialMode = service.isLightMode();
-    service.toggleTheme();
-    expect(service.isLightMode()).toBe(!initialMode);
-  });
+	it('should toggle theme', () => {
+		const initialMode = service.isLightMode();
+		service.toggleTheme();
+		expect(service.isLightMode()).toBe(!initialMode);
+	});
 
-  it('should force light mode when specified', () => {
-    service.toggleTheme(true);
-    expect(service.isLightMode()).toBe(true);
-    expect(document.body.classList.contains('light-mode')).toBe(true);
-    expect(document.body.classList.contains('dark-mode')).toBe(false);
-  });
+	it('should force light mode when specified', () => {
+		service.toggleTheme(true);
+		expect(service.isLightMode()).toBe(true);
+		expect(document.body.classList.contains('light-mode')).toBe(true);
+		expect(document.body.classList.contains('dark-mode')).toBe(false);
+	});
 
-  it('should force dark mode when specified', () => {
-    service.toggleTheme(false);
-    expect(service.isLightMode()).toBe(false);
-    expect(document.body.classList.contains('light-mode')).toBe(false);
-    expect(document.body.classList.contains('dark-mode')).toBe(true);
-  });
+	it('should force dark mode when specified', () => {
+		service.toggleTheme(false);
+		expect(service.isLightMode()).toBe(false);
+		expect(document.body.classList.contains('light-mode')).toBe(false);
+		expect(document.body.classList.contains('dark-mode')).toBe(true);
+	});
 });

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

@@ -1,4 +1,4 @@
-import { Injectable, signal, PLATFORM_ID, inject } from '@angular/core';
+import { Injectable, signal } from '@angular/core';
 import { VacationsNumber } from './calendar-service';
 
 @Injectable({
@@ -18,4 +18,9 @@ export class UserInputService {
 	}
 
 	readonly vacationNumberSignal = signal<VacationsNumber>(this.getInitialValues());
+	readonly remainingVacationDaysSignal = signal<VacationsNumber>({
+		cp: 0,
+		rtt: 0,
+		other: 0,
+	});
 }

src/app/shared/utils/stored-signal.ts

@@ -0,0 +1,111 @@
+import { signal, effect, WritableSignal, Injector, runInInjectionContext } from '@angular/core';
+
+/**
+ * Checks if localStorage is available in the current environment.
+ * @returns true if localStorage is accessible, false otherwise
+ */
+function isLocalStorageAvailable(): boolean {
+	try {
+		return typeof localStorage !== 'undefined' && localStorage !== null;
+	} catch {
+		return false;
+	}
+}
+
+/**
+ * Creates a signal that automatically persists its value to localStorage.
+ *
+ * The signal will:
+ * - Initialize with the stored value from localStorage if available
+ * - Fall back to the provided initial value if no stored value exists or parsing fails
+ * - Automatically sync changes to localStorage with debouncing (300ms delay)
+ * - Work safely in SSR and environments where localStorage is unavailable
+ *
+ * @template T - The type of value stored in the signal (must be JSON-serializable)
+ * @param key - The localStorage key used to store the value
+ * @param initialValue - The default value used when no stored value exists
+ * @param injector - The Angular injector (use inject(Injector) to get current context)
+ * @param debounceMs - Optional debounce delay in milliseconds (default: 300ms)
+ * @returns A writable signal that persists to localStorage
+ *
+ * @example
+ * ```typescript
+ * const injector = inject(Injector);
+ * const darkMode = storedSignal('theme.darkMode', false, injector);
+ * darkMode.set(true); // Automatically saved to localStorage after 300ms
+ * console.log(darkMode()); // true
+ * ```
+ *
+ * @remarks
+ * - Requires an Injector to create the effect in the proper context
+ * - Values must be JSON-serializable (no functions, circular references, etc.)
+ * - In SSR or when localStorage is unavailable, the signal works normally but won't persist
+ * - Corrupted localStorage data is automatically cleared and reset to initial value
+ * - localStorage writes are debounced to improve performance with frequent updates
+ */
+export function storedSignal<T>(
+	key: string,
+	initialValue: T,
+	injector: Injector,
+	debounceMs = 300,
+): WritableSignal<T> {
+	let parsedValue = initialValue;
+
+	if (isLocalStorageAvailable()) {
+		try {
+			const storedValue = localStorage.getItem(key);
+			if (storedValue) {
+				parsedValue = JSON.parse(storedValue) as T;
+			}
+		} catch (error) {
+			console.warn(
+				`Failed to parse stored value for key "${key}". Using initial value.`,
+				error,
+			);
+			try {
+				localStorage.removeItem(key);
+			} catch {
+				// Ignore removal errors
+			}
+		}
+	}
+
+	const s = signal(parsedValue);
+
+	let timeoutId: ReturnType<typeof setTimeout> | null = null;
+	let isFirstRun = true;
+
+	runInInjectionContext(injector, () => {
+		effect(() => {
+			const value = s();
+
+			// Skip the first execution to avoid writing back what we just read
+			if (isFirstRun) {
+				isFirstRun = false;
+				return;
+			}
+
+			// Clear any pending timeout
+			if (timeoutId !== null) {
+				clearTimeout(timeoutId);
+			}
+
+			// Debounce the localStorage write
+			timeoutId = setTimeout(() => {
+				if (isLocalStorageAvailable()) {
+					try {
+						localStorage.setItem(key, JSON.stringify(value));
+					} catch (error) {
+						console.warn(
+							`Failed to save value for key "${key}" to localStorage.`,
+							error,
+						);
+					}
+				}
+				timeoutId = null;
+			}, debounceMs);
+		});
+	});
+
+	return s;
+}

src/index.html

@@ -1,18 +1,19 @@
 <!doctype html>
 <html lang="en">
-
 	<head>
-		<meta charset="utf-8">
+		<meta charset="utf-8" />
 		<title>VacOptimizer</title>
-		<base href="/">
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<link rel="icon" type="image/x-icon" href="favicon.ico">
-		<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet">
-		<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+		<base href="/" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<link rel="icon" type="image/x-icon" href="favicon.ico" />
+		<link
+			href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap"
+			rel="stylesheet"
+		/>
+		<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
 	</head>
 
 	<body>
 		<app-root></app-root>
 	</body>
-
-</html>
+</html>

src/main.server.ts

@@ -2,7 +2,6 @@ import { BootstrapContext, bootstrapApplication } from '@angular/platform-browse
 import { App } from './app/app';
 import { config } from './app/app.config.server';
 
-const bootstrap = (context: BootstrapContext) =>
-	bootstrapApplication(App, config, context);
+const bootstrap = (context: BootstrapContext) => bootstrapApplication(App, config, context);
 
 export default bootstrap;

src/main.ts

@@ -2,5 +2,4 @@ import { bootstrapApplication } from '@angular/platform-browser';
 import { appConfig } from './app/app.config';
 import { App } from './app/app';
 
-bootstrapApplication(App, appConfig)
-	.catch((err) => console.error(err));
+bootstrapApplication(App, appConfig).catch((err) => console.error(err));

src/server.ts

@@ -41,9 +41,7 @@ app.use(
 app.use((req, res, next) => {
 	angularApp
 		.handle(req)
-		.then((response) =>
-			response ? writeResponseToNodeResponse(response, res) : next(),
-		)
+		.then((response) => (response ? writeResponseToNodeResponse(response, res) : next()))
 		.catch(next);
 });