Merge pull request #7955 from coronasafe/develop

Merge Develop to Staging v24.23.0
ohcnetwork · May 31, 2024 · e5c7a51 · e5c7a51
2 parents 152fb19 + fa5e3e6
commit e5c7a51
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 75 deletions.
diff --git a/src/CAREUI/display/RecordMeta.tsx b/src/CAREUI/display/RecordMeta.tsx
@@ -1,8 +1,7 @@
 import CareIcon from "../icons/CareIcon";
 import {
-  formatDate,
+  formatDateTime,
   formatName,
-  formatTime,
   isUserOnline,
   relativeTime,
 } from "../../Utils/utils";
@@ -39,8 +38,9 @@ const RecordMeta = ({
     <div className="tooltip">
       <span className="underline">{relativeTime(time)}</span>
       <span className="tooltip-text tooltip-bottom flex -translate-x-1/2 gap-1 text-xs font-medium tracking-wider">
-        {formatTime(time)} <br />
-        {formatDate(time)}
+        <span className="whitespace-break-spaces">
+          {formatDateTime(time).replace(";", "")}
+        </span>
         {user && !inlineUser && (
           <span className="flex items-center gap-1">
             by

diff --git a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
@@ -311,59 +311,6 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                 </div>
               </div>
             )}
-            {((props.patientData.is_antenatal &&
-              isAntenatal(props.patientData.last_menstruation_start_date)) ||
-              isPostPartum(props.patientData.date_of_delivery)) && (
-              <div className="rounded-lg bg-white px-4 py-5 shadow sm:p-6">
-                <h3 className="mb-4 text-lg font-semibold leading-relaxed text-gray-900">
-                  Perinatal Status
-                </h3>
-
-                <div className="flex gap-2 pb-2">
-                  {props.patientData.is_antenatal &&
-                    isAntenatal(
-                      props.patientData.last_menstruation_start_date,
-                    ) && (
-                      <Chip
-                        variant="custom"
-                        className="border-pink-300 bg-pink-100 text-pink-600"
-                        startIcon="l-baby-carriage"
-                        text="Antenatal"
-                      />
-                    )}
-                  {isPostPartum(props.patientData.date_of_delivery) && (
-                    <Chip
-                      variant="custom"
-                      className="border-pink-300 bg-pink-100 text-pink-600"
-                      startIcon="l-baby-carriage"
-                      text="Post-partum"
-                    />
-                  )}
-                </div>
-
-                {props.patientData.last_menstruation_start_date && (
-                  <p className="space-x-2 p-2 text-sm">
-                    <CareIcon className="text-base" icon="l-calendar-alt" />
-                    <span>Last Menstruation:</span>
-                    <span className="font-semibold">
-                      {formatDate(
-                        props.patientData.last_menstruation_start_date,
-                      )}
-                    </span>
-                  </p>
-                )}
-
-                {props.patientData.date_of_delivery && (
-                  <p className="space-x-2 p-2 text-sm">
-                    <CareIcon className="text-base" icon="l-calendar-alt" />
-                    <span>Date of Delivery:</span>
-                    <span className="font-semibold">
-                      {formatDate(props.patientData.date_of_delivery)}
-                    </span>
-                  </p>
-                )}
-              </div>
-            )}
 
             <div className="rounded-lg bg-white px-4 py-5 shadow sm:p-6 md:col-span-2">
               <EncounterSymptomsCard />
@@ -637,6 +584,59 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                 </div>
               </div>
             </div>
+            {((props.patientData.is_antenatal &&
+              isAntenatal(props.patientData.last_menstruation_start_date)) ||
+              isPostPartum(props.patientData.date_of_delivery)) && (
+              <div className="mt-4 rounded-lg bg-white px-4 py-5 shadow sm:p-6">
+                <h3 className="mb-4 text-lg font-semibold leading-relaxed text-gray-900">
+                  Perinatal Status
+                </h3>
+
+                <div className="flex gap-2 pb-2">
+                  {props.patientData.is_antenatal &&
+                    isAntenatal(
+                      props.patientData.last_menstruation_start_date,
+                    ) && (
+                      <Chip
+                        variant="custom"
+                        className="border-pink-300 bg-pink-100 text-pink-600"
+                        startIcon="l-baby-carriage"
+                        text="Antenatal"
+                      />
+                    )}
+                  {isPostPartum(props.patientData.date_of_delivery) && (
+                    <Chip
+                      variant="custom"
+                      className="border-pink-300 bg-pink-100 text-pink-600"
+                      startIcon="l-baby-carriage"
+                      text="Post-partum"
+                    />
+                  )}
+                </div>
+
+                {props.patientData.last_menstruation_start_date && (
+                  <p className="space-x-2 p-2 text-sm">
+                    <CareIcon className="text-base" icon="l-calendar-alt" />
+                    <span>Last Menstruation:</span>
+                    <span className="font-semibold">
+                      {formatDate(
+                        props.patientData.last_menstruation_start_date,
+                      )}
+                    </span>
+                  </p>
+                )}
+
+                {props.patientData.date_of_delivery && (
+                  <p className="space-x-2 p-2 text-sm">
+                    <CareIcon className="text-base" icon="l-calendar-alt" />
+                    <span>Date of Delivery:</span>
+                    <span className="font-semibold">
+                      {formatDate(props.patientData.date_of_delivery)}
+                    </span>
+                  </p>
+                )}
+              </div>
+            )}
           </div>
         </div>
         <div className="w-full pl-0 md:pl-4 xl:w-1/3">

diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
@@ -502,6 +502,11 @@ export const DailyRounds = (props: any) => {
         </div>
 
         <div className="grid grid-cols-1 gap-x-6 md:grid-cols-2">
+          <div className="pb-6 md:col-span-2">
+            <FieldLabel>Symptoms</FieldLabel>
+            <EncounterSymptomsBuilder />
+          </div>
+
           <TextAreaFormField
             {...field("physical_examination_info")}
             label="Physical Examination Info"
@@ -513,11 +518,6 @@ export const DailyRounds = (props: any) => {
             rows={5}
           />
 
-          <div className="pb-6 md:col-span-2">
-            <FieldLabel>Symptoms</FieldLabel>
-            <EncounterSymptomsBuilder />
-          </div>
-
           {state.form.rounds_type !== "DOCTORS_LOG" && (
             <>
               <SelectFormField
@@ -674,6 +674,19 @@ export const DailyRounds = (props: any) => {
           {state.form.rounds_type === "DOCTORS_LOG" && (
             <>
               <div className="flex flex-col gap-10 divide-y-2 divide-dashed divide-gray-600 border-t-2 border-dashed border-gray-600 pt-6 md:col-span-2">
+                <div>
+                  <h3 className="mb-4 mt-8 text-lg font-semibold">
+                    {t("diagnosis")}
+                  </h3>
+                  {/*  */}
+                  {diagnoses ? (
+                    <EditDiagnosesBuilder value={diagnoses} />
+                  ) : (
+                    <div className="flex animate-pulse justify-center py-4 text-center font-medium text-gray-800">
+                      Fetching existing diagnosis of patient...
+                    </div>
+                  )}
+                </div>
                 <div>
                   <h3 className="my-4 text-lg font-semibold">
                     {t("investigations")}
@@ -701,19 +714,6 @@ export const DailyRounds = (props: any) => {
                   </h3>
                   <PrescriptionBuilder is_prn />
                 </div>
-                <div>
-                  <h3 className="mb-4 mt-8 text-lg font-semibold">
-                    {t("diagnosis")}
-                  </h3>
-                  {/*  */}
-                  {diagnoses ? (
-                    <EditDiagnosesBuilder value={diagnoses} />
-                  ) : (
-                    <div className="flex animate-pulse justify-center py-4 text-center font-medium text-gray-800">
-                      Fetching existing diagnosis of patient...
-                    </div>
-                  )}
-                </div>
               </div>
             </>
           )}