Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-7147: preTx: Code Review 0

- The little count down progress circles become bigger.

- The completed text on the bottom of some screens with check marks become settable by code.

- Duplicate group removed from instruction file

- "Recirculate ..." text has been removed from the priming screen

- Added syringe pump state

  1. … 9 more files in changeset.
DEN-7461: Meetings & Support - Pre-Treatment Integration

- Integration modifications

- UF Modifications request

- Saline Modification request

- Updated the validation mAccepted to be 1=true and 0=false.

- Heparin Stopped stated modification request

  1. … 28 more files in changeset.
DEN-7518: preTx: Implementation [Screens] ( 3 )

- The first round of the pre-treatment flow works.

    • -0
    • +36
    ./adjustment/VPreTreatmentAdjustmentConsumablesConfirm.cpp
    • -0
    • +60
    ./adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h
    • -0
    • +36
    ./adjustment/VPreTreatmentAdjustmentDisposablesConfirm.cpp
    • -0
    • +60
    ./adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h
    • -0
    • +52
    ./adjustment/VPreTreatmentAdjustmentDisposablesPrime.cpp
    • -0
    • +60
    ./adjustment/VPreTreatmentAdjustmentDisposablesPrime.h
    • -0
    • +63
    ./adjustment/VPreTreatmentAdjustmentInitTreatment.cpp
    • -0
    • +62
    ./adjustment/VPreTreatmentAdjustmentInitTreatment.h
    • -0
    • +52
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp
    • -0
    • +60
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h
    • -0
    • +52
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp
    • -0
    • +60
    ./adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h
    • -0
    • +52
    ./adjustment/VPreTreatmentAdjustmentStartTreatment.cpp
    • -0
    • +60
    ./adjustment/VPreTreatmentAdjustmentStartTreatment.h
    • -0
    • +56
    ./adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp
  1. … 52 more files in changeset.
DEN-7420: preTx: Implementation [Messaging] ( 3 )

    • -0
    • +27
    ./data/VPreTreatmentDisposablePrimeData.cpp
    • -0
    • +45
    ./data/VPreTreatmentDisposablePrimeData.h
  1. … 61 more files in changeset.
DEN-7139: preTx: Implementation [Screens] ( 2 )

    • -11
    • +11
    ./data/VPreTreatmentStatesData.h
  1. … 39 more files in changeset.
DEN-7138: preTx: Implementation [Screens] ( 1 )

7138 preTx: Implementation [Screens] ( 1 )

7143 preTx: Implementation [Navigation] ( 2 )

  1. … 26 more files in changeset.
DEN-7143: preTx: Implementation [Navigation] ( 2 )

- Added the pre-treatment Consumables states

- Made the Step bullet multi orientation state

- Made the Step indicator multi orientation state

- Added the component WaitDone which has a rotating circle for wait state and a check mark when set as done.

- Added the consumables stack and two screens [self test is done, installation needs work]

- Updated PreTreatmentMainStack to navigate for waterSample and consumables.

- Added the Water Sample fail screen

- Added the Water Sample result screen

- Added the Water Sample stack

- Added the Water Sample, Sample Screen

- Added the STATE property type for the State boolean types which will not initiated if the value has not been changed.

-

    • -44
    • +56
    ./data/VPreTreatmentStatesData.cpp
  1. … 47 more files in changeset.
DEN-7140: Implementation [Messaging] ( 1 )

- Added progress data Model/View which are:

ID_DGFilterFlush = 0x6000, // 96

ID_SelfTestNoCartridge = 0x6100, // 97

ID_SelfTestDry = 0x6300, // 99

ID_DisposablesPrime = 0x4300, // 67

    • -0
    • +27
    ./data/VPreTreatmentPrimeData.cpp
    • -0
    • +45
    ./data/VPreTreatmentPrimeData.h
    • -0
    • +27
    ./data/VPreTreatmentSelfTestDryData.cpp
    • -0
    • +45
    ./data/VPreTreatmentSelfTestDryData.h
    • -0
    • +27
    ./data/VPreTreatmentSelfTestNoCartridgeData.cpp
    • -0
    • +45
    ./data/VPreTreatmentSelfTestNoCartridgeData.h
  1. … 29 more files in changeset.
DEN-7140: Implementation [Messaging] ( 1 )

- PreTreatmentStates message has been added

    • -0
    • +137
    ./data/VPreTreatmentStatesData.cpp
    • -0
    • +124
    ./data/VPreTreatmentStatesData.h
  1. … 13 more files in changeset.
DEN-7142: preTx: Implementation [Navigation] ( 1 )

- Added HD_OP_MODE to navigate to the treatment home screen.

