Skip to content
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
class="border-l-[3px] font-semibold"
[ngClass]="
row.benVisitNo === 1
? 'border-l-success'
? 'border-l-primary'
: 'border-l-warning'
">
{{ serial(i) }}
Expand Down Expand Up @@ -149,7 +149,7 @@
*ngIf="!footerStart && visitStatus"
class="m-0 flex list-none items-center gap-5 p-0 text-[0.8125rem] text-muted-foreground">
<li class="inline-flex items-center gap-1.5">
<span class="size-3 rounded bg-success"></span>
<span class="size-3 rounded bg-primary"></span>
{{ firstVisitText }}
</li>
<li class="inline-flex items-center gap-1.5">
Expand Down
3 changes: 2 additions & 1 deletion src/app/app-modules/lab/workarea/workarea.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@
? true
: false
">
{{ current_language_set?.coreComponents?.mandatory }}*
{{ current_language_set?.coreComponents?.mandatory
}}<span class="text-destructive">*</span>
</span>

<z-radio-group
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
z-form-label
for="doctorDiagnosis"
class="rounded-md bg-muted px-3 py-2 text-sm font-semibold text-foreground">
{{ current_language_set?.doctorDiagnosis }}*
{{ current_language_set?.doctorDiagnosis
}}<span class="text-destructive">*</span>
</label>
<z-form-field class="w-full">
<z-form-control>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<z-card class="bg-muted/40">
<z-card-header>
<z-card-title
>{{ current_language_set?.casesheet?.provisionalDiag }}*</z-card-title
>{{ current_language_set?.casesheet?.provisionalDiag
}}<span class="text-destructive">*</span></z-card-title
>
</z-card-header>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="rounded-md bg-muted px-4 py-2">
<p class="text-sm font-semibold text-foreground">
{{ current_language_set?.casesheet?.provisionalDiag
}}<span *ngIf="enableProvisionalDiag">*</span>
}}<span *ngIf="enableProvisionalDiag" class="text-destructive">*</span>
</p>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@
(focus)="trackFieldInteraction('Chief Complaint')" />
</z-form-control>

<div
*ngIf="suggestedChiefComplaintList[i]?.length"
role="listbox"
class="absolute z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md">
class="absolute left-0 top-full z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md">

Check warning on line 101 in src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.html

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use <datalist> or <select> instead of the listbox role to ensure accessibility across all devices.

See more on https://sonarcloud.io/project/issues?id=PSMRI_MMU-UI-NEXT&issues=AaALUxVYoex1GfKC8zc5&open=AaALUxVYoex1GfKC8zc5&pullRequest=442
<button
type="button"
role="option"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
>{{
currentLanguageSet?.ExaminationData?.ANC_OPD_PNCExamination
?.genExamination?.typeofEdema
}}*</label
}}<span class="text-destructive">*</span></label
>
<z-radio-group
id="edemaType"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@
>{{
currentLanguageSet?.historyData?.ancHistory
?.familyHistoryDataANC_OPD_NCD_PNC?.diseaseType
}}{{ age >= 30 ? ' *' : '' }}</label
}}<span class="text-destructive">{{
age >= 30 ? ' *' : ''
}}</span></label
>
<z-form-control>
<z-select
Expand Down Expand Up @@ -106,10 +108,14 @@
</z-form-field>

<z-form-field class="gap-1.5">
<label z-form-label for="familyMembers-{{ i }}">{{
currentLanguageSet?.historyData?.ancHistory
?.familyHistoryDataANC_OPD_NCD_PNC?.familyMember
}}</label>
<label z-form-label for="familyMembers-{{ i }}"
>{{
currentLanguageSet?.historyData?.ancHistory
?.familyHistoryDataANC_OPD_NCD_PNC?.familyMember
}}<span class="text-destructive">{{
age >= 30 ? ' *' : ''
}}</span></label
>
<z-form-control>
<z-select
class="w-full bg-background"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,8 @@

<!-- ===================== PROVISIONAL DIAGNOSIS ===================== -->
<p class="text-base font-semibold tracking-tight text-foreground">
{{ currentLanguageSet?.DiagnosisDetails?.provisionaldiagnosis }} *
{{ currentLanguageSet?.DiagnosisDetails?.provisionaldiagnosis
}} <span class="text-destructive">*</span>
</p>

<ng-container formArrayName="provisionalDiagnosisList">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@
<!-- Referred to institute -->
<div class="grid grid-cols-1 items-center gap-2 sm:grid-cols-2">
<span class="text-sm font-medium text-foreground">
{{ currentLanguageSet?.Referdetails?.higherhealthcarecenter }}
{{ showMsg > 0 && instituteFlag === true ? '*' : '' }}
{{ currentLanguageSet?.Referdetails?.higherhealthcarecenter
}}<span class="text-destructive">{{
showMsg > 0 && instituteFlag === true ? ' *' : ''
}}</span>
</span>
<z-select
class="w-full"
Expand Down Expand Up @@ -95,7 +97,11 @@
<div class="grid grid-cols-1 items-start gap-2 sm:grid-cols-2">
<span class="text-sm font-medium text-foreground">
{{ currentLanguageSet?.Referdetails?.referralReason }}
<span *ngIf="referForm.get('referralReason')?.enabled">*</span>
<span
*ngIf="referForm.get('referralReason')?.enabled"
class="text-destructive"
>*</span
>
</span>
<z-form-field class="w-full">
<z-form-control>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
#complaintType />
</z-form-control>

