ASWI - Pokročilé softwarové inženýrství » ASWI 2021 » Administrativní klient pro systém SensLog (KGM/ReliSA) - CodeBakers

Re #XXXX - Podpora

• fixing merge

Merge branch 'feature/sensor-graphs' into dev

Re #8775 - Agregovat grafy se stejným typem sensoru

• bugs fixed
• sensors and units sending request to new methods
• ready for observation data

Merge remote-tracking branch 'origin/dev' into feature/coding_dashboard

1. Conflicts:
2. src/app/dashboard/components/sensor-insert-popup/sensor-insert-popup.component.html
3. src/app/shared/nav-bar/components/unit-insert-popup/unit-insert-popup.component.html

Re #8874 - Stylování popup oken
+ Add styles for next popup windows

Re #8775 - Agregovat grafy se stejným typem sensoru

• graph loading decomposition
• some bugs fixed

Re #8874 - Stylování popup oken
+ Add styles for popup windows

Re #8775 - Agregovat grafy se stejným typem sensoru

• fix chart definitions

Re #8775 - Agregovat grafy se stejným typem sensoru

+ add definiton of multiline graph
+ add graph loader methods for handling multiline

Re #8870 - Edit sensor, insert unit - enum na sensorType

• 500 error static message because BE returns HTML exception
  + sensorType as dropdown
  + removing sensors from form in insertion of unit and insertion of sensor