Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-2805-edit-treatment-parameters' into staging

    • -0
    • +156
    ./treatment/adjustments/TreatmentAdjustmentDurationEdit.qml
    • -142
    • +104
    ./treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml
    • -0
    • +273
    ./treatment/adjustments/TreatmentAdjustmentSetPoints.qml
    • -12
    • +21
    ./treatment/sections/TreatmentFlows.qml
  1. … 17 more files in changeset.
LDT-2096: Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- complete Edit implementation

- complete Duplicate implementation

-complete Delete implementation

- Add slots in VTreatmentCreate to handle RXProfile model selected

- Add signals to help load the CreateRx Screen

    • -0
    • +3
    ./pretreatment/create/PreTreatmentCreateContent.qml
    • -34
    • +116
    ./rxmanager/RxProfileContainer.qml
  1. … 10 more files in changeset.
LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentHome.qml to use text() instead of adjustment_ReasonText when displaying rejection reasons.

LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Added RangedValue.qml.

- Updated ValueAdjuster.qml and TreatmentFlowComponent.qml to use RangedValue.qml.

- Updated TreatmentAdjustmentSetPoints.qml to increase modal dialog size.

- Updated ValueAdjuster.qml to show value in red when outside of range.

    • -63
    • +11
    ./treatment/sections/TreatmentFlowsComponent.qml
  1. … 3 more files in changeset.
LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentStack.qml to revert to using text() instead of adjustment_ReasonText for displaying rejection reasons.

LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentFlowsComponent.qml to use Variables.emptyEntry for blank entries.

LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentSetPoints.qml to use Variables.emptyEntry for blank entries.

LDT-3142 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

fix validate button when on pre treatment

LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Added LabelUnitText.qml

- Updated TreatmentAdjustmentDurationConfirm.qml and TreatmentAdjustmentDurationEdit.qml to use LabelUnitText.qml

    • -74
    • +29
    ./treatment/adjustments/TreatmentAdjustmentDurationConfirm.qml
    • -30
    • +15
    ./treatment/adjustments/TreatmentAdjustmentDurationEdit.qml
  1. … 2 more files in changeset.
LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated TreatmentAdjustmentDuration.qml to add comments for clarity.

LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

fix name of UF to Dialysate/UF

    • -1
    • +0
    ./posttreatment/PostTreatmentStack.qml
  1. … 1 more file in changeset.
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

upated navigation for pretreatmetn steps

    • -14
    • +80
    ./pretreatment/PreTreatmentStack.qml
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

update to optomize dynamically building pretreattment step map

    • -123
    • +70
    ./pretreatment/PreTreatmentStack.qml
LDT-2096: Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Fix issues due to merge in pretreatment create qml files

    • -8
    • +11
    ./pretreatment/create/PreTreatmentCreateContent.qml
Merge branch 'feature/LDT-2825-institutional' into staging

  1. … 8 more files in changeset.
Merge branch 'feature/LDT-3000-end-of-treatment' into staging

    • -4
    • +5
    ./treatment/TreatmentSectionHeader.qml
  1. … 10 more files in changeset.
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Complete implementation of Add Rx profile with Create treatment screen

- Change Controller writing to use QHash

- added Saline Volume to profile.

    • -7
    • +11
    ./pretreatment/create/PreTreatmentCreateContent.qml
    • -1
    • +5
    ./pretreatment/create/PreTreatmentCreateStack.qml
    • -22
    • +24
    ./rxmanager/RxProfileContainer.qml
  1. … 8 more files in changeset.
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Complete implementation of Add Rx profile with Create treatment screen

- Change Controller writing to use QHash

- added Saline Volume to profile.

    • -3
    • +5
    ./pretreatment/create/PreTreatmentCreateContent.qml
    • -1
    • +5
    ./pretreatment/create/PreTreatmentCreateStack.qml
    • -22
    • +24
    ./rxmanager/RxProfileContainer.qml
  1. … 8 more files in changeset.
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

fix transistioning between opmodes

  1. … 2 more files in changeset.
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

update usermode to advanced mode

    • -20
    • +47
    ./pretreatment/PreTreatmentStack.qml
    • -1
    • +1
    ./pretreatment/create/PreTreatmentCreateContent.qml
    • -0
    • +52
    ./settings/SettingsAdvancedMode.qml
  1. … 3 more files in changeset.
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

add advanced/standard mode steps

    • -1
    • +1
    ./posttreatment/PostTreatmentStack.qml
    • -42
    • +113
    ./pretreatment/PreTreatmentStack.qml
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- add RX manager dialog

- Add base of Pretreatment page for rx profile. Need to adjust back signal

    • -0
    • +1
    ./pretreatment/create/PreTreatmentCreateContent.qml
    • -0
    • +66
    ./rxmanager/RxManager.qml
  1. … 5 more files in changeset.
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- add RX manager dialog

- Add base of Pretreatment page for rx profile. Need to adjust back signal

    • -0
    • +1
    ./pretreatment/create/PreTreatmentCreateContent.qml
    • -0
    • +66
    ./rxmanager/RxManager.qml
  1. … 5 more files in changeset.
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

add fw slot from td responses

    • -10
    • +13
    ./posttreatment/PostTreatmentStack.qml
  1. … 1 more file in changeset.
LDT-2830 Service - SW - 01 - Institutional - R&I - 05: DEV - Feature Implementation

addressing CR comments

    • -0
    • +1
    ./settings/SettingsInstitutionalRecord.qml
  1. … 5 more files in changeset.
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

post treatment auto eject implemented

    • -16
    • +0
    ./posttreatment/PostTreatmentReview.qml
    • -25
    • +106
    ./posttreatment/PostTreatmentStack.qml
    • -10
    • +0
    ./pretreatment/PreTreatmentInstallation.qml
  1. … 1 more file in changeset.
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

ud[date pretreatment flow to make header static

    • -1
    • +20
    ./posttreatment/PostTreatmentBase.qml
    • -15
    • +2
    ./pretreatment/PreTreatmentBase.qml
    • -15
    • +3
    ./pretreatment/PreTreatmentInstallation.qml
    • -20
    • +120
    ./pretreatment/PreTreatmentStack.qml
    • -10
    • +8
    ./pretreatment/create/PreTreatmentCreate.qml
  1. … 5 more files in changeset.
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

upodate instruction nview and for new design

    • -1
    • +0
    ./endtreatment/EndTreatmentEndStack.qml
    • -1
    • +1
    ./endtreatment/rinseback/EndTreatmentRinsebackComplete.qml
    • -9
    • +30
    ./pretreatment/PreTreatmentBase.qml
    • -126
    • +0
    ./pretreatment/PreTreatmentDisposablesStack.qml
    • -0
    • +22
    ./pretreatment/PreTreatmentInstallation.qml
    • -19
    • +35
    ./pretreatment/PreTreatmentStack.qml
    • -47
    • +0
    ./pretreatment/create/PreTreatmentCreateStack.qml
  1. … 5 more files in changeset.
LDT-2830 Service - SW - 01 - Institutional - R&I - 05: DEV - Feature Implementation

address cr comments

  1. … 3 more files in changeset.
LDT-2830 Service - SW - 01 - Institutional - R&I - 05: DEV - Feature Implementation

update advanced insitutional to move modell to c++

    • -109
    • +20
    ./settings/SettingsAdvancedInstitutional.qml
    • -1
    • +4
    ./settings/SettingsInstitutionalRecord.qml
  1. … 8 more files in changeset.