+
)}
@@ -581,7 +633,7 @@ export default function PatientInfoCard(props: {
}
className="xl:justify-center"
containerClassName="w-full lg:w-auto mt-2 2xl:mt-0 flex justify-center z-20"
@@ -596,6 +648,12 @@ export default function PatientInfoCard(props: {
consultation?.id &&
!consultation?.discharge_date,
],
+ [
+ `/facility/${patient.facility}/patient/${patient.id}/consultation/${consultation?.id}/consent-records`,
+ "Consent Records",
+ "l-file-medical",
+ patient.is_active,
+ ],
[
`/patient/${patient.id}/investigation_reports`,
"Investigation Summary",
@@ -629,7 +687,10 @@ export default function PatientInfoCard(props: {
key={i}
className="dropdown-item-primary pointer-events-auto m-2 flex cursor-pointer items-center justify-start gap-2 rounded border-0 p-2 text-sm font-normal transition-all duration-200 ease-in-out"
href={
- action[1] !== "Treatment Summary" &&
+ ![
+ "Treatment Summary",
+ "Consent Records",
+ ].includes(action[1]) &&
consultation?.admitted &&
!consultation?.current_bed &&
i === 1
@@ -638,7 +699,10 @@ export default function PatientInfoCard(props: {
}
onClick={() => {
if (
- action[1] !== "Treatment Summary" &&
+ ![
+ "Treatment Summary",
+ "Consent Records",
+ ].includes(action[1]) &&
consultation?.admitted &&
!consultation?.current_bed &&
i === 1
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index c62ad2a8a0d..7d219514267 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -2,11 +2,10 @@ import * as Notification from "../../Utils/Notifications.js";
import {
BLOOD_GROUPS,
- DISEASE_STATUS,
GENDER_TYPES,
MEDICAL_HISTORY_CHOICES,
OCCUPATION_TYPES,
- TEST_TYPE,
+ RATION_CARD_CATEGORY,
VACCINES,
} from "../../Common/constants";
import {
@@ -67,6 +66,7 @@ import SelectMenuV2 from "../Form/SelectMenuV2.js";
import Checkbox from "../Common/components/CheckBox.js";
import _ from "lodash";
import { ILocalBodies } from "../ExternalResult/models.js";
+import { useTranslation } from "react-i18next";
const Loading = lazy(() => import("../Common/Loading"));
const PageTitle = lazy(() => import("../Common/PageTitle"));
@@ -89,11 +89,9 @@ const medicalHistoryChoices = MEDICAL_HISTORY_CHOICES.reduce(
[],
);
const genderTypes = GENDER_TYPES;
-const diseaseStatus = [...DISEASE_STATUS];
const bloodGroups = [...BLOOD_GROUPS];
const occupationTypes = OCCUPATION_TYPES;
-const testType = [...TEST_TYPE];
-const vaccines = ["Select", ...VACCINES];
+const vaccines = [...VACCINES];
const initForm: any = {
name: "",
@@ -103,7 +101,6 @@ const initForm: any = {
phone_number: "+91",
emergency_phone_number: "+91",
blood_group: "",
- disease_status: diseaseStatus[2],
is_declared_positive: "false",
date_declared_positive: new Date(),
date_of_birth: null,
@@ -121,25 +118,13 @@ const initForm: any = {
allergies: "",
pincode: "",
present_health: "",
- contact_with_confirmed_carrier: "false",
- contact_with_suspected_carrier: "false",
-
- estimated_contact_date: null,
date_of_return: null,
-
- number_of_primary_contacts: "",
- number_of_secondary_contacts: "",
is_antenatal: "false",
date_of_test: null,
- date_of_result: null,
- test_id: "",
- srf_id: "",
- test_type: testType[0],
treatment_plan: false,
ongoing_medication: "",
designation_of_health_care_worker: "",
instituion_of_health_care_worker: "",
- cluster_name: "",
covin_id: "",
is_vaccinated: "false",
number_of_doses: "0",
@@ -147,6 +132,7 @@ const initForm: any = {
last_vaccinated_date: null,
abha_number: null,
...medicalHistoryChoices,
+ ration_card_category: null,
};
const initError = Object.assign(
@@ -186,6 +172,7 @@ export const parseOccupationFromExt = (occupation: Occupation) => {
export const PatientRegister = (props: PatientRegisterProps) => {
const authUser = useAuthUser();
+ const { t } = useTranslation();
const { goBack } = useAppHistory();
const { gov_data_api_key, enable_hcx, enable_abdm } = useConfig();
const { facilityId, id } = props;
@@ -323,14 +310,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
? parseGenderFromExt(data.gender, state.form.gender)
: state.form.gender,
});
- field.onChange({
- name: "test_id",
- value: data.test_id ? data.test_id : state.form.test_id,
- });
- field.onChange({
- name: "srf_id",
- value: data.srf_id ? data.srf_id : state.form.srf_id,
- });
field.onChange({
name: "state",
value: data.district_object
@@ -353,28 +332,12 @@ export const PatientRegister = (props: PatientRegisterProps) => {
name: "village",
value: data.village ? data.village : state.form.village,
});
- field.onChange({
- name: "disease_status",
- value: data.result
- ? data.result.toUpperCase()
- : state.form.disease_status,
- });
- field.onChange({
- name: "test_type",
- value: data.test_type
- ? data.test_type.toUpperCase()
- : state.form.test_type,
- });
field.onChange({
name: "date_of_test",
value: data.sample_collection_date
? data.sample_collection_date
: state.form.date_of_test,
});
- field.onChange({
- name: "date_of_result",
- value: data.result_date ? data.result_date : state.form.date_of_result,
- });
field.onChange({
name: "phone_number",
value: data.mobile_number
@@ -416,7 +379,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
health_id: data.abha_number_object?.health_id || "",
nationality: data.nationality ? data.nationality : "India",
gender: data.gender ? data.gender : undefined,
- cluster_name: data.cluster_name ? data.cluster_name : "",
state: data.state ? data.state : "",
district: data.district ? data.district : "",
blood_group: data.blood_group
@@ -453,19 +415,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
occupation: data.meta_info?.occupation
? parseOccupationFromExt(data.meta_info.occupation)
: null,
-
- number_of_primary_contacts: data.number_of_primary_contacts
- ? data.number_of_primary_contacts
- : "",
- number_of_secondary_contacts: data.number_of_secondary_contacts
- ? data.number_of_secondary_contacts
- : "",
- contact_with_confirmed_carrier: data.contact_with_confirmed_carrier
- ? String(data.contact_with_confirmed_carrier)
- : "false",
- contact_with_suspected_carrier: data.contact_with_suspected_carrier
- ? String(data.contact_with_suspected_carrier)
- : "false",
is_vaccinated: String(data.is_vaccinated),
number_of_doses: data.number_of_doses
? String(data.number_of_doses)
@@ -645,39 +594,11 @@ export const PatientRegister = (props: PatientRegisterProps) => {
errors[field] = "Please enter valid phone number";
}
return;
-
- case "estimated_contact_date":
- if (
- JSON.parse(form.contact_with_confirmed_carrier) ||
- JSON.parse(form.contact_with_suspected_carrier)
- ) {
- if (!form[field]) {
- errors[field] = "Please enter the estimated date of contact";
- }
- }
- return;
- case "cluster_name":
- if (
- JSON.parse(form.contact_with_confirmed_carrier) ||
- JSON.parse(form.contact_with_suspected_carrier)
- ) {
- if (!form[field]) {
- errors[field] = "Please enter the name / cluster of the contact";
- }
- }
- return;
case "blood_group":
if (!form[field]) {
errors[field] = "Please select a blood group";
}
return;
- case "number_of_primary_contacts":
- case "number_of_secondary_contacts":
- if (form[field] && form[field] < 0) {
- errors[field] = "Value cannot be negative";
- }
- return;
-
case "is_vaccinated":
if (form.is_vaccinated === "true") {
if (form.number_of_doses === "0") {
@@ -694,23 +615,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
}
}
return;
-
- case "date_of_result":
- if (form[field] < form.date_of_test) {
- errors[field] =
- "Date should not be before the date of sample collection";
- }
- return;
- case "disease_status":
- if (form[field] === "POSITIVE") {
- if (!form.date_of_test) {
- errors["date_of_test"] = "Please fill the date of sample testing";
- }
- if (!form.date_of_result) {
- errors["date_of_result"] = "Please fill the date of result";
- }
- }
- return;
case "medical_history":
if (!form[field].length) {
errors[field] = "Please fill the medical history";
@@ -780,18 +684,12 @@ export const PatientRegister = (props: PatientRegisterProps) => {
? dateQueryString(formData.date_of_birth)
: null,
year_of_birth: ageInputType === "age" ? formData.year_of_birth : null,
- disease_status: formData.disease_status,
date_of_test: formData.date_of_test ? formData.date_of_test : undefined,
- date_of_result: formData.date_of_result
- ? formData.date_of_result
- : undefined,
date_declared_positive:
JSON.parse(formData.is_declared_positive) &&
formData.date_declared_positive
? formData.date_declared_positive
: null,
- test_id: formData.test_id,
- srf_id: formData.srf_id,
covin_id:
formData.is_vaccinated === "true" ? formData.covin_id : undefined,
is_vaccinated: formData.is_vaccinated,
@@ -811,7 +709,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
? formData.last_vaccinated_date
: null
: null,
- test_type: formData.test_type,
name: _.startCase(_.toLower(formData.name)),
pincode: formData.pincode ? formData.pincode : undefined,
gender: Number(formData.gender),
@@ -847,33 +744,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
present_health: formData.present_health
? formData.present_health
: undefined,
- contact_with_confirmed_carrier: JSON.parse(
- formData.contact_with_confirmed_carrier,
- ),
- contact_with_suspected_carrier: JSON.parse(
- formData.contact_with_suspected_carrier,
- ),
- estimated_contact_date:
- (JSON.parse(formData.contact_with_confirmed_carrier) ||
- JSON.parse(formData.contact_with_suspected_carrier)) &&
- formData.estimated_contact_date
- ? formData.estimated_contact_date
- : null,
- cluster_name:
- (JSON.parse(formData.contact_with_confirmed_carrier) ||
- JSON.parse(formData.contact_with_suspected_carrier)) &&
- formData.cluster_name
- ? formData.cluster_name
- : null,
allergies: formData.allergies,
- number_of_primary_contacts: Number(formData.number_of_primary_contacts)
- ? Number(formData.number_of_primary_contacts)
- : undefined,
- number_of_secondary_contacts: Number(
- formData.number_of_secondary_contacts,
- )
- ? Number(formData.number_of_secondary_contacts)
- : undefined,
ongoing_medication: formData.ongoing_medication,
is_declared_positive: JSON.parse(formData.is_declared_positive),
designation_of_health_care_worker:
@@ -883,6 +754,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
blood_group: formData.blood_group ? formData.blood_group : undefined,
medical_history,
is_active: true,
+ ration_card_category: formData.ration_card_category,
};
const { res, data: requestData } = id
? await request(routes.updatePatient, {
@@ -1473,8 +1345,9 @@ export const PatientRegister = (props: PatientRegisterProps) => {
+
{field("age").value !== "" && (
<>
@@ -1492,7 +1365,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
}
placeholder="Enter the age"
- className="col-span-6 sm:col-span-3"
type="number"
min={0}
/>
@@ -1835,6 +1707,14 @@ export const PatientRegister = (props: PatientRegisterProps) => {
optionLabel={(o) => o.text}
optionValue={(o) => o.id}
/>
+ t(`ration_card__${o}`)}
+ optionValue={(o) => o}
+ />
) : (
@@ -1864,7 +1744,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
>
-
+
{
optionValue={(option) => option.value}
/>
-
- option.label}
- optionValue={(option) => option.value}
- />
-
-
- option.label}
- optionValue={(option) => option.value}
- />
-
{
}
-
-
-
-
- o}
- optionValue={(o) => o}
- required
- />
-
-
- o}
- optionValue={(o) => o}
- required
- />
-
-
-
-
+
+
-
-
-
-
{
position="LEFT"
/>
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/Components/Shifting/ShiftDetails.tsx b/src/Components/Shifting/ShiftDetails.tsx
index 5d29e0c890a..457f110c271 100644
--- a/src/Components/Shifting/ShiftDetails.tsx
+++ b/src/Components/Shifting/ShiftDetails.tsx
@@ -4,7 +4,6 @@ import {
GENDER_TYPES,
SHIFTING_CHOICES_PEACETIME,
SHIFTING_CHOICES_WARTIME,
- TEST_TYPE_CHOICES,
} from "../../Common/constants";
import { Link, navigate } from "raviger";
import { lazy, useState } from "react";
@@ -85,10 +84,6 @@ export default function ShiftDetails(props: { id: string }) {
const copyContent = (data: any) => {
let formattedText =
- t("disease_status") +
- ": *" +
- data?.patient_object?.disease_status +
- "* \n" +
t("name") +
":" +
data?.patient_object?.name +
@@ -129,9 +124,6 @@ export default function ShiftDetails(props: { id: string }) {
const patientGender = GENDER_TYPES.find(
(i) => i.id === patientData?.gender,
)?.text;
- const testType = TEST_TYPE_CHOICES.find(
- (i) => i.id === patientData?.test_type,
- )?.text;
return (
@@ -150,20 +142,6 @@ export default function ShiftDetails(props: { id: string }) {
{t("yes")}
)}
-
-
- {t("disease_status")}{" "}
-
-
- {patientData?.disease_status}
-
-
-
-
- {t("test_type")}:{" "}
-
- {(patientData?.test_type && testType) || "-"}
-
{t("facility")}:{" "}
@@ -319,9 +297,6 @@ export default function ShiftDetails(props: { id: string }) {
const patientGender = GENDER_TYPES.find(
(i) => i.id === patientData?.gender,
)?.text;
- const testType = TEST_TYPE_CHOICES.find(
- (i) => i.id === patientData?.test_type,
- )?.text;
return (
@@ -427,12 +402,6 @@ export default function ShiftDetails(props: { id: string }) {
formatDateTime(patientData?.date_of_test)) ||
"-"}
-
-
- {t("test_type")}:{" "}
-
- {(patientData?.test_type && testType) || "-"}
-
{/*
diff --git a/src/Components/Shifting/ShiftingBoard.tsx b/src/Components/Shifting/ShiftingBoard.tsx
index 088f3d66276..3203b5027f5 100644
--- a/src/Components/Shifting/ShiftingBoard.tsx
+++ b/src/Components/Shifting/ShiftingBoard.tsx
@@ -82,12 +82,7 @@ const ShiftCard = ({ shift, filter }: any) => {
cursor: isDragging ? "grabbing" : "grab",
}}
>
-
+
@@ -316,7 +311,6 @@ export default function ShiftingBoard({
filterProp.ordering,
filterProp.is_kasp,
filterProp.assigned_to,
- filterProp.disease_status,
filterProp.is_antenatal,
filterProp.breathlessness_level,
]);
diff --git a/src/Components/Symptoms/SymptomsBuilder.tsx b/src/Components/Symptoms/SymptomsBuilder.tsx
new file mode 100644
index 00000000000..de6901d8384
--- /dev/null
+++ b/src/Components/Symptoms/SymptomsBuilder.tsx
@@ -0,0 +1,381 @@
+import { useState } from "react";
+import { Writable } from "../../Utils/types";
+import {
+ EncounterSymptom,
+ OTHER_SYMPTOM_CHOICE,
+ SYMPTOM_CHOICES,
+} from "./types";
+import AutocompleteMultiSelectFormField from "../Form/FormFields/AutocompleteMultiselect";
+import DateFormField from "../Form/FormFields/DateFormField";
+import ButtonV2 from "../Common/components/ButtonV2";
+import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
+import { classNames, dateQueryString } from "../../Utils/utils";
+import { FieldChangeEvent } from "../Form/FormFields/Utils";
+import CareIcon from "../../CAREUI/icons/CareIcon";
+import useSlug from "../../Common/hooks/useSlug";
+import useQuery from "../../Utils/request/useQuery";
+import SymptomsApi from "./api";
+import request from "../../Utils/request/request";
+import { Success } from "../../Utils/Notifications";
+import { sortByOnsetDate } from "./utils";
+
+export const CreateSymptomsBuilder = (props: {
+ value: Writable
[];
+ onChange: (value: Writable[]) => void;
+}) => {
+ return (
+
+
+ {props.value.map((obj, index, arr) => {
+ const handleUpdate = (event: FieldChangeEvent) => {
+ const updated = { ...obj, [event.name]: event.value };
+ props.onChange(arr.map((old, i) => (i === index ? updated : old)));
+ };
+
+ const handleRemove = () => {
+ props.onChange(arr.filter((_, i) => i !== index));
+ };
+
+ return (
+ -
+
+
+ );
+ })}
+
+
+ {props.value.length === 0 && (
+
+ No symptoms added
+
+ )}
+
+
+
props.onChange([...props.value, ...objects])}
+ />
+
+
+
+ Fetching symptom records...
+
+ );
+ }
+
+ let items = sortByOnsetDate(data.results);
+ if (!props.showAll) {
+ items = items.filter(
+ (i) => i.clinical_impression_status !== "entered-in-error",
+ );
+ }
+
+ return (
+
+
+ {items.map((symptom) => {
+ const handleUpdate = async (event: FieldChangeEvent) => {
+ setIsProcessing(true);
+ await request(SymptomsApi.partialUpdate, {
+ pathParams: { consultationId, external_id: symptom.id },
+ body: { [event.name]: event.value },
+ });
+ await refetch();
+ setIsProcessing(false);
+ };
+
+ const handleMarkAsEnteredInError = async () => {
+ setIsProcessing(true);
+ await request(SymptomsApi.markAsEnteredInError, {
+ pathParams: { consultationId, external_id: symptom.id },
+ });
+ await refetch();
+ setIsProcessing(false);
+ };
+
+ return (
+ -
+
+
+ );
+ })}
+
+
+ {items.length === 0 && (
+
+ Patient is Asymptomatic
+
+ )}
+
+
+
+
+
+
+
+
+
+
+ {symptom.clinical_impression_status === "entered-in-error" && (
+
+ Entered in Error
+
+ )}
+
+
+
+
+
+
+
setOnsetDate(value)}
+ errorClassName="hidden"
+ />
+
+
setSelected(e.value)}
+ options={SYMPTOM_CHOICES.filter(
+ ({ id }) => !activeSymptomIds.includes(id),
+ )}
+ optionLabel={(option) => option.text}
+ optionValue={(option) => option.id}
+ errorClassName="hidden"
+ />
+ {selected.includes(OTHER_SYMPTOM_CHOICE.id) && (
+ setOtherSymptom(value)}
+ errorClassName="hidden"
+ />
+ )}
+
+
+ Fetching symptom records...
+
+ );
+ }
+
+ const records = groupAndSortSymptoms(data.results);
+
+ return (
+
+ );
+};
+
+const SymptomsSection = (props: {
+ title: string;
+ symptoms: EncounterSymptom[];
+}) => {
+ return (
+
+
+ {props.title}
+
+
+ {!props.symptoms.length && (
+
+ No symptoms
+
+ )}
+
+
+
+
+
Archive File
+ This action is irreversible. Once a file is archived it cannot be
+ unarchived.
+
+
+ }
+ onClose={() => setArchiveDialogueOpen(null)}
+ >
+
+
+
+
+
+
+
+
File Details
+ This file is archived. Once a file is archived it cannot be
+ unarchived.
+
+
+ }
+ onClose={() => setArchiveDialogueOpen(null)}
+ >
+
+
+
+ {archiveDialogueOpen?.name} file is
+ archived.
+
+
+ Reason: {archiveDialogueOpen?.archive_reason}
+
+
+ Archived by: {archiveDialogueOpen?.archived_by?.username}
+
+
+ Time of Archive:
+ {formatDateTime(archiveDialogueOpen?.archived_datetime)}
+
+
+
+ setArchiveDialogueOpen(null)} />
+
+
+
+
+ );
+
+ return {
+ viewFile,
+ archiveFile,
+ Dialogues,
+ };
+}
diff --git a/src/Utils/useFileUpload.tsx b/src/Utils/useFileUpload.tsx
new file mode 100644
index 00000000000..e28e8c9b1b5
--- /dev/null
+++ b/src/Utils/useFileUpload.tsx
@@ -0,0 +1,448 @@
+import { ChangeEvent, useCallback, useRef, useState } from "react";
+import {
+ CreateFileResponse,
+ FileCategory,
+ FileUploadModel,
+} from "../Components/Patient/models";
+import DialogModal from "../Components/Common/Dialog";
+import CareIcon, { IconName } from "../CAREUI/icons/CareIcon";
+import Webcam from "react-webcam";
+import ButtonV2, { Submit } from "../Components/Common/components/ButtonV2";
+import { t } from "i18next";
+import useWindowDimensions from "../Common/hooks/useWindowDimensions";
+import { classNames } from "./utils";
+import request from "./request/request";
+import routes from "../Redux/api";
+import uploadFile from "./request/uploadFile";
+import * as Notification from "./Notifications.js";
+import imageCompression from "browser-image-compression";
+
+export type FileUploadOptions = {
+ type: string;
+ category?: FileCategory;
+ onUpload?: (file: FileUploadModel) => void;
+} & (
+ | {
+ allowAllExtensions?: boolean;
+ }
+ | {
+ allowedExtensions?: string[];
+ }
+);
+
+export type FileUploadButtonProps = {
+ icon?: IconName;
+ content?: string;
+ className?: string;
+};
+
+export type FileUploadReturn = {
+ progress: null | number;
+ error: null | string;
+ handleCameraCapture: () => void;
+ handleAudioCapture: () => void;
+ handleFileUpload: (associating_id: string) => Promise
;
+ Dialogues: JSX.Element;
+ UploadButton: (_: FileUploadButtonProps) => JSX.Element;
+ fileName: string;
+ file: File | null;
+ setFileName: (name: string) => void;
+ clearFile: () => void;
+};
+
+const videoConstraints = {
+ width: { ideal: 4096 },
+ height: { ideal: 2160 },
+ facingMode: "user",
+};
+
+// Array of image extensions
+const ExtImage: string[] = [
+ "jpeg",
+ "jpg",
+ "png",
+ "gif",
+ "svg",
+ "bmp",
+ "webp",
+ "jfif",
+];
+
+export default function useFileUpload(
+ options: FileUploadOptions,
+): FileUploadReturn {
+ const { type, onUpload, category = "UNSPECIFIED" } = options;
+
+ const [uploadFileName, setUploadFileName] = useState("");
+ const [error, setError] = useState(null);
+ const [progress, setProgress] = useState(null);
+ const [cameraModalOpen, setCameraModalOpen] = useState(false);
+ const [cameraFacingFront, setCameraFacingFront] = useState(true);
+ const webRef = useRef(null);
+ const [previewImage, setPreviewImage] = useState(null);
+ const [file, setFile] = useState(null);
+
+ const handleSwitchCamera = useCallback(() => {
+ setCameraFacingFront((prevState) => !prevState);
+ }, []);
+
+ const { width } = useWindowDimensions();
+ const LaptopScreenBreakpoint = 640;
+ const isLaptopScreen = width >= LaptopScreenBreakpoint ? true : false;
+
+ const captureImage = () => {
+ setPreviewImage(webRef.current.getScreenshot());
+ const canvas = webRef.current.getCanvas();
+ canvas?.toBlob((blob: Blob) => {
+ const extension = blob.type.split("/").pop();
+ const myFile = new File([blob], `capture.${extension}`, {
+ type: blob.type,
+ });
+ setUploadFileName(uploadFileName || "");
+ setFile(myFile);
+ });
+ };
+
+ const onFileChange = (e: ChangeEvent): any => {
+ if (!e.target.files?.length) {
+ return;
+ }
+ const f = e.target.files[0];
+ const fileName = f.name;
+ setFile(e.target.files[0]);
+ setUploadFileName(
+ uploadFileName ||
+ fileName.substring(0, fileName.lastIndexOf(".")) ||
+ fileName,
+ );
+
+ const ext: string = fileName.split(".")[1];
+
+ if (ExtImage.includes(ext)) {
+ const options = {
+ initialQuality: 0.6,
+ alwaysKeepResolution: true,
+ };
+ imageCompression(f, options).then((compressedFile: File) => {
+ setFile(compressedFile);
+ });
+ return;
+ }
+ setFile(f);
+ };
+
+ const validateFileUpload = () => {
+ const filenameLength = uploadFileName.trim().length;
+ const f = file;
+ if (f === undefined || f === null) {
+ setError("Please choose a file to upload");
+ return false;
+ }
+ if (filenameLength === 0) {
+ setError("Please give a name !!");
+ return false;
+ }
+ if (f.size > 10e7) {
+ setError("Maximum size of files is 100 MB");
+ return false;
+ }
+ return true;
+ };
+ const markUploadComplete = (
+ data: CreateFileResponse,
+ associatingId: string,
+ ) => {
+ return request(routes.editUpload, {
+ body: { upload_completed: true },
+ pathParams: {
+ id: data.id,
+ fileType: type,
+ associatingId,
+ },
+ });
+ };
+
+ const uploadfile = async (data: CreateFileResponse) => {
+ const url = data.signed_url;
+ const internal_name = data.internal_name;
+ const f = file;
+ if (!f) return;
+ const newFile = new File([f], `${internal_name}`);
+ console.log("filetype: ", newFile.type);
+ return new Promise((resolve, reject) => {
+ uploadFile(
+ url,
+ newFile,
+ "PUT",
+ { "Content-Type": file?.type },
+ (xhr: XMLHttpRequest) => {
+ if (xhr.status >= 200 && xhr.status < 300) {
+ setProgress(null);
+ setFile(null);
+ setUploadFileName("");
+ Notification.Success({
+ msg: "File Uploaded Successfully",
+ });
+ setError(null);
+ onUpload && onUpload(data);
+ resolve();
+ } else {
+ Notification.Error({
+ msg: "Error Uploading File: " + xhr.statusText,
+ });
+ setProgress(null);
+ reject();
+ }
+ },
+ setProgress as any,
+ () => {
+ Notification.Error({
+ msg: "Error Uploading File: Network Error",
+ });
+ setProgress(null);
+ reject();
+ },
+ );
+ });
+ };
+
+ const handleUpload = async (associating_id: string) => {
+ if (!validateFileUpload()) return;
+ const f = file;
+
+ const filename = uploadFileName === "" && f ? f.name : uploadFileName;
+ const name = f?.name;
+ setProgress(0);
+
+ const { data } = await request(routes.createUpload, {
+ body: {
+ original_name: name ?? "",
+ file_type: type,
+ name: filename,
+ associating_id,
+ file_category: category,
+ mime_type: f?.type ?? "",
+ },
+ });
+
+ if (data) {
+ await uploadfile(data);
+ await markUploadComplete(data, associating_id);
+ }
+ };
+
+ const cameraFacingMode = cameraFacingFront
+ ? "user"
+ : { exact: "environment" };
+
+ const Dialogues = (
+
+
+
+
+
+
Camera
+
+
+ }
+ className="max-w-2xl"
+ onClose={() => setCameraModalOpen(false)}
+ >
+
+ {!previewImage ? (
+
+
+
+ ) : (
+
+
+
+ )}
+
+
+ {/* buttons for mobile screens */}
+
+
+ {!previewImage ? (
+
+ {t("switch")}
+
+ ) : (
+ <>
+ )}
+
+
+ {!previewImage ? (
+ <>
+
+ {
+ captureImage();
+ }}
+ className="m-2"
+ >
+ {t("capture")}
+
+
+
+ ) : (
+ <>
+
+ {
+ setPreviewImage(null);
+ }}
+ className="m-2"
+ >
+ {t("retake")}
+
+ {
+ setPreviewImage(null);
+ setCameraModalOpen(false);
+ }}
+ className="m-2"
+ >
+ {t("submit")}
+
+
+
+ )}
+
+
+ {
+ setPreviewImage(null);
+ setCameraModalOpen(false);
+ }}
+ className="m-2"
+ >
+ {t("close")}
+
+
+
+ {/* buttons for laptop screens */}
+
+
+
+
+ {`${t("switch")} ${t("camera")}`}
+
+
+
+
+
+ {!previewImage ? (
+ <>
+
+ {
+ captureImage();
+ }}
+ >
+
+ {t("capture")}
+
+
+
+ ) : (
+ <>
+
+ {
+ setPreviewImage(null);
+ }}
+ >
+ {t("retake")}
+
+ {
+ setCameraModalOpen(false);
+ setPreviewImage(null);
+ }}
+ >
+ {t("submit")}
+
+
+
+ )}
+
+
+
{
+ setPreviewImage(null);
+ setCameraModalOpen(false);
+ }}
+ >
+ {`${t("close")} ${t("camera")}`}
+
+
+
+
+ );
+
+ const UploadButton = (props: FileUploadButtonProps) => (
+
+ );
+
+ return {
+ progress,
+ error,
+ handleCameraCapture: () => {
+ setCameraModalOpen(true);
+ },
+ handleAudioCapture: () => {
+ console.log("Audio capture not implemented");
+ },
+ handleFileUpload: handleUpload,
+ Dialogues,
+ UploadButton,
+ fileName: uploadFileName,
+ file: file,
+ setFileName: setUploadFileName,
+ clearFile: () => {
+ setFile(null);
+ setUploadFileName("");
+ },
+ };
+}
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index 38ffc2e1c66..d599a494b1c 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -409,6 +409,14 @@ export const compareBy =
(key: keyof T) => {
};
};
+export const compareByDateString = (key: keyof T) => {
+ return (a: T, b: T) => {
+ const aV = new Date(a[key] as string);
+ const bV = new Date(b[key] as string);
+ return aV < bV ? -1 : aV > bV ? 1 : 0;
+ };
+};
+
export const isValidUrl = (url?: string) => {
try {
new URL(url ?? "");
diff --git a/src/style/index.css b/src/style/index.css
index fe2c9c8edb1..b05417bf912 100644
--- a/src/style/index.css
+++ b/src/style/index.css
@@ -429,6 +429,12 @@ button:disabled,
}
}
+.skeleton-animate-alpha {
+ animation: skeletonShimmer 3s infinite linear;
+ background: linear-gradient(to right, rgba(0, 0, 0, 0.1) 10%, rgba(0, 0, 0, 0.05) 40%, rgba(0, 0, 0, 0.1) 70%);
+ background-size: 1000px 100%;
+}
+
@media print {
body * {