diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 81432213f..eb134f400 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/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(); - } - }); } diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts index ef9017375..6c8b1e5de 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts +++ b/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) { diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index b9afaddd4..1ab907e7f 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/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 => { diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index a6d8802ca..12747404a 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/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(); diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index ca7ec0a09..1a70997f6 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/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()