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

improve

Browse Source
This commit is contained in:
Peter Maquiran
2021-08-10 15:19:06 +01:00
parent 61111f2a51
commit 6634faeb3b
3 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+16 -1
View File
@@ -91,7 +91,7 @@
</div>
</div>
<div *ngIf="task" class="aside-right flex-column height-100">
<div *ngIf="task && !p.userRole(['PR'])" class="aside-right flex-column height-100">
<div class="buttons">
<div class="option-desc"> <div>Enviar para o PR</div> </div>
<button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
@@ -109,6 +109,21 @@
</div>
</div>
<div *ngIf="task && p.userRole(['PR'])" class="aside-right flex-column height-100">
<div class="buttons">
<button (click)="openExpedientActionsModal('0', fulltask)" class="btn-ok" shape="round" >Marcar para Despacho</button>
<button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (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 hidden class="solid"></div>
<button hidden class="btn-cancel" shape="round" >Delegar</button>
</div>
</div>
</div>
</ion-content>
src/app/shared/popover/opts-expediente/opts-expediente.page.html
+13 -1
View File
@@ -5,7 +5,7 @@
</button>
</div>
<div class="width-100">
<div class="d-flex width-100">
<div *ngIf="task && !p.userRole(['PR'])" class="d-flex width-100">
<div class="flex-grow-1">
<button class="btn-cancel desk" shape="round"> Enviar para o PR </button>
<button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
@@ -23,6 +23,18 @@
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-ok" shape="round" >Enviar para pendentes</button>
</div>
</div>
<div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
<div class="flex-grow-1">
<button (click)="openExpedientActionsModal('0', fulltask)" class="btn-ok" shape="round" >Marcar para Despacho</button>
<button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (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 hidden class="solid"></div>
<button hidden class="btn-cancel" shape="round" >Delegar</button>
</div>
</div>
<div class="solid"></div>
<button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+6 -6
View File
@@ -57,20 +57,20 @@ export class OptsExpedientePage implements OnInit {
}
goBack() {
if(this.task.Status == "Pending" && this.caller != 'events'){
if(this.task.Status == "Pending" && this.caller != 'events') {
if (window.innerWidth <= 800) {
this.router.navigate(['/home/gabinete-digital/pendentes']);
}
else {
let navigationExtras: NavigationExtras = {
queryParams: {
"pendentes": true,
}
"pendentes": true,
}
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
else{
else {
window.history.back();
/* this.activatedRoute.paramMap.subscribe(params => {
@@ -193,8 +193,8 @@ export class OptsExpedientePage implements OnInit {
modal.onDidDismiss().then( async (res)=>{
console.log(res['data']);
if(body == 'descartar'){
if(res['data']== 'Yes'){
if(body == 'descartar') {
if(res['data']== 'Yes') {
let otherbody = {
"serialNumber": this.task.SerialNumber,
"action": "Passivo",