Index: SDDs/CreateRx.png =================================================================== diff -u -re16be85f53cf630e993a43fa6ccca56355201b18 -rfeb708952ab1311368560d025d1e241c68b5413c Binary files differ Index: SDDs/CreateRx.puml =================================================================== diff -u -re16be85f53cf630e993a43fa6ccca56355201b18 -rfeb708952ab1311368560d025d1e241c68b5413c --- SDDs/CreateRx.puml (.../CreateRx.puml) (revision e16be85f53cf630e993a43fa6ccca56355201b18) +++ SDDs/CreateRx.puml (.../CreateRx.puml) (revision feb708952ab1311368560d025d1e241c68b5413c) @@ -48,27 +48,49 @@ UI ->o Wait_Retry: ⟲: Create Rx Screen US -> UI: ENT: Patient ID Text US -> UI: TCH: Touch each parameter to set value - alt Confirm - US -> UI: TCH: Confirm Button + alt Validate + US -> UI: TCH: Validate Button UI -> SW: ACT: Prescription Parameters SW -> TD: MSG: [x3F: #(all the Rx Params)] Req \n Prescription Parameters: Validation + alt Accepted + TD -> SW: MSG: [x40: 1,X] Rsp \n Prescription Parameters: Validation + SW -> UI: ACT: Notify UI: Parameters validation \n\t(Generate QR Code) + UI -> UI: ACT: Lock all editable fields\n\tShow QR Code\n\tShow Confirm Button + alt Confirm + US -> UI: TCH: Confirm Button + UI -> SW: ACT: Prescription Parameters Confimation + SW -> TD: MSD: [x44: 1] Req \n Prescription Parameters Confimation + alt Accepted + TD -> SW: MSG: [x12: 4,1] Dat \n OpMode - Pre-Treatment + SW -> UI: CMD: Pre-Treatment Stack + UI -[#Green]>o Pre_Tx + end + end + else #Pink + TD -> SW: MSG: [x40: 0,#RR] Rsp \n Prescription Parameters: Validation + SW -> UI: CMD: Highlight Rejected Parameters + UI ->o Wait_Retry: ⟲: Prescription Parameters Screen + end end - alt Accepted - TD -> SW: MSG: [x40: 1,X] Rsp \n Prescription Parameters: Validation - SW -> UI: ACT: Notify UI: Parameters validation \n\t(Generate QR Code) - UI -> SW: ACT: Prescription Parameters Confimation - SW -> TD: MSD: [x44: 1] Req \n Prescription Parameters Confimation - TD -> SW: MSG: [x12: 4,1] Dat \n OpMode - Pre-Treatment - SW -> UI: CMD: Pre-Treatment Stack - UI -[#Green]>o Pre_Tx - else #Pink - TD -> SW: MSG: [x40: 0,#RR] Rsp \n Prescription Parameters: Validation - SW -> UI: CMD: Highlight Rejected Parameters - UI ->o Wait_Retry: ⟲: Prescription Parameters Screen - end else #Pink Rejected x46: Initiate Treatment TD -> SW: MSG: [x46: 0,RR] SW -> UI: CMD: Rejection Reason (RR) Notification UI ->o Wait_Retry: ⟲: MainHome Screen end + alt Back + US -> UI: TCH: Back Button + UI -> SW: ACT: Back + alt Is Validated? + SW -> TD: MSG: [x44: 0] Req \n Prescription Parameters Confirmations: Back + SW -> UI: ACT: Set to not validated + UI -> UI: ACT: Enable Fields + UI ->o Wait_Retry: ⟲: Create Rx Screen + else + UI -> UI: ACT: Clear Create Rx Screen + SW -> TD: MSG: [x45: 0] Req \n Initiate Treatment Cancel + TD -> SW: MSG: [x12: 3,1] Dat \n OpMode - Standby + SW -> UI: CMD: MainHome Screen + UI ->o Wait_Retry: ⟲: MainHome Screen + end + end @enduml Index: SDDs/CreateRxLayout.png =================================================================== diff -u -rfa1d3e6e87700828521ac87868b4924f199f9649 -rfeb708952ab1311368560d025d1e241c68b5413c Binary files differ Index: SDDs/CreateRxLayout.puml =================================================================== diff -u -rfa1d3e6e87700828521ac87868b4924f199f9649 -rfeb708952ab1311368560d025d1e241c68b5413c --- SDDs/CreateRxLayout.puml (.../CreateRxLayout.puml) (revision fa1d3e6e87700828521ac87868b4924f199f9649) +++ SDDs/CreateRxLayout.puml (.../CreateRxLayout.puml) (revision feb708952ab1311368560d025d1e241c68b5413c) @@ -4,7 +4,7 @@ package "PreTreatmentCreateStack.qml" { package "PreTreatmentCreate.qml" { package "PreTreatmentBase.qml" { - Rectangle "Confirm Button" as Confirm + Rectangle "Validate/Confirm Button" as Confirm PreTreatmentBase.qml -[hidden]up-> Confirm package "PreTreatmentCreateContent.qml" { @@ -118,6 +118,14 @@ } } } + + Rectangle "Heparing Bolus Volume" as Heparing_Bolus_Volume { + package "LabelUnitContainer.qml" as Heparing_Bolus_Volume_LUC #AliceBlue { + package "ValueAdjuster.qml" as Heparing_Bolus_Volume_VA #APPLICATION { + [vTreatmentCreate.heparinBolusVolume] + } + } + } Rectangle "Heparin Dispensing Rate" as Heparin_Dispensing_Rate { package "LabelUnitContainer.qml" as Heparin_Dispensing_Rate_LUC #AliceBlue { @@ -126,15 +134,7 @@ } } } - - Rectangle "Heparing Bolus Volume" as Heparing_Bolus_Volume { - package "LabelUnitContainer.qml" as Heparing_Bolus_Volume_LUC #AliceBlue { - package "ValueAdjuster.qml" as Heparing_Bolus_Volume_VA #APPLICATION { - [vTreatmentCreate.heparinBolusVolume] - } - } - } - + Rectangle "Heparin Stop Time" as Heparin_Stop_Time { package "LabelUnitContainer.qml" as Heparin_Stop_Time_LUC #AliceBlue { package "ValueAdjuster.qml" as Heparin_Stop_Time_VA #APPLICATION { Index: sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml =================================================================== diff -u -rb395fdadb1ad460eba7e45eaca94c100a5d0c804 -rfeb708952ab1311368560d025d1e241c68b5413c --- sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml (.../AcidConcentrateAdjustment.qml) (revision b395fdadb1ad460eba7e45eaca94c100a5d0c804) +++ sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml (.../AcidConcentrateAdjustment.qml) (revision feb708952ab1311368560d025d1e241c68b5413c) @@ -48,6 +48,7 @@ } text : qsTr("Acid Concentrate") font.pixelSize : Fonts.fontPixelTitle + font.weight : Font.Medium } CloseButton { id: _closeButton Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r3604ca12ed47f4c60a12bb42efa4949ef01b7d95 -rfeb708952ab1311368560d025d1e241c68b5413c --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 3604ca12ed47f4c60a12bb42efa4949ef01b7d95) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision feb708952ab1311368560d025d1e241c68b5413c) @@ -88,7 +88,7 @@ readonly property color buttonDisableColor : "#515050" readonly property color pauseColor : "#9B864E" - readonly property color panelBackgroundColor : "#2E4259" + readonly property color panelBackgroundColor : "#12FFFFFF" readonly property color panelBorderColor : "#4DB5B5B5" readonly property color panelInvalidBorderColor : "#FFA500"