789

questionnair/src/app/page2/page2.component.ts

@@ -51,16 +51,7 @@ export class Page2Component implements OnInit {
      options.forEach(option => {
      options.forEach(option => {
         if (option['selected']) {
         if (option['selected']) {
           this.selectedObj = option;
           this.selectedObj = option;
-          const ret = {
-            pageId: this.curPageData['pageId'],
-            questions: [
-              {
-                questionId: this.curPageData['questions'][0].questionId,
-                options: [this.selectedObj]
-              }
-            ]
-          }
-          this.getAllAnswer.emit(ret);
+          this.getAnswer(this.selectedObj)
         }
         }
       })
       })
   }
   }

questionnair/src/app/page5/page5.component.ts

@@ -45,16 +45,7 @@ export class Page5Component implements OnInit {
     options.forEach(option => {
     options.forEach(option => {
       if (option['selected']) {
       if (option['selected']) {
         this.selectedObj = option;
         this.selectedObj = option;
-        const ret = {
-          pageId: this.curPageData['pageId'],
-          questions: [
-            {
-              questionId: this.curPageData['questions'][0].questionId,
-              options: [this.selectedObj]
-            }
-          ]
-        }
-        this.getAllAnswer.emit(ret);
+        this.getAnswer(this.selectedObj)
       }
       }
     })
     })
   }
   }

questionnair/src/app/page7/page7.component.ts

@@ -53,7 +53,14 @@ export class Page7Component implements OnInit {
         if (option['selected']) {
         if (option['selected']) {
           // console.log(this.selectedObj)
           // console.log(this.selectedObj)
           this.selectedObj[question['questionId']] = option
           this.selectedObj[question['questionId']] = option
-          
+          const questions = Object.keys(this.curAllQues).map(questionId => {
+            return { questionId, options: [this.curAllQues[questionId]] }
+          })
+          const ret = {
+            pageId: 7,
+            questions
+          }
+          this.getAllAnswer.emit(ret)
         }
         }
       })
       })
     })
     })

questionnair/src/app/page8/page8.component.ts

@@ -53,6 +53,14 @@ export class Page8Component implements OnInit {
       question['options'].forEach(option => {
       question['options'].forEach(option => {
         if (option['selected']) {
         if (option['selected']) {
           this.selectedObj[question['questionId']] = option
           this.selectedObj[question['questionId']] = option
+          const questions = Object.keys(this.curAllQues).map(questionId => {
+            return { questionId, options: [this.curAllQues[questionId]] }
+          })
+          const ret = {
+            pageId: 8,
+            questions
+          }
+          this.getAllAnswer.emit(ret)
         }
         }
       })
       })
     })
     })

questionnair/src/app/page9/page9.component.ts

@@ -50,6 +50,14 @@ export class Page9Component implements OnInit {
       question['options'].forEach(option => {
       question['options'].forEach(option => {
         if (option['selected']) {
         if (option['selected']) {
           this.selectedObj[question['questionId']] = option
           this.selectedObj[question['questionId']] = option
+          const questions = Object.keys(this.curAllQues).map(questionId => {
+            return { questionId, options: [this.curAllQues[questionId]] }
+          })
+          const ret = {
+            pageId: 9,
+            questions
+          }
+          this.getAllAnswer.emit(ret)
         }
         }
       })
       })
     })
     })