From 9e14fb0fce7f4ee45da66a279053839b04aa4c79 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 24 Feb 2022 13:35:54 +0100
Subject: [PATCH] improve

---
 .../chat/group-messages/group-messages.page.html |  1 +
 .../chat/group-messages/group-messages.page.scss |  9 +++++++++
 src/app/pages/chat/messages/messages.page.html   |  1 +
 src/app/pages/chat/messages/messages.page.scss   |  9 +++++++++
 .../approve-event/approve-event.page.html        | 15 +++++++++++++--
 .../agenda/approve-event/approve-event.page.html | 16 ++++++++++++++--
 .../shared/agenda/event-list/event-list.page.ts  |  4 ++--
 .../chat/group-messages/group-messages.page.html |  2 ++
 .../chat/group-messages/group-messages.page.scss |  9 +++++++++
 src/app/shared/chat/messages/messages.page.html  |  5 ++++-
 src/app/shared/chat/messages/messages.page.scss  |  8 ++++++++
 src/theme/variables.scss                         |  5 +++++
 12 files changed, 77 insertions(+), 7 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index 0554dbe80..9cd924709 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -187,6 +187,7 @@
 </ion-content>
 
 <ion-footer>
+  <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true" >A escrever...</div>
   <div class="container width-100 d-flex">
     <div>
       <button class="btn-no-color" (click)="openChatOptions()">
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss
index 74c83990c..46cd21731 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.scss
+++ b/src/app/pages/chat/group-messages/group-messages.page.scss
@@ -342,3 +342,12 @@
     position: absolute;
     z-index: 10;
 }
+
+
+.typing {
+  position: relative;
+  top: -34px;
+  height: 0px;
+  left: 0px;
+  margin-left: 22px;
+}
\ No newline at end of file
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index ccb179623..91459e6d2 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -163,6 +163,7 @@
 </ion-footer> -->
 
 <ion-footer>
+  <div class="typing" *ngIf="wsChatMethodsService.getDmRoom(roomId).otherUserType == true" >A escrever...</div>
   <ion-list hidden>
     <ion-item (click)="playFile(storedFileNames)">
       {{storedFileNames}}
diff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/pages/chat/messages/messages.page.scss
index 1b91e6802..55f17bf0b 100644
--- a/src/app/pages/chat/messages/messages.page.scss
+++ b/src/app/pages/chat/messages/messages.page.scss
@@ -303,3 +303,12 @@ display: block;
  float: left;
  padding-left: 10px;
 }
+
+
+.typing {
+  position: relative;
+  top: -34px;
+  height: 0px;
+  left: 0px;
+  margin-left: 22px;
+}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
index b1a4da7f5..1e0d1beaa 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
@@ -1,9 +1,20 @@
 <ion-header class="ion-no-border">
   <app-header></app-header>
 </ion-header>
-
 <ion-content id="main-content" class="container-wrapper">
-  <div class="main-content d-flex height-100" *ngIf="loadedEvent" >
+  
+
+  <div class="main-content d-flex flex-column height-100" *ngIf="loadedEvent" >
+    <div class="pl-20 pr-20 text-center d-flex justify-center align-center" style="width:100%; height: 30px; background-color: var(--Event-approve-header-color); border-top-right-radius: 25px;border-top-left-radius: 25px;">
+      <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " class="right-icons font-28" src="assets/images/icons-received-event.svg"></ion-icon>
+      <ion-icon  *ngIf="ThemeService.currentTheme == 'gov'" class="right-icons font-28" src="assets/images/theme/gov/icons-received-event.svg"></ion-icon>
+      <!-- <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " class="right-icons" src="assets/images/theme/gov/icons-received-event-selected.svg"></ion-icon> -->
+      <ion-icon  *ngIf="ThemeService.currentTheme == 'tribunal' " class="right-icons font-28" src="assets/images/theme/tribunal/icons-received-event.svg"></ion-icon>
+      <div style="color: white;">
+        Evento Pendente de Aprovação
+      </div>
+    </div>
+
     <div class="content d-flex flex-column width-100" *ngIf="loadedEvent.workflowInstanceDataFields">
       <div class="header-content width-100 d-flex justify-space-between">
         <div (click)="goBack()" class="header-icon-left cursor-pointer">
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index aaeec3984..5099c24f8 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -14,8 +14,21 @@
 
 <ion-content id="main-content">
 
