Merge branch '2.8' of github.com:I-TECH-UW/OpenELIS-Global-2 into 2.8

I-TECH-UW · Sep 20, 2023 · 09cf843 · 09cf843
2 parents 67bbe81 + c41a1dd
commit 09cf843
Show file tree

Hide file tree

Showing 12 changed files with 189 additions and 75 deletions.
diff --git a/frontend/src/components/addOrder/AddOrder.js b/frontend/src/components/addOrder/AddOrder.js
@@ -468,7 +468,7 @@ const AddOrder = (props) => {
               className="inputDate"
               labelText={<FormattedMessage id="sample.entry.nextVisit.date" />}
               value={orderFormValues.sampleOrderItems.nextVisitDate}
-              autofillDate={true}
+              autofillDate={false}
               onChange={(date) => handleDatePickerChange("nextVisitDate", date)}
             />
           </div>

diff --git a/frontend/src/components/admin/reflexTests/AutoComplete.js b/frontend/src/components/admin/reflexTests/AutoComplete.js
@@ -59,7 +59,8 @@ function Autocomplete(props) {
       clearError,
     } = props;
     setActiveSuggestion(0);
-    setShowSuggestions(true);
+    setShowSuggestions(false);
+    setFilteredSuggestions([]);
     setUserInput(e.currentTarget.innerText);
     setInvalid(false);
 

diff --git a/frontend/src/components/admin/reflexTests/ReflexRuleForm.js b/frontend/src/components/admin/reflexTests/ReflexRuleForm.js
@@ -348,6 +348,8 @@ function ReflexRule() {
       // console.log(JSON.stringify(reflexRuleList))
       if (reflexRuleList.length > 0) {
         setRuleList(reflexRuleList);
+      } else {
+        setLoading(false);
       }
     }
   };

