From 67d6260c3246dc567556088db3a946662f11fc45 Mon Sep 17 00:00:00 2001
From: Florian Hartwich <s46831@beuth-hochschule.de>
Date: Tue, 23 May 2017 12:51:03 +0200
Subject: [PATCH] Fix user awarding global entry & table cut off

---
 package.json                                              | 7 +++++--
 static/src/app/users/award-user/award-user.component.css  | 2 ++
 static/src/app/users/award-user/award-user.component.html | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 7818f38..e178efb 100644
--- a/package.json
+++ b/package.json
@@ -11,9 +11,12 @@
     "postinstall": "npm install --prefix ./static && npm install --prefix  ./api",
     "mongodb": "mongod --dbpath ./mongodb-data",
     "test": "npm test --prefix ./api",
-    "e2e": "npm run deploy-static && concurrently \"npm run e2e --prefix ./api\" \"npm run e2e --prefix ./static\""
+    "e2e": "npm run deploy-static && concurrently \"npm run e2e --prefix ./api\" \"$(npm bin)/wait-on -t 60000 http://localhost:3001/ && npm run e2e --prefix ./static\" --success first --kill-others",
+    "start-e2e": "npm run deploy-static && npm run e2e --prefix ./api",
+    "test-e2e": "npm run e2e --prefix ./static"
   },
   "devDependencies": {
-    "concurrently": "^3.4.0"
+    "concurrently": "^3.4.0",
+    "wait-on": "^2.0.2"
   }
 }
diff --git a/static/src/app/users/award-user/award-user.component.css b/static/src/app/users/award-user/award-user.component.css
index 324cd8f..0efa9ed 100644
--- a/static/src/app/users/award-user/award-user.component.css
+++ b/static/src/app/users/award-user/award-user.component.css
@@ -29,6 +29,7 @@
   padding-top: 20px;
   margin-left: 10px;
   height: 100vh;
+  bottom: 10px;
 }
 
 .form-group {
@@ -36,6 +37,7 @@
 }
 
 h3 {
+  margin-top: 80px;
   margin-bottom: 20px;
   margin-left: -20px;
 }
diff --git a/static/src/app/users/award-user/award-user.component.html b/static/src/app/users/award-user/award-user.component.html
index 4bcd047..fc714b4 100644
--- a/static/src/app/users/award-user/award-user.component.html
+++ b/static/src/app/users/award-user/award-user.component.html
@@ -12,7 +12,7 @@
             required
             style="min-width: 200px;">
       <option *ngFor="let deco of decorations" [value]="deco._id">
-        {{deco.fraction == 'BLUFOR'? 'NATO' : 'CSAT'}}: {{deco.name}}
+        {{deco.fraction == 'BLUFOR'? 'NATO' : deco.fraction == 'OPFOR'? 'CSAT' : 'Global'}}: {{deco.name}}
       </option>
     </select>