Index: leahi.pro
===================================================================
diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r232dc65ad1d642f750547db6c480da534704a2c4
--- leahi.pro (.../leahi.pro) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b)
+++ leahi.pro (.../leahi.pro) (revision 232dc65ad1d642f750547db6c480da534704a2c4)
@@ -249,6 +249,8 @@
sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.h \
\ # ---------- Models - DD - Adjustment - Settings
sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.h \
+ \ # ---------- Models - TD - Adjustment - End-Treatment
+ sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.h \
\ # ---------- Models - confirm
sources/model/confirm/MDuetConfirmHDi.h \
\ # ---------- Models - POST
@@ -300,7 +302,6 @@
\ # ---------- Models - HD - Adjustment - End-Treatment
sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h \
sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h \
- sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.h \
\ # ---------- Models - HD - Adjustment - Post-Treatment
sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h \
sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \
@@ -566,6 +567,8 @@
sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \
sources/model/td/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \
+ \ # ---------- Models - TD - Adjustment - End-Treatment
+ sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.cpp \
\ # ---------- Models - CONFIRM
sources/model/confirm/MDuetConfirmHDi.cpp \
\ # ---------- Models - POST
@@ -620,7 +623,6 @@
\ # ---------- Models - HD - Adjustment - End-Treatment
sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp \
sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \
- sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp \
\ # ---------- Models - HD - Adjustment - Post-Treatment
sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp \
sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp \
Index: leahi.qrc
===================================================================
diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r232dc65ad1d642f750547db6c480da534704a2c4
--- leahi.qrc (.../leahi.qrc) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b)
+++ leahi.qrc (.../leahi.qrc) (revision 232dc65ad1d642f750547db6c480da534704a2c4)
@@ -27,6 +27,7 @@
sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml
sources/gui/qml/pages/settings/SettingsLocalization.qml
sources/gui/qml/pages/settings/SettingsUserMode.qml
+ sources/gui/qml/pages/settings/SettingsFeatureConfigurations.qml
sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml
@@ -36,6 +37,7 @@
sources/gui/qml/dialogs/AlarmListDialog.qml
sources/gui/qml/dialogs/LockDialog.qml
sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml
+ sources/gui/qml/dialogs/EndTreatmentDialog.qml
sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml
@@ -106,6 +108,7 @@
resources/images/Vitals_Red.png
resources/images/check_green.png
resources/images/eye_closed.png
+ resources/images/complete_check.png
sources/gui/qml/components/MainMenu.qml
@@ -169,6 +172,7 @@
sources/gui/qml/components/PasswordRequirements.qml
sources/gui/qml/components/BaseSwitch.qml
sources/gui/qml/components/IdleTimer.qml
+ sources/gui/qml/components/TreatmentCompleteButton.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r232dc65ad1d642f750547db6c480da534704a2c4
--- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b)
+++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 232dc65ad1d642f750547db6c480da534704a2c4)
@@ -405,10 +405,9 @@
* \param vData - Data model contains treatment end adjustment state.
* \return void
*/
-void MessageDispatcher::onAdjustment(const AdjustTreatmentEndRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustTreatmentEndRequestData &)
{
QVariantList mData;
- mData += vData.requestedState;
onActionTransmit(GuiActionType::ID_AdjustTreatmentEndReq, mData);
}
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r232dc65ad1d642f750547db6c480da534704a2c4
--- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b)
+++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 232dc65ad1d642f750547db6c480da534704a2c4)
@@ -234,7 +234,7 @@
{Gui::GuiActionType::ID_AdjustRecirculateRsp , 2 * 4 }, // 2 parameters each 4bytes
// ---- Treatment End
- {Gui::GuiActionType::ID_AdjustTreatmentEndReq , 1 * 4 }, // 1 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustTreatmentEndReq , 0 * 4 }, // 1 parameter each 4bytes
{Gui::GuiActionType::ID_AdjustTreatmentEndRsp , 2 * 4 }, // 2 parameters each 4bytes
// ---- Post-Treatment
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r232dc65ad1d642f750547db6c480da534704a2c4
--- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b)
+++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 232dc65ad1d642f750547db6c480da534704a2c4)
@@ -261,7 +261,7 @@
// End-Treatment
case Gui::GuiActionType::ID_AdjustRinsebackReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRinsebackRequestData ); break;
case Gui::GuiActionType::ID_AdjustRecirculateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData ); break;
- case Gui::GuiActionType::ID_AdjustTreatmentEndReq : INTERPRET_TRANSMIT_MESSAGE(AdjustTreatmentEndRequestData ); break;
+ case Gui::GuiActionType::ID_AdjustTreatmentEndReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentEndRequestData ); break;
// Post-Treatment
case Gui::GuiActionType::ID_AdjustPatientDisconnectNotifyReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionNotifyRequestData ); break;
case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionConfirmRequestData ); break;
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r232dc65ad1d642f750547db6c480da534704a2c4
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 232dc65ad1d642f750547db6c480da534704a2c4)
@@ -82,7 +82,7 @@
ID_DuetConfirmUIr = 0xBB00, // 187
// POST
- ID_HDPostSingleResultData = 0x8E00, // 142
+ ID_HDPostSingleResultData = 0x8E0F, // 142 //// ----- @CRAPIZED: had to change to avoid duplication
ID_HDPostFinalResultData = 0x8F00, // 143
ID_DGPostSingleResultData = 0x9000, // 144
ID_DGPostFinalResultData = 0x9100, // 145
@@ -275,8 +275,8 @@
ID_AdjustRecirculateRsp = 0x5500, // 85
// Treatment End
- ID_AdjustTreatmentEndReq = 0x5700, // 87
- ID_AdjustTreatmentEndRsp = 0x5800, // 88
+ ID_AdjustTreatmentEndReq = 0x8D00, // 141
+ ID_AdjustTreatmentEndRsp = 0x8E00, // 142
// Post-Treatment
// Patient Disconnect
@@ -303,7 +303,7 @@
ID_AdjustDisinfectStartRsp = 0x8000, // 128
ID_AdjustDGCleaningUsageReq = 0xB800, // 184
- ID_AdjustDGCleaningUsageRsp = 0x8D00, // 141
+ ID_AdjustDGCleaningUsageRsp = 0x8D0F, // 141 //// ----- @CRAPIZED: had to change to avoid duplication
// RO Water Input Mode
ID_DuetRoWaterStatDGq = 0xC300, // 195 DG -> UI // DG initiates Status query
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r232dc65ad1d642f750547db6c480da534704a2c4
--- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b)
+++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 232dc65ad1d642f750547db6c480da534704a2c4)
@@ -60,6 +60,7 @@
readonly property color alarmDialogGreyText : "#838080"
readonly property color dialogShadowColor : "#334E759C"
readonly property color dialogValueColor : "#3D8EEF"
+ readonly property color darkDialogColor : "#091E31"
readonly property color backgroundRangeRect : "#3e546e"
readonly property color highlightProgressBar : "#3d8eef"
Index: sources/gui/qml/main.qml
===================================================================
diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r232dc65ad1d642f750547db6c480da534704a2c4
--- sources/gui/qml/main.qml (.../main.qml) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 232dc65ad1d642f750547db6c480da534704a2c4)
@@ -203,7 +203,7 @@
VTreatmentVitals { id: vTreatmentVitals
interval : vTreatmentCreate.bloodPressureMeasureInterval
canStartInterval: vTDOpMode.inTreatment && vTDTreatmentStates.txTreatment
- enableBPCuff : true // TODO: PRS 343 update with enable/disable Integrated Blood Pressure Cuff
+ enableBPCuff : vSettings.integratedBPCuff
onCanStartIntervalChanged : {
if ( vTreatmentVitals.canStartInterval ) { vTreatmentVitals.doTimerStart() }
else { vTreatmentVitals.doTimerStop() }
@@ -360,22 +360,24 @@
// }
}
// keyboard should always be before AlarmItem to not to covet it.
- KeyboardItem { id: _keyboard }
+ KeyboardItem { id: _keyboard }
// Dialogs
- AcidConcentrateAdjustment { id: _acidConcentrateAdjustment }
- HeaderbarPrescription { id: _headerbarPrescription }
- HeaderbarWiFi { id: _headerbarWifi }
- HeaderbarStorage { id: _headerbarStorage }
- HeaderbarSettings { id: _headerbarSettings }
- HeaderbarInformation { id: _headerbarInformation }
+ AcidConcentrateAdjustment { id: _acidConcentrateAdjustment }
+ HeaderbarPrescription { id: _headerbarPrescription }
+ HeaderbarWiFi { id: _headerbarWifi }
+ HeaderbarStorage { id: _headerbarStorage }
+ HeaderbarSettings { id: _headerbarSettings }
+ HeaderbarInformation { id: _headerbarInformation }
TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals }
- LockDialog { id: _lockDialog }
- AlarmItem { id: _alarmItem ; z: 996 }
- PowerItem { id: _powerItem ; z: 997 }
- ConfirmDialog { id: _confirmDialog ; z: 998 }
- DiagnosticsDialog { id: _diagnosticsDialog; z: 999 }
+ EndTreatmentDialog { id: _endTreatmentDialog }
+ LockDialog { id: _lockDialog }
+ AlarmItem { id: _alarmItem ; z: 996 }
+ PowerItem { id: _powerItem ; z: 997 }
+ ConfirmDialog { id: _confirmDialog ; z: 998 }
+ DiagnosticsDialog { id: _diagnosticsDialog; z: 999 }
+
// Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem
// then cannot be anchored.
NotificationBar { id: _alarmBar
Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -rd2c4e611703fcb97794975dbc28f9a030b84bbf0 -r232dc65ad1d642f750547db6c480da534704a2c4
--- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision d2c4e611703fcb97794975dbc28f9a030b84bbf0)
+++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 232dc65ad1d642f750547db6c480da534704a2c4)
@@ -71,6 +71,7 @@
readonly property bool visibleDeviceRegistration : onlyManufacturing && loggedIn
readonly property bool visibleInstitutionalRecord : true
readonly property bool visibleFeatureConfigurations : loggedIn
+ readonly property bool visibleAdvancedInstitutional : loggedIn
readonly property bool visibleLocalization : loggedIn
readonly property bool visibleUserModes : loggedIn
@@ -96,28 +97,30 @@
FactoryReset ,
Decommission ,
InstitutionalRecord ,
+ AdvancedInstitutional ,
UserMode ,
FeatureConfigurations
}
property var itemsText : [
- qsTr("Device Information" ), // Device Information
- qsTr("Volume And Brightness" ), // VolumeBrightness
- qsTr("Wi-Fi" ), // WiFi
- qsTr("Device Cleaning" ), // DGCleaning
- qsTr("DG Scheduling" ), // DGScheduling
- qsTr("Service" ), // servicePassword
- qsTr("Date and Time" ), // SetDateTime
- qsTr("Export Logs" ), // ExportLogs
- qsTr("Language" ), // Localization
- qsTr("Water Input Mode" ), // RoInput
- qsTr("Calibration" ), // Calibration
- qsTr("Device Configuration" ), // Device Configuration
- qsTr("Device Registration" ), // DeviceRegistration
- qsTr("Software Update" ), // SWUpdate
- qsTr("Enable Root SSH" ), // RootSSHAccess
- qsTr("Factory Reset" ), // FactoryReset
- qsTr("Decommissioning" ), // Decommission
- qsTr("Institutional Configurations" ), // Institutional Configurations
+ qsTr("Device Information" ), // Device Information
+ qsTr("Volume And Brightness" ), // VolumeBrightness
+ qsTr("Wi-Fi" ), // WiFi
+ qsTr("Device Cleaning" ), // DGCleaning
+ qsTr("DG Scheduling" ), // DGScheduling
+ qsTr("Service" ), // servicePassword
+ qsTr("Date and Time" ), // SetDateTime
+ qsTr("Export Logs" ), // ExportLogs
+ qsTr("Language" ), // Localization
+ qsTr("Water Input Mode" ), // RoInput
+ qsTr("Calibration" ), // Calibration
+ qsTr("Device Configuration" ), // Device Configuration
+ qsTr("Device Registration" ), // DeviceRegistration
+ qsTr("Software Update" ), // SWUpdate
+ qsTr("Enable Root SSH" ), // RootSSHAccess
+ qsTr("Factory Reset" ), // FactoryReset
+ qsTr("Decommissioning" ), // Decommission
+ qsTr("Institutional Settings" ), // Institutional Configurations
+ qsTr("Advanced Institutional Settings" ), // AdvancedInstitutional
qsTr("User Modes" ), // User Modes
qsTr("Feature Configurations" ), // FeatureConfigurations
]
@@ -141,6 +144,7 @@
visibleFactoryReset , // FactoryReset
visibleDecommission , // Decommission
visibleInstitutionalRecord , // Institutional Record
+ visibleAdvancedInstitutional , // AdvancedInstitutional
visibleUserModes , // User Modes
visibleFeatureConfigurations , // FeatureConfigurations
]
@@ -236,10 +240,15 @@
break
case SettingsStack.InstitutionalRecord:
- vAdjustmentInstitutionalRecord.doAdjustment()
+ vInstitutionalRecord.doAdjustment()
push( _settingsInstitutionalRecord )
break
+ case SettingsStack.AdvancedInstitutional:
+ vAdvancedInstitutionalRecord.doAdjustment()
+ push( _settingsAdvancedInstitutional )
+ break
+
case SettingsStack.FeatureConfigurations:
push( _settingsFeatureConfigurations )
break
@@ -274,9 +283,10 @@
SettingsFactoryReset { id: _serviceFactoryReset }
SettingsDecommission { id: _serviceDecommission }
SettingsInstitutionalRecord { id: _settingsInstitutionalRecord }
- SettingsFeatureConfigurations { id: _settingsFeatureConfigurations}
+ SettingsAdvancedInstitutional { id: _settingsAdvancedInstitutional}
SettingsLocalization { id: _settingLocalization }
SettingsUserMode { id: _settingUserMode }
+ SettingsFeatureConfigurations { id: _settingsFeatureConfigurations}
function gotoServiceMode( vservice ) {
//DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth)
@@ -297,17 +307,6 @@
}
}
- Connections { target: vAdjustmentInstitutionalRecord
- function onAdjustmentTriggered ( vValue ) {
- if ( vAdjustmentInstitutionalRecord.adjustment_Accepted ) {
- _settingsHome.notificationText = ""
- }
- else {
- _settingsHome.notificationText = vAdjustmentInstitutionalRecord.text()
- }
- }
- }
-
Connections { target: vTDOpMode
function onServiceChanged ( vValue ) { gotoServiceMode( vValue )}
function onStandbyWaitDisinfectChanged ( vValue ) { page( _settingsHome , vValue )}