Index: sources/ApplicationController.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r6d4b788c840eeccb9ff603ce3195fd037fca7ede --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 6d4b788c840eeccb9ff603ce3195fd037fca7ede) @@ -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 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r6d4b788c840eeccb9ff603ce3195fd037fca7ede --- sources/ApplicationController.h (.../ApplicationController.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/ApplicationController.h (.../ApplicationController.h) (revision 6d4b788c840eeccb9ff603ce3195fd037fca7ede) @@ -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/disinfect/DisinfectStack.qml =================================================================== diff -u -r31f8f296fb58f57c121a39dfd7e78b11723479c6 -r6d4b788c840eeccb9ff603ce3195fd037fca7ede --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 31f8f296fb58f57c121a39dfd7e78b11723479c6) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 6d4b788c840eeccb9ff603ce3195fd037fca7ede) @@ -53,14 +53,47 @@ else { vPage.reasonText = vDisinfectAdjustDisinfect.text() } } - property var doDisinfects : [ - doDisinfectFlush , - doDisinfectHeat , - doDisinfectChemical , - doDisinfectChemFlush , - doDisinfectROPermeate, - ] + function disinfectsCalls(vIndex) { + let functionArray + if ( vAdjustmentInstitutionalRecord.enableChemicalDisinfect ) { + functionArray = [ + doDisinfectFlush , + doDisinfectHeat , + doDisinfectChemical , + doDisinfectChemFlush , + doDisinfectROPermeate, + ] + } + else { + functionArray = [ + doDisinfectFlush , + doDisinfectHeat , + doDisinfectROPermeate, + ] + } + functionArray[vIndex]() + } + + function disinfectsTexts() { + if ( vAdjustmentInstitutionalRecord.enableChemicalDisinfect ) { + return [ + _root.flushTitle , + _root.heatTitle , + _root.chemicalTitle , + _root.chemFlushTitle , + _root.roPermeateTitle, + ] + } + else { + return [ + _root.flushTitle , + _root.heatTitle , + _root.roPermeateTitle, + ] + } + } + DisinfectBase { id : _disinfectHome objectName : "_disinfectHome" property int stackStepIndex : 0 @@ -72,15 +105,9 @@ colCount : 1 colSpacing : 0 // rowCount : itemsText - itemsText : [ - _root.flushTitle , - _root.heatTitle , - _root.chemicalTitle , - _root.chemFlushTitle , - _root.roPermeateTitle, - ] + itemsText : disinfectsTexts() onItemClicked: { - doDisinfects[vIndex]() + disinfectsCalls(vIndex) } } Image { id: _denaliDeviceImage Index: sources/view/settings/VAdjustmentInstitutionalRecord.cpp =================================================================== diff -u -r31f8f296fb58f57c121a39dfd7e78b11723479c6 -r6d4b788c840eeccb9ff603ce3195fd037fca7ede --- sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision 31f8f296fb58f57c121a39dfd7e78b11723479c6) +++ sources/view/settings/VAdjustmentInstitutionalRecord.cpp (.../VAdjustmentInstitutionalRecord.cpp) (revision 6d4b788c840eeccb9ff603ce3195fd037fca7ede) @@ -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 -r31f8f296fb58f57c121a39dfd7e78b11723479c6 -r6d4b788c840eeccb9ff603ce3195fd037fca7ede --- sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision 31f8f296fb58f57c121a39dfd7e78b11723479c6) +++ sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision 6d4b788c840eeccb9ff603ce3195fd037fca7ede) @@ -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 { @@ -106,8 +106,8 @@ PROPERTY(quint32 , enableChemicalDisinfect , 0 ) PROPERTY(QStringList , parametersTitle , titles()) - PROPERTY(QStringList , parametersUnit , units ()) PROPERTY(QStringList , parametersText , {} ) + PROPERTY(QStringList , parametersUnit , units ()) VIEW_DEC_CLASS_ADJUSTMENT(VAdjustmentInstitutionalRecord, AdjustInstitutionalRecordResponseData)