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

Merge branch 'feature/LDT-2805-edit-treatment-parameters' into staging

    • -11
    • +182
    ./hd/adjustment/treatment/MTreatmentAdjustRequests.h
  1. … 21 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 treatment adjustment response messages to remove extra parameters and only send accept and rejection reason.

  1. … 9 more files in changeset.
LDT-3142 Blood Set Auto-Load and Auto-Eject - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

added SDD diagram

  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 MTreatmentAdjustBolusVolumeResponse.h to fix typo.

Merge branch 'feature/LDT-3072-beta-transition' into staging

  1. … 7 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

add fw slot from td responses

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

addressing CR comments and moving model to c++ from qml

  1. … 11 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 treatment adjustments to use officially assigned message IDs.

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

push institutional code

    • -13
    • +338
    ./hd/adjustment/settings/MAdjustHDRequests.h
    • -0
    • +113
    ./td/adjustment/settings/MAdjustTDAdvancedInstitutionalRecordResponse.cpp
    • -0
    • +144
    ./td/adjustment/settings/MAdjustTDAdvancedInstitutionalRecordResponse.h
    • -0
    • +221
    ./td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp
    • -0
    • +116
    ./td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp
    • -0
    • +149
    ./td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h
  1. … 37 more files in changeset.
LDT-3077 Support of the transition to the Beta System - SW - 01 - R&I - 05: DEV - Feature Implementation

remove FP valves

  1. … 12 more files in changeset.
LDT-3005 End of Treatment - SW - 01 - R&I - 05: DEV - Feature Implementation

update message Ids

  1. … 1 more file in changeset.
LDT-3005 End of Treatment - SW - 01 - R&I - 05: DEV - Feature Implementation

upload of code

    • -0
    • +49
    ./td/adjustment/treatment/MTreatmentAdjustEndResponse.cpp
    • -0
    • +84
    ./td/adjustment/treatment/MTreatmentAdjustEndResponse.h
  1. … 26 more files in changeset.
LDT-2962 Heparin - SW - 01 - R&I - 05: DEV - Feature Implementation

add message IDs

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

add idle timeout for heparin screen

  1. … 7 more files in changeset.
LDT-2962 Heparin - SW - 01 - R&I - 05: DEV - Feature Implementation

implementation of heparin

  1. … 17 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 to add models and views to support treatment adjustment messages for set points, blood flow rate, dialysate flow rate, and dialysate temperature.

- Updated to rename Treatment Adjustment Saline Volume to Treatment Adjustment Bolus Volume.

    • -6
    • +120
    ./hd/adjustment/treatment/MTreatmentAdjustRequests.h
    • -0
    • +52
    ./td/adjustment/treatment/MTreatmentAdjustDialysateFlowRateResponse.cpp
    • -0
    • +52
    ./td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.cpp
    • -0
    • +87
    ./td/adjustment/treatment/MTreatmentAdjustDialysateTemperatureResponse.h
  1. … 29 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 and TreatmentAdjustmentDuration.qml to properly handle treatment duration adjustment messages.

- Updated TreatmentAdjustmentDurationConfirm.qml for changes to UI/UX design updates.

- Updated MTreatmentAdjustDurationConfirmResponse.h/cpp, MTreatmentAdjustDurationEditResponse.h/cpp, VTreatmentAdjustmentDurationConfirm.h/cpp, VTreatmentAdjustmentDurationEdit.h/cpp for changes to duration adjustment message changes.

  1. … 7 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 parameters for treatment duration edit messages.

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

- Updated parameters for treatment duration edit and confirm messages.

  1. … 4 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 VTreatmentAdjustmentDurationConfirm.h/cpp, MTreatmentAdjustDurationConfirmResponse.h/cpp for treatment duration adjustment confirmation.

- Moved MTreatmentAdjustDurationResponse.h/cpp to MTreatmentAdjustDurationEditResponse.h/cpp for treatment duration adjustment edit.

- Moved VTreatmentAdjustmentDuration.h/cpp to VTreatmentAdjustmentDurationEdit.h/cpp for treatment duration adjustment edit.

  1. … 16 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 MTreatmentAdjustBolusVolumeResponse.h/cpp and VTreatmentAdjustmentBolusVolume.h/cpp for handling bolus adjustment.

- Updated MessageDispatcher.h/cpp, MessageGlobals.h, MessageInterpreter.cpp, MModel.h, GuiGlobals.h, MTreatmentAdjustRequests.h to add Bolus Volume Adjustment Request and Response messages.

- Updated main.qml, TreatmentStack.qml, TreatmentAdjustmentSaline.qml to add VTreatmentAdjustmentBolusVolume for handling bolus volume adjustment.

  1. … 11 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 to fix spelling of transmembrane.

  1. … 7 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 MessageDispatcher.cpp and MessageGlobals.h to add TMP limit to Adjust Pressure Limits request and response messages.

- Updated GuiGlobals.h to change MsgId for ID_AdjustPressuresLimitsReq and ID_AdjustPressuresLimitsRsp.

- Updated TreatmentStack.qml for TMP limit and to properly handle rejection reason text.

- Updated TreatmentAdjustmentPressuresLimits.qml to initialize control values, properly update controls on value change, initialize TMP min/max/step, and change layout to properly show notification.

- Updated MTreatmentAdjustPressuresLimitsResponse.h, MTreatmentAdjustRequests.h, VTreatmentAdjustmentPressuresLimits.h/cpp to add TMP limit.

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

address cr comments

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

update message ids and cpp files for TD and DD date time

    • -0
    • +49
    ./dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp
    • -0
    • +82
    ./dd/adjustment/settings/MAdjustDDDateTimeResponse.h
    • -0
    • +49
    ./td/adjustment/settings/MAdjustTDDateTimeResponse.cpp
    • -0
    • +82
    ./td/adjustment/settings/MAdjustTDDateTimeResponse.h
  1. … 8 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp