Add global decorations filter; Add noSquad user filter

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);

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;

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

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

static/src/app/users/award-user/award-user.component.css

@@ -25,10 +25,10 @@
   overflow-x: hidden;
   width: 100%;
   border-left: thin solid lightgrey;
-  padding-left: 50px;
+  padding: 20px 0 0 50px;
-  padding-top: 20px;
   margin-left: 10px;
   height: 100vh;
+  bottom: 10px;
 }
 
 .form-group {
@@ -36,8 +36,7 @@
 }
 
 h3 {
-  margin-bottom: 20px;
+  margin: 80px 0 20px -20px;
-  margin-left: -20px;
 }
 
 label {

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>
 

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