Merge branch 'feature/gabinete' into developer

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

@@ -64,6 +64,8 @@ export class BookMeetingModalPage implements OnInit {
 
   ngOnInit() {
     this.adding = "intervenient";
+    console.log(this.task);
+    
 
     this.getAttachments();
   }
@@ -111,12 +113,14 @@ export class BookMeetingModalPage implements OnInit {
     }
     console.log(this.postData);
 
-    this.processes.FindTaskDocId(this.task.SerialNumber).subscribe(res =>{
-      if(res){
-        this.calendarService.postExpedientEvent(res, this.postData, "md",this.task.SerialNumber, this.task.FsId);
-      } 
-    });
-    this.distartExpedientModal();
+    if(this.task.FsId == '8'){
+      this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId);
+      this.distartExpedientModal();
+    }
+    else if(this.task.FsId == '361'){
+      this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId);
+    }
+
     this.close();
   }
 
@@ -139,16 +143,14 @@ export class BookMeetingModalPage implements OnInit {
       modal.onDidDismiss().then((res) => {
         this.taskParticipants = res.data;
         let newattendees: EventPerson[] = res['data'];
-        if (newattendees != null)
-        {
+        if(newattendees != null){
           newattendees.forEach(newattendee => {
             let att = {
               "EmailAddress": newattendee.EmailAddress,
               "Name": newattendee.Name,
               "IsRequired": true
             };
-            if (this.eventAttendees == null)
-            {
+            if(this.eventAttendees == null){
               this.eventAttendees = new Array();
             }
             this.eventAttendees.push(att);
@@ -157,10 +159,8 @@ export class BookMeetingModalPage implements OnInit {
         this.postData.Attendees = this.eventAttendees;
       });
     } else {
-
       this.showAttendees = true;
     }
-
   }
 
   async addParticipantsCc() {

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

@@ -77,9 +77,9 @@ export class ExpedientTaskModalPage implements OnInit {
         Nad: 30,
         Subject: '',
         Message: '',
-        SourceSecFsId: this.task.workflowInstanceDataFields.FsId,
-        SouceType: 'DOC',
-        SourceId: this.task.workflowInstanceDataFields.DocId,
+        SourceSecFsId: this.task.workflowInstanceDataFields.FsId, //361
+        SouceType: 'DOC', //FOLDER
+        SourceId: this.task.workflowInstanceDataFields.DocId, //FolderId
         DeadlineType: '',
 
       };

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

@@ -36,7 +36,7 @@
         <ion-icon name="arrow-redo" slot="start"></ion-icon>
         <ion-label>Pedido de Deferimento</ion-label>
       </ion-item>
-      <ion-item (click)="openBookMeetingModal(task)">
+      <ion-item (click)="openBookMeetingModal(fulltask)">
         <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

@@ -14,7 +14,6 @@ import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.p
 import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { momentG }  from 'src/plugin/momentG'
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
-import { ProcessTask } from 'src/app/models/task';
 
 @Component({
   selector: 'app-expediente-detail',
@@ -93,7 +92,7 @@ export class ExpedienteDetailPage implements OnInit {
         "DocId": res.workflowInstanceDataFields.DocId,
       }
 
-      console.log('task', this.fulltask);
+      console.log('task', this.task);
 
       this.fulltask = res;
       console.log('GetTask', res);
@@ -211,7 +210,7 @@ export class ExpedienteDetailPage implements OnInit {
     const modal = await this.modalController.create({
       component: BookMeetingModalPage,
       componentProps: {
-        task: task,
+        task: this.task,
       },
       cssClass: classs,
       backdropDismiss: false

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

@@ -53,6 +53,7 @@ export class ExpedientePage implements OnInit {
           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Remetente,
           "DocumentsQty": 0,
+          "WorkflowName": element.workflowDisplayName,
         }
         this.taskslist.push(task);
       });