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

some changes

Browse Source
This commit is contained in:
tiago.kayaya
2021-06-04 15:59:36 +01:00
parent 19f270f425
commit d37b6c58dc
10 changed files with 14 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/create-process/create-process.page.html
+1 -1
View File
@@ -5,7 +5,7 @@
<ion-label class="title">{{modalTitle[taskType]}}</ion-label>
</ion-item>
<div class="ion-item-container width-100">
<ion-input placeholder="Assunto" [(ngModel)]="postData.DispatchFolder.Subject"></ion-input>
<ion-textarea placeholder="Assunto" [(ngModel)]="postData.DispatchFolder.Subject"></ion-textarea>
</div>
<div class="container-div width-100">
src/app/modals/dar-parecer/dar-parecer.page.ts
+1 -1
View File
@@ -62,7 +62,7 @@ export class DarParecerPage implements OnInit {
console.log(body);
try {
await this.processes.CompleteTask(body).toPromise()
await this.processes.CompleteTask(body).toPromise();
this.modalController.dismiss();
this.successMessage()
} catch (error) {
src/app/modals/delegar/delegar.page.ts
+4 -1
View File
@@ -75,6 +75,9 @@ export class DelegarPage implements OnInit {
this.router.navigate(['/home/gabinete-digital/expediente']);
this.modalController.dismiss(null);
}
goBack() {
window.history.back()
}
cancelTask(){
this.modalController.dismiss(null);
}
@@ -100,7 +103,7 @@ export class DelegarPage implements OnInit {
(error)=>{
this.badRequest()
});
this.close();
this.goBack();
}
}
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
-15
View File
@@ -84,22 +84,7 @@ export class DespachoPage implements OnInit {
}
goBack() {
// this.activatedRoute.queryParams.subscribe(params => {
// if(params["from"] == 'pendentes') {
// this.router.navigate(['/home/gabinete-digital/pendentes']);
// } else {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "despachos": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras);
// }
// });
window.history.back()
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
-35
View File
@@ -2,41 +2,6 @@
<app-header></app-header>
</ion-header>
<!-- <ion-menu autoHide="false" side="end" content-id="main-content">
<ion-header>
<ion-toolbar translucent>
<ion-title>Menu</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<ion-list>
<ion-item (click)="openExpedientActionsModal('0', fulltask)">
<ion-icon name="documents" slot="start"></ion-icon>
<ion-label>Efectuar Despacho</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('1', fulltask)">
<ion-icon name="arrow-undo" slot="start"></ion-icon>
<ion-label>Pedido de Parecer</ion-label>
</ion-item>
<ion-item (click)="openExpedientActionsModal('2', fulltask)">
<ion-icon name="arrow-redo" slot="start"></ion-icon>
<ion-label>Pedido de Deferimento</ion-label>
</ion-item>
<ion-item (click)="openBookMeetingModal(fulltask)">
<ion-icon name="calendar" slot="start"></ion-icon>
<ion-label>Marcar reunião</ion-label>
</ion-item>
<ion-item (click)="discartExpedient()">
<ion-icon name="trash" slot="start"></ion-icon>
<ion-label>Descartar</ion-label>
</ion-item>
<ion-item hidden disabled>
<ion-icon name="paper-plane" slot="start"></ion-icon>
<ion-label>Enviar para pendentes</ion-label>
</ion-item>
</ion-list>
</ion-content>
</ion-menu> -->
<div class="ion-page d-none" id="main-content">
<ion-menu-button></ion-menu-button>
</div>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+3 -4
View File
@@ -227,20 +227,19 @@ export class ExpedienteDetailPage implements OnInit {
await modal.present();
modal.onDidDismiss().then( async (res)=>{
console.log(res['data']);
console.log(body);
if(body == 'descartar'){
if(res['data']== 'Yes'){
let otherbody = {
"serialNumber": this.task.SerialNumber,
"action": "Passivo",
"ActionTypeId": 94,
"ActionTypeId": 99999877,
"dataFields": {
"Note": "",
}
}
try {
try {
await this.processes.CompleteTask(otherbody).toPromise()
this.successMessage()
} catch (error) {
@@ -255,7 +254,7 @@ export class ExpedienteDetailPage implements OnInit {
else{
if(res['data']== 'Yes'){
try {
await this.processes.CompleteTask(body).toPromise()
//await this.processes.CompleteTask(body).toPromise()
this.successMessage()
} catch (error) {
this.badRequest()
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+4 -5
View File
@@ -313,21 +313,20 @@ export class ExpedientePrPage implements OnInit {
await modal.present();
modal.onDidDismiss().then( async (res)=>{
console.log(res['data']);
console.log(body);
if(body == 'descartar'){
if(res['data']== 'Yes'){
let otherbody = {
"serialNumber": body.serialNumber,
"serialNumber": this.task.SerialNumber,
"action": "Passivo",
"ActionTypeId": 94,
"ActionTypeId": 99999877,
"dataFields": {
"Note": "",
}
}
try {
await this.processes.CompleteTask(otherbody).toPromise()
await this.processes.CompleteTask(otherbody).toPromise();
this.successMessage()
} catch (error) {
this.badRequest()
@@ -343,7 +342,7 @@ export class ExpedientePrPage implements OnInit {
if(res['data']== 'Yes'){
try {
await this.processes.CompleteTask(body).toPromise()
//await this.processes.CompleteTask(body).toPromise()
this.successMessage()
this.goBack();
} catch (error) {
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
-1
View File
@@ -107,7 +107,6 @@
<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()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Parecer'">
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+1 -8
View File
@@ -41,7 +41,6 @@ export class PedidoPage implements OnInit {
fulltask: any;
eventsList: Event[];
serialnumber: string;
profile: string;
intervenientes: any;
cc: any;
loggeduser: User;
@@ -61,15 +60,11 @@ export class PedidoPage implements OnInit {
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
// console.log(params["serialNumber"]);
}
});
}
ngOnInit() {
this.profile = "mdgpr";
// console.log(this.serialnumber);
this.LoadTaskDetail(this.serialnumber);
}
@@ -255,7 +250,6 @@ export class PedidoPage implements OnInit {
componentProps: {
taskAction: taskAction,
task: this.fulltask,
profile: this.profile,
},
cssClass: classs,
});
@@ -286,13 +280,11 @@ export class PedidoPage implements OnInit {
}
async viewEventDetail(eventId: any) {
console.log(this.profile);
const modal = await this.modalController.create({
component: ViewEventPage,
componentProps: {
eventId: eventId,
profile: this.profile,
},
cssClass: 'modal modal-desktop',
backdropDismiss: false
@@ -370,6 +362,7 @@ export class PedidoPage implements OnInit {
await modal.present();
modal.onDidDismiss();
}
async openAddNoteModal(actionName:string) {
let classs;
if( window.innerWidth <= 800){
src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
-19
View File
@@ -32,7 +32,6 @@ export class PedidosPage implements OnInit {
taskType: string;
serialNumber:string;
@Input() profile:string;
@Input() segment:string;
@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
@@ -43,7 +42,6 @@ export class PedidosPage implements OnInit {
private alertService: AlertService,
private activatedRoute: ActivatedRoute,
) {
this.profile = 'mdgpr';
}
ngOnInit() {
@@ -176,28 +174,11 @@ export class PedidosPage implements OnInit {
}
async viewPedidoDetail(serialNumber:any) {
console.log(this.profile);
// const modal = await this.modalController.create({
// component: PedidoPage,
// componentProps:{
// enterAnimation: "",
// serialNumber: serialNumber,
// profile: this.profile,
// },
// cssClass: 'modal modal-desktop',
// });
// await modal.present();
// modal.onDidDismiss().then((res)=>{
// console.log('refresh list');
// this.LoadList();
// });
let navigationExtras: NavigationExtras = {
queryParams: {
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
}
};
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);