Affiche le nb de congés payés restants

src/Application/HumanResource/Leave/Query/GetLeaveRequestsOverviewQuery.ts

@@ -0,0 +1,6 @@
+import { IQuery } from 'src/Application/IQuery';
+import { User } from 'src/Domain/HumanResource/User/User.entity';
+
+export class GetLeaveRequestsOverviewQuery implements IQuery {
+  constructor(public readonly date: Date, public readonly user: User) {}
+}

src/Application/HumanResource/Leave/Query/GetLeaveRequestsOverviewQueryHandler.ts

@@ -0,0 +1,41 @@
+import { Inject } from '@nestjs/common';
+import { QueryHandler } from '@nestjs/cqrs';
+import { GetLeaveRequestsOverviewQuery } from './GetLeaveRequestsOverviewQuery';
+import { ILeaveRequestsOverview } from 'src/Domain/HumanResource/Leave/ILeaveRequestsOverview';
+import { IDateUtils } from 'src/Application/IDateUtils';
+import { ILeaveRepository } from 'src/Domain/HumanResource/Leave/Repository/ILeaveRepository';
+
+@QueryHandler(GetLeaveRequestsOverviewQuery)
+export class GetLeaveRequestsOverviewQueryHandler {
+  constructor(
+    @Inject('IDateUtils')
+    private readonly dateUtils: IDateUtils,
+    @Inject('ILeaveRepository')
+    private readonly leaveRepository: ILeaveRepository
+  ) {}
+
+  public async execute(
+    query: GetLeaveRequestsOverviewQuery
+  ): Promise<ILeaveRequestsOverview> {
+    const [startDate, endDate] = this.dateUtils.getLeaveReferencePeriodDays(
+      query.date
+    );
+
+    const numDaysPerWeek = this.dateUtils.getWorkedDaysPerWeek();
+    const numWeeks = this.dateUtils.getNumberOfPaidLeaveWeeks();
+    const daysPerYear = numWeeks * numDaysPerWeek;
+    const totalDurationTaken = await this.leaveRepository.getSumOfDurationsBetween(
+      startDate,
+      endDate,
+      query.user
+    );
+    const daysTaken = this.dateUtils.getLeaveDurationAsDays(totalDurationTaken);
+    const daysRemaining = daysPerYear - daysTaken;
+
+    return {
+      daysPerYear,
+      daysTaken,
+      daysRemaining
+    };
+  }
+}

src/Application/IDateUtils.ts

@@ -10,13 +10,17 @@ export interface IDateUtils {
   getWorkedDaysDuringAPeriod(start: Date, end: Date): Date[];
   isAWorkingDay(date: Date): boolean;
   getWorkedFreeDays(year: number): Date[];
+  getWorkedDaysPerWeek(): number;
+  getNumberOfPaidLeaveWeeks(): number;
   getEasterDate(year: number): Date;
   getLeaveDuration(
     startDate: string,
     isStartsAllDay: boolean,
     endDate: string,
     isEndsAllDay: boolean
   ): number;
+  getLeaveDurationAsDays(duration: number);
+  getLeaveReferencePeriodDays(date: Date): [Date, Date];
   addDaysToDate(date: Date, days: number): Date;
   getYear(date: Date): number;
   getMonth(date: Date): MonthDate;

src/Domain/HumanResource/Leave/ILeaveRequestsOverview.ts

@@ -0,0 +1,5 @@
+export interface ILeaveRequestsOverview {
+  daysPerYear: number;
+  daysTaken: number;
+  daysRemaining: number;
+}

src/Domain/HumanResource/Leave/Repository/ILeaveRepository.ts

@@ -10,4 +10,9 @@ export interface ILeaveRepository {
     endDate: string
   ): Promise<number>;
   sumOfDurationLeaveByUserAndDate(user: User, date: string): Promise<number>;
+  getSumOfDurationsBetween(
+    startDate: Date,
+    endDate: Date,
+    user: User
+  ): Promise<number>;
 }

src/Infrastructure/Adapter/DateUtilsAdapter.ts

@@ -207,4 +207,38 @@ export class DateUtilsAdapter implements IDateUtils {
 
     return duration;
   }
