From 9bebc1b8b6298ff024c9b7e165a5cab2569447fb Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 28 Jul 2023 16:28:59 +0100
Subject: [PATCH] fix merge

---
 .../profile/edit-profile/edit-profile.page.html      |  4 ++--
 src/app/models/beast-orm.ts                          | 11 +++++++++++
 src/app/pages/chat/messages/messages.page.ts         |  2 +-
 src/app/pages/events/events.page.html                |  2 +-
 .../despachos-pr/despacho-pr/despacho-pr.page.scss   |  2 +-
 .../despachos/despacho/despacho.page.scss            |  2 +-
 .../diploma-assinar/diploma-assinar.page.scss        |  2 +-
 .../diplomas-gerar/diplomas-gerar.page.scss          |  2 +-
 .../diplomas/diploma/diploma.page.scss               |  2 +-
 .../expediente-detail/expediente-detail.page.scss    |  2 +-
 .../expediente-pr/expediente-pr.page.scss            |  2 +-
 .../gabinete-digital/pedidos/pedido/pedido.page.scss |  2 +-
 src/app/pages/inactivity/inactivity.page.scss        |  6 ------
 src/app/shared/agenda/edit-event/edit-event.page.ts  |  4 +++-
 src/app/shared/agenda/new-event/new-event.page.ts    |  4 +++-
 src/app/shared/chat/messages/messages.page.ts        |  2 +-
 src/app/tiny-mce/tiny-mce.page.html                  |  2 +-
 version/git-version.ts                               | 12 ++++++------
 18 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html
index 1961636eb..af76e36d1 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.html
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.html
@@ -1,6 +1,6 @@
 <ion-content class=" bg-blue">
-  <div class="main-content width-100 overflow-y-auto height-100 header-fix">
-    <div class="profile-header width-100">
+  <div class="main-content header-fix width-100 overflow-y-auto height-100">
+    <div class="profile-header width-100 ">
       <div class="div-logo  width-40">
         <div class="logo-icon">
           <img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-no-bg.png' alt='logo'>
diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts
index 0aa850763..4fed91633 100644
--- a/src/app/models/beast-orm.ts
+++ b/src/app/models/beast-orm.ts
@@ -51,24 +51,33 @@ models.register({
   models: [MessageModel, DeleteMessageModel, attachments]
 })
 
+
+
 // // acçoes
 // export class ActionModel  extends models.Model{
+// 	static $tableName = ''
+	
 // 	ProcessId = models.IntegerField({unique: true})
 // 	Description = models.CharField()
 // 	Detail = models.CharField()
 // 	DateBegin = models.CharField()
 // 	DateEnd = models.CharField()
 // 	ActionType = models.CharField()
+
 // }
 
 
 // export class PublicationFolderModel  extends models.Model{
+// 	static $tableName = ''
+
 // 	DateBegin = models.CharField()
 // 	Description = models.CharField()
 // 	Detail = models.CharField()
 // }
 
 // export class PublicationDetailsModel  extends models.Model{
+// 	static $tableName = ''
+
 // 	DateIndex = models.CharField()
 //     DocumentId = models.IntegerField({unique: true})
 //     ProcessId = models.CharField()
@@ -83,6 +92,8 @@ models.register({
 
 
 // export class WebtrixUserModel  extends models.Model {
+// 	static $tableName = ''
+	
 // 	FullName = models.CharField()
 // 	Role = models.CharField()
 // }
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 0f714e387..315da9a67 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -423,7 +423,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         }],
         temporaryData: formData,
         attachmentsModelData: {
-          fileBase64: await this.fileService.blobToBase64(blob),
+          fileBase64: encodedData,
         }
       })
 
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 550d1b036..fc1eb095d 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -25,7 +25,7 @@
   <div class="conteiner-box pt-20 height-100">
     
     <div class="main-content justify-center d-flex height-100"> 
