asv-hlps 1.0.12 → 1.0.15

package/lib/cjs/users/models/Ste.d.ts

@@ -2,7 +2,8 @@ import { SteGrp } from './SteGrp';
 export interface Ste {
     id: number;
     name: string;
+    shortname?: string;
     isValided?: boolean;
     isActive?: boolean;
-    grp: SteGrp;
+    grp?: SteGrp;
 }

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

@@ -1,3 +1,4 @@
+import { Ste } from "./models/Ste";
 import { User } from "./models/User";
 export declare const inGrp: (grps: string[], user: User) => boolean;
 export declare const inSteGrp: (grps: string[], user: User) => boolean;
@@ -8,4 +9,7 @@ export declare const getFullname: (user: User) => string;
 export declare const entryDesignationUser: (user: User) => string;
 export declare const secureUser: (user: any, username: string, heads: any) => void;
 export declare const secureUserPassword: (user: any, heads: any) => void;
-export declare const getUserCode: (user: User) => string;
+export declare const userGrpCode: (user: User) => string;
+export declare const userCoef: (user: User) => number;
+export declare const labelSteName: (ste: Ste, size?: number, tabs?: string[]) => string;
+export declare const getSteShortname: (ste: Ste, [...steGrpNames]: Iterable<any>) => string;

package/lib/cjs/users/user.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserCode = exports.secureUserPassword = exports.secureUser = exports.entryDesignationUser = exports.getFullname = exports.isStaffSte = exports.isBillPeriod = exports.hasRole = exports.inSteGrp = exports.inGrp = void 0;
+exports.getSteShortname = exports.labelSteName = exports.userCoef = exports.userGrpCode = exports.secureUserPassword = exports.secureUser = exports.entryDesignationUser = exports.getFullname = exports.isStaffSte = exports.isBillPeriod = exports.hasRole = exports.inSteGrp = exports.inGrp = void 0;
 const bcrypt = __importStar(require("bcryptjs"));
 const randomatic_1 = __importDefault(require("randomatic"));
 const shared_1 = require("../utils/shared");
@@ -49,7 +49,7 @@ const hasRole = (roles, user) => {
 };
 exports.hasRole = hasRole;
 const isBillPeriod = (user, period) => {
-    return (user.periodBill.toLowerCase() === period) ? true : false;
+    return user.periodBill.toLowerCase() === period ? true : false;
 };
 exports.isBillPeriod = isBillPeriod;
 // export const isStaffSte = (user: User, steNames: string|string[]) => {
