merge conflic removed

ohcnetwork · Mar 3, 2025 · 34e7f6c · 34e7f6c
2 parents 66acf9b + dd8c696
commit 34e7f6c
Show file tree

Hide file tree

Showing 37 changed files with 280 additions and 492 deletions.
diff --git a/.github/workflows/issue-automation.yml b/.github/workflows/issue-automation.yml
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/locale/en.json b/public/locale/en.json
@@ -734,6 +734,7 @@
   "dashboard": "Dashboard",
   "date": "Date",
   "date_and_time": "Date and Time",
+  "date_and_time_of_death": "Date and Time of Death",
   "date_declared_positive": "Date of declaring positive",
   "date_of_admission": "Date of Admission",
   "date_of_birth": "Date of Birth",
@@ -748,7 +749,8 @@
   "date_range": "Date Range",
   "dates_and_identifiers": "Dates & Identifiers",
   "day": "Day",
-  "death_report": "Death Report",
+  "deceased_disclaimer": "Please provide the date and time of death for record-keeping purposes. This information is handled with utmost sensitivity and respect.",
+  "deceased_status": "Deceased Status",
   "delete": "Delete",
   "delete_account": "Delete account",
   "delete_account_btn": "Yes, delete this account",
@@ -1299,6 +1301,7 @@
   "is_it_upshift": "is it upshift",
   "is_phone_a_whatsapp_number": "Is the phone number a WhatsApp number?",
   "is_pregnant": "Is pregnant",
+  "is_the_patient_deceased": "Is the patient deceased",
   "is_this_administration_for_a_past_time": "Is this administration for a past time",
   "is_this_an_emergency": "Is this an Emergency?",
   "is_this_an_emergency_request": "Is this an emergency request?",
@@ -1653,6 +1656,7 @@
   "ongoing_medications": "Ongoing Medications",
   "online": "Online",
   "only_indian_mobile_numbers_supported": "Currently only Indian numbers are supported",
+  "only_mark_if_applicable": "Only mark if applicable",
   "onset": "Onset",
   "op_encounter": "OP Encounter",
   "op_file_closed": "OP file closed",
@@ -1731,6 +1735,7 @@
   "patient_face": "Patient Face",
   "patient_files": "Patient Files",
   "patient_information": "Patient Information",
+  "patient_is_deceased": "Patient is deceased",
   "patient_name": "Patient Name",
   "patient_name_uhid": "Patient Name/UHID",
   "patient_no": "OP/IP No",
@@ -2563,7 +2568,7 @@
   "we_ve_sent_you_a_code_to": "We've sent you a code to",
   "weekly_schedule": "Weekly Schedule",
   "weekly_working_hours_error": "Average weekly working hours must be a number between 0 and 168",
-  "welcome_back": "Welcome back, {{name}}!",
+  "welcome_back_name": "Welcome Back {{name}} !",
   "welcome_back_to_hospital_dashboard": "Welcome back to the overview ",
   "what_facility_assign_the_patient_to": "What facility would you like to assign the patient to",
   "whatsapp_number": "Whatsapp Number",

diff --git a/public/locale/ml.json b/public/locale/ml.json
@@ -378,7 +378,7 @@
   "appointment_details": "അപ്പോയിൻ്റ്മെൻ്റ് വിശദാംശങ്ങൾ",
   "appointment_not_found": "അപ്പോയിൻ്റ്മെൻ്റ് കണ്ടെത്തിയില്ല",
   "appointment_type": "അപ്പോയിൻ്റ്മെൻ്റ് തരം",
-  "appointments": "നിയമനങ്ങൾ",
+  "appointments": "അപ്പോയ്ന്റ്മെന്റ്സ്",
   "approve": "അംഗീകരിക്കുക",
   "approved": "അംഗീകരിച്ചു",
   "approved_by_district_covid_control_room": "ജില്ലാ കോവിഡ് കൺട്രോൾ റൂം അംഗീകരിച്ചു",
@@ -676,7 +676,6 @@
   "date_of_return": "മടങ്ങിവരുന്ന തീയതി",
   "date_of_test": "ടെസ്റ്റ് തീയതി",
   "day": "ദിവസം",
