Auto deployed to care.ohc.network for develop branch. All pull requests have preview builds powered by Netlify.
- 
diff --git a/netlify.toml b/netlify.toml
index 0b2f1efd031..f92f9feba29 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -29,7 +29,7 @@ status = 200
script-src 'self' 'nonce-f51b9742' https://plausible.10bedicu.in;
style-src 'self' 'unsafe-inline';
connect-src 'self' https://plausible.10bedicu.in;
- img-src 'self' https://cdn.coronasafe.network https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com;
+ img-src 'self' https://cdn.ohc.network https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com;
object-src 'self' https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com;
report-uri https://csp-logger.ohc.network/
'''
diff --git a/package.json b/package.json
index eeb5d36bc22..d2de97bbb09 100644
--- a/package.json
+++ b/package.json
@@ -1,22 +1,22 @@
{
"name": "care_fe",
"version": "2.5.4",
- "description": "Care is a single point to link Hospitals,Corona Care Centers and Volunteers to the unified Corona Safe Network",
+ "description": "Care is a Digital Public Good enabling TeleICU & Decentralised Administration of Healthcare Capacity across States.",
"private": true,
"repository": {
"type": "git",
- "url": "git@github.com:coronasafe/care_fe.git"
+ "url": "git@github.com:ohcnetwork/care_fe.git"
},
"bugs": {
- "url": "https://support.coronasafe.network",
- "email": "info@coronasafe.network"
+ "url": "https://github.com/ohcnetwork/care_fe/issues",
+ "email": "info@ohc.network"
},
"contributors": [
- "coronasafe Contributors"
+ "Open Healthcare Network Contributors"
],
- "homepage": "https://care.coronasafe.in",
+ "homepage": "https://care.ohc.network",
"keywords": [
- "Coronasafe",
+ "ohcnetwork",
"care",
"react",
"tailwind",
@@ -24,7 +24,7 @@
"typescript",
"vite"
],
- "author": "Coronsafe Care Contributors",
+ "author": "Open Healthcare Network Contributors",
"license": "MIT",
"scripts": {
"build:react": "cross-env NODE_ENV=production vite build",
@@ -161,4 +161,4 @@
"node": ">=20.12.0"
},
"packageManager": "npm@10.5.0"
-}
+}
\ No newline at end of file
diff --git a/public/config.json b/public/config.json
index 88ad2cdf5c8..a0810dbbafc 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,15 +1,15 @@
{
- "github_url": "https://github.com/coronasafe",
- "coronasafe_url": "https://coronasafe.network?ref=care",
- "site_url": "care.coronasafe.in",
+ "github_url": "https://github.com/ohcnetwork",
+ "ohcn_url": "https://ohc.network?ref=care",
+ "site_url": "care.ohc.network",
"analytics_server_url": "https://plausible.10bedicu.in",
"header_logo": {
- "light": "https://cdn.coronasafe.network/header_logo.png",
- "dark": "https://cdn.coronasafe.network/header_logo.png"
+ "light": "https://cdn.ohc.network/header_logo.png",
+ "dark": "https://cdn.ohc.network/header_logo.png"
},
"main_logo": {
- "light": "https://cdn.coronasafe.network/light-logo.svg",
- "dark": "https://cdn.coronasafe.network/black-logo.svg"
+ "light": "https://cdn.ohc.network/light-logo.svg",
+ "dark": "https://cdn.ohc.network/black-logo.svg"
},
"gmaps_api_key": "AIzaSyDsBAc3y7deI5ZO3NtK5GuzKwtUzQNJNUk",
"gov_data_api_key": "579b464db66ec23bdd000001cdd3946e44ce4aad7209ff7b23ac571b",
diff --git a/public/contribute.json b/public/contribute.json
deleted file mode 100644
index c1e5c9480b7..00000000000
--- a/public/contribute.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "Care",
- "description": "Care is a single point to link Hospitals,Corona Care Centers and Volunteers to the unified Corona Safe Network",
- "repository": {
- "url": "https://github.com/coronasafe/care_fe",
- "license": "MIT"
- },
- "participate": {
- "home": "https://volunteer.coronasafe.network",
- "docs": "https://knowledge.coronasafe.network"
- },
- "bugs": {
- "list": "https://github.com/coronasafe/care_fe/issues",
- "report": "https://github.com/coronasafe/care_fe/issues/new/choose"
- },
- "urls": {
- "prod": "https://care.coronasafe.network",
- "stage": "https://care.coronasafe.in"
- },
- "keywords": [
- "javascript",
- "typescript",
- "reason-react",
- "React",
- "Docker"
- ]
-}
\ No newline at end of file
diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx
index 610309057d0..6e5a9e33e4e 100644
--- a/src/Common/constants.tsx
+++ b/src/Common/constants.tsx
@@ -441,17 +441,49 @@ export const INSULIN_INTAKE_FREQUENCY_OPTIONS = [
"TD",
] as const;
-export type PatientCategoryID = "Comfort" | "Stable" | "Moderate" | "Critical";
+export type PatientCategoryID =
+ | "Comfort"
+ | "Stable"
+ | "Moderate"
+ | "Critical"
+ | "ActivelyDying";
export const PATIENT_CATEGORIES: {
id: PatientCategoryID;
text: PatientCategory;
+ description: string;
twClass: string;
}[] = [
- { id: "Comfort", text: "Comfort Care", twClass: "patient-comfort" },
- { id: "Stable", text: "Mild", twClass: "patient-stable" },
- { id: "Moderate", text: "Moderate", twClass: "patient-abnormal" },
- { id: "Critical", text: "Critical", twClass: "patient-critical" },
+ {
+ id: "Comfort", // Comfort Care is discontinued
+ text: "Comfort Care",
+ twClass: "patient-comfort",
+ description: "End of life care",
+ },
+ {
+ id: "Stable",
+ text: "Mild",
+ twClass: "patient-stable",
+ description: "Urgent: not life-threatening",
+ },
+ {
+ id: "Moderate",
+ text: "Moderate",
+ twClass: "patient-abnormal",
+ description: "Emergency: could be life-threatening",
+ },
+ {
+ id: "Critical",
+ text: "Critical",
+ twClass: "patient-critical",
+ description: "Immediate: life-threatening",
+ },
+ {
+ id: "ActivelyDying",
+ text: "Actively Dying",
+ twClass: "patient-activelydying",
+ description: "",
+ },
];
export const PATIENT_FILTER_CATEGORIES = PATIENT_CATEGORIES;
diff --git a/src/Common/hooks/useConfig.ts b/src/Common/hooks/useConfig.ts
index 0bb619296a3..38e2336d583 100644
--- a/src/Common/hooks/useConfig.ts
+++ b/src/Common/hooks/useConfig.ts
@@ -10,7 +10,7 @@ interface ILogo {
export interface IConfig {
dashboard_url?: string;
github_url: string;
- coronasafe_url: string;
+ ohcn_url: string;
site_url: string;
analytics_server_url: string;
diff --git a/src/Components/Auth/Login.tsx b/src/Components/Auth/Login.tsx
index 4d49c4458ed..d0d055413cb 100644
--- a/src/Components/Auth/Login.tsx
+++ b/src/Components/Auth/Login.tsx
@@ -21,7 +21,7 @@ export const Login = (props: { forgot?: boolean }) => {
main_logo,
recaptcha_site_key,
github_url,
- coronasafe_url,
+ ohcn_url,
state_logo,
custom_logo,
custom_logo_alt,
@@ -173,7 +173,7 @@ export const Login = (props: { forgot?: boolean }) => {
)}
- 
diff --git a/src/Components/Scribe/formDetails.ts b/src/Components/Scribe/formDetails.ts
index d085a72d331..736ab971744 100644
--- a/src/Components/Scribe/formDetails.ts
+++ b/src/Components/Scribe/formDetails.ts
@@ -68,13 +68,15 @@ const DAILY_ROUND_FORM_SCRIBE_DATA: Field[] = [
friendlyName: "Patient Category",
id: "patient_category",
type: "string",
- example: "Comfort Care",
+ example: "Mild",
default: "",
description: "A string to categorize the patient.",
- options: PATIENT_CATEGORIES.map((category) => ({
- id: category.id,
- text: category.text,
- })),
+ options: PATIENT_CATEGORIES.filter((c) => c.id !== "Comfort").map(
+ (category) => ({
+ id: category.id,
+ text: category.text,
+ }),
+ ),
validator: (value) => {
return typeof value === "string";
},
diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
index 5b78ddf9ac5..a3cb3063577 100644
--- a/src/Components/Users/ManageUsers.tsx
+++ b/src/Components/Users/ManageUsers.tsx
@@ -78,7 +78,7 @@ export default function ManageUsers() {
const { data: homeFacilityData } = useQuery(routes.getAnyFacility, {
pathParams: { id: qParams.home_facility },
- prefetch: !!qParams.home_facility,
+ prefetch: !!qParams.home_facility && qParams.home_facility !== "NONE",
});
const {
@@ -556,7 +556,11 @@ export default function ManageUsers() {
value(
"Home Facility",
"home_facility",
- qParams.home_facility ? homeFacilityData?.name || "" : "",
+ qParams.home_facility
+ ? qParams.home_facility === "NONE"
+ ? t("no_home_facility")
+ : homeFacilityData?.name || ""
+ : "",
),
value(
"Last Active",
diff --git a/src/Components/Users/UserAdd.tsx b/src/Components/Users/UserAdd.tsx
index 9b4d675c184..86d27bc84d7 100644
--- a/src/Components/Users/UserAdd.tsx
+++ b/src/Components/Users/UserAdd.tsx
@@ -606,7 +606,7 @@ export const UserAdd = (props: UserProps) => {
title={headerText}
options={
diff --git a/src/Components/Users/UserFilter.tsx b/src/Components/Users/UserFilter.tsx
index f79968cef4f..ff2a81723cd 100644
--- a/src/Components/Users/UserFilter.tsx
+++ b/src/Components/Users/UserFilter.tsx
@@ -43,7 +43,7 @@ export default function UserFilter(props: any) {
useQuery(routes.getAnyFacility, {
pathParams: { id: filter.home_facility },
- prefetch: !!filter.home_facility,
+ prefetch: !!filter.home_facility && filter.home_facility !== "NONE",
onResponse: ({ data }) => setFilterState({ home_facility_ref: data }),
});
@@ -134,6 +134,7 @@ export default function UserFilter(props: any) {