@@ -68,21 +68,21 @@ const getFullname = (user) => {
     const firstname = user.firstname ? user.firstname.trim() : "";
     const civil = titr ? titr : gender;
     // const fullname =  Util.titleCase(civil)+' '+lastname.toUpperCase()+' '+Util.titleCase(firstname);
-    return (0, shared_1.titleCase)(civil) + ' ' + lastname.toUpperCase() + ' ' + (0, shared_1.titleCase)(firstname);
+    return (0, shared_1.titleCase)(civil) + " " + lastname.toUpperCase() + " " + (0, shared_1.titleCase)(firstname);
 };
 exports.getFullname = getFullname;
 const entryDesignationUser = (user) => {
     if (user.grp && user.ste) {
-        if (!(user.grp.code === 'sf')) {
-            return user.username.toUpperCase() + ' ' + user.ste.name.trim().replace(/  +/g, ' '); // remove more than 1 space
+        if (!(user.grp.code === "sf")) {
+            return user.username.toUpperCase() + " " + user.ste.name.trim().replace(/  +/g, " "); // remove more than 1 space
         }
-        return user.username.toUpperCase() + ' ' + user.fullname.trim().replace(/  +/g, ' ');
+        return user.username.toUpperCase() + " " + user.fullname.trim().replace(/  +/g, " ");
     }
     return user.username.toUpperCase();
 };
 exports.entryDesignationUser = entryDesignationUser;
 const secureUser = (user, username, heads) => {
-    user.password = (0, randomatic_1.default)('Aa0', 8);
+    user.password = (0, randomatic_1.default)("Aa0", 8);
     user.dns = heads.host;
     user.clp = user.password;
     user.password = bcrypt.hashSync(user.password, 8);
@@ -90,13 +90,46 @@ const secureUser = (user, username, heads) => {
 };
 exports.secureUser = secureUser;
 const secureUserPassword = (user, heads) => {
-    user.password = (0, randomatic_1.default)('Aa0', 8);
+    user.password = (0, randomatic_1.default)("Aa0", 8);
     user.dns = heads.host;
     user.clp = user.password;
     user.password = bcrypt.hashSync(user.password, 8);
 };
 exports.secureUserPassword = secureUserPassword;
-const getUserCode = (user) => {
-    return user.grp.code.toLowerCase() === 'st' ? user.ste.grp.code.toLowerCase() : user.grp.code.toLowerCase();
+const userGrpCode = (user) => {
+    return user.grp.code.toLowerCase() === "st" ? user.ste.grp.code.toLowerCase() : user.grp.code.toLowerCase();
 };
-exports.getUserCode = getUserCode;
+exports.userGrpCode = userGrpCode;
+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 steNameLength = ste.name.length;
+    if (steNameLength > size) {
+        if (ste.shortname.length > size) {
+            const shortedName = (0, exports.getSteShortname)(ste, tabs);
+            if (shortedName.length > size) {
+                return (0, shared_1.limitTo)(shortedName, (size - 2), '..');
+            }
+            return shortedName;
+        }
+        return ste.shortname;
+    }
+    return ste.name;
+};
+exports.labelSteName = labelSteName;
+const getSteShortname = (ste, [...steGrpNames]) => {
+    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;
+};
+exports.getSteShortname = getSteShortname;

package/lib/esm/users/models/Ste.d.ts

@@ -2,7 +2,8 @@ import { SteGrp } from './SteGrp';
 export interface Ste {
     id: number;
     name: string;
+    shortname?: string;
     isValided?: boolean;
     isActive?: boolean;
-    grp: SteGrp;
+    grp?: SteGrp;
 }

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

@@ -1,3 +1,4 @@
+import { Ste } from "./models/Ste";
 import { User } from "./models/User";
 export declare const inGrp: (grps: string[], user: User) => boolean;
 export declare const inSteGrp: (grps: string[], user: User) => boolean;
@@ -8,4 +9,7 @@ export declare const getFullname: (user: User) => string;
 export declare const entryDesignationUser: (user: User) => string;
 export declare const secureUser: (user: any, username: string, heads: any) => void;
 export declare const secureUserPassword: (user: any, heads: any) => void;
-export declare const getUserCode: (user: User) => string;
+export declare const userGrpCode: (user: User) => string;
+export declare const userCoef: (user: User) => number;
+export declare const labelSteName: (ste: Ste, size?: number, tabs?: string[]) => string;
+export declare const getSteShortname: (ste: Ste, [...steGrpNames]: Iterable<any>) => string;

package/lib/esm/users/user.js

@@ -1,6 +1,6 @@
-import * as bcrypt from 'bcryptjs';
-import randomatic from 'randomatic';
-import { titleCase } from "../utils/shared";
+import * as bcrypt from "bcryptjs";
+import randomatic from "randomatic";
+import { limitTo, titleCase } from "../utils/shared";
 export const inGrp = (grps, user) => {
     return [...grps].includes(user.grp.code.toLowerCase()) ? true : false;
 };
@@ -17,7 +17,7 @@ export const hasRole = (roles, user) => {
     return [...roles].includes(user.role.code.toLowerCase()) ? true : false;
 };
 export const isBillPeriod = (user, period) => {
-    return (user.periodBill.toLowerCase() === period) ? true : false;
+    return user.periodBill.toLowerCase() === period ? true : false;
 };
 // export const isStaffSte = (user: User, steNames: string|string[]) => {
 export const isStaffSte = (user, steNames) => {
@@ -34,30 +34,60 @@ export const getFullname = (user) => {
     const firstname = user.firstname ? user.firstname.trim() : "";
     const civil = titr ? titr : gender;
     // const fullname =  Util.titleCase(civil)+' '+lastname.toUpperCase()+' '+Util.titleCase(firstname);
-    return titleCase(civil) + ' ' + lastname.toUpperCase() + ' ' + titleCase(firstname);
+    return titleCase(civil) + " " + lastname.toUpperCase() + " " + titleCase(firstname);
 };
 export const entryDesignationUser = (user) => {
     if (user.grp && user.ste) {
-        if (!(user.grp.code === 'sf')) {
-            return user.username.toUpperCase() + ' ' + user.ste.name.trim().replace(/  +/g, ' '); // remove more than 1 space
+        if (!(user.grp.code === "sf")) {
+            return user.username.toUpperCase() + " " + user.ste.name.trim().replace(/  +/g, " "); // remove more than 1 space
         }
-        return user.username.toUpperCase() + ' ' + user.fullname.trim().replace(/  +/g, ' ');
+        return user.username.toUpperCase() + " " + user.fullname.trim().replace(/  +/g, " ");
     }
     return user.username.toUpperCase();
 };
 export const secureUser = (user, username, heads) => {
-    user.password = randomatic('Aa0', 8);
+    user.password = randomatic("Aa0", 8);
     user.dns = heads.host;
     user.clp = user.password;
     user.password = bcrypt.hashSync(user.password, 8);
     user.username = username;
 };
 export const secureUserPassword = (user, heads) => {
-    user.password = randomatic('Aa0', 8);
+    user.password = randomatic("Aa0", 8);
     user.dns = heads.host;
     user.clp = user.password;
     user.password = bcrypt.hashSync(user.password, 8);
 };
-export const getUserCode = (user) => {
-    return user.grp.code.toLowerCase() === 'st' ? user.ste.grp.code.toLowerCase() : user.grp.code.toLowerCase();
+export const userGrpCode = (user) => {
+    return user.grp.code.toLowerCase() === "st" ? user.ste.grp.code.toLowerCase() : user.grp.code.toLowerCase();
+};
+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']) => {
+    const steNameLength = ste.name.length;
+    if (steNameLength > size) {
+        if (ste.shortname.length > size) {
+            const shortedName = getSteShortname(ste, tabs);
+            if (shortedName.length > size) {
+                return limitTo(shortedName, (size - 2), '..');
+            }
+            return shortedName;
+        }
+        return ste.shortname;
+    }
+    return ste.name;
+};
+export const getSteShortname = (ste, [...steGrpNames]) => {
+    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;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asv-hlps",
-  "version": "1.0.12",
+  "version": "1.0.15",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",