diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html index 13571d2d5..e74ac8dcf 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html @@ -4,7 +4,7 @@
-

Deseja retirar este expediente da sua caixa de correspondência?

+

Deseja retirar este expediente da sua caixa de correspondência?

diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 101711a1e..0767ac284 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -163,12 +163,9 @@ export class ExpedientTaskModalPage implements OnInit { }; }) - let docs = { ProcessInstanceID: "", - Attachments: [ - - ] + Attachments: [] } const DocumentToSave = this.documents.map((e) => { @@ -196,21 +193,22 @@ export class ExpedientTaskModalPage implements OnInit { //SubjectTypes: [], } try { + let action_despacho = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 94, + "dataFields": { + "Note": "", + } + } this.taskResult = await this.processes.postDespatcho(this.postData).toPromise(); - await this.successMessage('Processo efetuado') + this.modalController.dismiss(action_despacho); + //await this.successMessage('Processo efetuado'); + } catch (error) { await this.badRequest('Processo não efetuado') } console.log('this.taskResult', this.taskResult); - let action_despacho = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 94, - "dataFields": { - "Note": "", - } - } - this.modalController.dismiss(action_despacho); break; case '1': @@ -225,21 +223,20 @@ export class ExpedientTaskModalPage implements OnInit { } try { - this.taskResult = await this.processes.postParecer(this.postData).toPromise() - await this.successMessage('Processo efetuado') + let action_parecer = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 92, + "dataFields": { + "Note": "", + } + } + this.taskResult = await this.processes.postParecer(this.postData).toPromise(); + this.modalController.dismiss(action_parecer); + //await this.successMessage('Processo efetuado') } catch (error) { await this.badRequest('Processo não efetuado') } - - let action_parecer = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 92, - "dataFields": { - "Note": "", - } - } - this.modalController.dismiss(action_parecer); break; case '2': this.postData = { @@ -253,21 +250,21 @@ export class ExpedientTaskModalPage implements OnInit { } //console.log(this.postData); try { - this.taskResult = await this.processes.postDeferimento(this.postData).toPromise() - await this.successMessage('Processo efetuado') + let action_deferimento = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 93, + "dataFields": { + "Note": "", + } + } + this.taskResult = await this.processes.postDeferimento(this.postData).toPromise(); + this.modalController.dismiss(action_deferimento); + //await this.successMessage('Processo efetuado') } catch (error) { await this.badRequest('Processo não efetuado') } console.log('this.taskResult', this.taskResult); - let action_deferimento = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 93, - "dataFields": { - "Note": "", - } - } - this.modalController.dismiss(action_deferimento); break; } } @@ -290,21 +287,21 @@ export class ExpedientTaskModalPage implements OnInit { } console.log(this.postData); try { + let action_despacho_pr = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 99999881 , + "dataFields": { + "Note": "", + } + } this.taskResult = await this.processes.postDespatchoPr(this.postData).toPromise(); - await this.successMessage('Processo efetuado') + this.modalController.dismiss(action_despacho_pr); + //await this.successMessage('Processo efetuado') } catch (error) { await this.badRequest('Processo não efetuado') } console.log('this.taskResult', this.taskResult); - let action_despacho_pr = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 99999881 , - "dataFields": { - "Note": "", - } - } - this.modalController.dismiss(action_despacho_pr); break; case '1': @@ -319,21 +316,20 @@ export class ExpedientTaskModalPage implements OnInit { } try { + let action_parecer_pr = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 99999881, + "dataFields": { + "Note": "", + } + } this.taskResult = await this.processes.postParecerPr(this.postData).toPromise(); - await this.successMessage('Processo efetuado') + this.modalController.dismiss(action_parecer_pr); + //await this.successMessage('Processo efetuado') } catch (error) { await this.badRequest('Processo não efetuado') } - - let action_parecer_pr = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 99999881, - "dataFields": { - "Note": "", - } - } - this.modalController.dismiss(action_parecer_pr); break; } break; diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index be6428a04..764c4133f 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -196,18 +196,13 @@ export class ExpedienteDetailPage implements OnInit { modal.onDidDismiss().then(res=>{ console.log(res['data']); let body = res['data']; - // alert('close '+ res['data']) if(res['data']){ - console.log('open discart'); - + console.log('open discart') this.distartExpedientModal(body); - } else{ console.log('Not open'); - } - }); }