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

@@ -73,9 +73,7 @@
         <th class="col-sm-2">Begründung</th>
         <th class="col-sm-1 text-right">Datum</th>
         <th class="col-sm-1 text-center">Status</th>
-        <th class="col-sm-1 text-center">
+        <th class="col-sm-1 text-center"></th>
-          <span class="btn btn-default" (click)="deleteAwarding()">Löschen</span>
-        </th>
       </tr>
       </thead>
       <tbody *ngFor="let award of awards">
@@ -96,15 +94,10 @@
           <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 === 0? 'In Bearbeitung' : (award.confirmed === 1? 'Genehmigt' : 'Abgelehnt')}}
         </td>
         <td class="text-center">
-          <label>
+          <span class="glyphicon glyphicon-trash trash" title="Löschen" (click)="deleteAwarding(award._id)"></span>
-            <input name="deleteAward"
-                   type="checkbox"
-                   value="{{award._id}}"
-                   [(ngModel)]="award.checked">
-          </label>
         </td>
       </tr>
       </tbody>

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

@@ -93,28 +93,22 @@ export class AwardUserComponent implements OnInit {
     }
   }
 
-  deleteAwarding() {
+  deleteAwarding(awardingId) {
-    const checkedAwardings = this.awards.filter(award => award['checked'] === true);
+    this.awardingService.deleteAwarding(awardingId).subscribe((res) => {
-
-    if (checkedAwardings.length > 0) {
-      checkedAwardings.forEach(awarding => {
-        this.awardingService.deleteAwarding(awarding._id).subscribe((res) => {
       this.awardingService.getUserAwardings(this.userId)
           .subscribe((awards) => {
             this.awards = awards;
-              });
-        });
-      });
-
             this.showSuccessLabel = true;
             setTimeout(() => {
               this.showSuccessLabel = false;
-      }, 4000);
+            }, 2000);
-    }
+          });
+    });
   }
 
   cancel() {
     this.router.navigate(['../..'], {relativeTo: this.route});
     return false;
   }
+
 }