Rework add hours component

src/app/core/models/leave-time.model.ts

@@ -0,0 +1,23 @@
+import { LeaveType } from '@data/api/time-service/models/leave-type';
+
+export interface ILeaveType {
+	leaveType: LeaveType;
+	leaveInRussian: string;
+}
+
+export class LeaveTimeModel {
+	private static _leaveTypes: ILeaveType[] = [
+		{ leaveType: LeaveType.SickLeave, leaveInRussian: 'Больничный' },
+		{ leaveType: LeaveType.Idle, leaveInRussian: 'Отгул' },
+		{ leaveType: LeaveType.Training, leaveInRussian: 'Обучение' },
+		{ leaveType: LeaveType.Vacation, leaveInRussian: 'Отпуск' },
+	];
+
+	public static getLeaveInfoByLeaveType(leaveType: LeaveType) {
+		return this._leaveTypes.find((leave: ILeaveType) => leave.leaveType === leaveType);
+	}
+
+	public static getAllLeaveTypes(): ILeaveType[] {
+		return this._leaveTypes.slice();
+	}
+}

src/app/core/services/attendance.service.ts

@@ -1,4 +1,3 @@
-//@ts-nocheck
 import { Injectable } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { Time } from '@angular/common';
@@ -8,11 +7,11 @@ import { DateService } from './date.service';
 
 @Injectable()
 export class AttendanceService {
-	private readonly _datePeriod = new BehaviorSubject<DatePeriod>(this.dateService.getDefaultDatePeriod(6));
+	private readonly _datePeriod = new BehaviorSubject<DatePeriod>(this.dateService.getDefaultDatePeriod());
 
 	readonly datePeriod$ = this._datePeriod.asObservable();
 
-	private readonly _recommendedTime = new BehaviorSubject<Time>(this.getRecommendedTime(this.datePeriod));
+	private readonly _recommendedTime = new BehaviorSubject<number>(this.getRecommendedTime(this.datePeriod));
 
 	readonly recommendedTime$ = this._recommendedTime.asObservable();
 
@@ -35,22 +34,25 @@ export class AttendanceService {
 		return timeString.length === 1 ? '0' + timeString : timeString;
 	}
 
-	public getRecommendedTime(datePeriod: DatePeriod, hoursPerDay: number = 8, rate: number = 1): Time {
+	public getRecommendedTime(datePeriod: DatePeriod, hoursPerDay: number = 8, skipHolidays = false, rate: number = 1): number {
 		const daysArray: Date[] = [];
 
 		if (datePeriod.endDate && this.dateService.isSameDay(datePeriod.startDate, datePeriod.endDate)) {
-			return { hours: hoursPerDay * rate, minutes: 0 };
+			return hoursPerDay * rate;
 		} else {
-			const startDate = new Date(datePeriod.startDate);
-			const endDate = new Date(datePeriod.endDate);
+			const startDate = new Date(datePeriod.startDate as Date);
+			const endDate = new Date(datePeriod.endDate as Date);
 
 			while (startDate.getDate() !== endDate.getDate()) {
 				daysArray.push(new Date(startDate));
 				startDate.setDate(startDate.getDate() + 1);
 			}
-			const hours = (daysArray.filter((day: Date) => day.getDay() !== 6 && day.getDay() !== 0).length + 1) * hoursPerDay * rate;
 
-			return { hours: hours, minutes: 0 };
+			if (skipHolidays) {
+				return (daysArray.filter((day: Date) => day.getDay() !== 6 && day.getDay() !== 0).length + 1) * hoursPerDay * rate;
+			} else {
+				return (daysArray.length + 1) * hoursPerDay * rate;
+			}
 		}
 	}
 }

src/app/core/services/date.service.ts

@@ -1,4 +1,3 @@
-//@ts-nocheck
 import { Injectable } from '@angular/core';
 import { DatePeriod } from '@data/models/date-period';
 import { DayOfWeek } from '@data/models/day-of-week';
@@ -9,8 +8,8 @@ import { DayOfWeek } from '@data/models/day-of-week';
 export class DateService {
 	constructor() {}
 
-	isSameDay(fromDate: Date, toDate: Date): boolean {
-		return fromDate.getTime() === toDate.getTime();
+	isSameDay(fromDate: Date | null, toDate: Date | null): boolean {
+		return fromDate?.getTime() === toDate?.getTime();
 	}
 
 	isSameMonth(fromDate: Date, toDate: Date): boolean {
@@ -31,10 +30,14 @@ export class DateService {
 		}
 	}
 
-	getDefaultDatePeriod(daysFromToday: number): DatePeriod {
-		const today = new Date();
-		const inWeek = this.addDays(today, daysFromToday);
-		return { startDate: today, endDate: inWeek };
+	getDefaultDatePeriod(): DatePeriod {
+		// const today: Date = new Date();
+		const startDate: Date = new Date();
+		const endDate: Date = new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate() + 7);
+
+		// const today = new Date();
+		// const inWeek = this.addDays(today, daysFromToday);
+		return { startDate, endDate };
 	}
 
 	getWeek(dateSelected: Date): DayOfWeek[] {

src/app/core/services/time/time.service.ts

@@ -17,8 +17,9 @@ import { EditWorkTimeMonthLimitRequest } from '@data/api/time-service/models/edi
 export interface IFindWorkTimesRequest {
 	userid?: string;
 	projectid?: string;
-	starttime?: string;
-	endtime?: string;
+	month?: number;
+	year?: number;
+	includedayjobs?: boolean;
 	takeCount?: number;
 	skipCount?: number;
 }

src/app/core/services/user/user.service.ts

@@ -186,6 +186,7 @@ export class UserService {
 			includecommunications: true,
 			includerole: true,
 			includeimages: true,
+			includeprojects: true,
 		};
 
 		return this.getUser(params).pipe(tap(this._setUser.bind(this)));