peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix asside options

Browse Source
This commit is contained in:
Peter Maquiran
2024-02-28 10:23:05 +01:00
parent a5f458de2e
commit 37eaf14786
24 changed files with 334 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+21 -23
View File
@@ -16,32 +16,30 @@
[fulltask]="fulltask"
></app-task-details>
<!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
<div *ngIf="task && showOptions" (click)="showOptions=!showOptions" class="aside-right ">
<div class="aside-right-container flex-column height-100 overflow-y-auto">
<div class="buttons px-20" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Responder ao PR</div> </div>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Executado')" class="btn-cancel mb-0" style="margin-bottom: 0px !important;" shape="round" >Executado</button>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Reencaminhar para Área Jurídica</div>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Outras opções</div>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<div class="buttons px-20" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Responder ao PR</div> </div>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Executado')" class="btn-cancel mb-0" style="margin-bottom: 0px !important;" shape="round" >Executado</button>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Reencaminhar para Área Jurídica</div>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Outras opções</div>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div class="buttons px-20" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
<button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Reexecutar')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
</div>
<div class="buttons px-20" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
<button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Reexecutar')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
</div> -->
</div>
<div *ngIf="!task">
<ion-list>
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
+19 -1
View File
@@ -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;
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+10 -32
View File
@@ -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)
})
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+7 -4
View File
@@ -16,9 +16,8 @@
[fulltask]="fulltask"
></app-task-details>
<!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
<div *ngIf="task && showOptions" class="aside-right" (click)="showOptions=!showOptions">
<div class="aside-right-container flex-column height-100 overflow-y-auto">
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
<div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' "> <div>Responder ao PR</div> </div>
<button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
@@ -53,9 +52,13 @@
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
</div>
</div>
</div> -->
</div>
<div *ngIf="!task">
<ion-list>
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+20 -1
View File
@@ -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;
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+8 -27
View File
@@ -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();
}
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+13 -10
View File
@@ -15,17 +15,20 @@
></app-task-details>
<!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
<div class="buttons">
<button *ngIf="p.userRole('PR')" (click)="AssinarDraft()" class="btn-cancel" shape="round" >Assinar</button>
<div class="solid"></div>
<div *ngIf="task && showOptions" (click)="showOptions=!showOptions" class="aside-right">
<div class="aside-right-container flex-column height-100 overflow-y-auto">
<div class="buttons">
<button *ngIf="p.userRole('PR')" (click)="AssinarDraft()" class="btn-cancel" shape="round" >Assinar</button>
<div class="solid"></div>
</div>
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="openAddNoteModal('Arquivo')">Arquivar</button>
</div>
<div class="buttons">
</div>
</div>
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="openAddNoteModal('Arquivo')">Arquivar</button>
</div>
<div class="buttons">
</div>
</div> -->
</div>
<div *ngIf="!task">
<ion-list>
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+20 -1
View File
@@ -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;
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+5 -22
View File
@@ -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
});
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
+10 -7
View File
@@ -21,14 +21,17 @@
></app-task-details>
</div>
<div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
<div class="buttons">
<button (click)="enviarDiploma({note: '', documents: [], serialnumber: task.SerialNumber})" class="btn-cancel" shape="round" >Enviar Diploma</button>
<button (click)="openDelegarModal()" class="btn-cancel" shape="round" >Delegar</button>
<button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para pendentes</button>
<div class="solid"></div>
<div *ngIf="task && showOptions" (click)="showOptions=!showOptions" class="aside-right">
<div class="aside-right-container flex-column height-100 overflow-y-auto">
<div class="buttons">
<button (click)="enviarDiploma({note: '', documents: [], serialnumber: task.SerialNumber})" class="btn-cancel" shape="round" >Enviar Diploma</button>
<button (click)="openDelegarModal()" class="btn-cancel" shape="round" >Delegar</button>
<button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para pendentes</button>
<div class="solid"></div>
</div>
</div>
</div>
<div *ngIf="!task">
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
+20 -1
View File
@@ -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;
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts
+5 -17
View File
@@ -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)
})
}
}
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+17 -14
View File
@@ -16,21 +16,24 @@
[fulltask]="fulltask"
></app-task-details>
<!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
<div class="buttons" *ngIf="task.activityInstanceName == 'Revisar Diploma'">
<button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>
<button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efectuar Despacho</button>
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<div class="solid"></div>
<div *ngIf="task && showOptions" (click)="showOptions=!showOptions" class="aside-right ">
<div class="aside-right-container flex-column height-100 overflow-y-auto">
<div class="buttons" *ngIf="task.activityInstanceName == 'Revisar Diploma'">
<button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>
<button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efectuar Despacho</button>
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<div class="solid"></div>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Diploma Assinado'">
<button (click)="openAddNoteModal('Concluir diploma')" class="btn-cancel" shape="round" >Concluir</button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efectuar Despacho</button>
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
</div>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Diploma Assinado'">
<button (click)="openAddNoteModal('Concluir diploma')" class="btn-cancel" shape="round" >Concluir</button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efectuar Despacho</button>
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
</div>
</div> -->
</div>
<div *ngIf="!task">
<ion-list>
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss
+19 -1
View File
@@ -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;
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+9 -28
View File
@@ -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();
}
}
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss
+2 -1
View File
@@ -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);
}
}
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+20 -17
View File
@@ -15,24 +15,27 @@
></app-task-details>
</div>
<!-- <div class="aside-right flex-column height-100 overflow-y-auto">
<div class="buttons">
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Enviar para o PR</div> </div>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Solicitar revisão</div> </div>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Submeter para revisão</button>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Outras opções</div> </div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
<button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel" shape="round" >Enviar para pendentes</button>
<button *ngIf="p.userPermission([p.permissionList.Chat.access])" (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
<div class="solid"></div>
<div *ngIf="task && showOptions" class="aside-right" (click)="showOptions=!showOptions">
<div class="aside-right-container flex-column height-100 overflow-y-auto">
<div class="buttons">
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Enviar para o PR</div> </div>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Solicitar revisão</div> </div>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Submeter para revisão</button>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Outras opções</div> </div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
<button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel" shape="round" >Enviar para pendentes</button>
<button *ngIf="p.userPermission([p.permissionList.Chat.access])" (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
<div class="solid"></div>
</div>
</div>
</div> -->
</div>
</div>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+22 -3
View File
@@ -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;
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+6 -18
View File
@@ -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)
})
}
}
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
+1 -1
View File
@@ -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;
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+51 -48
View File
@@ -55,56 +55,59 @@
</ion-item>
</div>
<!-- <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
<div *ngIf="task.WorkflowName == 'Pedido de Deferimento'">
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Deferimento'">
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button *ngIf="loggeduser.Profile != 'PR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<div *ngIf="task && showOptions" class="aside-right" (click)="showOptions=!showOptions">
<div class="aside-right-container flex-column height-100 overflow-y-auto">
<div *ngIf="task.WorkflowName == 'Pedido de Deferimento'">
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Deferimento'">
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button *ngIf="loggeduser.Profile != 'PR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Reapreciar Deferimento'">
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button *ngIf="loggeduser.Profile != 'PR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Deferimento'">
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button hidden (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openAddNoteModal('Solicitar Reapreciação')" class="btn-cancel" shape="round" >Solicitar Reapreciação</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Reapreciar Deferimento'">
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button *ngIf="loggeduser.Profile != 'PR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Deferimento'">
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button hidden (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openAddNoteModal('Solicitar Reapreciação')" class="btn-cancel" shape="round" >Solicitar Reapreciação</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<div *ngIf="task.WorkflowName == 'Pedido de Parecer' || task.WorkflowName == 'Pedido de Parecer do Presidente'">
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Parecer'">
<button *ngIf="checkStringInArray('Registar')" (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente' && checkStringInArray('Reencaminhar')" (click)="openForwardModal(task)" class="btn-cancel" shape="round" >Reencaminhar</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Parecer'">
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button *ngIf="loggeduser.Profile != 'PR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente'" class="buttons">
<button (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
</div>
</div>
</div>
<div *ngIf="task.WorkflowName == 'Pedido de Parecer' || task.WorkflowName == 'Pedido de Parecer do Presidente'">
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Parecer'">
<button *ngIf="checkStringInArray('Registar')" (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente' && checkStringInArray('Reencaminhar')" (click)="openForwardModal(task)" class="btn-cancel" shape="round" >Reencaminhar</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Parecer'">
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button *ngIf="loggeduser.Profile != 'PR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div *ngIf="task.WorkflowName == 'Pedido de Parecer do Presidente'" class="buttons">
<button (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
</div>
</div>
</div> -->
</div>
</div>
</ion-content>
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
+20 -1
View File
@@ -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;
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+8 -31
View File
@@ -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)
})
}
}
src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html
+1 -3
View File
@@ -1,7 +1,6 @@
<div class="height-100 d-flex flex-column overflow-hidden width-100">
<div class="d-flex overflow-x-auto pa-10 width-100">
<div style="background-color: #d9d9d9;" *ngIf="showAttachmentList">
<div class="d-flex overflow-x-auto pa-10 width-100" style="background-color: #d9d9d9;" *ngIf="showAttachmentList">
<div *ngFor="let attachment of taskViewerAttachment; let i = index"
class="ion-no-margin ion-no-padding cursor-pointer attachment-list" class="pa-10 mx-10 card-text"
@@ -46,7 +45,6 @@
</div>
</div>
</div>
</div>