fix merge

2026-04-18 20:47:54 +00:00 · 2023-07-28 16:28:59 +01:00
parent ac805b67ba
commit 9bebc1b8b6
18 changed files with 37 additions and 28 deletions
@@ -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'>
@@ -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()
 // }
@@ -423,7 +423,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
        }],
        temporaryData: formData,
        attachmentsModelData: {
-          fileBase64: await this.fileService.blobToBase64(blob),
+          fileBase64: encodedData,
        }
      })

@@ -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>
@@ -215,7 +215,7 @@ ion-button{
 }
@media only screen and (min-width: 801px) {
  .div-icon{
-    display: none;
+    display: none !important;
  }
  .content{
    width: 65%;
@@ -174,7 +174,7 @@ ion-button{
 }
@media only screen and (min-width: 801px) {
  .div-icon{
-    display: none;
+    display: none !important;
  }
  .content{
    width: 65%;
@@ -240,7 +240,7 @@ ion-button{
 }
@media only screen and (min-width: 801px) {
  .div-icon{
-    display: none;
+    display: none !important;
  }
  .content{
    width: 65%;
@@ -227,7 +227,7 @@ ion-button{
 }
@media only screen and (min-width: 801px) {
  .div-icon{
-    display: none;
+    display: none !important;
  }
  .content{
    width: 65%;
@@ -63,7 +63,7 @@ ion-button{
 }
@media only screen and (min-width: 801px) {
  .div-icon{
-    display: none;
+    display: none !important;
  }
  .content{
    width: 65%;
@@ -287,7 +287,7 @@ ion-button{
 }
@media only screen and (min-width: 801px) {
  .menu-ptions{
-    display: none;
+    display: none !important;
  }
  .content{
    width: 65%;
@@ -205,7 +205,7 @@ ion-button{
 }
@media only screen and (min-width: 801px) {
  .menu-ptions{
-    display: none;
+    display: none !important;
  }
  .content{
    width: 65%;
@@ -171,7 +171,7 @@ ion-button{
 }
@media only screen and (min-width: 801px) {
  .div-icon{
-    display: none;
+    display: none !important;
  }
  .content{
    width: 65%;
@@ -319,12 +319,6 @@ ion-item{
    position: relative;
    top: 35px;
  }
-
-  .div-top-header {
-    position: absolute !important;
-    top: 0px !important;
-  }
-
  
 }

@@ -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 {
@@ -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

@@ -442,7 +442,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
        }],
        temporaryData: formData,
        attachmentsModelData: {
-          fileBase64: await this.fileService.blobToBase64(blob),
+          fileBase64: encodedData,
        }
      })

@@ -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>
@@ -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"
 }