diff --git a/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html index 59a1ee23d..7e67b9d9d 100644 --- a/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html +++ b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.html @@ -5,7 +5,7 @@
-
+
{{ attachment.Assunto }}Rascunho diff --git a/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.ts b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.ts index 79bef430c..c873d7714 100644 --- a/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.ts +++ b/src/app/pages/gabinete-digital/viewer-attachment/viewer-attachment.page.ts @@ -5,8 +5,6 @@ import { MiddlewareRepositoryService } from "src/app/shared/repository/middlewar import { DeviceService } from "src/app/services/device.service" import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { ProcessesService } from 'src/app/services/processes.service'; -import { Subject, fromEvent, interval } from 'rxjs'; -import { switchMap, take } from 'rxjs/operators'; import { PermissionService } from 'src/app/services/permission.service'; @Component({ @@ -40,15 +38,21 @@ export class ViewerAttachmentPage implements OnInit { const selectFirst = this.taskViewerAttachment[0] } + + isSelectedAttachmentIsDraft( attachment: ViewerAttachment) { + if(!attachment?.content) { + return false + } else if (attachment?.content == '') { + return false + } else { + return true + } + + } + async clickDocument(viewerAttachment: ViewerAttachment, i) { - if(!this.taskViewerAttachment[this.selectedIndex]?.content) { - this.draft = false - } else if (this.taskViewerAttachment[this.selectedIndex]?.content == '') { - this.draft = false - } else { - this.draft =true - } + this.draft = this.isSelectedAttachmentIsDraft(this.taskViewerAttachment[this.selectedIndex]) let count = 0 try { @@ -109,11 +113,6 @@ export class ViewerAttachmentPage implements OnInit { this.clickDocument(task, this.selectedIndex) } - somefunction() { - console.log('Saved tinymce') - } - - private holdStart: number = 0; private holdEnd: number = 0; private holdDuration: number = 500; // Adjust the duration needed for a "hold" @@ -134,7 +133,10 @@ export class ViewerAttachmentPage implements OnInit { console.log('Hold to click action triggered!'); console.log(event) window['e'] = event; - (event as any).target.parentElement.querySelector('button').click() + + if(!this.isSelectedAttachmentIsDraft(attachment)) { + (event as any).target.parentElement.querySelector('button').click() + } this.isHoldTriggered = true; } }, this.holdDuration); @@ -146,6 +148,10 @@ export class ViewerAttachmentPage implements OnInit { this.isHoldTriggered = false; } - openExpedientActionsModal(a: any, b:any) {} - openBookMeetingModal(a: any) {} + openExpedientActionsModal(taskAction, Document) { + window['TaskDetailsPage-openExpedientActionsModal'](taskAction, Document) + } + openBookMeetingModal(Document) { + window['TaskDetailsPage-openBookMeetingModal'](Document) + } } diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts index a271d5ae1..71e54b32e 100644 --- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts +++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts @@ -39,6 +39,13 @@ export class TaskDetailsPage implements OnInit { } ngOnInit() { + window['TaskDetailsPage-openExpedientActionsModal']= (taskAction, Document) => { + this.openExpedientActionsModal(taskAction, Document) + } + + window['TaskDetailsPage-openBookMeetingModal']= (Document) => { + this.openBookMeetingModal(Document) + } } @@ -83,7 +90,7 @@ export class TaskDetailsPage implements OnInit { }); modal.onDidDismiss().then( - async(res)=>{} + async(res) => {} , (error) => { console.log(error) }