Strict done!!
This commit is contained in:
@ -12,6 +12,14 @@ export class AttendanceItem {
|
||||
fullDay?: boolean;
|
||||
|
||||
public constructor(init?: Partial<AttendanceItem>) {
|
||||
this.id = '';
|
||||
this.code = 0;
|
||||
this.name = '';
|
||||
this.designation = '';
|
||||
this.department = '';
|
||||
this.attendanceType = new AttendanceType();
|
||||
this.prints = '';
|
||||
this.hoursWorked = '';
|
||||
Object.assign(this, init);
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,6 +4,9 @@ export class AttendanceType {
|
||||
value: number;
|
||||
|
||||
public constructor(init?: Partial<AttendanceType>) {
|
||||
this.id = 0;
|
||||
this.name = '';
|
||||
this.value = 1;
|
||||
Object.assign(this, init);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { FormArray, FormBuilder, FormGroup } from '@angular/forms';
|
||||
import { FormArray, FormBuilder, FormControl, FormGroup } from '@angular/forms';
|
||||
import { MatDialog } from '@angular/material/dialog';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import * as moment from 'moment';
|
||||
@ -21,11 +21,11 @@ import { AttendanceService } from './attendance.service';
|
||||
})
|
||||
export class AttendanceComponent implements OnInit {
|
||||
public attendanceObservable = new BehaviorSubject<AttendanceItem[]>([]);
|
||||
dataSource: AttendanceDataSource;
|
||||
dataSource: AttendanceDataSource = new AttendanceDataSource(this.attendanceObservable);
|
||||
form: FormGroup;
|
||||
|
||||
info: Attendance;
|
||||
attendanceTypes: AttendanceType[];
|
||||
info: Attendance = new Attendance();
|
||||
attendanceTypes: AttendanceType[] = [];
|
||||
|
||||
displayedColumns = ['code', 'name', 'designation', 'department', 'status', 'prints'];
|
||||
|
||||
@ -50,7 +50,9 @@ export class AttendanceComponent implements OnInit {
|
||||
|
||||
this.info = data.info;
|
||||
this.attendanceTypes = data.attendanceTypes;
|
||||
this.form.get('date').setValue(moment(this.info.date, 'DD-MMM-YYYY').toDate());
|
||||
(this.form.get('date') as FormControl).setValue(
|
||||
moment(this.info.date, 'DD-MMM-YYYY').toDate(),
|
||||
);
|
||||
this.form.setControl(
|
||||
'attendances',
|
||||
this.fb.array(
|
||||
|
||||
@ -18,7 +18,7 @@ const serviceName = 'AttendanceService';
|
||||
export class AttendanceService {
|
||||
constructor(private http: HttpClient, private log: ErrorLoggerService) {}
|
||||
|
||||
get(date: string): Observable<Attendance> {
|
||||
get(date: string | null): Observable<Attendance> {
|
||||
const getUrl: string = date === null ? url : `${url}/${date}`;
|
||||
return <Observable<Attendance>>(
|
||||
this.http
|
||||
|
||||
@ -5,6 +5,8 @@ export class Attendance {
|
||||
body: AttendanceItem[];
|
||||
|
||||
public constructor(init?: Partial<Attendance>) {
|
||||
this.date = '';
|
||||
this.body = [];
|
||||
Object.assign(this, init);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user