Compare commits

..

No commits in common. "162453c894ef86d793662b31b077048f417f925c" and "07a6822920418a92c34e4bfb1cd8d45cff1ce260" have entirely different histories.

2 changed files with 15 additions and 28 deletions

View File

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

View File

@ -93,28 +93,22 @@ export class AwardUserComponent implements OnInit {
}
}
deleteAwarding() {
const checkedAwardings = this.awards.filter(award => award['checked'] === true);
if (checkedAwardings.length > 0) {
checkedAwardings.forEach(awarding => {
this.awardingService.deleteAwarding(awarding._id).subscribe((res) => {
deleteAwarding(awardingId) {
this.awardingService.deleteAwarding(awardingId).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;
}
}