adjustment

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Release 17 Code Review branch

git checkout release/stagingmerge-DEN-17017-ui-bn-release-17

git diff HEAD staging > ../stagingmerge-DEN-17017-ui-bn-release-17.patch

git apply ../stagingmerge-DEN-17017-ui-bn-release-17.patch

    • -7
    • +18
    ./disinfect/VDisinfectAdjustDisinfect.cpp
    • -17
    • +19
    ./disinfect/VDisinfectAdjustDisinfect.h
  1. … 15 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -2
    • +2
    ./disinfect/VDisinfectAdjustDisinfect.cpp
    • -2
    • +2
    ./disinfect/VDisinfectAdjustDisinfect.h
  1. … 2 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -2
    • +2
    ./disinfect/VDisinfectAdjustDisinfect.cpp
    • -2
    • +2
    ./disinfect/VDisinfectAdjustDisinfect.h
  1. … 37 more files in changeset.
DEN-16953: UI-DN-Release-15

- DEN-16680 addressed the code review comments

    • -1
    • +1
    ./disinfect/VDisinfectAdjustDisinfect.cpp
    • -8
    • +7
    ./disinfect/VDisinfectAdjustDisinfect.h
  1. … 1 more file in changeset.
DEN-16953: UI-DN-Release-15

- DEN-16680: Added a new button to support heat disinfect with passive cool.

- DEN-16680: The button is only called Heat Disinfect

- DEN-16680: Renamed the current Heat Disinfect button to Heat Disinfect with Active Cool

    • -5
    • +16
    ./disinfect/VDisinfectAdjustDisinfect.cpp
    • -9
    • +12
    ./disinfect/VDisinfectAdjustDisinfect.h
  1. … 1 more file in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./disinfect/VDisinfectAdjustDisinfect.cpp
  1. … 8 more files in changeset.
DEN-16785: Make Chem Disinfect and Chem Flush Disinfect Buttons Invisible per Instit Config Status

- Added code to application controller to call for request institutional record.

- Added code in the disinfect stack qml to dynamically adjust the disinfect buttons upon enable chemical disinfect value

- Changed the status of chemical disinfect in the institutional record to enabled or disabled from 1 or 0

DEN-16785: Make Chem Disinfect and Chem Flush Disinfect Buttons Invisible per Instit Config Status

- used the itemVisible to hide the chemical flush and checmical disinfect.

- fixed the institutional model class comment.

- made the enableChemicaldisinfect enabled/true by default.

DEN-16784: BACK Button Appears during Disinfection Screen after Ending Treatment

- Fixed the disinfect back button being visible on after treatment disinfection.

- Set the hasCancel to false when op_mode sets back to the StandbyWaitTreatment.

- Removed the disinfect back button hide on touch.

    • -1
    • +0
    ./disinfect/VDisinfectAdjustDisinfect.cpp
  1. … 7 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./disinfect/VDisinfectAdjustDisinfect.cpp
  1. … 8 more files in changeset.
DEN-16784: BACK Button Appears during Disinfection Screen after Ending Treatment

- Fixed the disinfect back button being visible on after treatment disinfection.

- Set the hasCancel to false when op_mode sets back to the StandbyWaitTreatment.

- Removed the disinfect back button hide on touch.

    • -1
    • +0
    ./disinfect/VDisinfectAdjustDisinfect.cpp
  1. … 2 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 30 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./disinfect/VDisinfectAdjustDisinfect.cpp
    • -1
    • +1
    ./disinfect/VDisinfectAdjustDisinfect.h
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h
    • -2
    • +2
    ./posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustTreatmentLog.h
    • -1
    • +1
    ./pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp
    • -1
    • +1
    ./pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h
    • -1
    • +1
    ./pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp
    • -1
    • +1
    ./pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h
    • -1
    • +1
    ./pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp
  1. … 598 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./disinfect/VDisinfectAdjustDisinfect.cpp
    • -1
    • +1
    ./disinfect/VDisinfectAdjustDisinfect.h
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h
    • -2
    • +2
    ./posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustTreatmentLog.h
    • -1
    • +1
    ./pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp
    • -1
    • +1
    ./pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h
    • -1
    • +1
    ./pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp
    • -1
    • +1
    ./pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h
    • -1
    • +1
    ./pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp
  1. … 598 more files in changeset.
DENBUG-75: UI: Treatment log data via USB does not match with data displayed on the Treatment Review Screen

CS-5: @ UI: TxCode generation on device

~ Added QRCode for the TxCode

- Added a Third-Party Open-Source MIT Licence QRCode generator from the following link:

* Copyright (c) Project Nayuki. (MIT License)

* https://www.nayuki.io/page/qr-code-generator-library

- Created a QRCode component

- Added the QRCode generation functionality in the GuiView

- Added QRCode for both the Pre-Tx-Confirmation (UI Generated) and Post-Tx-Review (CS received)

- Moved the CS TxCode Receive wait "..." from C++ to QML to keep the TxCode empty while wait to avoid displaying the "..." as a QRCode.

- Animated the CS TxCode Receive wait "..."

~ Added development testability for the CloudSync communication

