From a9606aafa98a4ad28b5115e1a83b47be323fc512 Mon Sep 17 00:00:00 2001
From: johannnes <>
Date: Wed, 3 Apr 2013 17:37:42 +0000
Subject: [PATCH] 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                       |   3 +++
 fhem/www/frontend/controls_frontend.txt         |  15 ++++++++++-----
 .../frontend/app/controller/ChartController.js  |  11 ++++++++++-
 .../frontend/app/controller/MainController.js   |   2 +-
 .../www/frontend/app/resources/icons/accept.png | Bin 0 -> 781 bytes
 .../www/frontend/app/resources/icons/add.png    | Bin 0 -> 733 bytes
 .../frontend/app/resources/icons/arrow_left.png | Bin 0 -> 345 bytes
 .../www/frontend/app/resources/icons/delete.png | Bin 0 -> 715 bytes
 .../app/resources/icons/resultset_previous.png  | Bin 0 -> 389 bytes
 .../www/frontend/app/view/DevicePanel.js        |   2 ++
 .../www/frontend/app/view/LineChartPanel.js     |  16 +++++++++++-----
 .../frontend/www/frontend/app/view/Viewport.js  |  10 ++++++----
 12 files changed, 43 insertions(+), 16 deletions(-)
 create mode 100644 fhem/www/frontend/www/frontend/app/resources/icons/accept.png
 create mode 100644 fhem/www/frontend/www/frontend/app/resources/icons/add.png
 create mode 100644 fhem/www/frontend/www/frontend/app/resources/icons/arrow_left.png
 create mode 100644 fhem/www/frontend/www/frontend/app/resources/icons/delete.png
 create mode 100644 fhem/www/frontend/www/frontend/app/resources/icons/resultset_previous.png

