refactor: groups module (#1197)

See: #1196
This commit is contained in:
Karan Takalkar
2020-08-12 19:22:24 +05:30
committed by GitHub
parent c6ee2a062f
commit cc80bd9577
22 changed files with 121 additions and 101 deletions
@@ -38,7 +38,8 @@
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
<button mat-raised-button color="primary" [disabled]="!groupsAddRoleForm.valid">Confirm</button>
<button mat-raised-button color="primary" [disabled]="!groupsAddRoleForm.valid"
*mifosxHasPermission="'ASSIGNROLE_GROUP'">Confirm</button>
</mat-card-actions>
</form>
@@ -18,7 +18,7 @@ export class AddRoleComponent implements OnInit {
/** Groups Add Role Form */
groupsAddRoleForm: FormGroup;
/** Client Menmber Data */
/** Client Member Data */
clientMemberData: any;
/** Role Data */
roleData: any;
@@ -23,12 +23,12 @@ export class ActivateGroupComponent implements OnInit {
maxDate = new Date();
/** Activate group form. */
activateGroupForm: FormGroup;
/** Group Account Id */
/** Group Id */
groupId: any;
/**
* @param {FormBuilder} formBuilder Form Builder
* @param {groupsService} groupsService Shares Service
* @param {groupsService} groupsService Groups Service
* @param {DatePipe} datePipe Date Pipe
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
@@ -41,9 +41,6 @@ export class ActivateGroupComponent implements OnInit {
this.groupId = this.route.parent.snapshot.params['groupId'];
}
/**
* Creates the activate group form.
*/
ngOnInit() {
this.createActivateGroupForm();
}
@@ -64,7 +64,8 @@
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
<button mat-raised-button color="primary" [disabled]="!groupMeetingForm.valid" (click)="submit()">Submit</button>
<button mat-raised-button color="primary" [disabled]="!groupMeetingForm.valid" (click)="submit()"
*mifosxHasPermission="'CREATE_MEETING'">Submit</button>
</mat-card-actions>
</form>
@@ -26,7 +26,7 @@
</mat-option>
</mat-select>
<mat-error *ngIf="closeGroupForm.controls.closureReasonId.hasError('required')">
CLosure Reason is <strong>required</strong>
Closure Reason is <strong>required</strong>
</mat-error>
</mat-form-field>
@@ -21,9 +21,9 @@ export class CloseGroupComponent implements OnInit {
minDate = new Date(2000, 0, 1);
/** Maximum date allowed. */
maxDate = new Date();
/** Close Share Account form. */
/** Close Group form. */
closeGroupForm: FormGroup;
/** Group Data */
/** Group Closure Data */
closureData: any;
/** Group Id */
groupId: any;
@@ -36,7 +36,8 @@
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
<button mat-raised-button color="primary" [disabled]="!groupEditMeetingScheduleForm.valid" (click)="submit()">Submit</button>
<button mat-raised-button color="primary" [disabled]="!groupEditMeetingScheduleForm.valid" (click)="submit()"
*mifosxHasPermission="'CREATE_MEETING'">Submit</button>
</mat-card-actions>
</form>
@@ -71,7 +71,8 @@
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
<button mat-raised-button color="primary" [disabled]="!groupEditMeetingForm.valid" (click)="submit()">Submit</button>
<button mat-raised-button color="primary" [disabled]="!groupEditMeetingForm.valid" (click)="submit()"
*mifosxHasPermission="'CREATE_MEETING'">Submit</button>
</mat-card-actions>
</form>
@@ -37,6 +37,7 @@ export class GroupActionsComponent {
/**
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
constructor(private route: ActivatedRoute,
private router: Router) {
@@ -18,7 +18,7 @@ export class GroupAssignStaffComponent implements OnInit {
/** Group Assign Staff form. */
groupAssignStaffForm: FormGroup;
/** Field Officer Data */
/** Staff Data */
staffData: any;
/** Group Data */
groupData: any;
@@ -39,9 +39,6 @@ export class GroupAssignStaffComponent implements OnInit {
});
}
/**
* Creates the group assign staff form.
*/
ngOnInit() {
this.staffData = this.groupData.staffOptions;
this.createGroupAssignStaffForm();
@@ -41,7 +41,8 @@
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
<button mat-raised-button color="primary" (click)="submit()">Confirm</button>
<button mat-raised-button color="primary" (click)="submit()"
*mifosxHasPermission="'SAVEORUPDATEATTENDANCE_MEETING'">Confirm</button>
</mat-card-actions>
</mat-card>
@@ -69,8 +69,9 @@
</mat-card-content>
<mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
<button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
<button mat-raised-button color="primary" [disabled]="!transferClientsForm.valid" (click)="submit()">Submit</button>
<button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
<button mat-raised-button color="primary" [disabled]="!transferClientsForm.valid" (click)="submit()"
*mifosxHasPermission="'TRANSFERCLIENTS_GROUP'">Submit</button>
</mat-card-actions>
</form>
@@ -24,7 +24,7 @@ export class GroupTransferClientsComponent implements OnInit, AfterViewInit {
groupsData: any = [];
/** Staff data. */
staffData: any;
/** Group Members. */
/** Client Members. */
clientMembers: any[] = [];
/**
@@ -11,7 +11,9 @@ import { GroupsService } from 'app/groups/groups.service';
import { ClientsService } from 'app/clients/clients.service';
import { MatDialog } from '@angular/material';
/**
* Manage Group Members Component
*/
@Component({
selector: 'mifosx-manage-group-members',
templateUrl: './manage-group-members.component.html',
@@ -25,7 +27,7 @@ export class ManageGroupMembersComponent implements AfterViewInit {
clientsData: any = [];
/** Client Members. */
clientMembers: any[] = [];
/** ClientChoice. */
/** Client Choice. */
clientChoice = new FormControl('');
/**
@@ -72,7 +74,8 @@ export class ManageGroupMembersComponent implements AfterViewInit {
/**
* Remove client.
* @param index Client's array index.
* @param {number} index Client's array index.
* @param {any} client Client
*/
removeClient(index: number, client: any) {
const removeMemberDialogRef = this.dialog.open(DeleteDialogComponent, {
@@ -84,7 +84,7 @@
<span *ngIf="groupViewData.staffId">
<button mat-menu-item *mifosxHasPermission="'UNASSIGNSTAFF_GROUP'" (click)="doAction('Unassign Staff')">Unassign Staff</button></span>
<span *ngIf="!(groupViewData.centerId || groupViewData.collectionMeetingCalendar) && groupViewData.status.value==='Active'">
<button mat-menu-item *mifosxHasPermission="'CREATE_MEETING'" (click)="doAction('Attach Meeting')">Attatch Meeting</button></span>
<button mat-menu-item *mifosxHasPermission="'CREATE_MEETING'" (click)="doAction('Attach Meeting')">Attach Meeting</button></span>
<button mat-menu-item *mifosxHasPermission="'CLOSE_GROUP'" (click)="doAction('Close')">Close</button>
<button mat-menu-item *mifosxHasPermission="'DELETE_GROUP'" (click)="doAction('Delete')">Delete</button>
</mat-menu>
@@ -28,6 +28,9 @@ export class GroupsViewComponent {
/**
* Fetches group data from `resolve`
* @param {ActivatedRoute} route Activated Route
* @param {GroupsService} groupsService Groups Service
* @param {Router} router Router
* @param {MatDialog} dialog Dialog
*/
constructor(private route: ActivatedRoute,
private groupsService: GroupsService,
@@ -41,6 +41,9 @@ export class NotesTabComponent implements OnInit {
/**
* Fetches notes data from `resolve`
* @param {Activated Route} route Activated Route.
* @param {FormBuilder} formBuilder FormBuilder
* @param {GroupsService} groupsService Groups Service
* @param {MatDialog} dialog MatDialog
* @param {AuthenticationService} authenticationService Authentication Service.
*/
constructor(private route: ActivatedRoute,