Optimize sign up ux; Add confirmation for promotion

api/routes/authenticate.js

@@ -102,7 +102,7 @@ let create = (userParam) => {
 
       if (user) {
         // username already exists
-        deferred.reject('Username "' + userParam.username + '" is already taken');
+        deferred.reject(new Error("Username already exists"));
       } else {
         createUser();
       }

api/routes/request.js

@@ -9,6 +9,10 @@ const codes = require('./http-codes');
 
 const routerHandling = require('../middleware/router-handling');
 
+const apiAuthenticationMiddleware = require('../middleware/auth-middleware');
+const checkSql = require('../middleware/permission-check').checkSql;
+const checkHl = require('../middleware/permission-check').checkHl;
+
 // Mongoose Model using mongoDB
 const UserModel = require('../models/user');
 const AwardingModel = require('../models/awarding');
@@ -31,7 +35,7 @@ const request = express.Router();
 // routes **********************
 request.route('/award')
 
-  .post((req, res, next) => {
+  .post(apiAuthenticationMiddleware, checkSql, (req, res, next) => {
     const award = new AwardingModel(req.body);
     award.confirmed = 0;
     award.proposer = req.user._id;
@@ -54,18 +58,36 @@ request.route('/award')
 
 request.route('/promotion')
 
-  .get((req, res, next) => {
+  .get(apiAuthenticationMiddleware, checkSql, (req, res, next) => {
     const squadFilter = req.query.squadId;
+    const fractFilter = req.query.fractFilter;
+    const progressFilter = req.query.inProgress;
+    let filter;
+    if (squadFilter) {
+      filter = {squadId: squadFilter};
+    }
     let userIds = [];
-    UserModel.find({squadId: squadFilter}, (err, items) => {
+    UserModel.find(filter).populate('squadId').exec((err, items) => {
       if (err) {
         err.status = codes.servererror;
         return next(err);
       }
+
       for (let item of items) {
+        if (!fractFilter || (fractFilter && item.squadId && item.squadId.fraction === fractFilter)) {
           userIds.push(item._id);
         }
-      PromotionModel.find({userId: {"$in": userIds}}, {}, {sort: {timestamp: 'desc'}}).populate('userId').populate('proposer', resultSet).exec((err, items) => {
+      }
+
+      let promotionFilter = {
+        userId: {"$in": userIds}
+      };
+      if (progressFilter) {
+        promotionFilter.confirmed = 0;
+      }
+
+      PromotionModel.find(promotionFilter, {}, {sort: {timestamp: 'desc'}})
+        .populate('userId').populate('proposer', resultSet).exec((err, items) => {
         if (err) {
           err.status = codes.servererror;
           return next(err);
@@ -83,7 +105,7 @@ request.route('/promotion')
 
   })
 
-  .post((req, res, next) => {
+  .post(apiAuthenticationMiddleware, checkSql, (req, res, next) => {
     const promotion = new PromotionModel(req.body);
     promotion.confirmed = 0;
     promotion.proposer = req.user._id;
@@ -104,6 +126,54 @@ request.route('/promotion')
     routerHandling.httpMethodNotAllowed
   );
 
+
+request.route('/promotion/:id')
+  .patch(apiAuthenticationMiddleware, checkHl, (req, res, next) => {
+    if (!req.body || (req.body._id && req.body._id !== req.params.id)) {
+      // little bit different as in PUT. :id does not need to be in data, but if the _id and url id must match
+      const err = new Error('id of PATCH resource and send JSON body are not equal ' + req.params.id + " " + req.body._id);
+      err.status = codes.notfound;
+      next(err);
+      return; // prevent node to process this function further after next() has finished.
+    }
+
+    req.body.updatedAt = new Date();
+    req.body.$inc = {__v: 1};
+
+    // PATCH is easier with mongoose than PUT. You simply update by all data that comes from outside. no need to reset attributes that are missing.
+    PromotionModel.findByIdAndUpdate(req.params.id, req.body, {new: true}, (err, item) => {
+      if (err) {
+        err.status = codes.wrongrequest;
+      }
+      else if (!item) {
+        err = new Error("item not found");
+        err.status = codes.notfound;
+      }
+      else {
+        if (item.confirmed === 1) {
+          let updateUser = {
+            _id: item.userId,
+            rankLvl: item.newRankLvl
+          };
+          UserModel.findByIdAndUpdate(updateUser._id, updateUser, {new: true}, (err, item) => {
+            if (err) {
+              err.status = codes.wrongrequest;
+            }
+            else if (!item) {
+              err = new Error("user not found");
+              err.status = codes.notfound;
+            }
+          });
+        }
+        res.locals.items = item;
+      }
+      next(err);
+    })
+  })
+  .all(
+    routerHandling.httpMethodNotAllowed
+  );
+
 // this middleware function can be used, if you like or remove it
 // it looks for object(s) in res.locals.items and if they exist, they are send to the client as json
 request.use(routerHandling.emptyResponse);

api/server.js

@@ -73,7 +73,7 @@ app.use(urls.users, userRouter);
 app.use(urls.squads, squadRouter);
 app.use(urls.ranks, rankRouter);
 app.use(urls.decorations, decorationRouter);
-app.use(urls.request, apiAuthenticationMiddleware, checkSql, requestRouter);
+app.use(urls.request, requestRouter);
 app.use(urls.awards, awardingRouter);
 app.use(urls.command, apiAuthenticationMiddleware, checkAdmin, commandRouter);
 app.use(urls.account, apiAuthenticationMiddleware, checkAdmin, accountRouter);

api/signature-tool/signature-tool.js

@@ -126,7 +126,7 @@ let addDecorationsAndSave = (userId, loadedImage, res, next) => {
   let ribbonPx = 598;
   let ribbonPy = 95;
 
-  AwardingModel.find({'userId': userId}, ['decorationId', 'date'],
+  AwardingModel.find({'userId': userId, 'confirmed': 1}, ['decorationId', 'date'],
     {sort: {date: 'asc'}}).populate('decorationId', ['isMedal'])
     .exec((err, awardings) => {
         if (err) {

static/src/app/login/signup.component.html

@@ -3,9 +3,11 @@
   <div class="row">
     <h2 style="text-align: center;" class="form-signin-heading">Registrieren</h2>
 
-    <p>Dieses Formular nur ausfüllen wenn du einer <b>HL</b> angehörst oder <b>SQL</b> bist. Dabei den Nutzernamen aus dem OPT Forum verwenden!
+    <p>Dieses Formular nur ausfüllen wenn du einer <b>HL</b> angehörst oder <b>SQL</b> bist. Dabei den Nutzernamen aus
-      Im Forum eine Nachricht an <a href="https://opt-dev.de/dashboard/index.php?conversation-add/&userID=9" target="_blank">HardiReady</a>
+      dem OPT Forum verwenden!
-      senden, in welcher der 'geheime Text' drin steht, den du bei der Registrierung nutzt.<br>
+      Im Forum eine Nachricht an <a href="https://opt-dev.de/dashboard/index.php?conversation-add/&userID=9"
+                                    target="_blank">HardiReady</a>
+      senden, in welcher der 'geheime Text' steht, den du bei der Registrierung nutzt.<br>
       Dabei kann es sich um irgend eine willkürliche Zeichenfolge oder einen Satz handeln - dient nur dem Abgleich.
       Anschließend wird dein Account aktiviert und du wirst darüber per PN informiert.</p>
 
@@ -25,9 +27,16 @@
         <span *ngIf="!loading">Registrieren</span>
         <span *ngIf="loading" class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
       </button>
+      <h3 class="text-center">
+        <span *ngIf="showSuccessLabel"
+              class="label label-success label-small"
+              style="margin-left: inherit">
+          Account erfolgreich erstellt
+        </span>
+      </h3>
       <span *ngIf="showErrorLabel"
             class="center-block label label-danger" style="font-size: medium; padding: 2px; margin-top: 2px">
-        Login fehlgeschlagen
+        {{error}}
     </span>
     </div>
 

static/src/app/login/signup.component.ts

@@ -13,6 +13,10 @@ export class SignupComponent implements OnInit {
 
   showErrorLabel = false;
 
+  showSuccessLabel = false;
+
+  error: string;
+
   loading = false;
 
   returnUrl: string;
@@ -35,10 +39,11 @@ export class SignupComponent implements OnInit {
       this.loginService.signUp(username, password, secret)
         .subscribe(
           data => {
-            console.log(data)
+            this.loading = false;
-            //this.router.navigate([this.returnUrl]);
+            this.showSuccessLabel = true;
           },
           error => {
+            this.error = error;
             this.showErrorLabel = true;
             setTimeout(() => {
               this.showErrorLabel = false;

static/src/app/models/model-interfaces.ts

@@ -41,6 +41,7 @@ export interface Award {
 }
 
 export interface Promotion {
+  _id?: string;
   userId?: string
   oldRankLvl: number,
   newRankLvl: number

static/src/app/request/confirm-award/confirm-award.component.html

@@ -1,6 +1,12 @@
 <form #form="ngForm" class="overview">
   <h3>Offene Anträge - Auszeichnungen</h3>
 
+  <span *ngIf="showSuccessLabel"
+        class="label label-success label-small"
+        style="margin-left: inherit">
+  Erfolgreich gespeichert
+  </span>
+
   <div class="table-container">
     <table class="table table-hover">
       <thead>

static/src/app/request/confirm-award/confirm-award.component.ts

@@ -9,8 +9,11 @@ import {AwardingService} from "../../services/awarding-service/awarding.service"
   styleUrls: ['./confirm-award.component.css'],
 })
 export class ConfirmAwardComponent {
+
   awards: Award[];
 
+  showSuccessLabel = false;
+
   constructor(private router: Router,
               private route: ActivatedRoute,
               private awardingService: AwardingService) {
@@ -34,6 +37,10 @@ export class ConfirmAwardComponent {
       let currentUser = JSON.parse(localStorage.getItem('currentUser'));
       this.awardingService.getUnconfirmedAwards(currentUser.squad.fraction).subscribe(awards => {
         this.awards = awards;
+        this.showSuccessLabel = true;
+        setTimeout(() => {
+          this.showSuccessLabel = false;
+        }, 2000);
       });
     });
   }

static/src/app/request/confirm-promotion/confirm-promotion.component.css

@@ -2,7 +2,7 @@
   padding: 5px;
 }
 
-.trash {
+.action {
   cursor: pointer;
 }
 

static/src/app/request/confirm-promotion/confirm-promotion.component.html

@@ -1,60 +1,5 @@
 <form #form="ngForm" class="overview">
-  <h3>Beförderung beantragen</h3>
+  <h3>Offene Anträge - Beförderung</h3>
-
-  <div class="form-group">
-    <label for="user">Teilnehmer</label>
-    <select class="form-control"
-            name="user"
-            id="user"
-            [(ngModel)]="user"
-            [compareWith]="equals"
-            required
-            (change)="toggleUser()">
-      <option *ngFor="let user of users" [ngValue]="user">
-        {{user.username}}
-      </option>
-    </select>
-  </div>
-
-  <div *ngIf="showForm">
-
-    <div class="form-group">
-      <label for="user">Aktueller Rang</label>
-      <input class="form-control"
-             [(ngModel)]="user.rank.name"
-             [ngModelOptions]="{standalone: true}"
-             readonly>
-    </div>
-
-    <div class="form-group">
-      <label for="decoration">Neuer Rang</label>
-      <select class="form-control"
-              name="decoration"
-              id="decoration"
-              #decorationField
-              [(ngModel)]="newLevel"
-              required>
-        <option *ngFor="let rank of ranks" [ngValue]="rank.level">
-          {{rank.name}}
-        </option>
-      </select>
-    </div>
-
-  </div>
-
-  <button id="cancel"
-          (click)="cancel()"
-          class="btn btn-default">
-    Abbrechen
-  </button>
-
-  <button id="save"
-          *ngIf="showForm"
-          (click)="addPromotion()"
-          class="btn btn-default"
-          [disabled]="newLevel === user.rank.level">
-    Bestätigen
-  </button>
 
   <span *ngIf="showSuccessLabel"
         class="label label-success label-small"
@@ -62,7 +7,6 @@
   Erfolgreich gespeichert
   </span>
 
-
   <div class="table-container">
     <label>Beförderungsanträge</label>
     <table class="table table-hover">
@@ -74,9 +18,10 @@
         <th class="col-sm-1 ">Antragsteller</th>
         <th class="col-sm-1 text-center">Datum</th>
         <th class="col-sm-1 text-center">Status</th>
+        <th class="col-sm-1 text-center">Aktion</th>
       </tr>
       </thead>
-      <tbody *ngFor="let promotion of uncheckedPromotions">
+      <tbody *ngFor="let promotion of promotions">
       <tr>
         <td>
           {{promotion.userId.username}}
@@ -96,6 +41,10 @@
         <td class="text-center">
           {{promotion.confirmed === 0? 'In Bearbeitung' : (promotion.confirmed === 1? 'Genehmigt' : 'Abgelehnt')}}
         </td>
+        <td class="text-right">
+          <a class="action" (click)="confirm(promotion, true)">Bestätigen</a><br>
+          <a class="action" (click)="confirm(promotion, false)">Ablehnen</a>
+        </td>
       </tr>
       </tbody>
     </table>

static/src/app/request/confirm-promotion/confirm-promotion.component.ts

@@ -1,8 +1,6 @@
-import {Component, ViewChild} from "@angular/core";
+import {Component} from "@angular/core";
 import {ActivatedRoute, Router} from "@angular/router";
-import {Rank, User} from "../../models/model-interfaces";
+import {Promotion, Rank} from "../../models/model-interfaces";
-import {NgForm} from "@angular/forms";
-import {UserService} from "../../services/user-service/user.service";
 import {RankService} from "../../services/rank-service/rank.service";
 import {PromotionService} from "../../services/promotion-service/promotion.service";
 
@@ -13,84 +11,46 @@ import {PromotionService} from "../../services/promotion-service/promotion.servi
 })
 export class ConfirmPromotionComponent {
 
-  @ViewChild(NgForm) form: NgForm;
-
-  showForm = false;
-
   showSuccessLabel = false;
 
-  user: User = {};
-
-  newLevel: number;
-
   ranks: Rank[];
 
-  users: User[];
+  promotions: Promotion[];
-
-  uncheckedPromotions = [];
 
   constructor(private router: Router,
               private route: ActivatedRoute,
-              private userService: UserService,
               private rankService: RankService,
               private promotionService: PromotionService) {
   }
 
   ngOnInit() {
     let currentUser = JSON.parse(localStorage.getItem('currentUser'));
-    // show only current users squad members
+    // show only current users fraction promotions
-    this.userService.findUsers('', undefined, currentUser.squad._id).subscribe(users => {
-      this.users = users;
-    });
     this.rankService.findRanks('', currentUser.squad.fraction).subscribe(ranks => {
       this.ranks = ranks;
     });
-    this.promotionService.getSquadPromotions(currentUser.squad._id).subscribe(promotions => {
+    this.promotionService.getUnconfirmedPromotions(currentUser.squad.fraction).subscribe(promotions => {
-      this.uncheckedPromotions = promotions;
+      this.promotions = promotions;
     })
 
   }
 
-  toggleUser() {
+  confirm(promotion: Promotion, decision: boolean) {
-    this.showForm = true;
+    const updateObject = {
-    this.newLevel = this.user.rank.level;
+      _id: promotion._id,
-  }
+      confirmed: decision ? 1 : 2
-
-
-  addPromotion() {
-    const promotion = {
-      "userId": this.user._id,
-      "oldRankLvl": this.user.rank.level,
-      "newRankLvl": this.newLevel,
     };
 
-    this.promotionService.requestPromotion(promotion).subscribe();
+    this.promotionService.updatePromotion(updateObject).subscribe(res => {
+      let currentUser = JSON.parse(localStorage.getItem('currentUser'));
+      this.promotionService.getUnconfirmedPromotions(currentUser.squad.fraction).subscribe(promotions => {
+        this.promotions = promotions;
         this.showSuccessLabel = true;
         setTimeout(() => {
           this.showSuccessLabel = false;
         }, 2000);
-    this.showForm = false;
+      });
-    this.user = {};
+    });
-
-    let currentUser = JSON.parse(localStorage.getItem('currentUser'));
-    this.promotionService.getSquadPromotions(currentUser.squad._id).subscribe(promotions => {
-      this.uncheckedPromotions = promotions;
-    })
-
-  }
-
-  cancel() {
-    this.router.navigate(['..'], {relativeTo: this.route});
-    return false;
-  }
-
-  /**
-   * compare ngValue with ngModel to assign selected element
-   */
-  equals(o1: User, o2: User) {
-    if (o1 && o2) {
-      return o1._id === o2._id;
-    }
   }
 
 }

static/src/app/services/login-service/login-service.ts

@@ -27,11 +27,7 @@ export class LoginService {
   signUp(username: string, password: string, secret: string) {
     return this.http.post(this.config.apiUrl + this.config.apiSignupPath, {username: username, password: password, secret: secret})
       .map((response: Response) => {
-        // login successful if there's a jwt token in the response
+
-        let user = response.json();
-        if (user) {
-          //TODO
-        }
       });
   }
 

static/src/app/services/promotion-service/promotion.service.ts

@@ -10,6 +10,11 @@ export class PromotionService {
               private config: AppConfig) {
   }
 
+  getUnconfirmedPromotions(fraction?: string) {
+    return this.http.get(this.config.apiUrl + this.config.apiPromotionPath + '?inProgress=true&fractFilter=' + fraction)
+      .map(res => res.json())
+  }
+
   getSquadPromotions(squadId: string) {
     return this.http.get(this.config.apiUrl + this.config.apiPromotionPath + '?squadId=' + squadId)
       .map(res => res.json())
@@ -19,6 +24,11 @@ export class PromotionService {
     return this.http.post(this.config.apiUrl + this.config.apiPromotionPath, promotion)
   }
 
+  updatePromotion(promotion) {
+    return this.http.patch(this.config.apiUrl + this.config.apiPromotionPath + '/' + promotion._id, promotion)
+      .map(res => res.json())
+  }
+
   deletePromotion(promotionId) {
     return this.http.delete(this.config.apiUrl + this.config.apiPromotionPath + promotionId)
   }

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

@@ -92,7 +92,7 @@
           <a class="small text-nowrap">{{award.date | date: 'dd.MM.yyyy'}}</a>
         </td>
         <td class="text-center">
-          {{award.confirmed? 'Bestätigt' : 'In Bearbeitung'}}
+          {{award.confirmed === 0? 'In Bearbeitung' : (award.confirmed === 1? 'Genehmigt' : 'Abgelehnt')}}
         </td>
         <td class="text-center">
           <span class="glyphicon glyphicon-trash trash" title="Löschen" (click)="deleteAwarding(award._id)"></span>