From d49204b20498d64b3a06a1b58694026570be50ea Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 4 May 2021 16:21:53 +0100
Subject: [PATCH] save

---
 .../expedient-task-modal.page.html                    |  5 ++++-
 .../expedient-task-modal.page.scss                    |  5 +++--
 .../expedient-task-modal/expedient-task-modal.page.ts | 11 +++++------
 .../gabinete-digital/pedidos/pedido/pedido.page.html  |  2 +-
 .../gabinete-digital/pedidos/pedido/pedido.page.ts    |  3 +++
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 393596dbd..074782045 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -40,9 +40,12 @@
             <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
           </div>
           <div class="ion-input-class">
-            <ion-select placeholder="Tipo" [(ngModel)]="postData.SubjectTypeId" interface="action-sheet" Cancel-text="Cancelar" required>
+            <ion-item>
+            <ion-label *ngIf="!selectedTypes">Tipos de assunto</ion-label>
+            <ion-select [(ngModel)]="selectedTypes" multiple="true" interface="action-sheet" Cancel-text="Cancelar" required>
               <ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
             </ion-select>
+          </ion-item>
           </div>
         </div>
       </div>
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
index 0c23c34ab..a1b20e389 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
@@ -41,17 +41,18 @@
     font-size: 25px;
   }
   ion-select{
-    padding-left: 5px;
+    //padding-left: 5px;
     margin-left: 0;
   }
   .ion-input-class{
     width: calc(100% - 45px);
-    height: 45px;
+    height: 51px;
     border: 1px solid #ebebeb;
     border-radius: 5px;
     padding-left: 5px;
     padding-right: 10px;
     float: left;
+    overflow: hidden;
   }
   .ion-input-class-no-height{
     border: 1px solid #ebebeb;
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index 7db3a4ff4..925f9663f 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -45,6 +45,7 @@ export class ExpedientTaskModalPage implements OnInit {
   documents:SearchDocument[] = [];
 
   subjectTypes:any;
+  selectedTypes: string[]=[];
 
   postData: Despacho;
   dispatchFolder: Folder;
@@ -142,6 +143,8 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
   async saveTask(){
+    console.log(this.selectedTypes);
+    
 
     if(this.postData.Priority=='99999861'){
       this.dispatchFolder.DeadlineType = 'Normal';
@@ -209,9 +212,9 @@ export class ExpedientTaskModalPage implements OnInit {
           this.postData = {
             DistributionType: "Paralelo",
             CountryCode: 'AO',
-            Priority: this.postData.Priority,
+            Priority: this.postData.Priority, 
             UserEmail: this.user,
-            SubjectTypeId: this.postData.SubjectTypeId,
+            SubjectTypeId: this.postData.SubjectTypeId, //this.selectedTypes
             UsersSelected: attendees,
             DispatchFolder: this.dispatchFolder,
             AttachmentList: DocumentToSave
@@ -220,11 +223,7 @@ export class ExpedientTaskModalPage implements OnInit {
           this.taskResult = await this.processes.postDeferimento(this.postData);
           break;
       }
-
-
     this.modalController.dismiss('openDiscart');
-    /* this.distartExpedientModal();
-    this.close(); */
   }
   else {
     this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
index 019ac7eed..9fd0999bd 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
@@ -114,7 +114,7 @@
         <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
       <div class="buttons" *ngIf="task.WorkflowName == 'Pedido de Parecer'">
-        <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+        <button (click)="notImplemented()" class="btn-cancel" shape="round" >Dar meu Parecer</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
       </div>
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index ae182b391..0373b5330 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -70,6 +70,9 @@ export class PedidoPage implements OnInit {
   close(){
     this.modalController.dismiss();
   }
+  notImplemented(){
+    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+  }
 
 
   async LoadTaskDetail(serial: string) {