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 seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 18 Jun
12:43 pm

Nicholas Ramirez

Merge remote-tracking branch 'origin/staging' into Wifi_Settings_Page

Options
12:41 pm

Nicholas Ramirez

revert QML reload code

Options
    • -1
    • +1
    /leahi.qrc
    • -9
    • +0
    /main.cpp
    • -1
    • +1
    /sources/gui/qml/components/MainMenu.qml
    • -2
    • +1
    /sources/gui/qml/components/NotificationBar.qml
    • -6
    • +6
    /sources/gui/qml/main.qml
    • -1
    • +0
    /sources/main.h
12:25 pm

Nicholas Ramirez

Add logic in c++ for showing the connected WIfis data on QML

Options
    • -1
    • +58
    /sources/device/DeviceController.cpp
    • -0
    • +1
    /sources/device/DeviceController.h
    • -0
    • +1
    /sources/device/DeviceError.cpp
    • -0
    • +1
    /sources/device/DeviceError.h
    • -0
    • +9
    /sources/device/DeviceGlobals.h
    • -0
    • +47
    /sources/device/DeviceModels.cpp
    • -1
    • +37
    /sources/device/DeviceModels.h
    • -1
    • +80
    /sources/device/DeviceView.cpp
    • -0
    • +23
    /sources/device/DeviceView.h
    • -27
    • +25
    /sources/gui/qml/pages/settings/SettingsWiFi.qml
    • -0
    • +2
    /sources/model/MModel.h
    • -0
    • +1
    /sources/storage/StorageGlobals.cpp
    • -0
    • +1
    /sources/storage/StorageGlobals.h
    • -1
    • +0
    /sources/view/VView.h
Tuesday 17 Jun
8:23 am

Nicholas Ramirez

Revert and remove wifiinterface and vnetworkmodel files

Options
    • -6
    • +2
    /leahi.pro
    • -4
    • +0
    /main.cpp
    • -1
    • +0
    /sources/gui/GuiGlobals.cpp
    • -2
    • +0
    /sources/gui/qml/main.qml
    • -480
    • +0
    /sources/view/settings/VNetworkModel.cpp
    • -131
    • +0
    /sources/view/settings/VNetworkModel.h
    • -1009
    • +0
    /sources/wifi/WifiInterface.cpp
    • -162
    • +0
    /sources/wifi/WifiInterface.h
Monday 16 Jun
4:18 pm

Tiffany Mejia

LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation - Adjust DD implementation for Conductivity and Gen dialysate mode data due to payload changes

Options
    • -2
    • +2
    /sources/canbus/MessageGlobals.h
    • -12
    • +3
    /sources/model/dg/data/MDDConductivityData.cpp
    • -16
    • +7
    /sources/model/dg/data/MDDConductivityData.h
    • -3
    • +0
    /sources/model/dg/data/MDDGenDialysateData.cpp
    • -18
    • +15
    /sources/model/dg/data/MDDGenDialysateData.h
    • -4
    • +1
    /sources/view/dg/data/VDDConductivityData.cpp
    • -4
    • +1
    /sources/view/dg/data/VDDConductivityData.h
    • -1
    • +0
    /sources/view/dg/data/VDDGenDialysateData.cpp
1:01 pm

Dara Navaei

Bamboo Commit: Updated MAlarmMapping.cpp

Options
    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
1:00 pm

Behrouz NematiPour

Merge branch 'feature/LDT-450-TreatmentParametersCreateRx' into staging

Options
    • -2
    • +2
    /sources/canbus/MessageGlobals.h
Friday 13 Jun
1:55 pm

Nicholas Ramirez

Completed most of QML and c++ for wifi settings. Need to finish shell scripts

