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 a34c72216..b6cef208a 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 @@ -24,6 +24,8 @@ import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page'; import { DocumentViewerOptionService } from "src/app/services/document-viewer-option.service"; import { DeviceService } from "src/app/services/device.service" import { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page'; +import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; +import { AgendaService } from 'src/app/module/agenda/domain/agenda.service'; @Component({ selector: 'app-despacho-pr', @@ -69,6 +71,7 @@ export class DespachoPrPage implements OnInit { public TaskService: TaskService, public DeviceService: DeviceService, private DocumentViewerOptionService: DocumentViewerOptionService, + private agendaService: AgendaService ) { this.activatedRoute.paramMap.subscribe(params => { if (params["params"].SerialNumber) { @@ -151,6 +154,8 @@ export class DespachoPrPage implements OnInit { } catch (error) { console.log(error) } + + this.getNewDraft({FolderID: res.workflowInstanceDataFields.FolderID}) this.getDocumentPdf(this.fulltask.Documents) // this.updateProcessOnDB(res); @@ -681,4 +686,37 @@ export class DespachoPrPage implements OnInit { } + + @XTracerAsync({name:'task/getNewDraft', bugPrint: true}) + async getNewDraft({FolderID}, tracing?: TracingType) { + this.agendaService.getDraftListByProcessId({ + processId: FolderID + }).then(( draftList => { + + if(draftList.isOk()) { + const docObject = draftList.value.data.map((e) => ({ + "id": e.id, + "ownerId": e.ownerId, + "path": e.path, + "description":e.description, + "ApplicationId": "", + "Assunto": e.description, + "DocDate": e.createdAt, + "DocId": "", + "DocNumber": "element.DocNumber", + "FolderId": e.folderId, + "content": e.content, + "Sender": "", + "SourceDocId": "element.SourceDocId", + "status": e.status, + })) + + for(const file of docObject) { + this.mergedArray.push(file); + } + + + } + })); + } } diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 6283c62d5..9146540ee 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -161,12 +161,16 @@ export class DespachoPage implements OnInit { - // console.log({res}) + try { + this.getDraft(split_stringDraft); + } catch (error) { + console.log(error) + } - // this.updateProcessOnDB(res); this.fulltask = res; - this.getDocumentPdf({FolderID: res.workflowInstanceDataFields.FolderID}) + this.getNewDraft({FolderID: res.workflowInstanceDataFields.FolderID}) + this.getDocumentPdf(this.fulltask.Documents) console.log('All', this.mergedArray) @@ -200,7 +204,29 @@ export class DespachoPage implements OnInit { }); } - getDocumentPdf({FolderID}) { + getDocumentPdf(Documents: any) { + Documents.forEach(element => { + let docObject = { + "ApplicationId": element.ApplicationId, + "Assunto": element.Assunto, + "DocDate": element.DocDate, + "DocId": element.DocId, + "DocNumber": element.DocNumber, + "FolderId": element.FolderId, + "Sender": element.Sender, + "SourceDocId": element.SourceDocId, + "content": "", + "path": "", + "ownerId": "", + "status": "", + } + this.mergedArray.push(docObject); + }); + } + + + @XTracerAsync({name:'task/getNewDraft', bugPrint: true}) + async getNewDraft({FolderID}, tracing?: TracingType) { this.agendaService.getDraftListByProcessId({ processId: FolderID }).then(( draftList => { diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index 309970d45..224838b50 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -19,6 +19,8 @@ import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page'; import { PopupQuestionPage } from 'src/app/modals/popup-question/popup-question.page'; import { PermissionService } from 'src/app/services/permission.service'; import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page'; +import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; +import { AgendaService } from 'src/app/module/agenda/domain/agenda.service'; @Component({ selector: 'app-diploma-assinar', @@ -58,6 +60,7 @@ export class DiplomaAssinarPage implements OnInit { public TaskService: TaskService, private toastController: ToastController, public p: PermissionService, + private agendaService: AgendaService ) { this.activatedRoute.paramMap.subscribe(params => { if (params["params"].SerialNumber) { @@ -154,6 +157,8 @@ export class DiplomaAssinarPage implements OnInit { } catch (error) { console.log(error) } + + this.getNewDraft({FolderID: res.workflowInstanceDataFields.FolderID}) this.getDocumentPdf(this.fulltask.Documents) let thedate = new Date(this.task.CreateDate); @@ -529,4 +534,47 @@ export class DiplomaAssinarPage implements OnInit { } + + + @XTracerAsync({name:'task/getNewDraft', bugPrint: true}) + async getNewDraft({FolderID}, tracing?: TracingType) { + this.agendaService.getDraftListByProcessId({ + processId: FolderID + }).then(( draftList => { + + if(draftList.isOk()) { + const docObject = draftList.value.data.map((e) => ({ + "id": e.id, + "ownerId": e.ownerId, + "path": e.path, + "description":e.description, + "ApplicationId": "", + "Assunto": e.description, + "DocDate": e.createdAt, + "DocId": "", + "DocNumber": "element.DocNumber", + "FolderId": e.folderId, + "content": e.content, + "Sender": "", + "SourceDocId": "element.SourceDocId", + "status": e.status, + })) + + for(const file of docObject) { + this.mergedArray.push(file); + } + + this.task.DraftIds = draftList.value.data.map(e => e.id).join(',') + this.DraftIds = this.task.DraftIds + + if (draftList.value.data.length == 0) { + console.log('No draft found.'); + this.asDraft = false + } else { + this.asDraft = true + } + + } + })); + } } diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index ad80c3e27..4e108805d 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -23,6 +23,7 @@ import { TinyMCEPage } from 'src/app/tiny-mce/tiny-mce.page'; import { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page'; import { DiplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; +import { AgendaService } from 'src/app/module/agenda/domain/agenda.service'; @Component({ @@ -62,7 +63,8 @@ export class DiplomaPage implements OnInit { public ThemeService: ThemeService, private httpErrorHandle: HttpErrorHandle, private despachoService: DespachoService, - public TaskService: TaskService + public TaskService: TaskService, + private agendaService: AgendaService ) { this.activatedRoute.paramMap.subscribe(params => { // @@ -164,6 +166,8 @@ export class DiplomaPage implements OnInit { } catch (error) { console.log(error) } + + this.getNewDraft({FolderID: res.workflowInstanceDataFields.FolderID}) this.getDocumentPdf(this.fulltask.Documents) let thedate = new Date(this.task.CreateDate); @@ -577,4 +581,37 @@ export class DiplomaPage implements OnInit { } + + @XTracerAsync({name:'task/getNewDraft', bugPrint: true}) + async getNewDraft({FolderID}, tracing?: TracingType) { + this.agendaService.getDraftListByProcessId({ + processId: FolderID + }).then(( draftList => { + + if(draftList.isOk()) { + const docObject = draftList.value.data.map((e) => ({ + "id": e.id, + "ownerId": e.ownerId, + "path": e.path, + "description":e.description, + "ApplicationId": "", + "Assunto": e.description, + "DocDate": e.createdAt, + "DocId": "", + "DocNumber": "element.DocNumber", + "FolderId": e.folderId, + "content": e.content, + "Sender": "", + "SourceDocId": "element.SourceDocId", + "status": e.status, + })) + + for(const file of docObject) { + this.mergedArray.push(file); + } + + + } + })); + } } diff --git a/src/app/ui/chat/chat.page.html b/src/app/ui/chat/chat.page.html index 050b2b0e3..0c9828044 100644 --- a/src/app/ui/chat/chat.page.html +++ b/src/app/ui/chat/chat.page.html @@ -85,8 +85,8 @@
- - audio + + audio {{ room.messages[0].attachments[0].description }} diff --git a/src/app/ui/chat/store/model/room.ts b/src/app/ui/chat/store/model/room.ts index 12ccd5ca7..57b6edbc4 100644 --- a/src/app/ui/chat/store/model/room.ts +++ b/src/app/ui/chat/store/model/room.ts @@ -17,6 +17,7 @@ export class RoomViewModel implements IRoom { receiverId?: typeof RoomEntitySchema._input.receiverId displayDate = '' lastMessageImage = false + lastMessageAudio = false lastMessageDocument = false constructor(model: IRoom) { @@ -33,7 +34,10 @@ export class RoomViewModel implements IRoom { this.lastMessageDocument = true } else if (this.messages?.[0]?.attachments[0]?.source == MessageAttachmentSource.Webtrix) { this.lastMessageDocument = true + } else if (this.messages?.[0]?.attachments[0]?.mimeType?.startsWith('audio/')) { + this.lastMessageAudio = true; } + } formatarData() { diff --git a/src/assets/icon/icons-audio.png b/src/assets/icon/icons-audio.png new file mode 100644 index 000000000..88e5d1431 Binary files /dev/null and b/src/assets/icon/icons-audio.png differ diff --git a/version/git-version.ts b/version/git-version.ts index c73dfce8a..8ea40cb73 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "0dd4fd665", - "SHA": "0dd4fd665b7c7bfaa0dc7aa6a5e6c4a167fb660f", + "shortSHA": "9c8ecc182", + "SHA": "9c8ecc182fd7f405aec5dbe5d0cbe5e29656ae09", "branch": "feature/chat-new-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Oct 7 13:27:49 2024 +0100'", - "lastCommitMessage": "remove expired room", - "lastCommitNumber": "6087", - "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is ahead of 'origin/feature/chat-new-api-peter' by 2 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/core/chat/repository/message/message-socket-repository.ts\n\tmodified: src/app/infra/repository/adapter.ts\n\tmodified: src/app/infra/repository/dexie/dexie-repository.service.ts\n\tmodified: src/app/infra/socket/signalR/signal-r.service.ts\n\tmodified: src/app/infra/socket/signalR/signalR.ts\n\tmodified: src/app/infra/socket/type.ts\n\tmodified: src/app/module/chat/data/repository/message/message-live-signalr-data-source.service.ts\n\tmodified: src/app/module/chat/data/repository/room/room-local-repository.service.ts\n\tmodified: src/app/module/chat/domain/chat-service.service.ts\n\tmodified: src/app/module/chat/domain/service/room-last-message.service.ts\n\tmodified: src/app/module/chat/domain/use-case/message/listen-message-by-roomId.service.ts\n\tmodified: src/app/module/chat/domain/use-case/message/listen-send-message.service.ts\n\tmodified: src/app/module/chat/domain/use-case/room/room-bold-sync-use-case.service.ts\n\tmodified: src/app/module/chat/domain/use-case/room/room-set-last-message.service.ts\n\tmodified: src/app/ui/chat/chat-routing.module.ts\n\tmodified: src/app/ui/chat/component/group-contacts/group-contacts.page.html\n\tmodified: src/app/ui/chat/component/messages/messages.page.html\n\tmodified: src/app/ui/chat/component/messages/messages.page.ts\n\tmodified: src/app/ui/chat/modal/room-info/room-info.page.html\n\tmodified: src/app/ui/chat/modal/room-info/room-info.page.ts\n\tmodified: src/app/ui/chat/store/roomStore.ts\n\tmodified: version/git-version.ts", + "lastCommitTime": "'Tue Oct 8 13:16:01 2024 +0100'", + "lastCommitMessage": "fix chat", + "lastCommitNumber": "6088", + "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is ahead of 'origin/feature/chat-new-api-peter' by 3 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/ui/chat/chat.page.html\n\tmodified: src/app/ui/chat/store/model/room.ts\n\tnew file: src/assets/icon/icons-audio.png", "changeAuthor": "peter.maquiran" } \ No newline at end of file