diff --git a/src/app/core/chat/usecase/member/member-admin-use-case.service.ts b/src/app/core/chat/usecase/member/member-admin-use-case.service.ts index aa9898e0c..d037b5d09 100644 --- a/src/app/core/chat/usecase/member/member-admin-use-case.service.ts +++ b/src/app/core/chat/usecase/member/member-admin-use-case.service.ts @@ -5,7 +5,6 @@ import { IMemberRemoteRepository } from 'src/app/core/chat/repository/member/mem // Define the schema for the entire response const MemberSetAdminDTOSchema = z.object({ - senderId: z.number(), roomId: z.string(), memberId: z.string() }); diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 53e554fea..deb862481 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -32,7 +32,7 @@
- +
@@ -190,6 +190,19 @@ + +
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 ec2afc21b..de443ea07 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 @@ -28,6 +28,9 @@ import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { RouteService } from 'src/app/services/route.service'; import { TaskService } from 'src/app/services/task.service' import { z } from 'zod'; +import { FilePickerWebService } from 'src/app/infra/file-picker/web/file-picker-web.service' +import { allowedDocExtension } from 'src/app/utils/allowedDocExtension'; +import { JSFileToDataUrl } from 'src/app/utils/ToBase64'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -124,7 +127,8 @@ export class ExpedientTaskModalPage implements OnInit { public p: PermissionService, private httpErroHandle: HttpErrorHandle, private RouteService: RouteService, - public TaskService: TaskService + public TaskService: TaskService, + private FilePickerWebService: FilePickerWebService, ) { this.loggeduser = SessionStore.user; @@ -221,6 +225,12 @@ export class ExpedientTaskModalPage implements OnInit { this.getSubjectType(); } + getDescricaoPlaceholder() { + let title = this.modalTitle[this.taskType]; + title = title.replace(/Efectuar|Solicitar/g, ''); + return SessionStore.user.Profile == 'PR'? `Escreva aqui o conteúdo do ${title}` : 'Descrição*'; + } + onSelectedTypesChanged(ev:any) { if(ev.length > 1){ @@ -664,7 +674,23 @@ export class ExpedientTaskModalPage implements OnInit { } - async getDoc(){ + async getDoc1() { + const file = await this.FilePickerWebService.getAnyFileFromDevice(); + if(file.isOk()) { + + //const fileExtension = await allowedDocExtension(file.value.type) + + console.log('FILE rigth?', file) + + let fileBase64 = await JSFileToDataUrl(file.value); + + if(fileBase64.isOk()) { + + } + } + } + + async getDoc() { const modal = await this.modalController.create({ component: SearchPage, cssClass: 'modal-width-100-width-background modal', diff --git a/src/app/ui/chat/chat.page.html b/src/app/ui/chat/chat.page.html index 4b8d5fa58..61b7b4496 100644 --- a/src/app/ui/chat/chat.page.html +++ b/src/app/ui/chat/chat.page.html @@ -90,7 +90,8 @@ -
{{room.messages[0].message}}
+
{{room.messages[0].message}}
+
Visualização única
@@ -106,8 +107,8 @@
Mensagem foi eliminada
-
-
Mensagem visualizada
+
+
Mensagem de visualização única
diff --git a/src/app/ui/chat/component/messages/messages.page.html b/src/app/ui/chat/component/messages/messages.page.html index 77dce0f38..812648b95 100644 --- a/src/app/ui/chat/component/messages/messages.page.html +++ b/src/app/ui/chat/component/messages/messages.page.html @@ -58,7 +58,7 @@
-
+
{{ message.sender.wxFullName }} @@ -66,7 +66,7 @@
-
+
{{ message.message }}
@@ -89,10 +89,6 @@ (error)="onImageError()" > -
- Mandou uma mensagen com visualização única -
-
@@ -152,6 +148,11 @@
+ +
+ Mandou uma mensagen com visualização única +
+
Mensagem foi eliminada
@@ -237,7 +238,7 @@
- +