@silexpert/core 0.4.234 → 0.4.241

package/ts/api/resources/TimeRecorder.ts

@@ -1,12 +1,15 @@
 import { Resource } from '../Resource';
 import {
-  ReadAttendanceHours, QueryAttendance, QueryPaginatedDelays, ReadPaginatedDelays, BasePaginate, ReadUsersNotConnected, ITimeRecorder,
+  ReadAttendanceHours, QueryAttendance, QueryPaginatedDelays, ReadPaginatedDelays, BasePaginate, ReadUsersNotConnected, ITimeRecorder, UpdateRecorder,
 } from '../../types';
 
 export class TimeRecorder extends Resource {
   create(payload: ITimeRecorder): Promise<TimeRecorder> {
     return this.axios.$post('/time-recorders', payload);
   }
+  update(payload: UpdateRecorder): Promise<TimeRecorder> {
+    return this.axios.$put('/time-recorders', payload);
+  }
   getAllPresenceHoursByUser(idUser: number, params: QueryAttendance): Promise<ReadAttendanceHours> {
     return this.axios.$get(`/users/${idUser}/attendances`,
       { params });

package/ts/api/resources/Transaction.ts

@@ -20,6 +20,11 @@ export class Transaction extends Resource {
       },
     });
   }
+
+  update(id: number, params: Partial<IAccountingTransaction>): Promise<IAccountingTransaction> {
+    return this.axios.patch(`/transactions/${id}`, params);
+  }
+
   getAll(idSociety: number, query: QueryGetAllTransactions): Promise<IAccountingTransaction[]> {
     return this.axios.$get(`/society/${idSociety}/transactions/list`, { params: query });
   }

package/ts/types/Enum/TaskResponseType.ts

