@silexpert/core 1.1.242 → 1.1.244

package/ts/types/Enum/TimeCounterType.ts

@@ -5,42 +5,42 @@ export const TimeCounterType = {
     id: 1,
     label: 'OnBoarding',
     aberrantTime: 60,
-    limitedRoles: [Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS],
+    limitedRoles: [Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS, Role.DATA_OFFICER],
     color: 'fire',
   },
   VAT: {
     id: 2,
     label: 'TVA',
     aberrantTime: 60,
-    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS],
+    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS, Role.DATA_OFFICER],
     color: 'iris',
   },
   REVISION: {
     id: 3,
     label: 'Révision',
     aberrantTime: 120,
-    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS],
+    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS, Role.DATA_OFFICER],
     color: 'bubblegum-light',
   },
   FOLDER_REVIEW: {
     id: 4,
     label: 'Revue dossier',
     aberrantTime: 60,
-    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS],
+    limitedRoles: [Role.MANAGER, Role.EXPERT_ACCOUNTANT, Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS, Role.DATA_OFFICER],
     color: 'cerulean',
   },
   REPORTING: {
     id: 5,
     label: 'Signalement',
     aberrantTime: 60,
-    limitedRoles: [Role.CUSTOMER_SUCCESS],
+    limitedRoles: [Role.CUSTOMER_SUCCESS, Role.ON_BOARDER, Role.TERMINATION, Role.LITIGE],
     color: 'lipstick-dark',
   },
   SYNCHRONISATION: {
     id: 6,
     label: 'Synchronisation',
     aberrantTime: 30,
-    limitedRoles: [Role.CUSTOMER_SUCCESS],
+    limitedRoles: [Role.CUSTOMER_SUCCESS, Role.ON_BOARDER, Role.TERMINATION, Role.LITIGE],
     color: 'orange-dark',
   },
   UNDER_SUPERVISION: {
@@ -75,21 +75,21 @@ export const TimeCounterType = {
     id: 11,
     label: 'Prévisionnel',
     aberrantTime: 20,
-    limitedRoles: [Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS],
+    limitedRoles: [Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS, Role.DATA_OFFICER],
     color: 'cerulean-light',
   },
   CERTIFICATE: {
     id: 12,
     label: 'Attestation',
     aberrantTime: 20,
-    limitedRoles: [Role.CUSTOMER_SUCCESS],
+    limitedRoles: [Role.CUSTOMER_SUCCESS, Role.ON_BOARDER, Role.TERMINATION, Role.LITIGE],
     color: 'pink-salmon',
   },
   COMPLEMENTARY_MISSION: {
     id: 13,
     label: 'Mission complémentaire',
     aberrantTime: 20,
-    limitedRoles: [Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS],
+    limitedRoles: [Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS, Role.DATA_OFFICER],
     color: 'cerulean-light',
   },
   ORGANISATION: {
@@ -124,21 +124,21 @@ export const TimeCounterType = {
     id: 18,
     label: 'Traitement des courriers',
     aberrantTime: 20,
-    limitedRoles: [Role.CUSTOMER_SUCCESS],
+    limitedRoles: [Role.CUSTOMER_SUCCESS, Role.ON_BOARDER, Role.TERMINATION, Role.LITIGE],
     color: 'pink-salmon',
   },
   SUPPORT_PROCESSING: {
     id: 19,
     label: 'Traitement support',
     aberrantTime: 20,
-    limitedRoles: [Role.CUSTOMER_SUCCESS],
+    limitedRoles: [Role.CUSTOMER_SUCCESS, Role.ON_BOARDER, Role.TERMINATION, Role.LITIGE],
     color: 'error',
   },
   BILAN: {
     id: 20,
     label: 'Bilan',
     aberrantTime: 120,
-    limitedRoles: [Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS, Role.EXPERT_ACCOUNTANT],
+    limitedRoles: [Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS, Role.DATA_OFFICER, Role.EXPERT_ACCOUNTANT],
     color: 'cerulean-dark',
   },
   PAYSLIP: {
@@ -250,7 +250,7 @@ export const TimeCounterType = {
     id: 36,
     label: 'Validation contrôle interne',
     aberrantTime: 480,
-    limitedRoles: [Role.CUSTOMER_SUCCESS],
+    limitedRoles: [Role.CUSTOMER_SUCCESS, Role.ON_BOARDER, Role.TERMINATION, Role.LITIGE],
     color: 'grey-dark',
   },
   CALENDLY: {

package/ts/types/Interface/models/IComment.ts

@@ -1,6 +1,7 @@
 import { ICommentType } from './ICommentType';
 import { IChannelType } from './IChannelType';
 import { IUser } from './IUser';
+import { IExercice } from './IExercice';
 import { ISupervision } from './ISupervision';
 import { ICard, ITask } from '../..';
 
@@ -14,6 +15,7 @@ export interface IComment {
   idReport?: number | null;
   idTask?: number | null;
   idUser?: number | null;
+  idExercice?: number | null;
   idCard?: number | null;
   idChecklist?: number | null;
   isPing?: boolean;
@@ -25,6 +27,7 @@ export interface IComment {
   commentType?: ICommentType;
   channelType?: IChannelType;
   user?: IUser;
+  exercice?: IExercice;
   supervision?: ISupervision;
   task?: ITask;
   card?: ICard;

package/ts/types/Interface/models/IExercice.ts

@@ -12,6 +12,7 @@ import { ISociety } from './ISociety';
 import { IExerciceDetail } from './IExerciceDetail';
 import { IBalanceSheetModule } from './IBalanceSheetModule';
 import { IRegistration } from './IRegistration';
+import { IComment } from './IComment';
 
 // exercices
 export interface IExercice {
@@ -62,4 +63,5 @@ export interface IExercice {
   exerciceDetail?: IExerciceDetail;
   exerciceBalanceSheetModule?: IBalanceSheetModule;
   registrations: IRegistration[];
+  comments?: IComment[];
 }

package/ts/utils/checkup.ts

@@ -16,12 +16,16 @@ export const getCheckupDetailForm = (
   societyDetail: any, //FIXME: typage ???
   brandName: string, 
   bankList: { id: number, name: number }[],
+  dateOfRegistration?: Date | null,
+  recoveryDate?: Date | null,
 ) => { //FIXME: typage ???
 
-  const isSocietyCreationCompute = societyDetail.isSocietyCreation !== null &&
-          societyDetail.isSocietyCreation !== undefined
-    ? societyDetail.isSocietyCreation
-    : true;
+  const isSocietyCreationCompute = !recoveryDate || !dateOfRegistration || 
+  (recoveryDate && 
+    dateOfRegistration && 
+    dayjs(dateOfRegistration).isBetween(dayjs(recoveryDate).subtract(1, 'month'), dayjs(recoveryDate).add(1, 'month')))
+    ? true
+    : false;
 
   return [
     {

package/ts/utils/email/templates/signature.ts

@@ -237,7 +237,7 @@ ${logoClementine}
                   <a href="https://www.smileyourpla.net/" style="display: inline-block; color:#6E6E71;" target="_blank"><img
                           src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_smileYourPlanet.png"
                           alt="Initiative Smile your planet" height="36"></a>
-                  <% if(user.calendlyUrl) { %>
+                  <% if(user.calendlyUrl && !isDataOfficer) { %>
                     <a href="<%= user.calendlyUrl %>" style="display: inline-block; color:#6E6E71;" target="_blank">
                       <img
                       src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_rdv_tel<%= commercialName === 'Pourcentage' ? '_pourcentage' : '' %>.png"

package/ts/utils/email.ts

@@ -21,6 +21,10 @@ function getRoleSignature(user:any) {
   const isFacturation = user.roles.map((r: any) => r.id).includes(Role.FACTURATION);
   const isExpert = user.roles.map((r: any) => r.id).includes(Role.EXPERT_ACCOUNTANT);
   const isCS = user.roles.map((r: any) => r.id).includes(Role.CUSTOMER_SUCCESS);
+  const isOnBoarder = user.roles.map((r: any) => r.id).includes(Role.ON_BOARDER);
+  const isTermination = user.roles.map((r: any) => r.id).includes(Role.TERMINATION);
+  const isLitige = user.roles.map((r: any) => r.id).includes(Role.LITIGE);
+  const isDataOfficer = user.roles.map((r: any) => r.id).includes(Role.DATA_OFFICER);
   const isSales = user.roles.map((r: any) => r.id).includes(Role.COMMERCIAL);
   const isAdmin = user.roles.map((r: any) => r.id).includes(Role.ADMIN);
   const isFront = !!intersection([user.roles.map((r: any) => r.id), [Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS]]).length;
@@ -31,6 +35,18 @@ function getRoleSignature(user:any) {
   if (isCS && isManager) { return 'Responsable relations clients'; }
   if (isCS) { return `Conseill${user.idCivility === 2 ? 'ère' : 'er'} comptable`; }
 
+  if (isOnBoarder && isManager) { return `Responsable chargé${user.idCivility === 2 ? 'e' : ''} accueil clients`; }
+  if (isOnBoarder) { return `Chargé${user.idCivility === 2 ? 'e' : ''} accueil clients`; }
+
+  if (isTermination && isManager) { return `Responsable chargé${user.idCivility === 2 ? 'e' : ''} de la satisfaction clients`; }
+  if (isTermination) { return `Chargé${user.idCivility === 2 ? 'e' : ''} de la satisfaction clients`; }
+
+  if (isLitige && isManager) { return `Responsable chargé${user.idCivility === 2 ? 'e' : ''} de la satisfaction clients (Litige)`; }
+  if (isLitige) { return `Chargé${user.idCivility === 2 ? 'e' : ''} de la satisfaction clients (Litige)`; }
+
+  if (isDataOfficer && isManager) { return 'Responsable aide comptable'; }
+  if (isDataOfficer) { return 'Aide comptable'; }
+
   if (isFacturation && isStagiaireOrAlternant) { return 'Assistant facturation'; }
   if (isFacturation && isManager) { return 'Responsable facturation'; }
   if (isFacturation) { return `Chargé${user.idCivility === 2 ? 'e' : ''} de facturation`; }
@@ -110,13 +126,13 @@ function getMailSignature(user:any, idTypeBrand:number) {
   }) as unknown as string;
 
   if (user.roles.map((r: any) => r.id).includes(Role.ADMIN)) { return informatiqueMail; }
-  if (user && !!intersection([user.roles.map((r: any) => r.id), [Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS, Role.COMMERCIAL]]).length) return user.email;
+  if (user && !!intersection([user.roles.map((r: any) => r.id), [Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS, Role.DATA_OFFICER, Role.COMMERCIAL]]).length) return user.email;
   return bonjourMail;
 }
 
 function getPhoneSignature(user:any) {
   if (user.phone !== '0383931414') { return user.phone.replace(/\B(?=(\d{2})+(?!\d))/g, ' '); }
-  return false;
+  return null;
 }
 
 export function generateSignature(params: any): string {
@@ -156,6 +172,10 @@ export function generateSignature(params: any): string {
     ...(idTypeBrand ? { idTypeBrand } : {}),
     objectWaited: 'listMails.social',
   }) as unknown as string;
+  const dataOfficerMail = getBrandConfig({
+    ...(idTypeBrand ? { idTypeBrand } : {}),
+    objectWaited: 'listMails.gestion',
+  }) as unknown as string;
   const supportMail = getBrandConfig({
     ...(idTypeBrand ? { idTypeBrand } : {}),
     objectWaited: 'listMails.support',
@@ -187,11 +207,18 @@ export function generateSignature(params: any): string {
 
   let roleSignature: string | null;
   let mailSignature: string | null;
-  let phoneSignature: string | boolean;
+  let phoneSignature: string | null;
   let horaires: string | null;
-  [roleSignature, mailSignature, phoneSignature, horaires] = ['Expert-Comptable', bonjourMail, false, 'Du lundi au vendredi de 9h à 19h'];
+  [roleSignature, mailSignature, phoneSignature, horaires] = ['Expert-Comptable', bonjourMail, null, 'Du lundi au vendredi de 9h à 19h'];
 
-  if (forceRole === 'social') { // Signature social
+  if (user.roles && user.roles.some((r: any) => r.id === Role.DATA_OFFICER)) { // Signature data_officer
+    user = {
+      firstname: `L'équipe ${commercialName}`,
+      isAll: true,
+    };
+    mailSignature = dataOfficerMail;
+    roleSignature = '';
+  } else if (forceRole === 'social') { // Signature social
     user = {
       firstname: 'Service social',
       isAll: true,
@@ -238,6 +265,7 @@ export function generateSignature(params: any): string {
   return ejs.render(signatureTemplate, {
     forceRole,
     isFacturation: user.roles ? user.roles.some((r: any) => r.id === Role.FACTURATION) : false,
+    isDataOfficer: user.roles ? user.roles.some((r: any) => r.id === Role.DATA_OFFICER) : true,
     brandName,
     idTypeBrand,
     commercialName,
@@ -247,7 +275,7 @@ export function generateSignature(params: any): string {
     user,
     roleSignature,
     mailSignature,
-    phoneSignature,
+    phoneSignature: phoneSignature ? phoneSignature.replace(/\s+/gm, ' ') : null,
     standardPhoneSignature: standardPhoneSignature.replace(/\s+/gm, ' '),
     horaires,
     primaryColor,

package/ts/utils/task.ts

@@ -13,8 +13,16 @@ const getIdRoleUsedForTask = (listRoles: number[]): number => {
     idRole = Role.FACTURATION;
   } else if (listRoles.includes(Role.CUSTOMER_SUCCESS)) {
     idRole = Role.CUSTOMER_SUCCESS;
+  } else if (listRoles.includes(Role.ON_BOARDER)) {
+    idRole = Role.ON_BOARDER;
+  } else if (listRoles.includes(Role.TERMINATION)) {
+    idRole = Role.TERMINATION;
+  } else if (listRoles.includes(Role.LITIGE)) {
+    idRole = Role.LITIGE;
   } else if (listRoles.includes(Role.FRONT_OFFICE)) {
     idRole = Role.FRONT_OFFICE;
+  } else if (listRoles.includes(Role.DATA_OFFICER)) {
+    idRole = Role.DATA_OFFICER;
   }
   return idRole;
 };

package/ts/utils/webmail.ts

@@ -8,6 +8,8 @@ const getIdRoleUsedForEmail = (listRoles: number[]): number => {
     idRole = Role.FRONT_OFFICE;
   } else if (listRoles.includes(Role.FRONT_OFFICE_EXPRESS)) {
     idRole = Role.FRONT_OFFICE_EXPRESS;
+  } else if (listRoles.includes(Role.DATA_OFFICER)) {
+    idRole = Role.DATA_OFFICER;
   } else if (listRoles.includes(Role.COMMERCIAL)) {
     idRole = Role.COMMERCIAL;
   } else if (listRoles.includes(Role.EXPERT_ACCOUNTANT)) {
@@ -18,6 +20,12 @@ const getIdRoleUsedForEmail = (listRoles: number[]): number => {
     idRole = Role.JURIDIC;
   } else if (listRoles.includes(Role.SOCIAL)) {
     idRole = Role.SOCIAL;
+  } else if (listRoles.includes(Role.ON_BOARDER)) {
+    idRole = Role.ON_BOARDER;
+  } else if (listRoles.includes(Role.TERMINATION)) {
+    idRole = Role.TERMINATION;
+  } else if (listRoles.includes(Role.LITIGE)) {
+    idRole = Role.LITIGE;
   }
   return idRole;
 };