feat(#45) : redirection to summary on survey click if completed

CAUCA-9-1-1 · May 23, 2018 · 87ec624 · 87ec624
1 parent cf3afa0
commit 87ec624
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 39 deletions.
diff --git a/src/pages/inspection-question-summary/inspection-question-summary.html b/src/pages/inspection-question-summary/inspection-question-summary.html
@@ -6,7 +6,7 @@
 
 </ion-header>
 <ion-content class="outer-content">
-    <ion-list>
+    <ion-list style="padding-bottom: 5px;">
         <ion-item *ngFor="let category of inspectionQuestionSummaryCategory">
             <ion-list-header *ngIf="category.title != ''">
                 {{category.title | uppercase}}

diff --git a/src/pages/inspection-question-summary/inspection-question-summary.ts b/src/pages/inspection-question-summary/inspection-question-summary.ts
@@ -24,7 +24,6 @@ export class InspectionQuestionSummaryPage {
                 private messageTools: MessageToolsProvider,) {
 
         this.idInspection = this.navParams.get('idInspection');
-        this.idInspection = '8e6d8188-9733-4f1c-9ade-dc57adcdd533';
         this.loadInspectionQuestionSummary();
     }
 

diff --git a/src/pages/intervention-home/intervention-home.ts b/src/pages/intervention-home/intervention-home.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {AlertController, IonicPage, MenuController, NavController, NavParams} from 'ionic-angular';
+import {IonicPage, MenuController, NavController, NavParams} from 'ionic-angular';
 import {InterventionGeneralPage} from '../intervention-general/intervention-general';
 import {InterventionWaterSuppliesPage} from '../intervention-water-supplies/intervention-water-supplies';
 import {InterventionBuildingsPage} from '../intervention-buildings/intervention-buildings';
@@ -26,8 +26,7 @@ export class InterventionHomePage {
     constructor(public navCtrl: NavController,
                 public navParams: NavParams,
                 public menuCtrl: MenuController,
-                private controller: InspectionControllerProvider,
-                private alertCtrl: AlertController,) {
+                private controller: InspectionControllerProvider,) {
         controller.setIdInterventionForm(this.navParams.data['id']);
     }
 
@@ -48,46 +47,19 @@ export class InterventionHomePage {
     }
 
     goToInspectionQuestions() {
-        if (this.controller.inspectionDetail.isSurveyCompleted) {
-            this.SurveyNavigationPopup().present();
-        } else {
-            this.navCtrl.push('InspectionQuestionPage', {
+        if (this.controller.inspectionDetail.isSurveyCompleted)
+        {
+            this.navCtrl.push('InspectionQuestionSummaryPage', {idInspection: this.controller.idInspection});
+        }
+        else
+        {
+                this.navCtrl.push('InspectionQuestionPage', {
                 idInspection: this.controller.idInspection,
                 inspectionSurveyCompleted: this.controller.inspectionDetail.isSurveyCompleted
             });
         }
     }
 
-    SurveyNavigationPopup() {
-        let alert = this.alertCtrl.create();
-        alert.setTitle('Questionnaire d\'inspection');
-        alert.setMessage('Le questionnaire est déjà complété, que voulez-vous faire : ');
-        alert.addButton({
-            text: 'Recommencer le questionnaire', handler: () => {
-                alert.dismiss(true);
-                this.navCtrl.push('InspectionQuestionPage', {
-                    idInspection: this.controller.idInspection,
-                    inspectionSurveyCompleted: this.controller.inspectionDetail.isSurveyCompleted
-                });
-                return false;
-            }
-        });
-        alert.addButton({
-            text: 'Voir le résumé du questionnaire', handler: () => {
-                alert.dismiss(true);
-                this.navCtrl.push('InspectionQuestionSummaryPage', {idInspection: this.controller.idInspection});
-                return false;
-            }
-        });
-        alert.addButton({
-            text: 'Retourner au détail de l\'inspection', handler: () => {
-                alert.dismiss(true);
-                return false;
-            }
-        });
-        return alert;
-    }
-
     async goBackToInspectionList(){
         await this.navCtrl.popToRoot();
         await this.navCtrl.setRoot('InspectionListPage');