From 3b7de5cf2d91d82f732164b87f74586672ed2137 Mon Sep 17 00:00:00 2001
From: peter <peter.millauer@gmail.com>
Date: Tue, 11 Feb 2020 03:35:36 +0100
Subject: [PATCH] tooltips fix

---
 .../pages/armory/armory.component.ts          |  3 +-
 .../pages/character/character.component.ts    | 28 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/frontend/src/app/frontcraft/pages/armory/armory.component.ts b/src/frontend/src/app/frontcraft/pages/armory/armory.component.ts
index a704d83..e77f39c 100644
--- a/src/frontend/src/app/frontcraft/pages/armory/armory.component.ts
+++ b/src/frontend/src/app/frontcraft/pages/armory/armory.component.ts
@@ -35,7 +35,8 @@ export class FrontcraftArmoryComponent implements OnInit{
         itemname: item.name,
         iconname: item.icon.replace('.jpg', ''),
         quality: item.quality.replace(/^\w/, c => c.toUpperCase()),
-        url: "https://classic.wowhead.com/item="+item.id
+        url: "https://classic.wowhead.com/item="+item.id,
+        tooltip: "unavailable"
       }})
     }))
   }
diff --git a/src/frontend/src/app/frontcraft/pages/character/character.component.ts b/src/frontend/src/app/frontcraft/pages/character/character.component.ts
index 997e999..57e0866 100644
--- a/src/frontend/src/app/frontcraft/pages/character/character.component.ts
+++ b/src/frontend/src/app/frontcraft/pages/character/character.component.ts
@@ -25,7 +25,7 @@ export class FrontcraftCharacterComponent implements OnInit{
     gear1:string[] = []
     
     boss2= {}
-    gear2:Item[] = []
+    gear2:string[] = []
 
     constructor(
       private api: ApiService,
@@ -50,7 +50,7 @@ export class FrontcraftCharacterComponent implements OnInit{
 
           
 
-          fetch(this.dataLink).then(raw => raw.json().then(async (json) => {
+          fetch(this.dataLink).then(raw => raw.json().then((json) => {
             if(json.length < 1) return
             const data = json[0]
 
@@ -58,14 +58,18 @@ export class FrontcraftCharacterComponent implements OnInit{
               name: data.encounterName,
               date: data.startTime
             }
-
-            this.gear2 = await Promise.all(data.gear.map(i => i.name).map(itemName => this.api.get('ItemManager').getItem(itemName)))
-            this.gear2 = this.gear2.filter(i => i!=null)            
-          
+            this.gear2 = data.gear.map(item => {return <Item>{
+              itemname: item.name,
+              iconname: item.icon.replace('.jpg', ''),
+              quality: item.quality.replace(/^\w/, c => c.toUpperCase()),
+              url: "https://classic.wowhead.com/item="+item.id,
+              tooltip: "unavailable"
+            }}).filter(item => item.itemname != "Unknown Item")
           }))
 
-          fetch(this.dataLink).then(raw => raw.json().then(async (json) => {
+          fetch(this.dataLink).then(raw => raw.json().then((json) => {
             if(json.length < 2) return
+
             const data = json[1]
 
             this.boss1 = {
@@ -73,9 +77,13 @@ export class FrontcraftCharacterComponent implements OnInit{
               date: data.startTime
             }
 
-            
-            this.gear1 = await Promise.all(data.gear.map(i => i.name).map(itemName => this.api.get('ItemManager').getItem(itemName)))
-            this.gear1 = this.gear1.filter(i => i!=null)            
+            this.gear1 = data.gear.map(item => {return <Item>{
+              itemname: item.name,
+              iconname: item.icon.replace('.jpg', ''),
+              quality: item.quality.replace(/^\w/, c => c.toUpperCase()),
+              url: "https://classic.wowhead.com/item="+item.id,
+              tooltip: "unavailable"
+            }}).filter(item => item.itemname != "Unknown Item")
           }))
         }
       })