peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-08 13:38:50 +01:00
parent 67a69d2e47
commit d2f1aa1949
5 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/chat.page.html
+5 -5
View File
@@ -75,7 +75,7 @@
</div>
<div *ngIf="room.lastMessage" class="item-description" [class.item-description-active]="room.id == idSelected">
<p class="font-13-em" *ngIf="room.lastMessage && room.otherUserType == false">{{room.lastMessage.msg}}</p>
<p class="font-13-em mb-0" *ngIf="room.lastMessage && room.otherUserType == false">{{room.lastMessage.msg}}</p>
<p class="font-13-em" *ngIf="room.otherUserType == true">está escrever...</p>
<!-- <ion-label *ngIf="room.lastMessage.file">
<fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
@@ -133,14 +133,14 @@
</div>
<div (click)="openGroupMessagesPage(group.id)" class="item-content flex-grow-1 cursor-pointer">
<div class="item-title-time">
<div class="item-title" [class.item-title-active]="group.id ==idSelected">
<p class="font-15-em" [class.bold-message]="group.messageUnread == true">{{group.name.split('-').join(' ')}}</p>
<div class="item-title add-ellipsis" [class.item-title-active]="group.id ==idSelected">
<p class="font-15-em add-ellipsis mb-0 white-space-nowrap" [class.bold-message]="group.messageUnread == true">{{group.name.split('-').join(' ')}}</p>
</div>
<div class="item-date font-13-em" [class.item-date-active]="group.id ==idSelected" *ngIf="group.lastMessage && !group.customFields.countDownDate">{{group.duration}}</div>
<div class="item-date font-13-em" [class.item-date-active]="group.id ==idSelected" *ngIf="group.customFields.countDownDate">{{group.countDownTime}}</div>
</div>
<div *ngIf="group.lastMessage" class="item-description d-flex align-items-center" [class.item-description-active]="group.id ==idSelected">
<div class="item-message font-13-em" *ngIf="group.otherUserType == false">{{group.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
<div class="item-message font-13-em white-space-nowrap" *ngIf="group.otherUserType == false">{{group.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
<div class="font-13-em" *ngIf="group.otherUserType == true">{{group.userThatIsTyping}} está escrever ...</div>
<div class="item-files add-ellipsis" *ngIf="group.lastMessage.file">
@@ -148,7 +148,7 @@
<fa-icon *ngIf="group.lastMessage.file.type == 'application/audio'" icon="file-audio" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
<span *ngIf="group.lastMessage.file.type == 'application/audio'" class="item-files-title font-13-em"> audio </span>
<fa-icon *ngIf="group.lastMessage.file.type == 'application/meeting'" icon="calendar-alt" class="file-icon" [class.set-active-item-font-to-white]="group.id == idSelected"></fa-icon>
<span *ngIf="group.lastMessage.file.type != 'application/audio' && group.lastMessage.attachments" class="item-files-title font-13-em"> {{ group.lastMessage.attachments[0].title }}</span>
<span *ngIf="group.lastMessage.file.type != 'application/audio' && group.lastMessage.attachments" class="item-files-title font-13-em add-ellipsis"> {{ group.lastMessage.attachments[0].title }}</span>
</div>
<div class="item-files" *ngIf="group.attachments">
<div *ngIf="group.value.lastMessage.attachments[0].image_url">
src/app/pages/chat/chat.page.scss
+5 -2
View File
@@ -74,6 +74,8 @@ ion-content{
border-bottom: 1px solid #ebebeb;
padding: 0px 20px 0 20px !important;
overflow: hidden;
display: flex;
.item-icon{
width: em(40);
@@ -87,15 +89,17 @@ ion-content{
.item-content{
//width: 317px;
float:right;
width: 88%;
}
.item-title-time{
width: 100%;
overflow: auto;
margin-top: 10px;
display: flex;
justify-content: space-between;
}
.item-title{
width: calc(100% - 90px);
float: left;
color: var(--title-text-color);
}
@@ -103,7 +107,6 @@ ion-content{
color: #fff;
}
.item-date{
width: 90px;
float: right;
color: #797979;
text-align: right;
src/app/services/chat/room.service.ts
+3 -1
View File
@@ -360,7 +360,9 @@ export class RoomService {
}
if(ChatMessage?.t == "au") {
console.log('ChatMessage', ChatMessage)
if(ChatMessage?.t == "au" || ChatMessage?.t == "ru" || ChatMessage?.t == "ul") {
this.updateContacts()
} else if (ChatMessage?.t == "r") {
this.name = ChatMessage.msg
src/global.scss
+5
View File
@@ -1238,6 +1238,9 @@ ngx-mat-datetime-content{
overflow: hidden !important;
text-overflow: ellipsis !important;
}
.white-space-nowrap {
white-space: nowrap !important;
}
.menuButton{
font-size: rem(14);
@@ -1639,3 +1642,5 @@ h5, .buttons{
font-size: em($i);
}
}
version/git-version.ts
+5 -5
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "834840fc4",
"SHA": "834840fc419a5b2e66120c2b8d53bfef7a227242",
"shortSHA": "67a69d2e4",
"SHA": "67a69d2e4724ac828c2c0e09649b593ca6a2d021",
"branch": "developer",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Aug 3 11:58:33 2023 +0100'",
"lastCommitTime": "'Tue Aug 8 09:43:26 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "5127",
"lastCommitNumber": "5128",
"change": "",
"changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tnew file: index.html\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/models/message.model.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/chat/edit-group/edit-group.page.scss\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.html\n\tmodified: src/app/pages/publications/new-action/new-action.page.scss\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/pages/publications/publications.page.scss\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.ts\n\tmodified: src/app/shared/publication/new-action/new-action.page.html\n\tmodified: src/global.scss",
"changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/chat/chat.page.html\n\tmodified: src/app/pages/chat/chat.page.scss\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/global.scss",
"changeAuthor": "peter.maquiran"
}