From 5e47eb72eb9bfa8ee2f57ad54dd374c2277357f9 Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Mon, 21 Aug 2023 23:06:06 +0530 Subject: [PATCH] change output file name and df columns --- cloud-functions/python/functions/consolidation.py | 9 ++++++--- scripts/consolidated_data.py | 8 ++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/cloud-functions/python/functions/consolidation.py b/cloud-functions/python/functions/consolidation.py index 7f31911..3bb64e4 100644 --- a/cloud-functions/python/functions/consolidation.py +++ b/cloud-functions/python/functions/consolidation.py @@ -9,6 +9,7 @@ import platform import os import io from flask import send_file +from datetime import datetime initialize_app() @@ -66,14 +67,16 @@ def consolidation(request): df = pd.DataFrame(data) - output_filename = "data.xlsx" + output_filename = f'data_{datetime.today().strftime("%d_%m_%Y_%H_%M")}.xlsx' output_path = os.getcwd() + path_delim + output_filename writer = pd.ExcelWriter(output_path, engine = 'openpyxl') df = df[(df['testTime'] > start_date) & (df['testTime'] <= end_date)] df = df.sort_values(by=['testTime'], ascending=False) - df = df.drop(['resultData', "reportUploadTime", "userImageURL", "testType", "birthYear", "testStatus", "reportPath", "createdBy", "csvPath", "result", "mobileId", "resultRatio", "localFlag", "led2", "led1"], axis=1) + # df = df.drop(['resultData', "reportUploadTime", "userImageURL", "testType", "birthYear", "testStatus", "reportPath", "createdBy", "csvPath", "result", "mobileId", "resultRatio", "localFlag", "led2", "led1"], axis=1) + df = df[["_id", "calculatedRatio", "deviceId", "deviceRatio", "deviceType", "kitSerial", "led1Average", "led1Buffer", "led1Sample", "led2Average", "led2Buffer", "led2Sample", "location", "deviceSerialNumber", "name", "testTime"]] df.rename(columns={'deviceSerialNumber': "loginId", "calculatedRatio": "calibratedRatio"}, inplace = True) + df = df.reindex(sorted(df.columns), axis=1) df.to_excel(writer, sheet_name = 'data', index=False) writer.close() @@ -85,4 +88,4 @@ def consolidation(request): file_data = io.BytesIO(f.read()) # application/vnd.ms-excel - return send_file(file_data, download_name= "data.xlsx", mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") \ No newline at end of file + return send_file(file_data, download_name= output_filename, mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") \ No newline at end of file diff --git a/scripts/consolidated_data.py b/scripts/consolidated_data.py index 30b0d12..b3176f9 100644 --- a/scripts/consolidated_data.py +++ b/scripts/consolidated_data.py @@ -7,6 +7,7 @@ import pandas as pd import datetime import sys import platform +from datetime import datetime if __name__ == "__main__": @@ -62,7 +63,7 @@ if __name__ == "__main__": print(df.size) # Save the DataFrame to a CSV file - output_filename = "data.xlsx" + output_filename = f'data_{datetime.today().strftime("%d_%m_%Y_%H_%M")}.xlsx' df.to_csv(output_filename, index=False) downloads_dir = os.path.join(os.path.expanduser("~"), "Downloads") @@ -70,7 +71,10 @@ if __name__ == "__main__": writer = pd.ExcelWriter(output_path, engine = 'openpyxl') df = df[(df['testTime'] > start_date) & (df['testTime'] <= end_date)] df = df.sort_values(by=['testTime'], ascending=False) - df = df.drop(['resultData', "reportUploadTime", "userImageURL", "testType", "birthYear", "testStatus", "reportPath", "createdBy", "csvPath", "result", "mobileId", "resultRatio", "localFlag", "led2", "led1"], axis=1) + # df = df.drop(['resultData', "reportUploadTime", "userImageURL", "testType", "birthYear", "testStatus"], axis=1) + df = df[["_id", "calculatedRatio", "deviceId", "deviceRatio", "deviceType", "kitSerial", "led1Average", "led1Buffer", "led1Sample", "led2Average", "led2Buffer", "led2Sample", "location", "deviceSerialNumber", "name", "testTime"]] + df.rename(columns={'deviceSerialNumber': "loginId", "calculatedRatio": "calibratedRatio"}, inplace = True) + df = df.reindex(sorted(df.columns), axis=1) df.to_excel(writer, sheet_name = 'data', index=False) writer.close()