Merge branch 'develop' into ITEST-902

README.md

@@ -1,7 +1,7 @@
 # OpenELIS Global 2
 
 This is the OpenELIS rewrite onto Java Spring, and with all new technology and
-features. Please see our [website](http://www.openelis-global.org/) for more
+features. Please vist our [website](http://www.openelis-global.org/) for more
 information.
 
 You can find more information on how to set up OpenELIS at our
@@ -15,21 +15,32 @@ You can find more information on how to set up OpenELIS at our
 
 [![End to End QA Tests Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/frontend-qa.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/frontend-qa.yml)
 
-### For Implementers who Just want to run OpenELIS without Making any Code Changes
+[![End to End QA Tests Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/build-installer.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/build-installer.yml)
+
+### For Offline Installation Using the OpenELIS Global2 Installer
+
+Download the OpenELIS Global Installer for each Release from the
+[Release Assets](https://github.com/I-TECH-UW/OpenELIS-Global-2/releases)
+
+see full
+[installtion instructions](https://docs.openelis-global.org/en/latest/install/)
+for Offline Installation
+
+### For running OpenELIS Global2 in Docker with default Settings out of the Box
 
 see [OpenELIS-Docker setup](https://github.com/I-TECH-UW/openelis-docker)
 
-### Running OpenELIS in Docker For Devlopers with Intention of Making code Changes
+### For Running OpenELIS Global2 from Source Code
 
-#### Running docker compose With pre-released docker images
+#### Running OpenELIS Global2 using docker compose With published docker images on dockerhub
 
     docker-compose up -d
 
-#### Running docker compose with docker images built directly from the source code
+#### Running OpenELIS Global2 using docker compose with docker images built directly from the source code
 
     docker-compose -f build.docker-compose.yml up -d --build
 
-#### Running docker compose With locally compiled/built Artifacts (ie the War file and React code) For Developers
+#### Running OpenELIS Global2 using docker compose With locally compiled/built Artifacts (ie the War file and React code)
 
 1.  Fork the
     [OpenELIS-Global Repository](https://github.com/I-TECH-UW/OpenELIS-Global-2.git)

dev.docker-compose.yml

@@ -24,7 +24,7 @@ services:
             - ./volume/database/database.env
         volumes:
               # preserves the database between containers
-             - db-data:/var/lib/postgresql/data                
+             - ./volume/database/data:/var/lib/postgresql/data                
               # files here will run on install
              - ./volume/database/dbInit:/docker-entrypoint-initdb.d
         networks:

frontend/cypress/e2e/dashboard.cy.js

@@ -78,7 +78,8 @@ describe("ImmunoChemistry Dashboard", function () {
 
   it("Validate the Status of Order", () => {
     cy.fixture("DashBoard").then((order) => {
-      dashboard.validateOrderStatus(order.labNo, 3);
+      //TO DO : needs to be properly re-writen with proper selector
+      //dashboard.validateOrderStatus(order.labNo, 3);
     });
   });
 });

frontend/src/components/addOrder/OrderEntryAdditionalQuestions.js

@@ -381,18 +381,20 @@ const OrderEntryAdditionalQuestions = ({
 
   function setAdditionalQuestions(res, event) {
     console.debug(res);
-    setQuestionnaire(res);
-    var convertedQuestionnaireResponse = convertQuestionnaireToResponse(res);
-    setQuestionnaireResponse(convertedQuestionnaireResponse);
-    setOrderFormValues({
-      ...orderFormValues,
-      sampleOrderItems: {
-        ...orderFormValues.sampleOrderItems,
-        questionnaire: res,
-        programId: event ? event.target.value : "",
-        additionalQuestions: convertedQuestionnaireResponse,
-      },
-    });
+    if ("item" in res) {
+      setQuestionnaire(res);
+      var convertedQuestionnaireResponse = convertQuestionnaireToResponse(res);
+      setQuestionnaireResponse(convertedQuestionnaireResponse);
+      setOrderFormValues({
+        ...orderFormValues,
+        sampleOrderItems: {
+          ...orderFormValues.sampleOrderItems,
+          questionnaire: res,
+          programId: event ? event.target.value : "",
+          additionalQuestions: convertedQuestionnaireResponse,
+        },
+      });
+    }
   }
   const getAnswer = (linkId) => {
     var responseItem = questionnaireResponse?.item?.find(

frontend/src/components/layout/search/searchBar.css

@@ -7,7 +7,7 @@
 .search-bar-container {
   position: absolute;
   display: flex;
-  width: 430px;
+  width: 100%;
   top: 10px;
   right: -30px;
   box-shadow: 0em 0.1em 0.05em #ccc;
@@ -24,11 +24,12 @@
 
 .patients {
   overflow-y: auto;
-  width: 700px;
+  width: 100%;
   max-height: 250px;
-  position: relative;
+  position: absolute;
   background-color: #f0e7e7;
   top: 45px;
+  right: -30px;
   box-shadow: 0em 0.1em 0.5em #ccc;
 }
 

frontend/src/components/patient/resultsViewer/results-viewer.styles.scss

@@ -203,20 +203,19 @@
   height: 5rem;
   border-radius: 1px;
 }
-@media screen and (max-width:673px){
+@media screen and (max-width: 673px) {
   .patient-name {
     font-size: 16px;
-    margin-left:5%;
+    margin-left: 5%;
   }
-  
+
   .patient-dob {
     font-size: 14px;
-    margin-left:5%;
+    margin-left: 5%;
   }
-  
+
   .patient-id {
     font-size: 12px;
-    margin-left:5%;
+    margin-left: 5%;
   }
-
 }

frontend/src/components/patient/resultsViewer/results-viewer.tsx

@@ -88,7 +88,7 @@ const RoutedResultsViewer: React.FC<ResultsViewerProps> = () => {
       <>
         <Loading></Loading>
         <Grid fullWidth={true}>
-          <Column lg={16} md={8} sm={4} >
+          <Column lg={16} md={8} sm={4}>
             <EmptyState
               headerTitle={intl.formatMessage({ id: "label.test.results" })}
               displayText={intl.formatMessage({
@@ -116,7 +116,7 @@ const RoutedResultsViewer: React.FC<ResultsViewerProps> = () => {
         </Column>
       </Grid>
       <Grid fullWidth={true}>
-        <Column lg={16} md={8} sm={4} >
+        <Column lg={16} md={8} sm={4}>
           <Section>
             <Section>
               <Heading>