From a3df38263ed0a4293c194d4c710cc72813553c38 Mon Sep 17 00:00:00 2001
From: Florian Hartwich <s46831@beuth-hochschule.de>
Date: Tue, 23 May 2017 13:16:47 +0200
Subject: [PATCH] Add global decorations filter; Add noSquad user filter

---
 api/routes/decorations.js                                 | 2 +-
 api/routes/users.js                                       | 6 ++++--
 .../decoration-list/decoration-list.component.html        | 8 ++++++++
 static/src/app/users/award-user/award-user.component.css  | 7 ++-----
 static/src/app/users/user-list/user-list.component.html   | 7 +++++++
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/api/routes/decorations.js b/api/routes/decorations.js
index 2292141..f2c8743 100644
--- a/api/routes/decorations.js
+++ b/api/routes/decorations.js
@@ -31,7 +31,7 @@ decoration.route('/')
     if (req.query.q) {
       filter.name = {$regex: req.query.q, $options: 'i'}
     }
-    DecorationModel.find(filter, {}, {sort: {fraction: 'asc', sortingNumber: 'asc', name: 'asc'}}, (err, items) => {
+    DecorationModel.find(filter, {}, {sort: {fraction: 'asc', isMedal: 'asc', sortingNumber: 'asc', name: 'asc'}}, (err, items) => {
       if (err) {
         err.status = codes.servererror;
         return next(err);
diff --git a/api/routes/users.js b/api/routes/users.js
index 3a33a0d..f883e4b 100644
--- a/api/routes/users.js
+++ b/api/routes/users.js
@@ -56,7 +56,9 @@ users.route('/')
           if (!nameQuery || (nameQuery && user.username.toLowerCase().includes(nameQuery.toLowerCase()))) {
             getExtendedUser(user, next, (extUser) => {
               // filter by fraction
-              if (!fractionFilter || (fractionFilter && extUser.squad && extUser.squad.fraction.toLowerCase() === fractionFilter)) {
+              if (!fractionFilter ||
+                (fractionFilter && extUser.squad && extUser.squad.fraction.toLowerCase() === fractionFilter) ||
+                (fractionFilter && fractionFilter === 'unassigned' && !extUser.squad)) {
                 resUsers.push(extUser);
               } else {
                 rowsLength -= 1;
@@ -174,7 +176,7 @@ users.route('/:id')
     })
   })
 
-  .put(apiAuthenticationMiddleware, (req, res,next) => {
+  .put(apiAuthenticationMiddleware, (req, res, next) => {
     // first check that the given element id is the same as the URL id
     if (!req.body || req.body._id !== req.params.id) {
       // the URL does not fit the given element
diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.html b/static/src/app/decorations/decoration-list/decoration-list.component.html
index 366e2f5..342eaf0 100644
--- a/static/src/app/decorations/decoration-list/decoration-list.component.html
+++ b/static/src/app/decorations/decoration-list/decoration-list.component.html
@@ -20,6 +20,14 @@
                #fractRadioOpfor
                (change)="filterSquadsByFraction(query.value, fractRadioOpfor.value)">CSAT
       </label>
+      <br>
+      <label class="radio-inline" style="padding-top: 8px;">
+        <input type="radio" name="fractSelect" value="global"
+               [(ngModel)]="fractionRadioSelect"
+               #fractRadioGlobal
+               (change)="filterSquadsByFraction(query.value, fractRadioGlobal.value)">Global
+      </label>
+
     </form>
     <a class="pull-right btn btn-success" (click)="openNewSquadForm()">
       Neue Auszeichnung hinzufügen
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 0efa9ed..dc5e592 100644
--- a/static/src/app/users/award-user/award-user.component.css
+++ b/static/src/app/users/award-user/award-user.component.css
@@ -25,8 +25,7 @@
   overflow-x: hidden;
   width: 100%;
   border-left: thin solid lightgrey;
-  padding-left: 50px;
-  padding-top: 20px;
+  padding: 20px 0 0 50px;
   margin-left: 10px;
   height: 100vh;
   bottom: 10px;
@@ -37,9 +36,7 @@
 }
 
 h3 {
-  margin-top: 80px;
-  margin-bottom: 20px;
-  margin-left: -20px;
+  margin: 80px 0 20px -20px;
 }
 
 label {
diff --git a/static/src/app/users/user-list/user-list.component.html b/static/src/app/users/user-list/user-list.component.html
index 347e042..b160437 100644
--- a/static/src/app/users/user-list/user-list.component.html
+++ b/static/src/app/users/user-list/user-list.component.html
@@ -20,6 +20,13 @@
                #fractRadioOpfor
                (change)="filterUsersByFraction(query.value, fractRadioOpfor.value)">CSAT
       </label>
+      <br>
+      <label class="radio-inline" style="padding-top: 8px;">
+        <input type="radio" name="fractSelect" value="unassigned"
+               [(ngModel)]="fractionRadioSelect"
+               #fractRadioUnassigned
+               (change)="filterUsersByFraction(query.value, fractRadioUnassigned.value)">Ohne Squad
+      </label>
     </form>
     <a class="pull-right btn btn-success" (click)="openNewUserForm()">
       Neuen Teilnehmer hinzufügen