-  "death_report": "മരണ റിപ്പോർട്ട്",
   "delete": "ഇല്ലാതാക്കുക",
   "delete_account": "അക്കൗണ്ട് ഇല്ലാതാക്കുക",
   "delete_account_btn": "അതെ, ഈ അക്കൗണ്ട് ഇല്ലാതാക്കുക",
@@ -787,7 +786,7 @@
   "emergency_contact_volunteer": "അടിയന്തര കോൺടാക്റ്റ് (വോളണ്ടിയർ)",
   "emergency_phone_number": "എമർജൻസി ഫോൺ നമ്പർ",
   "empty_date_time": "--:-- --; ------------",
-  "encounter": "ഏറ്റുമുട്ടൽ",
+  "encounter": "എൻകൗണ്ടർ",
   "encounter_admit_sources__born": "ആശുപത്രിയിൽ ജനിച്ചു",
   "encounter_admit_sources__emd": "അപകട/അടിയന്തര വിഭാഗത്തിൽ നിന്ന്",
   "encounter_admit_sources__gp": "ജനറൽ പ്രാക്ടീഷണറുടെ റഫറൽ",
@@ -1218,6 +1217,7 @@
   "moving_camera": "ചലിക്കുന്ന ക്യാമറ",
   "my_doctors": "എൻ്റെ ഡോക്ടർമാർ",
   "my_profile": "എൻ്റെ പ്രൊഫൈൽ",
+  "my_schedules": "എന്റെ ഷെഡ്യൂൾസ്",
   "name": "പേര്",
   "name_of_hospital": "ആശുപത്രിയുടെ പേര്",
   "name_of_shifting_approving_facility": "ഷിഫ്റ്റിംഗ് അപ്രൂവിംഗ് സൗകര്യത്തിൻ്റെ പേര്",
@@ -1677,6 +1677,7 @@
   "set_home_facility": "ഹോം സൗകര്യമായി സജ്ജമാക്കുക",
   "set_your_local_language": "നിങ്ങളുടെ പ്രാദേശിക ഭാഷ സജ്ജമാക്കുക",
   "settings_and_filters": "ക്രമീകരണങ്ങളും ഫിൽട്ടറുകളും",
+  "settings": "സെറ്റിംഗ്സ്",
   "severity_of_breathlessness": "ശ്വാസതടസ്സത്തിൻ്റെ തീവ്രത",
   "sex": "ലൈംഗികത",
   "shared_by": "പങ്കിട്ടത്",
@@ -1875,7 +1876,7 @@
   "username_available": "ഉപയോക്തൃനാമം ലഭ്യമാണ്",
   "username_not_available": "ഉപയോക്തൃനാമം ലഭ്യമല്ല",
   "username_userdetails_not_found": "ഉപയോക്തൃനാമമോ ഉപയോക്തൃ വിശദാംശങ്ങളോ കണ്ടെത്താനായില്ല",
-  "users": "ഉപയോക്താക്കൾ",
+  "users": "യൂസേഴ്സ്",
   "vacant": "ഒഴിഞ്ഞുകിടക്കുന്നു",
   "vaccinated": "വാക്സിനേഷൻ നൽകി",
   "vaccine_name": "വാക്സിൻ പേര്",

diff --git a/renovate.json b/renovate.json
@@ -11,7 +11,6 @@
   ],
   "automergeStrategy": "squash",
   "automergeType": "pr",
-  "bumpVersion": "minor",
   "packageRules": [
     {
       "groupName": "all dependencies (minor, patch)",
@@ -23,4 +22,4 @@
       "automerge": true
     }
   ]
