Prepare release 0.0.6

alexstocker · May 19, 2018 · 9aa35f8 · 9aa35f8
1 parent 65d3722
commit 9aa35f8
Show file tree

Hide file tree

Showing 60 changed files with 70 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # SensorLogger
-### (0.0.6) UNRELEASED
+### (0.0.6) RELEASED
+  * Added SensorLogs::deleteLogById and deleteLog controller action #37'
+  * Added dashboard widgets column media styles
+  * Added timeoffset calculation for realtime charts
+  * Added RealTime Data widget
   * Started to rebuild script.js #11, added RealTime Chart widget
   * Updated insertExtendedLog and insertLog to use QueryBuilder
   * Added SensorLogs::deleteLogById and deleteLog controller action #37'

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 # Sensor Logger
 
 ### Latest Versions
-- owncloud [0.0.5](https://github.com/alexstocker/sensorlogger/releases/tag/0.0.5)
-- nextcloud [0.0.5nc](https://github.com/alexstocker/sensorlogger/releases/tag/0.0.5nc)
+- 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)
 
 Read more [SensorLogger WIKI](https://github.com/alexstocker/sensorlogger/wiki/)
 
-![SensorLogger Dashboard](http://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_dashboard-1.png)
+![SensorLogger Dashboard](https://www.html5live.at/wp-content/uploads/2018/05/sensorlogger_oc_dashboard_widget_livedata_001.png)
 
 ![SensorLogger Chart](http://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_chart_0.png)
 

diff --git a/appinfo/app.php b/appinfo/app.php
diff --git a/appinfo/autoload.php b/appinfo/autoload.php
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -5,7 +5,7 @@
     <description>SensorLogger for ownCloud enables users to log data provided by sensor devices</description>
     <licence>AGPL</licence>
     <author>Alexander Stocker</author>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <namespace>SensorLogger</namespace>
     <category>tools</category>
     <ocsid>174814</ocsid>
@@ -25,7 +25,7 @@
     <website>https://www.html5live.at/sensorlogger/</website>
     <summary>Log data from any type of sensor and visualize it</summary>
 
-    <screenshot>https://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_dashboard-1.png</screenshot>
+    <screenshot>https://www.html5live.at/wp-content/uploads/2018/05/sensorlogger_oc_dashboard_widget_livedata_001.png</screenshot>
 
     <screenshot>https://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_chart_0.png</screenshot>
 
@@ -40,7 +40,7 @@
     <screenshot>https://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_deviceDetails_edit.png</screenshot>
 
     <dependencies>
-        <owncloud min-version="9.0" max-version="10.0"/>
+        <owncloud min-version="9" max-version="10"/>
         <database>mysql</database>
     </dependencies>
 </info>
diff --git a/appinfo/routes.php b/appinfo/routes.php
diff --git a/controller/apisensorloggercontroller.php b/controller/apisensorloggercontroller.php
diff --git a/controller/sensorloggercontroller.php b/controller/sensorloggercontroller.php
diff --git a/img/graph.png b/img/graph.png
diff --git a/img/graph.svg b/img/graph.svg
diff --git a/img/reset-white.png b/img/reset-white.png
diff --git a/img/reset-white.svg b/img/reset-white.svg
diff --git a/img/reset.png b/img/reset.png
diff --git a/img/reset.svg b/img/reset.svg
diff --git a/l10n/de.js b/l10n/de.js
diff --git a/l10n/de.json b/l10n/de.json
diff --git a/lib/App.php b/lib/App.php
diff --git a/lib/Application.php b/lib/Application.php
diff --git a/lib/DataType.php b/lib/DataType.php
diff --git a/lib/DataTypes.php b/lib/DataTypes.php
diff --git a/lib/Device.php b/lib/Device.php
diff --git a/lib/DeviceTypes.php b/lib/DeviceTypes.php
@@ -19,8 +19,6 @@ class DeviceTypes {
 	public static function getDeviceTypes($userId, IDBConnection $db) {
 		$query = $db->getQueryBuilder();
 		$query->select('sdt.user_id','sdt.id','sdt.device_type_name')
-			//->selectAlias('sdt.user_id','user_id')
-			//->selectAlias('sdt.id','id')
 			->from('sensorlogger_device_types','sdt')
 			->leftJoin('sdt', 'sensorlogger_devices', 'sd', 'sdt.id = sd.type_id')
 			->where('sdt.user_id = "'.$userId.'"')

diff --git a/lib/Error.php b/lib/Error.php
diff --git a/lib/Group.php b/lib/Group.php
diff --git a/lib/Log.php b/lib/Log.php
diff --git a/lib/LogExtended.php b/lib/LogExtended.php
diff --git a/lib/SensorDevices.php b/lib/SensorDevices.php
diff --git a/lib/SensorGroups.php b/lib/SensorGroups.php
diff --git a/lib/SensorLogs.php b/lib/SensorLogs.php
diff --git a/lib/Type.php b/lib/Type.php
diff --git a/lib/Widget.php b/lib/Widget.php
diff --git a/lib/Widgets.php b/lib/Widgets.php
diff --git a/phpunit.integration.xml b/phpunit.integration.xml
diff --git a/phpunit.xml b/phpunit.xml
diff --git a/templates/main.php b/templates/main.php
@@ -54,8 +54,14 @@
 				<div class="systemTagsInfoView"></div>
 			</div>
 			<ul class="tabHeaders">
-				<li class="tabHeader selected" data-tabid="shareTabView" data-tabindex="2">
-					<a href="#">Teilen</a>
+				<li class="tabHeader selected" data-tabid="shareTabView" data-tabindex="0">
+					<a href="#">Share</a>
+				</li>
+				<li class="tabHeader" data-tabid="activityTabView" data-tabindex="1">
+					<a href="#">Activities</a>
+				</li>
+				<li class="tabHeader" data-tabid="notificationsTabView" data-tabindex="1">
+					<a href="#">Notifications</a>
 				</li>
 			</ul>
 			<div id="tabsContainer">

diff --git a/templates/part.chart.php b/templates/part.chart.php
diff --git a/templates/part.dashboard.php b/templates/part.dashboard.php
diff --git a/templates/part.list.php b/templates/part.list.php
diff --git a/templates/part.listDataTypes.php b/templates/part.listDataTypes.php
diff --git a/templates/part.listDeviceGroups.php b/templates/part.listDeviceGroups.php
diff --git a/templates/part.listDeviceTypes.php b/templates/part.listDeviceTypes.php
@@ -11,7 +11,7 @@
 	<tr>
 		<td class="td-data"><?php p($deviceType['id']); ?></td>
 		<td class="td-data"><?php p($deviceType['device_type_name']); ?></td>
-		<td class="td-data"></td>
+		<td class="td-data"><?php p($deviceType['uuid']); ?></td>
 		<td class="td-data">Show devices</td>
 	</tr>
 <?php } ?>

diff --git a/templates/part.listDevices.php b/templates/part.listDevices.php
diff --git a/templates/part.listSharedDevices.php b/templates/part.listSharedDevices.php
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
diff --git a/templates/part.settings.php b/templates/part.settings.php
diff --git a/templates/widget_dashboard.php b/templates/widget_dashboard.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
diff --git a/tests/curl/getdatatypes.php b/tests/curl/getdatatypes.php
diff --git a/tests/curl/post.php b/tests/curl/post.php
@@ -1,5 +1,5 @@
 <?php
-	$url = 'http://owncloud10.loc/index.php/apps/sensorlogger/api/v1/createlog/';
+	$url = 'http://owncloud.loc/index.php/apps/sensorlogger/api/v1/createlog/';
 
 	$humidity = mt_rand (1.00*10, 99.99*10) / 10;
 	$temperature = mt_rand (-9.00*10, 49.99*10) / 10;
@@ -10,8 +10,8 @@
 					"date" => date('Y-m-d H:i:s'));
 	$data_json = json_encode($array);
 
-	$username = 'admin';
-	$token = 'RWGFF-KMZUC-NFOQD-CMXCC';
+	$username = 'test';
+	$token = 'GOETJ-QOSIY-WCIZI-ZAJTL';
 
 	$ch = curl_init();
 	curl_setopt($ch, CURLOPT_URL, $url);

diff --git a/tests/curl/post_extend.php b/tests/curl/post_extend.php
diff --git a/tests/curl/post_extend_0.php b/tests/curl/post_extend_0.php
@@ -8,7 +8,7 @@
 	$nh3 = mt_rand (1*10, 500*10) / 10;
 	$ch4 = mt_rand (1*10, 1000*10) / 10;
 
-	$array = array("deviceId" => "4aa62764-59d1-1e21-b103-7161475fce8c",
+	$array = array("deviceId" => "635558e7-602c-0dfd-f4db-3ee12efdf7ce",
 					"date" => date('Y-m-d H:i:s'),
 					"data" => array(
 						array(

diff --git a/tests/curl/put.php b/tests/curl/put.php
diff --git a/tests/curl/register.php b/tests/curl/register.php
@@ -1,5 +1,5 @@
 <?php
-	$url = 'http://owncloud10.loc/index.php/apps/sensorlogger/api/v1/registerdevice/';
+	$url = 'http://owncloud.loc/index.php/apps/sensorlogger/api/v1/registerdevice/';
 
     $registerArray = [
         '_route' => 'sensorlogger.apisensorlogger.registerDevice',
@@ -29,8 +29,8 @@
 
     $data_json = json_encode($registerArray);
 
-	$username = 'admin';
-	$token = 'RWGFF-KMZUC-NFOQD-CMXCC';
+	$username = 'test';
+	$token = 'GOETJ-QOSIY-WCIZI-ZAJTL';
 
 	$ch = curl_init();
 	curl_setopt($ch, CURLOPT_URL, $url);

diff --git a/tests/curl/register_extend_0.php b/tests/curl/register_extend_0.php
@@ -12,7 +12,7 @@ function genUniquID() {
 	return $uuid;
 }
 
-	$url = 'http://owncloud10.loc/index.php/apps/sensorlogger/api/v1/registerdevice/';
+	$url = 'http://owncloud.loc/index.php/apps/sensorlogger/api/v1/registerdevice/';
 
 	$registerArray = [
 		'_route' => 'sensorlogger.apisensorlogger.registerDevice',
@@ -56,7 +56,7 @@ function genUniquID() {
 	$data_json = json_encode($registerArray);
 
 	$username = 'test';
-	$token = 'MDBFK-CLTDQ-JUDHW-AKJLB';
+	$token = 'GOETJ-QOSIY-WCIZI-ZAJTL';
 
 	$ch = curl_init();
 	curl_setopt($ch, CURLOPT_URL, $url);

diff --git a/tests/integration/AppTest.php b/tests/integration/AppTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * ownCloud - sensorlogger
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author ELExG <[email protected]>
+ * @copyright ELExG 2017
+ */
+
+use OCP\AppFramework\App;
+use Test\TestCase;
+
+
+/**
+ * This test shows how to make a small Integration Test. Query your class
+ * directly from the container, only pass in mocks if needed and run your tests
+ * against the database
+ */
+class AppTest extends TestCase {
+
+    private $container;
+
+    public function setUp() {
+        parent::setUp();
+        $app = new App('sensorlogger');
+        $this->container = $app->getContainer();
+    }
+
+    public function testAppInstalled() {
+        $appManager = $this->container->query('OCP\App\IAppManager');
+        $this->assertTrue($appManager->isInstalled('sensorlogger'));
+    }
+
+    public function testAppRemove() {
+        $appManager = $this->container->query('OCP\App\IAppManager');
+        $this->testAppRemove();
+    }
+
+}