Commits · 7227d24db0bb824213e13f5ceddc801c51949738 · Marek Skácelík / Smart Energy Management System · GitLab

Apr 23, 2023
- Merge branch 'Metrics-User-update' into 'milestone-3' · 7227d24d
  Marek Skácelík authored Apr 23, 2023
  7227d24d
- Updated method to generate statistics · 76213be1
  Miroslav Rouča authored Apr 23, 2023
  
  76213be1
- Reformat User code · 45b3d5e6
  Miroslav Rouča authored Apr 23, 2023
  
  45b3d5e6
- Changed LocalDateTime to Instant for generating UserStatistics · b21ee156
  Miroslav Rouča authored Apr 23, 2023
  
  b21ee156
- Merge branch 'updateSmartMeter' into 'milestone-3' · d9728a86
  Marek Skácelík authored Apr 23, 2023
  d9728a86
- Merge branch 'milestone-3' into 'updateSmartMeter' · 3da52c5e
  Marek Skácelík authored Apr 23, 2023
  3da52c5e
- Merge branch 'milestone3/fixingissues' into 'milestone-3' · 06094e60
  Marek Skácelík authored Apr 23, 2023
  06094e60
- Deleted timestamp from Matrics · 0af78709
  Miroslav Rouča authored Apr 23, 2023
  
  0af78709
Apr 22, 2023
- Issue finished: Change of findAll methods in controllers · 578d774b
  Anesa Fazlagić authored Apr 22, 2023
  
  578d774b
Apr 21, 2023
- Merge branch 'update-ElectricityTarif' into 'milestone-3' · 248e5bd2
  Marek Skácelík authored Apr 21, 2023
  248e5bd2
- Updated companyId in electricityPrice · e9f5ccba
  Miroslav Rouča authored Apr 21, 2023 and Marek Skácelík committed Apr 21, 2023
  
  e9f5ccba
- Updated scheduled method · 5558bb57
  Miroslav Rouča authored Apr 21, 2023
  
  5558bb57
- Added active and scheduled method to SmartMeter · 27ae9b71
  Miroslav Rouča authored Apr 21, 2023
  
  27ae9b71
Apr 20, 2023
- Updated companyId in electricityPrice · bc5ec7f8
  Miroslav Rouča authored Apr 20, 2023
  
  bc5ec7f8
Apr 18, 2023
- Merge branch 'issue-34' into 'milestone-3' · 026dadbc
  Marek Skácelík authored Apr 18, 2023
  026dadbc
- changed App class names · 11086d2b
  Marek Skácelík authored Apr 18, 2023
  
  11086d2b
- Merge branch 'issue-37' into 'milestone-3' · 02b84bcd
  Marek Skácelík authored Apr 18, 2023
  02b84bcd
- renamed repository test classes and other minor tweaks · ee3ab2c4
  Marek Skácelík authored Apr 18, 2023
  
  ee3ab2c4
- Merge branch 'issue-43' into 'milestone-3' · 68a3f7c1
  Marek Skácelík authored Apr 18, 2023
  68a3f7c1
- Replaced LocalDateTime with Instance · 93767ed5
  Marek Skácelík authored Apr 18, 2023
  
  93767ed5
Apr 16, 2023
- Update ClassDiagram.jpg · 486847a2
  Miroslav Rouča authored Apr 16, 2023
  
  486847a2
- Replace ClassDiagram.jpg · 8d8b3883
  Miroslav Rouča authored Apr 16, 2023
  
  8d8b3883
- Merge branch 'roles-test' into 'milestone-2' · 3eccd4f3
  Miroslav Rouča authored Apr 16, 2023
  3eccd4f3
- Merge branch 'metrics-test' into 'milestone-2' · 5515b9b6
  Miroslav Rouča authored Apr 16, 2023
  5515b9b6
- Added Roles tests · ef52f46b
  Miroslav Rouča authored Apr 16, 2023
  
  ef52f46b
- Merge branch 'electricityTarif-test' into 'milestone-2' · bcd136fd
  Miroslav Rouča authored Apr 16, 2023
  bcd136fd
- Merge branch 'SmartMeter-tests' into 'milestone-2' · ea7aad4a
  Marek Skácelík authored Apr 16, 2023
  ea7aad4a
- Merge branch 'testing/house' into 'milestone-2' · fcb53573
  Marek Skácelík authored Apr 16, 2023
  fcb53573
- added SmartMeterService tests (unit) · d8b83367
  Marek Skácelík authored Apr 16, 2023
  
  d8b83367
- Added tests for MetricsService · 5728302d
  Miroslav Rouča authored Apr 16, 2023
  
  5728302d
- removed search by address · 6b1634a0
  Anesa Fazlagić authored Apr 16, 2023
  
  6b1634a0
- Added test for ElectricityPrice · 7aee70d8
  Miroslav Rouča authored Apr 16, 2023
  
  7aee70d8
- Merge branch 'testing_user' into 'milestone-2' · 0f5da44d
  Filip Bugoš authored Apr 16, 2023
  0f5da44d
- fix: data inicialization 16/04/23 · 5ec8a2b6
  Filip Bugoš authored Apr 16, 2023
  
  5ec8a2b6
- feat: User service test 16/04/23 · 1c62f411
  Filip Bugoš authored Apr 16, 2023
  
  1c62f411
- Merge branch 'testing/statistics' into 'milestone-2' · d4633a9d
  Marek Skácelík authored Apr 16, 2023
  d4633a9d
- feat: User service test 16/04/23 · 7ee41e07
  Filip Bugoš authored Apr 16, 2023
  
  7ee41e07
- added tests for house · 4a4df920
  Anesa Fazlagić authored Apr 16, 2023
  
  4a4df920
- fix: statistics 16/04/23 · 9539f38b
  Filip Bugoš authored Apr 16, 2023
  
  9539f38b
- small changes · 2b9cf24e
  Anesa Fazlagić authored Apr 16, 2023
  
  2b9cf24e