@@ -26,13 +26,14 @@ export enum StateTask {
   TODO = 1,
   DO = 2,
   NOTDO = 3,
+  REFUSED = 4,
 }
 
 export const TaskResponseType = {
   DEMANDE_ATTESTATION: {
     id: 1,
     label: 'Demande attestation',
-    responseType: ResponseType.MAIL.id,
+    responseType: ResponseType.INTERN_ACTIVITY.id,
     weight: 2,
     isExterne: true,
     idMailAuto: null,
@@ -56,15 +57,15 @@ export const TaskResponseType = {
     idMailAuto: null,
     schedule: 15,
   },
-  SUPPORT_TECHNIQUE: {
-    id: 4,
-    label: 'Support technique',
-    responseType: ResponseType.CALL.id,
-    weight: 6,
-    isExterne: true,
-    idMailAuto: null,
-    schedule: 15,
-  },
+  // SUPPORT_TECHNIQUE: {
+  //   id: 4,
+  //   label: 'Support technique',
+  //   responseType: ResponseType.CALL.id,
+  //   weight: 6,
+  //   isExterne: true,
+  //   idMailAuto: null,
+  //   schedule: 15,
+  // },
   SUIVI_BILAN: {
     id: 5,
     label: 'Suivi bilan',
@@ -101,73 +102,73 @@ export const TaskResponseType = {
     idMailAuto: null,
     schedule: 30,
   },
-  PV_AG_APPROBATION: {
-    id: 9,
-    label: 'Pv d\'AG/Approbation',
-    responseType: ResponseType.INTERN_ACTIVITY.id,
-    weight: 4,
-    isExterne: true,
-    idMailAuto: null,
-    schedule: 15,
-  },
-  DIVIDENDES: {
-    id: 10,
-    label: 'Dividendes',
-    responseType: ResponseType.INTERN_ACTIVITY.id,
-    weight: 6,
-    isExterne: true,
-    idMailAuto: null,
-    schedule: 15,
-  },
-  CREATION_SOCIETE: {
-    id: 11,
-    label: 'Creation société',
-    responseType: ResponseType.INTERN_ACTIVITY.id,
-    weight: 8,
-    isExterne: true,
-    idMailAuto: null,
-    schedule: 15,
-  },
+  // PV_AG_APPROBATION: {
+  //   id: 9,
+  //   label: 'Pv d\'AG/Approbation',
+  //   responseType: ResponseType.INTERN_ACTIVITY.id,
+  //   weight: 4,
+  //   isExterne: true,
+  //   idMailAuto: null,
+  //   schedule: 15,
+  // },
+  // DIVIDENDES: {
+  //   id: 10,
+  //   label: 'Dividendes',
+  //   responseType: ResponseType.INTERN_ACTIVITY.id,
+  //   weight: 6,
+  //   isExterne: true,
+  //   idMailAuto: null,
+  //   schedule: 15,
+  // },
+  // CREATION_SOCIETE: {
+  //   id: 11,
+  //   label: 'Creation société',
+  //   responseType: ResponseType.INTERN_ACTIVITY.id,
+  //   weight: 8,
+  //   isExterne: true,
+  //   idMailAuto: null,
+  //   schedule: 15,
+  // },
   QUESTIONS_JURIDIQUES: {
     id: 12,
     label: 'Questions juridiques',
-    responseType: ResponseType.CALL.id,
-    weight: 6,
-    isExterne: true,
-    idMailAuto: null,
-    schedule: 15,
-  },
-  BULLETIN_PAIE: {
-    id: 13,
-    label: 'Bulletin de paie',
-    responseType: ResponseType.MAIL.id,
-    weight: 2,
-    isExterne: true,
-    idMailAuto: null,
-    schedule: 15,
-  },
-  DECLARATIONS: {
-    id: 14,
-    label: 'Déclarations',
-    responseType: ResponseType.MAIL.id,
-    weight: 3,
-    isExterne: true,
-    idMailAuto: null,
-    schedule: 15,
-  },
-  EMBAUCHE: {
-    id: 15,
-    label: 'Embauche',
     responseType: ResponseType.INTERN_ACTIVITY.id,
-    weight: 4,
+    weight: 6,
     isExterne: true,
     idMailAuto: null,
     schedule: 15,
   },
+  // BULLETIN_PAIE: {
+  //   id: 13,
+  //   label: 'Bulletin de paie',
+  //   responseType: ResponseType.MAIL.id,
+  //   weight: 2,
+  //   isExterne: true,
+  //   idMailAuto: null,
+  //   schedule: 15,
+  // },
+  // DECLARATIONS: {
+  //   id: 14,
+  //   label: 'Déclarations',
+  //   responseType: ResponseType.MAIL.id,
+  //   weight: 3,
+  //   isExterne: true,
+  //   idMailAuto: null,
+  //   schedule: 15,
+  // },
+  // EMBAUCHE: {
+  //   id: 15,
+  //   label: 'Embauche',
+  //   responseType: ResponseType.INTERN_ACTIVITY.id,
+  //   weight: 4,
+  //   isExterne: true,
+  //   idMailAuto: null,
+  //   schedule: 15,
+  // },
   QUESTIONS_SOCIALES: {
     id: 16,
     label: 'Questions sociales',
-    responseType: ResponseType.CALL.id,
+    responseType: ResponseType.INTERN_ACTIVITY.id,
     weight: 5,
     isExterne: true,
     idMailAuto: null,
@@ -275,7 +276,7 @@ export const TaskResponseType = {
   RESILIATION: {
     id: 28,
     label: 'Résiliation',
-    responseType: ResponseType.CALL.id,
+    responseType: ResponseType.INTERN_ACTIVITY.id,
     weight: 6,
     isExterne: true,
     idMailAuto: null,
@@ -290,4 +291,13 @@ export const TaskResponseType = {
     idMailAuto: null,
     schedule: 30,
   },
+  RELATION_CLIENT: {
+    id: 30,
+    label: 'Relation client',
+    responseType: ResponseType.INTERN_ACTIVITY.id,
+    weight: 6,
+    isExterne: true,
+    idMailAuto: null,
+    schedule: 30,
+  },
 };

package/ts/types/Interface/api/mail/QueryCountMail.ts

@@ -1,36 +1,22 @@
 import {
   IsBoolean,
-  IsInt,
   IsOptional,
 } from 'class-validator';
-import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
+import { WhereOptions, WhereValue } from 'sequelize';
+import { Mail } from '../../../../api/resources/Mail';
+import { ApiPropertyOptional } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class QueryCountMail {
-  @ApiProperty()
-  @IsInt()
-  idUser: number;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsBoolean()
-  @ToBoolean()
-  isWithoutSociety?: boolean;
-
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsBoolean()
-  @ToBoolean()
-  isSent?: boolean;
-
   @ApiPropertyOptional()
   @IsOptional()
   @IsBoolean()
   @ToBoolean()
-  isCountingManagerRoleMails?: boolean;
+  distinct?: boolean;
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsInt({ each: true })
-  listIdSocieties?: number[];
+  where?: {
+    [K in keyof Mail]?: WhereOptions | WhereValue
+  };
 }

package/ts/types/Interface/api/mail/QueryCountUnprocessedByUserMail.ts

@@ -0,0 +1,25 @@
+import {
+  IsBoolean,
+  IsInt,
+  IsOptional,
+} from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
+
+export class QueryCountUnprocessedByUserMail {
+  @ApiProperty()
+  @IsInt()
+  idUser: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isWithoutSociety?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isCountingManagerRoleMails?: boolean;
+}

package/ts/types/Interface/api/revision/QueryRevisionSearchEntries.ts

@@ -82,7 +82,7 @@ export class QueryRevisionSearchEntries {
   @ApiPropertyOptional({ default: 'date' })
   @IsString()
   @IsOptional()
-  orderBy?: 'date' | 'accountNumber';
+  orderBy?: 'date' | 'accountNumber' | 'amount' | 'designation' | 'vatRate';
 
   @ApiPropertyOptional()
   @IsBoolean()

package/ts/types/Interface/api/timeRecorder/UpdateRecorder.ts

@@ -0,0 +1,13 @@
+import { IsString, IsDateString, IsNumber } from 'class-validator';
+import { ApiProperty } from '../../../../utils';
+
+export class UpdateRecorder {
+  @ApiProperty()
+  @IsString()
+  @IsDateString()
+  date: string;
+
+  @ApiProperty()
+  @IsNumber()
+  idUser: number;
+}

package/ts/types/index.ts

@@ -480,6 +480,7 @@ export * from './Interface/api/mail/QueryPaginatedMail';
 export * from './Interface/api/mail/QueryCountProcessedByUser';
 export * from './Interface/api/mail/QueryGetAnsweringTimeByUser';
 export * from './Interface/api/mail/QueryCountMail';
+export * from './Interface/api/mail/QueryCountUnprocessedByUserMail';
 export * from './Interface/api/mail/UpdateMail';
 export * from './Interface/api/mail/CreateMailParams';
 export * from './Interface/api/mail/UpdateMailParams';
@@ -570,6 +571,7 @@ export * from './Interface/api/timeRecorder/QueryPaginatedDelays';
 export * from './Interface/api/timeRecorder/ReadAttendanceHours';
 export * from './Interface/api/timeRecorder/ReadPaginatedDelays';
 export * from './Interface/api/timeRecorder/ReadUsersNotConnected';
+export * from './Interface/api/timeRecorder/UpdateRecorder';
 
 // export * from './Interface/api/survey/QuerySurvey';
 export * from './Interface/api/survey/ReadSurvey';
@@ -757,6 +759,7 @@ export * from './Interface/enum/Date';
 
 export * from '../utils/cerfa';
 export * from '../utils/checklist';
+export * from '../utils/date';
 export * from './Interface/api/affectedPatrimony/CreateAffectedPatrimony';
 export * from './Interface/api/affectedPatrimony/CreateInKindAffectedPatrimony';
 export * from './Interface/api/affectedPatrimony/ResultCreateAffectedPatrimony';

package/ts/utils/date.ts

@@ -0,0 +1,32 @@
+/**
+ * @param dateStart (format YYYY-MM-DD)
+ * @param dateEnd (format YYYY-MM-DD)
+ * @returns object of date (09:00-10:00, 12:00-13:00 et 14:00-17:00)
+ */
+import * as dayjs from 'dayjs';
+import * as isBetween from 'dayjs/plugin/isBetween';
+import { ReadAttendanceHours, UpdateCalendarEvent } from '../types';
+
+dayjs.extend(isBetween);
+
+export async function checkRealHoursUser(customPayload: UpdateCalendarEvent, realHours: ReadAttendanceHours):Promise<UpdateCalendarEvent> {
+  const res = { ...customPayload };
+  if (realHours.datas.length > 0) {
+    const dateToCompareStart = dayjs(customPayload.dateStart).toDate();
+    const dateToCompareEnd = dayjs(customPayload.dateEnd).toDate();
+    const realHoursObject = realHours.datas;
+
+    // on cherche la bonne specialhour pour comparer les horaires
+    const realHoursOfPeriod = realHoursObject.filter((sh) => (sh.endTime && dayjs(dateToCompareStart).diff(dayjs(sh.endTime)) <= 0) && (sh.startTime && dayjs(dateToCompareEnd).diff(dayjs(sh.startTime)) >= 0));
+
+    if (realHoursOfPeriod?.length > 0 && realHoursOfPeriod[0].startTime && realHoursOfPeriod[0].endTime) {
+      const dateStart = dayjs(realHoursOfPeriod[0].startTime, 'YYYY-MM-DD HH:mm:ss').toDate();
+      const dateEnd = dayjs(realHoursOfPeriod[0].endTime, 'YYYY-MM-DD HH:mm:ss').toDate();
+
+      // on check si les horaires de l'event sont dans les horaires du collab sinon on les fait commencer à l'heure à laquelle il s'est connecté
+      res.dateStart = !(dayjs(dateToCompareStart).isBetween(dateStart, dateEnd, 'minutes', '[]')) ? dateStart : dateToCompareStart;
+      res.dateEnd = !(dayjs(dateToCompareEnd).isBetween(dateStart, dateEnd, 'minutes', '[]')) ? dateEnd : dateToCompareEnd;
+    }
+  }
+  return res;
+}

package/ts/utils/webmail.ts

@@ -2,7 +2,9 @@ import { Role } from '../types/Enum/Role';
 
 const getIdRoleUsedForEmail = (listRoles: number[]): number => {
   let idRole = Role.CUSTOMER_SUCCESS;
-  if (listRoles.includes(Role.FRONT_OFFICE)) {
+  if (listRoles.includes(Role.BACK_MANAGER)) {
+    idRole = Role.BACK_MANAGER;
+  } else if (listRoles.includes(Role.FRONT_OFFICE)) {
     idRole = Role.FRONT_OFFICE;
   } else if (listRoles.includes(Role.FRONT_OFFICE_EXPRESS)) {
     idRole = Role.FRONT_OFFICE_EXPRESS;
@@ -16,8 +18,6 @@ const getIdRoleUsedForEmail = (listRoles: number[]): number => {
     idRole = Role.JURIDIC;
   } else if (listRoles.includes(Role.SOCIAL)) {
     idRole = Role.SOCIAL;
-  } else if (listRoles.includes(Role.BACK_MANAGER)) {
-    idRole = Role.BACK_MANAGER;
   }
   return idRole;
 };