Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'feature/LDT-4767-enhancement-Isolated-UF' into develop

    • -9
    • +7
    ./treatment/sections/TreatmentTime.qml
  1. … 3 more files in changeset.
LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

fix minor buigs

  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-5232-hdf

  1. … 1 more file in changeset.
LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

bug fix

    • -1
    • +2
    ./pretreatment/create/PreTreatmentCreateContent.qml
LDT-5082 SW Misc & Enhc - SW - 01 - Miscellaneous - Feature Complete - R&I - 08: DEV - Dialin Implementation

addressed cr comments

  1. … 22 more files in changeset.
LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

updated to allow only certain options availabel for modaity

    • -2
    • +6
    ./pretreatment/create/PreTreatmentCreatePatientPrescription.qml
  1. … 1 more file in changeset.
LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Updated C++ files so they automatically compile for Qt5 vs Qt6 based on Qt kit used for building.

- Updated QML so that Qt5 is the default state of the files and Qt6 changes are marked and commented out.

    • -0
    • +15
    ./settings/SettingsAdvancedInstitutional.qml
    • -1
    • +6
    ./settings/SettingsDeviceRegistration.qml
    • -0
    • +15
    ./settings/SettingsInstitutionalRecord.qml
  1. … 22 more files in changeset.
LDT-5249 System Interface for Users - SW - 01 - Bicarb/Acid Low Replacement - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

added dialog and component for drain bicart items

    • -0
    • +11
    ./posttreatment/PostTreatmentDisconnectStack.qml
    • -10
    • +1
    ./posttreatment/PostTreatmentDrainConsumables.qml
  1. … 6 more files in changeset.
LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

update to transition pages per pre -tx stae

    • -14
    • +13
    ./pretreatment/PreTreatmentStack.qml
LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

removed secondary id

    • -6
    • +4
    ./posttreatment/PostTreatmentReview.qml
    • -2
    • +0
    ./pretreatment/create/PreTreatmentCreateContent.qml
    • -10
    • +25
    ./pretreatment/create/PreTreatmentCreatePatientPrescription.qml
  1. … 8 more files in changeset.
LDT-5334 SW Misc & Enhc - SW - 01 - Pre-Tx - Usability Support - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

add pre tx states model update

    • -0
    • +1
    ./pretreatment/create/PreTreatmentCreatePatientPrescription.qml
  1. … 15 more files in changeset.
LDT-5235 HDF - SW - 01 - HDF - Messaging & Models - R&I - 03: DEV - Feature Implementation & Code Document [& Diagnostics]

HDF implementatio ncompeolte

  1. … 7 more files in changeset.
LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

update borad cast

    • -4
    • +3
    ./treatment/sections/TreatmentTime.qml
  1. … 5 more files in changeset.
LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

fix model column names

  1. … 3 more files in changeset.
LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

add command messages

    • -2
    • +17
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationStack.qml
    • -2
    • +3
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 15 more files in changeset.
LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

updated allowed actions for iuso uf

    • -2
    • +2
    ./treatment/sections/TreatmentFlows.qml
    • -2
    • +1
    ./treatment/sections/TreatmentTime.qml
  1. … 2 more files in changeset.
LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

added conductivity

    • -14
    • +18
    ./settings/SettingsCalibrationSettings.qml
  1. … 3 more files in changeset.
LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

add remianing models

    • -5
    • +3
    ./settings/SettingsCalibrationSettings.qml
  1. … 3 more files in changeset.
LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

Front end for calibration is completed and working

    • -43
    • +87
    ./settings/SettingsCalibrationSettings.qml
  1. … 5 more files in changeset.
LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

fix sending fw 0 instead of defaul t for subsittution if HDF is not enabled

    • -1
    • +1
    ./pretreatment/create/PreTreatmentCreatePatientPrescription.qml
LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Updated to fix additional QML errors and warnings.

    • -6
    • +6
    ./settings/SettingsDeviceRegistration.qml
- Updated to change path '/home/denali' to '/home/leahi'.

  1. … 2 more files in changeset.
LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Updated to change path '/home/denali' to '/home/leahi'.

  1. … 2 more files in changeset.
LDT-4964 Service - SW - 01 - SW Integration - Calibration - R&I - 05: DEV - Feature Implementation

    • -0
    • +138
    ./settings/SettingsCalibrationSettings.qml
  1. … 9 more files in changeset.
- Updated for Qt 6.12 port.

    • -6
    • +2
    ./settings/SettingsAdvancedInstitutional.qml
    • -6
    • +2
    ./settings/SettingsInstitutionalRecord.qml
    • -1
    • +2
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
  1. … 7 more files in changeset.
LDT-5109: SW Misc & Enhc - SW - 01 - Miscellaneous - Leahi Qt6 & UB24 & Squish9.2.2 - rebuild/test - R&I - 05: DEV - Feature Implementation

- Updated for Qt 6.12 port.

    • -6
    • +2
    ./settings/SettingsAdvancedInstitutional.qml
    • -6
    • +2
    ./settings/SettingsInstitutionalRecord.qml
  1. … 19 more files in changeset.
LDT-4772 NON-FEATURE: SW Misc & Enhc - SW - 01 - Isolated UF - R&I - 05: DEV - Feature Implementation

updated edit iso uf edit

    • -0
    • +80
    ./treatment/adjustments/TreatmentAdjustmentEndIsolatedUF.qml
    • -1
    • +22
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationStack.qml
    • -13
    • +21
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 1 more file in changeset.
LDT-4984 SW Misc & Enhc - SW - 01 - SW Integration - Pre-Tx - R&I - 05: DEV - Feature Implementation

update initiate tx message to include modality

  1. … 6 more files in changeset.
LDT-4924 SW Misc & Enhc - SW - 01 - SW Integration - Rinseback - R&I - 05: DEV - Feature Implementation

cr comments

    • -4
    • +0
    ./endtreatment/EndTreatmentRecirculateStack.qml
    • -6
    • +8
    ./endtreatment/EndTreatmentRinsebackStack.qml
  1. … 2 more files in changeset.