From 26dbf8312b76b4413f1effdbd117be5c85173004 Mon Sep 17 00:00:00 2001
From: peter <peter.millauer@gmail.com>
Date: Tue, 3 Mar 2020 17:32:37 +0100
Subject: [PATCH] show trial tags

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

diff --git a/src/backend/Components/Raid/RaidManager.ts b/src/backend/Components/Raid/RaidManager.ts
index 7b0b908..ac5bd06 100644
--- a/src/backend/Components/Raid/RaidManager.ts
+++ b/src/backend/Components/Raid/RaidManager.ts
@@ -264,7 +264,7 @@ export class RaidManager
         const characterData: (Signup & Character & Spec)[] = await this.admin
             .knex('signups as s')
             //.transacting(tx)
-            .select('s.id as id', 'charactername', 'class', 'specid', 'specname', 'race', 'userid', 'benched', 'late', 'raidid', 'characterid', 'specid')
+            .select('s.id as id', 'charactername', 'rank', 'class', 'specid', 'specname', 'race', 'userid', 'benched', 'late', 'raidid', 'characterid', 'specid')
             .join('raids as r', 's.raidid', '=', 'r.id')
             .join('characters as c', 's.characterid', '=', 'c.id')
             .join('users as u', 'c.userid', '=', 'u.id')
@@ -296,7 +296,7 @@ export class RaidManager
                 'r.id': raid.id,
             })
             .andWhere(function () {
-                this.whereNotIn('u.rank', ['Trial', 'Guest'])
+                //this.whereNotIn('u.rank', ['Trial', 'Guest'])
                 this.whereNotNull('t.signupid')
             })
 
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 b7123f2..6dd86ca 100644
--- a/src/frontend/src/app/frontcraft/pages/raid/raid.component.html
+++ b/src/frontend/src/app/frontcraft/pages/raid/raid.component.html
@@ -68,6 +68,11 @@
                                                 [src]="'../../../../assets/images/'+participant.class.toLowerCase()+'.png'" />
                                             {{ participant.charactername }}
                                         </a>
+                                        <span 
+                                            *ngIf="participant.rank=='Trial'" 
+                                            style="font-size: 9px;">
+                                            Trial
+                                        </span>
                                     </div>
                                 </nb-card-body>
                             </nb-card>
@@ -92,6 +97,11 @@
                                                 [src]="'../../../../assets/images/'+participant.class.toLowerCase()+'.png'" />
                                             {{ participant.charactername }}
                                         </a>
+                                        <span 
+                                            *ngIf="participant.rank=='Trial'" 
+                                            style="font-size: 9px;">
+                                            Trial
+                                        </span>
                                     </div>
                                 </nb-card-body>
                             </nb-card>
@@ -118,6 +128,11 @@
                                                     [src]="'../../../../assets/images/'+participant.class.toLowerCase()+'.png'" />
                                                 {{ participant.charactername }}
                                             </a>
+                                            <span 
+                                                *ngIf="participant.rank=='Trial'" 
+                                                style="font-size: 9px;">
+                                                Trial
+                                            </span>
                                         </div>
                                     </nb-card-body>
                                 </nb-card>
@@ -146,10 +161,26 @@
                                 <wowhead [item]="item.value[0]"></wowhead><br />
                                 <div class="row">
                                     <div *ngFor="let token of item.value" class="col-12 col-md-6 col-xl-4">
-                                        [ {{token.level}} ]
-                                        <span style="text-transform: capitalize;"
-                                            [ngStyle]="{'color':token.level>=10?'#ff8000':token.level>=8?'#a335ee':token.level>=6?'#0070dd':token.level>=4?'#1eff00':token.level>=2?'#ffffff':'#9d9d9d'}">
-                                            {{token.charactername}}
+                                        <span [ngStyle]="{'text-decoration': token.rank=='Trial'? 'line-through' : 'none currentcolor solid' }">
+                                            [ {{token.level}} ]
+                                            <span style="text-transform: capitalize;"
+                                                [ngStyle]="{'color':token.level>=10?'#ff8000':token.level>=8?'#a335ee':token.level>=6?'#0070dd':token.level>=4?'#1eff00':token.level>=2?'#ffffff':'#9d9d9d'}">
+                                                {{token.charactername}}
+                                            </span>
+                                        </span>
+                                        &nbsp;
+                                        <ng-template #tooltip>
+                                            <div style="color:white">
+                                                Becomes valid when promoted to Raider
+                                            </div>
+                                        </ng-template>
+                                        <span 
+                                        *ngIf="token.rank=='Trial'" 
+                                        style="font-size: 9px;"
+                                        [nbPopover]="tooltip" 
+                                        nbPopoverTrigger="hover"
+                                        nbPopoverPlacement="top">
+                                            Trial
                                         </span><br />
                                     </div>
                                 </div>
diff --git a/src/frontend/src/app/frontcraft/pages/raid/raid.component.ts b/src/frontend/src/app/frontcraft/pages/raid/raid.component.ts
index 0589591..f8c99d0 100644
--- a/src/frontend/src/app/frontcraft/pages/raid/raid.component.ts
+++ b/src/frontend/src/app/frontcraft/pages/raid/raid.component.ts
@@ -163,6 +163,8 @@ export class FrontcraftRaidComponent implements OnInit, OnDestroy{
       const raiddata = await raidManager.getRaidData(<any>{
         id: param
       })
+      console.log(raiddata);
+      
       this.display(raiddata)
       
     }