application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
A little optimization

    • -5
    • +2
    /sources/gui/qml/pages/settings/SettingsDG.qml
Merge branch 'DEN-8308_UI_DEV_Treatment_Log' into DEN-8495_UI_DEV_Service_ManualDisinfection_Flush

DEN-8319: Code Review 0

    • -1
    • +7
    /sources/gui/qml/components/FooterStatic.qml
DEN-8319: Code Review 0

    • -1
    • +5
    /sources/gui/qml/components/Footer.qml
Removing test data.

    • -1
    • +1
    /sources/gui/qml/pages/settings/SettingsDG.qml
DEN-8501: Svc: Implementation [Navigation]

    • -1
    • +3
    /sources/gui/qml/components/MainMenu.qml
    • -12
    • +23
    /sources/gui/qml/pages/disinfect/DisinfectStack.qml
    • -9
    • +23
    /sources/gui/qml/pages/settings/SettingsDG.qml
DEN-8252: Updated POST Views

- Fixed setData

- Added baseline UI view classes

    • -0
    • +1
    /sources/gui/qml/pages/post/PostInProgress.qml
    • -0
    • +162
    /sources/view/VUIPostSingleResultData.cpp
    • -0
    • +67
    /sources/view/VUIPostSingleResultData.h
DEN-8252: Updated POST Views

- Using QAbstractListModel to store the name and result for each HD, DG, and UI test

- Using global settings to read the list of tests from the filesystem

    • -0
    • +2
    /sources/gui/qml/pages/post/PostInProgress.qml
    • -2
    • +161
    /sources/view/dg/data/VDGPostSingleResultData.cpp
    • -4
    • +32
    /sources/view/dg/data/VDGPostSingleResultData.h
    • -2
    • +162
    /sources/view/hd/data/VHDPostSingleResultData.cpp
    • -4
    • +32
    /sources/view/hd/data/VHDPostSingleResultData.h
DEN-8256: Added power on self test in progress screen

    • binary
    /resources/images/RedCross.png
    • -1
    • +11
    /sources/gui/qml/components/WaitDone.qml
    • -0
    • +84
    /sources/gui/qml/compounds/CheckListScrollView.qml
    • -1
    • +2
    /sources/gui/qml/compounds/CheckListView.qml
    • -0
    • +117
    /sources/gui/qml/pages/post/PostInProgress.qml
DEN-8500: Svc: Implementation [Screen]

    • -0
    • +33
    /sources/gui/qml/components/Label.qml
    • -5
    • +8
    /sources/gui/qml/components/TextEntry.qml
    • -0
    • +79
    /sources/gui/qml/components/TimeEntry.qml
    • -0
    • +139
    /sources/gui/qml/pages/settings/SettingsDG.qml
Updated the Alarms Mapping

    • -1
    • +5
    /sources/model/hd/alarm/MAlarmMapping.cpp
Last minute modification request to remove timestamps

- It seems reasonable to remove the timestamps and let UI set timestamp upon receiving the messages fro each of the average(data)/Alarm/Event.

DEN-8454: Added HD/DG Messaging for POST

    • -0
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +43
    /sources/model/dg/data/MDGPostFinalResultData.cpp
    • -0
    • +81
    /sources/model/dg/data/MDGPostFinalResultData.h
    • -0
    • +47
    /sources/model/dg/data/MDGPostSingleResultData.cpp
    • -0
    • +84
    /sources/model/dg/data/MDGPostSingleResultData.h
    • -0
    • +43
    /sources/model/hd/data/MHDPostFinalResultData.cpp
    • -0
    • +81
    /sources/model/hd/data/MHDPostFinalResultData.h
    • -0
    • +47
    /sources/model/hd/data/MHDPostSingleResultData.cpp
    • -0
    • +84
    /sources/model/hd/data/MHDPostSingleResultData.h
    • -0
    • +24
    /sources/view/dg/data/VDGPostFinalResultData.cpp
  1. … 7 more files in changeset.
DEN-8318: TxLog: Code Analysis & AlarmMapping

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-8490: Meetings & Support - General Support

- Support : Instruction for the Usability test support

- Support : SW team support and adding the second DGOpMode parameter (SubMode) fro logging.

- Support : SW team support, changed the Alarm Status log to be data from event.

- Added another parameter for treatment log - alarm

- Removed the initialization logging from the event logs which are all CANBus messages, in to the debug log .

