smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
263 commits 2 branches 3 tags 36 MiB
Commit graph

164 commits

Author SHA1 Message Date
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
Claudio Maggioni
6be999ffcc Created models for scenes and states 2020-04-15 18:02:24 +02:00
Claudio Maggioni
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
Claudio Maggioni
646672e3db Code review for Thermostat 2020-04-15 17:55:04 +02:00
Claudio Maggioni
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
Claudio Maggioni
cddf718767 Code review for SecurityCamera 2020-04-15 17:00:16 +02:00
Claudio Maggioni
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
Claudio Maggioni
d964f8846f Code review for Curtains 2020-04-15 16:38:02 +02:00
tommi27
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
tommi27
4c4297dfdf wip, to fix 2020-04-13 16:42:48 +02:00
omenem
2b93ffa07b Minor Changes 2020-04-13 15:44:47 +02:00
tommi27
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
Claudio Maggioni
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
tommi27
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
tommi27
7cfb2ffc73 Added thermostat, not complete 2020-04-09 11:30:05 +02:00
Claudio Maggioni
802cee52f8 fixed cors on password reset 2020-03-26 01:01:49 +01:00
Claudio Maggioni
6c9e2a7d7d Fixed ConcurrentModificationException on socket broadcast 2020-03-25 23:13:17 +01:00
Claudio Maggioni
27cb73292c Added /auth/profile 2020-03-25 22:41:59 +01:00
Claudio Maggioni
c5996608a4 fixed dimmable light 2020-03-25 22:34:15 +01:00
Claudio Maggioni
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
Claudio Maggioni
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)
```
La trascrizione dei test è stata fatta in modo certosino, simile a
quello dei monaci emanuensi.
I GRAVISSIMI buggg (3 g perchè fa faigo) potevano rendere il sito
incomprensibile
```
 2020-03-25 17:10:27 +01:00
Matteo Omenetti
03bbf6b824 Merge branch '47-fix-cascade-deletion-when-room-is-deleted' into 'dev' 
Resolve "Fix cascade deletion when room is deleted"

Closes #47

See merge request sa4-2020/the-sanmarinoes/backend!59
 2020-03-25 15:08:39 +01:00
omenem
6ce44e73ff fix min intensity of dimmabke light of 1 in Dimmable Save Request 2020-03-25 14:58:56 +01:00