Skip to content

AMM-2127 clinical observation search is not working. #264

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 6 commits into from
Mar 25, 2026
Merged

AMM-2127 clinical observation search is not working. #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80edbf8
Moving 1979,2159 from Release 3.6.2 to Release 3.6.1 (#255)
snehar-nd Feb 27, 2026
33501e5
fix: amm-2192 remove mandatory for prescription
snehar-nd Mar 2, 2026
95ba793
fix: removed prescription data is required condition
snehar-nd Mar 18, 2026
349da21
fix: amm-2127 clinical observation search not working as expected
snehar-nd Mar 23, 2026
152460c
Merge branch 'release-3.6.2' into sn/3.6.1
snehar-nd Mar 23, 2026
e598316
fix: resolve coderabbit review comments on findings autocomplete and …
snehar-nd Mar 25, 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
287 changes: 138 additions & 149 deletions ...app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,180 +263,169 @@

<div class="row m-t-20">
<ng-container formArrayName="clinicalObservationsList">
<div
<div class="row align-items-center m-t-10"
*ngFor="
let observations of getClinicalObservationsList();
let i = index;
let isLast = last
"
>
<ng-container [formGroupName]="i" class="col-12">
<div class="row">
<div class="col-8">
<mat-form-field class="input-full-width">
<mat-label>{{
current_language_set?.casesheet?.clinicalObs
}}</mat-label>
<input
matInput
allowText="inputFieldValidator"
appClinicalObservations
[observationsList]="observations"
name="viewObservationsProvided"
formControlName="clinicalObservationsProvided"
maxlength="100"
minlength="3"
[previousSelected]="
generalFindingsForm.value.clinicalObservationsList
"
(focus)="trackFieldInteraction('Clinical Observations Input')"
/>
<mat-icon
class="search-btn cursorPointer"
matSuffix
appClinicalObservations
[observationsList]="observations"
[previousSelected]="
generalFindingsForm.value.clinicalObservationsList
"
(click)="
trackFieldInteraction('Search Clinical Observations')
"
>search</mat-icon
>
</mat-form-field>
</div>
<ng-container [formGroupName]="i">
<div class="col-xs-12 col-sm-8 col-md-9">
<mat-form-field class="input-full-width" appearance="fill">
<mat-label>{{
current_language_set?.casesheet?.clinicalObs
}}</mat-label>
<input
matInput
type="text"
autocomplete="off"
name="viewObservationsProvided"
formControlName="clinicalObservationsProvided"
minlength="3"
maxlength="100"
#observationInput
[matAutocomplete]="autoObservation"
(keyup)="onObservationInputKeyup(observationInput.value, i)"
(focus)="trackFieldInteraction('Clinical Observations Input')"
/>
</mat-form-field>

<div class="col-4" style="margin-top: 10px">
<button
mat-mini-fab
type="button"
color="primary"
*ngIf="isLast"
[disabled]="validateAddedObservations(observations)"
(click)="
addObservations();
trackFieldInteraction('Add Clinical Observation')
"
class="mat-add-btn"
<mat-autocomplete
#autoObservation="matAutocomplete"
autoActiveFirstOption
[displayWith]="displayObservation"
(optionSelected)="onObservationSelected($event.option.value, i)"
>
<mat-option
*ngFor="let obs of suggestedObservationsList[i]"
[value]="obs"
>
{{ current_language_set?.common?.add }}
</button>
{{ obs.term }}
</mat-option>
</mat-autocomplete>
</div>

<button
mat-mini-fab
type="button"
class="mat-remove-btn"
color="warn"
*ngIf="
i !== 0 ||
(i === 0 &&
generalFindingsForm.get('clinicalObservationsList')?.value
.clinicalObservationsProvided !== null &&
generalFindingsForm.get('clinicalObservationsList')?.value
.clinicalObservationsProvided !== '')
"
(click)="
removeObservationsFromList(i, observations);
trackFieldInteraction('Remove Clinical Observation')
"
>
{{ current_language_set?.common?.remove }}
</button>
</div>
<div class="col-xs-12 col-sm-4 col-md-3 d-flex align-items-center">
<button
mat-mini-fab
type="button"
color="primary"
*ngIf="isLast"
[disabled]="validateAddedObservations(observations)"
(click)="
addObservations();
trackFieldInteraction('Add Clinical Observation')
"
class="mat-add-btn m-r-10"
>
{{ current_language_set?.common?.add }}
</button>

<button
mat-mini-fab
type="button"
class="mat-remove-btn"
color="warn"
*ngIf="
observations.get('clinicalObservationsProvided')?.disabled ||
i !== 0 ||
(i === 0 &&
generalFindingsForm.get('clinicalObservationsList')?.value[i]
?.clinicalObservationsProvided)
"
(click)="
removeObservationsFromList(i, observations);
trackFieldInteraction('Remove Clinical Observation')
"
>
{{ current_language_set?.common?.remove }}
</button>
</div>
</ng-container>
</div>
</ng-container>
</div>
<div class="row m-t-5">
<ng-container formArrayName="significantFindingsList">
<div
<div class="row align-items-center m-t-10"
*ngFor="
let findings of getSignificantFindingsList();
let i = index;
let isLast = last
"
>
<ng-container [formGroupName]="i" class="col-12">
<div class="row">
<div class="col-8">
<mat-form-field class="input-full-width">
<mat-label>{{
current_language_set?.casesheet?.significantFind
}}</mat-label>
<input
matInput
allowText="inputFieldValidator"
appSignificantFindings
[findingsList]="findings"
name="viewFindingsProvided"
formControlName="significantFindingsProvided"
maxlength="100"
minlength="3"
[previousSelected]="
generalFindingsForm.value.significantFindingsList
"
(keyup)="
resetFindingsCheckbox(
generalFindingsForm.get('significantFindingsList')?.value
.significantFindingsProvided
)
"
(focus)="trackFieldInteraction('Significant Findings Input')"
/>

<mat-icon
class="search-btn cursorPointer"
matSuffix
appSignificantFindings
[findingsList]="findings"
[previousSelected]="
generalFindingsForm.value.significantFindingsList
"
(click)="trackFieldInteraction('Search Significant Findings')"
>search</mat-icon
>
</mat-form-field>
</div>
<ng-container [formGroupName]="i">
<div class="col-xs-12 col-sm-8 col-md-9">
<mat-form-field class="input-full-width" appearance="fill">
<mat-label>{{
current_language_set?.casesheet?.significantFind
}}</mat-label>
<input
matInput
type="text"
autocomplete="off"
name="viewFindingsProvided"
formControlName="significantFindingsProvided"
minlength="3"
maxlength="100"
#findingsInput
[matAutocomplete]="autoFindings"
(keyup)="onFindingsInputKeyup(findingsInput.value, i)"
(focus)="trackFieldInteraction('Significant Findings Input')"
/>
</mat-form-field>

<div class="col-4" style="margin-top: 10px">
<button
mat-mini-fab
type="button"
color="primary"
*ngIf="isLast"
[disabled]="validateAddedFindings(findings)"
(click)="
addFindings();
trackFieldInteraction('Add Significant Finding')
"
class="mat-add-btn"
<mat-autocomplete
#autoFindings="matAutocomplete"
autoActiveFirstOption
[displayWith]="displayFindings"
(optionSelected)="onFindingsSelected($event.option.value, i)"
>
<mat-option
*ngFor="let finding of suggestedFindingsSearchList[i]"
[value]="finding"
>
{{ current_language_set?.common?.add }}
</button>
{{ finding.term }}
</mat-option>
</mat-autocomplete>
</div>

<button
mat-mini-fab
type="button"
color="warn"
class="mat-remove-btn"
*ngIf="
i !== 0 ||
(i === 0 &&
generalFindingsForm.get('significantFindingsList')?.value
.significantFindingsProvided !== null &&
generalFindingsForm.get('significantFindingsList')?.value
.significantFindingsProvided !== '')
"
(click)="
removeFindingsFromList(i, findings);
trackFieldInteraction('Remove Significant Finding')
"
>
{{ current_language_set?.common?.remove }}
</button>
</div>
<div class="col-xs-12 col-sm-4 col-md-3 d-flex align-items-center">
<button
mat-mini-fab
type="button"
color="primary"
*ngIf="isLast"
[disabled]="validateAddedFindings(findings)"
(click)="
addFindings();
trackFieldInteraction('Add Significant Finding')
"
class="mat-add-btn m-r-10"
>
{{ current_language_set?.common?.add }}
</button>

<button
mat-mini-fab
type="button"
color="warn"
class="mat-remove-btn"
*ngIf="
findings.get('significantFindingsProvided')?.disabled ||
i !== 0 ||
(i === 0 &&
generalFindingsForm.get('significantFindingsList')?.value[i]
?.significantFindingsProvided)
"
(click)="
removeFindingsFromList(i, findings);
trackFieldInteraction('Remove Significant Finding')
"
>
{{ current_language_set?.common?.remove }}
</button>
</div>
</ng-container>
</div>
Expand Down
Loading
Loading