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

fix

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-14 10:17:05 +01:00
parent 2645d1e081
commit cd4fda997c
5 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+3
View File
@@ -290,6 +290,8 @@ export class AgendaPage implements OnInit {
weeksToShow = [] weeksToShow = []
weekToShow() { weekToShow() {
setTimeout(() => {
let num = 0; let num = 0;
function Week(a) { function Week(a) {
@@ -313,6 +315,7 @@ export class AgendaPage implements OnInit {
this.weeksToShow = ["week-6"] this.weeksToShow = ["week-6"]
} }
}, 250)
} }
src/app/pages/chat/group-messages/group-messages.page.html
+3 -3
View File
@@ -203,9 +203,9 @@
</div> </div>
{{last ? scrollToBottom() : ''}} {{last ? scrollToBottom() : ''}}
</div> </div>
<div *ngIf="msg.t == 'au'" class="info-text-leave"> <div *ngIf="msg.t == 'au' && msg.msg != sessionStore.user.UserName" >
<div *ngFor="let user of allUsers"> <div *ngFor="let user of allUsers" >
<div *ngIf="msg.msg == user.username"> <div *ngIf="msg.msg == user.username" class="info-text-leave">
<ion-label>Adicionou {{user.name}}</ion-label><br /> <ion-label>Adicionou {{user.name}}</ion-label><br />
</div> </div>
</div> </div>
src/app/services/chat/room.service.ts
+3
View File
@@ -715,6 +715,9 @@ export class RoomService {
const messages = await MessageModel.filter({rid:this.id}).execute() const messages = await MessageModel.filter({rid:this.id}).execute()
console.log('MessageModel', messages)
for (let ChatMessage of messages) { for (let ChatMessage of messages) {
const wewMessage = await this.simplePrepareMessage(ChatMessage) const wewMessage = await this.simplePrepareMessage(ChatMessage)
wewMessage.from = 'Offline' wewMessage.from = 'Offline'
src/app/shared/chat/group-messages/group-messages.page.html
+2 -2
View File
@@ -207,9 +207,9 @@
</div> </div>
{{last ? scrollToBottom() : ''}} {{last ? scrollToBottom() : ''}}
</div> </div>
<div *ngIf="msg.t == 'au'" class="info-text-leave"> <div *ngIf="msg.t == 'au' && msg.msg != sessionStore.user.UserName">
<div *ngFor="let user of allUsers"> <div *ngFor="let user of allUsers">
<div *ngIf="msg.msg == user.username"> <div *ngIf="msg.msg == user.username" class="info-text-leave">
<ion-label>Adicionou {{user.name}}</ion-label><br /> <ion-label>Adicionou {{user.name}}</ion-label><br />
</div> </div>
</div> </div>
version/git-version.ts
+5 -5
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "b1e5857c8", "shortSHA": "2645d1e08",
"SHA": "b1e5857c823920ddf52aaaef26d6391ee5ad7347", "SHA": "2645d1e081fd138bdda2b12af913ab0c497683f9",
"branch": "developer-bug", "branch": "developer-bug",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Fri Aug 11 16:46:06 2023 +0100'", "lastCommitTime": "'Fri Aug 11 17:02:51 2023 +0100'",
"lastCommitMessage": "fix", "lastCommitMessage": "fix",
"lastCommitNumber": "5147", "lastCommitNumber": "5148",
"change": "", "change": "",
"changeStatus": "On branch developer-bug\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/shared/chat/messages/messages.page.ts", "changeStatus": "On branch developer-bug\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }