Merge branch 'release/v2.1.0' into studies/type-specific-dynamic-form

IAM5K · Apr 10, 2024 · 7c17760 · 7c17760
2 parents cef9c32 + c61beef
commit 7c17760
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/app/models/data/studyOptions.data.ts b/src/app/models/data/studyOptions.data.ts
@@ -37,10 +37,12 @@ export class StudyOptionsData {
   ];
 
   public static studiesTypes: Options[] = [
+    { title: "Break", value: "break" },
     { title: "Learn", value: "learn" },
     { title: "Listen", value: "listen" },
     { title: "Practice", value: "practice" },
     { title: "Read", value: "read" },
+    { title: "Slept", value: "slept" },
     { title: "Write", value: "write" },
     { title: "Test", value: "test" },
   ];

diff --git a/src/app/pages/studies/studies.page.html b/src/app/pages/studies/studies.page.html
@@ -1,4 +1,11 @@
-<app-header [pageTitle]="pageTitle"></app-header>
+<ion-header [translucent]="true">
+  <ion-toolbar>
+    <ion-buttons slot="start">
+      <ion-menu-button></ion-menu-button>
+    </ion-buttons>
+    <ion-title>{{ pageTitle }}</ion-title>
+  </ion-toolbar>
+</ion-header>
 
 <ion-content [fullscreen]="true">
   <ion-header collapse="condense">
@@ -159,15 +166,13 @@ <h2 class="mt-0 h2" *ngIf="studiesCount !== 0">My Studies</h2>
             <ion-card-content>
               <p>
                 <span class="bold">Description:</span>
-                {{ study?.description }}
+                {{study?.description}}
               </p>
               <p>
-                <span class="bold">Date:</span>
-                {{ study?.startTime }}
-              </p>
-              <p>
-                <span class="bold">Answered By at</span>
-                {{ study?.endTime }}
+                <span class="bold">From:</span>
+                {{study?.startTime}}
+                <span class="bold">-</span>
+                {{study?.endTime}}
               </p>
               <ion-button
                 [attr.aria-label]="'Edit item ' + i"