Skip to content

Commit

Permalink
Prepare Release 0.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
alexstocker committed Sep 22, 2018
1 parent 9647ff9 commit f9a87d4
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 21 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SensorLogger
### (0.0.7) UNRELEASED
### 0.0.7 RELEASED
* WipeOut Device #49
* Fixed missing device.displayName in widget config dropdown
* Updated CHANGELOG
Expand All @@ -8,7 +8,7 @@
* Add wipeout icon set #49
* Adding ClassFinder, MaxValues24hWidget, Widget Interface

### (0.0.6) RELEASED
### 0.0.6 RELEASED
* Added SensorLogs::deleteLogById and deleteLog controller action #37'
* Added dashboard widgets column media styles
* Added timeoffset calculation for realtime charts
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Sensor Logger

### Latest Versions
- owncloud [0.0.6](https://github.com/alexstocker/sensorlogger/releases/tag/0.0.6)
- nextcloud [0.0.6nc](https://github.com/alexstocker/sensorlogger/releases/tag/0.0.6nc)
- owncloud [0.0.7](https://github.com/alexstocker/sensorlogger/releases/tag/0.0.7)
- nextcloud [0.0.7nc](https://github.com/alexstocker/sensorlogger/releases/tag/0.0.7nc)

Read more [SensorLogger WIKI](https://github.com/alexstocker/sensorlogger/wiki/)

Expand Down
3 changes: 3 additions & 0 deletions js/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
$(function () {
var sidebar = $('#app-sidebar');
var saveBtn = $('#save-btn');
var wipeOutBtn = $('#wipeout-btn');
var showList = $('#showList');
var showDashboard = $('#showDashboard');
var deviceList = $('#deviceList');
Expand Down Expand Up @@ -153,6 +154,7 @@
sidebar.on('click','.icon-close',function(e) {
sidebar.hide();
saveBtn.hide();
wipeOutBtn.hide();
});

$(document.body).on('click','.actions',function(e) {
Expand Down Expand Up @@ -261,6 +263,7 @@

sidebarBody.append(widgetType);
sidebarBody.append(device);
wipeOutBtn.hide();

sidebarTitle.empty().append('Dashboard widget');

Expand Down
2 changes: 1 addition & 1 deletion tests/curl/post.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$humidity = mt_rand (1.00*10, 99.99*10) / 10;
$temperature = mt_rand (-9.00*10, 49.99*10) / 10;

$array = array("deviceId" => "666666-fe8c-11e6-bc64-92361f002671",
$array = array("deviceId" => "101010-fe8c-11e6-bc64-92361f002671",
"temperature" => $temperature,
"humidity" => $humidity,
"date" => date('Y-m-d H:i:s'));
Expand Down
18 changes: 9 additions & 9 deletions tests/curl/post_extend_0.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
$url = 'http://owncloud.loc/index.php/apps/sensorlogger/api/v1/createlog/';
$url = 'http://owncloud10.loc/index.php/apps/sensorlogger/api/v1/createlog/';

$co = mt_rand (1*10, 1000*10) / 10;
$co2 = mt_rand (1*10, 10000*10) / 10;
Expand All @@ -8,39 +8,39 @@
$nh3 = mt_rand (1*10, 500*10) / 10;
$ch4 = mt_rand (1*10, 1000*10) / 10;

$array = array("deviceId" => "635558e7-602c-0dfd-f4db-3ee12efdf7ce",
$array = array("deviceId" => "92931177-0b34-179b-5958-9e467507f159",
"date" => date('Y-m-d H:i:s'),
"data" => array(
array(
"dataTypeId" => 4,
"dataTypeId" => 20,
"value" => $co
),
array(
"dataTypeId" => 9,
"value" => $co2
),
array(
"dataTypeId" => 5,
"dataTypeId" => 21,
"value" => $c2h6oh
),
array(
"dataTypeId" => 10,
"dataTypeId" => 22,
"value" => $h,
),
array(
"dataTypeId" => 7,
"dataTypeId" => 23,
"value" => $nh3,
),
array(
"dataTypeId" => 8,
"dataTypeId" => 24,
"value" => $ch4,
)
));

$data_json = json_encode($array);

$username = 'test';
$token = 'LDLIB-POSVG-ALYVJ-QBPKM';
$username = 'admin';
$token = 'RWGFF-KMZUC-NFOQD-CMXCC';

$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
Expand Down
14 changes: 7 additions & 7 deletions tests/curl/register_extend_0.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ function genUniquID() {
return $uuid;
}

$url = 'http://owncloud.loc/index.php/apps/sensorlogger/api/v1/registerdevice/';
$url = 'http://owncloud10.loc/index.php/apps/sensorlogger/api/v1/registerdevice/';

$registerArray = [
'_route' => 'sensorlogger.apisensorlogger.registerDevice',
'deviceId' => genUniquID(),
'deviceName' => 'Some Default Name',
'deviceType' => 'Some Device Type',
'deviceGroup' => 'Some Device Group',
'deviceParentGroup' => 'Some Parent Group',
'deviceName' => 'voc001',
'deviceType' => 'Air Quality',
'deviceGroup' => 'Pool House',
'deviceParentGroup' => 'Home',
'deviceDataTypes' => [[
'type' => 'CO',
'description' => 'Carbon monoxide',
Expand Down Expand Up @@ -55,8 +55,8 @@ function genUniquID() {

$data_json = json_encode($registerArray);

$username = 'test';
$token = 'GOETJ-QOSIY-WCIZI-ZAJTL';
$username = 'admin';
$token = 'RWGFF-KMZUC-NFOQD-CMXCC';

$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
Expand Down

0 comments on commit f9a87d4

Please sign in to comment.