asv-hlps 1.3.36 → 1.3.38

package/lib/esm/models/world/City.d.ts

@@ -0,0 +1,15 @@
+import { Department } from './Department';
+import { Region } from './Region';
+export declare class City {
+    id?: number;
+    name?: string;
+    departmentcode?: string;
+    inseecode?: string;
+    zip?: string;
+    slug?: string;
+    lat?: string;
+    lng?: string;
+    isActive?: boolean;
+    region?: Region;
+    department?: Department;
+}

package/lib/esm/models/world/City.js

@@ -0,0 +1,2 @@
+export class City {
+}

package/lib/esm/models/world/Continent.d.ts

@@ -0,0 +1,6 @@
+export declare class Continent {
+    id: number;
+    name?: string;
+    code?: string;
+    isActive?: boolean;
+}

package/lib/esm/models/world/Continent.js

@@ -0,0 +1,2 @@
+export class Continent {
+}

package/lib/esm/models/world/Country.d.ts

@@ -0,0 +1,12 @@
+import { Continent } from "./Continent";
+export interface Country {
+    id: number;
+    nameFr?: string;
+    nameEn?: string;
+    iso2?: string;
+    iso3?: string;
+    indicatif?: string;
+    flag?: string;
+    isActive?: boolean;
+    continent?: Continent;
+}

package/lib/esm/models/world/Country.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/models/world/Department.d.ts

@@ -0,0 +1,10 @@
+import { Region } from "./Region";
+export interface Department {
+    id?: number;
+    name?: string;
+    code?: string;
+    regionCode?: string;
+    slug?: string;
+    isActive?: boolean;
+    region?: Region;
+}

package/lib/esm/models/world/Department.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/models/world/Quarter.d.ts

@@ -0,0 +1,7 @@
+import { City } from "./City";
+export interface Quarter {
+    id: number;
+    name?: string;
+    isActive?: boolean;
+    city?: City;
+}

package/lib/esm/models/world/Quarter.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/models/world/Region.d.ts

@@ -0,0 +1,9 @@
+import { Country } from "./Country";
+export declare class Region {
+    id?: number;
+    name?: string;
+    code?: string;
+    slug?: string;
+    isActive?: boolean;
+    country?: Country;
+}

package/lib/esm/models/world/Region.js

@@ -0,0 +1,2 @@
+export class Region {
+}

package/lib/esm/models/world/index.d.ts

@@ -0,0 +1,7 @@
+import { City } from "./City";
+import { Continent } from "./Continent";
+import { Country } from "./Country";
+import { Department } from "./Department";
+import { Quarter } from "./Quarter";
+import { Region } from "./Region";
+export { City, Continent, Country, Department, Quarter, Region };

package/lib/esm/models/world/index.js

@@ -0,0 +1,4 @@
+import { City } from "./City";
+import { Continent } from "./Continent";
+import { Region } from "./Region";
+export { City, Continent, Region };

package/lib/esm/npms/typeorm.js

