From d5406c34244103e38a3a3aa8dd56e4da858c32d3 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 16 Mar 2011 12:08:25 +0100 Subject: [PATCH] added icons per entity type --- htdocs/frontend/images/chart_curve.png | Bin 710 -> 0 bytes htdocs/frontend/images/types/bolt.png | Bin 0 -> 634 bytes htdocs/frontend/images/types/clock.png | Bin 0 -> 882 bytes htdocs/frontend/images/types/cloud.png | Bin 0 -> 581 bytes htdocs/frontend/images/types/flame.png | Bin 0 -> 1077 bytes htdocs/frontend/images/{ => types}/folder.png | Bin htdocs/frontend/images/types/house.png | Bin 0 -> 806 bytes htdocs/frontend/images/types/propeller.png | Bin 0 -> 579 bytes .../frontend/images/types/radioactivity.png | Bin 0 -> 202 bytes htdocs/frontend/images/types/rain.png | Bin 0 -> 626 bytes htdocs/frontend/images/types/sun.png | Bin 0 -> 623 bytes htdocs/frontend/images/types/thermometer.png | Bin 0 -> 262 bytes htdocs/frontend/images/types/user.png | Bin 0 -> 741 bytes htdocs/frontend/images/types/waterdrop.png | Bin 0 -> 555 bytes htdocs/frontend/javascripts/entity.js | 18 +++++++++++------- 15 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 htdocs/frontend/images/chart_curve.png create mode 100644 htdocs/frontend/images/types/bolt.png create mode 100644 htdocs/frontend/images/types/clock.png create mode 100644 htdocs/frontend/images/types/cloud.png create mode 100644 htdocs/frontend/images/types/flame.png rename htdocs/frontend/images/{ => types}/folder.png (100%) create mode 100644 htdocs/frontend/images/types/house.png create mode 100644 htdocs/frontend/images/types/propeller.png create mode 100644 htdocs/frontend/images/types/radioactivity.png create mode 100644 htdocs/frontend/images/types/rain.png create mode 100644 htdocs/frontend/images/types/sun.png create mode 100644 htdocs/frontend/images/types/thermometer.png create mode 100644 htdocs/frontend/images/types/user.png create mode 100644 htdocs/frontend/images/types/waterdrop.png diff --git a/htdocs/frontend/images/chart_curve.png b/htdocs/frontend/images/chart_curve.png deleted file mode 100644 index 01e933a619caa8c6cb9fcee5d9eae853e97abace..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 710 zcmV;%0y+JOP)RLq zBa83f%q*uO+hkn-px3iWUBhj*zEtZ=#J?K1BwoS4fri4we+W?%x_!2UEjG9A57v+ddMu0 zbbp6n;=LcDNq6gD2L9C2J@8#y?*rTbgTj6Ps|^D5|MCj{`@<*H#t`wKg(3XGf2QyU zf0@G{{9_BdAC4aSKNVGeAq>dh`~N>9tN(u{wmT>x9B`-HYmvir?8JeOFVbz5u> zH|V#x^ai*A`gyzm|72hZ`OUy04pZPY)6&ahrsWHdS>_MiW?QUvoolwwWxnYbrv=9G zAbFr`rQinWXqscE(MN|a!$l4~hCDEFhknBjyGi=*G17r<_V)jl zB|4H8rP?#iOLZRs>9-bTIvMExwy4+UuxQe`XV#)U8P$NSZU2ojH2n=T)ZNqrEM0*# zI5i4uc*w#O3aL7Q*+%*5QW{Y@8K%V=Ja7ZFGq?QL&e;54D`OK7Z~U*7wgHIO|JMZJ s)OG(gKsaSB6tDTOk-Qp=;RaBG0e_Hjj63iYg#Z8m07*qoM6N<$g46R|L;wH) diff --git a/htdocs/frontend/images/types/bolt.png b/htdocs/frontend/images/types/bolt.png new file mode 100644 index 0000000000000000000000000000000000000000..9680afd12f8fadf5b83f827240978446af5962b6 GIT binary patch literal 634 zcmV-=0)_pFP)3kp_oQM4NsQ6$aEKj6mx0hg})10sT;E2V;K zUHNY7qG&TIJ`gc&M*EmdrgP_>>zSLTO=}7j2M*`nnfbo+_|8cvrSLzG(R^{I&fHg| z3Nfi70*Jk=pS3m4lD_qhO!oanz~FpWe?InrjDM6H7D@P(w+NOTuL0gfPQ>)8EiKPO>RV|@%G(EApK7|ni6$Or7s}#zN5D2fFuoW z?SUp(cysDe%D^FVRe!-fK+o2zXp zH&*H~_``&05AX{CqjQ9Pq)Pw`p&~+e-<5=lgjH9A;4MsYR*p|Xp3o{VtL6Q8vD&1u z_TBwgt>E(`Zp(h8_8f=r&cr~-uy!|BC|zGKq17aQeR}wL=f1PUhPjus5Lo&7j={xc zCLhQZ=E~bn;<}`gh7Bu?>ih@P+*yw5-^u2k8!el-HG?lt4o$V&*`tbh^4#JtCOgRB z@^-thiGaZ!P|20J4^o7;v)78_|FldDe9Z$i&;9^|y&bKi-n=y{JsccrzVF2T076QP UWao5~B>(^b07*qoM6N<$g7%3ha{vGU literal 0 HcmV?d00001 diff --git a/htdocs/frontend/images/types/clock.png b/htdocs/frontend/images/types/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..e2672c20676177efb2fdea593b8f000fd5f12342 GIT binary patch literal 882 zcmV-&1C9KNP)Zkp%;s8}r$h6cUMpt8KZ&`memftw9r2BH zXZp!+CFaEnJk?xA$eKJbHrNPn>;Axd{TeCT;zL2Z2lqOE#$fse--k~9GCAnb$WrIY zUzF=05;%7ScRp;-^ba=g4+!_yjOVxZHrAy=-Qy;3W{V_ws3i3@rj zN6Uq**d4Ifp5hMksmBf!JrmJQC(GkeNV1GOW##ZtQFwF|H80+P{}RL%{YNk_%ft(I z#;Cz`v~ti@ZP83cwQ@*mu2Dwn=d>z@4RV(M%#h6&LDo!N4vuc zo|;?G=MQ0U0&vMd?WX`v6t{tSSteePbgELlMO}xKy8^QHBD{2ALkbX%5TpZC;3a)d zD?(MwgLzpdUa8!vFvP literal 0 HcmV?d00001 diff --git a/htdocs/frontend/images/types/cloud.png b/htdocs/frontend/images/types/cloud.png new file mode 100644 index 0000000000000000000000000000000000000000..3f73eaa1445abf43c729c134b24e3a308b61a6a4 GIT binary patch literal 581 zcmV-L0=oT)P)51y3fE zx%w@DD2lfa4>~OCGd7Nm`OJhY_mM~>Zhr}oW%;_>?Rs0S*4L#qhyF>!#}6{}`ym$d z3Buv0; zoaA!3@5yAc6buI6aLmp%8cvFa6)*`v ziL2Gh4c=@vXTXaSngz8JkH?=c0QGwP-E1~<4=IuM)DpQMAbqXrbn2ezx(?O?e*s`O z?^U&04K$n0HG?_ja+xm{i>-7zeF}v_$5<>TF=>%V>5u1y4%qonRQK+Gyv>d9r2 z_!MbW%b{woxdJd30jv+$V$B;TN!XD9>s(-&>lT8rN~D(owD5X8j)$88yveuZli0@M zWFFdBwj}ZJ125cWkDq1WMm~P-i-+uRojblk;ni|yUyu>Kyb^TD+M%cw2LnSQ&CD}br{Hny0VD1e&mj5nn4yQsCo^RV3wJ-&vjsEyCX z?Btl{oU>(gg!^5om)paYcW6*%%oOUo>KSD?o_~U-M_{d&t%PTre1cDqxB%c5dy5QM zREL;MZ$ni${5g@U^W*MGb#kC@QriCe2dM)M_iGjc1V{?z&-kq*ADcbty%Zv3m6Ub3 zm6Zcj&$kxvbjny=4A5V6vNayEesju@@52_6xQsMskzB)G{Hg~%szL4HtOTH^McmC} zXfzw83yeSXE(ZF;92!o)-l&w?qA2*H*{Y;1nZQte1hs($nf+3t$Wjf~CEiQ~34h60 z52YDZ_L`iw3=ho9#mI})-YG=msf&?dE|P|i}NbA2e2mtw#l?UU_Hy*(B8~8kg)YES0aMNcBt3^ zHv4hiuGXd?JTuG|0n{(I<6$Ub8FI)hCG zY#QI1MYBPqJ{{P){h1tKj-fV{;)VV8ONT|Uld`IU(0B*>o`MUr%ry_)^$>Gk2UNQ1 z9LYr&F!vtKzMIf|6{$-L*+`MX4$Azn1CBH^d0_si*wmT9y-#w}Q=4KE{<^O=RXw<~ zimS2FaYXRaWZHJ1ubfHBCkQ*|9d;4TE$-VT|Efe9&YuE~g2S$C<^bNVev*WR#Jf+V zD3r>&0Q>HlzheXA%NI?a2TB@0`7&X1|4>xh^&H7)W3}Po%Ue>Z`U6#Yxr`dM3>7|} zm@u^R!N?wwqr8+ko#6A-IYm)a>ev|;dD@wr{L6i?e``qSQsn=_iCpSO#m5W3bpe$S zcnFGetvxT_+zEDdlR5<}oMV(*owO(Xm~v65hyUEo)1C$YawX_;cDm1ucK!m9dr*_q h<=oN|IrXNMmq)O(fxY*wxjP3zNW!DT`a%^I{{sk4G#UT^ literal 0 HcmV?d00001 diff --git a/htdocs/frontend/images/folder.png b/htdocs/frontend/images/types/folder.png similarity index 100% rename from htdocs/frontend/images/folder.png rename to htdocs/frontend/images/types/folder.png diff --git a/htdocs/frontend/images/types/house.png b/htdocs/frontend/images/types/house.png new file mode 100644 index 0000000000000000000000000000000000000000..fed62219f57cdfb854782dbadf5123c44d056bd4 GIT binary patch literal 806 zcmV+>1KIqEP)v;U&v3%|^C`Ga3?LtY&4dQB4Oz;1v;J%z!D&%WRH@BZ?x; z3)8@IUIv@hG|@IwyHLC`l{1<4BK>wam95g|i|?Cfzt876&-Zx_0f5*l-9`IJI&mHu zE6$@xB)6N}7VeR;!X8D!TAw;;&0Bsj?A071cO>X3K0wl7WZ1;Tg!4LHyNcnzoeQ7t zNW`aSlm8WXYkek&ir$13=ngczvf zV0vnjNpCF&K8px}dunv+`LIb-sOC$_jD(;IBI$xC|7`(+9cA>Vir_V#z{?k7SX^Ah z^71m~W@q439Ycqfhi7+gp#A14n1n1!e>$EdeATG|f798Y=ggzwEKH2Q!qU2QA(Se?dwqG69%>n$6rtE z%F(845Az8c{w(XgimJg96!jLMz?zS6I1HUm2baqQx7&@nx;lhHA!r6vs2|fqJETOu zLxeu2OQ(3(au%dg>AcZsWI(zXn9XJg1cLe8k~0h0wOL=&HK}7X k{AKr*U4z7Szv)i%9gTgghwgU$Q~&?~07*qoM6N<$g31kYk^lez literal 0 HcmV?d00001 diff --git a/htdocs/frontend/images/types/propeller.png b/htdocs/frontend/images/types/propeller.png new file mode 100644 index 0000000000000000000000000000000000000000..976187e179ff7a9a041c49f99e0f05d2fe2bd694 GIT binary patch literal 579 zcmV-J0=)f+P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipS> z2s;R$?p?6}00F~EL_t(I%cYaQj?+L8#y>l2OS_FDrJy*PxHu`+t&nUt@E*``5)z`L zx=87vqe&X*kmzzxK*1Z(*j27h0Z0`2BNTE%EUpAcC6@52=SshZ&}u#1vCFM!!Vp` zt=Y7V^_S6T#9@4J5PZ+`{GricST2`VYn!z%77OdNVWgDr_WS(@W`>j!N~v4ZZ{7Dh{|1+d{MY|Z RU@8Cr002ovPDHLkV1hW;0%`yN literal 0 HcmV?d00001 diff --git a/htdocs/frontend/images/types/radioactivity.png b/htdocs/frontend/images/types/radioactivity.png new file mode 100644 index 0000000000000000000000000000000000000000..4dad70cb283b175b1a140d98cc6b5619259828a9 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9jKx9jP7LeL$-D$|cmjMvT>t+E zvKZ3R7-r67Xb$DP59DwbctjR6FmMZlFeAgPITAoY_7YEDSN7Y?0vy^J@0{{AfI=>w zE{-7_*OL+k}p15yVIOdCw+D4H~wPEj;DW-^6wO-tiNMz;pW q8L3jtD(l*qI|CLN9lH>~&T!{Fx9*o&l3hUa7(8A5T-G@yGywoAB{<;# literal 0 HcmV?d00001 diff --git a/htdocs/frontend/images/types/rain.png b/htdocs/frontend/images/types/rain.png new file mode 100644 index 0000000000000000000000000000000000000000..cb3d54d064a1bbfe5b3e9eabd68a27cb940737c8 GIT binary patch literal 626 zcmV-&0*(ENP)b1=~CRSYnKceL_LH+CwnM`4yJ49kFhue97LB6 z_K?9#hng$~K`Gt*7nH_0PE<*@PCxEP->Gh}a5DvZ@bOOX?)&t;cXtx!9NlEZ&<)3} z>lQkl&f_2mb^%X(-$#JYfKT;${d9hx^sf@y?Y1DlD;A5}>2w+qLeO|TM!K$l1CbYv zM&oqBLATpo1JXWV2e4Wym2M}KNn}}8C?MwLa(TPo@9)C)MFCLW&*$^6Gnovclp@db zkYN~TW>xO?6B;iCv@h#RTlL^Y@a$^28a*VLCJsb}IoNX+I9LEWT6h#Ta7(sb zMx&7sIEnNC1daxSL0HPn%~ya7cr+{FJ3s+E1e`!)4;PNHrk%Zs$w*-oVG&)AW5$^> z@i``hDW1zPC0ucA^76~UCXSTw{P^d}Rz6X61K!$PO;j&z(%QHiubvx0>%pCP_1A^p zDnQ=6^bY=#BM#~x&)yTtWjA2dCtSuJqcmVp0;9xdasUzfD7y}QrGMDMk+-mS^yA+8 za$G&Ph*nr$QVk=}3M)&hc^PQ;*Al8_5^a4Wr2_fwJo(zI{9j+=Zxg9)Ryp#|fB*mh M07*qoM6N<$f`Wtv3@TMo36t?!us(ut2(qE`#u;Y2=pT zq@2~2T~yXyeA(Qqy5;+9o4@n>4e8r+MnSPzjxHXahjaKm&-eRqP6dF9|A~@^;+?rt z=H0jE_T4vTwd@82LFU{PN7lpd$oktP$3Gho==lu{2>(S8IKK0m@1#{_mk%-f(Z z+<+0WLyL4{ZOnvyEl7}LBImWjh~I^nZG{LlL-;RKT!Im`W9MTdQZ5xqr;6nfwX(

