Merge branch 'master' of code.webtrigon.com:kj/cac-desktop into master

src/app/dashboard/partner-details/partner-details.component.html

@@ -315,7 +315,7 @@
         </ng-container>
 
         <ng-container *ngIf="selectedSegment === 2">
-            <section class="card">
+            <section class="card" *ngIf="partnerDetails.surveyCtoData.hiiData.length > 0">
                 <header>
                     <h5> HII Data </h5>
                 </header>
@@ -389,13 +389,14 @@
                             Relevant Documents
                         </div>
                         <div class="col">
-                            <a href="{{ package.relevantDocuments }}" target="_blank"> Link </a>
+                            <a *ngIf="package.relevantDocuments" href="{{ package.relevantDocuments }}" target="_blank"> Link </a>
+                            <span *ngIf="!package.relevantDocuments"> - </span>
                         </div>
                     </div>
                 </section>
             </section>
 
-            <section class="card">
+            <section class="card" *ngIf="partnerDetails.surveyCtoData.spData.length > 0">
                 <header>
                     <h5> SP Data </h5>
                 </header>
@@ -416,6 +417,31 @@
                             {{ package.status }}
                         </div>
                     </div>
+                    <div class="row">
+                        <div class="col">
+                            Female Number
+                        </div>
+                        <div class="col">
+                            {{ package.femaleNo }}
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            Male Number
+                        </div>
+                        <div class="col">
+                            {{ package.maleNo }}
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            Transgenders Number
+                        </div>
+                        <div class="col">
+                            {{ package.tgNo }}
+                        </div>
+                    </div>
+
                     <div class="row">
                         <div class="col">
                             Total Aggregation
@@ -437,13 +463,14 @@
                             Relevant Documents
                         </div>
                         <div class="col">
-                            <a href="{{ package.relevantDocuments }}" target="_blank"> Link </a>
+                            <a *ngIf="package.relevantDocuments" href="{{ package.relevantDocuments }}" target="_blank"> Link </a>
+                            <span *ngIf="!package.relevantDocuments"> - </span>
                         </div>
                     </div>
                 </section>
             </section>
 
-            <section class="card">
+            <section class="card" *ngIf="partnerDetails.surveyCtoData.spSchemeData.length > 0">
                 <header>
                     <h5> SP Scheme </h5>
                 </header>

src/app/dashboard/partner-details/partner-details.component.ts

