fix timestamp and memo display in raid, fix bad signup count

This commit is contained in:
peter
2020-08-25 04:19:40 +02:00
parent e12bb72632
commit 9ca1c1f354
4 changed files with 46 additions and 6 deletions
+2 -1
View File
@@ -152,7 +152,8 @@ export class RaidManager
.where({ .where({
raidid: this.admin.knex.ref('raids.id'), raidid: this.admin.knex.ref('raids.id'),
benched: false, benched: false,
late: false late: false,
absent: false
}) })
.as('signupcount') .as('signupcount')
+1 -1
View File
@@ -132,7 +132,7 @@ export class UserManager
] ]
initialize = async () => { initialize = async () => {
this.exporters = [this.guild, this.item, this.raid, this.character] this.exporters = [this, this.guild, this.item, this.raid, this.character]
//set up permissions //set up permissions
getLogger('UserManager#initialize').debug('setting up permissions') getLogger('UserManager#initialize').debug('setting up permissions')
@@ -28,10 +28,6 @@ export class PagesLayoutComponent{
icon: 'book-open-outline', icon: 'book-open-outline',
title: 'Loot Rules', title: 'Loot Rules',
link: '/frontcraft/rules', link: '/frontcraft/rules',
},{
icon: "shield",
title: 'Armory',
link: '/frontcraft/armory'
}] }]
constructor(){} constructor(){}
@@ -88,6 +88,7 @@
[src]="'/assets/images/'+participant.class.toLowerCase()+'.png'" /> [src]="'/assets/images/'+participant.class.toLowerCase()+'.png'" />
{{ participant.charactername }} {{ participant.charactername }}
</a> </a>
<ng-template #timeInfo> <ng-template #timeInfo>
<div style="padding: 10px"> <div style="padding: 10px">
{{participant.timestamp | date : 'HH:mm EEE MMM d'}} {{participant.timestamp | date : 'HH:mm EEE MMM d'}}
@@ -137,6 +138,27 @@
[src]="'/assets/images/'+participant.class.toLowerCase()+'.png'" /> [src]="'/assets/images/'+participant.class.toLowerCase()+'.png'" />
{{ participant.charactername }} {{ participant.charactername }}
</a> </a>
<ng-template #timeInfo>
<div style="padding: 10px">
{{participant.timestamp | date : 'HH:mm EEE MMM d'}}
({{participant.before | date : 'dd'}} days before start)
</div>
</ng-template>
<nb-icon [nbPopover]="timeInfo" nbPopoverTrigger="hover"
style="width: 0.75em; height: 0.75em;" icon="clock-outline"
[status]="participant.before>8.64e+7?(participant.before>2.592e+8?'success':'warning'):'danger'">
</nb-icon>
<ng-template #memoBox>
<div style="padding: 10px">
<p
style="white-space: pre-line; max-width: 50vw; word-wrap: break-word;">
{{participant.memo}}
</p>
</div>
</ng-template>
<nb-icon *ngIf="participant.memo" [nbPopover]="memoBox" nbPopoverTrigger="hover"
style="width: 0.75em; height: 0.75em;" icon="message-circle-outline">
</nb-icon>
<span *ngIf="participant.rank=='Trial'" style="font-size: 9px;"> <span *ngIf="participant.rank=='Trial'" style="font-size: 9px;">
Trial Trial
</span> </span>
@@ -166,6 +188,27 @@
[src]="'/assets/images/'+participant.class.toLowerCase()+'.png'" /> [src]="'/assets/images/'+participant.class.toLowerCase()+'.png'" />
{{ participant.charactername }} {{ participant.charactername }}
</a> </a>
<ng-template #timeInfo>
<div style="padding: 10px">
{{participant.timestamp | date : 'HH:mm EEE MMM d'}}
({{participant.before | date : 'dd'}} days before start)
</div>
</ng-template>
<nb-icon [nbPopover]="timeInfo" nbPopoverTrigger="hover"
style="width: 0.75em; height: 0.75em;" icon="clock-outline"
[status]="participant.before>8.64e+7?(participant.before>2.592e+8?'success':'warning'):'danger'">
</nb-icon>
<ng-template #memoBox>
<div style="padding: 10px">
<p
style="white-space: pre-line; max-width: 50vw; word-wrap: break-word;">
{{participant.memo}}
</p>
</div>
</ng-template>
<nb-icon *ngIf="participant.memo" [nbPopover]="memoBox" nbPopoverTrigger="hover"
style="width: 0.75em; height: 0.75em;" icon="message-circle-outline">
</nb-icon>
<span *ngIf="participant.rank=='Trial'" style="font-size: 9px;"> <span *ngIf="participant.rank=='Trial'" style="font-size: 9px;">
Trial Trial
</span> </span>