From 4ae2e7cfa89f34727d2ee71260e2d6d3a45934c9 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 14 Aug 2023 14:11:15 +0100
Subject: [PATCH 1/2] fix

---
 src/app/modals/ask-modal/ask-modal.module.ts  |  3 +-
 src/app/models/publication.ts                 |  2 +-
 .../gabinete-digital.page.html                |  5 ---
 .../new-publication/new-publication.page.html |  2 +-
 .../new-publication/new-publication.page.html | 37 ++++++++++---------
 .../new-publication/new-publication.page.ts   |  2 +-
 .../publication-detail.page.ts                |  2 -
 version/git-version.ts                        | 12 +++---
 8 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/src/app/modals/ask-modal/ask-modal.module.ts b/src/app/modals/ask-modal/ask-modal.module.ts
index d9366c587..484654bff 100644
--- a/src/app/modals/ask-modal/ask-modal.module.ts
+++ b/src/app/modals/ask-modal/ask-modal.module.ts
@@ -15,6 +15,7 @@ import { AskModalPage } from './ask-modal.page';
     IonicModule,
     AskModalPageRoutingModule
   ],
-  declarations: [AskModalPage]
+  declarations: [AskModalPage],
+  exports: [AskModalPage]
 })
 export class AskModalPageModule {}
diff --git a/src/app/models/publication.ts b/src/app/models/publication.ts
index a042c85f8..f2fa18227 100644
--- a/src/app/models/publication.ts
+++ b/src/app/models/publication.ts
@@ -8,7 +8,7 @@ export class Publication{
     Message: string;
     DatePublication:  Date | string;
     OriginalFileName?: string;
-    FileBase64?:string;
+    FileBase64?:string = "";
     FileExtension?: string;
     OrganicEntityId?: number;
 }
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index c78e364c8..ff67bfee4 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -725,11 +725,6 @@
                   TaskService.pendentesstore.newList.length}} correspondência nova</span>
               </p>
 
-              <p class="text-center exp-card-content">
-                <span class="number">{{TaskService.pendentesstore.count}} </span>
-                <span class="title1" *ngIf="TaskService.pendentesstore.count == 0">correspondência</span>
-                <span class="title1" *ngIf="TaskService.pendentesstore.count == 1">correspondência</span>
-                <span class="title1" *ngIf="TaskService.pendentesstore.count > 1">correspondências</span>
             </div>
 
 
diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html
index 330459437..a954a90f6 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.html
+++ b/src/app/pages/publications/new-publication/new-publication.page.html
@@ -50,7 +50,7 @@
 
       </div>
 
-      <div class="picture d-flex pb-5 hide-desktop" *ngIf="publication.FileBase64 && capturedImage ==''">
+      <div class="picture d-flex pb-5 hide-desktop" *ngIf="!( publication.FileBase64 == 'data:image/jpg;base64,null' || publication.FileBase64 == '' )">
         <div  class="post-img" *ngIf="publication.FileBase64">
           <img src="{{publication.FileBase64}}" alt="image" >
         </div>
diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html
index 410bce0d0..9a69f55b3 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.html
+++ b/src/app/shared/publication/new-publication/new-publication.page.html
@@ -28,25 +28,11 @@
     </div>
   </div>
 
-  {{ capturedImage }}
-  {{ publication | json }}
 
-  <div class="picture d-flex pb-5 hide-desktop" *ngIf="publication.FileBase64 != 'data:image/jpg;base64,null' ">
-    <div  class="post-img">
-      <img src="{{publication.FileBase64}}" alt="image" >
-    </div>
-    <div class="d-flex flex-column pl-10">
-      <div class="picture-file-name">{{publication.OriginalFileName}}.{{publication.FileExtension}}</div>
-      <div class="size">75 Kb</div>
-    </div>
-    <div class="flex-grow-1 d-flex align-center justify-end">
-      <div style="color: red;">X</div>
-    </div>
-  </div>
-
-  <div *ngIf="capturedImage && capturedImageTitle" class="ion-item-container-no-border">
+    <!-- Captured -->
+  <div class="ion-item-container-no-border" *ngIf="capturedImage">
     <ion-label class="attached-title">Fotografia Anexada</ion-label>
