@michalrakus/x-react-web-lib 1.9.0 → 1.10.0

package/lib/components/XInputInterval.js

@@ -0,0 +1,56 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XInputInterval = void 0;
+var react_1 = __importDefault(require("react"));
+var XInput_1 = require("./XInput");
+var XInputIntervalBase_1 = require("./XInputIntervalBase");
+var XInputInterval = /** @class */ (function (_super) {
+    __extends(XInputInterval, _super);
+    function XInputInterval(props) {
+        var _this = _super.call(this, props) || this;
+        _this.onValueChange = _this.onValueChange.bind(_this);
+        return _this;
+    }
+    XInputInterval.prototype.getValue = function () {
+        return this.getValueFromObject();
+    };
+    XInputInterval.prototype.onValueChange = function (value) {
+        this.onValueChangeBase(value, this.props.onChange);
+    };
+    XInputInterval.prototype.render = function () {
+        return (react_1.default.createElement("div", { className: "field grid" },
+            react_1.default.createElement("label", { htmlFor: this.props.field, className: "col-fixed", style: this.getLabelStyle() }, this.getLabel()),
+            react_1.default.createElement(XInputIntervalBase_1.XInputIntervalBase, __assign({ id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), error: this.getError(), style: this.props.inputStyle }, this.getClassNameTooltip()))));
+    };
+    return XInputInterval;
+}(XInput_1.XInput));
+exports.XInputInterval = XInputInterval;

package/lib/components/XInputIntervalBase.d.ts

@@ -0,0 +1,10 @@
+import { CSSProperties } from "react";
+import { IPostgresInterval } from "./XUtils";
+export declare const XInputIntervalBase: (props: {
+    id?: string | undefined;
+    value: IPostgresInterval | null;
+    onChange: (value: IPostgresInterval | null) => void;
+    readOnly?: boolean | undefined;
+    error?: string | undefined;
+    style?: CSSProperties | undefined;
+}) => JSX.Element;

package/lib/components/XInputIntervalBase.js

@@ -0,0 +1,97 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XInputIntervalBase = void 0;
+var inputtext_1 = require("primereact/inputtext");
+var react_1 = __importStar(require("react"));
+var XUtilsConversions_1 = require("./XUtilsConversions");
+var XUtils_1 = require("./XUtils");
+// zatial podporuje len hours a minutes - TODO - pridat aj seconds, ale cez nejaky prepinac
+var XInputIntervalBase = function (props) {
+    // true, ak uzivatel typuje hodnotu ale hodnota sa este neda skonvertovat na korektny interval (este nevieme vytvorit IPostgresInterval)
+    // false, ak uz mame v inpute korektnu hodnotu - vtedy zavolame props.onChange a posleme mu IPostgresInterval
+    var _a = __read((0, react_1.useState)(false), 2), inputChanged = _a[0], setInputChanged = _a[1];
+    // pouzivane, len ak inputChanged === true, je tu zapisana zmenena hodnota v inpute
+    var _b = __read((0, react_1.useState)(undefined), 2), inputValueState = _b[0], setInputValueState = _b[1];
+    var onChange = function (e) {
+        // conversion to IPostgresInterval will be done in onBlur
+        setInputChanged(true);
+        setInputValueState(e.target.value);
+    };
+    var onBlur = function (e) {
+        // optimalizacia - testujeme len ak inputChanged === true
+        if (inputChanged) {
+            // convert e.target.value (e.g. 10:29) into IPostgresInterval (e.g. {hours: 10, minutes: 29})
+            var valueInterval = (0, XUtilsConversions_1.intervalFromUI)(e.target.value);
+            if (valueInterval === undefined) {
+                // user odisiel z inputu a nechal tam nevalidnu hodnotu - zapiseme hodnotu null, nech nemusime kontrolovat field pri validacii
+                valueInterval = null;
+            }
+            props.onChange(valueInterval);
+            setInputChanged(false);
+            setInputValueState(undefined); // pre poriadok
+        }
+    };
+    var getInputValue = function () {
+        var inputValue;
+        if (inputChanged) {
+            inputValue = inputValueState;
+        }
+        else {
+            inputValue = (0, XUtilsConversions_1.intervalAsUI)(props.value);
+        }
+        return inputValue;
+    };
+    // remark - width:'3.5rem' is default, can be overriden by value from props.style, if needed
+    return (react_1.default.createElement(inputtext_1.InputText, __assign({ id: props.id, value: getInputValue(), onChange: onChange, onBlur: onBlur, readOnly: props.readOnly }, XUtils_1.XUtils.createErrorProps(props.error), { style: __assign({ width: '3.5rem' }, props.style) })));
+};
+exports.XInputIntervalBase = XInputIntervalBase;

