save

src/app/modals/create-process/create-process.page.html

@@ -5,7 +5,7 @@
         <ion-label class="title">{{modalTitle[taskType]}}</ion-label>
       </ion-item>
       <div class="ion-item-container width-100">
-        <ion-input placeholder="Assunto" [(ngModel)]="postData.DispatchFolder.Subject"></ion-input>
+        <ion-input placeholder="Assunto*" [(ngModel)]="postData.DispatchFolder.Subject"></ion-input>
       </div>
 
       <div class="container-div width-100">
@@ -29,15 +29,15 @@
             </div>
             <div class="ion-input-class">
 
-              <ion-select class="d-block d-md-none" placeholder="Prazo" [(ngModel)]="postData.Priority" interface="action-sheet" Cancel-text="Cancelar" required>
+              <ion-select class="d-block d-md-none" placeholder="Prazo*" [(ngModel)]="postData.Priority" interface="action-sheet" Cancel-text="Cancelar" required>
                 <ion-select-option value="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999863"><b>Muito Urgente</b> (1 dia para a execução da tarefa)</ion-select-option>
                 <ion-select-option value="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</ion-select-option>
               </ion-select>
 
-              <mat-form-field class="width-100 d-none d-md-block" placeholder="Sample Type" required>
-                <mat-select matInput [(value)]="postData.Priority" >
+              <mat-form-field class="width-100 d-none d-md-block" floatLabel="never" required>
+                <mat-select placeholder="Prazo*" matInput [(value)]="postData.Priority" >
                   <mat-option value="99999861">
                     Normal
                   </mat-option>
@@ -63,8 +63,8 @@
             </div>
             <div class="ion-input-class">
 
-              <mat-form-field appearance="fill" class="width-100">
-                <mat-select [formControl]="toppings">
+              <mat-form-field appearance="fill" class="width-100" floatLabel="never">
+                <mat-select placeholder="Prazo*" [formControl]="toppings">
                   <mat-option [value]="99999861">Normal</mat-option>
                   <mat-option  [value]="99999862">Urgente</mat-option>
                   <mat-option  [value]="99999863">Muito Urgente</mat-option>
@@ -85,7 +85,7 @@
               <div class="list-people">
                 <ion-item lines="none">
                   <ion-list>
-                    <ion-label *ngIf="taskParticipants?.length < 1" 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/modals/create-process/create-process.page.scss

@@ -72,7 +72,7 @@
     }
     .list-people-title{
       /* font-size: 13px; */
-      color: #797979;
+      color: #a3a3a3;
     }
     .attach-document{
       font-size: 15px;

src/app/modals/delegar/delegar.page.ts

@@ -7,8 +7,6 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { EventsService } from 'src/app/services/events.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
-import { AddParticipantsModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page';
-import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { AlertService } from 'src/app/services/alert.service';
 import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';

src/app/modals/forward/forward.page.ts

@@ -7,8 +7,6 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { EventsService } from 'src/app/services/events.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
-import { AddParticipantsModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page';
-import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { AlertService } from 'src/app/services/alert.service';
 import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
@@ -16,6 +14,7 @@ import { SuccessMessagePage } from 'src/app/shared/popover/success-message/succe
 import { ToastService } from 'src/app/services/toast.service';
 import { SearchDocument } from 'src/app/models/search-document';
 import { SearchPage } from 'src/app/pages/search/search.page';
+import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page';
 
 @Component({
   selector: 'app-forward',
@@ -157,28 +156,44 @@ export class ForwardPage implements OnInit {
     }
   }
 
-  async addParticipants(){
-    console.log('HERE');
-    
+  async addParticipants() {
     this.adding = "intervenient";
-    if(window.innerWidth <= 800){
+    if(window.innerWidth <=800) {
+      this.showAttendees=false;
       const modal = await this.modalController.create({
-        component: AddParticipantsModalPage,
-         componentProps: {
-          eventPersons: this.eventAttendees
+        component: AttendeesPageModal,
+          componentProps: {
+          adding: this.adding,
+          taskParticipants: this.taskParticipants,
+          taskParticipantsCc: this.taskParticipantsCc
         },
-        cssClass: 'book-meeting-modal',
+        cssClass: 'modal attendee',
         backdropDismiss: false
       });
-  
+
       await modal.present();
-  
-      modal.onDidDismiss().then((res) => {
+
+      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);
+        }
       });
     } else {
-      this.showAttendees = true;
+      this.showAttendees=true
     }
   }
+
+  async setIntervenient(data) {
+    this.taskParticipants = data;
+  }
+  
+  async setIntervenientCC(data) {
+    this.taskParticipantsCc = data;
+  }
   
   validateFormInputs(){
     let formLocation = this.postData.Location.trim();