Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-6877: Merging the Versions/Acceleration

  1. … 40 more files in changeset.
DEN-6876: Cleaned up the code to start the versions cherry pick

- Messages 60,61 which was Treatment End has been removed (FW is not using it anymore).

    • -2
    • +24
    ./pages/treatment/TreatmentStack.qml
  1. … 14 more files in changeset.
DEN-6865: ptTx-RB: Implementation [Messaging] (2/2)

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

  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.

-

    • -0
    • +111
    ./pages/postTreatment/end/PostTreatmentEnd.qml
    • -0
    • +112
    ./pages/postTreatment/end/PostTreatmentEndPause.qml
  1. … 27 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

    • -0
    • +154
    ./pages/postTreatment/PostTreatmentReconnect.qml
    • -0
    • +164
    ./pages/postTreatment/PostTreatmentRinsebackInit.qml
    • -105
    • +49
    ./pages/treatment/TreatmentStack.qml
  1. … 7 more files in changeset.
DEN-6862, DEN-6865 Blood Prime Screen

- Added Blood Prime Screen/Message

- Cleaned up the code a little.

    • -9
    • +16
    ./pages/treatment/TreatmentStack.qml
  1. … 15 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
    • +52
    ./components/ImageText.qml
    • -7
    • +58
    ./pages/treatment/TreatmentStack.qml
  1. … 13 more files in changeset.
DEN-6864: Implementation [Messaging] (1/2)

  1. … 28 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

    • -0
    • +86
    ./pages/postTreatment/PostTreatmentComplete.qml
    • -0
    • +95
    ./pages/postTreatment/PostTreatmentRinsebackComplete.qml
    • -5
    • +24
    ./pages/treatment/TreatmentStack.qml
  1. … 5 more files in changeset.
DEN-5759: Code Review 0

- Added a TODO for the DoubleSlider component to add a validation and active feature to be able to use it for PreTreatmentCreate.

DEN-5759: prTx: Code Review 0

    • -1
    • +0
    ./components/ConfirmTreatmentSubTable.qml
Merge DEN-4860_BLE into master

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

  1. … 10 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.

-

    • -3
    • +3
    ./components/ConfirmTreatmentTable.qml
    • -2
    • +2
    ./components/ConfirmTreatmentTableEntry.qml
    • -0
    • +85
    ./pages/postTreatment/PostTreatmentRecirculate.qml
    • -0
    • +192
    ./pages/postTreatment/PostTreatmentRinseback.qml
    • -1
    • +1
    ./pages/pretreatment/create/PreTreatmentPrime.qml
    • -1
    • +31
    ./pages/treatment/TreatmentStack.qml
  1. … 10 more files in changeset.
DEN-5757: Code Coverage

Merge branch 'master' into DEN-5751_Pre-TreatmentUltrafiltration

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

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

  1. … 5 more files in changeset.
DEN-5753: Update Design Documents

- Fixed comments in some files of the Pre-Treatment Create.

    • -2
    • +2
    ./pages/pretreatment/create/PreTreatmentPrime.qml
  1. … 1 more file in changeset.
DEN-6359: Addressed code review comments

DEN-4867: Addressed code review comments

  1. … 3 more files in changeset.
DEN-6359: Addressed code review comments

    • -0
    • +76
    ./components/TextEntry.qml
  1. … 6 more files in changeset.
DEN-5754: Implementation

- Removed not used SliderDoubleCreateTreatment.qml component.

    • -194
    • +0
    ./components/SliderDoubleCreateTreatment.qml
  1. … 1 more file in changeset.
DEN-5754: Implementation

- code refactoring and clean up

    • -0
    • +55
    ./components/TitleBarCreateTreatment.qml
    • -55
    • +0
    ./components/TopMenuBarCreateTreatment.qml
    • -0
    • +55
    ./pages/pretreatment/create/PreTreatmentBase.qml
    • -0
    • +88
    ./pages/pretreatment/create/PreTreatmentConfirm.qml
    • -0
    • +660
    ./pages/pretreatment/create/PreTreatmentCreate.qml
    • -0
    • +124
    ./pages/pretreatment/create/PreTreatmentPrime.qml
    • -144
    • +0
    ./pages/treatment/TreatmentBegin.qml
    • -108
    • +0
    ./pages/treatment/TreatmentConfirm.qml
    • -670
    • +0
    ./pages/treatment/TreatmentCreate.qml
    • -140
    • +0
    ./pages/treatment/TreatmentPrime.qml
    • -11
    • +12
    ./pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
DEN-6359: Removed styling, moved keyboard to the bottom of the screen, updated text input functionality.

    • -0
    • +76
    ./components/DenaliTextInput.qml
    • -0
    • +45
    ./components/Keyboard.qml
    • -23
    • +0
    ./keyboard/images/backspace-868482.svg
    • -18
    • +0
    ./keyboard/images/handwriting-868482.svg
    • -55
    • +0
    ./keyboard/images/hidekeyboard-868482.svg
    • -14
    • +0
    ./keyboard/images/search-868482.svg
    • -201
    • +0
    ./keyboard/images/selectionhandle-bottom.svg
  1. … 8 more files in changeset.
DEN-5754: Implementation

- Code clean up

    • -35
    • +23
    ./components/ConfirmTreatmentSubTable.qml
    • -0
    • +66
    ./components/StepBullet.qml
    • -0
    • +86
    ./components/StepIndicator.qml
    • -147
    • +22
    ./components/TopMenuBarCreateTreatment.qml
    • -10
    • +10
    ./pages/treatment/TreatmentConfirm.qml
    • -10
    • +10
    ./pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
DEN-6349: Updated Keyboard style and positioning

DEN-6352: Numeric keyboard styling adjustments

  1. … 1 more file in changeset.
DEN-6352: Added Qt virtualkeyboard

    • -0
    • +23
    ./keyboard/images/backspace-868482.svg
    • -0
    • +8
    ./keyboard/images/check-868482.svg
    • -0
    • +13
    ./keyboard/images/enter-868482.svg
    • -0
    • +28
    ./keyboard/images/globe-868482.svg
    • -0
    • +18
    ./keyboard/images/handwriting-868482.svg
    • -0
    • +55
    ./keyboard/images/hidekeyboard-868482.svg
    • -0
    • +14
    ./keyboard/images/search-868482.svg
    • -0
    • +201
    ./keyboard/images/selectionhandle-bottom.svg
    • -0
    • +12
    ./keyboard/images/shift-80c342.svg
    • -0
    • +12
    ./keyboard/images/shift-868482.svg
    • -0
    • +12
    ./keyboard/images/shift-c5d6b6.svg
    • -0
    • +33
    ./keyboard/images/textmode-868482.svg
    • -0
    • +1036
    ./keyboard/style.qml
  1. … 2 more files in changeset.
DEN-5836: Code Coverage

- commented as manually tested the AlarmClearedCondition.

  1. … 6 more files in changeset.