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.

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 fixes #1291

Merged
merged 2 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ services:

fhir.openelis.org:
container_name: external-fhir-api
image: hapiproject/hapi:v6.6.0-tomcat
image: itechuw/openelis-global-2-fhir:develop
depends_on:
- database
- certs
Expand Down Expand Up @@ -106,7 +106,7 @@ services:
tty: true

proxy:
image: nginx:1.15-alpine
image: itechuw/openelis-global-2-proxy:develop
container_name: openelisglobal-proxy
ports:
- 80:80
Expand Down
2 changes: 1 addition & 1 deletion frontend/cypress/e2e/dashboard.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe("Pathology Dashboard", function () {

it("Validate the Status of Order", () => {
cy.fixture("DashBoard").then((order) => {
// dashboard.validateOrderStatus(order.labNo, 4);
// dashboard.validateOrderStatus(order.labNo, 4);
});
});
});
Expand Down
7 changes: 6 additions & 1 deletion frontend/src/components/admin/reflexTests/ReflexStyles.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,15 @@ body {
padding-left: 0px;
width: 100%;
z-index: 10;
position: relative;
position: absolute;
background-color: #ffffff;
}

.suggestions-container {
position: relative;
width: 100%;
}

.suggestions li {
padding: 0.5rem;
z-index: 99 !important;
Expand Down
38 changes: 20 additions & 18 deletions frontend/src/components/common/AutoComplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,24 +88,26 @@ function AutoComplete(props) {
if (showSuggestions && userInput) {
if (filteredSuggestions.length) {
suggestionsListComponent = (
<ul className="suggestions">
{filteredSuggestions.map((suggestion, index) => {
let className;
// Flag the active suggestion with a class
if (index === activeSuggestion) {
className = "suggestion-active";
}
return (
<li
className={className}
key={index}
onClick={(e) => onClick(e, suggestion.id, suggestion)}
>
{suggestion.value}
</li>
);
})}
</ul>
<div className="suggestions-container">
<ul className="suggestions">
{filteredSuggestions.map((suggestion, index) => {
let className;
// Flag the active suggestion with a class
if (index === activeSuggestion) {
className = "suggestion-active";
}
return (
<li
className={className}
key={index}
onClick={(e) => onClick(e, suggestion.id, suggestion)}
>
{suggestion.value}
</li>
);
})}
</ul>
</div>
);
} else {
suggestionsListComponent = (
Expand Down
Loading