From 3908eac19395077a20537b9946290472c896f6e8 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 9 Dec 2021 18:03:15 +0100
Subject: [PATCH 1/2] Improve

---
 src/app/guards/auth.guard.ts          |  1 +
 src/app/pages/agenda/agenda.page.html | 14 +++++-----
 src/app/pages/agenda/agenda.page.scss | 37 +++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts
index b493d2813..6d859eafe 100644
--- a/src/app/guards/auth.guard.ts
+++ b/src/app/guards/auth.guard.ts
@@ -19,6 +19,7 @@ export class AuthGuard implements CanActivate {
     
     if(!SessionStore.user.Inactivity) {
       this.router.navigate(['/']);
+      return false
     }
     else if(!SessionStore.exist) {
       this.router.navigate(['/']);
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index da4a939b0..3723d055b 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -28,8 +28,8 @@
                 <ion-row class="ion-align-items-center">
                   <!-- Move back one screen of the slides -->
 
-                  <div class="arrow cursor-pointer">
-                    <button (click)="back()" class="btn-no-color" >
+                  <div class="arrow cursor-pointer resize">
+                    <button (click)="back()" class="btn-no-color resize" >
                       <ion-icon *ngIf="ThemeService.currentTheme == 'default' "  slot="icon-only"  src="assets/images/icons-calendar-arrow-left.svg"></ion-icon>
                       <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="icon-only"  src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
                       <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' "  slot="icon-only"  src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
@@ -102,7 +102,7 @@
                     </div>
                   </div> -->
                   <!-- Move forward one screen of the slides -->
-                  <div (click)="next()" class="arrow cursor-pointer">
+                  <div (click)="next()" class="arrow cursor-pointer resize">
                     <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " slot="icon-only" src="assets/images/icons-calendar-arrow-right.svg"></ion-icon>
                     <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " slot="icon-only" src="assets/images/theme/gov/icons-calendar-arrow-right.svg"></ion-icon>
                     <ion-icon  *ngIf="ThemeService.currentTheme == 'tribunal' " slot="icon-only" src="assets/images/theme/gov/icons-calendar-arrow-right.svg"></ion-icon>
@@ -111,21 +111,21 @@
                 </ion-row>
                 <ion-row class="ion-align-items-center">
 
-                  <button *ngIf="profile == 'mdgpr' && loggeduser.Profile =='MDGPR' " (click)="changeProfile()" class="d-md-none btn-no-color">
+                  <button *ngIf="profile == 'mdgpr' && loggeduser.Profile =='MDGPR' " (click)="changeProfile()" class="d-md-none btn-no-color resize">
                     <ion-icon class="right-icons" src="assets/images/icons-profile-calendar-md.svg"></ion-icon>
                   </button>
 
-                  <button  *ngIf="profile == 'pr' && loggeduser.Profile =='MDGPR' " (click)="changeProfile()" class="btn-no-color">
+                  <button  *ngIf="profile == 'pr' && loggeduser.Profile =='MDGPR' " (click)="changeProfile()" class="btn-no-color resize">
                     <ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg"></ion-icon>
                   </button>
 
-                  <button class="btn-no-color cursor-pointer" (click)="viewEventsToApprove()" *ngIf="loggeduser.Profile == 'MDGPR'">
+                  <button class="btn-no-color cursor-pointer resize" (click)="viewEventsToApprove()" *ngIf="loggeduser.Profile == 'MDGPR'">
                     <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " class="right-icons" src="assets/images/icons-received-event.svg"></ion-icon>
                     <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " class="right-icons" src="assets/images/theme/gov/icons-received-event.svg"></ion-icon>
                     <ion-icon  *ngIf="ThemeService.currentTheme == 'tribunal' " class="right-icons" src="assets/images/theme/tribunal/icons-received-event.svg"></ion-icon>
                   </button>
 
-                  <button class="btn-no-color cy-add-event cursor-pointer" (click)="clearContact();openAddEvent();">
+                  <button class="btn-no-color cy-add-event cursor-pointer resize" (click)="clearContact();openAddEvent();">
                     <ion-icon *ngIf="ThemeService.currentTheme == 'default' "   class="right-icons" src="assets/images/icons-add.svg" ></ion-icon>
                     <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "   class="right-icons" src="assets/images/theme/gov/icons-add.svg" ></ion-icon>
                     <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' "   class="right-icons" src="assets/images/theme/tribunal/icons-add.svg" ></ion-icon>
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 171a72a24..543d67ed8 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -801,6 +801,43 @@ app-approve-event{
 
 }
 
+@media only screen and (max-width: 415px) {
+  .capitaliseText {
+    font-size: 18px;
+  }
+  .resize{
+    font-size: 33px !important;
+    ion-icon{
+      font-size: 33px !important;
+    }
+  }
+}
+
+@media only screen and (max-width: 398px) {
+  .capitaliseText {
+    font-size: 15px;
+  }
+  .resize{
+    font-size: 27px !important;
+    ion-icon{
+      font-size: 27px !important;
+    }
+  }
+}
+
+
+@media only screen and (max-width: 364px) {
+  .capitaliseText {
+    font-size: 13px;
+  }
+  .resize{
+    font-size: 23px !important;
+    ion-icon{
+      font-size: 23px !important;
+    }
+  }
+}
+
 
  
  

From 3946384696e5716b8c7d0a0cbce2f5adeebbacff Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 9 Dec 2021 18:53:23 +0100
Subject: [PATCH 2/2] add red line into input incase of an error

---
 src/app/pages/agenda/agenda.page.html               | 8 ++++----
 src/app/pages/agenda/agenda.page.ts                 | 2 +-
 src/app/pages/agenda/new-event/new-event.page.html  | 2 +-
 src/app/shared/agenda/new-event/new-event.page.html | 7 ++++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 3723d055b..e755593ce 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -194,7 +194,7 @@
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps btn-no-color" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="collaps btn-no-color" src="assets/images/theme/tribunal/icons-collaps-up.svg" ></ion-icon>
               </button>
-              <button  class="btn-no-color" *ngIf="!showCalendar" (click)="calendarHeight='320px';showCalendar=true">
+              <button  class="btn-no-color" *ngIf="!showCalendar" (click)="calendarHeight='316px';showCalendar=true">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps btn-no-color" src="assets/images/icons-collaps-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps btn-no-color" src="assets/images/theme/gov/icons-collaps-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " class="collaps btn-no-color" src="assets/images/theme/tribunal/icons-collaps-down.svg" ></ion-icon>
@@ -205,10 +205,10 @@
             <ion-row class="timeline-date align-center">
               <span *ngIf="timelineIsCurrentDate()">Hoje, &nbsp;</span> {{ timelineDate }}
             </ion-row>
-            <ion-row class="filter ion-align-items-center">
-              <div class="filter-name">{{timelineFilterState}}</div>
+            <ion-row class="filter ion-align-items-center" >
+              <div class="filter-name" (click)="showTimelineFilterState=!showTimelineFilterState">{{timelineFilterState}}</div>
               <!-- Icon -->
-              <button  (click)="showTimelineFilterState=!showTimelineFilterState" class="arrow-down btn-no-color">
+              <button   class="arrow-down btn-no-color" (click)="showTimelineFilterState=!showTimelineFilterState">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " style="font-size: 19pt;" src="assets/images/icons-arrow-arrow-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " style="font-size: 19pt;" src="assets/images/theme/gov/icons-arrow-arrow-down.svg" ></ion-icon>
                 <ion-icon *ngIf="ThemeService.currentTheme == 'tribunal' " style="font-size: 19pt;" src="assets/images/theme/gov/icons-arrow-arrow-down.svg" ></ion-icon>
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index ec5221a8f..a3935ab61 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -204,7 +204,7 @@ export class AgendaPage implements OnInit {
       this.profile = "pr";
     }
 
-    this.calendarHeight = "320px";
+    this.calendarHeight = "316px";
     this.showCalendar = true;
     this.timelineDate = momentG(new Date(), 'dd MMMM yyyy');
 
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 1a6b55b81..9fc9309f4 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -269,7 +269,7 @@
       </ion-label>
     </div>
 
-    <div   *ngFor="let document of documents; let i = index" >
+    <div  *ngFor="let document of documents; let i = index" >
       <ion-list class="list">
         <ion-item>
         <ion-label>
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 9c068535c..b7ecf060c 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -93,8 +93,9 @@
         </div>
       </div>
     </div>
+
     <div class="container-div">
-      <div class="ion-item-class-2 d-flex">
+      <div class="ion-item-class-2 d-flex" >
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
         </div>
@@ -102,7 +103,7 @@
         <!--
           [className]="Form?.get('Subject')?.invalid ? 'input-error ion-input-class  flex-grow-1' : 'ion-input-class  ion-input-class  flex-grow-1' "
          -->
-        <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top">
+        <div  class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
           <mat-form-field class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="picker1"
@@ -133,7 +134,7 @@
         <!--
           [className]="Form?.get('Subject')?.invalid ? 'input-error ion-input-class  flex-grow-1' : 'ion-input-class  ion-input-class  flex-grow-1' "
          -->
-        <div (click)="openFim()" class="ion-input-class flex-grow-1 justify-center align-center materia-top" [class.input-error]="Form?.get('dateEnd')?.invalid  && validateFrom ">
+        <div (click)="openFim()" class="ion-input-class flex-grow-1 justify-center align-center materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
 
           <mat-form-field class="date-hour-picker">
             <input matInput [ngxMatDatetimePicker]="fim"