diff --git a/src/app/core/chat/entity/message.ts b/src/app/core/chat/entity/message.ts index 2c5558195..6e9480420 100644 --- a/src/app/core/chat/entity/message.ts +++ b/src/app/core/chat/entity/message.ts @@ -30,6 +30,7 @@ export const MessageEntityAttachmentSchema = z.object({ mimeType: z.string().nullable().optional(), safeFile: z.any().optional(), description: z.string().nullable().optional(), + filePath: z.string().nullable().optional() }) export const MessageEntitySchema = z.object({ diff --git a/src/app/core/chat/usecase/message/message-create-use-case.service.ts b/src/app/core/chat/usecase/message/message-create-use-case.service.ts index 3e4ca4402..937b8c8e0 100644 --- a/src/app/core/chat/usecase/message/message-create-use-case.service.ts +++ b/src/app/core/chat/usecase/message/message-create-use-case.service.ts @@ -88,6 +88,7 @@ export class MessageCreateUseCaseService { const validation = zodSafeValidation(MessageEntitySchema, message) if(validation.isOk()) { + console.log("send data", message); message.sendAttemp++; const createMessageLocally = await this.messageLocalDataSourceService.insert(message) @@ -220,6 +221,8 @@ export class MessageCreateUseCaseService { } } + } else { + console.log('cant send error', validation.error); } } } diff --git a/src/app/infra/database/dexie/instance/chat/schema/attachment.ts b/src/app/infra/database/dexie/instance/chat/schema/attachment.ts index 2db705dcb..a359b1315 100644 --- a/src/app/infra/database/dexie/instance/chat/schema/attachment.ts +++ b/src/app/infra/database/dexie/instance/chat/schema/attachment.ts @@ -17,9 +17,10 @@ export const AttachmentTableSchema = z.object({ docId: z.number().optional(), mimeType: z.string().nullable().optional(), id: z.string().uuid().nullable().optional(), - description: z.string().optional() -}) + description: z.string().optional(), + filePath: z.string().optional().nullable() +}); export type AttachmentTable = z.infer export type DexieAttachmentsTableSchema = EntityTable; -export const AttachmentTableColumn = '++$id, id, $messageId, messageId, file' +export const AttachmentTableColumn = '++$id, id, $messageId, messageId, file, filePath' diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index 4611b5ade..142c72f55 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/src/app/modals/view-document/view-document.page.ts @@ -22,6 +22,7 @@ export class ViewDocumentPage implements OnInit { docId: any task: ExpedientTaskModalPageNavParamsTask; Document: any + link: any; loader = true attachment: SearchList[] = []; @@ -38,6 +39,7 @@ export class ViewDocumentPage implements OnInit { this.Document = this.navParams.get('Document') this.task = this.navParams.get('task') this.attachment = this.navParams.get('attachment') + this.link = this.navParams.get('link') if(!this.file.title) { @@ -57,38 +59,35 @@ export class ViewDocumentPage implements OnInit { ngOnInit() { - this.processes.GetViewer(this.docId, this.applicationId).subscribe(async(res)=> { + if(this.link == undefined) { + this.processes.GetViewer(this.docId, this.applicationId).subscribe(async(res)=> { - const link: string = res.replace('//pdfjs/web/', '/pdfjs/web/') - this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link); + const link: string = res.replace('//pdfjs/web/', '/pdfjs/web/') + this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link); - // const iframe = document.getElementById("iframe") - // const handleLoad = () => { - // this.loader = false - // }; - - // iframe.addEventListener('load', handleLoad, true) - - if(res == "") { - const alert = await this.alertController.create({ - cssClass: 'my-custom-class', - //header: 'Apagar evento!', - message: 'Sem imagem', - buttons: [ - { - text: 'Sim', - handler: () => { - this.close(); + if(res == "") { + const alert = await this.alertController.create({ + cssClass: 'my-custom-class', + //header: 'Apagar evento!', + message: 'Sem imagem', + buttons: [ + { + text: 'Sim', + handler: () => { + this.close(); + } } - } - ] - }); - } - - }, ()=>{ - this.close(); - }); + ] + }); + } + }, ()=>{ + this.close(); + }); + } else { + //console.log(this.link); + this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(this.link); + } } diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 74f66fa42..96df9b622 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -383,7 +383,7 @@ export class DespachoPrPage implements OnInit { async reexecutar(note: string, documents: any) { let body = { "serialNumber": this.serialNumber, - "action": "Reexecutar", + "action": "Reexecução", "ActionTypeId": 100000010, "dataFields": { "ReviewUserComment": note, 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 188f75119..b9549b4bf 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 @@ -665,7 +665,8 @@ export class ExpedienteDetailPage implements OnInit { cssClass: 'modal modal-desktop', componentProps: { name: this.task.Folio, - task: this.task + task: this.task, + documents: this.fulltask.Documents }, }); diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 549096c3f..e18c53077 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -452,12 +452,13 @@ export class PedidoPage implements OnInit { cssClass: 'modal modal-desktop', componentProps: { name: this.task.Folio, - task: this.task + task: this.task, + documents: this.fulltask.Documents }, }); modal.onDidDismiss().then( - ()=>{}, + () => {}, (error) => { console.log(error) } diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index 3b438bc2d..d4e553dec 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -11,7 +11,7 @@ src='assets/images/theme/gov/icons-calendar-arrow-left.svg'>
-

{{publicationFolderService.FolderDetails[folderId].Description}}

+

{{publicationFolderService.FolderDetails[folderId].Detail}}

@@ -39,7 +39,7 @@
-

{{publicationFolderService.FolderDetails[folderId].Detail}}

+

{{publicationFolderService.FolderDetails[folderId].Description}}

diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index 7cae9a018..8ae9b1ca4 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -3,7 +3,7 @@
- {{publicationFolderService.FolderDetails[folderId].Description}} + {{publicationFolderService.FolderDetails[folderId].Detail}}