@michalrakus/x-react-web-lib 1.20.0 → 1.22.0

package/lib/serverApi/XUtilsCommon.d.ts

@@ -9,10 +9,15 @@ export declare class XUtilsCommon {
     static getPathToAssocAndField(path: string): [string | null, string];
     static isSingleField(path: string): boolean;
     static getPrefixAndField(path: string): [string | null, string];
+    static createDisplayValue(object: any, fields: string[]): string;
     static objectAsJSON(value: any): string;
     static arrayCreateMap<ID, T>(array: T[], idField: string): Map<ID, T>;
     static getDayName(date: Date | null | undefined): string | undefined;
     static dateAddDays(date: Date | null, days: number): Date | null;
+    static dateAddMonths(date: Date | null, months: number): Date | null;
+    static dateEquals(date1: Date | null, date2: Date | null): boolean;
+    static dateDiffInYears(dateOld: Date | null, dateNew: Date | null): number | null;
+    static monthDiff(monthOld: Date | null, monthNew: Date | null): number | null;
     static findFirstMatch(pattern: RegExp, value: string): string | null;
     static sqlMaxDateIfNull(sqlExp: string): string;
     static today(): Date;

package/lib/serverApi/XUtilsCommon.js

@@ -168,6 +168,38 @@ var XUtilsCommon = /** @class */ (function () {
             return [prefix, pathOnly];
         }
     };
+    XUtilsCommon.createDisplayValue = function (object, fields) {
+        var e_2, _a;
+        var displayValue = "";
+        try {
+            for (var fields_1 = __values(fields), fields_1_1 = fields_1.next(); !fields_1_1.done; fields_1_1 = fields_1.next()) {
+                var field = fields_1_1.value;
+                // TODO - konverzie na spravny typ/string
+                var _b = __read(XUtilsCommon.getPrefixAndField(field), 2), prefix = _b[0], fieldOnly = _b[1];
+                var value = XUtilsCommon.getValueByPath(object, fieldOnly);
+                if (value !== null && value !== undefined) {
+                    var valueStr = value.toString(); // TODO - spravnu konverziu
+                    if (valueStr !== "") {
+                        if (displayValue !== "") {
+                            displayValue += " ";
+                        }
+                        if (prefix) {
+                            displayValue += prefix;
+                        }
+                        displayValue += valueStr;
+                    }
+                }
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (fields_1_1 && !fields_1_1.done && (_a = fields_1.return)) _a.call(fields_1);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        return displayValue;
+    };
     XUtilsCommon.objectAsJSON = function (value) {
         // sem treba dat nejaku pre nas vhodnu serializaciu
         // zatial provizorne robene cez antipatern - modifikaciu prototype funcii primitivnych typov
@@ -191,7 +223,7 @@ var XUtilsCommon = /** @class */ (function () {
         return json;
     };
     XUtilsCommon.arrayCreateMap = function (array, idField) {
-        var e_2, _a;
+        var e_3, _a;
         var idRowMap = new Map();
         try {
             for (var array_1 = __values(array), array_1_1 = array_1.next(); !array_1_1.done; array_1_1 = array_1.next()) {
@@ -201,12 +233,12 @@ var XUtilsCommon = /** @class */ (function () {
                 }
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
                 if (array_1_1 && !array_1_1.done && (_a = array_1.return)) _a.call(array_1);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_3) throw e_3.error; }
         }
         return idRowMap;
     };
@@ -222,6 +254,61 @@ var XUtilsCommon = /** @class */ (function () {
         }
         return result;
     };
+    XUtilsCommon.dateAddMonths = function (date, months) {
+        var result = null;
+        if (date !== null) {
+            result = new Date(date);
+            result.setMonth(result.getMonth() + months);
+        }
+        return result;
+    };
+    // helper method, because date1 === date2 compares pointers, not values (Date is not primitive type like string or number)
+    XUtilsCommon.dateEquals = function (date1, date2) {
+        var result = false;
+        if (date1 === null && date2 === null) {
+            result = true;
+        }
+        else if (date1 !== null && date2 !== null) {
+            result = (date1.getTime() === date2.getTime());
+        }
+        return result;
+    };
+    // solution from internet
+    XUtilsCommon.dateDiffInYears = function (dateOld, dateNew) {
+        var diff = null;
+        if (dateOld !== null && dateNew !== null) {
+            var yearNew = dateNew.getFullYear();
+            var monthNew = dateNew.getMonth();
+            var dayNew = dateNew.getDate();
+            var yearOld = dateOld.getFullYear();
+            var monthOld = dateOld.getMonth();
+            var dayOld = dateOld.getDate();
+            diff = yearNew - yearOld;
+            if (monthOld > monthNew) {
+                diff--;
+            }
+            else {
+                if (monthOld === monthNew) {
+                    if (dayOld > dayNew) {
+                        diff--;
+                    }
+                }
+            }
+        }
+        return diff;
+    };
+    // returns month diff for 2 dates of type month (YYYY-MM-01) - days are ignored
+    XUtilsCommon.monthDiff = function (monthOld, monthNew) {
+        var diff = null;
+        if (monthOld !== null && monthNew !== null) {
+            var yearCountNew = monthNew.getFullYear();
+            var monthCountNew = monthNew.getMonth();
+            var yearCountOld = monthOld.getFullYear();
+            var monthCountOld = monthOld.getMonth();
+            diff = (yearCountNew - yearCountOld) * 12 + (monthCountNew - monthCountOld);
+        }
+        return diff;
+    };
     XUtilsCommon.findFirstMatch = function (pattern, value) {
         var match = pattern.exec(value);
         return match != null ? match[0] : null;

package/lib/serverApi/XUtilsConversions.d.ts

@@ -6,20 +6,27 @@ export declare function stringAsDB(value: string | null): string;
 export declare function intFromUI(stringValue: string): number | null | undefined;
 export declare function numberAsUI(value: number | null, fractionDigits?: number): string;
 export declare function numberFromModel(value: any): number | null;
+export declare function numberFromString(valueString: string): number | null;
+export declare enum XDateScale {
+    Date = 1,
+    Month = 2,
+    Year = 3
+}
 export declare function dateFromModel(value: any): Date | null;
-export declare function dateFromUI(valueString: string): Date | null | undefined;
-export declare function dateAsUI(value: Date | null): string;
+export declare function dateFromUI(valueString: string, dateScale?: XDateScale): Date | null | undefined;
+export declare function dateAsUI(value: Date | null, dateScale?: XDateScale): string;
 export declare function datetimeAsUI(value: Date | null): string;
 export declare function timeFromModel(value: any): Date | null;
-export declare function dateFormatUI(): string;
-export declare function dateFormatCalendar(): string;
+export declare function dateFormatUI(dateScale?: XDateScale): string;
+export declare function dateFormatCalendar(dateScale?: XDateScale): string;
 export declare function datetimeFormatUI(): string;
 export declare function intervalFromUI(valueString: string): IPostgresInterval | null | undefined;
 export declare function intervalAsUI(valueInterval: IPostgresInterval | null): string;
 export declare function booleanAsUIText(value: boolean | null): string;
 export declare enum AsUIType {
     Form = 1,
-    Text = 2
+    Text = 2,
+    Excel = 3
 }
 /**
  * converts values of object
@@ -31,3 +38,4 @@ export declare enum AsUIType {
  */
 export declare function convertObject(entity: string, object: any, fromModel: boolean, asUI: AsUIType | undefined): void;
 export declare function convertValue(xField: XField, value: any, fromModel: boolean, asUI: AsUIType | undefined): any;
+export declare function convertValueBase(fieldType: string, scale: number | undefined, value: any, fromModel: boolean, asUI: AsUIType | undefined): any;

package/lib/serverApi/XUtilsConversions.js

@@ -27,7 +27,7 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertValue = exports.convertObject = exports.AsUIType = exports.booleanAsUIText = exports.intervalAsUI = exports.intervalFromUI = exports.datetimeFormatUI = exports.dateFormatCalendar = exports.dateFormatUI = exports.timeFromModel = exports.datetimeAsUI = exports.dateAsUI = exports.dateFromUI = exports.dateFromModel = exports.numberFromModel = exports.numberAsUI = exports.intFromUI = exports.stringAsDB = exports.stringAsUI = exports.stringFromUI = void 0;
+exports.convertValueBase = exports.convertValue = exports.convertObject = exports.AsUIType = exports.booleanAsUIText = exports.intervalAsUI = exports.intervalFromUI = exports.datetimeFormatUI = exports.dateFormatCalendar = exports.dateFormatUI = exports.timeFromModel = exports.datetimeAsUI = exports.dateAsUI = exports.dateFromUI = exports.dateFromModel = exports.XDateScale = exports.numberFromString = exports.numberFromModel = exports.numberAsUI = exports.intFromUI = exports.stringAsDB = exports.stringAsUI = exports.stringFromUI = void 0;
 var XUtilsCommon_1 = require("./XUtilsCommon");
 var XLocale_1 = require("../components/XLocale");
 var XUtilsMetadataCommon_1 = require("./XUtilsMetadataCommon");
@@ -95,6 +95,23 @@ function numberFromModel(value) {
     return numberValue;
 }
 exports.numberFromModel = numberFromModel;
+// konvertuje hodnotu napr. 12.34
+function numberFromString(valueString) {
+    var numberValue = parseFloat(valueString);
+    if (isNaN(numberValue)) {
+        numberValue = null;
+    }
+    return numberValue;
+}
+exports.numberFromString = numberFromString;
+// upresnenie typu datumu - pouzivame typ number, lebo zneuzivame atribut scale v TypeORM na zadanie upresnenia
+var XDateScale;
+(function (XDateScale) {
+    XDateScale[XDateScale["Date"] = 1] = "Date";
+    XDateScale[XDateScale["Month"] = 2] = "Month";
+    XDateScale[XDateScale["Year"] = 3] = "Year"; // yyyy
+})(XDateScale = exports.XDateScale || (exports.XDateScale = {}));
+//export type XDateType = "month" | "year" | "date";
 // v modeli na klientovi by mal byt vzdy Date, teraz je tam niekedy string (z json-u zo servera) a niekedy Date (z komponentu)
 // provizorne zatial takato konverzia
 function dateFromModel(value) {
@@ -108,9 +125,10 @@ function dateFromModel(value) {
     return dateValue;
 }
 exports.dateFromModel = dateFromModel;
-function dateFromUI(valueString) {
+function dateFromUI(valueString, dateScale) {
+    if (dateScale === void 0) { dateScale = XDateScale.Date; }
     // converts valueString (e.g. 21.2.2024) into Date
-    // if stringValue is invalid, returns undefined
+    // if valueString is invalid, returns undefined
     var valueDate = undefined;
     if (valueString === '') {
         valueDate = null;
@@ -120,22 +138,46 @@ function dateFromUI(valueString) {
         var day = void 0;
         var month = null;
         var year = null;
-        var posDot = valueString.indexOf('.');
-        if (posDot === -1) {
-            day = intFromUI(valueString);
+        if (dateScale === XDateScale.Date) {
+            // format "dd.mm.yyyy"
+            var posDot = valueString.indexOf('.');
+            if (posDot === -1) {
+                day = intFromUI(valueString);
+            }
+            else {
+                day = intFromUI(valueString.substring(0, posDot));
+                var rest = valueString.substring(posDot + 1);
+                var posDot2 = rest.indexOf('.');
+                if (posDot2 === -1) {
+                    month = intFromUI(rest);
+                }
+                else {
+                    month = intFromUI(rest.substring(0, posDot2));
+                    year = intFromUI(rest.substring(posDot2 + 1));
+                }
+            }
         }
-        else {
-            day = intFromUI(valueString.substring(0, posDot));
-            var rest = valueString.substring(posDot + 1);
-            var posDot2 = rest.indexOf('.');
-            if (posDot2 === -1) {
-                month = intFromUI(rest);
+        else if (dateScale === XDateScale.Month) {
+            // format "mm.yyyy"
+            day = 1;
+            var posDot = valueString.indexOf('.');
+            if (posDot === -1) {
+                month = intFromUI(valueString);
             }
             else {
-                month = intFromUI(rest.substring(0, posDot2));
-                year = intFromUI(rest.substring(posDot2 + 1));
+                month = intFromUI(valueString.substring(0, posDot));
+                year = intFromUI(valueString.substring(posDot + 1));
             }
         }
+        else if (dateScale === XDateScale.Year) {
+            // format "yyyy"
+            day = 1;
+            month = 1;
+            year = intFromUI(valueString);
+        }
+        else {
+            throw "Unimplemented dateScale = " + dateScale;
+        }
         // doplnime mesiac a rok ak uzivatel nezadal (ak mame undefined, tak umyselne nedoplname)
         if (month === null) {
             month = XUtilsCommon_1.XUtilsCommon.today().getMonth() + 1; // o 1 mesiac viac (januar je 0)
@@ -163,9 +205,10 @@ function dateFromUI(valueString) {
     return valueDate;
 }
 exports.dateFromUI = dateFromUI;
-function dateAsUI(value) {
+function dateAsUI(value, dateScale) {
+    if (dateScale === void 0) { dateScale = XDateScale.Date; }
     if (value !== null) {
-        return (0, XUtilsCommon_1.dateFormat)(value, dateFormatUI());
+        return (0, XUtilsCommon_1.dateFormat)(value, dateFormatUI(dateScale));
     }
     else {
         return "";
@@ -208,12 +251,40 @@ function timeFromModel(value) {
     return timeValue;
 }
 exports.timeFromModel = timeFromModel;
-function dateFormatUI() {
-    return "dd.mm.yyyy";
+function dateFormatUI(dateScale) {
+    if (dateScale === void 0) { dateScale = XDateScale.Date; }
+    var format;
+    if (dateScale === XDateScale.Date) {
+        format = "dd.mm.yyyy";
+    }
+    else if (dateScale === XDateScale.Month) {
+        format = "mm.yyyy";
+    }
+    else if (dateScale === XDateScale.Year) {
+        format = "yyyy";
+    }
+    else {
+        throw "Unimplemented dateScale = " + dateScale;
+    }
+    return format;
 }
 exports.dateFormatUI = dateFormatUI;
-function dateFormatCalendar() {
-    return "dd.mm.yy";
+function dateFormatCalendar(dateScale) {
+    if (dateScale === void 0) { dateScale = XDateScale.Date; }
+    var format;
+    if (dateScale === XDateScale.Date) {
+        format = "dd.mm.yy";
+    }
+    else if (dateScale === XDateScale.Month) {
+        format = "mm.yy";
+    }
+    else if (dateScale === XDateScale.Year) {
+        format = "yy";
+    }
+    else {
+        throw "Unimplemented dateScale = " + dateScale;
+    }
+    return format;
 }
 exports.dateFormatCalendar = dateFormatCalendar;
 function datetimeFormatUI() {
@@ -284,7 +355,8 @@ exports.booleanAsUIText = booleanAsUIText;
 var AsUIType;
 (function (AsUIType) {
     AsUIType[AsUIType["Form"] = 1] = "Form";
-    AsUIType[AsUIType["Text"] = 2] = "Text"; // reporty - boolean sa konvertuje na ano/nie
+    AsUIType[AsUIType["Text"] = 2] = "Text";
+    AsUIType[AsUIType["Excel"] = 3] = "Excel"; // excel - nie vsetko konvertujeme do string-u, vecsinou zostavame pri typoch number, Date
 })(AsUIType = exports.AsUIType || (exports.AsUIType = {}));
 /**
  * converts values of object
@@ -345,23 +417,27 @@ function convertObject(entity, object, fromModel, asUI) {
 }
 exports.convertObject = convertObject;
 function convertValue(xField, value, fromModel, asUI) {
-    if (xField.type === "decimal") {
+    return convertValueBase(xField.type, xField.scale, value, fromModel, asUI);
+}
+exports.convertValue = convertValue;
+function convertValueBase(fieldType, scale, value, fromModel, asUI) {
+    if (fieldType === "decimal") {
         if (fromModel) {
             value = numberFromModel(value);
         }
-        if (asUI) {
-            value = numberAsUI(value, xField.scale);
+        if (asUI && asUI !== AsUIType.Excel) {
+            value = numberAsUI(value, scale);
         }
     }
-    else if (xField.type === "date") {
+    else if (fieldType === "date") {
         if (fromModel) {
             value = dateFromModel(value);
         }
-        if (asUI) {
-            value = dateAsUI(value);
+        if (asUI && (asUI !== AsUIType.Excel || scale === XDateScale.Month || scale === XDateScale.Year)) {
+            value = dateAsUI(value, scale);
         }
     }
-    else if (xField.type === "datetime") {
+    else if (fieldType === "datetime") {
         if (fromModel) {
             value = dateFromModel(value);
         }
@@ -369,25 +445,25 @@ function convertValue(xField, value, fromModel, asUI) {
             value = datetimeAsUI(value);
         }
     }
-    else if (xField.type === "interval") {
+    else if (fieldType === "interval") {
         // konverziu z modelu (json objekt-u) netreba
         if (asUI) {
             value = intervalAsUI(value);
         }
     }
-    else if (xField.type === "boolean") {
+    else if (fieldType === "boolean") {
         // konverziu z modelu (json objekt-u) netreba
         // pre AsUIType.Form ponechame typ boolean (spracujeme neskor)
-        if (asUI === AsUIType.Text) {
+        if (asUI === AsUIType.Text || asUI === AsUIType.Excel) {
             value = booleanAsUIText(value);
         }
     }
     else {
         // vsetko ostatne
-        if (asUI) {
-            value = value ? value.toString() : "";
+        if (asUI && asUI !== AsUIType.Excel) {
+            value = (value !== null && value !== undefined) ? value.toString() : "";
         }
     }
     return value;
 }
-exports.convertValue = convertValue;
+exports.convertValueBase = convertValueBase;

package/lib/serverApi/XUtilsMetadataCommon.d.ts

@@ -13,6 +13,7 @@ export declare class XUtilsMetadataCommon {
     static getXField(xEntity: XEntity, field: string): XField;
     static getXFieldByPathBase(xEntity: XEntity, path: string): XField | undefined;
     static getXFieldByPath(xEntity: XEntity, path: string): XField;
+    static hasPathToManyAssoc(xEntity: XEntity, path: string): boolean;
     static getXFieldByPathStr(entity: string, path: string): XField;
     static getXAssocBase(xEntity: XEntity, assocField: string): XAssoc | undefined;
     static getXAssocByPath(xEntity: XEntity, path: string): XAssoc;

package/lib/serverApi/XUtilsMetadataCommon.js

@@ -91,6 +91,23 @@ var XUtilsMetadataCommon = /** @class */ (function () {
             return XUtilsMetadataCommon.getXFieldByPath(xAssocEntity, restPath);
         }
     };
+    // returns true if path contains some toMany assoc
+    XUtilsMetadataCommon.hasPathToManyAssoc = function (xEntity, path) {
+        var _a = __read(XUtilsCommon_1.XUtilsCommon.getFieldAndRestPath(path), 2), field = _a[0], restPath = _a[1];
+        if (restPath === null) {
+            return false;
+        }
+        else {
+            var xAssoc = XUtilsMetadataCommon.getXAssoc(xEntity, field);
+            if (xAssoc.relationType === "one-to-many" || xAssoc.relationType === "many-to-many") {
+                return true;
+            }
+            else {
+                var xAssocEntity = XUtilsMetadataCommon.getXEntity(xAssoc.entityName);
+                return XUtilsMetadataCommon.hasPathToManyAssoc(xAssocEntity, restPath);
+            }
+        }
+    };
     XUtilsMetadataCommon.getXFieldByPathStr = function (entity, path) {
         return XUtilsMetadataCommon.getXFieldByPath(XUtilsMetadataCommon.getXEntity(entity), path);
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michalrakus/x-react-web-lib",
-  "version": "1.20.0",
+  "version": "1.22.0",
   "description": "",
   "scripts": {
     "clean": "rimraf lib",