Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/staging' into feature/LDT-4161-tx-review

fix merge issues

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-4161-tx-review

  1. … 2 more files in changeset.
LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

clean up post tx stack

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

remove commented out lines

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

refactor Pre/ Post workflow

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

address cr comments

    • -0
    • +26
    ./qml/components/LegendItem.qml
  1. … 2 more files in changeset.
address cr comment

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

address CR comments

    • -0
    • +71
    ./qml/components/ScrollBarVH.qml
    • -4
    • +4
    ./qml/pages/treatment/TreatmentTrends.qml
  1. … 1 more file in changeset.
LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

updated name to Prescirptaihje tobnwserpiogubhrweog4t

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

fix alarm clearing when switching opmodes

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

add final touches

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

add top lgeend

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

fionish reveiw screen

  1. … 2 more files in changeset.
LDT-3937 Post-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

Hide buttons when validated

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

add mor items to review screen

LDT-3937 Post-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

add fixes to alot of compoenenents

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

fix paylaod length isuse

  1. … 6 more files in changeset.
LDT-3937 Post-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

update message id

  1. … 1 more file in changeset.
LDT-3937 Post-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

add ability to click through pre and post tx state when fw message are not implemented

LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

add correct meeage id

  1. … 4 more files in changeset.
LDT-3937 Post-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

ad ddisinfection page foundations

  1. … 1 more file in changeset.
LDT-3937 Post-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

move review to other story

    • -111
    • +0
    ./qml/components/ReviewContainer.qml
    • -0
    • +5
    ./qml/pages/posttreatment/PostTreatmentDisinfection.qml
  1. … 5 more files in changeset.
LDT-4166 Post-Treatment - SW - 01 - TxReview - R&I - 05: DEV - Feature Implementation

fix build issue

    • -23
    • +0
    ./qml/components/HelpNotification.qml
    • -0
    • +110
    ./qml/components/ReviewContainer.qml
  1. … 6 more files in changeset.
LDT-3937 Post-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

    • -0
    • +111
    ./qml/components/ReviewContainer.qml
    • -0
    • +93
    ./qml/compounds/ProcessStatusView.qml
    • -0
    • +77
    ./qml/pages/posttreatment/PostTreatmentDrainConsumables.qml
    • -2
    • +0
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 3 more files in changeset.
LDT-3937 Post-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

fix staging issues

    • -23
    • +0
    ./qml/components/HelpNotification.qml
  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-3932-post-treatment-foundation

  1. … 1 more file in changeset.
LDT-3805 SW Misc & Enhc - SW - 01 - Usability Requests - R&I - 05: DEV - Feature Implementation

fix build errror

Merge remote-tracking branch 'origin/staging' into feature/LDT-3800-enhancements-usability-requests

    • -346
    • +48
    ./qml/dialogs/NotificationDialog.qml
  1. … 1 more file in changeset.
LDT-3805 SW Misc & Enhc - SW - 01 - Usability Requests - R&I - 05: DEV - Feature Implementation

fix post merge errors

    • -23
    • +8
    ./qml/pages/treatment/TreatmentStack.qml
Merge remote-tracking branch 'origin/staging' into feature/LDT-3800-enhancements-usability-requests

    • -13
    • +12
    ./qml/dialogs/NotificationDialog.qml
    • -8
    • +39
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.