Index: sources/ApplicationController.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -rbf894466a9c12a0bf0db190027256288f2c3f74d --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision bf894466a9c12a0bf0db190027256288f2c3f74d) @@ -699,6 +699,16 @@ } /*! + * \brief ApplicationController::institutionalRequest + * \details Sends an institutional record request + */ +void ApplicationController::institutionalRequest() { + AdjustInstitutionalRequestData adjustInstitutionalRequestData; + emit didAdjustment(adjustInstitutionalRequestData); + LOG_DEBUG("POSTInstitutionalRecordReq Sent"); +} + +/*! * \brief ApplicationController::onstartPOST * \details The POST entry point * - Sends the first async check-in to the HD to let HD know it can start it's POST and UI is ready to communicate. @@ -759,6 +769,7 @@ alarmTrigger (Gui::GuiAlarmID::ALARM_ID_NO_ALARM, true); // send queued fails postDoneRequest (); // send HD the POST result versionsRequest (); // send HD the version request + institutionalRequest (); // send HD the institutional record request emit didPOSTPass (_post.isDone( )); // GuiController -> GuiView : didPOSTPass(bool) } Index: sources/ApplicationController.h =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -rbf894466a9c12a0bf0db190027256288f2c3f74d --- sources/ApplicationController.h (.../ApplicationController.h) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/ApplicationController.h (.../ApplicationController.h) (revision bf894466a9c12a0bf0db190027256288f2c3f74d) @@ -83,6 +83,7 @@ void postDoneRequest(); void versionsRequest(); + void institutionalRequest(); void alarmTrigger (Gui::GuiAlarmID vAlarmID, bool vSend = false, bool vSingle = false); Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r2bb4b7e255c69e5b3a869f37bcbb37d7ad87870f -rbf894466a9c12a0bf0db190027256288f2c3f74d --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 2bb4b7e255c69e5b3a869f37bcbb37d7ad87870f) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision bf894466a9c12a0bf0db190027256288f2c3f74d) @@ -153,7 +153,7 @@ function onHomeChanged ( vValue ) { page( _startupScreen , vValue )} function onStandbyChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } function onStandbyStartChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } - function onStandbyWaitTreatmentChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } + function onStandbyWaitTreatmentChanged ( vValue ) { if ( vValue ) vDisinfectAdjustDisinfect.hasCancel = false } function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectStack , vValue )} function onValidateParametersChanged ( vValue ) { _preTreatmentCreateStack.clear ( vValue ) // vValue == true if enterig the state ( clear only on entering). Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml =================================================================== diff -u -ra9524b7a57b19e112b18a1e4ae6a44fb9d00af90 -rbf894466a9c12a0bf0db190027256288f2c3f74d --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision a9524b7a57b19e112b18a1e4ae6a44fb9d00af90) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision bf894466a9c12a0bf0db190027256288f2c3f74d) @@ -53,35 +53,20 @@ else { vPage.reasonText = vDisinfectAdjustDisinfect.text() } } - property var doDisinfects : [ - doDisinfectFlush , - doDisinfectHeat , - doDisinfectChemical , - doDisinfectChemFlush , - doDisinfectROPermeate, - ] - DisinfectBase { id : _disinfectHome objectName : "_disinfectHome" property int stackStepIndex : 0 header.stepNames : [ _root.disinfectTitle ] title.text : _root.disinfectTitle TouchGrid { - width : parent.width / 2 - colCount : 1 - colSpacing : 0 - // rowCount : itemsText - itemsText : [ - _root.flushTitle , - _root.heatTitle , - _root.chemicalTitle , - _root.chemFlushTitle , - _root.roPermeateTitle, - ] - onItemClicked: { - doDisinfects[vIndex]() - } + property bool isVisible: vAdjustmentInstitutionalRecord.enableChemicalDisinfect + width : parent.width / 2 + colCount : 1 + colSpacing : 0 + itemsText : [ _root.flushTitle , _root.heatTitle , _root.chemicalTitle , _root.chemFlushTitle , _root.roPermeateTitle , ] + itemsVisible : [ true , true , isVisible , isVisible , true , ] + onItemClicked : [ doDisinfectFlush , doDisinfectHeat , doDisinfectChemical , doDisinfectChemFlush , doDisinfectROPermeate , ][vIndex]() } Image { id: _denaliDeviceImage anchors.right : parent.right Index: sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h =================================================================== diff -u -ra9524b7a57b19e112b18a1e4ae6a44fb9d00af90 -rbf894466a9c12a0bf0db190027256288f2c3f74d --- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision a9524b7a57b19e112b18a1e4ae6a44fb9d00af90) +++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision bf894466a9c12a0bf0db190027256288f2c3f74d) @@ -32,36 +32,37 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * |0xB100| 0x020 | Rsp | Y | HD | UI | Service Mode | + * |0xD000| 0x020 | Rsp | Y | HD | UI | Service Mode | * * | Payload || * | || - * | #1: (U32) | \ref Data::mMaxHepBolVolumeML | - * | #2: (U32) | \ref Data::mMinHepBolVolumeML | - * | #3: (U32) | \ref Data::mMaxHepDispRateMLPHR | - * | #4: (U32) | \ref Data::mMinHepDispRateMLPHR | - * | #5: (U32) | \ref Data::mMaxUltrafiltrationVolumeL | - * | #6: (U32) | \ref Data::mMinUltrafiltrationVolumeL | - * | #7: (U32) | \ref Data::mMaxVenAsymPressLimitMMHG | - * | #8: (U32) | \ref Data::mMinVenAsymPressLimitMMHG | - * | #9: (U32) | \ref Data::mMaxVenPressLimitWindowMMHG | - * | #10:(U32) | \ref Data::mMinVenPressLimitWindowMMHG | - * | #11:(U32) | \ref Data::mMaxArtPressLimitWindowMMHG | - * | #12:(U32) | \ref Data::mMinArtPressLimitWindowMMHG | - * | #13:(F32) | \ref Data::mMaxDialysateTempC | - * | #14:(F32) | \ref Data::mMinDialysateTempC | - * | #15:(S32) | \ref Data::mMaxSalineBolVolumeML | - * | #16:(S32) | \ref Data::mMinSalineBolVolumeML | - * | #17:(S32) | \ref Data::mMaxStopHepDispBeforeTxEndMIN | - * | #18:(S32) | \ref Data::mMinStopHepDispBeforeTxEndMIN | - * | #19:(S32) | \ref Data::mMaxTxDurationMIN | - * | #20:(S32) | \ref Data::mMinTxDurationMIN | - * | #21:(F32) | \ref Data::mMaxDialysateFlowMLPM | - * | #22:(F32) | \ref Data::mMinDialysateFlowMLPM | - * | #23:(F32) | \ref Data::mMaxBloodFlowMLPM | - * | #24:(F32) | \ref Data::mMinBloodFlowMLPM | - * | #25:(F32) | \ref Data::mReason | - * | #26:(F32) | \ref Data::mAccepted | + * | #1: (U32) | \ref Data::mAccepted | + * | #2: (U32) | \ref Data::mReason | + * | #3: (U32) | \ref Data::mMinBloodFlowMLPM | + * | #4: (U32) | \ref Data::mMaxBloodFlowMLPM | + * | #5: (U32) | \ref Data::mMinDialysateFlowMLPM | + * | #6: (U32) | \ref Data::mMaxDialysateFlowMLPM | + * | #7: (U32) | \ref Data::mMinTxDurationMIN | + * | #8: (U32) | \ref Data::mMaxTxDurationMIN | + * | #9: (U32) | \ref Data::mMinStopHepDispBeforeTxEndMIN | + * | #10:(U32) | \ref Data::mMaxStopHepDispBeforeTxEndMIN | + * | #11:(U32) | \ref Data::mMinSalineBolVolumeML | + * | #12:(U32) | \ref Data::mMaxSalineBolVolumeML | + * | #13:(F32) | \ref Data::mMinDialysateTempC | + * | #14:(F32) | \ref Data::mMaxDialysateTempC | + * | #15:(S32) | \ref Data::mMinArtPressLimitWindowMMHG | + * | #16:(S32) | \ref Data::mMaxArtPressLimitWindowMMHG | + * | #17:(S32) | \ref Data::mMinVenPressLimitWindowMMHG | + * | #18:(S32) | \ref Data::mMaxVenPressLimitWindowMMHG | + * | #19:(S32) | \ref Data::mMinVenAsymPressLimitMMHG | + * | #20:(S32) | \ref Data::mMaxVenAsymPressLimitMMHG | + * | #21:(F32) | \ref Data::mMinUltrafiltrationVolumeL | + * | #22:(F32) | \ref Data::mMaxUltrafiltrationVolumeL | + * | #23:(F32) | \ref Data::mMinHepDispRateMLPHR | + * | #24:(F32) | \ref Data::mMaxHepDispRateMLPHR | + * | #25:(F32) | \ref Data::mMinHepBolVolumeML | + * | #26:(F32) | \ref Data::mMaxHepBolVolumeML | + * | #27:(U32) | \ref Data::mEnableChemicalDisinfect | * * \sa Data * Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -rbf894466a9c12a0bf0db190027256288f2c3f74d --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision bf894466a9c12a0bf0db190027256288f2c3f74d) @@ -89,7 +89,6 @@ */ void View::VDisinfectAdjustDisinfect::doDisinfectCancel() { - hasCancel(false); AdjustDisinfectModeRequestData vData; vData.mInititate = Model::MAdjustDisinfectModeReq::eCancel; emit didAdjustment(vData); Index: sources/view/settings/VAdjustmentInstitutionalRecord.cpp =================================================================== diff -u -ra9524b7a57b19e112b18a1e4ae6a44fb9d00af90 -rbf894466a9c12a0bf0db190027256288f2c3f74d --- sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision a9524b7a57b19e112b18a1e4ae6a44fb9d00af90) +++ sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision bf894466a9c12a0bf0db190027256288f2c3f74d) @@ -70,7 +70,7 @@ values << QString("%1 - %2").arg(vData.mMinUltrafiltrationVolumeL ).arg(vData.mMaxUltrafiltrationVolumeL ); values << QString("%1 - %2").arg(vData.mMinHepDispRateMLPM ).arg(vData.mMaxHepDispRateMLPM ); values << QString("%1 - %2").arg(vData.mMinHepBolVolumeML ).arg(vData.mMaxHepBolVolumeML ); - values << QString("%1") .arg(vData.mEnableChemicalDisinfect ); + values << QString("%1") .arg(vData.mEnableChemicalDisinfect ? tr("Enabled") : tr("Disabled") ); parametersText(values); // *** has to be the last to let the information to be set and then emit the signal *** Index: sources/view/settings/VAdjustmentInstitutionalRecord.h =================================================================== diff -u -ra9524b7a57b19e112b18a1e4ae6a44fb9d00af90 -rbf894466a9c12a0bf0db190027256288f2c3f74d --- sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision a9524b7a57b19e112b18a1e4ae6a44fb9d00af90) +++ sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision bf894466a9c12a0bf0db190027256288f2c3f74d) @@ -51,7 +51,7 @@ tr("Prescribed UF Volume" ), tr("Heparin Dispense Rate" ), tr("Heparin Bolus Volume" ), - tr("Enable Chemical Disinfect" ), + tr("Chemical Disinfect" ), }; const QStringList _units { @@ -103,11 +103,11 @@ PROPERTY(float , maxHepDispRateMLPM , 0.0 ) PROPERTY(float , minHepBolVolumeML , 0.0 ) PROPERTY(float , maxHepBolVolumeML , 0.0 ) - PROPERTY(quint32 , enableChemicalDisinfect , 0 ) + PROPERTY(bool , enableChemicalDisinfect , true ) PROPERTY(QStringList , parametersTitle , titles()) - PROPERTY(QStringList , parametersUnit , units ()) PROPERTY(QStringList , parametersText , {} ) + PROPERTY(QStringList , parametersUnit , units ()) VIEW_DEC_CLASS_ADJUSTMENT(VAdjustmentInstitutionalRecord, AdjustInstitutionalRecordResponseData)