diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 10185d587..506f78753 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -366,18 +366,23 @@ export class CreateProcessPage implements OnInit { } console.log('this.postData', this.postData, this.taskType); - try { - await this.despachoService.createDespacho(this.postData).toPromise(); - await this.despachoService.CompleteTask({serialNumber: this.task.serialNumber}).toPromise(); + if(this.postData.DispatchFolder.Message){ + try { + await this.despachoService.createDespacho(this.postData).toPromise(); + await this.despachoService.CompleteTask({serialNumber: this.task.serialNumber}).toPromise(); - this.modalController.dismiss(); - this.toastService.successMessage('Despacho criado'); - } catch (error) { - this.toastService.badRequest('Processo não efectuado'); - } finally { - loader.remove() + this.modalController.dismiss(); + this.toastService.successMessage('Despacho criado'); + } catch (error) { + this.toastService.badRequest('Processo não efectuado'); + } finally { + //loader.remove(); + } } - + else{ + this.toastService.badRequest('Por favor adicione uma nota'); + } + loader.remove(); break; case '1': // Pedido de Parecer this.postData = { diff --git a/src/app/modals/view-document/view-document.page.html b/src/app/modals/view-document/view-document.page.html index 7de84b677..0dac8efec 100644 --- a/src/app/modals/view-document/view-document.page.html +++ b/src/app/modals/view-document/view-document.page.html @@ -5,7 +5,7 @@ -
+
{{file.title}}
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 bb6b2a947..3e0fbc2db 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 @@ -130,7 +130,7 @@ export class ExpedientTaskModalPage implements OnInit { SubjectTypes: this.selectedTypes, NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber, }; - + this.postData.DispatchFolder = this.dispatchFolder; this.postData.UsersSelected = this.participants; /* By Default TypeDeadline should be 'Normal' */ @@ -274,7 +274,7 @@ export class ExpedientTaskModalPage implements OnInit { }) }); - + } else { // 8 docs.Attachments.push({ ApplicationId: 8, @@ -459,17 +459,25 @@ export class ExpedientTaskModalPage implements OnInit { } } - try { + if(this.postData.DispatchFolder.Message){ + try { - this.taskResult = await this.processes.postParecerPr(this.postData).toPromise(); - await this.toastService.successMessage('Pedido enviado'); - this.modalController.dismiss(action_parecer_pr); - } catch (error) { + this.taskResult = await this.processes.postParecerPr(this.postData).toPromise(); + await this.toastService.successMessage('Pedido enviado'); + this.modalController.dismiss(action_parecer_pr); + } catch (error) { - await this.toastService.badRequest('Processo não efetuado') - } finally { - loader.remove() + await this.toastService.badRequest('Processo não efetuado') + } finally { + //loader.remove() + } } + else{ + this.toastService.badRequest('Por favor adicione uma nota'); + } + loader.remove(); + + break; } break;