leahi-application

Clone Tools

Stats

Commits this week: 11
Total Committers: 7
Last Commit: 11 Dec
Commits this week: 11

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few minutes ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 05 Aug
10:30 am

Nicholas Ramirez

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

reduce spacing by 10 of header bar icons

Options
    • -1
    • +1
    /sources/gui/qml/components/HeaderBar.qml
9:13 am

Nicholas Ramirez

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

address final cr comments

Options
    • -1
    • +1
    /sources/storage/StorageGlobals.cpp
    • -1
    • +1
    /sources/view/hd/alarm/VAlarmInstructionsModel.cpp
9:05 am

Nicholas Ramirez

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

Address CR comments. QAbstractlistmodel working

Options
    • -6
    • +0
    /sources/device/DeviceView.cpp
    • -1
    • +0
    /sources/device/DeviceView.h
    • -1
    • +0
    /sources/gui/qml/AlarmItem.qml
    • -18
    • +12
    /sources/gui/qml/dialogs/NotificationDialog.qml
    • -32
    • +30
    /sources/view/hd/alarm/VAlarmInstructionsModel.cpp
    • -2
    • +2
    /sources/view/hd/alarm/VAlarmInstructionsModel.h
    • -4
    • +1
    /sources/view/hd/alarm/VAlarmStatus.cpp
    • -2
    • +0
    /sources/view/hd/alarm/VAlarmStatus.h
Monday 04 Aug
4:47 pm

Nicholas Ramirez

LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

address CR comments and almost finished updated the alarm model to a c++ QAbstractlistmodel

Options
    • -2
    • +2
    /sources/gui/qml/AlarmItem.qml
    • -3
    • +9
    /sources/gui/qml/components/AlarmButtonRow.qml
    • -3
    • +2
    /sources/gui/qml/components/NotificationBar.qml
    • -2
    • +0
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -25
    • +16
    /sources/gui/qml/dialogs/NotificationDialog.qml
    • -1
    • +1
    /sources/gui/qml/globals/Fonts.qml
    • -2
    • +0
    /sources/gui/qml/globals/Variables.qml
    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +111
    /sources/view/hd/alarm/VAlarmInstructionsModel.cpp
    • -0
    • +46
    /sources/view/hd/alarm/VAlarmInstructionsModel.h
    • -3
    • +15
    /sources/view/hd/alarm/VAlarmStatus.cpp
    • -9
    • +9
    /sources/view/hd/alarm/VAlarmStatus.h
    • -2
    • +0
    /sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
2:10 pm

Nicholas Ramirez

LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

Finished wifi indicator popup to display SSD and IP address

Options
    • -22
    • +26
    /sources/device/DeviceController.cpp
    • -0
    • +1
    /sources/device/DeviceController.h
    • -11
    • +6
    /sources/device/DeviceView.cpp
    • -37
    • +13
    /sources/gui/qml/dialogs/WiFiDialog.qml
10:19 am

Tiffany Mejia

LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- implement TD air pump and air bubbles message

- Adjust page indicators in diagnostics screen

- Add TD air pump and bubbles message to diagnostics screen

- fix DD diagnostics conductivity to have fixed float points

-Fix dd dialysate pump model comments

- Add Base of DD valves in doxygen comment TODO LATER

- Address imports for diagnostics QML files

- Generate png files for all SDD items

Options
    • binary
    /SDDs/CreateRx.png
    • binary
    /SDDs/DiagnosticsScreen.png
    • binary
    /SDDs/MainTreatmentScreen.png
    • binary
    /SDDs/Wifi.png
    • -4
    • +8
    /leahi.pro
    • -1
    • +2
    /sources/canbus/MessageGlobals.h
    • -1
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +2
    /sources/gui/GuiGlobals.cpp
    • -2
    • +3
    /sources/gui/GuiGlobals.h
    • -2
    • +0
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsBase.qml
    • -7
    • +7
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -2
    • +0
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml
    • -1
    • +3
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsSwipe.qml
    • -18
    • +99
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
    • -2
    • +4
    /sources/gui/qml/main.qml
  16. … 15 more files in changeset.
10:00 am

Nicholas Ramirez

LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

fix build error

Options
    • -11
    • +0
    /sources/device/DeviceController.cpp
    • -5
    • +2
    /sources/device/DeviceView.cpp
9:57 am

Nicholas Ramirez

LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

Update wifi popup component

Options
    • -0
    • +2
    /leahi.qrc
    • -0
    • +44
    /sources/device/DeviceController.cpp
    • -0
    • +10
    /sources/device/DeviceController.h
    • -0
    • +16
    /sources/device/DeviceView.cpp
    • -0
    • +1
    /sources/device/DeviceView.h
    • -30
    • +13
    /sources/gui/qml/components/HeaderBar.qml
    • -0
    • +14
    /sources/gui/qml/components/HeaderBarPopup.qml
    • -5
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -0
    • +61
    /sources/gui/qml/dialogs/WiFiDialog.qml
    • -0
    • +1
    /sources/gui/qml/globals/Colors.qml
Saturday 02 Aug
1:32 am

Tiffany Mejia

LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- implement TD air pump and air bubbles message

- Adjust page indicators in diagnostics screen

- Add TD air pump and bubbles message to diagnostics screen

- fix DD diagnostics conductivity to have fixed float points

-Fix dd dialysate pump model comments

- Add Base of DD valves in doxygen comment TODO LATER

Options
    • -49
    • +0
    /sources/model/hd/data/MHDAirBubbleData.cpp
    • -84
    • +0
    /sources/model/hd/data/MHDAirBubbleData.h
    • -0
    • +49
    /sources/model/td/data/MTDAirBubbleData.cpp
    • -0
    • +84
    /sources/model/td/data/MTDAirBubbleData.h
    • -25
    • +0
    /sources/view/hd/data/VHDAirBubbleData.cpp
    • -43
    • +0
    /sources/view/hd/data/VHDAirBubbleData.h
    • -0
    • +25
    /sources/view/td/data/VTDAirBubbleData.cpp
    • -0
    • +43
    /sources/view/td/data/VTDAirBubbleData.h
Friday 01 Aug
4:09 pm

Nicholas Ramirez

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

Address CR comments

Options
    • -1
    • +1
    /sources/storage/StorageGlobals.cpp
    • -4
    • +2
    /sources/view/hd/alarm/VAlarmStatus.cpp
4:06 pm

Nicholas Ramirez

LDT-1541 HeaderBar - SW - 01 - WiFi indicator - R&I - 05: DEV - Feature Implementation

add modal dialog to go under wifi button and align as arequested. Added click away to close

Options
    • -18
    • +34
    /sources/gui/qml/components/HeaderBar.qml
    • -2
    • +6
    /sources/gui/qml/components/ModalDialog.qml
2:36 pm

Nicholas Ramirez

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

Address CR comments

Options
    • -1
    • +1
    /SDDs/AlarmInstructions/AlarmListDialog.dot
    • -6
    • +2
    /sources/gui/qml/components/AlarmButtonRow.qml
    • -26
    • +18
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -28
    • +28
    /sources/gui/qml/dialogs/NotificationDialog.qml
    • -5
    • +5
    /sources/view/hd/alarm/VAlarmStatus.cpp
    • -1
    • +1
    /sources/view/hd/alarm/VAlarmStatus.h
12:56 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -2
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
12:52 pm

Behrouz NematiPour

Merge branch 'bugfix/LDT-1753-ui-heparin-stop-time-slider' into staging

Options
10:46 am

Nicholas Ramirez

LDT-1791 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 03: SDD - Design Diagram - plantuml

remove extra file

Options
    • -0
    • +0
    /SDDs/FinalDiagram.dot
10:44 am

Nicholas Ramirez

LDT-1791 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 03: SDD - Design Diagram - plantuml

Added alarm instructions compoennets SDD to project

Options
    • -0
    • +62
    /SDDs/AlarmInstructions/AlarmBar.dot
    • -0
    • +88
    /SDDs/AlarmInstructions/AlarmDialog.dot
    • -0
    • +61
    /SDDs/AlarmInstructions/AlarmDialogHeaderBar.dot
    • -0
    • +84
    /SDDs/AlarmInstructions/AlarmListDialog.dot
    • -0
    • +306
    /SDDs/AlarmInstructions/FinalDiagram.dot
    • binary
    /SDDs/AlarmInstructions/images/AlarmListAlarmButtonRow.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListColon.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListContent.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListDialog.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListHeaderBar.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListHeaderIcon.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListHeaderText.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListHour.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListList.png
    • binary
    /SDDs/AlarmInstructions/images/AlarmListMin.png
  16. … 41 more files in changeset.
Thursday 31 Jul
3:58 pm

Nicholas Ramirez

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

Update alarm dialog list with new (not imeplemened) scheme of how the alarms.conf file will be

Options
    • -2
    • +3
    /sources/gui/qml/AlarmItem.qml
    • -16
    • +16
    /sources/gui/qml/dialogs/NotificationDialog.qml
    • -0
    • +1
    /sources/storage/StorageGlobals.cpp
    • -0
    • +1
    /sources/storage/StorageGlobals.h
    • -1
    • +8
    /sources/view/hd/alarm/VAlarmStatus.cpp
    • -0
    • +1
    /sources/view/hd/alarm/VAlarmStatus.h
Wednesday 30 Jul
11:21 pm

Tiffany Mejia

LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

-Implement DD blood Leak message

Options
    • -0
    • +4
    /leahi.pro
    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +1
    /sources/gui/GuiGlobals.cpp
    • -2
    • +2
    /sources/gui/GuiGlobals.h
    • -0
    • +13
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -2
    • +4
    /sources/gui/qml/main.qml
    • -0
    • +5
    /sources/model/MModel.h
    • -0
    • +41
    /sources/model/dd/data/MDDBloodLeakData.cpp
    • -0
    • +78
    /sources/model/dd/data/MDDBloodLeakData.h
    • -0
    • +1
    /sources/view/VView.h
    • -0
    • +24
    /sources/view/dd/data/VDDBloodLeakData.cpp
    • -0
    • +42
    /sources/view/dd/data/VDDBloodLeakData.h