Options
    • -0
    • +2
    /.gitignore
    • -3
    • +8
    /leahi.pro
    • -0
    • +4
    /main.cpp
    • -0
    • +1
    /sources/gui/GuiGlobals.cpp
    • -0
    • +2
    /sources/gui/qml/main.qml
    • -29
    • +25
    /sources/gui/qml/pages/settings/SettingsWiFi.qml
    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -1
    • +2
    /sources/storage/StorageGlobals.cpp
    • -0
    • +1
    /sources/view/VView.h
    • -0
    • +480
    /sources/view/settings/VNetworkModel.cpp
    • -0
    • +131
    /sources/view/settings/VNetworkModel.h
    • -0
    • +1009
    /sources/wifi/WifiInterface.cpp
    • -0
    • +162
    /sources/wifi/WifiInterface.h
12:34 pm

Behrouz NematiPour

LDT-718: General Alarm Requirements - SW - 05: DEV - Feature Implementation

Addressing code review comment(s):

- http://devapps.diality.us:8060/cru/LEAHI-APPLICATION-LDT-713-1#CFR-67864

Options
    • -1
    • +1
    /sources/storage/StorageGlobals.cpp
12:16 pm

Behrouz NematiPour

LDT-718: General Alarm Requirements - SW - 05: DEV - Feature Implementation

Addressing code review comment(s):

- http://devapps.diality.us:8060/cru/LEAHI-APPLICATION-LDT-713-1#c22189

Options
    • -2
    • +2
    /sources/model/hd/alarm/MAlarmCleared.h
Thursday 12 Jun
4:52 pm

Nicholas Ramirez

fix back button location in settings screen

Options
    • -2
    • +3
    /sources/gui/qml/pages/settings/SettingsBase.qml
4:48 pm

Nicholas Ramirez

fixed name of resource file to link properly when reloading. removed explicit qml import dependency to the .qrc file and use the QML engine import path for the QML reloading

Options
    • -1
    • +1
    /leahi.qrc
    • -1
    • +1
    /sources/gui/qml/components/MainMenu.qml
    • -1
    • +2
    /sources/gui/qml/components/NotificationBar.qml
    • -6
    • +6
    /sources/gui/qml/main.qml
10:50 am

Nicholas Ramirez

Implemented QML reload feature by pressing the F5 key when the run argument '-r' is set

Options
    • -1
    • +2
    /leahi.pro
    • -0
    • +9
    /main.cpp
    • -0
    • +46
    /sources/gui/GuiGlobals.cpp
    • -0
    • +11
    /sources/gui/GuiGlobals.h
    • -0
    • +1
    /sources/main.h
Wednesday 11 Jun
8:26 pm

Behrouz NematiPour

LDT-455 Treatment Parameters (Create Rx) - SW - 05: DEV - Feature Implementation

- Fixed the issue with the validation message length.

- Fixed the forgotten requirement for the Heparin Stop time less than the Treatment Duration.

- Fixed the issue with the CreateRx branch build issue on the version enums/ddSerial being different than the rest.

Options
    • -2
    • +2
    /sources/canbus/MessageGlobals.h
    • -4
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -4
    • +4
    /sources/cloudsync/CloudSyncController.cpp
    • -4
    • +4
    /sources/gui/GuiGlobals.h
    • -2
    • +21
    /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
    • -1
    • +1
    /sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml
    • -1
    • +1
    /sources/storage/Logger.cpp
6:08 pm

Tiffany Mejia

Merge remote-tracking branch 'origin/LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast' into LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast

Options
6:08 pm

Tiffany Mejia

Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Fix diagnostic font size and weight

- Adjust affected treatment QML files per Tx message implementation

- Add Air trap additional payload

Options
    • -0
    • +1
    /sources/gui/qml/components/DebugDataColumn.qml
    • -5
    • +9
    /sources/gui/qml/dialogs/DiagnosticsDialog.qml
    • -3
    • +3
    /sources/gui/qml/globals/Fonts.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -2
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -1
    • +1
    /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
    • -6
    • +5
    /sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml
    • -2
    • +2
    /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
    • -8
    • +11
    /sources/model/hd/data/MTDAirTrapData.cpp
    • -4
    • +7
    /sources/model/hd/data/MTDAirTrapData.h
    • -1
    • +2
    /sources/view/hd/data/VTDAirTrapData.cpp
    • -1
    • +2
    /sources/view/hd/data/VTDAirTrapData.h
