Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-8308_UI_DEV_Treatment_Log' into DEN-8495_UI_DEV_Service_ManualDisinfection_Flush

DEN-8319: TxLog: Code Review 0

  1. … 4 more files in changeset.
DEN-8494: Implementation [ Service Log in & About ]

    • -1
    • +2
    ./qml/pages/settings/SettingsDateTime.qml
  1. … 17 more files in changeset.
DEN-8494: Implementation: Merge the Service Login & About into the code.

- Added Service login

- Added having the comment capability in settings .conf files.

- Performance improvement in settings reader.

    • -12
    • +15
    ./qml/pages/settings/SettingsBase.qml
    • -2
    • +2
    ./qml/pages/settings/SettingsDateTime.qml
    • -52
    • +19
    ./qml/pages/settings/SettingsHome.qml
    • -15
    • +79
    ./qml/pages/settings/SettingsStack.qml
  1. … 5 more files in changeset.
A little optimization

    • -4
    • +4
    ./qml/pages/disinfect/DisinfectStack.qml
  1. … 1 more file in changeset.
DEN-8319: Code Review 0

DEN-8319: Code Review 0

  1. … 2 more files in changeset.
Removing test data.

  1. … 2 more files in changeset.
DEN-8501: Svc: Implementation [Navigation]

    • -12
    • +23
    ./qml/pages/disinfect/DisinfectStack.qml
    • -9
    • +23
    ./qml/pages/settings/SettingsDG.qml
  1. … 2 more files in changeset.
DEN-8500: Svc: Implementation [Screen]

    • -0
    • +33
    ./qml/components/Label.qml
    • -0
    • +79
    ./qml/components/TimeEntry.qml
    • -0
    • +139
    ./qml/pages/settings/SettingsDG.qml
    • -14
    • +28
    ./qml/pages/settings/SettingsStack.qml
  1. … 7 more files in changeset.
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)

-

  1. … 51 more files in changeset.
DEN-8559: TxLog: Implementation [The Average 30min period log]

  1. … 16 more files in changeset.
DEN-8559: TxLog: Implementation [The Average 30min period log]

- Implemented the Models

  1. … 15 more files in changeset.
DEN-8490: Update the End Treatment Screens with the new Instruction base

- Also added the milliseconds to the logs

    • -7
    • +7
    ./qml/components/ConfirmTreatmentTable.qml
    • -0
    • +63
    ./qml/components/FooterStatic.qml
    • -1
    • +1
    ./qml/components/UltrafiltrationButton.qml
    • -2
    • +2
    ./qml/compounds/PressureRangeSlider.qml
    • -0
    • +181
    ./qml/pages/TreatmentFlowBase.qml
    • -151
    • +3
    ./qml/pages/disinfect/DisinfectBase.qml
    • -4
    • +2
    ./qml/pages/disinfect/DisinfectStack.qml
    • -0
    • +50
    ./qml/pages/endtreatment/EndTreatmentBase.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
    ./qml/compounds/Fader.qml
  1. … 2 more files in changeset.
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

    • -0
    • +376
    ./qml/dialogs/DiagnosticsDialog.qml
    • -0
    • +78
    ./qml/pages/UserConfirmation.qml
  1. … 93 more files in changeset.
DEN-8317: Implementation: Merge the Wi-Fi into the code.

    • -2
    • +2
    ./qml/components/NotificationBarSmall.qml
    • -10
    • +10
    ./qml/pages/settings/SettingsHome.qml
  1. … 2 more files in changeset.
DEN-8317: Implementation: Merge the Wi-Fi into the code.

    • -2
    • +2
    ./qml/components/ConfirmTreatmentTable.qml
  1. … 4 more files in changeset.
DEN-8317: Implementation: Merge the Wi-Fi into the code.

    • -69
    • +52
    ./qml/pages/settings/SettingsDateTime.qml
DEN-8317: Implementation: Merge the Wi-Fi into the code.

    • -3
    • +1
    ./qml/components/ConfirmTreatmentTable.qml
    • -0
    • +48
    ./qml/components/ScrollBar.qml
    • -3
    • +9
    ./qml/pages/settings/SettingsStack.qml
    • -0
    • +83
    ./qml/pages/settings/SettingsWiFi.qml
  1. … 4 more files in changeset.
DEN-8316: TxLog: Implementation [Simulator/Testing]

    • -5
    • +6
    ./qml/pages/disinfect/DisinfectBase.qml
  1. … 42 more files in changeset.
DEN-8303 Meeting & Support - General Purpose

- Adding two other Alarms parameters to the log

- Fixed the ProgressCircle component circle color.

- Adding a simple detail screen for the Treatment Log Review screen

- Popping up the keyboard when get into the Date/Time screen.

-

    • -0
    • +5
    ./qml/pages/settings/SettingsDateTime.qml
    • -1
    • +2
    ./qml/pages/settings/SettingsStack.qml
  1. … 5 more files in changeset.
DEN-8137: Confirm button in Confirm Treatment screen becomes disabled after enabled

- fixed the confirm button enabled.

  1. … 1 more file in changeset.
DEN-7835: Code Review 0

- Removed extra test steps in the instruction.conf

- Updated the SDItem.qml code dox.

- Updated the storage variable for Date/Time script location

  1. … 6 more files in changeset.
DEN-7931 UI Logging: Rotation and deletion do not trigger on disk usage.

- Fixed and gave to the V&V team, Michael, to test.

- First round of test was successful.

  1. … 9 more files in changeset.
DEN-7831: posTx: Implementation [Simulator/Testing]

- Disinfection

    • -17
    • +69
    ./qml/pages/disinfect/DisinfectStack.qml
  1. … 32 more files in changeset.
DEN-7831: posTx: Implementation [Simulator/Testing]

- As part of the test and simulation treatment log was implemented at some point.

- It still needs to convert received values and map some other type values and dates.

    • -0
    • +119
    ./qml/pages/posttreatment/PostTreatmentReview.qml
  1. … 5 more files in changeset.
DEN-7946 Saline, Standby, Alarm, Keyboard, ....

    • -13
    • +13
    ./qml/pages/settings/SettingsDateTime.qml
    • -0
    • +11
    ./qml/pages/settings/SettingsHome.qml
  1. … 13 more files in changeset.
DEN-8052: posTx: Implementation [Messaging] (Disinfection)

DEN-8067: Meetings & Support - Post-Treatment Integration

    • -39
    • +73
    ./qml/pages/disinfect/DisinfectStack.qml
  1. … 14 more files in changeset.
DEN-8052: posTx: Implementation [Messaging] (Disinfection)

- Disinfection MVC

- There is still a state message and also some parts in qml for the progress and states during the disinfection.

    • -1
    • +2
    ./qml/pages/disinfect/DisinfectBase.qml
    • -13
    • +18
    ./qml/pages/disinfect/DisinfectStack.qml
  1. … 34 more files in changeset.