@movalib/movalib-commons 1.0.72 → 1.0.74

package/devIndex.tsx

@@ -23,18 +23,13 @@ import { flexCenter } from './src/helpers/Tools';
 
 const App = () => {
 
-  // Activation des logs console si nous ne sommes pas en PRODUCTION sinon contrôle de la variable debugMode
-  if (process.env.NODE_ENV !== 'production' || localStorage.getItem('debugMode') === 'true') {
-    Logger.enableLogging();
-  }
+  Logger.enableLogging();
 
   // Chargement de données garage de test
   const [garage, setGarage] = useState<Garage>();
 
   useEffect(() => {
-
     refreshGarageData();
-    
   }, []);
 
 

package/dist/devIndex.js

@@ -58,10 +58,7 @@ var ScheduleFields_1 = __importDefault(require("./src/ScheduleFields"));
 var Schedule_1 = __importDefault(require("./src/models/Schedule"));
 var Tools_1 = require("./src/helpers/Tools");
 var App = function () {
-    // Activation des logs console si nous ne sommes pas en PRODUCTION sinon contrôle de la variable debugMode
-    if (process.env.NODE_ENV !== 'production' || localStorage.getItem('debugMode') === 'true') {
-        Logger_1.default.enableLogging();
-    }
+    Logger_1.default.enableLogging();
     // Chargement de données garage de test
     var _a = (0, react_1.useState)(), garage = _a[0], setGarage = _a[1];
     (0, react_1.useEffect)(function () {

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export { default as AuthenticationService } from './src/services/AuthenticationService';
 export { default as GarageService } from './src/services/GarageService';
 export { default as UserService } from './src/services/UserService';
+export { default as AddressFields } from './src/AddressFields';
 export { default as ScheduleFields } from './src/ScheduleFields';
 export { default as VehicleFullCard } from './src/VehicleFullCard';
 export { default as MovaDigitalPassport } from './src/MovaDigitalPassport';
@@ -29,7 +30,7 @@ export { default as Event } from './src/models/Event';
 export { default as VehicleTire } from './src/models/VehicleTire';
 export type { APIRequest, APIResponse } from './src/helpers/ApiHelper';
 export type { DaySchedule } from './src/ScheduleFields';
-export type { MovaFormField, MovaLoginForm, MovaUserSignUpForm, MovaInterval, OriginReference, MovaVehicleForm } from './src/helpers/Types';
+export type { MovaFormField, MovaLoginForm, MovaUserSignUpForm, MovaInterval, OriginReference, MovaVehicleForm, AddressFieldName } from './src/helpers/Types';
 export { readCookie, deleteCookie } from './src/helpers/CookieUtils';
 export { validateField, formatVehicleTire, formatFrenchVehiclePlate, isEmpty } from './src/helpers/Tools';
 export { validatePhoneNumber, validateText, validateEmail } from './src/helpers/Validator';

package/dist/index.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Gender = exports.DocumentState = exports.DigitalPassportIndex = exports.DocumentType = exports.EventType = exports.EventState = exports.DayOfWeek = exports.MovaAppType = exports.RoleType = exports.capitalizeFirstLetter = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.validateEmail = exports.validateText = exports.validatePhoneNumber = exports.isEmpty = exports.formatFrenchVehiclePlate = exports.formatVehicleTire = exports.validateField = exports.deleteCookie = exports.readCookie = exports.VehicleTire = exports.Event = exports.Schedule = exports.Garage = exports.Document = exports.Vehicle = exports.Address = exports.Role = exports.User = exports.Customer = exports.Logger = exports.GenderSelector = exports.ConfirmationDialog = exports.MovaVehicleTireField = exports.MovaCopyright = exports.MovaSignUp = exports.MovaLogin = exports.MovaSnackbar = exports.TestButton = exports.VehiclePlateField = exports.QRCode = exports.MovaDialog = exports.Loader = exports.MovaDigitalPassport = exports.VehicleFullCard = exports.ScheduleFields = exports.UserService = exports.GarageService = exports.AuthenticationService = void 0;
-exports.DateFormatTypes = void 0;
+exports.DocumentState = exports.DigitalPassportIndex = exports.DocumentType = exports.EventType = exports.EventState = exports.DayOfWeek = exports.MovaAppType = exports.RoleType = exports.capitalizeFirstLetter = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.validateEmail = exports.validateText = exports.validatePhoneNumber = exports.isEmpty = exports.formatFrenchVehiclePlate = exports.formatVehicleTire = exports.validateField = exports.deleteCookie = exports.readCookie = exports.VehicleTire = exports.Event = exports.Schedule = exports.Garage = exports.Document = exports.Vehicle = exports.Address = exports.Role = exports.User = exports.Customer = exports.Logger = exports.GenderSelector = exports.ConfirmationDialog = exports.MovaVehicleTireField = exports.MovaCopyright = exports.MovaSignUp = exports.MovaLogin = exports.MovaSnackbar = exports.TestButton = exports.VehiclePlateField = exports.QRCode = exports.MovaDialog = exports.Loader = exports.MovaDigitalPassport = exports.VehicleFullCard = exports.ScheduleFields = exports.AddressFields = exports.UserService = exports.GarageService = exports.AuthenticationService = void 0;
+exports.DateFormatTypes = exports.Gender = void 0;
 // Export des services
 var AuthenticationService_1 = require("./src/services/AuthenticationService");
 Object.defineProperty(exports, "AuthenticationService", { enumerable: true, get: function () { return __importDefault(AuthenticationService_1).default; } });
@@ -14,6 +14,8 @@ Object.defineProperty(exports, "GarageService", { enumerable: true, get: functio
 var UserService_1 = require("./src/services/UserService");
 Object.defineProperty(exports, "UserService", { enumerable: true, get: function () { return __importDefault(UserService_1).default; } });
 // Export des composants
+var AddressFields_1 = require("./src/AddressFields");
+Object.defineProperty(exports, "AddressFields", { enumerable: true, get: function () { return __importDefault(AddressFields_1).default; } });
 var ScheduleFields_1 = require("./src/ScheduleFields");
 Object.defineProperty(exports, "ScheduleFields", { enumerable: true, get: function () { return __importDefault(ScheduleFields_1).default; } });
 var VehicleFullCard_1 = require("./src/VehicleFullCard");

package/dist/src/AddressFields.d.ts

@@ -0,0 +1,16 @@
+import { FunctionComponent } from "react";
+import { AddressFieldName, MovaFormField } from "./helpers/Types";
+type Form = {
+    streetNumber: MovaFormField;
+    streetName: MovaFormField;
+    additional: MovaFormField;
+    postalCode: MovaFormField;
+    cityName: MovaFormField;
+};
+interface AddressFieldsProps {
+    form: Form;
+    size: 'small' | 'medium';
+    handleChange: (fieldName: AddressFieldName, newValue: any, save?: boolean) => void;
+}
+declare const AddressFields: FunctionComponent<AddressFieldsProps>;
+export default AddressFields;

package/dist/src/AddressFields.js

@@ -0,0 +1,20 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var jsx_runtime_1 = require("react/jsx-runtime");
+var material_1 = require("@mui/material");
+var AddressFields = function (_a) {
+    var form = _a.form, size = _a.size, handleChange = _a.handleChange;
+    return ((0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true }, { children: [(0, jsx_runtime_1.jsx)(material_1.TextField, { id: "address-streetName", label: "RUE", value: form.streetName.value, required: true, size: size, onBlur: function (e) { return handleChange('streetName', e.target.value, true); }, onChange: function (e) { return handleChange('streetName', e.target.value, false); }, sx: { width: '98%', mt: 2.5 } }), (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "address-additionnalInfo", label: "COMPL\u00C9MENT", size: size, value: form.additional.value, onBlur: function (e) { return handleChange('additional', e.target.value, true); }, onChange: function (e) { return handleChange('additional', e.target.value, false); }, sx: { width: '98%', mt: 2.5 } }), (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "address-postalCode", label: "CODE POSTAL", value: form.postalCode.value, required: true, size: size, onBlur: function (e) { return handleChange('postalCode', e.target.value, true); }, onChange: function (e) { return handleChange('postalCode', e.target.value, false); }, sx: { width: '40%', mt: 2.5, pr: 2 } }), (0, jsx_runtime_1.jsx)(material_1.TextField, { id: "address-cityName", label: "VILLE", value: form.cityName.value, required: true, size: size, onBlur: function (e) { return handleChange('cityName', e.target.value, true); }, onChange: function (e) { return handleChange('cityName', e.target.value, false); }, sx: { width: '55%', mt: 2.5 } })] })));
+};
+exports.default = AddressFields;

package/dist/src/helpers/ApiHelper.js

@@ -2,12 +2,11 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.request = exports.API_BASE_URL = void 0;
 var CookieUtils_1 = require("./CookieUtils");
 var Logger_1 = __importDefault(require("./Logger"));
-exports.API_BASE_URL = (_a = process.env.REACT_APP_API_URL) !== null && _a !== void 0 ? _a : 'https://localhost:8443/api';
+exports.API_BASE_URL = process.env.REACT_APP_API_URL || 'https://localhost:8443/api';
 function handleError(error) {
     var msg = error.message.includes('fetch') ? "Connexion impossible" : error.message;
     return {

package/dist/src/helpers/DateUtils.d.ts

@@ -1,4 +1,8 @@
 import { DateFormatTypes } from './Enums';
+export declare const countryTimeZones: {
+    [key: string]: string;
+};
+export declare const toUTCToLocaleDate: (date: "" | Date | null, countryCode: string) => Date;
 export declare const formatDateByCountryCode: (date: Date | undefined, countryCode: string, formatType: DateFormatTypes) => string;
 export declare function getLongFormattedDateTime(date: Date | undefined, timeZone: string, locale: Locale): string;
 export declare function capitalizeFirstLetter(str: string): string;

package/dist/src/helpers/DateUtils.js

@@ -1,22 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.capitalizeFirstLetter = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = void 0;
+exports.capitalizeFirstLetter = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.toUTCToLocaleDate = exports.countryTimeZones = void 0;
 var date_fns_tz_1 = require("date-fns-tz");
 var locale_1 = require("date-fns/locale");
 var Enums_1 = require("./Enums");
-var formatDateByCountryCode = function (date, countryCode, formatType) {
+// Tableau de correspondance entre les codes de pays et les fuseaux horaires
+exports.countryTimeZones = {
+    'FR': 'Europe/Paris',
+    // Ajoutez d'autres correspondances de codes de pays et de fuseaux horaires ici
+};
+var toUTCToLocaleDate = function (date, countryCode) {
+    var zonedDate = new Date(date !== null && date !== void 0 ? date : "");
     if (date) {
-        // Tableau de correspondance entre les codes de pays et les fuseaux horaires
-        var countryTimeZones = {
-            'FR': 'Europe/Paris',
-            // Ajoutez d'autres correspondances de codes de pays et de fuseaux horaires ici
-        };
-        var timeZone = countryTimeZones[countryCode.toUpperCase()];
+        var timeZone = exports.countryTimeZones[countryCode.toUpperCase()];
         if (!timeZone) {
             throw new Error('Code de pays non pris en charge');
         }
         // Convertir la date UTC en date du fuseau horaire local
-        var zonedDate = (0, date_fns_tz_1.utcToZonedTime)(date, timeZone);
+        zonedDate = (0, date_fns_tz_1.utcToZonedTime)(date, timeZone);
+    }
+    return zonedDate;
+};
+exports.toUTCToLocaleDate = toUTCToLocaleDate;
+var formatDateByCountryCode = function (date, countryCode, formatType) {
+    if (date) {
+        // Convertir la date UTC en date du fuseau horaire local
+        var zonedDate = (0, exports.toUTCToLocaleDate)(date, countryCode);
+        var timeZone = exports.countryTimeZones[countryCode.toUpperCase()];
         // Formater la date
         switch (formatType) {
             case Enums_1.DateFormatTypes.SHORT_FORMAT_DATE:

package/dist/src/helpers/Types.d.ts

@@ -1,3 +1,4 @@
+export type AddressFieldName = 'streetName' | 'additional' | 'postalCode' | 'cityName';
 export type OriginReference = {
     key: string;
     value: string;

package/dist/src/models/Garage.d.ts

@@ -6,10 +6,11 @@ export default class Garage {
     adminId: string;
     name: string;
     address: Address;
+    workforce: number;
     contactPhone: string;
     prestations: Prestation[];
     schedules: Schedule[];
     contactEmail?: string;
     logo?: string;
-    constructor(id: string, adminId: string, name: string, address: Address, prestations: Prestation[], schedules: Schedule[], contactPhone: string, contactEmail?: string, logo?: string);
+    constructor(id: string, adminId: string, name: string, address: Address, workforce: number, prestations: Prestation[], schedules: Schedule[], contactPhone: string, contactEmail?: string, logo?: string);
 }

package/dist/src/models/Garage.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var Garage = /** @class */ (function () {
-    function Garage(id, adminId, name, address, prestations, schedules, contactPhone, contactEmail, logo) {
+    function Garage(id, adminId, name, address, workforce, prestations, schedules, contactPhone, contactEmail, logo) {
         this.id = id;
         this.adminId = adminId;
         this.name = name;
         this.address = address;
+        this.workforce = workforce;
         this.prestations = prestations;
         this.schedules = schedules;
         this.contactPhone = contactPhone;

package/index.ts

@@ -6,6 +6,7 @@ export { default as GarageService } from './src/services/GarageService';
 export { default as UserService } from './src/services/UserService';
 
 // Export des composants
+export { default as AddressFields } from './src/AddressFields';
 export { default as ScheduleFields } from './src/ScheduleFields';
 export { default as VehicleFullCard } from './src/VehicleFullCard';
 export { default as MovaDigitalPassport } from './src/MovaDigitalPassport';
@@ -35,13 +36,11 @@ export { default as Schedule } from './src/models/Schedule';
 export { default as Event } from './src/models/Event';
 export { default as VehicleTire } from './src/models/VehicleTire';
 
-
-
 // Export des types
 export type { APIRequest, APIResponse } from './src/helpers/ApiHelper';
 export type { DaySchedule } from './src/ScheduleFields';
 export type { MovaFormField, MovaLoginForm, MovaUserSignUpForm, MovaInterval, OriginReference,
-    MovaVehicleForm } from './src/helpers/Types';
+    MovaVehicleForm, AddressFieldName} from './src/helpers/Types';
 
 // Export des méthodes utilitaires
 export { readCookie, deleteCookie } from './src/helpers/CookieUtils'; 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movalib/movalib-commons",
-  "version": "1.0.72",
+  "version": "1.0.74",
   "description": "Bibliothèque d'objets communs à l'ensemble des projets React de Movalib",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/AddressFields.tsx

@@ -0,0 +1,68 @@
+import React, { FunctionComponent } from "react";
+import { Grid, TextField, Typography } from "@mui/material";
+import { AddressFieldName, MovaFormField } from "./helpers/Types";
+
+
+type Form = {
+  streetNumber: MovaFormField,
+  streetName: MovaFormField,
+  additional: MovaFormField,
+  postalCode: MovaFormField,
+  cityName: MovaFormField,
+}
+
+interface AddressFieldsProps {
+  form: Form;
+  size: 'small' | 'medium';
+  handleChange: (fieldName: AddressFieldName, newValue: any, save?:boolean) => void;
+}
+
+const AddressFields: FunctionComponent<AddressFieldsProps> = ({ form, size, handleChange }) => (
+  <Grid container>                             
+    <TextField
+        id="address-streetName"
+        label="RUE"
+        value={form.streetName.value}
+        required
+        size={size}
+        onBlur={(e) => handleChange('streetName', e.target.value, true)}
+        onChange={(e) => handleChange('streetName', e.target.value, false)}
+        sx={{ width: '98%', mt: 2.5 }}
+        >
+    </TextField>
+    <TextField
+        id="address-additionnalInfo"
+        label="COMPLÉMENT"
+        size={size}
+        value={form.additional.value}
+        onBlur={(e) => handleChange('additional', e.target.value, true)}
+        onChange={(e) => handleChange('additional', e.target.value, false)}
+        sx={{ width: '98%', mt: 2.5 }}
+        >
+    </TextField>  
+    <TextField
+        id="address-postalCode"
+        label="CODE POSTAL"
+        value={form.postalCode.value}
+        required
+        size={size}
+        onBlur={(e) => handleChange('postalCode', e.target.value, true)}
+        onChange={(e) => handleChange('postalCode', e.target.value, false)}
+        sx={{ width: '40%', mt: 2.5 , pr: 2}}
+        >
+    </TextField>      
+    <TextField
+        id="address-cityName"
+        label="VILLE"
+        value={form.cityName.value}
+        required
+        size={size}
+        onBlur={(e) => handleChange('cityName', e.target.value, true)}
+        onChange={(e) => handleChange('cityName', e.target.value, false)}
+        sx={{ width: '55%', mt: 2.5 }}
+        >
+    </TextField> 
+  </Grid>
+);
+
+export default AddressFields;

package/src/ScheduleFields.tsx

@@ -9,6 +9,7 @@ import Schedule from './models/Schedule';
 import { DayOfWeek } from './helpers/Enums';
 import Logger from './helpers/Logger';
 import { flexCenter } from './helpers/Tools';
+import { toUTCToLocaleDate } from './helpers/DateUtils';
 
 export const FR_WEEK_DAYS: string[] = ['Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi', 'Dimanche'];
 

package/src/helpers/ApiHelper.ts

@@ -2,7 +2,7 @@ import { APIMethod } from "./Enums";
 import { COOKIE_GARAGE_TOKEN, readCookie } from "./CookieUtils";
 import Logger from "./Logger";
 
-export const API_BASE_URL = process.env.REACT_APP_API_URL ?? 'https://localhost:8443/api';
+export const API_BASE_URL = process.env.REACT_APP_API_URL || 'https://localhost:8443/api';
 
 export type APIResponse<T> = {
     success: boolean;

package/src/helpers/DateUtils.ts

@@ -2,15 +2,16 @@ import { format, utcToZonedTime } from 'date-fns-tz';
 import { fr } from 'date-fns/locale';
 import { DateFormatTypes } from './Enums';
 
+// Tableau de correspondance entre les codes de pays et les fuseaux horaires
+export const countryTimeZones: { [key: string]: string } = {
+    'FR': 'Europe/Paris',
+    // Ajoutez d'autres correspondances de codes de pays et de fuseaux horaires ici
+};
 
-export const formatDateByCountryCode = (date: Date | undefined, countryCode: string, formatType: DateFormatTypes): string => {
+export const toUTCToLocaleDate = (date: "" | Date | null,  countryCode: string): Date => {
+    let zonedDate = new Date(date ?? "");
 
     if(date){
-        // Tableau de correspondance entre les codes de pays et les fuseaux horaires
-        const countryTimeZones: { [key: string]: string } = {
-            'FR': 'Europe/Paris',
-            // Ajoutez d'autres correspondances de codes de pays et de fuseaux horaires ici
-        };
 
         const timeZone = countryTimeZones[countryCode.toUpperCase()];
 
@@ -19,7 +20,19 @@ export const formatDateByCountryCode = (date: Date | undefined, countryCode: str
         }
 
         // Convertir la date UTC en date du fuseau horaire local
-        const zonedDate = utcToZonedTime(date, timeZone);
+        zonedDate = utcToZonedTime(date, timeZone);
+    }
+
+    return zonedDate;
+}
+
+export const formatDateByCountryCode = (date: Date | undefined, countryCode: string, formatType: DateFormatTypes): string => {
+
+    if(date){
+
+        // Convertir la date UTC en date du fuseau horaire local
+        let zonedDate = toUTCToLocaleDate(date, countryCode);
+        const timeZone = countryTimeZones[countryCode.toUpperCase()];
 
         // Formater la date
         switch(formatType){

package/src/helpers/Types.ts

@@ -1,3 +1,6 @@
+
+export type AddressFieldName = 'streetName' | 'additional' | 'postalCode' | 'cityName';
+
 export type OriginReference = { 
     key: string; 
     value: string 

package/src/models/Garage.ts

@@ -8,6 +8,7 @@ export default class Garage {
     adminId:string;
     name:string;
     address:Address;
+    workforce: number;
     contactPhone: string;
     prestations: Prestation[];
     schedules: Schedule[];
@@ -19,6 +20,7 @@ export default class Garage {
         adminId:string,
         name:string,
         address:Address,
+        workforce: number,
         prestations: Prestation[],
         schedules: Schedule[],
         contactPhone: string,
@@ -29,6 +31,7 @@ export default class Garage {
         this.adminId = adminId;
         this.name = name;
         this.address = address;
+        this.workforce = workforce;
         this.prestations = prestations;
         this.schedules = schedules;
         this.contactPhone = contactPhone;

package/webpack.config.js

@@ -37,8 +37,8 @@ module.exports = {
         template: path.resolve(__dirname, 'public', 'index.html'), // Chemin vers votre fichier HTML de base
       }),
       new webpack.DefinePlugin({
-        'REACT_APP_API_URL': JSON.stringify(process.env.REACT_APP_API_URL),
-        'REACT_APP_MOVALIB_APP_URL': JSON.stringify(process.env.REACT_APP_MOVALIB_APP_URL)
+        'process.env.REACT_APP_API_URL': JSON.stringify(process.env.REACT_APP_API_URL),
+        'process.env.REACT_APP_MOVALIB_APP_URL': JSON.stringify(process.env.REACT_APP_MOVALIB_APP_URL)
       }),
     ],      
 };