Tuesday 10 Jun
7:21 pm

Behrouz NematiPour

LDT-718: General Alarm Requirements - SW - 05: DEV - Feature Implementation

- Updated the Alarm Messages for the Leahi Project.

- Used the init configuration location for the name/secured as well, since we don't have the secured partition yet.

- Added the rejection id next to the title for now for testing.

Options
    • -1
    • +2
    /etc/reports/alarms/AlarmMapping.csv
    • -2
    • +8
    /etc/reports/alarms/AlarmMapping.py
    • -28
    • +40
    /etc/reports/cppcheck/cppcheck.err
    • -253
    • +351
    /etc/reports/cppcheck/cppcheck.log
    • -239
    • +28
    /leahi.pro.user
    • -2
    • +0
    /sources/AlarmGenerator.cpp
    • -2
    • +2
    /sources/gui/GuiGlobals.h
    • -2
    • +2
    /sources/gui/qml/components/MainMenu.qml
    • -2
    • +2
    /sources/gui/qml/main.qml
    • -3
    • +3
    /sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h
    • -1
    • +1
    /sources/model/hd/adjustment/settings/MAdjustHDRequests.h
    • -7
    • +7
    /sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h
    • -7
    • +7
    /sources/model/hd/alarm/MAlarmActiveList.h
    • -1
    • +1
    /sources/model/hd/alarm/MAlarmCleared.h
    • -1
    • +2
    /sources/model/hd/alarm/MAlarmMapping.cpp
  16. … 6 more files in changeset.
4:48 pm

Tiffany Mejia

Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Implement TX messages: blood flow, conductivity, saline, UF, tx time, tx set point data, gen Dialysate, pressure

- remove blood pump duplicate and replace with blood flow

Options
    • -1
    • +2
    /etc/reports/alarms/AlarmMapping.csv
    • -2
    • +8
    /etc/reports/alarms/AlarmMapping.py
    • -10
    • +16
    /leahi.pro
    • -4
    • +6
    /sources/canbus/MessageGlobals.h
    • -2
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -3
    • +4
    /sources/gui/GuiGlobals.cpp
    • -11
    • +13
    /sources/gui/GuiGlobals.h
    • -11
    • +11
    /sources/gui/qml/dialogs/DiagnosticsDialog.qml
    • -4
    • +6
    /sources/gui/qml/main.qml
    • -10
    • +20
    /sources/model/MModel.h
    • -0
    • +67
    /sources/model/dg/data/MDDConductivityData.cpp
    • -0
    • +100
    /sources/model/dg/data/MDDConductivityData.h
    • -0
    • +72
    /sources/model/dg/data/MDDGenDialysateData.cpp
    • -0
    • +106
    /sources/model/dg/data/MDDGenDialysateData.h
    • -82
    • +0
    /sources/model/dg/data/MDGConductivityData.cpp
  16. … 34 more files in changeset.
4:48 pm

Tiffany Mejia

Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Add all main treatment messages: Blood flow, Ultrafiltration, Saline, DD Cond, Gen Dialysate, pressure

- Remove bloodpump model to use bloodflow instead

- Fix diagnostic bug for bloodflow to correct labeling order

-

Options
    • -1
    • +2
    /etc/reports/alarms/AlarmMapping.csv
    • -2
    • +8
    /etc/reports/alarms/AlarmMapping.py
    • -10
    • +16
    /leahi.pro
    • -4
    • +6
    /sources/canbus/MessageGlobals.h
    • -2
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -3
    • +4
    /sources/gui/GuiGlobals.cpp
    • -11
    • +13
    /sources/gui/GuiGlobals.h
    • -11
    • +11
    /sources/gui/qml/dialogs/DiagnosticsDialog.qml
    • -4
    • +6
    /sources/gui/qml/main.qml
    • -10
    • +20
    /sources/model/MModel.h
    • -0
    • +67
    /sources/model/dg/data/MDDConductivityData.cpp
    • -0
    • +100
    /sources/model/dg/data/MDDConductivityData.h
    • -0
    • +72
    /sources/model/dg/data/MDDGenDialysateData.cpp
    • -0
    • +106
    /sources/model/dg/data/MDDGenDialysateData.h
    • -82
    • +0
    /sources/model/dg/data/MDGConductivityData.cpp
  16. … 34 more files in changeset.
