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

temp fix for id match #31

Merged
smalho01 merged 3 commits into from
Jul 12, 2022
Merged

temp fix for id match #31

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01a6a81
temp fix for id match
kghoreshi Jul 12, 2022
afdad23
remove console log
kghoreshi Jul 12, 2022
ffb5e72
fix relaunch error
kghoreshi Jul 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
16 changes: 9 additions & 7 deletions src/components/QuestionnaireForm/QuestionnaireForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ export default class QuestionnaireForm extends Component {
// search for any QuestionnaireResponses
this.smart.request(this.getRetrieveSaveQuestionnaireUrl() +
"&subject=" + this.getPatient()).then((result) => {

this.popupClear("Would you like to load a previous form?", "Cancel", false);
this.processSavedQuestionnaireResponses(result, true);
}, ((result) => {
Expand Down Expand Up @@ -236,7 +235,7 @@ export default class QuestionnaireForm extends Component {
let count = 0;

partialResponses.entry.forEach(r => {
if (this.props.qform.id == r.resource.questionnaire) {
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);
Expand Down Expand Up @@ -1453,12 +1452,15 @@ export default class QuestionnaireForm extends Component {

const savedParentItem = findSavedParentItem(parentLinkId, savedItem);
const replaceOrInsertItem = (newResponseItem, savedParentItem) => {
const replaceIndex = savedParentItem.item.findIndex(item => item.linkId == newResponseItem.linkId);
if (replaceIndex != -1) {
savedParentItem.item[replaceIndex] = newResponseItem;
} else {
savedParentItem.item.push(newResponseItem);
if(savedParentItem.item) {
const replaceIndex = savedParentItem.item.findIndex(item => item.linkId == newResponseItem.linkId);
if (replaceIndex != -1) {
savedParentItem.item[replaceIndex] = newResponseItem;
} else {
savedParentItem.item.push(newResponseItem);
}
}

};
if (savedParentItem != undefined) {
replaceOrInsertItem(newItem, savedParentItem);
Expand Down