application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'UI_BUG_S63' into develop

    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -3
    • +3
    /sources/bluetooth/BluetoothInterface.h
Updated the DG POST index like the HD

    • -3
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +1
    /sources/view/dg/data/post/VDGPOSTData.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -3
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'UI_BUG_S62' into UI_BUG_S63

UI-BUG-S62: UI-BUG-S62-1

Addressed code reviews.

    • binary
    /resources/images/Logo d-Qt-mod1.png
    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -3
    • +3
    /sources/bluetooth/BluetoothInterface.h
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
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
    /sources/gui/qml/components/BackButton.qml
    • -2
    • +0
    /sources/gui/qml/components/Circle.qml
    • -1
    • +18
    /sources/gui/qml/components/Slider.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +5
    /sources/view/hd/data/post/VHDPOSTData.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'UI_BUG_S63' into develop

DEN-9704: Missing acknowledgement confirmation message/alarm when leaving BP/HR blank

- A typo caused the BP/HR entry timer disabled.

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
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'UI_BUG_S62' into develop

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
    • +3
    /sources/gui/qml/globals/Variables.qml
Merge branch 'UI_BUG_S62' into develop

DEN-10422: Dialysate Flow Rate maximum rate selectable in Treatment does not meet PRS resolution

    • -62
    • +61
    /sources/view/VTreatmentCreate.h
    • -4
    • +5
    /sources/view/hd/data/VTreatmentRanges.cpp
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.

    • -4
    • +4
    /sources/gui/qml/components/RangeSlider.qml
    • -14
    • +14
    /sources/view/VTreatmentCreate.h
DEN-11825: BP/HR screen has no instruction

- Added the suggested on line instruction for the user.

Merge branch 'UI_BUG_S62' into develop

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.

    • -0
    • +5
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'UI_BUG_S62' into develop

    • -4
    • +29
    /sources/bluetooth/BluetoothInterface.cpp
    • -0
    • +4
    /sources/bluetooth/BluetoothInterface.h
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.

    • -0
    • +39
    /scripts/export_logs.sh
    • -4
    • +29
    /sources/bluetooth/BluetoothInterface.cpp
    • -0
    • +4
    /sources/bluetooth/BluetoothInterface.h
    • -2
    • +8
    /sources/gui/qml/components/EntryDialog.qml
    • -0
    • +5
    /sources/gui/qml/compounds/BPHREntry.qml
    • -0
    • +15
    /sources/model/ui/data/MUIBloodPressureData.cpp
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.

-

    • binary
    /resources/images/Logo Qt 1024px_old.png
    • binary
    /resources/images/Logo d-Qt-mod1.png
    • -0
    • +55
    /sources/gui/qml/VirtualKeyboard.qml
    • -8
    • +8
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -4
    • +4
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -3
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp