diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index f8ec312ff..a09c32cdb 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -87,6 +87,10 @@ const routes: Routes = [ path: 'expedientes-pr', loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) }, + { + path: 'diplomas-assinar', + loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) + }, /* { path: 'chat', diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 625cb4e50..eda18087c 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -92,10 +92,6 @@ export class EventsPage implements OnInit { this.profile = "mdgpr"; /* console.log(this.profile); */ - /* this.storageService.get(AuthConnstants.USER).then(res=>{ - console.log(res); - }); */ - this.showGreeting(); this.router.events.forEach((event) => { @@ -104,10 +100,6 @@ export class EventsPage implements OnInit { this.LoadList(); } }); - /* this.storageService.get(AuthConnstants.PROFILE).then(res=>{ - this.profile = res; - }); */ - } @@ -255,10 +247,24 @@ export class EventsPage implements OnInit { } LoadList(){ - this.processes.GetTasksList("Expediente", false).subscribe(result => { - this.expedientList = result.reverse(); - console.log(this.expedientList); - }); + switch (this.loggeduser.Profile) { + case 'MDGPR': + this.processes.GetTasksList("Expediente", false).subscribe(result => { + this.expedientList = result.reverse(); + console.log(this.expedientList); + }); + break; + case 'PR': + this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => { + this.expedientList = result.reverse(); + console.log(this.expedientList); + }); + break; + + default: + break; + } + } sortArrayISODate(myArray: any){ diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar-routing.module.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar-routing.module.ts new file mode 100644 index 000000000..0600a270a --- /dev/null +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { DiplomaAssinarPage } from './diploma-assinar.page'; + +const routes: Routes = [ + { + path: '', + component: DiplomaAssinarPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class DiplomaAssinarPageRoutingModule {} diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts new file mode 100644 index 000000000..5c5bf8d3a --- /dev/null +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { DiplomaAssinarPageRoutingModule } from './diploma-assinar-routing.module'; + +import { DiplomaAssinarPage } from './diploma-assinar.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + DiplomaAssinarPageRoutingModule + ], + declarations: [DiplomaAssinarPage] +}) +export class DiplomaAssinarPageModule {} diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html new file mode 100644 index 000000000..46d48e394 --- /dev/null +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html @@ -0,0 +1,9 @@ + + + diploma-assinar + + + + + + diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.spec.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.spec.ts new file mode 100644 index 000000000..28b57eec4 --- /dev/null +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { DiplomaAssinarPage } from './diploma-assinar.page'; + +describe('DiplomaAssinarPage', () => { + let component: DiplomaAssinarPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DiplomaAssinarPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(DiplomaAssinarPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts new file mode 100644 index 000000000..99177a354 --- /dev/null +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-diploma-assinar', + templateUrl: './diploma-assinar.page.html', + styleUrls: ['./diploma-assinar.page.scss'], +}) +export class DiplomaAssinarPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar-routing.module.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar-routing.module.ts new file mode 100644 index 000000000..d2ee2ed52 --- /dev/null +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar-routing.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { DiplomasAssinarPage } from './diplomas-assinar.page'; + +const routes: Routes = [ + { + path: '', + component: DiplomasAssinarPage + }, + { + path: 'diploma-assinar', + loadChildren: () => import('./diploma-assinar/diploma-assinar.module').then( m => m.DiplomaAssinarPageModule) + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class DiplomasAssinarPageRoutingModule {} diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts new file mode 100644 index 000000000..4c13c29c3 --- /dev/null +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { DiplomasAssinarPageRoutingModule } from './diplomas-assinar-routing.module'; + +import { DiplomasAssinarPage } from './diplomas-assinar.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + DiplomasAssinarPageRoutingModule + ], + declarations: [DiplomasAssinarPage] +}) +export class DiplomasAssinarPageModule {} diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html new file mode 100644 index 000000000..28d811737 --- /dev/null +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -0,0 +1,9 @@ + + + diplomas-assinar + + + + + + diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.spec.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.spec.ts new file mode 100644 index 000000000..0307cc23d --- /dev/null +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { DiplomasAssinarPage } from './diplomas-assinar.page'; + +describe('DiplomasAssinarPage', () => { + let component: DiplomasAssinarPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DiplomasAssinarPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(DiplomasAssinarPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 000000000..e8c657431 --- /dev/null +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-diplomas-assinar', + templateUrl: './diplomas-assinar.page.html', + styleUrls: ['./diplomas-assinar.page.scss'], +}) +export class DiplomasAssinarPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 82902770c..10188bd70 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -174,129 +174,158 @@ export class ExpedientTaskModalPage implements OnInit { SourceId: e.Id } }); - docs.Attachments = DocumentToSave; - this.dispatchFolder.SubjectTypes = this.selectedTypes; - - if(this.taskParticipants.length > 0) { - switch (this.taskType) { - case '0': - this.postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: this.postData.Priority, - UserEmail: this.user, - UsersSelected: attendees, - DispatchFolder: this.dispatchFolder, - AttachmentList: docs, - //SubjectTypes: [], - - } - - // console.log('this.postData', this.postData, this.taskType); - - try { - switch(this.loggeduser.Profile){ - case 'MDGPR': + switch (this.loggeduser.Profile) { + case 'MDGPR': + switch (this.taskType) { + case '0': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + AttachmentList: docs, + //SubjectTypes: [], + } + try { this.taskResult = await this.processes.postDespatcho(this.postData).toPromise(); - break; - case 'PR': + await this.successMessage('Processo efetuado') + } catch (error) { + await this.badRequest('Processo não efetuado') + } + console.log('this.taskResult', this.taskResult); + let action_despacho = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 94, + "dataFields": { + "Note": "", + } + } + this.modalController.dismiss(action_despacho); + break; + + case '1': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + AttachmentList: docs + } + + try { + await this.successMessage('Processo efetuado') + } catch (error) { + await this.badRequest('Processo não efetuado') + } + + let action_parecer = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 92, + "dataFields": { + "Note": "", + } + } + this.modalController.dismiss(action_parecer); + break; + case '2': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + AttachmentList: docs + } + //console.log(this.postData); + try { + this.taskResult = await this.processes.postDeferimento(this.postData).toPromise() + await this.successMessage('Processo efetuado') + } catch (error) { + await this.badRequest('Processo não efetuado') + } + console.log('this.taskResult', this.taskResult); + let action_deferimento = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 93, + "dataFields": { + "Note": "", + } + } + this.modalController.dismiss(action_deferimento); + break; + } + + break; + case 'PR': + switch (this.taskType) { + case '0': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + AttachmentList: docs, + //SubjectTypes: [], + } + try { this.taskResult = await this.processes.postDespatchoPr(this.postData).toPromise(); - break; - } - await this.successMessage('Processo efetuado') - } catch (error) { - await this.badRequest('Processo não efetuado') - } - - console.log('this.taskResult', this.taskResult); - - let action_despacho = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 94, - "dataFields": { - "Note": "", - } - } - - this.modalController.dismiss(action_despacho); - break; - - case '1': - this.postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: this.postData.Priority, - UserEmail: this.user, - UsersSelected: attendees, - DispatchFolder: this.dispatchFolder, - AttachmentList: docs - } - - //console.log(this.postData); - - try { - switch(this.loggeduser.Profile){ - case 'MDGPR': - this.taskResult = await this.processes.postParecer(this.postData).toPromise(); - break; - case 'PR': - this.taskResult = await this.processes.postParecerPr(this.postData).toPromise(); - break; - } - - await this.successMessage('Processo efetuado') - } catch (error) { - await this.badRequest('Processo não efetuado') - } + await this.successMessage('Processo efetuado') + } catch (error) { + await this.badRequest('Processo não efetuado') + } + console.log('this.taskResult', this.taskResult); + let action_despacho_pr = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 99999881 , + "dataFields": { + "Note": "", + } + } + this.modalController.dismiss(action_despacho_pr); + break; + + case '1': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + AttachmentList: docs + } - // console.log('this.taskResult', this.taskResult); - - let action_parecer = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 92, - "dataFields": { - "Note": "", + try { + await this.successMessage('Processo efetuado') + } catch (error) { + await this.badRequest('Processo não efetuado') + } + + let action_parecer_pr = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 99999881, + "dataFields": { + "Note": "", + } + } + this.modalController.dismiss(action_parecer_pr); + break; } - } - this.modalController.dismiss(action_parecer); - break; - case '2': - this.postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: this.postData.Priority, - UserEmail: this.user, - UsersSelected: attendees, - DispatchFolder: this.dispatchFolder, - AttachmentList: docs - } - - //console.log(this.postData); - - try { - this.taskResult = await this.processes.postDeferimento(this.postData).toPromise() - await this.successMessage('Processo efetuado') - } catch (error) { - await this.badRequest('Processo não efetuado') - } - - - console.log('this.taskResult', this.taskResult); - - let action_deferimento = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 93, - "dataFields": { - "Note": "", - } - } - this.modalController.dismiss(action_deferimento); break; } } 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 6944f0168..5ec54695b 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 @@ -89,9 +89,6 @@ export class ExpedientePrPage implements OnInit { }; this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - markToDispatch(){ - - } sendExpedienteToPending(){ this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ @@ -229,7 +226,6 @@ export class ExpedientePrPage implements OnInit { await modal.present(); modal.onDidDismiss().then(res=>{ console.log(res['data']); - if(res['data']== 'Yes'){ this.processes.CompleteTask(body); } @@ -237,7 +233,7 @@ export class ExpedientePrPage implements OnInit { let otherbody = { "serialNumber": body.serialNumber, "action": "Passivo", - "ActionTypeId": 94, + "ActionTypeId": 99999877, "dataFields": { "Note": "", } @@ -245,6 +241,7 @@ export class ExpedientePrPage implements OnInit { this.processes.CompleteTask(otherbody); } //Volta na lista principal + this.goBack(); this.modalController.dismiss(); }); diff --git a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts index 3137f45e7..87eedcb46 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts @@ -44,6 +44,10 @@ const routes: Routes = [ path: 'expedientes-pr', loadChildren: () => import('./expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) }, + { + path: 'diplomas-assinar', + loadChildren: () => import('./diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) + }, ]; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index e30ea9283..bacde385e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -21,6 +21,7 @@ import { DespachosPrPage } from 'src/app/shared/gabinete-digital/despachos-pr/de import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page'; import { ExpedientesPrPage } from 'src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page'; import { SignedDiplomaComponent } from 'src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component'; +import { DiplomasAssinarPage } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page'; /* import { ComponentsModule } from 'src/app/components/components.module'; */ @NgModule({ @@ -44,7 +45,8 @@ import { SignedDiplomaComponent } from 'src/app/shared/gabinete-digital/signed-d DespachosPrPage, DiplomasPage, ExpedientesPrPage, - SignedDiplomaComponent + SignedDiplomaComponent, + DiplomasAssinarPage ], entryComponents: [ EmptyContainerPage, @@ -57,7 +59,8 @@ import { SignedDiplomaComponent } from 'src/app/shared/gabinete-digital/signed-d DespachosPrPage, DiplomasPage, ExpedientesPrPage, - SignedDiplomaComponent + SignedDiplomaComponent, + DiplomasAssinarPage ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index b1540730a..d852360bb 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -113,7 +113,7 @@ -
+
@@ -122,7 +122,7 @@

{{count_dip_pv}} Documentos

-
+
@@ -131,6 +131,14 @@

{{count_dip_Signed}} Documentos

+
+
+ +
+

Diplomas por Assinar

+

{{count_dip_Signed}} Documentos

+
+
@@ -148,6 +156,7 @@ + diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 8c778560d..0cb71da9a 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -60,6 +60,7 @@ export class GabineteDigitalPage implements OnInit { showDespachosPr = false; showPendentes = false; showDiplomas = false; + showDiplomasAssinar = false; showExpedientDetail = false; showSignedDiploma = false emptyTextDescription = 'Sem opção selecionada'; @@ -128,6 +129,11 @@ export class GabineteDigitalPage implements OnInit { this.openDiplomasPage(''); this.selectedElement='DiplomasPorAssinar' break; + + case params["diplomasassinar"]: + this.openDiplomasPage(''); + this.selectedElement='DiplomasAssinar' + break; } }); @@ -170,6 +176,7 @@ export class GabineteDigitalPage implements OnInit { this.showDespachosPr = false; this.showPendentes = false; this.showDiplomas = false; + this.showDiplomasAssinar = false; this.showExpedientesPr = false; this.showExpedientDetail = false; this.showSignedDiploma = false @@ -179,14 +186,10 @@ export class GabineteDigitalPage implements OnInit { this.showLoader = true; let expedientes = await this.processesbackend.GetTasksList("Expediente", false).toPromise(); - switch(this.loggeduser.Profile){ - case 'MDGPR': - this.count_exp_dailywork = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; - break; - case 'PR': - this.count_exp_pr = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; - break; - } + this.count_exp_dailywork = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; + + let expedientes_pr = await this.processesbackend.GetTasksList("Expediente do Presidente", false).toPromise(); + this.count_exp_pr = Object.keys(expedientes_pr.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; let despachos = await this.processesbackend.GetTasksList("Despacho", false).toPromise(); this.count_desp_dailywork = Object.keys(despachos).length; @@ -208,19 +211,11 @@ export class GabineteDigitalPage implements OnInit { let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma"); this.count_dip_pv = Object.keys(diplomasValidar).length; - this.processesbackend.GetTasksList("Expediente", false).subscribe(result => { - let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); - this.count_exp_pr = Object.keys(res).length - }); - this.processesbackend.GetTasksList("Expediente", false).subscribe(result => { let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Signed"); this.count_dip_Signed = Object.keys(res).length }); - - - this.processesbackend.GetToApprovedEvents('PR','true').subscribe(res=>{ this.count_ev_pr = res; }); @@ -348,7 +343,8 @@ export class GabineteDigitalPage implements OnInit { openPedidosPage(segment:string){ this.closeAllDesktopComponents(); if( window.innerWidth <= 800) { - this.openPedidoList(); + //this.openPedidoList(); + this.router.navigate(['/home/gabinete-digital/pedidos']); } else{ this.segment = segment; @@ -361,7 +357,8 @@ export class GabineteDigitalPage implements OnInit { openDespachosPage(segment:string){ this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ - this.openDespachoList(); + //this.openDespachoList(); + this.router.navigate(['/home/gabinete-digital/despachos']); } else{ let navigationExtras: NavigationExtras = {queryParams: {"despachos": true,}}; @@ -373,7 +370,8 @@ export class GabineteDigitalPage implements OnInit { openDespachosPrPage(segment:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ - this.openDespachoListPr(); + //this.openDespachoListPr(); + this.router.navigate(['/home/gabinete-digital/despachos-pr']); } else{ let navigationExtras: NavigationExtras = {queryParams: {"despachospr": true,}}; @@ -385,7 +383,8 @@ export class GabineteDigitalPage implements OnInit { openPendentesPage(segment:string){ this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ - this.openPendenteList(); + //this.openPendenteList(); + this.router.navigate(['/home/gabinete-digital/pendentes']); } else{ let navigationExtras: NavigationExtras = { queryParams: {"pendentes": true,}}; @@ -411,7 +410,8 @@ export class GabineteDigitalPage implements OnInit { openDiplomasPage(segment:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ - this.openDeploma(); + //this.openDeploma(); + this.router.navigate(['/home/gabinete-digital/diplomas']); } else{ this.segment = segment; @@ -421,6 +421,19 @@ export class GabineteDigitalPage implements OnInit { } } + openDiplomasAssinarPage() { + this.closeAllDesktopComponents(); + if( window.innerWidth <= 800){ + //this.openDeploma(); + this.router.navigate(['/home/gabinete-digital/diplomas-assinar']); + } + else{ + let navigationExtras: NavigationExtras = { queryParams: {"diplomasassinar": true,}}; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + this.showDiplomasAssinar = true; + } + } + openSignedDiploma(segment:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index 99cb9cc6b..b8bdca889 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -83,7 +83,10 @@ export class PublicationDetailPage implements OnInit { try { await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise(); this.successMessage() + this.close(); + //this.goBackToViewPublications.emit(); + } catch (error) { this.badRequest() } diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index 6f62e7715..c0a3d444b 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -45,10 +45,6 @@
- -
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar-routing.module.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar-routing.module.ts new file mode 100644 index 000000000..fc7a3ca6f --- /dev/null +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { DiplomasAssinarPage } from './diplomas-assinar.page'; + +const routes: Routes = [ + { + path: '', + component: DiplomasAssinarPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class DiplomasAssinarPageRoutingModule {} diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts new file mode 100644 index 000000000..4c13c29c3 --- /dev/null +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { DiplomasAssinarPageRoutingModule } from './diplomas-assinar-routing.module'; + +import { DiplomasAssinarPage } from './diplomas-assinar.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + DiplomasAssinarPageRoutingModule + ], + declarations: [DiplomasAssinarPage] +}) +export class DiplomasAssinarPageModule {} 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 new file mode 100644 index 000000000..21d078e88 --- /dev/null +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -0,0 +1,84 @@ + +
+
Diplomas
+
+ +
+

Diplomas por Assinar

+
+
+ + + + + + +
+
+ + + + + +
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }} +
+
+ {{task.Remetente}} +
+
+ {{task.activityInstanceName}} +
+
+ + +
+
+
+ {{ task.Folio }} +
+
+
+
+
+
+
+ + + + + + + +

+

+

+
+
+ + + + + +

+

+

+
+
+
+
+
+ diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss new file mode 100644 index 000000000..f91d1eccc --- /dev/null +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss @@ -0,0 +1,183 @@ +@import '~src/function.scss'; +/* CONTENT */ +:host{ + padding: 30px 20px 0 20px !important; + margin: 0; +} +.title{ + font-family: Roboto; + font-size: 25px; + color:#000; + overflow: auto; + + .thetitle{ + width: fit-content; + float: left; + } + .theicon{ + width: fit-content; + float: right; + } + } + .bottom-title{ + width: calc(100% - 40px); + margin-left: 20px !important; + margin-right: 20px !important; + margin: 0 auto; + align-items: center; + justify-content: center; + border-bottom: 5px solid #42b9fe; + + .bottom-text{ + font-size: 15px !important; + font-family: Roboto !important; + color: #0d89d1 !important; + } + } +.item-list-small{ + font-size: 11px; + overflow: hidden; + } + .ion-item-class{ + padding: 0; + + } + .label-text{ + width: 100%; + padding: 0; + margin: 0; + } +//DIV +ion-item{ + --background: none; +} +.item { + background-color: var(--white); + margin: 0 auto; + margin-bottom: 10px; + overflow: hidden; + } +.div-content-expediente{ + width: 100%; + float: left; + border-left: 3px solid #dae3f3; + padding:5px 5px 15px 5px; + margin: 10px 0 10px 0; + background: #dae3f3; + border-radius: 20px; +} +.div-content-pendentes{ + width: 100%; + float: left; + border-left: 3px solid #d9d9d9; + padding: 5px; +} + .div-content-expediente h3, .div-content-pendentes h3{ + margin: 0; + padding: 0; + font-size: 14pt; + width: 100%; + } + .div-icon{ + width: 10%; + font-size: 20px; + float: left; + color: #808080; + } + .div-icon ion-icon{ + display: block; + margin: 0 auto; + + } + .div-content-expediente p, .div-content-pendentes p{ + font-size: 14pt; + color: rgb(94, 92, 92); + padding: 0; + margin: 0; + } + .span-left{ + float: left; + font-size: 12px; + padding-left: 18px; + } + .span-right{ + text-align: right; + float: right; + font-size: 12px; + padding-right: 18px; +} + +/* New CSS */ +.expediente{ + padding-top: 10px; +} +.exp-list-item{ + overflow: auto; + margin: 10px auto; +} +.exp-top-detail{ + width: 100%; + overflow: auto; +} +.exp-date{ + width: auto; + font-family: Roboto; + font-size: 13px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #797979; + float: left; +} +.exp-remetente{ + font-family: Roboto; + font-size: 13px; + font-weight: normal; + color: #000000; + float: left; + margin-left: 16px; + +} +.exp-icon{ + width: 45px; + float: right; + font-size: 13px; +} +.exp-icon ion-icon{ + font-size: 25px; + color: #42b9fe; +} +.exp-bottom-detail{ + float: left; + font-family: Roboto; + font-size: 16px; + font-weight: 700; + color: #0d89d1; +} +.div-top-header{ + width: 400px; + margin: 6px auto; + background-color: #0782c9; + overflow: auto; +} +.div-search{ + font-size: 45px; + float: left; + margin: 0 0 0 10px +} +.div-logo{ + background: transparent; + width: 150px; + margin: 2.5px 0 2.5px 71px; + float: left; +} +.div-logo img{ + width: 100%; +} +.div-profile{ + font-size: 45px; + float: right; + margin-right: 10px; +} \ No newline at end of file diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.spec.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.spec.ts new file mode 100644 index 000000000..0307cc23d --- /dev/null +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { DiplomasAssinarPage } from './diplomas-assinar.page'; + +describe('DiplomasAssinarPage', () => { + let component: DiplomasAssinarPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DiplomasAssinarPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(DiplomasAssinarPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 000000000..f73ceac38 --- /dev/null +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -0,0 +1,100 @@ +import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; +import { NavigationExtras, Router } from '@angular/router'; +import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model'; +import { ProcessesService } from 'src/app/services/processes.service'; +import { formatDate } from '@angular/common'; +import { ModalController, NavParams } from '@ionic/angular'; +import { AlertService } from 'src/app/services/alert.service'; +import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page'; + +@Component({ + selector: 'app-diplomas-assinar', + templateUrl: './diplomas-assinar.page.html', + styleUrls: ['./diplomas-assinar.page.scss'], +}) +export class DiplomasAssinarPage implements OnInit { + //profile:string; +diplomasList:DailyWorkTask[] = []; +showLoader: boolean; +totalDocs:any; +serialNumber:string; + +@Input() profile:string; +@Input() segment:string; + +constructor( + private processes:ProcessesService, + private modalController: ModalController, + private alertService: AlertService, + private router: Router, + ) { + } + +ngOnInit() { + this.LoadList(); +} + +goToDiploma(serialNumber:any){ + let navigationExtras: NavigationExtras = { + queryParams: { + "serialNumber": serialNumber, + } + }; + this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras); +} + +doRefresh() { + this.LoadList(); + setTimeout(() => { + //event.target.complete(); + }, 2000); +} + +async LoadList(){ + + let diplomas = await this.processes.GetTasksList("Assinar Diploma", false).toPromise(); + this.diplomasList = new Array(); + + console.log(diplomas); + let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Revisar Diploma"); + console.log(diplomasAssinar); + diplomasAssinar.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; +} + +}