Tiffany Mejia

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Address CR comments

    • -1
    • +9
    /sources/cloudsync/CloudSyncController.h
Create enum for all rejection reasons. Remove default

Create enum for all rejection reasons.

Remove default

Add logname as the third parameter

Add logname as the third parameter

change to quint 32

change to quint 32

Change to QString

Change to QString

Make clarification comments of what each parameter means

Make clarification comments of what each parameter means

Check the caller to include logfile name

Check the caller to include logfile name

Add third argument for logname like line 526.

Add third argument for logname like line 526.

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
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

-Add dialog to qrc and main.ql=ml

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

-Add dialog to qrc and main.ql=ml

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

- add RX manager dialog

- Add base of Pretreatment page for rx profile. Need to adjust back signal

    • -0
    • +62
    /sources/gui/qml/dialogs/RxManagerDialog.qml
    • -19
    • +18
    /sources/gui/qml/pages/ManagerStack.qml
    • -0
    • +66
    /sources/gui/qml/pages/rxmanager/RxManager.qml
    • -7
    • +11
    /sources/storage/RxProfilesController.cpp
    • -2
    • +4
    /sources/storage/RxProfilesController.h
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- add RX manager dialog

- Add base of Pretreatment page for rx profile. Need to adjust back signal

    • -0
    • +62
    /sources/gui/qml/dialogs/RxManagerDialog.qml
    • -19
    • +18
    /sources/gui/qml/pages/ManagerStack.qml
    • -0
    • +66
    /sources/gui/qml/pages/rxmanager/RxManager.qml
    • -7
    • +11
    /sources/storage/RxProfilesController.cpp
    • -2
    • +4
    /sources/storage/RxProfilesController.h
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

*Write functionality working to create an RX profile given a QStringList

    • -69
    • +55
    /sources/storage/RxProfilesController.cpp
    • -9
    • +5
    /sources/storage/RxProfilesController.h
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

*Write functionality working to create an RX profile given a QStringList

    • -69
    • +55
    /sources/storage/RxProfilesController.cpp
    • -9
    • +5
    /sources/storage/RxProfilesController.h
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Cleanup Rx manager stack to separate QML components.

- Cleanup font size to fix spacing for each profile

    • -0
    • +1
    /sources/gui/qml/components/LabelValue.qml
    • -234
    • +16
    /sources/gui/qml/pages/ManagerStack.qml
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Cleanup Rx manager stack to separate QML components.

- Cleanup font size to fix spacing for each profile

    • -0
    • +1
    /sources/gui/qml/components/LabelValue.qml
    • -234
    • +16
    /sources/gui/qml/pages/ManagerStack.qml
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Adjust RXprofile view to have list model

- adjust signal to return list of rx models

- adjust manager stack to use view modeldata

    • -15
    • +90
    /sources/gui/qml/pages/ManagerStack.qml
    • -1
    • +1
    /sources/storage/RxProfilesController.cpp
    • -1
    • +1
    /sources/storage/RxProfilesController.h
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

- Adjust RXprofile view to have list model

- adjust signal to return list of rx models

- adjust manager stack to use view modeldata

    • -15
    • +90
    /sources/gui/qml/pages/ManagerStack.qml
    • -1
    • +1
    /sources/storage/RxProfilesController.cpp
    • -1
    • +1
    /sources/storage/RxProfilesController.h
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

Add model list implementation, and rename files

    • -39
    • +3
    /sources/gui/qml/pages/ManagerStack.qml
    • -0
    • +29
    /sources/model/rxmanager/MRxProfilesData.cpp
    • -0
    • +105
    /sources/model/rxmanager/MRxProfilesData.h
    • -0
    • +346
    /sources/storage/RxProfilesController.cpp
    • -0
    • +122
    /sources/storage/RxProfilesController.h
Prescription Manager - SW - 01 - R&I - 05: DEV - Feature Implementation

Add model list implementation, and rename files

    • -39
    • +3
    /sources/gui/qml/pages/ManagerStack.qml
    • -0
    • +29
    /sources/model/rxmanager/MRxProfilesData.cpp
    • -0
    • +105
    /sources/model/rxmanager/MRxProfilesData.h
    • -0
    • +346
    /sources/storage/RxProfilesController.cpp
    • -0
    • +122
    /sources/storage/RxProfilesController.h