Commit graph

197 commits

Author SHA1 Message Date
e08f1b4477 Bug fixes
Former-commit-id: e2dd5aecc8d9fd521d97bff04a9336f6c5008aad
2016-01-05 02:11:03 +01:00
060f784611 Some refactoring for better testing
Former-commit-id: 159d14c7ee81ea75ef9bade2d48c67a056ea4c42
2016-01-05 00:42:25 +01:00
e9168e6136 Rollback: Added tail into run script
Former-commit-id: 00bdc63174715e07226189408786784a253c588c
2016-01-04 23:20:09 +01:00
d0bab40da2 Added tail into run script
Former-commit-id: 5efd4d202b8fcc6f778102184a9ed4f98dc35fa5
2016-01-04 23:12:29 +01:00
53ce5c0dce Linux fixes and updated run script to run main server
Former-commit-id: 8863d1403995e9ff8d7754928a60b32ed00ba9eb
2016-01-04 23:04:00 +01:00
d117e344c2 Implemented reporting and storing of raw data
Former-commit-id: db8352f02b4a703698c69618a8af6036d78f5b1d
2016-01-04 22:50:26 +01:00
2c59ae5693 Added event table and added ignored table to DB upgrade
Former-commit-id: 9237a2457630ac5fa1e41c7e6b16214ca24cba08
2016-01-04 19:21:26 +01:00
1f781f0c8d Added events to ControllerManager
Former-commit-id: 0982aed3728ac12c562b63fad5d74b7a548e50c0
2016-01-04 19:05:16 +01:00
6522b817dc Changed Controller Object sensor from Sensor to HalSensor
Former-commit-id: efbf9952098f1bdd70547d12a98a62a396fbf705
2016-01-04 18:16:58 +01:00
a63f34641f Enabled ControllerManager and med startup more robust
Former-commit-id: f5aade38ed8bd352c12d00046ce38c99e6147216
2015-12-31 00:27:42 +01:00
27c5204ec1 Implemented loading and saving Events and Sensors
Former-commit-id: 26ce2c437dd31a0236f6e13f1dff0709ed6a4966
2015-12-31 00:04:53 +01:00
588ac41956 Massive refactoring, new Sensor/Event class structure, controller instantiation disabled as it needs some more work
Former-commit-id: 0d2c15d63ea44c45c018fec59877a374122dacd4
2015-12-23 01:17:30 +01:00
fc05f82f31 Added Sensor plugin logic
Former-commit-id: d1cd27bf98192e0976b078eabb202bd13496df5c
2015-12-23 00:33:49 +01:00
Daniel Collin
275ffd97c2 Adding logic to the batabase upgrade.
1. Introduced a new db table "db_version_history" to hal-default.db. The table contains a list of db version. Every version has some parameters:
- 'db-version' (int) - A db version number. table 'conf', key 'db_version' points to this.
- 'force-upgrade' (default:0) - If 1 then force the upgrade to this version
- 'clear-internal-aggr-data' (default:0) - If 1 then clear all internal aggr data before upgrade.
- 'clear-external-aggr-data' (defualt:0) - If 1 then clear all external aggr data before upgrade.
The db table 'conf', key 'db_version' has to point to the db version to upgrad to. Only forward upgrades are supported.

2. Modified HalContext to act accoring to the parameters in the new db table.


Former-commit-id: 19bd87ade3129f3fc0c51f0e1b94f71dc854d792
2015-12-21 14:09:51 +01:00
Daniel Collin
b391e3a5e1 Fixed so that the aggregation will have less of a delay
Former-commit-id: cf26badd0d108260c4c00934005599aa7aea2e47
2015-12-21 13:49:18 +01:00
3f579bdf63 added run script
Former-commit-id: be675da729024872eef85cd98fbad22996fc4c65
2015-12-19 13:59:45 +01:00
4e283b750a Fixed mobile view
Former-commit-id: c0a27929741e826f6ba42aab39e5072098f69cd0
2015-12-18 17:47:59 +01:00
405d7ebf02 Bug fix, Optimized imports, Changed Timer to ExecutorService
Former-commit-id: b23ccf25f1f121589bd8887dbe833b95db4d2b24
2015-12-18 17:20:33 +01:00
Daniel Collin
d635888742 bug fix
Former-commit-id: cc32837aa622271c375ce50add3fb43136c32fc1
2015-12-18 10:15:22 +01:00
Daniel Collin
5036ec90e9 Using UTC instead of LOCAL time.
Former-commit-id: 21831d97d7f616313e0e90bf8ae69e04dea57685
2015-12-18 10:00:27 +01:00
4d9589dc9a Small refactoring
Former-commit-id: 749d08fb2f5d9827c6d0f2587e30324bba2ccd3a
2015-12-16 19:21:45 +01:00
9472fae5d3 Zutil fix
Former-commit-id: db04797c390be3f156c6f64d999a41332660b79a
2015-12-15 23:53:48 +01:00
56106a178d Some more refactoring and initial implementation of sensor Interface
Former-commit-id: 8e05cf50495dd54ba95d3a4ed10f0374cb2c428a
2015-12-15 23:29:04 +01:00
70f9bb1681 Refactoring, moved some files and renamed some classes
Former-commit-id: bdba0e95af5560f5e72cf0e45bed257ca29dc4a2
2015-12-15 21:44:42 +01:00
Ziver Koc
2bc4607ad1 Merge remote-tracking branch 'origin/master'
Former-commit-id: e670fc581a15545d7781d2fc4a976f74e0e3aba8
2015-12-14 18:18:24 +01:00
Ziver Koc
3b362b7f68 Local senor is configurable in the web
Former-commit-id: ceb417b12c57751efffdabebb7b514d25a06bb90
2015-12-14 18:18:14 +01:00
Daniel Collin
9802c08270 refactor TimeUtility class to make it testable
+ added a test class for TimeUtility


Former-commit-id: 54d9cf2bf8da37bb723dd5defebbfd3057fef214
2015-12-14 16:14:40 +01:00
Daniel Collin
41d704ad73 refactor and bug fix
- Introduced sensor type specific aggregation logic in DataAggregationDeamon (sum/avg)
- Renamed TimeConstants class to TimeUtility.
- DataAggregationDeamon::getTimestampPeriodStart did not calculate days correctly.
- Moved getTimestampPeriodStart to TimeUtility class.


Former-commit-id: c3db0dba990f1091b249fcdd4b5c3e78999cd456
2015-12-14 13:14:44 +01:00
81b605d9be create modify delete external users are working on the web
Former-commit-id: dd1ac3cd8b3f54b1be1aab9f452b12dce006b7cd
2015-12-12 01:34:55 +01:00
37686c2a79 Some more refactoring
Former-commit-id: 84a2afdcddb4db3339a224f7a9fb2e22b7285e8f
2015-12-12 00:27:23 +01:00
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