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 minutes ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
Tuesday 01 Oct 2024
9:04 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

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

Dara Navaei

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

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

Behrouz NematiPour

Merge branch 'release/p1b/staging' into release/p1b/master

Options
5:50 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

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

Dara Navaei

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

Options
    • -2
    • +2
    /sources/canbus/MessageGlobals.h
    • -1
    • +1
    /sources/gui/qml/compounds/BPHREntry.qml
    • -2
    • +2
    /sources/gui/qml/pages/disinfect/DisinfectStack.qml
    • -1
    • +1
    /sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
    • -1
    • +1
    /sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml
    • -2
    • +2
    /sources/gui/qml/pages/settings/SettingsInformation.qml
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -2
    • +2
    /sources/model/hd/data/MHDUsageInfoResponse.cpp
    • -2
    • +2
    /sources/model/hd/data/MHDUsageInfoResponse.h
    • -1
    • +1
    /sources/model/settings/MWifiNetwork.h
    • -2
    • +2
    /sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp
    • -2
    • +2
    /sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h
    • -2
    • +2
    /sources/view/settings/VAdjustmentServiceDates.cpp
    • -2
    • +2
    /sources/view/settings/VAdjustmentServiceDates.h
    • -2
    • +2
    /sources/view/settings/VHDUsageInfo.cpp
    • -2
    • +2
    /sources/view/settings/VHDUsageInfo.h
    • -1
    • +1
    /sources/wifi/WifiInterface.cpp
5:31 pm

Behrouz NematiPour

Merge branch 'release/stagingmerge-DEN-17017-ui-bn-release-17' into release/p1b/staging

Options
5:22 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

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

Dara Navaei

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

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

Behrouz NematiPour

Merge branch 'staging' - DEN-17017: Release 17

Options
Thursday 26 Sep 2024
6:17 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

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

Dara Navaei

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

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

Behrouz NematiPour

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

Options
    • -2
    • +2
    /sources/canbus/MessageGlobals.h
    • -2
    • +8
    /sources/gui/qml/compounds/BPHREntry.qml
    • -28
    • +44
    /sources/gui/qml/pages/disinfect/DisinfectStack.qml
    • -1
    • +12
    /sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
    • -1
    • +6
    /sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml
    • -6
    • +4
    /sources/gui/qml/pages/settings/SettingsInformation.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -10
    • +2
    /sources/model/hd/data/MHDUsageInfoResponse.cpp
    • -8
    • +2
    /sources/model/hd/data/MHDUsageInfoResponse.h
    • -25
    • +20
    /sources/model/settings/MWifiNetwork.h
    • -7
    • +18
    /sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp
    • -17
    • +19
    /sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h
    • -6
    • +11
    /sources/view/settings/VAdjustmentServiceDates.cpp
    • -4
    • +5
    /sources/view/settings/VAdjustmentServiceDates.h
    • -12
    • +15
    /sources/view/settings/VHDUsageInfo.cpp
    • -2
    • +5
    /sources/view/settings/VHDUsageInfo.h
    • -5
    • +27
    /sources/wifi/WifiInterface.cpp
4:36 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

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

Dara Navaei

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

Options
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Wednesday 25 Sep 2024
3:19 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

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

Dara Navaei

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

Options
    • -1
    • +1
    /sources/canbus/MessageGlobals.h
    • -2
    • +2
    /sources/gui/qml/compounds/BPHREntry.qml
    • -1
    • +1
    /sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
    • -1
    • +1
    /sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml
    • -2
    • +2
    /sources/gui/qml/pages/settings/SettingsInformation.qml
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -2
    • +2
    /sources/model/hd/data/MHDUsageInfoResponse.cpp
    • -2
    • +2
    /sources/model/hd/data/MHDUsageInfoResponse.h
    • -2
    • +2
    /sources/view/settings/VAdjustmentServiceDates.cpp
    • -2
    • +2
    /sources/view/settings/VAdjustmentServiceDates.h
    • -2
    • +2
    /sources/view/settings/VHDUsageInfo.cpp
    • -2
    • +2
    /sources/view/settings/VHDUsageInfo.h
2:34 pm

Behrouz NematiPour

Merge branch 'DEN-17055-ui-dn-release-17' into staging

Options
1:57 pm

Behrouz NematiPour

LEAH-1864: UI: Digi Board Bring up - Basics [ ( NO Settings , NO Cloud) ]

- matched the Denali code to be executed on the Leahi board.

Options
    • -0
    • +3
    /denali.pro
    • -0
    • +4
    /sources/ApplicationController.cpp
    • -1351
    • +1352
    /sources/cloudsync/CloudSyncController.cpp
    • -1
    • +1
    /sources/gui/qml/pages/settings/SettingsExportLogs.qml
    • -3
    • +14
    /sources/storage/StorageGlobals.cpp
    • -2
    • +12
    /sources/utility/encryption.cpp
Monday 23 Sep 2024
8:38 pm

Behrouz NematiPour

Merge branch 'DEN-17055-ui-dn-release-17' into develop

Options
8:33 pm

Behrouz NematiPour

DEN-16947: UF goal did not reset to zero after first treatment

- set the PreTreatmentConnectionStack to clear the screens with entry when gets hidden.

Options
    • -0
    • +6
    /sources/gui/qml/compounds/BPHREntry.qml
    • -0
    • +11
    /sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
    • -0
    • +5
    /sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml
10:41 am

Dara Navaei

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.

Options
    • -2
    • +2
    /sources/view/settings/VHDUsageInfo.cpp
Friday 20 Sep 2024
3:58 pm

Dara Navaei

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.

Options
    • -2
    • +6
    /sources/view/settings/VHDUsageInfo.cpp
Thursday 19 Sep 2024
5:53 pm

Behrouz NematiPour

Merge branch 'DEN-17055-ui-dn-release-17' into develop

Options
    • -3
    • +3
    /sources/wifi/WifiInterface.cpp