Fisheye on application/sources/gui/qml/pages/TreatmentFlowBase.qml

application (DEN-16553-UI-BN-WPA3-Support): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 24 Jan 2024 14:28:27 -0800

Dara Navaei committed 2ef03b2 on branch master, @Environement_Swith and 61 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /alarmMapping.sh

(-1, +1)

| History

| Source

| Diff

· /cho.sh

(-1, +1)

| History

| Source

| Diff

· /cppcheck.sh

(-1, +1)

| History

| Source

| Diff

· /cr_objectives.sh

(-1, +1)

| History

| Source

| Diff

· /imake.sh

(-1, +1)

| History

| Source

| Diff

· /main.cpp

(-2, +2)

| History

| Source

| Diff

· /remove-exra-emptylines.sh

(-1, +1)

| History

| Source

| Diff

· /sources/AlarmGenerator.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/AlarmGenerator.h

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationController.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/ApplicationController.h

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationPost.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationPost.h

(-1, +1)

| History

| Source

| Diff

· /sources/MainTimer.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/MainTimer.h

(-1, +1)

| History

| Source

| Diff

… 598 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 04 Jan 2023 16:48:39 -0800

Dara Navaei committed c9f8f8c on branch master, @Environement_Swith and 181 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /alarmMapping.sh

(-1, +1)

| History

| Source

| Diff

· /cppcheck.sh

(-2, +2)

| History

| Source

| Diff

· /cr_objectives.sh

(-1, +1)

| History

| Source

| Diff

· /imake.sh

(-1, +1)

| History

| Source

| Diff

· /main.cpp

(-1, +1)

| History

| Source

| Diff

· /remove-exra-emptylines.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/autostart

(-2, +2)

| History

| Source

| Diff

· /scripts/bluetooth_paired_clear.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/bluetooth_paired_query.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/brightness_get.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/brightness_set.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/date_time_set.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/export_logs.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/globals.sh

(-3, +4)

| History

| Source

| Diff

· /scripts/run.sh

(-3, +3)

| History

| Source

| Diff

… 594 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-14391 , DEN-14393 : Qt 5.15.10 [QML run-time issues]...

Behrouz NematiPour — Wed, 23 Nov 2022 16:08:49 -0800

Behrouz NematiPour committed f68b226 on branch master, @Environement_Swith and 182 more in application

DEN-14391 , DEN-14393 : Qt 5.15.10 [QML run-time issues]

- Fixed all the QML warning and errors

- Enabled the Clang-Tidy, Clazy and cppcheck and fixed some.

- Removed unused images

- made the Denali POST logo transparent.

· /.gitignore

(-0, +2)

| History

| Source

| Diff

· /AlarmMapping.csv

(-2, +2)

| History

| Source

| Diff

· /cppcheck.log

(-397, +602)

| History

| Source

| Diff

· /cppcheck.sh

(-9, +14)

| History

| Source

| Diff

· /denali.pro

(-0, +1)

| History

| Source

| Diff

· /denali.pro.user

(-10, +258)

| History

| Source

| Diff

· /denali.qrc

(-9, +1)

| History

| Source

| Diff

· /resources/images/AlarmBell.png

(binary)

| History

| Source

| Diff

· /resources/images/AlarmBellSilent.png

(binary)

| History

| Source

| Diff

· /resources/images/Busy2.png

(binary)

| History

| Source

| Diff

· /resources/images/Done.png

(binary)

| History

| Source

| Diff

· /resources/images/Logo Diality.png

(binary)

| History

| Source

| Diff

· /resources/images/Logo DialityT.png

(binary)

| History

| Source

· /resources/images/Logo Qt 1024px_old.png

(binary)

| History

| Source

| Diff

· /resources/images/Logo d-blue.png

(binary)

| History

| Source

| Diff

… 42 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-13939: IMP: Fixed the merge issue...

Behrouz NematiPour — Mon, 03 Oct 2022 13:07:19 -0700

Behrouz NematiPour committed bd47699 on branch master, @Environement_Swith and 192 more in application

DEN-13939: IMP: Fixed the merge issue

- Not sure why git didn't get the changes on the ModalDialog's Norification changes to NotificationSmall, and caused the issue on the property IconVisible.

