leahi-application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-2937-rinseback' into staging

LDT-2942: Rinseback - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated VDDValvesStatesData.cpp for changes to enums in common repo.

LDT-2940: Rinseback - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-2937-rinseback

    • -10
    • +103
    /sources/view/td/data/VTreatmentRanges.cpp
    • -7
    • +30
    /sources/view/td/data/VTreatmentRanges.h
LDT-2940: Rinseback - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

- Updated Rinseback.puml to add user interaction to start rinseback.

LDT-2940: Rinseback - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

- Updated Rinseback sequence diagram to remove redundant sequence.

LDT-2942: Rinseback - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated EndTreatmentRinseback.qml to remove unnecessary import and update TimeText id/objectName.

LDT-2942: Rinseback - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated leahi.pro for moved VTreatmentRanges.h/cpp.

LDT-2940: Rinseback - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

- Updated Rinseback sequence diagram.

    • -235
    • +0
    /sources/view/hd/data/VTreatmentRanges.cpp
    • -99
    • +0
    /sources/view/hd/data/VTreatmentRanges.h
    • -0
    • +235
    /sources/view/td/data/VTreatmentRanges.cpp
    • -0
    • +99
    /sources/view/td/data/VTreatmentRanges.h
Merge branch 'feature/LDT-3139-blood-set-auto-load' into staging

fix bug

    • -3
    • +11
    /sources/gui/qml/compounds/ValueAdjuster.qml
LDT-3144 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 05: DEV - Feature Implementation

address cr comments

Merge branch 'staging' into feature/LDT-3139-blood-set-auto-load

    • -0
    • +7
    /sources/gui/qml/components/HeaderBar.qml
    • -1
    • +6
    /sources/gui/qml/globals/Variables.qml
    • -4
    • +47
    /sources/view/settings/VSettings.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'feature/LDT-2805-edit-treatment-parameters' into staging

    • -4
    • +87
    /sources/canbus/MessageDispatcher.cpp
    • -2
    • +15
    /sources/canbus/MessageInterpreter.cpp
    • -88
    • +22
    /sources/gui/qml/compounds/ValueAdjuster.qml
    • -0
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -32
    • +47
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
  1. … 8 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 MTreatmentAdjustBloodFlowRateResponse.h, MTreatmentAdjustBolusVolumeResponse.h, MTreatmentAdjustDialysateFlowRateResponse.h, MTreatmentAdjustDialysateTemperatureResponse.h, MTreatmentAdjustDurationConfirmResponse.h, MTreatmentAdjustDurationEditResponse.h, MTreatmentAdjustPressuresLimitsResponse.h, MTreatmentAdjustSetPointsResponse.h, MTreatmentAdjustUltrafiltrationConfirmResponse.h, MTreatmentAdjustUltrafiltrationEditResponse.h to changed doxygen headers.

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

- Updated GuiGlobals.cpp to add includes.

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

- Updated to move where VTreatmentAdjustmentBloodFlowRate, VTreatmentAdjustmentBolusVolume, VTreatmentAdjustmentDialysateFlowRate, VTreatmentAdjustmentDialysateTemperature, VTreatmentAdjustmentDurationConfirm, VTreatmentAdjustmentDurationEdit, VTreatmentAdjustmentSetPoints are registered to Qt.

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

address cr comments

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

- Updated RnagedValue.qml and ValueAdjuster.qml to prevent divide by 0 when step is 0.

    • -10
    • +14
    /sources/gui/qml/components/RangedValue.qml
    • -4
    • +6
    /sources/gui/qml/compounds/ValueAdjuster.qml
LDT-2810: Edit Treatment Parameters During Treatment - SW - 01 - Edit Treatment Parameters During Treatment - R&I - 05: DEV - Feature Implementation

- Updated treatment adjustment response messages to remove extra parameters and only send accept and rejection reason.

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

    • -0
    • +106
    /sources/gui/qml/components/RangedValue.qml
    • -92
    • +16
    /sources/gui/qml/compounds/ValueAdjuster.qml
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

- Updated LabelUnitText.qml to add objectNames.

    • -5
    • +9
    /sources/gui/qml/compounds/LabelUnitText.qml
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

    • -0
    • +86
    /sources/gui/qml/compounds/LabelUnitText.qml
LDT-3142 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

added SDD diagram

    • binary
    /SDDs/BloodSetAutoLoadAndEject.png
    • -0
    • +116
    /SDDs/BloodSetAutoLoadAndEject.puml