mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
update
This commit is contained in:
@@ -209,14 +209,14 @@ ion-content {
|
||||
}
|
||||
|
||||
.incoming-true {
|
||||
margin: 10px 75px 10px 20px;
|
||||
margin: 10px 35px 10px 20px;
|
||||
background: #ebebeb;
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
|
||||
.incoming-false {
|
||||
margin: 10px 20px 10px 75px;
|
||||
margin: 10px 20px 10px 35px;
|
||||
background: var(--chat-incoming-msg-color);
|
||||
float: right;
|
||||
}
|
||||
|
||||
@@ -191,14 +191,14 @@ ion-content {
|
||||
}
|
||||
|
||||
.incoming-true {
|
||||
margin: 10px 75px 10px 20px;
|
||||
margin: 10px 35px 10px 20px;
|
||||
background: #ebebeb;
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
|
||||
.incoming-false {
|
||||
margin: 10px 20px 10px 75px;
|
||||
margin: 10px 20px 10px 35px;
|
||||
background: var(--chat-incoming-msg-color);
|
||||
float: right;
|
||||
}
|
||||
|
||||
@@ -374,6 +374,10 @@ export class EventsPage implements OnInit {
|
||||
|
||||
this.firstEnter = true
|
||||
|
||||
if(window['all-process-gabinete']) {
|
||||
window['all-process-gabinete']()
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -66,6 +66,10 @@ export class AuthService {
|
||||
if(!data?.user?.Authorization && SessionStore?.user?.Authorization) {
|
||||
window.location.reload();
|
||||
}
|
||||
|
||||
if(window['all-process-gabinete']) {
|
||||
window['all-process-gabinete']()
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -360,8 +360,6 @@ export class RoomService {
|
||||
|
||||
}
|
||||
|
||||
console.log('ChatMessage', ChatMessage)
|
||||
|
||||
if(ChatMessage?.t == "au" || ChatMessage?.t == "ru" || ChatMessage?.t == "ul") {
|
||||
this.updateContacts()
|
||||
} else if (ChatMessage?.t == "r") {
|
||||
@@ -745,6 +743,11 @@ export class RoomService {
|
||||
}
|
||||
}
|
||||
|
||||
if(!this.lastMessage) {
|
||||
this.lastMessage = messages.pop();
|
||||
}
|
||||
|
||||
|
||||
setTimeout(() => {
|
||||
this.scrollDown()
|
||||
}, 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() {
|
||||
|
||||
@@ -76,8 +76,10 @@ export class TaskService {
|
||||
this.updateCount()
|
||||
this.runCallback();
|
||||
|
||||
document.addEventListener('resume', function () {
|
||||
// this.loadAllTask();
|
||||
document.addEventListener('resume', () => {
|
||||
if(window['all-process-gabinete']) {
|
||||
window['all-process-gabinete']()
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@ export class ExpedientegdStoreService {
|
||||
}
|
||||
|
||||
private save() {
|
||||
setTimeout(()=>{
|
||||
setTimeout(() => {
|
||||
localstoreService.set(this.keyName,{
|
||||
list: this._list,
|
||||
count: this._count
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
export let versionData = {
|
||||
"shortSHA": "d2f1aa194",
|
||||
"SHA": "d2f1aa194924a7b7bfe26812b7c71bbf8c009108",
|
||||
"shortSHA": "95d8bed53",
|
||||
"SHA": "95d8bed53ddbc022ecb5e0ebb6c5f0b72ee919b6",
|
||||
"branch": "developer",
|
||||
"lastCommitAuthor": "'Peter Maquiran'",
|
||||
"lastCommitTime": "'Tue Aug 8 13:38:50 2023 +0100'",
|
||||
"lastCommitTime": "'Tue Aug 8 13:43:24 2023 +0100'",
|
||||
"lastCommitMessage": "fix",
|
||||
"lastCommitNumber": "5129",
|
||||
"lastCommitNumber": "5140",
|
||||
"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"
|
||||
}
|
||||
Reference in New Issue
Block a user