Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

  1. … 2 more files in changeset.
LDT-2940: Rinseback - SW - 01 - R&I - 03: SDD - Design Diagram - plantuml

- Updated Rinseback sequence diagram.

    • -0
    • +235
    ./data/VTreatmentRanges.cpp
    • -0
    • +99
    ./data/VTreatmentRanges.h
  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

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

    • -12
    • +0
    ./adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp
    • -12
    • +0
    ./adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp
    • -12
    • +0
    ./adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.cpp
    • -12
    • +0
    ./adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.cpp
    • -12
    • +0
    ./adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp
    • -12
    • +0
    ./adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp
    • -12
    • +0
    ./adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp
  1. … 1 more file in changeset.
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.

    • -4
    • +1
    ./adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp
    • -5
    • +0
    ./adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h
    • -4
    • +0
    ./adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp
    • -6
    • +0
    ./adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h
    • -4
    • +0
    ./adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp
    • -5
    • +0
    ./adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h
  1. … 18 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.

    • -0
    • +61
    ./adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp
    • -0
    • +59
    ./adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.h
    • -4
    • +3
    ./adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp
    • -2
    • +2
    ./adjustment/treatment/VTreatmentAdjustmentBolusVolume.h
    • -0
    • +61
    ./adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.cpp
    • -0
    • +59
    ./adjustment/treatment/VTreatmentAdjustmentDialysateFlowRate.h
    • -0
    • +61
    ./adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.cpp
    • -0
    • +59
    ./adjustment/treatment/VTreatmentAdjustmentDialysateTemperature.h
    • -0
    • +43
    ./adjustment/treatment/VTreatmentAdjustmentFlows.cpp
    • -0
    • +74
    ./adjustment/treatment/VTreatmentAdjustmentFlows.h
    • -0
    • +66
    ./adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp
    • -0
    • +77
    ./adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h
    • -0
    • +71
    ./adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp
    • -0
    • +60
    ./adjustment/treatment/VTreatmentAdjustmentSetPoints.h
  1. … 30 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.

    • -5
    • +16
    ./adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp
    • -11
    • +3
    ./adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h
    • -5
    • +16
    ./adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp
    • -13
    • +5
    ./adjustment/treatment/VTreatmentAdjustmentDurationEdit.h
  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 and confirm messages.

    • -5
    • +5
    ./adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp
    • -4
    • +4
    ./adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h
    • -5
    • +5
    ./adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp
    • -4
    • +4
    ./adjustment/treatment/VTreatmentAdjustmentDurationEdit.h
  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.

    • -0
    • +50
    ./adjustment/treatment/VTreatmentAdjustmentDurationConfirm.cpp
    • -0
    • +73
    ./adjustment/treatment/VTreatmentAdjustmentDurationConfirm.h
    • -0
    • +50
    ./adjustment/treatment/VTreatmentAdjustmentDurationEdit.cpp
    • -0
    • +73
    ./adjustment/treatment/VTreatmentAdjustmentDurationEdit.h
  1. … 20 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.

    • -0
    • +62
    ./adjustment/treatment/VTreatmentAdjustmentBolusVolume.cpp
    • -0
    • +59
    ./adjustment/treatment/VTreatmentAdjustmentBolusVolume.h
  1. … 13 more files in changeset.
LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

uppdate vitals measurement to combobox

  1. … 6 more files in changeset.
LDT-2691 Patient Vitals - SW - 01 - Enhancement - Round timestamp - R&I - 05: DEV - Feature Implementation

add 2 min fw response timer

    • -0
    • +10
    ./adjustment/treatment/VTreatmentAdjustmentVitals.cpp
  1. … 3 more files in changeset.
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

address CR comments

  1. … 2 more files in changeset.
LDT-2273 Patient Vitals - SW - 01 - R&I - 09: SDD - Functions Documentation

add function documentation

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

- Updated various QMLs to fix whitespace alignment.

- Moved ultrafiltration models and views from TD to HD directories.

- Updated message IDs for UF messages.

    • -0
    • +58
    ./adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp
    • -0
    • +65
    ./adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h
    • -0
    • +60
    ./adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp
    • -0
    • +68
    ./adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h
    • -0
    • +56
    ./adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp
    • -0
    • +56
    ./adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h
  1. … 22 more files in changeset.
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated GuiGlobals.h to update IDs for ID_AdjustPatientConnectionConfirmReq, ID_AdjustPatientConnectionConfirmRsp, ID_AdjustUltrafiltrationConfirmReq, and ID_AdjustUltrafiltrationConfirmRsp.

