From 537dec86c8617a59ebb508390363a58eea1d1a19 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 1 Mar 2018 14:46:40 +0100 Subject: [PATCH] refactoring for Product --- .vs/AAWebPlatform/v15/.suo | Bin 74752 -> 60928 bytes AAWebPlatform.njsproj | 4 +- Panels/{BotsPanel.js => ProductsPanel.js} | 70 +++++++++++++--------- BotCard.js => Product.js | 2 +- TimeMachine.js | 2 +- index.html | 4 +- 6 files changed, 49 insertions(+), 33 deletions(-) rename Panels/{BotsPanel.js => ProductsPanel.js} (76%) rename BotCard.js => Product.js (99%) diff --git a/.vs/AAWebPlatform/v15/.suo b/.vs/AAWebPlatform/v15/.suo index f7add7506c99dc4c340821a65c808f75e375ea62..fc035de59a3c589bed32f5555deb1c52a1f84d59 100644 GIT binary patch delta 3214 zcmdUxdr(wW9LMiDyLVY&kqa!cq3D8}0uqAa`?VmNuZpeljn<~-BS7TglX%!OYNkZ9X{H$>?5UIrMJB%JdzO1gtfuMVA9ZFw^Lw1vy}#f2 zox9cVo2#2lJ2I%aB-EiuQkW!3CUCW@s|!M6pjVye5~GNDis(SIK~DjLK{A*G zgkLO{2J9dXWP%|;^tp7Iq|4hOZ`Sn~$O)1(LMn$60&+kfFbt%F2w(<@AOZ9Ty@6Ob zo<6b;a=Bqm1W_OZh#m*z6kQiKIYOOs796vDp17!Dy=N}uJmB?t`j5L8%2K^UOt}yG ziXQe#=mol62w4PH0TF#)o}FHiZN37hpBIEGFFJNCt~A$?54wo|J)kcTbFv{t{Ehh{{vsD5{!;oR)#LJVc4;{-VgFNAYLaLa;EN|OxbdbEJn|# zd2;{ZB1a-Wi}ildvjqCG9`%(l4?JR6e9i9uEhn&e(IxSZL#b@kn%`cV9&u;9GTP0FqpBO{$%%@n#zCQnY)< z>}I~=Jb&*~e`9)5nA(qvUo=;Ta(}H;bEbXCG=66S*ZPk-$+|r)OdV%YbGbhn{m;C} ztP8L`BGyHok*@H=FdhPElAlb4x9mJf!MGO zvIG1Ge$stEL!Jk}fD51#Tm+ZEWpG8pO>h-T7m%2Cbs@L6Y4{HCZOMg|bI`DREsI>!AGgTPTpTj654=_d<;ilP2SO z&lF!7%HBA!e&ZS*R+yhxvT8~B;<9wL(j4x^2TfdUX6a?B+caErf1JXU=S>?IJ+L{{ zezqepvOK?NPB5w4PL!xKIkoQ@MSHSBEZvLHgyx}Cr%lrW0XM7fa5M5gKG4#=J{>^ zm>M3=*PKstPD!;dSm)yvi~^vJ+G95HzhYqzr+gD)>7(Y>esTiby|mpQmar%P6k}_O*V-k!@k#T%cjQNnp5(B7uYchE@ zIqJ&-><>%Lf>O(tvei$_Y8$76rExTVo$^oWF7{g8{jHk&2L-1#akb??bWmw^gG+N= zXfoa4<2q07gIp?qazg5_qVW9NbN}`Ec)`jnuSc_HM(y=Uzx$FBYb~bgQvq7t`Y8Dt P?NqZpF?eFk>JR)^@DotP delta 5034 zcmeHKdr*|u760ztT^5!FKR_O$1Y9wK3V!Nb$cG@9_Nr`{>c;zPy%A>Mk z&g~w3v-bGgY!$TgUVc=7t9&2-KnWd+$KZAKGNuNmOzl&w73$a3lLum_9F$WgM2yC#}O5XL_{fq+AF~tlcXBNS}Saf z$?UB~E)B66u?f+P*n-%Gp#D^Lgz;3TxkJSjY?F}g3i548+Y!`nH_~Sj9f&6ooro?( z4+5KGrh1X-L%4aPs=~7FTrKS6{SkiY=xxCEN!ltbp^0OWr`@DUlwtC`Fg^wOkjH4; zBCLlzwix-4$Ea-~)>Vj*$L1kV9>b=mroI_qrm~Qd9W;PSxU0z+Dtc_6jhKNjBJvUF zQh~ggfyhLpBdBiU#%b7Qk?NI*8f7Xu#SJn`jtRG;}@$ezKyRE zU{`z(Ux{&_*u(8uoAJCmJxk7#E--Hzcc)wu$ri#gw1Hw5uBFU@^(i7`r=E95sz6Nv z72b5EcQN;h+?}qIb-Kxz2@~hQXF8)SsNrxDbj-ZLilIHZmpuyqOuq6TC-E9M^sTqZ zmU15>two#-po8PSfvWZ+$hf4T%Gs>$c;ye-P^;)Ijsin=lAL6p$;2ByzpPfjI&c1S z=3iud-qPq3YxstZ}PTY)uSlj^7V~s?sw=uto9?GLwp_aJiMk#WoS`Sz#_P;N|gBvH`zo% zCYLkUzt6lC!D%k5yw5~WY~fty^(9y8ia?AB0;B&z(C=BOPz9*GV3$e3uEL-9yx{I{fcH8!urAn}oyG(hbD33E z%(vBYZ|80vXTv055DElJ8v^X?S_I8iiRveRrSaF*-DYo(Qgb*-5b%$g8nQe`*eJ~P zG(}f5wzRc5oGuvlEMl*cD9YtgqH}Hlx0vurRN* zq*Tf?8O()wR&$v>ugGjOONB)Sqt#s0?WHYx#Id=>wa3-wXv*L2YH7x?X31JmVzlB| zz15g!k|cAU)lgKFS7xx=i_B%_0=rd$gw;!6t;Yhbf6zk4(H!<&(gow?v9SH1#7Of_ z_2YG$>l>OKes_#eySk*Mt+dX$1zHX+il;Mz@RtS)x^aoOk;7L!yOlA5?M{cr#fIFA zcAB8_Vy?!ZRYM*FcExvl6hPC#49>3>ug6@H0A1$2eq$b zg~Epl%-xp>XAT&l_JC^nf4{ey+e3_GZ0xjpSUZdl<|-c18{qulJdHXqyI`Ase&b^T zXBk&-C|%0nudexUA!??))H$H|A|j75_;sfwU+#)xc@3@_S4+EdvxAPZ;Ht4&s~wvv z8tdA&wm6$=A`eU}pE_M%rkub18b9)PD zPeajtY|x%U-VT*|JXZ9=viT3VJ<{HLJmB5&k;7=2xijt}o7NAPyC~m4@2QBACNQ+{ zbm+We+a&Tjq<$kKVnvK!-_Ya;1`oPBF!fzzv0*ZxO`zQk6?*j0!^VI7BO*_$35Fr+ z4xG(t^;=;|I>Su%hZDVNY!T5Ouf_4Min?Y;BWf(Bjlx85KRKHDv&4g+$&P#(DXi&# zAq&MtWFfrL3TNdvZ+EpiTekbpeB{m4Dc!oaS9Y3Z-++a|0~5wNm>NyfL z`h$kMr}De+RkaGA`$96z@%-5P27Vsl6@S0W;9&TDHXK@)E-ycQlEGV^KIpsXgUYdG z3G~7a6gX|US>v0yFv+0GlA?X$J908RQGavqwW^BG9pE0XlBLNXC{VjW7B8G-FfgpUbB@=> dR^Z7?REK@-+{5FTS2VhZd{MzKq+^3i{|!fEywv~z diff --git a/AAWebPlatform.njsproj b/AAWebPlatform.njsproj index 61a3c4aa8..ba5c19177 100644 --- a/AAWebPlatform.njsproj +++ b/AAWebPlatform.njsproj @@ -36,7 +36,7 @@ - + Code @@ -99,7 +99,7 @@ - + diff --git a/Panels/BotsPanel.js b/Panels/ProductsPanel.js similarity index 76% rename from Panels/BotsPanel.js rename to Panels/ProductsPanel.js index 20efb0a0d..10d549279 100644 --- a/Panels/BotsPanel.js +++ b/Panels/ProductsPanel.js @@ -1,16 +1,16 @@  -function newBotsPanel() { +function newProductsPanel() { - const CARD_STATES = { + const PRODUCT_STATUS = { ON: 'on', OFF: 'off' }; var thisObject = { container: undefined, - cards: undefined, + gerOnProducts: gerOnProducts, getLayerStatus: getLayerStatus, draw: draw, getContainer: getContainer, // returns the inner most container that holds the point received by parameter. @@ -25,7 +25,7 @@ function newBotsPanel() { thisObject.container.frame.containerName = "Chart Layers Panel"; let isInitialized = false; - let cards; + let products; let layers = []; @@ -79,15 +79,15 @@ function newBotsPanel() { var cardPosition; var lastY = 5; - cards = []; + products = []; for (var i = 0; i < layers.length; i++) { let fullCodeName = layers[i].devTeam.codeName + '-' + layers[i].bot.codeName + '-' + layers[i].product.codeName + '-' + layers[i].layer.codeName; - /* Buttons are going to be one at the right of the other. */ + /* Products are going to be one at the right of the other. */ - var card = newBotCard(); + var card = newProduct(); card.devTeam = layers[i].devTeam.displayName; card.bot = layers[i].bot.displayName; card.product = layers[i].product.displayName; @@ -111,7 +111,7 @@ function newBotsPanel() { lastY = lastY + card.container.frame.height; - /* We start listening to the cards click event, so as to know when one was pressed. */ + /* We start listening to the products click event, so as to know when one was pressed. */ card.container.eventHandler.listenToEvent('onMouseClick', buttonPressed, i); @@ -123,11 +123,11 @@ function newBotsPanel() { } else { - card.status = CARD_STATES.ON; + card.status = PRODUCT_STATUS.ON; } - cards.push(card); + products.push(card); let eventData = { layer: card.code, @@ -137,17 +137,33 @@ function newBotsPanel() { thisObject.container.eventHandler.raiseEvent('Layer Status Changed', eventData); } - thisObject.cards = cards; - isInitialized = true; } + function gerOnProducts() { + + /* Returns all products which status is ON */ + + let onProducts = []; + + for (let i = 0; i < products.length; i++) { + + if (products[i].status = PRODUCT_STATUS.ON) { + + onProducts.push(products[i]); + } + } + + return onProducts; + } + + function getLayerStatus(layerName) { - for (let i = 0; i < cards.length; i++) { + for (let i = 0; i < products.length; i++) { - let button = cards[i]; + let button = products[i]; if (button.code === layerName) { @@ -157,7 +173,7 @@ function newBotsPanel() { } - return CARD_STATES.OFF; + return PRODUCT_STATUS.OFF; } function getContainer(point) { @@ -171,9 +187,9 @@ function newBotsPanel() { /* Now we see which is the inner most container that has it */ - for (var i = 0; i < this.cards.length; i++) { + for (var i = 0; i < products.length; i++) { - container = this.cards[i].getContainer(point); + container = products[i].getContainer(point); if (container !== undefined) { @@ -198,27 +214,27 @@ function newBotsPanel() { function buttonPressed(event, index) { - switch (thisObject.cards[index].status) { + switch (products[index].status) { - case CARD_STATES.ON: - thisObject.cards[index].status = CARD_STATES.OFF; + case PRODUCT_STATUS.ON: + products[index].status = PRODUCT_STATUS.OFF; break; - case CARD_STATES.OFF: - thisObject.cards[index].status = CARD_STATES.ON; + case PRODUCT_STATUS.OFF: + products[index].status = PRODUCT_STATUS.ON; break; } let eventData = { - layer: thisObject.cards[index].code, - status: thisObject.cards[index].status + layer: products[index].code, + status: products[index].status } thisObject.container.eventHandler.raiseEvent('Layer Status Changed', eventData); - window.localStorage.setItem(thisObject.cards[index].code, thisObject.cards[index].status); + window.localStorage.setItem(products[index].code, products[index].status); } @@ -228,8 +244,8 @@ function newBotsPanel() { thisObject.container.frame.draw(false, false, true); - for (var i = 0; i < thisObject.cards.length; i++) { - thisObject.cards[i].draw(); + for (var i = 0; i < products.length; i++) { + products[i].draw(); } } diff --git a/BotCard.js b/Product.js similarity index 99% rename from BotCard.js rename to Product.js index 0be651231..2aaec1b73 100644 --- a/BotCard.js +++ b/Product.js @@ -1,4 +1,4 @@ -function newBotCard() { +function newProduct() { var thisObject = { container: undefined, diff --git a/TimeMachine.js b/TimeMachine.js index 1dc29ed92..4e614cba1 100644 --- a/TimeMachine.js +++ b/TimeMachine.js @@ -46,7 +46,7 @@ function newTimeMachine() { orderBookPanel = newOrderBookPanel(); orderBookPanel.initialize(); - botsPanel = newBotsPanel(); + botsPanel = newProductsPanel(); botsPanel.initialize(); let iteration = 0; diff --git a/index.html b/index.html index f16c1b2e5..b57cf4f56 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ - + @@ -64,7 +64,7 @@ - +