Release 3.6.1

src/registrar/beneficiary-details/beneficiary-details.component.ts

@@ -37,6 +37,7 @@ import {
 import { HttpServiceService } from 'src/app/app-modules/core/services/http-service.service';
 import { RegistrarService } from '../services/registrar.service';
 import { SessionStorageService } from '../services/session-storage.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-beneficiary-details',
@@ -61,6 +62,7 @@ export class BeneficiaryDetailsComponent implements OnInit, DoCheck, OnDestroy {
   firstName: any;
   lastName: any;
   regDate: any;
+  isEnableES: boolean = false;
 
   constructor(
     private router: Router,
@@ -73,6 +75,7 @@ export class BeneficiaryDetailsComponent implements OnInit, DoCheck, OnDestroy {
   ) {}
 
   ngOnInit() {
+    this.isEnableES = environment.isEnableES || false;
     this.assignSelectedLanguage();
     this.today = new Date();
     this.getHealthIDDetails();
@@ -136,41 +139,97 @@ export class BeneficiaryDetailsComponent implements OnInit, DoCheck, OnDestroy {
 
   getBenFamilyDetails() {
     this.route.params.subscribe((param) => {
-      const reqObj = {
-        beneficiaryRegID: null,
-        beneficiaryName: null,
-        beneficiaryID: param['beneficiaryId'],
-        phoneNo: null,
-        HealthID: null,
-        HealthIDNumber: null,
-        familyId: null,
-        identity: null,
-      };
-      this.registrarService
-        .identityQuickSearch(reqObj)
-        .subscribe((res: any) => {
-          if (res && res.data.length === 1) {
-            this.beneficiary = res.data[0];
-            this.benFamilyId = res.data[0].familyId;
-            this.beneficiaryName =
-              this.beneficiary.firstName +
-              (this.beneficiary.lastName !== undefined
-                ? ' ' + this.beneficiary.lastName
-                : '');
-            this.regDate = moment
-              .utc(this.beneficiary.createdDate)
-              .format('DD-MM-YYYY hh:mm A');
-          }
-        });
-      const benFlowID: any = param['beneficiaryRegID'];
-      this.beneficiaryDetailsService
-        .getBeneficiaryImage(benFlowID)
-        .subscribe((data: any) => {
-          if (data && data.benImage) {
+      const beneficiaryId = param['beneficiaryId'];
+      const benFlowID = param['beneficiaryRegID'];
+
+      // Fetch beneficiary details based on search method
+      const searchObservable = this.isEnableES
+        ? this.searchWithElasticsearch(beneficiaryId)
+        : this.searchTraditional(beneficiaryId);
+
+      searchObservable.subscribe({
+        next: (res: any) => this.handleSearchResponse(res),
+        error: (err: any) => this.handleSearchError(err),
+      });
+
+      // Fetch beneficiary image independently
+      this.fetchBeneficiaryImage(benFlowID);
+    });
+  }
+
+  private searchWithElasticsearch(searchTerm: string) {
+    return this.registrarService.identityQuickSearchES({ search: searchTerm });
+  }
+
+  private searchTraditional(beneficiaryId: string) {
+    const reqObj = {
+      beneficiaryRegID: null,
+      beneficiaryName: null,
+      beneficiaryID: beneficiaryId,
+      phoneNo: null,
+      HealthID: null,
+      HealthIDNumber: null,
+      familyId: null,
+      identity: null,
+    };
+    return this.registrarService.identityQuickSearch(reqObj);
+  }
+
+  private handleSearchResponse(res: any) {
+    if (!res?.data || res.data.length === 0) {
+      this.showAlert(
+        this.current_language_set?.alerts?.info?.beneficiarynotfound ||
+          'Beneficiary not found',
+        'info'
+      );
+      return;
+    }
+
+    if (res.data.length > 1) {
+      this.showAlert(
+        'Multiple beneficiaries found with this ID. Please use advanced search.',
+        'info'
+      );
+      return;
+    }
+
+    // Single result found
+    this.beneficiary = res.data[0];
+    this.benFamilyId = res.data[0].familyID || res.data[0].familyId;
+    this.beneficiaryName = this.formatBeneficiaryName(this.beneficiary);
+    this.regDate = moment
+      .utc(this.beneficiary.createdDate)
+      .format('DD-MM-YYYY hh:mm A');
+  }
+
+  private formatBeneficiaryName(beneficiary: any): string {
+    const { firstName, lastName } = beneficiary;
+    return lastName?.trim() ? `${firstName} ${lastName}` : firstName;
+  }
+
+  private handleSearchError(err: any) {
+    console.error('Error fetching beneficiary details:', err);
+    this.showAlert('Error fetching beneficiary details', 'error');
+  }
+
+  private fetchBeneficiaryImage(benFlowID: string) {
+    this.beneficiaryDetailsService
+      .getBeneficiaryImage(benFlowID)
+      .subscribe({
+        next: (data: any) => {
+          if (data?.benImage) {
             this.beneficiary.benImage = data.benImage;
           }
-        });
-    });
+        },
+        error: (err: any) => {
+          console.error('Error fetching beneficiary image:', err);
+          // Optionally show error to user or handle silently
+        },
+      });
+  }
+
+  private showAlert(message: string, type: string) {
+    this.confirmationService.alert(message, type);
   }
 
   getHealthIDDetails() {

src/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html

@@ -114,7 +114,7 @@ <h4>{{ currentLanguageSet?.createFamilyTagging }}</h4>
       </form>
     </mat-dialog-content>
 
-    <mat-dialog-actions class="padding15 margin15 pull-right">
+    <mat-dialog-actions class="padding15 margin15 pull-right" style="display: flex;width:100%;justify-content: flex-end;gap:12px">
       <button
         class="full-width-login button-reset"
         type="button"

src/registrar/family-tagging/family-tagging-details/family-tagging-details.component.ts

@@ -38,6 +38,8 @@ import { FamilyTaggingService } from '../../services/familytagging.service';
 import { RegistrarService } from '../../services/registrar.service';
 import { SearchFamilyComponent } from '../../search-family/search-family.component';
 import { SessionStorageService } from '../../services/session-storage.service';
+import { environment } from 'src/environments/environment';
+
 
 @Component({
   selector: 'app-family-tagging-details',
@@ -97,6 +99,7 @@ export class FamilyTaggingDetailsComponent
   benStateId: any;
   benDistrictId: any;
   benBlockId: any;
+  isEnableES: boolean = false;
 
   constructor(
     private dialog: MatDialog,
@@ -110,6 +113,8 @@ export class FamilyTaggingDetailsComponent
   ) {}
 
   ngOnInit() {
+
+    this.isEnableES = environment.isEnableES || false;
     this.assignSelectedLanguage();
     this.benFamilyId = this.route.snapshot.paramMap.get('familyId');
     this.benFamilyName = this.route.snapshot.paramMap.get('familyName');
@@ -373,17 +378,43 @@ export class FamilyTaggingDetailsComponent
     });
   }
 
-  getBeneficiaryDetailsAfterFamilyTag() {
-    const benReqObj = {
-      beneficiaryRegID: null,
-      beneficiaryID: this.beneficiaryId,
-      phoneNo: null,
-      HealthID: null,
-      HealthIDNumber: null,
-      familyId: null,
-      identity: null,
-    };
+ getBeneficiaryDetailsAfterFamilyTag() {
+  const benReqObj = {
+    beneficiaryRegID: null,
+    beneficiaryID: this.beneficiaryId,
+    phoneNo: null,
+    HealthID: null,
+    HealthIDNumber: null,
+    familyId: null,
+    identity: null,
+  };
 
+  if (this.isEnableES) {
+    // Use Elasticsearch when enabled
+    const esSearchReqObj = {
+      search: this.beneficiaryId
+    };
+
+    this.registrarService.identityQuickSearchES(esSearchReqObj).subscribe(
+      (beneficiaryDetails: any) => {
+        if (beneficiaryDetails && beneficiaryDetails.statusCode === 200 && 
+            beneficiaryDetails.data && beneficiaryDetails.data.length === 1) {
+          this.benFamilyId =
+            beneficiaryDetails.data[0].familyID !== undefined &&
+            beneficiaryDetails.data[0].familyID !== null
+              ? beneficiaryDetails.data[0].familyID
+              : null;
+          this.registrarService.getBenFamilyDetails(this.benFamilyId);
+        } else {
+          this.benFamilyId = null;
+        }
+      },
+      (error: string) => {
+        this.confirmationService.alert(error, 'error');
+      }
+    );
+  } else {
+    // Use regular search when Elasticsearch is disabled
     this.registrarService.identityQuickSearch(benReqObj).subscribe(
       (beneficiaryDetails: any) => {
         if (beneficiaryDetails && beneficiaryDetails.data.length === 1) {
@@ -399,7 +430,8 @@ export class FamilyTaggingDetailsComponent
       },
       (error: string) => {
         this.confirmationService.alert(error, 'error');
-      },
+      }
     );
   }
 }
+}

src/registrar/registration/consent-form/consent-form.component.html

@@ -19,9 +19,7 @@ <h4>{{ currentLanguageSet?.beneficaryConsent }}</h4>
     </section>
     <section>
       <p class="textFormat">
-        To provide you with better service, we would,request your personal
-        information. The information that you will providewill be kept
-        confidential and will only be used for research and analysis.
+        {{ currentLanguageSet?.consentFormText }}
       </p>
     </section>
   </mat-dialog-content>
@@ -30,7 +28,7 @@ <h4>{{ currentLanguageSet?.beneficaryConsent }}</h4>
       class="full-width-login mat_blue"
       type="button"
       (click)="acceptConsent('1')">
-      Accept
+      {{ currentLanguageSet?.tc?.accept }}
     </button>
   </mat-dialog-actions>
 </section>

src/registrar/registration/location-information/location-information.component.html

@@ -7,15 +7,16 @@
           *ngIf="item?.fieldType?.toLowerCase() === 'text'"
         >
           <mat-form-field class="input-full-width">
-            <mat-label> {{ item.fieldTitle }}</mat-label>
+            <mat-label> {{ item.fieldTitle | titlecase }}</mat-label>
             <input
               matInput
               type="input"
               (input)="onInputChanged($event, item.allowMax, item.fieldName)"
               (focus)="trackFieldInteraction(item.fieldTitle)"
-              placeholder="{{ item.placeholder }}"
+              placeholder="{{ item.placeholder | titlecase }}"
               [required]="item.isRequired || false"
-              formControlName="{{ item.fieldName }}" />
+              formControlName="{{ item.fieldName }}"
+            />
           </mat-form-field>
           <mat-error
             *ngIf="
@@ -56,7 +57,7 @@
               matInput
               [matDatepicker]="picker"
               formControlName="{{ item.fieldName }}"
-              placeholder="{{ item.placeholder }}"
+              placeholder="{{ item.placeholder | titlecase }}"
               [required]="item.isRequired || false"
               readonly
             />
@@ -75,16 +76,16 @@
           <mat-form-field
             class="input-full-width backgroundWhite dropdownfontStyle"
           >
-            <mat-label> {{ item.fieldTitle }}</mat-label>
+            <mat-label> {{ item.fieldTitle | titlecase }}</mat-label>
             <mat-select
               matInput
               multiple
               [required]="item.isRequired || false"
-              placeholder="{{ item.placeholder }}"
+              placeholder="{{ item.placeholder | titlecase }}"
               formControlName="{{ item.fieldName }}"
             >
               <mat-option *ngFor="let option of item.options" [value]="option">
-                {{ option }}
+                {{ option | titlecase }}
               </mat-option>
             </mat-select>
           </mat-form-field>
@@ -110,18 +111,22 @@
               *ngFor="let option of item.options"
               [value]="option"
             >
-              {{ option }}
+              {{ option | titlecase }}
             </mat-radio-button>
           </mat-radio-group>
         </div>
 
-        <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4" *ngIf="item?.fieldType?.toLowerCase() === 'dropdown'">
-
-          <mat-form-field class="input-full-width backgroundWhite fieldForHRP dropdownfontStyle">
-            <mat-label>{{ item.fieldTitle }}</mat-label>
+        <div
+          class="col-xs-12 col-sm-6 col-md-4 col-lg-4"
+          *ngIf="item?.fieldType?.toLowerCase() === 'dropdown'"
+        >
+          <mat-form-field
+            class="input-full-width backgroundWhite fieldForHRP dropdownfontStyle"
+          >
+            <mat-label>{{ item.fieldTitle | titlecase }}</mat-label>
 
             <input
-               matInput
+              matInput
               [placeholder]="item.placeholder"
               [required]="item.isRequired || false"
               [formControlName]="item.fieldName"
@@ -130,16 +135,22 @@
               (focus)="showAllOptions(item)"
             />
 
-            <mat-autocomplete #auto="matAutocomplete" 
-              (optionSelected)="onChangeLocation(item.fieldName, $event.option.value)">
-              <mat-option *ngFor="let option of item.filteredOptions" [value]="option">
-
-                {{ option }}
+            <mat-autocomplete
+              #auto="matAutocomplete"
+              (optionSelected)="
+                onChangeLocation(item.fieldName, $event.option.value)
+              "
+            >
+              <mat-option
+                *ngFor="let option of item.filteredOptions"
+                [value]="option"
+              >
+                {{ option | titlecase }}
               </mat-option>
             </mat-autocomplete>
           </mat-form-field>
         </div>
-       </ng-container>
+      </ng-container>
     </div>
   </form>
 </div>