diff --git a/src/Components/Users/UserAdd.tsx b/src/Components/Users/UserAdd.tsx
index d26d0832b27..26ba9e44b4b 100644
--- a/src/Components/Users/UserAdd.tsx
+++ b/src/Components/Users/UserAdd.tsx
@@ -189,6 +189,7 @@ export const UserAdd = (props: UserProps) => {
setUsernameExists(userExistsEnums.checking);
const { res: usernameCheck } = await request(routes.checkUsername, {
pathParams: { username },
+ silent: true,
});
if (usernameCheck === undefined || usernameCheck.status === 409)
setUsernameExists(userExistsEnums.exists);
diff --git a/src/Locale/en/Consultation.json b/src/Locale/en/Consultation.json
index 54b587eb81e..c633f7aaab3 100644
--- a/src/Locale/en/Consultation.json
+++ b/src/Locale/en/Consultation.json
@@ -15,5 +15,6 @@
"generated_summary_caution": "This is a computer generated summary using the information captured in the CARE system.",
"NORMAL": "Normal",
"VENTILATOR": "Critical Care",
- "AUTOMATED": "Automated"
+ "AUTOMATED": "Automated",
+ "TELEMEDICINE": "Telemedicine"
}
diff --git a/src/Redux/actions.tsx b/src/Redux/actions.tsx
index 2395c9ad163..32af9609263 100644
--- a/src/Redux/actions.tsx
+++ b/src/Redux/actions.tsx
@@ -1,43 +1,6 @@
import { HCXClaimModel, HCXPolicyModel } from "../Components/HCX/models";
import { MedibaseMedicine } from "../Components/Medicine/models";
-import { fireRequest, fireRequestForFiles } from "./fireRequest";
-
-export const getConfig = () => {
- return fireRequestForFiles("config");
-};
-// User
-export const postLogin = (params: object) => {
- return fireRequest("login", [], params);
-};
-export const getCurrentUser = () => {
- return fireRequest("currentUser");
-};
-export const signupUser = (params: object) => {
- return fireRequest("createUser", [], params);
-};
-export const deleteUser = (username: string) => {
- return fireRequest("deleteUser", [], {}, { username });
-};
-
-export const checkResetToken = (params: object) => {
- return fireRequest("checkResetToken", [], params);
-};
-
-export const postResetPassword = (form: object) => {
- return fireRequest("resetPassword", [], form);
-};
-
-export const postForgotPassword = (form: object) => {
- return fireRequest("forgotPassword", [], form);
-};
-
-export const getUserPnconfig = (pathParams: object) => {
- return fireRequest("getUserPnconfig", [], {}, pathParams);
-};
-
-export const updateUserPnconfig = (params: object, pathParams: object) => {
- return fireRequest("updateUserPnconfig", [], params, pathParams);
-};
+import { fireRequest } from "./fireRequest";
// Facility
export const createFacility = (params: object) => {
@@ -46,39 +9,12 @@ export const createFacility = (params: object) => {
export const updateFacility = (id: string, params: object) => {
return fireRequest("updateFacility", [id], params);
};
-export const partialUpdateFacility = (id: string, params: object) => {
- return fireRequest("partialUpdateFacility", [id], params);
-};
export const deleteFacilityCoverImage = (id: string) => {
return fireRequest("deleteFacilityCoverImage", [], {}, { id });
};
export const getUserList = (params: object, key?: string) => {
return fireRequest("userList", [], params, null, key);
};
-export const getUserListFacility = (pathParam: object) => {
- return fireRequest("userListFacility", [], {}, pathParam);
-};
-
-export const addUserSkill = (username: string, skill: string) => {
- return fireRequest("addUserSkill", [], { skill }, { username });
-};
-
-export const addUserFacility = (username: string, facility: string) => {
- return fireRequest("addUserFacility", [], { facility }, { username });
-};
-
-export const deleteUserSkill = (username: string, id: string) => {
- return fireRequest("deleteUserSkill", [], {}, { username, id });
-};
-
-export const deleteUserFacility = (username: string, facility: string) => {
- return fireRequest(
- "deleteUserFacility",
- [],
- { data: { facility } },
- { username }
- );
-};
export const getPermittedFacilities = (params: object) => {
return fireRequest("getPermittedFacilities", [], params);
@@ -108,9 +44,6 @@ export const getFacilityUsers = (id: string, params?: object) => {
{ facility_id: id }
);
};
-export const getOnlineDoctors = () => {
- return fireRequest("getOnlineDoctors", [], {}, {});
-};
export const listFacilityAssetLocation = (params: object, pathParam: object) =>
fireRequest("listFacilityAssetLocation", [], params, pathParam);
@@ -140,15 +73,6 @@ export const updateFacilityAssetLocation = (
facility_external_id,
external_id,
});
-export const partialUpdateFacilityAssetLocation = (
- params: object,
- facility_external_id: string,
- external_id: string
-) =>
- fireRequest("partialUpdateFacilityAssetLocation", [], params, {
- facility_external_id,
- external_id,
- });
// asset bed
export const listAssetBeds = (params: object, altKey?: string) =>
@@ -165,17 +89,6 @@ export const createAssetBed = (
{}
);
-export const getAssetBed = (
- asset_external_id: string,
- bed_id: string,
- external_id: string
-) =>
- fireRequest(
- "getAssetBed",
- [],
- { asset: asset_external_id, bed: bed_id },
- { external_id }
- );
export const partialUpdateAssetBed = (params: object, asset_id: string) =>
fireRequest(
"partialUpdateAssetBed",
@@ -186,21 +99,6 @@ export const partialUpdateAssetBed = (params: object, asset_id: string) =>
}
);
-export const updateAssetBed = (
- params: object,
- asset_external_id: string,
- external_id: string,
- bed_id: string
-) =>
- fireRequest(
- "updateAssetBed",
- [],
- { ...params, asset: asset_external_id, bed: bed_id },
- {
- external_id,
- }
- );
-
export const deleteAssetBed = (asset_id: string) =>
fireRequest(
"deleteAssetBed",
@@ -260,47 +158,6 @@ export const deleteFacilityBed = (external_id: string) => {
return fireRequest("deleteFacilityBed", [], {}, { external_id });
};
-// Consultation Beds
-export const listConsultationBeds = (params: object) =>
- fireRequest("listConsultationBeds", [], params, {});
-export const createConsultationBed = (
- params: object,
- consultation_id: string,
- bed_id: string
-) =>
- fireRequest(
- "createConsultationBed",
- [],
- { ...params, consultation: consultation_id, bed: bed_id },
- {}
- );
-
-export const getConsultationBed = (
- consultation_external_id: string,
- bed_id: string,
- external_id: string
-) =>
- fireRequest(
- "getConsultationBed",
- [],
- { consultation: consultation_external_id, bed: bed_id },
- { external_id }
- );
-export const updateConsultationBed = (
- params: object,
- consultation_external_id: string,
- external_id: string,
- bed_id: string
-) =>
- fireRequest(
- "updateConsultationBed",
- [],
- { ...params, consultation: consultation_external_id, bed: bed_id },
- {
- external_id,
- }
- );
-
// Download Actions
export const downloadFacility = () => {
return fireRequest("downloadFacility");
@@ -318,9 +175,6 @@ export const downloadFacilityTriage = () => {
return fireRequest("downloadFacilityTriage");
};
-export const downloadPatients = () => {
- return fireRequest("downloadPatients");
-};
// Capacity/Triage/Doctor
export const createCapacity = (
id: number | undefined,
@@ -377,9 +231,6 @@ export const deleteCapacity = (pathParam: object) => {
export const searchPatient = (params: object) => {
return fireRequest("searchPatient", [], params);
};
-export const searchUser = (params: object) => {
- return fireRequest("searchUser", [], params);
-};
export const getAllPatient = (params: object, altKey: string) => {
return fireRequest("patientList", [], params, null, altKey);
};
@@ -398,23 +249,9 @@ export const patchPatient = (params: object, pathParam: object) => {
export const transferPatient = (params: object, pathParam: object) => {
return fireRequest("transferPatient", [], params, pathParam);
};
-export const getPatientNotes = (
- patientId: string,
- limit: number,
- offset: number
-) => {
- return fireRequest("getPatientNotes", [], { limit, offset }, { patientId });
-};
-export const addPatientNote = (patientId: string, params: object) => {
- return fireRequest("addPatientNote", [], params, { patientId });
-};
-
export const getStates = () => {
return fireRequest("statesList", []);
};
-export const getStatesByText = (params: object) => {
- return fireRequest("statesList", [], params);
-};
export const getState = (id: number) => {
return fireRequest("getState", [], {}, { id: id });
};
@@ -433,20 +270,10 @@ export const getDistrict = (id: number, key?: string) => {
export const getLocalbodyByDistrict = (pathParam: object) => {
return fireRequest("getLocalbodyByDistrict", [], {}, pathParam);
};
-export const getLocalbodyByName = (params: object) => {
- return fireRequest("getLocalbodyByName", [], params, null);
-};
export const getWardByLocalBody = (pathParam: object) => {
return fireRequest("getWardByLocalBody", [], {}, pathParam);
};
-export const getWards = (params: object) => {
- return fireRequest("getWards", [], params);
-};
-
-export const getAllLocalBodyByDistrict = (pathParam: object) => {
- return fireRequest("getAllLocalBodyByDistrict", [], {}, pathParam);
-};
// Local Body
export const getLocalBody = (pathParam: object) => {
@@ -460,10 +287,6 @@ export const getAllLocalBody = (params: object) => {
export const getSampleTestList = (params: object, pathParam: object) => {
return fireRequest("sampleTestList", [], params, pathParam);
};
-
-export const sampleSearch = (params: object) => {
- return fireRequest("getTestSampleList", [], params);
-};
export const createSampleTest = (params: object, pathParam: object) => {
return fireRequest("createSampleTest", [], params, pathParam);
};
@@ -497,9 +320,6 @@ export const getDailyReport = (params: object, pathParam: object) => {
export const getConsultationDailyRoundsDetails = (pathParam: object) => {
return fireRequest("getDailyReport", [], {}, pathParam);
};
-export const dailyRoundsAnalyse = (params: object, pathParam: object) => {
- return fireRequest("dailyRoundsAnalyse", [], params, pathParam);
-};
// Consultation
export const createConsultation = (params: object) => {
@@ -552,10 +372,6 @@ export const getInventorySummary = (facilityId: number, params: object) => {
params
);
};
-export const getItemName = (id: number) => {
- return fireRequest("getItemName", [id], {});
-};
-
export const flagInventoryItem = (params: object) => {
return fireRequest("flagInventoryItem", [], {}, params);
};
@@ -584,12 +400,6 @@ export const dischargePatient = (params: object, pathParams: object) => {
return fireRequest("dischargePatient", [], params, pathParams);
};
-//Profile
-
-export const updateUserDetails = (username: string, data: object) => {
- return fireRequest("updateUserDetails", [username], data);
-};
-
//Shift
export const createShift = (params: object) => {
return fireRequest("createShift", [], params);
@@ -615,36 +425,6 @@ export const externalResult = (pathParam: object) => {
return fireRequest("externalResult", [], {}, pathParam);
};
-export const updateExternalResult = (id: number, params: object) => {
- return fireRequest("updateExternalResult", [], params, { id });
-};
-
-export const partialUpdateExternalResult = (id: number, params: object) => {
- return fireRequest("partialUpdateExternalResult", [], params, { id });
-};
-
-// Notifications
-export const getNotifications = (params: object, altKey?: string) => {
- return fireRequest("getNotifications", [], params, {}, altKey);
-};
-
-export const getNotificationData = (pathParam: object) => {
- return fireRequest("getNotificationData", [], {}, pathParam);
-};
-
-export const markNotificationAsRead = (id: string) => {
- return fireRequest(
- "markNotificationAsRead",
- [],
- { read_at: new Date() },
- { id }
- );
-};
-
-export const getPublicKey = () => {
- return fireRequest("getPublicKey", [], {}, {});
-};
-
// FileUpload
export const createUpload = (params: object) => {
@@ -659,10 +439,6 @@ export const retrieveUpload = (params: object, fileId: string) => {
return fireRequest("retrieveUpload", [], params, { fileId: fileId });
};
-export const retrieveUploadFilesURL = (params: object, fileId: string) => {
- return fireRequestForFiles("retrieveUpload", [], params, { fileId: fileId });
-};
-
export const editUpload = (
params: object,
fileId: string,
@@ -757,47 +533,13 @@ export const createAsset = (params: object) =>
fireRequest("createAsset", [], params);
export const getAsset = (id: string) =>
fireRequest("getAsset", [], {}, { external_id: id });
-export const deleteAsset = (id: string) =>
- fireRequest("deleteAsset", [], {}, { external_id: id });
export const updateAsset = (id: string, params: object) =>
fireRequest("updateAsset", [], params, { external_id: id });
export const operateAsset = (id: string, params: object) =>
fireRequest("operateAsset", [], params, { external_id: id });
-// ABDM related
-
-export const resentAadhaarOtp = (txnId: string) =>
- fireRequest("resendAadhaarOtp", [], { txnId });
-
-export const generateMobileOtp = (txnId: string, mobile: string) =>
- fireRequest("generateMobileOtp", [], { txnId, mobile });
-
-export const linkCareContext = (
- consultationId: string,
- data: { name?: string; gender?: "M" | "F" | "O"; dob?: string }
-) => {
- return fireRequest("linkCareContext", [], {
- consultation: consultationId,
- ...data,
- });
-};
-
-export const healthFacilityActions = {
- list: (params: object) => {
- return fireRequest("listHealthFacilities", [], params);
- },
-
- update: (id: string, data: object) => {
- return fireRequest("updateHealthFacility", [], data, {
- facility_id: id,
- });
- },
-};
-
export const listAssetAvailability = (params: object) =>
fireRequest("listAssetAvailability", [], params);
-export const getAssetAvailability = (id: string) =>
- fireRequest("getAssetAvailability", [], {}, { id });
export const listPMJYPackages = (query?: string) =>
fireRequest("listPMJYPackages", [], { query });
diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index 9d09f7e889f..9634036e6c4 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -45,6 +45,7 @@ import {
WardModel,
LocationModel,
StateModel,
+ PatientNotesModel,
} from "../Components/Facility/models";
import {
IDeleteExternalResult,
@@ -597,6 +598,7 @@ const routes = {
},
getPatient: {
path: "/api/v1/patient/{id}/",
+ TBody: Type
(),
TRes: Type(),
},
updatePatient: {
@@ -614,10 +616,13 @@ const routes = {
getPatientNotes: {
path: "/api/v1/patient/{patientId}/notes/",
method: "GET",
+ TBody: Type(),
+ TRes: Type>(),
},
addPatientNote: {
path: "/api/v1/patient/{patientId}/notes/",
method: "POST",
+ TRes: Type(),
},
sampleTestList: {
path: "/api/v1/patient/{patientId}/test_sample/",
diff --git a/src/Redux/fireRequest.tsx b/src/Redux/fireRequest.tsx
index 892e6bd2ee9..6c3aee7c12a 100644
--- a/src/Redux/fireRequest.tsx
+++ b/src/Redux/fireRequest.tsx
@@ -149,7 +149,7 @@ export const fireRequest = (
}
// 4xx Errors
- if (error.response.status > 400 && error.response.status < 500) {
+ if (error.response.status > 400 && error.response.status < 600) {
if (error.response.data && error.response.data.detail) {
if (error.response.data.code === "token_not_valid") {
window.location.href = `/session-expired?redirect=${window.location.href}`;
@@ -167,14 +167,6 @@ export const fireRequest = (
}
return;
}
-
- // 5xx Errors
- if (error.response.status >= 500 && error.response.status <= 599) {
- Notification.Error({
- msg: "Something went wrong...!",
- });
- return;
- }
} else {
return error.response;
}
@@ -264,7 +256,7 @@ export const fireRequestV2 = (
}
// 4xx Errors
- if (error.response.status > 400 && error.response.status < 500) {
+ if (error.response.status > 400 && error.response.status < 600) {
if (error.response.data && error.response.data.detail) {
Notification.Error({
msg: error.response.data.detail,
@@ -279,124 +271,6 @@ export const fireRequestV2 = (
}
return;
}
-
- // 5xx Errors
- if (error.response.status >= 500 && error.response.status <= 599) {
- Notification.Error({
- msg: "Something went wrong...!",
- });
- return;
- }
}
});
};
-
-export const fireRequestForFiles = (
- key: string,
- path: any = [],
- params: any = {},
- pathParam?: any,
- altKey?: string
-) => {
- return (dispatch: any) => {
- // cancel previous api call
- if (isRunning[altKey ? altKey : key]) {
- isRunning[altKey ? altKey : key].cancel();
- }
- isRunning[altKey ? altKey : key] = axios.CancelToken.source();
- // get api url / method
- const request = Object.assign({}, requestMap[key]);
- if (path.length > 0) {
- request.path += "/" + path.join("/");
- }
- if (request.method === undefined || request.method === "GET") {
- request.method = "GET";
- const qs = new URLSearchParams(omitBy(params, isEmpty)).toString();
- if (qs !== "") {
- request.path += `?${qs}`;
- }
- }
- // set dynamic params in the URL
- if (pathParam) {
- Object.keys(pathParam).forEach((param: any) => {
- request.path = request.path.replace(`{${param}}`, pathParam[param]);
- });
- }
-
- // set authorization header in the request header
- const config: any = {
- headers: {
- "Content-type": "application/pdf",
- "Content-disposition": "inline",
- },
- };
- // Content-Type: application/pdf
- // Content-Disposition: inline; filename="filename.pdf"
- if (!request.noAuth && localStorage.getItem(LocalStorageKeys.accessToken)) {
- config.headers["Authorization"] =
- "Bearer " + localStorage.getItem(LocalStorageKeys.accessToken);
- }
- const axiosApiCall: any = axios.create(config);
-
- dispatch(fetchDataRequest(key));
- return axiosApiCall[request.method.toLowerCase()](request.path, {
- ...params,
- cancelToken: isRunning[altKey ? altKey : key].token,
- })
- .then((response: any) => {
- dispatch(fetchResponseSuccess(key, response.data));
- return response;
- })
- .catch((error: any) => {
- dispatch(fetchDataRequestError(key, error));
-
- if (error.response) {
- // temporarily don't show invalid phone number error on duplicate patient check
- if (error.response.status === 400 && key === "searchPatient") {
- return;
- }
-
- // currentUser is ignored because on the first page load
- // 403 error is displayed for invalid credential.
- if (error.response.status === 403 && key === "currentUser") {
- if (localStorage.getItem(LocalStorageKeys.accessToken)) {
- localStorage.removeItem(LocalStorageKeys.accessToken);
- }
- return;
- }
-
- // 400 Bad Request Error
- if (error.response.status === 400 || error.response.status === 406) {
- Notification.BadRequest({
- errs: error.response.data,
- });
- return error.response;
- }
-
- // 4xx Errors
- if (error.response.status > 400 && error.response.status < 500) {
- if (error.response.status === 429) {
- return error.response;
- } else if (error.response.data && error.response.data.detail) {
- Notification.Error({
- msg: error.response.data.detail,
- });
- } else {
- Notification.Error({
- msg: "Something went wrong...!",
- });
- }
- return;
- }
-
- // 5xx Errors
- if (error.response.status >= 500 && error.response.status <= 599) {
- Notification.Error({
- msg: "Something went wrong...!",
- });
- return;
- }
- }
- });
- };
-};
diff --git a/src/Routers/routes/ConsultationRoutes.tsx b/src/Routers/routes/ConsultationRoutes.tsx
index 4f1d6e7d75d..401358717eb 100644
--- a/src/Routers/routes/ConsultationRoutes.tsx
+++ b/src/Routers/routes/ConsultationRoutes.tsx
@@ -8,6 +8,7 @@ import { FileUpload } from "../../Components/Patient/FileUpload";
import { make as CriticalCareRecording } from "../../Components/CriticalCareRecording/CriticalCareRecording.bs";
import { ConsultationDetails } from "../../Components/Facility/ConsultationDetails";
import TreatmentSummary from "../../Components/Facility/TreatmentSummary";
+import ConsultationDoctorNotes from "../../Components/Facility/ConsultationDoctorNotes";
export default {
"/facility/:facilityId/patient/:patientId/consultation": ({
@@ -129,6 +130,14 @@ export default {
dailyRoundsListData={[]}
/>
),
+ "/facility/:facilityId/patient/:patientId/consultation/:consultationId/notes":
+ ({ facilityId, patientId, consultationId }: any) => (
+
+ ),
"/facility/:facilityId/patient/:patientId/consultation/:consultationId/:tab":
({ facilityId, patientId, consultationId, tab }: any) => (
= 500 && res.status < 600) {
- console.error("Server error", res);
- notify?.Error({ msg: "Something went wrong...!" });
- return;
- }
-
// 400/406 Bad Request
if (res.status === 400 || res.status === 406) {
notify?.BadRequest({ errs: error });
return;
}
- // Other 400 Errors
- if (res.status >= 400) {
+ // Other Errors between 400-599 (inclusive)
+ if (res.status >= 400 && res.status < 600) {
// Invalid token
if (!silent && error?.code === "token_not_valid") {
navigate(`/session-expired?redirect=${window.location.href}`);
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index 90e6b323db7..df6bd46d131 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -214,13 +214,14 @@ export const parseCsvFile = async (
export const getPincodeDetails = async (pincode: string, apiKey: string) => {
const response = await fetch(
- `https://api.data.gov.in/resource/5c2f62fe-5afa-4119-a499-fec9d604d5bd?api-key=${apiKey}&format=json&filters[pincode]=${pincode}&limit=1`
+ `https://api.data.gov.in/resource/6176ee09-3d56-4a3b-8115-21841576b2f6?api-key=${apiKey}&format=json&filters[pincode]=${pincode}&limit=1`
);
const data = await response.json();
return data.records[0];
};
export const includesIgnoreCase = (str1: string, str2: string) => {
+ if (!str1 || !str2) return false;
const lowerCaseStr1 = str1.toLowerCase();
const lowerCaseStr2 = str2.toLowerCase();
return (