&09}?3!+0xOT@w2!VY%$ zj|Qoisx?Xewm&q%SbjiFY^0(I!gmV#q77T0t|0EJMfe#*$tA9gs83{GdZFA;x{o96 zB^%K$7%@AxKer&}ti|FWs}2pYzTg0Ry6;OQZ&K!w#ON`Q%*5Js144tWhd>1Tnd7f7 zk-!t=?~tr%T0tsJ(--<#x2)&;s)i5r7k+}jpgM|^Wqqb{;s;8N-ZpQB0Ez$r002ov JPDHLkV1fyHAhiGh literal 0 HcmV?d00001 diff --git a/htdocs/frontend/images/types/thermometer.png b/htdocs/frontend/images/types/thermometer.png new file mode 100644 index 0000000000000000000000000000000000000000..674efbf8373fe48e0edae7cf0c118bbf62be0ab8 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0WW zg+Z8+Vb&Z8pdfpRr>`sfZDs)uBlV|$Z!ZK2&G2+_46!(UG{}(ekbyw)BEKAud)n8! zZ0A3$-_zbY_wT<4d@LI7x4o}2`Y-Q3zi~2iSb&!x17pBib7yCMp1+&tDW}|5(43V2 z>F>rm=jYOC)3!zM$hzEkt8mtG28ZYUBO+Ws;yYN%_8VHMgeV`qECe#>OeO#c)I$ztaD0e F0sx-WT#5hy literal 0 HcmV?d00001 diff --git a/htdocs/frontend/images/types/user.png b/htdocs/frontend/images/types/user.png new file mode 100644 index 0000000000000000000000000000000000000000..79f35ccbdad44489dbf07d1bf688c411aa3b612c GIT binary patch literal 741 zcmVz1iyEv%?$mbQ(# zwJpuiQJP8?X_`#S8b+U_G6=ziYB!xPAcq{)ZJ0bECH@ zYx#`n8^Wzn^J!4>=q^bltNO15ry?0ecSLkjpT@vlid!jk)Fjf7&)q_V5zGs#3N%6* zbW~7Hg=&P0&~Y(|g>$hC9FL?;ttzPDZbpZu9OLb33^e2;FNTGJxScp1&q4M+y2ntQ z?C(=hpU$3~`Thx0eHwi0x`q+!d5k@|0_WHe%sG3e-s^MM`xM-ig!VcIA7H}X1ot~L zg=MLB4w-Q;Bi!!u2|I+Qb;0{{4Q53YX6+4_aXena{nmt*!YG7ua~`qc>o=?@U?rOU znS7%>klzi*muXnbM6i@4FR@s^8vTjDgy&%J?w?`u>NYMDFa_2%0SQ(qJE<3=<8Bzo zfdU60e*y(^$RF%r$kl)p7=7tlCDa$+J7w>}DU(O#~fk>pYuRvHi1E9^msg{tLeV XM&GIRvfA7%00000NkvXXu0mjf&%8>| literal 0 HcmV?d00001 diff --git a/htdocs/frontend/images/types/waterdrop.png b/htdocs/frontend/images/types/waterdrop.png new file mode 100644 index 0000000000000000000000000000000000000000..9d645ff87b65b9a6cd1df95fde44360f720391c5 GIT binary patch literal 555 zcmV+`0@VG9P)Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy7<5HgbW?9;ba!ELWdKlNX>N2bPDNB8b~7$BHmT?0B>(^cg-Jv~ zR5(wKlV2!9aTLdQg|;PLR+OZ9um=jogS;p&UZ*^H^Wa59G)j4qm%V!Mf7ZmTwT6;H zy3$rlS<=cDmztO;nU=P-@A13o&TZS>-L2E@cYf#lIepK$SEEsQh)CvuA@xPclw$R5UQ4xq6pAfBYUp>sqvYalVYy!g5Mq;A!&Qi1h`mMS;? z#A0wPMlKPEr>H^|;*U|U$%V8emfqE(l?W_F0f{u}hA(iNE0)fkUc9o|7!)C{2TX~b zlmKPxpb0;%6a>5^NZ)^qXC<+eZ)W!VZ`76tv4t_M-Bj)_ALy7L&OE^28A58^rF)|j z!a|U^EM(M2T-?<=;<=Q>SEQe@51JV@)u-}yP#Ynpt#N@y! t@lAW+8+O6>9f6+-z#9C3Nvx5Je*u>Yv<@v1&>sK*002ovPDHLkV1keV@1Fnw literal 0 HcmV?d00001 diff --git a/htdocs/frontend/javascripts/entity.js b/htdocs/frontend/javascripts/entity.js index 2827a5a..0cd9ce0 100644 --- a/htdocs/frontend/javascripts/entity.js +++ b/htdocs/frontend/javascripts/entity.js @@ -148,6 +148,7 @@ Entity.prototype.getRow = function() { .append($('') .text(this.title) .addClass('indicator') + .css('background-image', 'url(images/types/' + this.definition.icon + ')') ) ) .append($('').text(this.definition.translation[vz.options.language])) // channel type @@ -211,20 +212,23 @@ Entity.prototype.loadData = function() { vz.options.plot.yaxis.min = null; } - // update entity table - var unit = ' ' + this.definition.unit; + // update details in table $('#entity-' + this.uuid + ' .min') - .text(vz.wui.formatNumber(this.data.min[1]) + unit) + .text(vz.wui.formatNumber(this.data.min[1]) + this.definition.unit) .attr('title', $.plot.formatDate(new Date(this.data.min[0]), '%d. %b %h:%M:%S', vz.options.plot.xaxis.monthNames)); $('#entity-' + this.uuid + ' .max') - .text(vz.wui.formatNumber(this.data.max[1]) + unit) + .text(vz.wui.formatNumber(this.data.max[1]) + this.definition.unit) .attr('title', $.plot.formatDate(new Date(this.data.max[0]), '%d. %b %h:%M:%S', vz.options.plot.xaxis.monthNames)); $('#entity-' + this.uuid + ' .average') - .text(vz.wui.formatNumber(this.data.average) + unit); + .text(vz.wui.formatNumber(this.data.average) + this.definition.unit); $('#entity-' + this.uuid + ' .last') - .text(vz.wui.formatNumber(this.data.tuples.last()[1]) + unit); + .text(vz.wui.formatNumber(this.data.tuples.last()[1]) + this.definition.unit); if (this.definition.interpreter == 'Volkszaehler\\Interpreter\\MeterInterpreter') { // sensors have no consumption - $('#entity-' + this.uuid + ' .consumption').text(vz.wui.formatNumber(this.data.consumption) + unit + 'h'); + var consumption = vz.wui.formatNumber((this.data.consumption > 1000) ? this.data.consumption / 1000 : this.data.consumption); + var unit = ((this.data.consumption > 1000) ? ' k' : ' ') + this.definition.unit + 'h'; + var cost = (this.cost !== undefined) ? ' (' + vz.wui.formatNumber(this.cost * this.data.consumption) + ' €)' : ''; + + $('#entity-' + this.uuid + ' .consumption').text(consumption + unit + cost); } } else { // no data available, clear table