package/lib/components/XInputIntervalDT.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="react" />
+import { IPostgresInterval } from "./XUtils";
+import { XInputDT, XInputDTProps } from "./XInputDT";
+export interface XInputIntervalDTProps extends XInputDTProps {
+}
+export declare class XInputIntervalDT extends XInputDT<XInputIntervalDTProps> {
+    constructor(props: XInputIntervalDTProps);
+    getValue(): IPostgresInterval | null;
+    onValueChange(value: IPostgresInterval | null): void;
+    render(): JSX.Element;
+}

package/lib/components/XInputIntervalDT.js

@@ -0,0 +1,43 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XInputIntervalDT = void 0;
+var react_1 = __importDefault(require("react"));
+var XInputIntervalBase_1 = require("./XInputIntervalBase");
+var XInputDT_1 = require("./XInputDT");
+var XInputIntervalDT = /** @class */ (function (_super) {
+    __extends(XInputIntervalDT, _super);
+    function XInputIntervalDT(props) {
+        var _this = _super.call(this, props) || this;
+        _this.onValueChange = _this.onValueChange.bind(_this);
+        return _this;
+    }
+    XInputIntervalDT.prototype.getValue = function () {
+        return this.getValueFromRowData();
+    };
+    XInputIntervalDT.prototype.onValueChange = function (value) {
+        this.onValueChangeBase(value, this.props.onChange);
+    };
+    XInputIntervalDT.prototype.render = function () {
+        return (react_1.default.createElement(XInputIntervalBase_1.XInputIntervalBase, { id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), error: this.getError() }));
+    };
+    return XInputIntervalDT;
+}(XInputDT_1.XInputDT));
+exports.XInputIntervalDT = XInputIntervalDT;

package/lib/components/XLazyDataTable.js

@@ -198,7 +198,7 @@ var XLazyDataTable = function (props) {
     };
     // premenne platne pre cely component (obdoba member premennych v class-e)
     var dataTableEl = (0, react_1.useRef)(null);
-    var customFilter = props.customFilter;
+    var customFilterItems = XUtils_1.XUtils.createCustomFilterItems(props.customFilter);
     var aggregateItems = createAggregateItems();
     var _b = __read((0, react_1.useState)({ rowList: [], totalRecords: 0, aggregateValues: [] }), 2), value = _b[0], setValue = _b[1];
     var _c = __read((0, react_1.useState)(false), 2), loading = _c[0], setLoading = _c[1];
@@ -213,8 +213,8 @@ var XLazyDataTable = function (props) {
         if (displayFieldFilter !== undefined) {
             filtersInit[displayFieldFilter.field] = createFilterItem(props.filterDisplay, displayFieldFilter.constraint);
         }
-        // ak mame props.searchTableParams.customFilter, pridame ho
-        customFilter = XUtils_1.XUtils.filterAnd(customFilter, props.searchTableParams.customFilter);
+        // ak mame props.searchTableParams.customFilterItems, pridame ho
+        customFilterItems = XUtils_1.XUtils.filterAnd(customFilterItems, props.searchTableParams.customFilter);
     }
     var _f = __read((0, react_1.useState)(filtersInit), 2), filters = _f[0], setFilters = _f[1]; // filtrovanie na "controlled manner" (moze sa sem nainicializovat nejaka hodnota)
     var _g = __read((0, react_1.useState)(props.sortField ? [{ field: props.sortField, order: 1 }] : []), 2), multiSortMeta = _g[0], setMultiSortMeta = _g[1];
@@ -255,7 +255,7 @@ var XLazyDataTable = function (props) {
         return __generator(this, function (_a) {
             //console.log("zavolany onPage");
             setFirst(event.first);
-            loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: event.first, rows: rows, filters: filters, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
+            loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: event.first, rows: rows, filters: filters, customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
             return [2 /*return*/];
         });
     }); };
