api/cron-job/update-signatures.js

@@ -5,7 +5,10 @@ const async = require('async');
 const UserModel = require('../models/user');
 const signatureTool = require('../signature-tool/signature-tool');
 
-const createAllSignatures = () => {
+
+// Execute daily @ 02:30 AM
+const cronJob = cron.job('00 30 02 * * *', () => {
+
   console.log('\x1b[35m%s\x1b[0m', new Date().toLocaleString()
     + ': cron job started - UPDATE SIGNATURES');
 
@@ -39,12 +42,6 @@ const createAllSignatures = () => {
     })
   });
 
-};
+});
 
-// Execute daily @ 02:30 AM
-const cronJob = cron.job('00 30 02 * * *', createAllSignatures);
-
-module.exports = {
-  cronJob: cronJob,
-  createAllSignatures: createAllSignatures
-};
+module.exports = cronJob;

api/models/awarding.js

@@ -22,12 +22,8 @@ const AwardingSchema = new Schema({
     required: true
   },
   confirmed: {
-    type: Number,
-    get: v => Math.round(v),
-    set: v => Math.round(v),
-    min: 0,
-    max: 2,
-    default: 0
+    type: Boolean,
+    default: true
   },
   date: {
     type: Date,

api/routes/authenticate.js

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

api/routes/awardings.js

@@ -36,9 +36,6 @@ awarding.route('/')
     if (req.query.userId) {
       filter.userId = req.query.userId;
     }
-    if (req.query.inProgress) {
-      filter.confirmed = 0;
-    }
     if (req.query.simple) {
       AwardingModel.find(filter, {}, {sort: {date: 'desc'}}, (err, items) => {
         if (err) {
@@ -56,26 +53,17 @@ awarding.route('/')
       });
     } else {
       AwardingModel.find(filter, {}, {sort: {date: 'desc'}})
-        .populate('decorationId').populate('proposer', resultSet).populate('userId').exec((err, items) => {
+        .populate('decorationId').populate('proposer', resultSet).exec((err, items) => {
         if (err) {
           err.status = codes.servererror;
           return next(err);
           // with return before (or after) the next(err) we prevent that the code continues here after next(err) has finished.
           // this saves an extra else {..}
         }
-        let results = [];
-        if (req.query.fractFilter) {
-          for (let item of items) {
-            if (item.decorationId.fraction === req.query.fractFilter) {
-              results.push(item)
-            }
-          }
-          res.locals.items = results;
-
-        } else {
+        // if the collection is empty we do not send empty arrays back.
+        if (items && items.length > 0) {
           res.locals.items = items;
         }
-
         res.locals.processed = true;
         next();
       });
@@ -84,7 +72,6 @@ awarding.route('/')
 
   .post(apiAuthenticationMiddleware, checkHl, (req, res, next) => {
     const award = new AwardingModel(req.body);
-    award.confirmed = 1;
     award.proposer = req.user._id;
     // timestamp and default are set automatically by Mongoose Schema Validation
     award.save((err) => {
@@ -104,36 +91,6 @@ awarding.route('/')
   );
 
 awarding.route('/: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.
-    }
-
-    // optional task 3: increment version manually as we do not use .save(.)
-    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.
-    AwardingModel.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 {
-        res.locals.items = item;
-      }
-      next(err);
-    })
-  })
-
   .delete(apiAuthenticationMiddleware, checkHl, (req, res, next) => {
     AwardingModel.findByIdAndRemove(req.params.id, (err, item) => {
       if (err) {

api/routes/command.js

@@ -8,19 +8,11 @@ const logger = require('debug')('cc:command');
 const codes = require('./http-codes');
 
 const routerHandling = require('../middleware/router-handling');
-const createAllSignatures = require('../cron-job/update-signatures').createAllSignatures;
 const createSignature = require('../signature-tool/signature-tool');
 
 const command = express.Router();
 
-command.route('/createSignature')
-  .post((req, res, next) => {
-    createAllSignatures();
-  })
-
-  .all(
-    routerHandling.httpMethodNotAllowed
-  );
+// add middleware for bonus tasks 4 and 5 to find filter and offset/limit params  for GET / and GET /:id
 
 command.route('/createSignature/:id')
   .post((req, res, next) => {

api/routes/request.js

@@ -9,10 +9,6 @@ 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');
@@ -35,9 +31,9 @@ const request = express.Router();
 // routes **********************
 request.route('/award')
 
-  .post(apiAuthenticationMiddleware, checkSql, (req, res, next) => {
+  .post((req, res, next) => {
     const award = new AwardingModel(req.body);
-    award.confirmed = 0;
+    award.confirmed = false;
     award.proposer = req.user._id;
     // timestamp and default are set automatically by Mongoose Schema Validation
     award.save((err) => {
@@ -58,36 +54,18 @@ request.route('/award')
 
 request.route('/promotion')
 
-  .get(apiAuthenticationMiddleware, checkSql, (req, res, next) => {
+  .get((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(filter).populate('squadId').exec((err, items) => {
+    UserModel.find({squadId: squadFilter}, (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);
       }
-      }
-
-      let promotionFilter = {
-        userId: {"$in": userIds}
-      };
-      if (progressFilter) {
-        promotionFilter.confirmed = 0;
-      }
-
-      PromotionModel.find(promotionFilter, {}, {sort: {timestamp: 'desc'}})
-        .populate('userId').populate('proposer', resultSet).exec((err, items) => {
+      PromotionModel.find({userId: {"$in": userIds}}, {}, {sort: {timestamp: 'desc'}}).populate('userId').populate('proposer', resultSet).exec((err, items) => {
         if (err) {
           err.status = codes.servererror;
           return next(err);
@@ -105,7 +83,7 @@ request.route('/promotion')
 
   })
 
-  .post(apiAuthenticationMiddleware, checkSql, (req, res, next) => {
+  .post((req, res, next) => {
     const promotion = new PromotionModel(req.body);
     promotion.confirmed = 0;
     promotion.proposer = req.user._id;
@@ -126,54 +104,6 @@ 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

@@ -17,7 +17,7 @@ const errorResponseWare = require('./middleware/error-response');
 const apiAuthenticationMiddleware = require('./middleware/auth-middleware');
 const checkSql = require('./middleware/permission-check').checkSql;
 const checkAdmin = require('./middleware/permission-check').checkAdmin;
-const signatureCronJob = require('./cron-job/update-signatures').cronJob;
+const signatureCronJob = require('./cron-job/update-signatures');
 
 // router modules
 const authenticateRouter = require('./routes/authenticate');
@@ -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, requestRouter);
+app.use(urls.request, apiAuthenticationMiddleware, checkSql, 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, 'confirmed': 1}, ['decorationId', 'date'],
+  AwardingModel.find({'userId': userId}, ['decorationId', 'date'],
     {sort: {date: 'asc'}}).populate('decorationId', ['isMedal'])
     .exec((err, awardings) => {
         if (err) {
@@ -209,8 +209,6 @@ let saveJimpImageAndCompress = (image, userId, res, next) => {
     }).then((files) => {
       res.locals.items = {status: 'success'};
       return next();
-    }).catch((error) => {
-      console.log(error)
     })
   }, 3000);
 };

static/src/app/app.component.html

@@ -48,21 +48,6 @@
               </li>
             </ul>
           </li>
-          <li *ngIf="loginService.hasPermission(2)" class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
-               aria-expanded="false">
-              Anträge
-              <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-              <li>
-                <a [routerLink]="['/confirm-promotion']">Beförderung</a>
-              </li>
-              <li>
-                <a [routerLink]="['/confirm-award']">Orden/ Auszeichnung</a>
-              </li>
-            </ul>
-          </li>
         </ul>
 
         <ul class="nav navbar-nav" style="float: right">

static/src/app/app.config.ts

@@ -4,7 +4,7 @@ export class AppConfig {
   public readonly apiUrl = '';
 
   public readonly apiAppUserPath        = '/account/';
-  public readonly apiAwardPath          = '/awardings';
+  public readonly apiAwardPath          = '/awardings/';
   public readonly apiDecorationPath     = '/decorations/';
   public readonly apiAuthenticationPath = '/authenticate';
   public readonly apiSignupPath         = '/authenticate/signup';

static/src/app/app.routing.ts

@@ -1,7 +1,7 @@
-import {RouterModule, Routes} from "@angular/router";
-import {LoginComponent} from "./login/index";
-import {NotFoundComponent} from "./not-found/not-found.component";
-import {LoginGuardAdmin, LoginGuardHL, LoginGuardSQL} from "./login/login.guard";
+import {Routes, RouterModule} from '@angular/router';
+import {LoginComponent} from './login/index';
+import {NotFoundComponent} from './not-found/not-found.component';
+import {LoginGuardAdmin, LoginGuardHL, LoginGuardSQL} from './login/login.guard';
 import {usersRoutes, usersRoutingComponents} from "./users/users.routing";
 import {squadsRoutes, squadsRoutingComponents} from "./squads/squads.routing";
 import {decorationsRoutes, decorationsRoutingComponents} from "./decorations/decoration.routing";
@@ -11,8 +11,6 @@ import {SignupComponent} from "./login/signup.component";
 import {AdminComponent} from "./admin/admin.component";
 import {RequestAwardComponent} from "./request/award/req-award.component";
 import {RequestPromotionComponent} from "./request/promotion/req-promotion.component";
-import {ConfirmPromotionComponent} from "./request/confirm-promotion/confirm-promotion.component";
-import {ConfirmAwardComponent} from "./request/confirm-award/confirm-award.component";
 
 
 export const appRoutes: Routes = [
@@ -25,8 +23,6 @@ export const appRoutes: Routes = [
 
   {path: 'request-award', component: RequestAwardComponent, canActivate: [LoginGuardSQL]},
   {path: 'request-promotion', component: RequestPromotionComponent, canActivate: [LoginGuardSQL]},
-  {path: 'confirm-award', component: ConfirmAwardComponent, canActivate: [LoginGuardHL]},
-  {path: 'confirm-promotion', component: ConfirmPromotionComponent, canActivate: [LoginGuardHL]},
 
   {path: 'cc-users', children: usersRoutes, canActivate: [LoginGuardHL]},
   {path: 'cc-squads', children: squadsRoutes, canActivate: [LoginGuardHL]},
@@ -42,8 +38,7 @@ export const appRoutes: Routes = [
 
 export const appRouting = RouterModule.forRoot(appRoutes);
 
-export const routingComponents = [LoginComponent, SignupComponent, RequestAwardComponent, RequestPromotionComponent, ConfirmAwardComponent,
-  ConfirmPromotionComponent, AdminComponent, ...armyRoutingComponents, NotFoundComponent, ...usersRoutingComponents,
+export const routingComponents = [LoginComponent, SignupComponent, RequestAwardComponent, RequestPromotionComponent, AdminComponent, ...armyRoutingComponents , NotFoundComponent, ...usersRoutingComponents,
   ...squadsRoutingComponents, ...decorationsRoutingComponents, ...ranksRoutingComponents];
 
 export const routingProviders = [LoginGuardHL];

static/src/app/army/army-member.component.html

@@ -32,7 +32,7 @@
         </tr>
         </thead>
         <tbody *ngFor="let award of user.awards">
-        <tr *ngIf="award.confirmed === 1" class="cell-outline">
+        <tr *ngIf="award.confirmed" class="cell-outline">
           <td class="text-center" *ngIf="award.decorationId.isMedal">
             <img height="90px" src="resource/decoration/{{award.decorationId._id}}.png">
           </td>

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

@@ -3,11 +3,9 @@
   <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!
-      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>
+    <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!
+      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' drin 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>
 
@@ -27,16 +25,9 @@
         <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">
-        {{error}}
+        Login fehlgeschlagen
     </span>
     </div>
 

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

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

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

@@ -37,11 +37,10 @@ export interface Award {
   reason?: string;
   proposer?: AppUser;
   date?: number; // since Date.now() returns a number
-  confirmed?: number;
+  confirmed?: boolean;
 }
 
 export interface Promotion {
-  _id?: string;
   userId?: string
   oldRankLvl: number,
   newRankLvl: number

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

@@ -97,10 +97,10 @@
           {{award.proposer?.username}}
         </td>
         <td class="text-right">
-          {{award.date | date: 'dd.MM.yyyy'}}
+          <a class="small text-nowrap">{{award.date | date: 'dd.MM.yyyy'}}</a>
         </td>
         <td class="text-center">
-          {{award.confirmed === 0? 'In Bearbeitung' : (award.confirmed === 1? 'Genehmigt' : 'Abgelehnt')}}
+          {{award.confirmed? 'Bestätigt' : 'In Bearbeitung'}}
         </td>
       </tr>
       </tbody>

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

@@ -1,43 +0,0 @@
-.decoration-preview {
-  padding: 5px;
-}
-
-.action {
-  cursor: pointer;
-}
-
-.table {
-  overflow-wrap: break-word;
-  table-layout: fixed;
-}
-
-.table-container {
-  margin-top: 40px;
-  overflow-x: auto;
-  width: 75%;
-}
-
-/* enable scrolling for long list of awardings */
-.overview {
-  position: fixed;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  width: 100%;
-  border-left: thin solid lightgrey;
-  padding: 20px 0 0 50px;
-  margin-left: 10px;
-  height: 100vh;
-  bottom: 10px;
-}
-
-.form-group {
-  width: 25%;
-}
-
-h3 {
-  margin: 80px 0 20px -20px;
-}
-
-label {
-  display: block;
-}

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

@@ -1,55 +0,0 @@
-<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>
-      <tr>
-        <th class="col-sm-1">Teilnehmer</th>
-        <th class="col-sm-1"></th>
-        <th class="col-sm-2">Auszeichnung</th>
-        <th class="col-sm-2">Begründung</th>
-        <th class="col-sm-1 ">Antragsteller</th>
-        <th class="col-sm-1 text-right">Datum</th>
-        <th class="col-sm-1 text-right">Aktion</th>
-      </tr>
-      </thead>
-      <tbody *ngFor="let award of awards">
-      <tr>
-        <td>
-          {{award.userId.username}}
-        </td>
-        <td *ngIf="award.decorationId.isMedal">
-          <img height="40px" src="resource/decoration/{{award.decorationId._id}}.png">
-        </td>
-        <td *ngIf="!award.decorationId.isMedal">
-          <img width="60px" src="resource/decoration/{{award.decorationId._id}}.png">
-        </td>
-        <td>
-          {{award.decorationId.name}}
-        </td>
-        <td>
-          {{award.reason}}
-        </td>
-        <td>
-          {{award.proposer?.username}}
-        </td>
-        <td class="text-right">
-          {{award.date | date: 'dd.MM.yyyy'}}
-        </td>
-        <td class="text-right">
-          <a class="action" (click)="confirm(award, true)">Bestätigen</a><br>
-          <a class="action" (click)="confirm(award, false)">Ablehnen</a>
-        </td>
-      </tr>
-      </tbody>
-    </table>
-  </div>
-
-</form>

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

@@ -1,49 +0,0 @@
-import {Component} from "@angular/core";
-import {ActivatedRoute, Router} from "@angular/router";
-import {Award} from "../../models/model-interfaces";
-import {AwardingService} from "../../services/awarding-service/awarding.service";
-
-
-@Component({
-  templateUrl: './confirm-award.component.html',
-  styleUrls: ['./confirm-award.component.css'],
-})
-export class ConfirmAwardComponent {
-
-  awards: Award[];
-
-  showSuccessLabel = false;
-
-  constructor(private router: Router,
-              private route: ActivatedRoute,
-              private awardingService: AwardingService) {
-  }
-
-  ngOnInit() {
-    let currentUser = JSON.parse(localStorage.getItem('currentUser'));
-
-    this.awardingService.getUnconfirmedAwards(currentUser.squad.fraction).subscribe(awards => {
-      this.awards = awards;
-    });
-  }
-
-  confirm(award: Award, decision: boolean) {
-    const updateObject = {
-      _id: award._id,
-      confirmed: decision ? 1 : 2
-    };
-
-    this.awardingService.updateAward(updateObject).subscribe(res => {
-      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

@@ -1,43 +0,0 @@
-.decoration-preview {
-  padding: 5px;
-}
-
-.action {
-  cursor: pointer;
-}
-
-.table {
-  overflow-wrap: break-word;
-  table-layout: fixed;
-}
-
-.table-container {
-  margin-top: 40px;
-  overflow-x: auto;
-  width: 65%;
-}
-
-/* enable scrolling for long list of awardings */
-.overview {
-  position: fixed;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  width: 100%;
-  border-left: thin solid lightgrey;
-  padding: 20px 0 0 50px;
-  margin-left: 10px;
-  height: 100vh;
-  bottom: 10px;
-}
-
-.form-group {
-  width: 25%;
-}
-
-h3 {
-  margin: 80px 0 20px -20px;
-}
-
-label {
-  display: block;
-}

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

@@ -1,54 +0,0 @@
-<form #form="ngForm" class="overview">
-  <h3>Offene Anträge - Beförderung</h3>
-
-  <span *ngIf="showSuccessLabel"
-        class="label label-success label-small"
-        style="margin-left: inherit">
-  Erfolgreich gespeichert
-  </span>
-
-  <div class="table-container">
-    <label>Beförderungsanträge</label>
-    <table class="table table-hover">
-      <thead>
-      <tr>
-        <th class="col-sm-1">Teilnehmer</th>
-        <th class="col-sm-1">Alter Rang</th>
-        <th class="col-sm-1">Neuer Rang</th>
-        <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 promotions">
-      <tr>
-        <td>
-          {{promotion.userId.username}}
-        </td>
-        <td *ngFor="let rank of (ranks | rankfilter: promotion.oldRankLvl)">
-          {{rank.name}}
-        </td>
-        <td *ngFor="let rank of (ranks | rankfilter: promotion.newRankLvl)">
-          {{rank.name}}
-        </td>
-        <td>
-          {{promotion.proposer.username}}
-        </td>
-        <td class="text-center">
-          {{promotion.timestamp | date: 'dd.MM.yyyy'}}
-        </td>
-        <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>
-  </div>
-
-
-</form>

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

@@ -1,56 +0,0 @@
-import {Component} from "@angular/core";
-import {ActivatedRoute, Router} from "@angular/router";
-import {Promotion, Rank} from "../../models/model-interfaces";
-import {RankService} from "../../services/rank-service/rank.service";
-import {PromotionService} from "../../services/promotion-service/promotion.service";
-
-
-@Component({
-  templateUrl: './confirm-promotion.component.html',
-  styleUrls: ['./confirm-promotion.component.css'],
-})
-export class ConfirmPromotionComponent {
-
-  showSuccessLabel = false;
-
-  ranks: Rank[];
-
-  promotions: Promotion[];
-
-  constructor(private router: Router,
-              private route: ActivatedRoute,
-              private rankService: RankService,
-              private promotionService: PromotionService) {
-  }
-
-  ngOnInit() {
-    let currentUser = JSON.parse(localStorage.getItem('currentUser'));
-    // show only current users fraction promotions
-    this.rankService.findRanks('', currentUser.squad.fraction).subscribe(ranks => {
-      this.ranks = ranks;
-    });
-    this.promotionService.getUnconfirmedPromotions(currentUser.squad.fraction).subscribe(promotions => {
-      this.promotions = promotions;
-    })
-
-  }
-
-  confirm(promotion: Promotion, decision: boolean) {
-    const updateObject = {
-      _id: promotion._id,
-      confirmed: decision ? 1 : 2
-    };
-
-    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);
-      });
-    });
-  }
-
-}

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

@@ -1,5 +1,5 @@
 import {Injectable} from "@angular/core";
-import {Award, User} from "../../models/model-interfaces";
+import {User} from "../../models/model-interfaces";
 import {Headers, Http} from "@angular/http";
 import {Observable} from "rxjs/Observable";
 import {AppConfig} from "../../app.config";
@@ -12,11 +12,6 @@ export class AwardingService {
               private config: AppConfig) {
   }
 
-  getUnconfirmedAwards(fraction?: string) {
-    return this.http.get(this.config.apiUrl + this.config.apiAwardPath + '?inProgress=true&fractFilter=' + fraction)
-      .map(res => res.json())
-  }
-
   /**
    * get awards array with populated decorations
    */
@@ -25,21 +20,16 @@ export class AwardingService {
       .map(res => res.json())
   }
 
-  addAwarding(award: Award) {
+  addAwarding(award) {
     return this.http.post(this.config.apiUrl + this.config.apiAwardPath, award)
   }
 
-  updateAward(award) {
-    return this.http.patch(this.config.apiUrl + this.config.apiAwardPath + '/' + award._id, award)
-      .map(res => res.json())
-  }
-
-  requestAwarding(award: Award) {
+  requestAwarding(award) {
     return this.http.post(this.config.apiUrl + this.config.apiRequestAwardPath, award)
   }
 
   deleteAwarding(awardingId) {
-    return this.http.delete(this.config.apiUrl + this.config.apiAwardPath + '/' + awardingId)
+    return this.http.delete(this.config.apiUrl + this.config.apiAwardPath + awardingId)
   }
 
 }

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

@@ -27,7 +27,11 @@ 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,11 +10,6 @@ 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())
@@ -24,11 +19,6 @@ 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 === 0? 'In Bearbeitung' : (award.confirmed === 1? 'Genehmigt' : 'Abgelehnt')}}
+          {{award.confirmed? 'Bestätigt' : 'In Bearbeitung'}}
         </td>
         <td class="text-center">
           <span class="glyphicon glyphicon-trash trash" title="Löschen" (click)="deleteAwarding(award._id)"></span>