Skip to content

#ED-3419 fix: Fixed telemetry event for update category #3537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swayangjit merged 2 commits into from
Feb 12, 2024
Merged

#ED-3419 fix: Fixed telemetry event for update category #3537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edd2af4
#ED-3419 fix: Fixed telemetry event for update category
Ajoymaity Feb 9, 2024
0ca3c6f
Merge branch 'release-7.0.0' of github.com:Sunbird-Ed/SunbirdEd-mobil…
Ajoymaity Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/app/profile/guest-edit/guest-edit.page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
<span *ngIf="item.required" class="ge-danger">&nbsp;*</span>
</ion-text>
</ion-label>
<ion-select [multiple]="isMultipleVales(item)" [formControlName]="item.identifier"
<ion-select [multiple]="isMultipleVales(item)" [formControlName]="item.identifier" [disabled]="!(i === 0 || !item.isDisable)"
[interfaceOptions]="syllabusOptions" class="ion-text-capitalize" (ngModelChange)="onCategoryChanged(item,$event,i)"
placeholder="{{ item.placeHolder | translateJson }}"
placeholder="{{ item.placeHolder | translateJson }}" (ionCancel)="cancelEvent(category, $event)"
okText="{{'BTN_SUBMIT' | translate}}" cancelText="{{'CANCEL' | translate}}">
<ion-select-option *ngFor="let eachSyllabus of item.itemList" value="{{eachSyllabus?.code}}">
<ion-select-option *ngFor="let eachSyllabus of item?.itemList" value="{{eachSyllabus?.code}}">
{{eachSyllabus.name | aliased}}&lrm;
</ion-select-option>
</ion-select>
Expand Down
141 changes: 92 additions & 49 deletions src/app/profile/guest-edit/guest-edit.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import {
ProfileType,
SharedPreferences,
FrameworkCategoryCode,
CachedItemRequestSourceFrom
CachedItemRequestSourceFrom,
CorrelationData
} from '@project-sunbird/sunbird-sdk';
import { CommonUtilService } from '../../../services/common-util.service';
import { AppGlobalService } from '../../../services/app-global-service.service';
Expand Down Expand Up @@ -204,7 +205,6 @@ export class GuestEditPage implements OnInit, OnDestroy {
const headerTitle = this.isNewUser ? this.commonUtilService.translateMessage('CREATE_USER') :
this.commonUtilService.translateMessage('EDIT_PROFILE');
await this.headerService.showHeaderWithBackButton([], headerTitle);
// await this.getSyllabusDetails();
}

ionViewWillLeave() {
Expand All @@ -222,13 +222,14 @@ export class GuestEditPage implements OnInit, OnDestroy {
this.formControlSubscriptions.unsubscribe();
}
// await this.getCategoriesAndUpdateAttributes(this.guestEditForm.value.profileType);
// this.guestEditForm.patchValue({
// syllabus: [],
// boards: [],
// grades: [],
// subjects: [],
// medium: []
// });
this.categories.forEach((e, index) => {
if (this.profileSettingsForms.get(e.identifier).value) {
this.profileSettingsForms.get(e.identifier).patchValue([]);
if (index != 0) {
e['isDisable'] = true;
}
}
})
this.btnColor = '#8FC4FF';
}

Expand All @@ -239,7 +240,7 @@ export class GuestEditPage implements OnInit, OnDestroy {
const getSuggestedFrameworksRequest: GetSuggestedFrameworksRequest = {
from: CachedItemRequestSourceFrom.SERVER,
language: this.translate.currentLang,
requiredCategories: FrameworkCategoryCodesGroup.DEFAULT_FRAMEWORK_CATEGORIES
requiredCategories: this.appGlobalService.getRequiredCategories()
};

await this.frameworkUtilService.getActiveChannelSuggestedFrameworkList(getSuggestedFrameworksRequest).toPromise()
Expand Down Expand Up @@ -384,42 +385,68 @@ export class GuestEditPage implements OnInit, OnDestroy {
);
}

generateInteractTelemetry(value, categoryType) {
let correlationList: Array<CorrelationData> = [];
correlationList = this.populateCData(value, categoryType);
correlationList.push({ id: value.toString(), type: categoryType });
this.telemetryGeneratorService.generateInteractTelemetry(
InteractType.SELECT_CATEGORY,
InteractSubtype.EDIT_USER_SUCCESS,
Environment.USER,
PageId.EDIT_USER,
undefined,
undefined,
undefined,
correlationList
);
}

