Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor bug fixes and styling #607

Merged
merged 2 commits into from
Nov 22, 2023
Merged

Minor bug fixes and styling #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e557e6
Minor bug fixes and styling
mozzy11 Nov 22, 2023
1a46a76
remove redundant code
mozzy11 Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions build.docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: .
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions dev.docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/addOrder/add-order.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
background-color: #FFFFFF;
border-radius: 5px;
margin: 2%;
padding: 4%;
padding: 2%;
}

.ProgressIndicator {
Expand Down
17 changes: 15 additions & 2 deletions frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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) => (
Expand Down
19 changes: 14 additions & 5 deletions frontend/src/components/admin/labNumber/LabNumberManagement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import {
SelectItem,
Button,
Loading,
Grid,
Column,
Section,
} from "@carbon/react";
import LabNumberFormValues from "./LabNumberFormValues";
import {
Expand Down Expand Up @@ -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"
Expand Down
19 changes: 14 additions & 5 deletions frontend/src/components/admin/program/ProgramManagement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import {
SelectItem,
Button,
Loading,
Grid,
Column,
Section,
} from "@carbon/react";
import ProgramFormValues from "./ProgramFormValues";
import {
Expand Down Expand Up @@ -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"
Expand Down
13 changes: 13 additions & 0 deletions frontend/src/components/admin/reflexTests/ReflexTestManagement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
</>
Expand Down
Loading
Loading