@@ -38,9 +38,12 @@ export const tormDateParams = (qb, propColumn, opDates, dates, datesBy) => {
     }
     if (dates) {
         if (!datesBy) {
-            qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m-%d') BETWEEN CAST(:fromDate as date) AND  CAST(:toDate as date)`, {
-                fromDate: dates.fromDate,
-                toDate: dates.toDate,
+            // qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m-%d') BETWEEN CAST(:fromDate as date) AND  CAST(:toDate as date)`, {
+            qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m-%d') BETWEEN :fromDate  AND  :toDate`, {
+                /* fromDate: dates.fromDate,
+                toDate: dates.toDate, */
+                fromDate: dateFormatter(dates.fromDate, "ymd", "-"),
+                toDate: dateFormatter(dates.toDate, "ymd", "-"),
             });
         }
         else {

package/lib/esm/pdfs/invoices/amountInvoice.d.ts

@@ -1,5 +1,5 @@
-import { Bill } from "../../models/entities/bills/Bill";
-import { Sale } from "../../models/entities/sales/Sale";
+import { Bill } from "../../models/bills/Bill";
+import { Sale } from "../../models/sales/Sale";
 export declare const infoAmountOnBl: (tob: Sale) => {
     width: string;
     table: {

package/lib/esm/pdfs/invoices/infoInvoice.d.ts

@@ -1,5 +1,5 @@
-import { Bill } from "../../models/entities/bills/Bill";
-import { Sale } from "../../models/entities/sales/Sale";
+import { Bill } from "../../models/bills/Bill";
+import { Sale } from "../../models/sales/Sale";
 export declare const infoSale: (tob: Sale) => {
     width: string;
     table: {

package/lib/esm/pdfs/tools/tools.d.ts

@@ -1,5 +1,5 @@
-import { User } from "../../models/entities/users/User";
-import { UserNotarial } from "../../models/entities/users/UserNotatial";
+import { User } from "../../models/users/User";
+import { UserNotarial } from "../../models/users/UserNotatial";
 export declare const displayPdfDate: (label: string, fromDate: string, toDate: string) => string;
 export declare const displayTitle: (title: string) => {
     width: string;

package/lib/esm/product.d.ts

@@ -1,4 +1,4 @@
-import { Product } from "./models/entities/products/Product";
-import { User } from "./models/entities/users/User";
+import { Product } from "./models/products/Product";
+import { User } from "./models/users/User";
 export declare const unitPriceByClientCat: (product: Product, client: User, speUnitPrice?: number, addDiscount?: boolean) => number;
 export declare const productCatCode: (product: Product, catCodes: string[]) => boolean;

package/lib/esm/sale.d.ts

@@ -1,4 +1,4 @@
-import { Sale } from "./models/entities/sales/Sale";
+import { Sale } from "./models/sales/Sale";
 export declare const getNbProductsOnSale: (sale: Sale) => number;
 export declare const getTotalTvaOnSale: (sale: Sale, dlvr?: boolean) => number;
 export declare const getSubTotalAmountOnSale: (sale: Sale, dlvr?: boolean) => number;

package/lib/esm/sale.js

@@ -100,8 +100,9 @@ export const tabLabel = (sale) => {
     }
     const tabLen = labels.length;
     const modulo = tabLen % 5;
+    const chunkSize = 5;
     if (modulo !== 0) {
-        for (let i = 0; i < 5 - +modulo; i++) {
+        for (let i = 0; i < chunkSize - +modulo; i++) {
             labels.push({ name: "L' OEIL DE DIEU", product: "est votre meilleur ami", pp: " ", saleDate: " " });
         }
     }

package/lib/esm/user.d.ts

@@ -1,10 +1,10 @@
 import { UserGrp } from "./models";
-import { Gender } from "./models/entities/users/Gender";
-import { Ste } from "./models/entities/users/Ste";
-import { User } from "./models/entities/users/User";
-import { UserNotarial } from "./models/entities/users/UserNotatial";
-import { UserRole } from "./models/entities/users/UserRole";
-import { UserTitr } from "./models/entities/users/UserTitr";
+import { Gender } from "./models/users/Gender";
+import { Ste } from "./models/users/Ste";
+import { User } from "./models/users/User";
+import { UserNotarial } from "./models/users/UserNotatial";
+import { UserRole } from "./models/users/UserRole";
+import { UserTitr } from "./models/users/UserTitr";
 interface FullnameType {
     firstname?: string;
     lastname?: string;

package/lib/esm/utils.d.ts

@@ -37,6 +37,7 @@ export declare const removeBackSlashOccurences: (text: string, toChar: string) =
 export declare const genSequenceRef: (refs: any[], startChars: string, zeroFillWidth: number, dateFormat?: string) => string;
 export declare const sesStorageSet: (key: string, val: any) => void;
 export declare const sesStorageGet: (key: string) => any;
+export declare const toPlural: (word: string) => string;
 export declare const replaceAllIn: (text: string, regex?: RegExp, toChar?: string) => string;
 export declare const replaceSpacesWith: (text: string, toChar?: string) => string;
 export declare const dateFormatter: (date: Date | string, format?: "y" | "ym" | "ymd" | "dmy" | "ago" | "md" | "dmy-hm" | "dmyfr" | "myfr" | "mfr-short" | "mfr-long", separator?: "/" | "" | "-") => string;

package/lib/esm/utils.js

@@ -239,12 +239,32 @@ export const sesStorageSet = (key, val) => {
 export const sesStorageGet = (key) => {
     return JSON.parse(sessionStorage.getItem(key));
 };
+/* start: string -------------------------------------- */
+export const toPlural = (word) => {
+    word = word.trimEnd();
+    if (["s", "x"].includes(word.slice(-1).toLocaleLowerCase())) {
+        return word;
+    }
+    else {
+        if (["hopital", "hôpital", "medical", "médical"].includes(word)) {
+            // return word.substring(0, word.lastIndexOf("l")) + "ux";
+            return word.replace(/.$/, "") + "ux";
+        }
+        if (["bureau"].includes(word)) {
+            // return word.substring(0, word.lastIndexOf("l")) + "ux";
+            return word + "x";
+        }
+    }
+    return word + "s";
+    // if(word.lastIndexOf())
+};
 export const replaceAllIn = (text, regex = / /g, toChar = "_") => {
     return text.replace(regex, toChar) || text;
 };
 export const replaceSpacesWith = (text, toChar = "_") => {
     return text.replace(/\s/g, toChar) || text;
 };
+/* end: string ---------------------------------------- */
 /* start: dates -------------------------------------- */
 export const dateFormatter = (date, format = "dmy", separator = "/") => {
     switch (format) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asv-hlps",
-  "version": "1.3.36",
+  "version": "1.3.38",
   "description": "helpers",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -18,9 +18,9 @@
   "devDependencies": {
     "@types/bcryptjs": "^2.4.5",
     "@types/lodash": "^4.14.200",
-    "@types/pdfmake": "^0.2.5",
-    "@types/randomatic": "^3.1.3",
-    "@types/react": "^18.2.28",
+    "@types/pdfmake": "^0.2.7",
+    "@types/randomatic": "^3.1.4",
+    "@types/react": "^18.2.31",
     "typescript": "^5.2.2"
   },
   "dependencies": {