UI-DEN-5751-1 71
- Details
- Objectives
- General Comments 0
- Unresolved
- Resolved
- Number of files included: 94
-
application
0
-
Folder
sources
0
-
Folder
canbus
0
- File MessageDispatcher.cpp 0 Remove
- File MessageDispatcher.h 0 Remove
- File MessageGlobals.h 0 Remove
- File MessageInterpreter.cpp 0 Remove
- File MessageInterpreter.h 0 Remove
-
Folder
gui
0
-
Folder
qml
0
-
Folder
components
0
- File CircleWithText.qml 0 Remove
- File ConfirmTreatmentSubTable.qml 3 Remove
- File ConfirmTreatmentTable.qml 0 Remove
- File GridSelection.qml 0 Remove
- File NotificationBar.qml 0 Remove
- File ProgressCircle.qml 0 Remove
- File RangeSlider.qml 0 Remove
- File Slider.qml 0 Remove
- File SliderCreateTreatment.qml 0 Remove
- File SliderDoubleCreateTreatment.qml 0 Remove
- File StepBullet.qml 0 Remove
- File StepIndicator.qml 0 Remove
- File TickMarks.qml 0 Remove
- File TitleBarCreateTreatment.qml 0 Remove
- File TopMenuBarCreateTreatment.qml 0 Remove
-
Folder
globals
0
- File Colors.qml 0 Remove
- File Fonts.qml 0 Remove
- File Variables.qml 8 Remove
-
Folder
pages
0
-
Folder
pretreatment/create
0
- File PreTreatmentBase.qml 3 Remove
- File PreTreatmentConfirm.qml 0 Remove
- File PreTreatmentCreate.qml 6 Remove
- File PreTreatmentPrime.qml 0 Remove
- File PreTreatmentUltrafiltration.qml 0 Remove
-
Folder
treatment
0
-
Folder
adjustments
0
- File TreatmentAdjustmentUltrafiltrationConfirm.qml 3 Remove
- File TreatmentAdjustmentUltrafiltrationEdit.qml 0 Remove
- File TreatmentAdjustmentUltrafiltrationPaused.qml 0 Remove
- File TreatmentAdjustmentUltrafiltrationStart.qml 0 Remove
-
Folder
sections
0
- File TreatmentUltrafiltration.qml 0 Remove
- File TreatmentBegin.qml 0 Remove
- File TreatmentConfirm.qml 0 Remove
- File TreatmentCreate.qml 0 Remove
- File TreatmentPrime.qml 0 Remove
- File TreatmentStack.qml 0 Remove
-
Folder
adjustments
0
-
Folder
pretreatment/create
0
- File main.qml 0 Remove
-
Folder
components
0
- File GuiGlobals.cpp 0 Remove
- File GuiGlobals.h 0 Remove
-
Folder
qml
0
-
Folder
model
0
-
Folder
hd
0
-
Folder
adjustment
0
- File MTreatmentAdjustRequests.h 0 Remove
- File MTreatmentAdjustUltrafiltrationInitResponse.cpp 0 Remove
- File MTreatmentAdjustUltrafiltrationInitResponse.h 0 Remove
-
Folder
alarm
0
- File MAlarmCleared.cpp 0 Remove
- File MAlarmCleared.h 0 Remove
- File MAlarmStatusData.cpp 6 Remove
- File MAlarmStatusData.h 0 Remove
- File MAlarmTriggered.cpp 6 Remove
- File MAlarmTriggered.h 0 Remove
-
Folder
adjustment
0
- File MModel.h 0 Remove
-
Folder
hd
0
-
Folder
view
0
-
Folder
hd
0
-
Folder
adjustment
0
- File VTreatmentAdjustmentUltrafiltrationInit.cpp 0 Remove
- File VTreatmentAdjustmentUltrafiltrationInit.h 0 Remove
-
Folder
alarm
0
- File VAlarmStatus.cpp 0 Remove
-
Folder
data
0
- File VTreatmentUltrafiltration.h 0 Remove
-
Folder
adjustment
0
- File VTreatmentBegin.h 0 Remove
- File VTreatmentCreate.cpp 0 Remove
- File VTreatmentEnd.cpp 0 Remove
- File VView.h 0 Remove
-
Folder
hd
0
-
Folder
canbus
0
-
Folder
unittests
0
- File tst_messaging.cpp 3 Remove
- File tst_messaging.h 0 Remove
- File tst_models.cpp 0 Remove
- File tst_models.h 0 Remove
- File cppcheck.log 0 Remove
- File denali.pro 0 Remove
- File denali.pro.user 0 Remove
- File denali.qrc 0 Remove
- File en_US.udic 0 Remove
-
Folder
sources
0
-
testsuites
0
-
Folder
shared/scripts
0
- File names.py 3 Remove
-
Folder
simulator
0
-
Folder
plugins
0
-
Folder
alarms
0
- File interface.ui 0 Remove
- File loader.py 12 Remove
-
Folder
createtreatment
0
- File interface.ui 0 Remove
- File loader.py 6 Remove
-
Folder
heparin
0
- File interface.ui 0 Remove
- File loader.py 0 Remove
-
Folder
inlinebloodpressures
0
- File interface.ui 0 Remove
- File loader.py 3 Remove
-
Folder
salinebolus
0
- File interface.ui 0 Remove
- File loader.py 3 Remove
-
Folder
treatmentranges
0
- File interface.ui 0 Remove
- File loader.py 3 Remove
-
Folder
treatmentstates
0
- File interface.ui 0 Remove
- File loader.py 3 Remove
-
Folder
ultrafiltration
0
- File interface.ui 0 Remove
- File loader.py 0 Remove
- File __init__.py 0 Remove
-
Folder
alarms
0
-
Folder
simulator
0
- File dynamicloader.py 0 Remove
- File interface.ui 0 Remove
- File loader.py 0 Remove
- File runtimewidget.py 0 Remove
- File run.py 0 Remove
- File runtimewidget.py 0 Remove
- File simulator.ui 0 Remove
-
Folder
plugins
0
-
Folder
tst_CreateTreatment
0
- File test.py 0 Remove
-
Folder
shared/scripts
0
-
Filter
- Only show me content:
- Unfiltered files: dynamically added content
- Filtered files: dynamically added content
- Clear filters
Keyboard shortcuts
#permalink
Details
Warning: no files are visible, they have all been filtered.
| Participant | Role | Time Spent | Comments | Latest Comment |
|---|---|---|---|---|
| Author | 3h 57m | 24 | created a sub-task for this as DoubleSlider doesn't have ... | |
| Reviewer - Complete | 1h 36m | 37 | will be addressed later, RESOLVED | |
| Reviewer - Complete | 1h 5m | 10 | RESOLVED. | |
| Total | 6h 38m | 71 |
#permalink
Objectives
Application :
- Fixed comments in some files of the Pre-Treatment Create.
- Removed not used SliderDoubleCreateTreatment.qml component.
- A lot of code clean up and refactoring
- cherry picked a fix from DEN-5830_AlarmDesign@51accb for the Treatment End message which has no payload.
- Also made the interpretMessage() for received messages to be more identical to the DEN-5830_AlarmDesign to hopefully help merging easier.
- Had a conversation with Syseng(Nic) and Fweng(Sean) and decided to have the fix somehow more understandable but there is no actual fix
and if that happens it would be the FW bug. - The modification is that the main progress bar will always have VTreatmentUltratiltration.minimum as minimum (current;y always zero) and
VTreatmentUltratiltration.maximum as maximum. - The UI always expects to get the vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min (adjustable min and slider min) greater than
vTreatmentUltrafiltration.ultrafiltration_RefUFVol (current uf volume delivered and current value on the progress bar) and so close to each other. - Removed the precision from VTreatmentUltrafiltration and moved into the Variables.
- linked the pre-treatment ultrafiltration adjustment with the in-treatment ultrafiltration section and the adjustment flow.
- added the rejection reason text to the pTx uf adj screen.
- Fixed the message id of the ID_ConfirmTreatmentReq from 58 to 59
- Enabled the priming button for now since there is no FW implementation.
- Removed the unused flag of ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT
- Removed the semi-colon at the end of the imports.
- Added the new MVC for initial UF Volume adjustment messages (79/80).
- reviewed the pre-treatment screens and modified
- added the double range slider for Arterial and Venous
- modified the treatmentBegin(ultrafiltration)
- so many other tweaks.
- reformat and commented out the message id debug log.
TestSuits:
- Reverted back the end treatment button click to cover that message.
- Fixed ConfirmPrimingBegin
- Fixed Create Treatment
- added the message id 80 for pTx uf adj rsp.
Branches in review
| Repository | Branch to review | Branched from |
|---|
/sources/canbus/MessageDispatcher.cpp
Changed
0
(0)
/sources/canbus/MessageDispatcher.h
Changed
0
(0)
/sources/canbus/MessageGlobals.h
Changed
0
(0)
/sources/canbus/MessageInterpreter.cpp
Changed
0
(0)
/sources/canbus/MessageInterpreter.h
Changed
0
(0)
/sources/gui/.../components/CircleWithText.qml
Deleted
0
(0)
/sources/.../components/ConfirmTreatmentSubTable.qml
Changed
3
(0)
/sources/.../components/ConfirmTreatmentTable.qml
Changed
0
(0)
/sources/gui/.../components/GridSelection.qml
Changed
0
(0)
/sources/.../components/NotificationBar.qml
Changed
0
(0)
/sources/gui/.../components/ProgressCircle.qml
Changed
0
(0)
/sources/gui/.../components/RangeSlider.qml
Changed
0
(0)
/sources/gui/qml/components/Slider.qml
Changed
0
(0)
/sources/.../components/SliderCreateTreatment.qml
Changed
0
(0)
/sources/.../components/SliderDoubleCreateTreatment.qml
Deleted
0
(0)
/sources/gui/qml/components/StepBullet.qml
Added
0
(0)
/sources/gui/.../components/StepIndicator.qml
Added
0
(0)
/sources/gui/qml/components/TickMarks.qml
Changed
0
(0)
/sources/.../components/TitleBarCreateTreatment.qml
Added
0
(0)
/sources/.../components/TopMenuBarCreateTreatment.qml
Deleted
0
(0)
/sources/gui/qml/globals/Colors.qml
Changed
0
(0)
/sources/gui/qml/globals/Fonts.qml
Changed
0
(0)
/sources/gui/qml/globals/Variables.qml
Changed
8
(0)
/sources/gui/.../create/PreTreatmentBase.qml
Added
3
(0)
/sources/.../create/PreTreatmentConfirm.qml
Added
0
(0)
/sources/gui/.../create/PreTreatmentCreate.qml
Added
6
(0)
/sources/gui/.../create/PreTreatmentPrime.qml
Added
0
(0)
/sources/.../create/PreTreatmentUltrafiltration.qml
Added
0
(0)
/sources/.../adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
Changed
3
(0)
/sources/.../adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
Changed
0
(0)
/sources/.../adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
Changed
0
(0)
/sources/.../adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
Changed
0
(0)
/sources/.../sections/TreatmentUltrafiltration.qml
Changed
0
(0)
/sources/gui/.../treatment/TreatmentBegin.qml
Deleted
0
(0)
/sources/.../treatment/TreatmentConfirm.qml
Deleted
0
(0)
/sources/gui/.../treatment/TreatmentCreate.qml
Deleted
0
(0)
/sources/gui/.../treatment/TreatmentPrime.qml
Deleted
0
(0)
/sources/gui/.../treatment/TreatmentStack.qml
Changed
0
(0)
/sources/gui/qml/main.qml
Changed
0
(0)
/sources/gui/GuiGlobals.cpp
Changed
0
(0)
/sources/gui/GuiGlobals.h
Changed
0
(0)
/sources/.../adjustment/MTreatmentAdjustRequests.h
Changed
0
(0)
/sources/.../adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp
Added
0
(0)
/sources/.../adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h
Added
0
(0)
/sources/model/hd/alarm/MAlarmCleared.cpp
Changed
0
(0)
/sources/model/hd/alarm/MAlarmCleared.h
Changed
0
(0)
/sources/model/.../alarm/MAlarmStatusData.cpp
Changed
6
(0)
/sources/model/hd/alarm/MAlarmStatusData.h
Changed
0
(0)
/sources/model/.../alarm/MAlarmTriggered.cpp
Changed
6
(0)
/sources/model/hd/alarm/MAlarmTriggered.h
Changed
0
(0)
/sources/model/MModel.h
Changed
0
(0)
/sources/.../adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp
Added
0
(0)
/sources/.../adjustment/VTreatmentAdjustmentUltrafiltrationInit.h
Added
0
(0)
/sources/view/hd/alarm/VAlarmStatus.cpp
Changed
0
(0)
/sources/.../data/VTreatmentUltrafiltration.h
Changed
0
(0)
/sources/view/VTreatmentBegin.h
Changed
0
(0)
/sources/view/VTreatmentCreate.cpp
Changed
0
(0)
/sources/view/VTreatmentEnd.cpp
Changed
0
(0)
/sources/view/VView.h
Changed
0
(0)
/unittests/tst_messaging.cpp
Changed
3
(0)
/unittests/tst_messaging.h
Changed
0
(0)
/unittests/tst_models.cpp
Changed
0
(0)
/unittests/tst_models.h
Changed
0
(0)
/cppcheck.log
Changed
0
(0)
/denali.pro
Changed
0
(0)
/denali.pro.user
Changed
0
(0)
/denali.qrc
Changed
0
(0)
/en_US.udic
Changed
0
(0)
/shared/scripts/names.py
Changed
3
(0)
/simulator/plugins/alarms/interface.ui
Added
0
(0)
/simulator/plugins/alarms/loader.py
Added
12
(0)
/simulator/.../createtreatment/interface.ui
Added
0
(0)
/simulator/.../createtreatment/loader.py
Added
6
(0)
/simulator/plugins/heparin/interface.ui
Changed
0
(0)
/simulator/plugins/heparin/loader.py
Changed
0
(0)
/simulator/.../inlinebloodpressures/interface.ui
Changed
0
(0)
/simulator/.../inlinebloodpressures/loader.py
Changed
3
(0)
/simulator/.../salinebolus/interface.ui
Changed
0
(0)
/simulator/plugins/salinebolus/loader.py
Changed
3
(0)
/simulator/.../treatmentranges/interface.ui
Changed
0
(0)
/simulator/.../treatmentranges/loader.py
Changed
3
(0)
/simulator/.../treatmentstates/interface.ui
Changed
0
(0)
/simulator/.../treatmentstates/loader.py
Changed
3
(0)
/simulator/.../ultrafiltration/interface.ui
Changed
0
(0)
/simulator/.../ultrafiltration/loader.py
Changed
0
(0)
/simulator/plugins/__init__.py
Changed
0
(0)
/simulator/simulator/dynamicloader.py
Added
0
(0)
/simulator/simulator/interface.ui
Added
0
(0)
/simulator/simulator/loader.py
Added
0
(0)
/simulator/simulator/runtimewidget.py
Deleted
0
(0)
/simulator/run.py
Changed
0
(0)
/simulator/runtimewidget.py
Deleted
0
(0)
/simulator/simulator.ui
Deleted
0
(0)
/tst_CreateTreatment/test.py
Changed
0
(0)