Merge branch 'dev' into 105-register-page-render-issues

Author: khoadnguyen

src/components/timeline/timeline.scss

@@ -113,20 +113,40 @@ timeline {
           }
         }
     }
-    .label-md{
-        margin: 13px 8px -15px 0;
+
+
+    .list-ios > .item-block:last-child, .list-ios > .item-wrapper:last-child .item-block{
+        border-bottom: none;
+    }
+
+    .list-ios > .item-block:first-child {
+        border-top: none;
+    }
+
+    .list-ios {
+        margin: -1px 0 20px !important;
     }
 
+    
+
     &:before {
         left: 3% !important;
     }
     .list, .list-md{
         margin-left:3% !important;
     }
 
+    .item.item-md .checkbox-md {
+        margin: -6px 14px 8px -35px !important;
+        padding-left: 4%;
+        padding-top: 2%;
+    }
+
     .checkbox-ios {
         // position: absolute !important;
         margin: -6px 14px 8px -35px !important;
+        padding-left: 4%;
+        padding-top: 2%;
     }
 
 

src/pages/dashboard/dashboard.ts

@@ -32,19 +32,12 @@ export class DashboardPage {
           {
             backgroundColor: ["rgba(0,0,255, .6)", "rgba(255,0,0, .6)", "rgba(128,0,128, .6)", "rgba(0,128,0, .6)", "rgba(255,165,0, .6)", "rgba(0,128,128, .6)", "rgba(255,0,255, .6)", "rgba(0,255,0, .6)"],
             borderColor: "black",
-            data: [10, 0, 5, 2, 2, 5, 8, 1]
+            data: [1, 1, 1, 1, 1, 1, 1, 2]
           }
         ]
       },
 
       options: {
-        scales: {
-          ticks: {
-            beginAtZero: true,
-            min: 0,
-            max: 10
-          },
-        },
         layout: {
           padding: {
             top: 55,
@@ -87,12 +80,10 @@ export class DashboardPage {
         }
       }
     });
-  //This code down below is to fix a bug where I could not modify the scale in the options
+    //This code down below is to fix a bug where I could not modify the scale in the options
     //key in the above code (It threw a typescript error even though it worked)
-    this.chart.config.options.scale.ticks.beginAtZero = true;
     this.chart.config.options.scale.ticks.min = 0;
     this.chart.config.options.scale.ticks.max = 10;
-    this.chart.config.options.scale.ticks.stepSize = 1;
     this.chart.update();
   }
 

src/pages/transition/transition.html

@@ -21,12 +21,14 @@
       <ion-card-header>
         <div id="categoryAndRange">
           <h1 id="category">{{area.title}}</h1>
-          <ion-range id="range" min="0" max="10" step="1" snaps="true" [(ngModel)]="area.number" (ionChange)="changeData(i, area.number)"></ion-range>
+          <button (click)="toggleSection(area)">View</button>
         </div>
-        <button (click)="toggleSection(area)">View</button>
       </ion-card-header>
-      <ion-card-content id="areaDescription" *ngIf="area.expand">
-        {{area.description}}
+      <ion-card-content id="areaDescription">
+        <span> {{area.intro}} </span>
+        <span *ngIf="!area.expand; else content"> ... </span>
+        <ng-template #content> {{ area.description }} </ng-template>
+        <ion-range id="range" min="0" max="10" step="1" snaps="true" [(ngModel)]="area.number" (ionChange)="changeData(i, area.number)"></ion-range>
       </ion-card-content>
     </ion-card>
   </ion-list>

src/pages/transition/transition.scss

@@ -11,7 +11,8 @@ page-transition {
     }
 
     #range {
