Skip to content
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.

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

Patient Registration form refactor #9854

Open
wants to merge 60 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 59 commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
310a865
added patient home actions plugin hook
khavinshankar Jan 8, 2025
5d481c8
expose core app env in global scope
khavinshankar Jan 8, 2025
34580bc
enable heatmap and fix appointments column size (#9713)
rithviknishad Jan 3, 2025
c4380ea
Fix: Forgot password error should be handled properly (#9707)
abhimanyurajeesh Jan 3, 2025
5de0532
Added no user assingned message (#9666)
AnveshNalimela Jan 4, 2025
ff52370
Remove facility name from facility users page (#9746)
Mahendar0701 Jan 4, 2025
0420e48
Enhance organization management by adding new organization types and …
bodhish Jan 5, 2025
f34a943
Cancel button fix in Book Appointment screen (#9757)
arhamathar Jan 5, 2025
17df88e
Add public flag to facility (#9759)
bodhish Jan 5, 2025
6b7ce41
Auto-Hide Sidebar on mobile (#9758)
abhimanyurajeesh Jan 5, 2025
0fec252
Implement Permission Context and Update User Permissions Handling
bodhish Jan 5, 2025
3a9325a
Replaced ButtonV2's with Button in entire codebase (#9736)
Mahendar0701 Jan 5, 2025
804578c
fixes overlapping text (#9767)
cbum-dev Jan 5, 2025
eac1636
Care Loading icon in organization and facility users (#9723)
Rishith25 Jan 5, 2025
ca8f0e3
Clean up facility search in index
bodhish Jan 5, 2025
ce6b2fc
Add searchPostFix prop to ValueSetSelect and related components
bodhish Jan 5, 2025
f96518e
Clean up patient login
bodhish Jan 5, 2025
be656d2
Fix cancel button in update encounter form (#9772)
Mahendar0701 Jan 6, 2025
c1981ca
disabled image build and deploy for care stagin (#9779)
tellmeY18 Jan 6, 2025
b8f2d23
Bump @tanstack/react-query-devtools from 5.62.11 to 5.62.15 (#9785)
dependabot[bot] Jan 6, 2025
a9477b1
Patient encounter notes (#9617)
bodhisha Jan 6, 2025
ddf9b3a
Fix Auto hide without hook (#9780)
abhimanyurajeesh Jan 6, 2025
39f7af2
Enhance encounter data handling by adding encounterId prop across mul…
bodhish Jan 6, 2025
002de3f
Disable encounter create during save (#9795)
bodhish Jan 6, 2025
06f6ead
Refactor PatientHome and EncounterShow components; update FacilityOrg…
bodhish Jan 6, 2025
943aba9
Partial Cleanup Public Router | Public Pages Header
gigincg Jan 6, 2025
1573ba8
Rewire enableWhen
gigincg Jan 6, 2025
541daa5
Remove localStorage watch from AuthUserProvider
gigincg Jan 6, 2025
ac178ea
Implement immediate redirection after successful login
bodhish Jan 6, 2025
0fef102
Fix: Update the value to Home Health in Create Encounter Form (#9806)
AdityaJ2305 Jan 7, 2025
c255f1f
Update Questionnaire Styling
gigincg Jan 7, 2025
303524d
Update Questionnaire Styling
gigincg Jan 7, 2025
eb9287c
Update Auth Handling
gigincg Jan 7, 2025
11b7833
Cleanup Patient Auth State
gigincg Jan 7, 2025
924feec
Handle Null created_by
gigincg Jan 7, 2025
abfcfc0
Types for null patient.created_by
gigincg Jan 7, 2025
4009739
Bump i18next from 24.2.0 to 24.2.1 (#9818)
dependabot[bot] Jan 7, 2025
0350bc4
Bump input-otp from 1.4.1 to 1.4.2 (#9819)
dependabot[bot] Jan 7, 2025
275e94e
Rename dosage field to frequency in ongoing medication form (#9811)
bodhish Jan 7, 2025
e0dc6af
feat: Add new fields to Question interface (#9824)
bodhish Jan 7, 2025
78bd1f2
Cleanup Labels in Questionnaire
gigincg Jan 7, 2025
68cb994
Allergy intolerance Cleanup (#9812)
amjithtitus09 Jan 7, 2025
1652f5b
cleanup CarePatientTokenKey (#9827)
Mahendar0701 Jan 7, 2025
6b87ee1
changed the facility name (#9829)
nihal467 Jan 7, 2025
699b342
Cleanup localStorage Management in Patient Login; Fix Time in Confirm…
gigincg Jan 7, 2025
4dc81a2
Use PatientContext from Router when required
gigincg Jan 8, 2025
c2654a3
Cleanup Navbars
gigincg Jan 8, 2025
4adce97
AllergyList: Add i18n; map key
gigincg Jan 8, 2025
2504b9e
Add Actions in Encounter
gigincg Jan 8, 2025
84139a7
Remove Shortcut for Nursing Care
gigincg Jan 8, 2025
373b2c1
Update Crowdin configuration file
gigincg Jan 8, 2025
42b9722
Update Crowdin configuration file
gigincg Jan 8, 2025
9f094aa
Fix: Replace InputWithError and InputErrors components with ShadCN’s …
AdityaJ2305 Jan 8, 2025
db279cf
fixed eslint errors caused while creating plugin map
khavinshankar Jan 8, 2025
bd25bd4
refactored the patient registration form using react hook form
khavinshankar Jan 8, 2025
745d45e
added patient registration form plugin hook
khavinshankar Jan 9, 2025
0e5aea6
Merge branch 'develop' into abdm_micro_fe
khavinshankar Jan 9, 2025
6e646e5
review suggestions
khavinshankar Jan 9, 2025
d6a8e1d
Merge commit '6e646e570065beca1e475ba898fdb0c23ca67c43' into abdm_mic…
khavinshankar Jan 9, 2025
e18e448
Merge branch 'develop' into abdm_micro_fe
khavinshankar Jan 10, 2025
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
14 changes: 14 additions & 0 deletions public/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@
"add_spoke": "Add Spoke Facility",
"additional_information": "Additional Information",
"address": "Address",
"address_is_required": "Address is required",
"administer": "Administer",
"administer_medicine": "Administer Medicine",
"administer_medicines": "Administer Medicines",
Expand Down Expand Up @@ -462,6 +463,7 @@
"beta": "beta",
"bladder": "Bladder",
"blood_group": "Blood Group",
"blood_group_is_required": "Blood group is required",
"blood_pressure_error": {
"missing": "Field is required. Either specify both or clear both.",
"exceed": "Value cannot exceed 250 mmHg.",
Expand Down Expand Up @@ -669,6 +671,8 @@
"date_of_admission": "Date of Admission",
"date_of_birth": "Date of Birth",
"date_of_birth_age": "Date of Birth/Age",
"date_of_birth_format": "Date of birth must be in YYYY-MM-DD format",
"date_of_birth_must_be_present": "Date of birth must be present",
"date_of_birth_or_age": "Date of Birth or Age",
"date_of_positive_covid_19_swab": "Date of Positive Covid 19 Swab",
"date_of_result": "Covid confirmation date",
Expand Down Expand Up @@ -977,12 +981,14 @@
"full_name": "Full Name",
"full_screen": "Full Screen",
"gender": "Gender",
"gender_is_required": "Gender is required",
"general_info_detail": "Provide the patient's personal details, including name, date of birth, gender, and contact information for accurate identification and communication.",
"generate_link_abha": "Generate/Link ABHA Number",
"generate_report": "Generate Report",
"generated_summary_caution": "This is a computer generated summary using the information captured in the CARE system.",
"generating": "Generating",
"generating_discharge_summary": "Generating discharge summary",
"geo_organization_is_required": "Geo organization is required when nationality is India",
"get_auth_methods": "Get Available Authentication Methods",
"get_auth_mode_error": "Could not find any supported authentication methods, Please try again with a different authentication method",
"get_tests": "Get Tests",
Expand Down Expand Up @@ -1220,9 +1226,11 @@
"my_doctors": "My Doctors",
"my_profile": "My Profile",
"name": "Name",
"name_is_required": "Name is required",
"name_of_hospital": "Name of Hospital",
"name_of_shifting_approving_facility": "Name of shifting approving facility",
"nationality": "Nationality",
"nationality_is_required": "Nationality is required",
"nearby_facilities": "Nearby Facilities",
"never": "never",
"new_password": "New Password",
Expand Down Expand Up @@ -1405,6 +1413,7 @@
"patient_update_success": "Patient Updated Sucessfully",
"patients": "Patients",
"pending": "Pending",
"permanant_address_is_required": "Permanant address is required",
"permanent_address": "Permanent Address",
"permission_denied": "You do not have permission to perform this action",
"personal_information": "Personal Information",
Expand All @@ -1416,9 +1425,11 @@
"phone_number": "Phone Number",
"phone_number_at_current_facility": "Phone Number of Contact person at current Facility",
"phone_number_min_error": "Phone number must be at least 10 characters long",
"phone_number_must_be_10_digits": "Phone number must be a 10-digit mobile number",
"phone_number_verified": "Phone Number Verified",
"pincode": "Pincode",
"pincode_autofill": "State and District auto-filled from Pincode",
"pincode_must_be_6_digits": "Pincode must be a 6-digit number",
"play": "Play",
"play_audio": "Play Audio",
"please_assign_bed_to_patient": "Please assign a bed to this patient",
Expand All @@ -1430,6 +1441,7 @@
"please_enter_username": "Please enter the username",
"please_fix_errors": "Please fix the errors in the highlighted fields and try submitting again.",
"please_select_a_facility": "Please select a facility",
"please_select_blood_group": "Please select the blood group",
"please_select_breathlessness_level": "Please select Breathlessness Level",
"please_select_district": "Please select the district",
"please_select_facility_type": "Please select Facility Type",
Expand Down Expand Up @@ -1929,6 +1941,8 @@
"working_status": "Working Status",
"year": "Year",
"year_of_birth": "Year of Birth",
"year_of_birth_format": "Year of birth must be in YYYY format",
"year_of_birth_must_be_present": "Year of birth must be present",
"years": "years",
"years_of_experience": "Years of Experience",
"years_of_experience_of_the_doctor": "Years of Experience of the Doctor",
Expand Down
4 changes: 3 additions & 1 deletion scripts/setup-care-apps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,14 @@ const plugins = readAppsConfig();

// Generate pluginMap.ts
const pluginMapPath = path.join(__dirname, "..", "src", "pluginMap.ts");
const pluginMapContent = `// Use type assertion for the static import${plugins
const pluginMapContent = `// Use type assertion for the static import
${plugins
.map(
(plugin) =>
`// @ts-expect-error Remote module will be available at runtime\nimport ${plugin.camelCaseName}Manifest from "${plugin.repo}/manifest";`,
)
.join("\n")}

import type { PluginManifest } from "./pluginTypes";

const pluginMap: PluginManifest[] = [${plugins.map((plugin) => `${plugin.camelCaseName}Manifest as PluginManifest`).join(",\n ")}];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { ReactNode, createContext, useContext, useState } from "react";

import { PLUGIN_Component } from "@/PluginEngine";
import { Encounter } from "@/types/emr/encounter";
import { Patient } from "@/types/emr/newPatient";

Expand Down Expand Up @@ -65,7 +64,6 @@ export const EncounterProvider = <T extends object = object>({
} as EncounterContextType<T>
}
>
<PLUGIN_Component __name="EncounterContextEnabler" />
{children}
</EncounterContext.Provider>
);
Expand Down
11 changes: 9 additions & 2 deletions src/components/Patient/PatientHome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import Loading from "@/components/Common/Loading";
import Page from "@/components/Common/Page";
import { patientTabs } from "@/components/Patient/PatientDetailsTab";

import { PLUGIN_Component } from "@/PluginEngine";
import routes from "@/Utils/request/api";
import query from "@/Utils/request/query";
import { formatDateTime, formatPatientAge, relativeDate } from "@/Utils/utils";
Expand Down Expand Up @@ -134,8 +135,8 @@ export const PatientHome = (props: {
{t("actions")}
</div>
<div className="mt-2 h-full space-y-2">
<div className="space-y-3 border-b border-dashed text-left text-lg font-semibold text-secondary-900">
<div>
<div className="space-y-3 text-left text-lg font-semibold text-secondary-900">
<div className="space-y-2">
<Button
className="w-full bg-white font-semibold text-green-800 hover:bg-secondary-200"
id="upload-patient-files"
Expand All @@ -150,6 +151,12 @@ export const PatientHome = (props: {
{t("view_update_patient_files")}
</span>
</Button>

<PLUGIN_Component
__name="PatientHomeActions"
patient={patientData}
className="w-full bg-white font-semibold text-green-800 hover:bg-secondary-200"
/>
</div>
</div>
</div>
Expand Down
Loading
Loading