Activity application/sources/view

10:58 pm

Behrouz NematiPour

More
07e0c7b
changed 42 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 232 more UI-DEN-6631-1

DEN-6863 , DEN-6865 , DEN-6866 : psTx

- Added Recirculate timeout Model/View.

- Added Rinseback timeout to the Model/View.

- Added three more parameter to the Treatment State Message 15 for the "Blood Prime", "Treatment End", "Treatment Stop"

- Renamed the StackItem method "back" to "page".

- Renamed the "End" button label to "End Treatment"

- Renamed the "TreatmentComplete" Screen to "TreatmentEnd" to be more consistent with the states.

- Added the "TreatmentEndPause" screen for "Treatment End Pause" state

- Added the recirculate timeout to the screens.

- Added the rinseback timeout to the screens.

- Refactored the "txDialysisRunning" to "txDialysis" to match the state with the same name.

-

- -0
- +1
./VView.h
- History
- Source
- Diff
./VView.h
- -14
- +33
./hd/data/VHDTreatmentStatesData.cpp
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.cpp
- -44
- +47
./hd/data/VHDTreatmentStatesData.h
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.h
- -0
- +26
./hd/data/VTreatmentRecirculateData.cpp
- History
- Source
./hd/data/VTreatmentRecirculateData.cpp
- -0
- +44
./hd/data/VTreatmentRecirculateData.h
- History
- Source
./hd/data/VTreatmentRecirculateData.h
- -4
- +6
./hd/data/VTreatmentRinsebackData.cpp
- History
- Source
- Diff
./hd/data/VTreatmentRinsebackData.cpp
- -4
- +6
./hd/data/VTreatmentRinsebackData.h
- History
- Source
- Diff
./hd/data/VTreatmentRinsebackData.h
… 35 more files in changeset.

11:04 pm

Behrouz NematiPour

More
28a3832
changed 14 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 232 more UI-DEN-6631-1

DEN-6862 , DEN-6865 : Blood Prime && Rinseback && Ricirculate

- Moved all the the imports into the main.qml since find out it doesn't make any difference until the module is loaded dynamically at runtime which we don't since it is slow.

- Added PostTreatmentAdditional for Additional Rinseback.

- Added RinsebackInit for Rinseback setup

- Code Clean up & refactoring

- -2
- +2
./hd/adjustment/VTreatmentAdjustmentRecirculate.cpp
- History
- Source
- Diff
./hd/.../VTreatmentAdjustmentRecirculate.cpp
- -4
- +4
./hd/adjustment/VTreatmentAdjustmentRecirculate.h
- History
- Source
- Diff
./hd/.../VTreatmentAdjustmentRecirculate.h
- -1
- +1
./hd/adjustment/VTreatmentAdjustmentRinseback.h
- History
- Source
- Diff
./hd/.../VTreatmentAdjustmentRinseback.h
- -8
- +9
./hd/data/VHDTreatmentStatesData.cpp
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.cpp
- -1
- +1
./hd/data/VHDTreatmentStatesData.h
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.h
… 9 more files in changeset.

4:58 pm

Behrouz NematiPour

More
2d37388
changed 18 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 232 more UI-DEN-6631-1

DEN-6862, DEN-6865 Blood Prime Screen

- Added Blood Prime Screen/Message

- Cleaned up the code a little.

- -0
- +1
./VView.h
- History
- Source
- Diff
./VView.h
- -0
- +1
./hd/data/VHDTreatmentStatesData.cpp
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.cpp
- -0
- +1
./hd/data/VHDTreatmentStatesData.h
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.h
- -0
- +26
./hd/data/VTreatmentBloodPrimeData.cpp
- History
- Source
./hd/data/VTreatmentBloodPrimeData.cpp
- -0
- +44
./hd/data/VTreatmentBloodPrimeData.h
- History
- Source
./hd/data/VTreatmentBloodPrimeData.h
… 13 more files in changeset.

1:44 pm

Behrouz NematiPour

More
fd25d67
changed 19 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 232 more UI-DEN-6631-1

DEN-6862: ptTx-RB: Implementation [Screens] Rinseback Complete

- DEN-6864: ptTx-RB: Implementation [Messaging] (1/2)

- DEN-6865: ptTx-RB: Implementation [Messaging] (2/2)

- Added ImageText Componenet for the rinseback in progress screen

- Added Flow rate as well to the message ID_Rinseback as 3rd parameter.