-        width: 80%;
+        margin: auto;
+        width: 100%;
     }
 
     button {

src/pages/transition/transition.ts

@@ -28,49 +28,57 @@ export class TransitionPage {
       {
         title: 'Career',
         expand: false,
-        description: 'How is your career going? We spend a lot of time working so how is it for you? Does it excite you? Have you a clear idea what it is you want to achieve? If you are not working are you happy you know what it is you want to do and are taking steps to achieve this? Are you a 1 – you feel physically sick before you go to work each morning (and not because you have been enjoying the festive season too much) or are you a 10 – would you do your job without being paid for it?',
+        intro: 'How is your career going? We spend a lot of time working so how is it for you? Does it excite you? Have you a clear idea what it is you want to achieve?',
+        description: 'If you are not working are you happy you know what it is you want to do and are taking steps to achieve this? Are you a 1 – you feel physically sick before you go to work each morning (and not because you have been enjoying the festive season too much) or are you a 10 – would you do your job without being paid for it?',
         number: 0
       },
       {
         title: 'Finances',
         expand: false,
-        description: 'This is not about how much you have but rather how you relate to money. There are some millionaires who worry themselves sick about money so might score very low here and others who have just enough to get by and simply go with the flow. A 10 is someone totally at ease with money whereas a 1 is someone so worried about money that it is creating huge stress and limiting them in all their actions.',
+        intro: 'This is not about how much you have but rather how you relate to money. There are some millionaires who worry themselves sick about money so might score very low here and others who have just enough to get by and simply go with the flow.',
+        description: 'A 10 is someone totally at ease with money whereas a 1 is someone so worried about money that it is creating huge stress and limiting them in all their actions.',
         number: 0
       },
       {
         title: 'Personal Growth',
         expand: false,
-        description: 'People who are truly successful commit themselves continually to learning and improving themselves. Are you a 10 – committed to learning as much as you can about life? Are you constantly experiencing new opportunities? Do you regularly read to learn and grow? Are you open to improving and stretching yourself? The fact that you are reading this demonstrates a certain level of commitment to develop yourself so you are not a 1 or even a 2.',
+        intro: 'People who are truly successful commit themselves continually to learning and improving themselves. Are you a 10 – committed to learning as much as you can about life?',
+        description: ' Are you constantly experiencing new opportunities? Do you regularly read to learn and grow? Are you open to improving and stretching yourself? The fact that you are reading this demonstrates a certain level of commitment to develop yourself so you are not a 1 or even a 2.',
         number: 0
       },
       {
         title: 'Health',
         expand: false,
-        description: 'We all take our health for granted until it lets us down. How is yours? Do you look after yourself? Are you eating well? Do you get regular exercise? Having a long-term illness does not necessarily mean you need to give yourself a low score. The main thing is whether you are doing everything within your control to improve or regulate your condition.',
+        intro: 'We all take our health for granted until it lets us down. How is yours? Do you look after yourself? Are you eating well? Do you get regular exercise?',
+        description: 'Having a long-term illness does not necessarily mean you need to give yourself a low score. The main thing is whether you are doing everything within your control to improve or regulate your condition.',
         number: 0
       },
       {
         title: 'Family',
         expand: false,
-        description: 'Family life is very important. Although family life should be loving, caring and supportive it often is not for a variety of reasons such as crying babies, wild teenage sons or daughters or constant arguments and tension. These all represent a huge challenge and will affect other areas of your life like your work / studies, relationships and so on. In this respect family life to you could mean a single unit or a more extended family. Whatever family life means to you give yourself a current score.',
+        intro: 'Family life is very important. Although family life should be loving, caring and supportive it often is not for a variety of reasons such as crying babies, wild teenage sons or daughters or constant arguments and tension.',
+        description: ' These all represent a huge challenge and will affect other areas of your life like your work / studies, relationships and so on. In this respect family life to you could mean a single unit or a more extended family. Whatever family life means to you give yourself a current score.',
         number: 0
       },
       {
         title: 'Relationships',
         expand: false,
-        description: 'Consider the key relationship you have whether it is with your boyfriend/girlfriend husband/wife/friend or family member. Where do you feel it is at? Where would you like it to be?',
+        intro: 'Consider the key relationship you have whether it is with your boyfriend/girlfriend husband/wife/friend or family member.',
+        description: 'Where do you feel it is at? Where would you like it to be?',
         number: 0
       },
       {
         title: 'Social Life',
         expand: false,
-        description: 'This can be about the quality of your social life which can score very low for people with busy careers. However you can also decide to score it based on how you interact with people as how often you get to socialise. A vital component of life is the need to get on and interact with people. How comfortable you are in social situations? Some people are the life and soul of every party, loved by all and fully confident yet sensitive whereas others will not want to speak up when there is a group of people around. Give yourself a score. Remember for this one that most 1s are locked up. so you can rule out that score.',
+        intro: 'This can be about the quality of your social life which can score very low for people with busy careers. However you can also decide to score it based on how you interact with people as how often you get to socialise. A vital component of life is the need to get on and interact with people.',
+        description: 'How comfortable you are in social situations? Some people are the life and soul of every party, loved by all and fully confident yet sensitive whereas others will not want to speak up when there is a group of people around. Give yourself a score. Remember for this one that most 1s are locked up. so you can rule out that score.',
         number: 0
       },
       {
         title: 'Attitude',
         expand: false,
-        description: 'Attitude is vital and can influence every aspect of your life. Is your glass half full or half empty? Are you a positive person who notices all the good things that happen and comes up with solutions when things don’t go as planned or do you always expect the worse and the worse always seems to happen?',
+        intro: 'Attitude is vital and can influence every aspect of your life. Is your glass half full or half empty?',
+        description: 'Are you a positive person who notices all the good things that happen and comes up with solutions when things don’t go as planned or do you always expect the worse and the worse always seems to happen?',
         number: 0
       },
       {
@@ -144,12 +152,8 @@ export class TransitionPage {
 
     //This code down below is to fix a bug where I could not modify the scale in the options
     //key in the above code (It threw a typescript error even though it worked)
-    this.chart.config.options.scale.ticks.beginAtZero = true;
     this.chart.config.options.scale.ticks.min = 0;
     this.chart.config.options.scale.ticks.max = 10;
-    this.chart.config.options.scale.ticks.stepSize = 1;
-    this.chart.data.datasets.data = [0, 0, 0, 0, 0, 0, 0, 0];
-    this.chart.data.datasets.data[0] = 0;
     this.chart.update();
   }