From 20536b88a0554d75ecfe322703bcf295eb339196 Mon Sep 17 00:00:00 2001 From: Vinod-V3 Date: Fri, 7 Apr 2023 20:51:06 +0530 Subject: [PATCH 1/8] ISSUE #ED-431 feat : Added Program details page --- scripts/deleteUnUsableIosIcon.js | 4 +- .../program-details.component.html | 50 +++++++ .../program-details.component.scss | 79 +++++++++++ .../program-details.component.spec.data.ts | 103 +++++++++++++++ .../program-details.component.ts | 123 ++++++++++++++++++ .../program-listing.component.ts | 2 +- .../manage-learn/programs/programs.module.ts | 9 +- .../manage-learn/shared/components/index.ts | 3 +- .../share-profile-data.component.html | 40 ++++++ .../share-profile-data.component.scss | 66 ++++++++++ .../share-profile-data.component.ts | 36 +++++ src/app/manage-learn/shared/shared.module.ts | 12 +- src/assets/i18n/en.json | 10 +- 13 files changed, 528 insertions(+), 9 deletions(-) create mode 100644 src/app/manage-learn/programs/program-details/program-details.component.html create mode 100644 src/app/manage-learn/programs/program-details/program-details.component.scss create mode 100644 src/app/manage-learn/programs/program-details/program-details.component.spec.data.ts create mode 100644 src/app/manage-learn/programs/program-details/program-details.component.ts create mode 100644 src/app/manage-learn/shared/components/share-profile-data/share-profile-data.component.html create mode 100644 src/app/manage-learn/shared/components/share-profile-data/share-profile-data.component.scss create mode 100644 src/app/manage-learn/shared/components/share-profile-data/share-profile-data.component.ts diff --git a/scripts/deleteUnUsableIosIcon.js b/scripts/deleteUnUsableIosIcon.js index 618d4049d..f6747d260 100644 --- a/scripts/deleteUnUsableIosIcon.js +++ b/scripts/deleteUnUsableIosIcon.js @@ -134,7 +134,9 @@ function deleteUnUsableIosIcon(ionicIconFilePath) { "arrow-up-circle-outline.svg", "arrow-down-circle-outline.svg", "caret-forward-circle.svg", - "ribbon.svg" + "ribbon.svg", + "chevron-up.svg", + "chevron-down.svg" ].includes(file))) { fs.unlinkSync(ionicIconFilePath + '/' + file); } diff --git a/src/app/manage-learn/programs/program-details/program-details.component.html b/src/app/manage-learn/programs/program-details/program-details.component.html new file mode 100644 index 000000000..1f9c935bb --- /dev/null +++ b/src/app/manage-learn/programs/program-details/program-details.component.html @@ -0,0 +1,50 @@ + + +
{{programDetails.programName}}
+
{{description}} + + {{ (showMore ? 'READ_LESS' : 'READ_MORE') | translate }} + +
+
+ + {{"FRMELEMNTS_LBL_JOIN_PROGRAM_POPUP" | translate}} + + +
+ {{"FRMELEMNTS_MSG_PROGRAM_JOINED" | translate:{'date':(endDate | date: 'd/M/yyyy')} }} +
+ + + +
+ + +
+ + +
+
{{data?.sectionName}}
+
+ +
+
+
+
+ + +
+
+ + +
+ +
+
+
{{"EMPTY_SEARCH_RESULTS" | translate}}.
+
{{"FRMELEMNTS_MSG_NO_SOLUTIONS_FOR_PROGRAM" | translate:{'type':selectedSection} }}
+
+ + + \ No newline at end of file diff --git a/src/app/manage-learn/programs/program-details/program-details.component.scss b/src/app/manage-learn/programs/program-details/program-details.component.scss new file mode 100644 index 000000000..463a39c4d --- /dev/null +++ b/src/app/manage-learn/programs/program-details/program-details.component.scss @@ -0,0 +1,79 @@ +@import 'src/assets/styles/_custom-mixins'; +@import "src/assets/styles/variables"; +@import "src/assets/styles/_variables.scss"; + +.details-block{ + margin-left: 0px; + padding: 15px; + .title{ + font-size: 18px; + font-weight: 700; + padding: 0px 15px; + margin-bottom: 10px; + color: $black; + } + .description{ + color: $black; + padding: 0px 15px; + font-weight: 600; + } +} + +.hr-line { + height: 1px; + border: 1px solid map-get($colors, medium_gray); + margin: 10px 0px; +} + +.program-joined-message{ + background-color: map-get($colors, light_red); + padding: 10px; + font-weight: 700; + margin: 0px 15px; + border-radius: 10px; + font-size: 12px; +} + +.read-more{ + color: $blue; + text-decoration-line: underline; + font-weight: 600; +} + +.section-filter{ + background-color: var(--app-secondary-background); + border-radius: 25px; +} + +.section-card{ + border-radius: 25px !important; + padding: 5px; + margin: 10px 0px; + background-color: var(--app-secondary-background); + .icon{ + background-color: $white; + box-shadow: var(--button-style-shadow); + height: 22px; + border-radius: 50%; + } +} + +.section-details{ + .section-name{ + font-size: 18px; + font-weight: 600; + color: map-get($colors, bright_blue); + text-transform:capitalize; + } + ion-icon{ + font-size: 22px; + } +} + +.no-data{ + margin: 100px 0px 50px 0px; + .message-1{ + font-size: 16px; + margin-bottom: 10px; + } +} \ No newline at end of file diff --git a/src/app/manage-learn/programs/program-details/program-details.component.spec.data.ts b/src/app/manage-learn/programs/program-details/program-details.component.spec.data.ts new file mode 100644 index 000000000..ab2950362 --- /dev/null +++ b/src/app/manage-learn/programs/program-details/program-details.component.spec.data.ts @@ -0,0 +1,103 @@ +export const solutionsList=[ + { + "_id": "60f80e3df87ea2376653e4fd", + "language": [ + "English" + ], + "externalId": "mutiple domains 4", + "name": "mutiple domains - multiple submission =false V2", + "description": "mutiple domains - multiple submission =false ", + "entityType": "state", + "type": "observation", + "endDate": "2022-07-21T12:08:29.023Z", + "link": "9d5692113b81824f4d9eb22f0e11fe8e", + "creator": "Diksha" + }, + { + "_id": "6051c03bd2c9fe2d56c365a5", + "language": [ + "English" + ], + "externalId": "mutiple domains", + "name": "mutiple domains", + "description": "mutiple domains", + "entityType": "state", + "type": "course", + "endDate": "2022-03-17T08:39:23.972Z", + "link": "2265710e82abd31b521e6175dc0fb913" + }, + { + "_id": "6052eb7e79c5f153ae7f27b8", + "language": [ + "English" + ], + "externalId": "a2e0ccbe-87ae-11eb-9117-441ca8998ea1-OBSERVATION-TEMPLATE_CHILD", + "name": "Test-observation-upload-pointBased", + "description": "This is a test observation upload for point based scoring system.", + "entityType": "state", + "type": "observation", + "endDate": "2022-03-18T05:56:14.599Z", + "link": "cd6cb122c0893c9b90434d5a536c53e3" + }, + { + "_id": "6051d9b2f39f6f3d6a493d27", + "language": [ + "English" + ], + "externalId": "mutiple domains 3", + "name": "mutiple domains - multiple submission =false", + "description": "mutiple domains - multiple submission =false ", + "entityType": "state", + "type": "course", + "endDate": "2022-03-17T10:28:02.170Z", + "link": "51e57c1e1b961d56810b038f7251fb73" + }, + { + "_id": "6051b4976fdee62367dfce62", + "language": [ + "English" + ], + "externalId": "multiple domain test", + "name": "multiple domain test", + "description": "multiple domain and multiple criteria without multipleAssessments", + "entityType": "state", + "type": "course", + "endDate": "2022-03-17T07:49:43.685Z", + "link": "3dbcec334041f542a37051a2b27989df" + }, + { + "_id": "605089da2df993615443f091", + "language": [ + "English" + ], + "externalId": "multiple domain and without multipleAssessments", + "name": "multiple domain and multipleAssessments", + "description": "multiple domain and multiple criteria without multipleAssessments", + "entityType": "state", + "type": "improvementProject", + "endDate": "2022-03-16T10:35:06.035Z", + "link": "5a60ff164f9d3e2ff837af7fc15bca80" + }, + { + "_id": "605084a02df993615443f06a", + "language": [ + "English" + ], + "externalId": "multiple domain and multiple criteria 2", + "name": "multiple domain and multiple criteria 2", + "description": "multiple domain and multiple criteria with multiple submission", + "entityType": "state", + "type": "course", + "endDate": "2022-03-16T10:12:48.159Z", + "link": "8a72ff5cf7589b46dd67f55f2b357755" + }, + { + "_id": "5ff9dc1b9259097d48017bbe", + "externalId": "MAHARASTHA-IMPROVEMENT-PROJECT", + "description": "Maharashtha improvement project description", + "name": "Come See Our School!- Parent Mela", + "projectTemplateId": "5ffbd53f5fc92a7dbc972906", + "projectId": "620531e1eaef6900071176b7", + "type": "improvementProject" + } + ] \ No newline at end of file diff --git a/src/app/manage-learn/programs/program-details/program-details.component.ts b/src/app/manage-learn/programs/program-details/program-details.component.ts new file mode 100644 index 000000000..cde823a91 --- /dev/null +++ b/src/app/manage-learn/programs/program-details/program-details.component.ts @@ -0,0 +1,123 @@ +import { Component, OnInit } from '@angular/core'; +import { AppHeaderService } from '@app/services'; +import { LibraryFiltersLayout } from '@project-sunbird/common-consumption'; +import { TranslateService } from '@ngx-translate/core'; +import { GenericPopUpService } from '../../shared'; +import { solutionsList } from './program-details.component.spec.data' + +@Component({ + selector: 'app-program-details', + templateUrl: './program-details.component.html', + styleUrls: ['./program-details.component.scss'], +}) +export class ProgramDetailsComponent implements OnInit { + headerConfig = { + showHeader : true, + showBurgerMenu : false, + actionButtons : [] + } + filtersList : any = [] + selectedFilterIndex = 0 + layout = LibraryFiltersLayout.ROUND + selectedSection: any + showMore:boolean=false + description + characterLimit = 150 + programDetails:any={ + data: solutionsList, + programJoined:false, + requestForPIIConsent:true, + count: 3, + programName: 'TEST_SCOPE_PROGRAM', + programId: '5ff438b04698083dbfab7284', + description: "View and participate in educational programs active in your location and designed for your role." + } + solutionsList:any=[] + filteredList:any=[] + sharingStatus='ACTIVE' + endDate=Date() + + constructor(private headerService: AppHeaderService, private translate: TranslateService, private popupService: GenericPopUpService) { + this.translate.get(['ALL','FRMELEMNTS_LBL_PROJECTS','FRMELEMNTS_LBL_OBSERVATIONS','FRMELEMNTS_LBL_COURSES','FRMELEMNTS_LBL_SURVEYS']).subscribe((translation)=>{ + this.filtersList = Object.keys(translation).map(translateItem => { return translation[translateItem]}) + }) + } + + ngOnInit() {} + + ionViewWillEnter(){ + this.headerConfig = this.headerService.getDefaultPageConfig() + this.headerConfig.showHeader = true + this.headerConfig.showBurgerMenu = false + this.headerConfig.actionButtons = [] + this.headerService.updatePageConfig(this.headerConfig) + this.readMoreOrLess() + this.formatList() + } + + readMoreOrLess(){ + if(this.showMore){ + this.description = this.programDetails.description + }else{ + if(this.programDetails.description.length > this.characterLimit){ + this.description = this.programDetails.description.slice(0,this.characterLimit)+'...' + }else{ + this.description = this.programDetails.description + } + } + } + + formatList(){ + this.programDetails.data.forEach(data => { + let sectionName=data.type=='improvementProject'?'projects':data.type+'s' + let index = this.solutionsList.findIndex((val)=>{return val.sectionName==sectionName}) + if(index!==-1){ + this.solutionsList[index].sectionList.push(data) + }else{ + let order=data.type=='improvementProject'?0:data.type=='observation'?1:data.type=='course'?2:3 + this.solutionsList.push({sectionName:sectionName,sectionList:[data],order:order}) + } + }); + this.filteredList=this.solutionsList.sort((a,b)=>{return a.order - b.order}) + this.selectedSection=this.solutionsList[0]?.sectionName + } + + onFilterChange(event){ + this.selectedFilterIndex = event.data.index + this.filteredList=this.solutionsList + if(event.data.index==0){ + this.selectedSection=this.solutionsList[0]?.sectionName + }else{ + let index =this.solutionsList.findIndex((data)=>{ + return data.sectionName == event.data.text.toLowerCase() + }) + if(index==-1){ + this.filteredList=[] + } + this.selectedSection = event.data.text.toLowerCase() + } + } + + joinProgram(){ + this.popupService.showJoinProgramForProjectPopup("FRMELEMNTS_LBL_JOIN_PROGRAM_POPUP",this.programDetails.programName,"all the resources in this program","FRMELEMNTS_LBL_JOIN_PROGRAM_POPUP").then( + (data:any)=>{ + if(data){ + this.programDetails.programJoined = true + } + } + ) + } + + showConsentPopup(){} + + cardClick(){ + if(!this.programDetails.programJoined){ + this.joinProgram() + } + } + + save(event){ + this.showConsentPopup() + } + +} \ No newline at end of file diff --git a/src/app/manage-learn/programs/program-listing/program-listing.component.ts b/src/app/manage-learn/programs/program-listing/program-listing.component.ts index 947581ba8..2f1b1461e 100644 --- a/src/app/manage-learn/programs/program-listing/program-listing.component.ts +++ b/src/app/manage-learn/programs/program-listing/program-listing.component.ts @@ -84,7 +84,7 @@ export class ProgramListingComponent implements OnInit { } selectedProgram(id) { - this.router.navigate([`/${RouterLinks.PROGRAM}/${RouterLinks.SOLUTIONS}`, id]); + this.router.navigate([`/${RouterLinks.PROGRAM}/details`]); } handleNavBackButton() { diff --git a/src/app/manage-learn/programs/programs.module.ts b/src/app/manage-learn/programs/programs.module.ts index 612a1d86f..20a0ae7d2 100644 --- a/src/app/manage-learn/programs/programs.module.ts +++ b/src/app/manage-learn/programs/programs.module.ts @@ -9,6 +9,8 @@ import { RouterLinks } from '@app/app/app.constant'; import { TranslateModule } from '@ngx-translate/core'; import { FormsModule } from '@angular/forms'; import { CoreModule } from '../core/core.module'; +import { ProgramDetailsComponent } from './program-details/program-details.component'; +import { CommonConsumptionModule } from '@project-sunbird/common-consumption'; const routes: Routes = [ { @@ -19,10 +21,14 @@ const routes: Routes = [ path: `${RouterLinks.SOLUTIONS}/:id`, component: SolutionListingComponent, }, + { + path: `details`, + component: ProgramDetailsComponent, + }, ]; @NgModule({ - declarations: [ProgramListingComponent, SolutionListingComponent], + declarations: [ProgramListingComponent, SolutionListingComponent, ProgramDetailsComponent], imports: [ CommonModule, RouterModule.forChild(routes), @@ -31,6 +37,7 @@ const routes: Routes = [ IonicModule, FormsModule, CoreModule, + CommonConsumptionModule, ], entryComponents:[] }) diff --git a/src/app/manage-learn/shared/components/index.ts b/src/app/manage-learn/shared/components/index.ts index fc933f6ff..947e71108 100644 --- a/src/app/manage-learn/shared/components/index.ts +++ b/src/app/manage-learn/shared/components/index.ts @@ -32,4 +32,5 @@ export * from './attachment-lists/attachment-lists.component'; export * from './report-list/report-list.component'; export * from './entity-search-local/entity-search-local.component'; export * from './start-improvement/start-improvement.component'; -export * from './join-program/join-program.component' +export * from './join-program/join-program.component'; +export * from './share-profile-data/share-profile-data.component' diff --git a/src/app/manage-learn/shared/components/share-profile-data/share-profile-data.component.html b/src/app/manage-learn/shared/components/share-profile-data/share-profile-data.component.html new file mode 100644 index 000000000..3ee3e2889 --- /dev/null +++ b/src/app/manage-learn/shared/components/share-profile-data/share-profile-data.component.html @@ -0,0 +1,40 @@ + +
+
+ {{'FRMELEMNTS_LBL_DATA_SETTINGS' | translate}} + +
+
+
{{'FRMELEMNTS_LBL_DATA_SHARING_ON' | translate}}
+
{{'FRMELEMNTS_LBL_DATA_SHARING_OFF' | translate}}
+

{{"FRMELEMNTS_MSG_SHARE_DATA_INFO" | translate:{'type':type} }} +
{{'DFLT_TRK_FRMELEMNTS_LBL_COURSE_LAST_UPDATED_ON' | translate:{'last_updated_on_date': lastUpdatedOn | date: 'dd/MM/yyyy'} }} +

+

{{"FRMELEMNTS_MSG_DONOT_SHARE_DATA_INFO" | translate:{'type':type} }}

+
{{ (showShareData ? 'FRMELEMNTS_BTN_CLOSE' : 'FRMELEMNTS_BTN_EDIT_SETTING') | translate }}
+
+
+
+
+
+ + {{'FRMELEMNTS_LBL_UPDATE_DATA_SETTINGS' | translate}} + + + + + {{'FRMELEMNTS_LBL_SHARE_PROFILE_INFORMATION' | translate}} + + + + {{'FRMELEMNTS_LBL_DONOT_SHARE_PROFILE_INFO' |translate}} + + + + +
+ {{'SAVE' | translate}} +
+
+
+ \ No newline at end of file diff --git a/src/app/manage-learn/shared/components/share-profile-data/share-profile-data.component.scss b/src/app/manage-learn/shared/components/share-profile-data/share-profile-data.component.scss new file mode 100644 index 000000000..02d31c8a5 --- /dev/null +++ b/src/app/manage-learn/shared/components/share-profile-data/share-profile-data.component.scss @@ -0,0 +1,66 @@ +@import 'src/assets/styles/_custom-mixins'; +@import "src/assets/styles/variables"; +@import "src/assets/styles/_variables.scss"; + + +ion-card{ + border-radius: 10px; +} + +.heading-icon-block{ + font-size: 1rem !important; + margin-top: 8px; + color: $black; + ion-icon{ + font-size: 1.5rem; + color: #024f9d; + } +} + +.data-share-header{ + margin-top: 10px; + .data-share-info{ + padding: 5px 0px; + font-size: 16px; + text-transform: uppercase; + } + p{ + font-size: 14px; + } +} + +.edit-setting{ + float: right; + padding: 12px; + color: $blue; + font-weight: bold; +} + +.hr{ + height: 1px; + border: 1px solid #E9DED3; + margin-top: 8px; +} + +.label-margin-bottom{ + margin-bottom: 3px !important; + padding-top: 10px; + font-size: 16px; +} + +.data-list{ + background: unset !important; +} + +.radio-item{ + --padding-start: 0px; +} + +.radio-detail{ + font-size: 14px; + color: map-get($colors, primary_black); +} + +ion-button{ + width: 8rem; +} \ No newline at end of file diff --git a/src/app/manage-learn/shared/components/share-profile-data/share-profile-data.component.ts b/src/app/manage-learn/shared/components/share-profile-data/share-profile-data.component.ts new file mode 100644 index 000000000..e45166d41 --- /dev/null +++ b/src/app/manage-learn/shared/components/share-profile-data/share-profile-data.component.ts @@ -0,0 +1,36 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; + +@Component({ + selector: 'app-share-profile-data', + templateUrl: './share-profile-data.component.html', + styleUrls: ['./share-profile-data.component.scss'], +}) +export class ShareProfileDataComponent implements OnInit { + @Input() dataSharingStatus + @Input() type + @Input() lastUpdatedOn + @Output() save = new EventEmitter() + showShareData = false; + isDataShare = false; + + constructor() { } + + ngOnInit() {} + + toggleDataShare() { + this.isDataShare = !this.isDataShare; + this.showShareData = false; + } + + toggleEditSettings(){ + this.showShareData = !this.showShareData; + } + + saveChanges(){ + this.isDataShare = false + this.showShareData = false; + this.save.emit(this.dataSharingStatus) + + } + +} diff --git a/src/app/manage-learn/shared/shared.module.ts b/src/app/manage-learn/shared/shared.module.ts index a8dfef041..891556345 100644 --- a/src/app/manage-learn/shared/shared.module.ts +++ b/src/app/manage-learn/shared/shared.module.ts @@ -37,7 +37,8 @@ import { ReportListComponent, EntitySearchLocalComponent, StartImprovementComponent, - JoinProgramComponent + JoinProgramComponent, + ShareProfileDataComponent } from './components'; import { TranslateModule } from '@ngx-translate/core'; @@ -133,7 +134,8 @@ import { EntitySearchPipe } from './pipe/entity-local-search'; EntitySearchPipe, EntitySearchLocalComponent, StartImprovementComponent, - JoinProgramComponent + JoinProgramComponent, + ShareProfileDataComponent ], imports: [CommonModule, FormsModule, IonicModule, ReactiveFormsModule, TranslateModule, ChartsModule], @@ -193,7 +195,8 @@ import { EntitySearchPipe } from './pipe/entity-local-search'; EntitySearchPipe, EntitySearchLocalComponent, StartImprovementComponent, - JoinProgramComponent + JoinProgramComponent, + ShareProfileDataComponent ], providers: [ Camera, @@ -233,7 +236,8 @@ import { EntitySearchPipe } from './pipe/entity-local-search'; ReportListComponent, EntitySearchLocalComponent, StartImprovementComponent, - JoinProgramComponent + JoinProgramComponent, + ShareProfileDataComponent ], }) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 55ffa1053..f0690cb46 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1379,5 +1379,13 @@ "FRMELEMNTS_LBL_START_OBSERVATION_POPUP_MSG1":"You must click on the Start observation button to access and edit the observation.", "FRMELEMNTS_LBL_START_OBSERVATION_POPUP_MSG2":"Click on the Start observation to get complete access to the content", "FRMELEMNTS_LBL_JOIN_PROGRAM_POPUP":"Join program", - "FRMELEMNTS_LBL_JOIN_PROGRAM_MSG":"Please join {{name}} program to view and access this {{type}}." + "FRMELEMNTS_LBL_JOIN_PROGRAM_MSG":"Please join {{name}} program to view and access this {{type}}.", + "FRMELEMNTS_MSG_NO_SOLUTIONS_FOR_PROGRAM":"There are no {{type}} attached to this program", + "FRMELEMNTS_MSG_PROGRAM_JOINED":"You have joined this program, please complete the resources by {{date}}", + "FRMELEMNTS_MSG_SHARE_DATA_INFO": "You have agreed to share your profile details with the {{type}} administrator", + "FRMELEMNTS_MSG_DONOT_SHARE_DATA_INFO": "You have not agreed to share your profile details with the {{type}} administrator", + "FRMELEMNTS_MSG_PROGRAM_NO_RESOURCES":"Please change and update your profile details to view program resources", + "FRMELEMNTS_LBL_OBSERVATIONS":"Observations", + "FRMELEMNTS_LBL_COURSES":"Courses", + "FRMELEMNTS_LBL_SURVEYS":"Surveys" } \ No newline at end of file From 9d05b0c0d026b597fa4945ee20d0a7f03dc85eb9 Mon Sep 17 00:00:00 2001 From: Vinod-V3 Date: Mon, 10 Apr 2023 19:06:28 +0530 Subject: [PATCH 2/8] Fetching details from api done --- .../program-details.component.html | 12 ++-- .../program-details.component.ts | 55 ++++++++++++++----- .../program-listing.component.ts | 2 +- .../manage-learn/programs/programs.module.ts | 2 +- 4 files changed, 50 insertions(+), 21 deletions(-) diff --git a/src/app/manage-learn/programs/program-details/program-details.component.html b/src/app/manage-learn/programs/program-details/program-details.component.html index 1f9c935bb..42368fba1 100644 --- a/src/app/manage-learn/programs/program-details/program-details.component.html +++ b/src/app/manage-learn/programs/program-details/program-details.component.html @@ -1,13 +1,13 @@ -
{{programDetails.programName}}
+
{{programDetails?.programName}}
{{description}} - + {{ (showMore ? 'READ_LESS' : 'READ_MORE') | translate }}
- + {{"FRMELEMNTS_LBL_JOIN_PROGRAM_POPUP" | translate}} @@ -31,8 +31,8 @@
-
- +
+
@@ -45,6 +45,6 @@
{{"EMPTY_SEARCH_RESULTS" | translate}}.
{{"FRMELEMNTS_MSG_NO_SOLUTIONS_FOR_PROGRAM" | translate:{'type':selectedSection} }}
- + \ No newline at end of file diff --git a/src/app/manage-learn/programs/program-details/program-details.component.ts b/src/app/manage-learn/programs/program-details/program-details.component.ts index cde823a91..b3e3123c1 100644 --- a/src/app/manage-learn/programs/program-details/program-details.component.ts +++ b/src/app/manage-learn/programs/program-details/program-details.component.ts @@ -3,7 +3,10 @@ import { AppHeaderService } from '@app/services'; import { LibraryFiltersLayout } from '@project-sunbird/common-consumption'; import { TranslateService } from '@ngx-translate/core'; import { GenericPopUpService } from '../../shared'; -import { solutionsList } from './program-details.component.spec.data' +import { ActivatedRoute } from '@angular/router'; +import { urlConstants } from '../../core/constants/urlConstants'; +import { LoaderService, UtilsService } from '../../core'; +import { KendraApiService } from '../../core/services/kendra-api.service'; @Component({ selector: 'app-program-details', @@ -23,24 +26,25 @@ export class ProgramDetailsComponent implements OnInit { showMore:boolean=false description characterLimit = 150 - programDetails:any={ - data: solutionsList, - programJoined:false, - requestForPIIConsent:true, - count: 3, - programName: 'TEST_SCOPE_PROGRAM', - programId: '5ff438b04698083dbfab7284', - description: "View and participate in educational programs active in your location and designed for your role." - } + programDetails:any={} solutionsList:any=[] filteredList:any=[] sharingStatus='ACTIVE' endDate=Date() + programId + count = 0; + limit = 25; + page = 1; - constructor(private headerService: AppHeaderService, private translate: TranslateService, private popupService: GenericPopUpService) { + constructor(private headerService: AppHeaderService, private translate: TranslateService, private popupService: GenericPopUpService, + private activatedRoute: ActivatedRoute, private loader: LoaderService, private utils: UtilsService, private kendraService: KendraApiService) { this.translate.get(['ALL','FRMELEMNTS_LBL_PROJECTS','FRMELEMNTS_LBL_OBSERVATIONS','FRMELEMNTS_LBL_COURSES','FRMELEMNTS_LBL_SURVEYS']).subscribe((translation)=>{ this.filtersList = Object.keys(translation).map(translateItem => { return translation[translateItem]}) }) + activatedRoute.params.subscribe((param)=>{ + this.programId = param.id + this.getSolutions() + }) } ngOnInit() {} @@ -51,8 +55,33 @@ export class ProgramDetailsComponent implements OnInit { this.headerConfig.showBurgerMenu = false this.headerConfig.actionButtons = [] this.headerService.updatePageConfig(this.headerConfig) - this.readMoreOrLess() - this.formatList() + } + + async getSolutions() { + this.loader.startLoader(); + let payload = await this.utils.getProfileInfo(); + if (payload) { + const config = { + url:`${urlConstants.API_URLS.SOLUTIONS_LISTING}${this.programId}?page=${this.page}&limit=${this.limit}&search=`, + payload: payload, + }; + this.kendraService.post(config).subscribe( + (success) => { + this.loader.stopLoader(); + if (success.result.data) { + this.programDetails = success.result + this.count = success.result.count; + this.formatList() + this.readMoreOrLess() + } + }, + (error) => { + this.loader.stopLoader(); + } + ); + } else { + this.loader.stopLoader(); + } } readMoreOrLess(){ diff --git a/src/app/manage-learn/programs/program-listing/program-listing.component.ts b/src/app/manage-learn/programs/program-listing/program-listing.component.ts index 2f1b1461e..657eddef6 100644 --- a/src/app/manage-learn/programs/program-listing/program-listing.component.ts +++ b/src/app/manage-learn/programs/program-listing/program-listing.component.ts @@ -84,7 +84,7 @@ export class ProgramListingComponent implements OnInit { } selectedProgram(id) { - this.router.navigate([`/${RouterLinks.PROGRAM}/details`]); + this.router.navigate([`/${RouterLinks.PROGRAM}/${RouterLinks.DETAILS}`,id]); } handleNavBackButton() { diff --git a/src/app/manage-learn/programs/programs.module.ts b/src/app/manage-learn/programs/programs.module.ts index 20a0ae7d2..df3be4964 100644 --- a/src/app/manage-learn/programs/programs.module.ts +++ b/src/app/manage-learn/programs/programs.module.ts @@ -22,7 +22,7 @@ const routes: Routes = [ component: SolutionListingComponent, }, { - path: `details`, + path: `${RouterLinks.DETAILS}/:id`, component: ProgramDetailsComponent, }, ]; From 5c3ebb85b7ec314aa6e680aa72aaeacb1a4f1fe4 Mon Sep 17 00:00:00 2001 From: Vinod-V3 Date: Fri, 14 Apr 2023 11:04:22 +0530 Subject: [PATCH 3/8] Added message input for Join program popup --- .../components/join-program/join-program.component.html | 2 +- .../shared/components/join-program/join-program.component.ts | 1 + src/app/manage-learn/shared/generic.popup.ts | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/manage-learn/shared/components/join-program/join-program.component.html b/src/app/manage-learn/shared/components/join-program/join-program.component.html index ada73dd23..7564ec88a 100644 --- a/src/app/manage-learn/shared/components/join-program/join-program.component.html +++ b/src/app/manage-learn/shared/components/join-program/join-program.component.html @@ -11,7 +11,7 @@

- {{'FRMELEMNTS_LBL_JOIN_PROGRAM_MSG' | translate:{'name':name,'type':type} }} + {{ (message ? message : 'FRMELEMNTS_LBL_JOIN_PROGRAM_MSG') | translate:{'name':name,'type':type} }}

diff --git a/src/app/manage-learn/shared/components/join-program/join-program.component.ts b/src/app/manage-learn/shared/components/join-program/join-program.component.ts index ec6a2bea5..d234e2702 100644 --- a/src/app/manage-learn/shared/components/join-program/join-program.component.ts +++ b/src/app/manage-learn/shared/components/join-program/join-program.component.ts @@ -12,6 +12,7 @@ export class JoinProgramComponent implements OnInit { @Input() name @Input() type @Input() button + @Input() message? constructor(private popOverCtrl:PopoverController) { } diff --git a/src/app/manage-learn/shared/generic.popup.ts b/src/app/manage-learn/shared/generic.popup.ts index 364e5816d..b878a0f2c 100644 --- a/src/app/manage-learn/shared/generic.popup.ts +++ b/src/app/manage-learn/shared/generic.popup.ts @@ -76,14 +76,15 @@ export class GenericPopUpService { return data; } - async showJoinProgramForProjectPopup(header,name,type,button){ + async showJoinProgramForProjectPopup(header,name,type,button,message?){ const alert = await this.popOverCtrl.create({ component : JoinProgramComponent, componentProps: { header: header, name: name, type:type, - button: button + button: button, + message: message }, cssClass: 'sb-popover', }); From 58ab1f9b821543f2da5b8d79aa1a52323a95d292 Mon Sep 17 00:00:00 2001 From: Vinod-V3 Date: Fri, 14 Apr 2023 11:08:11 +0530 Subject: [PATCH 4/8] Added Pii consent popup --- .../core/services/utils.service.ts | 42 +++++++ .../program-details.component.spec.data.ts | 103 ---------------- .../program-details.component.ts | 27 +++- .../manage-learn/shared/components/index.ts | 3 +- .../pii-consent-popup.component.html | 42 +++++++ .../pii-consent-popup.component.scss | 76 ++++++++++++ .../pii-consent-popup.component.ts | 116 ++++++++++++++++++ src/app/manage-learn/shared/shared.module.ts | 12 +- src/assets/i18n/en.json | 6 +- 9 files changed, 312 insertions(+), 115 deletions(-) delete mode 100644 src/app/manage-learn/programs/program-details/program-details.component.spec.data.ts create mode 100644 src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.html create mode 100644 src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.scss create mode 100644 src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.ts diff --git a/src/app/manage-learn/core/services/utils.service.ts b/src/app/manage-learn/core/services/utils.service.ts index bfec1a93b..fedf8c685 100644 --- a/src/app/manage-learn/core/services/utils.service.ts +++ b/src/app/manage-learn/core/services/utils.service.ts @@ -20,6 +20,8 @@ import { Events } from '@app/util/events'; import { Location } from "@angular/common"; import { ToastService } from "./toast/toast.service"; import { TranslateService } from "@ngx-translate/core"; +import { PopoverController } from "@ionic/angular"; +import { PiiConsentPopupComponent } from "../../shared"; @Injectable({ providedIn: "root" @@ -41,6 +43,7 @@ export class UtilsService { filters: any = {}; statuses = statuses; numberTasksCompleted =0; + consentPopup constructor( @Inject("PROFILE_SERVICE") private profileService: ProfileService, @Inject("AUTH_SERVICE") public authService: AuthService, @@ -54,6 +57,7 @@ export class UtilsService { private location : Location, private toast : ToastService, private translate: TranslateService, + private popoverCtrl : PopoverController ) { this.events.subscribe("loggedInProfile:update", _ => { @@ -780,4 +784,42 @@ return data; ]; return tabs; } + + async showConsentPopup(type){ + let componentProps={} + switch (type) { + case 'program': + componentProps={ + msg1 : "FRMELEMNTS_LBL_CONSENT_POPUP_MSG1", + msg2 : "FRMELEMNTS_LBL_CONSENT_POPUP_POLICY_MSG", + msg3 : "FRMELEMNTS_LBL_CONSENT_POPUP_MSG2", + link : RouterLinks.TERM_OF_USE + } + break; + + default: + componentProps={ + msg1 : "FRMELEMNTS_LBL_CONSENT_POPUP_MSG1", + msg2 : "FRMELEMNTS_LBL_CONSENT_POPUP_POLICY_MSG", + msg3 : "FRMELEMNTS_LBL_CONSENT_POPUP_MSG2", + link : RouterLinks.TERM_OF_USE + } + break; + } + this.consentPopup = await this.popoverCtrl.create({ + component : PiiConsentPopupComponent, + componentProps : componentProps, + cssClass: 'sb-popover back-drop-hard', + backdropDismiss: false + }) + await this.consentPopup.present() + let {data} = await this.consentPopup.onDidDismiss() + return data + } + + async closeConsentPopup(){ + this.consentPopup ? await this.consentPopup.dismiss() : null + } + + } \ No newline at end of file diff --git a/src/app/manage-learn/programs/program-details/program-details.component.spec.data.ts b/src/app/manage-learn/programs/program-details/program-details.component.spec.data.ts deleted file mode 100644 index ab2950362..000000000 --- a/src/app/manage-learn/programs/program-details/program-details.component.spec.data.ts +++ /dev/null @@ -1,103 +0,0 @@ -export const solutionsList=[ - { - "_id": "60f80e3df87ea2376653e4fd", - "language": [ - "English" - ], - "externalId": "mutiple domains 4", - "name": "mutiple domains - multiple submission =false V2", - "description": "mutiple domains - multiple submission =false ", - "entityType": "state", - "type": "observation", - "endDate": "2022-07-21T12:08:29.023Z", - "link": "9d5692113b81824f4d9eb22f0e11fe8e", - "creator": "Diksha" - }, - { - "_id": "6051c03bd2c9fe2d56c365a5", - "language": [ - "English" - ], - "externalId": "mutiple domains", - "name": "mutiple domains", - "description": "mutiple domains", - "entityType": "state", - "type": "course", - "endDate": "2022-03-17T08:39:23.972Z", - "link": "2265710e82abd31b521e6175dc0fb913" - }, - { - "_id": "6052eb7e79c5f153ae7f27b8", - "language": [ - "English" - ], - "externalId": "a2e0ccbe-87ae-11eb-9117-441ca8998ea1-OBSERVATION-TEMPLATE_CHILD", - "name": "Test-observation-upload-pointBased", - "description": "This is a test observation upload for point based scoring system.", - "entityType": "state", - "type": "observation", - "endDate": "2022-03-18T05:56:14.599Z", - "link": "cd6cb122c0893c9b90434d5a536c53e3" - }, - { - "_id": "6051d9b2f39f6f3d6a493d27", - "language": [ - "English" - ], - "externalId": "mutiple domains 3", - "name": "mutiple domains - multiple submission =false", - "description": "mutiple domains - multiple submission =false ", - "entityType": "state", - "type": "course", - "endDate": "2022-03-17T10:28:02.170Z", - "link": "51e57c1e1b961d56810b038f7251fb73" - }, - { - "_id": "6051b4976fdee62367dfce62", - "language": [ - "English" - ], - "externalId": "multiple domain test", - "name": "multiple domain test", - "description": "multiple domain and multiple criteria without multipleAssessments", - "entityType": "state", - "type": "course", - "endDate": "2022-03-17T07:49:43.685Z", - "link": "3dbcec334041f542a37051a2b27989df" - }, - { - "_id": "605089da2df993615443f091", - "language": [ - "English" - ], - "externalId": "multiple domain and without multipleAssessments", - "name": "multiple domain and multipleAssessments", - "description": "multiple domain and multiple criteria without multipleAssessments", - "entityType": "state", - "type": "improvementProject", - "endDate": "2022-03-16T10:35:06.035Z", - "link": "5a60ff164f9d3e2ff837af7fc15bca80" - }, - { - "_id": "605084a02df993615443f06a", - "language": [ - "English" - ], - "externalId": "multiple domain and multiple criteria 2", - "name": "multiple domain and multiple criteria 2", - "description": "multiple domain and multiple criteria with multiple submission", - "entityType": "state", - "type": "course", - "endDate": "2022-03-16T10:12:48.159Z", - "link": "8a72ff5cf7589b46dd67f55f2b357755" - }, - { - "_id": "5ff9dc1b9259097d48017bbe", - "externalId": "MAHARASTHA-IMPROVEMENT-PROJECT", - "description": "Maharashtha improvement project description", - "name": "Come See Our School!- Parent Mela", - "projectTemplateId": "5ffbd53f5fc92a7dbc972906", - "projectId": "620531e1eaef6900071176b7", - "type": "improvementProject" - } - ] \ No newline at end of file diff --git a/src/app/manage-learn/programs/program-details/program-details.component.ts b/src/app/manage-learn/programs/program-details/program-details.component.ts index b3e3123c1..4494c5684 100644 --- a/src/app/manage-learn/programs/program-details/program-details.component.ts +++ b/src/app/manage-learn/programs/program-details/program-details.component.ts @@ -5,7 +5,7 @@ import { TranslateService } from '@ngx-translate/core'; import { GenericPopUpService } from '../../shared'; import { ActivatedRoute } from '@angular/router'; import { urlConstants } from '../../core/constants/urlConstants'; -import { LoaderService, UtilsService } from '../../core'; +import { LoaderService, UtilsService, ToastService } from '../../core'; import { KendraApiService } from '../../core/services/kendra-api.service'; @Component({ @@ -37,7 +37,8 @@ export class ProgramDetailsComponent implements OnInit { page = 1; constructor(private headerService: AppHeaderService, private translate: TranslateService, private popupService: GenericPopUpService, - private activatedRoute: ActivatedRoute, private loader: LoaderService, private utils: UtilsService, private kendraService: KendraApiService) { + private activatedRoute: ActivatedRoute, private loader: LoaderService, private utils: UtilsService, private kendraService: KendraApiService, + private toastService: ToastService) { this.translate.get(['ALL','FRMELEMNTS_LBL_PROJECTS','FRMELEMNTS_LBL_OBSERVATIONS','FRMELEMNTS_LBL_COURSES','FRMELEMNTS_LBL_SURVEYS']).subscribe((translation)=>{ this.filtersList = Object.keys(translation).map(translateItem => { return translation[translateItem]}) }) @@ -128,16 +129,23 @@ export class ProgramDetailsComponent implements OnInit { } joinProgram(){ - this.popupService.showJoinProgramForProjectPopup("FRMELEMNTS_LBL_JOIN_PROGRAM_POPUP",this.programDetails.programName,"all the resources in this program","FRMELEMNTS_LBL_JOIN_PROGRAM_POPUP").then( + this.popupService.showJoinProgramForProjectPopup("FRMELEMNTS_LBL_JOIN_PROGRAM_POPUP",this.programDetails.programName,'program', + "FRMELEMNTS_LBL_JOIN_PROGRAM_POPUP","FRMELEMNTS_LBL_JOIN_PROGRAM_MSG2").then( (data:any)=>{ if(data){ - this.programDetails.programJoined = true + this.showConsentPopup() } } ) } - showConsentPopup(){} + showConsentPopup(){ + this.utils.showConsentPopup('program').then((data)=>{ + if(data!==undefined){ + this.programDetails.programJoined = true + } + }) + } cardClick(){ if(!this.programDetails.programJoined){ @@ -146,7 +154,14 @@ export class ProgramDetailsComponent implements OnInit { } save(event){ - this.showConsentPopup() + if(this.sharingStatus!==event){ + this.showConsentPopup() + this.sharingStatus=event + }else{ + } } + ionViewWillLeave(){ + this.utils.closeConsentPopup() + } } \ No newline at end of file diff --git a/src/app/manage-learn/shared/components/index.ts b/src/app/manage-learn/shared/components/index.ts index 947e71108..1f4ac8a22 100644 --- a/src/app/manage-learn/shared/components/index.ts +++ b/src/app/manage-learn/shared/components/index.ts @@ -33,4 +33,5 @@ export * from './report-list/report-list.component'; export * from './entity-search-local/entity-search-local.component'; export * from './start-improvement/start-improvement.component'; export * from './join-program/join-program.component'; -export * from './share-profile-data/share-profile-data.component' +export * from './share-profile-data/share-profile-data.component'; +export * from './pii-consent-popup/pii-consent-popup.component' diff --git a/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.html b/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.html new file mode 100644 index 000000000..ce365e8ed --- /dev/null +++ b/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.html @@ -0,0 +1,42 @@ + + + {{'PROFILE_DETAILS_TITLE' | translate}} + + + +
+
+
+
+

+ {{element.key}} + {{element.value}} +

+
+
+
+
+

+ + {{'FRMELEMNTS_LBL_CONSENT_POPUP_INFO' | translate}} +

+
+
+ + + +

+ {{ msg1 | translate }} + {{ msg2 | translate }} + {{ msg3 | translate }} +

+
+
+ {{'FRMELEMNTS_BTN_DONOT_SHARE' | translate}} + + {{'SHARE' | translate}} + +
+
+
+
\ No newline at end of file diff --git a/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.scss b/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.scss new file mode 100644 index 000000000..e9f8c93f6 --- /dev/null +++ b/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.scss @@ -0,0 +1,76 @@ +@import "src/assets/styles/base/_variables.scss"; +@import "src/assets/styles/_variables.scss"; +@import "src/assets/styles/_custom-mixins.scss"; + + +ion-header{ + background-color: white !important; +} + +#main-content { + overflow-y: scroll; + background-color: var(--app-secondary-background); +} + +.consent-popover-info { + overflow: hidden; + padding: 14px; +} + +.body { + flex-grow: 1; + flex-shrink: 1; + height: 38vh; + overflow-y: scroll; +} + +.footer { + flex-grow: 0; + flex-shrink: 0; +} + +.terms-checkbox{ + --background-checked: #{$blue}; + --border-color: #{$blue}; + --border-radius: 4px; + --border-width: 0.063rem; + --border-color-checked:#{$blue}; +} + +.button-section{ + ion-button{ + flex: 1; + height: 45px; + margin-left: 15px; + margin-right: 15px; + font-size: 16px; + color: var(--app-primary); + --background: white !important; + --border-radius: 15px !important + } + + .disable{ + pointer-events: none; + } + + .enable{ + color: white; + --background : var(--app-primary) !important + } +} + +.profile-info{ + color: map-get($colors, granite_gray); + font-family: "Noto Sans", sans-serif; + font-size: $font-size-base; + letter-spacing: 0; +} + +.profile-info-section{ + display: grid; + grid-template-columns: 100px 227px; +} + +.terms-info{ + color: $blue +} \ No newline at end of file diff --git a/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.ts b/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.ts new file mode 100644 index 000000000..0631437eb --- /dev/null +++ b/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.ts @@ -0,0 +1,116 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { AppGlobalService, CommonUtilService, FormAndFrameworkUtilService, UtilityService } from '@app/services'; +import { PopoverController } from '@ionic/angular'; + +@Component({ + selector: 'app-pii-consent-popup', + templateUrl: './pii-consent-popup.component.html', + styleUrls: ['./pii-consent-popup.component.scss'], +}) +export class PiiConsentPopupComponent implements OnInit { + + @Input() msg1 + @Input() msg2 + @Input() msg3 + @Input() link + isAgreed=false + profile + detailsList=[] + + constructor(private appGlobalService: AppGlobalService, private formAndFrameworkUtilService: FormAndFrameworkUtilService, + private commonUtilService: CommonUtilService, private popoverCtrl: PopoverController, private utilityService: UtilityService) { } + + ngOnInit() {} + + async ionViewWillEnter() { + this.profile = this.appGlobalService.getCurrentUser(); + const profileKeys = await this.formAndFrameworkUtilService.getConsentFormConfig(); + profileKeys.forEach(element => { + this.detailsList.push({ + key: this.commonUtilService.getTranslatedValue(element.templateOptions.placeHolder, + JSON.parse(element.templateOptions.placeHolder)['en']), + value: this.converDataSrcToObject(element) + }); + }); +} + + +converDataSrcToObject(ele) { + const dataSrc = ele.templateOptions.dataSrc; + switch (dataSrc.marker) { + case 'SERVER_PROFILE': + if (ele.code === 'emailId' || ele.code === 'phoneNumber') { + if (ele.code === 'emailId') { + return this.profile.serverProfile['email'] ? this.profile.serverProfile['email'] : + (this.profile.serverProfile['maskedEmail'] ? this.profile.serverProfile['maskedEmail'] : '-'); + } else { + return this.profile.serverProfile['phone'] ? this.profile.serverProfile['phone'] : + (this.profile.serverProfile['maskedPhone'] ? this.profile.serverProfile['maskedPhone'] : '-'); + } + } else { + if (ele.code === 'externalIds') { + let externalId = '-'; + if (this.profile.serverProfile[dataSrc.params.categoryCode] ) { + this.profile.serverProfile[dataSrc.params.categoryCode].forEach((externaleId) => { + if (externaleId.provider === this.profile.serverProfile.channel) { + externalId = externaleId.id; + } + }); + } + return externalId; + } else { + return this.profile.serverProfile[dataSrc.params.categoryCode] ? + this.profile.serverProfile[dataSrc.params.categoryCode] : '-'; + } + } + case 'SERVER_PROFILE_LOCATIONS': + let location = '-'; + if (this.profile.serverProfile.userLocations && this.profile.serverProfile.userLocations.length) { + this.profile.serverProfile.userLocations.forEach(element => { + if (element.type === ele.code) { + location = element.name; + } else if (ele.code === 'schoolId' && element.type === 'school' ) { + location = element.code; + } + }); + } + return location; + case 'SERVER_PROFILE_DECLARED': + if (this.profile.serverProfile.declarations.length && this.profile.serverProfile.declarations[0].info) { + return this.profile.serverProfile.declarations[0].info[dataSrc.params.categoryCode] ? + this.profile.serverProfile.declarations[0].info[dataSrc.params.categoryCode] : '-'; + } else if (ele.code === 'emailId' || ele.code === 'phoneNumber') { + if (ele.code === 'emailId') { + return this.profile.serverProfile['maskedEmail'] ? this.profile.serverProfile['maskedEmail'] : '-'; + } else { + return this.profile.serverProfile['maskedPhone'] ? this.profile.serverProfile['maskedPhone'] : '-'; + } + } + return '-'; + default: + return '-'; + } +} + + + async openTermsOfUse(){ + const baseUrl = await this.utilityService.getBuildConfigValue('TOU_BASE_URL'); + const url = baseUrl + this.link; + const options = 'hardwareback=yes,clearcache=no,zoom=no,toolbar=yes,disallowoverscroll=yes'; + (window as any).cordova.InAppBrowser.open(url, '_blank', options); + } + + changeEvent(event) { + this.isAgreed = event.target.checked; +} + +share() { + this.popoverCtrl.dismiss(true) +} + + +dontShare() { + this.popoverCtrl.dismiss(false) +} + +} diff --git a/src/app/manage-learn/shared/shared.module.ts b/src/app/manage-learn/shared/shared.module.ts index 891556345..0bdff2fb6 100644 --- a/src/app/manage-learn/shared/shared.module.ts +++ b/src/app/manage-learn/shared/shared.module.ts @@ -38,7 +38,8 @@ import { EntitySearchLocalComponent, StartImprovementComponent, JoinProgramComponent, - ShareProfileDataComponent + ShareProfileDataComponent, + PiiConsentPopupComponent } from './components'; import { TranslateModule } from '@ngx-translate/core'; @@ -135,7 +136,8 @@ import { EntitySearchPipe } from './pipe/entity-local-search'; EntitySearchLocalComponent, StartImprovementComponent, JoinProgramComponent, - ShareProfileDataComponent + ShareProfileDataComponent, + PiiConsentPopupComponent ], imports: [CommonModule, FormsModule, IonicModule, ReactiveFormsModule, TranslateModule, ChartsModule], @@ -196,7 +198,8 @@ import { EntitySearchPipe } from './pipe/entity-local-search'; EntitySearchLocalComponent, StartImprovementComponent, JoinProgramComponent, - ShareProfileDataComponent + ShareProfileDataComponent, + PiiConsentPopupComponent ], providers: [ Camera, @@ -237,7 +240,8 @@ import { EntitySearchPipe } from './pipe/entity-local-search'; EntitySearchLocalComponent, StartImprovementComponent, JoinProgramComponent, - ShareProfileDataComponent + ShareProfileDataComponent, + PiiConsentPopupComponent ], }) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index f0690cb46..b971548e7 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1387,5 +1387,9 @@ "FRMELEMNTS_MSG_PROGRAM_NO_RESOURCES":"Please change and update your profile details to view program resources", "FRMELEMNTS_LBL_OBSERVATIONS":"Observations", "FRMELEMNTS_LBL_COURSES":"Courses", - "FRMELEMNTS_LBL_SURVEYS":"Surveys" + "FRMELEMNTS_LBL_SURVEYS":"Surveys", + "FRMELEMNTS_LBL_CONSENT_POPUP_MSG1": "I consent to share my details with the administrators of this program. All program administrators are bound by the ", + "FRMELEMNTS_LBL_CONSENT_POPUP_MSG2":"in their use of my data", + "FRMELEMNTS_LBL_CONSENT_POPUP_POLICY_MSG": "Privacy Policy and DIKSHA Terms ", + "FRMELEMNTS_LBL_JOIN_PROGRAM_MSG2":"Please join {{name}} {{type}} to view and access all the resources in this {{type}}." } \ No newline at end of file From c505bd0102854eaa2045d2b30f9a540c3ed3904d Mon Sep 17 00:00:00 2001 From: Vinod-V3 Date: Mon, 24 Apr 2023 12:26:07 +0530 Subject: [PATCH 5/8] ISSUE #ED-431 feat : UI changes done for program details page --- .../program-details.component.html | 2 +- .../program-details.component.ts | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/app/manage-learn/programs/program-details/program-details.component.html b/src/app/manage-learn/programs/program-details/program-details.component.html index 42368fba1..f6c1a634d 100644 --- a/src/app/manage-learn/programs/program-details/program-details.component.html +++ b/src/app/manage-learn/programs/program-details/program-details.component.html @@ -24,7 +24,7 @@
-
+
{{data?.sectionName}}
diff --git a/src/app/manage-learn/programs/program-details/program-details.component.ts b/src/app/manage-learn/programs/program-details/program-details.component.ts index 4494c5684..3fb34106a 100644 --- a/src/app/manage-learn/programs/program-details/program-details.component.ts +++ b/src/app/manage-learn/programs/program-details/program-details.component.ts @@ -39,7 +39,7 @@ export class ProgramDetailsComponent implements OnInit { constructor(private headerService: AppHeaderService, private translate: TranslateService, private popupService: GenericPopUpService, private activatedRoute: ActivatedRoute, private loader: LoaderService, private utils: UtilsService, private kendraService: KendraApiService, private toastService: ToastService) { - this.translate.get(['ALL','FRMELEMNTS_LBL_PROJECTS','FRMELEMNTS_LBL_OBSERVATIONS','FRMELEMNTS_LBL_COURSES','FRMELEMNTS_LBL_SURVEYS']).subscribe((translation)=>{ + this.translate.get(['ALL','FRMELEMNTS_LBL_PROJECTS','FRMELEMNTS_LBL_OBSERVATIONS','FRMELEMNTS_LBL_COURSES','FRMELEMNTS_LBL_SURVEY']).subscribe((translation)=>{ this.filtersList = Object.keys(translation).map(translateItem => { return translation[translateItem]}) }) activatedRoute.params.subscribe((param)=>{ @@ -99,7 +99,7 @@ export class ProgramDetailsComponent implements OnInit { formatList(){ this.programDetails.data.forEach(data => { - let sectionName=data.type=='improvementProject'?'projects':data.type+'s' + let sectionName=data.type=='improvementProject'?'projects':data.type=='survey'?data.type:data.type+'s' let index = this.solutionsList.findIndex((val)=>{return val.sectionName==sectionName}) if(index!==-1){ this.solutionsList[index].sectionList.push(data) @@ -109,21 +109,16 @@ export class ProgramDetailsComponent implements OnInit { } }); this.filteredList=this.solutionsList.sort((a,b)=>{return a.order - b.order}) - this.selectedSection=this.solutionsList[0]?.sectionName } onFilterChange(event){ this.selectedFilterIndex = event.data.index this.filteredList=this.solutionsList - if(event.data.index==0){ - this.selectedSection=this.solutionsList[0]?.sectionName - }else{ - let index =this.solutionsList.findIndex((data)=>{ + this.selectedSection = '' + if(event.data.index!==0){ + this.filteredList = this.solutionsList.filter((data)=>{ return data.sectionName == event.data.text.toLowerCase() }) - if(index==-1){ - this.filteredList=[] - } this.selectedSection = event.data.text.toLowerCase() } } @@ -164,4 +159,8 @@ export class ProgramDetailsComponent implements OnInit { ionViewWillLeave(){ this.utils.closeConsentPopup() } + + selectSection(name){ + this.selectedSection = name + } } \ No newline at end of file From baeb534e58b26f2706e4ca9928660f8b96378570 Mon Sep 17 00:00:00 2001 From: Vinod-V3 Date: Wed, 26 Apr 2023 16:56:52 +0530 Subject: [PATCH 6/8] ISSUE #ED-1560 feat : Files saves for Project evidences --- .../services/attachment/attachment.service.ts | 16 ++--- .../project/add-file/add-file.page.ts | 72 ++++++------------- 2 files changed, 29 insertions(+), 59 deletions(-) diff --git a/src/app/manage-learn/core/services/attachment/attachment.service.ts b/src/app/manage-learn/core/services/attachment/attachment.service.ts index 6deff6700..8cefeff62 100644 --- a/src/app/manage-learn/core/services/attachment/attachment.service.ts +++ b/src/app/manage-learn/core/services/attachment/attachment.service.ts @@ -140,7 +140,7 @@ export class AttachmentService { await actionSheet.present(); return actionSheet.onDidDismiss(); } - takePicture(sourceType: PictureSourceType, mediaType: MediaType = this.camera.MediaType.ALLMEDIA) { + async takePicture(sourceType: PictureSourceType, mediaType: MediaType = this.camera.MediaType.ALLMEDIA) { var options: CameraOptions = { quality: 20, sourceType: sourceType, @@ -150,15 +150,15 @@ export class AttachmentService { destinationType: this.camera.DestinationType.FILE_URI }; - this.camera + await this.camera .getPicture(options) - .then((imagePath) => { + .then(async(imagePath) => { if (this.platform.is("android") && sourceType === this.camera.PictureSourceType.PHOTOLIBRARY) { let newFilePath = imagePath; if (!newFilePath.includes("file://")) { newFilePath = "file://" + imagePath } - this.checkForFileSizeRestriction(newFilePath).then(isValidFile => { + await this.checkForFileSizeRestriction(newFilePath).then(isValidFile => { if (isValidFile) { this.filePath .resolveNativePath(newFilePath) @@ -169,7 +169,7 @@ export class AttachmentService { } }) } else { - this.checkForFileSizeRestriction(imagePath).then(isValidFile => { + await this.checkForFileSizeRestriction(imagePath).then(isValidFile => { if (isValidFile) { this.copyFile(imagePath); } @@ -329,13 +329,13 @@ export class AttachmentService { this.payload = payload; switch (type) { case 'openCamera': - this.takePicture(this.camera.PictureSourceType.CAMERA); + await this.takePicture(this.camera.PictureSourceType.CAMERA); break; case 'openGallery': - this.takePicture(this.camera.PictureSourceType.PHOTOLIBRARY); + await this.takePicture(this.camera.PictureSourceType.PHOTOLIBRARY); break; case 'openFiles': - this.openFile(); + await this.openFile(); break; } } diff --git a/src/app/manage-learn/project/add-file/add-file.page.ts b/src/app/manage-learn/project/add-file/add-file.page.ts index f47e7cb40..f32d874db 100644 --- a/src/app/manage-learn/project/add-file/add-file.page.ts +++ b/src/app/manage-learn/project/add-file/add-file.page.ts @@ -65,6 +65,7 @@ export class AddFilePage implements OnInit { this.description = params.taskId ? actions.TASK_FILE_DESCRIPTION.label : actions.PROJECT_FILE_DESCRIPTION.label; this.taskId = params.taskId; }) + this.updateRemarks = _.debounce(this.updateRemarks,1500) } ngOnInit() { } @@ -75,14 +76,7 @@ export class AddFilePage implements OnInit { } handleHeaderEvents($event) { - if ($event.name == 'back') { - if (JSON.stringify(this.projectCopy) !== JSON.stringify(this.project) || - JSON.stringify(this.projectCopy.tasks[this.taskIndex]) !== JSON.stringify(this.task)) { - this.pageExitConfirm(); - } else { - this.location.back() - } - } + this.location.back() } getProject() { this.db.query({ _id: this.projectId }).then( @@ -110,6 +104,7 @@ export class AddFilePage implements OnInit { } else { this.project.remarks = this.remarks } + this.update('save') } setHeaderConfig() { @@ -164,20 +159,24 @@ export class AddFilePage implements OnInit { delete(index) { this.attachments.splice(index, 1); - this.task.isEdit = true; this.update('delete'); + this.task.isEdit = true; } - onAction(event) { + async onAction(event) { if(!this.taskId){ - this.popupService.showPPPForProjectPopUp('FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY', 'FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY_TEXT', 'FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY_LABEL', 'FRMELEMNTS_LBL_UPLOAD_EVIDENCES', 'https://diksha.gov.in/term-of-use.html', 'contentPolicy').then((data: any) => { + this.popupService.showPPPForProjectPopUp('FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY', 'FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY_TEXT', 'FRMELEMNTS_LBL_EVIDENCES_CONTENT_POLICY_LABEL', 'FRMELEMNTS_LBL_UPLOAD_EVIDENCES', 'https://diksha.gov.in/term-of-use.html', 'contentPolicy').then(async(data: any) => { if (data.isClicked) { if(data.isChecked){ if (event == 'openLink') { this.toggleLinkModal(); return; } - this.attachmentService.openAttachmentSource(event, this.attachments); + await this.attachmentService.openAttachmentSource(event, this.attachments); + setTimeout(() => { + this.update('save') + }, 1000); + }else{ this.toast.showMessage('FRMELEMNTS_MSG_EVIDENCES_CONTENT_POLICY_REJECT', 'danger'); } @@ -188,7 +187,10 @@ export class AddFilePage implements OnInit { this.toggleLinkModal(); return; } - this.attachmentService.openAttachmentSource(event, this.attachments); + await this.attachmentService.openAttachmentSource(event, this.attachments); + setTimeout(() => { + this.update('save') + }, 1000); } } @@ -197,13 +199,11 @@ export class AddFilePage implements OnInit { if (this.taskId) { this.task.attachments = this.attachments; this.task.remarks = this.remarks; + this.location.back(); if (JSON.stringify(this.projectCopy.tasks[this.taskIndex]) !== JSON.stringify(this.task)) { this.task.isEdit = true; this.project.isEdit = true; - this.taskId ? this.update(): this.update('submit'); this.toast.showMessage('FRMELEMNTS_LBL_FILES_ATTACHED', 'success') - } else { - this.location.back(); } } else { if (this.network.isNetworkAvailable) { @@ -223,6 +223,7 @@ export class AddFilePage implements OnInit { this.project.attachments = this.project?.attachments.concat(this.projectService.getLinks(event)); } this.toast.showMessage('FRMELEMNTS_MSG_SUCCESSFULLY_ATTACHED', 'success'); + this.update('save')   } this.toggleLinkModal(); } @@ -237,11 +238,8 @@ export class AddFilePage implements OnInit { .update(this.project) .then((success) => { this.project._rev = success.rev; - if (type == 'submit') { - this.attachments = []; - this.doSyncAction(type === 'submit'); - }else{ - this.location.back(); + if(type !== 'save'){ + this.location.back() } }) } @@ -255,35 +253,6 @@ export class AddFilePage implements OnInit { } } - async pageExitConfirm() { - let data; - this.translate.get(["FRMELEMNTS_MSG_ATTACHMENT_PAGE_EXIT_CONFIRM", "FRMELEMNTS_BTN_EXIT_PAGE", "FRMELEMNTS_BTN_YES_PAGE", "FRMELEMNTS_LBL_YES", "NO"]).subscribe((text) => { - data = text; - }); - const alert = await this.alert.create({ - cssClass: 'central-alert', - header: data['FRMELEMNTS_BTN_EXIT_PAGE'], - message: data['FRMELEMNTS_MSG_ATTACHMENT_PAGE_EXIT_CONFIRM'], - buttons: [ - { - text: this.taskId ? data["FRMELEMNTS_BTN_YES_PAGE"] : data["FRMELEMNTS_LBL_YES"], - handler: () => { }, - }, { - text: data["NO"], - role: "cancel", - cssClass: "secondary", - handler: (blah) => { - }, - }, - ], - }); - await alert.present(); - let resp = await alert.onDidDismiss(); - if (resp.role !== 'cancel') { - this.location.back(); - } - } - async submitProjectConfirmation() { let data; this.translate.get(["FRMELEMNTS_MSG_SUBMIT_PROJECT", "FRMELEMNTS_LBL_SUBMIT_IMPROVEMENT", "CANCEL", "FRMELEMNTS_BTN_SUBMIT"]).subscribe((text) => { @@ -316,7 +285,8 @@ export class AddFilePage implements OnInit { this.project.attachments = this.attachments; this.project.remarks = this.remarks; // this.project.status = statusType.submitted; - this.update('submit'); + this.attachments = []; + this.doSyncAction(true); }, 0) this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`], { queryParams: { From b26cba86bc9b0d36fe7d5805f8781eee6017e32d Mon Sep 17 00:00:00 2001 From: Vinod-V3 Date: Thu, 27 Apr 2023 14:34:41 +0530 Subject: [PATCH 7/8] Added toast message for project details page --- .../program-details/program-details.component.ts | 12 ++++++++++-- src/assets/i18n/en.json | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/app/manage-learn/programs/program-details/program-details.component.ts b/src/app/manage-learn/programs/program-details/program-details.component.ts index 3fb34106a..cc88b4880 100644 --- a/src/app/manage-learn/programs/program-details/program-details.component.ts +++ b/src/app/manage-learn/programs/program-details/program-details.component.ts @@ -134,10 +134,13 @@ export class ProgramDetailsComponent implements OnInit { ) } - showConsentPopup(){ + showConsentPopup(message?){ this.utils.showConsentPopup('program').then((data)=>{ if(data!==undefined){ this.programDetails.programJoined = true + if(message){ + this.toastService.openToast(message) + } } }) } @@ -149,10 +152,15 @@ export class ProgramDetailsComponent implements OnInit { } save(event){ + let message + this.translate.get(['FRMELEMNTS_MSG_DATA_SETTINGS_UPDATE_SUCCESS']).subscribe((msg)=>{ + message = msg['FRMELEMNTS_MSG_DATA_SETTINGS_UPDATE_SUCCESS'] + }) if(this.sharingStatus!==event){ - this.showConsentPopup() + this.showConsentPopup(message) this.sharingStatus=event }else{ + this.toastService.openToast(message) } } diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index b971548e7..57e7c6e42 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1391,5 +1391,6 @@ "FRMELEMNTS_LBL_CONSENT_POPUP_MSG1": "I consent to share my details with the administrators of this program. All program administrators are bound by the ", "FRMELEMNTS_LBL_CONSENT_POPUP_MSG2":"in their use of my data", "FRMELEMNTS_LBL_CONSENT_POPUP_POLICY_MSG": "Privacy Policy and DIKSHA Terms ", - "FRMELEMNTS_LBL_JOIN_PROGRAM_MSG2":"Please join {{name}} {{type}} to view and access all the resources in this {{type}}." + "FRMELEMNTS_LBL_JOIN_PROGRAM_MSG2":"Please join {{name}} {{type}} to view and access all the resources in this {{type}}.", + "FRMELEMNTS_MSG_DATA_SETTINGS_UPDATE_SUCCESS":"Your data setting has been updated successfully" } \ No newline at end of file From 7deaa7728fd5d9d6ec680c2870ba091482e06bf3 Mon Sep 17 00:00:00 2001 From: Vinod-V3 Date: Wed, 3 May 2023 09:35:47 +0530 Subject: [PATCH 8/8] Naming changes in consent popup --- .../manage-learn/core/services/utils.service.ts | 16 ++++++++-------- .../pii-consent-popup.component.html | 6 +++--- .../pii-consent-popup.component.ts | 14 +++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/app/manage-learn/core/services/utils.service.ts b/src/app/manage-learn/core/services/utils.service.ts index fedf8c685..fd80c5d82 100644 --- a/src/app/manage-learn/core/services/utils.service.ts +++ b/src/app/manage-learn/core/services/utils.service.ts @@ -790,19 +790,19 @@ return data; switch (type) { case 'program': componentProps={ - msg1 : "FRMELEMNTS_LBL_CONSENT_POPUP_MSG1", - msg2 : "FRMELEMNTS_LBL_CONSENT_POPUP_POLICY_MSG", - msg3 : "FRMELEMNTS_LBL_CONSENT_POPUP_MSG2", - link : RouterLinks.TERM_OF_USE + consentMessage1 : "FRMELEMNTS_LBL_CONSENT_POPUP_MSG1", + consentMessage2 : "FRMELEMNTS_LBL_CONSENT_POPUP_POLICY_MSG", + consentMessage3 : "FRMELEMNTS_LBL_CONSENT_POPUP_MSG2", + redirectLink : RouterLinks.TERM_OF_USE } break; default: componentProps={ - msg1 : "FRMELEMNTS_LBL_CONSENT_POPUP_MSG1", - msg2 : "FRMELEMNTS_LBL_CONSENT_POPUP_POLICY_MSG", - msg3 : "FRMELEMNTS_LBL_CONSENT_POPUP_MSG2", - link : RouterLinks.TERM_OF_USE + consentMessage1 : "FRMELEMNTS_LBL_CONSENT_POPUP_MSG1", + consentMessage2 : "FRMELEMNTS_LBL_CONSENT_POPUP_POLICY_MSG", + consentMessage3 : "FRMELEMNTS_LBL_CONSENT_POPUP_MSG2", + redirectLink : RouterLinks.TERM_OF_USE } break; } diff --git a/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.html b/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.html index ce365e8ed..b6f1c276b 100644 --- a/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.html +++ b/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.html @@ -26,9 +26,9 @@

- {{ msg1 | translate }} - {{ msg2 | translate }} - {{ msg3 | translate }} + {{ consentMessage1 | translate }} + {{ consentMessage2 | translate }} + {{ consentMessage3 | translate }}

diff --git a/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.ts b/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.ts index 0631437eb..7d3b461b3 100644 --- a/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.ts +++ b/src/app/manage-learn/shared/components/pii-consent-popup/pii-consent-popup.component.ts @@ -9,10 +9,10 @@ import { PopoverController } from '@ionic/angular'; }) export class PiiConsentPopupComponent implements OnInit { - @Input() msg1 - @Input() msg2 - @Input() msg3 - @Input() link + @Input() consentMessage1 + @Input() consentMessage2 + @Input() consentMessage3 + @Input() redirectLink isAgreed=false profile detailsList=[] @@ -29,13 +29,13 @@ export class PiiConsentPopupComponent implements OnInit { this.detailsList.push({ key: this.commonUtilService.getTranslatedValue(element.templateOptions.placeHolder, JSON.parse(element.templateOptions.placeHolder)['en']), - value: this.converDataSrcToObject(element) + value: this.convertDataSrcToObject(element) }); }); } -converDataSrcToObject(ele) { +convertDataSrcToObject(ele) { const dataSrc = ele.templateOptions.dataSrc; switch (dataSrc.marker) { case 'SERVER_PROFILE': @@ -95,7 +95,7 @@ converDataSrcToObject(ele) { async openTermsOfUse(){ const baseUrl = await this.utilityService.getBuildConfigValue('TOU_BASE_URL'); - const url = baseUrl + this.link; + const url = baseUrl + this.redirectLink; const options = 'hardwareback=yes,clearcache=no,zoom=no,toolbar=yes,disallowoverscroll=yes'; (window as any).cordova.InAppBrowser.open(url, '_blank', options); }