@silexpert/core 0.4.264 → 0.4.265

package/ts/types/Enum/TaskResponseType.ts

@@ -31,7 +31,7 @@ export enum RoleAvailableForTask {
   CUSTOMER_SUCCESS = Role.CUSTOMER_SUCCESS,
   FRONT_OFFICE = Role.FRONT_OFFICE,
   COMMERCIAL = Role.COMMERCIAL,
-  BACK_MANAGER = Role.BACK_MANAGER,
+  // BACK_MANAGER = Role.BACK_MANAGER,
   EXPERT_ACCOUNTANT = Role.EXPERT_ACCOUNTANT,
 }
 
@@ -142,7 +142,7 @@ export const TaskResponseType = {
       {
         id: 10,
         label: 'Préparation d\'un bilan',
-        role: Role.BACK_MANAGER,
+        role: Role.MANAGER,
         deadline: Deadline,
         isForWholeRole: false,
         backToClient: false,
@@ -150,6 +150,17 @@ export const TaskResponseType = {
         responseType: null,
         description: 'Controle de la DADS.',
       },
+      {
+        id: 11,
+        label: 'Comptable express',
+        role: Role.FRONT_OFFICE_EXPRESS,
+        deadline: Deadline,
+        isForWholeRole: false,
+        backToClient: false,
+        goToCalendar: false,
+        responseType: null,
+        description: 'Est-ce que nous pouvons réaliser le bilan 2020 de ce client ?',
+      },
     ],
   },
   EXTERN: {
@@ -269,7 +280,7 @@ export const TaskResponseType = {
       {
         id: 14,
         label: 'Litige dossier',
-        role: Role.BACK_MANAGER,
+        role: Role.MANAGER,
         deadline: Deadline,
         isForWholeRole: false,
         backToClient: true,
@@ -277,6 +288,17 @@ export const TaskResponseType = {
         responseType: ResponseType.MAIL,
         description: 'Le client veut avoir une explication de bilan par le responsable comptable',
       },
+      {
+        id: 15,
+        label: 'Comptable express',
+        role: Role.FRONT_OFFICE_EXPRESS,
+        deadline: Deadline,
+        isForWholeRole: false,
+        backToClient: true,
+        goToCalendar: false,
+        responseType: ResponseType.MAIL,
+        description: 'Bilan express à envoyer au SIE.',
+      },
     ],
 
   },

package/ts/types/Enum/TimeCounterType.ts

@@ -5,25 +5,25 @@ export const TimeCounterType = {
     id: 1,
     label: 'OnBoarding',
     aberrantTime: 60,
-    limitedRoles: [Role.FRONT_OFFICE, Role.BACK_OFFICE],
+    limitedRoles: [Role.FRONT_OFFICE],
   },
   VAT: {
     id: 2,
     label: 'TVA',
     aberrantTime: 60,
-    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE, Role.BACK_OFFICE],
+    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE],
   },
   REVISION: {
     id: 3,
     label: 'Révision',
     aberrantTime: 120,
-    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE, Role.BACK_OFFICE],
+    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE],
   },
   FOLDER_REVIEW: {
     id: 4,
     label: 'Revue dossier',
     aberrantTime: 60,
-    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE, Role.BACK_OFFICE],
+    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE],
   },
   REPORTING: {
     id: 5,
@@ -65,7 +65,7 @@ export const TimeCounterType = {
     id: 11,
     label: 'Prévisionnel',
     aberrantTime: null,
-    limitedRoles: [Role.FRONT_OFFICE, Role.BACK_OFFICE],
+    limitedRoles: [Role.FRONT_OFFICE],
   },
   CERTIFICATE: {
     id: 12,
@@ -77,7 +77,7 @@ export const TimeCounterType = {
     id: 13,
     label: 'Mission complémentaire',
     aberrantTime: null,
-    limitedRoles: [Role.FRONT_OFFICE, Role.BACK_OFFICE],
+    limitedRoles: [Role.FRONT_OFFICE],
   },
   ORGANISATION: {
     id: 14,
@@ -119,7 +119,7 @@ export const TimeCounterType = {
     id: 20,
     label: 'Bilan',
     aberrantTime: 120,
-    limitedRoles: [Role.FRONT_OFFICE, Role.BACK_OFFICE, Role.FRONT_MANAGER, Role.BACK_MANAGER, Role.EXPERT_ACCOUNTANT],
+    limitedRoles: [Role.FRONT_OFFICE, Role.EXPERT_ACCOUNTANT],
   },
   PAYSLIP: {
     id: 21,

package/ts/types/Interface/api/user/ParamsGetAllCollaborators.ts

@@ -1,4 +1,5 @@
 import {
+  IsIn,
   IsNumber,
   IsOptional, IsString,
 } from 'class-validator';
@@ -26,4 +27,12 @@ export class ParamsGetAllCollaborators {
   @IsOptional()
   @IsNumber()
   idUser?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString({
+    each: true,
+  })
+  @IsIn(['avatar', 'teams', 'businessLines'], { each: true })
+  include?: string[];
 }

package/ts/types/Interface/api/user/QueryGetAllCollaborators.ts

@@ -1,4 +1,5 @@
-import { ApiProperty } from '../../../../utils';
+import { IsIn, IsOptional, IsString } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 
 export class QueryGetAllCollaborators {
   @ApiProperty({
@@ -8,4 +9,12 @@ export class QueryGetAllCollaborators {
     example: [1, 13],
   })
   idUser?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString({
+    each: true,
+  })
+  @IsIn(['avatar', 'teams', 'businessLines'], { each: true })
+  include?: string[];
 }

package/ts/utils/task.ts

@@ -3,7 +3,7 @@ import { TaskResponseType, RoleAvailableForTask } from '../types/Enum/TaskRespon
 
 const getIdRoleUsedForTask = (listRoles: number[]): number => {
   let idRole = 0;
-  if (listRoles.includes(Role.COMMERCIAL) || listRoles.includes(Role.COMMERCIAL_MANAGER)) {
+  if (listRoles.includes(Role.COMMERCIAL)) {
     idRole = Role.COMMERCIAL;
   } else if (listRoles.includes(Role.JURIDIC)) {
     idRole = Role.JURIDIC;
@@ -11,27 +11,27 @@ const getIdRoleUsedForTask = (listRoles: number[]): number => {
     idRole = Role.SOCIAL;
   } else if (listRoles.includes(Role.FACTURATION)) {
     idRole = Role.FACTURATION;
-  } else if (listRoles.includes(Role.CUSTOMER_SUCCESS) || listRoles.includes(Role.CUSTOMER_SUCCESS_MANAGER)) {
+  } else if (listRoles.includes(Role.CUSTOMER_SUCCESS)) {
     idRole = Role.CUSTOMER_SUCCESS;
-  } else if (listRoles.includes(Role.FRONT_OFFICE) || listRoles.includes(Role.FRONT_MANAGER)) {
+  } else if (listRoles.includes(Role.FRONT_OFFICE)) {
     idRole = Role.FRONT_OFFICE;
   }
   return idRole;
 };
 
-const getIdRoleUsedForManagerTask = (listRoles: number[]): number => {
-  let idRole = 0;
-  if (listRoles.includes(Role.COMMERCIAL)) {
-    idRole = Role.COMMERCIAL_MANAGER;
-  } else if (listRoles.includes(Role.JURIDIC) || listRoles.includes(Role.SOCIAL) || listRoles.includes(Role.FACTURATION)) {
-    idRole = Role.MANAGER;
-  } else if (listRoles.includes(Role.CUSTOMER_SUCCESS)) {
-    idRole = Role.CUSTOMER_SUCCESS_MANAGER;
-  } else if (listRoles.includes(Role.FRONT_OFFICE)) {
-    idRole = Role.FRONT_MANAGER;
-  }
-  return idRole;
-};
+// const getIdRoleUsedForManagerTask = (listRoles: number[]): number => {
+//   let idRole = 0;
+//   if (listRoles.includes(Role.COMMERCIAL)) {
+//     idRole = Role.MANAGER;
+//   } else if (listRoles.includes(Role.JURIDIC) || listRoles.includes(Role.SOCIAL) || listRoles.includes(Role.FACTURATION)) {
+//     idRole = Role.MANAGER;
+//   } else if (listRoles.includes(Role.CUSTOMER_SUCCESS)) {
+//     idRole = Role.MANAGER;
+//   } else if (listRoles.includes(Role.FRONT_OFFICE)) {
+//     idRole = Role.MANAGER;
+//   }
+//   return idRole;
+// };
 
 const getIdRoleUsedForAttribution = (isIntern: boolean, idTaskType: number): number | undefined => {
   const taskTypeList = isIntern ? TaskResponseType.INTERN.types : TaskResponseType.EXTERN.types;
@@ -41,5 +41,5 @@ const getIdRoleUsedForAttribution = (isIntern: boolean, idTaskType: number): num
 const getIdRoleUsedForGetTaskOfUser = (idRole: number): boolean => !!Object.values(RoleAvailableForTask).find((role) => role === idRole);
 
 export {
-  getIdRoleUsedForTask, getIdRoleUsedForManagerTask, getIdRoleUsedForAttribution, getIdRoleUsedForGetTaskOfUser,
+  getIdRoleUsedForTask, getIdRoleUsedForAttribution, getIdRoleUsedForGetTaskOfUser,
 };

package/ts/utils/webmail.ts

@@ -4,13 +4,11 @@ const getIdRoleUsedForEmail = (listRoles: number[]): number => {
   let idRole = Role.CUSTOMER_SUCCESS;
   if (listRoles.includes(Role.FACTURATION)) {
     idRole = Role.FACTURATION;
-  } else 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;
-  } else if (listRoles.includes(Role.COMMERCIAL) || listRoles.includes(Role.COMMERCIAL_MANAGER)) {
+  } else if (listRoles.includes(Role.COMMERCIAL)) {
     idRole = Role.COMMERCIAL;
   } else if (listRoles.includes(Role.EXPERT_ACCOUNTANT)) {
     idRole = Role.EXPERT_ACCOUNTANT;