Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-2957-heparin' into staging

    • -1
    • +0
    ./pages/settings/SettingsLocalization.qml
    • -2
    • +0
    ./pages/settings/SettingsRootSSHAccess.qml
  1. … 2 more files in changeset.
Merge branch 'feature/LDT-2727-service' into staging

    • -2
    • +3
    ./dialogs/AcidConcentrateAdjustment.qml
  1. … 1 more file in changeset.
RESOLVED.

RESOLVED.

fixed

fixed

LDT-2962 Heparin - SW - 01 - R&I - 05: DEV - Feature Implementation

address cr comment fix heparin type options uindefined

    • -1
    • +1
    ./pages/treatment/TreatmentHeparin.qml
  1. … 1 more file in changeset.
can we merge these slots with the ones in TreatmentAdjustmentVitals?

can we merge these slots with the ones in TreatmentAdjustmentVitals?

Could we use the ArrowButton.qml component? I think there is already one made that does just this

Could we use the ArrowButton.qml component? I think there is already one made that does just this

whats this condition for?

whats this condition for?

LEAHI-APPLICATION-LDT-2937_Rinseback - SW - 01 - R&I
LEAHI-APPLICATION-LDT-2937_Rinseback - SW - 01 - R&I
LDT-2942: Rinseback - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated GuiGlobals.h to update rinseback message IDs (MSG_ID_TD_RINSEBACK_PROGRESS, MSG_ID_UI_RINSEBACK_CMD_REQUEST, MSG_ID_TD_RINSEBACK_CMD_RESPONSE)

- Updated EndTreatmentRinseback.qml for updates to UI/UX design.

- Updated VTreatmentRanges.h/cpp to fix loading of rinseback volume ranges.

  1. … 3 more files in changeset.
It is a little bit concerning: Could you please test/describe the following scenarios: *What if we have more than one Heparin type supported? *What if none (incorrectly) has been defined in the c...

It is a little bit concerning:
Could you please test/describe the following scenarios:

  • What if we have more than one Heparin type supported?
  • What if none (incorrectly) has been defined in the configuration (do we get an index out of bounds)?
We will address this later on code modularizations. RESOLVED.

We will address this later on code modularizations.
RESOLVED.

LDT-3078 Support of the transition to the Beta System - SW - 01 - R&I - 06: DEV - Diagnostic - if needed

update DD diagnostics to beta vales

    • -8
    • +75
    ./dialogs/diagnostics/DiagnosticsDD.qml
    • -23
    • +0
    ./dialogs/diagnostics/DiagnosticsFP.qml
LEAHI-APPLICATION-LDT-3072_Support of the transition to the Beta System - SW - 01 - R&I
LEAHI-APPLICATION-LDT-3072_Support of the transition to the Beta System - SW - 01 - R&I
LDT-3077 Support of the transition to the Beta System - SW - 01 - R&I - 05: DEV - Feature Implementation

remove FP valves

    • -16
    • +8
    ./dialogs/diagnostics/DiagnosticsFP.qml
  1. … 15 more files in changeset.
LDT-3005 End of Treatment - SW - 01 - R&I - 05: DEV - Feature Implementation

cleanup

  1. … 1 more file in changeset.
LEAHI-APPLICATION-LDT-3000_End of Treatment - SW - 01 - R&I
LEAHI-APPLICATION-LDT-3000_End of Treatment - SW - 01 - R&I
LDT-3005 End of Treatment - SW - 01 - R&I - 05: DEV - Feature Implementation

upload of code

    • -0
    • +34
    ./components/TreatmentCompleteButton.qml
    • -0
    • +37
    ./dialogs/EndTreatmentDialog.qml
    • -31
    • +29
    ./pages/treatment/TreatmentHome.qml
  1. … 16 more files in changeset.
I believe any related view could have provided a timer since they are inherited from QObject. That is fine for now but consider using our C++ view codes for such a thing.

I believe any related view could have provided a timer since they are inherited from QObject.
That is fine for now but consider using our C++ view codes for such a thing.

Thank you .

Thank you .

pop(null) will unwind the stack and go back to main treatment. I tested and added a comment in code as well

pop(null) will unwind the stack and go back to main treatment. I tested and added a comment in code as well

LDT-2960 Heparin - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

adddress cr comment

updated to statusColor

updated to statusColor

added

added

used for the 1 min user activity timeout to move back to main treatment from heparin.. Its a requirement LEAHI-PRS-666

used for the 1 min user activity timeout to move back to main treatment from heparin.. Its a requirement LEAHI-PRS-666

updated

updated

updated

updated

yes good catch. updated

yes good catch. updated

moved

moved

removed

removed