Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-12121-sw_dev-sprint-65

    • -10
    • +8
    ./qml/dialogs/DiagnosticsDialog.qml
  1. … 7 more files in changeset.
DEN-12121: Implemented Model and Views for BloodLeak, AirBubble, AirTrap and DG Conductvity for DEN-12118. Removed ODi and ODo in diagnostic dialog. Added isCompleted field in Rinseback Model for DEN-9932.

  1. … 24 more files in changeset.
DEN-10974: Syringe pump installation screen allows user to proceed before syringe installed

- Added the response message 0xAD00(173), for the request message of 0x6200(98):Pre-treatmetn disposables confirm.

  1. … 10 more files in changeset.
DEN-11972: Initial Patient ID entered text is displayed in red

- Set the keyboard locale to en_US

    • -0
    • +60
    ./qml/KeyboardItem.qml
  1. … 2 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 11 more files in changeset.
Merge branch 'DEN-11980-sw_dev-sprint-64' into staging

  1. … 6 more files in changeset.
Merge branch 'DEN-11980-sw_dev-sprint-64' into develop

  1. … 5 more files in changeset.
DEN-12106: Heparin Delivery Active Text Does Not Appear

  1. … 3 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 570 more files in changeset.
UI-BUG-S63: UI-BUG-S63-2: Addressed the code review comments.

DEN-11980: Split Flows Data Model to Blood Flow data and Inlet Data Models. Updated Views to reflect new message protocol for Blood Flow and Inlet Flow. Updated Diagnostic Dialog to reflect new message values.

  1. … 13 more files in changeset.
UI-BUG-S62: UI-BUG-S62-1

Addressed code reviews.

  1. … 5 more files in changeset.
Merge branch 'UI_BUG_S63' into develop

DEN-11814: Heparin Minimum Dispensing Parameters Should Be 0.2

- Reverted back the Heparin min to 0.0 due to the slider's issue which disables the OFF feature, since the value 0.0 becomes an invalid.

- A minor update on the POST progress display to start when 0 to max of complete enum -1.

- An idea of fixing the slider touch issue. [Is DISABLED for now, for more test]

    • -1
    • +1
    ./qml/pages/disinfect/DisinfectBase.qml
    • -2
    • +3
    ./qml/pages/disinfect/DisinfectStack.qml
    • -1
    • +1
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 6 more files in changeset.
Merge branch 'UI_BUG_S62' into develop

DEN-11825: BP/HR screen has no instruction for user to read from bluetooth cuff or enter information

- Center aligned the notification

  1. … 1 more file in changeset.
DEN-11814: Heparin Minimum Dispensing Parameters Should Be 0.2

- updated the min range regarding the recent PRS-347, PRS-348

- Fixed the minimum precision of the heparin.

    • -0
    • +1
    ./qml/components/SliderCreateTreatment.qml
  1. … 2 more files in changeset.
Merge branch 'UI_BUG_S62' into develop

DEN-8145: Issues with UI Create Treatment screen

Remainder items (summary):

- 3) Discuss whether to keep the manufacturing default on the slider since the user needs to confirm each parameter: Agreed to set to the minimum value

- 7) Arterial Pressure and Venous Pressure should be consistent with other parameters, the unit should be shown at the end: will be updated to have the units located in the title of the slider.

- Also fixed the title coloring when the slider has not been adjusted yet.

  1. … 2 more files in changeset.
DEN-11825: BP/HR screen has no instruction

- Added the suggested on line instruction for the user.

DEN-8145: Issues with UI Create Treatment screen

- Restricted the Patient ID entry to be max 20 characters and has to have at least 1 alphanumeric character without space, regarding the conversation with KeborMed.

  1. … 1 more file in changeset.
Merge branch 'UI_BUG_S62' into develop

  1. … 2 more files in changeset.
DEN-9704: Missing acknowledgement confirmation message/alarm when leaving BP/HR blank

- Added a script to later be used for the log export on the device, but it now only works on the VM since the device doesn't have the zip tool.

- Added a mimic function to simulate the BCuff measurement received and assigned F11 to it and it will only be enabled if the macro DEBUG_BCUFF_MIMIC is defined.

- Added opened and closed signals to the EntryDialog.qml to make it do the auto focus on the firstInput object when opened.

- Added setFocus() function in the BPHREntry.qml

- Removed the enabled option from doReset of the VTreatmentVitals

- And created two separate enableDialog for vital entry, and enable update for the auto update the properties.

- Added a constructor with systolic, diastolic, heartRate parameter to set the data on creation to be used in the message mimic.

- Added systolic, diastolic, heartRate parameters to the doTrigger of the VCommonAdjustmentVitals to open the vitals entry dialog with default values.

    • -2
    • +0
    ./qml/pages/treatment/TreatmentHome.qml
    • -3
    • +17
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 10 more files in changeset.
Code Cleanup

- DEN-11807: Treatment Confirmation - Rinseback Rate displays "min" instead of "mL/min"

- Renamed the Keyboard component name to VirtualKeyboard to resolve the InputPanel's Keyboard object/type conflict (There was no issue is was only a name conflict.)

- Preventing the Patient Id from being empty space string, and disabling the confirm in that case.

- Mode the create_update_folder.sh to the Scripts/local repository's folder.

- Added Qt logo and Diality Qt Colored log.

- Updated the alarmMapping.sh script to always checkout to common/staging and also print out the log on console.

-

    • -0
    • +55
    ./qml/VirtualKeyboard.qml
  1. … 9 more files in changeset.
DEN-11608: UI keyboard has non-English options enabled

- the language change button on the keyboard has been disabled.

DEN-10614 [On Going Code Review] UI_DEV: Add Patient ID to Pre-Treatment Flow

- Pushed the code improvements

- Addressed the code review comments

    • -35
    • +34
    ./qml/components/GridSelection.qml
    • -8
    • +13
    ./qml/components/SliderCreateTreatment.qml
    • -309
    • +197
    ./qml/pages/pretreatment/create/PreTreatmentCreate.qml
  1. … 6 more files in changeset.
DEN-10607: Screen

- Added the feature for the create treatment slider to be able to show OFF for zero values on label.

- Did a refactoring to clean up the SliderCreateTreatment.

    • -68
    • +78
    ./qml/components/SliderCreateTreatment.qml
  1. … 1 more file in changeset.
DEN-10205: BCuff [Missing Feature]: Try to reconnect to the previously paired

- Stop try to reconnect while still is trying the initial connect.

- Changed the BCuff wait state notification.

- Updated the Heparin section wording.

  1. … 4 more files in changeset.
DEN-10205: BCuff [Missing Feature]: Try to reconnect to the previously paired

Bluetooth Code improvements:

- stopping the agent from scanning if user selects a device to connect.

- Rewording of the parred device not found

- Added "ZERO" check for the address

- Added real-time Bluetooth status on top of the main screen.

- Not The UI will always updated but the TreatmentLog still needs UI to be in a proper screen/state to log the Vitals measurements.

Other Requested modifications:

Chris.Y:

- Added back for the pre-treatment BP/HR screen to the Ultrafiltration screen.

Eliza.P:

- Added notification for the Heparin Dispensing:"Heparin Active"

- Changed the button text to "OFF" when the heparin is off.

- Changed the button text to "COMPLETE" when the heparin is complete.

- Shortened the notification text and removed the "Heparin ... " from the beginning.

- Won't show the off notification since the button text changed to imply that.

  1. … 7 more files in changeset.