Merge pull request #37 from mcode/dev

Dev
mcode · Mar 28, 2023 · ef9aa54 · ef9aa54
2 parents d8ae9d2 + b717819
commit ef9aa54
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 28 deletions.
diff --git a/src/components/RequestBox/RequestBox.js b/src/components/RequestBox/RequestBox.js
@@ -375,26 +375,6 @@ export default class RequestBox extends Component {
 
   }
 
-  resetRemsAdmin = (e) => {
-    console.log("reset rems admin: " + "localhost:8090/etasu/reset");
-
-    fetch("http://localhost:8090/etasu/reset", {
-      method: 'POST',
-    })
-    .then(response => {
-      console.log("Reset rems admin etasu: ");
-      console.log(response);
-      this.props.consoleLog("Successfully reset rems admin etasu", types.info);
-    })
-    .catch(error => {
-      console.log("Reset rems admin error: ");
-      this.props.consoleLog("Server returned error when resetting rems admin etasu: ", types.error);
-      this.props.consoleLog(error.message);
-      console.log(error);
-    });
-
-  }
-
   isOrderNotSelected() {
     return Object.keys(this.state.request).length === 0;
   }
@@ -480,9 +460,6 @@ export default class RequestBox extends Component {
         <button className={"submit-btn btn btn-class "} onClick={this.submit} disabled={disableSendToCRD}>
           Submit to REMS-Admin
         </button>
-        <button className={"submit-btn btn btn-class "} onClick={this.resetRemsAdmin} disabled={disableSendToCRD}>
-          Reset REMS-Admin Database
-        </button>
       </div>
     );
   }

diff --git a/src/components/SettingsBox/SettingsBox.css b/src/components/SettingsBox/SettingsBox.css
@@ -20,4 +20,22 @@
 .setting-header{
     font-size:12px;
     margin:0;
-}
+}
+
+.setting-btn {
+    margin-top: 6px;
+  }
+
+
+.setting-btn:hover{
+    border-width:1px 3px 1px 1px;
+    margin-left:2px;
+    margin-top:8px;
+}
+
+.setting-btn:disabled,
+.setting-btn[disabled] {
+    border: 1px solid #999999;
+    background-color: #333232;
+    color: #858282;
+}
diff --git a/src/components/SettingsBox/SettingsBox.js b/src/components/SettingsBox/SettingsBox.js
@@ -27,10 +27,11 @@ export default class SettingsBox extends Component {
                 {Object.keys(headers).map((header)=>{
                     let value = headers[header].value;
                     let type = headers[header].type;
+                    let display = headers[header].display;
                     switch(type) {
                         case "input":
                             return <div key={header}>
-                                <p className="setting-header">{headers[header].display}</p>
+                                <p className="setting-header">{display}</p>
                                 <InputBox 
                                     extraClass = "setting-input"
                                     value = {value}
@@ -39,7 +40,7 @@ export default class SettingsBox extends Component {
                             </div>
                         case "check":
                             return <div key={header}>
-                                <p className="setting-header">{headers[header].display}
+                                <p className="setting-header">{display}
                                 <CheckBox
                                     extraClass = "setting-checkbox"
                                     extraInnerClass = "setting-inner-checkbox"
@@ -49,8 +50,16 @@ export default class SettingsBox extends Component {
                                     </p>
                                 <p>&nbsp;</p>
                             </div>
+                        case "button":
+                            return <div key={header}>
+                                <button className={"setting-btn btn btn-class"} onClick={value}>{display}</button>
+                                </div>
+                        case "spacer":
+                            return <div key={header}><br></br></div>
+                        case "line":
+                            return <div key={header}><hr></hr></div>
                         default:
-                            return <div key={header}><p className="setting-header">{headers[header].display}</p></div>
+                            return <div key={header}><p className="setting-header">{display}</p></div>
                     }
 
                 })}

diff --git a/src/containers/RequestBuilder.js b/src/containers/RequestBuilder.js
@@ -201,6 +201,27 @@ export default class RequestBuilder extends Component {
         this.setState({ openPatient: false })
     }
 
+    resetRemsAdmin = (e) => {
+        let url = new URL(this.state.cdsUrl);
+        const resetUrl = url.origin + "/etasu/reset";
+        console.log("reset rems admin: " + resetUrl);
+
+        fetch(resetUrl, {
+            method: 'POST',
+        })
+        .then(response => {
+            console.log("Reset rems admin etasu: ");
+            console.log(response);
+            this.consoleLog("Successfully reset rems admin etasu", types.info);
+        })
+        .catch(error => {
+            console.log("Reset rems admin error: ");
+            this.consoleLog("Server returned error when resetting rems admin etasu: ", types.error);
+            this.consoleLog(error.message);
+            console.log(error);
+        });
+    }
+
 
     render() {
         const header =
@@ -276,7 +297,17 @@ export default class RequestBuilder extends Component {
               "display": "Send Prefetch",
               "value": this.state.sendPrefetch,
               "key": "sendPrefetch"
-          }
+            },
+            "resetRemsAdmin": {
+                "type": "button",
+                "display": "Reset REMS-Admin Database",
+                "value": this.resetRemsAdmin,
+                "key": "resetRemsAdmin"
+            },
+            "endSpacer": {
+                "type": "line",
+                "key": "endSpacer"
+            }
         }
 
         return (