Tiffany Mejia

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

- return tally logic + 1

- account for string to number conversion in tally fn

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect

- Add additional tally for second backup condition

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

- Adjust find logic for newly added Tally

- fix big for tally fn call

- remove echo on gzip and mv commands

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Add bootup tally implementation

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

Merge remote-tracking branch 'origin/bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

debug statement

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Fix pending log tally and revert log name to just date.log

bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect'

fix issue on qstring

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Add debug statements to tally feature

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Add debug statements to tally feature

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

- Add time to device logs when they are generated

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.h
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +1
    /sources/view/settings/VNetworkModel.cpp
    • -1
    • +1
    /sources/view/settings/VNetworkModel.h
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Fix issues in Device Controller and Logger due to change of file extension to QStr5ing

    • -7
    • +11
    /sources/device/DeviceController.cpp
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

- Change CS rejection reason order to reject reason then logname

- Add log Tally fn

- Change Log Upload, Log backup to use log tally

- Change findpending to be dynamic due to tally changes

- Change pending/uploaded extension format to account for tally with %1

    • -31
    • +23
    /sources/device/DeviceController.cpp
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

- add duplicate function for 2010

    • -0
    • +35
    /sources/device/DeviceController.cpp
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Address CR comments

    • -1
    • +9
    /sources/cloudsync/CloudSyncController.h
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

- Add new error message for cloudsync for log duplicates

- Add more parameters to 2010 signal

- add Switch case logic for 2010 reject reason. Logic to be implemented and discussed

    • -1351
    • +1369
    /sources/cloudsync/CloudSyncController.cpp
    • -331
    • +333
    /sources/cloudsync/CloudSyncController.h
    • -4
    • +12
    /sources/device/DeviceController.cpp
LDT-2096: Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- complete Edit implementation

- complete Duplicate implementation

-complete Delete implementation

- Add slots in VTreatmentCreate to handle RXProfile model selected

- Add signals to help load the CreateRx Screen

    • -10
    • +11
    /sources/gui/qml/components/BaseComboBox.qml
    • -0
    • +1
    /sources/gui/qml/components/TextEntry.qml
    • -20
    • +12
    /sources/gui/qml/dialogs/RxManagerDialog.qml
    • -1
    • +8
    /sources/gui/qml/pages/ManagerStack.qml
    • -3
    • +8
    /sources/gui/qml/pages/rxmanager/RxManager.qml
    • -21
    • +32
    /sources/storage/RxProfilesController.cpp
    • -2
    • +11
    /sources/storage/RxProfilesController.h
  1. … 3 more files in changeset.
LDT-2096: Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Add Favorite and Order Arrows for RX Manager

    • binary
    /images/ascending-sort-arrow.png
    • binary
    /images/descending-sort-arrow.png
    • binary
    /images/empty-heart-favorite.png
    • binary
    /images/full-heart-favorite.png
LDT-2096: Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Fix issues due to merge in pretreatment create qml files

Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Complete implementation of Add Rx profile with Create treatment screen

- Change Controller writing to use QHash

- added Saline Volume to profile.

    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -9
    • +21
    /sources/gui/qml/pages/ManagerStack.qml
    • -33
    • +16
    /sources/gui/qml/pages/rxmanager/RxManager.qml
    • -31
    • +27
    /sources/storage/RxProfilesController.cpp
    • -4
    • +11
    /sources/storage/RxProfilesController.h
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Complete implementation of Add Rx profile with Create treatment screen

- Change Controller writing to use QHash

- added Saline Volume to profile.

    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -9
    • +21
    /sources/gui/qml/pages/ManagerStack.qml
    • -33
    • +16
    /sources/gui/qml/pages/rxmanager/RxManager.qml
    • -31
    • +27
    /sources/storage/RxProfilesController.cpp
    • -4
    • +11
    /sources/storage/RxProfilesController.h