diff --git a/src/app/organization/employees/create-employee/create-employee.component.html b/src/app/organization/employees/create-employee/create-employee.component.html new file mode 100644 index 000000000..5720bb1e2 --- /dev/null +++ b/src/app/organization/employees/create-employee/create-employee.component.html @@ -0,0 +1,77 @@ +
+ + + +
+ + + +
+ + + Office + + + {{ office.name }} + + + + Office is required + + + + + First Name + + + First Name is required + + + First Name cannot begin with a special character or number + + + + + Last Name + + + Last Name is required + + + Last Name cannot begin with a special character or number + + + + + Is Loan Officer + + + + Mobile Number for SMS + + + + + Joining Date + + + + + Joining Date is required + + + +
+ + + + + + + + +
+ + + +
diff --git a/src/app/organization/employees/create-employee/create-employee.component.scss b/src/app/organization/employees/create-employee/create-employee.component.scss new file mode 100644 index 000000000..3d0eabb99 --- /dev/null +++ b/src/app/organization/employees/create-employee/create-employee.component.scss @@ -0,0 +1,7 @@ +.container { + max-width: 37rem; +} + +.loan-officer { + padding: 17.5px 0 17.5px 0; +} diff --git a/src/app/organization/employees/create-employee/create-employee.component.spec.ts b/src/app/organization/employees/create-employee/create-employee.component.spec.ts new file mode 100644 index 000000000..916d3f59f --- /dev/null +++ b/src/app/organization/employees/create-employee/create-employee.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CreateEmployeeComponent } from './create-employee.component'; + +describe('CreateEmployeeComponent', () => { + let component: CreateEmployeeComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CreateEmployeeComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CreateEmployeeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/organization/employees/create-employee/create-employee.component.ts b/src/app/organization/employees/create-employee/create-employee.component.ts new file mode 100644 index 000000000..dabdca707 --- /dev/null +++ b/src/app/organization/employees/create-employee/create-employee.component.ts @@ -0,0 +1,87 @@ +/** Angular Imports */ +import { Component, OnInit } from '@angular/core'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { Router, ActivatedRoute } from '@angular/router'; +import { DatePipe } from '@angular/common'; + +/** Custom Services */ +import { OrganizationService } from '../../organization.service'; + +/** + * Create employee component. + */ +@Component({ + selector: 'mifosx-create-employee', + templateUrl: './create-employee.component.html', + styleUrls: ['./create-employee.component.scss'] +}) +export class CreateEmployeeComponent implements OnInit { + + /** Minimum joining date allowed. */ + minDate = new Date(2000, 0, 1); + /** Maximum joining date allowed. */ + maxDate = new Date(); + /** Employee form. */ + employeeForm: FormGroup; + /** Office data. */ + officeData: any; + + /** + * Retrieves the offices data from `resolve`. + * @param {FormBuilder} formBuilder Form Builder. + * @param {OrganizationService} organizationService Organization Service. + * @param {ActivatedRoute} route Activated Route. + * @param {Router} router Router for navigation. + * @param {DatePipe} datePipe Date Pipe to format date. + */ + constructor(private formBuilder: FormBuilder, + private organizationService: OrganizationService, + private route: ActivatedRoute, + private router: Router, + private datePipe: DatePipe) { + this.route.data.subscribe((data: { offices: any }) => { + this.officeData = data.offices; + }); + } + + /** + * Creates the employee form. + */ + ngOnInit() { + this.createEmployeeForm(); + } + + /** + * Creates the employee form. + */ + createEmployeeForm() { + this.employeeForm = this.formBuilder.group({ + 'officeId': ['', Validators.required], + 'firstname': ['', [Validators.required, Validators.pattern('(^[A-z]).*')]], + 'lastname': ['', [Validators.required, Validators.pattern('(^[A-z]).*')]], + 'isLoanOfficer': [false], + 'mobileNo': [''], + 'joiningDate': ['', Validators.required], + }); + } + + /** + * Submits the employee form and creates employee, + * if successful redirects to employees. + */ + submit() { + const prevJoiningDate: Date = this.employeeForm.value.joiningDate; + // TODO: Update once language and date settings are setup + const dateFormat = 'yyyy-MM-dd'; + this.employeeForm.patchValue({ + joiningDate: this.datePipe.transform(prevJoiningDate, dateFormat) + }); + const employee = this.employeeForm.value; + employee.locale = 'en'; + employee.dateFormat = dateFormat; + this.organizationService.createEmployee(employee).subscribe((response: any) => { + this.router.navigate(['../'], { relativeTo: this.route }); + }); + } + +} diff --git a/src/app/organization/employees/employees.component.html b/src/app/organization/employees/employees.component.html index f2d53e318..d61a8f495 100644 --- a/src/app/organization/employees/employees.component.html +++ b/src/app/organization/employees/employees.component.html @@ -5,9 +5,9 @@ Import Employees - diff --git a/src/app/organization/organization-routing.module.ts b/src/app/organization/organization-routing.module.ts index e444a3596..c7b914748 100644 --- a/src/app/organization/organization-routing.module.ts +++ b/src/app/organization/organization-routing.module.ts @@ -13,6 +13,7 @@ import { OrganizationComponent } from './organization.component'; import { LoanProvisioningCriteriaComponent } from './loan-provisioning-criteria/loan-provisioning-criteria.component'; import { OfficesComponent } from './offices/offices.component'; import { EmployeesComponent } from './employees/employees.component'; +import { CreateEmployeeComponent } from './employees/create-employee/create-employee.component'; import { CurrenciesComponent } from './currencies/currencies.component'; import { SmsCampaignsComponent } from './sms-campaigns/sms-campaigns.component'; import { AdhocQueryComponent } from './adhoc-query/adhoc-query.component'; @@ -78,11 +79,24 @@ const routes: Routes = [ }, { path: 'employees', - component: EmployeesComponent, data: { title: extract('Manage Employees'), breadcrumb: 'Manage Employees' }, - resolve: { - employees: EmployeesResolver - } + children: [ + { + path: '', + component: EmployeesComponent, + resolve: { + employees: EmployeesResolver + } + }, + { + path: 'create', + component: CreateEmployeeComponent, + data: { title: extract('Create Employee'), breadcrumb: 'Create Employee' }, + resolve: { + offices: OfficesResolver + } + } + ] }, { path: 'currencies', diff --git a/src/app/organization/organization.module.ts b/src/app/organization/organization.module.ts index 18c37d3f4..0c4217a7d 100644 --- a/src/app/organization/organization.module.ts +++ b/src/app/organization/organization.module.ts @@ -20,6 +20,7 @@ import { PasswordPreferencesComponent } from './password-preferences/password-pr import { EntityDataTableChecksComponent } from './entity-data-table-checks/entity-data-table-checks.component'; import { WorkingDaysComponent } from './working-days/working-days.component'; import { CreateOfficeComponent } from './offices/create-office/create-office.component'; +import { CreateEmployeeComponent } from './employees/create-employee/create-employee.component'; /** * Organization Module @@ -45,7 +46,8 @@ import { CreateOfficeComponent } from './offices/create-office/create-office.com PasswordPreferencesComponent, EntityDataTableChecksComponent, WorkingDaysComponent, - CreateOfficeComponent + CreateOfficeComponent, + CreateEmployeeComponent ] }) export class OrganizationModule { } diff --git a/src/app/organization/organization.service.ts b/src/app/organization/organization.service.ts index 785d34377..4e4815e65 100644 --- a/src/app/organization/organization.service.ts +++ b/src/app/organization/organization.service.ts @@ -47,6 +47,14 @@ export class OrganizationService { return this.http.get('/staff'); } + /** + * @param {any} employee Employee to be created. + * @returns {Observable} + */ + createEmployee(employee: any): Observable { + return this.http.post('/staff', employee); + } + /** * @returns {Observable} Currencies data */