- Added a header for the event log to be easier export in the excel sheet (the header doesn't have timestamp)

-

    • binary
    /resources/settings/Instructions/Twist shunt_temp.png
  1. … 37 more files in changeset.
Updated Alarm mapping against staging

    • -1
    • +4
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-8559: TxLog: Implementation [The Average 30min period log]

    • -0
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +11
    /sources/canbus/MessageInterpreter.cpp
    • -6
    • +6
    /sources/model/hd/alarm/MAlarmActiveList.h
DEN-8559: TxLog: Implementation [The Average 30min period log]

- Implemented the Models

    • -0
    • +85
    /sources/model/hd/alarm/MAlarmActiveList.cpp
    • -0
    • +141
    /sources/model/hd/alarm/MAlarmActiveList.h
DEN-8490: Update the End Treatment Screens with the new Instruction base

- Also added the milliseconds to the logs

    • -1
    • +0
    /sources/gui/qml/components/Footer.qml
    • -0
    • +63
    /sources/gui/qml/components/FooterStatic.qml
    • -2
    • +2
    /sources/gui/qml/components/RangeSlider.qml
    • -1
    • +1
    /sources/gui/qml/components/Slider.qml
    • -1
    • +1
    /sources/gui/qml/components/TickMarks.qml
    • -1
    • +1
    /sources/gui/qml/components/TimeText.qml
    • -0
    • +181
    /sources/gui/qml/pages/TreatmentFlowBase.qml
    • -151
    • +3
    /sources/gui/qml/pages/disinfect/DisinfectBase.qml
  1. … 25 more files in changeset.
Removing the fault screen

- Stay in what ever position we are and don't go to the fault screen for now.

- A fading created for the notifications.

    • -0
    • +49
    /sources/gui/qml/compounds/Fader.qml
    • -0
    • +8
    /sources/gui/qml/dialogs/AlarmListDialog.qml
DEN-7756: Addressed code review comments

Updated recent alarm mapping.

    • -0
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-8317: Implementation: Merge the Wi-Fi into the code.

- Mainly the WiFi integration

- Some other support tasks:

| Support : Instruction and Kishen images [ Calyton, Nick ]

| Support : Alarm Messaging Parser

| Support : Changed the Manager Screen into a Monitoring Dialog and can be shown by DblTap on SDCard Indication on top/right

| Support : Modified the Heat values to float on Monitoring Dialog

| Support/Bug : Fixed the Alarm Message Bug

    • binary
    /resources/images/eye.png
    • binary
    /resources/settings/Instructions/1.png
    • binary
    /resources/settings/Instructions/2.png
    • binary
    /resources/settings/Instructions/3.png
  1. … 93 more files in changeset.
DEN-8317: Implementation: Merge the Wi-Fi into the code.

    • binary
    /resources/images/eject.png
    • -3
    • +3
    /sources/gui/qml/components/BackButton.qml
    • -4
    • +4
    /sources/gui/qml/components/CloseButton.qml
    • -2
    • +2
    /sources/gui/qml/components/ImageLogoD.qml
    • -3
    • +3
    /sources/gui/qml/components/MuteButton.qml
    • -73
    • +0
    /sources/gui/qml/components/SettingsItem.qml
    • -1
    • +6
    /sources/gui/qml/components/USBButton.qml
    • -2
    • +2
    /sources/gui/qml/components/UpDownButton.qml
    • -2
    • +2
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -4
    • +6
    /sources/gui/qml/globals/Variables.qml
DEN-8317: Implementation: Merge the Wi-Fi into the code.

    • -2
    • +2
    /sources/gui/qml/components/Background.qml
    • -1
    • +1
    /sources/gui/qml/components/GridSelection.qml
    • -4
    • +4
    /sources/gui/qml/components/RangeBar.qml
    • -2
    • +2
    /sources/gui/qml/components/RangeSlider.qml
    • -2
    • +2
    /sources/gui/qml/components/ScrollBar.qml
    • -41
    • +30
    /sources/gui/qml/components/TextEntry.qml
    • -1
    • +1
    /sources/gui/qml/compounds/TouchGrid.qml
    • -1
    • +1
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -2
    • +1
    /sources/gui/qml/globals/Variables.qml
  1. … 4 more files in changeset.
DEN-8317: Implementation: Merge the Wi-Fi into the code.

    • -2
    • +11
    /sources/gui/qml/components/TextEntry.qml
    • -24
    • +1
    /sources/gui/qml/globals/Variables.qml
DEN-8317: Implementation: Merge the Wi-Fi into the code.

    • -0
    • +1
    /sources/gui/qml/components/Background.qml
    • -0
    • +48
    /sources/gui/qml/components/ScrollBar.qml
    • -0
    • +83
    /sources/gui/qml/pages/settings/SettingsWiFi.qml
Added an instruction image

- concentrate door open-v1.png

DEN-8318 Static Code Analysis

DEN-8316: TxLog: Implementation [Simulator/Testing]

    • binary
    /resources/settings/Instructions/water sampling_v1.png