From 3009f214820c5019e29a62775c4bba99a81cb730 Mon Sep 17 00:00:00 2001 From: Karan Takalkar Date: Thu, 14 May 2020 17:57:27 +0530 Subject: [PATCH] feat: add create center page (#595) Fixes: #210 --- src/app/centers/centers-routing.module.ts | 21 ++- src/app/centers/centers.component.html | 2 +- src/app/centers/centers.module.ts | 8 +- src/app/centers/centers.service.ts | 19 +++ .../create-center.component.html | 129 +++++++++++++++ .../create-center.component.scss | 26 +++ .../create-center.component.spec.ts | 25 +++ .../create-center/create-center.component.ts | 151 ++++++++++++++++++ src/app/groups/groups.service.ts | 9 ++ 9 files changed, 382 insertions(+), 8 deletions(-) create mode 100644 src/app/centers/create-center/create-center.component.html create mode 100644 src/app/centers/create-center/create-center.component.scss create mode 100644 src/app/centers/create-center/create-center.component.spec.ts create mode 100644 src/app/centers/create-center/create-center.component.ts diff --git a/src/app/centers/centers-routing.module.ts b/src/app/centers/centers-routing.module.ts index 33baf3f76..c0a3c8b62 100644 --- a/src/app/centers/centers-routing.module.ts +++ b/src/app/centers/centers-routing.module.ts @@ -8,14 +8,29 @@ import { Route } from '../core/route/route.service'; import { extract } from '../core/i18n/i18n.service'; import { CentersComponent } from './centers.component'; +import { CreateCenterComponent } from './create-center/create-center.component'; +import { OfficesResolver } from 'app/accounting/common-resolvers/offices.resolver'; const routes: Routes = [ Route.withShell([ { path: 'centers', - component: CentersComponent, - data: { title: extract('Centers'), breadcrumb: 'Centers' } + data: { title: extract('Centers'), breadcrumb: 'Centers' }, + children: [ + { + path: '', + component: CentersComponent + }, + { + path: 'create', + component: CreateCenterComponent, + data: { title: extract('Create Center'), breadcrumb: 'Create' }, + resolve: { + offices: OfficesResolver, + } + } + ] } ]) ]; @@ -23,6 +38,6 @@ const routes: Routes = [ @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule], - providers: [] + providers: [OfficesResolver] }) export class CentersRoutingModule { } diff --git a/src/app/centers/centers.component.html b/src/app/centers/centers.component.html index 9b57839cc..bad25b9d2 100644 --- a/src/app/centers/centers.component.html +++ b/src/app/centers/centers.component.html @@ -14,7 +14,7 @@ - diff --git a/src/app/centers/centers.module.ts b/src/app/centers/centers.module.ts index e3442d422..75839507e 100644 --- a/src/app/centers/centers.module.ts +++ b/src/app/centers/centers.module.ts @@ -1,6 +1,5 @@ /** Angular Imports */ import { NgModule } from '@angular/core'; -import { DatePipe } from '@angular/common'; /** Custom Modules */ import { CentersRoutingModule } from './centers-routing.module'; @@ -9,6 +8,7 @@ import { PipesModule } from '../pipes/pipes.module'; /** Custom Components */ import { CentersComponent } from './centers.component'; +import { CreateCenterComponent } from './create-center/create-center.component'; /** * Centers Module @@ -22,8 +22,8 @@ import { CentersComponent } from './centers.component'; PipesModule ], declarations: [ - CentersComponent - ], - providers: [DatePipe] + CentersComponent, + CreateCenterComponent + ] }) export class CentersModule { } diff --git a/src/app/centers/centers.service.ts b/src/app/centers/centers.service.ts index 3c240bcb6..9c2f5d078 100644 --- a/src/app/centers/centers.service.ts +++ b/src/app/centers/centers.service.ts @@ -42,4 +42,23 @@ export class CentersService { return this.http.get('/centers', { params: httpParams }); } + /** + * @param {any} center Center to be created. + * @returns {Observable} + */ + createCenter(center: any): Observable { + return this.http.post('/centers', center); + } + + /** + * @param {number} officeId Office Id of office to get staff for. + * @returns {Observable} + */ + getStaff(officeId: number): Observable { + const httpParams = new HttpParams() + .set('officeId', officeId.toString()) + .set('staffInSelectedOfficeOnly', 'true'); + return this.http.get('/centers/template', { params: httpParams }); + } + } diff --git a/src/app/centers/create-center/create-center.component.html b/src/app/centers/create-center/create-center.component.html new file mode 100644 index 000000000..c6b6803cc --- /dev/null +++ b/src/app/centers/create-center/create-center.component.html @@ -0,0 +1,129 @@ +
+ + + +
+ + + +
+ + + Name + + + Center Name is required + + + Center Name cannot begin with a special character or number + + + + + Office + + + {{ office.name }} + + + + Office is required + + + + + Staff + + + {{ staff.displayName }} + + + + + + Active + + + + Activation Date + + + + + Activation Date is required + + + + + External id + + + + + Submitted on + + + + + Submission Date is required + + + + + Select and Add groups + + + {{ group.name }} + + + + +
+ +
+ +
+
+
Group Details
+ +
+
+
Name
+
{{groupChoice.value.name}}
+
+
+
Id
+
{{groupChoice.value.id}}
+
+
+
Office
+
{{groupChoice.value.officeName}}
+
+
+ + +

Selected Groups

+
+ + {{group.name}} +
+
+ +
+ +
+ + + + + + +
+ +
+ +
diff --git a/src/app/centers/create-center/create-center.component.scss b/src/app/centers/create-center/create-center.component.scss new file mode 100644 index 000000000..9530da9a5 --- /dev/null +++ b/src/app/centers/create-center/create-center.component.scss @@ -0,0 +1,26 @@ +.container { + max-width: 37rem; + } + +.mat-table { + display: block; + font-family: Tahoma, Verdana; + width: 50%; +} + +.mat-row, +.mat-header-row { + display: flex; + border-bottom-width: 1px; + border-bottom-style: solid; + align-items: center; + min-height: 48px; + padding: 0 24px; +} + +.mat-cell, +.mat-header-cell { + flex: 1; + overflow: hidden; + word-wrap: break-word; +} diff --git a/src/app/centers/create-center/create-center.component.spec.ts b/src/app/centers/create-center/create-center.component.spec.ts new file mode 100644 index 000000000..a1a4f53ed --- /dev/null +++ b/src/app/centers/create-center/create-center.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CreateCenterComponent } from './create-center.component'; + +describe('CreateCenterComponent', () => { + let component: CreateCenterComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CreateCenterComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CreateCenterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/centers/create-center/create-center.component.ts b/src/app/centers/create-center/create-center.component.ts new file mode 100644 index 000000000..d55c09cfa --- /dev/null +++ b/src/app/centers/create-center/create-center.component.ts @@ -0,0 +1,151 @@ +/** Angular Imports */ +import { Component, OnInit } from '@angular/core'; +import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms'; +import { Router, ActivatedRoute } from '@angular/router'; +import { DatePipe } from '@angular/common'; + +/** Custom Services */ +import { GroupsService } from 'app/groups/groups.service'; +import { CentersService } from '../centers.service'; + +/** + * Create Center component. + */ +@Component({ + selector: 'mifosx-create-center', + templateUrl: './create-center.component.html', + styleUrls: ['./create-center.component.scss'] +}) +export class CreateCenterComponent implements OnInit { + + /** Minimum date allowed. */ + minDate = new Date(2000, 0, 1); + /** Maximum date allowed. */ + maxDate = new Date(); + /** Center form. */ + centerForm: FormGroup; + /** Office data. */ + officeData: any; + /** Group data. */ + groupsData: any; + /** Staff data. */ + staffData: any; + /** Group Members. */ + groupMembers: any[] = []; + /** Group Choice. */ + groupChoice = new FormControl(''); + + /** + * Retrieves the offices data from `resolve`. + * @param {FormBuilder} formBuilder Form Builder. + * @param {ActivatedRoute} route Activated Route. + * @param {Router} router Router for navigation. + * @param {CentersService} centerService CentersService. + * @param {GroupsService} groupService GroupsService. + * @param {DatePipe} datePipe Date Pipe to format date. + */ + constructor(private formBuilder: FormBuilder, + private route: ActivatedRoute, + private router: Router, + private centerService: CentersService, + private groupService: GroupsService, + private datePipe: DatePipe) { + this.route.data.subscribe( (data: { offices: any }) => { + this.officeData = data.offices; + }); + } + + /** + * Creates and sets the center form. + */ + ngOnInit() { + this.createCenterForm(); + } + + /** + * Creates the center form. + */ + createCenterForm() { + this.centerForm = this.formBuilder.group({ + 'name': ['', [Validators.required, Validators.pattern('(^[A-z]).*')]], + 'officeId': ['', Validators.required], + 'submittedOnDate': ['', Validators.required], + 'staffId': [''], + 'externalId': [''], + 'active': [''], + }); + this.buildDependencies(); + } + + /** + * Sets the staff and groups data each time the user selects a new office. + * Adds form control Activation Date if active. + */ + buildDependencies() { + this.centerForm.get('officeId').valueChanges.subscribe( (option: any) => { + this.groupService.getGroupsByOfficeId(option).subscribe( (data: any) => { + this.groupsData = data; + if (!this.groupsData.length) { + this.groupChoice.disable(); + } else { + this.groupChoice.enable(); + } + }); + this.centerService.getStaff(option).subscribe( (data: any) => { + this.staffData = data['staffOptions']; + if (this.staffData === undefined) { + this.centerForm.controls['staffId'].disable(); + } else { + this.centerForm.controls['staffId'].enable(); + } + }); + }); + this.centerForm.get('active').valueChanges.subscribe( (bool: boolean) => { + if (bool) { + this.centerForm.addControl('activationDate', new FormControl('', Validators.required)); + } else { + this.centerForm.removeControl('activationDate'); + } + }); + } + + /** + * Add group. + */ + addGroup() { + if (!this.groupMembers.includes(this.groupChoice.value)) { + this.groupMembers.push(this.groupChoice.value); + } + } + + /** + * Remove group. + */ + removeGroup(index: number) { + this.groupMembers.splice(index, 1); + } + + /** + * Submits the center form and creates center, + * if successful redirects to centers. + */ + submit() { + const prevSubmittedOnDate: Date = this.centerForm.value.submittedOnDate; + const prevActivationDate: Date = this.centerForm.value.activationDate; + // TODO: Update once language and date settings are setup + const dateFormat = 'dd MMMM yyyy'; + this.centerForm.patchValue({ + submittedOnDate: this.datePipe.transform(prevSubmittedOnDate, dateFormat), + activationDate: this.datePipe.transform(prevActivationDate, dateFormat) + }); + const center = this.centerForm.value; + center.locale = 'en'; + center.dateFormat = dateFormat; + center.groupMembers = []; + this.groupMembers.forEach((group: any) => center.groupMembers.push(group.id)); + this.centerService.createCenter(center).subscribe((response: any) => { + this.router.navigate(['../centers']); + }); + } + +} diff --git a/src/app/groups/groups.service.ts b/src/app/groups/groups.service.ts index d671d84bc..2705c9f69 100644 --- a/src/app/groups/groups.service.ts +++ b/src/app/groups/groups.service.ts @@ -42,4 +42,13 @@ export class GroupsService { return this.http.get('/groups', { params: httpParams }); } + /** + * @param {number} officeId Office Id of office to get groups for. + * @returns {Observable} + */ + getGroupsByOfficeId(officeId: number): Observable { + const httpParams = new HttpParams().set('officeId', officeId.toString()); + return this.http.get('/groups', { params: httpParams } ); + } + }