This commit is contained in:
Peter Maquiran
2023-08-08 16:32:57 +01:00
parent 95d8bed53d
commit a2dd41393b
8 changed files with 35 additions and 14 deletions
@@ -209,14 +209,14 @@ ion-content {
} }
.incoming-true { .incoming-true {
margin: 10px 75px 10px 20px; margin: 10px 35px 10px 20px;
background: #ebebeb; background: #ebebeb;
float: left; float: left;
} }
} }
.incoming-false { .incoming-false {
margin: 10px 20px 10px 75px; margin: 10px 20px 10px 35px;
background: var(--chat-incoming-msg-color); background: var(--chat-incoming-msg-color);
float: right; float: right;
} }
@@ -191,14 +191,14 @@ ion-content {
} }
.incoming-true { .incoming-true {
margin: 10px 75px 10px 20px; margin: 10px 35px 10px 20px;
background: #ebebeb; background: #ebebeb;
float: left; float: left;
} }
} }
.incoming-false { .incoming-false {
margin: 10px 20px 10px 75px; margin: 10px 20px 10px 35px;
background: var(--chat-incoming-msg-color); background: var(--chat-incoming-msg-color);
float: right; float: right;
} }
+4
View File
@@ -374,6 +374,10 @@ export class EventsPage implements OnInit {
this.firstEnter = true this.firstEnter = true
if(window['all-process-gabinete']) {
window['all-process-gabinete']()
}
} }
+4
View File
@@ -66,6 +66,10 @@ export class AuthService {
if(!data?.user?.Authorization && SessionStore?.user?.Authorization) { if(!data?.user?.Authorization && SessionStore?.user?.Authorization) {
window.location.reload(); window.location.reload();
} }
if(window['all-process-gabinete']) {
window['all-process-gabinete']()
}
} }
}); });
+13 -2
View File
@@ -360,8 +360,6 @@ export class RoomService {
} }
console.log('ChatMessage', ChatMessage)
if(ChatMessage?.t == "au" || ChatMessage?.t == "ru" || ChatMessage?.t == "ul") { if(ChatMessage?.t == "au" || ChatMessage?.t == "ru" || ChatMessage?.t == "ul") {
this.updateContacts() this.updateContacts()
} else if (ChatMessage?.t == "r") { } else if (ChatMessage?.t == "r") {
@@ -745,6 +743,11 @@ export class RoomService {
} }
} }
if(!this.lastMessage) {
this.lastMessage = messages.pop();
}
setTimeout(() => { setTimeout(() => {
this.scrollDown() this.scrollDown()
}, 50) }, 50)
@@ -800,6 +803,14 @@ export class RoomService {
} }
if(chatHistory?.result?.messages) {
if(!this.lastMessage) {
this.lastMessage = chatHistory?.result?.messages.pop() as any
}
}
} }
async readAllMessage() { async readAllMessage() {
+4 -2
View File
@@ -76,8 +76,10 @@ export class TaskService {
this.updateCount() this.updateCount()
this.runCallback(); this.runCallback();
document.addEventListener('resume', function () { document.addEventListener('resume', () => {
// this.loadAllTask(); if(window['all-process-gabinete']) {
window['all-process-gabinete']()
}
}); });
} }
+1 -1
View File
@@ -76,7 +76,7 @@ export class ExpedientegdStoreService {
} }
private save() { private save() {
setTimeout(()=>{ setTimeout(() => {
localstoreService.set(this.keyName,{ localstoreService.set(this.keyName,{
list: this._list, list: this._list,
count: this._count count: this._count
+5 -5
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "d2f1aa194", "shortSHA": "95d8bed53",
"SHA": "d2f1aa194924a7b7bfe26812b7c71bbf8c009108", "SHA": "95d8bed53ddbc022ecb5e0ebb6c5f0b72ee919b6",
"branch": "developer", "branch": "developer",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Tue Aug 8 13:38:50 2023 +0100'", "lastCommitTime": "'Tue Aug 8 13:43:24 2023 +0100'",
"lastCommitMessage": "fix", "lastCommitMessage": "fix",
"lastCommitNumber": "5129", "lastCommitNumber": "5140",
"change": "", "change": "",
"changeStatus": "On branch developer\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.scss\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/tiny-mce/tiny-mce.page.html\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts\n\tmodified: version/git-version.ts", "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.scss\n\tmodified: src/app/pages/chat/messages/messages.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/store/expedientegd-store.service.ts",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }