Merge pull request #2586 from JaySoni1/WEB-256-replace-custom-api-of-groups-service-ts

WEB-256 replace custom api of groups.service.ts

Author: gkbishnoi07

src/app/centers/centers-view/center-actions/manage-groups/manage-groups.component.ts

@@ -8,7 +8,7 @@ import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.co
 
 /** Custom Services */
 import { CentersService } from 'app/centers/centers.service';
-import { GroupsService } from 'app/groups/groups.service';
+import { GroupsService } from '@fineract/client';
 import { MatDialog } from '@angular/material/dialog';
 import { MatAutocompleteTrigger, MatAutocomplete, MatOption } from '@angular/material/autocomplete';
 import { MatIconButton } from '@angular/material/button';
@@ -68,7 +68,12 @@ export class ManageGroupsComponent implements AfterViewInit {
     this.groupChoice.valueChanges.subscribe((value: string) => {
       if (value.length >= 2) {
         this.groupsService
-          .getFilteredGroups('name', 'ASC', value, this.centerData.officeId, 'true')
+          .retrieveAll24({
+            orderBy: 'name',
+            sortOrder: 'ASC',
+            name: value,
+            officeId: this.centerData.officeId
+          })
           .subscribe((data: any) => {
             this.groupsData = data;
           });

src/app/centers/centers-view/centers-view.component.html

@@ -3,7 +3,12 @@
     <mat-card-title-group class="header-title-group">
       <div>
         <div>
-          <img mat-card-md-image class="profile-image" src="assets/images/center_placeholder.png" />
+          <img
+            mat-card-md-image
+            class="profile-image"
+            src="assets/images/center_placeholder.png"
+            alt="Center placeholder image"
+          />
         </div>
       </div>
 
@@ -75,7 +80,7 @@ <h3 class="flex-95">
         <span *ngIf="!(centerViewData.status.value === 'Active')">
           <button mat-menu-item *mifosxHasPermission="'ACTIVATE_CENTER'" (click)="doAction('Activate')">
             <mat-icon matListIcon>
-              <fa-icon icon="checkSign" size="sm"></fa-icon>
+              <fa-icon icon="check" size="sm"></fa-icon>
             </mat-icon>
             <span>{{ 'labels.buttons.Activate' | translate }}</span>
           </button>

src/app/centers/create-center/create-center.component.ts

@@ -10,7 +10,7 @@ import {
 import { Router, ActivatedRoute, RouterLink } from '@angular/router';
 
 /** Custom Services */
-import { GroupsService } from 'app/groups/groups.service';
+import { GroupsService } from '@fineract/client';
 import { CentersService } from '../centers.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
@@ -120,7 +120,7 @@ export class CreateCenterComponent implements OnInit {
    */
   buildDependencies() {
     this.centerForm.get('officeId').valueChanges.subscribe((option: any) => {
-      this.groupService.getGroupsByOfficeId(option).subscribe((data: any) => {
+      this.groupService.retrieveAll24(option).subscribe((data: any) => {
         this.groupsData = data;
         if (!this.groupsData.length) {
           this.groupChoice.disable();

src/app/clients/clients-view/custom-dialogs/unassign-staff-dialog/unassign-staff-dialog.component.ts

@@ -15,7 +15,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
  * Unassign staff dialog component.
  */
 @Component({
-  selector: 'mifosx-unassign-staff-dialog',
+  selector: 'mifosx-unassign-staff-dialog-client',
   templateUrl: './unassign-staff-dialog.component.html',
   styleUrls: ['./unassign-staff-dialog.component.scss'],
   imports: [

src/app/customApis.service.ts

@@ -121,6 +121,28 @@ export class RunReportsService {
     const httpParams = new HttpParams().set('R_groupId', centerId.toString()).set('genericResultSet', false.toString());
     return this.http.get('/runreports/GroupSummaryCounts', { params: httpParams });
   }
+
+  getGroupSummary(groupId: string): Observable<any> {
+    const httpParams = new HttpParams().set('R_groupId', groupId).set('genericResultSet', 'false');
+    return this.http.get(`/runreports/GroupSummaryCounts`, { params: httpParams });
+  }
+}
+@Injectable({
+  providedIn: 'root'
+})
+export class GroupsService {
+  constructor(private http: HttpClient) {}
+
+  /**
+   * @param {string} groupId Group Id
+   * @param {string} command Command
+   * @param {any} data Command payload
+   * @returns {Observable<any>}
+   */
+  executeGroupCommand(groupId: string, command: string, data: any): Observable<any> {
+    const httpParams = new HttpParams().set('command', command);
+    return this.http.post(`/groups/${groupId}`, data, { params: httpParams });
+  }
 }
 
 /**

src/app/groups/common-resolvers/glim-account-resolver.ts

@@ -6,7 +6,7 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { GroupsService } from '../groups.service';
+import { GroupsService } from '@fineract/client';
 
 /**
  * GLIM Loans Accounts data resolver.
@@ -24,7 +24,7 @@ export class GLIMAccountsResolver {
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
-    const groupId = route.parent.paramMap.get('groupId');
-    return this.groupsService.getGLIMAccountsData(groupId);
+    const groupId = Number(route.parent.paramMap.get('groupId'));
+    return this.groupsService.retrieveglimAccounts({ groupId: groupId });
   }
 }

src/app/groups/common-resolvers/group-account.resolver.ts

@@ -6,7 +6,7 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { GroupsService } from '../groups.service';
+import { GroupsService } from '@fineract/client';
 
 /**
  * Group Accounts data resolver.
@@ -24,7 +24,7 @@ export class GroupAccountsResolver {
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
-    const groupId = route.parent.paramMap.get('groupId');
-    return this.groupsService.getGroupAccountsData(groupId);
+    const groupId = Number(route.parent.paramMap.get('groupId'));
+    return this.groupsService.retrieveAccounts({ groupId });
   }
 }

src/app/groups/common-resolvers/group-actions.resolver.ts

@@ -6,17 +6,19 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { GroupsService } from '../groups.service';
+import { GroupsService } from '@fineract/client';
 
 /**
  * Group Actions data resolver.
  */
 @Injectable()
 export class GroupActionsResolver {
   /**
-   * @param {GroupsService} groupsService Groups service.
+   * @param {GroupsService} groupsService,
    */
-  constructor(private groupsService: GroupsService) {}
+  constructor(
+    private groupsService: GroupsService,
+  ) {}
 
   /**
    * Returns the group actions data.
@@ -25,22 +27,23 @@ export class GroupActionsResolver {
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
     const actionName = route.paramMap.get('action');
-    const groupId = route.paramMap.get('groupId') || route.parent.parent.paramMap.get('groupId');
+    const groupIdStr = route.paramMap.get('groupId') || route.parent.parent.paramMap.get('groupId');
+    const groupId = groupIdStr ? Number(groupIdStr) : undefined;
     switch (actionName) {
       case 'Attendance':
       case 'Manage Members':
       case 'Transfer Clients':
-        return this.groupsService.getGroupData(groupId);
+        return this.groupsService.retrieveOne15({ groupId });
       case 'Assign Staff':
-        return this.groupsService.getGroupData(groupId, 'true');
+        return this.groupsService.retrieveOne15({ groupId, staffInSelectedOfficeOnly: true });
       case 'Close':
-        return this.groupsService.getGroupCommandTemplate('close');
+        return this.groupsService.retrieveTemplate7({ command: 'close' });
       case 'Attach Meeting':
-        return this.groupsService.getGroupCalendarTemplate(groupId);
+        return this.groupsService.retrieveOne15({ groupId });
       case 'Edit Meeting':
       case 'Edit Meeting Schedule':
         const calendarId = route.queryParamMap.get('calendarId');
-        return this.groupsService.getGroupCalendarAndTemplate(groupId, calendarId);
+        return this.groupsService.retrieveOne15({ groupId });
       default:
         return undefined;
     }

src/app/groups/common-resolvers/group-data-and-template.resolver.ts

@@ -6,7 +6,7 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { GroupsService } from '../groups.service';
+import { GroupsService } from '@fineract/client';
 
 /**
  * Groups data and template resolver.
@@ -24,7 +24,7 @@ export class GroupDataAndTemplateResolver {
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
-    const groupId = route.paramMap.get('groupId');
-    return this.groupsService.getGroupData(groupId, 'true');
+    const groupId = Number(route.paramMap.get('groupId'));
+    return this.groupsService.retrieveOne15({ groupId: groupId });
   }
 }

src/app/groups/common-resolvers/group-datatable.resolver.ts

@@ -6,17 +6,17 @@ import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 
 /** Custom Services */
-import { GroupsService } from '../groups.service';
+import { DataTablesService } from '@fineract/client';
 
 /**
  * Group Datatable data resolver.
  */
 @Injectable()
 export class GroupDatatableResolver {
   /**
-   * @param {GroupsService} GroupsService Groups service.
+   * @param {DataTablesService} DataTablesService Groups service.
    */
-  constructor(private groupsService: GroupsService) {}
+  constructor(private dataTablesService: DataTablesService) {}
 
   /**
    * Returns the Group's Datatable data.
@@ -25,6 +25,8 @@ export class GroupDatatableResolver {
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
     const groupId = route.parent.parent.paramMap.get('groupId');
     const datatableName = route.paramMap.get('datatableName');
-    return this.groupsService.getGroupDatatable(groupId, datatableName);
+    return this.dataTablesService.getDatatables({
+      apptable: 'm_group'
+    });
   }
 }