- Connected Recirculate message to the Recirculate screen in progress.

- Connected Rinseback (Adj/Data) messages to the Rinseback screen in progress.

- Updated TreatmentStack Screen navigation for the Rinseback, Recirculate, TreatmentComplete and so on.

- -0
- +35
./hd/adjustment/VTreatmentAdjustmentRecirculate.cpp
- History
- Source
- Diff
./hd/.../VTreatmentAdjustmentRecirculate.cpp
- -4
- +4
./hd/adjustment/VTreatmentAdjustmentRecirculate.h
- History
- Source
- Diff
./hd/.../VTreatmentAdjustmentRecirculate.h
- -2
- +2
./hd/adjustment/VTreatmentAdjustmentRinseback.cpp
- History
- Source
- Diff
./hd/.../VTreatmentAdjustmentRinseback.cpp
- -12
- +12
./hd/adjustment/VTreatmentAdjustmentRinseback.h
- History
- Source
- Diff
./hd/.../VTreatmentAdjustmentRinseback.h
- -1
- +1
./hd/data/VHDTreatmentStatesData.cpp
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.cpp
- -1
- +1
./hd/data/VHDTreatmentStatesData.h
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.h
- -1
- +2
./hd/data/VTreatmentRinsebackData.cpp
- History
- Source
- Diff
./hd/data/VTreatmentRinsebackData.cpp
- -1
- +2
./hd/data/VTreatmentRinsebackData.h
- History
- Source
- Diff
./hd/data/VTreatmentRinsebackData.h
… 11 more files in changeset.

3:05 am

Behrouz NematiPour

More
58014da
changed 29 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 232 more UI-DEN-6631-1

DEN-6864: Implementation [Messaging] (1/2)

- -0
- +3
./VView.h
- History
- Source
- Diff
./VView.h
- -0
- +45
./hd/adjustment/VTreatmentAdjustmentRecirculate.cpp
- History
- Source
./hd/.../VTreatmentAdjustmentRecirculate.cpp
- -0
- +68
./hd/adjustment/VTreatmentAdjustmentRecirculate.h
- History
- Source
./hd/.../VTreatmentAdjustmentRecirculate.h
- -0
- +46
./hd/adjustment/VTreatmentAdjustmentRinseback.cpp
- History
- Source
./hd/.../VTreatmentAdjustmentRinseback.cpp
- -0
- +74
./hd/adjustment/VTreatmentAdjustmentRinseback.h
- History
- Source
./hd/adjustment/VTreatmentAdjustmentRinseback.h
- -28
- +56
./hd/data/VHDTreatmentStatesData.cpp
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.cpp
- -7
- +20
./hd/data/VHDTreatmentStatesData.h
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.h
- -0
- +26
./hd/data/VTreatmentRinsebackData.cpp
- History
- Source
./hd/data/VTreatmentRinsebackData.cpp
- -0
- +44
./hd/data/VTreatmentRinsebackData.h
- History
- Source
./hd/data/VTreatmentRinsebackData.h
… 20 more files in changeset.

9:04 pm

Behrouz NematiPour

More
3345651
changed 12 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 232 more UI-DEN-6631-1

- Added PostTreatmentComplete.qml screen - Added PostTreatmentRinsebackComplete.qml - Removed '_' from Dialisate state property name - fixed the Alarm enum name change on AlarmDefs

- -2
- +2
./hd/data/VHDTreatmentStatesData.cpp
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.cpp
- -2
- +2
./hd/data/VHDTreatmentStatesData.h
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.h
… 10 more files in changeset.

2:00 pm

Peter Lucia <plucia@diality.com>

More
faa306f
changed 5 files
DEN-7035_Date_Time_Set, DEN-7041_UI_build_fix and 6 more UI-DEN-7044-2

Merge DEN-4860_BLE into master

- -11
- +13
./VBluetooth.cpp
- History
- Source
- Diff
./VBluetooth.cpp
- -2
- +2
./VBluetooth.h
- History
- Source
- Diff
./VBluetooth.h
… 3 more files in changeset.

1:57 pm

Peter Lucia <plucia@diality.com>

More
d0a6510
changed 12 files
DEN-7035_Date_Time_Set, DEN-7041_UI_build_fix and 6 more

Merge master into DEN-6349_bp_hr_manual_entry

