application

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
Last Commit: 20 Nov
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 14 Nov 2024
2:20 pm

Behrouz NematiPour

Merge branch 'release/stagingmerge-DEN-17098-release_18_changes' into release/p1b/staging

Options
1:18 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
1:16 pm

Dara Navaei

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

Options
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
11:37 am

Behrouz NematiPour

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

Options
    • -3
    • +3
    /sources/canbus/MessageGlobals.h
    • -1
    • +1
    /sources/gui/qml/pages/settings/SettingsStack.qml
    • -12
    • +36
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -12
    • +30
    /sources/model/hd/data/MHDBloodLeakData.h
    • -9
    • +20
    /sources/model/hd/data/treatment/MTreatmentSalineData.cpp
    • -9
    • +18
    /sources/model/hd/data/treatment/MTreatmentSalineData.h
    • -30
    • +34
    /sources/model/hd/data/treatment/MTreatmentStatesData.cpp
    • -30
    • +35
    /sources/model/hd/data/treatment/MTreatmentStatesData.h
    • -4
    • +10
    /sources/view/hd/data/VHDBloodLeakData.cpp
    • -4
    • +10
    /sources/view/hd/data/VHDBloodLeakData.h
    • -0
    • +1
    /sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp
11:18 am

Behrouz NematiPour

Merge branch 'staging'

Options
11:17 am

Behrouz NematiPour

Merge branch 'staging' into develop

Options
Tuesday 12 Nov 2024
4:48 pm

Amir Manesh <amanesh@diality.com>

LEAH-1937: UI: Translation

Fixed the notification message issue for translation

Changed the Germany to German

Options
    • -2
    • +4
    /sources/view/settings/VLocalization.cpp
    • -1
    • +1
    /sources/view/settings/VLocalization.h
Friday 08 Nov 2024
12:02 pm

Amir Manesh <amanesh@diality.com>

LEAH-1937: UI: Translation

Added the notification msg

Options
    • -4
    • +7
    /sources/gui/qml/pages/settings/SettingsLocalization.qml
    • -1
    • +2
    /sources/view/settings/VLocalization.cpp
11:24 am

Behrouz NematiPour

LEAH-1937: UI: Translation

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

Options
    • -2
    • +1
    /sources/ApplicationController.cpp
10:41 am

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
10:38 am

Dara Navaei

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

Options
    • -1
    • +1
    /sources/canbus/MessageGlobals.h
    • -1
    • +1
    /sources/gui/qml/pages/settings/SettingsStack.qml
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +1
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -1
    • +1
    /sources/model/hd/data/MHDBloodLeakData.h
    • -2
    • +2
    /sources/model/hd/data/treatment/MTreatmentSalineData.cpp
    • -2
    • +2
    /sources/model/hd/data/treatment/MTreatmentSalineData.h
    • -2
    • +2
    /sources/model/hd/data/treatment/MTreatmentStatesData.cpp
    • -2
    • +2
    /sources/model/hd/data/treatment/MTreatmentStatesData.h
    • -1
    • +1
    /sources/view/hd/data/VHDBloodLeakData.cpp
    • -1
    • +1
    /sources/view/hd/data/VHDBloodLeakData.h
    • -2
    • +2
    /sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp
10:29 am

Behrouz NematiPour

Merge branch 'DEN-17098-release_18_changes' into staging

Options
10:23 am

Dara Navaei

DEN-17093: Blood Leak Zeroing in Treatment

- Fixed blood leak view class

Options
    • -7
    • +10
    /sources/view/hd/data/VHDBloodLeakData.cpp
    • -7
    • +10
    /sources/view/hd/data/VHDBloodLeakData.h
1:44 am

Behrouz NematiPour

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.

Options
    • -2
    • +3
    /denali.pro
    • -1
    • +0
    /denali.qrc
    • -8
    • +16
    /main.cpp
    • -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
    • -18
    • +1
    /sources/ApplicationController.cpp
    • -1
    • +0
    /sources/ApplicationController.h
    • -1302
    • +1301
    /sources/device/DeviceController.cpp
    • -3
    • +1
    /sources/gui/qml/KeyboardItem.qml
    • -2
    • +2
    /sources/model/settings/MSettings.cpp
    • -130
    • +81
    /sources/storage/Settings.cpp
    • -52
    • +125
    /sources/storage/Settings.h
  16. … 8 more files in changeset.
Thursday 07 Nov 2024
11:59 am

Behrouz NematiPour

LEAH-1937: UI: Translation

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

