From 38d225a78f13a8a5a0dc1c9b3a7668a301333656 Mon Sep 17 00:00:00 2001 From: Justin Otherguy Date: Fri, 3 Dec 2010 20:46:57 +0100 Subject: [PATCH 1/4] updated path in INSTALL --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 25005ac..cb51247 100644 --- a/INSTALL +++ b/INSTALL @@ -1 +1 @@ -Refer to the wiki: http://wiki.volkszaehler.org/getstarted +Refer to the wiki: http://wiki.volkszaehler.org/howto/getstarted From 4482aea31a7168badb0056fdf062aa3632b58413 Mon Sep 17 00:00:00 2001 From: Justin Otherguy Date: Mon, 6 Dec 2010 01:46:10 +0100 Subject: [PATCH 2/4] changed the number of days from 30 to 365 ;-) --- frontend/javascripts/frontend.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/javascripts/frontend.js b/frontend/javascripts/frontend.js index c6172b6..e4574f8 100644 --- a/frontend/javascripts/frontend.js +++ b/frontend/javascripts/frontend.js @@ -233,7 +233,7 @@ vz.wui.handleControls = function () { break; case 'zoom_year': - var year = 30*24*60*60*1000; + var year = 365*24*60*60*1000; vz.options.plot.xaxis.min = middle - year/2; vz.options.plot.xaxis.max = middle + year/2; break; From a3592220053d2c3fc035064b39fd8b0db5a3f828 Mon Sep 17 00:00:00 2001 From: Justin Otherguy Date: Thu, 9 Dec 2010 10:11:42 +0100 Subject: [PATCH 3/4] changed data types for "id" in other tables (than data) from smallint to integer, too --- backend/lib/Model/Entity.php | 2 +- backend/lib/Model/Property.php | 2 +- backend/lib/Model/Token.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/lib/Model/Entity.php b/backend/lib/Model/Entity.php index c868160..46084c7 100644 --- a/backend/lib/Model/Entity.php +++ b/backend/lib/Model/Entity.php @@ -49,7 +49,7 @@ use Volkszaehler\Util; abstract class Entity { /** * @Id - * @Column(type="smallint", nullable=false) + * @Column(type="integer", nullable=false) * @GeneratedValue(strategy="AUTO") */ protected $id; diff --git a/backend/lib/Model/Property.php b/backend/lib/Model/Property.php index f9681fb..9c0391b 100644 --- a/backend/lib/Model/Property.php +++ b/backend/lib/Model/Property.php @@ -46,7 +46,7 @@ use Volkszaehler\Model; class Property { /** * @Id - * @Column(type="smallint", nullable=false) + * @Column(type="integer", nullable=false) * @GeneratedValue(strategy="AUTO") * * @todo wait until DDC-117 is fixed (PKs on FKs) diff --git a/backend/lib/Model/Token.php b/backend/lib/Model/Token.php index ae8b560..2d443a5 100644 --- a/backend/lib/Model/Token.php +++ b/backend/lib/Model/Token.php @@ -38,7 +38,7 @@ use Volkszaehler\Util; class Token { /** * @Id - * @Column(type="smallint", nullable=false) + * @Column(type="integer", nullable=false) * @GeneratedValue(strategy="AUTO") * * @todo wait until DDC-117 is fixed (PKs on FKs) From c09bf582fbbb21fadac6764b88c40de073d7b364 Mon Sep 17 00:00:00 2001 From: Justin Otherguy Date: Thu, 9 Dec 2010 10:16:42 +0100 Subject: [PATCH 4/4] changes to demo data: removed unused entries, changed smallint -> integer --- share/sql/demo/entities.sql | 13 ++----------- share/sql/demo/properties.sql | 15 +++------------ 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/share/sql/demo/entities.sql b/share/sql/demo/entities.sql index 435f1d4..b39bdbe 100644 --- a/share/sql/demo/entities.sql +++ b/share/sql/demo/entities.sql @@ -20,7 +20,7 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; -- CREATE TABLE IF NOT EXISTS `entities` ( - `id` smallint(6) NOT NULL AUTO_INCREMENT, + `id` int(6) NOT NULL AUTO_INCREMENT, `uuid` varchar(36) NOT NULL, `type` varchar(255) NOT NULL, `class` varchar(255) NOT NULL, @@ -33,14 +33,5 @@ CREATE TABLE IF NOT EXISTS `entities` ( -- INSERT INTO `entities` (`id`, `uuid`, `type`, `class`) VALUES -(1, 'a301d8d0-903b-1234-94bb-d943d061b6a8', 'power', 'channel'), -(2, '99c4b540-9025-1234-8457-1d974d0a2aed', 'power', 'channel'), -(3, 'e1667740-9662-1234-b301-01e92d4b3942', 'group', 'aggregator'), -(4, 'd81facc0-966e-1234-9ba7-cdb480edfd96', 'group', 'aggregator'), -(5, '7aab2690-966f-1234-bc2b-0b307fe1be90', 'group', 'aggregator'), -(6, 'bda4a740-9662-1234-94c8-010787c77162', 'group', 'aggregator'), -(7, 'c48c2a90-9662-1234-acd6-972b5a34a506', 'group', 'aggregator'), -(8, '998d2ec0-caeb-1234-96a6-25bf0849305f', 'power', 'channel'), -(9, '9f3695b0-caeb-1234-b0cd-cdc70d5c6405', 'power', 'channel'), -(10, 'a21effa0-caeb-1234-9b05-1f6afa5f3812', 'power', 'channel'); +(1, 'a301d8d0-903b-1234-94bb-d943d061b6a8', 'power', 'channel'); diff --git a/share/sql/demo/properties.sql b/share/sql/demo/properties.sql index 42d3fa8..e97e94f 100644 --- a/share/sql/demo/properties.sql +++ b/share/sql/demo/properties.sql @@ -20,8 +20,8 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; -- CREATE TABLE IF NOT EXISTS `properties` ( - `id` smallint(6) NOT NULL AUTO_INCREMENT, - `entity_id` smallint(6) DEFAULT NULL, + `id` integer(6) NOT NULL AUTO_INCREMENT, + `entity_id` int(6) DEFAULT NULL, `pkey` varchar(255) NOT NULL, `value` varchar(255) NOT NULL, PRIMARY KEY (`id`), @@ -36,13 +36,4 @@ CREATE TABLE IF NOT EXISTS `properties` ( INSERT INTO `properties` (`id`, `entity_id`, `pkey`, `value`) VALUES (1, 1, 'title', 'S0-Zaehler'), (2, 1, 'description', 'Nummer 1'), -(4, 1, 'resolution', '2000'), -(5, 2, 'title', 'S0-Zaehler'), -(6, 2, 'description', 'Nummer 2'), -(8, 2, 'resolution', '2000'), -(9, 8, 'title', 'test'), -(10, 8, 'resolution', '2000'), -(11, 9, 'title', 'test'), -(12, 9, 'resolution', '2000'), -(13, 10, 'title', 'test'), -(14, 10, 'resolution', '2000'); +(4, 1, 'resolution', '2000');