Sterlite Custom Report Updates

scripts/core/handler/event_handler.py

@@ -170,14 +170,11 @@ class CustomReportHandler:
             worksheet.write(
                 start_row, col_index, value,
                 workbook.add_format(
-                    SterliteRefineryTemplate.COLUMN_HEADER_FORMAT
-                ))
-
-        row = result_df.shape[0]
-        column = result_df.shape[1]
+                    SterliteRefineryTemplate.COLUMN_HEADER_FORMAT)
+                )
         logger.info(f"Shape of current data frame is {result_df.shape}")
 
-        return row, column, worksheet
+        return result_df.shape, worksheet
 
     def custom_report_handler(self, input_json):
         """
@@ -224,8 +221,7 @@ class CustomReportHandler:
                             logger.info(f"start_row: {start_row}")
                             logger.info("Writing each block into excel sheet")
 
-                            last_row, last_column, worksheet = \
-                                self.write_dataframe_to_excel(
+                            shape, worksheet = self.write_dataframe_to_excel(
                                 input_json=each_blocks,
                                 writer=writer,
                                 workbook=workbook,
@@ -234,12 +230,12 @@ class CustomReportHandler:
                                 start_row=start_row,
 
                             )
-                            logger.info(f"Last row: {last_row}")
-                            logger.info(f"Last column: {last_column}")
+                            logger.info(f"Last row: {shape[0]}")
+                            logger.info(f"Last column: {shape[1]}")
 
-                            if total_column < last_column:
-                                total_column = last_column
-                            start_row += last_row + 2
+                            if total_column < shape[1]:
+                                total_column = shape[1]
+                            start_row += shape[0] + 2
                             logger.info(f"end_row: {start_row}")
 
                         # Add a header format.