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

src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -81,10 +81,10 @@ segmentChanged(ev: any) {
   this.loading = true;
 
   let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-   
-  console.log(result);
+  let despachosPr = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
+  console.log(despachosPr);
   
-  result.forEach( (element, index) => {
+  despachosPr.forEach( (element, index) => {
      
     let task = {
       "SerialNumber": element.serialNumber,

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

@@ -1,4 +1,4 @@
-<ion-header class="ion-no-border">
+<ion-header>
   <div class="title">
     <div class="thetitle"><ion-label >Despachos</ion-label></div>
     <div class="theicon">

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

@@ -7,7 +7,7 @@
       </button>
     </div>
   </div>
-  <ion-toolbar>
+  <!-- <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="validar">
         Diplomas por validar
@@ -16,7 +16,7 @@
         Diplomas assinados PR
       </ion-segment-button>
     </ion-segment>
-  </ion-toolbar>
+  </ion-toolbar> -->
 </ion-header>
 <ion-content>
   <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">

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

@@ -28,12 +28,13 @@ constructor(
   private alertService: AlertService,
   ) { 
     this.profile = 'mdgpr';
+    this.segment = 'validar'
   }
 
 ngOnInit() {
   //Inicializar segment
   this.segment = 'validar';
-  // this.LoadList();
+  this.LoadList();
 }
 segmentChanged(ev: any) {
   this.LoadList();
@@ -44,8 +45,11 @@ notImplemented(){
 }
 
 async LoadList(){
-  this.diplomasList = new Array();
+  
+
   let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+  this.diplomasList = new Array();
+
   console.log(diplomas);
   switch (this.segment) {
     case 'validar':
@@ -97,7 +101,7 @@ async LoadList(){
 doRefresh(event) {
   this.LoadList();
   setTimeout(() => {
-    event.target.complete();
+    //event.target.complete();
   }, 2000);
 }
 
@@ -120,5 +124,4 @@ async viewPedidoDetail(serialNumber:any) {
   });
 }
 
-
 }

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

@@ -1,4 +1,4 @@
-<ion-header class="ion-no-border">
+<ion-header>
   <div class="title">
     <div class="thetitle"><ion-label >Pedidos</ion-label></div>
     <div class="theicon">

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

@@ -1,4 +1,4 @@
-<ion-header class="ion-no-border">
+<ion-header>
   <div class="title">
     <div class="thetitle"><ion-label >Pendentes</ion-label></div>
     <div class="theicon">