@adins/ucsearch 2.9.12 → 2.9.14

package/fesm2020/adins-ucsearch.mjs

@@ -167,7 +167,8 @@ ExportTypeConstant.EXP_TYPE_PDF = 0;
 ExportTypeConstant.EXP_TYPE_XLS = 1;
 ExportTypeConstant.EXP_TYPE_XLSX = 2;
 ExportTypeConstant.EXP_TYPE_DOC = 3;
-ExportTypeConstant.EXP_TYPE_DOCX = 4;
+ExportTypeConstant.EXP_TYPE_DOCX = 4;
+ExportTypeConstant.EXP_TYPE_JPDF = 5;
 
 class KeyValueUCSearchObj {
     constructor() {
@@ -250,22 +251,18 @@ class UCSearchComponent {
                 key: ExportTypeConstant.EXP_TYPE_PDF,
                 value: "PDF"
             },
-            {
-                key: ExportTypeConstant.EXP_TYPE_XLS,
-                value: "Excel 2003"
-            },
             {
                 key: ExportTypeConstant.EXP_TYPE_XLSX,
                 value: "Excel 2007"
             },
-            {
-                key: ExportTypeConstant.EXP_TYPE_DOC,
-                value: "Document"
-            },
             {
                 key: ExportTypeConstant.EXP_TYPE_DOCX,
                 value: "Document XML"
             },
+            {
+                key: ExportTypeConstant.EXP_TYPE_JPDF,
+                value: "Justify PDF"
+            }
         ];
         this.ListOfMonth = new ListKeyValueMonth();
         this.ListOfYear = new Array();
@@ -583,7 +580,7 @@ class UCSearchComponent {
     postJSON(url, criteria = null) {
         return this.http.post(url, criteria);
     }
-    searchClick() {
+    searchClick(IsExportExcel = false) {
         let filtered = this.configuration.component.filter((item, i, arr) => arr.findIndex((x) => (x.name === item.name)) === i);
         for (let i = 0; i < filtered.length; i++) {
             if (filtered[i].type == "numeric") {
@@ -599,7 +596,10 @@ class UCSearchComponent {
             };
         }
         this.pageNow = 1;
-        this.search(this.apiUrl, this.pageNow, this.pageSize, order, this.arrCrit);
+        let rowPerPage = this.pageSize;
+        if (IsExportExcel)
+            rowPerPage = 9999;
+        this.search(this.apiUrl, this.pageNow, rowPerPage, order, this.arrCrit, IsExportExcel);
     }
     async reset() {
         this.searchForm.resetForm({
@@ -607,7 +607,7 @@ class UCSearchComponent {
         });
         await this.initiateForm();
     }
-    search(apiUrl, pageNo, rowPerPage, orderBy, addCrit = new Array()) {
+    search(apiUrl, pageNo, rowPerPage, orderBy, addCrit = new Array(), IsExportExcel = false) {
         let request = new RequestCriteriaObj();
         let arrCrit = new Array();
         let IsQueryIn = false;
@@ -769,13 +769,16 @@ 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((response) => {
+            if (IsExportExcel) {
+                this.ExcelData = response["Data"];
+                this.excelService.exportAsExcelFile(this.ExcelData, 'sample');
+                return;
+            }
             let qryPaging = {
                 response: response,
                 pageNow: pageNo
@@ -843,24 +846,26 @@ class UCSearchComponent {
         element.target.value = parseFloat(element.target.value.toString().replace(/,/g, ''));
     }
     exportAsXLSX() {
-        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);
-        });
+        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);
+        //   });
     }
     onChangeEvent(optValue, afFilter) {
         let jsonComp = this.configuration.component;