Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 6 additions & 10 deletions src/components/DisplayBox/DisplayBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export default class DisplayBox extends Component {
}
}

supportedRequesType(resource) {
supportedRequestType(resource) {
let resourceType = resource.resourceType.toUpperCase();
if (
resourceType === 'DEVICEREQUEST' ||
Expand All @@ -102,7 +102,9 @@ export default class DisplayBox extends Component {
}
} else {
// disable this suggestion button if any are allowed
document.getElementById(buttonId).setAttribute('disabled', 'true');
const element = document.getElementById(buttonId);
element.setAttribute('disabled', 'true');
element.setAttribute('style', 'background-color:#4BB543;');
}

if (suggestion.label) {
Expand Down Expand Up @@ -131,7 +133,7 @@ export default class DisplayBox extends Component {
console.log('suggested action CREATE result:');
console.log(result);

if (this.supportedRequesType(result)) {
if (this.supportedRequestType(result)) {
// call into the request builder to resubmit the CRD request with the suggested request
this.props.takeSuggestion(result);
}
Expand Down Expand Up @@ -377,6 +379,7 @@ export default class DisplayBox extends Component {
</Typography>
</CardContent>
<CardActions className={'links-section'}>{linksSection}</CardActions>
<CardActions>{suggestionsSection}</CardActions>
</React.Fragment>
</Card>
);
Expand All @@ -397,11 +400,4 @@ export default class DisplayBox extends Component {
}
}

componentDidUpdate() {
// clear the suggestion buttons
console.log(this.buttonList);
this.buttonList.forEach((requestButton, id) => {
document.getElementById(requestButton).removeAttribute('disabled');
});
}
}
3 changes: 1 addition & 2 deletions src/components/SMARTBox/PatientBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -479,9 +479,8 @@ export default class PatientBox extends Component {
</TableHead>
<TableBody>
{options.map((row) => (
<Tooltip title='Select Medication' arrow>
<Tooltip key={row.key} title='Select Medication' arrow>
<TableRow
key={row.key}
sx={{ 'td, th': { border: 0 } }}
className='hover-row'
onClick={() => this.handleRequestChange(row.value, patient)}
Expand Down