Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

REMS-232 dtr UI clean up & Prescriber form view #38

Merged
smalho01 merged 6 commits into from
Sep 20, 2022
Merged

REMS-232 dtr UI clean up & Prescriber form view #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dc9977c
Added separation between both bundles
zacharyrobin Sep 20, 2022
f90e55e
added in break lines and updated hover to be on parent div
zacharyrobin Sep 20, 2022
c61fd3e
added break lines to pharmacy bundle to match UI
zacharyrobin Sep 20, 2022
bf1487f
Added UI view for Prescriber Forms
zacharyrobin Sep 20, 2022
918f5ea
Cleaned up/ removed test code
zacharyrobin Sep 20, 2022
1d24cd3
added in if statement to prevent PIS from receiving unnecessary POST…
zacharyrobin Sep 20, 2022
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
19 changes: 9 additions & 10 deletions src/components/RemsInterface/RemsInterface.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ body {
margin: 0;
padding: 0;
font-family: sans-serif;

}

.left-form {
width: 48%;
float: left;
Expand All @@ -21,7 +21,7 @@ body {
}

.resource-entry{
clear: both;
/* clear: both; */
border-left: 4px solid #ffcccb;
padding: 5px;
border-bottom: 1px solid grey;
Expand All @@ -45,13 +45,11 @@ body {
background-color: #ededed;
}


.submit-btn {
float: right;
margin-top: 6px;
}


.submit-btn:hover{
border-width:1px 3px 1px 1px;
margin-left:2px;
Expand All @@ -71,6 +69,7 @@ body {
cursor: pointer;
margin-left: 15px;
}

.refresh{
cursor: pointer;
margin-left: 15px;
Expand All @@ -84,6 +83,7 @@ body {
overflow-y: scroll;
height:500px;
}

.jsonData{
line-height:16px;
font-family: 'Courier New', Courier, monospace;
Expand All @@ -99,6 +99,7 @@ body {
.elementBody{
color:#adadad;
}

.elementKey{
color:#343434
}
Expand All @@ -112,7 +113,6 @@ body {
}
}


/* ETASU styling */
.resource-entry-hover{
display:none;
Expand All @@ -121,9 +121,9 @@ body {
}

.etasu-container{
padding-bottom:10px;
padding-left: 10px;
padding-right:10px;
padding-bottom:40px;
padding-left: 20px;
padding-right:20px;
}

.resource-entry-text{
Expand All @@ -132,12 +132,11 @@ body {
width:75%;
}

.etasu-container:hover > .resource-entry-hover{
.resource-entry:hover > .resource-entry-hover{
clear: both;
display: block !important;
}


.resource-entry-icon{
width:25%;
float:right;
Expand Down
216 changes: 119 additions & 97 deletions src/components/RemsInterface/RemsInterface.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,58 +56,39 @@ export default class RemsInterface extends Component {
console.log(metReq);
return (
<div>
<div className={"resource-entry"}>
<div className={"etasu-container"}>
<div className={"resource-entry-text"} >{metReq.requirement.name}</div>
<div className={"resource-entry etasu-container"}>
<div className={"resource-entry-text"} >{metReq.requirement.name}</div>
<div className={"resource-entry-icon"}>{metReq.completed ? "✅" : "❌"}</div>
<div className={"resource-entry-hover"}>{metReq.requirement.description}</div>
</div>
<div className={"resource-entry-hover"}>{metReq.requirement.description}</div>
</div>
{
metReq.childMetRequirements.map(subMetReq =>
<div className={"resource-entry resource-child"}>
<div className={"etasu-container"}>
<div className={"resource-entry-text"}>{subMetReq.requirement.name}</div>
<div className={"resource-entry-icon"}>{subMetReq.completed ? "✅" : "❌"}</div>
<div className={"resource-entry-hover"}>{subMetReq.requirement.description}</div>
</div>
metReq.childMetRequirements.map(subMetReq =>
<div className={"resource-entry resource-child etasu-container"}>
<div className={"resource-entry-text"}>{subMetReq.requirement.name}</div>
<div className={"resource-entry-icon"}>{subMetReq.completed ? "✅" : "❌"}</div>
<div className={"resource-entry-hover"}>{subMetReq.requirement.description}</div>
</div>
)
}
</div>
)
});

}
// if (jsonData) {
// return Object.keys(jsonData).map(element => {
// console.log(element);
// return (
// // <div id={elementKey} className="jsonData" key={element} style={divStyle}>
// // <span className="elementKey">{element}</span>: <span className="elementBody">{jsonData[element] === null ? "null" : typeof jsonData[element] === "object" ? this.unfurlJson(jsonData[element], level + 1) : jsonData[element]}</span>
// // </div>
// <div>
// <div className={"resource-entry"}>
// <div>TEST</div>
// </div>
// </div>
// )
// });
// }

// }

}

async sendRemsMessage() {
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/$process-message", remsAdminResponse.data, this.getAxiosOptions()).then((response) => {
this.setState({ response });
console.log(response);
console.log(response.data);
});


// Will not send post request to PIS if only for prescriber enrollment
if(this.state.remsAdminResponse?.data?.case_number){
axios.post("http://localhost:3010/api/doctorOrder/$process-message", remsAdminResponse.data, this.getAxiosOptions()).then((response) => {
this.setState({ response });
console.log(response);
console.log(response.data);
});
}
}

toggleBundle() {
Expand Down Expand Up @@ -147,12 +128,14 @@ export default class RemsInterface extends Component {
this.setState({ response: response });
})
}

refreshBundle() {
this.setState({ spin: true });
axios.get(`http://localhost:8090/rems/${this.state.remsAdminResponse.data.case_number}`).then((response) => {
this.setState({ remsAdminResponse: response });
})
}

render() {
const status = this.state.remsAdminResponse?.data?.status;
let color = "#f7f7f7"
Expand All @@ -173,78 +156,117 @@ export default class RemsInterface extends Component {
colorPis = "#0275d8"
}

// Checking if REMS Request (pt enrollment) || Met Requirments (prescriber Form)
let hasRemsCase = this.state.remsAdminResponse?.data?.case_number ? true : false;

return (
<div>
<div className="container left-form">
<h1>REMS Admin Status</h1>
<Paper style={{ paddingBottom: "5px" }}>
<div className="status-icon" style={{ backgroundColor: color }}></div>
<div className="bundle-entry">
Case Number : {this.state.remsAdminResponse?.data?.case_number || "N/A"}
</div>
<div className="bundle-entry">
Status: {this.state.remsAdminResponse?.data?.status}
</div>
<div className="bundle-entry">
<Button variant="contained" onClick={this.toggleBundle}>View Bundle</Button>
<Button variant="contained" onClick={this.toggleResponse}>View ETASU</Button>

{this.state.remsAdminResponse?.data?.case_number ?
<AutorenewIcon
className={this.state.spin === true ? "refresh" : "renew-icon"}
onClick={this.refreshBundle}
onAnimationEnd={() => this.setState({ spin: false })}
/>
: ""
}
{hasRemsCase ?
<div>
<div className="container left-form">
<h1>REMS Admin Status</h1>
<Paper style={{ paddingBottom: "5px" }}>
<div className="status-icon" style={{ backgroundColor: color }}></div>
<div className="bundle-entry">
Case Number : {this.state.remsAdminResponse?.data?.case_number || "N/A"}
</div>
<div className="bundle-entry">
Status: {this.state.remsAdminResponse?.data?.status}
</div>
<div className="bundle-entry">
<Button variant="contained" onClick={this.toggleBundle}>View Bundle</Button>
<Button variant="contained" onClick={this.toggleResponse}>View ETASU</Button>

</div>
{this.state.remsAdminResponse?.data?.case_number ?
<AutorenewIcon
className={this.state.spin === true ? "refresh" : "renew-icon"}
onClick={this.refreshBundle}
onAnimationEnd={() => this.setState({ spin: false })}
/>
: ""
}

</Paper>
{this.state.viewResponse ?
<div className="bundle-view">
{this.unfurlJson(this.state.remsAdminResponse?.data, 0)}
</div>
:
""}
{this.state.viewBundle ? <div className="bundle-view">
{this.renderBundle(this.props.specialtyRxBundle)}
</div> : ""}
</div>

</Paper>
{this.state.viewResponse ?
<div className="bundle-view">
<br></br>
<h3>ETASU</h3>
{this.unfurlJson(this.state.remsAdminResponse?.data, 0)}
</div>
:
""}
{this.state.viewBundle ? <div className="bundle-view">
<br></br>
<h3>Bundle</h3>
{this.renderBundle(this.props.specialtyRxBundle)}
</div> : ""}

</div>

</div>
<div className="right-form">
<h1>Pharmacy Status</h1>
<Paper style={{ paddingBottom: "5px" }}>
<div className="status-icon" style={{ backgroundColor: colorPis }}></div>
<div className="bundle-entry">
ID : {this.state.response?.data?.doctorOrder?._id || "N/A"}
</div>
<div className="bundle-entry">
Status: {this.state.response?.data?.doctorOrder?.dispenseStatus}
</div>
<div className="bundle-entry">
<Button variant="contained" onClick={this.togglePisBundle}>View Bundle</Button>
{this.state.response?.data?.doctorOrder?._id ?
<AutorenewIcon
className={this.state.spinPis === true ? "refresh" : "renew-icon"}
onClick={this.refreshPisBundle}
onAnimationEnd={() => this.setState({ spinPis: false })}
/>
: ""
}
</div>

<div className="right-form">
<h1>Pharmacy Status</h1>
<Paper style={{ paddingBottom: "5px" }}>
<div className="status-icon" style={{ backgroundColor: colorPis }}></div>
<div className="bundle-entry">
ID : {this.state.response?.data?.doctorOrder?._id || "N/A"}
</Paper>
{this.state.viewPisBundle ? <div className="bundle-view">
<br></br>
<h3>Bundle</h3>
{this.renderBundle(this.props.specialtyRxBundle)}
</div> : ""}
</div>
<div className="bundle-entry">
Status: {this.state.response?.data?.doctorOrder?.dispenseStatus}
</div>
<div className="bundle-entry">
<Button variant="contained" onClick={this.togglePisBundle}>View Bundle</Button>
{this.state.response?.data?.doctorOrder?._id ?
<AutorenewIcon
className={this.state.spinPis === true ? "refresh" : "renew-icon"}
onClick={this.refreshPisBundle}
onAnimationEnd={() => this.setState({ spinPis: false })}
/>
: ""
}
</div>
:
<div>
<div className="container left-form">
<h1>Prescriber Document Status</h1>
<Paper style={{ paddingBottom: "5px" }}>
<div className="status-icon" style={{ backgroundColor: "#5cb85c" }}></div>
<div className="bundle-entry">
Status: Documents successfully submitted
</div>
<div className="bundle-entry">
<Button variant="contained" onClick={this.toggleBundle}>View Bundle</Button>

</div>
{this.state.remsAdminResponse?.data?.case_number ?
<AutorenewIcon
className={this.state.spin === true ? "refresh" : "renew-icon"}
onClick={this.refreshBundle}
onAnimationEnd={() => this.setState({ spin: false })}
/>
: ""
}
</div>

</Paper>
{this.state.viewPisBundle ? <div className="bundle-view">
{this.renderBundle(this.props.specialtyRxBundle)}
</div> : ""}
</div>
{/* <button className="submit-btn" onClick={() => { this.sendRemsMessage() }}>Submit</button> */}
</Paper>
{this.state.viewBundle ? <div className="bundle-view">
<br></br>
<h3>Bundle</h3>
{this.renderBundle(this.props.specialtyRxBundle)}
</div> : ""}

</div>
</div>
}
</div>
)
}
Expand Down