Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-15905-UI-BN-S102-Log178' into staging

  1. … 1 more file in changeset.
Added

Added

Fixed

Fixed

added

added

  1. … 2 more files in changeset.
yes I did.

yes I did.

these are combined/bundled states. look into the cpp. that is I added an extra _ in the name to distinguish them.

these are combined/bundled states.
look into the cpp.
that is I added an extra _ in the name to distinguish them.

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

  1. … 1 more file in changeset.
Do you have the HD state for these like the other ones we have ? If yes, can you please put the ///<

Do you have the HD state for these like the other ones we have ? If yes, can you please put the ///<

Type in the name, reservoir missing an r

Type in the name, reservoir missing an r

//DEBUG, please

//DEBUG, please

Did you intentionally left this commented out ?

Did you intentionally left this commented out ?

Please add //DEBUG

Please add //DEBUG

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

  1. … 12 more files in changeset.
DEN-15514: UI: In-Progress Indicator Missing During Cartridge Priming Steps

- Added some possible solution and will see what is the feedback.

  1. … 2 more files in changeset.
DEN-15112: Added - UI: UI Does not Display (Pending) Treatment Logs on Export Logs Screen

Updated the filemodel to have a proxyModel for filtering and sorting actions

    • -42
    • +13
    ./pages/settings/SettingsExportLogs.qml
  1. … 12 more files in changeset.
RESOLVED

RESOLVED

RESOLVED

RESOLVED

DEN-15514: UI: In-Progress Indicator Missing During Cartridge Priming Steps

- The issue on the FW side which not updating the corresponding blood prime state field ( index 6 ) causes the issue and UI is not getting updated.

- Regardless, updated the states to avoid later confusion.

added

added

Added

Added

Please put //DEBUG

Please put //DEBUG

Please put //DEBUG

Please put //DEBUG

DEN-15548: UI: Send alarm 178 on CAN (also log alarm 178)

- added the log for the Alarm UI generates (178) to be displayed on the screen, which is not actually send on the CANBus.

- I did not created another extra AlarmStatus request Model, since it is not necessary t o send this message over the CANBus, and it would be lots of unnecessary code for an unnecessary action (sending the message over the CANBus ) since the nature of the message actually is to be sent when there is no HD to ack UI messages.

  1. … 11 more files in changeset.
DEN-15905 - DEN-15548 - UI-BN-S102-Log178 - Application [ Ready ]
DEN-15905 - DEN-15548 - UI-BN-S102-Log178 - Application [ Ready ]
these are the removed/red lines. the added/green lines and not-changed/white lines are alinged.

these are the removed/red lines.
the added/green lines and not-changed/white lines are alinged.