Issue #SB-4923 fix: Fixed framework issue.

project-sunbird · Jun 29, 2018 · c869575 · c869575
1 parent 83835a3
commit c869575
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/src/services/framework/bean.ts b/src/services/framework/bean.ts
@@ -7,5 +7,5 @@ export class CategoryRequest {
 export class FrameworkDetailsRequest {
     frameworkId?: string;
     refreshFrameworkDetails?: boolean = false;
-    defaultFrameworkDetails: boolean = true;
+    defaultFrameworkDetails: boolean = false;
 }
diff --git a/src/services/framework/framework.service.ts b/src/services/framework/framework.service.ts
@@ -74,6 +74,29 @@ export class FrameworkService {
     successCallback: (response: string) => void,
     errorCallback: (error: string) => void) {
 
+    if (this.updatedFrameworkResponseBody.result == undefined
+      || request.frameworkId !== this.updatedFrameworkResponseBody.result.framework.identifier) {
+      let fr = new FrameworkDetailsRequest();
+      if (request.frameworkId !== undefined
+        && request.frameworkId !== "") {
+        fr.frameworkId = request.frameworkId;
+      } else {
+        fr.defaultFrameworkDetails = true;
+      }
+      this.getFrameworkDetails(fr, r => {
+        this.getCategory(request, successCallback, errorCallback);
+      }, e => {
+        //ignore as of now
+        errorCallback(e);
+      })
+    } else {
+      this.getCategory(request, successCallback, errorCallback);
+    }
+  }
+
+  private getCategory(request: CategoryRequest,
+    successCallback: (response: string) => void,
+    errorCallback: (error: string) => void) {
     if (request.prevCategory && request.selectedCode) {
       let filteredCategory = this.currentCategories.filter(c => {
         return c.code === request.prevCategory;
@@ -84,7 +107,7 @@ export class FrameworkService {
         }
         return request.selectedCode!.some(check);
       });
-      
+
       let check2 = function (element) {
         return element.associations !== undefined;
       }
@@ -100,7 +123,7 @@ export class FrameworkService {
         successCallback(JSON.stringify(Array.from(map.values())));
         return;
       }
-      
+
     }
 
     let nextCategories = this.currentCategories.filter(c => {