diff --git a/frontend/src/components/cytology/CytologyCaseView.js b/frontend/src/components/cytology/CytologyCaseView.js
@@ -370,7 +370,7 @@ function CytologyCaseView() {
           <Section>
             <Section>
               {pathologySampleInfo ? (
-                <div className="patient-header">
+                <div className="patient-header2">
                   <div className="patient-name">
                     <Tag type="blue">
                       {" "}
@@ -421,7 +421,7 @@ function CytologyCaseView() {
                   </div>
                 </div>
               ) : (
-                <div className="patient-header">
+                <div className="patient-header2">
                   <div className="patient-name">
                     {" "}
                     <FormattedMessage id="patient.label.nopatientid" />{" "}
@@ -432,7 +432,7 @@ function CytologyCaseView() {
           </Section>
           <Section>
             <Section>
-              <div className="patient-header">
+              <div className="patient-header2">
                 <QuestionnaireResponse
                   questionnaireResponse={
                     pathologySampleInfo.programQuestionnaireResponse
@@ -443,7 +443,7 @@ function CytologyCaseView() {
           </Section>
         </Column>
       </Grid>
-      <Grid fullWidth={true} className="gridBoundary">
+      <Grid fullWidth={true} className="orderLegendBody">
         {notificationVisible === true ? <AlertDialog /> : ""}
         {loading && <Loading description="Loading Dasboard..." />}
         <Column lg={16} md={8} sm={4}>

diff --git a/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js b/frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
@@ -267,7 +267,7 @@ function ImmunohistochemistryCaseView() {
           <Section>
             <Section>
               {immunohistochemistrySampleInfo ? (
-                <div className="patient-header">
+                <div className="patient-header2">
                   <div className="patient-name">
                     <Tag type="blue">
                       <FormattedMessage id="patient.label.name" /> :
@@ -319,7 +319,7 @@ function ImmunohistochemistryCaseView() {
                   </div>
                 </div>
               ) : (
-                <div className="patient-header">
+                <div className="patient-header2">
                   <div className="patient-name">
                     <FormattedMessage id="patient.label.nopatientid" />{" "}
                   </div>
@@ -329,7 +329,7 @@ function ImmunohistochemistryCaseView() {
           </Section>
           <Section>
             <Section>
-              <div className="patient-header">
+              <div className="patient-header2">
                 <QuestionnaireResponse
                   questionnaireResponse={
                     immunohistochemistrySampleInfo.programQuestionnaireResponse
@@ -341,7 +341,7 @@ function ImmunohistochemistryCaseView() {
         </Column>
       </Grid>
       <Stack gap={4}>
-        <Grid fullWidth={true} className="gridBoundary">
+        <Grid fullWidth={true} className="orderLegendBody">
           {notificationVisible === true ? <AlertDialog /> : ""}
           {(loading || resultsLoading) && (
             <Loading description="Loading Dasboard..." />

diff --git a/frontend/src/components/pathology/PathologyCaseView.js b/frontend/src/components/pathology/PathologyCaseView.js
@@ -209,28 +209,28 @@ function PathologyCaseView() {
         <Column lg={16}>
           <Section>
             <Section>
-              {pathologySampleInfo ? (<div className="patient-header">
+              {pathologySampleInfo ? (<div className="patient-header2">
                 <div className="patient-name"><Tag type="blue"><FormattedMessage id="patient.label.name" /> :</Tag>{pathologySampleInfo.lastName}  {pathologySampleInfo.firstName}</div>
                 <div className="patient-dob"> <Tag type="blue"><FormattedMessage id="patient.label.sex" /> :</Tag>{pathologySampleInfo.sex === 'M' ? "Male" : "Female"}<Tag type="blue"><FormattedMessage id="patient.label.age" /> :</Tag>{pathologySampleInfo.age} </div>
                 <div className="patient-id"><Tag type="blue"><FormattedMessage id="sample.label.orderdate" />  :</Tag>{pathologySampleInfo.requestDate}</div>
                 <div className="patient-id"><Tag type="blue"> <FormattedMessage id="sample.label.labnumber" /> :</Tag>{pathologySampleInfo.labNumber}</div>
                 <div className="patient-id"><Tag type="blue">  <FormattedMessage id="sample.label.facility" /> :</Tag> {pathologySampleInfo.referringFacility}<Tag type="blue"> <FormattedMessage id="sample.label.requester" />: </Tag>{pathologySampleInfo.department}</div>
                 <div className="patient-id"><Tag type="blue"> <FormattedMessage id="sample.label.requester" />: </Tag>{pathologySampleInfo.requester}</div>
-              </div>) : (<div className="patient-header">
+              </div>) : (<div className="patient-header2">
                 <div className="patient-name"> <FormattedMessage id="patient.label.nopatientid" /> </div>
               </div>)}
             </Section>
           </Section>
           <Section>
             <Section>
-              <div className="patient-header">
+              <div className="patient-header2">
                 <QuestionnaireResponse questionnaireResponse={pathologySampleInfo.programQuestionnaireResponse} />
               </div>
             </Section>
           </Section>
         </Column>
       </Grid>
-      <Grid fullWidth={true} className="gridBoundary">
+      <Grid fullWidth={true} className="orderLegendBody">
         {notificationVisible === true ? <AlertDialog /> : ""}
         {loading && (
           <Loading description="Loading Dasboard..." />
@@ -349,7 +349,7 @@ function PathologyCaseView() {
                     />
                   </Column>
                   <Column lg={4}>
-                    Pathology Report
+                  <FormattedMessage id="pathology.label.report" />
                   </Column>
                   <Column lg={2} md={1} sm={2}>
                     {pathologySampleInfo.reports[index].image &&

diff --git a/frontend/src/components/patient/CreatePatientForm.js b/frontend/src/components/patient/CreatePatientForm.js
@@ -359,6 +359,8 @@ function CreatePatientForm(props) {
                 )}
               </Field>
             </div>
+            <Accordion>
+              <AccordionItem title="Emergency Contact Information">
             <div className="inlineDiv">
               <Field name="patientContact.person.lastName">
                 {({ field }) => (
@@ -427,18 +429,10 @@ function CreatePatientForm(props) {
               </div>
               <div className="error"></div>
             </div>
+              </AccordionItem>
+            </Accordion>
+
             <div className="inlineDiv">
-              <Field name="city">
-                {({ field }) => (
-                  <TextInput
-                    value={values.city}
-                    name={field.name}
-                    labelText="Town"
-                    id={field.name}
-                    className="inputText"
-                  />
-                )}
-              </Field>
               <Field name="primaryPhone">
                 {({ field }) => (
                   <TextInput
@@ -450,6 +444,20 @@ function CreatePatientForm(props) {
                   />
                 )}
               </Field>
+              <Field name="gender">
+                {({ field }) => (
+                    <RadioButtonGroup
+                        valueSelected={values.gender}
+                        legendText="Gender"
+                        name={field.name}
+                        className="inputText"
+                        id="create_patient_gender"
+                    >
+                      <RadioButton id="radio-1" labelText="Male" value="M" />
+                      <RadioButton id="radio-2" labelText="Female" value="F" />
+                    </RadioButtonGroup>
+                )}
+              </Field>
             </div>
             <div className="inlineDiv">
               <Field name="birthDateForDisplay">
@@ -507,25 +515,20 @@ function CreatePatientForm(props) {
                 <ErrorMessage name="gender"></ErrorMessage>
               </div>
             </div>
-            <div className="inlineDiv">
-              <Field name="gender">
-                {({ field }) => (
-                    <RadioButtonGroup
-                        valueSelected={values.gender}
-                        legendText="Gender"
-                        name={field.name}
-                        className="inputText"
-                        id="create_patient_gender"
-                    >
-                      <RadioButton id="radio-1" labelText="Male" value="M" />
-                      <RadioButton id="radio-2" labelText="Female" value="F" />
-                    </RadioButtonGroup>
-                )}
-              </Field>
-            </div>
             <Accordion>
               <AccordionItem title="Additional Information">
                 <div className="inlineDiv">
+                  <Field name="city">
+                    {({ field }) => (
+                        <TextInput
+                            value={values.city}
+                            name={field.name}
+                            labelText="Town"
+                            id={field.name}
+                            className="inputText"
+                        />
+                    )}
+                  </Field>
                   <Field name="streetAddress">
                     {({ field }) => (
                       <TextInput

diff --git a/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss b/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss
@@ -130,7 +130,7 @@
 
 // patient header
 .patient-header {
-  background-color: #f5f5f5;
+  //background-color: #f5f5f5;
   border: 1px solid #ddd;
   padding: 20px;
   display: flex;
@@ -139,6 +139,25 @@
   justify-content: center;
   text-align: left;
   margin-top: 20px;
+  background-color: #FFFFFF;
+  border-radius: 5px;
+  margin: 2%;
+  padding: 2%;
+}
+.patient-header2 {
+  //background-color: #f5f5f5;
+  border: 1px solid #ddd;
+  // padding: 20px;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: center;
+  text-align: left;
+  margin-top: 20px;
+  background-color: #FFFFFF;
+  border-radius: 5px;
+  margin-top: 1%;
+  padding: 2%;
 }
 
 .patient-name {