From 7cef2d2a49979fcbe1c6755db24517e823f749f8 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 31 Jul 2023 11:03:22 +0100
Subject: [PATCH 1/3] add loader for tiny

---
 .../publication-detail/publication-detail.page.ts  |  3 +++
 src/app/tiny-mce/tiny-mce.page.html                |  1 +
 src/app/tiny-mce/tiny-mce.page.ts                  |  2 ++
 version/git-version.ts                             | 14 +++++++-------
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
index feec553f0..c50067483 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
@@ -78,6 +78,9 @@ export class PublicationDetailPage implements OnInit {
         FileExtension: 'jpeg',
       }
       this.showLoader = false;
+    },(error) => {
+      this.goBack();
+      this.httpErrorHandle.httpStatusHandle(error)
     });
   }
 
diff --git a/src/app/tiny-mce/tiny-mce.page.html b/src/app/tiny-mce/tiny-mce.page.html
index 2000e3124..f0eb39fd2 100644
--- a/src/app/tiny-mce/tiny-mce.page.html
+++ b/src/app/tiny-mce/tiny-mce.page.html
@@ -18,6 +18,7 @@
 </div>
 
 <editor
+  class="container-img"
   apiKey="wr5dk69kive0qr9ig6y5spqvlj3a0tsiwnzdsexnz241k69p"
   [(ngModel)]="editorContent"
   [init]="{ 
diff --git a/src/app/tiny-mce/tiny-mce.page.ts b/src/app/tiny-mce/tiny-mce.page.ts
index 9a57c2d38..9775dc01d 100644
--- a/src/app/tiny-mce/tiny-mce.page.ts
+++ b/src/app/tiny-mce/tiny-mce.page.ts
@@ -16,6 +16,7 @@ export class TinyMCEPage implements OnInit {
   content: ""
   editorContent: "";
   value: "";
+  loadingTiny = true
   
 
 
@@ -45,6 +46,7 @@ export class TinyMCEPage implements OnInit {
 
   doneWaitForTiny(tiny: HTMLDivElement) {
     tiny.style.height = '100%'
+    this.loadingTiny = true
   }
 
   ngOnInit() {
diff --git a/version/git-version.ts b/version/git-version.ts
index c9790f097..be6e447a4 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "ac805b67b",
-  "SHA": "ac805b67ba8c3e80b47b22db4b77151a5ed82ae1",
+  "shortSHA": "6d1adf1b8",
+  "SHA": "6d1adf1b8be1d2f85bd8b737d86e5999af1b292c",
   "branch": "developer-catch-merge",
-  "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Thu Jul 27 16:39:25 2023 +0100'",
-  "lastCommitMessage": "change",
-  "lastCommitNumber": "5119",
+  "lastCommitAuthor": "'Lorito Tiago'",
+  "lastCommitTime": "'Fri Jul 28 16:47:08 2023 +0100'",
+  "lastCommitMessage": "permssion",
+  "lastCommitNumber": "5121",
   "change": "",
-  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/profile/edit-profile/edit-profile.page.html\n\tmodified:   src/app/models/beast-orm.ts\n\tmodified:   src/app/pages/chat/messages/messages.page.ts\n\tmodified:   src/app/pages/events/events.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss\n\tmodified:   src/app/pages/inactivity/inactivity.page.scss\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/shared/chat/messages/messages.page.ts\n\tmodified:   src/app/tiny-mce/tiny-mce.page.html",
+  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/tiny-mce/tiny-mce.page.html\n\tmodified:   src/app/tiny-mce/tiny-mce.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 64857d043f55c9794a491192819bfe6e1f034caf Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 31 Jul 2023 14:35:51 +0100
Subject: [PATCH 2/3] fix

---
 .../despachos/despacho/despacho.page.html          |  8 ++++----
 version/git-version.ts                             | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index e851b36f0..6c4cdbb55 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -3,7 +3,7 @@
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header">
         <div class="title-content width-100 d-flex justify-space-between align-center">
-          <div class=" btn-dismiss font-30-rem cursor-pointer d-flex align-center " (click)="goBack()" defaultHref="#">
+          <div class=" btn-dismiss font-30-rem cursor-pointer" (click)="goBack()" defaultHref="#">
             <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
@@ -11,7 +11,7 @@
           <div class="middle d-flex align-center flex-grow-1">
             <ion-label class="title">{{ task.Folio }}</ion-label>
           </div>
-          <div class="div-icon d-flex" (click)="openOptions()" *ngIf="p.userPermission([p.permissionList.Agenda.access])">
+          <div class="div-icon" (click)="openOptions()" *ngIf="p.userPermission([p.permissionList.Agenda.access])">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-menu.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-menu.svg"></ion-icon>
@@ -53,10 +53,10 @@
               </ion-label>
             </ion-item>
           </div>
-          <div *ngIf="task.Note">
+          <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
             <h5 class="font-17-rem">Detalhes</h5>
             <ion-item class="ion-no-margin ion-no-padding">
-                <pre class="width-100 text">{{ task.Note }} </pre>
+                <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
             </ion-item>
           </div>
         </div>
diff --git a/version/git-version.ts b/version/git-version.ts
index be6e447a4..bf8a2a955 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "6d1adf1b8",
-  "SHA": "6d1adf1b8be1d2f85bd8b737d86e5999af1b292c",
+  "shortSHA": "7cef2d2a4",
+  "SHA": "7cef2d2a49979fcbe1c6755db24517e823f749f8",
   "branch": "developer-catch-merge",
-  "lastCommitAuthor": "'Lorito Tiago'",
-  "lastCommitTime": "'Fri Jul 28 16:47:08 2023 +0100'",
-  "lastCommitMessage": "permssion",
-  "lastCommitNumber": "5121",
+  "lastCommitAuthor": "'Peter Maquiran'",
+  "lastCommitTime": "'Mon Jul 31 11:03:22 2023 +0100'",
+  "lastCommitMessage": "add loader for tiny",
+  "lastCommitNumber": "5122",
   "change": "",
-  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/tiny-mce/tiny-mce.page.html\n\tmodified:   src/app/tiny-mce/tiny-mce.page.ts",
+  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 9d1d4783dbfd793c980170a4ab4e0c0e00686d00 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 31 Jul 2023 14:54:10 +0100
Subject: [PATCH 3/3] fix

---
 src/app/shared/agenda/new-event/new-event.page.ts |  4 ++--
 version/git-version.ts                            | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

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 4b772b929..652c359de 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -216,14 +216,14 @@ export class NewEventPage implements OnInit {
 
       this.setIntervenient.emit(this.taskParticipants);
       this.setIntervenientCC.emit(this.taskParticipantsCc);
+
+      this.setDefaultTime();
     }
 
     
-
     this.date = new Date(2021,9,4,5,6,7);
 
     this.injectValidation();
-    this.setDefaultTime();
     this.changeAgenda()
 
   }
diff --git a/version/git-version.ts b/version/git-version.ts
index bf8a2a955..aaa6f3fd2 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "7cef2d2a4",
-  "SHA": "7cef2d2a49979fcbe1c6755db24517e823f749f8",
+  "shortSHA": "64857d043",
+  "SHA": "64857d043f55c9794a491192819bfe6e1f034caf",
   "branch": "developer-catch-merge",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Jul 31 11:03:22 2023 +0100'",
-  "lastCommitMessage": "add loader for tiny",
-  "lastCommitNumber": "5122",
+  "lastCommitTime": "'Mon Jul 31 14:35:51 2023 +0100'",
+  "lastCommitMessage": "fix",
+  "lastCommitNumber": "5123",
   "change": "",
-  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html",
+  "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file