@silexpert/core 1.1.171 → 1.1.173

package/ts/types/Enum/BrandClementine.ts

@@ -513,28 +513,28 @@ export const BrandClementine = [
         name: 'page_intro',
         needBgImage: true,
         versionable: false,
-        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS],
+        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS, PrestationType.BILAN_PREVISIONNEL_KLEMS],
       },
       {
         label: 'Page chiffres',
         name: 'page_numbers',
         needBgImage: true,
         versionable: false,
-        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS],
+        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS, PrestationType.BILAN_PREVISIONNEL_KLEMS],
       },
       {
         label: 'Page simplifié',
         name: 'page_simplified',
         needBgImage: true,
         versionable: false,
-        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS],
+        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS, PrestationType.BILAN_PREVISIONNEL_KLEMS],
       },
       {
         label: 'Détail de la lettre de mission',
         name: 'page_detail_ldm',
         needBgImage: false,
         versionable: false,
-        idPrestationType: Object.values(PrestationDetail).filter(p => !p.isBack && !p.hidden && [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS].includes(p.id!)).map(({ id }) => id), // Prestations non express
+        idPrestationType: Object.values(PrestationDetail).filter(p => !p.isBack && !p.hidden && [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.BILAN_PREVISIONNEL_KLEMS].includes(p.id!)).map(({ id }) => id), // Prestations non express
       },
       {
         label: 'Détail de la lettre de mission (express)',
@@ -624,35 +624,35 @@ export const BrandClementine = [
         label: 'Signature',
         name: 'bloc_sign',
         needBgImage: false,
-        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS],
+        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS, PrestationType.BILAN_PREVISIONNEL_KLEMS],
         versionable: false,
       },
       {
         label: 'Conditions Générals de Vente (CGV) 1/2',
         name: 'bloc_cgv_first',
         needBgImage: false,
-        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS],
+        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS, PrestationType.BILAN_PREVISIONNEL_KLEMS],
         versionable: false,
       },
       {
         label: 'Conditions Générals de Vente (CGV) 2/2',
         name: 'bloc_cgv_second',
         needBgImage: false,
-        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS],
+        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS, PrestationType.BILAN_PREVISIONNEL_KLEMS],
         versionable: false,
       },
       {
         label: 'Mandat de prélèvement SEPA',
         name: 'bloc_sepa',
         needBgImage: false,
-        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS],
+        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS, PrestationType.BILAN_PREVISIONNEL_KLEMS],
         versionable: false,
       },
       {
         label: 'Pièces à nous envoyer',
         name: 'bloc_send_files',
         needBgImage: false,
-        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS],
+        idPrestationType: [PrestationType.SOCIAL, PrestationType.COMPTA_MICRO_KLEMS, PrestationType.COMPTA_EI_KLEMS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS, PrestationType.COMPTA_MICRO_KLEMS_EXPRESS, PrestationType.COMPTA_EI_KLEMS_EXPRESS, PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS, PrestationType.BILAN_PREVISIONNEL_KLEMS],
         versionable: false,
       },
     ],

package/ts/types/Enum/BrandStatutsExpress.ts

@@ -90,6 +90,10 @@ export const BrandStatutsExpress = [
         id: 1,
         name: 'Laxou',
       },
+      MARSEILLE: {
+        id: 3,
+        name: 'Marseille',
+      },
       HOME_OFFICE: {
         id: 5,
         name: 'Télétravail',

package/ts/types/Enum/TimeTrackingSource.ts

@@ -0,0 +1,4 @@
+export enum TimeTrackingSource {
+  CLEMENTINIER = 1,
+  MYCLE_REVISION = 2,
+}

package/ts/types/Interface/api/prestashop/PSObject.ts

@@ -1,3 +1,3 @@
 export interface PSObject {
-  id: number | null
+  id: number | string | null
 }

package/ts/types/Interface/api/timeTracking/Create.ts

@@ -0,0 +1,23 @@
+import { IsBoolean, IsNumber } from 'class-validator';
+import { ApiProperty } from '../../../../utils';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
+import { TimeTrackingSource } from '../../../Enum/TimeTrackingSource';
+
+export class CreateOrUpdateTimeTracking {
+  @ApiProperty()
+  @IsBoolean()
+  @ToBoolean()
+    stopTrigger: boolean;
+
+  @ApiProperty()
+  @IsNumber()
+    idExercice: number;
+
+  @ApiProperty()
+  @IsNumber()
+    idUser: number;
+
+  @ApiProperty()
+  @IsNumber()
+    idTimeTrackingSource: TimeTrackingSource;
+}

package/ts/types/Interface/api/timeTracking/Query.ts

@@ -0,0 +1,12 @@
+import { IsNumber } from 'class-validator';
+import { ApiProperty } from '../../../../utils';
+
+export class QueryTimeTracking {
+  @ApiProperty()
+  @IsNumber()
+    idExercice: number;
+
+  @ApiProperty()
+  @IsNumber()
+    idUser: number;
+}

package/ts/types/Interface/models/ITimeTracking.ts

@@ -9,7 +9,7 @@ export interface ITimeTracking {
   dateStart: Date;
   dateEnd: Date;
   duration: number;
-  idTimeTrakingSource: number;
+  idTimeTrackingSource: number;
   idUser: number;
   idSociety: number;
   idExercice: number;
@@ -20,5 +20,5 @@ export interface ITimeTracking {
   society: ISociety;
   user: IUser;
   exercice: IExercice;
-  timeTrakingSource: ITimeTrackingSource;
+  timeTrackingSource: ITimeTrackingSource;
 }

package/ts/types/index.ts

@@ -502,6 +502,7 @@ export * from './Enum/MissionAcceptation';
 export * from './Enum/Bank';
 export * from './Enum/VatControl';
 export * from './Enum/Cycle';
+export * from './Enum/TimeTrackingSource';
 
 // Interfaces API
 export * from './Interface/api/cashAndExpense/Query';
@@ -1006,4 +1007,6 @@ export * from './Interface/api/partners/QueryPartnerStatistic';
 export * from './Interface/api/partners/QueryPartnerCsv';
 export * from './Interface/api/partners/PartnerStatisticType';
 export * from './Interface/api/dubiousCustomer/Create';
-export * from './Interface/api/dubiousCustomer/Update';
+export * from './Interface/api/dubiousCustomer/Update';
+export * from './Interface/api/timeTracking/Create'; 
+export * from './Interface/api/timeTracking/Query';