Activity application/sources/gui

5:41 pm

Michael Garthwaite

More
4884b4c
changed 3 files
DEN-13226_UI_Unit_Testing UI-DEN-13226-1

Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

- -0
- +1
./GuiGlobals.h
- History
- Source
- Diff
./GuiGlobals.h
- -2
- +1
./qml/main.qml
- History
- Source
- Diff
./qml/main.qml
… 1 more file in changeset.

5:41 pm

Michael Garthwaite

More
2124420
changed 9 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 198 more UI-DEN-12121-1

DEN-12121: Updates per code review

- -0
- +1
./GuiGlobals.h
- History
- Source
- Diff
./GuiGlobals.h
- -0
- +1
./qml/AlarmItem.qml
- History
- Source
- Diff
./qml/AlarmItem.qml
- -1
- +1
./qml/dialogs/DiagnosticsDialog.qml
- History
- Source
- Diff
./qml/dialogs/DiagnosticsDialog.qml
- -2
- +1
./qml/main.qml
- History
- Source
- Diff
./qml/main.qml
… 5 more files in changeset.

4:48 pm

Behrouz NematiPour

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

This needs to be updated to 10 * 4 if the change to the "TreatmentStates" is approved by Sean Nash. Also please remove the duplicate.

This needs to be updated to 10 * 4 if the change to the "TreatmentStates" is approved by Sean Nash.
Also please remove the duplicate.

4:42 pm

Behrouz NematiPour

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

Sean Nash, How the change to the TreatmentState message will affect the Application? This newly added parameter seems redundant to me. The change is the "Dialysis State" addition. 10 - (U32) Dial...

Sean Nash,
How the change to the TreatmentState message will affect the Application?
This newly added parameter seems redundant to me.

The change is the "Dialysis State" addition.

10 - (U32) Dialysis state

Unknown macro: { 0=start, 1=UF, 2=saline bolus }

0x0F00

15

0x040

4 Hz

N

HD

All

Treatment State

sub-mode (U32-enum)

(U32) UF state

(U32) saline bolus state

(U32) Hep state

(U32) Rinseback state

(U32) Recirc state

7 - (U32) Bld Prime state

8 - (U32) Tx End state

9 - (U32) Stop state

10 - (U32) Dialysis state

4:40 pm

Behrouz NematiPour

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

Please remove the box column, we decided not to use it in the Application documentation. Please do this for all the new models added.

Please remove the box column, we decided not to use it in the Application documentation.
Please do this for all the new models added.

4:27 pm

Michael Garthwaite

Users can not see the alarm screen when the diagnostics screen is visible. This was a request by systems in DEN-12118. Is there another approach to this?

3:47 pm

Behrouz NematiPour

it has already been defined, this would be a duplicate handler. why do we need to have the top on diagnostics while it has to always be on alarm dialog/bar on screen?

it has already been defined, this would be a duplicate handler.
why do we need to have the top on diagnostics while it has to always be on alarm dialog/bar on screen?

3:45 pm

Michael Garthwaite

Required to display the Alarm Top on the diagnostic screen

3:43 pm

Behrouz NematiPour

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

keep one line empty on top of the // HD Data Messages

3:41 pm

Behrouz NematiPour

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

Why VAlarmStatus is added?

3:35 pm

Behrouz NematiPour

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

This message has been defined with 5xF32 parameters. 0x3100 49 0x080 1 Hz N DG All DG Conductivity Data (F32) RO rejection ratio (F32) CPi conductivity (F32) CPo conductivity (F32) CD1 conductivit...

This message has been defined with 5xF32 parameters.

0x3100

49

0x080

1 Hz

N

DG

All

DG Conductivity Data

(F32) RO rejection ratio

(F32) CPi conductivity

(F32) CPo conductivity

(F32) CD1 conductivity

(F32) CD2 conductivity

8:12 pm

Dara Navaei

More
UI-DEN-12121-1
started review

UI-DEN-12121_SW Dev Sprint 65

4:59 pm

Behrouz NematiPour

More
a3a8ae1
changed 6 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 198 more UI-UCOMMITS-3

DEN-12180: Internal general support

- investigate on the Begin Prime back to Cartridge installation

- Added objectName for easier debug.

- added the stack change for the Cartridge Installation in case FW wants to navigate back from Begin Prime to the beginning of Cartridge Installation.

