application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/DEN-16687-ui-dn-s117-msg-update-log-files' into develop

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-16693: Institutional Settings Implementation

Updated the units width in the institutional record.

DEN-16693: Institutional Settings Implementation

Updated the institutional record screen columns.

    • -3
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-16687-ui-dn-s117-msg-update-log-files' of bitbucket.org:diality-cloud/application into DEN-16687-ui-dn-s117-msg-update-log-files

    • -3
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
DENBUG-199: Alarm 280 (DG Fault: DRP Direction Fault) Triggered during Pre-Treatment Sequence

Added the Maxon RPM to the handled messages to be logged.

    • -0
    • +4
    /sources/model/dg/data/MDGDrainPumpData.cpp
    • -0
    • +3
    /sources/model/dg/data/MDGDrainPumpData.h
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +1
    /sources/view/dg/data/VDGDrainPumpData.cpp
    • -0
    • +1
    /sources/view/dg/data/VDGDrainPumpData.h
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -3
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-16693: Institutional Settings Implementation

Updated the qml file to display the insititutional record. Updated the model and view classes.

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

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

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

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

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

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

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -1
    • +1
    /sources/cloudsync/CloudSyncController.h
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'staging' into develop

    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-16657-UI-BN-S116-LogUpload' into staging

CS-10: The Log upload to the cloud

- The first draft of the implementation.

    • -2
    • +11
    /sources/cloudsync/CloudSyncController.h
    • -0
    • +93
    /sources/device/DeviceController.cpp
CS-10: The Log upload to the cloud

- The first draft of the implementation.

    • -2
    • +11
    /sources/cloudsync/CloudSyncController.h
    • -0
    • +93
    /sources/device/DeviceController.cpp
CS-10: The Log upload to the cloud

- Refactor some functions for better naming

    • -5
    • +9
    /sources/cloudsync/CloudSyncController.h
CS-10: The Log upload to the cloud

- Refactor some functions for better naming

    • -5
    • +9
    /sources/cloudsync/CloudSyncController.h
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
CS-10: The Log upload to the cloud

- Reverted back the part that splits logs for each cycle.

CS-10: The Log upload to the cloud

- Reverted back the part that splits logs for each cycle.

DEN-16675: UI: Log export between different devices on the same USB drive has conflict of names.

- The Log Cycle naming has been added for each defined cycle.

- it partially has implementation but has been took out to the CS-10: The Log upload to the cloud

DEN-16675: UI: Log export between different devices on the same USB drive has conflict of names.

- The Log Cycle naming has been added for each defined cycle.

- it partially has implementation but has been took out to the CS-10: The Log upload to the cloud

Bamboo Commit: Updated MAlarmMapping.cpp

    • -16
    • +22
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-16693: Institutional Settings Implementation

Initial commit of the inititutional record MVC implementation.

    • -0
    • +12
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +2
    /sources/canbus/MessageInterpreter.cpp
  1. … 7 more files in changeset.