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

Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Peter Maquiran
2021-09-03 15:50:53 +01:00
parent 4a6225b914 e2d86625aa
commit cc793f2f06
7 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/popover/deploma-options/deploma-options.page.scss
+6 -6
View File
@@ -25,11 +25,11 @@
border-top: 1px solid #bbb;
margin: 0 auto !important;
}
.btn-ok, .btn-cancel{
//width: 50% !important;
margin-bottom: 5px !important;
margin-top: 5px !important;
}
.btn-ok, .btn-cancel, .btn-delete{
width: calc(50% - 10px) !important;
margin: 5px 5px 5px 5px !important;
}
@media only screen and (max-width: 800px) {
.btn-ok, .btn-cancel, .btn-delete{
width: 47% !important;
@@ -53,4 +53,4 @@
/* .solid{
display: block;
} */
}
}
src/app/shared/popover/despachos-options/despachos-options.page.scss
+8 -8
View File
@@ -3,6 +3,7 @@
--padding-bottom:20px !important;
--padding-start:20px !important;
--padding-end:20px !important;
}
.arrow-right {
display: none;
@@ -25,11 +26,10 @@
border-top: 1px solid #bbb;
margin: 0 auto !important;
}
.btn-ok, .btn-cancel{
//width: 50% !important;
margin-bottom: 5px !important;
margin-top: 5px !important;
}
.btn-ok, .btn-cancel, .btn-delete{
width: calc(50% - 10px) !important;
margin: 5px 5px 5px 5px !important;
}
.pr-options {
.btn-ok, .btn-cancel{
@@ -45,7 +45,7 @@
width: 30%;
}
}
@media only screen and (min-width: 1140px){
.content{
width: 75%;
@@ -54,9 +54,9 @@
width: 25%;
}
}
.desk{
text-align: left;
background-color: white;
}
}
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html
+4 -2
View File
@@ -20,6 +20,7 @@
<!-- <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button> -->
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel" shape="round" >Enviar para pendentes</button>
<button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button>
</div>
</div>
<div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
@@ -28,11 +29,12 @@
<button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</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>
<button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button>
</div>
</div>
<div class="solid"></div>
<button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button>
<!-- <div class="solid"></div>
<button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button> -->
</div>
</ion-content>
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.scss
+1 -1
View File
@@ -58,4 +58,4 @@
.desk{
text-align: left;
background-color: white;
}
}
src/app/shared/popover/messages-options/messages-options.page.scss
+4
View File
@@ -25,6 +25,10 @@
border-top: 1px solid #bbb;
margin: 0 auto !important;
}
/* .btn-ok, .btn-cancel, .btn-delete{
width: calc(50% - 10px) !important;
margin: 5px 5px 5px 5px !important;
} */
@media only screen and (min-width: 701px) {
.arrow-right{
display: flex;
src/app/shared/popover/request-options/request-options.page.html
+9 -1
View File
@@ -15,6 +15,7 @@
<button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</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>
<button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Reapreciar Deferimento'">
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
@@ -25,6 +26,7 @@
<button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</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>
<button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Deferimento'">
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
@@ -36,15 +38,17 @@
<button (click)="openAddNoteModal('Solicitar Reapreciação')" class="btn-cancel" shape="round" >Solicitar Reapreciação</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>
<button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
</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 (click)="openDarParecer(task)" class="btn-cancel" shape="round" >Dar o meu Parecer</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</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>
<button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Parecer'">
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
@@ -54,6 +58,10 @@
<button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</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>
<button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
</div>
</div>
<!-- <div class="buttons">
<button (click)="close()" class="btn-cancel" shape="round" >Cancelar</button>
</div> -->
</ion-content>
src/app/shared/popover/request-options/request-options.page.ts
+18 -15
View File
@@ -39,7 +39,7 @@ export class RequestOptionsPage implements OnInit {
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
this.serialNumber = this.navParams.get('serialNumber');
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialNumber = params["serialNumber"];
@@ -62,7 +62,7 @@ export class RequestOptionsPage implements OnInit {
ngOnInit() {
console.log(this.task);
this.profile = "mdgpr";
window.onresize = (event) => {
if( window.innerWidth >= 800){
this.popoverController.dismiss();
@@ -73,6 +73,9 @@ export class RequestOptionsPage implements OnInit {
close() {
this.popoverController.dismiss('close')
}
cancel(){
this.popoverController.dismiss();
}
sendExpedienteToPending() {
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
@@ -83,7 +86,7 @@ export class RequestOptionsPage implements OnInit {
this.toastService.badRequest('Processo não encontrado')
});
}
async openBookMeetingModal(task: any) {
@@ -130,7 +133,7 @@ export class RequestOptionsPage implements OnInit {
console.log(res['data']);
if(res['data']=='openDiscart') {
console.log('open discart');
} else {
this.popoverController.dismiss('close')
}
@@ -139,8 +142,8 @@ export class RequestOptionsPage implements OnInit {
}
async repreciar(note:string, documents:any) {
let body = {
"serialNumber": this.serialNumber,
let body = {
"serialNumber": this.serialNumber,
"action": "Reapreciação",
"ActionTypeId": 100000009,
"dataFields": {
@@ -151,13 +154,13 @@ export class RequestOptionsPage implements OnInit {
const loader = this.toastService.loading()
try {
try {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.toastService.successMessage()
} catch (error) {
this.toastService.badRequest()
}
}
finally {
loader.remove()
}
@@ -180,9 +183,9 @@ export class RequestOptionsPage implements OnInit {
cssClass: classs,
backdropDismiss: true
});
await modal.present();
modal.onDidDismiss().then(async (res) => {
@@ -192,7 +195,7 @@ export class RequestOptionsPage implements OnInit {
SourceId: e.Id,
}
});
let docs = {
ProcessInstanceID: "",
Attachments: DocumentToSave,
@@ -217,7 +220,7 @@ export class RequestOptionsPage implements OnInit {
const loader = this.toastService.loading()
try {
try {
await this.pedidoService.arquivar({serialNumber: this.serialNumber,
documents,
note
@@ -233,7 +236,7 @@ export class RequestOptionsPage implements OnInit {
}
async openDarParecer(task: any) {
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -258,7 +261,7 @@ export class RequestOptionsPage implements OnInit {
async openDelegarModal(task: any) {
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -275,7 +278,7 @@ export class RequestOptionsPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then( async (res)=> {
if(res['data']=='close') {
this.popoverController.dismiss('close');
}