Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-17093: Blood Leak Zeroing in Treatment

- Added a new field to message 0x2F00 to log dialysate pump inlet to blood leak detector flush volume

- Removed the blood leak zeroing state enum read

  1. … 3 more files in changeset.
Could you please search for the 0x6C00 message ID in the Dry-Demo and update that too. If you found it please do the same as we did for the 0x0900 and 0x0B00. Also fix the dialin same as dry-demo.

Could you please search for the 0x6C00 message ID in the Dry-Demo and update that too.
If you found it please do the same as we did for the 0x0900 and 0x0B00.

Also fix the dialin same as dry-demo.

Don't we need to add the new field in its Model?

Don't we need to add the new field in its Model?

DEN-17093: Blood Leak Zeroing in Treatment

- Added a new enum in dialysis for blood leak zeroing

- Updated the payloads for message 0x6C

- Changed "Date And Time" to "Date and Time"

  1. … 4 more files in changeset.
UI-DEN-17098_Release 18 Changes
UI-DEN-17098_Release 18 Changes
LEAH-1937: UI: Translation

This Commit has TEST_CODE included

Added slot to load translation

Added support for the qml-keyboard language

  1. … 8 more files in changeset.
LEAH-1937: UI: Translation

- Removed not used NoCANBUS development settings.

- Added the two systemLocale and systemLanguage in the Settings singleton class, to be accessed by _Setting in one place.

- Renamed the isValid method in the Settings class to exists for clarity.

- Added local to the filename method in Settings to get the setting file name with the defined locale.

- Made the Category of the settings order to set eSettingsSystem at top, to get the locale first and then read the rest of the settings files according that setting.

- Separated the parse section from the read method to simplify the read function.

- Two big logic in Settings::read has changed:

1. the read won't read any conf file in the settings path anymore, since the order is not important and each file existance.

2. the Settings::read now reads a file and parse it after in oppose to read all files and the parse them. That is mainly because we need to make decision base on the content of the setting files (System.conf in this case for now)

- Renamed the Settings::save to saveSystem for clarification, since that is the only writable setting, and that does not have locale too.

  1. … 8 more files in changeset.
LEAH-1937: UI: Translation

Added locate option

Added Confirmation popup

Added write

Clean up the stack & settings

  1. … 3 more files in changeset.
LEAH-1937: UI: Translation

Localization Menu

Localization Screen

Localization View

Localization Read

    • -0
    • +58
    ./settings/VLocalization.cpp
    • -0
    • +63
    ./settings/VLocalization.h
  1. … 7 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -2
    • +2
    ./settings/VAdjustmentServiceDates.cpp
  1. … 11 more files in changeset.
Release 17 Code Review branch

git checkout release/stagingmerge-DEN-17017-ui-bn-release-17

git diff HEAD staging > ../stagingmerge-DEN-17017-ui-bn-release-17.patch

git apply ../stagingmerge-DEN-17017-ui-bn-release-17.patch

    • -6
    • +11
    ./settings/VAdjustmentServiceDates.cpp
  1. … 11 more files in changeset.
UI-DEN-17017_Release/Stagingmerge Release 17 [ Application ]
UI-DEN-17017_Release/Stagingmerge Release 17 [ Application ]
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -2
    • +2
    ./settings/VAdjustmentServiceDates.cpp
  1. … 8 more files in changeset.
RESOLVED

RESOLVED

Updated the code to not show any decimals.

Updated the code to not show any decimals.

DEN-16989: Treatment Information Not Showing on Information Screen

- Changed the HD usage info code to only show the hours without any decimals in the total hours as well as the hours since last service.

Displaying hours as a float can be confusing and not user-friendly. For example, seeing "11.7" requires users to calculate the actual hours and minutes, which adds unnecessary complexity. Please co...

Displaying hours as a float can be confusing and not user-friendly.
For example, seeing "11.7" requires users to calculate the actual hours and minutes, which adds unnecessary complexity.
Please consult with the system team to explore a more intuitive format for representing time, such as separating hours and minutes (e.g., "11h 42m" or 11:42) for better clarity.

DEN-16989: Treatment Information Not Showing on Information Screen

- Changed the HD usage info total number of hours and total number of hours since last service to be displayed only with 1 decimal point.

RESOLVED

RESOLVED

DEN-16989: Treatment Information Not Showing on Information Screen

- Addressed the code review comment

    • -4
    • +9
    ./settings/VAdjustmentServiceDates.cpp
Done

Done

please use the settings configuration formatting when needed in the following function: void View::VHDUsageInfo::onActionReceive(const HDUsageInfoResponseData &vData) *if there are other places ...

please use the settings configuration formatting when needed in the following function:

void View::VHDUsageInfo::onActionReceive(const HDUsageInfoResponseData &vData)


*if there are other places as we talked please update them with that as well.*
*please define the QSTring variable on top of the function and then used that variable (aka move your private variable in the function scope)*

_serviceDateFormat = _Settings.dateFormat();


and remove the private variable:

    const QString _LastTreatmentDateFormat    = "yyyy/MM/dd";