mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
improve secrete-group
This commit is contained in:
@@ -171,8 +171,7 @@ export class ApproveEventPage implements OnInit {
|
||||
modal.onDidDismiss()
|
||||
.then( async (res) => {
|
||||
|
||||
|
||||
if(res.data !== '') {
|
||||
if(res.data.note !== '') {
|
||||
let body = { "serialNumber": serialNumber,
|
||||
"action": "Emendar",
|
||||
"dataFields": {
|
||||
@@ -192,8 +191,10 @@ export class ApproveEventPage implements OnInit {
|
||||
loader.remove()
|
||||
}
|
||||
}
|
||||
else{
|
||||
this.toastService._badRequest('É necessário adicionar uma nota');
|
||||
else {
|
||||
if(res.data.option == 'save') {
|
||||
this.toastService._badRequest('É necessário adicionar uma nota');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
<!-- Edit event for Inicio -->
|
||||
<div class="main-content height-100 d-flex">
|
||||
|
||||
|
||||
<div class="content d-flex flex-column width-md-100 height-100">
|
||||
|
||||
<div class="main-header pt-30 px-20 background-white pb-15">
|
||||
@@ -372,6 +371,6 @@
|
||||
<ion-footer class="background-whit">
|
||||
<div class="buttons">
|
||||
<button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
|
||||
<button class="btn-ok cursor-pointer" shape="round" (click)="reenviar()">Gravar</button>
|
||||
<button class="btn-ok cursor-pointer" shape="round" (click)="gravasAction()">Gravar</button>
|
||||
</div>
|
||||
</ion-footer>
|
||||
|
||||
@@ -150,7 +150,7 @@ export class EditEventToApprovePage implements OnInit {
|
||||
|
||||
async getTask() {
|
||||
|
||||
this.processes.GetTask(this.serialNumber).subscribe( (result) =>{
|
||||
this.processes.GetTask(this.serialNumber).subscribe( (result) => {
|
||||
this.eventProcess = result
|
||||
|
||||
this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence)
|
||||
@@ -345,6 +345,16 @@ export class EditEventToApprovePage implements OnInit {
|
||||
|
||||
}
|
||||
|
||||
async gravasAction() {
|
||||
|
||||
await this.save();
|
||||
|
||||
if(this.eventProcess['activityInstanceName'] == 'Editar Evento') {
|
||||
this.reenviar();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
async reenviar() {
|
||||
let body = {
|
||||
serialNumber: this.eventProcess.serialNumber,
|
||||
|
||||
Reference in New Issue
Block a user