Options
    • -1
    • +1
    /sources/storage/Settings.cpp
    • -1
    • +1
    /sources/storage/Settings.h
    • -1
    • +1
    /sources/storage/StorageGlobals.h
    • -22
    • +6
    /sources/view/VAdjustmentResponseBase.cpp
    • -5
    • +0
    /sources/view/VAdjustmentResponseBase.h
11:57 am

Amir Manesh <amanesh@diality.com>

LEAH-1937: UI: Translation

Added Translation "qm" for "es"

Options
    • -0
    • +5356
    /resources/translation/translation_es.ts
Wednesday 06 Nov 2024
5:13 pm

Dara Navaei

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

Options
    • -3
    • +3
    /sources/canbus/MessageGlobals.h
    • -21
    • +33
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -21
    • +30
    /sources/model/hd/data/MHDBloodLeakData.h
    • -12
    • +19
    /sources/model/hd/data/treatment/MTreatmentSalineData.cpp
    • -12
    • +18
    /sources/model/hd/data/treatment/MTreatmentSalineData.h
    • -30
    • +34
    /sources/model/hd/data/treatment/MTreatmentStatesData.cpp
    • -30
    • +35
    /sources/model/hd/data/treatment/MTreatmentStatesData.h
Tuesday 05 Nov 2024
12:05 pm

Amir Manesh <amanesh@diality.com>

LEAH-1937: UI: Translation

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

Options
    • -0
    • +1
    /sources/storage/Settings.cpp
    • -0
    • +3
    /sources/storage/Settings.h
    • -0
    • +1
    /sources/storage/StorageGlobals.cpp
    • -0
    • +1
    /sources/storage/StorageGlobals.h
    • -3
    • +65
    /sources/view/VAdjustmentResponseBase.cpp
    • -3
    • +18
    /sources/view/VAdjustmentResponseBase.h
Monday 28 Oct 2024
4:31 pm

Dara Navaei

DEN-17093: Blood Leak Zeroing in Treatment

- Fixed a typo

Options
    • -1
    • +1
    /sources/model/hd/data/treatment/MTreatmentSalineData.h
4:08 pm

Behrouz NematiPour

Merge branch 'DEN-17098-release_18_changes' into develop

Options
Sunday 27 Oct 2024
2:01 pm

Dara Navaei

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

Options
    • -1
    • +1
    /sources/canbus/MessageGlobals.h
    • -1
    • +5
    /sources/model/hd/data/treatment/MTreatmentSalineData.cpp
    • -0
    • +3
    /sources/model/hd/data/treatment/MTreatmentSalineData.h
    • -1
    • +0
    /sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp
    • -1
    • +0
    /sources/view/hd/data/treatment/VHDTreatmentStatesData.h
Thursday 24 Oct 2024
3:32 pm

Dara Navaei

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"

Options
    • -1
    • +1
    /sources/canbus/MessageGlobals.h
    • -1
    • +1
    /sources/gui/qml/pages/settings/SettingsStack.qml
    • -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
    • -0
    • +2
    /sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp
    • -0
    • +1
    /sources/view/hd/data/treatment/VHDTreatmentStatesData.h
Monday 21 Oct 2024
1:36 pm

Amir Manesh <amanesh@diality.com>

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

Options
    • -0
    • +3
    /denali.pro
    • -0
    • +5435
    /denali.ts
    • -1
    • +1
    /sources/ApplicationController.cpp
    • -1
    • +1
    /sources/MainTimer.cpp
    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -3
    • +3
    /sources/canbus/CanInterface.cpp
    • -1
    • +1
    /sources/canbus/FrameInterface.cpp
    • -1
    • +1
    /sources/canbus/MessageAcknowModel.cpp
    • -1
    • +1
    /sources/canbus/MessageDispatcher.cpp
    • -1351
    • +1351
    /sources/cloudsync/CloudSyncController.cpp
    • -1
    • +1
    /sources/gui/GuiController.cpp
    • -1
    • +1
    /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
    • -2
    • +2
    /sources/storage/Logger.cpp
    • -1
    • +1
    /sources/storage/Settings.cpp
    • -1
    • +1
    /sources/storage/TreatmentLog.cpp
    • -1
    • +1
    /sources/wifi/WifiInterface.cpp
Tuesday 15 Oct 2024
4:58 pm

Amir Manesh <amanesh@diality.com>

LEAH-1937: UI: Translation

This Commit has TEST_CODE included

Added slot to load translation

Added support for the qml-keyboard language