<div
*ngIf="suggestedChiefComplaintList[i]?.length"
role="listbox"
class="absolute z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md">
class="absolute left-0 top-full z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md">

Check warning on line 41 in src/app/app-modules/nurse-doctor/visit-details/chief-complaints/chief-complaints.component.html

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use <datalist> or <select> instead of the listbox role to ensure accessibility across all devices.

See more on https://sonarcloud.io/project/issues?id=PSMRI_MMU-UI-NEXT&issues=AaALUxYwoex1GfKC8zc6&open=AaALUxYwoex1GfKC8zc6&pullRequest=442
<button
type="button"
role="option"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<div
class="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
<label z-form-label for="travelStatus">
{{ currentLanguageSet?.travel?.haveyouTravelledlast14days }} *
{{ currentLanguageSet?.travel?.haveyouTravelledlast14days
}} <span class="text-destructive">*</span>
</label>
<z-radio-group
formControlName="travelStatus"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@

<!-- BMI status markers (adult / no gender) -->
<div
class="flex flex-col justify-center gap-1"
class="flex flex-col gap-1.5"
*ngIf="
(totalMonths !== undefined && totalMonths > 228) ||
(totalMonths !== undefined &&
Expand All @@ -107,9 +107,15 @@
!male &&
!female)
">
<div
class="flex items-center gap-2 text-sm text-destructive"
*ngIf="BMI !== null && BMI < 18.5">
<!-- invisible label spacer: matches the sibling fields' label height so
the status badge lines up on the input's vertical center -->
<label z-form-label aria-hidden="true" class="invisible select-none"
>&nbsp;</label

Check warning on line 113 in src/app/app-modules/nurse-doctor/vitals/cancer-patient-vitals/cancer-patient-vitals.component.html

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

A form label must be associated with a control and have accessible text.

See more on https://sonarcloud.io/project/issues?id=PSMRI_MMU-UI-NEXT&issues=AaALUxZ-oex1GfKC8zc8&open=AaALUxZ-oex1GfKC8zc8&pullRequest=442
>
<div class="flex min-h-9 flex-col justify-center gap-1">
<div
class="flex items-center gap-2 text-sm text-destructive"
*ngIf="BMI !== null && BMI < 18.5">
<ng-icon name="lucideCircle" size="14"></ng-icon>
<span>{{
currentLanguageSet?.vitalsDetails
Expand Down Expand Up @@ -157,6 +163,7 @@
>{{ currentLanguageSet?.pleaseConfirmClinically }}
</span>
</span>
</div>
</div>

<!-- BMI status markers (minor) -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,16 @@
!male &&
!female)
">
<div class="flex flex-col justify-end gap-1">
<div
class="flex items-center gap-1.5 text-sm text-destructive"
*ngIf="bMI !== null && bMI < 18.5">
<div class="flex flex-col gap-1.5">
<!-- invisible label spacer: matches the sibling fields' label height so
the status badge lines up on the input's vertical center -->
<label z-form-label aria-hidden="true" class="invisible select-none"
>&nbsp;</label

Check warning on line 171 in src/app/app-modules/nurse-doctor/vitals/general-patient-vitals/general-patient-vitals.component.html

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

A form label must be associated with a control and have accessible text.

See more on https://sonarcloud.io/project/issues?id=PSMRI_MMU-UI-NEXT&issues=AaALUxZcoex1GfKC8zc7&open=AaALUxZcoex1GfKC8zc7&pullRequest=442
>
<div class="flex min-h-9 flex-col justify-center gap-1">
<div
class="flex items-center gap-1.5 text-sm text-destructive"
*ngIf="bMI !== null && bMI < 18.5">
<ng-icon name="lucideCircle" size="12"></ng-icon>
<span>{{
currentLanguageSet?.vitalsDetails
Expand Down Expand Up @@ -215,6 +221,7 @@
currentLanguageSet?.pleaseConfirmClinically
}}</span>
</span>
</div>
</div>
</ng-template>

Expand Down
8 changes: 4 additions & 4 deletions src/assets/English.json
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
"bloodGlucoseTrend": "Blood Glucose Trends",
"resultMammogram": "Results of Mammogram",
"otherComplication": "Other Complication of Current Pregnancy",
"add": "add",
"add": "Add",
"remove":"remove",
"confirmDiagnosis": "Confirmatory Diagnosis",
"labTest": "Test Report",
Expand Down Expand Up @@ -525,7 +525,7 @@
"consanguineousMarriage": "H/o Consanguineous Marriage",
"geneticDisorders": "Genetic Disorders",
"previousFamilyHistory": "Previous Family History",
"pleaseSelectDiabetesMellitusInDiseaseType": "Please select Diabetes Mellitus in disease type"
"pleaseSelectDiabetesMellitusInDiseaseType": "Please select any NCD for proper screening"
},
"menstrualHistoryANC": {
"menstrualHistory": "Menstrual History",
Expand Down Expand Up @@ -1186,10 +1186,10 @@
"Prescription": {
"form": "Form",
"medicine": "Medicine",
"dosage": "dosage",
"dosage": "Dosage",
"frequency": "Frequency",
"unit": "Unit",
"Route": "route",
"Route": "Route",
"instructions": "Instructions",
"quantity": "Quantity",
"isEDL": "IsEDL"
Expand Down