diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 91d69bce1..a9110b9cc 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -82,7 +82,7 @@ export class CreateProcessPage implements OnInit { Message: '', SourceSecFsId: this.task.workflowInstanceDataFields.FsId, //361 SourceType: 'DOC', //FOLDER - SourceId: this.task.workflowInstanceDataFields.DocId, //FolderId + SourceId: this.task.workflowInstanceDataFields.DocIdD, //FolderId DeadlineType: '', SubjectTypes: ['99999844'], NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber, @@ -103,23 +103,12 @@ export class CreateProcessPage implements OnInit { } ngOnInit() { - this.taskDate = new Date(this.task.taskStartDate); - - if(!this.task.hasOwnProperty('isEvent')) { - // if not - this.getAttachments(); - } - this.getSubjectType(); - - console.log('CHEGOU'); - - } close(){ - this.router.navigate(['/home/gabinete-digital/expediente']); + //this.router.navigate(['/home/gabinete-digital/expediente']); this.modalController.dismiss(null); } @@ -247,13 +236,6 @@ export class CreateProcessPage implements OnInit { } this.processes.CompleteTask(body); } - - getAttachments() { - this.attachmentsService.getAttachmentsBySerial(this.task.serialNumber).subscribe(res=>{ - this.loadedAttachments = res; - console.log(res); - }); - } async addParticipants() { /* console.log('HERES'); */ 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 b6833120a..8df933e43 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 @@ -56,7 +56,7 @@ export class DiplomasAssinarPage implements OnInit { 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; diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 6cb7d1180..14e5c9210 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -14,6 +14,8 @@ import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchDocument } from 'src/app/models/search-document'; import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; +import { User } from 'src/app/models/user.model'; +import { AuthService } from 'src/app/services/auth.service'; @Component({ selector: 'app-book-meeting-modal', @@ -40,6 +42,7 @@ export class BookMeetingModalPage implements OnInit { formLocationSatus: boolean = false; showAttendees= false; + loggeduser: User; constructor( private modalController: ModalController, @@ -48,7 +51,9 @@ export class BookMeetingModalPage implements OnInit { private processes:ProcessesService, private attachmentsService: AttachmentsService, private calendarService: EventsService, + authService: AuthService, ) { + this.loggeduser = authService.ValidatedUser; this.task = this.navParams.get('task'); this.postData = new Event(); this.eventBody = { BodyType : "1", Text : ""}; @@ -120,7 +125,16 @@ export class BookMeetingModalPage implements OnInit { if(this.task.FsId == '8') { try { - await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise() + switch (this.loggeduser.Profile) { + case 'MDGPR': + await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); + break; + + case 'PR': + await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise() + break; + } + this.distartExpedientModal(); this.successMessage('Reunião criada') } catch (error) { @@ -131,7 +145,15 @@ export class BookMeetingModalPage implements OnInit { } else if(this.task.FsId == '361') { try { - await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise() + switch (this.loggeduser.Profile) { + case 'MDGPR': + await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise(); + break; + + case 'PR': + await this.calendarService.createTaskEvent(this.task.FolderId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise(); + break; + } this.successMessage('Reunião criada') this.close(); } catch (error) { diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 439b22565..02f653f4f 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -2,7 +2,7 @@ - +
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index a1e17132a..1c4efdefc 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -238,7 +238,6 @@ export class ExpedienteDetailPage implements OnInit { else if(res['data'] == 'No'){ //Do nothing } - } else{ if(res['data']== 'Yes'){ @@ -252,8 +251,6 @@ export class ExpedienteDetailPage implements OnInit { this.processes.UpdateTaskStatus(this.task.FolderId); } } - - }); } diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html index 01b560e67..c03c37315 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html @@ -108,14 +108,14 @@
- +
- +
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index e8a89f9ce..ec366fd7a 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -126,7 +126,7 @@ export class ExpedientePrPage implements OnInit { "Note": res.workflowInstanceDataFields.Note, "FolderId": res.workflowInstanceDataFields.FolderID, "FsId": res.workflowInstanceDataFields.FsId, - "DocId": res.workflowInstanceDataFields.DocId, + "DocId": res.workflowInstanceDataFields.DocIdD, "WorkflowName": res.workflowDisplayName, } @@ -294,24 +294,17 @@ export class ExpedientePrPage implements OnInit { console.log('open discart'); this.distartExpedientModal(body); - } else{ - console.log('Not open'); - + console.log('Not open'); } - }); } async distartExpedientModal(body:any){ - console.log(this.fulltask); const modal = await this.modalController.create({ component: DiscartExpedientModalPage, componentProps: { - serialNumber: this.fulltask.serialNumber, - folderId: this.fulltask.workflowInstanceDataFields.FolderID, - action: 'complete', }, cssClass: 'discart-expedient-modal', backdropDismiss: false @@ -320,25 +313,36 @@ export class ExpedientePrPage implements OnInit { await modal.present(); modal.onDidDismiss().then(res=>{ console.log(res['data']); - if(res['data']== 'Yes'){ - this.processes.CompleteTask(body); - this.goBack(); - } - else if(res['data'] == 'No'){ - let otherbody = { - "serialNumber": body.serialNumber, - "action": "Passivo", - "ActionTypeId": 99999877, - "dataFields": { - "Note": "", + console.log(body); + + if(body == 'descartar'){ + if(res['data']== 'Yes'){ + let otherbody = { + "serialNumber": body.serialNumber, + "action": "Passivo", + "ActionTypeId": 94, + "dataFields": { + "Note": "", + } } + this.processes.CompleteTask(otherbody); + } + else if(res['data'] == 'No'){ + //Do nothing + } + } + else{ + if(res['data']== 'Yes'){ + this.processes.CompleteTask(body); + + this.goBack(); + } + else if(res['data'] == 'No'){ + console.log('Update'); + + this.processes.UpdateTaskStatus(this.task.FolderId); } - this.processes.CompleteTask(otherbody); } - //Volta na lista principal - this.goBack(); - this.modalController.dismiss(); - }); } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 662259267..04fb0aec9 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -41,8 +41,8 @@
- -

Pendentes

+

Pendentes

+

Meus Pendentes

{{count_total_pending}} Documentos

@@ -58,7 +58,8 @@
-

Pedidos de Parecer

+

Pedidos de Parecer

+

Pedidos de Parecer solicitados por mim

{{count_par_dailywork}} Documentos

@@ -84,7 +85,7 @@

Despacho do Presidente da República

-

Despacho

+

Despacho criados por mim

{{ count_de_pr }} Documentos

@@ -135,7 +136,7 @@
-

Diplomas por Assinar

+

Diplomas para Assinar

{{count_dip_as}} Documentos

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 89338cce4..ff55f4fd9 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -222,7 +222,7 @@ export class GabineteDigitalPage implements OnInit { let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma"); this.count_dip_pv = Object.keys(diplomasValidar).length; - let diplomasAssinar = despachospr.filter(data => data.activityInstanceName == "Assinar diploma"); + let diplomasAssinar = despachospr.filter(data => data.activityInstanceName == "Assinar Diploma"); this.count_dip_as = Object.keys(diplomasAssinar).length; this.processesbackend.GetTasksList("Expediente", false).subscribe(result => { diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index b9f8afed9..d2de06148 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -79,7 +79,7 @@
- + @@ -88,7 +88,7 @@
- + @@ -97,7 +97,7 @@
- + @@ -114,7 +114,7 @@ - + diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 64279458e..4f2560e0d 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -20,6 +20,8 @@ import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.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 { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page'; +import { AuthService } from 'src/app/services/auth.service'; +import { User } from 'src/app/models/user.model'; @Component({ selector: 'app-pedido', @@ -40,6 +42,7 @@ export class PedidoPage implements OnInit { profile: string; intervenientes: any; cc: any; + loggeduser: User; constructor(private activatedRoute: ActivatedRoute, private processes: ProcessesService, @@ -50,13 +53,15 @@ export class PedidoPage implements OnInit { private router: Router, private modalController: ModalController, private alertService: AlertService, - public popoverController: PopoverController) { - this.activatedRoute.queryParams.subscribe(params => { - if(params["serialNumber"]) { - this.serialnumber = params["serialNumber"]; - // console.log(params["serialNumber"]); - } - }); + public popoverController: PopoverController, + authService: AuthService) { + this.loggeduser = authService.ValidatedUser; + this.activatedRoute.queryParams.subscribe(params => { + if(params["serialNumber"]) { + this.serialnumber = params["serialNumber"]; + // console.log(params["serialNumber"]); + } + }); } ngOnInit() { @@ -75,6 +80,7 @@ export class PedidoPage implements OnInit { async LoadTaskDetail(serial: string) { + this.fulltask = await this.processes.GetTask(this.serialnumber).toPromise(); this.processes.GetTask(this.serialnumber).subscribe(res => { console.log(res); @@ -213,12 +219,12 @@ export class PedidoPage implements OnInit { sendExpedienteToPending(){ this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ console.log(res); - this.close(); + this.goBack(); }); } async openExpedientActionsModal(taskAction: any, task: any) { - //this.modalController.dismiss(); + let classs; if( window.innerWidth <= 800){ classs = 'modal modal-desktop' @@ -229,40 +235,18 @@ export class PedidoPage implements OnInit { component: CreateProcessPage, componentProps: { taskAction: taskAction, - task: task, + task: this.fulltask, profile: this.profile, }, cssClass: classs, }); await modal.present(); modal.onDidDismiss().then(res=>{ - console.log(res['data']); - if(res['data']=='openDiscart'){ - console.log('open discart'); - - this.distartExpedientModal(); - - } - + console.log('Modal closed'); + this.goBack(); }); } - async distartExpedientModal2(task: any){ - const modal = await this.modalController.create({ - component: DiscartExpedientModalPage, - componentProps: { - serialNumber: task.serialNumber, - folderId: task.workflowInstanceDataFields.FolderID, - action: 'discart', - }, - cssClass: 'discart-expedient-modal', - backdropDismiss: false - }); - - await modal.present(); - modal.onDidDismiss(); - } - async openBookMeetingModal(task: any) { let classs; if( window.innerWidth <= 800){ diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 21d078e88..737777102 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -6,7 +6,7 @@ -

Diplomas por Assinar

+

Diplomas para Assinar

diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 704681938..d1328e3c8 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/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; diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 9061c93df..bec578ef0 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/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(); - }); - } - } diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 57758dff2..8ba6ed443 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -13,7 +13,7 @@ Pedidos de Parecer - Pedidos de Defereimento + Pedidos de Defererimento diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index c5917c5c0..e5f6de932 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/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(); } diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html index 4fc84cb0a..86e024981 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html @@ -36,7 +36,7 @@ {{task.Senders}}
- {{task.WorkflowName}} + {{task.activityInstanceName}}