@@ -151,9 +151,9 @@ export class PartnerDetailsComponent implements OnInit {
                 "SP Name": spData.name,
                 "SP Status": spData.status,
                 'SP Reason Name': spData.reasonName,
-                "SP Female Number" : spData.femaleNo ? spData.femaleNo : '' ,
-                "SP Male Number" : spData.maleNo ? spData.maleNo : '',
-                "Tg Number" : spData.tgNo ? spData.tgNo : '',
+                "SP Female Number": spData.femaleNo ? spData.femaleNo : '',
+                "SP Male Number": spData.maleNo ? spData.maleNo : '',
+                "Tg Number": spData.tgNo ? spData.tgNo : '',
                 "SP TotalAggregation": spData.totalAggregation,
                 "SP OtherRemarks": spData.otherRemarks,
                 "SP RelevantDocuments": spData.relevantDocuments,
@@ -200,49 +200,61 @@ export class PartnerDetailsComponent implements OnInit {
     }
 
     exportProfileData(exportType: ExportType) {
-        const fileTypeXLS = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8',
-            fileTypeCSV = 'text/csv;charset=utf-8;',
-            fileExtension = exportType === 'CSV' ? '.csv' : '.xlsx',
-            element = document.createElement('a');
-
-        let blob;
-
         if (!this.partnerDetails) {
             return;
         }
 
         this.loadExportData(this.partnerDetails)
 
+
         const partnerData = XLSX.utils.json_to_sheet(this.exportData);
         const hiiData = XLSX.utils.json_to_sheet(this.exportSurveyCtoData[0]);
         const spData = XLSX.utils.json_to_sheet(this.exportSurveyCtoData[1]);
         const spSchema = XLSX.utils.json_to_sheet(this.exportSurveyCtoData[2]);
         const wb = XLSX.utils.book_new();
+       
+        if (exportType === 'CSV') {
+            if (this.isProfileData) {
+                this.exportJsonToCSV(this.exportData,['ProfileData'])
+            } else if (this.isImplementationData) {
+                this.exportJsonToCSV(this.exportSurveyCtoData, ['HiiData', 'SPData', 'SPSchemaData'])
+            } else {
+                let completeData = this.exportSurveyCtoData
+                completeData.push(this.exportData)
+                this.exportJsonToCSV(completeData, ['ProfileData', 'HiiData', 'SPData', 'SPSchemaData'])
+            }
+        } else {
+            if (this.isProfileData) {
+                XLSX.utils.book_append_sheet(wb, partnerData, "Partner Profile");
+                XLSX.writeFile(wb, 'PartnerProfile.xlsx');
+            } else if (this.isImplementationData) {
+                XLSX.utils.book_append_sheet(wb, hiiData, "Hii Data");
+                XLSX.utils.book_append_sheet(wb, spData, "Sp DATA");
+                XLSX.utils.book_append_sheet(wb, spSchema, "SP Schema Data");
+                XLSX.writeFile(wb, 'PartnerProfile.xlsx');
+            } else {
+                XLSX.utils.book_append_sheet(wb, partnerData, "PartneData");
+                XLSX.utils.book_append_sheet(wb, hiiData, "HiiData");
+                XLSX.utils.book_append_sheet(wb, spData, "SPData");
+                XLSX.utils.book_append_sheet(wb, spSchema, "SPSchemaData");
+                XLSX.writeFile(wb, 'PartnerProfile.xlsx');
+            }
+        }
+    }
 
+    exportJsonToCSV(csvData: any, fileName?: any) {
+        console.log(fileName)
+        const fileTypeCSV = 'text/csv;charset=utf-8;',
+            element = document.createElement('a');
+        let blob;
 
-        if (exportType === 'CSV') {
-            let csvData = Papa.unparse(this.exportData);
+        csvData.forEach((exportData: any, index: number) => {
+            let csvData = Papa.unparse(exportData);
             blob = new Blob([csvData], { type: fileTypeCSV });
             let url = URL.createObjectURL(blob);
             element.href = url;
-            element.setAttribute('download', 'PartnerProfile' + fileExtension);
+            element.setAttribute('download', fileName[index] + '.csv');
             element.click();
-
-        } else if (this.isImplementationData) {
-            XLSX.utils.book_append_sheet(wb, hiiData, "Hii Data");
-            XLSX.utils.book_append_sheet(wb, spData, "Sp DATA");
-            XLSX.utils.book_append_sheet(wb, spSchema, "SP Schema Data");
-            XLSX.writeFile(wb, 'PartnerProfile' + fileExtension);
-
-        } else if (this.isBothData) {
-            XLSX.utils.book_append_sheet(wb, partnerData, "Partner Profile");
-            XLSX.utils.book_append_sheet(wb, hiiData, "Hii Data");
-            XLSX.utils.book_append_sheet(wb, spData, "Sp DATA");
-            XLSX.utils.book_append_sheet(wb, spSchema, "SP Schema Data");
-            XLSX.writeFile(wb, 'PartnerProfile' + fileExtension);
-        } else {
-            XLSX.utils.book_append_sheet(wb, partnerData, "Partner Profile");
-            XLSX.writeFile(wb, 'PartnerProfile' + fileExtension);
-        }
+        });
     }
 }

src/app/dashboard/table/table.component.html

@@ -21,8 +21,8 @@
                     Show all Partners
                 </ng-container>
             </button>
-            <button class="button" (click)="showExportOptions = true"> <img src="assets/export.svg" alt=""> Export
-            </button>
+            <button [disabled]="selectedPartnerList.length === 0" class="button" (click)="showExportOptions = true">
+                <img src="assets/export.svg" alt=""> Export </button>
             <button class="button"> <img src="assets/filter.svg" alt=""> Filter </button>
         </div>
 

