Merge pull request #476 from mozzy11/2.8

innitial work on calculated Value Tests
I-TECH-UW · Jul 12, 2023 · c7e1041 · c7e1041
2 parents 3d9037a + 8ae1074
commit c7e1041
Show file tree

Hide file tree

Showing 20 changed files with 1,331 additions and 17 deletions.
diff --git a/react-ui/src/components/Style.css b/react-ui/src/components/Style.css
@@ -139,6 +139,7 @@ button {
   padding: 1%;
 }
 
+
 .errorMessage {
   font-size: 12px;
   color: red;
@@ -224,12 +225,26 @@ button {
   --cds-text-primary: black;
   width: 100%;
   --cds-text-secondary: black;
-  margin-top: 0.1%;
+  /* margin-top: 0.1%; */
+}
+
+.inputText2 {
+  --cds-text-primary: black;
+  width: 380px;
+  --cds-text-secondary: black;
+  padding-left: 1%;
+  /* margin-top: 0.1%; */
 }
 
 .inputSelect {
   --cds-text-primary: black;
-  width: 100px;
+  width: 100%;
+  --cds-text-secondary: black;
+}
+
+.inputSelect2 {
+  --cds-text-primary: black;
+  width: 380px;
   --cds-text-secondary: black;
 }
 
@@ -352,3 +367,12 @@ button {
 	    font-size: 10px;
 	  } */
 }
+
+.second-row {
+  padding-top: 3%;
+  padding-left: 3%;
+}
+
+.first-row {
+  max-width : 500px ;
+}
diff --git a/react-ui/src/components/addOrder/AddOrder.js b/react-ui/src/components/addOrder/AddOrder.js
@@ -362,7 +362,7 @@ const AddOrder = (props) => {
                                                                    value={orderFormValues.sampleOrderItems.referringSiteName == null ? '' : orderFormValues.sampleOrderItems.referringSiteName}
                                                                    id="siteName" className="inputText"/> : <AutoComplete
                         name="siteName"
-                        idField="siteName"
+                        id="siteName"
                         className="inputText"
                         onSelect={handleAutoCompleteSiteName}
                         label="Search site Name"
@@ -390,7 +390,7 @@ const AddOrder = (props) => {
                 {allowRequesterOptions === "false" ? '' : <div className="inlineDiv">
                     <AutoComplete
                         name="requesterId"
-                        idField="requesterId"
+                        id="requesterId"
                         onSelect={handleProviderSelectOptions}
                         label="Search Requester"
                         class="inputText"
@@ -484,7 +484,7 @@ const AddOrder = (props) => {
                                className="inputText"
                                value={orderFormValues.sampleOrderItems.otherLocationCode}
                                disabled={!otherSamplingVisible}
-                               id="testLocationCodeOtherId" className="inputText"/>
+                               id="testLocationCodeOtherId" />
                 </div>
                 <div className="inlineDiv">
                     <Checkbox labelText="Remember site and requester" className="inputText"

diff --git a/react-ui/src/components/admin/Admin.js b/react-ui/src/components/admin/Admin.js
@@ -5,6 +5,7 @@ import '../Style.css'
 import ReflexTestManagement from './reflexTests/ReflexTestManagement'
 import ProgramManagement from './program/ProgramManagement'
 import PathRoute from "../utils/PathRoute"
+import CalculatedValue from "./calculatedValue/CalculatedValueForm"
 import {
     SideNav,
     SideNavItems,
@@ -30,7 +31,8 @@ class Admin extends React.Component {
                 >
                     <SideNavItems className="adminSideNav">
                         <SideNavMenu title="Test Management">
-                            <SideNavMenuItem href="#reflex" >Manage Testing Algorithms and Reflex tests</SideNavMenuItem>
+                            <SideNavMenuItem href="#reflex" >Manage Reflex tests</SideNavMenuItem>
+                            <SideNavMenuItem href="#calculatedValue" >Manage Calculated Value tests</SideNavMenuItem>
                             <SideNavMenuItem href="#1"> Link</SideNavMenuItem>
                             <SideNavMenuItem href="#2">Link</SideNavMenuItem>
                         </SideNavMenu>
@@ -55,6 +57,9 @@ class Admin extends React.Component {
                 <PathRoute path="#program">
                     <ProgramManagement />
                 </PathRoute>
+                <PathRoute path="#calculatedValue">
+                    <CalculatedValue></CalculatedValue>
+                </PathRoute>
             </>
 
         );