Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/staging' into feature/LDT-4810-device-settings-enhancement

  1. … 1 more file in changeset.
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

address cr comments

  1. … 2 more files in changeset.
LDT-4857 SW Misc & Enhc - SW - 01 - Remove Old Messaging Logic [PowerOff].sh - R&I - 05: DEV - Feature Implementation

removed onAcitonReceive

  1. … 16 more files in changeset.
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

address cr comments

  1. … 4 more files in changeset.
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

final tweak to wifi network liost height

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

finish export logs

  1. … 1 more file in changeset.
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

add USB progress

  1. … 4 more files in changeset.
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

finalize export lgos screen

    • -28
    • +29
    ./settings/SettingsExportLogs.qml
  1. … 2 more files in changeset.
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

update export logs screen

    • -129
    • +95
    ./settings/SettingsExportLogs.qml
  1. … 5 more files in changeset.
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

finish wifi page

  1. … 2 more files in changeset.
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

finish wifi screen

    • -194
    • +277
    ./settings/SettingsExportLogs.qml
  1. … 5 more files in changeset.
LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

wifi screen redesign completed

LDT-4815 SW Misc & Enhc - SW - 01 - Device Settings - Screens - R&I - 05: DEV - Feature Implementation

upodate settings and information settings screen

    • -72
    • +75
    ./settings/SettingsInformation.qml
    • -88
    • +59
    ./settings/SettingsVolumeBrightness.qml
    • -137
    • +193
    ./settings/SettingsWiFi.qml
  1. … 7 more files in changeset.
LDT-4792 NON-FEATURE: SW Misc & Enhc - SW - 01 - Power Control - Shutdown - R&I - 05: DEV - Feature Implementation

address CR comments

  1. … 1 more file in changeset.
LDT-4792 NON-FEATURE: SW Misc & Enhc - SW - 01 - Power Control - Shutdown - R&I - 05: DEV - Feature Implementation

remove power off message

  1. … 11 more files in changeset.
Merge branch 'feature/LDT-4511-treatment-logs' into staging

    • -29
    • +11
    ./pretreatment/create/PreTreatmentCreatePatientPrescription.qml
  1. … 3 more files in changeset.
LDT-4546 NON-FEATURE: SW Misc & Enhc - SW - 01 - SW Integration - Vitals - R&I - 05: DEV - Feature Implementation

finalize updated vitral sdialog

  1. … 4 more files in changeset.
LDT-4657 NON-FEATURE: SW Misc & Enhc - SW - 01 - Dry-Demo Support - SW App - R&I - 05: DEV - Feature Implementation

add confirm message id and preset all parameters in dry demo

    • -0
    • +23
    ./pretreatment/create/PreTreatmentCreatePatientPrescription.qml
  1. … 11 more files in changeset.
LDT-4657 NON-FEATURE: SW Misc & Enhc - SW - 01 - Dry-Demo Support - SW App - R&I - 05: DEV - Feature Implementation

fix disinfection not showingf

    • -4
    • +4
    ./posttreatment/PostTreatmentStack.qml
  1. … 5 more files in changeset.
LDT-4546 NON-FEATURE: SW Misc & Enhc - SW - 01 - SW Integration - Vitals - R&I - 05: DEV - Feature Implementation

update vitals dialog

  1. … 1 more file in changeset.
LDT-4697 NON-FEATURE: SW Misc & Enhc - SW - 01 - Treatment adjustments - Vitals alarm limits - R&I - 05: DEV - Feature Implementation

update pressures

    • -4
    • +4
    ./treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml
LDT-4697 NON-FEATURE: SW Misc & Enhc - SW - 01 - Treatment adjustments - Vitals alarm limits - R&I - 05: DEV - Feature Implementation

finish adding dialog

    • -7
    • +15
    ./treatment/TreatmentSectionHeader.qml
    • -24
    • +113
    ./treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml
  1. … 17 more files in changeset.
LDT-4566 NON-FEATURE: SW Misc & Enhc - SW - 01 - SW Integration - Fluid Bolus - R&I - 05: DEV - Feature Implementation

updated tx states from comoon

    • -1
    • +1
    ./treatment/sections/TreatmentTime.qml
  1. … 7 more files in changeset.
LDT-4566 NON-FEATURE: SW Misc & Enhc - SW - 01 - SW Integration - Fluid Bolus - R&I - 05: DEV - Feature Implementation

    • -1
    • +3
    ./treatment/sections/TreatmentSaline.qml
  1. … 4 more files in changeset.
LDT-4514 Treatment Logs - SW - 01 - Treatment Logs - R&I - 03: SDD - Design Diagram - plantuml

add plant uml SDD diagram and fix timing

    • -2
    • +2
    ./posttreatment/PostTreatmentReview.qml
  1. … 11 more files in changeset.
LDT-4516 Treatment Logs - SW - 01 - Treatment Logs - R&I - 05: DEV - Feature Implementation

finisssh updatingn tx logs

    • -1
    • +1
    ./pretreatment/create/PreTreatmentCreatePatientPrescription.qml
  1. … 3 more files in changeset.
LDT-4516 Treatment Logs - SW - 01 - Treatment Logs - R&I - 05: DEV - Feature Implementation

update vdata from treatment log

    • -4
    • +4
    ./pretreatment/create/PreTreatmentCreateContent.qml
    • -29
    • +11
    ./pretreatment/create/PreTreatmentCreatePatientPrescription.qml
  1. … 11 more files in changeset.
LDT-4456 Edit Treatment Parameters During Treatment - SW - 01 - Integration - R&I - 05: DEV - Feature Implementation

fix defualt values for adjustment

    • -4
    • +8
    ./treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml
LDT-4216 NON-FEATURE: SW Misc & Enhc - SW - 01 - Create Rx - Final Flag Prm - R&I - 03: SDD - Design Diagram - plantuml

fix post merge errors

    • -6
    • +8
    ./posttreatment/PostTreatmentReview.qml
    • -9
    • +3
    ./pretreatment/PreTreatmentInstallStack.qml
Merge branch 'staging' into feature/LDT-4213-create-rx-final-flag

    • -30
    • +26
    ./pretreatment/PreTreatmentInstallStack.qml
    • -37
    • +21
    ./pretreatment/PreTreatmentStack.qml
  1. … 9 more files in changeset.