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

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts

@@ -3,23 +3,16 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-import { DailyWorkTask } from '../../../../models/dailyworktask.model';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { formatDate } from '@angular/common';
 import { Event } from '../../../../models/event.model';
 import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
-import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
 import { momentG }  from 'src/plugin/momentG'
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
-import { ExpedientTaskModalPage } from '../../expediente/expedient-task-modal/expedient-task-modal.page';
 import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
 import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
 import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
-import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page';
 import { ToastService } from 'src/app/services/toast.service';
 
@@ -58,25 +51,18 @@ export class DespachoPage implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
     ) { 
-
       this.activatedRoute.paramMap.subscribe(params => {
-        console.log(params["params"]);
-        
         if(params["params"].SerialNumber) {
           this.serialnumber = params["params"].SerialNumber;
         }
         if(params["params"].caller) {
           this.caller = params["params"].caller;
         }
-
       });
-      
   }
 
   ngOnInit() {
     this.profile = "mdgpr";
-    console.log(this.serialnumber);
-    
     this.activateRoute.paramMap.subscribe(paramMap => {
       if (!paramMap.has('SerialNumber')) {
         return;
@@ -121,7 +107,6 @@ export class DespachoPage implements OnInit {
     }
   }
 
-
   async LoadTaskDetail(serial: string) {
     this.processes.GetTask(serial).subscribe(res => {
       this.task = {
@@ -141,14 +126,10 @@ export class DespachoPage implements OnInit {
         "Status": res.workflowInstanceDataFields.Status,
       }
       this.fulltask = res;
-      console.log(this.task);
-      
-      console.log('GetTask', res);
 
       let thedate = new Date(this.task.CreateDate);
       this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
 
-
       this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{
         this.intervenientes = users.filter(user=>{
           return user.Type == 'I';
@@ -156,37 +137,26 @@ export class DespachoPage implements OnInit {
         this.cc = users.filter(user=>{
           return user.Type == 'CC';
         });
-        console.log(users);
-        
       });
-      console.log(this.task.FolderId);
-      
       this.getDocumentDetails(this.task.FolderId, '361');
-
     });
   }
 
   getDocumentDetails(forlderId:string, applicationId:string) {
-    console.log(forlderId);
-    
     this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
       this.attachments = res.Documents;
-      console.log(res['Documents']);
-      console.log(this.attachments);
     })
   }
 
   async LoadRelatedEvents(serial: string) {
     if (this.eventsList == null) {
       this.attachmentsService.getAttachmentsBySerial(serial).subscribe(res => {
-        console.log(res);
         res.forEach(att => {
           if (this.eventsList == null) {
             this.eventsList = new Array();
           }
           this.events.getEvent(att.ParentId).subscribe(event => {
             this.eventsList.push(event);
-            console.log(this.eventsList);
           });
         });
       });
@@ -195,7 +165,6 @@ export class DespachoPage implements OnInit {
 
   viewDocument(docId:string){
     this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{
-      console.log(res);
       const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
       const browser = this.iab.create(url,"_blank");
       browser.show();
@@ -289,10 +258,7 @@ export class DespachoPage implements OnInit {
   }
 
   async sendExpedienteToPending() {
-    console.log(this.serialnumber);
-    
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
-      console.log(res);
       this.close();
       this.toastService.successMessage('Processo enviado para despacho')
     },
@@ -319,7 +285,6 @@ export class DespachoPage implements OnInit {
     await modal.present();
   
     modal.onDidDismiss().then(res => {
-      console.log(res);
       if(res.data){
 
         const DocumentToSave = res.data.documents.map((e) => {
@@ -369,12 +334,8 @@ export class DespachoPage implements OnInit {
     modal.onDidDismiss().then(res=>{
       console.log(res['data']);
       if(res['data']=='openDiscart'){
-        console.log('open discart');
-        
         this.distartExpedientModal();
-
       }
-
     });
   }
 

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

@@ -53,16 +53,12 @@ export class DespachosPage implements OnInit {
     private router: Router,
     ) { 
       this.profile = 'mdgpr';
-      // alert('nice!')
     }
 
   ngOnInit() {
     //Inicializar segment
     this.segment = "despachos";
     this.LoadList();
-    this.authService.userData$.subscribe((res:any)=>{
-    console.log(res); 
-    });
   }
 
   segmentChanged(ev: any) {
@@ -79,7 +75,6 @@ export class DespachosPage implements OnInit {
     let result = await this.processes.GetTasksList("Despacho", false).toPromise();
     //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
     this.despachoList = new Array();
-    
 
     await result.forEach( (element, index) => {
       
@@ -99,12 +94,8 @@ export class DespachosPage implements OnInit {
           "WorkflowName": element.workflowDisplayName,
           "activityInstanceName": element.activityInstanceName,
         }
-        
       this.despachoList.push(task)
-      
     });
-    
-
     this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
 
     this.despachoList.forEach( (element, index) => {
@@ -115,9 +106,7 @@ export class DespachosPage implements OnInit {
       this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{
         element.DocumentsQty = res.DocumentsTotal
       })
-
     });
-
   }
 
   sortArrayISODate(myArray: any) {

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

@@ -54,8 +54,6 @@ export class DiplomasAssinarPage implements OnInit {
    
    let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
    this.diplomasList = new Array();
- 
-   console.log(diplomas);
        let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
        console.log(diplomasAssinar);
        diplomasAssinar.forEach(element => {

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts

@@ -106,7 +106,6 @@ export class DiplomaPage implements OnInit {
   }
 
   async LoadTaskDetail(serial: string) {
-
     this.processes.GetTask(serial).subscribe(res => {
       this.task = {
         "SerialNumber": res.serialNumber,
@@ -123,11 +122,7 @@ export class DiplomaPage implements OnInit {
         "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
         "activityInstanceName": res.activityInstanceName,
       }
-
       this.fulltask = res;
-      console.log(this.task);
-      
-      console.log('GetTask', res);
 
       let thedate = new Date(this.task.CreateDate);
       this.customDate = this.days[thedate.getDay()]+ ", "  + thedate.getDate() +" de "  + ( this.months[thedate.getMonth()]);
@@ -138,9 +133,7 @@ export class DiplomaPage implements OnInit {
         });
         this.cc = users.filter(user=>{
           return user.Type == 'CC';
-        });
+        }); 
-        console.log(users);
-        
       });
       this.getDocumentDetails(this.task.FolderId, '361');
 
@@ -150,7 +143,6 @@ export class DiplomaPage implements OnInit {
 
   viewDocument(docId:string){
     this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{
-      console.log(res);
       const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
       const browser = this.iab.create(url,"_blank");
       browser.show();

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

@@ -72,21 +72,13 @@ constructor(
     this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']);
   }
 
-  notImplemented(){
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-  }
-
   async LoadList(){
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
 
-    console.log('diplomas', diplomas);
-
     switch (this.segment) {
       case 'validar':
-        console.log(this.segment);
         this.diplomasList = new Array();
         let diplomasValidar = diplomas.reverse().filter(data => data.activityInstanceName == "Revisar Diploma");
-        console.log(diplomasValidar);
         diplomasValidar.forEach(element => {
           let DocId = element.workflowInstanceDataFields.FolderID;
           let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
@@ -136,10 +128,8 @@ constructor(
         this.showLoader = false;
         break;
       case 'assinados':
-        console.log(this.segment);
         this.diplomasList = new Array();
         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;
@@ -187,7 +177,6 @@ constructor(
           });
         });
         this.showLoader = false;
-        
         break;
     }
   }
@@ -199,25 +188,6 @@ constructor(
     }, 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();
-    });
-  }
-
   goBack() {
     this.router.navigate(['/home/gabinete-digital']);
     // window.history.back()

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts

@@ -137,7 +137,6 @@ export class PedidoPage implements OnInit {
           "activityInstanceName": res.activityInstanceName,
           "Status": res.workflowInstanceDataFields.Status,
         }
-        console.log(this.task);
       }
 
       let thedate = new Date(res.taskStartDate);
@@ -150,7 +149,6 @@ export class PedidoPage implements OnInit {
         this.cc = users.filter(user=>{
           return user.Type == 'CC';
         });
-        console.log(users);
       });
       this.getDocumentDetails(res.workflowInstanceDataFields.FolderID, '361');
     });
@@ -160,13 +158,11 @@ export class PedidoPage implements OnInit {
     this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
       this.attachments = res.Documents;
       // console.log(res['Documents']);
-      console.log(this.attachments);
     })
   }
 
   viewDocument(docId:string){
     this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{
-      console.log(res);
       const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
       const browser = this.iab.create(url,"_blank");
       browser.show();
@@ -255,7 +251,6 @@ export class PedidoPage implements OnInit {
 
   sendExpedienteToPending() {
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
-      console.log(res);
       this.goBack();
     });
   }

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

@@ -101,8 +101,6 @@ export class PedidosPage implements OnInit {
       let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
 
       let allParecer = parecer.concat(parecerPr).reverse();
-      console.log(allParecer);
-
       this.parecerList = new Array();
 
        allParecer.forEach(element => {
@@ -125,7 +123,6 @@ export class PedidosPage implements OnInit {
         }
         this.parecerList.push(task);
       });
-      console.log(this.parecerList);
         
     }
     else if(this.segment == 'deferimento') {
@@ -156,11 +153,9 @@ export class PedidosPage implements OnInit {
         }
           this.deferimentoList.push(task);
         });
-        console.log(this.deferimentoList);
         
       });
     }
-    console.log(this.taskType); 
   }
 
   doRefresh(event) {

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

@@ -86,7 +86,6 @@ export class DespachosPage implements OnInit {
  }
 
  openExpedientDetailPage(data){
-   console.log(data);
    this.openExpedientDetail.emit(data);
  }
 

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

@@ -44,14 +44,12 @@ export class ExpedientsPage implements OnInit {
     this.LoadList();
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
-        this.doRefresh();
+        this.LoadList();
       }
     });
   }
 
   segmentChanged(){
-    console.log(this.segment);
-    
     this.LoadList();
   }
 
@@ -66,7 +64,6 @@ export class ExpedientsPage implements OnInit {
 
   LoadList(){
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
-      console.log(result);
       this.taskslist = new Array();
       let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
       res.forEach(element => {
@@ -86,12 +83,10 @@ export class ExpedientsPage implements OnInit {
         }
         this.taskslist.push(task);
       });
-      console.log(this.taskslist);
     });
   }
 
   doRefresh() {
-    console.log('refresh expedientes1');
     this.LoadList();
   }
 

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

@@ -28,8 +28,8 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100" [ngSwitch]="segment">
+  <div class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
-    <div *ngIf="parecerList" class="overflow-y-auto height-100">
+    <div *ngIf="parecerList">
       <ion-list *ngSwitchCase="'parecer'">
         <!-- *ngFor = "let task of parecerList; let i = index"
         (click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -64,7 +64,7 @@
       </ion-list>
 
     </div>
-    <div *ngIf="deferimentoList" class="overflow-y-auto height-100">
+    <div *ngIf="deferimentoList">
       <ion-list *ngSwitchCase="'deferimento'">
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  

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

@@ -102,7 +102,6 @@ export class PedidosPage implements OnInit {
         }
         this.parecerList.push(task);
       });
-      console.log(this.parecerList);
         
     }
     else if(this.segment == 'deferimento') {
@@ -110,8 +109,6 @@ export class PedidosPage implements OnInit {
       this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
         this.taskslist = result;
         
-        console.log(result);
-        
         this.deferimentoList = new Array();
         let res = result.reverse();
         res.forEach(element => {
@@ -134,11 +131,9 @@ export class PedidosPage implements OnInit {
         }
           this.deferimentoList.push(task);
         });
-        console.log(this.deferimentoList);
         
       });
     }
-    console.log(this.taskType); 
   }
 
   doRefresh() {
@@ -152,7 +147,6 @@ export class PedidosPage implements OnInit {
   }
 
   async viewPedidoDetail(serialNumber:any) {
-    console.log(this.profile);
 
     const modal = await this.modalController.create({
       component: PedidoPage,

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

@@ -48,7 +48,7 @@ export class PendentesPage implements OnInit {
 
    this.router.events.forEach((event) => {
     if(event instanceof NavigationEnd && event.url == this.router.url) {
-      this.doRefresh();
+      this.LoadList();
     }
   });
   }
@@ -57,10 +57,6 @@ export class PendentesPage implements OnInit {
     this.LoadList();
   }
  
-  notImplemented(){
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-  }
- 
   openExpedientDetailPage(data){
     console.log(data);
     this.openExpedientDetail.emit(data);
@@ -69,9 +65,7 @@ export class PendentesPage implements OnInit {
   async LoadList(){
     this.showLoader = true;
     this.pendentesList = [];
-    console.log('clear');
     
-
     let despachos = await this.processes.GetTasksList("Despacho", false).toPromise();
     let pareceres = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
     let deferimentos = await this.processes.GetTasksList("Pedido de Deferimento", false).toPromise();
@@ -85,7 +79,6 @@ export class PendentesPage implements OnInit {
       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();
@@ -132,12 +125,7 @@ export class PendentesPage implements OnInit {
 
  
   doRefresh() {
-    console.log('Refresh pendentes');
-    
     this.LoadList();
- 
-    setTimeout(() => {
-    }, 2000);
   }
  
   async viewTaskDetails(serialNumber:string, workflowName:string) {
@@ -152,60 +140,6 @@ export class PendentesPage implements OnInit {
       this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
     }
   }
-
-  async openDespacho(serialNumber:string){
-
-    const modal = await this.modalController.create({
-      component: DespachoPage,
-      componentProps:{
-        enterAnimation: "",
-        serialNumber: serialNumber,
-        profile: this.profile,
-      },
-      cssClass: 'modal modal-desktop',
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      console.log('refresh list');
-      this.LoadList();
-    });
-  }
-  
-  async openPedido(serialNumber:string){
-
-    const modal = await this.modalController.create({
-      component: PedidoPage,
-      componentProps:{
-        enterAnimation: "",
-        serialNumber: serialNumber,
-        profile: this.profile,
-      },
-      cssClass: 'modal modal-desktop',
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      console.log('refresh list');
-      this.LoadList();
-    });
-  }
-
-  async viewExpedientDetail(serialNumber:any) {
-    console.log(this.profile);
-    const modal = await this.modalController.create({
-      component: ExpedienteDetailPage,
-      componentProps:{
-        enterAnimation: "",
-        serialNumber: serialNumber,
-        profile: this.profile,
-      },
-      cssClass: 'modal modal-desktop',
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      console.log('refresh list');
-      this.LoadList();
-    });
-  }
  
  }