diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index b89763886..764abed7b 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -71,6 +71,10 @@ const routes: Routes = [ path: 'dar-parecer', loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) }, + { + path: 'opts-expediente', + loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) + }, /* { path: 'chat', diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 8a821b234..d62a2f0a8 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -204,7 +204,7 @@ export class CreateProcessPage implements OnInit { "serialNumber": this.task.serialNumber, "action": "Conhecimento", "dataFields": { - "ReviewerComments": '', + "ReviewerUserComment": '', } } this.processes.PostTaskAction(body); diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts index ce85bd675..59196bd97 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts @@ -125,7 +125,7 @@ export class ApproveEventModalPage implements OnInit { let body = { "serialNumber": serialNumber, "action": "Emendar", "dataFields": { - "ReviewerComments": res.data, + "ReviewerUseComment": res.data, } } this.processes.PostTaskAction(body); 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 3d353e30d..b486506a9 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -156,7 +156,7 @@ export class DespachoPage implements OnInit { "serialNumber": this.serialnumber, "action": "Conhecimento", "dataFields": { - "ReviewerComments": note, + "ReviewerUseComment": note, } } this.processes.PostTaskAction(body); diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index c5ef87135..a6fb67450 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts @@ -143,7 +143,7 @@ export class ApproveEventModalPage implements OnInit { let body = { "serialNumber": serialNumber, "action": "Emendar", "dataFields": { - "ReviewerComments": res.data, + "ReviewerUseComment": res.data, } } console.log(body); diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index ae7f414d8..4715c7e76 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -132,7 +132,7 @@ export class ApproveEventPage implements OnInit { "serialNumber": serialNumber, "action": "Emendar", "dataFields": { - "ReviewerComments": res.data, + "ReviewerUseComment": res.data, } } console.log(body); 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 30bfa033b..c53e1f352 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 @@ -64,18 +64,17 @@
{{ task.Folio}}
-
- - - +
+
-

{{customDate}}Expediente

-

Muitíssimo urgente

+

{{customDate}}{{ task.WorkflowName }}
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss index 860c052db..17f8b49a6 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss @@ -73,12 +73,9 @@ padding-top: 4px; padding-left: 5px; } - .div-icon{ - width: 40px; - float: right; - font-size: 35px; - overflow: auto; - padding: 1px; + .btn-no-color icon{ + font-size: 15px; + border: 1px solid red; } } ion-item-group{ @@ -204,7 +201,7 @@ ion-button{ } } @media only screen and (min-width: 801px) { - .div-icon{ + .menu-ptions{ display: none; } .content{ 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 03dfdea68..e605d2cc6 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 @@ -7,13 +7,14 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute, Router } from '@angular/router'; import { formatDate } from '@angular/common'; import { Event } from '../../../../models/event.model'; -import { MenuController, ModalController, NavParams } from '@ionic/angular'; +import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page'; import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page'; 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 { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; @Component({ selector: 'app-expediente-detail', @@ -44,7 +45,8 @@ export class ExpedienteDetailPage implements OnInit { private router: Router, private modalController: ModalController, private navParams: NavParams, - private alertService: AlertService) { + private alertService: AlertService, + public popoverController: PopoverController,) { this.serialnumber = this.navParams.get('serialNumber'); this.profile = this.navParams.get('profile'); } @@ -90,6 +92,7 @@ export class ExpedienteDetailPage implements OnInit { "FolderId": res.workflowInstanceDataFields.FolderID, "FsId": res.workflowInstanceDataFields.FsId, "DocId": res.workflowInstanceDataFields.DocId, + "WorkflowName": res.workflowDisplayName, } console.log('task', this.task); @@ -261,4 +264,18 @@ export class ExpedienteDetailPage implements OnInit { }); } + + async openOptions(taskAction: any) { + const popover = await this.popoverController.create({ + component: OptsExpedientePage, + cssClass: 'exp-options', + componentProps: { + task: this.task, + fulltask: this.fulltask, + taskAction:taskAction, + }, + translucent: true + }); + return await popover.present(); + } } 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 4e4abe2e1..d0d6a701c 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -179,7 +179,7 @@ export class PedidoPage implements OnInit { "serialNumber": this.serialnumber, "action": "Arquivo", "dataFields": { - "ReviewerComments": '', + "ReviewerUseComment": '', } } this.processes.PostTaskAction(body); diff --git a/src/app/shared/agenda/approve-event/approve-event.component.ts b/src/app/shared/agenda/approve-event/approve-event.component.ts index 59b82a80f..94dfaa4de 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.ts +++ b/src/app/shared/agenda/approve-event/approve-event.component.ts @@ -154,7 +154,7 @@ export class ApproveEventComponent implements OnInit { let body = { "serialNumber": serialNumber, "action": "Emendar", "dataFields": { - "ReviewerComments": res.data, + "ReviewerUseComment": res.data, } } console.log(body); diff --git a/src/app/shared/popover/opts-expediente/opts-expediente-routing.module.ts b/src/app/shared/popover/opts-expediente/opts-expediente-routing.module.ts new file mode 100644 index 000000000..b0ca6d569 --- /dev/null +++ b/src/app/shared/popover/opts-expediente/opts-expediente-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { OptsExpedientePage } from './opts-expediente.page'; + +const routes: Routes = [ + { + path: '', + component: OptsExpedientePage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class OptsExpedientePageRoutingModule {} diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.module.ts b/src/app/shared/popover/opts-expediente/opts-expediente.module.ts new file mode 100644 index 000000000..f2d9a571d --- /dev/null +++ b/src/app/shared/popover/opts-expediente/opts-expediente.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 { OptsExpedientePageRoutingModule } from './opts-expediente-routing.module'; + +import { OptsExpedientePage } from './opts-expediente.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + OptsExpedientePageRoutingModule + ], + declarations: [OptsExpedientePage] +}) +export class OptsExpedientePageModule {} diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html new file mode 100644 index 000000000..f88c8f408 --- /dev/null +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -0,0 +1,17 @@ + +
+ +
+
+ + + + + + +
+ +
+ diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.scss b/src/app/shared/popover/opts-expediente/opts-expediente.page.scss new file mode 100644 index 000000000..2c7a0cc7f --- /dev/null +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.scss @@ -0,0 +1,51 @@ +.container{ + --padding-top:20px !important; + --padding-bottom:20px !important; + --padding-start:20px !important; + --padding-end:20px !important; +} +.arrow-right{ + display: none; + margin-bottom: 20px; + .arrow-right-icon{ + width: 37px; + float: right; + font-size: 35px; + overflow: hidden; + } +} +.buttons{ + display: flex; + flex-wrap: wrap; + justify-content: space-around; +} +.solid { + display: none; + width: 90%; + border-top: 1px solid #bbb; + margin: 0 auto !important; + } + .btn-ok, .btn-cancel{ + //width: 50% !important; + margin-bottom: 5px !important; + margin-top: 5px !important; +} +@media only screen and (min-width: 1024px) { + .arrow-right{ + display: flex; + justify-content: flex-end; + } + .btn-cancel{ + display: none; + width: 100% !important; + margin-bottom: 10px !important; + } + .btn-delete, .btn-ok{ + width: 100% !important; + margin-bottom: 10px !important; + margin-top: 10px !important; + } + /* .solid{ + display: block; + } */ +} \ No newline at end of file diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.spec.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.spec.ts new file mode 100644 index 000000000..2db20e545 --- /dev/null +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { OptsExpedientePage } from './opts-expediente.page'; + +describe('OptsExpedientePage', () => { + let component: OptsExpedientePage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ OptsExpedientePage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(OptsExpedientePage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts new file mode 100644 index 000000000..6e8815d15 --- /dev/null +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -0,0 +1,111 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalController, NavParams, PopoverController } from '@ionic/angular'; +import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; +import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; +import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; + +@Component({ + selector: 'app-opts-expediente', + templateUrl: './opts-expediente.page.html', + styleUrls: ['./opts-expediente.page.scss'], +}) +export class OptsExpedientePage implements OnInit { + task:any; + fulltask: any; + profile:string; + + constructor( + private popoverController: PopoverController, + private modalController: ModalController, + private navParams: NavParams, + ) { + this.task = this.navParams.get('task'); + } + + ngOnInit() { + this.profile = "mdgpr"; + } + + close(){ + if( window.innerWidth <= 1024){ + this.popoverController.dismiss(); + } + else{ + this.modalController.dismiss(); + } + } + + async openBookMeetingModal(task: any) { + let classs; + if( window.innerWidth <= 800){ + classs = 'book-meeting-modal modal modal-desktop' + } else { + classs = 'modal modal-desktop showAsideOptions' + } + const modal = await this.modalController.create({ + component: BookMeetingModalPage, + componentProps: { + task: this.task, + }, + cssClass: classs, + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + async openExpedientActionsModal(taskAction: any, task: any) { + //this.modalController.dismiss(); + let classs; + if( window.innerWidth <= 800){ + classs = 'modal modal-desktop' + } else { + classs = 'modal modal-desktop showAsideOptions' + } + const modal = await this.modalController.create({ + component: ExpedientTaskModalPage, + componentProps: { + taskAction: taskAction, + task: task, + 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(); + + } + + }); + } + + async distartExpedientModal(){ + 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 + }); + + await modal.present(); + modal.onDidDismiss().then(res=>{ + if(res['data']=='close'){ + this.close(); + /* console.log('2Expedient Discard closed2'); + this.close(); + this.openMenu(); */ + } + + }); + } + +} diff --git a/src/theme/variables.scss b/src/theme/variables.scss index d65a38fb7..58d62c523 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -291,6 +291,15 @@ max-height: 90px; min-height: 90px; } +.exp-options .popover-content{ + width: 100% !important; + left: 0 !important; + bottom: 0 !important; + right: 0 !important; + top: calc(100% - 260px) !important; + max-height: 260px; + min-height: 260px; +} .chat-options-popover .popover-content{ width: 100% !important; left: 0 !important;