dialin

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-10602_UI_DEV_PatientID' into develop

DIALIN-DEN-10602: DIALIN-DEN-10602_UI DEV Add PatientID PreTreatment

- Addressed the code review comments.

DEN-11114 worked on the blood leak

Merge branch 'DEN-10602_UI_DEV_PatientID' into develop

DIALIN-DEN-10602: DIALIN-DEN-10602_UI DEV Add PatientID PreTreatment

- Fixed the code review comment

- http://dvm-linux02:8060/cru/DIALIN-DEN-10602-2#c11532

Merge branch 'develop' of ssh://dvm-linux02:7999/vv/dialin into develop

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' of ssh://dvm-linux02:7999/vv/dialin into DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2

DEN-11114 added the new data publish to blood leak

Merge branch 'DEN-10602_UI_DEV_PatientID' into develop

DEN-10602: Fixed parsing of treatment parameters message in UI Proxy class.

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

DEN-11114: Fixed merge conflicts.

DEN-11114: Updated air_bubbles class to remove arterial bubble detector sensor. Updated UF test script to include HD valves, bubble detector and air trap level sensors.

Merge branch 'DEN-10602_UI_DEV_PatientID' into develop

DEN-10602: UI_DEV PatientID

- Updated the dialin ui_proxy to add the heparin for the treatment parameters messages.

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

Merge branch 'DEN-10602_UI_DEV_PatientID' into develop

cleaned up the code while merging.

cleaned up the code while merging.

Merge branch 'DEN-10602_UI_DEV_PatientID' into develop

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

Renamed the fans enums in HD and DG

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

DEN-11114 fixed the unit test

Merge branch 'develop' into DEN-10602_UI_DEV_PatientID

Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

    • -13
    • +42
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-11114, DEN-11374 fixed the DG temperature sensors mismatch by adding the heat disinfect sensor ID.

    • -13
    • +42
    /tests/dg_heat_and_chemical_disinfect_test.py
Merge branch 'DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2' into develop

    • -11
    • +13
    /tests/dg_heat_and_chemical_disinfect_test.py
DEN-11114 renamed some of the functions and variables

    • -11
    • +13
    /tests/dg_heat_and_chemical_disinfect_test.py