From 9ca1c1f354fd588dc1631d91ca00facc06d91cee Mon Sep 17 00:00:00 2001
From: peter <peter.millauer@gmail.com>
Date: Tue, 25 Aug 2020 04:19:40 +0200
Subject: [PATCH] fix timestamp and memo display in raid, fix bad signup count

---
 src/backend/Components/Raid/RaidManager.ts    |  3 +-
 src/backend/Components/User/UserManager.ts    |  2 +-
 .../pages/pages-layout.component.ts           |  4 --
 .../frontcraft/pages/raid/raid.component.html | 43 +++++++++++++++++++
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/backend/Components/Raid/RaidManager.ts b/src/backend/Components/Raid/RaidManager.ts
index 42b8bee..509d9c1 100644
--- a/src/backend/Components/Raid/RaidManager.ts
+++ b/src/backend/Components/Raid/RaidManager.ts
@@ -152,7 +152,8 @@ export class RaidManager
             .where({
                 raidid: this.admin.knex.ref('raids.id'),
                 benched: false,
-                late: false
+                late: false,
+                absent: false
             })
             .as('signupcount')
 
diff --git a/src/backend/Components/User/UserManager.ts b/src/backend/Components/User/UserManager.ts
index 25479b6..e28bccf 100644
--- a/src/backend/Components/User/UserManager.ts
+++ b/src/backend/Components/User/UserManager.ts
@@ -132,7 +132,7 @@ export class UserManager
     ]
 
     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
         getLogger('UserManager#initialize').debug('setting up permissions')
 
diff --git a/src/frontend/src/app/frontcraft/pages/pages-layout.component.ts b/src/frontend/src/app/frontcraft/pages/pages-layout.component.ts
index 79dd517..89e7dce 100644
--- a/src/frontend/src/app/frontcraft/pages/pages-layout.component.ts
+++ b/src/frontend/src/app/frontcraft/pages/pages-layout.component.ts
@@ -28,10 +28,6 @@ export class PagesLayoutComponent{
     icon: 'book-open-outline',
     title: 'Loot Rules',
     link: '/frontcraft/rules',
-  },{
-    icon: "shield",
-    title: 'Armory',
-    link: '/frontcraft/armory'
   }]
   
   constructor(){}
diff --git a/src/frontend/src/app/frontcraft/pages/raid/raid.component.html b/src/frontend/src/app/frontcraft/pages/raid/raid.component.html
index 80c17b6..884124d 100644
--- a/src/frontend/src/app/frontcraft/pages/raid/raid.component.html
+++ b/src/frontend/src/app/frontcraft/pages/raid/raid.component.html
@@ -88,6 +88,7 @@
                                                 [src]="'/assets/images/'+participant.class.toLowerCase()+'.png'" />
                                             {{ participant.charactername }}
                                         </a>
+
                                         <ng-template #timeInfo>
                                             <div style="padding: 10px">
                                                 {{participant.timestamp | date : 'HH:mm EEE MMM d'}}
@@ -137,6 +138,27 @@
                                                 [src]="'/assets/images/'+participant.class.toLowerCase()+'.png'" />
                                             {{ participant.charactername }}
                                         </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;">
                                             Trial
                                         </span>
@@ -166,6 +188,27 @@
                                                     [src]="'/assets/images/'+participant.class.toLowerCase()+'.png'" />
                                                 {{ participant.charactername }}
                                             </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;">
                                                 Trial
                                             </span>