- Note : there is an issue with the create treatment implementation which won't let to reset the stack and needs to be fixed.

- Added some Rinseback modification requests.

  1. … 6 more files in changeset.
DEN-7041: Fixed compilation issues with latest common master.

  1. … 1 more file in changeset.
Merge master into staging

  1. … 37 more files in changeset.
DEN-6638: ptTx-RB: Code Review 0

- Added an ability for now to ask for versions.

  1. … 2 more files in changeset.
DEN-6638: ptTx-RB: Code Review 0

- Fixed typo

  1. … 3 more files in changeset.
DEN-6635: Update Design Documents

- Code has been updated while the SDDUI was written.

- DEN-6638: Code Review 0

    • -3
    • +0
    ./adjustment/VTreatmentAdjustmentRecirculate.cpp
    • -16
    • +16
    ./adjustment/VTreatmentAdjustmentVersions.cpp
    • -16
    • +16
    ./adjustment/VTreatmentAdjustmentVersions.h
  1. … 7 more files in changeset.
DEN-6869: Added Accelerometer Dialin API and a Simulator plugin

- After adding the simulator plugin find out a bug in the code and fixed.

  1. … 4 more files in changeset.
DEN-6877: Merging the Versions/Acceleration

    • -0
    • +60
    ./adjustment/VTreatmentAdjustmentVersions.cpp
    • -0
    • +81
    ./adjustment/VTreatmentAdjustmentVersions.h
    • -0
    • +32
    ./data/VHDAccelerometerData.cpp
    • -0
    • +49
    ./data/VHDAccelerometerData.h
  1. … 35 more files in changeset.
DEN-6865: ptTx-RB: Implementation [Messaging] (2/2)

- Added Model/View for the messages "Treatment End" Req/Res (87/88)

    • -0
    • +46
    ./adjustment/VTreatmentAdjustmentEnd.cpp
    • -0
    • +64
    ./adjustment/VTreatmentAdjustmentEnd.h
  1. … 15 more files in changeset.
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.

-

    • -14
    • +33
    ./data/VHDTreatmentStatesData.cpp
    • -0
    • +26
    ./data/VTreatmentRecirculateData.cpp
    • -0
    • +44
    ./data/VTreatmentRecirculateData.h
  1. … 36 more files in changeset.
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
    ./adjustment/VTreatmentAdjustmentRecirculate.cpp
    • -4
    • +4
    ./adjustment/VTreatmentAdjustmentRecirculate.h
    • -1
    • +1
    ./adjustment/VTreatmentAdjustmentRinseback.h
  1. … 9 more files in changeset.
DEN-6862, DEN-6865 Blood Prime Screen

- Added Blood Prime Screen/Message

- Cleaned up the code a little.

    • -0
    • +26
    ./data/VTreatmentBloodPrimeData.cpp
    • -0
    • +44
    ./data/VTreatmentBloodPrimeData.h
  1. … 14 more files in changeset.
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
    ./adjustment/VTreatmentAdjustmentRecirculate.cpp
    • -4
    • +4
    ./adjustment/VTreatmentAdjustmentRecirculate.h
    • -2
    • +2
    ./adjustment/VTreatmentAdjustmentRinseback.cpp
    • -12
    • +12
    ./adjustment/VTreatmentAdjustmentRinseback.h
  1. … 11 more files in changeset.
DEN-6864: Implementation [Messaging] (1/2)

    • -0
    • +45
    ./adjustment/VTreatmentAdjustmentRecirculate.cpp
    • -0
    • +68
    ./adjustment/VTreatmentAdjustmentRecirculate.h
    • -0
    • +46
    ./adjustment/VTreatmentAdjustmentRinseback.cpp
    • -0
    • +74
    ./adjustment/VTreatmentAdjustmentRinseback.h
    • -28
    • +56
    ./data/VHDTreatmentStatesData.cpp
    • -0
    • +26
    ./data/VTreatmentRinsebackData.cpp
    • -0
    • +44
    ./data/VTreatmentRinsebackData.h
  1. … 21 more files in changeset.
- Added PostTreatmentComplete.qml screen - Added PostTreatmentRinsebackComplete.qml - Removed '_' from Dialisate state property name - fixed the Alarm enum name change on AlarmDefs

  1. … 10 more files in changeset.
Merge master into DEN-6349_bp_hr_manual_entry

  1. … 11 more files in changeset.
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.

-

  1. … 22 more files in changeset.
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.

  1. … 7 more files in changeset.
Server coverage issue fixed

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

Tested locally and it is working.

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

- commented out the removed enum from application.

  1. … 1 more file in changeset.
Merge master into DEN-4860_BLE

  1. … 12 more files in changeset.