10:15 pm

Tiffany Mejia

LDT-912: Main Treatment Screen - SW - Diagnostics Screen-DD - 05: DEV - Feature Implementation

- Move DG Valves to DD and rename to DD

- Implement the following DD messages:

Dialysate Pump, Concentrate pump

- Cleanup Saloine bolus enum in VTDTretamentSattesData.cpp

- Minor comment cleanup in MDDTemperatures

Options
    • -4
    • +12
    /leahi.pro
    • -1
    • +1
    /sources/canbus/MessageGlobals.h
    • -1
    • +3
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +3
    /sources/gui/GuiGlobals.cpp
    • -2
    • +2
    /sources/gui/GuiGlobals.h
    • -123
    • +237
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -1
    • +1
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
    • -2
    • +6
    /sources/gui/qml/main.qml
    • -5
    • +15
    /sources/model/MModel.h
    • -0
    • +119
    /sources/model/dd/data/MDDConcentratePumpData.cpp
    • -0
    • +152
    /sources/model/dd/data/MDDConcentratePumpData.h
    • -0
    • +104
    /sources/model/dd/data/MDDDialysatePumpData.cpp
    • -0
    • +138
    /sources/model/dd/data/MDDDialysatePumpData.h
    • -44
    • +15
    /sources/model/dd/data/MDDTemperaturesData.h
    • -0
    • +87
    /sources/model/dd/data/MDDValvesStatesData.cpp
  16. … 13 more files in changeset.
9:30 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
9:26 pm

Behrouz NematiPour

***** TEMPORY FOR DEMO *****

- Adjusted headerbar to easier touch the SD-card for diagnostics screen.

Options
    • -2
    • +2
    /sources/gui/qml/SDCProgressItem.qml
9:09 pm

Behrouz NematiPour

Merge remote-tracking branch 'origin/feature/LDT-907-Main-Treatment-Screen-SW-Diagnostics-Screen-DD-2' into develop

Options
    • -140
    • +178
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -38
    • +37
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
    • -6
    • +6
    /sources/gui/qml/main.qml
9:07 pm

Behrouz NematiPour

Merge branch 'bugfix/LDT-1753-ui-heparin-stop-time-slider' into develop

Options
8:44 pm

Behrouz NematiPour

LDT-1785: Update SW (UI)

- Fixed the issue with the heparin slider explained in the LDT-1753.

- Fixed the issue found in one of the merges that missed some qml import.

- Fixed the issue with the VTDTreatmentStates mismatch missing SalineMax Enum in common repo.

- Removed unused def, max, res properties of the heparin stop time from the VTreatmentRanges.

Options
    • -0
    • +2
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
    • -0
    • +2
    /sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
    • -17
    • +7
    /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
    • -3
    • +0
    /sources/view/hd/data/VTreatmentRanges.cpp
    • -2
    • +0
    /sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
4:54 pm

Nicholas Ramirez

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

clean up and fix alignments

Options
    • -0
    • +1
    /sources/gui/qml/components/MuteButton.qml
    • -4
    • +1
    /sources/gui/qml/dialogs/NotificationDialog.qml
4:32 pm

Nicholas Ramirez

LDT-1793 General Alarm Requirements - SW - 01 - Instructions with new design - R&I - 05: DEV - Feature Implementation

Update to alarm dialods

Options
    • -2
    • +2
    /leahi.qrc
    • -14
    • +10
    /sources/gui/qml/AlarmItem.qml
    • -0
    • +64
    /sources/gui/qml/components/AlarmButtonRow.qml
    • -3
    • +0
    /sources/gui/qml/components/ArrowButton.qml
    • -27
    • +29
    /sources/gui/qml/components/MuteButton.qml
    • -75
    • +29
    /sources/gui/qml/components/NotificationBar.qml
    • -38
    • +0
    /sources/gui/qml/components/UpDownButton.qml
    • -49
    • +0
    /sources/gui/qml/compounds/Fader.qml
    • -0
    • +2
    /sources/gui/qml/compounds/TouchGrid.qml
    • -76
    • +86
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -90
    • +287
    /sources/gui/qml/dialogs/NotificationDialog.qml
    • -5
    • +8
    /sources/gui/qml/globals/Colors.qml
    • -0
    • +1
    /sources/gui/qml/globals/Fonts.qml
    • -0
    • +5
    /sources/gui/qml/globals/Variables.qml
    • -2
    • +1
    /sources/gui/qml/main.qml
Tuesday 29 Jul
7:27 pm

Behrouz NematiPour

Merge remote-tracking branch 'origin/develop' into develop

Options
7:25 pm

Behrouz NematiPour

***** TEMPORARILY Fixed the build issue on develop *****

Removes the 'SALINE_BOLUS_STATE_MAX_DELIVERED' state as it is no longer needed.

*****

This must be overwritten later by a feature branch or staging that has the fix

*****

Options
    • -2
    • +0
    /sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
5:04 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -26
    • +28
    /sources/model/hd/alarm/MAlarmMapping.cpp
5:04 pm

Behrouz NematiPour

Merge branch 'staging' into develop

Options