fix for spread and update

ejtraderLabs · Sep 19, 2022 · 3c74899 · 3c74899
1 parent a17d62f
commit 3c74899
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ dist/
 __pycache__
 .DS_Store
 test/*
-test/
+test/
+test.ipynb
diff --git a/ejtraderMT/api/mql.py b/ejtraderMT/api/mql.py
@@ -250,6 +250,12 @@ def __init__(self, host=None, real_volume=None, tz_local=None, dbtype=None,dbhos
 
  def balance(self):
  return self.__api.Command(action="BALANCE")
+
+ def calender(self,symbol,fromDate,toDate):
+ df = self.__api.Command(action="CALENDAR", actionType="DATA", symbol=symbol, 
+ fromDate=self.__date_to_timestamp(fromDate), toDate=self.__date_to_timestamp(toDate))
+ return df
+
 
  def accountInfo(self):
  return self.__api.Command(action="ACCOUNT")
@@ -654,7 +660,7 @@ def __historyThread_save(self,data):
 
  elif isinstance(fromDate, str) and toDate==None:
  data = self.__api.Command(action="HISTORY", actionType="DATA", symbol=active, chartTF=chartTF,
- fromDate=self.__date_to_timestamp(fromDate),toDate=sself.__date_to_timestamp(toDate))
+ fromDate=self.__date_to_timestamp(fromDate),toDate=self.__date_to_timestamp(toDate))
 
  self.__api.Command(action="RESET")
  try:

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 pandas>=0.25.1
 pyzmq==19.0.2
-tzlocal==2.1
+tzlocal>=2.1
 ejtraderTH==1.0.3
 ejtraderDB==1.0.2
 tqdm==4.56.0