Activity application/sources/model

10:38 am

Dara Navaei

More
78b3d1f
changed 12 files
master, DEN-17157-update_denali_application_for_dry_demo and 9 more

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

- -20
- +14
./hd/alarm/MAlarmMapping.cpp
- History
- Source
- Diff
./hd/alarm/MAlarmMapping.cpp
- -1
- +1
./hd/data/MHDBloodLeakData.cpp
- History
- Source
- Diff
./hd/data/MHDBloodLeakData.cpp
- -1
- +1
./hd/data/MHDBloodLeakData.h
- History
- Source
- Diff
./hd/data/MHDBloodLeakData.h
- -2
- +2
./hd/data/treatment/MTreatmentSalineData.cpp
- History
- Source
- Diff
./hd/data/.../MTreatmentSalineData.cpp
- -2
- +2
./hd/data/treatment/MTreatmentSalineData.h
- History
- Source
- Diff
./hd/data/treatment/MTreatmentSalineData.h
- -2
- +2
./hd/data/treatment/MTreatmentStatesData.cpp
- History
- Source
- Diff
./hd/data/.../MTreatmentStatesData.cpp
- -2
- +2
./hd/data/treatment/MTreatmentStatesData.h
- History
- Source
- Diff
./hd/data/treatment/MTreatmentStatesData.h
… 5 more files in changeset.

10:30 am

Behrouz NematiPour and Sean Nash

More
UI-DEN-17098-1
finished reviewing

10:17 am

Behrouz NematiPour

More
d9b9df9
changed 23 files
DEN-17147-leahi-ui-updates-on-denali-repo, feature/LEAH-1976-implement-a-simple-video-screen and 5 more UI-LEAH-1924-3

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.

- -2
- +2
./settings/MSettings.cpp
- History
- Source
- Diff
./settings/MSettings.cpp
… 22 more files in changeset.

5:13 pm

Dara Navaei

More
f0bb3c5
changed 7 files
master, DEN-17098-release_18_changes and 10 more UI-DEN-17098-1

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
./hd/data/MHDBloodLeakData.cpp
- History
- Source
- Diff
./hd/data/MHDBloodLeakData.cpp
- -21
- +30
./hd/data/MHDBloodLeakData.h
- History
- Source
- Diff
./hd/data/MHDBloodLeakData.h
- -12
- +19
./hd/data/treatment/MTreatmentSalineData.cpp
- History
- Source
- Diff
./hd/data/.../MTreatmentSalineData.cpp
- -12
- +18
./hd/data/treatment/MTreatmentSalineData.h
- History
- Source
- Diff
./hd/data/treatment/MTreatmentSalineData.h
- -30
- +34
./hd/data/treatment/MTreatmentStatesData.cpp
- History
- Source
- Diff
./hd/data/.../MTreatmentStatesData.cpp
- -30
- +35
./hd/data/treatment/MTreatmentStatesData.h
- History
- Source
- Diff
./hd/data/treatment/MTreatmentStatesData.h
… 1 more file in changeset.

7:55 pm

Dara Navaei

Please refer to: DRY-DEMO-DEN-17098-1

7:55 pm

Dara Navaei

Please refer to: DRY-DEMO-DEN-17098-1

4:31 pm

Dara Navaei

More
3d479ea
changed 1 file
master, DEN-17098-release_18_changes and 10 more UI-DEN-17098-1

DEN-17093: Blood Leak Zeroing in Treatment

- Fixed a typo

- -1
- +1
./hd/data/treatment/MTreatmentSalineData.h
- History
- Source
- Diff
./hd/data/treatment/MTreatmentSalineData.h

4:30 pm

Dara Navaei

Done

2:44 pm

Behrouz NematiPour

More
Re: UI-DEN-17098-1
commented on review

please take a look at dry-demo, as well.

2:41 pm

Behrouz NematiPour

RESOLVED

2:41 pm

Behrouz NematiPour

More
Re: UI-DEN-17098-1
commented on review

fix the numbering (should be 4).

2:02 pm

Dara Navaei

No we do not need this code. I removed it.

2:01 pm

Dara Navaei

More
490f8e8
changed 5 files
master, DEN-17098-release_18_changes and 10 more UI-DEN-17098-1

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
- +5
./hd/data/treatment/MTreatmentSalineData.cpp
- History
- Source
- Diff
./hd/data/.../MTreatmentSalineData.cpp
- -0
- +3
./hd/data/treatment/MTreatmentSalineData.h
- History
- Source
- Diff
./hd/data/treatment/MTreatmentSalineData.h
… 3 more files in changeset.

7:56 pm

Behrouz NematiPour

More
Re: UI-DEN-17098-1
commented on review

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.

7:55 pm

Behrouz NematiPour

More
Re: UI-DEN-17098-1
commented on review

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

3:32 pm

Dara Navaei

More
8e2ac7a
changed 8 files
master, DEN-17098-release_18_changes and 10 more UI-DEN-17098-1

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
./hd/data/MHDBloodLeakData.cpp
- History
- Source
- Diff
./hd/data/MHDBloodLeakData.cpp
- -0
- +9
./hd/data/MHDBloodLeakData.h
- History
- Source
- Diff
./hd/data/MHDBloodLeakData.h
… 6 more files in changeset.

11:05 am

Dara Navaei

More
UI-DEN-17098-1
started review

UI-DEN-17098_Release 18 Changes

10:31 pm

Behrouz NematiPour

More
a75bc5b
changed 11 files
DEN-17147-leahi-ui-updates-on-denali-repo, feature/LEAH-1976-implement-a-simple-video-screen and 5 more UI-LEAH-1924-3

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.