+
+  /**
+   * @param duration Duration in minutes
+   * @returns Duration in days
+   */
+  public getLeaveDurationAsDays(duration: number) {
+    return duration / 420;
+  }
+
+  getLeaveReferencePeriodDays(date: Date): [Date, Date] {
+    // Reference period is between June 1st and May 31st.
+
+    let startDate = this.makeDate(this.getYear(date), 6, 1);
+
+    if (startDate > date) {
+      startDate = this.makeDate(this.getYear(date) - 1, 6, 1);
+    }
+
+    let endDate = this.makeDate(this.getYear(date), 5, 31);
+
+    if (endDate < date) {
+      endDate = this.makeDate(this.getYear(date) + 1, 5, 31);
+    }
+
+    return [startDate, endDate];
+  }
+
+  getWorkedDaysPerWeek(): number {
+    return 5;
+  }
+
+  getNumberOfPaidLeaveWeeks(): number {
+    return 7;
+  }
 }

src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts

@@ -16,14 +16,17 @@ import { Pagination } from 'src/Application/Common/Pagination';
 import { LeaveRequestView } from 'src/Application/HumanResource/Leave/View/LeaveRequestView';
 import { LoggedUser } from '../../User/Decorator/LoggedUser';
 import { LeaveRequestTableFactory } from '../Table/LeaveRequestTableFactory';
+import { LeaveRequestsOverviewTableFactory } from '../Table/LeaveRequestOverviewTableFactory';
+import { GetLeaveRequestsOverviewQuery } from 'src/Application/HumanResource/Leave/Query/GetLeaveRequestsOverviewQuery';
 
 @Controller('app/people/leave_requests')
 @UseGuards(IsAuthenticatedGuard)
 export class ListLeaveRequestsController {
   constructor(
     @Inject('IQueryBus')
     private readonly queryBus: IQueryBus,
-    private readonly tableFactory: LeaveRequestTableFactory
+    private readonly tableFactory: LeaveRequestTableFactory,
+    private readonly overviewTableFactory: LeaveRequestsOverviewTableFactory
   ) {}
 
   @Get()
@@ -39,6 +42,16 @@ export class ListLeaveRequestsController {
 
     const table = this.tableFactory.create(pagination.items, user.getId());
 
-    return { table, pagination, currentPage: paginationDto.page };
+    const overview = await this.queryBus.execute(
+      new GetLeaveRequestsOverviewQuery(new Date(), user)
+    );
+    const overviewTable = this.overviewTableFactory.create(overview);
+
+    return {
+      table,
+      overviewTable,
+      pagination,
+      currentPage: paginationDto.page
+    };
   }
 }

src/Infrastructure/HumanResource/Leave/Repository/LeaveRepository.ts

@@ -5,6 +5,7 @@ import { ILeaveRepository } from 'src/Domain/HumanResource/Leave/Repository/ILea
 import { Leave } from 'src/Domain/HumanResource/Leave/Leave.entity';
 import { User, UserRole } from 'src/Domain/HumanResource/User/User.entity';
 import { IDateUtils } from 'src/Application/IDateUtils';
