hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

Fix user awarding global entry & table cut off

pull/1/head
Florian Hartwich 2017-05-23 12:51:03 +02:00
parent e96f07a7fb
commit 67d6260c32
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package.json
View File

@ -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"
}
}

2
static/src/app/users/award-user/award-user.component.css
View File

@ -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;
}

2
static/src/app/users/award-user/award-user.component.html
View File

@ -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>