hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

show reject reason for squad leader

pull/30/head
HardiReady 2018-03-11 13:59:04 +01:00
parent 7287f6b8a1
commit 7808101c58
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
static/src/app/models/model-interfaces.ts
View File

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

2
static/src/app/request/award/req-award.component.css
View File

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

4
static/src/app/request/award/req-award.component.html
View File

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