diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html index a70ccdef9..f5afa6fde 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html @@ -16,32 +16,30 @@ [fulltask]="fulltask" > - +
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss index 3a718de47..69b86d394 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss @@ -15,9 +15,27 @@ ion-button{ width: 80%; margin: 20px auto; } +.aside-right-container { + position: fixed; + height: 100%; + background: white; + top: 0px; + box-shadow: 0px 0px 10px black; + z-index: 1111111111111111111111111111111111111111111111; + /* display: none; */ + right: 0px; + width: 400px; + padding: 30px 20px 0 20px !important; +} .aside-right{ - padding: 30px 20px 0 20px !important; + position: absolute; + height: 100%; + width: 100% !important; + background: #0000006b; + right: 0px; + z-index: 111111111111111; + top: 0px; .arrow-right{ display: flex; diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index c39490a14..a25e9263a 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -50,6 +50,8 @@ export class DespachoPrPage implements OnInit { dropButton = false selectedIndex = 0 + + showOptions = false constructor( private activateRoute: ActivatedRoute, private processes: ProcessesService, @@ -596,32 +598,8 @@ export class DespachoPrPage implements OnInit { async openOptions(taskAction?: any) { - if (window.innerWidth > 500) { - const popover = await this.popoverController.create({ - component: DkDespachosPrOptionsPage, - cssClass: 'exp-options-desktop', - componentProps: { - task: this.task, - fulltask: this.fulltask, - taskAction: taskAction, - showEnviarPendentes: false - } - }); - - await popover.present(); - - popover.onDidDismiss().then((res => { - - if (res['data'] == 'close') { - this.goBack() - - } - - this.TaskService.loadDiplomas() - - }), (error) => { - console.log(error) - }) + if (window.innerWidth > 500) { + this.showOptions = true } else { const popover = await this.popoverController.create({ component: DespachosPrOptionsPage, @@ -634,18 +612,18 @@ export class DespachoPrPage implements OnInit { }, translucent: true }); - + await popover.present(); - + popover.onDidDismiss().then((res => { - + if (res['data'] == 'close') { this.goBack() - + } - + this.TaskService.loadDiplomas() - + }), (error) => { console.log(error) }) diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html index e6d575846..57cb6c42a 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html @@ -16,9 +16,8 @@ [fulltask]="fulltask" > - + + + +
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss index 8f8bfeaf4..40cc0a4d5 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss @@ -16,8 +16,27 @@ ion-button{ margin: 20px auto; } -.aside-right{ +.aside-right-container { + position: fixed; + height: 100%; + background: white; + top: 0px; + box-shadow: 0px 0px 10px black; + z-index: 1111111111111111111111111111111111111111111111; + /* display: none; */ + right: 0px; + width: 400px; padding: 30px 20px 0 20px !important; +} + +.aside-right{ + position: absolute; + height: 100%; + width: 100% !important; + background: #0000006b; + right: 0px; + z-index: 111111111111111; + top: 0px; .arrow-right{ display: flex; 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 2cb5e7fe7..eda243f65 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -59,6 +59,8 @@ export class DespachoPage implements OnInit { dropButton = true + showOptions = false + constructor(private activateRoute: ActivatedRoute, private processes: ProcessesService, @@ -607,29 +609,8 @@ export class DespachoPage implements OnInit { async openOptions(taskAction?: any) { - if (window.innerWidth > 500) { - const model = await this.popoverController.create({ - component: DkDespachosOptionsPage, - cssClass: 'exp-options-desktop', - componentProps: { - task: this.task, - fulltask: this.fulltask, - taskAction: taskAction, - showEnviarPendentes: false - } - }); - - await model.present(); - - model.onDidDismiss().then((res) => { - // console.log('res', res.data) - if (res.data == 'back') { - this.goBack(); - } - - }, (error) => { - console.log(error) - }) + if (window.innerWidth > 500) { + this.showOptions = true } else { const popover = await this.popoverController.create({ component: DespachosOptionsPage, @@ -642,18 +623,18 @@ export class DespachoPage implements OnInit { }, translucent: true }); - - + + popover.onDidDismiss().then((res) => { // console.log('res', res.data) if (res.data == 'back') { this.goBack(); } - + }, (error) => { console.log(error) }) - + await popover.present(); } 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 index 3505439da..b04da82e8 100644 --- 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 @@ -15,17 +15,20 @@ > - + +
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 index a6a28bb1c..00b5b45a1 100644 --- 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 @@ -194,8 +194,27 @@ ion-button{ font-size: rem(13); } } -.aside-right{ +.aside-right-container { + position: fixed; + height: 100%; + background: white; + top: 0px; + box-shadow: 0px 0px 10px black; + z-index: 1111111111111111111111111111111111111111111111; + /* display: none; */ + right: 0px; + width: 400px; padding: 30px 20px 0 20px !important; +} + +.aside-right{ + position: absolute; + height: 100%; + width: 100% !important; + background: #0000006b; + right: 0px; + z-index: 111111111111111; + top: 0px; .arrow-right{ display: flex; 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 index ed3e8d9f2..4eb347579 100644 --- 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 @@ -45,6 +45,7 @@ export class DiplomaAssinarPage implements OnInit { DraftNames = "" asDraft = true; + showOptions = false constructor( private processes: ProcessesService, public popoverController: PopoverController, @@ -85,27 +86,9 @@ export class DiplomaAssinarPage implements OnInit { } async openOptions(taskAction?: any) { - - if (window.innerWidth > 500) { - const modalController = await this.popoverController.create({ - component: DkDiplomasGerarOptionsPage, - cssClass: 'exp-options-desktop', - componentProps: { - serialNumber: this.task.SerialNumber, - task: this.task, - showEnviarPendentes: false, - fulltask: this.fulltask, - DraftNames: this.DraftNames, - DraftIds: this.DraftIds, - asDraft: this.asDraft - - } - }); - return await modalController.present().then(() => { - this.TaskService.loadDiplomas() - }, (error) => { - console.log(error) - }) + + if (window.innerWidth > 500) { + this.showOptions = true } else { const popover = await this.popoverController.create({ component: DiplomaOptionsPage, @@ -118,7 +101,7 @@ export class DiplomaAssinarPage implements OnInit { DraftNames: this.DraftNames, DraftIds: this.DraftIds, asDraft: this.asDraft - + }, translucent: true }); diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html index 2ade61c59..19e6b2287 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html @@ -21,14 +21,17 @@ >
-
-
- - - - -
+
+
+
+ + + + +
+
+
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss index 8f8c0615c..392244bd5 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss @@ -180,8 +180,27 @@ ion-button{ font-size: rem(13); } } -.aside-right{ +.aside-right-container { + position: fixed; + height: 100%; + background: white; + top: 0px; + box-shadow: 0px 0px 10px black; + z-index: 1111111111111111111111111111111111111111111111; + /* display: none; */ + right: 0px; + width: 400px; padding: 30px 20px 0 20px !important; +} + +.aside-right{ + position: absolute; + height: 100%; + width: 100% !important; + background: #0000006b; + right: 0px; + z-index: 111111111111111; + top: 0px; .arrow-right{ display: flex; diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts index 5200c4f9f..b2762c6d9 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts @@ -38,6 +38,7 @@ export class DiplomasGerarPage implements OnInit { customDate: any; caller:string; + showOptions = false constructor( private processes: ProcessesService, public popoverController: PopoverController, @@ -72,22 +73,9 @@ export class DiplomasGerarPage implements OnInit { async openOptions(taskAction?: any) { - - if (window.innerWidth > 500) { - const modal = await this.popoverController.create({ - component: DkDiplomasGerarOptionsPage, - cssClass: 'exp-options-desktop', - componentProps: { - serialNumber: this.task.SerialNumber, - task: this.task, - showEnviarPendentes: false - } - }); - return await modal.present().then(() => { - this.TaskService.loadDiplomas() - }, (error) => { - console.log(error) - }) + + if (window.innerWidth > 500) { + this.showOptions = true } else { const popover = await this.popoverController.create({ component: DiplomasGerarOptionsPage, @@ -105,7 +93,7 @@ export class DiplomasGerarPage implements OnInit { console.log(error) }) } - + } diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html index dc5cf6f6f..4b0693bfa 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -16,21 +16,24 @@ [fulltask]="fulltask" > - + +
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss index 0bffada72..6b3a6e4a3 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss @@ -16,9 +16,27 @@ ion-button{ width: 80%; margin: 20px auto; } +.aside-right-container { + position: fixed; + height: 100%; + background: white; + top: 0px; + box-shadow: 0px 0px 10px black; + z-index: 1111111111111111111111111111111111111111111111; + /* display: none; */ + right: 0px; + width: 400px; + padding: 30px 20px 0 20px !important; +} .aside-right{ - padding: 30px 20px 0 20px !important; + position: absolute; + height: 100%; + width: 100% !important; + background: #0000006b; + right: 0px; + z-index: 111111111111111; + top: 0px; .arrow-right{ display: flex; 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 87ec0ec07..df0352ac5 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -50,6 +50,7 @@ export class DiplomaPage implements OnInit { DraftNames = "" DraftIds = "" + showOptions = false constructor( private processes: ProcessesService, public popoverController: PopoverController, @@ -97,30 +98,10 @@ export class DiplomaPage implements OnInit { async openOptions() { - - if (window.innerWidth > 500) { - - const model = await this.popoverController.create({ - component: DkDeplomasOptionsPage, - cssClass: 'exp-options-desktop', - componentProps: { - serialNumber: this.serialNumber, - task: this.task, - fulltask: this.fulltask, - showEnviarPendentes: false - } - }); - - model.onDidDismiss().then(() => { - this.TaskService.loadDiplomas() - }, (error) => { - console.log(error) - }).catch((e) => { - console.log(e) - }) - - - await model.present(); + + if (window.innerWidth > 500) { + + this.showOptions = true } else { const popover = await this.popoverController.create({ component: DiplomaOptionsPage, @@ -133,7 +114,7 @@ export class DiplomaPage implements OnInit { }, translucent: true }); - + popover.onDidDismiss().then(() => { this.TaskService.loadDiplomas() }, (error) => { @@ -141,11 +122,11 @@ export class DiplomaPage implements OnInit { }).catch((e) => { console.log(e) }) - - + + let a = await popover.present(); } - + } diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss index 46beee546..1ac83dce4 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss @@ -128,6 +128,7 @@ ion-menu{ .aside-right{ overflow: auto; padding: 30px 20px 0 20px !important; + width: 100% !important; .arrow-right{ display: flex; @@ -271,4 +272,4 @@ ion-menu{ float: right; font-size: rem(13); } -} \ No newline at end of file +} 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 56808951e..e51c5fac4 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 @@ -15,24 +15,27 @@ >
- + +
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 d2f2922d8..78ad11a3c 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 @@ -160,9 +160,28 @@ ion-button{ font-size: rem(13); } } -.aside-right { - padding: 0px 20px; - margin: 20px 0px; +.aside-right-container { + position: fixed; + height: 100%; + background: white; + top: 0px; + box-shadow: 0px 0px 10px black; + z-index: 1111111111111111111111111111111111111111111111; + /* display: none; */ + right: 0px; + width: 400px; + padding: 30px 20px 0 20px !important; +} + +.aside-right{ + position: absolute; + height: 100%; + width: 100%; + background: #0000006b; + right: 0px; + z-index: 111111111111111; + top: 0px; + .arrow-right{ display: flex; 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 f349632ff..c49631c02 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 @@ -64,6 +64,7 @@ export class ExpedienteDetailPage implements OnInit { loggeduser: LoginUserRespose; + showOptions = false constructor( private processes: ProcessesService, private router: Router, @@ -592,23 +593,10 @@ export class ExpedienteDetailPage implements OnInit { async openOptions(taskAction?: any) { - - if (window.innerWidth > 500) { - - const model = await this.popoverController.create({ - component: DKOptsExpedientePage, - cssClass: 'exp-options-desktop', - componentProps: { - task: this.task, - fulltask: this.fulltask, - taskAction: taskAction, - } - }); - return await model.present().then(() => { - this.TaskService.loadExpedientes() - }, (error) => { - console.log(error) - }) + + if (window.innerWidth > 500) { + + this.showOptions = true } else { const popover = await this.popoverController.create({ component: OptsExpedientePage, @@ -625,7 +613,7 @@ export class ExpedienteDetailPage implements OnInit { }, (error) => { console.log(error) }) - + } } diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss index 03768d15b..b53ecb421 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss @@ -160,7 +160,7 @@ ion-button{ } .aside-right{ padding: 30px 20px 0 20px !important; - + width: 100% !important; .arrow-right{ display: flex; justify-content: flex-end; 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 758ba497e..47a8f9e07 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -55,56 +55,59 @@ - + + diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss index 631f4dbb5..2eb423f52 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss @@ -125,8 +125,27 @@ ion-button{ font-size: rem(13); } } -.aside-right{ +.aside-right-container { + position: fixed; + height: 100%; + background: white; + top: 0px; + box-shadow: 0px 0px 10px black; + z-index: 1111111111111111111111111111111111111111111111; + /* display: none; */ + right: 0px; + width: 400px; padding: 30px 20px 0 20px !important; +} + +.aside-right{ + position: absolute; + width: 100% !important; + height: 100%; + background: #0000006b; + right: 0px; + z-index: 111111111111111; + top: 0px; .arrow-right{ display: flex; 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 dd7c03c80..795a68af9 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -51,6 +51,7 @@ export class PedidoPage implements OnInit { loggeduser: LoginUserRespose; taskArrayActions = []; + showOptions = false constructor(private activatedRoute: ActivatedRoute, private processes: ProcessesService, private menu: MenuController, @@ -250,33 +251,9 @@ export class PedidoPage implements OnInit { async openOptions(taskAction?: any) { - - if (window.innerWidth > 500) { - const model = await this.popoverController.create({ - component: DKRequestOptionsPage, - cssClass: 'exp-options-desktop', - componentProps: { - task: this.task, - serialNumber: this.task.SerialNumber, - fulltask: this.fulltask, - taskAction: taskAction, - showEnviarPendentes: false, - actions: this.taskArrayActions - } - }); - await model.present(); - - model.onDidDismiss().then((res => { - this.TaskService.loadPedidos(); - if (res['data'] == 'close') { - this.goBack() - } - this.TaskService.loadPedidos(); - - - }), (error) => { - console.log(error) - }) + + if (window.innerWidth > 500) { + this.showOptions = true } else { const popover = await this.popoverController.create({ component: RequestOptionsPage, @@ -292,20 +269,20 @@ export class PedidoPage implements OnInit { translucent: true }); await popover.present(); - + popover.onDidDismiss().then((res => { this.TaskService.loadPedidos(); if (res['data'] == 'close') { this.goBack() } this.TaskService.loadPedidos(); - - + + }), (error) => { console.log(error) }) } - + } diff --git a/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html index 96b2972cb..2ac24482f 100644 --- a/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html +++ b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html @@ -1,7 +1,6 @@
-
-
+
-