Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-926-Main-Treatment-Screen-SW-01-Diagnostics-Screen-FP' into develop

  1. … 2 more files in changeset.
Merge branch 'feature/LDT-1636-headerbar-information' into develop

  1. … 1 more file in changeset.
LDT-931: Main Treatment Screen - SW - Diagnostics Screen-FP - 05: DEV - Feature Implementation

- Add FP Folder structure

- Add The following FP message implementation

Versions

Pressure

Flow

Conductivity

Temperature

Valves

ROPump

BoostPump

Level

-Add FP can channel to Can interpreter

-Implement FP diagnostics screen

    • -0
    • +281
    ./qml/dialogs/diagnostics/DiagnosticsFP.qml
  1. … 45 more files in changeset.
LDT-1641 HeaderBar - SW - 01 - Information - R&I - 05: DEV - Feature Implementation

add FP versions to display later

LDT-1641 HeaderBar - SW - 01 - Information - R&I - 05: DEV - Feature Implementation

add more clickable areas to main treatmetn string

LDT-1641 HeaderBar - SW - 01 - Information - R&I - 05: DEV - Feature Implementation

add more cosmetic updates to popup

LDT-1641 HeaderBar - SW - 01 - Information - R&I - 05: DEV - Feature Implementation

update info popup cosmetically

LDT-1641 HeaderBar - SW - 01 - Information - R&I - 05: DEV - Feature Implementation

Udate information dialog and add QR code

Merge branch 'feature/LDT-1596-headerbar-settings' into staging

  1. … 1 more file in changeset.
Merge branch 'staging' into develop

Merge branch 'feature/LDT-1656-headerbar-storage' into staging

  1. … 1 more file in changeset.
Merge branch 'feature/LDT-1788-general-alarm-instructions-with-new-design' into staging

  1. … 2 more files in changeset.
LDT-1641 HeaderBar - SW - 01 - Information - R&I - 05: DEV - Feature Implementation

Add information popup to project. Need to fix QR Code

    • -0
    • +60
    ./qml/dialogs/headerbar/InformationDialog.qml
  1. … 1 more file in changeset.
LDT-1601HeaderBar - SW - 01 - Settings - R&I - 05: DEV - Feature Implementation

Add updates to popup and address cr comment

    • -4
    • +5
    ./qml/dialogs/headerbar/SettingsDialog.qml
  1. … 1 more file in changeset.
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation - Updated CloseButton.qml to change position based on updated UI design. - Updated TreatmentAdjustmentBase.qml to change header Back button position and title style based on updated UI design.

LDT-1661 HeaderBar - SW - 01 - Storage Indicator - R&I - 05: DEV - Feature Implementation

address cr comments

    • -1
    • +2
    ./qml/dialogs/headerbar/StorageDialog.qml
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

make the progress bar thinner on component

    • -1
    • +1
    ./qml/dialogs/headerbar/StorageDialog.qml
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

address CR commetns and fix qml errors

  1. … 2 more files in changeset.
LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

remove figure test

    • -30
    • +0
    ./qml/dialogs/NotificationDialog.qml
LDT-1661 HeaderBar - SW - 01 - Storage Indicator - R&I - 05: DEV - Feature Implementation

Remove redundant SDCProgressItem and udpate header bar to double click to open diagnistics

LDT-1599 HeaderBar - SW - 01 - Settings - R&I - 03: SDD - Design Diagram - plantuml

add puml file

  1. … 2 more files in changeset.
LDT-1601HeaderBar - SW - 01 - Settings - R&I - 05: DEV - Feature Implementation

Added settings popup to project to update brightness and alarm.

    • -0
    • +143
    ./qml/dialogs/headerbar/SettingsDialog.qml
  1. … 1 more file in changeset.
LDT-1661 HeaderBar - SW - 01 - Storage Indicator - R&I - 05: DEV - Feature Implementation

Add storage popup to project

    • -0
    • +40
    ./qml/dialogs/headerbar/StorageDialog.qml
  1. … 1 more file in changeset.
Merge branch 'feature/LDT-1536-headerbar-wifi-indicator' into staging

LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

Addressing even MORE CR comments

  1. … 3 more files in changeset.
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

addressing more CR comments

LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

address CR comments and make drop shadow color of header bar dialogs lighter

    • -2
    • +18
    ./qml/components/HeaderBarPopup.qml
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

address CR comments

    • -12
    • +2
    ./qml/components/HeaderBarPopup.qml
    • -2
    • +0
    ./qml/dialogs/headerbar/WiFiDialog.qml
  1. … 4 more files in changeset.
Merge branch 'feature/LDT-907-Main-Treatment-Screen-SW-Diagnostics-Screen-DD-2' into staging

LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

address CR comment and move instantiating wifi dialog to main.qml

    • -0
    • +14
    ./qml/components/HeaderBarPopup.qml
    • -0
    • +2
    ./qml/dialogs/headerbar/WiFiDialog.qml