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

Fork Auto Sync #32

Merged
smalho01 merged 4 commits into from
Aug 16, 2022
Merged

Fork Auto Sync #32

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be344c5
Fixed an issue where previous in-progress forms were non-selectable.
RobertScalfani Jul 27, 2022
e993cbc
Updated == equality to use ===
RobertScalfani Jul 28, 2022
c195d2b
Merge pull request #183 from HL7-DaVinci/select-previousform-fix
RobertScalfani Jul 28, 2022
c79173d
Merge branch 'master' into master
KeeyanGhoreshi Aug 12, 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
24 changes: 8 additions & 16 deletions src/components/QuestionnaireForm/QuestionnaireForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ export default class QuestionnaireForm extends Component {
this.getDisplayButtons = this.getDisplayButtons.bind(this);
this.isAdaptiveFormWithoutItem = this.isAdaptiveFormWithoutItem.bind(this);
this.isAdaptiveFormWithItem = this.isAdaptiveFormWithItem.bind(this);
this.loadPreviousForm = this.loadPreviousForm.bind(this);
}



componentWillMount() {
// search for any partially completed QuestionnaireResponses
if (this.props.standalone) {
Expand All @@ -73,15 +72,8 @@ export default class QuestionnaireForm extends Component {
savedResponse: mergedResponse
})
} else {
this.smart.request(this.getRetrieveSaveQuestionnaireUrl() +
"&status=in-progress" +
"&subject=" + this.getPatient()).then((result) => {
this.popupClear("Would you like to continue an in-process questionnaire?", "Cancel", false);
this.processSavedQuestionnaireResponses(result, false);
}, ((result) => {
this.popupClear("Error: failed to load in-process questionnaires", "OK", true);
this.popupLaunch();
})).catch(console.error);

this.loadPreviousForm();

// If not using saved QuestionnaireResponse, create a new one
let newResponse = {
Expand Down Expand Up @@ -177,7 +169,7 @@ export default class QuestionnaireForm extends Component {
// read configuration
let updateDate = new Date();
updateDate.setDate(updateDate.getDate() - ConfigData.QUESTIONNAIRE_EXPIRATION_DAYS);
return "QuestionnaireResponse?" + "_lastUpdated=gt" + updateDate.toISOString().split('T')[0];
return `QuestionnaireResponse?_lastUpdated=gt${updateDate.toISOString().split('T')[0]}&status=in-progress`
}

loadPreviousForm() {
Expand All @@ -187,7 +179,7 @@ export default class QuestionnaireForm extends Component {
this.popupClear("Would you like to load a previous form?", "Cancel", false);
this.processSavedQuestionnaireResponses(result, true);
}, ((result) => {
this.popupClear("Error: failed to load previous forms", "OK", true);
this.popupClear("Error: failed to load previous in-progress forms", "OK", true);
this.popupLaunch();
})).catch(console.error);
}
Expand Down Expand Up @@ -238,12 +230,12 @@ export default class QuestionnaireForm extends Component {
if (r.resource.questionnaire.includes(this.props.qform.id)) {
count = count + 1;
// add the option to the popupOptions
let date = new Date(r.resource.authored);
let option = date.toLocaleDateString(undefined, options) + " (" + r.resource.status + ")";
let date = new Date(bundleEntry.resource.authored);
let option = date.toLocaleDateString(undefined, options) + " (" + bundleEntry.resource.status + ")";
this.setState({
popupOptions: [...this.state.popupOptions, option]
});
this.partialForms[option] = r.resource;
this.partialForms[option] = bundleEntry.resource;
}
});
console.log(this.state.popupOptions);
Expand Down