omenem
cf06950b62
fix
2020-04-27 18:59:01 +02:00
eacc77fa43
fix
2020-04-27 18:51:55 +02:00
Christian Capeáns Pérez
c1147f02ae
fixed some stuff not working on automations
2020-04-27 17:03:17 +02:00
60c057ce5b
Merge branch 'socket-fix' into 'dev'
...
Socket fix
See merge request sa4-2020/the-sanmarinoes/backend!94
2020-04-27 14:30:11 +02:00
Claudio Maggioni (maggicl)
579dcaacfd
fix @SocketGsonExclude on device and children
2020-04-27 14:28:34 +02:00
omenem
719bde0840
fix
2020-04-27 13:55:59 +02:00
omenem
cc2a16f3e3
fix
2020-04-27 11:54:31 +02:00
omenem
06dbd2bef0
fix
2020-04-26 13:57:30 +02:00
omenem
c9395404e0
fix
2020-04-26 13:29:14 +02:00
omenem
10dc0c9741
new route fix
2020-04-26 12:13:46 +02:00
Claudio Maggioni (maggicl)
be7c9ce99f
fix duplicate device names
2020-04-25 22:51:30 +02:00
dbf9ef885b
Merge branch 'fix' into 'dev'
...
fix update sensor
See merge request sa4-2020/the-sanmarinoes/backend!86
2020-04-25 16:34:16 +02:00
Nicola Brunner
c5aab751df
fix update sensor
2020-04-25 16:33:00 +02:00
omenem
d61c7bbc0b
controller for triggers
2020-04-25 15:59:06 +02:00
omenem
db35205ed8
controller for scenePriority
2020-04-25 15:20:00 +02:00
omenem
5eadb2314c
wip
2020-04-25 15:00:22 +02:00
omenem
509d890c7e
Controllers for automation
2020-04-25 14:56:07 +02:00
britea
24804d2d82
fix scene repository
2020-04-24 23:09:31 +02:00
54c27921d9
Fixed DeviceService
2020-04-23 17:10:59 +02:00
Claudio Maggioni (maggicl)
3da04ccaef
Fixed user story 5 and 7
2020-04-23 11:17:46 +02:00
Claudio Maggioni (maggicl)
7ebf74a4c8
WIP merge with dev
2020-04-22 23:11:32 +02:00
Claudio Maggioni (maggicl)
37ea9591cf
Code review
2020-04-22 23:04:43 +02:00
Claudio Maggioni (maggicl)
3894fa14a9
Code review
2020-04-22 22:54:34 +02:00
389af7c04d
all device controllers have been updated with device service
2020-04-22 18:13:06 +02:00
omenem
570b1e8b29
wip, implemented very long stream in DeviceService, SceneService is missing though
2020-04-22 17:30:16 +02:00
c6d5a1acd7
controllers fixed and updated for guest or host checks
2020-04-22 17:17:07 +02:00
omenem
5c2f828834
wid, added implements keyword for Boolean/RangeTriggerable in all the devices
2020-04-22 16:48:49 +02:00
a428d57fe1
WIP: controllers check for owner or guest, device service needs review
2020-04-22 15:30:23 +02:00
db21aa0a26
Code review
2020-04-21 17:36:17 +02:00
c4f295d7d9
refactored controllers code
2020-04-21 17:09:11 +02:00
Claudio Maggioni (maggicl)
4357606187
Code review
2020-04-21 16:58:12 +02:00
omenem
618c152466
wip
2020-04-21 15:21:47 +02:00
Claudio Maggioni (maggicl)
eef0887da1
Code review
2020-04-21 14:57:11 +02:00
omenem
0692f7e2ee
wip
2020-04-21 14:45:04 +02:00
Claudio Maggioni (maggicl)
6317ac99e4
Code review
2020-04-21 14:25:42 +02:00
Claudio Maggioni (maggicl)
cfe3848d7e
Done method to get dimmable light if owner or guest
2020-04-21 14:06:56 +02:00
db102f75e4
light and room controller routes check for guest authorization
2020-04-20 16:41:11 +02:00
Claudio Maggioni (maggicl)
319629a681
Pseudocode for automation implemmentation
2020-04-20 14:14:04 +02:00
omenem
5c0df55de9
wip
2020-04-20 13:47:27 +02:00
7b80b52f9e
guest controller should be finished, must be reviewed
2020-04-19 17:10:42 +02:00
36a7a649d5
started guest controllers (WIP)
2020-04-18 17:35:14 +02:00
566a2e72e3
invited model finally works
2020-04-18 15:35:04 +02:00
262dbf12e7
hopefully fixed invited relationship II: The Revenge
2020-04-18 14:52:11 +02:00
d2aaa45a8b
hopefully fixed invited relationship
2020-04-18 14:11:21 +02:00
6e36d7d306
updated onetomany relationship
2020-04-18 12:43:01 +02:00
3921fe1330
started invitation relationship
2020-04-18 12:43:01 +02:00
Claudio Maggioni (maggicl)
61ff797ea1
Fixes to Scene implementation
2020-04-18 12:38:52 +02:00
omenem
e79ab46cb8
added sceneBinding method in cotrollers of output devices
2020-04-18 10:54:53 +02:00
Claudio Maggioni (maggicl)
f565a3be6e
Added documentation to Device.cloneState()
2020-04-17 21:12:33 +02:00
Claudio Maggioni (maggicl)
4aa4d68738
Fix on thermostat
2020-04-17 21:05:17 +02:00
Claudio Maggioni (maggicl)
57a6e22e2a
Corrections on Scene controllers and method cloneState on all OutputDevices
2020-04-17 20:54:09 +02:00
Claudio Maggioni (maggicl)
2bfff689b3
Simplified Models for States
2020-04-17 20:22:28 +02:00
Claudio Maggioni (maggicl)
7bb4cd34e1
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into 53-users-can-create-scenes
2020-04-17 19:19:46 +02:00
Claudio Maggioni (maggicl)
fefd073534
Converted thermostat to dimmable state and fixed errors on generics
2020-04-17 19:09:32 +02:00
omenem
3cedaf5f50
Fix
2020-04-17 18:28:42 +02:00
omenem
80088c0dc3
State controller, saveRequest and Repository
2020-04-17 18:13:46 +02:00
omenem
e3aa44435e
Scene Controller, saveRequest and Repository
2020-04-17 17:03:21 +02:00
Claudio Maggioni (maggicl)
cde88f2ca9
Added new hierarchy for dimmable devices and removed duplications in controllers and dtos
2020-04-16 18:28:33 +02:00
Claudio Maggioni (maggicl)
7cbacd7406
Implemented Many-to-Many behaviour for Switches and Dimmers
2020-04-16 17:43:25 +02:00
Claudio Maggioni (maggicl)
495c317eb8
Added apply() method on State to change underlying device accordingly
2020-04-15 23:10:05 +02:00
6be999ffcc
Created models for scenes and states
2020-04-15 18:02:24 +02:00
1fe31c0d46
Merge branch 'thermostat-feature' into 'dev'
...
Thermostat feature
See merge request sa4-2020/the-sanmarinoes/backend!77
2020-04-15 18:00:03 +02:00
646672e3db
Code review for Thermostat
2020-04-15 17:55:04 +02:00
9088a765b8
Merge branch '52-security-cameras' into 'dev'
...
Resolve "Users can add security camera in a room"
Closes #52
See merge request sa4-2020/the-sanmarinoes/backend!76
2020-04-15 17:06:30 +02:00
cddf718767
Code review for SecurityCamera
2020-04-15 17:00:16 +02:00
afea11931f
Merge branch '51-users-can-add-smart-curtains-blinds' into 'dev'
...
Resolve "Users can add smart curtains/blinds"
Closes #51
See merge request sa4-2020/the-sanmarinoes/backend!70
2020-04-15 16:43:06 +02:00
d964f8846f
Code review for Curtains
2020-04-15 16:38:02 +02:00
a8ad054a13
Merge branch 'master' into 'dev'
...
Master
See merge request sa4-2020/the-sanmarinoes/backend!75
2020-04-15 16:24:09 +02:00
0e924c088b
thermostat should be finished
2020-04-15 15:10:02 +02:00
Claudio Maggioni (maggicl)
44321fe153
wip
2020-04-15 14:10:40 +02:00
Claudio Maggioni (maggicl)
74b32cea83
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into thermostat-feature
2020-04-15 13:54:59 +02:00
Claudio Maggioni (maggicl)
8d53bee294
WIP on average temperature computation
2020-04-14 13:24:36 +02:00
4c4297dfdf
wip, to fix
2020-04-13 16:42:48 +02:00
omenem
2b93ffa07b
Minor Changes
2020-04-13 15:44:47 +02:00
0b1170404d
almost finished thermostat
2020-04-13 15:36:29 +02:00
omenem
8d0ec2ea63
Minor Changes
2020-04-13 15:10:05 +02:00
omenem
b3b7afea2a
Minor Changes
2020-04-12 18:45:32 +02:00
omenem
e5011110e7
Added fields tags (@NotNull etc...) also so CurtainSaveRequest
2020-04-12 18:35:22 +02:00
Claudio Maggioni (maggicl)
68f9b352cd
Updaed websocket to perform batch updates
2020-04-12 17:47:03 +02:00
Claudio Maggioni (maggicl)
8629c1f6b4
Adapted websocket code to new redux specification
2020-04-12 15:58:40 +02:00
britea
ad4a5a9c17
Added intensity to knob-dimmer
2020-04-11 18:30:47 +02:00
e46ac02da5
Input output connection routes now accept array of outputs
2020-04-11 17:24:23 +02:00
omenem
0872d7654f
4 attempt to pass pipeline
2020-04-09 15:38:03 +02:00
7bda571a27
thermostat in an entity now
2020-04-09 15:25:34 +02:00
omenem
79b39de6bb
3 attempt to pass pipeline
2020-04-09 15:25:17 +02:00
Jacob Salvi
831a2d07c6
removed id from Curtains.java
2020-04-09 15:17:20 +02:00
omenem
83c2554f29
2 attempt to fix pipeline
2020-04-09 15:12:25 +02:00
Jacob Salvi
7f34e2b391
Merge branch 'dev' of lab.si.usi.ch:sa4-2020/the-sanmarinoes/backend into 51-users-can-add-smart-curtains-blinds
...
# Conflicts:
# .gitlab-ci.yml
2020-04-09 14:27:12 +02:00
Jacob Salvi
bdf0f87d77
Added curtains
2020-04-09 13:41:58 +02:00
omenem
9e49da0d00
first fix to try making the pipeline pass
2020-04-09 12:27:04 +02:00
omenem
66bcecdbe0
added security camera device
2020-04-09 12:13:32 +02:00
7cfb2ffc73
Added thermostat, not complete
2020-04-09 11:30:05 +02:00
13db88b810
fix
2020-03-26 11:17:42 +01:00
802cee52f8
fixed cors on password reset
2020-03-26 01:01:49 +01:00
6c9e2a7d7d
Fixed ConcurrentModificationException on socket broadcast
2020-03-25 23:13:17 +01:00
27cb73292c
Added /auth/profile
2020-03-25 22:41:59 +01:00
c5996608a4
fixed dimmable light
2020-03-25 22:34:15 +01:00
3518647eeb
Merge branch '48-redirection-to-frontend-after-email-confirmation-operations-password-reset-and-email' into 'dev'
...
Resolve "Redirection to frontend after email confirmation operations (password reset and email)"
Closes #48
See merge request sa4-2020/the-sanmarinoes/backend!62
2020-03-25 20:29:48 +01:00
b283a62d0d
fixed redirects
2020-03-25 17:31:24 +01:00
britea
60c17b3dd8
Fixed @tommi27 synchronization frenzy for sensors
...
I have now discovered the Schadenfreude in using git-blame. To quote an
old commit message from high school:
[Trascrizione domande fisica e correzione di GRAVISSIMI bug presenti nel
codici di Maggioni](dd0933def0
2020-03-25 17:10:27 +01:00