/**
* This method is added as we are not getting subject value in reset form method
*/
async onCategoryChanged(category, event, index) {
if (index !== this.categories.length - 1) {
if (index === 0) {
if (this.defaultFrameworkID !== event) {
this.appGlobalService.setFramewokCategory('');
this.defaultFrameworkID = event;
await this.getCategoriesAndUpdateAttributes(true)
let currentValue = Array.isArray(event) ? event : [event];
if (currentValue.length) {
this.generateInteractTelemetry(Array.isArray(event) ? event : [event], category.code)
if (index !== this.categories.length - 1) {
if (index === 0) {
event = Array.isArray(event) ? event[0] : event;
if (this.defaultFrameworkID !== event) {
this.appGlobalService.setFramewokCategory('');
this.defaultFrameworkID = event;
await this.getCategoriesAndUpdateAttributes(true)
}
this.framework = await this.frameworkService.getFrameworkDetails({
from: CachedItemRequestSourceFrom.SERVER,
frameworkId: event,
requiredCategories: this.appGlobalService.getRequiredCategories()
}).toPromise();
}
this.framework = await this.frameworkService.getFrameworkDetails({
from: CachedItemRequestSourceFrom.SERVER,
frameworkId: event,
requiredCategories: []
}).toPromise();
}
if (index <= this.categories.length && this.profileSettingsForms.get(this.categories[index + 1].identifier).value.length > 0) {
for (let i = index + 1; i < this.categories.length; i++) {
this.profileSettingsForms.get(this.categories[i].identifier).patchValue([]);
// this.profileSettingsForms.get(this.categories[i].identifier).disable()
if (index <= this.categories.length) {
if (this.profileSettingsForms.get(this.categories[index + 1].identifier).value.length > 0) {
for (let i = index + 1; i < this.categories.length-1; i++) {
this.categories[i + 1]['isDisable'] = true;
this.profileSettingsForms.get(this.categories[i].identifier).patchValue([]);
}
} else {
for (let i = index + 1; i < this.categories.length-1; i++) {
this.categories[i + 1]['isDisable'] = true;
}
}
}
}
const boardCategoryTermsRequet: GetFrameworkCategoryTermsRequest = {
frameworkId: this.framework.identifier,
requiredCategories: [this.categories[index + 1].code],
// prevCategoryCode: this.categories[index].code,
currentCategoryCode: this.categories[index + 1].code,
language: this.translate.currentLang
};
const categoryTerms = (await this.frameworkUtilService.getFrameworkCategoryTerms(boardCategoryTermsRequet).toPromise())
.map(t => ({ name: t.name, code: t.code }))

this.categories[index + 1]['itemList'] = categoryTerms;
this.categories[index + 1]['isDisable'] = true;
}
const boardCategoryTermsRequet: GetFrameworkCategoryTermsRequest = {
frameworkId: this.framework ? this.framework.identifier : this.profile.syllabus[0] || this.defaultFrameworkID,
requiredCategories: [this.categories[index + 1].code],
// prevCategoryCode: this.categories[index].code,
currentCategoryCode: this.categories[index + 1].code,
language: this.translate.currentLang
};
const categoryTerms = (await this.frameworkUtilService.getFrameworkCategoryTerms(boardCategoryTermsRequet).toPromise())
.map(t => ({ name: t.name, code: t.code }))
this.categories[index + 1]['isDisable'] = false;
this.categories[index + 1]['itemList'] = categoryTerms;
}
}
}

/**
Expand Down Expand Up @@ -699,14 +726,13 @@ export class GuestEditPage implements OnInit, OnDestroy {
} else if(!change) {
for (var key of Object.keys(categoryDetails)) {
if(this.profileSettingsForms.get(key)) {
this.profileSettingsForms.get(key).patchValue(categoryDetails[key]);
let value = Array.isArray(categoryDetails[key]) ? categoryDetails[key] : [categoryDetails[key]];
this.profileSettingsForms.get(key).patchValue(value);
} else {
this.profileSettingsForms.removeControl(key);
}
}
}
this.isCategoryLabelLoded = true;
console.log('...............', this.group)
}
}).catch(e => console.error(e));
}
Expand All @@ -722,11 +748,14 @@ export class GuestEditPage implements OnInit, OnDestroy {
};
const categoryTerms = (await this.frameworkUtilService.getFrameworkCategoryTerms(boardCategoryTermsRequet).toPromise())
.map(t => ({ name: t.name, code: t.code }))

this.categories[index]['itemList'] = categoryTerms;
console.log('<<<<<<<<<<<<<<<<<<<<<<<<<', this.categories);
if (categoryTerms) {
this.categories[index]['itemList'] = categoryTerms;
if (index === this.categories.length - 1) {
this.isCategoryLabelLoded = true;
}
}
}
})
});
}

resetCategoriesTerms() {
Expand All @@ -740,11 +769,10 @@ export class GuestEditPage implements OnInit, OnDestroy {
async setFrameworkCategory1Value() {
this.loader = await this.commonUtilService.getLoader();
await this.loader.present();

const getSuggestedFrameworksRequest: GetSuggestedFrameworksRequest = {
from: CachedItemRequestSourceFrom.SERVER,
language: this.translate.currentLang,
requiredCategories: []
requiredCategories: this.appGlobalService.getRequiredCategories()
};

await this.frameworkUtilService.getActiveChannelSuggestedFrameworkList(getSuggestedFrameworksRequest).toPromise()
Expand All @@ -767,4 +795,19 @@ isDisabled(category, index) {
// return (index <2 || this.profileSettingsForms.get(this.categories[index-1]).value.length) ? false : true
}

cancelEvent(category, event) {}

private populateCData(formControllerValues, correlationType): Array<CorrelationData> {
const correlationList: Array<CorrelationData> = [];
if (formControllerValues) {
formControllerValues.forEach((value) => {
correlationList.push({
id: value,
type: correlationType
});
});
}
return correlationList;
}

}