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

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

@@ -91,10 +91,11 @@ export class DespachosPage implements OnInit {
  }
 
   async LoadList(){
-    this.despachoList = new Array();
+    
 
     let result = await this.processes.GetTasksList("Despacho", false).toPromise();
     //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
+    this.despachoList = new Array();
     
     console.log(result);
 

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts

@@ -9,7 +9,8 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { Event, EventToApproveEdit } from '../../../models/event.model';
-
+import { BadRequestComponent } from '../../popover/bad-request/bad-request.component';
+import { SuccessMessageComponent } from '../../popover/success-message/success-message.component';
 
 @Component({
   selector: 'app-edit-event',
@@ -21,7 +22,6 @@ export class EditEventToApproveComponent implements OnInit {
   serialNumber: string
   loadedAttachments: Attachment[]= []
 
-
   eventProcess = {
     serialNumber: "",
     taskStartDate: "",
@@ -232,8 +232,6 @@ export class EditEventToApproveComponent implements OnInit {
       }
     })
 
-
-    
     const event: any = {
       Agenda: this.eventProcess.workflowInstanceDataFields.Agenda,
       Body: this.eventProcess.workflowInstanceDataFields.Body,
@@ -253,16 +251,28 @@ export class EditEventToApproveComponent implements OnInit {
       ReviewerComments: ''
     }
     
-    this.eventsService.postEventToApproveEdit(event).subscribe()
+    this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
+      this.successMessage()
+    }, error =>{
+      this.badRequest()
+    })
 
 
     this.loadedAttachments.forEach((document:any)=>{
       if(document['action'] == 'add') {
         delete document.action
-        this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{});
+        this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{
+          //this.successMessage()
+        }, error =>{
+          this.badRequest()
+        });
       } else if(document['action'] == 'delete') {
         delete document.action
-        this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{})
+        this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{
+          //this.successMessage()
+        }, error =>{
+          this.badRequest()
+        })
       }
 
     })
@@ -396,4 +406,38 @@ export class EditEventToApproveComponent implements OnInit {
     });
   }
 
+  async successMessage(message?: string) {
+    
+    const modal = await this.modalController.create({
+      component: SuccessMessageComponent,
+       componentProps: {
+        message: message || 'Processo efetuado' ,
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },3000)
+    
+  }
+
+  async badRequest() {
+    const modal = await this.modalController.create({
+      component: BadRequestComponent,
+       componentProps: {
+        message: 'hello',
+      },
+      cssClass: 'modal modal-desktop'
+    });
+
+    modal.present()
+    
+    setTimeout(()=>{
+      modal.dismiss()
+    },1000)
+  }
+
 }

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