-  <div class="main-content d-flex height-100" *ngIf="loadedEvent">
+  
+  <div class="main-content d-flex flex-column height-100" *ngIf="loadedEvent">
+
+    <div class="pl-20 pr-20 text-center d-flex justify-center align-center" style="width:100%; height: 30px; background-color: var(--Event-approve-header-color); border-top-right-radius: 25px;">
+      <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " class="right-icons font-28" src="assets/images/icons-received-event.svg"></ion-icon>
+      <ion-icon  *ngIf="ThemeService.currentTheme == 'gov'" class="right-icons font-28" src="assets/images/theme/gov/icons-received-event.svg"></ion-icon>
+      <!-- <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " class="right-icons" src="assets/images/theme/gov/icons-received-event-selected.svg"></ion-icon> -->
+      <ion-icon  *ngIf="ThemeService.currentTheme == 'tribunal' " class="right-icons font-28" src="assets/images/theme/tribunal/icons-received-event.svg"></ion-icon>
+      <div style="color: white;">
+        Evento Pendente de Aprovação
+      </div>
+    </div>
+
     <div class="content d-flex flex-column">
+
       <div class="header-content width-100 d-flex justify-space-between">
         <div (click)="close()" class="header-icon-left cursor-pointer">
           <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
@@ -111,7 +124,6 @@
 
     </div>
 
-
     <div *ngIf="showAside" class="aside-right flex-column height-100 cursor-pointer">
       <div class="aside-buttons">
         <button hidden full class="btn-ok" shape="round" >Editar evento</button>
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index c845496d0..d693be7e0 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -70,7 +70,7 @@ export class EventListPage implements OnInit {
   async LoadToApproveEvents() {
     this.showLoader = true;
     console.log(this.segment);
-    if(this.segment == 'MDGPR'){
+    if(this.segment == 'MDGPR') {
       let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
       let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
 
@@ -80,7 +80,7 @@ export class EventListPage implements OnInit {
       }
       this.showLoader = false;
     }
-    else if(this.segment == 'PR'){
+    else if(this.segment == 'PR') {
       let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
       let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
       let allEvents = prEventsOficial.concat(prEventsPessoal);
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index cc817b8b6..3c57ada49 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -203,6 +203,8 @@
 </ion-content>
 
 <ion-footer>
+  <div class="typing" *ngIf="wsChatMethodsService.getGroupRoom(roomId).otherUserType == true" >A escrever...</div>
+
   <div class="container width-100 d-flex">
     <div>
       <!-- <button class="btn-no-color" (click)="openSendGroupMessageOptions()">
diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss
index 55f9547af..3c8b95917 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.scss
+++ b/src/app/shared/chat/group-messages/group-messages.page.scss
@@ -272,3 +272,12 @@
        }
 
     }
+
+
+.typing {
+  position: relative;
+  top: -34px;
+  height: 0px;
+  left: 0px;
+  margin-left: 22px;
+}
\ No newline at end of file
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index b23e15fd4..0cdf9b516 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -197,6 +197,9 @@
 
 
 <ion-footer>
+  
+  <div class="typing" *ngIf="wsChatMethodsService.getDmRoom(roomId).otherUserType == true" >A escrever...</div>
+
   <div class="container width-100 d-flex">
     <div>
       <!-- <button class="btn-no-color" (click)="openSendMessageOptions()">
@@ -231,7 +234,7 @@
       <ion-item class="ion-no-padding type-message" lines="none">
         <ion-textarea (keyup.enter)="sendMessage()" clearOnEdit="true" placeholder="Escrever uma mensagem"
           class="message-input" rows="1" [(ngModel)]="wsChatMethodsService.getDmRoom(roomId).message" (ionChange)="wsChatMethodsService.getDmRoom(roomId).sendTyping()"></ion-textarea>
-        <button hidden class="btn-no-color" (click)="notImplemented()">
+        <button hidden class="btn-no-color" >
           <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
         </button>
       </ion-item>
diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss
index 6dd7ecd97..e6a46d3ef 100644
--- a/src/app/shared/chat/messages/messages.page.scss
+++ b/src/app/shared/chat/messages/messages.page.scss
@@ -312,4 +312,12 @@ display: block;
 
 .float-status-all {
   font-size: 10pt !important;
+}
+
+.typing {
+  position: relative;
+  top: -34px;
+  height: 0px;
+  left: 0px;
+  margin-left: 22px;
 }
\ No newline at end of file
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index ef4d21407..1d93a49b6 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -663,6 +663,8 @@ body {
   --PinCircleBackground: url(/auth.svg);
   --PinBackground: #e1e7eb;
   --PinTextColor: #44b5ea;
+  --Event-approve-header-color: #c63527;
+
 
   --color: #97cae631;
   --color2: #97cae631;
@@ -755,6 +757,7 @@ body {
   --PinDots: #c63527;
   --PinTextColor: black;
   --PinCircleBackground: url(/auth.svg);
+  --Event-approve-header-color: #ffb81c;
 
   --color: #d9d9d9;
   --color2: #f0f0f0;
@@ -834,6 +837,8 @@ body {
   --PinTextColor: #44b5ea;
   --PinCircleBackground: url(/assets/background/auth.svg);
   --PinBackground: white !important;
+  --Event-approve-header-color: #42b9fe;
+
 
   --header-container-background: linear-gradient(
     270deg,