Move code from 3.4.0 to main #81
There are no files selected for viewing
Submodule Common-UI
updated
30 files
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -118,40 +118,29 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4> | |
| <ng-container formArrayName="provisionalDiagnosisList"> | ||
| <div | ||
| *ngFor=" | ||
| let diagnosis of provisionalDiagnosisControls; | ||
| let i = index; | ||
| let isLast = last | ||
| " | ||
| > | ||
| <ng-container [formGroupName]="i"> | ||
| <div class="row"> | ||
| <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?.provisionalDiag }}</mat-label> | ||
| <input matInput type="text" autocomplete="off" name="viewProvisionalDiagnosisProvided" | ||
| formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" required #diagnosisInput | ||
| [matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" /> | ||
| </mat-form-field> | ||
|
|
||
| <mat-autocomplete #autoDiagnosis="matAutocomplete" autoActiveFirstOption [displayWith]="displayDiagnosis" | ||
| (optionSelected)="onDiagnosisSelected($event.option.value, i)"> | ||
| <mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag"> | ||
| {{ diag.term }} | ||
| </mat-option> | ||
| </mat-autocomplete> | ||
| </div> | ||
|
|
||
| <div class="col-xs-12 col-sm-3 m-t-10"> | ||
| <button | ||
| mat-mini-fab | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,6 +59,9 @@ | |
| visitCategory: any; | ||
| attendantType: any; | ||
| enableNCDCondition = false; | ||
| suggestedDiagnosisList: any = []; | ||
|
|
||
|
|
||
| constructor( | ||
| private fb: FormBuilder, | ||
| private masterdataService: MasterdataService, | ||
|
|
@@ -178,8 +181,7 @@ | |
| (<FormGroup>diagnosisArrayList.at(i)).controls[ | ||
| 'viewProvisionalDiagnosisProvided' | ||
| ].disable(); | ||
| this.addDiagnosis(); | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -197,13 +199,11 @@ | |
| } | ||
| } | ||
|
|
||
| get provisionalDiagnosisControls(): AbstractControl[] { | ||
| return ( | ||
| (this.generalDiagnosisForm.get('provisionalDiagnosisList') as FormArray) | ||
| ?.controls || [] | ||
| ); | ||
| } | ||
|
|
||
| removeDiagnosisFromList( | ||
|
|
@@ -268,4 +268,35 @@ | |
| value, | ||
| ); | ||
| } | ||
|
|
||
| onDiagnosisInputKeyup(value: string, index: number) { | ||
| if (value.length >= 3) { | ||
| this.masterdataService | ||
| .searchDiagnosisBasedOnPageNo(value, index) | ||
| .subscribe((results: any) => { | ||
|
Comment on lines
+272
to
+276
There was a problem hiding this comment. 💡 Verification agent 🧩 Analysis chainConfirm MasterdataService signature for searchDiagnosisBasedOnPageNo Second argument reads like a page number; here it’s the row index. Ensure the method expects row index (or ignores it). Otherwise, pass an actual pageNo and track row index locally. 🏁 Script executed: #!/bin/bash
# Inspect MasterdataService signature and param names
fd 'masterdata\.service\.(ts|js)$' src | xargs -I{} rg -n 'searchDiagnosisBasedOnPageNo\s*\(' {}Length of output: 169 Fix incorrect argument usage for The searchDiagnosisBasedOnPageNo(searchTerm: any, pageNo: any) { … }but here you’re passing the row Please update the component to:
Example diff in onDiagnosisInputKeyup(value: string, index: number) {
if (value.length >= 3) {
- this.masterdataService
- .searchDiagnosisBasedOnPageNo(value, index)
+ // Use the actual page number (e.g. this.currentPage), not the row index
+ this.masterdataService
+ .searchDiagnosisBasedOnPageNo(value, this.currentPage)
.subscribe((results: any) => {
// handle results; use `index` only for row-specific logic🤖 Prompt for AI Agents |
||
| this.suggestedDiagnosisList[index] = results?.data?.sctMaster; | ||
| }); | ||
| } else { | ||
| this.suggestedDiagnosisList[index] = []; | ||
| } | ||
| } | ||
|
|
||
| displayDiagnosis(diagnosis: any): string { | ||
| return typeof diagnosis === 'string' ? diagnosis : diagnosis?.term || ''; | ||
| } | ||
|
|
||
| onDiagnosisSelected(selected: any, index: number) { | ||
| // this.patientQuickConsultForm.get(['provisionalDiagnosisList', index])?.setValue(selected); | ||
| const diagnosisFormArray = this.generalDiagnosisForm.get( | ||
| 'provisionalDiagnosisList' | ||
| ) as FormArray; | ||
| const diagnosisFormGroup = diagnosisFormArray.at(index) as FormGroup; | ||
|
|
||
| // Set the nested and top-level fields | ||
| diagnosisFormGroup.patchValue({ | ||
| viewProvisionalDiagnosisProvided: selected, | ||
| conceptID: selected?.conceptID || null, | ||
| term: selected?.term || null, | ||
| }); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,39 +12,27 @@ <h4 *ngIf="!enableProvisionalDiag"> | |
| <ng-container formArrayName="provisionalDiagnosisList"> | ||
| <div | ||
| *ngFor=" | ||
| let diagnosis of provisionalDiagnosisControls; | ||
| let i = index; | ||
| let isLast = last | ||
| " | ||
| > | ||
| <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?.provisionalDiag }}</mat-label> | ||
| <input matInput type="text" autocomplete="off" name="viewProvisionalDiagnosisProvided" | ||
| formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" required #diagnosisInput | ||
| [matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" /> | ||
| </mat-form-field> | ||
|
|
||
| <mat-autocomplete #autoDiagnosis="matAutocomplete" autoActiveFirstOption [displayWith]="displayDiagnosis" | ||
| (optionSelected)="onDiagnosisSelected($event.option.value, i)"> | ||
| <mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag"> | ||
| {{ diag.term }} | ||
| </mat-option> | ||
| </mat-autocomplete> | ||
| </div> | ||
| <div class="col-xs-12 col-sm-3 m-t-10"> | ||
| <button | ||
| mat-mini-fab | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Verification agent
🧩 Analysis chain
Confirm i18n key availability for bendetails.lastName across all locales
Template references current_language_set?.bendetails?.lastName. Please verify corresponding entries exist in all shipped locale JSONs to avoid a blank header at runtime.
Run this to confirm:
🏁 Script executed:
Length of output: 98
🏁 Script executed:
Length of output: 481
🏁 Script executed:
Length of output: 172
🏁 Script executed:
Length of output: 173
Add missing
bendetails.lastNametranslation to locale filesWe ran a validation across all JSON assets and found that the key
bendetails.lastNameis missing in the following file, which will lead to a blank header at runtime:src/assets/language.json: missingbendetails.lastNamePlease add the appropriate translation entry under the
bendetailsobject in this file (and any other locales as needed) to ensure the label renders correctly.🤖 Prompt for AI Agents