評価取り込み３回目

r-ujihara
1 parent 00c83ad5
Showing 10 changed files with 85 additions and 48 deletions
src/pages/extqa/extqa.html
src/pages/extqa/extqa.ts
src/pages/extunit/extunit.ts
src/pages/menu/menu.html
src/pages/qa/qa.html
src/pages/qa/qa.ts
src/pages/status/status.html
src/pages/status/status.ts
src/pages/unit/unit.html
src/providers/data-service.ts
--- a/src/pages/extqa/extqa.html
View file @0931166
+++ b/src/pages/extqa/extqa.html
View file @0931166
@@ -42,13 +42,16 @@
     <ion-card *ngIf="buttonDisabled" class="answer-card">
         <ion-card-content class="answer-content">
-            <ion-item>
-                <ion-thumbnail item-left>
-                    <img src="assets/img/ok.png" *ngIf="result == '正解'">
-                    <img src="assets/img/ng.png" *ngIf="result != '正解'">
-                </ion-thumbnail>
-                <ion-card-title color="{{resultcolor}}">{{result}}</ion-card-title>
-            </ion-item>
+            <ion-grid>
+                <ion-row align-items-center>
+                    <ion-col>
+                        <img src="assets/img/ok.png" *ngIf="result == '正解'">
+                        <img src="assets/img/ng.png" *ngIf="result != '正解'">
+                    </ion-col>
+                    <ion-col col-auto><font size="5" [innerHTML] = "result" [color]="result != '正解' ? 'blue' : 'red'"></font></ion-col>
+                    <ion-col></ion-col>
+                </ion-row>
+            </ion-grid>
             <p><br>解答</p>
             <font size="5" [innerHTML] = "qa1.answerString"></font>