Sunday 08 Jun
10:19 pm

Behrouz NematiPour

Merge branch 'feature/LDT-450-TreatmentParametersCreateRx' into staging

Options
    • -9
    • +19
    /leahi.pro
    • -55
    • +60
    /leahi.pro.user
    • -3
    • +3
    /sources/canbus/MessageGlobals.h
    • -18
    • +19
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +2
    /sources/cloudsync/CloudSyncController.cpp
    • -1
    • +1
    /sources/gui/GuiGlobals.cpp
    • -24
    • +23
    /sources/gui/GuiGlobals.h
    • -107
    • +135
    /sources/gui/qml/main.qml
    • -6
    • +6
    /sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml
    • -17
    • +17
    /sources/model/MModel.h
    • -2
    • +2
    /sources/storage/Logger.cpp
    • -36
    • +38
    /sources/view/VTreatmentCreate.cpp
    • -47
    • +47
    /sources/view/VTreatmentCreate.h
    • -1
    • +1
    /sources/view/VView.h
10:12 pm

Behrouz NematiPour

Merge branch 'LDT-261-MainTreatmentScreen-SW-Diagnostics-Screen' into staging

Options
Friday 06 Jun
5:37 pm

Behrouz NematiPour

Merge branch 'feature/LDT-450-TreatmentParametersCreateRx' into develop

Options
    • -9
    • +19
    /leahi.pro
    • -55
    • +60
    /leahi.pro.user
    • -3
    • +3
    /sources/canbus/MessageGlobals.h
    • -18
    • +19
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +2
    /sources/cloudsync/CloudSyncController.cpp
    • -1
    • +1
    /sources/gui/GuiGlobals.cpp
    • -24
    • +23
    /sources/gui/GuiGlobals.h
    • -107
    • +135
    /sources/gui/qml/main.qml
    • -6
    • +6
    /sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml
    • -17
    • +17
    /sources/model/MModel.h
    • -2
    • +2
    /sources/storage/Logger.cpp
    • -36
    • +38
    /sources/view/VTreatmentCreate.cpp
    • -47
    • +47
    /sources/view/VTreatmentCreate.h
    • -1
    • +1
    /sources/view/VView.h
5:33 pm

Behrouz NematiPour

Merge branch 'LDT-261-MainTreatmentScreen-SW-Diagnostics-Screen' into develop

Options
5:30 pm

Behrouz NematiPour

Merge branch 'staging' into develop

Options
4:30 pm

Behrouz NematiPour

Merge branch 'feature/LDT-450-TreatmentParametersCreateRx' into develop

Options
    • -52
    • +55
    /leahi.pro.user
    • -4
    • +4
    /sources/canbus/MessageGlobals.h
    • -6
    • +6
    /sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml
4:29 pm

Behrouz NematiPour

LDT-455 Treatment Parameters (Create Rx) - SW - 05: DEV - Feature Implementation

- updated the settings device registration to match the td,dd.

- updated the regex for the patient ID to match the extra characters accepted in the Whitney.

- fix the unmatched version messages enums with the changes on the diagnosticsScreen branch

Options
    • -46
    • +48
    /leahi.pro.user
    • -4
    • +4
    /sources/canbus/MessageGlobals.h
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -6
    • +6
    /sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml
12:52 pm

Behrouz NematiPour

Merge branch 'feature/LDT-450-TreatmentParametersCreateRx' into develop