src/app/dashboard/table/table.component.ts

@@ -306,13 +306,6 @@ export class TableComponent implements OnInit {
     }
 
     exportProfileData(exportType: exportType) {
-        const fileTypeXLS = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8',
-            fileTypeCSV = 'text/csv;charset=utf-8;',
-            fileExtension = exportType === 'CSV' ? '.csv' : '.xlsx',
-            element = document.createElement('a');
-
-        let blob;
-
         this.loadExportData();
 
         const partnerData = XLSX.utils.json_to_sheet(this.exportData);
@@ -323,28 +316,46 @@ export class TableComponent implements OnInit {
 
 
         if (exportType === 'CSV') {
-            let csvData = Papa.unparse(this.exportData);
+            if (this.isProfileData) {
+                this.exportJsonToCSV(this.exportData,['ProfileData'])
+            } else if (this.isImplementationData) {
+                this.exportJsonToCSV(this.exportSurveyCtoData, ['HiiData', 'SPData', 'SPSchemaData'])
+            } else {
+                let completeData = this.exportSurveyCtoData
+                completeData.push(this.exportData)
+                this.exportJsonToCSV(completeData, ['ProfileData', 'HiiData', 'SPData', 'SPSchemaData'])
+            }
+        } else {
+            if (this.isProfileData) {
+                XLSX.utils.book_append_sheet(wb, partnerData, "Partner Profile");
+                XLSX.writeFile(wb, 'PartnerProfile.xlsx');
+            } else if (this.isImplementationData) {
+                XLSX.utils.book_append_sheet(wb, hiiData, "Hii Data");
+                XLSX.utils.book_append_sheet(wb, spData, "Sp DATA");
+                XLSX.utils.book_append_sheet(wb, spSchema, "SP Schema Data");
+                XLSX.writeFile(wb, 'PartnerProfile.xlsx');
+            } else {
+                XLSX.utils.book_append_sheet(wb, partnerData, "PartneData");
+                XLSX.utils.book_append_sheet(wb, hiiData, "HiiData");
+                XLSX.utils.book_append_sheet(wb, spData, "SPData");
+                XLSX.utils.book_append_sheet(wb, spSchema, "SPSchemaData");
+                XLSX.writeFile(wb, 'PartnerProfile.xlsx');
+            }
+        }
+    }
+
+    exportJsonToCSV(csvData: any, fileName?: any) {
+        const fileTypeCSV = 'text/csv;charset=utf-8;',
+            element = document.createElement('a');
+        let blob;
+
+        csvData.forEach((exportData: any, index: number) => {
+            let csvData = Papa.unparse(exportData);
             blob = new Blob([csvData], { type: fileTypeCSV });
             let url = URL.createObjectURL(blob);
             element.href = url;
-            element.setAttribute('download', 'PartnerProfile' + fileExtension);
+            element.setAttribute('download', fileName[index] + '.csv');
             element.click();
-
-        } else if (this.isImplementationData && this.shouldHaveImplementationData) {
-            XLSX.utils.book_append_sheet(wb, hiiData, "Hii Data");
-            XLSX.utils.book_append_sheet(wb, spData, "Sp DATA");
-            XLSX.utils.book_append_sheet(wb, spSchema, "SP Schema Data");
-            XLSX.writeFile(wb, 'PartnerProfile' + fileExtension);
-
-        } else if (this.isBothData && this.shouldHaveImplementationData) {
-            XLSX.utils.book_append_sheet(wb, partnerData, "Partner Profile");
-            XLSX.utils.book_append_sheet(wb, hiiData, "Hii Data");
-            XLSX.utils.book_append_sheet(wb, spData, "Sp DATA");
-            XLSX.utils.book_append_sheet(wb, spSchema, "SP Schema Data");
-            XLSX.writeFile(wb, 'PartnerProfile' + fileExtension);
-        } else {
-            XLSX.utils.book_append_sheet(wb, partnerData, "Partner Profile");
-            XLSX.writeFile(wb, 'PartnerProfile' + fileExtension);
-        }
+        });
     }
 }