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

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

@@ -28,7 +28,7 @@
             (click)="viewExpedientDetail(task.SerialNumber)"
             >
             <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-              <div class="item width-100">
+              <div class="item width-100" *ngIf="task.Status == 'Active'">
                 <div class="exp-top-detail">
                   <div class="exp-date">
                     <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
@@ -54,7 +54,7 @@
 
     </div>
   </div>
-  <div *ngIf="despachoList.length < 1">
+  <div *ngIf="loading">
   
     <ion-list>
       <ion-item>

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

@@ -34,6 +34,7 @@ taskList:tasksList[] = [];
 taskType: string;
 serialNumber:string;
 totalDocs:any;
+loading = false
 
 @Input() profile:string;
 segment:string;
@@ -64,18 +65,18 @@ segmentChanged(ev: any) {
   this.LoadList();
 }
 
-notImplemented(){
-  this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-}
+  notImplemented(){
+    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+  }
 
-openExpedientDetailPage(data){
-  console.log(data);
-  this.openExpedientDetail.emit(data);
-}
+  openExpedientDetailPage(data){
+    console.log(data);
+    this.openExpedientDetail.emit(data);
+  }
 
- async LoadList(){
-   this.despachoList = new Array();
+ async LoadList() {
 
+<<<<<<< HEAD
    let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
    
    console.log(result);
@@ -94,20 +95,49 @@ openExpedientDetailPage(data){
        "FolderID": element.workflowInstanceDataFields.FolderID
      }
      this.despachoList.push(task)
+=======
+  this.despachoList = new Array();
+
+  this.loading = true;
+
+  let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+   
+  console.log(result);
+  
+  result.forEach( (element, index) => {
+>>>>>>> bb49078bfced9a3cf3d4e7d5af6a60ec6e10164f
      
-   });
+    let task = {
+      "SerialNumber": element.serialNumber,
+      "Folio": element.workflowInstanceDataFields.Subject,
+      "Senders": element.workflowInstanceDataFields.Sender,
+      "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+      "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+      "Remetente": element.workflowInstanceDataFields.Remetente,
+      "DocumentsQty": '',
+      "DocId": element.workflowInstanceDataFields.DocId,
+      "WorkflowName": element.workflowDisplayName,
+      "FolderID": element.workflowInstanceDataFields.FolderID,
+      "Status": element.workflowInstanceDataFields.Status 
+    }
 
-   this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
+    this.despachoList.push(task)
+ 
+  });
 
-   this.despachoList.forEach( (element, index) => {
-     // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
-     let FolderID = element['FolderID'];
+  this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
 
-     this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{
-       element.DocumentsQty = res.DocumentsTotal
-     })
+  this.despachoList.forEach( (element, index) => {
+    // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
+    let FolderID = element['FolderID'];
 
-   });
+    this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{
+      element.DocumentsQty = res.DocumentsTotal
+    })
+
+  });
+
+  this.loading = false;
 
  }
 

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

@@ -33,7 +33,7 @@ constructor(
 ngOnInit() {
   //Inicializar segment
   this.segment = 'validar';
-  this.LoadList();
+  // this.LoadList();
 }
 segmentChanged(ev: any) {
   this.LoadList();