save

src/app/models/folder.model.ts

@@ -5,4 +5,5 @@ export class Folder{
     SourceSecFsId:string;
     SouceType:string;
     SourceId:string;
+    DeadlineType: string;
 }

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

@@ -137,8 +137,16 @@ export class DespachoPage implements OnInit {
     this.modalController.dismiss();
   }
   executado(){
-
+    let body = { 
+      "serialNumber": this.serialnumber, 
+      "action": "Conhecimento",
+      "dataFields": {
+        "ReviewerComments": '',
+      }
+    }
+    this.processes.PostTaskAction(body);
   }
+
   delegar(){
 
   }

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

@@ -77,6 +77,7 @@ export class ExpedientTaskModalPage implements OnInit {
         SourceSecFsId: this.task.workflowInstanceDataFields.FsId,
         SouceType: 'DOC',
         SourceId: this.task.workflowInstanceDataFields.DocId,
+        DeadlineType: '',
 
       };
       this.postData.DispatchFolder = this.dispatchFolder;
@@ -117,6 +118,19 @@ export class ExpedientTaskModalPage implements OnInit {
     
   }
   saveTask(){
+
+    if(this.postData.Priority=='99999861'){
+      this.dispatchFolder.DeadlineType = 'Normal';
+    }
+    else if(this.postData.Priority=='99999862'){
+      this.dispatchFolder.DeadlineType = 'Urgente';
+    }
+    else if(this.postData.Priority=='99999863'){
+      this.dispatchFolder.DeadlineType = 'Muito Urgente';
+    }
+    else if(this.postData.Priority=='99999864'){
+      this.dispatchFolder.DeadlineType = 'Urgentíssimo';
+    }
     
     let attendees = this.taskParticipants.concat(this.taskParticipantsCc);
     attendees = attendees.map(function(val) {

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

@@ -154,7 +154,7 @@
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-        <button hidden class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+        <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
         <div hidden class="solid"></div>
         <button hidden class="btn-cancel" shape="round" >Delegar</button>
       </div>

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

@@ -69,6 +69,13 @@ export class ExpedienteDetailPage implements OnInit {
     this.modalController.dismiss();
   }
 
+  sendExpedienteToPending(){
+    this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
+      console.log(res);
+      this.close();
+    });
+  }
+
 
   async LoadTaskDetail(serial: string) {
     this.processes.GetTask(serial).subscribe(res => {

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

@@ -39,8 +39,10 @@ export class ExpedientePage implements OnInit {
   }
 
   LoadList(){
+    console.log('YEAHHH');
+    
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
-      let tasksListReverse = result.reverse();
+      let tasksListReverse = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
       this.taskslist = new Array();
       tasksListReverse.forEach(element => {
         let task: DailyWorkTask = {
@@ -53,6 +55,8 @@ export class ExpedientePage implements OnInit {
         }
         this.taskslist.push(task);
       });
+      console.log(this.taskslist);
+      
     });
   }
 

src/app/services/processes.service.ts

@@ -49,6 +49,18 @@ export class ProcessesService {
     };
     return this.http.get<any>(`${geturl}`, options);
   }
+  SetTaskToPending(serialNumber:string): Observable<any>{
+    const geturl = environment.apiURL + 'Tasks/SetTaskPending';
+    let params = new HttpParams();
+
+    params = params.set("serialNumber", serialNumber);
+    
+    let options = { 
+      headers: this.headers, 
+      params: params 
+    };
+    return this.http.post<any>(`${geturl}`,'', options);
+  }
 
   GetTaskParticipants(folderId:string): Observable<any>{
     const geturl = environment.apiURL + 'Processes/GetUsersInDispash';
@@ -210,9 +222,4 @@ export class ProcessesService {
     return this.http.get<any>(`${geturl}`, options);
   }
 
-  
-
-
-
-
 }

src/app/shared/gabinete-digital/expedients/expedients.page.html

@@ -8,11 +8,11 @@
     </div>
   </div>
   <ion-toolbar>
-    <ion-segment [(ngModel)]="segment">
+    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="expediente">
         Expediente
       </ion-segment-button>
-      <ion-segment-button value="pendentes" (click)="notImplemented()">
+      <ion-segment-button value="pendentes">
         Pendentes
       </ion-segment-button>
     </ion-segment>

src/app/shared/gabinete-digital/expedients/expedients.page.ts

@@ -41,6 +41,10 @@ export class ExpedientsPage implements OnInit {
     this.LoadList();
   }
 
+  segmentChanged(ev: any) {
+    this.LoadList();
+  }
+
   notImplemented(){
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
@@ -51,22 +55,47 @@ export class ExpedientsPage implements OnInit {
   }
 
   LoadList(){
-    this.processes.GetTasksList("Expediente", false).subscribe(result => {
-      console.log(result);
-      this.taskslist = new Array();
-      let res = result.reverse();
-      res.forEach(element => {
-        let task: DailyWorkTask = {
-          "SerialNumber": element.serialNumber,
-          "Folio": element.workflowInstanceDataFields.Subject,
-          "Senders": element.originator.email,
-          "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-          "Remetente": element.workflowInstanceDataFields.Remetente
-        }
-        this.taskslist.push(task);
-      });
-    });
+    switch(this.segment){
+      case "Expediente":
+        this.processes.GetTasksList("Expediente", false).subscribe(result => {
+          console.log(result);
+          this.taskslist = new Array();
+          let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
+          res.forEach(element => {
+            let task: DailyWorkTask = {
+              "SerialNumber": element.serialNumber,
+              "Folio": element.workflowInstanceDataFields.Subject,
+              "Senders": element.originator.email,
+              "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+              "Remetente": element.workflowInstanceDataFields.Remetente
+            }
+            this.taskslist.push(task);
+          });
+          console.log(this.taskslist);
+        });
+        break;
+      case "Pendentes":
+        this.processes.GetTasksList("Expediente", false).subscribe(result => {
+          console.log(result);
+          this.taskslist = new Array();
+          let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
+          res.forEach(element => {
+            let task: DailyWorkTask = {
+              "SerialNumber": element.serialNumber,
+              "Folio": element.workflowInstanceDataFields.Subject,
+              "Senders": element.originator.email,
+              "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+              "Remetente": element.workflowInstanceDataFields.Remetente
+            }
+            this.taskslist.push(task);
+          });
+          console.log(this.taskslist);
+        });
+        break;
+    }
+    
   }
 
   doRefresh(event) {

src/app/shared/gabinete-digital/pedidos/pedidos.page.ts

@@ -101,14 +101,11 @@ export class PedidosPage implements OnInit {
         
       });
     }
-    console.log(this.taskType);
-    
-    
+    console.log(this.taskType); 
   }
 
   doRefresh(event) {
     this.LoadList();
-
     setTimeout(() => {
       event.target.complete();
     }, 2000);