--- a/src/pages/extqa/extqa.ts
View file @0931166
+++ b/src/pages/extqa/extqa.ts
View file @0931166
@@ -30,7 +30,6 @@ export class ExtqaPage {
     nv: NavController;
     selected: number;
     result: string;
-    resultcolor: string;
     selectstate: Array<boolean> = new Array();
     subscription;
     screenHeight:number;
@@ -65,22 +64,20 @@ export class ExtqaPage {
       }
       this.selectstate[id] = true;
       this.selected = id;
+      this.content.scrollToBottom(300);
   }
   openAnswer() {
       if (this.buttonDisabled == null)
       {
           this.result = "解答";
-          this.resultcolor = "dark";
           if (this.selected === this.qa1.answerId) {  //正解
               this.result = "正解";
-              this.resultcolor = "danger";
               this.positiveCnt++;
           }
           else {
               this.result = "不正解";
-              this.resultcolor = "primary";
           }
           this.buttonDisabled = true;
--- a/src/pages/extunit/extunit.ts
View file @0931166
+++ b/src/pages/extunit/extunit.ts
View file @0931166
@@ -24,6 +24,7 @@ export class ExtunitPage {
     list1num: number;
     currentItem: Unit;
+    positiveCnt: number;
   constructor(public navCtrl: NavController, public navParams: NavParams,  private dataSevice: DataService) {
       this.menuId = navParams.get("menuId");
@@ -53,6 +54,14 @@ export class ExtunitPage {
     }
   }
+  ionViewWillLeave(){
+      var key: string;
+      var value: string;
+      key = this.menuId.toString() + "ext";
+      value = this.positiveCnt.toString();
+      this.dataSevice.savePositiveInfo(key, value);
+  }
+
   itemSelected(item: Unit) {
       this.currentItem = item;
       this.navCtrl.push(ExtqaPage,{menuId: this.menuId, unitId: item.unitId, title:item.unitName});
@@ -77,6 +86,7 @@ export class ExtunitPage {
               {
                   var svdata = val[i].toString().split(":");
                   this.list1state[i] = svdata[1] + "問中" + svdata[0] + "問正解！";
+                  this.positiveCnt = +svdata[0];
               }
           }
       });
--- a/src/pages/menu/menu.html
View file @0931166
+++ b/src/pages/menu/menu.html
View file @0931166
@@ -7,7 +7,7 @@
 <ion-header>
   <ion-navbar color="primary">
-    <ion-title>Top</ion-title>
+    <ion-title text-center>Top</ion-title>
   </ion-navbar>
 </ion-header>
--- a/src/pages/qa/qa.html
View file @0931166
+++ b/src/pages/qa/qa.html
View file @0931166
@@ -38,13 +38,17 @@
     <ion-card *ngIf="buttonDisabled" class="answer-card">
         <ion-card-content class="answer-content">
-            <ion-item>
-                <ion-thumbnail item-left>
-                    <img src="assets/img/ok.png" *ngIf="result == '正解'">
-                    <img src="assets/img/ng.png" *ngIf="result != '正解'">
-                </ion-thumbnail>
-                <ion-card-title color="{{resultcolor}}">{{result}}</ion-card-title>
-            </ion-item>
+            <ion-grid>
+                <ion-row align-items-center>
+                    <ion-col>
+                        <img src="assets/img/ok.png" *ngIf="result == '正解'">
+                        <img src="assets/img/ng.png" *ngIf="result != '正解'">
+                    </ion-col>
+                    <ion-col col-auto><font size="5" [innerHTML] = "result" [color]="result != '正解' ? 'blue' : 'red'"></font></ion-col>
+                    <ion-col>
+                    </ion-col>
+                </ion-row>
+            </ion-grid>
             <p><br>解答</p>
             <font size="5" [innerHTML] = "qa1.answerString"></font>
--- a/src/pages/qa/qa.ts
View file @0931166
+++ b/src/pages/qa/qa.ts
View file @0931166
@@ -30,7 +30,6 @@ export class QaPage {
     nv: NavController;
     selected: number;
     result: string;
-    resultcolor: string;
     selectstate: Array<boolean> = new Array();
     subscription;
     screenHeight:number;
@@ -68,22 +67,20 @@ export class QaPage {
       }
       this.selectstate[id] = true;
       this.selected = id;
+      this.content.scrollToBottom(300);
   }
   openAnswer() {
       if (this.buttonDisabled == null)
       {
           this.result = "解答";
-          this.resultcolor = "dark";
           if (this.selected === this.qa1.answerId) {  //正解
               this.result = "正解";
-              this.resultcolor = "danger";
               this.positiveCnt++;
           }
           else {
               this.result = "不正解";
-              this.resultcolor = "primary";
           }
           this.buttonDisabled = true;
--- a/src/pages/status/status.html
View file @0931166
+++ b/src/pages/status/status.html
View file @0931166
@@ -15,55 +15,55 @@
       <ion-item-divider color="light">>
         {{list_f[0].title}}
       </ion-item-divider>
-          <canvas #baseChart0 height="70" class="status-canvas"></canvas>
+          <canvas #baseChart0 height="120" class="status-canvas"></canvas>
     </ion-item-group>
     <ion-item-group>
       <ion-item-divider color="light">>
         {{list_f[1].title}}
       </ion-item-divider>
-          <canvas #baseChart1 height="70" class="status-canvas"></canvas>
+          <canvas #baseChart1 height="120" class="status-canvas"></canvas>
     </ion-item-group>
     <ion-item-group>
       <ion-item-divider color="light">>
         {{list_f[2].title}}
       </ion-item-divider>
-          <canvas #baseChart2 height="70" class="status-canvas"></canvas>
+          <canvas #baseChart2 height="120" class="status-canvas"></canvas>
     </ion-item-group>
     <ion-item-group>
       <ion-item-divider color="light">>
         {{list_f[3].title}}
       </ion-item-divider>
-          <canvas #baseChart3 height="70" class="status-canvas"></canvas>
+          <canvas #baseChart3 height="120" class="status-canvas"></canvas>
     </ion-item-group>
     <ion-item-group>
       <ion-item-divider color="light">>
         {{list_f[4].title}}
       </ion-item-divider>
-          <canvas #baseChart4 height="70" class="status-canvas"></canvas>
+          <canvas #baseChart4 height="120" class="status-canvas"></canvas>
     </ion-item-group>
     <ion-item-group>
       <ion-item-divider color="light">>
         {{list_f[5].title}}
       </ion-item-divider>
-          <canvas #baseChart5 height="70" class="status-canvas"></canvas>
+          <canvas #baseChart5 height="120" class="status-canvas"></canvas>
     </ion-item-group>
     <ion-item-group>
       <ion-item-divider color="light">>
         {{list_f[6].title}}
       </ion-item-divider>
-          <canvas #baseChart6 height="70" class="status-canvas"></canvas>
+          <canvas #baseChart6 height="120" class="status-canvas"></canvas>
     </ion-item-group>
     <ion-item-group>
       <ion-item-divider color="light">>
         {{list_f[7].title}}
       </ion-item-divider>
-          <canvas #baseChart7 height="70" class="status-canvas"></canvas>
+          <canvas #baseChart7 height="120" class="status-canvas"></canvas>
     </ion-item-group>
 </ion-content>
--- a/src/pages/status/status.ts
View file @0931166
+++ b/src/pages/status/status.ts
View file @0931166
@@ -57,7 +57,7 @@ export class StatusPage {
             }
         }],
         yAxes: [{
-            barThickness: 20
+            barThickness: 30
         }]
     }
@@ -71,11 +71,11 @@ export class StatusPage {
   constructor(public navCtrl: NavController, public navParams: NavParams, private dataSevice: DataService) {
     this.list_f = dataSevice.getMenuFirst();
-    for(var i = 0; i < this.list_f.length; i++){
-//        this.chartLabels.push(this.list_f[i].title);
-    }
-    this.chartLabels.push("");
+//    this.chartLabels.push("");
+    this.chartLabels.push("基礎");
+    this.chartLabels.push("応用");
+
     this.getChartData();
   }
@@ -103,20 +103,23 @@ export class StatusPage {
       var key: string;
       key = this.list_f[i].menuId.toString();
       promiseArray1.push(this.dataSevice.getInfo(key));
+      promiseArray1.push(this.dataSevice.getInfo(key+"ext"));
     }
     Promise.all(promiseArray1)
     .then(val =>
     {
-      for(var i = 0; i< this.list_f.length; i++)
+      for(var i = 0; i< (this.list_f.length * 2); i++)
       {
           var cdata: ChartData = { label:'正答率', 
                                    data: new Array(),
-                                   backgroundColor:['rgba(255, 99, 132, 0.2)'],
-                                   borderColor:['rgba(255,99,132,1)'],
+                                   backgroundColor:['rgba(255, 99, 132, 0.2)','rgba(255, 159, 64, 0.2)'],
+                                   borderColor:['rgba(255,99,132,1)','rgba(255, 159, 64, 1)'],
                                    borderWidth:2 };
           var num: number;
           var score: number;
+          var numext: number;
+          var scoreext: number;
           if(val[i] == null)
           {
             num = 0;
@@ -125,12 +128,25 @@ export class StatusPage {
           {
             num = +val[i];
           }
-          score = Math.floor((num / this.dataSevice.getQaCnt(this.list_f[i].menuId)) * 100);
+          if(val[i+1] == null)
+          {
+            numext = 0;
+          }
+          else
+          {
+            numext = +val[i+1];
+          }
+          score = Math.floor((num / this.dataSevice.getQaCnt(this.list_f[i / 2].menuId)) * 100);
 //          score = 10*i + 10;
+          scoreext = Math.floor((numext / this.dataSevice.getExtQaCnt(this.list_f[i / 2].menuId)) * 100);
           cdata.data.push(score);
+          cdata.data.push(scoreext);
+
           this.chartData = new Array();
           this.chartData.push(cdata);
-          this.getChart(this.getCanvas(i).nativeElement);
+          this.getChart(this.getCanvas(i / 2).nativeElement);
+
+          i++;
       }
     });
--- a/src/pages/unit/unit.html
View file @0931166
+++ b/src/pages/unit/unit.html
View file @0931166
@@ -45,7 +45,7 @@
       </ion-card-header>
       <ion-fab right top>
-        <button ion-fab color="danger" mini>
+        <button ion-fab color="danger" >
           <ion-icon *ngIf="openkeyword1" name="bowtie"></ion-icon>
           <ion-icon *ngIf="openkeyword1 == false" name="key"></ion-icon>
         </button>
@@ -73,7 +73,7 @@
       <img src="assets/img/unitdisable.png" *ngIf="list2dsp == false"/>
       <ion-fab right top *ngIf="list2dsp">
-        <button ion-fab color="danger" mini>
+        <button ion-fab color="danger">
           <ion-icon *ngIf="openkeyword2" name="bowtie"></ion-icon>
           <ion-icon *ngIf="openkeyword2 == false" name="key"></ion-icon>
         </button>
@@ -101,7 +101,7 @@
       <img src="assets/img/unitdisable.png" *ngIf="list3dsp == false"/>
       <ion-fab right top *ngIf="list3dsp">
-        <button ion-fab color="danger" mini>
+        <button ion-fab color="danger">
           <ion-icon *ngIf="openkeyword3" name="bowtie"></ion-icon>
           <ion-icon *ngIf="openkeyword3 == false" name="key"></ion-icon>
         </button>
@@ -129,7 +129,7 @@
       <img src="assets/img/unitdisable.png" *ngIf="list4dsp == false"/>
       <ion-fab right top *ngIf="list4dsp">
-        <button ion-fab color="danger" mini>
+        <button ion-fab color="danger">
           <ion-icon *ngIf="openkeyword4" name="bowtie"></ion-icon>
           <ion-icon *ngIf="openkeyword4 == false" name="key"></ion-icon>
         </button>
@@ -157,7 +157,7 @@
       <img src="assets/img/unitdisable.png" *ngIf="list5dsp == false"/>
       <ion-fab right top *ngIf="list5dsp">
-        <button ion-fab color="danger" mini>
+        <button ion-fab color="danger">
           <ion-icon *ngIf="openkeyword5" name="bowtie"></ion-icon>
           <ion-icon *ngIf="openkeyword5 == false" name="key"></ion-icon>
         </button>
@@ -185,7 +185,7 @@
       <img src="assets/img/unitdisable.png" *ngIf="list6dsp == false"/>
       <ion-fab right top *ngIf="list6dsp">
-        <button ion-fab color="danger" mini>
+        <button ion-fab color="danger">
           <ion-icon *ngIf="openkeyword6" name="bowtie"></ion-icon>
           <ion-icon *ngIf="openkeyword6 == false" name="key"></ion-icon>
         </button>
@@ -213,7 +213,7 @@
       <img src="assets/img/unitdisable.png" *ngIf="list7dsp == false"/>
       <ion-fab right top *ngIf="list7dsp">
-        <button ion-fab color="danger" mini>
+        <button ion-fab color="danger">
           <ion-icon *ngIf="openkeyword7" name="bowtie"></ion-icon>
           <ion-icon *ngIf="openkeyword7 == false" name="key"></ion-icon>
         </button>
--- a/src/providers/data-service.ts
View file @0931166
+++ b/src/providers/data-service.ts
View file @0931166
@@ -110,6 +110,16 @@ export class DataService {
       return num;
   }
+  public getExtQaCnt(menuId:number): number {
+      var num = 0;
+      for (var i = 0; i < this.extqa.length; i++) {
+          if (this.extqa[i].menuId === menuId) {
+              num++;
+          }
+      }
+      return num;
+  }
+
   public getQa(menuId: number, unitId: number): Qa[] {
       var qaItem: Qa[] = new Array();
       for (var i = 0; i < this.subject.length; i++) {