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

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

@@ -4,7 +4,7 @@
 <ion-content>
   <div class="header-content width-100">
     <div class="header-title d-flex width-100">
-      <p>Deseja retirar este expediente da sua caixa de correspondência?</p>
+      <h3>Deseja retirar este expediente da sua caixa de correspondência?</h3>
     </div>
   </div>
   <div class="header-body width-100">

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

@@ -163,12 +163,9 @@ export class ExpedientTaskModalPage implements OnInit {
       };
     })
     
-
     let docs = {
       ProcessInstanceID: "",
-      Attachments: [
+      Attachments: []
-
-      ]
     }
 
     const DocumentToSave = this.documents.map((e) => {
@@ -196,21 +193,22 @@ export class ExpedientTaskModalPage implements OnInit {
                   //SubjectTypes: [],
                 }
                 try {
+                  let action_despacho = {
+                    "serialNumber": this.task.serialNumber,
+                    "action": "Tratado",
+                    "ActionTypeId": 94,
+                    "dataFields": {
+                      "Note": "",
+                    }
+                  }
                   this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
-                  await this.successMessage('Processo efetuado')
+                  this.modalController.dismiss(action_despacho);
+                  //await this.successMessage('Processo efetuado');
+                  
                 } catch (error) {
                   await this.badRequest('Processo não efetuado')
                 }
                 console.log('this.taskResult', this.taskResult);
-                let action_despacho = {
-                  "serialNumber": this.task.serialNumber,
-                  "action": "Tratado",
-                  "ActionTypeId": 94,
-                  "dataFields": {
-                    "Note": "",
-                  }
-                }
-                this.modalController.dismiss(action_despacho);
                 break;
       
               case '1':
@@ -225,21 +223,20 @@ export class ExpedientTaskModalPage implements OnInit {
                 }
             
                 try {
-                  this.taskResult = await this.processes.postParecer(this.postData).toPromise()
+                  let action_parecer = {
-                  await this.successMessage('Processo efetuado')
+                    "serialNumber": this.task.serialNumber,
+                    "action": "Tratado",
+                    "ActionTypeId": 92,
+                    "dataFields": {
+                      "Note": "",
+                    }
+                  }
+                  this.taskResult = await this.processes.postParecer(this.postData).toPromise();
+                  this.modalController.dismiss(action_parecer);
+                  //await this.successMessage('Processo efetuado')
                 } catch (error) {
                   await this.badRequest('Processo não efetuado')
                 }
-      
-                let action_parecer = {
-                  "serialNumber": this.task.serialNumber,
-                  "action": "Tratado",
-                  "ActionTypeId": 92,
-                  "dataFields": {
-                    "Note": "",
-                  }
-                }
-                this.modalController.dismiss(action_parecer);
                 break;
               case '2':
                 this.postData = {
@@ -253,21 +250,21 @@ export class ExpedientTaskModalPage implements OnInit {
                 }
                 //console.log(this.postData);
                 try {
-                  this.taskResult = await this.processes.postDeferimento(this.postData).toPromise()
+                  let action_deferimento = {
-                  await this.successMessage('Processo efetuado')
+                    "serialNumber": this.task.serialNumber,
+                    "action": "Tratado",
+                    "ActionTypeId": 93,
+                    "dataFields": {
+                      "Note": "",
+                  }
+                }
+                this.taskResult = await this.processes.postDeferimento(this.postData).toPromise();
+                this.modalController.dismiss(action_deferimento);
+                  //await this.successMessage('Processo efetuado')
                 } catch (error) {
                   await this.badRequest('Processo não efetuado')
                 }
                 console.log('this.taskResult', this.taskResult);
-                let action_deferimento = {
-                  "serialNumber": this.task.serialNumber,
-                  "action": "Tratado",
-                  "ActionTypeId": 93,
-                  "dataFields": {
-                    "Note": "",
-                }
-              }
-              this.modalController.dismiss(action_deferimento);
             break;
           }
         }
@@ -290,21 +287,21 @@ export class ExpedientTaskModalPage implements OnInit {
               }
               console.log(this.postData);
               try {
+                let action_despacho_pr = {
+                  "serialNumber": this.task.serialNumber,
+                  "action": "Tratado",
+                  "ActionTypeId": 99999881 ,
+                  "dataFields": {
+                    "Note": "",
+                  }
+                }
                 this.taskResult = await this.processes.postDespatchoPr(this.postData).toPromise();
-                await this.successMessage('Processo efetuado')
+                this.modalController.dismiss(action_despacho_pr);
+                //await this.successMessage('Processo efetuado')
               } catch (error) {
                 await this.badRequest('Processo não efetuado')
               }
               console.log('this.taskResult', this.taskResult);
-              let action_despacho_pr = {
-                "serialNumber": this.task.serialNumber,
-                "action": "Tratado",
-                "ActionTypeId": 99999881 ,
-                "dataFields": {
-                  "Note": "",
-                }
-              }
-              this.modalController.dismiss(action_despacho_pr);
               break;
     
             case '1':
@@ -319,21 +316,20 @@ export class ExpedientTaskModalPage implements OnInit {
               }
           
               try {
+                let action_parecer_pr = {
+                  "serialNumber": this.task.serialNumber,
+                  "action": "Tratado",
+                  "ActionTypeId": 99999881,
+                  "dataFields": {
+                    "Note": "",
+                  }
+                }
                 this.taskResult = await this.processes.postParecerPr(this.postData).toPromise();
-                await this.successMessage('Processo efetuado')
+                this.modalController.dismiss(action_parecer_pr);
+                //await this.successMessage('Processo efetuado')
               } catch (error) {
                 await this.badRequest('Processo não efetuado')
               }
-    
-              let action_parecer_pr = {
-                "serialNumber": this.task.serialNumber,
-                "action": "Tratado",
-                "ActionTypeId": 99999881,
-                "dataFields": {
-                  "Note": "",
-                }
-              }
-              this.modalController.dismiss(action_parecer_pr);
               break;
             }
           break;

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

