From 24c9e04c096bca423a397f998371a85e07624e42 Mon Sep 17 00:00:00 2001 From: Karan Takalkar Date: Fri, 10 Jul 2020 13:10:14 +0530 Subject: [PATCH] feat: group actions (edit-meeting-schedule) (#1054) Fixes: #1053 --- .../group-actions.resolver.ts | 1 + ...edit-group-meeting-schedule.component.html | 46 +++++++++ ...edit-group-meeting-schedule.component.scss | 3 + ...t-group-meeting-schedule.component.spec.ts | 25 +++++ .../edit-group-meeting-schedule.component.ts | 95 +++++++++++++++++++ .../edit-group-meeting.component.html | 7 ++ .../edit-group-meeting.component.ts | 13 ++- .../group-actions.component.html | 1 + .../group-actions/group-actions.component.ts | 10 +- .../groups-view/groups-view.component.ts | 2 +- src/app/groups/groups.module.ts | 4 +- 11 files changed, 200 insertions(+), 7 deletions(-) create mode 100644 src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.html create mode 100644 src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.scss create mode 100644 src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.spec.ts create mode 100644 src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.ts diff --git a/src/app/groups/common-resolvers/group-actions.resolver.ts b/src/app/groups/common-resolvers/group-actions.resolver.ts index 8e000d253..603782405 100644 --- a/src/app/groups/common-resolvers/group-actions.resolver.ts +++ b/src/app/groups/common-resolvers/group-actions.resolver.ts @@ -38,6 +38,7 @@ export class GroupActionsResolver implements Resolve { case 'Attach Meeting': return this.groupsService.getGroupCalendarTemplate(groupId); case 'Edit Meeting': + case 'Edit Meeting Schedule': const calendarId = route.queryParamMap.get('calendarId'); return this.groupsService.getGroupCalendarAndTemplate(groupId, calendarId); default: diff --git a/src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.html b/src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.html new file mode 100644 index 000000000..5da12e1ac --- /dev/null +++ b/src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.html @@ -0,0 +1,46 @@ +
+ + + +
+ + + +
+ + + Existing Meeting Date + + + {{ date | date }} + + + + Existing Meeting Date is required + + + + + Revised Meeting Date + + + + + Revised Meeting Date is required + + + +
+ +
+ + + + + + +
+ +
+ +
diff --git a/src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.scss b/src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.scss new file mode 100644 index 000000000..d774f68da --- /dev/null +++ b/src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.scss @@ -0,0 +1,3 @@ +.container { + max-width: 37rem; +} diff --git a/src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.spec.ts b/src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.spec.ts new file mode 100644 index 000000000..44f8fa7b0 --- /dev/null +++ b/src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EditGroupMeetingScheduleComponent } from './edit-group-meeting-schedule.component'; + +describe('EditGroupMeetingScheduleComponent', () => { + let component: EditGroupMeetingScheduleComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EditGroupMeetingScheduleComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EditGroupMeetingScheduleComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.ts b/src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.ts new file mode 100644 index 000000000..361bf61e1 --- /dev/null +++ b/src/app/groups/groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component.ts @@ -0,0 +1,95 @@ +/** Angular Imports */ +import { Component, OnInit } from '@angular/core'; +import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms'; +import { DatePipe } from '@angular/common'; +import { ActivatedRoute, Router } from '@angular/router'; + +/** Custom Services */ +import { GroupsService } from 'app/groups/groups.service'; + +/** + * Edit Group Meetings Schedule Component + */ +@Component({ + selector: 'mifosx-edit-group-meeting-schedule', + templateUrl: './edit-group-meeting-schedule.component.html', + styleUrls: ['./edit-group-meeting-schedule.component.scss'] +}) +export class EditGroupMeetingScheduleComponent implements OnInit { + + /** Minimum date allowed. */ + minDate = new Date(2000, 0, 1); + /** Maximum date allowed. */ + maxDate = new Date(); + /** Group Meeting form. */ + groupEditMeetingScheduleForm: FormGroup; + /** Calendar Template Data */ + calendarTemplate: any; + /** Group Id */ + groupId: any; + /** CalendarI ID */ + calendarId: any; + /** Next meetings data */ + nextMeetingDates: any; + + /** + * Fetches Calendar Template from `resolve` + * @param {FormBuilder} formBuilder Form Builder + * @param {GroupsService} groupsService Shares Service + * @param {DatePipe} datePipe Date Pipe + * @param {ActivatedRoute} route Activated Route + * @param {Router} router Router + */ + constructor(private formBuilder: FormBuilder, + private groupsService: GroupsService, + private datePipe: DatePipe, + private route: ActivatedRoute, + private router: Router) { + this.route.data.subscribe((data: { groupActionData: any }) => { + this.calendarTemplate = data.groupActionData; + this.nextMeetingDates = this.calendarTemplate.nextTenRecurringDates; + }); + this.calendarId = this.route.snapshot.queryParams['calendarId']; + this.groupId = this.route.parent.snapshot.params['groupId']; + } + + ngOnInit() { + this.createEditMeetingScheduleForm(); + } + + /** + * Creates the Edit Group Meeting Schedule form. + */ + createEditMeetingScheduleForm() { + this.groupEditMeetingScheduleForm = this.formBuilder.group({ + 'presentMeetingDate': ['', Validators.required], + 'newMeetingDate': ['', Validators.required] + }); + } + + /** + * Submits the form and updates the meeting. + */ + submit() { + // TODO: Update once language and date settings are setup + const locale = 'en'; + const dateFormat = 'dd MMMM yyyy'; + const reschedulebasedOnMeetingDates = true; + const prevOldDate: Date = new Date(this.groupEditMeetingScheduleForm.value.presentMeetingDate); + const prevNewDate: Date = this.groupEditMeetingScheduleForm.value.newMeetingDate; + this.groupEditMeetingScheduleForm.patchValue({ + 'presentMeetingDate': this.datePipe.transform(prevOldDate, dateFormat), + 'newMeetingDate': this.datePipe.transform(prevNewDate, dateFormat) + }); + const data = { + ...this.groupEditMeetingScheduleForm.value, + reschedulebasedOnMeetingDates, + dateFormat, + locale + }; + this.groupsService.updateGroupMeeting(this.groupId, data, this.calendarId).subscribe((response: any) => { + this.router.navigate(['../../'], { relativeTo: this.route }); + }); + } + +} diff --git a/src/app/groups/groups-view/group-actions/edit-group-meeting/edit-group-meeting.component.html b/src/app/groups/groups-view/group-actions/edit-group-meeting/edit-group-meeting.component.html index b2dcf4fce..0264fd4c3 100644 --- a/src/app/groups/groups-view/group-actions/edit-group-meeting/edit-group-meeting.component.html +++ b/src/app/groups/groups-view/group-actions/edit-group-meeting/edit-group-meeting.component.html @@ -1,3 +1,10 @@ +
+ +
+
diff --git a/src/app/groups/groups-view/group-actions/edit-group-meeting/edit-group-meeting.component.ts b/src/app/groups/groups-view/group-actions/edit-group-meeting/edit-group-meeting.component.ts index 4986c6be6..06217ce96 100644 --- a/src/app/groups/groups-view/group-actions/edit-group-meeting/edit-group-meeting.component.ts +++ b/src/app/groups/groups-view/group-actions/edit-group-meeting/edit-group-meeting.component.ts @@ -23,7 +23,7 @@ export class EditGroupMeetingComponent implements OnInit { maxDate = new Date(); /** Group Meeting form. */ groupEditMeetingForm: FormGroup; - /** Calnedar Template Data */ + /** Calendar Template Data */ calendarTemplate: any; /** Group Id */ groupId: any; @@ -87,6 +87,7 @@ export class EditGroupMeetingComponent implements OnInit { case 2: // Weekly this.repetitionIntervals = ['1', '2', '3']; this.groupEditMeetingForm.addControl('repeatsOnDay', new FormControl('', Validators.required)); + this.groupEditMeetingForm.get('repeatsOnDay').patchValue(this.calendarTemplate.repeatsOnDay.id); break; case 3: // Monthly this.repetitionIntervals = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11']; @@ -99,10 +100,18 @@ export class EditGroupMeetingComponent implements OnInit { this.groupEditMeetingForm.patchValue({ 'startDate': this.calendarTemplate.startDate && new Date(this.calendarTemplate.startDate), 'frequency': this.calendarTemplate.frequency.id, - 'interval': this.calendarTemplate.interval + 'interval': `${this.calendarTemplate.interval}` }); } + /** + * Navigate to edit meeting schedule form. + */ + editSchedule() { + const queryParams: any = { calendarId: this.calendarId }; + this.router.navigate([`../Edit Meeting Schedule`], { relativeTo: this.route, queryParams: queryParams }); + } + /** * Submits the form and updates the meeting. */ diff --git a/src/app/groups/groups-view/group-actions/group-actions.component.html b/src/app/groups/groups-view/group-actions/group-actions.component.html index 7bc4613ba..b2adb0903 100644 --- a/src/app/groups/groups-view/group-actions/group-actions.component.html +++ b/src/app/groups/groups-view/group-actions/group-actions.component.html @@ -5,3 +5,4 @@ + diff --git a/src/app/groups/groups-view/group-actions/group-actions.component.ts b/src/app/groups/groups-view/group-actions/group-actions.component.ts index 6391dcf84..82781f074 100644 --- a/src/app/groups/groups-view/group-actions/group-actions.component.ts +++ b/src/app/groups/groups-view/group-actions/group-actions.component.ts @@ -1,6 +1,6 @@ /** Angular Imports */ import { Component } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; /** * Group actions component. @@ -21,6 +21,7 @@ export class GroupActionsComponent { 'Attendance': boolean 'Manage Members': boolean 'Edit Meeting': boolean + 'Edit Meeting Schedule': boolean } = { 'Assign Staff': false, 'Close': false, @@ -28,13 +29,16 @@ export class GroupActionsComponent { 'Attach Meeting': false, 'Attendance': false, 'Manage Members': false, - 'Edit Meeting': false + 'Edit Meeting': false, + 'Edit Meeting Schedule': false }; /** * @param {ActivatedRoute} route Activated Route */ - constructor(private route: ActivatedRoute) { + constructor(private route: ActivatedRoute, + private router: Router) { + this.router.routeReuseStrategy.shouldReuseRoute = () => false; const name = this.route.snapshot.params['name']; this.actions[name] = true; } diff --git a/src/app/groups/groups-view/groups-view.component.ts b/src/app/groups/groups-view/groups-view.component.ts index ad03c8e09..12b64d245 100644 --- a/src/app/groups/groups-view/groups-view.component.ts +++ b/src/app/groups/groups-view/groups-view.component.ts @@ -76,7 +76,7 @@ export class GroupsViewComponent { if (this.groupViewData.collectionMeetingCalendar) { const entityType = this.groupViewData.collectionMeetingCalendar.entityType.value; if (entityType === 'GROUPS' && this.groupViewData.hierarchy === '.' + this.groupViewData.id + '.' ) { - return true; + return true; } } return false; diff --git a/src/app/groups/groups.module.ts b/src/app/groups/groups.module.ts index 70ce3c3be..b91d5c3a0 100644 --- a/src/app/groups/groups.module.ts +++ b/src/app/groups/groups.module.ts @@ -30,6 +30,7 @@ import { AttachGroupMeetingComponent } from './groups-view/group-actions/attach- import { GroupAttendanceComponent } from './groups-view/group-actions/group-attendance/group-attendance.component'; import { ManageGroupMembersComponent } from './groups-view/group-actions/manage-group-members/manage-group-members.component'; import { EditGroupMeetingComponent } from './groups-view/group-actions/edit-group-meeting/edit-group-meeting.component'; +import { EditGroupMeetingScheduleComponent } from './groups-view/group-actions/edit-group-meeting-schedule/edit-group-meeting-schedule.component'; /** * Groups Module @@ -64,7 +65,8 @@ import { EditGroupMeetingComponent } from './groups-view/group-actions/edit-grou AttachGroupMeetingComponent, GroupAttendanceComponent, ManageGroupMembersComponent, - EditGroupMeetingComponent + EditGroupMeetingComponent, + EditGroupMeetingScheduleComponent ], entryComponents: [ UnassignRoleDialogComponent,