bugfix for parsing non numeric values, added icons

git-svn-id: https://svn.fhem.de/fhem/trunk@3028 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/www/frontend/CHANGED

@@ -1,3 +1,6 @@
+Update vom 03.4.2013
+  * Bugfix in der Verarbeitung der Userconfig für nicht numerische Werte
+  * Icons hinzugefügt
 Update vom 01.4.2013
   * Zoomen in Charts nun möglich mit aufziehbarer Box
   * Erweiterung der Anzahl der möglichen Y-Achsen von 3 auf 10

fhem/www/frontend/controls_frontend.txt

@@ -70,13 +70,18 @@ UPD 2013-03-02_01:53:05 395 www/frontend/app/resources/icons/resultset_next.png
 UPD 2013-03-02_01:53:05 700 www/frontend/app/resources/icons/stop.png
 UPD 2013-03-02_01:53:05 770 www/frontend/app/resources/icons/database_refresh.png
 UPD 2013-03-02_01:53:05 524 www/frontend/app/resources/icons/resultset_last.png
+UPD 2013-04-03_07:27:17 781 www/frontend/app/resources/icons/accept.png
+UPD 2013-04-03_07:27:17 715 www/frontend/app/resources/icons/delete.png
+UPD 2013-04-03_07:27:17 345 www/frontend/app/resources/icons/arrow_left.png
+UPD 2013-04-03_07:27:17 733 www/frontend/app/resources/icons/add.png
+UPD 2013-04-03_07:27:17 389 www/frontend/app/resources/icons/resultset_previous.png
 UPD 2013-04-01_07:05:33 2154 www/frontend/app/app.js
-UPD 2013-04-01_07:05:14 26312 www/frontend/app/view/LineChartPanel.js
+UPD 2013-04-03_07:26:41 26743 www/frontend/app/view/LineChartPanel.js
-UPD 2013-04-01_07:05:14 15702 www/frontend/app/view/DevicePanel.js
+UPD 2013-04-03_07:26:40 15793 www/frontend/app/view/DevicePanel.js
-UPD 2013-04-01_07:05:15 8424 www/frontend/app/view/Viewport.js
+UPD 2013-04-03_07:26:41 8588 www/frontend/app/view/Viewport.js
 UPD 2013-04-01_07:05:14 2476 www/frontend/app/view/TableDataGridPanel.js
-UPD 2013-04-02_06:04:19 43550 www/frontend/app/controller/ChartController.js
+UPD 2013-04-03_07:04:19 44036 www/frontend/app/controller/ChartController.js
-UPD 2013-04-01_07:04:20 13004 www/frontend/app/controller/MainController.js
+UPD 2013-04-03_07:04:20 13004 www/frontend/app/controller/MainController.js
 UPD 2013-04-01_07:04:35 202 www/frontend/app/model/ReadingsModel.js
 UPD 2013-04-01_07:04:36 338 www/frontend/app/model/SavedChartsModel.js
 UPD 2013-04-01_07:04:34 11535 www/frontend/app/model/ChartModel.js

fhem/www/frontend/www/frontend/app/controller/ChartController.js

@@ -398,11 +398,20 @@ Ext.define('FHEM.controller.ChartController', {
                               item.set(key, json.data[j].TIMESTAMP);
                           }
                       });
-                      var valuestring = parseFloat(eval('json.data[j].' + valuetext.replace(/[0-9]/g, ''), 10));
+                      
+                      var valuestring = eval('json.data[j].' + valuetext.replace(/[0-9]/g, ''));
+                      
+                      //parseFloat only when we got a numeric value, else textparsing in model will fail
+                      if (Ext.isNumeric(valuestring)) {
+                          valuestring = parseFloat(valuestring, 10);
+                      }
                       item.set(valuetext, valuestring);
                       item.set(timestamptext, json.data[j].TIMESTAMP);
                       store.add(item);
                       
