Merge pull request #559 from mozzy11/2.8

Minor styling improvements
I-TECH-UW · Sep 20, 2023 · e1bc45c · e1bc45c
2 parents 5fcbf15 + dcd114c
commit e1bc45c
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 14 deletions.
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..." />

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 {

diff --git a/frontend/src/components/resultPage/SearchResultForm.js b/frontend/src/components/resultPage/SearchResultForm.js
@@ -624,6 +624,7 @@ export function SearchResults(props) {
               <TextArea
                 id={"ResultValue" + row.id}
                 name={"testResult[" + row.id + "].resultValue"}
+                style={{ width: "10px", height: "20px" }}
                 //type="text"
                 // value={resultForm.testResult[row.id].resultValue}
                 labelText=""
@@ -637,6 +638,7 @@ export function SearchResults(props) {
               <TextArea
                 id={"ResultValue" + row.id}
                 name={"testResult[" + row.id + "].resultValue"}
+                style={{ width: "10px", height: "20px" }}
                 //type="text"
                 // value={resultForm.testResult[row.id].resultValue}
                 labelText=""
@@ -689,6 +691,34 @@ export function SearchResults(props) {
               />
             );
 
+          case "R":
+            return (
+              <TextArea
+                id={"ResultValue" + row.id}
+                name={"testResult[" + row.id + "].resultValue"}
+                style={{ width: "10px", height: "20px" }}
+                //type="text"
+                value={row.resultValue}
+                labelText=""
+                // helperText="Optional help text"
+                onChange={(e) => handleChange(e, row.id)}
+              />
+            );
+
+          case "A":
+            return (
+              <TextArea
+                id={"ResultValue" + row.id}
+                name={"testResult[" + row.id + "].resultValue"}
+                style={{ width: "10px", height: "20px" }}
+                //type="text"
+                value={row.resultValue}
+                labelText=""
+                // helperText="Optional help text"
+                onChange={(e) => handleChange(e, row.id)}
+              />
+            );
+
           default:
             return row.resultValue;
         }