Skip to content

Issue #ED-1309 fix: Fixed blank screen when user clicks on 'Start learning' button #3341

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
merged 2 commits into from
Feb 22, 2023
Merged

Issue #ED-1309 fix: Fixed blank screen when user clicks on 'Start learning' button #3341

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
1cf3ba9
Issue #ED-1309 fix: Fixed blank screen when user clicks on 'Start lea…
Ajoymaity Feb 22, 2023
12d1514
Issue #ED-1309 text: Fixed unit test
Ajoymaity Feb 22, 2023
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
3 changes: 3 additions & 0 deletions src/app/enrolled-course-details-page/enrolled-course-details-page.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2065,6 +2065,9 @@ describe('EnrolledCourseDetailsPage', () => {
}
]
};
jest.spyOn(enrolledCourseDetailsPage, 'getContentState').mockImplementation(() => {
return Promise.resolve();
});
enrolledCourseDetailsPage.contentStatusData = {
contentList: [
{
Expand Down
22 changes: 16 additions & 6 deletions src/app/enrolled-course-details-page/enrolled-course-details-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,10 +1406,14 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy, ConsentPopo
private async startContent() {
if (this.courseHeirarchy && this.courseHeirarchy.children
&& this.courseHeirarchy.children.length && !this.isBatchNotStarted) {
if (this.nextContent && !this.nextContent) {
this.initNextContent();
if (!this.nextContent) {
await this.getContentState(true).then(() => {
this.navigateToContentDetails(this.nextContent, 1);
});
} else {
this.navigateToContentDetails(this.nextContent, 1);
}
this.navigateToContentDetails(this.nextContent, 1);
// this.navigateToContentDetails(this.nextContent, 1);
} else {
this.commonUtilService.showToast(this.commonUtilService.translateMessage('COURSE_WILL_BE_AVAILABLE',
this.datePipe.transform(this.courseStartDate, 'mediumDate')));
Expand All @@ -1420,7 +1424,13 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy, ConsentPopo
* Function gets executed when user click on resume course button.
*/
async resumeContent(): Promise<void> {
this.navigateToContentDetails(this.nextContent, 1);
if (!this.nextContent) {
await this.getContentState(true).then(() => {
this.navigateToContentDetails(this.nextContent, 1);
});
} else {
this.navigateToContentDetails(this.nextContent, 1);
}

this.telemetryGeneratorService.generateInteractTelemetry(InteractType.TOUCH,
InteractSubtype.RESUME_CLICKED,
Expand Down Expand Up @@ -1907,7 +1917,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy, ConsentPopo
this.courseUtilService.showCredits(this.course, this.pageId, undefined, this.corRelationList);
}

getContentState(returnRefresh: boolean) {
async getContentState(returnRefresh: boolean) {
if (this.courseCardData.batchId) {
const request: GetContentStateRequest = {
userId: this.appGlobalService.getUserId(),
Expand All @@ -1917,7 +1927,7 @@ export class EnrolledCourseDetailsPage implements OnInit, OnDestroy, ConsentPopo
batchId: this.courseCardData.batchId,
fields: ['progress', 'score']
};
this.courseService.getContentState(request).toPromise()
await this.courseService.getContentState(request).toPromise()
.then((contentStateResponse: ContentStateResponse) => {
this.contentStatusData = contentStateResponse;

Expand Down