application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LEAH-1937: UI: Translation

- Removed the message and instruction from the structure since the rejection does not have those.

    • -22
    • +6
    /sources/view/VAdjustmentResponseBase.cpp
    • -5
    • +0
    /sources/view/VAdjustmentResponseBase.h
LEAH-1937: UI: Translation

Added Translation "qm" for "es"

    • -0
    • +5356
    /resources/translation/translation_es.ts
DEN-17093: Blood Leak Zeroing in Treatment

- Updated the payload of message 0x2F

- Updated the payload of message 0x0F

- Updated the payload of message 0x6C

    • -21
    • +33
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -21
    • +30
    /sources/model/hd/data/MHDBloodLeakData.h
LEAH-1937: UI: Translation

Added mechanism to class VAdjustmentResponseBase to support Rejects-Category for translation

    • -3
    • +65
    /sources/view/VAdjustmentResponseBase.cpp
    • -3
    • +18
    /sources/view/VAdjustmentResponseBase.h
DEN-17093: Blood Leak Zeroing in Treatment

- Fixed a typo

Merge branch 'DEN-17098-release_18_changes' into develop

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

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"

    • -2
    • +14
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -0
    • +9
    /sources/model/hd/data/MHDBloodLeakData.h
    • -0
    • +3
    /sources/view/hd/data/VHDBloodLeakData.cpp
    • -0
    • +3
    /sources/view/hd/data/VHDBloodLeakData.h
LEAH-1937: UI: Translation

Removed some "tr" from C++ code which does not need translation

Add new flag into the Qt-Project file for supporting Translation

Test the application with translation support

Identified new improvement options

Identified new bugs to be fixed

    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -1
    • +1
    /sources/canbus/MessageAcknowModel.cpp
    • -1351
    • +1351
    /sources/cloudsync/CloudSyncController.cpp
LEAH-1937: UI: Translation

This Commit has TEST_CODE included

Added slot to load translation

Added support for the qml-keyboard language

    • -0
    • +2
    /sources/view/settings/VLocalization.cpp
    • -0
    • +9
    /sources/view/settings/VLocalization.h
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.

    • -22
    • +2
    /sources/gui/qml/pages/MainStack.qml
    • -99
    • +105
    /sources/storage/Settings.cpp
    • -3
    • +2
    /sources/view/settings/VLocalization.cpp
    • -20
    • +4
    /sources/view/settings/VSettings.cpp
LEAH-1937: UI: Translation

Added locate option

Added Confirmation popup

Added write

Clean up the stack & settings

    • -6
    • +30
    /sources/view/settings/VLocalization.cpp
    • -0
    • +7
    /sources/view/settings/VLocalization.h
LEAH-1937: UI: Translation

Localization Menu

Localization Screen

Localization View

Localization Read

    • -0
    • +114
    /sources/gui/qml/pages/settings/SettingsLocalization.qml
    • -0
    • +58
    /sources/view/settings/VLocalization.cpp
    • -0
    • +63
    /sources/view/settings/VLocalization.h
DEN-12031: Models nested ifs : Changed some more model source files

Finalized the model changes

    • -14
    • +14
    /sources/model/dg/data/MDGValvesStatesData.cpp
    • -3
    • +8
    /sources/model/hd/alarm/MAlarmCleared.cpp
    • -5
    • +5
    /sources/model/hd/alarm/MAlarmStatusData.cpp
DEN-12031: Models nested ifs : Changed some more model source files

    • -19
    • +16
    /sources/model/dg/data/MDGAccelerometerData.cpp
    • -27
    • +20
    /sources/model/dg/data/MDGConductivityData.cpp
    • -17
    • +15
    /sources/model/dg/data/MDGDrainPumpData.cpp
    • -27
    • +20
    /sources/model/dg/data/MDGHeatersData.cpp
    • -11
    • +12
    /sources/model/dg/data/MDGPressuresData.cpp
    • -13
    • +13
    /sources/model/dg/data/MDGROPumpData.cpp
    • -25
    • +19
    /sources/model/dg/data/MDGReservoirData.cpp
  1. … 12 more files in changeset.
DEN-12031: Models nested if

Replaced else conditions with goto lError:

    • -12
    • +11
    /sources/model/hd/alarm/MAlarmStatusData.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'release/p1b/staging' into release/p1b/master

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /sources/gui/qml/compounds/BPHREntry.qml
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +1
    /sources/model/settings/MWifiNetwork.h
    • -2
    • +2
    /sources/view/settings/VHDUsageInfo.cpp
Merge branch 'release/stagingmerge-DEN-17017-ui-bn-release-17' into release/p1b/staging

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'staging' - DEN-17017: Release 17

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
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

    • -2
    • +8
    /sources/gui/qml/compounds/BPHREntry.qml
    • -28
    • +44
    /sources/gui/qml/pages/disinfect/DisinfectStack.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -10
    • +2
    /sources/model/hd/data/MHDUsageInfoResponse.cpp
    • -25
    • +20
    /sources/model/settings/MWifiNetwork.h
    • -6
    • +11
    /sources/view/settings/VAdjustmentServiceDates.cpp
    • -12
    • +15
    /sources/view/settings/VHDUsageInfo.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp