ACP Custom Report Changes

scripts/core/handler/event_handler.py

@@ -78,6 +78,8 @@ class CustomReportHandler:
         :param date_filter:
         :return:
         """
+        import numpy as np
+        null_value = np.nan
         for each_blocks in input_json:
             # Iterating each blocks for fetching query
 
@@ -135,7 +137,7 @@ class CustomReportHandler:
                                 # Creating null values if no data
                                 for each_columns in input_json[each_blocks][
                                     CommonConstants.DATA_COLUMN]:
-                                    temp_data_dict.update({each_columns: None})
+                                    temp_data_dict.update({each_columns: null_value})
                                 append_flag = True
 
                         if append_flag and temp_data_dict:
@@ -165,9 +167,14 @@ class CustomReportHandler:
                 temp_data_dict = dict()
                 for each_columns in input_json[each_blocks][
                     CommonConstants.DATA_COLUMN]:
-                    temp_data_dict.update(
-                        {each_columns: None}
-                    )
+                    if each_columns:
+                        temp_data_dict.update(
+                            {each_columns: null_value}
+                        )
+                    else:
+                        temp_data_dict.update(
+                            {each_columns: ""}
+                        )
                 input_json[each_blocks][CommonConstants.DATA].append(temp_data_dict)
         return input_json
 
@@ -205,8 +212,8 @@ class CustomReportHandler:
             data = category_data.get('data', [])
             data_frame = pd.DataFrame(data)
             data_frame.columns = category_data.get('columns', [])
+            data_frame.dropna(how='all', inplace=True)
             dataframes_list.append(data_frame)
-
             shape = data_frame.shape
 
             # Checking if merged border in the JSON
@@ -427,7 +434,7 @@ class CustomReportHandler:
 
                                 if total_column < shape[1]:
                                     total_column = shape[1]
-                                start_row += shape[0] + 2
+                                start_row += shape[0] + 3
 
                                 if header_flag:
                                     start_row += 1