diff --git a/fhem/www/frontend/CHANGED b/fhem/www/frontend/CHANGED
index 3023badb4..dee3fa863 100644
--- a/fhem/www/frontend/CHANGED
+++ b/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
diff --git a/fhem/www/frontend/controls_frontend.txt b/fhem/www/frontend/controls_frontend.txt
index 8277af7fd..a0e8fba3e 100644
--- a/fhem/www/frontend/controls_frontend.txt
+++ b/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-01_07:05:14 15702 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 26743 www/frontend/app/view/LineChartPanel.js
+UPD 2013-04-03_07:26:40 15793 www/frontend/app/view/DevicePanel.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-01_07:04:20 13004 www/frontend/app/controller/MainController.js
+UPD 2013-04-03_07:04:19 44036 www/frontend/app/controller/ChartController.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
diff --git a/fhem/www/frontend/www/frontend/app/controller/ChartController.js b/fhem/www/frontend/www/frontend/app/controller/ChartController.js
index bdc65e0ad..867726641 100644
--- a/fhem/www/frontend/www/frontend/app/controller/ChartController.js
+++ b/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;
diff --git a/fhem/www/frontend/www/frontend/app/controller/MainController.js b/fhem/www/frontend/www/frontend/app/controller/MainController.js
index 253a3e860..5f0f546a2 100644
--- a/fhem/www/frontend/www/frontend/app/controller/MainController.js
+++ b/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
diff --git a/fhem/www/frontend/www/frontend/app/resources/icons/accept.png b/fhem/www/frontend/www/frontend/app/resources/icons/accept.png
new file mode 100644
index 0000000000000000000000000000000000000000..89c8129a490b329f3165f32fa0781701aab417ea
GIT binary patch
literal 781
zcmV+o1M>WdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!pGibPR5;6}
zlj}=UVI0T(J9f@?Yy$~oL?MENP<s_55<8j=#k?#_)7`z&He=XKi!yRv#z-kGv(##H
zPHpPc=GK%laoJHq%)RMCwPAFzZ|CgAOcEn{;0q5A&*$@du5ke3{wIG76!;E_a;FdK
zvpp$H#^e2A>4-QibtN)VXQDpczE`xXAkUjh%RI>;okxb7K@0kpyQ1k_Y(|Oe7$m(^
zNYX>mI||sUbmn+c<m#Le&eeX{US5M~t}+^~?^x|a<4hF}*!YoT8=u}L$nm5IGu=t+
z9L!Cu36!D2Ujog{8R*!Qv#Iu-h5hwCT%4+a*g~$0uam-<K;}*|sK&CQl{uILRo+uj
zOcz2iRRHx=A>3<&FnE=4u#()KBS^SH8e)Qs5i!#lY=$-1gbH6VluzU=m=EP78&5vQ
z-?+fFP-G2l&l_QzYealK$;1Rl?FkzXR&Jv<pn=v~#I9rjiy!8pnkdBB+E5h!vH2Zs
z&o03*QH;J|Cj>@fBPNjCr#AYRyJ7UJQ0v#?)7Ott=>3<sG1xL&549^BdiQDc2Rk6B
z`CZUMF*oL$(7tdPx=A_AzG_6ieU8GLKR01{dI4q5ENECkOP~(zUNfjFVrvVjw*&_H
zKpN~TcTqhdhuVD-b<^codbfbK*#?vj9*4ql0y<|7?610!ZaoaDlGr-LWGi2|kG&eR
zM}vpV9aN6yK|7oS)sPHI2Nw>`#-pV!7>9}>Q1jL)H6h&gkP@3nI=+F3nA~M>u#(n*
z8T!#8oEw&-mED4!h4s!N@Jo3S7N&Q6%6l3}nlcd~X@>;uelvPsSkXIgg~e+^T1zSf
z3SNj(5%jK~i8@b;C<CFVY6wQ4<%I<*UYM=Ou+dYcgy^ro@n7=`XV9$WdAihN00000
LNkvXXu0mjf{u*Ke

literal 0
HcmV?d00001

diff --git a/fhem/www/frontend/www/frontend/app/resources/icons/add.png b/fhem/www/frontend/www/frontend/app/resources/icons/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..6332fefea4be19eeadf211b0b202b272e8564898
GIT binary patch
literal 733
zcmV<30wVp1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!Z%IT!R5;6}
zlj}>9VHk(~TedF+gQSL8D5xnVSSWAVY>J9b+m>@{iq7_KE}go~11+5s4;8hc+i0Xa
zI1j@EX5!S+Me6HNqKzU5YQwL;-W5$p%ZMKMeR<%zp69-~?<4?8|C8S?bklXr4v&Ov
zb&06v2|-x?qB`90yn>Qi%Sh2^G4n)$ZdyvTPf9}1)_buUT7>`e2G&2VU@~Bb(o+Mz
zi4)>IxlSY${Dj4k={-9RzU^W5g9|2V5RZ2Zu<x6&^l=W_1sO_5@*~{AJR(k@osu$W
zIOyKBVDIZThPU;2xYmJgUn>lL9s2xQbZ@r6eP9Ra5u(s|C0Nj#&4>wTSkb?%#=9?@
z^oxDy-O@tyN{L@by(WWvQ3%CyEu8x{+#Jb4-h&K9Owi)2p<DqQ{Z%tMS5;_RkwZ2s
ziU|ZZE*fUaAe}14z#AR(OU=04okqn3igEs-_q_}KZ*?@>gg+heWDyked|3R$$kL@A
z#sp1v-r+=G4B8D6DqsDH0@7OztA7aT9qc1Py{()w`m``?Y0&gi2=ROcc-9+nU^I6<
zT=e_Y=<?pf1$FXK3F5I5#ceAAN5BHvd?h5_(jPS+7l@o3)VYh{*frx)Pb%2=Sw~G2
znu{1!PYZ*jM}To^G}f>vSnG@?3Ue{BW5ONFttcE!R-R_W4O01|0-|K-YNXLo2`4Qv
z`r1LxR6#yf3FB%T95gJnaKKivA~Z}S9A(ZxE<qS_Liq!k=vg3Per<qx!vKx95m{X+
zQ8;uQPPk0h^qI`uo^&$1^CFd@NeQR5pADaHJwu&SvB+fQDdu0d@n7>DK}O3T04USJ
P00000NkvXXu0mjf^IS-S

literal 0
HcmV?d00001

diff --git a/fhem/www/frontend/www/frontend/app/resources/icons/arrow_left.png b/fhem/www/frontend/www/frontend/app/resources/icons/arrow_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dc696781e6135d37b5bf2e98e46fd94f020c48d
GIT binary patch
literal 345
zcmV-f0jB<mP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy>q$gGR5;6H
z{Qv(y10{fofkH6I3@AO3$p*x`Nil#0jeqs;pT9Ds7{CaN1)$9r#n~kE{`~pF@bLXZ
zhF?E_GyM7i!oL`P0x_8Wj$ni2F7#hzWPxfvDaI<Ur@*bm@aNwj1{rQSF#Y@QUm*U?
z@cSPS|NR3M1JS=3R<B%(@B+};zyC1)Vfgj;7g*6BprYSk#lI0W)Bup&pZ`FyUw=@&
zkhwGNyfB-H0S7ZD!^4*k8D77CgVos}uYolG`Td9C{=!F$jL0c5c2&qtph7vI2FDF)
rJ5G=sjX=%1K+Ok<)r{hW5u6tQ<Dt8}dRo)T00000NkvXXu0mjf%~_cN

literal 0
HcmV?d00001

diff --git a/fhem/www/frontend/www/frontend/app/resources/icons/delete.png b/fhem/www/frontend/www/frontend/app/resources/icons/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..08f249365afd29594b51210c6e21ba253897505d
GIT binary patch
literal 715
zcmV;+0yO=JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!T}ebiR5;6}
zllx0kVHn5#Tecsf1c`2hgi%nK^D=kV+T5njvrLa$EMjSnone|mjm2E}L#U;8)yiKo
zO>C4}Mrzlg<+1Y8PEBfUp0jJpx4B>@E+cy3`^(Gw`Mf+2&yxZm<$to~Vpgvg&QKNR
z_f#1(r6svZt%iF?s+n<8X?B&!h3g9Dbb8_=MX}!;HiQSAh`bp^WMl~Z-44teO7W_Y
zV4thSL{h;rJY7!l3%5J4H1!tIzB`Dv+YxO(haWeausGZYkI8^hWj6mzo=L0{%;<E2
z80_Y*w_}NMA$su)e0B@`wrYegSP*HT5w@N{_}&f79VIb*XrKGBY>yxzh{5!Htr?51
zvG|W62MzC8BZ76hRpCyO2zOn<%e)K>NHge!-~)Ap33OdWw6hsLYbCxGNt0%wk_2z7
zfyYvXheSG)5HRK1VB~%mq7Dmurw#bi@hEcOr3&G1ZiF*$M=&9nB#VNf&Q^r$4G5kp
zTURh&s)E0%5&hyVD}sp<72~zmAY`Y(9aqO6CXF%=zFHGzO-A&I(pE}v70YQxCPJ{Y
z4L+?5-crdLn3ZRPEs!A4ehEY3ZRpL~w9>@aMN+{F4dI@v&>(QDHQum!mG~E^$OS8l
z!7?%Uwib*ROP67Hw`ika)gX-(<Pal@1N`)16#~~<@x7jghg9OTS^;mJ8T{oIOsMnG
zla<QHU?S-#Kb7w%o*dlEj!JgnOSKW+hV$`!syc>8Ia`-u_IEhxG7U<13kSsMW+$<e
xd62)I>lbb2dUMm5p6pa}cjgA+U$^mJ^AjD?&bdi)8~y+Q002ovPDHLkV1g8IMc@Dc

literal 0
HcmV?d00001

diff --git a/fhem/www/frontend/www/frontend/app/resources/icons/resultset_previous.png b/fhem/www/frontend/www/frontend/app/resources/icons/resultset_previous.png
new file mode 100644
index 0000000000000000000000000000000000000000..18f9cc10948f025fde708328fa704b520161e5f6
GIT binary patch
literal 389
zcmV;00eb$4P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz7fD1xR5;6H
z`2YVu10|S&E(T=Je%PKm^Whh=3`m`MzddRC!+((z?*1p)fP|@c`>K{b{Xc8(tN&i@
zH%T)fYQpV#rAr?FpSk<x|EW7){I{yPLc9UNy*HN>E_eXe+_wJd|K3f{{%aMTC(eL?
z&YO?2=RWv9b;pbUjjJF3FIss2fAiYM|D{t;5@&#8!?n%vQ}6um-u(1``H~0!(`ViJ
zU$yMvf616*#2KJfaGFIu@9Y|n)@%Q3RzCcnHskjH!iD$#iw7MbEf6JRj;ypTzwkeA
z{@wqXv+w*Db>B;RG>UocU1Xkp@_*9QTmMBIcK#<TAqiV<Szs7{<iD`x_WxujWkG`t
jvxSVe{2#c?gbxD%(2D2&kkL<{00000NkvXXu0mjfE_S?j

literal 0
HcmV?d00001

diff --git a/fhem/www/frontend/www/frontend/app/view/DevicePanel.js b/fhem/www/frontend/www/frontend/app/view/DevicePanel.js
index 690667433..1d5611056 100644
--- a/fhem/www/frontend/www/frontend/app/view/DevicePanel.js
+++ b/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: {
diff --git a/fhem/www/frontend/www/frontend/app/view/LineChartPanel.js b/fhem/www/frontend/www/frontend/app/view/LineChartPanel.js
index 1d330cec5..38c3c6688 100644
--- a/fhem/www/frontend/www/frontend/app/view/LineChartPanel.js
+++ b/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');
diff --git a/fhem/www/frontend/www/frontend/app/view/Viewport.js b/fhem/www/frontend/www/frontend/app/view/Viewport.js
index 03efba4f5..c61f5a2da 100644
--- a/fhem/www/frontend/www/frontend/app/view/Viewport.js
+++ b/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'
                                 }
                             ]
                         },