Merge branch 'master' of https://github.com/VarunS2002/Python-NSE-Option-Chain-Analyzer

Author: VarunS2002

NSE_Option_Chain_Analyzer.py

@@ -27,7 +27,7 @@
 # noinspection PyAttributeOutsideInit
 class Nse:
     version: str = '5.3'
-    beta: Tuple[bool, int] = (True, 2)
+    beta: Tuple[bool, int] = (True, 3)
 
     def __init__(self, window: Tk) -> None:
         self.intervals: List[int] = [1, 2, 3, 5, 10, 15]
@@ -1077,19 +1077,18 @@ def get_dataframe(self) -> Optional[Tuple[pandas.DataFrame, str, float]]:
         df = df.transpose()
 
         ce_values: List[dict] = [data['CE'] for data in json_data['records']['data'] if
-                                 "CE" in data and str(data['expiryDate'].lower() == str(self.expiry_date).lower())]
+                                 "CE" in data and str(data['expiryDate']).lower() == str(self.expiry_date).lower()]
         pe_values: List[dict] = [data['PE'] for data in json_data['records']['data'] if
-                                 "PE" in data and str(data['expiryDate'].lower() == str(self.expiry_date).lower())]
+                                 "PE" in data and str(data['expiryDate']).lower() == str(self.expiry_date).lower()]
         points: float = pe_values[0]['underlyingValue']
         if points == 0:
             for item in pe_values:
                 if item['underlyingValue'] != 0:
                     points = item['underlyingValue']
                     break
-        ce_data: pandas.DataFrame = pandas.DataFrame(ce_values)
-        pe_data: pandas.DataFrame = pandas.DataFrame(pe_values)
-        ce_data_f: pandas.DataFrame = ce_data.loc[ce_data['expiryDate'] == self.expiry_date]
-        pe_data_f: pandas.DataFrame = pe_data.loc[pe_data['expiryDate'] == self.expiry_date]
+        ce_data_f: pandas.DataFrame = pandas.DataFrame(ce_values)
+        pe_data_f: pandas.DataFrame = pandas.DataFrame(pe_values)
+
         if ce_data_f.empty:
             messagebox.showerror(title="Error",
                                  message="Invalid Expiry Date.\nPlease restart and enter a new Expiry Date.")