- Updated StoppedSlider.qml to rename component _removeMarker to _lowMarker.

- Updated VTreatmentUltrafiltrationData.h to remove minimum and maximum properties and removed references to the properties in TreatmentUltrafiltrationItem.qml.

- Updated TreatmentAdjustmentBase.qml to make confirm button invisible by default.

  1. … 4 more files in changeset.
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

functionality working.

  1. … 4 more files in changeset.
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

Fix messaging issue

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

Wip. finishing up qml side

    • -3
    • +13
    ./adjustment/treatment/VTreatmentAdjustmentVitals.cpp
  1. … 10 more files in changeset.
LDT-2269 Patient Vitals - SW - 01 - R&I - 05: DEV - Feature Implementation

Initial upload of patient vitals

    • -0
    • +37
    ./adjustment/treatment/VTreatmentAdjustmentVitals.cpp
    • -0
    • +52
    ./adjustment/treatment/VTreatmentAdjustmentVitals.h
  1. … 30 more files in changeset.
LDT-2076 Solution Infusion - SW - 01 - R&I - 05: DEV - Feature Implementation

Removed obsolete saline enum

    • -1
    • +0
    ./data/treatment/VTDTreatmentStatesData.h
  1. … 1 more file in changeset.
LDT-1445: Ultrafiltration - SW - 01 - R&I - 05: DEV - Feature Implementation

- Updated treatment UF view (VTreatmentUltrafiltrationData.h/cpp) to add ufRunning and ufPaused properties.

LDT-2076 Solution Infusion - SW - 01 - R&I - 05: DEV - Feature Implementation

Update saline bolus command and file name changes

    • -0
    • +62
    ./adjustment/treatment/VTreatmentAdjustmentSaline.cpp
    • -0
    • +63
    ./adjustment/treatment/VTreatmentAdjustmentSaline.h
  1. … 8 more files in changeset.
LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

address CR comments and almost finished updated the alarm model to a c++ QAbstractlistmodel

  1. … 12 more files in changeset.
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- implement TD air pump and air bubbles message

- Adjust page indicators in diagnostics screen

- Add TD air pump and bubbles message to diagnostics screen

- fix DD diagnostics conductivity to have fixed float points

-Fix dd dialysate pump model comments

- Add Base of DD valves in doxygen comment TODO LATER

- Address imports for diagnostics QML files

- Generate png files for all SDD items

    • -0
    • +25
    ./data/VTDAirPumpData.cpp
    • -0
    • +43
    ./data/VTDAirPumpData.h
  1. … 26 more files in changeset.
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- implement TD air pump and air bubbles message

- Adjust page indicators in diagnostics screen

- Add TD air pump and bubbles message to diagnostics screen

- fix DD diagnostics conductivity to have fixed float points

-Fix dd dialysate pump model comments

- Add Base of DD valves in doxygen comment TODO LATER

    • -0
    • +25
    ./data/VTDAirBubbleData.cpp
    • -0
    • +43
    ./data/VTDAirBubbleData.h
  1. … 6 more files in changeset.
LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- Move DG Valves to DD and rename to DD

- Implement the following DD messages:

Dialysate Pump, Concentrate pump

- Cleanup Saloine bolus enum in VTDTretamentSattesData.cpp

- Minor comment cleanup in MDDTemperatures

  1. … 27 more files in changeset.
LDT-1785: Update SW (UI)

- Fixed the issue with the heparin slider explained in the LDT-1753.

- Fixed the issue found in one of the merges that missed some qml import.

- Fixed the issue with the VTDTreatmentStates mismatch missing SalineMax Enum in common repo.

- Removed unused def, max, res properties of the heparin stop time from the VTreatmentRanges.

  1. … 4 more files in changeset.
LDT-1738 (UI) Main Tx Screen - Ultrafiltration Details - R&I - 05: DEV - Feature Implementation

Fix copy/paste unicode error

LDT-1738 (UI) Main Tx Screen - Ultrafiltration Details - R&I - 05: DEV - Feature Implementation

Revert min/max changes

  1. … 10 more files in changeset.
LDT-1738 (UI) Main Tx Screen - Ultrafiltration Details - R&I - 05: DEV - Feature Implementation

Removed obsolete ‘minimum' and ‘maximum' properties in VTreatmentUltrafiltrationData.h and update proeprty binding using those

  1. … 4 more files in changeset.