tanshu/brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed: Star now showing in employee list

Browse Source
This commit is contained in:
Amritanshu Agrawal 2020-05-30 16:18:25 +05:30
parent dd799a8e2f
commit 95e92fc2bd
3 changed files with 11 additions and 2 deletions
brewman/routers
employee.py
overlord/src/app/employee/employee-list
employee-list.component.cssemployee-list.component.html

2
brewman/routers/employee.py

@ -137,11 +137,11 @@ async def show_list(db: Session = Depends(get_db), user: UserToken = Depends(get
"points": item.points, "points": item.points,
"isActive": item.is_active, "isActive": item.is_active,
"costCentre": item.cost_centre.name, "costCentre": item.cost_centre.name,
# "url": request.route_url("employees_id", id=item.id),
"joiningDate": item.joining_date.strftime("%d-%b-%Y"), "joiningDate": item.joining_date.strftime("%d-%b-%Y"),
"leavingDate": "" "leavingDate": ""
if item.is_active if item.is_active
else item.leaving_date.strftime("%d-%b-%Y"), else item.leaving_date.strftime("%d-%b-%Y"),
"isStarred": item.is_starred
} }
for item in db.query(Employee) for item in db.query(Employee)
.order_by(desc(Employee.is_active)) .order_by(desc(Employee.is_active))

3
overlord/src/app/employee/employee-list/employee-list.component.css

@ -0,0 +1,3 @@
.gold {
color: gold;
}

8
overlord/src/app/employee/employee-list/employee-list.component.html

@ -29,7 +29,13 @@
<!-- Name Column --> <!-- Name Column -->
<ng-container matColumnDef="name"> <ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header>Name</mat-header-cell> <mat-header-cell *matHeaderCellDef mat-sort-header>Name</mat-header-cell>
<mat-cell *matCellDef="let row"><a [routerLink]="['/employees', row.id]">{{row.name}}</a></mat-cell> <mat-cell *matCellDef="let row">
<a [routerLink]="['/employees', row.id]">
<mat-icon matSuffix *ngIf="row.isStarred" class="gold">star
</mat-icon>
{{row.name}}
</a>
</mat-cell>
</ng-container> </ng-container>
<!-- Designation Column --> <!-- Designation Column -->