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

add options

Browse Source
This commit is contained in:
Peter Maquiran
2021-08-11 11:15:43 +01:00
parent 4bcaba8ee0
commit da9df36320
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+4 -5
View File
@@ -83,7 +83,7 @@ export class ExpedienteDetailPage implements OnInit {
}
async approve(note:string, documents:any){
async approve(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Aprovar",
@@ -110,7 +110,7 @@ export class ExpedienteDetailPage implements OnInit {
}
async sendToReview(note:string, documents:any){
async sendToReview(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Retificar",
@@ -231,7 +231,6 @@ export class ExpedienteDetailPage implements OnInit {
});
}
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
@@ -317,7 +316,7 @@ export class ExpedienteDetailPage implements OnInit {
});
}
getAttachments(serialNumber){
getAttachments(serialNumber) {
console.log(serialNumber);
this.attachmentsService.getAttachmentsBySerial(serialNumber).subscribe(res=>{
@@ -501,7 +500,7 @@ export class ExpedienteDetailPage implements OnInit {
});
}
goToEvent(eventId:any){
goToEvent(eventId:any) {
this.router.navigate(['/home/events', eventId, 'expediente']);
}
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+3 -4
View File
@@ -236,7 +236,6 @@ export class ExpedientePrPage implements OnInit {
}
attachDocument() {
console.log('HERE');
this.getDoc();
}
@@ -300,7 +299,7 @@ export class ExpedientePrPage implements OnInit {
this.modalController.dismiss();
}
async approve(note:string, documents:any){
async approve(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Aprovar",
@@ -327,7 +326,7 @@ export class ExpedientePrPage implements OnInit {
}
async sendToReview(note:string, documents:any){
async sendToReview(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Retificar",
@@ -360,7 +359,7 @@ export class ExpedientePrPage implements OnInit {
}
const modal = await this.modalController.create({
component: AddNotePage,
componentProps:{
componentProps: {
showAttachmentBtn: false,
},
cssClass: classs,
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+10 -9
View File
@@ -49,7 +49,7 @@ export class OptsExpedientePage implements OnInit {
}
close() {
if( window.innerWidth < 801){
if( window.innerWidth < 801) {
this.popoverController.dismiss();
}
else{
@@ -127,7 +127,7 @@ export class OptsExpedientePage implements OnInit {
await modal.present();
modal.onDidDismiss().then(res => {
modal.onDidDismiss().then( async (res) => {
console.log(res);
if(res.data){
const DocumentToSave = res.data.documents.map((e) => {
@@ -142,21 +142,22 @@ export class OptsExpedientePage implements OnInit {
Attachments: DocumentToSave,
}
if(actionName == 'Aprovar'){
this.approve(res.data.note, docs);
if(actionName == 'Aprovar') {
await this.approve(res.data.note, docs);
}
else if(actionName == 'Revisão'){
this.sendToReview(res.data.note, docs);
else if(actionName == 'Revisão') {
await this.sendToReview(res.data.note, docs);
}
this.popoverController.dismiss();
this.goBack();
}
});
}
async sendToReview(note:string, documents:any){
async sendToReview(note:string, documents:any) {
let body = {
"serialNumber": this.task.serialnumber,
"serialNumber": this.task.serialnumber || this.task.SerialNumber,
"action": "Retificar",
"ActionTypeId": 99999877,
"dataFields": {
@@ -190,7 +191,7 @@ export class OptsExpedientePage implements OnInit {
async approve(note:string, documents:any){
let body = {
"serialNumber": this.task.serialnumber,
"serialNumber": this.task.serialnumber || this.task.SerialNumber,
"action": "Aprovar",
"ActionTypeId": 100000004 ,
"dataFields": {