- -0
- +4
./qml/pages/posttreatment/PostTreatmentStack.qml
- History
- Source
- Diff
./qml/pages/.../PostTreatmentStack.qml
- -0
- +5
./qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
- History
- Source
- Diff
./qml/.../PreTreatmentDisposablesStack.qml
- -0
- +2
./qml/pages/pretreatment/PreTreatmentPrimeStack.qml
- History
- Source
- Diff
./qml/pages/.../PreTreatmentPrimeStack.qml
- -8
- +8
./qml/pages/pretreatment/PreTreatmentStack.qml
- History
- Source
- Diff
./qml/pages/.../PreTreatmentStack.qml
… 2 more files in changeset.

4:43 pm

Michael Garthwaite

More
34861b4
changed 9 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 198 more UI-DEN-12121-1

DEN-12121: Updated Models and views to latest messaging protocol. Fixed BLD to show detect counter. Updated get version to display compatibility revision.

- -4
- +6
./qml/dialogs/DiagnosticsDialog.qml
- History
- Source
- Diff
./qml/dialogs/DiagnosticsDialog.qml
… 8 more files in changeset.

11:19 am

Behrouz NematiPour

More
388ecba
changed 6 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 198 more UI-DEN-12182-2

DEN-12180: INT: Alarm dialog body space [RC: 15*80]

- reduced the bottom margin of the Alarm Dialog bottoms.

- removed the space from the legacy files which caused issue with DevOps scripts.

- -1
- +1
./qml/dialogs/NotificationDialog.qml
- History
- Source
- Diff
./qml/dialogs/NotificationDialog.qml
… 5 more files in changeset.

6:24 pm

Michael Garthwaite

More
6a9123e
changed 7 files
DEN-13226_UI_Unit_Testing UI-DEN-13226-1

Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

- -2
- +4
./GuiGlobals.h
- History
- Source
- Diff
./GuiGlobals.h
- -2
- +10
./qml/main.qml
- History
- Source
- Diff
./qml/main.qml
… 5 more files in changeset.

6:22 pm

Michael Garthwaite

More
b6d23ac
changed 3 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 198 more UI-DEN-12121-1

DEN-12121: Further linkage for updating values on screen relating to DEN-12118

- -3
- +1
./qml/dialogs/DiagnosticsDialog.qml
- History
- Source
- Diff
./qml/dialogs/DiagnosticsDialog.qml
… 2 more files in changeset.

2:55 pm

Michael Garthwaite

More
65754e8
changed 1 file
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 198 more UI-UCOMMITS-3

DEN-12121: Updates per system team's feedback for DEN-12118

- -15
- +15
./qml/dialogs/DiagnosticsDialog.qml
- History
- Source
- Diff
./qml/dialogs/DiagnosticsDialog.qml

10:36 am

Michael Garthwaite

More
30a3a58
changed 15 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 198 more UI-DEN-12121-1

DEN-12121: Implemented QML updates, proper view links for QML, and remaining implementation for new messages to the QML stack. All relate to DEN-12118.

- -0
- +4
./GuiGlobals.cpp
- History
- Source
- Diff
./GuiGlobals.cpp
- -54
- +101
./qml/dialogs/DiagnosticsDialog.qml
- History
- Source
- Diff
./qml/dialogs/DiagnosticsDialog.qml
- -2
- +10
./qml/main.qml
- History
- Source
- Diff
./qml/main.qml
… 12 more files in changeset.

6:25 pm

Michael Garthwaite

More
2d37cfe
changed 10 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 198 more UI-DEN-12121-1

Merge branch 'staging' into DEN-12121-sw_dev-sprint-65

- -7
- +7
./GuiGlobals.h
- History
- Source
- Diff
./GuiGlobals.h
- -10
- +8
./qml/dialogs/DiagnosticsDialog.qml
- History
- Source
- Diff
./qml/dialogs/DiagnosticsDialog.qml
- -3
- +3
./qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml
- History
- Source
- Diff
./qml/.../EndTreatmentRinsebackComplete.qml
… 7 more files in changeset.

6:24 pm

Michael Garthwaite

More
968c786
changed 27 files
@Environement_Swith, Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging and 198 more UI-DEN-12121-1

DEN-12121: Implemented Model and Views for BloodLeak, AirBubble, AirTrap and DG Conductvity for DEN-12118. Removed ODi and ODo in diagnostic dialog. Added isCompleted field in Rinseback Model for DEN-9932.