@@ -269,7 +269,7 @@ var XLazyDataTable = function (props) {
         //console.log("zavolany onSort - this.state.multiSortMeta = " + JSON.stringify(multiSortMeta));
         //console.log("zavolany onSort - event.multiSortMeta = " + JSON.stringify(event.multiSortMeta));
         setMultiSortMeta(event.multiSortMeta);
-        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, customFilter: customFilter, multiSortMeta: event.multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
+        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, customFilterItems: customFilterItems, multiSortMeta: event.multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
     };
     var onClickFilter = function () {
         //console.log("zavolany onClickFilter");
@@ -281,7 +281,7 @@ var XLazyDataTable = function (props) {
         setFilters(filtersInit);
     };
     var loadData = function () {
-        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
+        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
     };
     var loadDataBase = function (findParam) { return __awaiter(void 0, void 0, void 0, function () {
         var findResult;
@@ -449,7 +449,7 @@ var XLazyDataTable = function (props) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    findParam = { resultType: FindParam_1.ResultType.OnlyRowCount, first: first, rows: rows, filters: filtersAfterFiltering, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems };
+                    findParam = { resultType: FindParam_1.ResultType.OnlyRowCount, first: first, rows: rows, filters: filtersAfterFiltering, customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems };
                     return [4 /*yield*/, findByFilter(findParam)];
                 case 1:
                     findResult = _a.sent();
@@ -461,7 +461,7 @@ var XLazyDataTable = function (props) {
         });
     }); };
     var createExportParams = function () {
-        var queryParam = { filters: filtersAfterFiltering, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields() };
+        var queryParam = { filters: filtersAfterFiltering, customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields() };
         return {
             path: "x-lazy-data-table-export",
             queryParam: queryParam,
@@ -569,45 +569,60 @@ var XLazyDataTable = function (props) {
         }
         return betweenFilter;
     };
-    var bodyTemplate = function (columnProps, rowData, xField) {
-        var rowDataValue = XUtilsCommon_1.XUtilsCommon.getValueByPath(rowData, columnProps.field);
-        var bodyValue = '';
+    var valueAsUI = function (value, xField) {
+        var valueResult = '';
         if (xField.type === "decimal") {
             // tuto zatial hack, mal by vzdy prist number
             var numberValue = null;
-            if (typeof rowDataValue === 'string') {
-                numberValue = parseFloat(rowDataValue);
+            if (typeof value === 'string') {
+                numberValue = parseFloat(value);
             }
-            else if (typeof rowDataValue === 'number') {
-                numberValue = rowDataValue;
+            else if (typeof value === 'number') {
+                numberValue = value;
             }
-            bodyValue = (0, XUtilsConversions_1.numberAsUI)(numberValue, xField.scale);
+            valueResult = (0, XUtilsConversions_1.numberAsUI)(numberValue, xField.scale);
         }
         else if (xField.type === "date") {
             // tuto zatial hack, mal by prist Date
             var dateValue = null;
-            if (typeof rowDataValue === 'string') {
-                dateValue = new Date(rowDataValue);
+            if (typeof value === 'string') {
+                dateValue = new Date(value);
             }
-            else if (typeof rowDataValue === 'object' && rowDataValue instanceof Date) {
-                dateValue = rowDataValue;
+            else if (typeof value === 'object' && value instanceof Date) {
+                dateValue = value;
             }
-            bodyValue = (0, XUtilsConversions_1.dateAsUI)(dateValue);
+            valueResult = (0, XUtilsConversions_1.dateAsUI)(dateValue);
         }
         else if (xField.type === "datetime") {
             // tuto zatial hack, mal by prist Date
             var dateValue = null;
-            if (typeof rowDataValue === 'string') {
-                dateValue = new Date(rowDataValue);
+            if (typeof value === 'string') {
+                dateValue = new Date(value);
             }
-            else if (typeof rowDataValue === 'object' && rowDataValue instanceof Date) {
-                dateValue = rowDataValue;
+            else if (typeof value === 'object' && value instanceof Date) {
+                dateValue = value;
             }
-            bodyValue = (0, XUtilsConversions_1.datetimeAsUI)(dateValue);
+            valueResult = (0, XUtilsConversions_1.datetimeAsUI)(dateValue);
         }
         else if (xField.type === "boolean") {
             // TODO - efektivnejsie by bolo renderovat len prislusne ikonky
-            bodyValue = react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { value: rowDataValue, disabled: true });
+            valueResult = react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { value: value, disabled: true });
+        }
+        else {
+            // string a ine typy
+            valueResult = value;
+        }
+        return valueResult;
+    };
+    var bodyTemplate = function (columnProps, rowData, xField) {
+        var bodyValue;
+        var rowDataValue = XUtilsCommon_1.XUtilsCommon.getValueOrValueListByPath(rowData, columnProps.field);
+        if (Array.isArray(rowDataValue)) {
+            var elemList = rowDataValue.map(function (value, index) { return react_1.default.createElement("div", { key: index }, valueAsUI(value, xField)); });
+            bodyValue = react_1.default.createElement("div", null, elemList);
+        }
+        else {
+            bodyValue = valueAsUI(rowDataValue, xField);
         }
         return bodyValue;
     };
@@ -805,8 +820,7 @@ var XLazyDataTable = function (props) {
         if (childColumn.props.body !== undefined) {
             body = childColumn.props.body;
         }
-        // TODO - mozno by bolo dobre vytvarat body pre kazdy typ fieldu, nech je to vsetko konzistentne
-        else if (xField.type === "decimal" || xField.type === "date" || xField.type === "datetime" || xField.type === "boolean") {
+        else {
             body = function (rowData) { return bodyTemplate(childColumn.props, rowData, xField); };
         }
         // *********** width/headerStyle ***********

package/lib/components/XSearchButton.js

@@ -136,7 +136,7 @@ var XSearchButton = /** @class */ (function (_super) {
                         setValueToModel(null); // prazdny retazec znamena null hodnotu
                         return [3 /*break*/, 3];
                     case 1:
-                        displayFieldFilter = { filter: "[".concat(props.displayField, "] LIKE :xDisplayFieldValue"), values: { "xDisplayFieldValue": "".concat(e.target.value, "%") } };
+                        displayFieldFilter = { where: "[".concat(props.displayField, "] LIKE :xDisplayFieldValue"), params: { "xDisplayFieldValue": "".concat(e.target.value, "%") } };
                         customFilter = this.getFilterBase(this.props.filter);
                         return [4 /*yield*/, XUtils_1.XUtils.fetchRows(this.xAssoc.entityName, XUtils_1.XUtils.filterAnd(displayFieldFilter, customFilter))];
                     case 2:

package/lib/components/XUtils.d.ts

@@ -3,13 +3,22 @@ import { CsvDecimalFormat, CsvEncoding, CsvSeparator, ExportType } from "../serv
 import React from "react";
 import { XEnvVar } from "./XEnvVars";
 import { XError, XErrorMap } from "./XErrors";
-import { XCustomFilter } from "../serverApi/FindParam";
+import { XCustomFilter, XCustomFilterItem } from "../serverApi/FindParam";
 export declare enum OperationType {
     None = 0,
     Insert = 1,
     Update = 2,
     Remove = 3
 }
+export interface IPostgresInterval {
+    years?: number;
+    months?: number;
+    days?: number;
+    hours?: number;
+    minutes?: number;
+    seconds?: number;
+    milliseconds?: number;
+}
 export declare class XUtils {
     static dropdownEmptyOptionValue: string;
     static xBackendUrl: string | undefined;
@@ -70,5 +79,6 @@ export declare class XUtils {
     static getErrorMessages(xErrorMap: XErrorMap): string;
     static getErrorMessage(xError: XError): string | undefined;
     static normalizeString(value: string): string;
-    static filterAnd(filter1: XCustomFilter | undefined, filter2: XCustomFilter | undefined): XCustomFilter | undefined;
+    static createCustomFilterItems(customFilter: XCustomFilter | undefined): XCustomFilterItem[] | undefined;
+    static filterAnd(...filters: (XCustomFilter | undefined)[]): XCustomFilterItem[] | undefined;
 }

package/lib/components/XUtils.js

@@ -73,6 +73,15 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XUtils = exports.OperationType = void 0;
 var XUtilsMetadata_1 = require("./XUtilsMetadata");
@@ -260,7 +269,7 @@ var XUtils = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        findParam = { resultType: FindParam_1.ResultType.AllRows, entity: entity, customFilter: customFilter, multiSortMeta: sortField ? [{ field: sortField, order: 1 }] : undefined, fields: fields };
+                        findParam = { resultType: FindParam_1.ResultType.AllRows, entity: entity, customFilterItems: XUtils.createCustomFilterItems(customFilter), multiSortMeta: sortField ? [{ field: sortField, order: 1 }] : undefined, fields: fields };
                         return [4 /*yield*/, XUtils.fetchOne('lazyDataTableFindRows', findParam)];
                     case 1:
                         rowList = (_a.sent()).rowList;
@@ -446,6 +455,7 @@ var XUtils = /** @class */ (function () {
             });
         });
     };
+    // TODO - prehodit do XUtilsCommon
     XUtils.arrayMoveElement = function (array, position, offset) {
         var element = array[position];
         array.splice(position, 1);
@@ -460,7 +470,7 @@ var XUtils = /** @class */ (function () {
             array.splice(positionNew, 0, element);
         }
     };
-    // helper function
+    // TODO - prehodit do XUtilsCommon
     XUtils.arraySort = function (array, fieldOrStringFunction) {
         var stringFunction;
         if (typeof fieldOrStringFunction === 'string') {
@@ -592,20 +602,47 @@ var XUtils = /** @class */ (function () {
         }
         return value;
     };
-    // pomocna metodka
-    XUtils.filterAnd = function (filter1, filter2) {
-        if (filter1 && filter2) {
-            return { filter: "(".concat(filter1.filter, ") AND (").concat(filter2.filter, ")"), values: __assign(__assign({}, filter1.values), filter2.values) };
-        }
-        else if (filter1 && filter2 === undefined) {
-            return filter1;
-        }
-        else if (filter1 === undefined && filter2) {
-            return filter2;
+    // pomocna metodka - konvertuje XCustomFilter -> XCustomFilterItem[]
+    XUtils.createCustomFilterItems = function (customFilter) {
+        var customFilterItems = undefined;
+        if (customFilter) {
+            if (Array.isArray(customFilter)) {
+                customFilterItems = customFilter;
+            }
+            else {
+                customFilterItems = [customFilter];
+            }
         }
-        else {
-            return undefined;
+        return customFilterItems;
+    };
+    // pomocna metodka
+    XUtils.filterAnd = function () {
+        var e_6, _a;
+        var filters = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            filters[_i] = arguments[_i];
+        }
+        var customFilterItemsResult = undefined;
+        if (filters.length > 0) {
+            customFilterItemsResult = [];
+            try {
+                for (var filters_1 = __values(filters), filters_1_1 = filters_1.next(); !filters_1_1.done; filters_1_1 = filters_1.next()) {
+                    var filter = filters_1_1.value;
+                    var customFilterItems = XUtils.createCustomFilterItems(filter);
+                    if (customFilterItems) {
+                        customFilterItemsResult.push.apply(customFilterItemsResult, __spreadArray([], __read(customFilterItems), false));
+                    }
+                }
+            }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+            finally {
+                try {
+                    if (filters_1_1 && !filters_1_1.done && (_a = filters_1.return)) _a.call(filters_1);
+                }
+                finally { if (e_6) throw e_6.error; }
+            }
         }
+        return customFilterItemsResult;
     };
     XUtils.dropdownEmptyOptionValue = " ";
     XUtils.xBackendUrl = undefined;

package/lib/components/XUtilsConversions.d.ts

@@ -1,3 +1,4 @@
+import { IPostgresInterval } from "./XUtils";
 export declare function stringFromUI(stringValue: string): string | null;
 export declare function stringAsUI(value: string | null): string;
 export declare function numberFromUI(stringValue: string): number | null;
@@ -10,3 +11,5 @@ export declare function timeFromModel(value: any): Date | null;
 export declare function dateFormatUI(): string;
 export declare function dateFormatCalendar(): string;
 export declare function datetimeFormatUI(): string;
+export declare function intervalFromUI(valueString: string): IPostgresInterval | null | undefined;
+export declare function intervalAsUI(valueInterval: IPostgresInterval | null): string;

package/lib/components/XUtilsConversions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.datetimeFormatUI = exports.dateFormatCalendar = exports.dateFormatUI = exports.timeFromModel = exports.datetimeAsUI = exports.dateAsUI = exports.dateFromModel = exports.numberFromModel = exports.numberAsUI = exports.numberFromUI = exports.stringAsUI = exports.stringFromUI = void 0;
+exports.intervalAsUI = exports.intervalFromUI = exports.datetimeFormatUI = exports.dateFormatCalendar = exports.dateFormatUI = exports.timeFromModel = exports.datetimeAsUI = exports.dateAsUI = exports.dateFromModel = exports.numberFromModel = exports.numberAsUI = exports.numberFromUI = exports.stringAsUI = exports.stringFromUI = void 0;
 var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
 function stringFromUI(stringValue) {
     var value;
@@ -123,3 +123,55 @@ function datetimeFormatUI() {
     return "dd.mm.yyyy HH:MM:ss";
 }
 exports.datetimeFormatUI = datetimeFormatUI;
+function intervalFromUI(valueString) {
+    // convert e.target.value (e.g. 10:29) into IPostgresInterval (e.g. {hours: 10, minutes: 29})
+    // if stringValue is invalid, returns undefined
+    var valueInterval = undefined;
+    if (valueString === '') {
+        valueInterval = null;
+    }
+    else {
+        var posColon = valueString.indexOf(':');
+        if (posColon === -1) {
+            var minutes = parseInt(valueString);
+            if (!isNaN(minutes)) {
+                var hours = Math.floor(minutes / 60);
+                minutes = minutes - (hours * 60);
+                valueInterval = { hours: hours, minutes: minutes };
+            }
+        }
+        else {
+            var hours = parseInt(valueString.substring(0, posColon));
+            var minutes = parseInt(valueString.substring(posColon + 1));
+            if (!isNaN(hours) && !isNaN(minutes)) {
+                if (minutes >= 60) {
+                    var hoursFromMinutes = Math.floor(minutes / 60);
+                    hours += hoursFromMinutes;
+                    minutes = minutes - (hoursFromMinutes * 60);
+                }
+                valueInterval = { hours: hours, minutes: minutes };
+            }
+        }
+    }
+    return valueInterval;
+}
+exports.intervalFromUI = intervalFromUI;
+function intervalAsUI(valueInterval) {
+    var _a, _b;
+    // conversion e.g. {hours: 10, minutes: 29} => '10:29'
+    var valueString;
+    if (valueInterval !== null) {
+        var hours = (_a = valueInterval.hours) !== null && _a !== void 0 ? _a : 0;
+        var minutes = (_b = valueInterval.minutes) !== null && _b !== void 0 ? _b : 0;
+        //const seconds: number = value.seconds ?? 0;
+        if (valueInterval.days) {
+            hours += valueInterval.days * 24;
+        }
+        valueString = "".concat(hours.toString(), ":").concat(minutes.toString().padStart(2, '0'));
+    }
+    else {
+        valueString = ''; // null
+    }
+    return valueString;
+}
+exports.intervalAsUI = intervalAsUI;

package/lib/serverApi/ExportImportParam.d.ts

@@ -1,5 +1,5 @@
 import { DataTableFilterMeta, DataTableSortMeta } from "primereact/datatable";
-import { XCustomFilter } from "./FindParam";
+import { XCustomFilterItem } from "./FindParam";
 export declare enum ExportType {
     Csv = "csv",
     Json = "json"
@@ -11,7 +11,7 @@ export interface ExportParam {
 }
 export interface LazyDataTableQueryParam {
     filters: DataTableFilterMeta;
-    customFilter?: XCustomFilter;
+    customFilterItems?: XCustomFilterItem[];
     multiSortMeta?: DataTableSortMeta[];
     entity: string;
     fields: string[];

package/lib/serverApi/FindParam.d.ts

@@ -4,13 +4,14 @@ export declare enum ResultType {
     RowCountAndPagedRows = 1,
     AllRows = 2
 }
-export interface XCustomFilterValues {
+export interface XParams {
     [key: string]: any;
 }
-export interface XCustomFilter {
-    filter: string;
-    values: XCustomFilterValues;
+export interface XCustomFilterItem {
+    where: string;
+    params: XParams;
 }
+export type XCustomFilter = XCustomFilterItem | XCustomFilterItem[];
 export declare enum XAggregateType {
     Min = "MIN",
     Max = "MAX",
@@ -26,7 +27,7 @@ export interface FindParam {
     first?: number;
     rows?: number;
     filters?: DataTableFilterMeta;
-    customFilter?: XCustomFilter;
+    customFilterItems?: XCustomFilterItem[];
     multiSortMeta?: DataTableSortMeta[];
     entity: string;
     fields?: string[];

package/lib/serverApi/XUtilsCommon.d.ts

@@ -1,6 +1,7 @@
 export declare class XUtilsCommon {
     static newLine: string;
     static getValueByPath(object: any, path: string): any;
+    static getValueOrValueListByPath(object: any, path: string): any | any[];
     static getFieldListForPath(path: string): string[];
     static getFieldAndRestPath(path: string): [string, string | null];
     static getPathToAssoc(path: string): string;