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

Merge branch 'comment-despacho-deferimento' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Eudes Inácio
2022-06-24 17:08:49 +01:00
parent f469e1fa81 efd97d6679
commit e3df1e7de1
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/Rules/despacho.service.ts
+3 -3
View File
@@ -100,7 +100,7 @@ export class DespachoService {
return this.processes.CompleteTask(body)
}
EfectuarDespacho({note = '', documents = [], serialnumber, activityInstanceName}) {
EfectuarDespacho({note, documents = [], serialnumber, activityInstanceName}) {
let body;
if(activityInstanceName == 'Concluir Despacho'
|| activityInstanceName == 'Concluir Parecer'
@@ -150,14 +150,14 @@ export class DespachoService {
/**
* @description efetuar despacho
*/
CompleteTask({serialNumber}) {
CompleteTask({serialNumber, note}) {
const body = {
"serialNumber": serialNumber,
"action": "Despacho",
"ActionTypeId": 94,
"dataFields": {
"ReviewUserComment": '',
"ReviewUserComment": note,
},
"AttachmentList" :null,
}
src/app/Rules/pedido.service.ts
+2 -2
View File
@@ -42,14 +42,14 @@ export class PedidoService {
return this.processes.CompleteTask(body)
}
taskCompleteDeferimento({serialNumber}) {
taskCompleteDeferimento({serialNumber, note}) {
const body = {
"serialNumber": serialNumber,
"action": "Deferimento",
"ActionTypeId": 93, // Pedido de deferimento
"dataFields": {
"ReviewUserComment": '',
"ReviewUserComment": note,
},
"AttachmentList" :null,
}
src/app/modals/create-process/create-process.page.ts
+4 -4
View File
@@ -290,7 +290,7 @@ export class CreateProcessPage implements OnInit {
try {
await this.processes.postDespatcho(this.postData).toPromise();
await this.despachoService.EfectuarDespacho({serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise();
await this.despachoService.EfectuarDespacho({note: this.dispatchFolder.Message, serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise();
this.modalController.dismiss();
this.toastService._successMessage('Despacho criado');
@@ -346,7 +346,7 @@ export class CreateProcessPage implements OnInit {
try {
await this.pedidoService.createDeferimento(this.postData).toPromise();
await this.pedidoService.taskCompleteDeferimento({serialNumber:this.task.serialNumber}).toPromise();
await this.pedidoService.taskCompleteDeferimento({note: this.postData.DispatchFolder.Message,serialNumber:this.task.serialNumber}).toPromise();
this.modalController.dismiss();
this.toastService._successMessage('Pedido de Deferimento criado');
@@ -375,7 +375,7 @@ export class CreateProcessPage implements OnInit {
if(this.postData.DispatchFolder.Message){
try {
await this.despachoService.createDespacho(this.postData).toPromise();
await this.despachoService.CompleteTask({serialNumber: this.task.serialNumber}).toPromise();
await this.despachoService.CompleteTask({serialNumber: this.task.serialNumber, note: this.dispatchFolder.Message}).toPromise();
this.modalController.dismiss();
this.toastService._successMessage('Despacho criado');
@@ -435,7 +435,7 @@ export class CreateProcessPage implements OnInit {
try {
await this.pedidoService.createDeferimento(this.postData).toPromise();
await this.pedidoService.taskCompleteDeferimento({serialNumber:this.task.serialNumber}).toPromise();
await this.pedidoService.taskCompleteDeferimento({note: this.postData.DispatchFolder.Message, serialNumber:this.task.serialNumber}).toPromise();
this.modalController.dismiss();
this.toastService._successMessage('Pedido de Deferimento criado');
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+5 -5
View File
@@ -308,7 +308,7 @@ export class ExpedientTaskModalPage implements OnInit {
"action": "Tratado",
"ActionTypeId": 94,
"dataFields": {
"Note": this.postData.DispatchFolder.Subject,
"Note": this.postData.DispatchFolder.Message,
}
}
@@ -343,7 +343,7 @@ export class ExpedientTaskModalPage implements OnInit {
"action": "Tratado",
"ActionTypeId": 92,
"dataFields": {
"Note": this.postData.DispatchFolder.Subject,
"Note": this.postData.DispatchFolder.Message,
}
}
@@ -374,7 +374,7 @@ export class ExpedientTaskModalPage implements OnInit {
"action": "Tratado",
"ActionTypeId": 93,
"dataFields": {
"Note": this.postData.DispatchFolder.Subject,
"Note": this.postData.DispatchFolder.Message,
}
}
@@ -412,7 +412,7 @@ export class ExpedientTaskModalPage implements OnInit {
"action": "Tratado",
"ActionTypeId": 99999881 ,
"dataFields": {
"Note": this.postData.DispatchFolder.Subject,
"Note": this.postData.DispatchFolder.Message,
}
}
@@ -451,7 +451,7 @@ export class ExpedientTaskModalPage implements OnInit {
"action": "Tratado",
"ActionTypeId": 99999881,
"dataFields": {
"Note": this.postData.DispatchFolder.Subject,
"Note": this.postData.DispatchFolder.Message,
}
}