application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.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
    • -2
    • +2
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -2
    • +2
    /sources/model/hd/data/MHDBloodLeakData.h
    • -2
    • +2
    /sources/view/hd/data/VHDBloodLeakData.cpp
    • -2
    • +2
    /sources/view/hd/data/VHDBloodLeakData.h
Merge branch 'release/stagingmerge-DEN-17098-release_18_changes' 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
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"

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

- Fixed a typo

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

DEN-17093: Blood Leak Zeroing in Treatment

- Fixed blood leak view class

    • -12
    • +36
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -12
    • +30
    /sources/model/hd/data/MHDBloodLeakData.h
    • -4
    • +10
    /sources/view/hd/data/VHDBloodLeakData.cpp
    • -4
    • +10
    /sources/view/hd/data/VHDBloodLeakData.h
Merge branch 'staging'

Merge branch 'staging' into develop

LEAH-1937: UI: Translation

Fixed the notification message issue for translation

Changed the Germany to German

    • -2
    • +4
    /sources/view/settings/VLocalization.cpp
    • -1
    • +1
    /sources/view/settings/VLocalization.h
LEAH-1937: UI: Translation

Added the notification msg

    • -1
    • +2
    /sources/view/settings/VLocalization.cpp
LEAH-1937: UI: Translation

- Added the missing line in stash for the ApplicationController.cpp making the Settings static class.

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
    • -1
    • +1
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -1
    • +1
    /sources/model/hd/data/MHDBloodLeakData.h
    • -1
    • +1
    /sources/view/hd/data/VHDBloodLeakData.cpp
    • -1
    • +1
    /sources/view/hd/data/VHDBloodLeakData.h
Merge branch 'DEN-17098-release_18_changes' into staging

DEN-17093: Blood Leak Zeroing in Treatment

- Fixed blood leak view class

    • -7
    • +10
    /sources/view/hd/data/VHDBloodLeakData.cpp
    • -7
    • +10
    /sources/view/hd/data/VHDBloodLeakData.h
LEAH-1937: UI: Translation

- Moved the translations next to application location in translations folder on target build and point to Projects/application/resources when build on VM.

- Defined the Settings_Category_Translations for the locale as translations/translation

- Moved the settings(locale) next to application location in settings folder on target build and point to /home/denali/Desktop when build on VM.

- Defined the Settings_Category_Locale for the locale as settings/locale

- Added the translation ts/qm with tagged words for Spanish and Germany.

- Removed the loadTranslation logic from the Application controller.

- set the keyboardlocal property to read from the vLocalizations.

- Made all the methods in the Setting class static and the class not instantiable.

- Modified the ConfigurationsDataList to the ParametersDataList to distinguish between the settings and configurations, as well as clarification on the DataList of the Treatement Parameters.

- Corrected the order of the translation, log, startgui.

- Separated the Settings read function and added two readLocale and ReadConfigurations to be able to call the readLocale earlier to get the localization values needed for the rest of the configurations and translations.

    • -5356
    • +0
    /resources/translation/translation_es.ts
    • binary
    /resources/translations/translation_de.qm
    • -0
    • +5386
    /resources/translations/translation_de.ts
    • binary
    /resources/translations/translation_es.qm
    • -0
    • +5386
    /resources/translations/translation_es.ts
    • -1302
    • +1301
    /sources/device/DeviceController.cpp
    • -130
    • +81
    /sources/storage/Settings.cpp
  1. … 8 more files in changeset.
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