Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/pages/events/attendees/attendees.page.html

@@ -1,6 +1,6 @@
 <ion-header class="ion-no-border px-20">
   <ion-toolbar class="px-10">
-    <ion-title class="pa-0">Adicionar intervenientes</ion-title>
+    <ion-title class="pa-0">Adicionar intervenientes - A.M.</ion-title>
   </ion-toolbar>
   <ion-searchbar class="attendee-search-bar" (ionChange)="onChange($event)" placeholder="Insira email para adicionar destinatário"></ion-searchbar><!-- [(ngModel)]="searchCountryString" -->
   <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>

src/app/pages/events/attendees/attendees.page.ts

@@ -120,11 +120,11 @@ export class AttendeesPage implements OnInit {
 
   async selectContact(itm: EventPerson){
     if(this.adding == "intervenient"){
-
+      itm.IsRequired = true;
       this.taskParticipants.push(itm);
       
     } else if (this.adding == "CC") {
-      
+      itm.IsRequired = false;
       this.taskParticipantsCc.push(itm);
     }
   }

src/app/pages/events/events.page.html

@@ -79,7 +79,7 @@
             <ion-icon class="icon" slot="end" src="assets/images/icons-correspondencias.svg"></ion-icon>
             <div class="text">Correspondência por ler</div>
           </div>
-          <button class="btn-no-color cursor-pointer" (click)="viewExpedientListPage()">
+          <button (click)="viewExpedientListPage()" class="btn-no-color cursor-pointer">
             <ion-icon class="icon-next" slot="end" src="assets/images/icons-arrow-circle-arrow-right.svg"></ion-icon>
           </button>
         </div>

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html

@@ -2,41 +2,6 @@
   <app-header></app-header>
 </ion-header>
 
-<ion-menu autoHide="false" side="end" content-id="main-content">
-  <ion-header>
-    <ion-toolbar translucent>
-      <ion-title>Menu</ion-title>
-    </ion-toolbar>
-  </ion-header>
-  <ion-content>
-    <ion-list>
-      <ion-item (click)="openExpedientActionsModal('0',fulltask)">
-        <ion-icon name="documents" slot="start"></ion-icon>
-        <ion-label>Efectuar Despacho</ion-label>
-      </ion-item>
-      <ion-item (click)="openExpedientActionsModal('1',fulltask)">
-        <ion-icon name="arrow-undo" slot="start"></ion-icon>
-        <ion-label>Pedido de Parecer</ion-label>
-      </ion-item>
-      <ion-item (click)="openExpedientActionsModal('2',fulltask)">
-        <ion-icon name="arrow-redo" slot="start"></ion-icon>
-        <ion-label>Pedido de Deferimento</ion-label>
-      </ion-item>
-      <ion-item (click)="openBookMeetingModal(task)">
-        <ion-icon name="calendar" slot="start"></ion-icon>
-        <ion-label>Marcar reunião</ion-label>
-      </ion-item>
-      <ion-item hidden disabled>
-        <ion-icon name="paper-plane" slot="start"></ion-icon>
-        <ion-label>Enviar para pendentes</ion-label>
-      </ion-item>
-    </ion-list>
-  </ion-content>
-</ion-menu>
-<div class="ion-page d-none" id="main-content">
-  <ion-menu-button></ion-menu-button>
-</div>
-
 <ion-content>
   <div class="main-content d-flex height-100">
     <div class="content d-flex flex-column" *ngIf="task">

src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.html

@@ -1,5 +1,5 @@
 <ion-header class="ion-no-border">
-  <h4>Adicionar Intervenientes</h4>
+  <h4>Adicionar Intervenientes - TK</h4>
   <ion-searchbar (ionChange)="onChange($event)" placeholder="Pesquisar"></ion-searchbar>
   <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
 </ion-header>

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -65,7 +65,7 @@
               <div class="list-people">
                 <ion-item lines="none">
                   <ion-list>
-                    <ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
+                    <ion-label *ngIf="taskParticipants.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
                     <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
                   </ion-list>
                 </ion-item>

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -21,6 +21,7 @@ import { User } from 'src/app/models/user.model';
 import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
 import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { ToastService } from 'src/app/services/toast.service';
+import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page';
 
 @Component({
   selector: 'app-expedient-task-modal',
@@ -249,10 +250,12 @@ export class ExpedientTaskModalPage implements OnInit {
                       "Note": "",
                     }
                   }
-                  this.taskResult = await this.processes.postParecer(this.postData).toPromise();
-                  await this.toastService.successMessage('Processo efetuado', () =>{
+                  //this.taskResult = await this.processes.postParecer(this.postData).toPromise();
+                  await this.toastService.successMessage('Processo efetuado');
+                  setInterval(()=>{
                     this.modalController.dismiss(action_parecer);
-                  });
+                  }, 7000);
+                  
                 } catch (error) {
                   await this.toastService.badRequest('Processo não efetuado')
                 }
@@ -367,89 +370,71 @@ export class ExpedientTaskModalPage implements OnInit {
     });
 
   }
