Merge branch 'kevin' into 'master'

src/app/chartvisits/chartvisits.page.html

@@ -14,7 +14,7 @@
  <li *ngFor="let chart_data of chart_details; let i= index">
  <div class="list_main" (click)="toggleGroup(i)" [ngClass]="{active:isGroupShown(i)}">
  <div class="col floatLeft">
- <p>Office Vist Type</p>
+ <p>Office Visit Type</p>
  <h3><strong>{{chart_data.office_vist_type}}</strong></h3>
  </div>
  <!-- <div class="col floatLeft borderNone">

src/app/details/details.page.html

@@ -44,7 +44,7 @@
               </ion-col>
               <ion-col col>
                   <p>Gender</p>
-                  <h3>Male</h3>
+                  <h3>{{student_details.gender}}</h3>
               </ion-col>
             </ion-row>
     </div>
@@ -53,7 +53,7 @@
       <ul>
         <li (click)="goToPage('studentsprofile')">
           <img src="../../assets/imgs/m1.png" >
-          <p>Students<br> Profile</p>
+          <p>Student<br> Profile</p>
         </li>
         <li (click)="goToPage('healthcareforum')">
             <img src="../../assets/imgs/m2.png">

src/app/healthcareforum/healthcareforum.page.html

@@ -34,7 +34,7 @@
   </div>
   <div class="list_bar">
       <div class="col floatLeft">
-      <p>Uploaded By</p>
+      <p>School Year</p>
       <h3>{{health_formData.school_year}}</h3>
       </div>
       

src/app/healthhistory/healthhistory.page.html

@@ -4,7 +4,7 @@
   </ion-back-button>
   </button>
   <div class="nav_title floatLeft">
-  <h4>Medical Authorizations</h4>
+  <h4>Health History</h4>
   </div>
   <div class="clear"></div>
  </ion-header>

src/app/login/login.page.html

@@ -3,7 +3,7 @@
     <div class="login_top_div">
       <img src="../../assets/imgs/asset_logo_theme.png">
       <h3>Welcome Back</h3>
-      <p>Sigin in to Continue</p>
+      <p>Sign In to continue</p>
     </div>
     <div class="login_form">
       
@@ -51,7 +51,7 @@
         <form [formGroup]="signupForm" (ngSubmit)="OnLogin()">
       <div class="login_top_div">
         <h3>Welcome Back</h3>
-        <p>Sigin up to Continue</p>
+        <p>Sign In to continue</p>
       </div>
       <div class="login_form">
         <div class="row">
@@ -93,7 +93,7 @@
 </div>
       <br>
         <div class="row">
-            <ion-button expand="block" [disabled]="!signupForm.valid" (click)="user_signup()">Signup</ion-button>
+            <ion-button expand="block" [disabled]="!signupForm.valid" (click)="user_signup()">SIGN UP</ion-button>
         </div>
       </div>
     </form>

src/app/medicalauthorization/medicalauthorization.page.html

@@ -37,7 +37,7 @@
   </div>
   <div class="list_bar">
   <div class="col floatLeft">
-  <p>Tme of first medication</p>
+  <p>Time of first medication</p>
   <h3>{{medical_data.date_first_medicine}}{{medical_data.time_first_medicine}}</h3>
   </div>
   <div class="col floatLeft borderNone">

src/app/medicalhistory/medicalhistory.page.html

@@ -4,7 +4,7 @@
   </ion-back-button>
   </button>
   <div class="nav_title floatLeft">
-  <h4>Medical Authorizations</h4>
+  <h4>Medical History</h4>
   </div>
   <div class="clear"></div>
  </ion-header>