Merge pull request #3548 from sujithsojan/release-7.0.0_ef

Issue #ED-3420 fix: Not able to consume Downloaded contents in offline
Sunbird-Ed · Feb 20, 2024 · 0a1a06d · 0a1a06d
2 parents 3b4034b + 85918a2
commit 0a1a06d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/app/collection-detail-etb/collection-detail-etb.page.ts b/src/app/collection-detail-etb/collection-detail-etb.page.ts
@@ -381,7 +381,7 @@ export class CollectionDetailEtbPage implements OnInit {
       this.headerService.updatePageConfig(this.headerConfig);
       this.hiddenGroups.clear();
       this.shownGroups = undefined;
-      await this.getFrameworkCategory()
+      await this.getFrameworkCategory();
       await this.assignCardData();
       this.resetVariables();
       await this.setContentDetails(this.identifier, true);
@@ -1579,10 +1579,13 @@ export class CollectionDetailEtbPage implements OnInit {
   }
 
   async getFrameworkCategory() {
-    await this.formAndFrameworkUtilService.invokedGetFrameworkCategoryList(this.profile.syllabus[0]).then((categories) => {
-      if (categories) {
-        this.categories = categories.sort((a, b) => b.index - a.index)
-      }
-    });
+    this.categories = this.appGlobalService.getCachedFrameworkCategory().value;
+    if (!this.categories && this.commonUtilService.networkInfo.isNetworkAvailable) {
+      await this.formAndFrameworkUtilService.invokedGetFrameworkCategoryList(this.profile.syllabus[0]).then((categories) => {
+        if (categories) {
+          this.categories = categories.sort((a, b) => b.index - a.index)
+        }
+      });
+    }
   }
 }
diff --git a/src/app/content-details/content-details.page.ts b/src/app/content-details/content-details.page.ts
@@ -1759,8 +1759,11 @@ export class ContentDetailsPage implements OnInit, OnDestroy {
 
 
   async getContentCategories(frameworkId) {
-    await this.formFrameworkUtilService.invokedGetFrameworkCategoryList(frameworkId).then((data) => {
-      this.contentCategories = data;
-  });
+    this.contentCategories = this.appGlobalService.getCachedFrameworkCategory().value;
+    if(!this.contentCategories  && this.commonUtilService.networkInfo.isNetworkAvailable) {
+      await this.formFrameworkUtilService.invokedGetFrameworkCategoryList(frameworkId).then((data) => {
+        this.contentCategories = data;
+    });
+    }
   }
 }