asv-hlps 1.4.68 → 1.4.70

package/lib/cjs/estates/models/Estate.d.ts

@@ -21,4 +21,5 @@ export default interface Estate {
     isActive?: boolean;
     housings?: Housing[];
     assets?: EstateAsset[];
+    priceNote?: string;
 }

package/lib/cjs/estates/models/EstateElt.d.ts

@@ -2,4 +2,5 @@ import NaCoAc from "../../shared/models/NaCoAc";
 export default interface EstateElt extends NaCoAc {
     iconName?: string;
     iconPack?: string;
+    icon?: string;
 }

package/lib/cjs/pdfs/tools.js

@@ -22,7 +22,7 @@ const displayTitle = (title) => {
 exports.displayTitle = displayTitle;
 const displayClient = (user) => {
     // const clientSte =  user.ste ?  HlpUser.getSteShortname(user.ste) : '';
-    const clientSte = user.ste ? (0, user_1.getSteShortname)(user.ste, ["pharmacie", "clinique", "hopital"]) : "";
+    const clientSte = user.ste ? (0, user_1.getSteShortname)(user.ste, "code", ["pharmacie", "clinique", "hopital"]) : "";
     /* const clientLastname = (user.lastname) ? user.lastname : '';
     const clientFirstname = (user.firstname) ? user.firstname : '';
     const clientGender = (user.gender) ? user.gender.abr : ''; */

package/lib/cjs/shared/HlpCrud.d.ts

@@ -1,9 +1,8 @@
-import { Request, Response } from "express";
 import { Entity } from "typeorm";
 export declare class HlpCrud {
     dataSource: any;
     constructor(dataSource: any);
-    checkUniqProp(prop: string, model: any, req: Request, res: Response): Promise<Response<any, Record<string, any>>>;
+    checkUniqProp(prop: string, model: any, body: any, bodyName?: string): Promise<boolean>;
     toggleProp(id: number, prop: string, model: typeof Entity | any): Promise<any>;
     create(tob: any, model: typeof Entity | any): any;
     del(id: number, model: typeof Entity | any): any;

package/lib/cjs/shared/HlpCrud.js

@@ -15,37 +15,46 @@ class HlpCrud {
     constructor(dataSource) {
         this.dataSource = dataSource;
     }
-    checkUniqProp(prop, model, req, res) {
-        return __awaiter(this, void 0, void 0, function* () {
+    checkUniqProp(prop_1, model_1, body_1) {
+        return __awaiter(this, arguments, void 0, function* (prop, model, body, bodyName = "name") {
             try {
-                const reqName = req.body.name;
-                const reqId = req.body.id;
-                const obj = yield this.dataSource.manager.findOneBy(model, { [prop]: reqName });
+                const obj = yield this.dataSource.manager.findOneBy(model, { [prop]: body[bodyName] });
                 // ------ no obj ------
-                if (!obj) {
-                    return res.send(true);
-                }
-                // ------ if id ------
-                if (reqId) {
-                    return reqId === obj.id ? res.send(true) : res.send(false);
-                }
-                else {
-                    return res.send(false);
-                }
+                if (!obj)
+                    return true;
+                return body.id ? body.id === obj.id : false;
             }
             catch (error) {
                 console.log(error);
             }
-            /* try {
-              const repository = dataSource.manager
-        
-              const obj = await repository.findOneBy(model, {[prop]: req.body.name})
-              this.checkObj(obj, req.body.id, res)
-            } catch (error) {
-              console.log(error);
-            } */
         });
     }
+    // async checkUniqProp(prop: string, model: any, req: Request, res: Response) {
+    //   try {
+    //     const reqName = req.body.name;
+    //     const reqId = req.body.id;
+    //     const obj: any = await this.dataSource.manager.findOneBy(model, { [prop]: reqName });
+    //     // ------ no obj ------
+    //     if (!obj) {
+    //       return res.send(true);
+    //     }
+    //     // ------ if id ------
+    //     if (reqId) {
+    //       return reqId === obj.id ? res.send(true) : res.send(false);
+    //     } else {
+    //       return res.send(false);
+    //     }
+    //   } catch (error) {
+    //     console.log(error);
+    //   }
+    //   /* try {
+    //     const repository = dataSource.manager
+    //     const obj = await repository.findOneBy(model, {[prop]: req.body.name})
+    //     this.checkObj(obj, req.body.id, res)
+    //   } catch (error) {
+    //     console.log(error);
+    //   } */
+    // }
     toggleProp(id, prop, model) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/lib/cjs/users/user.d.ts

@@ -48,6 +48,6 @@ export declare const userCoef: <T extends {
     ste?: Ste;
     grp?: UserGrp;
 }>(user: T) => number;
-export declare const labelSteName: (ste: Ste, size?: number, tabs?: string[]) => string;
-export declare const getSteShortname: (ste: Ste, steGrpNames: string[]) => string;
+export declare const labelSteName: (ste: Ste, size?: number, steGrpProp?: "code" | "shortname", tabs?: string[]) => string;
+export declare const getSteShortname: (ste: Ste, steGrpProp?: "code" | "shortname", steGrpNames?: string[]) => string;
 export {};

package/lib/cjs/users/user.js

@@ -118,11 +118,11 @@ const userCoef = (user) => {
     return user.grp.code.toLowerCase() === "st" ? user.ste.grp.coef : user.grp.coef;
 };
 exports.userCoef = userCoef;
-const labelSteName = (ste, size = 20, tabs = ["pharmacie", "clinique", "hopital"]) => {
+const labelSteName = (ste, size = 20, steGrpProp = "code", tabs = ["pharmacie", "clinique", "hopital"]) => {
     const steNameLength = ste.name.length;
     if (steNameLength > size) {
+        const shortedName = (0, exports.getSteShortname)(ste, steGrpProp, tabs);
         if (ste.shortname.length > size) {
-            const shortedName = (0, exports.getSteShortname)(ste, tabs);
             if (shortedName.length > size) {
                 return (0, utils_1.limitTo)(shortedName, size - 2, "..");
             }
@@ -133,17 +133,13 @@ const labelSteName = (ste, size = 20, tabs = ["pharmacie", "clinique", "hopital"
     return ste.name;
 };
 exports.labelSteName = labelSteName;
-const getSteShortname = (ste, steGrpNames) => {
+const getSteShortname = (ste, steGrpProp = "code", steGrpNames = ["pharmacie", "clinique", "hopital"]) => {
     if (!ste) {
         return null;
     }
-    // const tabs = ['pharmacie', 'clinique', 'hopital'];
     const name = ste.name.trimStart();
     const firstWord = name.substring(0, name.indexOf(" "));
     const restWords = name.substring(name.indexOf(" ") + 1);
-    return steGrpNames.includes(firstWord.toLowerCase())
-        ? // ste.grp.code.toLowerCase() + '. ' + restWords.trimLeft() :
-            ste.grp.code.toUpperCase() + ". " + restWords.trimStart()
-        : name;
+    return steGrpNames.includes(firstWord.toLowerCase()) ? ste.grp[steGrpProp].toUpperCase() + ". " + restWords.trimStart() : name;
 };
 exports.getSteShortname = getSteShortname;

package/lib/esm/estates/models/Estate.d.ts

@@ -21,4 +21,5 @@ export default interface Estate {
     isActive?: boolean;
     housings?: Housing[];
     assets?: EstateAsset[];
+    priceNote?: string;
 }

package/lib/esm/estates/models/EstateElt.d.ts

@@ -2,4 +2,5 @@ import NaCoAc from "../../shared/models/NaCoAc";
 export default interface EstateElt extends NaCoAc {
     iconName?: string;
     iconPack?: string;
+    icon?: string;
 }

package/lib/esm/pdfs/tools.js

@@ -17,7 +17,7 @@ export const displayTitle = (title) => {
 };
 export const displayClient = (user) => {
     // const clientSte =  user.ste ?  HlpUser.getSteShortname(user.ste) : '';
-    const clientSte = user.ste ? getSteShortname(user.ste, ["pharmacie", "clinique", "hopital"]) : "";
+    const clientSte = user.ste ? getSteShortname(user.ste, "code", ["pharmacie", "clinique", "hopital"]) : "";
     /* const clientLastname = (user.lastname) ? user.lastname : '';
     const clientFirstname = (user.firstname) ? user.firstname : '';
     const clientGender = (user.gender) ? user.gender.abr : ''; */

package/lib/esm/shared/HlpCrud.d.ts

@@ -1,9 +1,8 @@
-import { Request, Response } from "express";
 import { Entity } from "typeorm";
 export declare class HlpCrud {
     dataSource: any;
     constructor(dataSource: any);
-    checkUniqProp(prop: string, model: any, req: Request, res: Response): Promise<Response<any, Record<string, any>>>;
+    checkUniqProp(prop: string, model: any, body: any, bodyName?: string): Promise<boolean>;
     toggleProp(id: number, prop: string, model: typeof Entity | any): Promise<any>;
     create(tob: any, model: typeof Entity | any): any;
     del(id: number, model: typeof Entity | any): any;

package/lib/esm/shared/HlpCrud.js

@@ -12,37 +12,46 @@ export class HlpCrud {
     constructor(dataSource) {
         this.dataSource = dataSource;
     }
-    checkUniqProp(prop, model, req, res) {
-        return __awaiter(this, void 0, void 0, function* () {
+    checkUniqProp(prop_1, model_1, body_1) {
+        return __awaiter(this, arguments, void 0, function* (prop, model, body, bodyName = "name") {
             try {
-                const reqName = req.body.name;
-                const reqId = req.body.id;
-                const obj = yield this.dataSource.manager.findOneBy(model, { [prop]: reqName });
+                const obj = yield this.dataSource.manager.findOneBy(model, { [prop]: body[bodyName] });
                 // ------ no obj ------
-                if (!obj) {
-                    return res.send(true);
-                }
-                // ------ if id ------
-                if (reqId) {
-                    return reqId === obj.id ? res.send(true) : res.send(false);
-                }
-                else {
-                    return res.send(false);
-                }
+                if (!obj)
+                    return true;
+                return body.id ? body.id === obj.id : false;
             }
             catch (error) {
                 console.log(error);
             }
-            /* try {
-              const repository = dataSource.manager
-        
-              const obj = await repository.findOneBy(model, {[prop]: req.body.name})
-              this.checkObj(obj, req.body.id, res)
-            } catch (error) {
-              console.log(error);
-            } */
         });
     }
+    // async checkUniqProp(prop: string, model: any, req: Request, res: Response) {
+    //   try {
+    //     const reqName = req.body.name;
+    //     const reqId = req.body.id;
+    //     const obj: any = await this.dataSource.manager.findOneBy(model, { [prop]: reqName });
+    //     // ------ no obj ------
+    //     if (!obj) {
+    //       return res.send(true);
+    //     }
+    //     // ------ if id ------
+    //     if (reqId) {
+    //       return reqId === obj.id ? res.send(true) : res.send(false);
+    //     } else {
+    //       return res.send(false);
+    //     }
+    //   } catch (error) {
+    //     console.log(error);
+    //   }
+    //   /* try {
+    //     const repository = dataSource.manager
+    //     const obj = await repository.findOneBy(model, {[prop]: req.body.name})
+    //     this.checkObj(obj, req.body.id, res)
+    //   } catch (error) {
+    //     console.log(error);
+    //   } */
+    // }
     toggleProp(id, prop, model) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/lib/esm/users/user.d.ts

@@ -48,6 +48,6 @@ export declare const userCoef: <T extends {
     ste?: Ste;
     grp?: UserGrp;
 }>(user: T) => number;
-export declare const labelSteName: (ste: Ste, size?: number, tabs?: string[]) => string;
-export declare const getSteShortname: (ste: Ste, steGrpNames: string[]) => string;
+export declare const labelSteName: (ste: Ste, size?: number, steGrpProp?: "code" | "shortname", tabs?: string[]) => string;
+export declare const getSteShortname: (ste: Ste, steGrpProp?: "code" | "shortname", steGrpNames?: string[]) => string;
 export {};

package/lib/esm/users/user.js

@@ -98,11 +98,11 @@ export const userGrpCode = (user) => {
 export const userCoef = (user) => {
     return user.grp.code.toLowerCase() === "st" ? user.ste.grp.coef : user.grp.coef;
 };
-export const labelSteName = (ste, size = 20, tabs = ["pharmacie", "clinique", "hopital"]) => {
+export const labelSteName = (ste, size = 20, steGrpProp = "code", tabs = ["pharmacie", "clinique", "hopital"]) => {
     const steNameLength = ste.name.length;
     if (steNameLength > size) {
+        const shortedName = getSteShortname(ste, steGrpProp, tabs);
         if (ste.shortname.length > size) {
-            const shortedName = getSteShortname(ste, tabs);
             if (shortedName.length > size) {
                 return limitTo(shortedName, size - 2, "..");
             }
@@ -112,16 +112,12 @@ export const labelSteName = (ste, size = 20, tabs = ["pharmacie", "clinique", "h
     }
     return ste.name;
 };
-export const getSteShortname = (ste, steGrpNames) => {
+export const getSteShortname = (ste, steGrpProp = "code", steGrpNames = ["pharmacie", "clinique", "hopital"]) => {
     if (!ste) {
         return null;
     }
-    // const tabs = ['pharmacie', 'clinique', 'hopital'];
     const name = ste.name.trimStart();
     const firstWord = name.substring(0, name.indexOf(" "));
     const restWords = name.substring(name.indexOf(" ") + 1);
-    return steGrpNames.includes(firstWord.toLowerCase())
-        ? // ste.grp.code.toLowerCase() + '. ' + restWords.trimLeft() :
-            ste.grp.code.toUpperCase() + ". " + restWords.trimStart()
-        : name;
+    return steGrpNames.includes(firstWord.toLowerCase()) ? ste.grp[steGrpProp].toUpperCase() + ". " + restWords.trimStart() : name;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asv-hlps",
-  "version": "1.4.68",
+  "version": "1.4.70",
   "description": "helpers",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -16,30 +16,30 @@
   "author": "Aril Vignon",
   "license": "ISC",
   "devDependencies": {
-    "@types/express": "^5.0.5",
+    "@types/express": "^5.0.6",
     "@types/jwt-decode": "^3.1.0",
-    "@types/lodash": "^4.17.20",
-    "@types/pdfmake": "^0.2.12",
+    "@types/lodash": "^4.17.24",
+    "@types/pdfmake": "^0.3.2",
     "@types/randomatic": "^3.1.5",
-    "@types/react": "^19.2.2"
+    "@types/react": "^19.2.14"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.90.7",
-    "axios": "^1.13.2",
-    "class-validator": "^0.14.2",
+    "@tanstack/react-query": "^5.95.2",
+    "axios": "^1.13.6",
+    "class-validator": "^0.15.1",
     "classnames": "^2.5.1",
-    "dayjs": "^1.11.19",
+    "dayjs": "^1.11.20",
     "express": "^4.21.2",
     "i": "^0.3.7",
     "jwt-decode": "^4.0.0",
-    "lodash": "^4.17.21",
-    "npm": "^11.6.2",
-    "pdfmake": "^0.2.20",
+    "lodash": "^4.17.23",
+    "npm": "^11.12.0",
+    "pdfmake": "^0.3.7",
     "randomatic": "^3.1.1",
     "remove-accents": "^0.5.0",
-    "typeorm": "^0.3.27",
+    "typeorm": "^0.3.28",
     "typescript": "^5.9.3",
     "yup": "^1.7.1",
-    "zustand": "^5.0.8"
+    "zustand": "^5.0.12"
   }
 }