+                      //rewrite of valuestring to get always numbers, even when text as value was passed to model
+                      valuestring = store.last().get(valuetext);
+                      
                       // recheck if our min and max values are still valid
                       if (me.minYValue > valuestring) {
                           me.minYValue = valuestring;

fhem/www/frontend/www/frontend/app/controller/MainController.js

@@ -93,7 +93,7 @@ Ext.define('FHEM.controller.MainController', {
         
         if (Ext.isDefined(FHEM.version)) {
             var sp = this.getStatustextfield();
-            sp.setText(FHEM.version + "; Frontend Version: 0.4 - 2013-03-23");
+            sp.setText(FHEM.version + "; Frontend Version: 0.4 - 2013-04-03");
         }
         
         //setup west accordion / treepanel

fhem/www/frontend/www/frontend/app/view/DevicePanel.js

@@ -262,6 +262,7 @@ Ext.define('FHEM.view.DevicePanel', {
                             
                             var combo = Ext.create('Ext.form.ComboBox', {
                                 store: comboStore,
+                                padding: 8,
                                 queryMode: 'local',
                                 displayField: 'name',
                                 valueField: 'name',
@@ -291,6 +292,7 @@ Ext.define('FHEM.view.DevicePanel', {
                                 var control = Ext.create('Ext.button.Button', {
                                    text: val,
                                    width: 120,
+                                   height: 40,
                                    enableToggle: true,
                                    pressed: pressed,
                                    listeners: {

fhem/www/frontend/www/frontend/app/view/LineChartPanel.js

@@ -152,19 +152,22 @@ Ext.define('FHEM.view.LineChartPanel', {
                           xtype: 'button',
                           width: 100,
                           text: 'Show Chart',
-                          name: 'requestchartdata'
+                          name: 'requestchartdata',
+                          icon: 'app/resources/icons/accept.png'
                         },
                         {
                           xtype: 'button',
                           width: 100,
                           text: 'Save Chart',
-                          name: 'savechartdata'
+                          name: 'savechartdata',
+                          icon: 'app/resources/icons/database_save.png'
                         },
                         {
                             xtype: 'button',
                             width: 100,
                             text: 'Reset Fields',
-                            name: 'resetchartform'
+                            name: 'resetchartform',
+                            icon: 'app/resources/icons/delete.png'
                         },
                         {
                             xtype: 'radio',
@@ -238,19 +241,22 @@ Ext.define('FHEM.view.LineChartPanel', {
                             xtype: 'button',
                             width: 100,
                             text: 'Step back',
-                            name: 'stepback'
+                            name: 'stepback',
+                            icon: 'app/resources/icons/resultset_previous.png'
                         },
                         {
                             xtype: 'button',
                             width: 100,
                             text: 'Step forward',
-                            name: 'stepforward'
+                            name: 'stepforward',
+                            icon: 'app/resources/icons/resultset_next.png'
                         },
                         {
                             xtype: 'button',
                             width: 100,
                             text: 'Reset Zoom',
                             name: 'resetzoom',
+                            icon: 'app/resources/icons/delete.png',
                             scope: me,
                             handler: function(btn) {
                                 var chart = me.down('chart');

fhem/www/frontend/www/frontend/app/view/Viewport.js

@@ -52,17 +52,19 @@ Ext.define('FHEM.view.Viewport', {
                             items: [
                                 {
                                     xtype: 'button',
-                                    width: 60,
+                                    width: 80,
                                     margin: '30px 0 0 5px',
                                     text: 'Execute',
-                                    name: 'executecommand'
+                                    name: 'executecommand',
+                                    icon: 'app/resources/icons/arrow_left.png'
                                 },
                                 {
                                     xtype: 'button',
-                                    width: 90,
+                                    width: 110,
                                     margin: '30px 0 0 5px',
                                     text: 'Save to Config',
-                                    name: 'saveconfig'
+                                    name: 'saveconfig',
+                                    icon: 'app/resources/icons/database_save.png'
                                 }
                             ]
                         },