Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

address cr comments

    • -1
    • +1
    ./qml/pages/treatment/TreatmentHDF.qml
    • -1
    • +1
    ./qml/pages/treatment/TreatmentHeparin.qml
  1. … 2 more files in changeset.
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

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

address cr comments

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

fix bug

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

cr comments

  1. … 3 more files in changeset.
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

address crf comments

    • -27
    • +12
    ./qml/pages/treatment/TreatmentTrends.qml
  1. … 6 more files in changeset.
LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

addres cr comments

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

added uf logic

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

  1. … 2 more files in changeset.
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-2707-trends

    • -11
    • +19
    ./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

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

    • -0
    • +69
    ./qml/pages/posttreatment/PostTreatmentDisconnectStack.qml
  1. … 3 more files in changeset.
LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

fix bug

    • -1
    • +0
    ./qml/pages/treatment/TreatmentStack.qml
LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

fix adjsut tx payload

    • -1
    • +2
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 5 more files in changeset.
LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

fix clearing sub volume

LDT-3459 - Cloud Communication - SW - 01 - CloudSync - R&I - 05: DEV - Feature Implementation

- Updated SettingsDeviceRegistration.qml updated IP address text to show text when SSID and IP Address are not empty.

- Updated StorageGlobals.cpp to change CloudSync path.

  1. … 1 more file in changeset.
LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

fix spacing on alarm list dialog

LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

update notification dialog

    • -0
    • +356
    ./qml/dialogs/AlarmDialog.qml
    • -335
    • +53
    ./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 interactive image pinc h to zoom

    • -36
    • +38
    ./qml/compounds/InteractiveImage.qml
LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

remove prime discard volume

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

update tratemetn settings payload

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

add OG Rx at top of create rx dialog when in treatment mode

LDT-3805 SW Misc & Enhc - SW - 01 - Usability Requests - R&I - 05: DEV - Feature Implementation

updated treatmetn flows to pulse when in BYPASS

LDT-3805 SW Misc & Enhc - SW - 01 - Usability Requests - R&I - 05: DEV - Feature Implementation

add interactive image

    • -4
    • +6
    ./qml/compounds/AutoStepController.qml
    • -3
    • +10
    ./qml/compounds/InstructionView.qml
    • -0
    • +118
    ./qml/compounds/InteractiveImage.qml
    • -4
    • +11
    ./qml/dialogs/NotificationDialog.qml
    • -0
    • +2
    ./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

added progress circle to autostepcontroller

    • -2
    • +33
    ./qml/compounds/AutoStepController.qml