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

I-TECH-UW · Nov 22, 2023 · 138d452 · 138d452
2 parents 63d0b4a + e9b1d68
commit 138d452
Show file tree

Hide file tree

Showing 23 changed files with 872 additions and 677 deletions.
diff --git a/build.docker-compose.yml b/build.docker-compose.yml
@@ -14,6 +14,27 @@ services:
       - keys-vol:/etc/ssl/private/
       - certs-vol:/etc/ssl/certs/
 
+  database:
+      container_name: openelisglobal-database 
+      image: postgres:9.5
+      ports:
+          - "15432:5432"
+      restart: always
+      env_file:
+          - ./volume/database/database.env
+      volumes:
+              # preserves the database between containers
+          - db-data:/var/lib/postgresql/data                
+              # files here will run on install
+          - ./volume/database/dbInit:/docker-entrypoint-initdb.d
+      networks:
+          - default
+      healthcheck:
+            test: [ "CMD", "pg_isready", "-q", "-d", "clinlims", "-U", "clinlims" ]
+            timeout: 45s
+            interval: 10s
+            retries: 10      
+
   oe.openelis.org:
     build:
       context: .
@@ -52,6 +73,10 @@ services:
       - default
     restart: always
     environment:
+      spring.datasource.url : jdbc:postgresql://database:5432/clinlims?currentSchema=clinlims
+      spring.datasource.username : clinlims
+      spring.datasource.password : clinlims
+      spring.datasource.driverClassName: org.postgresql.Driver
       TZ: Africa/Nairobi
       JAVA_OPTS: "-Djavax.net.ssl.trustStore=/etc/openelis-global/truststore 
                       -Djavax.net.ssl.trustStorePassword=tspass

diff --git a/dev.docker-compose.yml b/dev.docker-compose.yml
@@ -72,6 +72,10 @@ services:
             - default
         restart: always
         environment:
+          spring.datasource.url : jdbc:postgresql://database:5432/clinlims?currentSchema=clinlims
+          spring.datasource.username : clinlims
+          spring.datasource.password : clinlims
+          spring.datasource.driverClassName: org.postgresql.Driver
           TZ: Africa/Nairobi
 
           JAVA_OPTS: "-Djavax.net.ssl.trustStore=/etc/openelis-global/truststore 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -73,6 +73,10 @@ services:
             - default
         restart: always
         environment:
+          spring.datasource.url : jdbc:postgresql://database:5432/clinlims?currentSchema=clinlims
+          spring.datasource.username : clinlims
+          spring.datasource.password : clinlims
+          spring.datasource.driverClassName: org.postgresql.Driver
           TZ: Africa/Nairobi
 
           JAVA_OPTS: "-Djavax.net.ssl.trustStore=/etc/openelis-global/truststore 

diff --git a/frontend/src/components/addOrder/add-order.scss b/frontend/src/components/addOrder/add-order.scss
@@ -44,7 +44,7 @@
   background-color: #FFFFFF;
   border-radius: 5px;
   margin: 2%;
-  padding: 4%;
+  padding: 2%;
 }
 
 .ProgressIndicator {

diff --git a/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx b/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx
@@ -11,9 +11,11 @@ import {
   Toggle,
   Loading,
   Checkbox,
-  RadioButtonGroup,
-  RadioButton,
   ModalWrapper,
+  Grid,
+  Column,
+  Section,
+  Heading
 } from "@carbon/react";
 import AutoComplete from "../../common/AutoComplete.js";
 import { Add, Subtract, Save } from "@carbon/react/icons";
@@ -583,6 +585,17 @@ const CalculatedValue: React.FC<CalculatedValueProps> = () => {
 
   return (
     <div className="adminPageContent">
+      <Grid >
+          <Column lg={16}>
+            <Section>
+            <Section>
+                <Heading>
+                  <FormattedMessage id="sidenav.label.admin.testmgt.calculated" />
+              </Heading>
+              </Section>
+            </Section>
+          </Column>
+        </Grid>
       {notificationVisible === true ? <AlertDialog /> : ""}
       {loading && <Loading></Loading>}
       {calculationList.map((calculation, index) => (

diff --git a/frontend/src/components/admin/labNumber/LabNumberManagement.js b/frontend/src/components/admin/labNumber/LabNumberManagement.js
@@ -9,6 +9,9 @@ import {
   SelectItem,
   Button,
   Loading,
+  Grid,
+  Column,
+  Section,
 } from "@carbon/react";
 import LabNumberFormValues from "./LabNumberFormValues";
 import {
@@ -163,12 +166,18 @@ function LabNumberManagement() {
       {notificationVisible === true ? <AlertDialog /> : ""}
       {loading && <Loading />}
       <div className="adminPageContent">
+        <Grid >
+          <Column lg={16}>
+            <Section>
+              <Section>
+                <Heading>
+                  <FormattedMessage id="configure.labNumber.title" />
+                </Heading>
+              </Section>
+            </Section>
+          </Column>
+        </Grid>
         <Form onSubmit={handleSubmit}>
-          <FormLabel>
-            <Heading>
-              <FormattedMessage id="configure.labNumber.title" />
-            </Heading>
-          </FormLabel>
           <div className="inlineDiv">
             <Select
               id="lab_number_type"

diff --git a/frontend/src/components/admin/program/ProgramManagement.js b/frontend/src/components/admin/program/ProgramManagement.js
@@ -9,6 +9,9 @@ import {
   SelectItem,
   Button,
   Loading,
+  Grid,
+  Column,
+  Section,
 } from "@carbon/react";
 import ProgramFormValues from "./ProgramFormValues";
 import {
@@ -157,12 +160,18 @@ function ProgramManagement() {
     <>
       {notificationVisible === true ? <AlertDialog /> : ""}
       <div className="adminPageContent">
+      <Grid >
+          <Column lg={16}>
+            <Section>
+              <Section>
+                <Heading>
+                  <FormattedMessage id="edit.add.program.title" />
+                </Heading>
+              </Section>
+            </Section>
+          </Column>
+        </Grid>
         <Form onSubmit={handleSubmit}>
-          <FormLabel>
-            <Heading>
-              <FormattedMessage id="edit.add.program.title" />
-            </Heading>
-          </FormLabel>
           <div className="formInlineDiv">
             <Select
               id="additionalQuestionsSelect"

diff --git a/frontend/src/components/admin/reflexTests/ReflexTestManagement.js b/frontend/src/components/admin/reflexTests/ReflexTestManagement.js
@@ -1,11 +1,24 @@
 import React from "react";
 import { injectIntl } from "react-intl";
 import ReflexRule from "./ReflexRuleForm";
+import { Grid, Column, Section, Heading } from "@carbon/react";
+import { FormattedMessage } from "react-intl";
 
 function ReflexTestManagement() {
   return (
     <>
       <div className="adminPageContent">
+      <Grid >
+          <Column lg={16}>
+            <Section>
+              <Section>
+                <Heading>
+                  <FormattedMessage id="sidenav.label.admin.testmgt.reflex" />
+                </Heading>
+              </Section>
+            </Section>
+          </Column>
+        </Grid>
         <ReflexRule />
       </div>
     </>