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

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

@@ -6,7 +6,7 @@
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
     </div>
-    <div class="bottom-title d-flex"><h3 class="bottom-text">Diplomas por Assinar</h3></div>
+    <div class="bottom-title d-flex"><h3 class="bottom-text">Diplomas para Assinar</h3></div>
   </div>
 </ion-header>
 <ion-content>

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

@@ -56,7 +56,7 @@ serialNumber:string;
     this.diplomasList = new Array();
 
     console.log(diplomas);
-    let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar diploma");
+    let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
     console.log(diplomasAssinar);
     diplomasAssinar.forEach(element => {
       let DocId = element.workflowInstanceDataFields.FolderID;

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

@@ -19,7 +19,6 @@ showLoader: boolean;
 totalDocs:any;
 serialNumber:string;
 
-@Input() profile:string;
 @Input() segment:string;
 
 constructor(
@@ -29,16 +28,9 @@ constructor(
   private router: Router,
   private activatedRoute: ActivatedRoute,
   ) { 
-    this.profile = 'mdgpr';
-    this.segment = 'validar'
   }
 
   ngOnInit() {
-    //Inicializar segment
-    this.segment = 'validar';
-
-
-
     this.LoadList();
   }
 
@@ -61,7 +53,6 @@ constructor(
 
   async LoadList(){
     
-
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
     this.diplomasList = new Array();
 
@@ -117,36 +108,63 @@ constructor(
         this.showLoader = false;
         break;
       case 'assinados':
-        console.log('Assinados');
+        let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
+        console.log(diplomasAssinados);
+        diplomasAssinados.forEach(element => {
+          let DocId = element.workflowInstanceDataFields.FolderID;
+          let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+          this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
+            this.totalDocs = res.DocumentsTotal;
+            console.log(res.DocumentsTotal);
+            let date = new Date(element.taskStartDate);
+        date.setMonth(date.getMonth() + 1);
+        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+
+        let task = {
+            "SerialNumber": element.serialNumber,
+            "Folio": element.workflowInstanceDataFields.Subject,
+            "Senders": element.originator.email,
+            "CreateDate": taskDate,
+            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+            "Remetente": element.workflowInstanceDataFields.Remetente,
+            "DocumentsQty": 0,
+            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "WorkflowName": element.workflowDisplayName,
+            "activityInstanceName": element.activityInstanceName,
+        }
+            this.diplomasList.push(task);
+          },
+          (error)=>{
+            let date = new Date(element.taskStartDate);
+        date.setMonth(date.getMonth() + 1);
+        let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+
+        let task = {
+            "SerialNumber": element.serialNumber,
+            "Folio": element.workflowInstanceDataFields.Subject,
+            "Senders": element.workflowInstanceDataFields.Sender,
+            "CreateDate": taskDate,
+            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+            "Remetente": element.workflowInstanceDataFields.Remetente,
+            "DocumentsQty": 0,
+            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "WorkflowName": element.workflowDisplayName,
+            "activityInstanceName": element.activityInstanceName,
+        }
+            this.diplomasList.push(task);
+          });
+        });
+        this.showLoader = false;
         
         break;
     }
   }
 
-  doRefresh(event) {
+  doRefresh() {
     this.LoadList();
     setTimeout(() => {
       //event.target.complete();
     }, 2000);
   }
 
-  async viewPedidoDetail(serialNumber:any) {
-    console.log(this.profile);
-
-    const modal = await this.modalController.create({
-      component: DiplomaPage,
-      componentProps:{
-        enterAnimation: "",
-        serialNumber: serialNumber,
-        profile: this.profile,
-      },
-      cssClass: 'modal modal-desktop',
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      console.log('refresh list');
-      this.LoadList();
-    });
-  }
-
 }

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

@@ -13,7 +13,7 @@
         Pedidos de Parecer
       </ion-segment-button>
       <ion-segment-button value="deferimento">
-        Pedidos de Defereimento
+        Pedidos de Defererimento
       </ion-segment-button>
     </ion-segment>
   </ion-toolbar>

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

@@ -48,10 +48,9 @@ export class PedidosPage implements OnInit {
     }
 
   ngOnInit() {
-    //Inicializar segment
-    this.segment = 'parecer';
     this.LoadList();
   }
+  
   segmentChanged(ev: any) {
     this.LoadList();
   }

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

@@ -36,7 +36,7 @@
                     <ion-label>{{task.Senders}}</ion-label>
                   </div>
                   <div class="exp-workflow">
-                    <span class="label">{{task.WorkflowName}}</span>
+                    <span class="label">{{task.activityInstanceName}}</span>
                   </div>
                   <div class="exp-icon">
                     <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>