Skip to content
Permalink
Browse files
resolved merge conflict
  • Loading branch information
pembemiriam committed Oct 24, 2018
2 parents 3aec110 + 5073d6c commit cef8266b273c65b79c8285128782c9a82a9b4475
Showing 6 changed files with 39 additions and 2 deletions.
@@ -31,6 +31,7 @@ import {Store} from '@ngrx/store';
import * as fromRoot from '../../store';
import {SEARCH as SEARCH_OFFICE} from '../../store/office/office.actions';
import {SEARCH as SEARCH_ROLE} from '../../store/role/role.actions';
import { Staff } from '../../services/domain/center/staff';

export interface CenterFormData {
user: User;
@@ -73,6 +74,8 @@ export class CenterFormComponent implements OnInit {

roles: Observable<Role[]>;

staffs: Staff[];

detailForm: FormGroup;
contactForm: FormGroup;
officeForm: FormGroup;
@@ -1,4 +1,5 @@
import {Component, OnInit} from '@angular/core';
<<<<<<< HEAD

import {Store} from '@ngrx/store';
import * as fromRoot from '../store';
@@ -25,6 +26,19 @@ export interface Group {
value: string;
viewValue: string;
}
=======
import {ActivatedRoute, Params, Router} from '@angular/router';
import {Employee, Center} from '../services/office/domain/employee.model';
import {FetchRequest} from '../services/domain/paging/fetch-request.model';
import {TableData} from '../common/data-table/data-table.component';
import {Store} from '@ngrx/store';
import * as fromRoot from '../store';
import {Observable} from 'rxjs/Observable';
import {SEARCH} from '../store/employee/employee.actions';
import { Staff } from '../services/domain/center/staff';
import { Office } from '../services/office/domain/office.model';
import { Group } from '../services/domain/group/group';
>>>>>>> 5073d6c9e7f89e3f0f1ee761c12c19ea641afaea



@@ -62,6 +76,11 @@ export class CollectionComponent implements OnInit {

loading$: Observable<boolean>;

staffs: Staff[] = [];
offices: Office[] = [];
centers: Center[] = [];
groups: Group[] = [];

columns: any[] = [
{ name: 'name', label: 'Name' },
{ name: 'accountNumber', label: 'Account #' },
@@ -70,14 +70,15 @@
</div>
<div class="app-input1">
<mat-form-field class="app-input2">
<input matInput placeholder="Password" type="password" formControlName="password" autocomplete="new-password" [type]="!hide ? 'password' : 'text'">
<input matInput placeholder="Password" type="password" formControlName="password" autocomplete="new-password" [type]="passwordField ? 'password' : 'text'">
<mat-error *ngIf="form.get('password').hasError('required')">
Required
</mat-error>
<mat-icon matSuffix (click)="hide = !hide">{{hide ? 'visibility_off' : 'visibility' }}</mat-icon>
<mat-icon matSuffix (click)="togglePasswordField()">{{passwordField ? 'visibility_off' : 'visibility'}}</mat-icon>
</mat-form-field>
</div>
<br>
<p style="color:red;text-align: center">{{ error$ | async }}</p>
<br>
<p>
<button mat-raised-button color="primary" type="submit" class="btn" [disabled]="form.invalid">Sign In</button>
@@ -47,6 +47,7 @@ export class LoginComponent implements OnInit, OnDestroy {
];

form: FormGroup;
passwordField: boolean = true;

error$: Observable<string>;

@@ -101,6 +102,13 @@ export class LoginComponent implements OnInit, OnDestroy {
}
});
}

togglePasswordField() {
if (this.passwordField)
this.passwordField = false
else
this.passwordField = true
}

selectLanguage(selectChange: MatSelectChange): void {
sessionStorage.setItem(TRANSLATE_STORAGE_KEY, selectChange.value);
@@ -0,0 +1,3 @@
export interface Staff {

}
@@ -0,0 +1,3 @@
export interface Group {

}

0 comments on commit cef8266

Please sign in to comment.