peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 13:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

show message break line

Browse Source
This commit is contained in:
Peter Maquiran
2024-08-29 15:23:11 +01:00
parent ef9dd02ea5
commit feea78fd59
15 changed files with 250 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/app-routing.module.ts
-6
View File
@@ -282,12 +282,6 @@ const routes = [
path: 'crop-image',
loadChildren: () => import('./modals/crop-image/crop-image.module').then( m => m.CropImagePageModule)
},
{
path: 'edit-message',
loadChildren: () => import('./modals/edit-message/edit-message.module').then( m => m.EditMessagePageModule)
}
/*
path: 'chat',
component: ChatPage
src/app/home/home-routing.module.ts
+229 -229
View File
@@ -78,206 +78,206 @@ const routes: Routes = [
],
},
{
path: 'agenda',
children: [
{
path:'',
loadChildren: () => AgendaPageModule
},
{
path:':eventId/:caller',
loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule),
},
{
path: 'eventId/:caller',
loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule),
},
{
path: 'edit-event',
loadChildren: () => import('../pages/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule)
},
{
path: 'emend-message-modal',
loadChildren: () => import('../pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule)
},
{
path: 'view-event',
loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule)
},
{
path:'event-list',
children: [
{
path:'',
loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)
},
{
path:'approve-event',
children : [
{
path:':serialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
},
]
}
]
},
],
// {
// path: 'agenda',
// children: [
// {
// path:'',
// loadChildren: () => AgendaPageModule
// },
// {
// path:':eventId/:caller',
// loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule),
// },
// {
// path: 'eventId/:caller',
// loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule),
// },
// {
// path: 'edit-event',
// loadChildren: () => import('../pages/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule)
// },
// {
// path: 'emend-message-modal',
// loadChildren: () => import('../pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule)
// },
// {
// path: 'view-event',
// loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule)
// },
// {
// path:'event-list',
// children: [
// {
// path:'',
// loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)
// },
// {
// path:'approve-event',
// children : [
// {
// path:':serialNumber/:caller',
// loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
// },
// ]
// }
// ]
// },
// ],
},
{
path: 'gabinete-digital',
children: [
{
path:'',
loadChildren: ()=> GabineteDigitalPageModule
},
{
path:'expediente',
children: [
{
path:'',
loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule)
},
{
path:':SerialNumber',
loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)
},
{
path:':SerialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)
},
{
path:'events/:eventId/:caller',
loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
},
{
path:'expediente-task-modal',
loadChildren: ()=> import('../pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module').then(m => m.ExpedientTaskModalPageModule),
},
]
},
{
path: 'expedientes-pr',
children: [
{
path: '',
loadChildren: ()=> import('../pages/gabinete-digital/expedientes-pr/expedientes-pr.module').then(m => m.ExpedientesPrPageModule),
},
{
path:':SerialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module').then(m => m.ExpedientePrPageModule),
},
]
},
{
path: 'despachos',
children: [
{
path: '',
loadChildren: ()=> import('../pages/gabinete-digital/despachos/despachos.module').then(m => m.DespachosPageModule),
},
{
path:':SerialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/despachos/despacho/despacho.module').then(m => m.DespachoPageModule),
},
]
},
{
path: 'despachos-pr',
children: [
{
path: '',
loadChildren: ()=> import('../pages/gabinete-digital/despachos-pr/despachos-pr.module').then(m => m.DespachosPrPageModule),
},
{
path:':SerialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module').then(m => m.DespachoPrPageModule),
},
]
},
{
path: 'pedidos',
children: [
{
path: '',
loadChildren: ()=> import('../pages/gabinete-digital/pedidos/pedidos.module').then(m => m.PedidosPageModule),
},
{
path:':SerialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/pedidos/pedido/pedido.module').then(m => m.PedidoPageModule),
},
]
},
{
path: 'diplomas',
children: [
{
path: '',
loadChildren: ()=> import('../pages/gabinete-digital/diplomas/diplomas.module').then(m => m.DiplomasPageModule),
},
{
path:':SerialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/diplomas/diploma/diploma.module').then(m => m.DiplomaPageModule),
},
]
},
{
path: 'diplomas-assinar',
children: [
{
path: '',
loadChildren: ()=> import('../pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then(m => m.DiplomasAssinarPageModule),
},
{
path:':SerialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module').then(m => m.DiplomaAssinarPageModule),
},
]
},
{
path: 'diplomas-gerar',
children: [
{
path: '',
loadChildren: ()=> import('../pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module').then(m => m.DiplomasGerarPageModule),
},
{
path:':SerialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar-routing.module').then(m => m.DiplomasGerarPageRoutingModule),
},
]
},
{
path:'event-list',
children: [
{
path:'',
loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)
},
{
path:'approve-event',
children : [
{
path:':serialNumber/:caller',
loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
},
]
}
]
},
{
path: 'events-to-approve',
children: [
{
path: '',
loadChildren: ()=> import('../shared/gabinete-digital/edit-event-to-approve/edit-event.module')
}
]
}
],
},
// },
// {
// path: 'gabinete-digital',
// children: [
// {
// path:'',
// loadChildren: ()=> GabineteDigitalPageModule
// },
// {
// path:'expediente',
// children: [
// {
// path:'',
// loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente.module').then(m => m.ExpedientePageModule)
// },
// {
// path:':SerialNumber',
// loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)
// },
// {
// path:':SerialNumber/:caller',
// loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)
// },
// {
// path:'events/:eventId/:caller',
// loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
// },
// {
// path:'expediente-task-modal',
// loadChildren: ()=> import('../pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module').then(m => m.ExpedientTaskModalPageModule),
// },
// ]
// },
// {
// path: 'expedientes-pr',
// children: [
// {
// path: '',
// loadChildren: ()=> import('../pages/gabinete-digital/expedientes-pr/expedientes-pr.module').then(m => m.ExpedientesPrPageModule),
// },
// {
// path:':SerialNumber/:caller',
// loadChildren: ()=> import('../pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module').then(m => m.ExpedientePrPageModule),
// },
// ]
// },
// {
// path: 'despachos',
// children: [
// {
// path: '',
// loadChildren: ()=> import('../pages/gabinete-digital/despachos/despachos.module').then(m => m.DespachosPageModule),
// },
// {
// path:':SerialNumber/:caller',
// loadChildren: ()=> import('../pages/gabinete-digital/despachos/despacho/despacho.module').then(m => m.DespachoPageModule),
// },
// ]
// },
// {
// path: 'despachos-pr',
// children: [
// {
// path: '',
// loadChildren: ()=> import('../pages/gabinete-digital/despachos-pr/despachos-pr.module').then(m => m.DespachosPrPageModule),
// },
// {
// path:':SerialNumber/:caller',
// loadChildren: ()=> import('../pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module').then(m => m.DespachoPrPageModule),
// },
// ]
// },
// {
// path: 'pedidos',
// children: [
// {
// path: '',
// loadChildren: ()=> import('../pages/gabinete-digital/pedidos/pedidos.module').then(m => m.PedidosPageModule),
// },
// {
// path:':SerialNumber/:caller',
// loadChildren: ()=> import('../pages/gabinete-digital/pedidos/pedido/pedido.module').then(m => m.PedidoPageModule),
// },
// ]
// },
// {
// path: 'diplomas',
// children: [
// {
// path: '',
// loadChildren: ()=> import('../pages/gabinete-digital/diplomas/diplomas.module').then(m => m.DiplomasPageModule),
// },
// {
// path:':SerialNumber/:caller',
// loadChildren: ()=> import('../pages/gabinete-digital/diplomas/diploma/diploma.module').then(m => m.DiplomaPageModule),
// },
// ]
// },
// {
// path: 'diplomas-assinar',
// children: [
// {
// path: '',
// loadChildren: ()=> import('../pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then(m => m.DiplomasAssinarPageModule),
// },
// {
// path:':SerialNumber/:caller',
// loadChildren: ()=> import('../pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module').then(m => m.DiplomaAssinarPageModule),
// },
// ]
// },
// {
// path: 'diplomas-gerar',
// children: [
// {
// path: '',
// loadChildren: ()=> import('../pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module').then(m => m.DiplomasGerarPageModule),
// },
// {
// path:':SerialNumber/:caller',
// loadChildren: ()=> import('../pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar-routing.module').then(m => m.DiplomasGerarPageRoutingModule),
// },
// ]
// },
// {
// path:'event-list',
// children: [
// {
// path:'',
// loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)
// },
// {
// path:'approve-event',
// children : [
// {
// path:':serialNumber/:caller',
// loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
// },
// ]
// }
// ]
// },
// {
// path: 'events-to-approve',
// children: [
// {
// path: '',
// loadChildren: ()=> import('../shared/gabinete-digital/edit-event-to-approve/edit-event.module')
// }
// ]
// }
// ],
// },
{
path: 'search',
children: [
@@ -288,37 +288,37 @@ const routes: Routes = [
],
},
{
path: 'publications',
children: [
{
path:'',
loadChildren: ()=> PublicationsPageModule
},
{
path:':folderId',
loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)
},
{
path:'view-publications',
children: [
{
path:':folderId/:publicationId',
loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)
},
]
},
{
path:'new-publication',
loadChildren: ()=> import('../shared/publication/new-publication/new-publication.module').then(m => m.NewPublicationPageModule)
},
{
path: 'request-options',
loadChildren: () => import('../shared/popover/request-options/request-options.module').then( m => m.RequestOptionsPageModule)
},
],
// {
// path: 'publications',
// children: [
// {
// path:'',
// loadChildren: ()=> PublicationsPageModule
// },
// {
// path:':folderId',
// loadChildren: ()=> import('../pages/publications/view-publications/view-publications.module').then(m => m.ViewPublicationsPageModule)
// },
// {
// path:'view-publications',
// children: [
// {
// path:':folderId/:publicationId',
// loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule)
// },
// ]
// },
// {
// path:'new-publication',
// loadChildren: ()=> import('../shared/publication/new-publication/new-publication.module').then(m => m.NewPublicationPageModule)
// },
// {
// path: 'request-options',
// loadChildren: () => import('../shared/popover/request-options/request-options.module').then( m => m.RequestOptionsPageModule)
// },
// ],
},
// },
{
path: 'chat',
children: [
src/app/ui/chat/chat-routing.module.ts
+4
View File
@@ -64,6 +64,10 @@ const routes: Routes = [
path: 'room-info',
loadChildren: () => import('./modal/room-info/room-info.module').then( m => m.RoomInfoPageModule)
},
{
path: 'edit-message',
loadChildren: () => import('./modal/edit-message/edit-message.module').then( m => m.EditMessagePageModule)
}
];
@NgModule({
src/app/ui/chat/component/messages/messages.page.html
+3 -3
View File
@@ -44,7 +44,7 @@
<div class="messages height-100 width-100 d-flex flex-column rotate-div" #scrollMe >
<div
*ngFor="let message of messages1[roomId]; let messageIndex = index" class="messages-list-item-wrapper"
*ngFor="let message of messages1[roomId]; let messageIndex = index" class="messages-list-item-wrapper px-10-em"
[ngClass]="{
'info-meeting': message.messageType == IMessageType.information,
'my-message': message.messageType != IMessageType.information && message?.sender?.wxUserId === SessionStore.user.UserId,
@@ -54,7 +54,7 @@
<div class="message-container rotate-div" *ngIf="message.isDeleted != true && message.messageType != IMessageType.information">
<div class="d-flex justify-content-between">
<div>
<div >
<div style="white-space: pre-line;">
{{ message.message }}
</div>
@@ -130,7 +130,7 @@
</div>
<div style="text-align: end;">
<div *ngIf="totalMembers != 0">
<div *ngIf="totalMembers != 0 && SessionStore.user.UserId == message.sender.wxUserId">
<ion-icon *ngIf="messageStatus(message) == 'enviar'" src="assets/images/clock-regular.svg"></ion-icon>
<ion-icon *ngIf="messageStatus(message) == 'enviado'" src="assets/images/check-solid.svg"></ion-icon>
<ion-icon *ngIf="messageStatus(message) == 'allReceived'" src="assets/images/check-double-solid.svg"></ion-icon>
src/app/ui/chat/component/messages/messages.page.ts
+3 -4
View File
@@ -25,7 +25,7 @@ import { Observable, Subscription } from 'rxjs';
import { RoomLocalRepository } from 'src/app/module/chat/data/repository/room/room-local-repository.service'
import { MemberListLocalRepository } from 'src/app/module/chat/data/repository/member/member-list-local-repository.service'
import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service';
import { EditMessagePage } from 'src/app/modals/edit-message/edit-message.page';
import { EditMessagePage } from 'src/app/ui/chat/modal/edit-message/edit-message.page';
import { IMessageType, MessageAttachmentFileType, MessageAttachmentSource, MessageEntity } from 'src/app/core/chat/entity/message';
import { JSFileToDataUrl } from 'src/app/utils/ToBase64';
import { CameraService } from 'src/app/infra/camera/camera.service'
@@ -50,8 +50,6 @@ import { RoomTable } from 'src/app/infra/database/dexie/instance/chat/schema/roo
import { TypingTable } from 'src/app/infra/database/dexie/instance/chat/schema/typing';
import { HttpClient } from '@angular/common/http';
import { v4 as uuidv4 } from 'uuid'
import { MatMenuTrigger } from '@angular/material/menu';
@Component({
selector: 'app-messages',
templateUrl: './messages.page.html',
@@ -896,7 +894,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
componentProps: {
roomId: this.roomId,
members: [],
isAdmin: this.isAdmin
isAdmin: this.isAdmin,
roomType: this.roomType
}
});
await modal.present();
src/app/ui/chat/modal/chat-popover/chat-popover.page.html
+5 -5
View File
@@ -20,13 +20,13 @@
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<br *ngIf="showLoader">
<button (click)="details()" class="btn-cancel" shape="round">Detalhes</button>
<button *ngIf="isAdmin" (click)="addUser()" class="btn-cancel" shape="round">Adicionar</button>
<button (click)="leaveGroup()" class="btn-cancel" shape="round">Sair do Grupo</button>
<button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round" style="min-width: 192px;">Alterar
<button *ngIf="isAdmin && roomType == EnumRoomType.Group" (click)="addUser()" class="btn-cancel" shape="round">Adicionar</button>
<button *ngIf="roomType == EnumRoomType.Group" (click)="leaveGroup()" class="btn-cancel" shape="round">Sair do Grupo</button>
<button *ngIf="isAdmin && roomType == EnumRoomType.Group" (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round" style="min-width: 192px;">Alterar
nome do grupo</button>
<button *ngIf="isAdmin" (click)="setRoomOwner()" class="btn-cancel" shape="round">Adicionar admin</button>
<button *ngIf="isAdmin && roomType == EnumRoomType.Group" (click)="setRoomOwner()" class="btn-cancel" shape="round">Adicionar admin</button>
<div class="solid"></div>
<button (click)="close('cancel')" full class="btn-cancel mobile-only" shape="round">Cancelar</button>
<button *ngIf="isAdmin" (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
<button *ngIf="isAdmin && roomType == EnumRoomType.Group" (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
</div>
</ion-content>
src/app/ui/chat/modal/chat-popover/chat-popover.page.ts
+4
View File
@@ -9,6 +9,7 @@ import { isHttpResponse } from 'src/app/services/http.service';
import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service'
import { RoomInfoPage } from '../room-info/room-info.page';
import { RoomType } from 'src/app/core/chat/entity/group';
@Component({
selector: 'app-chat-popover',
@@ -21,6 +22,8 @@ export class ChatPopoverPage implements OnInit {
isAdmin = false;
isGroupCreated: boolean;
showLoader = false
EnumRoomType = RoomType
roomType!: RoomType
constructor(
private popoverController: PopoverController,
@@ -32,6 +35,7 @@ export class ChatPopoverPage implements OnInit {
) {
this.roomId = this.navParams.get('roomId');
this.isAdmin = this.navParams.get('isAdmin');
this.roomType = this.navParams.get('roomType');
}
src/app/modals/edit-message/edit-message-routing.module.ts → src/app/ui/chat/modal/edit-message/edit-message-routing.module.ts
View File
src/app/modals/edit-message/edit-message.module.ts → src/app/ui/chat/modal/edit-message/edit-message.module.ts
View File
src/app/modals/edit-message/edit-message.page.html → src/app/ui/chat/modal/edit-message/edit-message.page.html
+1 -1
View File
@@ -22,7 +22,7 @@
<div class="main-content">
<div class="old-message-container d-flex justify-center">
<div class="old-message">{{ oldMessage }}</div>
<div class="old-message" style="white-space: pre-line;">{{ oldMessage }}</div>
</div>
src/app/modals/edit-message/edit-message.page.scss → src/app/ui/chat/modal/edit-message/edit-message.page.scss
View File
src/app/modals/edit-message/edit-message.page.spec.ts → src/app/ui/chat/modal/edit-message/edit-message.page.spec.ts
View File
src/app/modals/edit-message/edit-message.page.ts → src/app/ui/chat/modal/edit-message/edit-message.page.ts
View File
src/app/ui/chat/modal/messages/messages.page.ts
+1 -1
View File
@@ -23,7 +23,7 @@ import { Observable as DexieObservable } from 'Dexie';
import { Subscription } from 'rxjs';
import { MessageTable } from 'src/app/infra/database/dexie/instance/chat/schema/message';
import { ChatServiceService } from 'src/app/module/chat/domain/chat-service.service';
import { EditMessagePage } from 'src/app/modals/edit-message/edit-message.page';
import { EditMessagePage } from 'src/app/ui/chat/modal/edit-message/edit-message.page';
import { MessageAttachmentFileType, MessageAttachmentSource, MessageEntity } from 'src/app/core/chat/entity/message';
import { MemberTable } from 'src/app/infra/database/dexie/instance/chat/schema/members';
import { TypingTable } from 'src/app/infra/database/dexie/instance/chat/schema/typing';