Index: sources/gui/qml/main.qml =================================================================== diff -u -rb12853c86ef9e517667516dc3e47bca07349cedf -rad78225384a974269b18c0fe3b55a7d64f77d813 --- sources/gui/qml/main.qml (.../main.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) +++ sources/gui/qml/main.qml (.../main.qml) (revision ad78225384a974269b18c0fe3b55a7d64f77d813) @@ -54,7 +54,10 @@ import VDuetRoWaterDG 0.1 import VCloudSync 0.1 import VHDUsageInfo 0.1 +import VInstitutionalRecord 0.1 import VAdjustmentInstitutionalRecord 0.1 +import VAdvancedInstitutionalRecord 0.1 +import VAdjustmentAdvancedInstitutionalRecord 0.1 // States views import VTDOpMode 0.1 //// ----- @LEAHIZED import VPreTreatmentStates 0.1 @@ -66,15 +69,20 @@ // In-Treatment - Data import VTreatmentBloodFlow 0.1 import VTreatmentDialysateFlow 0.1 +import VTreatmentIsolatedUF 0.1 import VTreatmentPressureOcclusion 0.1 import VTreatmentUltrafiltration 0.1 import VTreatmentTime 0.1 import VTreatmentParametersSetPoint 0.1 import VTreatmentRinseback 0.1 import VTreatmentRecirculate 0.1 import VTreatmentBloodPrime 0.1 +import VTreatmentSaline 0.1 import VTreatmentStop 0.1 import VTreatmentRanges 0.1 +import VTreatmentHeparin 0.1 +import VTreatmentTrends 0.1 + // Pre-Treatment import VPreTreatmentAdjustmentInitTreatment 0.1 import VDGFilterFlush 0.1 @@ -108,7 +116,6 @@ import VDDLevel 0.1 import VDDBloodLeak 0.1 // FP Data -import VFPValvesStates 0.1 import VFPROPump 0.1 import VFPPressures 0.1 import VFPLevel 0.1 @@ -117,8 +124,18 @@ import VFPTemperature 0.1 import VFPBoostPump 0.1 // In-Treatment - Adjustemnt -import VTreatmentAdjustmentDuration 0.1 +import VTreatmentAdjustmentBloodPrime 0.1 +import VTreatmentAdjustmentBolusVolume 0.1 +import VTreatmentAdjustmentDurationEdit 0.1 +import VTreatmentAdjustmentDurationConfirm 0.1 +import VTreatmentAdjustmentSetPoints 0.1 +import VTreatmentAdjustmentBloodFlowRate 0.1 +import VTreatmentAdjustmentDialysateFlowRate 0.1 +import VTreatmentAdjustmentDialysateTemperature 0.1 import VTreatmentAdjustmentFlows 0.1 +import VTreatmentAdjustmentIsolatedUFDurationEdit 0.1 +import VTreatmentAdjustmentIsolatedUFVolumeEdit 0.1 +import VTreatmentAdjustmentIsolatedUFConfirm 0.1 import VTreatmentAdjustmentUltrafiltrationState 0.1 import VTreatmentAdjustmentUltrafiltrationEdit 0.1 import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 @@ -175,6 +192,9 @@ VCloudSync { id: vCloudSync } VHDUsageInfo { id: vHDUsageInfo } VAdjustmentInstitutionalRecord { id: vAdjustmentInstitutionalRecord } + VInstitutionalRecord { id: vInstitutionalRecord } + VAdjustmentAdvancedInstitutionalRecord { id: vAdjustmentAdvancedInstitutionalRecord } + VAdvancedInstitutionalRecord { id: vAdvancedInstitutionalRecord } //VAdjustIn // ---- States VTDOpMode { id: vTDOpMode @@ -195,7 +215,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() } @@ -217,14 +237,18 @@ VTDTemperature { id: vTDTemperature } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } + VTreatmentIsolatedUF { id: vTreatmentIsolatedUF } VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } VTreatmentTime { id: vTreatmentTime } VTreatmentParametersSetPoint { id: vTreatmentParametersSetPoint } VTreatmentBloodPrime { id: vTreatmentBloodPrime } + VTreatmentSaline { id: vTreatmentSaline } VTreatmentRinseback { id: vTreatmentRinseback } VTreatmentRecirculate { id: vTreatmentRecirculate } VTreatmentStop { id: vTreatmentStop } + VTreatmentHeparin { id: vTreatmentHeparin } + // ---- DD VDGDrainPump { id: vDGDrainPump } VDDHeaters { id: vDDHeaters } @@ -243,7 +267,6 @@ VDDLevel { id: vDDLevel } VDDBloodLeak { id: vDDBloodLeak } // --- FP Data - VFPValvesStates { id: vFPValvesStates } VFPROPump { id: vFPROPump } VFPPressures { id: vFPPressures } VFPLevel { id: vFPLevel } @@ -267,11 +290,23 @@ VPreTreatmentAdjustmentStartTreatment { id: vPreTreatmentAdjustmentStartTreatment } // --- - VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } + VTreatmentAdjustmentDurationEdit { id: vTreatmentAdjustmentDurationEdit } + VTreatmentAdjustmentDurationConfirm { id: vTreatmentAdjustmentDurationConfirm } + VTreatmentAdjustmentSetPoints { id: vTreatmentAdjustmentSetPoints } + VTreatmentAdjustmentBloodFlowRate { id: vTreatmentAdjustmentBloodFlowRate } + VTreatmentAdjustmentDialysateFlowRate { id: vTreatmentAdjustmentDialysateFlowRate } + VTreatmentAdjustmentDialysateTemperature { id: vTreatmentAdjustmentDialysateTemperature } VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } VTreatmentCreate { id: vTreatmentCreate } VTreatmentRanges { id: vTreatmentRanges } + VTreatmentTrends { id: vTreatmentTrends } + + VTreatmentAdjustmentBloodPrime { id: vTreatmentAdjustmentBloodPrime } + VTreatmentAdjustmentBolusVolume { id: vTreatmentAdjustmentBolusVolume } + VTreatmentAdjustmentIsolatedUFDurationEdit { id: vTreatmentAdjustmentIsolatedUFDurationEdit } + VTreatmentAdjustmentIsolatedUFVolumeEdit { id: vTreatmentAdjustmentIsolatedUFVolumeEdit } + VTreatmentAdjustmentIsolatedUFConfirm { id: vTreatmentAdjustmentIsolatedUFConfirm } VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } VTreatmentAdjustmentVitals { id: vTreatmentAdjustmentVitals } VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } @@ -319,7 +354,7 @@ disable : _GuiView.manufactSetup || _GuiView.updateSetup hidden : true // it should be hidden by default since the landing screen changed to init and it does not have the main menu until the POST passes. width : Variables.applicationWidth - isMainMenu : true + model : _model Component.onCompleted : { _settingsStack.visible = false @@ -333,12 +368,39 @@ _managerStack .visible = vIndex === 1 _settingsStack.visible = vIndex === 2 } + + ListModel { id: _model + ListElement { text: qsTr("Treatment") ; visible: true } + ListElement { text: qsTr("Prescriptions") ; visible: true } + ListElement { text: qsTr("Settings") ; visible: true } + } } Connections { target: vTDOpMode function onStandbyWaitDisinfectChanged ( vValue ) { _mainMenu.isTreatment() } } + Connections { target: vTreatmentVitals + function onDidTimeout() { + // interval set to OFF so just record without vitals + if ( ! vTreatmentVitals.interval ) { + vTreatmentTrends.onNoVitalsRecord() + } + // interval is set and BP cuff is available + else if ( vTreatmentVitals.enableBPCuff ) { + vTreatmentTrends.onIntervalRequestVitals() + } + } + } + + Connections { target: vTreatmentAdjustmentVitals + function onDidTimeout() { vTreatmentTrends.onIntervalTimeoutVitals() } + } + + Connections { target: _mainStack + function onIsCreateRx ( vState ) { _headerBar.isCreateRx = vState } + } + // 9 - Others HeaderBar { id: _headerBar anchors.top: parent.top @@ -350,22 +412,23 @@ // } } // 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 } + 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