-    <ion-item lines="none" *ngIf="capturedImage">
+    <ion-item lines="none" >
       <ion-thumbnail slot="start">
         <ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage"></ion-img>
       </ion-thumbnail>
@@ -59,8 +45,23 @@
         <ion-icon name="close"></ion-icon>
       </button>
     </ion-item>
-
   </div>
+  
+  <!-- current image -->
+  <div class="picture d-flex pb-5 hide-desktop" *ngIf="!( publication.FileBase64 == 'data:image/jpg;base64,null' || publication.FileBase64 == '' )" >
+    <div  class="post-img">
+      <img src="{{publication.FileBase64}}" alt="image" >
+    </div>
+    <div class="d-flex flex-column pl-10">
+      <div class="picture-file-name">{{publication.OriginalFileName}}.{{publication.FileExtension}}</div>
+      <div class="size">75 Kb</div>
+    </div>
+    <div class="flex-grow-1 d-flex align-center justify-end">
+      <div style="color: red;">X</div>
+    </div>
+  </div>
+
+
 
   <div class="ion-item-container-no-border hide-desktop">
     <ion-label (click)="takePicture()">
diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts
index e6bdccfa4..5671ea3f8 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -42,7 +42,7 @@ export class NewPublicationPage implements OnInit {
   guestPicture:any;
 
   capturedImage:any = '';
-  capturedImageTitle:any;
+  capturedImageTitle:any = '';
   photos: any[] = [];
 
   constructor(
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 7bf88c525..475a05a4b 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
@@ -9,7 +9,6 @@ import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { PermissionService } from 'src/app/services/permission.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { PublicationFolderService } from 'src/app/store/publication-folder.service';
-import { AskModalPage } from 'src/app/modals/ask-modal/ask-modal.page'
 @Component({
   selector: 'app-publication-detail-shared',
   templateUrl: './publication-detail.page.html',
@@ -34,7 +33,6 @@ export class PublicationDetailPage implements OnInit {
     public p:PermissionService,
     private httpErrorHandle: HttpErrorHandle,
     public publicationFolderService: PublicationFolderService,
-    public AskModalPage: AskModalPage
     ) {
 
       /* this.folderId = this.navParams.get('folderIdId'); */
diff --git a/version/git-version.ts b/version/git-version.ts
index 494d1b35f..d71e61411 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "fa6450f32",
-  "SHA": "fa6450f3285f9d28851e8debc4cf9e05bcdf6c4e",
+  "shortSHA": "0f3416cc3",
+  "SHA": "0f3416cc3031874f4cd6d4738068d07696ab3190",
   "branch": "developer",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Aug 14 11:00:35 2023 +0100'",
-  "lastCommitMessage": "changes",
-  "lastCommitNumber": "5152",
+  "lastCommitTime": "'Mon Aug 14 12:15:18 2023 +0100'",
+  "lastCommitMessage": "fix",
+  "lastCommitNumber": "5153",
   "change": "",
-  "changeStatus": "On branch developer\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/chat/chat.page.html\n\tmodified:   src/app/pages/chat/chat.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/services/chat/chat-system.service.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.html",
+  "changeStatus": "On branch developer\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/ask-modal/ask-modal.module.ts\n\tmodified:   src/app/models/publication.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 0c64632986291d42bf592f52756dd37132b62d64 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 14 Aug 2023 16:25:57 +0100
Subject: [PATCH 2/2] merge

---
 index.html                                    |  1 -
 src/app/pages/agenda/agenda.page.scss         | 60 +++++++++++++++++++
 .../agenda/view-event/view-event.page.html    |  4 +-
 .../chat/messages/contacts/contacts.page.ts   |  5 +-
 .../despacho-pr/despacho-pr.page.ts           |  4 +-
 .../agenda/view-event/view-event.page.html    |  4 +-
 .../chat/messages/contacts/contacts.page.ts   |  2 +-
 .../despachos-options.page.ts                 | 32 +++++++++-
 .../despachos-pr-options.page.ts              |  4 +-
 version/git-version.ts                        | 10 ++--
 10 files changed, 107 insertions(+), 19 deletions(-)
 delete mode 100644 index.html

diff --git a/index.html b/index.html
deleted file mode 100644
index a564f3577..000000000
--- a/index.html
+++ /dev/null
@@ -1 +0,0 @@
-https://wetransfer.com/downloads/48a9320a9b41c4b3bef97cfc0c42941620230803122443/778a91?utm_campaign=TRN_TDL_05&utm_source=sendgrid&utm_medium=email&trk=TRN_TDL_05
\ No newline at end of file
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 0b043777d..5d392ec15 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -1037,6 +1037,66 @@ $font-size: rem(15);
 
 }
 
+
+@media only screen and (min-width: 398px) {
+  .week-5 {
+    .calendar-title-container {
+      font-size: 16px;
+    }
+    .height-75 {
+      height: 75px;
+    }
+    
+    .height-356 {
+      height: 323px;
+    }
+  }
+
+  .week-6 {
+    .calendar-title-container {
+      font-size: 16px;
+    }
+    .height-75 {
+      height: 75px;
+    }
+    
+    .height-356 {
+      height: 371px;
+    }
+  }
+  
+}
+
+@media only screen and (min-width: 415px) {
+  .week-5 {
+    .calendar-title-container {
+      font-size: 16px;
+    }
+    .height-75 {
+      height: 75px;
+    }
+    
+    .height-356 {
+      height: 319px;
+    }
+  }
+
+  .week-6 {
+    .calendar-title-container {
+      font-size: 16px;
+    }
+    .height-75 {
+      height: 75px;
+    }
+    
+    .height-356 {
+      height: 360px;
+    }
+  }
+  
+}
+
+
 @media only screen and (min-width: 500px) {
   .week-5 {
     .calendar-title-container {
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index 5e083bb19..b2c974144 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -101,10 +101,10 @@
                   <span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span>
                 </div>
 
-                <div (click)="docIndex(i);LoadDocumentDetails()" class="cursor-pointer" style="width: 35px; height: 41px;" autoHide="false">
+                <!-- <div (click)="docIndex(i);LoadDocumentDetails()" class="cursor-pointer" style="width: 35px; height: 41px;" autoHide="false">
                   <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>
-                </div>
+                </div> -->
 
               </ion-label>
             </ion-item>
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts
index a65f432b0..8dee2d862 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.ts
+++ b/src/app/pages/chat/messages/contacts/contacts.page.ts
@@ -87,9 +87,8 @@ export class ContactsPage implements OnInit {
       username: username,
     }
     this.chatService.createRoom(body).subscribe(async(res) => {
-      
       this.room = res['room'];
-      await this.ChatSystemService.getAllRooms();
+      this.ChatSystemService.getAllRooms();
       this.getDirectMessage(this.room._id);
     });
   }
@@ -102,7 +101,7 @@ export class ContactsPage implements OnInit {
 
   async openModal(roomId:any){
     this.close();
-    
+    console.log('open chat')
 
     const modal = await this.modalController.create({
       component: MessagesPage,
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index 7f965076b..25653055c 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -301,8 +301,8 @@ export class DespachoPrPage implements OnInit {
   async concluir(note: string, documents: any) {
     let body = {
       "serialNumber": this.serialNumber,
-      "action": "Executado",
-      "ActionTypeId": 104,
+      "action": "Arquivo",
+      "ActionTypeId": 95,
       "dataFields": {
         "ReviewUserComment": note,
       },
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index 645b07068..65e0af8fa 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -128,11 +128,11 @@
               <span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span>
             </div>
 
-            <div (click)="docIndex(i);LoadDocumentDetails()" class="doc-options">
+            <!-- <div (click)="docIndex(i);LoadDocumentDetails()" class="doc-options">
               <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>
-            </div>
+            </div> -->
 
           </ion-label>
         </li>
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts
index 5963701f3..4a7168408 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.ts
+++ b/src/app/shared/chat/messages/contacts/contacts.page.ts
@@ -68,7 +68,7 @@ export class ContactsPage implements OnInit {
         username: username,
       }
       this.chatService.createRoom(body).subscribe(res => {
-        
+        this.ChatSystemService.getAllRooms();
         this.room = res['room'];
         this.openMessage.emit(this.room._id);
       });
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts
index 36c9c312c..2a6756e82 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -13,6 +13,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { RouteService } from 'src/app/services/route.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { environment } from 'src/environments/environment';
+import { TaskService } from 'src/app/services/task.service'
 
 @Component({
   selector: 'app-despachos-options',
@@ -36,6 +37,7 @@ export class DespachosOptionsPage implements OnInit {
     public ThemeService: ThemeService,
     private RouteService: RouteService,
     private httpErrorHandle: HttpErrorHandle,
+    public TaskService: TaskService
     ) {
       this.task = this.navParams.get('task')
       this.fulltask = this.navParams.get('fulltask')
@@ -249,7 +251,7 @@ export class DespachosOptionsPage implements OnInit {
           await this.generateDiploma(res.data.note, docs);
         }
         else if(actionName == 'Concluido') {
-          //this.concluir(res.data.note, docs);
+          this.concluir(res.data.note, docs);
         }
         else if(actionName == 'Reexecução') {
           await this.reexecutar(res.data.note, docs);
@@ -261,6 +263,34 @@ export class DespachosOptionsPage implements OnInit {
     });
   }
 
+
+
+  async concluir(note: string, documents: any) {
+    let body = {
+      "serialNumber": this.serialNumber,
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList": documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.httpErrorHandle.httpsSucessMessagge('Concluir Despacho')
+      this.TaskService.loadDiplomas()
+    } catch (error) {
+      this.httpErrorHandle.httpStatusHandle(error)
+    }
+    finally {
+      loader.remove()
+    }
+
+  }
+
   async arquivar(note:string, documents:any) {
     let body = {
       "serialNumber": this.serialNumber,
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
index bdbed6a30..75aab4181 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
@@ -311,8 +311,8 @@ export class DespachosPrOptionsPage implements OnInit {
   async concluir(note:string, documents:any){
     let body = {
       "serialNumber": this.serialNumber,
-      "action": "Executado",
-      "ActionTypeId": 104,
+      "action": "Arquivo",
+      "ActionTypeId": 95,
       "dataFields": {
         "ReviewUserComment": note,
       },
diff --git a/version/git-version.ts b/version/git-version.ts
index d71e61411..717604bf2 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "0f3416cc3",
-  "SHA": "0f3416cc3031874f4cd6d4738068d07696ab3190",
+  "shortSHA": "4ae2e7cfa",
+  "SHA": "4ae2e7cfa89f34727d2ee71260e2d6d3a45934c9",
   "branch": "developer",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Aug 14 12:15:18 2023 +0100'",
+  "lastCommitTime": "'Mon Aug 14 14:11:15 2023 +0100'",
   "lastCommitMessage": "fix",
-  "lastCommitNumber": "5153",
+  "lastCommitNumber": "5154",
   "change": "",
-  "changeStatus": "On branch developer\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/ask-modal/ask-modal.module.ts\n\tmodified:   src/app/models/publication.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts",
+  "changeStatus": "On branch developer\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tdeleted:    index.html\n\tmodified:   src/app/pages/agenda/agenda.page.scss\n\tmodified:   src/app/pages/agenda/view-event/view-event.page.html\n\tmodified:   src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified:   src/app/shared/agenda/view-event/view-event.page.html\n\tmodified:   src/app/shared/chat/messages/contacts/contacts.page.ts\n\tmodified:   src/app/shared/popover/despachos-options/despachos-options.page.ts\n\tmodified:   src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file