@@ -196,18 +196,13 @@ export class ExpedienteDetailPage implements OnInit {
     modal.onDidDismiss().then(res=>{
       console.log(res['data']);
       let body = res['data'];
-      // alert('close '+ res['data'])
       if(res['data']){
-        console.log('open discart');
+        console.log('open discart')
-        
         this.distartExpedientModal(body);
-
       }
       else{
         console.log('Not open');
-        
       }
-
     });
   }
 
@@ -230,6 +225,7 @@ export class ExpedienteDetailPage implements OnInit {
       
       if(res['data']== 'Yes'){
         this.processes.CompleteTask(body);
+        this.goBack();
       }
       else if(res['data'] == 'No'){
         let otherbody = {

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

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -40,6 +40,11 @@ export class ExpedientePage implements OnInit {
 
   ngOnInit() {
     this.LoadList();
+    this.router.events.forEach((event) => {
+      if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.LoadList();
+      }
+    });
   }
 
   notImplemented(){

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

@@ -317,6 +317,7 @@ export class ExpedientePrPage implements OnInit {
       console.log(res['data']);
       if(res['data']== 'Yes'){
         this.processes.CompleteTask(body);
+        this.goBack(); 
       }
       else if(res['data'] == 'No'){
         let otherbody = {

src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -40,6 +40,11 @@ export class ExpedientesPrPage implements OnInit {
 
   ngOnInit() {
     this.LoadList();
+    this.router.events.forEach((event) => {
+      if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.LoadList();
+      }
+    });
   }
 
   notImplemented(){

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

@@ -65,17 +65,20 @@ export class PedidosPage implements OnInit {
     this.openPedido.emit(data);
   }
 
-  LoadList(){
+  async LoadList(){
     if(this.segment == 'parecer'){
       this.taskType = "Pedido de Parecer";
-      this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => {
-        this.taskslist = result;
-        console.log(result);
 
-        this.parecerList = new Array();
+      let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
-        let res = result.reverse();
+      let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
-        res.forEach(element => {
+
-          let task = {
+      let allParecer = parecer.concat(parecerPr).reverse();
+      console.log(allParecer);
+
+      this.parecerList = new Array();
+
+       allParecer.forEach(element => {
+        let task = {
             "SerialNumber": element.serialNumber,
             "Folio": element.workflowInstanceDataFields.Subject,
             "Senders": element.originator.email,
@@ -86,12 +89,11 @@ export class PedidosPage implements OnInit {
             "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
-          }
+        }
-          this.parecerList.push(task);
+        this.parecerList.push(task);
-        });
-        console.log(this.parecerList);
-        
       });
+      console.log(this.parecerList);
+        
     }
     else if(this.segment == 'deferimento') {
       this.taskType = "Pedido de Deferimento";