Commit graph

217 commits

Author SHA1 Message Date
2c1b4af586 Some refactoring in DataDeletionDaemon
Former-commit-id: ffcd854d70d4848fd026a154f7df3cc332710378
2015-12-12 00:27:23 +01:00
046aea1a2c External sensors are editable from web
Former-commit-id: 64343310cae1cbd1b14343f170ea7adc66d11671
2015-12-12 00:27:23 +01:00
Daniel Collin
2823057e76 bug fixes
Former-commit-id: c1bc39ba77ac319bbda1f55c59c68353c947ac98
2015-12-11 23:19:17 +01:00
2bc92ddc68 Added missing files
Former-commit-id: 4933c01ce78ab2000497c3873cdf6923b7626969
2015-12-11 22:38:19 +01:00
Ziver Koc
f5ccdf7465 Added external user modal
Former-commit-id: 4b1a8ed74f3a4085ab5c250626c51b0f0b017c0d
2015-12-11 17:55:32 +01:00
dcollin
b421206ce3 Refactoring code a lot.
- Common inner class in DataAggregatorDeamon for all period lenghts.
- Removed deletion of data from DataAggregator and
DataSynchronizationClient and put it in a new DataDeletionDeamon
- Moved time constants to a common TimeConstants class

Former-commit-id: 523ce7ad73b6edb4a507adcfa33b04742b170f25
2015-12-11 17:40:00 +01:00
04f1af3268 html updates to configuration page
Former-commit-id: 3fd5c512193dd50ef534c505ec31cb77178719b5
2015-12-10 23:24:47 +01:00
4ac7dcdea7 Local user is now configurable
Former-commit-id: 19d9d740432459ec65488e5a8b59e1c5719f8001
2015-12-10 22:24:19 +01:00
84fd5adb5e Refactored we pages
Former-commit-id: a64def61acdcbf63bf4792b9084a48dded9eb41a
2015-12-10 21:30:37 +01:00
c669cca664 removed old sqlite lib
Former-commit-id: d4b11925aa343bd9a55d3f812ce63c1de23fff1d
2015-12-10 20:39:11 +01:00
Daniel Collin
400c8ec2a4 Added a hacked sqlite lib for Raspberry Pi (armhf)
Former-commit-id: 167b9272e4d6873170071f5646b836cc6d2b0c3b
2015-12-10 09:11:16 +01:00
Daniel Collin
b164474b76 bug fix for aggregation transations
Former-commit-id: c17ab908a34f8cb2582f094895cec1a2c1ff4781
2015-12-10 09:11:16 +01:00
Ziver Koc
fbb910ef94 Merge remote-tracking branch 'origin/master'
Former-commit-id: 171a3526a67a41b48969be9e21431397a3b55dac
2015-12-09 17:41:04 +01:00
Ziver Koc
8afbfd5ebf Updated sqlite lib
Former-commit-id: 0d0aeabb872ab7774b50dd11e39878991f288b35
2015-12-09 17:39:49 +01:00
Ziver Koc
1395561dc0 Updated sqlite lib
Former-commit-id: 3e83693651ce67face7ae25faa2f82015f3a8f3d
2015-12-09 17:33:12 +01:00
Ziver Koc
95b865e556 Merge branch 'master' of http://repo.koc.se/hal
Former-commit-id: aff7d7a63c125693132d2d73e17f4e36cc8b51ca
2015-12-09 17:24:26 +01:00
Ziver Koc
a0f2dd736a Changed trace levels
Former-commit-id: d8128f8adf18824144268c5380019938388ac485
2015-12-09 17:24:01 +01:00
dcollin
005c57ad03 optimization: executing insert and delete in batches
Former-commit-id: 550aaa9db54972dfdf26702ea897975ec7de3697
2015-12-09 16:52:29 +01:00
dcollin
dc41dc878a optimization: all aggrigations are done in a singe transaction
Former-commit-id: 3229a510ac70dc3f3bbeb49e3493976c90b4bceb
2015-12-09 15:24:06 +01:00
Daniel Collin
6b272cd5a9 bug fix when calculating confidence
Former-commit-id: 2b9c1e20655a3fc1959d0c8bcab96ab52b6a1063
2015-12-09 14:27:03 +01:00
3c763dbc2b DB upgrade implemented
Former-commit-id: 351a040593e4ddab880d517d9e0854d8c8815fb5
2015-12-08 22:25:14 +01:00
Daniel Collin
5e98b51287 Bug fix: use null instead of undefined in html
Former-commit-id: d707c25e7b07c80cd44aef0b806a1536eadebb1b
2015-12-08 17:18:56 +01:00
Daniel Collin
0954e9c0c5 Preventing SQL-injection with PreparedStatement
Former-commit-id: 9954c913f528fa40be32b328b3ea1dad8ece8888
2015-12-08 17:12:36 +01:00
Ziver Koc
c1af8a1e17 Refactoring in Zutil
Former-commit-id: fb96815cdc14141930bc026bff8272e241e05731
2015-12-08 16:39:28 +01:00
Daniel Collin
f3bf9d716d fix build script since it did no longer build
Former-commit-id: 3a045493a26f7256c32c43a13cc59b0f680dfb80
2015-12-08 09:19:54 +01:00
Ziver Koc
c04ca7a926 Some small fixes
Former-commit-id: 2b6db2d58ec76bba2d3e67ac66ce510d3920aba3
2015-12-07 22:51:11 +01:00
Ziver Koc
4ff6ae2b4c Added DB initialization logic and upgrade needed detection
Former-commit-id: 7a8b4d8157529a10c242ea995c0d2a4939b4d142
2015-12-07 22:42:55 +01:00
Ziver Koc
4419be3661 Removed hal.db (added to gitignore)
Former-commit-id: 552188a78aa395e4f94f0f86ed9292ce3ebe83e9
2015-12-07 22:05:11 +01:00
Ziver Koc
4bea6adf89 Fixed issue where all sensor data was shown as 0
Former-commit-id: f656f227c83153b3df76f2083011b1b936c041b6
2015-12-07 22:02:33 +01:00
Ziver Koc
9fd1537edb Removed confidence reset to 1.0
Former-commit-id: 442b0e8d1b797756d54848ed9574ad3e3cf80348
2015-12-07 21:59:13 +01:00
Ziver Koc
80d07bdbf2 Added property methods to HalContext
Former-commit-id: 2d2d1877ea892be4013fdb35394fe94eba91f58a
2015-12-07 21:56:52 +01:00
Ziver Koc
4370557958 SQL bug fix (Overview page still not working)
Former-commit-id: 497a8509c8d199e8d106f3baaa0de357caa922e7
2015-12-07 21:49:00 +01:00
Ziver Koc
fdc9183c0c Changed DB access to a getter
Former-commit-id: 0eb743932c1bcd1e4fe9eba1d8485a54ae0b9db6
2015-12-07 21:48:13 +01:00
Ziver Koc
8cd81766a0 Added conf file for configuring server ports
Former-commit-id: 16f48cef9ddfdf3722bff863eb520e807d7c0c37
2015-12-07 21:20:47 +01:00
Daniel Collin
46728b4768 added null points in charts
Former-commit-id: 5d9a57b107ed55133634aa7549b57efe30ba5e2e
2015-12-07 17:59:01 +01:00
Ziver Koc
5f28b017f7 Compacted libs and made the code Java 7 compliant
Former-commit-id: 5ef92c478a977c02158a9829ae78972654f93873
2015-12-07 17:17:07 +01:00
Daniel Collin
9b9774e150 bug fixes
Former-commit-id: 73a44e02291ae0e73acd589f5c82bd270357ac78
2015-12-07 16:47:48 +01:00
Daniel Collin
4c05900dfc adding ant build script
Former-commit-id: 47153bf95c1f09c1119a11c95f1188d8beca0113
2015-12-04 12:18:45 +01:00
Ziver Koc
a0dce97932 Small log fix
Former-commit-id: 996bbd027691fe3462645dabfbbdaf125713a0b9
2015-12-04 10:45:26 +01:00
dcollin
b6b82b47f8 bug fixes
Former-commit-id: a0194f04545aa33b13808ec570eedb1d92b127bf
2015-12-04 10:42:54 +01:00
Ziver Koc
99e5b3a1f2 Merge branch 'master' of http://repo.koc.se/hal
Former-commit-id: 1607261b4d294dde72f75d3da67439a97e60652d
2015-12-04 10:34:10 +01:00
dcollin
79468d8e0d bug fixes
Former-commit-id: 5070493832b19151a693d7f8586fa9c9323de477
2015-12-04 10:33:27 +01:00
Ziver Koc
c99cedb2ad Some bug fixes
Former-commit-id: d282235d58ecb970ef1a7190ccaa592f097e1499
2015-12-04 10:33:22 +01:00
dcollin
1949d11f99 Bug fix
Former-commit-id: cde5245fdcf9bfde48acc9c79dbc53cb57f72272
2015-12-04 09:19:17 +01:00
dcollin
6dbaff4444 Some cleanup
Former-commit-id: ce7c102582a25756784b6a230a8654af6e965c77
2015-12-04 09:13:58 +01:00
dcollin
2aa2c76025 Added network sync
Former-commit-id: 59cc72d4de037d9ae2ecdd6d1bc5aa7816c883d8
2015-12-04 09:09:02 +01:00
dcollin
c27620d63d Added synchronizer daemon
Former-commit-id: ee3100d97cad83de5498f38467ac61a922398cb6
2015-12-04 07:36:07 +01:00
dcollin
6c5a5585c2 Added heatmap
Former-commit-id: 65cd207c8664abe42926759c7003d95e7a39d293
2015-12-04 06:58:47 +01:00
dcollin
9195e578d1 Some more html structure in configure page
Former-commit-id: f145433d81f55134c474c139890300799298844b
2015-12-04 05:51:02 +01:00
dcollin
de1706d67a Added configuration page
Former-commit-id: 8ab1873678b8e4a56332da785cd6f943648f6afd
2015-12-04 05:20:23 +01:00