~ Fixed the date change buf file watch to wait for the CS to get the checkin and create the out buf file.

CS-3: CS: Heparin OFF o the HCP portal Treatment report

- Fixed some issues in the create treatment screen on heparin type

- Combined the separated values for log and GUI into one values for both.

- Added the functionality for the TreatmentConfirm (Pre-Tx), TreatmentReview (Ppost-Tx), TreatmentReport (log) for the heparin values.

DENBUG-75: UI: Treatment log data via USB does not match with data displayed on the Treatment Review Screen

DENBUG-75: UI: Treatment log data via USB does not match with data displayed on the Treatment Review Screen

- removed the qtcode component from the two screen of the treatment confirm, review for P1 release.

    • -3
    • +5
    ./posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
  1. … 19 more files in changeset.
DENBUG-136: Main treatment screen fails to prompt user with vital measurements entry after set interval

- the issue cannot be reproduced.

- added a count down timer for the vital entry to better understand how and when the timer works on each interval.

  1. … 1 more file in changeset.
DENBUG-136: Main treatment screen fails to prompt user with vital measurements entry after set interval

- the issue cannot be reproduced.

- added a count down timer for the vital entry to better understand how and when the timer works on each interval.

  1. … 1 more file in changeset.
CS-3: CS: Heparin OFF o the HCP portal Treatment report

- Fixed some issues in the create treatment screen on heparin type

- Combined the separated values for log and GUI into one values for both.

- Added the functionality for the TreatmentConfirm (Pre-Tx), TreatmentReview (Ppost-Tx), TreatmentReport (log) for the heparin values.

    • -3
    • +5
    ./posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
  1. … 7 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
  1. … 19 more files in changeset.
CS-5: UI: TxCode generation on device

    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
  1. … 9 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustTreatmentLog.h
  1. … 17 more files in changeset.
DEN-14815: Cartridge Removal Screen is Displayed Prematurely

- Added the Response model and updated the view for MAdjustPatientDisconnectionConfirmResponse

    • -2
    • +18
    ./posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp
    • -1
    • +2
    ./posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h
  1. … 8 more files in changeset.
DEN-14815: Cartridge Removal Screen is Displayed Prematurely

- Added the message ID_AdjustPatientDisconnectionConfirmReq = 0x0600, // 6

    • -2
    • +12
    ./posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp
    • -1
    • +3
    ./posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h
  1. … 8 more files in changeset.
DEN-14815: Cartridge Removal Screen is Displayed Prematurely

- Modified the Patient Disconnection confirm to notify since there is no response and UI just notifies the HD.

- This way the actual confirm which is on the Treatment Review screen Next button can have better name.

- Also modified the ID_AdjustDisposablesRemovalConfirmRsp enum to match its req.

    • -2
    • +2
    ./posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp
    • -1
    • +1
    ./posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h
  1. … 7 more files in changeset.
DEN-15911: Post-treatment screen displays heparin type and heparin concentration even if heparin rate and dispensing were disabled in pre-treatment

- Separated the Log and the Gui values for now to address the cloud log later, when the cloud is ready to not to reject Logs to have NONE.

    • -3
    • +14
    ./posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
    • -0
    • +3
    ./posttreatment/VPostTreatmentAdjustTreatmentLog.h
  1. … 7 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./disinfect/VDisinfectAdjustDisinfect.cpp
    • -1
    • +1
    ./disinfect/VDisinfectAdjustDisinfect.h
    • -1
    • +1
    ./treatment/VTreatmentAdjustmentPressuresLimits.cpp
    • -1
    • +1
    ./treatment/VTreatmentAdjustmentPressuresLimits.h
  1. … 51 more files in changeset.
DEN-15359: Usability: Arterial and Venous Pressure Alarm Limits

- DEN-15387: UI: Updates for treatment parameter entry (A/V alarm window)

- DEN-15388: UI: Updates for in-treatment adjustment of alarm parameter window (pressure alarm screen)

- Monitoring components for the TxHome, Rinseback, BloodPrime

    • -32
    • +5
    ./treatment/VTreatmentAdjustmentPressuresLimits.cpp
    • -27
    • +13
    ./treatment/VTreatmentAdjustmentPressuresLimits.h
  1. … 34 more files in changeset.
DEN-15407: UI: Add RO Permeate Sample to cleaning mode screen + messaging

    • -5
    • +15
    ./disinfect/VDisinfectAdjustDisinfect.cpp
    • -5
    • +7
    ./disinfect/VDisinfectAdjustDisinfect.h
  1. … 4 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    ./treatment/VTreatmentAdjustmentRecirculate.cpp
    • -1
    • +1
    ./treatment/VTreatmentAdjustmentRecirculate.h
  1. … 5 more files in changeset.
DEN-14988 : Add recirculation and patient connection instructions to normal rinseback workflow screens

    • -9
    • +17
    ./treatment/VTreatmentAdjustmentRecirculate.cpp
    • -4
    • +9
    ./treatment/VTreatmentAdjustmentRecirculate.h
  1. … 4 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 13 more files in changeset.
DEN-14947 Update code based on feedback from Behrouz

  1. … 3 more files in changeset.