Moved to Angular 6.0

---- Pending * Table width for the points column in incentive * Linting * keyboard navigation where it was used earlier * can remove the unused totals calculated serverside in productledger * spinner and loading bars * Activate Guard for Employee Function tabs * Progress for Fingerprint uploads * deleted reconcile and receipe features as they were not being used * focus the right control on component load
2018-06-09 17:05:11 +05:30
parent b3cb01da02
commit 6be1dd5a3a
1380 changed files with 23914 additions and 18722 deletions
@@ -0,0 +1,18 @@
+import {DataSource} from '@angular/cdk/collections';
+import {Observable} from 'rxjs';
+import {EmployeeAttendanceItem} from './employee-attendance';
+
+
+export class EmployeeAttendanceDataSource extends DataSource<EmployeeAttendanceItem> {
+
+  constructor(private data: Observable<EmployeeAttendanceItem[]>) {
+    super();
+  }
+
+  connect(): Observable<EmployeeAttendanceItem[]> {
+    return this.data;
+  }
+
+  disconnect() {
+  }
+}
@@ -0,0 +1,21 @@
+import {Injectable} from '@angular/core';
+import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from '@angular/router';
+import {Observable} from 'rxjs/internal/Observable';
+import {EmployeeAttendanceService} from './employee-attendance.service';
+import {EmployeeAttendance} from './employee-attendance';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class EmployeeAttendanceResolver implements Resolve<EmployeeAttendance> {
+
+  constructor(private ser: EmployeeAttendanceService) {
+  }
+
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<EmployeeAttendance> {
+    const id = route.paramMap.get('id');
+    const startDate = route.queryParamMap.get('startDate') || null;
+    const finishDate = route.queryParamMap.get('finishDate') || null;
+    return this.ser.get(id, startDate, finishDate);
+  }
+}
@@ -0,0 +1,52 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {RouterModule, Routes} from '@angular/router';
+import {EmployeeAttendanceResolver} from './employee-attendance-resolver.service';
+import {AuthGuard} from '../auth/auth-guard.service';
+import {EmployeeAttendanceComponent} from './employee-attendance.component';
+import {AttendanceTypeResolver} from '../attendance/attendance-type-resolver.service';
+
+const employeeEmployeeAttendanceRoutes: Routes = [
+  {
+    path: 'EmployeeAttendance',
+    component: EmployeeAttendanceComponent,
+    canActivate: [AuthGuard],
+    data: {
+      permission: 'Attendance'
+    },
+    resolve: {
+      info: EmployeeAttendanceResolver,
+      attendanceTypes: AttendanceTypeResolver
+    },
+    runGuardsAndResolvers: 'always'
+  },
+  {
+    path: 'EmployeeAttendance/:id',
+    component: EmployeeAttendanceComponent,
+    canActivate: [AuthGuard],
+    data: {
+      permission: 'Attendance'
+    },
+    resolve: {
+      info: EmployeeAttendanceResolver,
+      attendanceTypes: AttendanceTypeResolver
+    },
+    runGuardsAndResolvers: 'always'
+  }
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    RouterModule.forChild(employeeEmployeeAttendanceRoutes)
+
+  ],
+  exports: [
+    RouterModule
+  ],
+  providers: [
+    EmployeeAttendanceResolver
+  ]
+})
+export class EmployeeAttendanceRoutingModule {
+}
@@ -0,0 +1,53 @@
+.right {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.center {
+  display: flex;
+  justify-content: center;
+}
+
+.present {
+    background-color: #228B22;
+}
+
+.off-day {
+    background-color: #87CEFA;
+}
+
+.on-leave {
+    background-color: #CD5C5C;
+}
+
+.absent {
+    background-color: #CD0000;
+}
+
+.half-day {
+    background-color: #98FB98;
+}
+
+.double-duty {
+    background-color: #006400;
+}
+
+.paid-leave-availed {
+    background-color: #EEEE00;
+}
+
+.casual-leave-availed {
+    background-color: #800080;
+}
+
+.compensatory-off {
+    background-color: #F5DEB3;
+}
+
+.half-day-pl {
+    background-color: #FFF68F;
+}
+
+.half-day-cl {
+    background-color: #FF00FF;
+}
@@ -0,0 +1,71 @@
+<mat-card>
+  <mat-card-title-group>
+    <mat-card-title>Employee Attendance</mat-card-title>
+  </mat-card-title-group>
+  <mat-card-content>
+    <form [formGroup]="form" fxLayout="column">
+      <div fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="20px" fxLayoutGap.lt-md="0px"
+           fxLayoutAlign="space-around start">
+        <mat-form-field fxFlex>
+          <input matInput [matDatepicker]="startDate" (focus)="startDate.open()" placeholder="Start Date"
+                 formControlName="startDate" autocomplete="off">
+          <mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
+          <mat-datepicker #startDate></mat-datepicker>
+        </mat-form-field>
+        <mat-form-field fxFlex>
+          <input matInput [matDatepicker]="finishDate" (focus)="finishDate.open()" placeholder="Finish Date"
+                 formControlName="finishDate" autocomplete="off">
+          <mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
+          <mat-datepicker #finishDate></mat-datepicker>
+        </mat-form-field>
+      </div>
+      <div fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="20px" fxLayoutGap.lt-md="0px"
+           fxLayoutAlign="space-around start">
+        <mat-form-field fxFlex="80">
+          <input type="text" matInput #employeeElement placeholder="Employee" [matAutocomplete]="auto"
+                 formControlName="employee" autocomplete="off">
+          <mat-autocomplete #auto="matAutocomplete" autoActiveFirstOption [displayWith]="displayFn"
+                            (optionSelected)="selected($event)">
+            <mat-option *ngFor="let employee of employees | async" [value]="employee">{{employee.name}}</mat-option>
+          </mat-autocomplete>
+        </mat-form-field>
+        <button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
+      </div>
+      <mat-table #table [dataSource]="dataSource" formArrayName="attendances">
+
+        <!-- Date Column -->
+        <ng-container matColumnDef="date">
+          <mat-header-cell *matHeaderCellDef class="center">Date</mat-header-cell>
+          <mat-cell *matCellDef="let row" class="center">{{row.date}}</mat-cell>
+        </ng-container>
+
+        <!-- Status Column -->
+        <ng-container matColumnDef="status">
+          <mat-header-cell *matHeaderCellDef>Status</mat-header-cell>
+          <mat-cell *matCellDef="let row; let i = index" [formGroupName]="i" fxFlex>
+            <mat-select formControlName="attendanceType" name="attendanceType">
+              <mat-option *ngFor="let at of attendanceTypes" [value]="at.id">
+                {{ at.name }}
+              </mat-option>
+            </mat-select>
+          </mat-cell>
+        </ng-container>
+
+        <!-- Prints Column -->
+        <ng-container matColumnDef="prints">
+          <mat-header-cell *matHeaderCellDef>Prints</mat-header-cell>
+          <mat-cell *matCellDef="let row; let i = index">
+            {{row.prints}}
+            <mat-icon *ngIf="!form.controls.attendances.controls[i].pristine">new_releases</mat-icon>
+          </mat-cell>
+        </ng-container>
+
+        <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+        <mat-row *matRowDef="let row; let i = index; columns: displayedColumns;" [class]="getClass(i)"></mat-row>
+      </mat-table>
+    </form>
+  </mat-card-content>
+  <mat-card-actions>
+    <button mat-raised-button color="primary" (click)="save()" [disabled]="form.pristine">Save</button>
+  </mat-card-actions>
+</mat-card>
@@ -0,0 +1,146 @@
+import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core';
+import {FormArray, FormBuilder, FormGroup} from '@angular/forms';
+import {MatAutocompleteSelectedEvent, MatDialog} from '@angular/material';
+import {ActivatedRoute, Router} from '@angular/router';
+import {BehaviorSubject, Observable, of as observableOf} from 'rxjs';
+import {EmployeeAttendanceDataSource} from './employee-attendance-datasource';
+import * as moment from 'moment';
+import {AuthService} from '../auth/auth.service';
+import {ToasterService} from '../core/toaster.service';
+import {EmployeeAttendanceService} from './employee-attendance.service';
+import {EmployeeAttendance, EmployeeAttendanceItem} from './employee-attendance';
+import {EmployeeService} from '../employee/employee.service';
+import {Employee} from '../employee/employee';
+import {debounceTime, distinctUntilChanged, map, startWith, switchMap} from 'rxjs/operators';
+import {AttendanceType} from '../attendance/attendance-type';
+
+@Component({
+  selector: 'app-employee-attendance',
+  templateUrl: './employee-attendance.component.html',
+  styleUrls: ['./employee-attendance.component.css']
+})
+export class EmployeeAttendanceComponent implements OnInit, AfterViewInit {
+  @ViewChild('employeeElement') employeeElement: ElementRef;
+  public employeeAttendanceObservable = new BehaviorSubject<EmployeeAttendanceItem[]>([]);
+  dataSource: EmployeeAttendanceDataSource;
+  form: FormGroup;
+
+  info: EmployeeAttendance;
+  attendanceTypes: AttendanceType[];
+
+  displayedColumns = ['date', 'status', 'prints'];
+
+  employees: Observable<Employee[]>;
+
+  constructor(
+    private route: ActivatedRoute,
+    private router: Router,
+    private fb: FormBuilder,
+    private dialog: MatDialog,
+    private toaster: ToasterService,
+    private auth: AuthService,
+    private ser: EmployeeAttendanceService,
+    private employeeSer: EmployeeService
+  ) {
+    this.createForm();
+    this.listenToEmployeeValueChanges();
+  }
+
+  ngOnInit() {
+    this.route.data
+      .subscribe((data: { info: EmployeeAttendance, attendanceTypes: AttendanceType[] }) => {
+        this.info = data.info;
+        this.attendanceTypes = data.attendanceTypes;
+        this.form.get('startDate').setValue(moment(this.info.startDate, 'DD-MMM-YYYY').toDate());
+        this.form.get('finishDate').setValue(moment(this.info.finishDate, 'DD-MMM-YYYY').toDate());
+        this.form.get('employee').setValue(this.info.employee);
+        this.form.setControl('attendances', this.fb.array(
+          this.info.body.map(
+            x => this.fb.group({
+              attendanceType: x.attendanceType.id
+            })
+          )
+        ));
+        this.dataSource = new EmployeeAttendanceDataSource(this.employeeAttendanceObservable);
+        this.employeeAttendanceObservable.next(this.info.body);
+      });
+  }
+
+  ngAfterViewInit() {
+    setTimeout(() => {
+      this.employeeElement.nativeElement.focus();
+    }, 0);
+  }
+
+  createForm() {
+    this.form = this.fb.group({
+      startDate: '',
+      finishDate: '',
+      employee: '',
+      attendances: this.fb.array([])
+    });
+  }
+
+  listenToEmployeeValueChanges() {
+    this.employees = this.form.get('employee').valueChanges
+      .pipe(
+        startWith(null),
+        map(x => (x !== null && x.length >= 1) ? x : null),
+        debounceTime(150),
+        distinctUntilChanged(),
+        switchMap(x => (x === null) ? observableOf([]) : this.employeeSer.autocomplete(x))
+      );
+
+  }
+
+  displayFn(employee?: Employee): string | undefined {
+    return employee ? employee.name : undefined;
+  }
+
+  selected(event: MatAutocompleteSelectedEvent): void {
+    this.info.employee = event.option.value;
+  }
+
+    getClass(index: number) {
+    const array = this.form.get('attendances') as FormArray;
+    const id = array.controls[index].value.attendanceType;
+    const name: string = this.attendanceTypes.filter(x => x.id === id)[0].name;
+    return name.toLowerCase().replace(/(\s+\+\s+)|(\s+)/g, '-');
+  }
+
+  show() {
+    const formValue = this.form.value;
+    this.info.startDate = moment(formValue.startDate).format('DD-MMM-YYYY');
+    this.info.finishDate = moment(formValue.finishDate).format('DD-MMM-YYYY');
+    this.router.navigate(['EmployeeAttendance', this.info.employee.id], {
+      queryParams: {
+        startDate: this.info.startDate,
+        finishDate: this.info.finishDate
+      }
+    });
+
+  }
+
+  save() {
+    this.ser.save(this.getEmployeeAttendance())
+      .subscribe(
+        (result) => {
+          this.toaster.show('Success', '');
+        },
+        (error) => {
+          this.toaster.show('Danger', error.error);
+        }
+      );
+  }
+
+  getEmployeeAttendance(): EmployeeAttendance {
+    const formValue = this.form.value;
+    this.info.startDate = moment(formValue.startDate).format('DD-MMM-YYYY');
+    this.info.finishDate = moment(formValue.finishDate).format('DD-MMM-YYYY');
+    const array = this.form.get('attendances') as FormArray;
+    this.info.body.forEach((item, index) => {
+      item.attendanceType.id = array.controls[index].value.attendanceType;
+    });
+    return this.info;
+  }
+}
@@ -0,0 +1,79 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {
+  DateAdapter,
+  MAT_DATE_FORMATS,
+  MAT_DATE_LOCALE,
+  MatAutocompleteModule,
+  MatButtonModule,
+  MatCardModule,
+  MatCheckboxModule,
+  MatDatepickerModule,
+  MatDialogModule,
+  MatFormFieldModule,
+  MatIconModule,
+  MatInputModule,
+  MatNativeDateModule,
+  MatPaginatorModule,
+  MatProgressSpinnerModule,
+  MatSelectModule,
+  MatSortModule,
+  MatTableModule
+} from '@angular/material';
+import {SharedModule} from '../shared/shared.module';
+import {ReactiveFormsModule} from '@angular/forms';
+import {CdkTableModule} from '@angular/cdk/table';
+import {EmployeeAttendanceRoutingModule} from './employee-attendance-routing.module';
+import {EmployeeAttendanceComponent} from './employee-attendance.component';
+import {MomentDateAdapter} from '@angular/material-moment-adapter';
+import {A11yModule} from '@angular/cdk/a11y';
+import {FlexLayoutModule, FlexModule} from '@angular/flex-layout';
+
+export const MY_FORMATS = {
+  parse: {
+    dateInput: 'DD-MMM-YYYY',
+  },
+  display: {
+    dateInput: 'DD-MMM-YYYY',
+    monthYearLabel: 'MMM YYYY',
+    dateA11yLabel: 'DD-MMM-YYYY',
+    monthYearA11yLabel: 'MMM YYYY',
+  },
+};
+
+@NgModule({
+  imports: [
+    A11yModule,
+    CommonModule,
+    CdkTableModule,
+    FlexModule,
+    FlexLayoutModule,
+    MatAutocompleteModule,
+    MatButtonModule,
+    MatCardModule,
+    MatCheckboxModule,
+    MatDatepickerModule,
+    MatDialogModule,
+    MatFormFieldModule,
+    MatIconModule,
+    MatInputModule,
+    MatNativeDateModule,
+    MatPaginatorModule,
+    MatProgressSpinnerModule,
+    MatSelectModule,
+    MatSortModule,
+    MatTableModule,
+    ReactiveFormsModule,
+    SharedModule,
+    EmployeeAttendanceRoutingModule
+  ],
+  declarations: [
+    EmployeeAttendanceComponent
+  ],
+  providers: [
+    {provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
+    {provide: MAT_DATE_FORMATS, useValue: MY_FORMATS},
+  ]
+})
+export class EmployeeAttendanceModule {
+}
@@ -0,0 +1,43 @@
+import {Injectable} from '@angular/core';
+import {Observable} from 'rxjs/internal/Observable';
+import {catchError} from 'rxjs/operators';
+import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
+import {EmployeeAttendance} from './employee-attendance';
+import {ErrorLoggerService} from '../core/error-logger.service';
+
+const httpOptions = {
+  headers: new HttpHeaders({'Content-Type': 'application/json'})
+};
+
+const url = '/api/EmployeeAttendance';
+const serviceName = 'AttendanceService';
+
+@Injectable({providedIn: 'root'})
+export class EmployeeAttendanceService {
+
+  constructor(private http: HttpClient, private log: ErrorLoggerService) {
+  }
+
+  get(id: string, startDate: string, finishDate: string): Observable<EmployeeAttendance> {
+    const getUrl: string = (id === null) ? url : `${url}/${id}`;
+    const options = {params: new HttpParams()};
+    if (startDate !== null) {
+      options.params = options.params.set('s', startDate);
+    }
+    if (finishDate !== null) {
+      options.params = options.params.set('f', finishDate);
+    }
+    return <Observable<EmployeeAttendance>>this.http.get<EmployeeAttendance>(getUrl, options)
+      .pipe(
+        catchError(this.log.handleError(serviceName, `get id=${id}`))
+      );
+  }
+
+  save(employeeAttendance: EmployeeAttendance): Observable<EmployeeAttendance> {
+    const id = employeeAttendance.employee.id;
+    return <Observable<EmployeeAttendance>>this.http.post<EmployeeAttendance>(`${url}/${id}`, employeeAttendance, httpOptions)
+      .pipe(
+        catchError(this.log.handleError(serviceName, 'save'))
+      );
+  }
+}
@@ -0,0 +1,25 @@
+import {Employee} from '../employee/employee';
+import {AttendanceType} from '../attendance/attendance-type';
+
+export class EmployeeAttendance {
+  startDate: string;
+  finishDate: string;
+  employee: Employee;
+  body: EmployeeAttendanceItem[];
+
+  public constructor(init?: Partial<EmployeeAttendance>) {
+    Object.assign(this, init);
+  }
+}
+
+export class EmployeeAttendanceItem {
+  date: string;
+  attendanceType: AttendanceType;
+  prints: string;
+  hours: string;
+  worked: string;
+
+  public constructor(init?: Partial<EmployeeAttendanceItem>) {
+    Object.assign(this, init);
+  }
+}