Index: sources/gui/qml/compounds/InstitutionalContainer.qml =================================================================== diff -u -rf433eeefae34530e7cc3dc4e5576e43729b236f2 -r49271f2bd039c9d15586c7c9b2f57f80c801d819 --- sources/gui/qml/compounds/InstitutionalContainer.qml (.../InstitutionalContainer.qml) (revision f433eeefae34530e7cc3dc4e5576e43729b236f2) +++ sources/gui/qml/compounds/InstitutionalContainer.qml (.../InstitutionalContainer.qml) (revision 49271f2bd039c9d15586c7c9b2f57f80c801d819) @@ -50,8 +50,9 @@ property int rejectionDef : 0 property var defModel : [] property bool grabbed : false - property int row : 0 + signal didChange(int vValue) + enum Range { Min , Max , @@ -88,7 +89,7 @@ } onDidChange : function(vValue) { - vInstitutionalRecord.clearRejectionReason( _root.row , InstitutionalContainer.Min ) + _root.didChange( InstitutionalContainer.Min ) value = vValue } } @@ -131,7 +132,7 @@ } onDidChange : function(vValue) { - vInstitutionalRecord.clearRejectionReason( _root.row , InstitutionalContainer.Max ) + _root.didChange( InstitutionalContainer.Max ) value = vValue } } @@ -158,7 +159,6 @@ color: _root.rejectionDef ? Colors.panelInvalidBorderColor : Colors.transparent } - // TODO fix VitalsInterval on enhancement branch... this branch does not have updated vitals code and combobox ValueAdjuster { id: _def anchors.fill : parent editable : _root.defEditable @@ -176,7 +176,7 @@ } onDidChange : function(vValue) { - vInstitutionalRecord.clearRejectionReason( _root.row , InstitutionalContainer.Def ) + _root.didChange( InstitutionalContainer.Def ) value = vValue } } Index: sources/gui/qml/compounds/LabelUnitContainer.qml =================================================================== diff -u -r1f9e84f74ead9e10577c8caa204c6eb911e12ab8 -r49271f2bd039c9d15586c7c9b2f57f80c801d819 --- sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision 1f9e84f74ead9e10577c8caa204c6eb911e12ab8) +++ sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision 49271f2bd039c9d15586c7c9b2f57f80c801d819) @@ -29,8 +29,8 @@ property string unitText : "" property bool valid : true property bool showEdit : false - property int titleFontSize : Fonts.fontPixelContainerTitle - property int unitFontSize : Fonts.fontPixelContainerUnit + property int titleFontSize : Fonts.fontPixelDefaultButton + property int unitFontSize : Fonts.fontUnit height : cellHeight width : cellWidth Index: sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml =================================================================== diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r49271f2bd039c9d15586c7c9b2f57f80c801d819 --- sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b) +++ sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision 49271f2bd039c9d15586c7c9b2f57f80c801d819) @@ -84,118 +84,26 @@ } } - function clearErrors() { - vAdjustmentAdvancedInstitutionalRecord.minRORejectionRatioAlarmMinRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.minRORejectionRatioAlarmMaxRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.minRORejectionRatioAlarmDefRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.disinfectionFrequencyMinRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.disinfectionFrequencyMaxRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.disinfectionFrequencyDefRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.disinfectionParametersCycleTimeMinRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.disinfectionParametersCycleTimeMaxRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.disinfectionParametersCycleTimeDefRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.maxBloodPumpStopTimeMinRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.maxBloodPumpStopTimeMaxRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.maxBloodPumpStopTimeDefRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.inletWaterCondLowThresholdMinRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.inletWaterCondLowThresholdMaxRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.inletWaterCondLowThresholdDefRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.inletWaterCondHighThresholdMinRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.inletWaterCondHighThresholdMaxRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.inletWaterCondHighThresholdDefRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.chlorineWaterSampleCheckMinRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.chlorineWaterSampleCheckMaxRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.chlorineWaterSampleCheckDefRejectionReason = Variables.noRejectReason - vAdjustmentAdvancedInstitutionalRecord.waterSampleTestResultRequiredDefRejectionReason = Variables.noRejectReason - } - Connections { target: vAdvancedInstitutionalRecord function onAdjustmentTriggered ( vValue ) { - if ( vAdvancedInstitutionalRecord.adjustment_Accepted ) { - _root.notificationText = "" - initModel() + if ( ! vAdvancedInstitutionalRecord.adjustment_Accepted ) { + _root.notificationText = vAdvancedInstitutionalRecord.adjustment_ReasonText } - else { - _root.notificationText = vAdvancedInstitutionalRecord.adjustment_ReasonText - } } } Connections { target: vAdjustmentAdvancedInstitutionalRecord function onAdjustmentTriggered ( vValue ) { if ( vAdjustmentAdvancedInstitutionalRecord.adjustment_Accepted ) { _root.notificationText = qsTr("Advanced Institutional records and preferences updated") - clearErrors() + vAdvancedInstitutionalRecord.doAdjustment() } else { _root.notificationText = qsTr("Error Adjusting Advanced Institutional Records") } } } - // To populate model with parameter ranges and initial/ set value of each institutional setting - // min - minimum range from param ranges (DataList.conf) - // max - maximum range from param ranges (DataList.conf) - // step - step or resolution from param ranges (DataList.conf) - // minVal - minimum value from institutional settings in FW - // maxVin - maximum value from institutional settings in FW - // defVal - default value from institutional settings in FW - // decimal - preceision of value - // rejection- rejection re3ason from adjust record - function initModel() { - advancedInstitutionalModel.clear() - // Order matters - // MinRoRejectionRatio - advancedInstitutionalModel.append({ "min" : vTreatmentRanges.minRORejectionRatioAlarmMin, "max" : vTreatmentRanges.minRORejectionRatioAlarmMax, - "step" : vTreatmentRanges.minRORejectionRatioAlarmRes, "decimal" : 0, - "minVal": vAdvancedInstitutionalRecord.minRORejectionRatioAlarmMin, "rejectionMax": vAdjustmentAdvancedInstitutionalRecord.minRORejectionRatioAlarmMaxRejectionReason, - "maxVal": vAdvancedInstitutionalRecord.minRORejectionRatioAlarmMax, "rejectionMin": vAdjustmentAdvancedInstitutionalRecord.minRORejectionRatioAlarmMinRejectionReason, - "defVal": vAdvancedInstitutionalRecord.minRORejectionRatioAlarmDef, "rejectionDef": vAdjustmentAdvancedInstitutionalRecord.minRORejectionRatioAlarmDefRejectionReason }); - // DisinfectionFrequency - advancedInstitutionalModel.append({ "min" : vTreatmentRanges.disinfectionFrequencyMin, "max" : vTreatmentRanges.disinfectionFrequencyMax, - "step" : vTreatmentRanges.disinfectionFrequencyRes, "decimal" : 0, - "minVal": vAdvancedInstitutionalRecord.disinfectionFrequencyMin, "rejectionMax": vAdjustmentAdvancedInstitutionalRecord.disinfectionFrequencyMaxRejectionReason, - "maxVal": vAdvancedInstitutionalRecord.disinfectionFrequencyMax, "rejectionMin": vAdjustmentAdvancedInstitutionalRecord.disinfectionFrequencyMinRejectionReason, - "defVal": vAdvancedInstitutionalRecord.disinfectionFrequencyDef, "rejectionDef": vAdjustmentAdvancedInstitutionalRecord.disinfectionFrequencyDefRejectionReason }); - // DisinfectionParametersCycleTime - advancedInstitutionalModel.append({ "min" : vTreatmentRanges.disinfectionParametersCycleTimeMin, "max" : vTreatmentRanges.disinfectionParametersCycleTimeMax, - "step" : vTreatmentRanges.disinfectionParametersCycleTimeRes, "decimal" : 0, - "minVal": vAdvancedInstitutionalRecord.disinfectionParametersCycleTimeMin, "rejectionMax": vAdjustmentAdvancedInstitutionalRecord.disinfectionParametersCycleTimeMaxRejectionReason, - "maxVal": vAdvancedInstitutionalRecord.disinfectionParametersCycleTimeMax, "rejectionMin": vAdjustmentAdvancedInstitutionalRecord.disinfectionParametersCycleTimeMinRejectionReason, - "defVal": vAdvancedInstitutionalRecord.disinfectionParametersCycleTimeDef, "rejectionDef": vAdjustmentAdvancedInstitutionalRecord.disinfectionParametersCycleTimeDefRejectionReason}); - // MaxBloodPumpStopTime - advancedInstitutionalModel.append({ "min" : vTreatmentRanges.maxBloodPumpStopTimeMin, "max" : vTreatmentRanges.maxBloodPumpStopTimeMax, - "step" : vTreatmentRanges.maxBloodPumpStopTimeRes, "decimal" : 0, - "minVal": vAdvancedInstitutionalRecord.maxBloodPumpStopTimeMin, "rejectionMax": vAdjustmentAdvancedInstitutionalRecord.maxBloodPumpStopTimeMaxRejectionReason, - "maxVal": vAdvancedInstitutionalRecord.maxBloodPumpStopTimeMax, "rejectionMin": vAdjustmentAdvancedInstitutionalRecord.maxBloodPumpStopTimeMinRejectionReason, - "defVal": vAdvancedInstitutionalRecord.maxBloodPumpStopTimeDef, "rejectionDef": vAdjustmentAdvancedInstitutionalRecord.maxBloodPumpStopTimeDefRejectionReason }); - // InletWaterCondLowThreshold - advancedInstitutionalModel.append({ "min" : vTreatmentRanges.inletWaterCondLowThresholdMin, "max" : vTreatmentRanges.inletWaterCondLowThresholdMax, - "step" : vTreatmentRanges.inletWaterCondLowThresholdRes, "decimal" : 0, - "minVal": vAdvancedInstitutionalRecord.inletWaterCondLowThresholdMin, "rejectionMax": vAdjustmentAdvancedInstitutionalRecord.inletWaterCondLowThresholdMaxRejectionReason, - "maxVal": vAdvancedInstitutionalRecord.inletWaterCondLowThresholdMax, "rejectionMin": vAdjustmentAdvancedInstitutionalRecord.inletWaterCondLowThresholdMinRejectionReason, - "defVal": vAdvancedInstitutionalRecord.inletWaterCondLowThresholdDef, "rejectionDef": vAdjustmentAdvancedInstitutionalRecord.inletWaterCondLowThresholdDefRejectionReason }); - // InletWaterCondHighThreshold - advancedInstitutionalModel.append({ "min" : vTreatmentRanges.inletWaterCondHighThresholdMin, "max" : vTreatmentRanges.inletWaterCondHighThresholdMax, - "step" : vTreatmentRanges.inletWaterCondHighThresholdRes, "decimal" : 0, - "minVal": vAdvancedInstitutionalRecord.inletWaterCondHighThresholdMin, "rejectionMax": vAdjustmentAdvancedInstitutionalRecord.inletWaterCondHighThresholdMaxRejectionReason, - "maxVal": vAdvancedInstitutionalRecord.inletWaterCondHighThresholdMax, "rejectionMin": vAdjustmentAdvancedInstitutionalRecord.inletWaterCondHighThresholdMinRejectionReason, - "defVal": vAdvancedInstitutionalRecord.inletWaterCondHighThresholdDef, "rejectionDef": vAdjustmentAdvancedInstitutionalRecord.inletWaterCondHighThresholdDefRejectionReason }); - // ChlorineWaterSampleCheck - advancedInstitutionalModel.append({ "min" : vTreatmentRanges.chlorineWaterSampleCheckMin, "max" : vTreatmentRanges.chlorineWaterSampleCheckMax, - "step" : vTreatmentRanges.chlorineWaterSampleCheckRes, "decimal" : 0, - "minVal": vAdvancedInstitutionalRecord.chlorineWaterSampleCheckMin, "rejectionMax": vAdjustmentAdvancedInstitutionalRecord.chlorineWaterSampleCheckMaxRejectionReason, - "maxVal": vAdvancedInstitutionalRecord.chlorineWaterSampleCheckMax, "rejectionMin": vAdjustmentAdvancedInstitutionalRecord.chlorineWaterSampleCheckMinRejectionReason, - "defVal": vAdvancedInstitutionalRecord.chlorineWaterSampleCheckDef, "rejectionDef": vAdjustmentAdvancedInstitutionalRecord.chlorineWaterSampleCheckDefRejectionReason }); - // WaterSampleTestResultRequired - advancedInstitutionalModel.append({ "min" : _root.none, "max" : _root.none, - "step" : _root.none, "decimal" : 0, - "minVal": _root.none, "defVal" : vAdvancedInstitutionalRecord.waterSampleTestResultRequiredDef, - "maxVal": _root.none, "rejectionDef": vAdjustmentAdvancedInstitutionalRecord.waterSampleTestResultRequiredDefRejectionReason }); - } - - ListModel { id: advancedInstitutionalModel } - component HeaderText: Text { id: _headerText property string title : "" property int leftMargin : Variables.defaultMargin * 8.5 @@ -300,26 +208,25 @@ } boundsBehavior : Flickable.StopAtBounds clip : true - model : advancedInstitutionalModel + model : vAdvancedInstitutionalRecord.model spacing : anchors.topMargin flickableDirection : Flickable.VerticalFlick delegate: InstitutionalContainer { id: _delegateControl width : _listContent.contentWith - text : _root.title[index] === undefined ? "" : _root.title[index] - unitText : _root.unit[index] === undefined ? "" : _root.unit[index] + text : model.title + unitText : model.unit contentArea.anchors.leftMargin : width * 0.25 - - min : model.min - max : model.max - step : model.step - decimal : model.decimal - minVal : model.minVal - maxVal : model.maxVal - defVal : model.defVal - rejectionMin: model.rejectionMin - rejectionMax: model.rejectionMax - rejectionDef: model.rejectionDef + min : model.min ?? 0 + max : model.max ?? 0 + step : model.step ?? 0 + decimal : model.decimal ?? 0 + minVal : model.minVal ?? 0 + maxVal : model.maxVal ?? 0 + defVal : model.defVal ?? 0 + rejectionMin: model.rejectionMin ?? 0 + rejectionMax: model.rejectionMax ?? 0 + rejectionDef: model.rejectionDef ?? 0 maxText : "NA" minText : "NA" defModel : index === SettingsAdvancedInstitutional.WaterSampleTestResultRequired ? vTreatmentRanges.waterSampleTestResultRequired : [] @@ -328,6 +235,10 @@ _listView.interactive = ! grabbed } + onDidChange: function (vValue) { + vAdvancedInstitutionalRecord.clearRejectionReason( index , vValue ) + } + RoFeatureIndicator { anchors { left : parent.left Index: sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml =================================================================== diff -u -re81e290cc55ef1872c5a78770970c14d26fc0e4e -r49271f2bd039c9d15586c7c9b2f57f80c801d819 --- sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision e81e290cc55ef1872c5a78770970c14d26fc0e4e) +++ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 49271f2bd039c9d15586c7c9b2f57f80c801d819) @@ -221,7 +221,6 @@ text : model.title unitText : model.unit contentArea.anchors.leftMargin : width * 0.25 - row : index min : model.min ?? 0 max : model.max ?? 0 step : model.step ?? 0 @@ -243,6 +242,10 @@ onGrabbedChanged: { _listView.interactive = ! grabbed } + + onDidChange: function (vValue) { + vInstitutionalRecord.clearRejectionReason( index , vValue ) + } } ScrollBar { flickable: _listView } Index: sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp =================================================================== diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r49271f2bd039c9d15586c7c9b2f57f80c801d819 --- sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp (.../VAdjustmentAdvancedInstitutionalRecord.cpp) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b) +++ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp (.../VAdjustmentAdvancedInstitutionalRecord.cpp) (revision 49271f2bd039c9d15586c7c9b2f57f80c801d819) @@ -37,28 +37,6 @@ void View::VAdjustmentAdvancedInstitutionalRecord::onActionReceive(const AdjustAdvancedInstitutionalRecordResponseData &vData) { adjustment_Accepted ( vData.mAccepted ); - minRORejectionRatioAlarmMinRejectionReason ( vData.mMinRORejectionRatioAlarmMinRejectionReason ); - minRORejectionRatioAlarmMaxRejectionReason ( vData.mMinRORejectionRatioAlarmMaxRejectionReason ); - minRORejectionRatioAlarmDefRejectionReason ( vData.mMinRORejectionRatioAlarmDefRejectionReason ); - disinfectionFrequencyMinRejectionReason ( vData.mDisinfectionFrequencyMinRejectionReason ); - disinfectionFrequencyMaxRejectionReason ( vData.mDisinfectionFrequencyMaxRejectionReason ); - disinfectionFrequencyDefRejectionReason ( vData.mDisinfectionFrequencyDefRejectionReason ); - disinfectionParametersCycleTimeMinRejectionReason ( vData.mDisinfectionParametersCycleTimeMinRejectionReason ); - disinfectionParametersCycleTimeMaxRejectionReason ( vData.mDisinfectionParametersCycleTimeMaxRejectionReason ); - disinfectionParametersCycleTimeDefRejectionReason ( vData.mDisinfectionParametersCycleTimeDefRejectionReason ); - maxBloodPumpStopTimeMinRejectionReason ( vData.mMaxBloodPumpStopTimeMinRejectionReason ); - maxBloodPumpStopTimeMaxRejectionReason ( vData.mMaxBloodPumpStopTimeMaxRejectionReason ); - maxBloodPumpStopTimeDefRejectionReason ( vData.mMaxBloodPumpStopTimeDefRejectionReason ); - inletWaterCondLowThresholdMinRejectionReason ( vData.mInletWaterCondLowThresholdMinRejectionReason ); - inletWaterCondLowThresholdMaxRejectionReason ( vData.mInletWaterCondLowThresholdMaxRejectionReason ); - inletWaterCondLowThresholdDefRejectionReason ( vData.mInletWaterCondLowThresholdDefRejectionReason ); - inletWaterCondHighThresholdMinRejectionReason ( vData.mInletWaterCondHighThresholdMinRejectionReason ); - inletWaterCondHighThresholdMaxRejectionReason ( vData.mInletWaterCondHighThresholdMaxRejectionReason ); - inletWaterCondHighThresholdDefRejectionReason ( vData.mInletWaterCondHighThresholdDefRejectionReason ); - chlorineWaterSampleCheckMinRejectionReason ( vData.mChlorineWaterSampleCheckMinRejectionReason ); - chlorineWaterSampleCheckMaxRejectionReason ( vData.mChlorineWaterSampleCheckMaxRejectionReason ); - chlorineWaterSampleCheckDefRejectionReason ( vData.mChlorineWaterSampleCheckDefRejectionReason ); - waterSampleTestResultRequiredDefRejectionReason ( vData.mWaterSampleTestResultRequiredDefRejectionReason ); // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the Previous values before being set. *** Index: sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h =================================================================== diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r49271f2bd039c9d15586c7c9b2f57f80c801d819 --- sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h (.../VAdjustmentAdvancedInstitutionalRecord.h) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b) +++ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h (.../VAdjustmentAdvancedInstitutionalRecord.h) (revision 49271f2bd039c9d15586c7c9b2f57f80c801d819) @@ -49,30 +49,6 @@ RANGEVALUESET( quint32 , chlorineWaterSampleCheck , 0) RANGEVALUESET( quint32 , waterSampleTestResultRequired , 0) - // rejection reasons - TRIGGER(quint32 , minRORejectionRatioAlarmMinRejectionReason , 0) - TRIGGER(quint32 , minRORejectionRatioAlarmMaxRejectionReason , 0) - TRIGGER(quint32 , minRORejectionRatioAlarmDefRejectionReason , 0) - TRIGGER(quint32 , disinfectionFrequencyMinRejectionReason , 0) - TRIGGER(quint32 , disinfectionFrequencyMaxRejectionReason , 0) - TRIGGER(quint32 , disinfectionFrequencyDefRejectionReason , 0) - TRIGGER(quint32 , disinfectionParametersCycleTimeMinRejectionReason , 0) - TRIGGER(quint32 , disinfectionParametersCycleTimeMaxRejectionReason , 0) - TRIGGER(quint32 , disinfectionParametersCycleTimeDefRejectionReason , 0) - TRIGGER(quint32 , maxBloodPumpStopTimeMinRejectionReason , 0) - TRIGGER(quint32 , maxBloodPumpStopTimeMaxRejectionReason , 0) - TRIGGER(quint32 , maxBloodPumpStopTimeDefRejectionReason , 0) - TRIGGER(quint32 , inletWaterCondLowThresholdMinRejectionReason , 0) - TRIGGER(quint32 , inletWaterCondLowThresholdMaxRejectionReason , 0) - TRIGGER(quint32 , inletWaterCondLowThresholdDefRejectionReason , 0) - TRIGGER(quint32 , inletWaterCondHighThresholdMinRejectionReason , 0) - TRIGGER(quint32 , inletWaterCondHighThresholdMaxRejectionReason , 0) - TRIGGER(quint32 , inletWaterCondHighThresholdDefRejectionReason , 0) - TRIGGER(quint32 , chlorineWaterSampleCheckMinRejectionReason , 0) - TRIGGER(quint32 , chlorineWaterSampleCheckMaxRejectionReason , 0) - TRIGGER(quint32 , chlorineWaterSampleCheckDefRejectionReason , 0) - TRIGGER(quint32 , waterSampleTestResultRequiredDefRejectionReason , 0) - VIEW_DEC_CLASS_ADJUSTMENT(VAdjustmentAdvancedInstitutionalRecord, AdjustAdvancedInstitutionalRecordResponseData) public slots: Index: sources/view/settings/VAdvancedInstitutionalRecord.cpp =================================================================== diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r49271f2bd039c9d15586c7c9b2f57f80c801d819 --- sources/view/settings/VAdvancedInstitutionalRecord.cpp (.../VAdvancedInstitutionalRecord.cpp) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b) +++ sources/view/settings/VAdvancedInstitutionalRecord.cpp (.../VAdvancedInstitutionalRecord.cpp) (revision 49271f2bd039c9d15586c7c9b2f57f80c801d819) @@ -18,43 +18,170 @@ #include "GuiController.h" #include "format.h" - VIEW_DEF_CLASS_ADJUSTMENT(VAdvancedInstitutionalRecord) void View::VAdvancedInstitutionalRecord::initConnections() { ADJUST_VIEW_CONNECTION(AdvancedInstitutionalRequestData) ACTION_VIEW_CONNECTION(AdvancedInstitutionalRecordResponseData) + ACTION_VIEW_CONNECTION(SettingsData); + ACTION_VIEW_CONNECTION(AdjustAdvancedInstitutionalRecordResponseData) + + _institutionalList.setRoleNames({ + { eRole_Title , "title" }, + { eRole_Units , "unit" }, + { eRole_Min , "min" }, + { eRole_Max , "max" }, + { eRole_Step , "step" }, + { eRole_Decimal , "decimal" }, + { eRole_MinVal , "minVal" }, + { eRole_MaxVal , "maxVal" }, + { eRole_DefVal , "defVal" }, + { eRole_RejectionMin , "rejectionMin" }, + { eRole_RejectionMax , "rejectionMax" }, + { eRole_RejectionDef , "rejectionDef" }, + }); + + initModel(); } void View::VAdvancedInstitutionalRecord::onActionReceive(const AdvancedInstitutionalRecordResponseData &vData) { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - minRORejectionRatioAlarmMin ( vData.mMinRORejectionRatioAlarmMin ); - minRORejectionRatioAlarmMax ( vData.mMinRORejectionRatioAlarmMax ); - minRORejectionRatioAlarmDef ( vData.mMinRORejectionRatioAlarmDef ); - disinfectionFrequencyMin ( vData.mDisinfectionFrequencyMin ); - disinfectionFrequencyMax ( vData.mDisinfectionFrequencyMax ); - disinfectionFrequencyDef ( vData.mDisinfectionFrequencyDef ); - disinfectionParametersCycleTimeMin ( vData.mDisinfectionParametersCycleTimeMin ); - disinfectionParametersCycleTimeMax ( vData.mDisinfectionParametersCycleTimeMax ); - disinfectionParametersCycleTimeDef ( vData.mDisinfectionParametersCycleTimeDef ); - maxBloodPumpStopTimeMin ( vData.mMaxBloodPumpStopTimeMin ); - maxBloodPumpStopTimeMax ( vData.mMaxBloodPumpStopTimeMax ); - maxBloodPumpStopTimeDef ( vData.mMaxBloodPumpStopTimeDef ); - inletWaterCondLowThresholdMin ( vData.mInletWaterCondLowThresholdMin ); - inletWaterCondLowThresholdMax ( vData.mInletWaterCondLowThresholdMax ); - inletWaterCondLowThresholdDef ( vData.mInletWaterCondLowThresholdDef ); - inletWaterCondHighThresholdMin ( vData.mInletWaterCondHighThresholdMin ); - inletWaterCondHighThresholdMax ( vData.mInletWaterCondHighThresholdMax ); - inletWaterCondHighThresholdDef ( vData.mInletWaterCondHighThresholdDef ); - chlorineWaterSampleCheckMin ( vData.mChlorineWaterSampleCheckMin ); - chlorineWaterSampleCheckMax ( vData.mChlorineWaterSampleCheckMax ); - chlorineWaterSampleCheckDef ( vData.mChlorineWaterSampleCheckDef ); - waterSampleTestResultRequiredDef ( vData.mWaterSampleTestResultRequiredDef ); + _institutionalList.updateData( MinRoRejectionRatio, eRole_MinVal, vData.mMinRORejectionRatioAlarmMin ); + _institutionalList.updateData( MinRoRejectionRatio, eRole_MaxVal, vData.mMinRORejectionRatioAlarmMax ); + _institutionalList.updateData( MinRoRejectionRatio, eRole_DefVal, vData.mMinRORejectionRatioAlarmDef ); + _institutionalList.updateData( DisinfectionFrequency, eRole_MinVal, vData.mDisinfectionFrequencyMin ); + _institutionalList.updateData( DisinfectionFrequency, eRole_MaxVal, vData.mDisinfectionFrequencyMax ); + _institutionalList.updateData( DisinfectionFrequency, eRole_DefVal, vData.mDisinfectionFrequencyDef ); + _institutionalList.updateData( DisinfectionParametersCycleTime, eRole_MinVal, vData.mDisinfectionParametersCycleTimeMin ); + _institutionalList.updateData( DisinfectionParametersCycleTime, eRole_MaxVal, vData.mDisinfectionParametersCycleTimeMax ); + _institutionalList.updateData( DisinfectionParametersCycleTime, eRole_DefVal, vData.mDisinfectionParametersCycleTimeDef ); + _institutionalList.updateData( MaxBloodPumpStopTime, eRole_MinVal, vData.mMaxBloodPumpStopTimeMin ); + _institutionalList.updateData( MaxBloodPumpStopTime, eRole_MaxVal, vData.mMaxBloodPumpStopTimeMax ); + _institutionalList.updateData( MaxBloodPumpStopTime, eRole_DefVal, vData.mMaxBloodPumpStopTimeDef ); + _institutionalList.updateData( InletWaterCondLowThreshold, eRole_MinVal, vData.mInletWaterCondLowThresholdMin ); + _institutionalList.updateData( InletWaterCondLowThreshold, eRole_MaxVal, vData.mInletWaterCondLowThresholdMax ); + _institutionalList.updateData( InletWaterCondLowThreshold, eRole_DefVal, vData.mInletWaterCondLowThresholdDef ); + _institutionalList.updateData( InletWaterCondHighThreshold, eRole_MinVal, vData.mInletWaterCondHighThresholdMin ); + _institutionalList.updateData( InletWaterCondHighThreshold, eRole_MaxVal, vData.mInletWaterCondHighThresholdMax ); + _institutionalList.updateData( InletWaterCondHighThreshold, eRole_DefVal, vData.mInletWaterCondHighThresholdDef ); + _institutionalList.updateData( ChlorineWaterSampleCheck, eRole_MinVal, vData.mChlorineWaterSampleCheckMin ); + _institutionalList.updateData( ChlorineWaterSampleCheck, eRole_MaxVal, vData.mChlorineWaterSampleCheckMax ); + _institutionalList.updateData( ChlorineWaterSampleCheck, eRole_DefVal, vData.mChlorineWaterSampleCheckDef ); + _institutionalList.updateData( WaterSampleTestResultRequired, eRole_MinVal, None ); + _institutionalList.updateData( WaterSampleTestResultRequired, eRole_MaxVal, None ); + _institutionalList.updateData( WaterSampleTestResultRequired, eRole_DefVal, vData.mWaterSampleTestResultRequiredDef ); + // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the Previous values before being set. *** adjustment ( true ); } + +void View::VAdvancedInstitutionalRecord::initModel() +{ + _institutionalList.insertRow( MinRoRejectionRatio, {{ eRole_Title, tr("Minimum RO Rejection Ratio Alarm" )}, { eRole_Units, tr("% reject" ) }, { eRole_Decimal, 0 }}); + _institutionalList.insertRow( DisinfectionFrequency, {{ eRole_Title, tr("Disinfection Frequency" )}, { eRole_Units, tr("days between cycles") }, { eRole_Decimal, 0 }}); + _institutionalList.insertRow( DisinfectionParametersCycleTime, {{ eRole_Title, tr("Disinfection Parameters, Cycle Time")}, { eRole_Units, tr("Time" ) }, { eRole_Decimal, 0 }}); + _institutionalList.insertRow( MaxBloodPumpStopTime, {{ eRole_Title, tr("Maximum Blood Pump Stop Time" )}, { eRole_Units, tr("min" ) }, { eRole_Decimal, 0 }}); + _institutionalList.insertRow( InletWaterCondLowThreshold, {{ eRole_Title, tr("Inlet Water Cond. Low Threshold" )}, { eRole_Units, tr("uS/cm" ) }, { eRole_Decimal, 0 }}); + _institutionalList.insertRow( InletWaterCondHighThreshold, {{ eRole_Title, tr("Inlet Water Cond. High Threshold" )}, { eRole_Units, tr("uS/cm" ) }, { eRole_Decimal, 0 }}); + _institutionalList.insertRow( ChlorineWaterSampleCheck, {{ eRole_Title, tr("Chlorine Water Sample Check" )}, { eRole_Units, tr("min" ) }, { eRole_Decimal, 0 }}); + _institutionalList.insertRow( WaterSampleTestResultRequired, {{ eRole_Title, tr("Water Sample Test Result Required" )}, { eRole_Units, tr("" ) }, { eRole_Decimal, 0 }}); +} + +void View::VAdvancedInstitutionalRecord::onActionReceive(const AdjustAdvancedInstitutionalRecordResponseData &vData) +{ + _institutionalList.updateData( MinRoRejectionRatio, eRole_RejectionMin, vData.mMinRORejectionRatioAlarmMinRejectionReason ); + _institutionalList.updateData( MinRoRejectionRatio, eRole_RejectionMax, vData.mMinRORejectionRatioAlarmMaxRejectionReason ); + _institutionalList.updateData( MinRoRejectionRatio, eRole_RejectionDef, vData.mMinRORejectionRatioAlarmDefRejectionReason ); + _institutionalList.updateData( DisinfectionFrequency, eRole_RejectionMin, vData.mDisinfectionFrequencyMinRejectionReason ); + _institutionalList.updateData( DisinfectionFrequency, eRole_RejectionMax, vData.mDisinfectionFrequencyMaxRejectionReason ); + _institutionalList.updateData( DisinfectionFrequency, eRole_RejectionDef, vData.mDisinfectionFrequencyDefRejectionReason ); + _institutionalList.updateData( DisinfectionParametersCycleTime, eRole_RejectionMin, vData.mDisinfectionParametersCycleTimeMinRejectionReason ); + _institutionalList.updateData( DisinfectionParametersCycleTime, eRole_RejectionMax, vData.mDisinfectionParametersCycleTimeMaxRejectionReason ); + _institutionalList.updateData( DisinfectionParametersCycleTime, eRole_RejectionDef, vData.mDisinfectionParametersCycleTimeDefRejectionReason ); + _institutionalList.updateData( MaxBloodPumpStopTime, eRole_RejectionMin, vData.mMaxBloodPumpStopTimeMinRejectionReason ); + _institutionalList.updateData( MaxBloodPumpStopTime, eRole_RejectionMax, vData.mMaxBloodPumpStopTimeMaxRejectionReason ); + _institutionalList.updateData( MaxBloodPumpStopTime, eRole_RejectionDef, vData.mMaxBloodPumpStopTimeDefRejectionReason ); + _institutionalList.updateData( InletWaterCondLowThreshold, eRole_RejectionMin, vData.mInletWaterCondLowThresholdMinRejectionReason ); + _institutionalList.updateData( InletWaterCondLowThreshold, eRole_RejectionMax, vData.mInletWaterCondLowThresholdMaxRejectionReason ); + _institutionalList.updateData( InletWaterCondLowThreshold, eRole_RejectionDef, vData.mInletWaterCondLowThresholdDefRejectionReason ); + _institutionalList.updateData( InletWaterCondHighThreshold, eRole_RejectionMin, vData.mInletWaterCondHighThresholdMinRejectionReason ); + _institutionalList.updateData( InletWaterCondHighThreshold, eRole_RejectionMax, vData.mInletWaterCondHighThresholdMaxRejectionReason ); + _institutionalList.updateData( InletWaterCondHighThreshold, eRole_RejectionDef, vData.mInletWaterCondHighThresholdDefRejectionReason ); + _institutionalList.updateData( ChlorineWaterSampleCheck, eRole_RejectionMin, vData.mChlorineWaterSampleCheckMinRejectionReason ); + _institutionalList.updateData( ChlorineWaterSampleCheck, eRole_RejectionMax, vData.mChlorineWaterSampleCheckMaxRejectionReason ); + _institutionalList.updateData( ChlorineWaterSampleCheck, eRole_RejectionDef, vData.mChlorineWaterSampleCheckDefRejectionReason ); + _institutionalList.updateData( WaterSampleTestResultRequired, eRole_RejectionDef, vData.mWaterSampleTestResultRequiredDefRejectionReason ); +} + +void View::VAdvancedInstitutionalRecord::onActionReceive(const SettingsData &) +{ + QString mCategory = Storage::Settings_Category_DataList; + bool isConfigsOk = true; // assume configurations are valid + + FROMVARIANT_WITHRETURN ( minRORejectionRatioAlarmMin , "Minimum RO Rejection Ratio Alarm" , "Min_RO_Rejection_Ratio_Alarm_Min" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( minRORejectionRatioAlarmMax , "Minimum RO Rejection Ratio Alarm" , "Min_RO_Rejection_Ratio_Alarm_Max" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( minRORejectionRatioAlarmRes , "Minimum RO Rejection Ratio Alarm" , "Min_RO_Rejection_Ratio_Alarm_Res" , Int , isConfigsOk ); + _institutionalList.updateData ( MinRoRejectionRatio, eRole_Min, _minRORejectionRatioAlarmMin ); + _institutionalList.updateData ( MinRoRejectionRatio, eRole_Max, _minRORejectionRatioAlarmMax ); + _institutionalList.updateData ( MinRoRejectionRatio, eRole_Step, _minRORejectionRatioAlarmRes ); + + FROMVARIANT_WITHRETURN ( disinfectionFrequencyMin , "Disinfection Frequency" , "Disinfection_Frequency_Min" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( disinfectionFrequencyMax , "Disinfection Frequency" , "Disinfection_Frequency_Max" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( disinfectionFrequencyRes , "Disinfection Frequency" , "Disinfection_Frequency_Res" , Int , isConfigsOk ); + _institutionalList.updateData ( DisinfectionFrequency, eRole_Min, _disinfectionFrequencyMin ); + _institutionalList.updateData ( DisinfectionFrequency, eRole_Max, _disinfectionFrequencyMax ); + _institutionalList.updateData ( DisinfectionFrequency, eRole_Step, _disinfectionFrequencyRes ); + + FROMVARIANT_WITHRETURN ( disinfectionParametersCycleTimeMin, "Disinfection Parameters Cycle Time" , "Disinfection_Parameters_Cycle_Time_Min", Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( disinfectionParametersCycleTimeMax, "Disinfection Parameters Cycle Time" , "Disinfection_Parameters_Cycle_Time_Max", Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( disinfectionParametersCycleTimeRes, "Disinfection Parameters Cycle Time" , "Disinfection_Parameters_Cycle_Time_Res", Int , isConfigsOk ); + _institutionalList.updateData ( DisinfectionParametersCycleTime, eRole_Min, _disinfectionParametersCycleTimeMin ); + _institutionalList.updateData ( DisinfectionParametersCycleTime, eRole_Max, _disinfectionParametersCycleTimeMax ); + _institutionalList.updateData ( DisinfectionParametersCycleTime, eRole_Step, _disinfectionParametersCycleTimeRes ); + + FROMVARIANT_WITHRETURN ( maxBloodPumpStopTimeMin , "Maximum Blood Pump Stop Time" , "Max_Blood_Pump_Stop_Time_Min" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( maxBloodPumpStopTimeMax , "Maximum Blood Pump Stop Time" , "Max_Blood_Pump_Stop_Time_Max" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( maxBloodPumpStopTimeRes , "Maximum Blood Pump Stop Time" , "Max_Blood_Pump_Stop_Time_Res" , Int , isConfigsOk ); + _institutionalList.updateData ( MaxBloodPumpStopTime, eRole_Min, _maxBloodPumpStopTimeMin ); + _institutionalList.updateData ( MaxBloodPumpStopTime, eRole_Max, _maxBloodPumpStopTimeMax ); + _institutionalList.updateData ( MaxBloodPumpStopTime, eRole_Step, _maxBloodPumpStopTimeRes ); + + FROMVARIANT_WITHRETURN ( inletWaterCondLowThresholdMin , "Inlet Water Cond. Low Threshold" , "Inlet_Water_Cond_Low_Threshold_Min" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( inletWaterCondLowThresholdMax , "Inlet Water Cond. Low Threshold" , "Inlet_Water_Cond_Low_Threshold_Max" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( inletWaterCondLowThresholdRes , "Inlet Water Cond. Low Threshold" , "Inlet_Water_Cond_Low_Threshold_Res" , Int , isConfigsOk ); + _institutionalList.updateData ( InletWaterCondLowThreshold, eRole_Min, _inletWaterCondLowThresholdMin ); + _institutionalList.updateData ( InletWaterCondLowThreshold, eRole_Max, _inletWaterCondLowThresholdMax ); + _institutionalList.updateData ( InletWaterCondLowThreshold, eRole_Step, _inletWaterCondLowThresholdRes ); + + FROMVARIANT_WITHRETURN ( inletWaterCondHighThresholdMin , "Inlet Water Cond. High Threshold" , "Inlet_Water_Cond_High_Threshold_Min" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( inletWaterCondHighThresholdMax , "Inlet Water Cond. High Threshold" , "Inlet_Water_Cond_High_Threshold_Max" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( inletWaterCondHighThresholdRes , "Inlet Water Cond. High Threshold" , "Inlet_Water_Cond_High_Threshold_Res" , Int , isConfigsOk ); + _institutionalList.updateData ( InletWaterCondHighThreshold, eRole_Min, _inletWaterCondHighThresholdMin ); + _institutionalList.updateData ( InletWaterCondHighThreshold, eRole_Max, _inletWaterCondHighThresholdMax ); + _institutionalList.updateData ( InletWaterCondHighThreshold, eRole_Step, _inletWaterCondHighThresholdRes ); + + FROMVARIANT_WITHRETURN ( chlorineWaterSampleCheckMin , "Chlorine Water Sample Check" , "Chlorine_Water_Sample_Check_Min" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( chlorineWaterSampleCheckMax , "Chlorine Water Sample Check" , "Chlorine_Water_Sample_Check_Max" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( chlorineWaterSampleCheckRes , "Chlorine Water Sample Check" , "Chlorine_Water_Sample_Check_Res" , Int , isConfigsOk ); + _institutionalList.updateData ( ChlorineWaterSampleCheck, eRole_Min, _chlorineWaterSampleCheckMin ); + _institutionalList.updateData ( ChlorineWaterSampleCheck, eRole_Max, _chlorineWaterSampleCheckMax ); + _institutionalList.updateData ( ChlorineWaterSampleCheck, eRole_Step, _chlorineWaterSampleCheckRes ); + + _institutionalList.updateData ( WaterSampleTestResultRequired, eRole_Min, None ); + _institutionalList.updateData ( WaterSampleTestResultRequired, eRole_Max, None ); + _institutionalList.updateData ( WaterSampleTestResultRequired, eRole_Step, None ); +} + +void View::VAdvancedInstitutionalRecord::clearRejectionReason(const int &vRow, const int &vRange) +{ + int role = vRange == Min ? eRole_RejectionMin : + vRange == Max ? eRole_RejectionMax : + vRange == Def ? eRole_RejectionDef : -1; + + _institutionalList.updateData(vRow, role, 0); +} Index: sources/view/settings/VAdvancedInstitutionalRecord.h =================================================================== diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r49271f2bd039c9d15586c7c9b2f57f80c801d819 --- sources/view/settings/VAdvancedInstitutionalRecord.h (.../VAdvancedInstitutionalRecord.h) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b) +++ sources/view/settings/VAdvancedInstitutionalRecord.h (.../VAdvancedInstitutionalRecord.h) (revision 49271f2bd039c9d15586c7c9b2f57f80c801d819) @@ -23,7 +23,10 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" +#include "MListModel.h" +#include "MSettings.h" #include "MTDAdvancedInstitutionalRecordResponse.h" +#include "MAdjustTDAdvancedInstitutionalRecordResponse.h" namespace View { @@ -40,6 +43,39 @@ // friends friend class ::tst_views; + enum { + None = -1, + Min = 0 , + Max = 1 , + Def = 2 , + } Range; + + enum { + eRole_Title = Qt::UserRole , + eRole_Units , + eRole_Min , + eRole_Max , + eRole_Step , + eRole_Decimal , + eRole_MinVal , + eRole_MaxVal , + eRole_DefVal , + eRole_RejectionMin , + eRole_RejectionMax , + eRole_RejectionDef , + } DataRole; + + enum { + MinRoRejectionRatio , + DisinfectionFrequency , + DisinfectionParametersCycleTime , + MaxBloodPumpStopTime , + InletWaterCondLowThreshold , + InletWaterCondHighThreshold , + ChlorineWaterSampleCheck , + WaterSampleTestResultRequired + } Records; + const QStringList _titles { tr("Minimum RO Rejection Ratio Alarm" ), tr("Disinfection Frequency" ), @@ -75,23 +111,28 @@ RANGESET( quint32 , chlorineWaterSampleCheck , 0) RANGESET( quint32 , waterSampleTestResultRequired , 0) - PROPERTY(QStringList , parametersTitle , titles()) - PROPERTY(QStringList , parametersUnit , units ()) + Q_PROPERTY(MListModel* model READ model NOTIFY didModelChange) - VIEW_DEC_CLASS_ADJUSTMENT(VAdvancedInstitutionalRecord, AdvancedInstitutionalRecordResponseData) + VIEW_DEC_CLASS_ADJUSTMENT(VAdvancedInstitutionalRecord, AdvancedInstitutionalRecordResponseData ) + VIEW_DEC_SLOT(SettingsData ) + VIEW_DEC_SLOT(AdjustAdvancedInstitutionalRecordResponseData ) private: - QStringList titles() { return _titles; } - QStringList units () { return _units ; } + MListModel* model () { return &_institutionalList; } + MListModel _institutionalList; + void initModel(); public slots: void doAdjustment() { AdvancedInstitutionalRequestData data; emit didAdjustment(data); } + void clearRejectionReason(const int &vRow, const int &vRange); + signals: void didAdjustment(const AdvancedInstitutionalRequestData &vData); + void didModelChange(); }; } Index: sources/view/settings/VInstitutionalRecord.cpp =================================================================== diff -u -re81e290cc55ef1872c5a78770970c14d26fc0e4e -r49271f2bd039c9d15586c7c9b2f57f80c801d819 --- sources/view/settings/VInstitutionalRecord.cpp (.../VInstitutionalRecord.cpp) (revision e81e290cc55ef1872c5a78770970c14d26fc0e4e) +++ sources/view/settings/VInstitutionalRecord.cpp (.../VInstitutionalRecord.cpp) (revision 49271f2bd039c9d15586c7c9b2f57f80c801d819) @@ -267,18 +267,6 @@ _institutionalList.updateData ( UFVolume, eRole_Max, _ultrafiltrationVolumeMax ); _institutionalList.updateData ( UFVolume, eRole_Step, _ultrafiltrationVolumeRes ); - dialyzerTypeOptions ( _Settings.keys(mCategory , "Dialyzer Type Options" )); - bloodPressureMeasureInterval ( _Settings.keys(mCategory , "Vitals Measurement Interval Options" )); - treatmentModalityOptions ( _Settings.keys(mCategory , "Treatment Modality" )); - hdfTreatmentModeOptions ( _Settings.keys(mCategory , "HDF Treatment Mode" )); - dryBicabCartridgeSizeOptions ( _Settings.keys(mCategory , "Dry Bicarb Cartridge Size" )); - - isConfigsOk = isConfigsOk && !_dialyzerTypeOptions .isEmpty(); - isConfigsOk = isConfigsOk && !_bloodPressureMeasureInterval .isEmpty(); - isConfigsOk = isConfigsOk && !_treatmentModalityOptions .isEmpty(); - isConfigsOk = isConfigsOk && !_hdfTreatmentModeOptions .isEmpty(); - isConfigsOk = isConfigsOk && !_dryBicabCartridgeSizeOptions .isEmpty(); - FROMVARIANT_WITHRETURN ( rinsebackVolumeMin , "Rinseback Volume Ranges" , "Rinseback_Volume_Min" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( rinsebackVolumeMax , "Rinseback Volume Ranges" , "Rinseback_Volume_Max" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( rinsebackVolumeRes , "Rinseback Volume Ranges" , "Rinseback_Volume_Res" , UInt , isConfigsOk ); Index: sources/view/settings/VInstitutionalRecord.h =================================================================== diff -u -re81e290cc55ef1872c5a78770970c14d26fc0e4e -r49271f2bd039c9d15586c7c9b2f57f80c801d819 --- sources/view/settings/VInstitutionalRecord.h (.../VInstitutionalRecord.h) (revision e81e290cc55ef1872c5a78770970c14d26fc0e4e) +++ sources/view/settings/VInstitutionalRecord.h (.../VInstitutionalRecord.h) (revision 49271f2bd039c9d15586c7c9b2f57f80c801d819) @@ -109,17 +109,10 @@ RANGESET( qint32 , venousPressureLimitAsymtrc , 0) RANGESET( qint32 , trancembrncPressureLimitWindow , 0) RANGESET( float , ultrafiltrationVolume , 0) - READONLY( QStringList , bloodPressureMeasureInterval ,{}) RANGESET( quint32 , rinsebackVolume , 0) RANGESET( quint32 , rinsebackFlowRate , 0) RANGESET( float , substitutionVolume , 0) - // TODO: enhancement - READONLY( QStringList , treatmentModalityOptions ,{}) - READONLY( QStringList , hdfTreatmentModeOptions ,{}) - READONLY( QStringList , dryBicabCartridgeSizeOptions ,{}) - READONLY( QStringList , dialyzerTypeOptions ,{}) - Q_PROPERTY(MListModel* model READ model NOTIFY didModelChange) VIEW_DEC_CLASS_ADJUSTMENT(VInstitutionalRecord, InstitutionalRecordResponseData )