Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 53 more files in changeset.
Merge branch 'DEN-14936-UI-BN-S93' into staging

    • -42
    • +64
    ./qml/dialogs/DiagnosticsDialog.qml
  1. … 1 more file in changeset.
DEN-14955 Tx Create Reject - Add heparin type reject marking in QML

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./qml/pages/settings/SettingsStack.qml
  1. … 3 more files in changeset.
DEN-14955 Tx Create Rejection - Include the type buttons' reject reason - Modify to make gridSelection title color changeable

  1. … 3 more files in changeset.
DEN-15017 Ultrafiltration Volume Cannot Be Set to 0 L

revert back the commit e454ad

DEN-14955 Slider - Update the other sliders with switches in the preTx Create screen to also handle properly the on/off-inactive/active state

DEN-14955 Sliders - Update code to properly handle the ON/OFF inactive/active visual state - Remove active setting of Heparin Stop slider in pre Tx create

    • -2
    • +13
    ./qml/components/SliderCreateTreatment.qml
DEN-14955 Slider - add missing }

DEN-11539: Service password initial setup

- removed the console log debug line

    • -1
    • +1
    ./qml/pages/settings/SettingsStack.qml
DEN-11539: Service password initial setup

- added hashing for the service password and did some clean up.

- improved the navigation

- made the service password mandatory to navigate to the service menu, so HD message can't navigate the UI to service screen without user entering the password.

    • -36
    • +24
    ./qml/pages/settings/SettingsStack.qml
  1. … 2 more files in changeset.
DEN-14955 ServicePassword - Add secondary password line input to userConfirmation - Add logic for checking password entry - Add a mock encrypt function to signify needing encryption

    • -10
    • +28
    ./qml/pages/settings/SettingsStack.qml
  1. … 2 more files in changeset.
DEN-14955 Tx Create Rejection - Update code base on feedback from Behrouz on CR

DEN-14955 Slider Bug fix - DEN-15026 Correct handling for slider and switch on/off

    • -6
    • +5
    ./qml/components/SliderCreateTreatment.qml
DEN-14955 - Slider fix DEN-15028 - Related the heparin stop time slider active state to the heparin dispensing active state

DEN-14955 Service Password - Add a validation CPP function for QML to call to check entry conforms to rules

    • -0
    • +7
    ./qml/pages/settings/SettingsStack.qml
  1. … 2 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -23
    • +22
    ./qml/dialogs/DiagnosticsDialog.qml
  1. … 8 more files in changeset.
DEN-14955 : DEN-13152 bug fix - Fix slider to correctly accept value changes outside of slider-action induced changes

DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -4
    • +10
    ./qml/dialogs/DiagnosticsDialog.qml
DEN-15017 Ultrafiltration Volume Cannot Be Set to 0 L

- Talked with Sean and to use the 0x1A00 message | #3:(F32) | \ref Data::mUltrafiltration_Volume_Min |.

  1. … 1 more file in changeset.
DEN-14955 TxCreateRejection - Update based on feedback from Behrouz - Fix positioning of the invalid parameter after FW response to avoid abnormal repositioning on slider update - Add a constant variable for the no reject reason - Remove modification to VALUESET and add trigger macro call to the VTreatmentCreate file

    • -127
    • +125
    ./qml/pages/pretreatment/create/PreTreatmentCreate.qml
  1. … 3 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

    • -8
    • +24
    ./qml/dialogs/DiagnosticsDialog.qml
  1. … 8 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

- Added the Dialysis subState to TreatmentStates, message 0x0F

  1. … 5 more files in changeset.
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

- MSG_ID 0x0B

- Added the keepAlive/UI-CheckIn to the list of AckRequired so if HD won't ack UI, the Alarm, "HD Communication Failure" will be displayed.

  1. … 6 more files in changeset.
DEN-14955 TXCreateRejection - Add property *Accepted to handle validation status from FW - Add label color logic to rangeSlider for invalid parameter - Add setting of valid/accepted states in VTreatmentCreate on response handling

    • -1
    • +1
    ./qml/components/SliderCreateTreatment.qml
  1. … 2 more files in changeset.
DEN-14955 Quick Start - Pre Tx Screen - Remove debug value set for value of ultrafiltration slider max

DEN-14955 Quick Start - PreTx Screen - Add SliderArrows to the pre treatment ultrafiltration screen - correct coloring of rangeSlider tick colors for inactive / active state - Add bool property to Slider to enable centering of tickMarks on the slider - Correct the placement of tickmarks for center on rangeSlider

DEN-14955 Quick Start - Arrows - Add a enable property to enable pressAndHold signaling for arrows

DEN-14955 Quick Start Sliders - Fix slider to show initial value property set - Add visibility logic to show only one text tag of min/max when they are the same

    • -3
    • +0
    ./qml/components/SliderCreateTreatment.qml
DEN-14853 UI Out Of Sync With Firmware On Handled Messages

  1. … 19 more files in changeset.