From 6bec3c7f8baefb3f4d0cf963825457cf2ed00bd2 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 16 Dec 2022 18:16:19 +0100
Subject: [PATCH] save

---
 src/app/pages/agenda/agenda.page.html         | 26 +++++++++----------
 src/app/pages/agenda/agenda.page.scss         |  6 ++---
 .../agenda/new-event/new-event.page.html      |  4 +--
 .../agenda/new-event/new-event.page.html      |  4 +--
 .../shared/agenda/new-event/new-event.page.ts |  3 +++
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 6cefd8036..5cb8bd0b2 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -264,11 +264,11 @@
 
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
 
-                        <div *ngIf="!event.endMany && !event.middle" class="time-start labelb">Início...</div>
-                        <div *ngIf="event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="event.startMany && !event.middle" class="time-start labelb">Início</div>
+                        <div *ngIf="event.endMany && !event.middle " class="time-end labelb">Fim</div>
 
-                        <div *ngIf="!event.startMany && !event.middle" class="time-end labelb">Fim...</div>
-                        <div *ngIf="event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}} </div>
+                        <div *ngIf="!(event.endMany && !event.middle) && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="!(event.startMany && !event.middle) && !event.middle" class="time-end"> {{event.event.EndDate | date: 'HH:mm'}} </div>
 
                         <div *ngIf="event.middle" class="time-start"> Todo </div>
                         <div *ngIf="event.middle" class="time-end text-center"> o dia </div>
@@ -306,13 +306,12 @@
                     <div  class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)"
                     >
 
-                    <!-- Shared -->
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
-                        <div *ngIf="event.endMany && !event.middle" class="time-start labelb">Início</div>
-                        <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="event.startMany && !event.middle" class="time-start labelb">Início</div>
+                        <div *ngIf="event.endMany && !event.middle " class="time-end labelb">Fim</div>
 
-                        <div *ngIf="event.startMany && !event.middle" class="time-end labelb">Fim</div> 
-                        <div *ngIf="!event.startMany && !event.middle " class="time-end">{{event.event.EndDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="!(event.endMany && !event.middle) && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="!(event.startMany && !event.middle) && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}} </div>
 
                         <div *ngIf="event.middle" class="time-start"> Todo </div>
                         <div *ngIf="event.middle" class="time-end text-center"> o dia </div>
@@ -337,6 +336,7 @@
               </div>
             </div>
             
+            <!-- shared desktop -->
             <div  class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pl-20 pr-20 width-100 height-100 overflow-y-auto" *ngIf="SessionStore.user.SharedCalendars.length != 0 || SessionStore.user.Profile == 'PR' " >
               <div *ngFor="let events of TimelinePRList | keyvalue;">
 
@@ -352,12 +352,12 @@
 
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="event.startMany && !event.middle" class="time-start labelb">Início</div>
-                        <div *ngIf="!event.startMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="event.endMany && !event.middle " class="time-end labelb">Fim</div>
 
-                        <div *ngIf=" event.endMany && !event.middle" class="time-end labelb">Fim4</div>
-                        <div *ngIf="!event.endMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}} </div>
+                        <div *ngIf="!(event.endMany && !event.middle) && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="!(event.startMany && !event.middle) && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}} </div>
 
-                        <div *ngIf="event.middle" class="time-start"> Todo {{ event.startMany }}   </div>
+                        <div *ngIf="event.middle" class="time-start"> Todo </div>
                         <div *ngIf="event.middle" class="time-end text-center"> o dia </div>
 
                       </div>
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 970c808a1..b7f934b9e 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -486,12 +486,12 @@ td.monthview-primary-with-event {
     margin-right: 10px;
     min-width: 33px;
     .time-start{
-      color: #797979 ;
+      color: #797979 !important;
       font-family: Roboto;
       font-size: 13px;
     }
     .time-end{
-      color: #797979 ;
+      color: #797979 !important;
       font-family: Roboto;
       font-size: 13px;
     }
@@ -916,7 +916,7 @@ $font-size: 11pt;
 }
 
 
+
 .labelb {
   font-weight: 500;
-    color: red !important;
 }
\ No newline at end of file
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 8f5bc6aca..fe411fa7d 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -171,7 +171,7 @@
       </div>
     </div>
 
-    <div class="container-div width-100">
+    <!-- <div class="container-div width-100">
       <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
@@ -192,7 +192,7 @@
 
         </div>
       </div>
-    </div>
+    </div> -->
 
     <div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100">
       <div class="ion-item-class-2 d-flex">
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 9bbde70e1..34b8207b2 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -176,7 +176,7 @@
     </div>
 
 
-    <div class="container-div width-100">
+    <!-- <div class="container-div width-100">
       <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
@@ -197,7 +197,7 @@
 
         </div>
       </div>
-    </div>
+    </div> -->
 
     <div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100">
       <div class="ion-item-class-2 d-flex">
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index 85e57ee61..e4ecf5002 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -376,7 +376,10 @@ export class NewEventPage implements OnInit {
     this.clearContact.emit();
     this.setIntervenient.emit([]);
     this.setIntervenientCC.emit([]);
+    // chat exit
     this.backToChat.emit({roomId:this.roomId})
+    // agenda exit
+    this.cloneAllmobileComponent.emit({})
   }
 
   getRecurrenceTypes() {