@senior-agronegocio/angular-components 0.0.62 → 0.0.63

package/bundles/senior-agronegocio-angular-components.umd.js

@@ -4498,6 +4498,10 @@
             _this.translate = translate;
             return _this;
         }
+        EventControlService.prototype.getListEventControlWithFilters = function (listParams) {
+            return this.http.post(this.queriesUrl + "/listEventControlWithFilters", listParams)
+                .pipe(this.defaultCatch());
+        };
         EventControlService.ctorParameters = function () { return [
             { type: http.HttpClient },
             { type: api.MessageService },
@@ -4794,11 +4798,10 @@
             if (listParams === void 0) { listParams = {}; }
             this.currentListParams = __assign(__assign({}, this.currentListParams), listParams);
             var _a = this.currentListParams, page = _a.page, size = _a.size;
-            var nSort = this.getSortedFields();
-            var filterQuery = this.getFilterQuery();
-            var displayFields = ["*", "eventControlItem"];
+            var order = this.getSortedFields();
+            var input = __assign(__assign({}, this.getInput()), { page: page, size: size, order: order });
             this.eventControlBoardService.eventControlService
-                .list({ sort: nSort, page: page, size: size, filterQuery: filterQuery, displayFields: displayFields })
+                .getListEventControlWithFilters(input)
                 .pipe(operators.takeUntil(this.ngUnsubscribe), operators.catchError(function (err) {
                 _this.gridLoading = false;
                 throw err;
@@ -4864,38 +4867,35 @@
         EventControlBoardComponent.prototype.getSortedFields = function () {
             var _this = this;
             var _a;
-            var nSort = [];
+            var order = '';
             if (((_a = this.currentListParams.sort) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-                nSort = JSON.parse(JSON.stringify(this.currentListParams.sort));
-                nSort.forEach(function (sortItem) {
-                    sortItem.field = _this.getFieldNameForSortRequest(sortItem.field);
-                });
+                order = this.currentListParams.sort.map(function (sortItem) {
+                    return _this.getFieldNameForSortRequest(sortItem.field) + " " + (sortItem.order === exports.AGRO_NUMBERS.ONE ? 'asc' : 'desc');
+                }).join(', ');
             }
             else if (this.standalone) {
-                nSort.push({ field: 'createdDate', order: exports.AGRO_NUMBERS.ONE });
+                order = 'createdDate asc';
             }
             else {
-                nSort.push({ field: 'lastModifiedDate', order: exports.AGRO_NUMBERS.MINUSONE });
+                order = 'lastModifiedDate desc';
             }
-            return nSort;
+            return order;
         };
-        EventControlBoardComponent.prototype.getFilterQuery = function () {
-            var _this = this;
+        EventControlBoardComponent.prototype.getInput = function () {
+            var _a, _b, _c, _d, _e, _f, _g;
             var filterData = this.currentListParams.filterData;
-            var filterJson = { filter: {} };
-            return __spread(this.filterFields).filter(function (_a) {
-                var name = _a.name;
-                return filterData && filterData[name] !== undefined && filterData[name] !== null && filterData[name].length !== 0;
-            })
-                .map(function (formField) {
-                var _a;
-                var lookupFieldName = 'id';
-                var finalFilterName = (_a = formField.name) !== null && _a !== void 0 ? _a : '';
-                filterJson.filter[finalFilterName] = filterData[finalFilterName].id;
-                return _this.createFilterString(finalFilterName, formField.type, filterData[finalFilterName], lookupFieldName);
-            })
-                .filter(function (filter) { return filter !== null && filter !== '' && filter !== undefined; })
-                .join(' and ');
+            var controlCode = filterData['controlCode'] && Array.isArray(filterData['controlCode']) ? filterData['controlCode'] : null;
+            var filter = {
+                companyId: (_b = (_a = filterData['e070emp']) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : null,
+                branchId: (_d = (_c = filterData['e070fil']) === null || _c === void 0 ? void 0 : _c.id) !== null && _d !== void 0 ? _d : null,
+                controlCode: controlCode ? controlCode.map(function (code) { return parseInt(code); }) : null,
+                externalId: (_e = filterData['externalId']) !== null && _e !== void 0 ? _e : null,
+                eventOrigin: (_f = filterData['eventOrigin']) !== null && _f !== void 0 ? _f : null,
+                eventStatus: (_g = filterData['status']) !== null && _g !== void 0 ? _g : null,
+                createdDateStart: filterData['createdDate'] ? this.getStartDate(filterData['createdDate']) : null,
+                createdDateEnd: filterData['createdDate'] ? this.getEndDate(filterData['createdDate']) : null,
+            };
+            return filter;
         };
         EventControlBoardComponent.prototype.getFieldNameForSortRequest = function (name) {
             switch (name) {
@@ -4907,28 +4907,13 @@
                     return name;
             }
         };
-        EventControlBoardComponent.prototype.createFilterString = function (name, type, value, lookupFieldName) {
-            if (lookupFieldName === void 0) { lookupFieldName = 'id'; }
-            if (name === 'controlCode') {
-                var filterParts_1 = [];
-                value.forEach(function (val) { return filterParts_1.push("controlCode eq '" + val + "'"); });
-                return "(" + filterParts_1.join(' or ') + ")";
-            }
-            if (name === 'status') {
-                return "eventControlItem.status eq '" + value + "'";
-            }
-            return this.createFilterStringFromType(name, type, value, lookupFieldName);
+        EventControlBoardComponent.prototype.getEndDate = function (value) {
+            var endDate = moment(value).endOf('day').format("YYYY-MM-DDTHH:mm:ss") + 'Z';
+            return endDate;
         };
-        EventControlBoardComponent.prototype.createFilterStringFromType = function (name, type, value, lookupFieldName) {
-            if (type === angularComponents.FieldType.Chips) {
-                return name + " eq '" + value[lookupFieldName] + "'";
-            }
-            if (type === angularComponents.FieldType.Date) {
-                var startOfDay = moment(value).startOf('day').format("YYYY-MM-DDTHH:mm:ss") + 'Z';
-                var endOfDay = moment(value).endOf('day').format("YYYY-MM-DDTHH:mm:ss") + 'Z';
-                return name + " ge '" + startOfDay + "' and " + name + " le '" + endOfDay + "'";
-            }
-            return name + " eq '" + value + "'";
+        EventControlBoardComponent.prototype.getStartDate = function (value) {
+            var startDate = moment(value).startOf('day').format("YYYY-MM-DDTHH:mm:ss") + 'Z';
+            return startDate;
         };
         EventControlBoardComponent.prototype.onGridChange = function (event) {
             var size = event === null || event === void 0 ? void 0 : event.rows;