api/models/awarding.js

@@ -29,9 +29,6 @@ const AwardingSchema = new Schema({
     max: 2,
     default: 0
   },
-  rejectReason: {
-    type: String
-  },
   date: {
     type: Date,
     default: Date.now()

api/routes/awardings.js

@@ -114,6 +114,7 @@ awarding.route('/:id')
             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};
 

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

@@ -83,7 +83,6 @@ export interface Award {
   proposer?: AppUser;
   date?: number; // since Date.now() returns a number
   confirmed?: number;
-  rejectReason?: string;
 }
 
 export interface Promotion {

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

@@ -19,7 +19,7 @@
 .table-container {
   margin-top: 40px;
   overflow-x: auto;
-  width: 90%;
+  width: 75%;
   min-width: 800px;
   padding: 5px;
 }

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

@@ -77,7 +77,6 @@
         <th class="col-sm-1 ">Antragsteller</th>
         <th class="col-sm-1 text-right">Datum</th>
         <th class="col-sm-1 text-center">Status</th>
-        <th class="col-sm-2 text-right">Grund für Ablehnung</th>
       </tr>
       </thead>
       <tbody *ngFor="let award of awards">
@@ -103,9 +102,6 @@
         <td class="text-center">
           {{award.confirmed === 0? 'In Bearbeitung' : (award.confirmed === 1? 'Genehmigt' : 'Abgelehnt')}}
         </td>
-        <td class="text-right">
-          {{award.rejectReason ? award.rejectReason : ''}}
-        </td>
       </tr>
       </tbody>
     </table>

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

@@ -16,7 +16,7 @@
         <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-2 text-right">Aktion</th>
+        <th class="col-sm-1 text-right">Aktion</th>
       </tr>
       </thead>
       <tbody *ngFor="let award of awards">
@@ -34,10 +34,7 @@
           {{award.decorationId.name}}
         </td>
         <td>
-          <textarea style="width:100%;"
+          {{award.reason}}
-                    rows="7"
-                    title="reason"
-                    #reason>{{award.reason}}</textarea>
         </td>
         <td>
           {{award.proposer?.username}}
@@ -46,15 +43,8 @@
           {{award.date | date: 'dd.MM.yyyy'}}
         </td>
         <td class="text-right">
-          <a class="action" (click)="confirm(award, true, reason.value)">Bestätigen</a><br>
+          <a class="action" (click)="confirm(award, true)">Bestätigen</a><br>
-          <a class="action" (click)="confirm(award, false, reason.value, rejectReason.value)">Ablehnen</a>
+          <a class="action" (click)="confirm(award, false)">Ablehnen</a>
-          <div>
-            <textarea cols="20"
-                      rows="5"
-                      title="rejectReason"
-                      placeholder="Begründung für Ablehnung (optional)"
-                      #rejectReason></textarea>
-          </div>
         </td>
       </tr>
       </tbody>

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

@@ -25,20 +25,12 @@ export class ConfirmAwardComponent implements OnInit {
     });
   }
 
-  confirm(award: Award, decision: boolean, reason: string, rejectReason: string) {
+  confirm(award: Award, decision: boolean) {
     const updateObject = {
       _id: award._id,
       confirmed: decision ? 1 : 2
     };
 
-    if (rejectReason) {
-      updateObject['rejectReason'] = rejectReason;
-    }
-
-    if (reason && reason !== award.reason) {
-      updateObject['reason'] = reason;
-    }
-
     this.awardingService.updateAward(updateObject).subscribe(res => {
       const currentUser = this.loginService.getCurrentUser();
       this.awardingService.getUnconfirmedAwards(currentUser.squad.fraction).subscribe(awards => {