Stylish approve-event-modal

Change colors at PR list of events to approve

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

@@ -0,0 +1,29 @@
+ion-header{
+    padding: 20px 20px 0px 20px;
+}
+ion-content{
+    --padding-top: 20px;
+    --padding-start: 15px;
+    --padding-end: 20px;
+}
+
+.container-footer{
+    margin:0 auto;
+    overflow: auto;
+}
+.button-cancel {
+    width: 170px;
+    height: 44px;
+    border-radius: 22.5px;
+    --background: #e0e9ee;
+    --color: #061b52;
+    margin:10px;
+  }
+  .button-save {
+    width: 170px;
+    height: 44px;
+    border-radius: 22.5px;
+    --background: #42b9fe;
+    --color:#ffffff;
+    margin:10px;
+  }

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html

@@ -2,8 +2,9 @@
   <ion-item  lines="none">
     <ion-label class="title">Convocar Reunião</ion-label>
   </ion-item>
+
     <div class="ion-item-container">
-      <ion-input placeholder="Assunto"></ion-input>
+      <ion-input placeholder="Assunto" value="{{task.Folio}}"></ion-input>
     </div>
 
   <div class="container-div">
@@ -60,8 +61,18 @@
     <div class="ion-icon-class">
       <ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
     </div>
-    <div class="ion-input-class">
-      <ion-input placeholder="Intervenientes"></ion-input>
+    <div class="ion-input-class-no-height">
+      <div class="list-people">
+        <ion-item lines="none">
+          <ion-list>
+            <ion-label *ngIf="!taskParticipants" class="list-people-title">Adicionar intervenientes</ion-label>
+            <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
+          </ion-list>
+        </ion-item>
+      </div>
+      <div class="add-people">
+        <ion-icon (click)="addParticipants()" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+      </div>
     </div>
   </div>
 </div>
@@ -71,8 +82,18 @@
     <div class="ion-icon-class">
       <ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
     </div>
-    <div class="ion-input-class">
-      <ion-input placeholder="Com Conhecimento"></ion-input>
+    <div class="ion-input-class-no-height">
+      <div class="list-people">
+        <ion-item lines="none">
+          <ion-list>
+            <ion-label *ngIf="!taskParticipantsCc" class="list-people-title">Com conhecimento</ion-label>
+            <ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
+          </ion-list>
+        </ion-item>
+      </div>
+      <div class="add-people">
+        <ion-icon (click)="addParticipantsCc()" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
+      </div>
     </div>
   </div>
 </div>

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss

@@ -60,14 +60,21 @@ ion-select{
   border-radius: 5px;
   overflow: auto;
 }