-}
+}
diff --git a/src/CAREUI/interactive/Zoom.tsx b/src/CAREUI/interactive/Zoom.tsx
@@ -68,7 +68,7 @@ export const ZoomControls = (props: { disabled?: boolean }) => {
   }
 
   return (
-    <div className="absolute bottom-8 right-8 flex flex-col items-center justify-center gap-1 rounded-full border border-secondary-400 bg-white p-0.5 shadow-lg md:flex-row-reverse md:gap-2">
+    <div className="fixed bottom-8 right-8 flex flex-col items-center justify-center gap-1 rounded-full border border-secondary-400 bg-white p-0.5 shadow-lg md:flex-row-reverse md:gap-2">
       <Button
         disabled={props.disabled}
         variant="ghost"

diff --git a/src/Routers/routes/adminRoutes.tsx b/src/Routers/routes/adminRoutes.tsx
@@ -1,6 +1,5 @@
 import QuestionnaireEditor from "@/components/Questionnaire/QuestionnaireEditor";
 import { QuestionnaireList } from "@/components/Questionnaire/QuestionnaireList";
-import { QuestionnaireShow } from "@/components/Questionnaire/show";
 import { ValueSetEditor } from "@/components/ValueSet/ValueSetEditor";
 import { ValueSetList } from "@/components/ValueSet/ValueSetList";
 
@@ -9,7 +8,6 @@ import { AppRoutes } from "@/Routers/AppRouter";
 const AdminRoutes: AppRoutes = {
   "/admin/questionnaire": () => <QuestionnaireList />,
   "/admin/questionnaire/create": () => <QuestionnaireEditor />,
-  "/admin/questionnaire/:id": ({ id }) => <QuestionnaireShow id={id} />,
   "/admin/questionnaire/:id/edit": ({ id }) => <QuestionnaireEditor id={id} />,
   "/admin/valuesets": () => <ValueSetList />,
   "/admin/valuesets/create": () => <ValueSetEditor />,

diff --git a/src/components/Common/AvatarEditModal.tsx b/src/components/Common/AvatarEditModal.tsx
@@ -235,15 +235,15 @@ const AvatarEditModal = ({
               <>
                 {preview || imageUrl ? (
                   <>
-                    <div className="flex flex-1 items-center justify-center rounded-lg">
+                    <div className="flex h-[50vh] md:h-[75vh] w-full items-center justify-center overflow-scroll rounded-lg border border-secondary-200">
                       <img
                         src={
                           preview && preview.startsWith("blob:")
                             ? DOMPurify.sanitize(preview)
                             : imageUrl
                         }
                         alt="cover-photo"
-                        className="h-full w-full object-cover"
+                        className="h-full w-full object-contain"
                       />
                     </div>
                     <p className="text-center font-medium text-secondary-700">

diff --git a/src/components/Common/DebugPreview.tsx b/src/components/Common/DebugPreview.tsx
@@ -19,7 +19,7 @@ export function DebugPreview({ data, title, className }: DebugPreviewProps) {
         </CardTitle>
       </CardHeader>
       <CardContent>
-        <pre className="text-sm text-muted-foreground whitespace-pre-wrap overflow-auto max-h-[500px]">
+        <pre className="text-sm text-gray-500 whitespace-pre-wrap overflow-auto max-h-[500px]">
           {JSON.stringify(data, null, 2)}
         </pre>
       </CardContent>

diff --git a/src/components/Common/FilePreviewDialog.tsx b/src/components/Common/FilePreviewDialog.tsx
@@ -13,6 +13,8 @@ import {
 import { useTranslation } from "react-i18next";
 import useKeyboardShortcut from "use-keyboard-shortcut";
 
+import { cn } from "@/lib/utils";
+
 import CareIcon, { IconName } from "@/CAREUI/icons/CareIcon";
 
 import { Button } from "@/components/ui/button";
@@ -247,7 +249,7 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
                   <CareIcon icon="l-arrow-left" className="h-4 w-4" />
                 </Button>
               )}
-              <div className="flex h-[75vh] w-full items-center justify-center overflow-scroll rounded-lg border border-secondary-200">
+              <div className="flex h-[50vh] md:h-[75vh] w-full items-center justify-center overflow-scroll rounded-lg border border-secondary-200">
                 {file_state.isImage ? (
                   <img
                     src={fileUrl}
@@ -273,7 +275,7 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
                     sandbox=""
                     title={t("source_file")}
                     src={fileUrl}
-                    className="h-[75vh] w-full"
+                    className="h-[50vh] md:h-[75vh] w-full"
                   />
                 ) : (
                   <div className="flex h-full w-full flex-col items-center justify-center">
@@ -297,8 +299,8 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
                 </Button>
               )}
             </div>
-            <div className="flex items-center justify-between">
-              <div className="mt-2 flex w-full flex-col justify-center gap-3 md:flex-row">
+            <div className="flex items-center justify-center">
+              <div className="mt-2 grid grid-cols-5 max-md:grid-cols-6 gap-4">
                 {file_state.isImage && (
                   <>
                     {[
@@ -339,7 +341,10 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
                         variant="ghost"
                         key={index}
                         onClick={button[2] as () => void}
-                        className="z-50 rounded bg-white/60 px-4 py-2 text-black backdrop-blur transition hover:bg-white/70"
+                        className={cn(
+                          "z-50 rounded bg-white/60 px-4 py-2 text-black backdrop-blur transition hover:bg-white/70",
+                          index > 2 ? "max-md:col-span-3" : "max-md:col-span-2",
+                        )}
                         disabled={button[3] as boolean}
                       >
                         {button[1] && (
@@ -382,7 +387,10 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
                         variant="ghost"
                         key={index}
                         onClick={button[2] as () => void}
-                        className="z-50 rounded bg-white/60 px-4 py-2 text-black backdrop-blur transition hover:bg-white/70"
+                        className={cn(
+                          "z-50 rounded bg-white/60 px-4 py-2 text-black backdrop-blur transition hover:bg-white/70",
+                          index > 2 ? "max-md:col-span-3" : "max-md:col-span-2",
+                        )}
                         disabled={button[3] as boolean}
                       >
                         {button[1] && (
@@ -400,7 +408,7 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
             </div>
           </>
         ) : (
-          <div className="flex h-[75vh] items-center justify-center">
+          <div className="flex h-[50vh] md:h-[75vh] items-center justify-center">
             <CircularProgress />
           </div>
         )}

diff --git a/src/components/Encounter/CreateEncounterForm.tsx b/src/components/Encounter/CreateEncounterForm.tsx
@@ -17,6 +17,8 @@ import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 import * as z from "zod";
 
+import { cn } from "@/lib/utils";
+
 import { Button } from "@/components/ui/button";
 import {
   Form,
@@ -226,10 +228,12 @@ export default function CreateEncounterForm({
                           key={value}
                           type="button"
                           data-cy={`encounter-type-${value}`}
-                          className="h-24 w-full justify-start text-lg"
-                          variant={
-                            field.value === value ? "default" : "outline"
-                          }
+                          className={cn(
+                            "h-24 w-full justify-start text-lg",
+                            field.value === value &&
+                              "ring-2 ring-primary text-primary",
+                          )}
+                          variant="outline"
                           onClick={() => field.onChange(value)}
                         >
                           <div className="flex flex-col items-center text-center">

diff --git a/src/components/Facility/FacilityForm.tsx b/src/components/Facility/FacilityForm.tsx
@@ -312,7 +312,6 @@ export default function FacilityForm({
                     <PhoneInput
                       data-cy="facility-phone"
                       placeholder={t("enter_phone_number")}
-                      maxLength={13}
                       {...field}
                     />
                   </FormControl>

diff --git a/src/components/Facility/FacilityHome.tsx b/src/components/Facility/FacilityHome.tsx
@@ -223,10 +223,6 @@ export const FacilityHome = ({ facilityId }: Props) => {
                     </div>
                   </div>
                   <div className="flex-shrink-0">
-                    <PLUGIN_Component
-                      __name="FacilityHomeActions"
-                      facility={facilityData}
-                    />
                     {/* <AlertDialog>
                       TODO: add delete facility
                       <AlertDialogTrigger asChild>
@@ -269,7 +265,7 @@ export const FacilityHome = ({ facilityId }: Props) => {
                     aria-label={t("edit_cover_photo")}
                   >
                     <CareIcon
-                      icon="l-edit"
+                      icon="l-pen"
                       className="text-white"
                       aria-hidden="true"
                     />
@@ -282,15 +278,16 @@ export const FacilityHome = ({ facilityId }: Props) => {
             </div>
 
             <div className="mt-2 space-y-2">
-              <div className="mt-2 space-y-2 flex justify-end">
+              <div className="flex justify-end gap-2 max-sm:flex-col sm:mt-4 mt-12 flex-wrap">
+                <PLUGIN_Component
+                  __name="FacilityHomeActions"
+                  facility={facilityData}
+                />
                 <EditFacilitySheet
                   facilityId={facilityId}
                   trigger={
-                    <Button
-                      className="cursor-pointer mt-2 [@media(max-width:25rem)]:mt-12 [@media(max-width:25rem)]:w-full"
-                      variant="outline"
-                    >
-                      <CareIcon icon="l-edit" />
+                    <Button className="cursor-pointer" variant="outline">
+                      <CareIcon icon="l-pen" />
                       {t("edit_facility_details")}
                     </Button>
                   }