diff --git a/components/case/representation/index.js b/components/case/representation/index.js index 1df6e770..8cff8d9e 100644 --- a/components/case/representation/index.js +++ b/components/case/representation/index.js @@ -786,72 +786,79 @@ let MakeRepresentation = (props) => { {Object.keys( props.props.currentView .representationCapacity - ).length > 0 && - (savingStatus ? ( - - {router.locale == "cy" - ? "Nôl data" - : "Saving data"} - { - - ) : ( - - ))} - {formObj.hasOwnProperty( - "representationForm" - ) && - formObj[ + console.log( + "on save:", + valuesObj + ); + updateRepresentation( + valuesObj, + false, + true + ); + }} + > + {t( + "common:save-exit-button" + )} + + )} + + )} +
+ {formObj.hasOwnProperty( "representationForm" - ].hasOwnProperty("values") && - formObj[ - "representationForm" - ].values.hasOwnProperty( - "representationType" ) && - formObj["representationForm"].values - .representationType == - "Questionnaire" && - whichProgress()} + formObj[ + "representationForm" + ].hasOwnProperty("values") && + formObj[ + "representationForm" + ].values.hasOwnProperty( + "representationType" + ) && + formObj["representationForm"] + .values + .representationType == + "Questionnaire" && + whichProgress()} +
diff --git a/components/myportal/awaitingsubmissionfromblob.js b/components/myportal/awaitingsubmissionfromblob.js index 17f80f5f..a006b721 100644 --- a/components/myportal/awaitingsubmissionfromblob.js +++ b/components/myportal/awaitingsubmissionfromblob.js @@ -81,7 +81,10 @@ const AwaitingSubmissionFromBlob = (props) => { "appealComplete" ) ? ( - {showTopThreeArr[index].pinswg_name} + { + showTopThreeArr[index] + .appealComplete + } ) : ( { }); Object.assign(blobProgress, { - "appealComplete": true, + "appealComplete": blobProgress.pinswg_name, }); + delete blobProgress["pinswg_name"]; + //http: if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) { await createBlob(JSON.stringify(blobProgress), containerName, tempCaseRef)