- -3
- +9
./hd/alarm/VAlarmStatus.cpp
- History
- Source
- Diff
./hd/alarm/VAlarmStatus.cpp
… 11 more files in changeset.

10:44 am

Behrouz NematiPour

More
76f632c
changed 24 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 232 more UI-DEN-6631-1

6636: ptTx_Rinseback: Implementation

- Added the PostTreatmentRinseback.qml

- Added the PostTreatmentRecirculate.qml

- Improved the StackItem.qml

- Added Rinseback/Recirculate Navigation

- Removed Diagnostics screen since it's not one screen anymore and is too old.

-

- -6
- +5
./hd/data/VHDTreatmentStatesData.cpp
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.cpp
- -9
- +5
./hd/data/VHDTreatmentStatesData.h
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.h
… 22 more files in changeset.

12:18 pm

Behrouz NematiPour

More
a303012
changed 16 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 233 more UI-DEN-5777-1

DEN-6619: Implementation

- Added a signal named didSDCardSpaceTooLow in the DriveWatcher which will be triggered when the free storage space available on the SD-CARD is less than 10%. (No action on UI happens currently)

- Added a flag in DriveWatcher to stop emitting the Logger while it is cleaning the Logs [[ IMPORTANT : is is handled by signal/slots for thread synchronization and safety ]].

- Added a function to find the total size of the file in a path.

- Added find function to find files with a list of filter in a path.

- Added an overloaded version of find to help find the files in a path which are exceeding the storage limit from the oldest files.

- Added error check in the read overloaded which works with Json.

- Re-implemented the FileHandler::removeLogs to clean up the logs by % instead of date.

- Removed unused global log paths from StorageGlobal.

-

- -1
- +1
./VTreatmentCreate.cpp
- History
- Source
- Diff
./VTreatmentCreate.cpp
… 15 more files in changeset.

9:13 pm

Behrouz NematiPour

More
7777127
changed 8 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 234 more UI-DEN-5751-1

DEN-6612 UI_DVT: Pre-Treatment Ultrafiltration

- This story wasn't part of the current sprint S37 but while I worked on it to be able to push it to master ASAP, so put the story as the commit comment.

- -0
- +2
./VTreatmentBegin.h
- History
- Source
- Diff
./VTreatmentBegin.h
- -2
- +2
./hd/alarm/VAlarmStatus.cpp
- History
- Source
- Diff
./hd/alarm/VAlarmStatus.cpp
… 6 more files in changeset.

5:21 pm

Behrouz NematiPour

More
7fb8deb
changed 1 file
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 236 more UI-UCOMMITS-4

Server coverage issue fixed

- This line was not covered on server although it was covered on local.

Tested locally and it is working.

- -1
- +3
./hd/alarm/VAlarmStatus.cpp
- History
- Source
- Diff
./hd/alarm/VAlarmStatus.cpp

1:11 pm

Behrouz NematiPour

More
4af6dcf
changed 2 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 236 more UI-UCOMMITS-4

Build failed on server because the fw common branch master was changed.

- commented out the removed enum from application.

- -4
- +4
./hd/data/VHDTreatmentStatesData.cpp
- History
- Source
- Diff
./hd/data/VHDTreatmentStatesData.cpp
… 1 more file in changeset.

12:55 pm

Peter Lucia <plucia@diality.com>

More
54aae98
changed 13 files
DEN-7035_Date_Time_Set, DEN-7041_UI_build_fix and 6 more

Merge master into DEN-4860_BLE

- -2
- +6
./hd/alarm/VAlarmStatus.cpp
- History
- Source
- Diff
./hd/alarm/VAlarmStatus.cpp
… 12 more files in changeset.

11:56 am

Peter Lucia <plucia@diality.com>

More
dca8a36
changed 6 files
DEN-4860_BLE, DEN-7035_Date_Time_Set and 7 more UI-DEN-4860-BLE-1 UI-DEN-7044-2 UI-DEN-7524-3 UI-DEN-8058-1

DEN-4867: Code Review 0 - Requested Modifications

- Removed startBLETimer and killBLETimer so we are not creating and deleting timers. Only one timer will be used

- Added toggleBLETimer

- Logging measurements when they are received instead of using qDebug

- Passing device addr and name to BLEScanner instead of just addr so only a QBluetoothDeviceInfo object is necessary, allowing removal of the macAddress QString

- Removed VBluetoothDeviceInfo static cast in VBluetooth::doSelectDevice