@silexpert/core 1.1.243 → 1.1.245

package/ts/types/index.ts

@@ -260,6 +260,7 @@ export * from './Interface/models/IUserSocietyPermission';
 export * from './Interface/models/IUserTeam';
 export * from './Interface/models/IUserFile';
 export * from './Interface/models/IUserTest';
+export * from './Interface/models/IUserTimeSlot';
 export * from './Interface/models/IVatDeclaration';
 export * from './Interface/models/IVatDeclarationSocietyDetail';
 export * from './Interface/models/IMail';
@@ -329,6 +330,7 @@ export * from './Interface/models/IUserRoomEquipment';
 export * from './Interface/models/IUserSpecialDay';
 export * from './Interface/models/ICollaboraterDetail';
 export * from './Interface/models/IExpertAnnuary';
+export * from './Interface/models/IUserTimeSlot';
 
 
 // Schemas
@@ -529,6 +531,7 @@ export * from './Enum/SpecialDayType';
 export * from './Enum/Degree';
 export * from './Enum/Brevo';
 export * from './Enum/ZoneCode';
+export * from './Enum/TimeSlot';
 
 // Interfaces API
 export * from './Interface/api/kilometricAllowance/ReadKilometricAllowance';
@@ -1043,6 +1046,8 @@ export * from './Interface/api/echo/Mission';
 export * from './Interface/api/echo/CreateOrder';
 export * from './Interface/api/echo/NewsPaper';
 export * from './Interface/api/echo/Order';
+export * from './Interface/api/userTimeSlot/QueryUserTimeSlot';
+export * from './Interface/api/workingSchedule/QueryAvailableTimeSlot';
 
 // Enums types
 export * from './Interface/enum/Util';

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.ts

@@ -132,7 +132,7 @@ function getMailSignature(user:any, idTypeBrand:number) {
 
 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 {
@@ -207,9 +207,9 @@ 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 (user.roles && user.roles.some((r: any) => r.id === Role.DATA_OFFICER)) { // Signature data_officer
     user = {
@@ -218,7 +218,6 @@ export function generateSignature(params: any): string {
     };
     mailSignature = dataOfficerMail;
     roleSignature = '';
-    phoneSignature = standardPhoneSignature;
   } else if (forceRole === 'social') { // Signature social
     user = {
       firstname: 'Service social',
@@ -276,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,