Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rb2db816026524a19086e900eef867d7f5a3aa6f2 -r11c9e7b76125f24a08ed6c66175af20025ac5458 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision b2db816026524a19086e900eef867d7f5a3aa6f2) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) @@ -672,6 +672,7 @@ mData += vData.mRinsebackVolume ; mData += vData.mHepatitusBStatus ; mData += vData.mAcidConcentrateIndex ; + mData += vData.mFinalConfirmation ; mData += vData.mSubstitutionFluidVolume ; mData += vData.mHeparinBolusVolume ; mData += vData.mHeparinDispensingRate ; Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r83acad721bd36d2c88a15feddd6812d2e591bef3 -r11c9e7b76125f24a08ed6c66175af20025ac5458 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 83acad721bd36d2c88a15feddd6812d2e591bef3) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) @@ -221,8 +221,8 @@ {Gui::GuiActionType::ID_AdjustInitTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_AdjustInitTreatmentRsp , 2 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Treatment Parameters Validation/Confirm - {Gui::GuiActionType::ID_AdjustParametersValidationReq , 24 * 4 }, //24 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 25 * 4 }, //25 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustParametersValidationReq , 25 * 4 }, //25 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 26 * 4 }, //26 parameters each 4bytes {Gui::GuiActionType::ID_AdjustParametersConfirmReq , 1 * 4 }, // 1 parameters each 4bytes // Pre-Treatment Water Sample {Gui::GuiActionType::ID_DGFilterFlushData , 2 * 4 }, // 2 parameters each 4bytes Index: sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml =================================================================== diff -u -rdcd977aa407345edac30e4430a0476de4b0163d8 -r11c9e7b76125f24a08ed6c66175af20025ac5458 --- sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml (.../HeaderbarPrescription.qml) (revision dcd977aa407345edac30e4430a0476de4b0163d8) +++ sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml (.../HeaderbarPrescription.qml) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) @@ -81,7 +81,7 @@ _headerbarPrescriptionContent.currentIndex = PreTreatmentCreateContent.TreatmentSettings } else { - _headerbarPrescriptionContent.validate() + _headerbarPrescriptionContent.validate(false) } } } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -rdcd977aa407345edac30e4430a0476de4b0163d8 -r11c9e7b76125f24a08ed6c66175af20025ac5458 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision dcd977aa407345edac30e4430a0476de4b0163d8) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) @@ -34,7 +34,7 @@ function clear( vValue ) { if ( ! vValue ) return; _preTreatmentCreateContent.clear() } function confirmReady() { return _root.isFirstTab ? true : _preTreatmentCreateContent.confirmReady() } function confirmButtonClicked() { if ( _root.isFirstTab ) { _preTreatmentCreateContent.currentIndex = PreTreatmentCreateContent.TreatmentSettings } - else { _preTreatmentCreateContent.validate() }} + else { _preTreatmentCreateContent.validate(true) }} function back() { _preTreatmentCreateContent.currentIndex = PreTreatmentCreateContent.PatientPrescription } PreTreatmentCreateContent { id: _preTreatmentCreateContent Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -rdcd977aa407345edac30e4430a0476de4b0163d8 -r11c9e7b76125f24a08ed6c66175af20025ac5458 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision dcd977aa407345edac30e4430a0476de4b0163d8) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) @@ -114,10 +114,10 @@ _preTreatmentCreatePatientPrescription .ready() } - function validate () { + function validate (vFinalConfirmation) { vTreatmentCreate .patientID = _preTreatmentCreatePatientPrescription.patientID vPostTreatmentAdjustmentTreatmentLog.patientID = _preTreatmentCreatePatientPrescription.patientID // store for the TreatmentLog - + vTreatmentCreate.finalConfirmation = vFinalConfirmation ? 1 : 0 vTreatmentCreate.doValidation ( ) } Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp =================================================================== diff -u -r0d1a10c754665f397bf7e507643d928657ed9561 -r11c9e7b76125f24a08ed6c66175af20025ac5458 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 0d1a10c754665f397bf7e507643d928657ed9561) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) @@ -35,6 +35,7 @@ _data.mRinsebackVolumeRejectionReason .value, _data.mHepatitusBStatusRejectionReason .value, _data.mAcidConcentrateIndexRejectionReason .value, + _data.mFinalConfirmationRejectionReason .value, _data.mSubstitutionFluidVolumeRejectionReason .value, _data.mHeparinBolusVolumeRejectionReason .value, _data.mHeparinDispensingRateRejectionReason .value, @@ -65,6 +66,7 @@ if ( ! GetValue(vByteArray, index, _data.mRinsebackVolumeRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mHepatitusBStatusRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mAcidConcentrateIndexRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFinalConfirmationRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mSubstitutionFluidVolumeRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mHeparinBolusVolumeRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mHeparinDispensingRateRejectionReason )) goto lError; Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h =================================================================== diff -u -r0d1a10c754665f397bf7e507643d928657ed9561 -r11c9e7b76125f24a08ed6c66175af20025ac5458 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 0d1a10c754665f397bf7e507643d928657ed9561) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) @@ -52,14 +52,15 @@ * | #15:(U32) | \ref Data::mRinsebackVolumeRejectionReason | * | #16:(U32) | \ref Data::mHepatitusBStatusRejectionReason | * | #17:(U32) | \ref Data::mAcidConcentrateIndexRejectionReason | - * | #18:(U32) | \ref Data::mSubstitutionFluidVolumeRejectionReason | - * | #19:(U32) | \ref Data::mHeparinBolusVolumeRejectionReason | - * | #20:(U32) | \ref Data::mHeparinDispensingRateRejectionReason | - * | #21:(U32) | \ref Data::mDialysateTempRejectionReason | - * | #22:(U32) | \ref Data::mAcidConcentrateConversionFactorRejectionReason | - * | #23:(U32) | \ref Data::mUFPreWeightRejectionReason | - * | #24:(U32) | \ref Data::mUFEstimatedTargetWeightRejectionReason | - * | #25:(U32) | \ref Data::mUFVolumeRejectionReason | + * | #18:(U32) | \ref Data::mFinalConfirmationRejectionReason | + * | #19:(U32) | \ref Data::mSubstitutionFluidVolumeRejectionReason | + * | #20:(U32) | \ref Data::mHeparinBolusVolumeRejectionReason | + * | #21:(U32) | \ref Data::mHeparinDispensingRateRejectionReason | + * | #22:(U32) | \ref Data::mDialysateTempRejectionReason | + * | #23:(U32) | \ref Data::mAcidConcentrateConversionFactorRejectionReason | + * | #24:(U32) | \ref Data::mUFPreWeightRejectionReason | + * | #25:(U32) | \ref Data::mUFEstimatedTargetWeightRejectionReason | + * | #26:(U32) | \ref Data::mUFVolumeRejectionReason | * \sa Data * @@ -95,6 +96,7 @@ Types::U32 mRinsebackVolumeRejectionReason ; Types::U32 mHepatitusBStatusRejectionReason ; Types::U32 mAcidConcentrateIndexRejectionReason ; + Types::U32 mFinalConfirmationRejectionReason ; Types::U32 mSubstitutionFluidVolumeRejectionReason ; Types::U32 mHeparinBolusVolumeRejectionReason ; Types::U32 mHeparinDispensingRateRejectionReason ; @@ -129,6 +131,7 @@ quint32 mRinsebackVolumeRejectionReason = 0; quint32 mHepatitusBStatusRejectionReason = 0; quint32 mAcidConcentrateIndexRejectionReason = 0; + quint32 mFinalConfirmationRejectionReason = 0; quint32 mSubstitutionFluidVolumeRejectionReason = 0; quint32 mHeparinBolusVolumeRejectionReason = 0; quint32 mHeparinDispensingRateRejectionReason = 0; Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -r0d1a10c754665f397bf7e507643d928657ed9561 -r11c9e7b76125f24a08ed6c66175af20025ac5458 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 0d1a10c754665f397bf7e507643d928657ed9561) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) @@ -88,14 +88,15 @@ * | #14:(U32) | \ref mRinsebackVolume | * | #15:(U32) | \ref mHepatitusBStatus | * | #16:(U32) | \ref mAcidConcentrateIndex | - * | #17:(F32) | \ref mSubstitutionFluidVolume | - * | #18:(F32) | \ref mHeparinBolusVolume | - * | #19:(F32) | \ref mHeparinDispensingRate | - * | #20:(F32) | \ref mDialysateTemp | - * | #21:(F32) | \ref mAcidConcentrateConversionFactor | - * | #22:(F32) | \ref mUFPreWeight | - * | #23:(F32) | \ref mUFEstimatedTargetWeight | - * | #24:(F32) | \ref mUFVolume | + * | #17:(U32) | \ref mFinalConfirmation | + * | #18:(F32) | \ref mSubstitutionFluidVolume | + * | #19:(F32) | \ref mHeparinBolusVolume | + * | #20:(F32) | \ref mHeparinDispensingRate | + * | #21:(F32) | \ref mDialysateTemp | + * | #22:(F32) | \ref mAcidConcentrateConversionFactor | + * | #23:(F32) | \ref mUFPreWeight | + * | #24:(F32) | \ref mUFEstimatedTargetWeight | + * | #25:(F32) | \ref mUFVolume | * */ @@ -117,6 +118,7 @@ quint32 mRinsebackVolume = 0; // mL quint32 mHepatitusBStatus = 0; // quint32 mAcidConcentrateIndex = 0; // + quint32 mFinalConfirmation = 0; // flag float mSubstitutionFluidVolume = 0; // L float mHeparinBolusVolume = 0; // mL float mHeparinDispensingRate = 0; // mL/hr @@ -144,6 +146,7 @@ mRinsebackVolume , mHepatitusBStatus , mAcidConcentrateIndex , + mFinalConfirmation , mSubstitutionFluidVolume , mHeparinBolusVolume , mHeparinDispensingRate , Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180 -r11c9e7b76125f24a08ed6c66175af20025ac5458 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) @@ -58,6 +58,7 @@ data.mRinsebackVolume = _rinsebackVolume ; data.mHepatitusBStatus = _hepatitusBStatus ; data.mAcidConcentrateIndex = _acidConcentrate ; + data.mFinalConfirmation = _finalConfirmation ; data.mSubstitutionFluidVolume = _substitutionFluidVolume ; data.mHeparinBolusVolume = _heparinBolusVolume ; data.mHeparinDispensingRate = _heparinDispensingRate ; @@ -132,6 +133,7 @@ rinsebackVolumeRejectReason (data.mRinsebackVolumeRejectionReason ); hepatitusBStatusRejectReason (data.mHepatitusBStatusRejectionReason ); acidConcentrateIndexRejectionReason (data.mAcidConcentrateIndexRejectionReason ); + finalConfirmationRejectionReason (data.mFinalConfirmationRejectionReason ); substitutionFluidVolumeRejectReason (data.mSubstitutionFluidVolumeRejectionReason ); heparinBolusVolumeRejectReason (data.mHeparinBolusVolumeRejectionReason ); heparinDispensingRateRejectReason (data.mHeparinDispensingRateRejectionReason );