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
+23 -20
View File
@@ -290,29 +290,32 @@ export class AgendaPage implements OnInit {
weeksToShow = []
weekToShow() {
let num = 0;
function Week(a) {
for(let b of a.querySelectorAll('td')) {
if(!b.className.includes('text-muted')) {
num++;
return true
setTimeout(() => {
let num = 0;
function Week(a) {
for(let b of a.querySelectorAll('td')) {
if(!b.className.includes('text-muted')) {
num++;
return true
}
}
}
}
for (let a of document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr') as any ){
Week(a)
}
if(num <= 5) {
this.weeksToShow = ["week-5"]
} else {
this.weeksToShow = ["week-6"]
}
for (let a of document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr') as any ){
Week(a)
}
if(num <= 5) {
this.weeksToShow = ["week-5"]
} else {
this.weeksToShow = ["week-6"]
}
}, 250)
}
@@ -203,9 +203,9 @@
</div>
{{last ? scrollToBottom() : ''}}
</div>
<div *ngIf="msg.t == 'au'" class="info-text-leave">
<div *ngFor="let user of allUsers">
<div *ngIf="msg.msg == user.username">
<div *ngIf="msg.t == 'au' && msg.msg != sessionStore.user.UserName" >
<div *ngFor="let user of allUsers" >
<div *ngIf="msg.msg == user.username" class="info-text-leave">
<ion-label>Adicionou {{user.name}}</ion-label><br />
</div>
</div>
+3
View File
@@ -715,6 +715,9 @@ export class RoomService {
const messages = await MessageModel.filter({rid:this.id}).execute()
console.log('MessageModel', messages)
for (let ChatMessage of messages) {
const wewMessage = await this.simplePrepareMessage(ChatMessage)
wewMessage.from = 'Offline'
@@ -207,9 +207,9 @@
</div>
{{last ? scrollToBottom() : ''}}
</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 *ngIf="msg.msg == user.username">
<div *ngIf="msg.msg == user.username" class="info-text-leave">
<ion-label>Adicionou {{user.name}}</ion-label><br />
</div>
</div>
+5 -5
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "b1e5857c8",
"SHA": "b1e5857c823920ddf52aaaef26d6391ee5ad7347",
"shortSHA": "2645d1e08",
"SHA": "2645d1e081fd138bdda2b12af913ab0c497683f9",
"branch": "developer-bug",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Fri Aug 11 16:46:06 2023 +0100'",
"lastCommitTime": "'Fri Aug 11 17:02:51 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "5147",
"lastCommitNumber": "5148",
"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"
}