· /sources/gui/qml/components/ModalDialog.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/dialogs/PowerOff.qml	(-2, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainHome.qml	(-2, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentFlowBase.qml	(-3, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml	(-4, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(-2, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-1, +1)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 28 Sep 2022 16:41:05 -0700

Dara Navaei committed 265ce74 on branch master, @Environement_Swith and 191 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /main.cpp

(-1, +1)

| History

| Source

| Diff

· /scripts/run.sh

(-1, +1)

| History

| Source

| Diff

· /sources/AlarmGenerator.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/AlarmGenerator.h

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationController.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationController.h

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationPost.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationPost.h

(-1, +1)

| History

| Source

| Diff

· /sources/MainTimer.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/Threads.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/Threads.h

(-1, +1)

| History

| Source

| Diff

· /sources/bluetooth/BluetoothInterface.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/FrameInterface.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.h

(-1, +1)

| History

| Source

| Diff

… 81 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Merge branch 'DEN-13198-UI_BN_75' into staging

Behrouz NematiPour — Wed, 28 Sep 2022 16:24:03 -0700

Behrouz NematiPour committed fec49d1 on branch master, @Environement_Swith and 191 more in application

Merge branch 'DEN-13198-UI_BN_75' into staging

· /main.cpp

(-36, +67)

| History

| Source

| Diff

· /scripts/run.sh

(-49, +80)

| History

| Source

| Diff

· /sources/ApplicationController.cpp

(-18, +55)

| History

| Source

| Diff

· /sources/ApplicationPost.cpp

(-8, +26)

| History

| Source

| Diff

· /sources/MainTimer.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.cpp

(-17, +17)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.h

(-2, +5)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-10, +7)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-19, +13)

| History

| Source

| Diff

· /sources/cloudsync/CloudSyncController.cpp

(-2, +9)

| History

| Source

| Diff

· /sources/device/DeviceController.cpp

(-57, +42)

| History

| Source

| Diff

· /sources/device/DeviceController.h

(-3, +0)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.cpp

(-3, +0)

| History

| Source

| Diff

· /sources/gui/GuiGlobals.h

(-9, +6)

| History

| Source

| Diff

· /sources/gui/GuiView.cpp

(-27, +50)

| History

| Source

| Diff

… 31 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 13 Sep 2022 11:18:59 -0700

Dara Navaei committed 54c4136 on branch master, @Environement_Swith and 191 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /alarmMapping.sh

(-1, +1)

| History

| Source

| Diff

· /cppcheck.sh

(-1, +1)

| History

| Source

| Diff

· /cr_objectives.sh

(-1, +1)

| History

| Source

| Diff

· /main.cpp

(-1, +1)

| History

| Source

| Diff

· /scripts/run.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/setup.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/start.sh

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationController.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/ApplicationPost.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/MainTimer.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/_wip_/fileCopy/main.cpp

(-6, +6)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageDispatcher.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageGlobals.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-1, +1)

| History

| Source

| Diff

… 86 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-13743: IMP: Mostly worked on Alarm Dialog/Bar...

Behrouz NematiPour — Tue, 30 Aug 2022 19:25:33 -0700

Behrouz NematiPour committed efb549a on branch master, @Environement_Swith and 192 more in application

DEN-13743: IMP: Mostly worked on Alarm Dialog/Bar

- Changed the Alarm Dialog (Title decreased by 4, Description increased by 4) / Bar (increased by 6) font size,

- Adjusted the AlarmDialog Timer position and layout.

- Removed the mouseArea from the WaitDone component.

- Added titel/description fontPixedSize for the NotificationDialog and NotificationBar

- Clear the reasontext on home screen when is not visible anymore.

- Clear the reasontext on SettingsDG when is not visible anymore.

- Used NotificationBarSmall instead of NotificationBar in:

- ModalDialog

- MainHome

- TreatmentAdjustmentBase

- TreatmentFlowBase

· /AlarmMapping.csv	(-1, +1)	\| History	\| Source	\| Diff
· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/AlarmItem.qml	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/ModalDialog.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/NotificationBar.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TimeText.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/WaitDone.qml	(-4, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/dialogs/NotificationDialog.qml	(-4, +10)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Fonts.qml	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/main.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainHome.qml	(-2, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/MainStack.qml	(-0, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentFlowBase.qml	(-3, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsDG.qml	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-2, +2)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-13489 IMP: General Implementation...

Behrouz NematiPour — Wed, 03 Aug 2022 02:59:49 -0700

Behrouz NematiPour committed 6f2622b on branch master, @Environement_Swith and 192 more in application

DEN-13489 IMP: General Implementation

DEN-13035: Update alarm body messages

- Removed the exclamation mark icon form the Alarm Dialog.

- Removed the exclamation mark icon form the Alarm Bar.

- Made the whole AlarmDialog title bar doubleClick and diagnostics opener if the alarm is not minimizable.

- Moved the Alarm ID from title to the bottom left of the dialog with format: "ID:".

- Clipped the AlarmDialon body message area, crop the text if longer than dialog area.

- Changed the "settings" property name of the VSettings to "instructions".

- Changed the date/time formats keys to simplify the code and conf file.

- Implemented the Alarm Body messages, to load from Alams/Alarms.conf, instead of the FW.

- The FW texts/documents will still being used if the Alarms.conf doesn't have a definition.

- A instruction base capability has also been added to the MVC, but UI still not supporting it.

· /AlarmMapping.csv

(-3, +3)

| History

| Source

| Diff

· /denali.pro.user

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/MessageInterpreter.cpp

(-3, +3)

| History

| Source

| Diff

· /sources/cloudsync/CloudSyncController.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/AlarmItem.qml

(-8, +9)

| History

| Source

| Diff

· /sources/gui/qml/components/NotificationBar.qml

(-9, +9)

| History

| Source

| Diff

· /sources/gui/qml/dialogs/NotificationDialog.qml

(-18, +27)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-4, +3)

| History

| Source

| Diff

· /sources/gui/qml/pages/TreatmentFlowBase.qml

(-8, +6)

| History

| Source

| Diff

· /sources/gui/qml/pages/settings/SettingsDG.qml

(-3, +3)

| History

| Source

| Diff

· /sources/model/hd/alarm/MAlarmMapping.cpp

(-293, +293)

| History

| Source

| Diff

· /sources/model/settings/MSettings.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/storage/Settings.h

(-0, +25)

| History

| Source

| Diff

· /sources/storage/StorageGlobals.cpp

(-0, +7)

| History

| Source

| Diff

· /sources/storage/StorageGlobals.h

(-0, +6)

| History

| Source

| Diff

… 4 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-13134: IMP: General Implementation for any bugs and any other implementations...

Behrouz NematiPour — Mon, 27 Jun 2022 19:40:23 -0700

Behrouz NematiPour committed 86e9dfb on branch master, @Environement_Swith and 197 more in application

DEN-13134: IMP: General Implementation for any bugs and any other implementations

DEN-12836: Treatment Report/log export modifications

- Improved the SDItem and renamed to SDCProgressItem.

- Added another separate progress circle component for the USB Driver [USBProgressItem]

- Adding Space check for USB as well to get the USBProgressCircle update.

- Optimized ExportButton and added two size for Settings screen(normal) and Treatment Review screen(small)

- Improved USB button comonent

- Added a global byte size converter in Variable.qml

- Improved MainMenu component

- Added a notification for the TreatmentFlowBase.qml main component.

- Used the notification of the TreatmentFlowBase.qml for the Treatment Review Screen Log export to display feedback to the user.

- Added an individual screen for the log export.

- Removed the Export Log and USB eject from the main settings option screen.

- Added an option for the Export log on the settings home screen which is currently enabled for non-service users too.

- Fixed the DGVersionResponse, log message.

- Put a comment in the FileHandler.cpp about the Qt API QStorageInfo::mountedVolume() which seems so slow on detecting mounted volumes when a USB derive is just plugged in (It could be system issue, since it has also been observed from shell console.)

- Added error handling to the Treatment Log/Report export

DEN-12726: Denali application crashing

- Modified the Logger Maxusage limit to keep 50% of the data/event log and 15% of the service log and keep 35% free, after the log clean up triggered by 15% free storage detected.

DEN-13051: Encounter alarm 6 and SD card detection problem after updating UI version

DEN-13156: Settings screen menu should disappear on service mode

- Improved the MainStack.qml navigation rules.

- Improved the Patient ID keyboard handling, to hide the keyboard, when not on the screen.

- Improved the SettingsStack.qml navigation rules.

DEN-13128: KBM: Cloud Sync Integration

- Saving the CS log in UTC timezone.

DEN-13127: LTS: Development Support

- Fixed the issue found on the End-Treatment screen Confirm button which didn't respect the last instruction page enable only rule.

· /AlarmMapping.csv

(-5, +5)

| History

| Source

| Diff

· /alarmMapping.sh

(-7, +7)

| History

| Source

| Diff

· /denali.pro.user

(-5, +14)

| History

| Source

| Diff

· /denali.qrc

(-32, +34)

| History

| Source

| Diff

· /scripts/run.sh

(-5, +28)

| History

| Source

| Diff

· /sources/cloudsync/CloudSyncController.cpp

(-1, +2)

| History

| Source

| Diff

· /sources/device/DeviceController.cpp

(-17, +70)

| History

| Source

| Diff

· /sources/device/DeviceController.h

(-0, +6)

| History

| Source

| Diff

· /sources/gui/GuiView.cpp

(-12, +25)

| History

| Source

| Diff

· /sources/gui/GuiView.h

(-5, +15)

| History

| Source

| Diff

· /sources/gui/qml/SDCProgressItem.qml

(-0, +89)

| History

| Source

· /sources/gui/qml/SDItem.qml

(-87, +0)

| History

| Source

| Diff

· /sources/gui/qml/USBProgressItem.qml

(-0, +90)

| History

| Source

· /sources/gui/qml/components/BackButton.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/ConfirmButton.qml

(-1, +1)

| History

| Source

| Diff

… 30 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 16 Feb 2022 10:10:27 -0800

Dara Navaei committed 27cc308 on branch master, @Environement_Swith and 200 more in application

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /alarmMapping.sh

(-7, +6)

| History

| Source

| Diff

· /cppcheck.sh

(-6, +6)

| History

| Source

| Diff

· /cr_objectives.sh

(-0, +15)

| History

| Source

| Diff

· /main.cpp

(-6, +6)

| History

| Source

| Diff

· /remove-exra-emptylines.sh

(-6, +6)

| History

| Source

| Diff

· /scripts/autostart

(-6, +6)

| History

| Source

| Diff

· /scripts/bluetooth_paired_clear.sh

(-6, +6)

| History

| Source

| Diff

· /scripts/bluetooth_paired_query.sh

(-6, +6)

| History

| Source

| Diff

· /scripts/brightness_get.sh

(-0, +15)

| History

| Source

| Diff

· /scripts/brightness_set.sh

(-0, +15)

| History

| Source

| Diff

· /scripts/date_time_set.sh

(-0, +15)

| History

| Source

| Diff

· /scripts/export_logs.sh

(-0, +15)

| History

| Source

| Diff

· /scripts/run.sh

(-6, +6)

| History

| Source

| Diff

· /scripts/setup.sh

(-6, +6)

| History

| Source

| Diff

· /scripts/start.sh

(-6, +6)

| History

| Source

| Diff

… 570 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-8705: Pre-Treatment Setup Screen...

Behrouz NematiPour — Tue, 06 Jul 2021 01:07:01 -0700

Behrouz NematiPour committed ac07818 on branch master, @Environement_Swith and 215 more in application

DEN-8705: Pre-Treatment Setup Screen

- Usability tests feedback modifications

- A/V Pressure Limits ranges update regarding PRS changes.

· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /resources/settings/Instructions/Instructions.conf	(-3, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/StepBullet.qml	(-5, +5)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/StepIndicator.qml	(-0, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/compounds/InstructionView.qml	(-29, +56)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-4, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentFlowBase.qml	(-1, +3)	\| History	\| Source	\| Diff
· /sources/model/hd/alarm/MAlarmMapping.cpp	(-232, +236)	\| History	\| Source	\| Diff
· /sources/storage/Settings.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/TreatmentLog.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/storage/TreatmentLog.h	(-4, +5)	\| History	\| Source	\| Diff
· /sources/view/VTreatmentCreate.h	(-4, +4)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-DEN-8937: Meetings & Support - General Support...

Behrouz NematiPour — Mon, 28 Jun 2021 14:51:25 -0700

Behrouz NematiPour committed f0cbe4c on branch master, @Environement_Swith and 216 more in application

DEN-DEN-8937: Meetings & Support - General Support

- Disinfection each sub-state timer

· /denali.pro.user	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/TimeText.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/compounds/CheckListView.qml	(-2, +13)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentFlowBase.qml	(-1, +7)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/disinfect/DisinfectStack.qml	(-15, +6)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): Merge branch 'DEN-8308_UI_DEV_Treatment_Log' into DEN-8495_UI_DEV_Service_ManualDisinfection_Flush

Behrouz NematiPour — Mon, 24 May 2021 20:00:52 -0700

Behrouz NematiPour committed ea616a4 on branch master, @Environement_Swith and 221 more in application

Merge branch 'DEN-8308_UI_DEV_Treatment_Log' into DEN-8495_UI_DEV_Service_ManualDisinfection_Flush

· /sources/gui/qml/pages/TreatmentFlowBase.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/UserConfirmation.qml	(-5, +5)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-8319: TxLog: Code Review 0

Behrouz NematiPour — Mon, 24 May 2021 19:59:58 -0700

Behrouz NematiPour committed 66506a1 on branch master, @Environement_Swith and 222 more in application

DEN-8319: TxLog: Code Review 0

· /sources/gui/qml/pages/TreatmentFlowBase.qml	(-1, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/UserConfirmation.qml	(-5, +5)	\| History	\| Source	\| Diff
· /sources/model/settings/MWifiNetwork.h	(-0, +15)	\| History	\| Source	\| Diff
· /sources/view/settings/VDateTime.cpp	(-0, +5)	\| History	\| Source	\| Diff
· /sources/wifi/WifiInterface.cpp	(-0, +14)	\| History	\| Source	\| Diff
· /sources/wifi/WifiInterface.h	(-0, +14)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-8494: Implementation: Merge the Service Login & About into the code....

Behrouz NematiPour — Sat, 22 May 2021 22:33:38 -0700

Behrouz NematiPour committed 56ad953 on branch master, @Environement_Swith and 221 more in application

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.

· /denali.pro.user	(-1, +1)	\| History	\| Source	\| Diff
· /resources/settings/Service.conf	(-0, +5)	\| History	\| Source
· /sources/gui/qml/compounds/TouchGrid.qml	(-0, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentFlowBase.qml	(-2, +4)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/UserConfirmation.qml	(-1, +5)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsBase.qml	(-12, +15)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsDG.qml	(-2, +3)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsDateTime.qml	(-2, +2)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsHome.qml	(-52, +19)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsStack.qml	(-15, +79)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/settings/SettingsWiFi.qml	(-7, +8)	\| History	\| Source	\| Diff
· /sources/storage/Settings.cpp	(-25, +44)	\| History	\| Source	\| Diff
· /sources/storage/Settings.h	(-0, +5)	\| History	\| Source	\| Diff
· /sources/view/settings/VSettings.cpp	(-1, +2)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-8490: Update the End Treatment Screens with the new Instruction base...

Behrouz NematiPour — Sat, 15 May 2021 16:06:53 -0700

Behrouz NematiPour committed 8a5dbf5 on branch master, @Environement_Swith and 222 more in application

DEN-8490: Update the End Treatment Screens with the new Instruction base

- Also added the milliseconds to the logs

· /denali.pro.user

(-1, +1)

| History

| Source

| Diff

· /denali.qrc

(-8, +5)

| History

| Source

| Diff

· /resources/settings/Instructions/Instructions.conf

(-0, +11)

| History

| Source

| Diff

· /sources/gui/qml/components/ConfirmTreatmentTable.qml

(-7, +7)

| History

| Source

| Diff

· /sources/gui/qml/components/Footer.qml

(-1, +0)

| History

| Source

| Diff

· /sources/gui/qml/components/FooterStatic.qml

(-0, +63)

| History

| Source

· /sources/gui/qml/components/RangeSlider.qml

(-2, +2)

| History

| Source

| Diff

· /sources/gui/qml/components/Slider.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/TickMarks.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/TimeText.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/UltrafiltrationButton.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/compounds/PressureRangeSlider.qml

(-2, +2)

| History

| Source

| Diff

· /sources/gui/qml/pages/TreatmentFlowBase.qml

(-0, +181)

| History

| Source

· /sources/gui/qml/pages/disinfect/DisinfectBase.qml

(-151, +3)

| History

| Source

| Diff

· /sources/gui/qml/pages/disinfect/DisinfectStack.qml

(-4, +2)

| History

| Source

| Diff

… 25 more files in changeset.