@@ -44,11 +44,11 @@ export class ExpedientePage implements OnInit {
     private alertService: AlertService) { 
       //this.serialnumber = this.navParams.get('serialNumber');
       //this.profile = this.navParams.get('profile');
-    }
+  }
 
   ngOnInit() {
     this.profile = "mdgpr";
-    console.log(this.serialNumber);
+    // console.log(this.serialNumber);
     
     this.activateRoute.paramMap.subscribe(paramMap => {
       if (!paramMap.has('SerialNumber')) {
@@ -61,11 +61,11 @@ export class ExpedientePage implements OnInit {
     this.LoadTaskDetail(this.serialNumber);
     this.LoadRelatedEvents(this.serialNumber);
   }
+
   openExpedientListPage(){
     this.openExpedientList.emit();
   }
 
-
   async LoadTaskDetail(serial: string) {
     this.processes.GetTask(serial).subscribe(res => {
       this.task = {
@@ -99,7 +99,7 @@ export class ExpedientePage implements OnInit {
     }
   }
 
-  viewDocument(){
+  viewDocument() {
     const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
     const browser = this.iab.create(url,"_blank");
     browser.show();
@@ -154,4 +154,5 @@ export class ExpedientePage implements OnInit {
       }
     });
   }
+
 }

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

@@ -91,7 +91,7 @@ export class ExpedientsPage implements OnInit {
   goToExpediente(serialNumber:any){
     let navigationExtras: NavigationExtras = {
       queryParams: {
-          "serialNumber": serialNumber,
+        "serialNumber": serialNumber,
       }
     };
     this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);

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

@@ -93,7 +93,7 @@ export class PedidosPage implements OnInit {
         
       });
     }
-    else if(this.segment == 'deferimento'){
+    else if(this.segment == 'deferimento') {
       this.taskType = "Pedido de Deferimento";
       this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
         this.taskslist = result;

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

@@ -135,8 +135,8 @@ export class PendentesPage implements OnInit {
   goToDespacho(serialNumber:any){
     let navigationExtras: NavigationExtras = {
      queryParams: {
-         "serialNumber": serialNumber,
-       }
+        "serialNumber": serialNumber,
+      }
      };
      this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
    }
@@ -144,8 +144,8 @@ export class PendentesPage implements OnInit {
    goToPedido(serialNumber:any){
     let navigationExtras: NavigationExtras = {
      queryParams: {
-         "serialNumber": serialNumber,
-       }
+        "serialNumber": serialNumber,
+      }
      };
      this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
    }
@@ -153,7 +153,7 @@ export class PendentesPage implements OnInit {
    goToExpediente(serialNumber:any){
     let navigationExtras: NavigationExtras = {
       queryParams: {
-          "serialNumber": serialNumber,
+        "serialNumber": serialNumber,
       }
     };
     this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);

src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts

@@ -32,137 +32,138 @@ constructor(
     this.segment = 'validar'
   }
 
-ngOnInit() {
-  //Inicializar segment
-  this.segment = 'assinados';
-  this.LoadList();
-}
-segmentChanged(ev: any) {
-  this.LoadList();
-}
-
-notImplemented(){
-  this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-}
-
-async LoadList(){
-  
-
-  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':
-      let diplomasValidar = diplomas.reverse().filter(data => data.workflowInstanceDataFields.Status == "Revising");
-      console.log(diplomasValidar);
-      diplomasValidar.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 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": this.totalDocs,
-            "DocId": element.workflowInstanceDataFields.DocId,
-            "WorkflowName": element.workflowDisplayName,
-            "activityInstanceName": element.activityInstanceName,
-          }
-          this.diplomasList.push(task);
-        },
-        (error)=>{
-          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": 0,
-            "DocId": element.workflowInstanceDataFields.DocId,
-            "WorkflowName": element.workflowDisplayName,
-            "activityInstanceName": element.activityInstanceName,
-          }
-          this.diplomasList.push(task);
-        });
-      });
-      this.showLoader = false;
-      break;
-    case 'assinados':
-      let diplomasassinado = diplomas.reverse().filter(data => data.workflowInstanceDataFields.Status == "Signed");
-      console.log('Assinados');
-      
-      diplomasassinado.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 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": this.totalDocs,
-            "DocId": element.workflowInstanceDataFields.DocId,
-            "WorkflowName": element.workflowDisplayName,
-            "activityInstanceName": element.activityInstanceName,
-          }
-          this.diplomasList.push(task);
-        },
-        (error)=>{
-          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": 0,
-            "DocId": element.workflowInstanceDataFields.DocId,
-            "WorkflowName": element.workflowDisplayName,
-            "activityInstanceName": element.activityInstanceName,
-          }
-          this.diplomasList.push(task);
-        });
-      });
-      this.showLoader = false;
-
-      break;
-  }
-}
-
-doRefresh(event) {
-  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');
+  ngOnInit() {
+    //Inicializar segment
+    this.segment = 'assinados';
     this.LoadList();
-  });
-}
+  }
+  segmentChanged(ev: any) {
+    this.LoadList();
+  }
+
+  notImplemented(){
+    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+  }
+
+  async LoadList(){
+    
+
+    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':
+        let diplomasValidar = diplomas.reverse().filter(data => data.workflowInstanceDataFields.Status == "Revising");
+        console.log(diplomasValidar);
+        diplomasValidar.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 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": this.totalDocs,
+              "DocId": element.workflowInstanceDataFields.DocId,
+              "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
+            }
+            this.diplomasList.push(task);
+          },
+          (error)=>{
+            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": 0,
+              "DocId": element.workflowInstanceDataFields.DocId,
+              "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
+            }
+            this.diplomasList.push(task);
+          });
+        });
+        this.showLoader = false;
+        break;
+      case 'assinados':
+        let diplomasassinado = diplomas.reverse().filter(data => data.workflowInstanceDataFields.Status == "Signed");
+        console.log('Assinados');
+        
+        diplomasassinado.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 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": this.totalDocs,
+              "DocId": element.workflowInstanceDataFields.DocId,
+              "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
+            }
+            this.diplomasList.push(task);
+          },
+          (error)=>{
+            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": 0,
+              "DocId": element.workflowInstanceDataFields.DocId,
+              "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
+            }
+            this.diplomasList.push(task);
+          });
+        });
+        this.showLoader = false;
+
+        break;
+    }
+  }
+
+  doRefresh(event) {
+    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();
+    });
+  }
+  
 }