-.container-footer{
-    margin:0 auto;
-    overflow: auto;
-}
-.attach-icon{
-  width: 37px;
-  font-size: 35px;
+.list-people{
+  width: 256px;
   float: left;
+
+}
+.add-people{
+  width: 45px;
+  float: right;
+  overflow: auto;
+  font-size: 25px;
+  padding: 10px;
+}
+.list-people-title{
+  /* font-size: 13px; */
+  color: #797979;
 }
 .attach-document{
   font-size: 15px;
@@ -76,6 +83,16 @@ ion-select{
   padding: 5px;
   float: left;
 }
+.attach-icon{
+  width: 37px;
+  font-size: 35px;
+  float: left;
+}
+.attach-title-item{
+  width: 100%;
+  font-size: 15px;
+  color:#0d89d1;
+}
 /* SPAN */
 .span-left{
   float: left;
@@ -86,11 +103,6 @@ text-align: right;
 float: right;
 font-size: 13px;
 }
-.attach-title-item{
-  width: 100%;
-  font-size: 15px;
-  color:#0d89d1;
-}
 .container-footer{
     margin:0 auto;
     overflow: auto;

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -1,6 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { ModalController } from '@ionic/angular';
+import { ModalController, NavParams } from '@ionic/angular';
+import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-participants-cc-modal.page';
+import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page';
 
 @Component({
   selector: 'app-book-meeting-modal',
@@ -8,11 +10,17 @@ import { ModalController } from '@ionic/angular';
   styleUrls: ['./book-meeting-modal.page.scss'],
 })
 export class BookMeetingModalPage implements OnInit {
-  
+  task: any;
+  taskParticipants: any;
+  taskParticipantsCc: any;
+
   constructor(private modalController: ModalController,
-    private router:Router,) { }
+    private router:Router,
+    private navParams: NavParams,
+    ) { }
 
   ngOnInit() {
+    this.task = this.navParams.get('task');
   }
 
   close(){
@@ -26,4 +34,37 @@ export class BookMeetingModalPage implements OnInit {
     
   }
 
+  async addParticipants(){
+    const modal = await this.modalController.create({
+      component: AddParticipantsModalPage,
+       componentProps: {
+      },
+      cssClass: 'add-participants-modal',
+      backdropDismiss: false
+    });
+
+    await modal.present();
+
+    modal.onDidDismiss().then((res) => {
+      this.taskParticipants = res.data;
+      /* console.log(this.taskParticipants.data); */
+    });
+  }
+  async addParticipantsCc(){
+    const modal = await this.modalController.create({
+      component: AddParticipantsCcModalPage,
+       componentProps: {
+      },
+      cssClass: 'add-participants-cc-modal',
+      backdropDismiss: false
+    });
+
+    await modal.present();
+
+    modal.onDidDismiss().then((res) => {
+      this.taskParticipantsCc = res.data;
+      /* console.log(this.taskParticipants.data); */
+    });
+  }
+
 }

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

@@ -3,7 +3,7 @@
     <ion-label class="title">{{modalTitle[taskType]}}</ion-label>
   </ion-item>
   <div class="ion-item-container">
-    <ion-input placeholder="Assunto"></ion-input>
+    <ion-input placeholder="Assunto" [(ngModel)]="taskSubject"></ion-input>
   </div>
 
   <div class="container-div">
@@ -12,7 +12,7 @@
         <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
       </div>
       <div class="ion-input-class">
-        <ion-input class="add-border" placeholder="Descrição"></ion-input>
+        <ion-input class="add-border" placeholder="Descrição" [(ngModel)]="taskDescription"></ion-input>
       </div>
     </div>
   </div>

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

@@ -78,6 +78,12 @@ ion-select{
   font-size: 15px;
   color: #0d89d1;
 }
+
+.attach-title-item{
+  width: 100%;
+  font-size: 15px;
+  color:#0d89d1;
+}
 /* SPAN */
 .span-left{
   float: left;
@@ -88,11 +94,6 @@ text-align: right;
 float: right;
 font-size: 13px;
 }
-.attach-title-item{
-  width: 100%;
-  font-size: 15px;
-  color:#0d89d1;
-}
 .container-footer{
     margin:0 auto;
     overflow: auto;

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

@@ -2,6 +2,10 @@ import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { ModalController, NavParams } from '@ionic/angular';
 import { EventPerson } from 'src/app/models/eventperson.model';
+import { AuthService } from 'src/app/services/auth.service';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { StorageService } from 'src/app/services/storage.service';
+import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-participants-cc-modal.page';
 import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page';
 
 @Component({
@@ -17,28 +21,71 @@ export class ExpedientTaskModalPage implements OnInit {
     'Solicitar Deferimento'
   ];
   taskType:number;
+  task: any;
   taskParticipants: any;
   taskParticipantsCc: any;
+  taskSubject: string;
+  taskDescription: string;
 
   constructor(
     private modalController: ModalController,
     private router:Router,
+    private processes:ProcessesService,
     private navParams: NavParams,
+    private authService: AuthService,
     ) { }
 
   ngOnInit() {
-    this.taskType = this.navParams.get('taskType'); 
+    this.taskType = this.navParams.get('taskAction');
+    this.task = this.navParams.get('task');
+    console.log(this.task);
+    this.taskSubject = this.task.workflowInstanceFolio;
+
+    this.authService.userData$.subscribe((res:any)=>{
+      console.log(res);
+    });
+    
   }
 
   close(){
     this.router.navigate(['/home/gabinete-digital/expediente']);
     this.modalController.dismiss(null);
   }
+ /*  if(this.modalTitle[this.taskType]){
+
+  } */
   cancelTask(){
     this.modalController.dismiss(null);
   }
   saveTask(){
-    
+    let body = {
+      "distributionType": "Paralelo",
+      "deadline": "2020-11-13T12:55:39.5281471+01:00",
+      "userEmail": "gilson.manuel@gabinetedigital.local",
+      "dispatchFolder": {
+        "Nad": 30,
+        "Subject": this.taskSubject,
+        "Message": this.taskDescription,
+        "SourceSecFsId": this.task.workflowInstanceDataFields.FsId,
+        "SourceType": "DOC",
+        "SourceId": this.task.workflowInstanceDataFields.DocId,
+      },
+      "usersSelected": [
+        {
+          "UserId": "GABINETEDIGITAL\\gilson.manuel",
+          "UserType": "CC",
+          "DeadLine": "2020-11-13T12:55:39.5381237+01:00"
+        },
+        {
+          "UserId": "GABINETEDIGITAL\\tiago.kayaya",
+          "UserType": "I",
+          "DeadLine": "2020-11-13T12:55:39.5381237+01:00"
+        }
+      ]
+    }
+    this.processes.DispatchTask(body);
+    this.router.navigate(['/home/gabinete-digital/expediente']);
+    this.modalController.dismiss(null);
   }
  
   async addParticipants(){
@@ -59,10 +106,10 @@ export class ExpedientTaskModalPage implements OnInit {
   }
   async addParticipantsCc(){
     const modal = await this.modalController.create({
-      component: AddParticipantsModalPage,
+      component: AddParticipantsCcModalPage,
        componentProps: {
       },
-      cssClass: 'add-participants-modal',
+      cssClass: 'add-participants-cc-modal',
       backdropDismiss: false
     });
 
@@ -70,6 +117,7 @@ export class ExpedientTaskModalPage implements OnInit {
 
     modal.onDidDismiss().then((res) => {
       this.taskParticipantsCc = res.data;
+      
       /* console.log(this.taskParticipants.data); */
     });
   }

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html

@@ -20,19 +20,19 @@
   </ion-header>
   <ion-content>
     <ion-list>
-      <ion-item (click)="openExpedientActionsModal('0')">
+      <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')">
+      <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')">
+      <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()">
+      <ion-item (click)="openBookMeetingModal(task)">
         <ion-icon name="calendar" slot="start"></ion-icon>
         <ion-label>Marcar reunião</ion-label>
       </ion-item>

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -30,6 +30,7 @@ export class ExpedienteDetailPage implements OnInit {
     private alertService: AlertService) { }
 
   task: DailyWorkTask;
+  fulltask:any;
   eventsList: Event[];  
   serialnumber:string;
 
@@ -57,6 +58,9 @@ export class ExpedienteDetailPage implements OnInit {
         "CreateDate": formatDate(new Date(result.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
         "DocumentURL": result.formURL
       }
+      this.fulltask = result;
+      console.log(result);
+      
     });
   }
 
@@ -93,11 +97,12 @@ export class ExpedienteDetailPage implements OnInit {
      this.menu.open();
   }
 
-  async openExpedientActionsModal(taskType:any){
+  async openExpedientActionsModal(taskAction:any, task:any){
     const modal = await this.modalController.create({
       component: ExpedientTaskModalPage,
       componentProps:{
-        taskType: taskType,
+        taskAction: taskAction,
+        task: task,
       },
       cssClass: 'expedient-task-modal',
       backdropDismiss: false
@@ -113,11 +118,11 @@ export class ExpedienteDetailPage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/expediente']);
   }
 
-  async openBookMeetingModal(eventSerialNumber){
+  async openBookMeetingModal(task:any){
     const modal = await this.modalController.create({
       component: BookMeetingModalPage,
       componentProps:{
-        serialNumber: eventSerialNumber,
+        task: task,
       },
       cssClass: 'book-meeting-modal',
       backdropDismiss: false