Options
    • -9
    • +19
    /leahi.pro
    • -5
    • +6
    /leahi.pro.user
    • -7
    • +7
    /sources/canbus/MessageGlobals.h
    • -18
    • +19
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +2
    /sources/cloudsync/CloudSyncController.cpp
    • -1
    • +1
    /sources/gui/GuiGlobals.cpp
    • -24
    • +23
    /sources/gui/GuiGlobals.h
    • -0
    • +127
    /sources/gui/qml/dialogs/DiagnosticsDialog.qml
    • -107
    • +135
    /sources/gui/qml/main.qml
    • -17
    • +17
    /sources/model/MModel.h
    • -2
    • +2
    /sources/storage/Logger.cpp
    • -36
    • +38
    /sources/view/VTreatmentCreate.cpp
    • -47
    • +47
    /sources/view/VTreatmentCreate.h
    • -1
    • +1
    /sources/view/VView.h
12:46 pm

Behrouz NematiPour

Merge remote-tracking branch 'origin/LDT-261-MainTreatmentScreen-SW-Diagnostics-Screen' into develop

Options
Thursday 05 Jun
6:24 pm

Behrouz NematiPour

LDT-455 Treatment Parameters (Create Rx) - SW - 05: DEV - Feature Implementation

- Updated the version message length

- Improved the unhandled messages function performance.

- Updated the Alarm Messages IDs

- Removed the orange Prescription profiel ID with number from the Treatment Confirm Screen table title .

- Added gradient to the MainMenu component.

- Set the main menu height (notificationHeight) higher to the 100.

- Figured that the keyboard may cover the AlarmBar so changged the Keyboard style to remove the bottom margin and made the extra black ribbon not visible when alarmbar is visible to uncover the alarmbar.

- Created a temporary StatusBar/HeaderBar to have a base to adjust other screens.

- Adjusted the Patient ID screen for the new screen size ena keyboard loaction.

- Updated the Virtual Keyboard style to adjust for the new screen size and the AlarmBar.

- Updated the TreatmentRanges for Leahi to read from the settings//configurations.

- Added separate date and time properties in the VDateTime to temporarily display on the StatusBar/HeaderBar.

Options
    • -1
    • +1
    /etc/reports/alarms/AlarmMapping.csv
    • -1
    • +1
    /etc/reports/alarms/AlarmMapping.py
    • -45
    • +46
    /leahi.pro.user
    • -3
    • +3
    /sources/canbus/MessageGlobals.h
    • -16
    • +17
    /sources/canbus/MessageInterpreter.cpp
    • -18
    • +17
    /sources/gui/GuiGlobals.h
    • -1
    • +2
    /sources/gui/qml/KeyboardItem.qml
    • -25
    • +4
    /sources/gui/qml/components/ConfirmTreatmentTable.qml
    • -4
    • +4
    /sources/gui/qml/components/MainMenu.qml
    • -1
    • +1
    /sources/gui/qml/components/StepIndicator.qml
    • -2
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -101
    • +129
    /sources/gui/qml/main.qml
    • -1
    • +1
    /sources/gui/qml/pages/MainStack.qml
    • -1
    • +2
    /sources/gui/qml/pages/TreatmentFlowBase.qml
    • -10
    • +10
    /sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
  16. … 9 more files in changeset.
Tuesday 03 Jun
9:36 am

Tiffany Mejia

Main Treatment Screen - SW - Diagnostics Screen - 05: DEV - Feature Implementation

- Fix typos from HD/DG to TD/DD

Options
    • -1
    • +1
    /sources/canbus/MessageGlobals.h
    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +2
    /sources/gui/GuiGlobals.h
    • -4
    • +4
    /sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.cpp
    • -1
    • +1
    /sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.h
    • -3
    • +3
    /sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp
    • -3
    • +3
    /sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h
    • -1
    • +1
    /sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.cpp
    • -1
    • +1
    /sources/model/hd/data/MTDTemperatureData.h
    • -1
    • +1
    /sources/view/hd/data/VTDAirTrapData.cpp