Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r18567640c36d4bd3d2fa37ac929987cec7476309 -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 18567640c36d4bd3d2fa37ac929987cec7476309) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -47,6 +47,8 @@ readonly property alias alarm_AlarmID : vAlarmStatus.alarm_AlarmID readonly property alias hasAlarm : vAlarmStatus.hasAlarm + signal goToPost() + function alarmMinimize() { // The has alarm check has been added here to let other components call this function, // without worrying about the alarmDialog popoing up without an alarm present. @@ -98,7 +100,9 @@ function onDidAlarmEmpty ( ) { alarmHide () } } - NotificationDialog { id : _notificationDialog } + NotificationDialog { id : _notificationDialog + onGoToPost: _root.goToPost() + } Connections { target: vAlarmStatus function onAlarm_PriorityChanged ( vValue ) { Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -r0797b3a8c28ad756be125a91c45fb53a2783dc9a -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 0797b3a8c28ad756be125a91c45fb53a2783dc9a) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -47,8 +47,8 @@ x: Math.round((Variables.applicationWidth - width) / 2) y: Math.round((Variables.applicationHeight - height) / 2) - enter: Transition { NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 200 } } - exit : Transition { NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 200 } } + enter: Transition { NumberAnimation { property: "scale"; from: 0.8; to: 1.0; duration: 200; easing.type: Easing.OutCubic } } + exit : Transition { NumberAnimation { property: "scale"; from: 1.0; to: 0.8; duration: 200; easing.type: Easing.InCubic } } modal: true @@ -58,7 +58,7 @@ anchors.bottomMargin: _alarmBar.visible ? Variables.notificationHeight : 0 color : "#99000000" - Behavior on opacity { NumberAnimation { duration: 300} } + Behavior on opacity { NumberAnimation { duration: 200} } } background: Rectangle { id: _backgroundRect Index: sources/gui/qml/compounds/BPHREntry.qml =================================================================== diff -u -rc749ecd5dc413ce091250af652ccba4d96f7a582 -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision c749ecd5dc413ce091250af652ccba4d96f7a582) +++ sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -41,6 +41,12 @@ width : _container.width height : _container.height + function clear() { + systolic = "" + diastolic = "" + heartRate = "" + } + function setInitialFocus() { numPad.setup(_bloodPressureSystolic, qsTr("Systolic"), Index: sources/gui/qml/dialogs/AlarmDialog.qml =================================================================== diff -u -rd59edcf7fa2a0f096e22d330012dbaefa4bda374 -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision d59edcf7fa2a0f096e22d330012dbaefa4bda374) +++ sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -196,7 +196,7 @@ } } - Rectangle { id: _timerRect + Item { id: _timerRect property int countDown : 0 height : 70 @@ -209,9 +209,6 @@ leftMargin : Variables.defaultMargin * 4 } - color : "#FFECEC" - radius : height - Text { id: _astrix anchors { left: parent.left @@ -232,10 +229,9 @@ } color : "black" - text : qsTr("Rinseback will not be allowed in:") + text : qsTr("Return Blood will not be allowed in:") font.pixelSize : 25 font.weight : Font.Medium - } TimeText { id: _timeoutText Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u -r5292af384a2d6a77e9fe40396eee96be27c69719 -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 5292af384a2d6a77e9fe40396eee96be27c69719) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -104,6 +104,7 @@ Rectangle { id: _content color : _root.contentbackgroundColor clip : true + anchors { fill : parent topMargin : _titleBar.height + 2 - _root.headerOverlap Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -rbd083c017790f073bf4a296e05faf803a240f29f -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision bd083c017790f073bf4a296e05faf803a240f29f) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -35,6 +35,10 @@ radius : Variables.alarmDialogRadius + backgroundColor: Colors.offWhite + + signal goToPost() + enum AlarmPage { AlarmMain , AlarmList @@ -73,7 +77,8 @@ onMuteClicked : vAlarmStatus.doSilence () onResumeClicked : vAlarmStatus.doUserActionResume () onRinsebackClicked : vAlarmStatus.doUserActionRinseback () - onEndClicked : vAlarmStatus.doUserActionEnd () + onEndClicked : _root.goToPost() +// onEndClicked : vAlarmStatus.doUserActionEnd () onTemporaryBreakClicked : vAlarmStatus.doUserActionTemporaryBreak () onOkClicked : vAlarmStatus.doUserActionOk () onListClicked : alarmList () Index: sources/gui/qml/dialogs/UfVolumeAdjustment.qml =================================================================== diff -u -r81ed00031f6f2b4124a17ac8054b4a3815e2e2bc -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/dialogs/UfVolumeAdjustment.qml (.../UfVolumeAdjustment.qml) (revision 81ed00031f6f2b4124a17ac8054b4a3815e2e2bc) +++ sources/gui/qml/dialogs/UfVolumeAdjustment.qml (.../UfVolumeAdjustment.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -73,8 +73,8 @@ unitText : Variables.unitWeight valid : ! vTreatmentCreate.ufEstimatedTargetWeightRejectionReason editable : _root.editingEnabled - minimum : _preWeight.value - maximum : vTreatmentRanges.weightMax + minimum : vTreatmentRanges.weightMin + maximum : _preWeight.value step : vTreatmentRanges.weightRes defaultValue : vTreatmentRanges.weightDef decimal : Variables.weightPrecision Index: sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml =================================================================== diff -u -r83acad721bd36d2c88a15feddd6812d2e591bef3 -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml (.../HeaderbarPrescription.qml) (revision 83acad721bd36d2c88a15feddd6812d2e591bef3) +++ sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml (.../HeaderbarPrescription.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -31,13 +31,15 @@ Text { id: descriptiveText anchors { top : parent.top + topMargin : 10 left : parent.left leftMargin : Variables.defaultMargin * 5 } - text : qsTr("[Original Prescribed Parameters]") + text : qsTr("*Original Prescribed Parameters") visible : vTDOpMode.inTreatment color : Colors.mainTreatmentOrange font.pixelSize : 24 + font.weight : Font.Medium } PreTreatmentCreateContent { id: _headerbarPrescriptionContent @@ -71,16 +73,14 @@ rightMargin : Variables.defaultMargin * 3 } enabled : _root.isFirstTab ? true : _headerbarPrescriptionContent.confirmReady() - text.text : _root.isFirstTab ? qsTr("Next") : qsTr("Validate") + text.text : _root.isFirstTab ? qsTr("Next") : qsTr("Confirm") visible : ! vTDOpMode.inTreatment && ! vTreatmentCreate.parametersValidated onClicked : { if ( _root.isFirstTab ) { _headerbarPrescriptionContent.currentIndex = PreTreatmentCreateContent.TreatmentSettings - return } - - if ( ! vTreatmentCreate.parametersValidated ) { + else { _headerbarPrescriptionContent.validate() } } Index: sources/gui/qml/main.qml =================================================================== diff -u -r5941bc1d07e5d58f9d848afbf1414ef4f78e9185 -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/main.qml (.../main.qml) (revision 5941bc1d07e5d58f9d848afbf1414ef4f78e9185) +++ sources/gui/qml/main.qml (.../main.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -414,7 +414,9 @@ RinsebackCompleteDialog { id: _rinsebackCompleteDialog } LockDialog { id: _lockDialog } - AlarmItem { id: _alarmItem ; z: 996 } + AlarmItem { id: _alarmItem ; z: 996 + onGoToPost: _mainStack.goToPost() + } PowerItem { id: _powerItem ; z: 997 } ConfirmDialog { id: _confirmDialog ; z: 998 } DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r8cf828e5768d491c3e329c39b108624832054e94 -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 8cf828e5768d491c3e329c39b108624832054e94) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -44,6 +44,10 @@ stackView.initialItem : _root.initialItem + function goToPost() { + page( _postTreatmentStack ) + } + // Standby / Disinfection DisinfectStack { id: _disinfectStack } // Pre Treatment Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -r952d633ac2d84a05dff3355cf864064b21a5ee7e -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 952d633ac2d84a05dff3355cf864064b21a5ee7e) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -52,6 +52,7 @@ if (visible) { _mainMenu.hidden = true _headerBar.activeStack = stackView + page( _postTreatmentDisconnectStack) //REMOVE FOR DEMO ONLY } else { stackView.initialItem = null Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r83acad721bd36d2c88a15feddd6812d2e591bef3 -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 83acad721bd36d2c88a15feddd6812d2e591bef3) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -29,7 +29,7 @@ PreTreatmentBase { id: _root objectName: "_PreTreatmentCreate" // SquishQt testability readonly property bool isFirstTab : _preTreatmentCreateContent.currentIndex === PreTreatmentCreateContent.PatientPrescription - property int subStepIndex :_preTreatmentCreateContent.currentIndex + property int subStepIndex : _preTreatmentCreateContent.currentIndex function clear( vValue ) { if ( ! vValue ) return; _preTreatmentCreateContent.clear() } function confirmReady() { return _root.isFirstTab ? true : _preTreatmentCreateContent.confirmReady() } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -r58d24875f4e9c0115a05cae01b4a4e0a26818396 -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 58d24875f4e9c0115a05cae01b4a4e0a26818396) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -115,8 +115,8 @@ } function validate () { - vTreatmentCreate .patientID = _preTreatmentCreateTreatmentSettings.patientID - vPostTreatmentAdjustmentTreatmentLog.patientID = _preTreatmentCreateTreatmentSettings.patientID // store for the TreatmentLog + vTreatmentCreate .patientID = _preTreatmentCreatePatientPrescription.patientID + vPostTreatmentAdjustmentTreatmentLog.patientID = _preTreatmentCreatePatientPrescription.patientID // store for the TreatmentLog vTreatmentCreate.doValidation ( ) } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml =================================================================== diff -u -raf80aaa1c114eab78444e973c86b3c42dd85ef52 -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision af80aaa1c114eab78444e973c86b3c42dd85ef52) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -178,7 +178,7 @@ step : vTreatmentRanges.substitutionVolumeRes defaultValue : vTreatmentRanges.substitutionVolumeDef decimal : Variables.substitutionPrecision - value : vTreatmentCreate.substitutionFluidVolume + value : _root.isHDFFeatured ? vTreatmentCreate.substitutionFluidVolume : 0 isActive : vTreatmentCreate.substitutionFluidVolumeSet onDidActiveChange : function(vState) { vTreatmentCreate.substitutionFluidVolumeSet = vState } @@ -294,7 +294,7 @@ visible : _root.heparinFeatured showEdit : true needsAttention : ! _heparinRxAdjustment.confirmReady() - editEnabled : _heparinRxControl.value === PreTreatmentCreateTreatmentSettings.ON + editEnabled : _heparinRxControl.value === PreTreatmentCreatePatientPrescription.ON function reset() { vTreatmentCreate.heparinBolusVolume = 0 @@ -313,7 +313,7 @@ _heparinRxAdjustment.open() } else { - reset() + _heparinRx.reset() } } } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml =================================================================== diff -u -raf80aaa1c114eab78444e973c86b3c42dd85ef52 -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml (.../PreTreatmentCreateTreatmentSettings.qml) (revision af80aaa1c114eab78444e973c86b3c42dd85ef52) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml (.../PreTreatmentCreateTreatmentSettings.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -98,7 +98,7 @@ isActive : vTreatmentCreate.bicarbonateSet onDidActiveChange : function(vState) { vTreatmentCreate.bicarbonateSet = vState } onDidChange : function(vValue) { - if ( ! _sodium.valid ) { vTreatmentCreate.bicarbonateRejectReason = Variables.noRejectReason } + if ( ! _bicarbonate.valid ) { vTreatmentCreate.bicarbonateRejectReason = Variables.noRejectReason } vTreatmentCreate.bicarbonate = vValue } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -raacca8cc53f5e4ff5abb6d7df3d5ad48c915645c -rfdddcd8b25b5acc99f8c044c998af0e95752063c --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision aacca8cc53f5e4ff5abb6d7df3d5ad48c915645c) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c) @@ -75,7 +75,7 @@ _bphrEntry.heartRate ) } - + _bphrEntry.clear() _headerBar.vitalsRecorded() }