Attendance Done!!

Changed the datatype of dates in attendance and employee to date from datetime
this might bork things in other places
This commit is contained in:
tanshu
2020-05-14 21:49:22 +05:30
parent 0a79b1acbb
commit bd05e6bb17
17 changed files with 201 additions and 108 deletions

View File

@ -58,9 +58,9 @@
{{row.prints}}
<mat-icon *ngIf="!form.controls.attendances.controls[i].pristine">new_releases</mat-icon>
<mat-chip-list class="no-bg">
<mat-chip *ngIf="row.hours.length" class="no-bg" [selected]="row.worked !== 'Error'"
[color]="row.worked === true ? 'primary' : 'warn'">
{{row.hours}}
<mat-chip *ngIf="row.hoursWorked.length" class="no-bg" [selected]="true"
[color]="row.fullDay === true ? 'primary' : 'warn'">
{{row.hoursWorked}}
</mat-chip>
</mat-chip-list>
</mat-cell>

View File

@ -17,8 +17,8 @@ export class AttendanceItem {
department: string;
attendanceType: AttendanceType;
prints: string;
hours: string;
worked: string;
hoursWorked: string;
fullDay?: boolean;
public constructor(init?: Partial<AttendanceItem>) {
Object.assign(this, init);

View File

@ -46,7 +46,7 @@ export class UnpostedDataSource extends DataSource<Unposted> {
case 'date':
return compare(a.date, b.date, isAsc);
case 'type':
return compare(a.voucherType, b.voucherType, isAsc);
return compare(a.type, b.type, isAsc);
case 'debitAmount':
return compare(+a.debitAmount, +b.debitAmount, isAsc);
case 'creditAmount':