From 5ce4490718fd9b2b833859f95032042e1a781405 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Thu, 22 Feb 2018 09:33:34 +0100
Subject: [PATCH] Pending TODOs done

---
 .vs/AAOlivia-Plotter/v15/.suo | Bin 18432 -> 18944 bytes
 Candles.js                    |  14 +++++++++++---
 Volumes.js                    |  22 ++++++++++++++++------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.vs/AAOlivia-Plotter/v15/.suo b/.vs/AAOlivia-Plotter/v15/.suo
index c4c027080a51595af00e29ef61dd8be724da5b78..ccd85b9ab981207b7dc36cec13952f01e6d57903 100644
GIT binary patch
delta 148
zcmZpez}PT_ae{#?0}Kc-FbD$Kj6nSF|Ns9WVaCah9QGR%N*E_G<+4=&IkSCpA(OAw
zWNmw{$$82elRqexOx~wtG<lkB6HJVmiNOUZzHIVmyFG&TAhVz#1jy#we84`9Q7{Tg
RI0wiU+idQ5l5LS2698_bC2s%#

delta 82
zcmZpe!q_l@ae{#?69W_oFfgzHnT$aE@Bjb*AW`PYjvV$I6G|8-G3Bz@y?VcGb0L$j
d)#iOlPK=Wk9K1GrIo)AmoHJS7_2wccHUK%57svnr

diff --git a/Candles.js b/Candles.js
index 0ba9f2539..f6b22f7f2 100644
--- a/Candles.js
+++ b/Candles.js
@@ -354,7 +354,15 @@
 
                 for (let i = 0; i < dailyFile.length; i++) {
 
-                    let candle = newCandle();
+                    let candle = {
+                        open: undefined,
+                        close: undefined,
+                        min: 10000000000000,
+                        max: 0,
+                        begin: undefined,
+                        end: undefined,
+                        direction: undefined
+                    };
 
                     candle.min = dailyFile[i][0];
                     candle.max = dailyFile[i][1];
@@ -362,8 +370,8 @@
                     candle.open = dailyFile[i][2];
                     candle.close = dailyFile[i][3];
 
-                    candle.begin = (new Date(dailyFile[i][4])).valueOf();
-                    candle.end = (new Date(dailyFile[i][5])).valueOf();
+                    candle.begin = marketFile[i][4];
+                    candle.end = marketFile[i][5];
 
                     if (candle.open > candle.close) { candle.direction = 'down'; }
                     if (candle.open < candle.close) { candle.direction = 'up'; }
diff --git a/Volumes.js b/Volumes.js
index 7e682c7ee..6dd5e1f31 100644
--- a/Volumes.js
+++ b/Volumes.js
@@ -266,10 +266,15 @@
 
                 for (let i = 0; i < dailyFile.length; i++) {
 
-                    var volume = newVolumeBar();
+                    var volume = {
+                        amountBuy: 0,
+                        amountSell: 0,
+                        begin: undefined,
+                        end: undefined
+                    };
 
-                    volume.begin = (new Date(dailyFile[i][2])).valueOf(); // TODO ELIMINATE THIS
-                    volume.end = (new Date(dailyFile[i][3])).valueOf();
+                    volume.begin = marketFile[i][2];
+                    volume.end = marketFile[i][3];
 
                     volume.amountBuy = dailyFile[i][0];
                     volume.amountSell = dailyFile[i][1];
@@ -328,10 +333,15 @@
 
         for (let i = 0; i < marketFile.length; i++) {
 
-            var volume = newVolumeBar();  // TODO ELIMINATE THIS OBJECT DEPENDENCYY
+            var volume = = {
+                amountBuy: 0,
+                amountSell: 0,
+                begin: undefined,
+                end: undefined
+            };
 
-            volume.begin = (new Date(marketFile[i][2])).valueOf(); // TODO ELIMINATE THIS
-            volume.end = (new Date(marketFile[i][3])).valueOf();
+            volume.begin = marketFile[i][2];
+            volume.end = marketFile[i][3];
 
             volume.amountBuy = marketFile[i][0];
             volume.amountSell = marketFile[i][1];