+import { Type } from 'src/Domain/HumanResource/Leave/LeaveRequest.entity';
 
 export class LeaveRepository implements ILeaveRepository {
   constructor(
@@ -68,4 +69,23 @@ export class LeaveRepository implements ILeaveRepository {
 
     return Number(result.time) || 0;
   }
+
+  public async getSumOfDurationsBetween(
+    startDate: Date,
+    endDate: Date,
+    user: User
+  ): Promise<number> {
+    const result = await this.repository
+      .createQueryBuilder('leave')
+      .select('SUM(leave.time) as time')
+      .innerJoin('leave.leaveRequest', 'leaveRequest')
+      .innerJoin('leaveRequest.user', 'user')
+      .where('leave.date >= :startDate', { startDate })
+      .andWhere('leave.date < :endDate', { endDate })
+      .andWhere('leaveRequest.type = :type', { type: Type.PAID })
+      .andWhere('user.id = :user', { user: user.getId() })
+      .getRawOne();
+
+    return Number(result.time) || 0;
+  }
 }

src/Infrastructure/HumanResource/Leave/Table/LeaveRequestOverviewTableFactory.ts

@@ -0,0 +1,26 @@
+import { Injectable } from '@nestjs/common';
+import { ILeaveRequestsOverview } from 'src/Domain/HumanResource/Leave/ILeaveRequestsOverview';
+import { Table } from 'src/Infrastructure/Tables';
+import { RowFactory } from 'src/Infrastructure/Tables/RowFactory';
+
+@Injectable()
+export class LeaveRequestsOverviewTableFactory {
+  constructor(private rowFactory: RowFactory) {}
+
+  public create(overview: ILeaveRequestsOverview): Table {
+    const columns = [];
+    const rowBuilder = this.rowFactory.createBuilder();
+
+    for (const type in overview) {
+      columns.push(`leaves-overview-${type}`);
+      rowBuilder.template('pages/leave_requests/_overview_badge.njk', {
+        type,
+        days: overview[type]
+      });
+    }
+
+    const row = rowBuilder.build();
+
+    return new Table(columns, [row]);
+  }
+}

src/Infrastructure/HumanResource/humanResource.module.ts

@@ -79,6 +79,8 @@ import { ListMealTicketsController } from './MealTicket/Controller/ListMealTicke
 import { MealTicketTableFactory } from './MealTicket/Table/MealTicketTableFactory';
 import { AddMealTicketRemovalController } from './MealTicket/Controller/AddMealTicketRemovalController';
 import { ExportLeavesCalendarController } from './Leave/Controller/ExportLeavesCalendarController';
+import { LeaveRequestsOverviewTableFactory } from './Leave/Table/LeaveRequestOverviewTableFactory';
+import { GetLeaveRequestsOverviewQueryHandler } from 'src/Application/HumanResource/Leave/Query/GetLeaveRequestsOverviewQueryHandler';
 
 @Module({
   imports: [
@@ -181,6 +183,8 @@ import { ExportLeavesCalendarController } from './Leave/Controller/ExportLeavesC
     IncreaseUserSavingsRecordCommandHandler,
     UserTableFactory,
     LeaveRequestTableFactory,
+    GetLeaveRequestsOverviewQueryHandler,
+    LeaveRequestsOverviewTableFactory,
     PayrollElementsTableFactory,
     MealTicketTableFactory
   ]

src/assets/styles/variables.css

@@ -63,6 +63,15 @@
   --event-other-border: rgb(244, 245, 247);
   --event-other-text: rgb(36, 38, 45);
   --event-today: #fcf8e3;
+  --leave-daysPerYear-background: rgb(244, 245, 247);
+  --leave-daysPerYear-border: rgb(244, 245, 247);
+  --leave-daysPerYear-text: rgb(36, 38, 45);
+  --leave-daysTaken-background: rgb(253, 246, 178);
+  --leave-daysTaken-border: rgb(253, 246, 178);
+  --leave-daysTaken-text: rgb(142, 75, 16);
+  --leave-daysRemaining-background: rgb(222, 247, 236);
+  --leave-daysRemaining-border: rgb(222, 247, 236);
+  --leave-daysRemaining-text: rgb(4, 108, 78);
   --header-height-desktop: 56px;
 }
 

src/templates/pages/leave_requests/_overview_badge.njk

@@ -0,0 +1,3 @@
+<span class="pc-badge pc-bold" style="--badge-color: var(--leave-{{ type }}-text); --badge-background: var(--leave-{{ type }}-background)">
+    {{ 'leaves-overview-days'|trans({ days: days }) }}
+</span>

src/templates/pages/leave_requests/list.njk

@@ -15,7 +15,10 @@
         {{ links.add(path('people_leave_requests_add'), text='leave-requests-add-title'|trans) }}
     </div>
 
-    {% table table %}
+    <div class="pc-stack">
+        {% table overviewTable, { attr: {class: 'pc-table--center pc-table--no-shadow'} } %}
+        {% table table %}
+    </div>
 
     {% set paginationUrl = path('people_leave_requests_list') %}
     {% include 'includes/pagination.njk' %}

src/translations/fr-FR.ftl

@@ -175,6 +175,14 @@ leave-requests-delete-yes = Oui, annuler
 leave-requests-delete-no = Non, ne pas annuler
 
 leaves-calendar-url-title = Lien d'abonnement au calendrier
+leaves-overview-daysPerYear = Congés payés par an
+leaves-overview-daysTaken = Congés payés pris
+leaves-overview-daysRemaining = Congés payés restants (estimation)
+leaves-overview-days = {$days ->
+    [0] 0
+    [1] 1 jour
+    *[other] {$days} jours
+}
 
 payroll-elements-title = Éléments de paie
 payroll-elements-page-title = Éléments de paie {DATETIME($date, month: "long", year: "numeric")}