Browse Source

fix

master
drfelfel 1 year ago
parent
commit
6835d13f9c
2 changed files with 6 additions and 6 deletions
  1. +4
    -4
      src/routes/panel/volunteer/table/table.component.html
  2. +2
    -2
      src/routes/panel/volunteer/table/table.component.ts

+ 4
- 4
src/routes/panel/volunteer/table/table.component.html View File

@ -125,13 +125,13 @@
<td mat-cell *matCellDef="let element">{{ element.step }}</td>
</ng-container>
<ng-container matColumnDef="status">
<ng-container matColumnDef="waiting">
<th mat-header-cell *matHeaderCellDef >وضعیت داوطلب</th>
<td mat-cell *matCellDef="let element">
<b style="color: rgb(151, 9, 9)(145, 142, 142);" *ngIf="element.status == 'reject'">رد شده</b>
<b style="color: rgb(1, 87, 27)(145, 142, 142);" *ngIf="element.status == 'resolve'">تایید شده</b>
<b style="color: rgb(212, 176, 14)(145, 142, 142);" *ngIf="element.status == 'wait'">در انتظار تایید</b>
<b style="color: rgb(151, 9, 9)(145, 142, 142);" *ngIf="element.waiting == 'reject'">رد شده</b>
<b style="color: rgb(1, 87, 27)(145, 142, 142);" *ngIf="element.waiting == 'resolve'">تایید شده</b>
<b style="color: rgb(212, 176, 14)(145, 142, 142);" *ngIf="element.waiting == 'wait'">در انتظار تایید</b>
</td>
</ng-container>

+ 2
- 2
src/routes/panel/volunteer/table/table.component.ts View File

@ -11,7 +11,7 @@ import * as moment from 'jalali-moment'
})
export class TableComponent implements OnInit {
public columns: string[] = ['position', 'uid', 'firstname', 'lastname', 'fathername', 'major', 'grade', 'nationalcode','entrynumber','status', 'step', 'done', 'options'];
public columns: string[] = ['position', 'uid', 'firstname', 'lastname', 'fathername', 'major', 'grade', 'nationalcode','entrynumber','waiting', 'step', 'done', 'options'];
public data: MatTableDataSource<object> = new MatTableDataSource<object>();
public loading: boolean = false;
public search: string = '';
@ -50,7 +50,7 @@ export class TableComponent implements OnInit {
user.step = list[i]['step']
user.options = true
user.uid = list[i]['uid']
user.status = list[i]['status']
user.waiting = list[i]['waiting']
user.done = list[i]['done']
if (user.done) {
user.done = moment(user.done).format("jYYYY/jMM/jDD")

Loading…
Cancel
Save