From 78b21493ba735a5cf0b322c9969dab2a1eb1d763 Mon Sep 17 00:00:00 2001 From: prahalad Date: Sat, 5 Mar 2022 00:03:41 +0530 Subject: [PATCH] Fixed Export data --- .../partner-details.component.ts | 39 ++++++++++++------- src/app/dashboard/table/table.component.ts | 14 +++++-- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/app/dashboard/partner-details/partner-details.component.ts b/src/app/dashboard/partner-details/partner-details.component.ts index 6bf2331..92f959d 100644 --- a/src/app/dashboard/partner-details/partner-details.component.ts +++ b/src/app/dashboard/partner-details/partner-details.component.ts @@ -72,12 +72,21 @@ export class PartnerDetailsComponent implements OnInit { let primaryAreasOfSupportOffered: any = []; let primaryAreasOfSupportRequired: any = []; + let states: any = []; + let districts: any = []; + let preferredModeOfCommunications : any = []; + + partnerData.strengthAndCapability.primaryAreasOfSupportOffered.forEach(x => { primaryAreasOfSupportOffered.push(x.name) }) partnerData.strengthAndCapability.primaryAreasOfSupportRequired.forEach(x => { primaryAreasOfSupportRequired.push(x.name) }) partnerData.detailedProfile.preferredLanguages.forEach(x => { preferredLanguages.push(x.name) }) partnerData.detailedProfile.communities.forEach(x => { communities.push(x.name) }) partnerData.detailedProfile.branchLocationCountries.forEach(x => { branchLocationCountries.push(x.name) }) partnerData.organizationBasicInfo.areasOfWork.forEach(x => { areaOfWork.push(x.name) }) + partnerData.detailedProfile.states.forEach(x => { states.push(x.name)}) + partnerData.detailedProfile.districts.forEach(x => { districts.push(x.name)}) + partnerData.detailedProfile.preferredModeOfCommunications.forEach(x => { preferredModeOfCommunications.push(x.name)}) + exportData = [{ @@ -111,21 +120,20 @@ export class PartnerDetailsComponent implements OnInit { // Detailed Profile 'Bio': partnerData.detailedProfile.bio, - 'Branch Location Countries': branchLocationCountries.toString(), - "Communities": communities.toString(), - "District": partnerData.detailedProfile.district, - "Districts": partnerData.detailedProfile.districts ? partnerData.detailedProfile.districts.toString() : '', - "Files": partnerData.detailedProfile.files, - "Have Branches In Other Districts": partnerData.detailedProfile.haveBranchesInOtherDistricts, - "Logo": partnerData.detailedProfile.logo, - "partner Location": partnerData.detailedProfile.partnerLocation, - "Preferred Languages": preferredLanguages.toString(), - "Preferred Mode Of Communications": partnerData.detailedProfile.preferredModeOfCommunications ? partnerData.detailedProfile.preferredModeOfCommunications.toString() : '', - "State": partnerData.detailedProfile.state, - "States": partnerData.detailedProfile.states ? partnerData.detailedProfile.states.toString() : '', - "Total Reach Of Organization": partnerData.detailedProfile.totalReachOfOrganization, - "Year Of Establishment": partnerData.detailedProfile.yearOfEstablishment, - + 'Branch Location Countries': branchLocationCountries.toString(), + "Communities": communities.toString(), + "District": partnerData.detailedProfile.district, + "Districts": partnerData.detailedProfile.districts ? districts.toString() : '', + "Files": partnerData.detailedProfile.files, + "Have Branches In Other Districts": partnerData.detailedProfile.haveBranchesInOtherDistricts, + "Logo": partnerData.detailedProfile.logo, + "partner Location": partnerData.detailedProfile.partnerDataLocation, + "Preferred Languages": preferredLanguages.toString(), + "Preferred Mode Of Communications": partnerData.detailedProfile.preferredModeOfCommunications ? preferredModeOfCommunications.toString() : '', + "State": partnerData.detailedProfile.state, + "States": partnerData.detailedProfile.states ? states.toString() : '', + "Total Reach Of Organization": partnerData.detailedProfile.totalReachOfOrganization, + "Year Of Establishment": partnerData.detailedProfile.yearOfEstablishment, // Strength "Other Specific Support Required": partnerData.strengthAndCapability.otherSpecificSupportRequired, @@ -138,6 +146,7 @@ export class PartnerDetailsComponent implements OnInit { }] + console.log(exportData) let surveyCtoHIIData = []; for (const hiidata of partnerData.surveyCtoData.hiiData) { diff --git a/src/app/dashboard/table/table.component.ts b/src/app/dashboard/table/table.component.ts index c8f6c20..4f8b679 100644 --- a/src/app/dashboard/table/table.component.ts +++ b/src/app/dashboard/table/table.component.ts @@ -180,12 +180,20 @@ export class TableComponent implements OnInit { let primaryAreasOfSupportOffered: any = []; let primaryAreasOfSupportRequired: any = []; + let states: any = []; + let districts: any = []; + let preferredModeOfCommunications : any = []; + + partner.strengthAndCapability.primaryAreasOfSupportOffered.forEach(x => { primaryAreasOfSupportOffered.push(x.name)}) partner.strengthAndCapability.primaryAreasOfSupportRequired.forEach(x => { primaryAreasOfSupportRequired.push(x.name)}) partner.detailedProfile.preferredLanguages.forEach(x => { preferredLanguages.push(x.name)}) partner.detailedProfile.communities.forEach(x => { communities.push(x.name)}) partner.detailedProfile.branchLocationCountries.forEach(x => { branchLocationCountries.push(x.name)}) partner.organizationBasicInfo.areasOfWork.forEach(x => { areaOfWork.push(x.name)}) + partner.detailedProfile.states.forEach(x => { states.push(x.name)}) + partner.detailedProfile.districts.forEach(x => { districts.push(x.name)}) + partner.detailedProfile.preferredModeOfCommunications.forEach(x => { preferredModeOfCommunications.push(x.name)}) let partnerDetails = { @@ -222,15 +230,15 @@ export class TableComponent implements OnInit { 'Branch Location Countries': branchLocationCountries.toString(), "Communities": communities.toString(), "District": partner.detailedProfile.district, - "Districts": partner.detailedProfile.districts ? partner.detailedProfile.districts.toString() : '', + "Districts": partner.detailedProfile.districts ? districts.toString() : '', "Files": partner.detailedProfile.files, "Have Branches In Other Districts": partner.detailedProfile.haveBranchesInOtherDistricts, "Logo": partner.detailedProfile.logo, "partner Location": partner.detailedProfile.partnerLocation, "Preferred Languages": preferredLanguages.toString(), - "Preferred Mode Of Communications": partner.detailedProfile.preferredModeOfCommunications ? partner.detailedProfile.preferredModeOfCommunications.toString() : '', + "Preferred Mode Of Communications": partner.detailedProfile.preferredModeOfCommunications ? preferredModeOfCommunications.toString() : '', "State": partner.detailedProfile.state, - "States": partner.detailedProfile.states ? partner.detailedProfile.states.toString() : '', + "States": partner.detailedProfile.states ? states.toString() : '', "Total Reach Of Organization": partner.detailedProfile.totalReachOfOrganization, "Year Of Establishment": partner.detailedProfile.yearOfEstablishment,