Options
    • -6
    • +8
    /main.cpp
    • -0
    • +12
    /sources/ApplicationController.cpp
    • -0
    • +1
    /sources/ApplicationController.h
    • -1
    • +3
    /sources/gui/qml/KeyboardItem.qml
    • -3
    • +56
    /sources/storage/Settings.cpp
    • -0
    • +8
    /sources/storage/Settings.h
    • -0
    • +1
    /sources/storage/StorageGlobals.cpp
    • -0
    • +1
    /sources/storage/StorageGlobals.h
    • -0
    • +2
    /sources/view/settings/VLocalization.cpp
    • -0
    • +9
    /sources/view/settings/VLocalization.h
Monday 14 Oct 2024
10:31 pm

Behrouz NematiPour

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.

Options
    • -22
    • +2
    /sources/gui/qml/pages/MainStack.qml
    • -3
    • +0
    /sources/gui/qml/pages/settings/SettingsServicePassword.qml
    • -0
    • +3
    /sources/model/settings/MSettings.cpp
    • -2
    • +5
    /sources/model/settings/MSettings.h
    • -99
    • +105
    /sources/storage/Settings.cpp
    • -10
    • +15
    /sources/storage/Settings.h
    • -1
    • +0
    /sources/storage/StorageGlobals.cpp
    • -1
    • +0
    /sources/storage/StorageGlobals.h
    • -3
    • +2
    /sources/view/settings/VLocalization.cpp
    • -20
    • +4
    /sources/view/settings/VSettings.cpp
    • -1
    • +0
    /sources/view/settings/VSettings.h
Friday 11 Oct 2024
3:43 pm

Amir Manesh <amanesh@diality.com>

LEAH-1937: UI: Translation

Added locate option

Added Confirmation popup

Added write

Clean up the stack & settings

Options
    • -4
    • +15
    /sources/gui/qml/pages/settings/SettingsLocalization.qml
    • -2
    • +2
    /sources/gui/qml/pages/settings/SettingsStack.qml
    • -2
    • +0
    /sources/storage/Settings.h
    • -6
    • +30
    /sources/view/settings/VLocalization.cpp
    • -0
    • +7
    /sources/view/settings/VLocalization.h
Thursday 10 Oct 2024
5:57 pm

Amir Manesh <amanesh@diality.com>

LEAH-1937: UI: Translation

Localization Menu

Localization Screen

Localization View

Localization Read

Options
    • -0
    • +2
    /denali.pro
    • -0
    • +1
    /denali.qrc
    • -0
    • +1
    /sources/gui/GuiGlobals.cpp
    • -0
    • +2
    /sources/gui/qml/main.qml
    • -0
    • +114
    /sources/gui/qml/pages/settings/SettingsLocalization.qml
    • -5
    • +10
    /sources/gui/qml/pages/settings/SettingsStack.qml
    • -1
    • +1
    /sources/storage/Settings.h
    • -0
    • +1
    /sources/view/VView.h
    • -0
    • +58
    /sources/view/settings/VLocalization.cpp
    • -0
    • +63
    /sources/view/settings/VLocalization.h
Thursday 03 Oct 2024
2:43 pm

Amir Manesh <amanesh@diality.com>

DEN-12031: Models nested ifs : Changed some more model source files

Finalized the model changes

Options
    • -1
    • +1
    /sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp
    • -14
    • +14
    /sources/model/dg/data/MDGValvesStatesData.cpp
    • -2
    • +7
    /sources/model/hd/adjustment/MAdjustPowerOff.cpp
    • -3
    • +8
    /sources/model/hd/alarm/MAlarmCleared.cpp
    • -3
    • +8
    /sources/model/hd/alarm/MAlarmClearedCondition.cpp
    • -5
    • +5
    /sources/model/hd/alarm/MAlarmStatusData.cpp
    • -4
    • +9
    /sources/model/hd/data/post/MHDPostFinalResultData.cpp
    • -3
    • +8
    /sources/model/hd/data/post/MHDRTCEpochData.cpp
Wednesday 02 Oct 2024
6:05 pm

Amir Manesh <amanesh@diality.com>

DEN-12031: Models nested ifs : Changed some more model source files

Options
    • -7
    • +10
    /sources/model/confirm/MDuetConfirmHDi.cpp
    • -21
    • +17
    /sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp
    • -5
    • +9
    /sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp
    • -5
    • +9
    /sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp
    • -19
    • +16
    /sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp
    • -7
    • +11
    /sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp
    • -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
    • -9
    • +11
    /sources/model/dg/data/MDGLoadCellReadingsData.cpp
    • -5
    • +9
    /sources/model/dg/data/MDGOperationModeData.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
  16. … 12 more files in changeset.
5:07 pm

Amir Manesh <amanesh@diality.com>

DEN-12031: Models nested if

Replaced else conditions with goto lError:

Options
    • -12
    • +11
    /sources/model/hd/alarm/MAlarmStatusData.cpp