mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 12:37:53 +00:00
fix message
This commit is contained in:
@@ -115,6 +115,11 @@ export class AuthService {
|
|||||||
this.errorHandler.handleError(error);
|
this.errorHandler.handleError(error);
|
||||||
this.httpErroHandle.loginHttpStatusHandle(error)
|
this.httpErroHandle.loginHttpStatusHandle(error)
|
||||||
captureException(error);
|
captureException(error);
|
||||||
|
|
||||||
|
if(error?.status == 403) {
|
||||||
|
console.log('error?.status == 403')
|
||||||
|
}
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
return response
|
return response
|
||||||
}
|
}
|
||||||
@@ -290,6 +295,11 @@ export class AuthService {
|
|||||||
this.errorHandler.handleError(error);
|
this.errorHandler.handleError(error);
|
||||||
this.httpErroHandle.loginHttpStatusHandle(error)
|
this.httpErroHandle.loginHttpStatusHandle(error)
|
||||||
captureException(error);
|
captureException(error);
|
||||||
|
|
||||||
|
if(error?.status == 403) {
|
||||||
|
console.log('error?.status == 403')
|
||||||
|
}
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
return response
|
return response
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -134,7 +134,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<div style="text-align: end;">
|
<div style="text-align: end;">
|
||||||
|
|
||||||
<div *ngIf="totalMembers != 0 && SessionStore.user.UserId == message.sender.wxUserId">
|
|
||||||
|
<div class="d-flex align-center justify-content-end" style="text-align: end;" *ngIf="totalMembers != 0 && SessionStore.user.UserId == message.sender.wxUserId">
|
||||||
|
<span class="font-14-em pr-1">{{ message.hour }}</span>
|
||||||
<ion-icon *ngIf="messageStatus(message) == 'enviar'" src="assets/images/clock-regular.svg"></ion-icon>
|
<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) == 'enviado'" src="assets/images/check-solid.svg"></ion-icon>
|
||||||
<ion-icon *ngIf="messageStatus(message) == 'allReceived'" src="assets/images/check-double-solid.svg"></ion-icon>
|
<ion-icon *ngIf="messageStatus(message) == 'allReceived'" src="assets/images/check-double-solid.svg"></ion-icon>
|
||||||
|
|||||||
@@ -151,7 +151,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div style="text-align: end;">
|
<div style="text-align: end;">
|
||||||
|
|
||||||
<div *ngIf="RoomStore.totalMembers != 0 && SessionStore.user.UserId == message.sender.wxUserId">
|
<div class="d-flex align-center justify-content-end" style="text-align: end;" *ngIf="RoomStore.totalMembers != 0 && SessionStore.user.UserId == message.sender.wxUserId">
|
||||||
|
<span class="font-14-em pr-1">{{ message.hour }}</span>
|
||||||
<ion-icon *ngIf="messageStatus(message) == 'enviar'" src="assets/images/clock-regular.svg"></ion-icon>
|
<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) == 'enviado'" src="assets/images/check-solid.svg"></ion-icon>
|
||||||
<ion-icon *ngIf="messageStatus(message) == 'allReceived'" src="assets/images/check-double-solid.svg"></ion-icon>
|
<ion-icon *ngIf="messageStatus(message) == 'allReceived'" src="assets/images/check-double-solid.svg"></ion-icon>
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ export class MessageViewModal {
|
|||||||
showReaction = false
|
showReaction = false
|
||||||
showMessage = false
|
showMessage = false
|
||||||
ballon = false
|
ballon = false
|
||||||
|
hour = ''
|
||||||
|
|
||||||
constructor(model?: IMessage) {
|
constructor(model?: IMessage) {
|
||||||
if(model) {
|
if(model) {
|
||||||
@@ -70,6 +71,16 @@ export class MessageViewModal {
|
|||||||
if(this.isDeleted == false && this.messageType == IMessageType.normal) {
|
if(this.isDeleted == false && this.messageType == IMessageType.normal) {
|
||||||
this.showMessage = true
|
this.showMessage = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Format the time to "HH:MM"
|
||||||
|
if(this.sentAt) {
|
||||||
|
const date = new Date(this.sentAt);
|
||||||
|
|
||||||
|
// Format the time to "HH:MM"
|
||||||
|
this.hour = date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', hour12: false });
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
setMessageUIType() {
|
setMessageUIType() {
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "ed3b19962",
|
"shortSHA": "48b6d671f",
|
||||||
"SHA": "ed3b19962236fd8851b2067cd5ff59a06f3bee68",
|
"SHA": "48b6d671fe05332a5521ea1dce8f782b3f2b9d85",
|
||||||
"branch": "feature/chat-new-api-peter",
|
"branch": "feature/chat-new-api-peter",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Thu Oct 10 12:19:09 2024 +0100'",
|
"lastCommitTime": "'Fri Oct 11 12:10:43 2024 +0100'",
|
||||||
"lastCommitMessage": "register component",
|
"lastCommitMessage": "visual alingment",
|
||||||
"lastCommitNumber": "6093",
|
"lastCommitNumber": "6094",
|
||||||
"changeStatus": "On branch feature/chat-new-api-peter\nYour branch is ahead of 'origin/feature/chat-new-api-peter' by 8 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/ui/chat/component/group-contacts/group-contacts.page.ts\n\tmodified: src/app/ui/chat/component/messages/messages.page.html\n\tmodified: src/app/ui/chat/modal/chat-popover/chat-popover.page.html\n\tmodified: src/app/ui/chat/modal/chat-popover/chat-popover.page.ts\n\tmodified: src/app/ui/chat/modal/group-contacts/group-contacts.page.ts\n\tmodified: src/app/ui/chat/modal/messages/messages.page.html\n\tmodified: version/git-version.ts",
|
"changeStatus": "On branch feature/chat-new-api-peter\nYour branch is ahead of 'origin/feature/chat-new-api-peter' by 9 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/ui/chat/component/messages/messages.page.html\n\tmodified: src/app/ui/chat/modal/messages/messages.page.html\n\tmodified: src/app/ui/chat/store/model/message.ts",
|
||||||
"changeAuthor": "peter.maquiran"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user