Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-3805 SW Misc & Enhc - SW - 01 - Usability Requests - R&I - 05: DEV - Feature Implementation

fix build errror

Merge remote-tracking branch 'origin/staging' into feature/LDT-3800-enhancements-usability-requests

    • -346
    • +48
    ./gui/qml/dialogs/NotificationDialog.qml
  1. … 1 more file in changeset.
LDT-3805 SW Misc & Enhc - SW - 01 - Usability Requests - R&I - 05: DEV - Feature Implementation

fix post merge errors

    • -23
    • +8
    ./gui/qml/pages/treatment/TreatmentStack.qml
Merge remote-tracking branch 'origin/staging' into feature/LDT-3800-enhancements-usability-requests

    • -13
    • +12
    ./gui/qml/dialogs/NotificationDialog.qml
    • -8
    • +39
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
Merge branch 'feature/LDT-3656-New-Design-CreateRx' into staging

    • -2
    • +14
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
LDT-3805 SW Misc & Enhc - SW - 01 - Usability Requests - R&I - 05: DEV - Feature Implementation

address cr c omments

    • -8
    • +16
    ./gui/qml/compounds/InstructionView.qml
    • -9
    • +16
    ./gui/qml/dialogs/NotificationDialog.qml
    • -0
    • +59
    ./gui/qml/pages/MainInitialization.qml
    • -1
    • +1
    ./gui/qml/pages/settings/SettingsStack.qml
    • -70
    • +39
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

post merge confliuc iresolution

Merge remote-tracking branch 'origin/staging' into feature/LDT-3855-sw-enhc-general-alarm

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-3757-recirculate

  1. … 2 more files in changeset.
Merge branch 'feature/LDT-3834-sw-misc-enhc-stop-state' into staging

  1. … 1 more file in changeset.
LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

fix build error

LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

address cr comments

    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHDF.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentHeparin.qml
LDT-3937 Post-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

add message ids

LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

cr comments

    • -1
    • +1
    ./gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml
LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

address cr comments

    • -1
    • +1
    ./gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml
LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

fix bug

    • -1
    • +1
    ./gui/qml/dialogs/HeparinRxAdjustment.qml
LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

cr comments

LDT-3762 Rinseback - SW - 01 - Recirculate - R&I - 05: DEV - Feature Implementation

add TODO comment

LDT-3760 Rinseback - SW - 01 - Recirculate - R&I - 03: SDD - Design Diagram - plantuml

address CR ocmments

  1. … 1 more file in changeset.
LDT-2712: Trends and Screensaver Screens - SW - 01 - Trends Screen - R&I - 05: DEV - Feature Implementation

rem0oved obsolete dox comment

LDT-2712: Trends and Screensaver Screens - SW - 01 - Trends Screen - R&I - 05: DEV - Feature Implementation

address crf comments

    • -27
    • +12
    ./gui/qml/pages/treatment/TreatmentTrends.qml
    • -12
    • +2
    ./view/td/data/treatment/VTreatmentTrends.cpp
LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

addres cr comments

    • -5
    • +0
    ./gui/qml/dialogs/NotificationDialog.qml
LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

added uf logic

    • -1
    • +1
    ./gui/qml/dialogs/UfVolumeAdjustment.qml
LDT-3459 - Cloud Communication - SW - 01 - CloudSync - R&I - 05: DEV - Feature Implementation

- Updated StorageGlobals.cpp to add comment with old CloudSync config path.

LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

    • -0
    • +6
    ./gui/qml/dialogs/UfVolumeAdjustment.qml
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-2707-trends

    • -11
    • +19
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
LDT-3937 Post-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

remove obsolete items

    • -1
    • +1
    ./gui/qml/components/SubStepIndicator.qml
LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

fix clearing uf weight and opened dialogs changing opmodes

LDT-3937 Post-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

add post treatment workflow pages

  1. … 1 more file in changeset.
LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

fix bug

    • -1
    • +0
    ./gui/qml/pages/treatment/TreatmentStack.qml