From 40edf1992e930650f86bbd9677c8c20c6c3023d6 Mon Sep 17 00:00:00 2001 From: kghoreshi Date: Tue, 31 May 2022 01:49:29 -0400 Subject: [PATCH 1/4] add display for response --- .../RemsInterface/RemsInterface.css | 23 ++++++++++++ .../RemsInterface/RemsInterface.jsx | 35 +++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/src/components/RemsInterface/RemsInterface.css b/src/components/RemsInterface/RemsInterface.css index 230aaba6..7fba33a5 100644 --- a/src/components/RemsInterface/RemsInterface.css +++ b/src/components/RemsInterface/RemsInterface.css @@ -77,6 +77,29 @@ body { animation-timing-function: ease-in-out; } +.requestBody{ + overflow-y: scroll; + height:500px; +} +.jsonData{ + line-height:16px; + font-family: 'Courier New', Courier, monospace; + font-size: 14px; + + border-left: 2px solid #dddddd; + border-top:0px; + padding-left:6px; + + display:block; +} + +.elementBody{ + color:#adadad; +} +.elementKey{ + color:#343434 +} + @keyframes spin { from { transform:rotate(0deg); diff --git a/src/components/RemsInterface/RemsInterface.jsx b/src/components/RemsInterface/RemsInterface.jsx index 1229619c..2e5ca447 100644 --- a/src/components/RemsInterface/RemsInterface.jsx +++ b/src/components/RemsInterface/RemsInterface.jsx @@ -21,6 +21,7 @@ export default class RemsInterface extends Component { response: null, spin: false, spinPis: false, + viewResponse: false, viewBundle: false, viewPisBundle: false, }; @@ -31,6 +32,8 @@ export default class RemsInterface extends Component { this.refreshBundle = this.refreshBundle.bind(this); this.refreshPisBundle = this.refreshPisBundle.bind(this); this.toggleBundle = this.toggleBundle.bind(this); + this.toggleResponse = this.toggleResponse.bind(this); + this.togglePisBundle = this.togglePisBundle.bind(this); } @@ -47,6 +50,23 @@ export default class RemsInterface extends Component { return options; } + unfurlJson(jsonData, level){ + var divStyle = { + marginLeft:20 + }; + if(jsonData){ + return Object.keys(jsonData).map(element=>{ + var elementKey = `${element}-${level}`; + return ( +
+ {element}: {jsonData[element]===null?"null":typeof jsonData[element] === "object"?this.unfurlJson(jsonData[element], level + 1):jsonData[element]} +
+ ) + }); + } + +} + async sendRemsMessage() { const remsAdminResponse = await axios.post("http://localhost:8090/api/rems", this.props.specialtyRxBundle, this.getAxiosOptions()); this.setState({ remsAdminResponse }); @@ -66,6 +86,13 @@ export default class RemsInterface extends Component { }) } + toggleResponse() { + console.log(this.state.viewResponse); + this.setState((prevState)=>{ + return {...prevState, viewResponse: !prevState.viewResponse} + }) + } + togglePisBundle() { this.setState((prevState)=>{ return {...prevState, viewPisBundle: !prevState.viewPisBundle} @@ -130,6 +157,8 @@ export default class RemsInterface extends Component {
+ + {this.state.remsAdminResponse?.data?.case_number ? + {this.state.viewResponse? +
+ { this.unfurlJson(this.state.remsAdminResponse, 0) } +
+ : + ""} {this.state.viewBundle ?
{this.renderBundle(this.props.specialtyRxBundle)}
: ""} From 6f813f061273f89abbd47775e4e484442d2767e2 Mon Sep 17 00:00:00 2001 From: kghoreshi Date: Tue, 31 May 2022 01:56:33 -0400 Subject: [PATCH 2/4] formatting --- .../RemsInterface/RemsInterface.jsx | 132 +++++++++--------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/src/components/RemsInterface/RemsInterface.jsx b/src/components/RemsInterface/RemsInterface.jsx index 2e5ca447..cbf9d0ab 100644 --- a/src/components/RemsInterface/RemsInterface.jsx +++ b/src/components/RemsInterface/RemsInterface.jsx @@ -50,22 +50,22 @@ export default class RemsInterface extends Component { return options; } - unfurlJson(jsonData, level){ + unfurlJson(jsonData, level) { var divStyle = { - marginLeft:20 - }; - if(jsonData){ - return Object.keys(jsonData).map(element=>{ - var elementKey = `${element}-${level}`; - return ( -
- {element}: {jsonData[element]===null?"null":typeof jsonData[element] === "object"?this.unfurlJson(jsonData[element], level + 1):jsonData[element]} -
- ) - }); + marginLeft: 20 + }; + if (jsonData) { + return Object.keys(jsonData).map(element => { + var elementKey = `${element}-${level}`; + return ( +
+ {element}: {jsonData[element] === null ? "null" : typeof jsonData[element] === "object" ? this.unfurlJson(jsonData[element], level + 1) : jsonData[element]} +
+ ) + }); } -} + } async sendRemsMessage() { const remsAdminResponse = await axios.post("http://localhost:8090/api/rems", this.props.specialtyRxBundle, this.getAxiosOptions()); @@ -81,21 +81,21 @@ export default class RemsInterface extends Component { } toggleBundle() { - this.setState((prevState)=>{ - return {...prevState, viewBundle: !prevState.viewBundle} + this.setState((prevState) => { + return { ...prevState, viewBundle: !prevState.viewBundle } }) } toggleResponse() { console.log(this.state.viewResponse); - this.setState((prevState)=>{ - return {...prevState, viewResponse: !prevState.viewResponse} + this.setState((prevState) => { + return { ...prevState, viewResponse: !prevState.viewResponse } }) } togglePisBundle() { - this.setState((prevState)=>{ - return {...prevState, viewPisBundle: !prevState.viewPisBundle} + this.setState((prevState) => { + return { ...prevState, viewPisBundle: !prevState.viewPisBundle } }) } @@ -112,15 +112,15 @@ export default class RemsInterface extends Component { } refreshPisBundle() { - this.setState({spinPis: true}); - axios.get(`http://localhost:3010/api/doctorOrder/${this.state.response.data.doctorOrder._id}`).then((response)=>{ - this.setState({response: response}); + this.setState({ spinPis: true }); + axios.get(`http://localhost:3010/api/doctorOrder/${this.state.response.data.doctorOrder._id}`).then((response) => { + this.setState({ response: response }); }) } refreshBundle() { - this.setState({spin: true}); - axios.get(`http://localhost:8090/api/rems/${this.state.remsAdminResponse.data.case_number}`).then((response)=>{ - this.setState({remsAdminResponse: response}); + this.setState({ spin: true }); + axios.get(`http://localhost:8090/api/rems/${this.state.remsAdminResponse.data.case_number}`).then((response) => { + this.setState({ remsAdminResponse: response }); }) } render() { @@ -132,7 +132,7 @@ export default class RemsInterface extends Component { color = "#f0ad4e" } - let colorPis = "#f7f7f7" + let colorPis = "#f7f7f7" const statusPis = this.state.response?.data?.doctorOrder?.dispenseStatus; if (statusPis === "Approved") { @@ -147,7 +147,7 @@ export default class RemsInterface extends Component {

REMS Admin Status

- +
Case Number : {this.state.remsAdminResponse?.data?.case_number || "N/A"} @@ -159,27 +159,27 @@ export default class RemsInterface extends Component { - {this.state.remsAdminResponse?.data?.case_number ? - this.setState({spin: false})} - /> - :"" - } + {this.state.remsAdminResponse?.data?.case_number ? + this.setState({ spin: false })} + /> + : "" + }
- {this.state.viewResponse? -
- { this.unfurlJson(this.state.remsAdminResponse, 0) } -
- : - ""} + {this.state.viewResponse ? +
+ {this.unfurlJson(this.state.remsAdminResponse, 0)} +
+ : + ""} {this.state.viewBundle ?
{this.renderBundle(this.props.specialtyRxBundle)} -
: ""} +
: ""} @@ -187,31 +187,31 @@ export default class RemsInterface extends Component {

Pharmacy Status

- -
-
- ID : {this.state.response?.data?.doctorOrder?._id || "N/A"} -
-
- Status: {this.state.response?.data?.doctorOrder?.dispenseStatus} -
-
- - {this.state.response?.data?.doctorOrder?._id ? - this.setState({spinPis: false})} - /> - :"" - } - -
- - - {this.state.viewPisBundle ?
+ +
+
+ ID : {this.state.response?.data?.doctorOrder?._id || "N/A"} +
+
+ Status: {this.state.response?.data?.doctorOrder?.dispenseStatus} +
+
+ + {this.state.response?.data?.doctorOrder?._id ? + this.setState({ spinPis: false })} + /> + : "" + } + +
+ + + {this.state.viewPisBundle ?
{this.renderBundle(this.props.specialtyRxBundle)} -
: ""} +
: ""}
{/* */} From 8318d5efa08b0a314692bac87ae69c1a653a2662 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 31 May 2022 14:41:22 -0400 Subject: [PATCH 3/4] url change --- src/components/RemsInterface/RemsInterface.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/RemsInterface/RemsInterface.jsx b/src/components/RemsInterface/RemsInterface.jsx index cbf9d0ab..9e650bca 100644 --- a/src/components/RemsInterface/RemsInterface.jsx +++ b/src/components/RemsInterface/RemsInterface.jsx @@ -68,7 +68,7 @@ export default class RemsInterface extends Component { } async sendRemsMessage() { - const remsAdminResponse = await axios.post("http://localhost:8090/api/rems", this.props.specialtyRxBundle, this.getAxiosOptions()); + const remsAdminResponse = await axios.post("http://localhost:8090/rems", this.props.specialtyRxBundle, this.getAxiosOptions()); this.setState({ remsAdminResponse }); console.log(remsAdminResponse) axios.post("http://localhost:3010/api/doctorOrder/fhir/rems", remsAdminResponse.data, this.getAxiosOptions()).then((response) => { @@ -173,7 +173,7 @@ export default class RemsInterface extends Component { {this.state.viewResponse ?
- {this.unfurlJson(this.state.remsAdminResponse, 0)} + {this.unfurlJson(this.state.remsAdminResponse?.data, 0)}
: ""} From e07b76e787337b2ab48cd65563e8bb8818f20038 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 31 May 2022 14:51:10 -0400 Subject: [PATCH 4/4] url change --- src/components/RemsInterface/RemsInterface.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/RemsInterface/RemsInterface.jsx b/src/components/RemsInterface/RemsInterface.jsx index 9e650bca..13db68db 100644 --- a/src/components/RemsInterface/RemsInterface.jsx +++ b/src/components/RemsInterface/RemsInterface.jsx @@ -119,7 +119,7 @@ export default class RemsInterface extends Component { } refreshBundle() { this.setState({ spin: true }); - axios.get(`http://localhost:8090/api/rems/${this.state.remsAdminResponse.data.case_number}`).then((response) => { + axios.get(`http://localhost:8090/rems/${this.state.remsAdminResponse.data.case_number}`).then((response) => { this.setState({ remsAdminResponse: response }); }) }