updated mysql structure

berwinter · Apr 5, 2015 · 0c9a5f5 · 0c9a5f5
1 parent 75031fc
commit 0c9a5f5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/js/main.js b/js/main.js
@@ -236,7 +236,7 @@ var actualValues =
 			try {
      			var value = actualValues.values[i];
 				var type  = "value";
-     			var text = value.format.replace(/((DIGITAL|MWH|KWH|MISCHER_AUF|MISCHER_ZU|VENTIL|DREHZAHL|COLOR|ANIMATION)\()?#\.?(#*)\)?/g, function(number,tmp,modifier,fractions) {
+     			var text = value.format.replace(/((DIGITAL|MWH|KWH|MISCHER_AUF|MISCHER_ZU|VENTIL|DREHZAHL|GRADCOLOR|ANIMATION)\()?#\.?(#*)\)?/g, function(number,tmp,modifier,fractions) {
      				switch(modifier) {
      					case "MISCHER_AUF":
      						return converter.mixerOn(data[value.frame][value.type]);
@@ -252,8 +252,8 @@ var actualValues =
      						return converter.kwh(data[value.frame][value.type]).toFixed(fractions.length);
      					case "DREHZAHL":
      						return converter.speed(data[value.frame][value.type]);
-						case "COLOR":
-							type = "color";
+						case "GRADCOLOR":
+							type = "gradcolor";
 							return converter.color(data[value.frame][value.type]);
      					case "ANIMATION":
      						for(var i in $(value.path))
@@ -286,7 +286,7 @@ var actualValues =
      		if(text != null)
      		{
 				switch(type) {
-					case "color":
+					case "gradcolor":
 						$(value.path).attr("style","stop-color:"+text);
 						break;
 					default:

diff --git a/sql/migration/data-migration.sql → sql/migration/data-migration_v80_v90.sql b/sql/migration/data-migration.sql → sql/migration/data-migration_v80_v90.sql
diff --git a/sql/migration/table-migration.sql → sql/migration/table-migration_v80_v90.sql b/sql/migration/table-migration.sql → sql/migration/table-migration_v80_v90.sql
diff --git a/sql/migration/table-migration_v95_v96.sql b/sql/migration/table-migration_v95_v96.sql
@@ -0,0 +1,13 @@
+ALTER TABLE `t_schema` 
+DROP INDEX `UNIQUE`;
+
+ALTER TABLE `t_menu` 
+CHANGE COLUMN `type` `type` VARCHAR(20) NOT NULL ;
+
+CREATE TABLE `t_chartoptions` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `chard_id` int(11) NOT NULL,
+  `property` varchar(120) NOT NULL,
+  `value` varchar(120) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/sql/structure.sql b/sql/structure.sql
@@ -1,6 +1,16 @@
 CREATE DATABASE  IF NOT EXISTS `uvr1611`;
 USE `uvr1611`;
 
+DROP TABLE IF EXISTS `t_chartoptions`;
+CREATE TABLE `t_chartoptions` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `chard_id` int(11) NOT NULL,
+  `property` varchar(120) NOT NULL,
+  `value` varchar(120) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
 DROP TABLE IF EXISTS `t_data`;
 CREATE TABLE `t_data` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -56,7 +66,7 @@ CREATE TABLE `t_menu` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` varchar(200) NOT NULL,
   `unit` varchar(10) DEFAULT NULL,
-  `type` enum('schema','line','power','energy','weather') NOT NULL,
+  `type` varchar(20) DEFAULT NOT NULL,
   `order` tinyint(4) DEFAULT NULL,
   `schema` varchar(200) DEFAULT NULL,
   PRIMARY KEY (`id`)
@@ -70,7 +80,6 @@ CREATE TABLE `t_schema` (
   `type` enum('analog1','analog2','analog3','analog4','analog5','analog6','analog7','analog8','analog9','analog10','analog11','analog12','analog13','analog14','analog15','analog16','digital1','digital2','digital3','digital4','digital5','digital6','digital7','digital8','digital9','digital10','digital11','digital12','digital13','digital14','digital15','digital16','speed1','speed2','speed3','speed4','energy1','energy2','power1','power2','current_energy1','current_energy2') NOT NULL,
   `format` varchar(200) DEFAULT NULL,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `UNIQUE` (`frame`,`type`),
   KEY `index` (`frame`,`type`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;