@adins/ucsearch 2.11.28 → 2.13.2

package/fesm2015/adins-ucsearch.js

@@ -691,25 +691,28 @@ class UCSearchComponent {
         return this.http.post(url, criteria);
     }
     /**
+     * @param {?=} IsExportExcel
      * @return {?}
      */
-    searchClick() {
-        // 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;
+    searchClick(IsExportExcel = false) {
+        /** @type {?} */
+        let filtered = this.configuration.component.filter((/**
+         * @param {?} item
+         * @param {?} i
+         * @param {?} arr
+         * @return {?}
+         */
+        (item, i, arr) => arr.findIndex((/**
+         * @param {?} x
+         * @return {?}
+         */
+        (x) => (x.name === item.name))) === i));
+        for (let i = 0; i < filtered.length; i++) {
+            if (filtered[i].type == "numeric") {
+                if (!this.checkValueGteLte(filtered[i]))
+                    return;
+            }
+        }
         /** @type {?} */
         let order = null;
         if (this.configuration.orderby != null) {
@@ -719,7 +722,11 @@ class UCSearchComponent {
             };
         }
         this.pageNow = 1;
-        this.search(this.apiUrl, this.pageNow, this.pageSize, order, this.arrCrit);
+        /** @type {?} */
+        let rowPerPage = this.pageSize;
+        if (IsExportExcel)
+            rowPerPage = 9999;
+        this.search(this.apiUrl, this.pageNow, rowPerPage, order, this.arrCrit, IsExportExcel);
     }
     /**
      * @return {?}
@@ -738,9 +745,10 @@ class UCSearchComponent {
      * @param {?} rowPerPage
      * @param {?} orderBy
      * @param {?=} addCrit
+     * @param {?=} IsExportExcel
      * @return {?}
      */
-    search(apiUrl, pageNo, rowPerPage, orderBy, addCrit = new Array()) {
+    search(apiUrl, pageNo, rowPerPage, orderBy, addCrit = new Array(), IsExportExcel = false) {
         /** @type {?} */
         let request = new RequestCriteriaObj();
         /** @type {?} */
@@ -911,10 +919,8 @@ class UCSearchComponent {
             }
         }
         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((/**
@@ -922,6 +928,11 @@ class UCSearchComponent {
          * @return {?}
          */
         (response) => {
+            if (IsExportExcel) {
+                this.ExcelData = response["Data"];
+                this.excelService.exportAsExcelFile(this.ExcelData, 'sample');
+                return;
+            }
             /** @type {?} */
             let qryPaging = {
                 response: response,
@@ -982,6 +993,46 @@ class UCSearchComponent {
             }
         }));
     }
+    /**
+     * @param {?} component
+     * @return {?}
+     */
+    checkValueGteLte(component) {
+        //cek yg pakai restriction gte/lte/gt/lt
+        /** @type {?} */
+        let MinComponent = this.configuration.component.find((/**
+         * @param {?} x
+         * @return {?}
+         */
+        x => x.name == component.name && (x.restriction.toUpperCase() == "GTE"))) == undefined ? this.configuration.component.find((/**
+         * @param {?} x
+         * @return {?}
+         */
+        x => x.name == component.name && (x.restriction.toUpperCase() == "GT"))) : this.configuration.component.find((/**
+         * @param {?} x
+         * @return {?}
+         */
+        x => x.name == component.name && (x.restriction.toUpperCase() == "GTE")));
+        /** @type {?} */
+        let MaxComponent = this.configuration.component.find((/**
+         * @param {?} x
+         * @return {?}
+         */
+        x => x.name == component.name && (x.restriction.toUpperCase() == "LTE"))) == undefined ? this.configuration.component.find((/**
+         * @param {?} x
+         * @return {?}
+         */
+        x => x.name == component.name && (x.restriction.toUpperCase() == "LT"))) : this.configuration.component.find((/**
+         * @param {?} x
+         * @return {?}
+         */
+        x => 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 {?}
@@ -1002,33 +1053,26 @@ class UCSearchComponent {
      * @return {?}
      */
     exportAsXLSX() {
-        /** @type {?} */
-        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((/**
-         * @param {?} response
-         * @return {?}
-         */
-        response => {
-            this.ExcelData = response["Data"];
-            this.excelService.exportAsExcelFile(this.ExcelData, 'sample');
-        }), (/**
-         * @param {?} error
-         * @return {?}
-         */
-        (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
@@ -1095,8 +1139,12 @@ class UCSearchComponent {
         let ddl = component.options;
         /** @type {?} */
         let text = ddl[ddl.selectedIndex].value.trim();
-        if (text) {
-            this.searchInput.integrationObj.requestObj[wfKeyFilter] = text;
+        /** @type {?} */
+        let listValue = text.split(';');
+        /** @type {?} */
+        let listWfKey = wfKeyFilter.split(';');
+        for (let i = 0; i < listValue.length; i++) {
+            this.searchInput.integrationObj.requestObj[listWfKey[i]] = listValue[i];
         }
     }
     /**