Merge pull request #97 from mcode/655-contrast-compliance

655 contrast compliance
mcode · Jun 14, 2024 · 7acf658 · 7acf658
2 parents de26f86 + eef0e54
commit 7acf658
Show file tree

Hide file tree

Showing 7 changed files with 8,203 additions and 5,495 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14-alpine
+FROM node:21-alpine
 WORKDIR /home/node/app/rems-smart-on-fhir
 COPY --chown=node:node . .
 RUN npm install

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM node:14-alpine
+FROM node:21-alpine
 WORKDIR /home/node/app/rems-smart-on-fhir
 COPY --chown=node:node . .
 RUN npm install

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "cds-hooks": "^1.1.1",
     "cql-exec-fhir": "^2.1.5",
     "cql-execution": "^3.0.0",
+    "dotenv": "^16.4.5",
     "env-var": "^7.3.1",
     "fhir": "^4.11.2",
     "fhir-visualizers": "^0.0.6",

diff --git a/src/views/Patient/MedReqDropDown/MedReqDropDown.tsx b/src/views/Patient/MedReqDropDown/MedReqDropDown.tsx
@@ -382,7 +382,7 @@ function MedReqDropDown({
               {selectedMedicationCard && (
                 <>
                   <Grid item container>
-                    <Grid item xs={10} sm={11}>
+                    <Grid item xs={10} sm={11} style={{ backgroundColor: '#D1D1D1' }}>
                       <Typography bgcolor="text.secondary" color="white" textAlign="center">
                         Medication Code:{' '}
                         {getDrugCodeFromMedicationRequest(selectedMedicationCard)?.code}

diff --git a/src/views/Questionnaire/QuestionnaireForm.css b/src/views/Questionnaire/QuestionnaireForm.css
@@ -75,7 +75,7 @@ html {
 }
 
 .patient-info-panel {
-  color: white;
+  color: #3b3b3b;
 }
 
 .filled {
@@ -99,3 +99,34 @@ html {
   background-color: white;
   z-index: 5;
 }
+
+.lf-form .required {
+  color: #8b0000;
+  font-size: medium;
+}
+
+.lf-form-title {
+  color: #1976d2;
+  background-color: #F3F6F9;
+}
+
+.lf-control-button {
+  color: #000;
+}
+
+.lf-form-title .lf-question {
+  font-size: x-large;
+  vertical-align: middle;
+}
+
+.lf-form .lf-form-title .lf-control-button {
+  color: #3b3b3b;
+}
+
+.lf-form .lf-form-title .lf-control-button:hover {
+  color: #636363;
+}
+
+.task-button {
+  color: #3b3b3b;
+}
diff --git a/src/views/Questionnaire/QuestionnaireForm.tsx b/src/views/Questionnaire/QuestionnaireForm.tsx
@@ -1151,7 +1151,7 @@ export function QuestionnaireForm(props: QuestionnaireProps) {
 
   // Get tooltip for Submit button
   const getMissingFieldsTooltip = () => {
-    const tooltip = isFilledOut() ? 'Submit to REMS admin' : 'Fill out missing fields';
+    const tooltip = isFilledOut() ? 'Submit to REMS admin' : 'Fill out missing required fields';
     return <Typography fontSize={'small'}>{tooltip}</Typography>;
   };
 
@@ -1174,7 +1174,7 @@ export function QuestionnaireForm(props: QuestionnaireProps) {
         <Accordion disableGutters>
           <AccordionSummary expandIcon={<ExpandMoreIcon />}>
             <Typography className="error-text">
-              You must include a value for the following missing fields (click to expand):
+              &nbsp;*You must include a value for the following missing fields (click to expand):
             </Typography>
           </AccordionSummary>
           <AccordionDetails>