@michalrakus/x-react-web-lib 1.2.0 → 1.4.0

package/lib/components/XLazyDataTable.js

@@ -112,6 +112,8 @@ var tristatecheckbox_1 = require("primereact/tristatecheckbox");
 var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
 var XExportRowsDialog_1 = require("./XExportRowsDialog");
 var api_1 = require("primereact/api");
+var XCalendar_1 = require("./XCalendar");
+var XInputDecimalBase_1 = require("./XInputDecimalBase");
 var XLazyDataTable = function (props) {
     // must be here, is used in createInitFilters()
     var xEntity = XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.entity);
@@ -438,7 +440,7 @@ var XLazyDataTable = function (props) {
                     if (csvParam && csvParam.useHeaderLine) {
                         csvParam.headers = getHeaders();
                     }
-                    exportParam = { exportType: exportType, filters: filtersAfterFiltering, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), csvParam: csvParam };
+                    exportParam = { exportType: exportType, filters: filtersAfterFiltering, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), csvParam: csvParam };
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
@@ -476,58 +478,90 @@ var XLazyDataTable = function (props) {
             console.log("Nie je vyselectovany ziaden zaznam.");
         }
     };
-    // ****** checkbox vo filtri ********
+    // ****** dropdown vo filtri ********
     // pouziva sa len pre simple filtrovanie (filterDisplay="row")
