@michalrakus/x-react-web-lib 1.17.0 → 1.19.0

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.dateFromModel = exports.numberFromModel = exports.numberAsUI = exports.intFromUI = exports.stringAsDB = exports.stringAsUI = exports.stringFromUI = void 0;
+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;
 var XUtilsCommon_1 = require("./XUtilsCommon");
 var XLocale_1 = require("../components/XLocale");
 var XUtilsMetadataCommon_1 = require("./XUtilsMetadataCommon");
@@ -54,14 +54,17 @@ exports.stringAsDB = stringAsDB;
 function intFromUI(stringValue) {
     // convert stringValue (e.g. 1234) into integer number
     // if stringValue is invalid, returns undefined
-    var value;
+    var value = undefined;
     if (stringValue === '') {
         value = null;
     }
     else {
-        value = parseInt(stringValue, 10); // 1234xxx vrati number 1234, preto testujeme aj value.toString() !== stringValue
-        if (isNaN(value) || value.toString() !== stringValue) {
-            value = undefined;
+        if (XUtilsCommon_1.XUtilsCommon.isInt(stringValue)) {
+            // 1234xxx vrati number 1234, preto sme spravili test isInt
+            value = parseInt(stringValue, 10);
+            if (isNaN(value)) {
+                value = undefined;
+            }
         }
     }
     return value;
@@ -105,6 +108,61 @@ function dateFromModel(value) {
     return dateValue;
 }
 exports.dateFromModel = dateFromModel;
+function dateFromUI(valueString) {
+    // converts valueString (e.g. 21.2.2024) into Date
+    // if stringValue is invalid, returns undefined
+    var valueDate = undefined;
+    if (valueString === '') {
+        valueDate = null;
+    }
+    else {
+        // null znamena nezadane (doplni sa podla aktualneho datumu), undefined znamena zadana nekorektna hodnota
+        var day = void 0;
+        var month = null;
+        var year = null;
+        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));
+            }
+        }
+        // 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)
+        }
+        if (year === null) {
+            year = XUtilsCommon_1.XUtilsCommon.today().getFullYear();
+        }
+        // ak day alebo month alebo year zostal undefined, tak user zadal nekorektnu hodnotu - vratime undefined
+        if (day && month && year) {
+            var monthStr = month.toString();
+            if (monthStr.length < 2) {
+                monthStr = "0" + monthStr;
+            }
+            var dayStr = day.toString();
+            if (dayStr.length < 2) {
+                dayStr = "0" + dayStr;
+            }
+            valueDate = new Date("".concat(year, "-").concat(monthStr, "-").concat(dayStr));
+            if (isNaN(valueDate)) {
+                // ak je nekorektny datum (napr. 2024-13-01)
+                valueDate = undefined;
+            }
+        }
+    }
+    return valueDate;
+}
+exports.dateFromUI = dateFromUI;
 function dateAsUI(value) {
     if (value !== null) {
         return (0, XUtilsCommon_1.dateFormat)(value, dateFormatUI());

package/package.json

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