Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-3072-beta-transition' into develop

  1. … 4 more files in changeset.
Merge branch 'feature/LDT-2957-heparin' into staging

    • -2
    • +4
    ./qml/compounds/LabelUnitContainer.qml
    • -1
    • +0
    ./qml/pages/settings/SettingsROInput.qml
    • -1
    • +0
    ./qml/pages/settings/SettingsUserMode.qml
  1. … 1 more file in changeset.
Merge branch 'feature/LDT-2727-service' into staging

    • -3
    • +3
    ./qml/compounds/LabelUnitContainer.qml
  1. … 1 more file in changeset.
LDT-2962 Heparin - SW - 01 - R&I - 05: DEV - Feature Implementation

address cr comment fix heparin type options uindefined

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

LDT-3077 Support of the transition to the Beta System - SW - 01 - R&I - 05: DEV - Feature Implementation

remove FP valves

  1. … 13 more files in changeset.
LDT-2962 Heparin - SW - 01 - R&I - 05: DEV - Feature Implementation

add message IDs

  1. … 4 more files in changeset.
LDT-2960 Heparin - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

adddress cr comment

    • -2
    • +2
    ./qml/pages/treatment/TreatmentStack.qml
LDT-2960 Heparin - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

address cr comments

    • -0
    • +355
    ./qml/pages/treatment/TreatmentHeparin.qml
    • -1
    • +0
    ./qml/pages/treatment/TreatmentStack.qml
    • -355
    • +0
    ./qml/pages/treatment/sections/TreatmentHeparin.qml
  1. … 2 more files in changeset.
LDT-2962 Heparin - SW - 01 - R&I - 05: DEV - Feature Implementation

add idle timeout for heparin screen

    • -0
    • +43
    ./qml/components/IdleTimer.qml
    • -5
    • +10
    ./qml/pages/treatment/TreatmentStack.qml
    • -21
    • +37
    ./qml/pages/treatment/sections/TreatmentHeparin.qml
  1. … 5 more files in changeset.
LDT-2962 Heparin - SW - 01 - R&I - 05: DEV - Feature Implementation

implementation of heparin

    • -2
    • +4
    ./qml/compounds/LabelUnitContainer.qml
    • -1
    • +2
    ./qml/pages/treatment/TreatmentSection.qml
    • -4
    • +21
    ./qml/pages/treatment/TreatmentStack.qml
    • -63
    • +289
    ./qml/pages/treatment/sections/TreatmentHeparin.qml
  1. … 4 more files in changeset.
LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

address cr comments

    • -1
    • +1
    ./qml/compounds/LabelUnitContainer.qml
    • -2
    • +17
    ./qml/pages/settings/SettingsDateTime.qml
  1. … 13 more files in changeset.
LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

clean up user mode setting

    • -1
    • +1
    ./qml/pages/settings/SettingsUserMode.qml
  1. … 2 more files in changeset.
LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

sync date and time to ui time when NTP is set

    • -1
    • +7
    ./qml/pages/settings/SettingsDateTime.qml
  1. … 2 more files in changeset.
LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

Updated manufacutring log in to use current password then enter new one

LDT-2730 Service - SW - 01 - Service - R&I - 03: SDD - Design Diagram - plantuml

add SDD diagram

    • -1
    • +0
    ./qml/pages/settings/SettingsStack.qml
  1. … 2 more files in changeset.
LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

Revert visible service items to normal

    • -8
    • +8
    ./qml/pages/settings/SettingsStack.qml
LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

update message ids and cpp files for TD and DD date time

  1. … 18 more files in changeset.
LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

updates to resetting wifi to show correct behavior

    • -4
    • +4
    ./qml/pages/settings/SettingsStack.qml
    • -5
    • +11
    ./qml/pages/settings/SettingsWiFi.qml
  1. … 4 more files in changeset.
Merge branch 'feature/LDT-2666-ultrafiltration-no-pause' into staging

    • -9
    • +8
    ./qml/compounds/LabelUnitContainer.qml
LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

update cpp to enable all service scritps to run

    • -6
    • +4
    ./qml/pages/settings/SettingsDateTime.qml
    • -0
    • +2
    ./qml/pages/settings/SettingsStack.qml
  1. … 9 more files in changeset.
LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

Finish implementing date/time and test on device.. WIP send FW date and time

    • -4
    • +29
    ./qml/pages/settings/SettingsDateTime.qml
  1. … 2 more files in changeset.
LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated to use common LabelUnitContainer height in UF screens.

    • -1
    • +1
    ./qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml
LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltration.qml to use StackItem.page function to push edit screen.

LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentUltrafiltration.qml to always push confirm screen when UF settings change response is received and use StackItem.page function to push new screen.

LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

updates to date/time area

    • -76
    • +86
    ./qml/pages/settings/SettingsDateTime.qml
  1. … 1 more file in changeset.
LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

add missing macro methods needed to call factory reset

    • -1
    • +1
    ./qml/pages/settings/SettingsStack.qml
  1. … 5 more files in changeset.
LDT-2671: Ultrafiltration - SW - 01 - Enhancement - No pause adjustment - R&I - 05: DEV - Feature Implementation

- Updated Variables.qml to add width and height of UF new value containers in confirmation screen.

- Updated TreatmentAdjustmentUltrafiltration.qml to allow adjustments to be processed no matter what screen it is currently displaying, remove title text binding, and fix/add objectNames.

- Updated UF start, edit, and confirm screens to add objectNames.

- Updated TreatmentAdjustmentUltrafiltrationEdit.qml to update slots.

LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

User modes added to settings and funcitnality set in conf file

    • -2
    • +0
    ./qml/pages/settings/SettingsROInput.qml
    • -1
    • +10
    ./qml/pages/settings/SettingsStack.qml
    • -0
    • +53
    ./qml/pages/settings/SettingsUserMode.qml
  1. … 5 more files in changeset.
LDT-2732 Service - SW - 01 - Service - R&I - 05: DEV - Feature Implementation

Updated remaining switches to use base switch component

    • -3
    • +3
    ./qml/compounds/LabelUnitContainer.qml
    • -16
    • +14
    ./qml/pages/settings/SettingsROInput.qml