-    var onCheckboxFilterChange = function (field, checkboxValue) {
-        // TODO - treba vyklonovat?
+    var onDropdownFilterChange = function (field, displayValue) {
+        var filterValue = displayValue !== XUtils_1.XUtils.dropdownEmptyOptionValue ? displayValue : null;
+        setFilterValue(field, filterValue, api_1.FilterMatchMode.EQUALS);
+    };
+    var getDropdownFilterValue = function (field) {
+        var filterValue = getFilterValue(field);
+        return filterValue !== null ? filterValue : XUtils_1.XUtils.dropdownEmptyOptionValue;
+    };
+    // ****** vseobecne metodky pre set/get do/z filtra ********
+    // zatial funguje len pre simple filtrovanie (filterDisplay="row")
+    // vseobecna specialna metodka pouzvana pri custom filtri (XLazyColumn.filterElement)
+    var setFilterItem = function (field, filterItem) {
+        filters[field] = filterItem;
+        // neskusal som, ci treba aj toto klonovat ale pravdepodobne hej
         var filtersCloned = __assign({}, filters);
-        if (checkboxValue !== null) {
-            filtersCloned[field] = { value: checkboxValue ? "1" : "0", matchMode: api_1.FilterMatchMode.EQUALS };
-        }
-        else {
-            // pouzivatel zrusil hodnotu vo filtri (vybral prazdny stav v checkboxe), zrusime polozku z filtra
-            //delete filtersCloned[field];
-            filtersCloned[field] = { value: null, matchMode: api_1.FilterMatchMode.EQUALS };
-        }
         setFilters(filtersCloned);
     };
-    var getCheckboxFilterValue = function (field) {
-        var checkboxValue = null;
-        var filterValue = filters[field];
-        if (filterValue !== undefined && filterValue !== null) {
-            if (filterValue.value === '1') {
-                checkboxValue = true;
-            }
-            else if (filterValue.value === '0') {
-                checkboxValue = false;
-            }
+    // vseobecna metodka - nastavi hodnotu do filtra
+    // ak je matchMode === undefined, tak zachova povodnu hodnotu matchMode
+    var setFilterValue = function (field, value, matchMode) {
+        var filterValue = filters[field]; // funguje len pre filterDisplay="row"
+        filterValue.value = value;
+        if (matchMode !== undefined) {
+            filterValue.matchMode = matchMode;
+        }
+        // treba klonovat, inac react nezobrazi zmenenu hodnotu
+        var filtersCloned = __assign({}, filters);
+        setFilters(filtersCloned);
+    };
+    // vseobecna metodka - precita hodnotu z filtra (vrati napr. typ Date | null)
+    var getFilterValue = function (field) {
+        var filterValue = filters[field]; // funguje len pre filterDisplay="row"
+        return filterValue.value;
+    };
+    // ****** vseobecne metodky pre set/get do/z filtra - pre betweenFilter ********
+    // do DataTableFilterMetaData.value ulozime dvojprvkove pole [value1, value2]
+    // na backende spracujeme toto dvojprvkove pole
+    var setFilterValue1 = function (field, value) {
+        // na zaciatku (po inicializacii lazy table) je filterValue = null
+        var filterValue = getFilterValue(field);
+        if (filterValue !== null) {
+            filterValue[0] = value;
+        }
+        else {
+            filterValue = [value, null];
         }
-        return checkboxValue;
+        setFilterValue(field, filterValue, api_1.FilterMatchMode.BETWEEN);
     };
-    // ****** dropdown vo filtri ********
-    // pouziva sa len pre simple filtrovanie (filterDisplay="row")
-    var onDropdownFilterChange = function (field, displayValue) {
-        // TODO - treba vyklonovat?
-        var filtersCloned = __assign({}, filters);
-        if (displayValue !== XUtils_1.XUtils.dropdownEmptyOptionValue) {
-            filtersCloned[field] = { value: displayValue, matchMode: api_1.FilterMatchMode.EQUALS };
+    var setFilterValue2 = function (field, value) {
+        // na zaciatku (po inicializacii lazy table) je filterValue = null
+        var filterValue = getFilterValue(field);
+        if (filterValue !== null) {
+            filterValue[1] = value;
         }
         else {
-            // pouzivatel zrusil hodnotu vo filtri (vybral prazdny riadok), zrusime polozku z filtra
-            //delete filtersCloned[field];
-            filtersCloned[field] = { value: null, matchMode: api_1.FilterMatchMode.EQUALS };
+            filterValue = [null, value];
         }
-        setFilters(filtersCloned);
+        setFilterValue(field, filterValue, api_1.FilterMatchMode.BETWEEN);
     };
-    var getDropdownFilterValue = function (field) {
-        var dropdownValue = XUtils_1.XUtils.dropdownEmptyOptionValue;
-        var filterValue = filters[field];
-        if (filterValue !== undefined && filterValue !== null) {
-            if (filterValue.value !== null) {
-                dropdownValue = filterValue.value;
+    var getFilterValue1 = function (field) {
+        return getFilterValue1or2(field, 0);
+    };
+    var getFilterValue2 = function (field) {
+        return getFilterValue1or2(field, 1);
+    };
+    var getFilterValue1or2 = function (field, index) {
+        var filterValue = getFilterValue(field);
+        return filterValue !== null ? filterValue[index] : null;
+    };
+    var getBetweenFilter = function (columnBetweenFilter, tableBetweenFilter) {
+        var betweenFilter = undefined;
+        // columnBetweenFilter has higher prio than tableBetweenFilter
+        if (columnBetweenFilter !== undefined) {
+            if (columnBetweenFilter === "row" || columnBetweenFilter === "column") {
+                betweenFilter = columnBetweenFilter;
             }
+            // for "noBetween" stays betweenFilter = undefined (simple filter used)
+        }
+        else {
+            betweenFilter = tableBetweenFilter; // betweenFilter from XLazyDataTable property
         }
-        return dropdownValue;
+        return betweenFilter;
     };
     var bodyTemplate = function (columnProps, rowData, xField) {
         var rowDataValue = XUtilsCommon_1.XUtilsCommon.getValueByPath(rowData, columnProps.field);
@@ -684,14 +718,61 @@ var XLazyDataTable = function (props) {
             header = headerLabel;
         }
         // *********** filterElement ***********
+        var betweenFilter = undefined;
         var filterElement;
-        if (xField.type === "boolean") {
-            var checkboxValue = getCheckboxFilterValue(childColumn.props.field);
-            filterElement = react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { value: checkboxValue, onChange: function (e) { return onCheckboxFilterChange(childColumn.props.field, e.value); } });
+        if (childColumn.props.filterElement !== undefined) {
+            filterElement = function (options) {
+                // compilator sa stazoval ze childColumn.props.filterElement muze byt undefined, preto som pridal "!"
+                return childColumn.props.filterElement(setFilterItem, options);
+            };
         }
-        else if (childColumn.props.dropdownInFilter) {
-            var dropdownValue = getDropdownFilterValue(childColumn.props.field);
-            filterElement = react_1.default.createElement(XDropdownDTFilter_1.XDropdownDTFilter, { entity: props.entity, path: childColumn.props.field, value: dropdownValue, onValueChange: onDropdownFilterChange });
+        else {
+            if (xField.type === "boolean") {
+                var checkboxValue = getFilterValue(childColumn.props.field);
+                filterElement = react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { value: checkboxValue, onChange: function (e) { return setFilterValue(childColumn.props.field, e.value, api_1.FilterMatchMode.EQUALS); } });
+            }
+            else if (childColumn.props.dropdownInFilter) {
+                var dropdownValue = getDropdownFilterValue(childColumn.props.field);
+                filterElement = react_1.default.createElement(XDropdownDTFilter_1.XDropdownDTFilter, { entity: props.entity, path: childColumn.props.field, value: dropdownValue, onValueChange: onDropdownFilterChange });
+            }
+            else if (xField.type === "date" || xField.type === "datetime") {
+                betweenFilter = getBetweenFilter(childColumn.props.betweenFilter, props.betweenFilter);
+                if (betweenFilter !== undefined) {
+                    // display: 'flex' umiestni XCalendar elementy vedla seba
+                    filterElement =
+                        react_1.default.createElement("div", { style: betweenFilter === "row" ? { display: 'flex' } : undefined },
+                            react_1.default.createElement(XCalendar_1.XCalendar, { value: getFilterValue1(childColumn.props.field), onChange: function (value) { return setFilterValue1(childColumn.props.field, value); }, datetime: xField.type === "datetime" }),
+                            react_1.default.createElement(XCalendar_1.XCalendar, { value: getFilterValue2(childColumn.props.field), onChange: function (value) { return setFilterValue2(childColumn.props.field, value); }, datetime: xField.type === "datetime" }));
+                }
+                else {
+                    var dateValue = getFilterValue(childColumn.props.field);
+                    filterElement = react_1.default.createElement(XCalendar_1.XCalendar, { value: dateValue, onChange: function (value) { return setFilterValue(childColumn.props.field, value); }, datetime: xField.type === "datetime" });
+                }
+            }
+            else if (xField.type === "decimal" || xField.type === "number") {
+                var params = XUtilsMetadata_1.XUtilsMetadata.getParamsForInputNumber(xField);
+                betweenFilter = getBetweenFilter(childColumn.props.betweenFilter, props.betweenFilter);
+                if (betweenFilter !== undefined) {
+                    // display: 'flex' umiestni input elementy pod seba (betweenFilter = "column") resp. vedla seba (betweenFilter = "row")
+                    filterElement =
+                        react_1.default.createElement("div", { style: { display: 'flex', flexDirection: betweenFilter } },
+                            react_1.default.createElement(XInputDecimalBase_1.XInputDecimalBase, __assign({ value: getFilterValue1(childColumn.props.field), onChange: function (value) { return setFilterValue1(childColumn.props.field, value); } }, params)),
+                            react_1.default.createElement(XInputDecimalBase_1.XInputDecimalBase, __assign({ value: getFilterValue2(childColumn.props.field), onChange: function (value) { return setFilterValue2(childColumn.props.field, value); } }, params)));
+                }
+                else {
+                    var numberValue = getFilterValue(childColumn.props.field);
+                    filterElement = react_1.default.createElement(XInputDecimalBase_1.XInputDecimalBase, __assign({ value: numberValue, onChange: function (value) { return setFilterValue(childColumn.props.field, value); } }, params));
+                }
+            }
+        }
+        // ************** dataType **************
+        // depending on the dataType of the column, suitable match modes are displayed in filter
+        var dataType = undefined;
+        if (xField.type === "decimal" || xField.type === "number") {
+            dataType = "numeric";
+        }
+        else if (xField.type === "date" || xField.type === "datetime") {
+            dataType = "date";
         }
         // *********** showFilterMenu ***********
         var showFilterMenu;
@@ -701,7 +782,7 @@ var XLazyDataTable = function (props) {
         else {
             showFilterMenu = true; // default
             if (props.filterDisplay === "row") {
-                if (xField.type === "boolean" || childColumn.props.dropdownInFilter) {
+                if (xField.type === "boolean" || childColumn.props.dropdownInFilter || betweenFilter !== undefined) {
                     showFilterMenu = false;
                 }
             }
@@ -710,9 +791,12 @@ var XLazyDataTable = function (props) {
         // pre filterDisplay = "row" nechceme clear button, chceme setrit miesto
         var showClearButton = props.filterDisplay === "menu";
         // *********** body ***********
-        // TODO - mozno by bolo dobre vytvarat body pre kazdy field, nech je to vsetko konzistentne
         var body;
-        if (xField.type === "decimal" || xField.type === "date" || xField.type === "datetime" || xField.type === "boolean") {
+        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") {
             body = function (rowData) { return bodyTemplate(childColumn.props, rowData, xField); };
         }
         // *********** width/headerStyle ***********
@@ -721,7 +805,7 @@ var XLazyDataTable = function (props) {
             // TODO - if filter not used at all, then buttons flags should be false
             var filterMenuInFilterRow = props.filterDisplay === "row" && showFilterMenu;
             var filterButtonInHeader = props.filterDisplay === "menu";
-            width = XUtilsMetadata_1.XUtilsMetadata.computeColumnWidth(xField, filterMenuInFilterRow, undefined, headerLabel, true, filterButtonInHeader);
+            width = XUtilsMetadata_1.XUtilsMetadata.computeColumnWidth(xField, betweenFilter, filterMenuInFilterRow, undefined, headerLabel, true, filterButtonInHeader);
         }
         var headerStyle = {};
         if (width !== undefined) {
@@ -741,7 +825,7 @@ var XLazyDataTable = function (props) {
                 align = "center";
             }
         }
-        return react_1.default.createElement(column_1.Column, { field: childColumn.props.field, header: header, filter: true, sortable: true, filterElement: filterElement, showFilterMenu: showFilterMenu, showClearButton: showClearButton, body: body, headerStyle: headerStyle, align: align });
+        return react_1.default.createElement(column_1.Column, { field: childColumn.props.field, header: header, filter: true, sortable: true, filterElement: filterElement, dataType: dataType, showFilterMenu: showFilterMenu, showClearButton: showClearButton, body: body, headerStyle: headerStyle, align: align });
     });
     return (react_1.default.createElement("div", null,
         react_1.default.createElement("div", { className: "flex justify-content-center" },

package/lib/components/XUtilsMetadata.d.ts

@@ -1,5 +1,6 @@
-import { XAssoc, XEntity, XField } from "../serverApi/XEntityMetadata";
+import { XAssoc, XEntity, XField, XRelationType } from "../serverApi/XEntityMetadata";
 import { XBrowseMeta } from "../serverApi/XBrowseMetadata";
+import { XBetweenFilterProp } from "./XLazyDataTable";
 export declare class XUtilsMetadata {
     private static xEntityMap;
     private static xBrowseMetaMap;
@@ -9,6 +10,8 @@ export declare class XUtilsMetadata {
     static getXField(xEntity: XEntity, field: string): XField;
     static getXFieldByPath(xEntity: XEntity, path: string): XField;
     static getXFieldByPathStr(entity: string, path: string): XField;
+    static getXAssocByPath(xEntity: XEntity, path: string): XAssoc;
+    static getLastXAssocByPath(xEntity: XEntity, path: string): XAssoc;
     static getXAssocToOne(xEntity: XEntity, assocField: string): XAssoc;
     static getXAssocToMany(xEntity: XEntity, assocField: string): XAssoc;
     static getXAssocToOneByAssocEntity(xEntity: XEntity, assocEntityName: string): XAssoc;
@@ -16,6 +19,7 @@ export declare class XUtilsMetadata {
     static getXEntityForAssocToOne(xEntity: XEntity, assocField: string): XEntity;
     static getXEntityForAssocToMany(xEntity: XEntity, assocField: string): XEntity;
     static getXFieldList(xEntity: XEntity): XField[];
+    static getXAssocList(xEntity: XEntity, relationTypeList?: XRelationType[]): XAssoc[];
     static getParamsForInputNumber(xField: XField): {
         useGrouping: boolean;
         fractionDigits?: number;
@@ -24,7 +28,7 @@ export declare class XUtilsMetadata {
         size?: number;
     };
     static CHAR_SIZE: number;
-    static computeColumnWidth(xField: XField, filterMenuInFilterRow: boolean, formColumnType: string | undefined, header: string | undefined, sortableButtonInHeader: boolean, filterButtonInHeader: boolean): string | undefined;
+    static computeColumnWidth(xField: XField, betweenFilter: XBetweenFilterProp, filterMenuInFilterRow: boolean, formColumnType: string | undefined, header: string | undefined, sortableButtonInHeader: boolean, filterButtonInHeader: boolean): string | undefined;
     static computeColumnWidthBase(charSize?: number, paddingAndOther?: number): number | undefined;
     static getXBrowseMeta(entity: string, browseId?: string): XBrowseMeta;
     static setXBrowseMeta(entity: string, browseId: string | undefined, xBrowseMeta: XBrowseMeta): void;

package/lib/components/XUtilsMetadata.js

@@ -127,7 +127,7 @@ var XUtilsMetadata = /** @class */ (function () {
             return XUtilsMetadata.getXField(xEntity, field);
         }
         else {
-            var xAssoc = XUtilsMetadata.getXAssocToOne(xEntity, field);
+            var xAssoc = XUtilsMetadata.getXAssoc(xEntity, field);
             var xAssocEntity = XUtilsMetadata.getXEntity(xAssoc.entityName);
             return XUtilsMetadata.getXFieldByPath(xAssocEntity, restPath);
         }
@@ -135,17 +135,33 @@ var XUtilsMetadata = /** @class */ (function () {
     XUtilsMetadata.getXFieldByPathStr = function (entity, path) {
         return XUtilsMetadata.getXFieldByPath(XUtilsMetadata.getXEntity(entity), path);
     };
+    XUtilsMetadata.getXAssocByPath = function (xEntity, path) {
+        var _a = __read(XUtilsCommon_1.XUtilsCommon.getFieldAndRestPath(path), 2), field = _a[0], restPath = _a[1];
+        if (restPath === null) {
+            return XUtilsMetadata.getXAssoc(xEntity, field);
+        }
+        else {
+            var xAssoc = XUtilsMetadata.getXAssoc(xEntity, field);
+            var xAssocEntity = XUtilsMetadata.getXEntity(xAssoc.entityName);
+            return XUtilsMetadata.getXAssocByPath(xAssocEntity, restPath);
+        }
+    };
+    // for path assoc1.assoc2.field returns assoc2 (last assoc before field)
+    XUtilsMetadata.getLastXAssocByPath = function (xEntity, path) {
+        var pathToAssoc = XUtilsCommon_1.XUtilsCommon.getPathToAssoc(path);
+        return XUtilsMetadata.getXAssocByPath(xEntity, pathToAssoc);
+    };
     XUtilsMetadata.getXAssocToOne = function (xEntity, assocField) {
-        return XUtilsMetadata.getXAssoc(xEntity, xEntity.assocToOneMap, assocField);
+        return XUtilsMetadata.getXAssoc(xEntity, assocField, ["many-to-one", "one-to-one"]);
     };
     XUtilsMetadata.getXAssocToMany = function (xEntity, assocField) {
-        return XUtilsMetadata.getXAssoc(xEntity, xEntity.assocToManyMap, assocField);
+        return XUtilsMetadata.getXAssoc(xEntity, assocField, ["one-to-many", "many-to-many"]);
     };
     XUtilsMetadata.getXAssocToOneByAssocEntity = function (xEntity, assocEntityName) {
-        return XUtilsMetadata.getXAssocByAssocEntity(xEntity, xEntity.assocToOneMap, assocEntityName);
+        return XUtilsMetadata.getXAssocByAssocEntity(xEntity, assocEntityName, ["many-to-one", "one-to-one"]);
     };
     XUtilsMetadata.getXAssocToManyByAssocEntity = function (xEntity, assocEntityName) {
-        return XUtilsMetadata.getXAssocByAssocEntity(xEntity, xEntity.assocToManyMap, assocEntityName);
+        return XUtilsMetadata.getXAssocByAssocEntity(xEntity, assocEntityName, ["one-to-many", "many-to-many"]);
     };
     XUtilsMetadata.getXEntityForAssocToOne = function (xEntity, assocField) {
         return XUtilsMetadata.getXEntityForAssoc(XUtilsMetadata.getXAssocToOne(xEntity, assocField));
@@ -160,7 +176,7 @@ var XUtilsMetadata = /** @class */ (function () {
             for (var _b = __values(Object.entries(xEntity.fieldMap)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var _d = __read(_c.value, 2), key = _d[0], xField = _d[1];
                 // assoc fieldy sa nachadzaju aj v xEntity.fieldMap ako typ number (netusim preco), preto ich vyfiltrujeme
-                if (xEntity.assocToOneMap[xField.name] === undefined) {
+                if (xEntity.assocMap[xField.name] === undefined) {
                     xFieldList.push(xField);
                 }
             }
@@ -174,6 +190,27 @@ var XUtilsMetadata = /** @class */ (function () {
         }
         return xFieldList;
     };
+    XUtilsMetadata.getXAssocList = function (xEntity, relationTypeList) {
+        var e_2, _a;
+        //const xAssocList: XAssoc[] = Array.from(xEntity.assocMap, (v: XAssoc, k: string) => v);
+        var xAssocList = [];
+        try {
+            for (var _b = __values(Object.entries(xEntity.assocMap)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var _d = __read(_c.value, 2), key = _d[0], xAssoc = _d[1];
+                if (relationTypeList === undefined || relationTypeList.includes(xAssoc.relationType)) {
+                    xAssocList.push(xAssoc);
+                }
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        return xAssocList;
+    };
     // docasne sem, kym nemame jednotny XInputDecimal/XInputDecimalDT
     XUtilsMetadata.getParamsForInputNumber = function (xField) {
         var useGrouping = true;
@@ -209,7 +246,7 @@ var XUtilsMetadata = /** @class */ (function () {
         }
         return { useGrouping: useGrouping, fractionDigits: fractionDigits, min: min, max: max, size: size };
     };
-    XUtilsMetadata.computeColumnWidth = function (xField, filterMenuInFilterRow, formColumnType, header, sortableButtonInHeader, filterButtonInHeader) {
+    XUtilsMetadata.computeColumnWidth = function (xField, betweenFilter, filterMenuInFilterRow, formColumnType, header, sortableButtonInHeader, filterButtonInHeader) {
         var width;
         if (formColumnType === undefined) {
             // lazy datatable (no inputs, no buttons, only text and padding)
@@ -221,10 +258,10 @@ var XUtilsMetadata = /** @class */ (function () {
                 width = XUtilsMetadata.computeColumnWidthBase(size, 0.5 + 0.5);
             }
             else if (xField.type === "date") {
-                width = XUtilsMetadata.computeColumnWidthBase(10, 0.5 + 0.5); // napr. 31.12.2021
+                width = XUtilsMetadata.computeColumnWidthBase(10, 0.25 + 1.25 + 0.25); // napr. 31.12.2021, 1.25 rem date picker button
             }
             else if (xField.type === "datetime") {
-                width = XUtilsMetadata.computeColumnWidthBase(10 + 9, 0.5 + 0.5); // napr. 31.12.2021 03:03:00
+                width = XUtilsMetadata.computeColumnWidthBase(10 + 9, 0.25 + 1.25 + 0.25); // napr. 31.12.2021 03:03:00
             }
             else if (xField.type === "boolean") {
                 width = 1.43 + 0.5 + 0.5; // checkbox ma sirku 20px
@@ -232,6 +269,9 @@ var XUtilsMetadata = /** @class */ (function () {
             else {
                 throw "XField ".concat(xField.name, ": unknown xField.type = ").concat(xField.type);
             }
+            if (betweenFilter === "row" && width) {
+                width *= 2;
+            }
         }
         else {
             // form datatable (formColumnType is defined)
@@ -243,12 +283,25 @@ var XUtilsMetadata = /** @class */ (function () {
                 else if (xField.type === "decimal" || xField.type === "number") {
                     var size = XUtilsMetadata.getParamsForInputNumber(xField).size;
                     width = XUtilsMetadata.computeColumnWidthBase(size, padding + padding);
+                    if (betweenFilter === "row" && width) {
+                        width *= 2; // not tested, only estimation
+                    }
                 }
                 else if (xField.type === "date") {
-                    width = 0.21 + 6 + 2.36 + 0.21; // padding + input (also in App.css defined) + button + padding
+                    if (betweenFilter === "row") {
+                        width = (0.21 + 6 + 1.25 + 0.21) * 2; // not tested, only estimation
+                    }
+                    else {
+                        width = 0.21 + 6 + 2.36 + 0.21; // padding + input (also in App.css defined) + button + padding
+                    }
                 }
                 else if (xField.type === "datetime") {
-                    width = 0.21 + 10 + 2.36 + 0.21; // padding + input (also in App.css defined) + button + padding
+                    if (betweenFilter === "row") {
+                        width = (0.21 + 10 + 1.25 + 0.21) * 2; // not tested, only estimation
+                    }
+                    else {
+                        width = 0.21 + 10 + 2.36 + 0.21; // padding + input (also in App.css defined) + button + padding
+                    }
                 }
                 else if (xField.type === "boolean") {
                     width = 1.43 + 0.5 + 0.5; // checkbox ma sirku 20px
@@ -346,18 +399,22 @@ var XUtilsMetadata = /** @class */ (function () {
         }
         return key;
     };
-    XUtilsMetadata.getXAssoc = function (xEntity, assocMap, assocField) {
-        var xAssoc = assocMap[assocField];
+    XUtilsMetadata.getXAssoc = function (xEntity, assocField, relationTypeList) {
+        var xAssoc = xEntity.assocMap[assocField];
         if (xAssoc === undefined) {
             throw "Assoc ".concat(assocField, " was not found in entity = ").concat(xEntity.name);
         }
+        // relationTypeList is optional and is only for check (not to get some unwanted type of assoc)
+        if (relationTypeList !== undefined && !relationTypeList.includes(xAssoc.relationType)) {
+            throw "Assoc ".concat(assocField, " in entity ").concat(xEntity.name, " is of type ").concat(xAssoc.relationType, " and required type is ").concat(JSON.stringify(relationTypeList));
+        }
         return xAssoc;
     };
-    XUtilsMetadata.getXAssocByAssocEntity = function (xEntity, assocMap, assocEntityName) {
-        var e_2, _a;
+    XUtilsMetadata.getXAssocByAssocEntity = function (xEntity, assocEntityName, relationTypeList) {
+        var e_3, _a;
         var xAssocFound = undefined;
         try {
-            for (var _b = __values(Object.entries(assocMap)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = __values(Object.entries(xEntity.assocMap)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var _d = __read(_c.value, 2), key = _d[0], xAssoc = _d[1];
                 if (xAssoc.entityName === assocEntityName) {
                     if (xAssocFound === undefined) {
@@ -369,16 +426,20 @@ var XUtilsMetadata = /** @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 (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_3) throw e_3.error; }
         }
         if (xAssocFound === undefined) {
             throw "Assoc for assocEntityName = ".concat(assocEntityName, " not found in entity ").concat(xEntity.name);
         }
+        // relationTypeList is optional and is only for check (not to get some unwanted type of assoc)
+        if (relationTypeList !== undefined && !relationTypeList.includes(xAssocFound.relationType)) {
+            throw "Assoc for assocEntityName = ".concat(assocEntityName, " in entity ").concat(xEntity.name, " is of type ").concat(xAssocFound.relationType, " and required type is ").concat(JSON.stringify(relationTypeList));
+        }
         return xAssocFound;
     };
     XUtilsMetadata.getXEntityForAssoc = function (xAssoc) {

package/lib/serverApi/ExportImportParam.d.ts

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

package/lib/serverApi/XEntityMetadata.d.ts

@@ -5,8 +5,7 @@ export interface XEntity {
     name: string;
     idField: string;
     fieldMap: XFieldMap;
-    assocToOneMap: XAssocMap;
-    assocToManyMap: XAssocMap;
+    assocMap: XAssocMap;
 }
 export interface XFieldMap {
     [name: string]: XField;
@@ -23,7 +22,9 @@ export interface XField {
     scale?: number;
     width?: number;
 }
+export type XRelationType = "one-to-one" | "one-to-many" | "many-to-one" | "many-to-many";
 export interface XAssoc {
+    relationType: XRelationType;
     name: string;
     entityName: string;
     inverseAssocName?: string;

package/lib/serverApi/XUtilsCommon.d.ts

@@ -3,6 +3,7 @@ export declare class XUtilsCommon {
     static getValueByPath(object: any, path: string): any;
     static getFieldListForPath(path: string): string[];
     static getFieldAndRestPath(path: string): [string, string | null];
+    static getPathToAssoc(path: string): string;
     static isSingleField(path: string): boolean;
     static objectAsJSON(value: any): string;
     static getDayName(date: Date | null | undefined): string | undefined;

package/lib/serverApi/XUtilsCommon.js

@@ -52,6 +52,15 @@ var XUtilsCommon = /** @class */ (function () {
             return [assocField, restPath];
         }
     };
+    XUtilsCommon.getPathToAssoc = function (path) {
+        var posDot = path.lastIndexOf(".");
+        if (posDot === -1) {
+            throw "Path to assoc could not be retrieved. Path ".concat(path, " must have at least 2 items.");
+        }
+        else {
+            return path.substring(0, posDot);
+        }
+    };
     XUtilsCommon.isSingleField = function (path) {
         return path.indexOf(".") === -1;
     };

package/package.json

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