@adins/ucsearch 2.11.28 → 2.13.2

package/fesm5/adins-ucsearch.js

@@ -768,28 +768,35 @@ var UCSearchComponent = /** @class */ (function () {
         return this.http.post(url, criteria);
     };
     /**
+     * @param {?=} IsExportExcel
      * @return {?}
      */
     UCSearchComponent.prototype.searchClick = /**
+     * @param {?=} IsExportExcel
      * @return {?}
      */
-    function () {
-        // for(let i=0;i<this.countForm;i++){
-        //   if(this.configuration.component[i].type == "datepicker"){
-        //     if ((i != (this.countForm-1)) && (this.configuration.component[i].name != this.configuration.component[i+1].name)){
-        //       this.checkInputDate(this.configuration.component[i]);
-        //     }
-        //   }
-        // }
-        // if(this.dateWrong) return;
-        // for(let i=0;i<this.countForm;i++){
-        //   if(this.configuration.component[i].type == "datepicker"){
-        //     if ((i != (this.countForm-1)) && (this.configuration.component[i].name != this.configuration.component[i+1].name)){
-        //       this.checkInputDate(this.configuration.component[i]);
-        //     }
-        //   }
-        // }
-        // if(this.dateWrong) return;
+    function (IsExportExcel) {
+        if (IsExportExcel === void 0) { IsExportExcel = false; }
+        /** @type {?} */
+        var filtered = this.configuration.component.filter((/**
+         * @param {?} item
+         * @param {?} i
+         * @param {?} arr
+         * @return {?}
+         */
+        function (item, i, arr) {
+            return arr.findIndex((/**
+             * @param {?} x
+             * @return {?}
+             */
+            function (x) { return (x.name === item.name); })) === i;
+        }));
+        for (var i = 0; i < filtered.length; i++) {
+            if (filtered[i].type == "numeric") {
+                if (!this.checkValueGteLte(filtered[i]))
+                    return;
+            }
+        }
         /** @type {?} */
         var order = null;
         if (this.configuration.orderby != null) {
@@ -799,7 +806,11 @@ var UCSearchComponent = /** @class */ (function () {
             };
         }
         this.pageNow = 1;
-        this.search(this.apiUrl, this.pageNow, this.pageSize, order, this.arrCrit);
+        /** @type {?} */
+        var rowPerPage = this.pageSize;
+        if (IsExportExcel)
+            rowPerPage = 9999;
+        this.search(this.apiUrl, this.pageNow, rowPerPage, order, this.arrCrit, IsExportExcel);
     };
     /**
      * @return {?}
@@ -829,6 +840,7 @@ var UCSearchComponent = /** @class */ (function () {
      * @param {?} rowPerPage
      * @param {?} orderBy
      * @param {?=} addCrit
+     * @param {?=} IsExportExcel
      * @return {?}
      */
     UCSearchComponent.prototype.search = /**
@@ -837,11 +849,13 @@ var UCSearchComponent = /** @class */ (function () {
      * @param {?} rowPerPage
      * @param {?} orderBy
      * @param {?=} addCrit
+     * @param {?=} IsExportExcel
      * @return {?}
      */
-    function (apiUrl, pageNo, rowPerPage, orderBy, addCrit) {
+    function (apiUrl, pageNo, rowPerPage, orderBy, addCrit, IsExportExcel) {
         var _this = this;
         if (addCrit === void 0) { addCrit = new Array(); }
+        if (IsExportExcel === void 0) { IsExportExcel = false; }
         /** @type {?} */
         var request = new RequestCriteriaObj();
         /** @type {?} */
@@ -1012,10 +1026,8 @@ var UCSearchComponent = /** @class */ (function () {
             }
         }
         request.criteria = arrCrit;
-        if (!this.searchInput.isJoinExAPI) {
-            request.integrationObj = null;
-        }
-        else {
+        request.integrationObj = null;
+        if (this.searchInput.isJoinExAPI) {
             request.integrationObj = this.searchInput.integrationObj;
         }
         this.http.post(apiUrl, request).subscribe((/**
@@ -1023,6 +1035,11 @@ var UCSearchComponent = /** @class */ (function () {
          * @return {?}
          */
         function (response) {
+            if (IsExportExcel) {
+                _this.ExcelData = response["Data"];
+                _this.excelService.exportAsExcelFile(_this.ExcelData, 'sample');
+                return;
+            }
             /** @type {?} */
             var qryPaging = {
                 response: response,
@@ -1097,6 +1114,50 @@ var UCSearchComponent = /** @class */ (function () {
             }
         }));
     };
+    /**
+     * @param {?} component
+     * @return {?}
+     */
+    UCSearchComponent.prototype.checkValueGteLte = /**
+     * @param {?} component
+     * @return {?}
+     */
+    function (component) {
+        //cek yg pakai restriction gte/lte/gt/lt
+        /** @type {?} */
+        var MinComponent = this.configuration.component.find((/**
+         * @param {?} x
+         * @return {?}
+         */
+        function (x) { return x.name == component.name && (x.restriction.toUpperCase() == "GTE"); })) == undefined ? this.configuration.component.find((/**
+         * @param {?} x
+         * @return {?}
+         */
+        function (x) { return x.name == component.name && (x.restriction.toUpperCase() == "GT"); })) : this.configuration.component.find((/**
+         * @param {?} x
+         * @return {?}
+         */
+        function (x) { return x.name == component.name && (x.restriction.toUpperCase() == "GTE"); }));
+        /** @type {?} */
+        var MaxComponent = this.configuration.component.find((/**
+         * @param {?} x
+         * @return {?}
+         */
+        function (x) { return x.name == component.name && (x.restriction.toUpperCase() == "LTE"); })) == undefined ? this.configuration.component.find((/**
+         * @param {?} x
+         * @return {?}
+         */
+        function (x) { return x.name == component.name && (x.restriction.toUpperCase() == "LT"); })) : this.configuration.component.find((/**
+         * @param {?} x
+         * @return {?}
+         */
+        function (x) { return x.name == component.name && (x.restriction.toUpperCase() == "LTE"); }));
+        if (this.myForm.nativeElement[MinComponent.id].value > this.myForm.nativeElement[MaxComponent.id].value) {
+            this.toastr.warning(MinComponent.label + " must be less than " + MaxComponent.label);
+            return false;
+        }
+        return true;
+    };
     /**
      * @param {?} element
      * @return {?}
@@ -1128,34 +1189,26 @@ var UCSearchComponent = /** @class */ (function () {
      * @return {?}
      */
     function () {
-        var _this = this;
-        /** @type {?} */
-        var request = new RequestCriteriaObj();
-        request.pageNo = 1;
-        request.rowPerPage = 9999;
-        request.orderBy = null;
-        request.criteria = [];
-        request.queryString = this.configuration.querystring;
-        if (!this.searchInput.isJoinExAPI) {
-            request.integrationObj = null;
-        }
-        else {
-            request.integrationObj = this.searchInput.integrationObj;
-        }
-        this.http.post(this.apiUrl, request).subscribe((/**
-         * @param {?} response
-         * @return {?}
-         */
-        function (response) {
-            _this.ExcelData = response["Data"];
-            _this.excelService.exportAsExcelFile(_this.ExcelData, 'sample');
-        }), (/**
-         * @param {?} error
-         * @return {?}
-         */
-        function (error) {
-            console.log(error);
-        }));
+        this.searchClick(true);
+        // let request = new RequestCriteriaObj();
+        // request.pageNo = 1;
+        // request.rowPerPage = 9999;
+        // request.orderBy = null;
+        // request.criteria = [];
+        // request.queryString = this.configuration.querystring;
+        // if (!this.searchInput.isJoinExAPI) {
+        //   request.integrationObj = null;
+        // } else {
+        //   request.integrationObj = this.searchInput.integrationObj;
+        // }
+        // this.http.post(this.apiUrl, request).subscribe(
+        //   response => {
+        //     this.ExcelData = response["Data"];
+        //     this.excelService.exportAsExcelFile(this.ExcelData, 'sample');
+        //   },
+        //   (error) => {
+        //     console.log(error);
+        //   });
     };
     /**
      * @param {?} optValue
@@ -1232,8 +1285,12 @@ var UCSearchComponent = /** @class */ (function () {
         var ddl = component.options;
         /** @type {?} */
         var text = ddl[ddl.selectedIndex].value.trim();
-        if (text) {
-            this.searchInput.integrationObj.requestObj[wfKeyFilter] = text;
+        /** @type {?} */
+        var listValue = text.split(';');
+        /** @type {?} */
+        var listWfKey = wfKeyFilter.split(';');
+        for (var i = 0; i < listValue.length; i++) {
+            this.searchInput.integrationObj.requestObj[listWfKey[i]] = listValue[i];
         }
     };
     /**