-      <div class="box-container width-100 d-flex mx-20" style="padding: 0px;overflow: hidden;">
+      <div class="box-container width-100 d-flex mx-20 overflow-hidden" style="padding: 0px;overflow: hidden;">
         <ion-progress-bar type="indeterminate" *ngIf="loadingAllTask || TaskService.showLoader"></ion-progress-bar>
         <div class="px-20 pb-20 container-filters">
           <p class="time ion-text-left font-18-em">{{customDate}}</p>
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
index c0614724e..2fb850abe 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
@@ -215,7 +215,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
index c56ea9141..cb2549b66 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
@@ -174,7 +174,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
index ddf77dfba..931c581b2 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
@@ -240,7 +240,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
index 7feccfad9..5ae9a8021 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
@@ -227,7 +227,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
index 938ba3388..c69e20a36 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
@@ -63,7 +63,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
index 04d7d3744..f43435ef9 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
@@ -287,7 +287,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .menu-ptions{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
index 64886b436..7eb4236d3 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
@@ -205,7 +205,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .menu-ptions{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
index 94ff63f03..9c0983be6 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
@@ -171,7 +171,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;
diff --git a/src/app/pages/inactivity/inactivity.page.scss b/src/app/pages/inactivity/inactivity.page.scss
index b1d218f0b..ca3c52bf8 100644
--- a/src/app/pages/inactivity/inactivity.page.scss
+++ b/src/app/pages/inactivity/inactivity.page.scss
@@ -319,12 +319,6 @@ ion-item{
     position: relative;
     top: 35px;
   }
-
-  .div-top-header {
-    position: absolute !important;
-    top: 0px !important;
-  }
-
   
 }
 
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index db2417803..19a8ed4ac 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -452,7 +452,8 @@ export class EditEventPage implements OnInit {
     window['temp.path:/home/agenda/edit-event.component.ts'] = {
       postEvent: this._postEvent,
       eventBody: this.eventBody,
-      segment: this.segment
+      segment: this.segment,
+      loadedEventAttachments: this.loadedEventAttachments
     }
   }
 
@@ -464,6 +465,7 @@ export class EditEventPage implements OnInit {
       this._postEvent = restoredData.postEvent
       this.eventBody = restoredData.eventBody
       this.segment = restoredData.segment
+      this.loadedEventAttachments = restoredData.loadedEventAttachments
 
       return true;
     } else {
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 3d9460c98..4b772b929 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -727,7 +727,8 @@ export class NewEventPage implements OnInit {
       postEvent: this.postEvent,
       eventBody: this.eventBody,
       segment: this.segment,
-      CalendarName: this.CalendarName
+      CalendarName: this.CalendarName,
+      documents: this.documents
     }
   }
 
@@ -745,6 +746,7 @@ export class NewEventPage implements OnInit {
       this.eventBody = restoredData.eventBody
       this.segment = restoredData.segment
       this.CalendarName = restoredData.CalendarName
+      this.documents = restoredData.documents
 
       // restore dater for date and hours picker
 
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 44f9255fa..a3c513193 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -442,7 +442,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
         }],
         temporaryData: formData,
         attachmentsModelData: {
-          fileBase64: await this.fileService.blobToBase64(blob),
+          fileBase64: encodedData,
         }
       })
 
diff --git a/src/app/tiny-mce/tiny-mce.page.html b/src/app/tiny-mce/tiny-mce.page.html
index 7386845fe..2000e3124 100644
--- a/src/app/tiny-mce/tiny-mce.page.html
+++ b/src/app/tiny-mce/tiny-mce.page.html
@@ -1,6 +1,6 @@
 <div >
 <ion-toolbar class="d-flex">
-  <div class="d-flex align-items-center px-20 pt-20 font-25">
+  <div class="d-flex align-items-center px-20 pt-20 font-25-rem">
     <div class="left cursor-pointer" (click)="close()">
       <fa-icon icon="chevron-left" class="menu-icon font-awesome-1"></fa-icon>
     </div>
diff --git a/version/git-version.ts b/version/git-version.ts
index 5403e43ea..c9790f097 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "e1b1f5e62",
-  "SHA": "e1b1f5e62a65c7e372dbdde3bc218e15de87701c",
+  "shortSHA": "ac805b67b",
+  "SHA": "ac805b67ba8c3e80b47b22db4b77151a5ed82ae1",
   "branch": "developer-catch-merge",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Thu Jul 27 15:14:42 2023 +0100'",
+  "lastCommitTime": "'Thu Jul 27 16:39:25 2023 +0100'",
   "lastCommitMessage": "change",
-  "lastCommitNumber": "5118",
-  "change": "diff --git a/src/app/tiny-mce/tiny-mce.page.html b/src/app/tiny-mce/tiny-mce.page.html\nindex 7386845fe..2000e3124 100644\n--- a/src/app/tiny-mce/tiny-mce.page.html\n+++ b/src/app/tiny-mce/tiny-mce.page.html\n@@ -1,6 +1,6 @@\n <div >\n <ion-toolbar class=\"d-flex\">\n-  <div class=\"d-flex align-items-center px-20 pt-20 font-25\">\n+  <div class=\"d-flex align-items-center px-20 pt-20 font-25-rem\">\n     <div class=\"left cursor-pointer\" (click)=\"close()\">\n       <fa-icon icon=\"chevron-left\" class=\"menu-icon font-awesome-1\"></fa-icon>\n     </div>",
-  "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/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified:   src/app/pages/inactivity/inactivity.page.html\n\tmodified:   src/app/tiny-mce/tiny-mce.page.html\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified:   src/app/tiny-mce/tiny-mce.page.html",
+  "lastCommitNumber": "5119",
+  "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",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file