- 
-  async addParticipants() {
-    /* console.log('HERES'); */
-    
 
-    this.adding = "intervenient";
-    this.contacts =  this.taskParticipants;
-
-    if(window.innerWidth <=800){
-      
-      this.showAttendees=false;
+  async openAttendees() {
 
+    if(window.innerWidth <= 1024) {
       const modal = await this.modalController.create({
-        component: AddParticipantsModalPage,
+        component: AttendeesPage,
          componentProps: {
-          eventPersons: this.participants
+          adding: this.adding,
+          taskParticipants: this.taskParticipants,
+          taskParticipantsCc: this.taskParticipantsCc
         },
-        cssClass: 'add-participants-modal',
+        cssClass: 'attendee modal modal-desktop',
         backdropDismiss: false
       });
+  
       await modal.present();
-      modal.onDidDismiss().then((res) => {
-        this.taskParticipants = res.data;
-        let newattendees: EventPerson[] = res['data'];
-        if(newattendees!= null){
-          newattendees.forEach(newattendee => {
-          let att = {
-            'UserEmail': newattendee.EmailAddress,
-            'UserType': 'I',
-          };
-          if(this.participants == null){
-            this.participants = new Array();
-          }
-          this.participants.push(att);
-        });
+  
+      modal.onDidDismiss().then((data) => {
+        
+        if(data){
+          data = data['data'];
+
+          const newAttendees: EventPerson[] = data['taskParticipants'];
+          const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
+
+          this.setIntervenient(newAttendees);
+          this.setIntervenientCC(newAttendeesCC);
         }
-        this.postData.UsersSelected = this.participants;
-        console.log(this.postData);
       });
     } else {
-      this.showAttendees=true
+      this.showAttendees = true
     }
   }
+
+  /* setIntervenient(data){
+    this.taskParticipants = data;
+    //this.postData.UsersSelected = data;
+  }
+  
+  setIntervenientCC(data){
+    this.taskParticipantsCc = data;
+  } */
+ 
+  
+  async setIntervenient(data) {
+    this.taskParticipants = data;
+  }
+  
+  async setIntervenientCC(data) {
+    this.taskParticipantsCc = data;
+  }
+
+  async addParticipants() {
+    this.adding = 'intervenient'
+    this.openAttendees();
+  }
   
   async addParticipantsCc() {
-
     this.adding = "CC";
-    this.contacts = this.taskParticipantsCc;
-
-    if(window.innerWidth <=800){
-      this.showAttendees=false;
-
-      const modal = await this.modalController.create({
-        component: AddParticipantsCcModalPage,
-         componentProps: {
-           eventPersons: this.participants
-        },
-        cssClass: 'add-participants-cc-modal',
-        backdropDismiss: false
-      });
-      await modal.present();
-      modal.onDidDismiss().then((res) => {
-        this.taskParticipantsCc = res.data;
-        let newattendees: EventPerson[] = res['data'];
-        if(newattendees!= null){
-          newattendees.forEach(newattendee => {
-          let att = {
-            'UserEmail': newattendee.EmailAddress,
-            'UserType': 'CC',
-          };
-          if(this.participants == null){
-            this.participants = new Array();
-          }
-          this.participants.push(att);
-        });
-        }
-        this.postData.UsersSelected = this.participants;
-        console.log(this.postData);
-      });
-    } else {
-      this.showAttendees=true
-    }
+    this.openAttendees();
+  }
 
+  dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){
+    this.taskParticipants = taskParticipants;
+    this.taskParticipantsCc = taskParticipantsCc;
   }
 
   async distartExpedientModal() {
@@ -485,13 +470,7 @@ export class ExpedientTaskModalPage implements OnInit {
     
   }
 
-  async setIntervenient(data) {
-    this.taskParticipants = data;
-  }
   
-  async setIntervenientCC(data) {
-    this.taskParticipantsCc = data;
-  }
 
   async closeComponent() {
     this.showAttendees = false;