Skip to content

Sn/es #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snehar-nd merged 3 commits into from
Jan 6, 2026
Merged

Sn/es #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f439a1b
fix: AMM-2038 found ben id issue , and age issue fixed that
snehar-nd Jan 6, 2026
495ccc8
fix: removed the esenable condition for table serach
snehar-nd Jan 6, 2026
55057d0
Merge branch 'release-3.6.1' of https://github.com/PSMRI/Common-UI in…
snehar-nd Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/registrar/search/search.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
id="searchbox"
pattern="[a-zA-Z0-9]*"
maxlength="32"
placeholder="{{ isEnableES ? currentLanguageSet?.ro?.benIDOrPhNo : currentLanguageSet?.ro?.benIDOrPhNo }}"
placeholder="{{ isEnableES ? currentLanguageSet?.ro?.benDetails : currentLanguageSet?.ro?.benIDOrPhNo }}"
class="pull-left search_textbox"
[(ngModel)]="quicksearchTerm"
(ngModelChange)="onSearchInputChange($event)"
Expand Down Expand Up @@ -110,7 +110,7 @@ <h4 class="modal-title">
<input
autocomplete="off"
matInput
placeholder="{{ currentLanguageSet?.common?.inTableSearch }}"
placeholder="{{currentLanguageSet?.common?.inTableSearch}}"
#filterTerm
(keyup)="filterBeneficiaryList(filterTerm.value)"
/>
Expand Down Expand Up @@ -163,7 +163,7 @@ <h4 class="modal-title">
*matCellDef="let beneficiary"
(click)="patientRevisited(beneficiary.benObject)"
>
{{ isEnableES ? beneficiary?.beneficiaryRegID : beneficiary?.beneficiaryID }}
{{ beneficiary?.beneficiaryID }}
</td>
</ng-container>

Expand Down
6 changes: 3 additions & 3 deletions src/registrar/search/search.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes
benObject &&
benObject.m_gender &&
benObject.m_gender.genderName &&
benObject.dOB
benObject.dob
) {
const action = false;
console.log(JSON.stringify(benObject, null, 4), 'benObject');
Expand All @@ -455,7 +455,7 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes
.subscribe((result) => {
if (result) this.sendToNurseWindow(result, benObject);
});
} else if (!benObject.m_gender.genderName && !benObject.dOB) {
} else if (!benObject.m_gender.genderName && !benObject.dob) {
this.confirmationService.alert(
this.currentLanguageSet.alerts.info.genderAndAgeDetails,
'info',
Expand All @@ -465,7 +465,7 @@ export class SearchComponent implements OnInit, DoCheck, AfterViewChecked, OnDes
this.currentLanguageSet.alerts.info.noGenderDetails,
'info',
);
} else if (!benObject.dOB) {
} else if (!benObject.dob) {
this.confirmationService.alert(
this.currentLanguageSet.alerts.info.noAgeDetailsAvail,
'info',
Expand Down