smiuser/hpos-data
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change output file name and df columns

Browse Source
This commit is contained in:
Pritimay Sarkar
2023-08-21 23:06:06 +05:30
parent c29e215cfd
commit 5e47eb72eb
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cloud-functions/python/functions/consolidation.py
View File

@@ -9,6 +9,7 @@ import platform
import os import os
import io import io
from flask import send_file from flask import send_file
from datetime import datetime
initialize_app() initialize_app()
@@ -66,14 +67,16 @@ def consolidation(request):
df = pd.DataFrame(data) 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 output_path = os.getcwd() + path_delim + output_filename
writer = pd.ExcelWriter(output_path, engine = 'openpyxl') writer = pd.ExcelWriter(output_path, engine = 'openpyxl')
df = df[(df['testTime'] > start_date) & (df['testTime'] <= end_date)] df = df[(df['testTime'] > start_date) & (df['testTime'] <= end_date)]
df = df.sort_values(by=['testTime'], ascending=False) 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.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) df.to_excel(writer, sheet_name = 'data', index=False)
writer.close() writer.close()
@@ -85,4 +88,4 @@ def consolidation(request):
file_data = io.BytesIO(f.read()) file_data = io.BytesIO(f.read())
# application/vnd.ms-excel # application/vnd.ms-excel
return send_file(file_data, download_name= "data.xlsx", mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") return send_file(file_data, download_name= output_filename, mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")

8
scripts/consolidated_data.py
View File

@@ -7,6 +7,7 @@ import pandas as pd
import datetime import datetime
import sys import sys
import platform import platform
from datetime import datetime
if __name__ == "__main__": if __name__ == "__main__":
@@ -62,7 +63,7 @@ if __name__ == "__main__":
print(df.size) print(df.size)
# Save the DataFrame to a CSV file # 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) df.to_csv(output_filename, index=False)
downloads_dir = os.path.join(os.path.expanduser("~"), "Downloads") downloads_dir = os.path.join(os.path.expanduser("~"), "Downloads")
@@ -70,7 +71,10 @@ if __name__ == "__main__":
writer = pd.ExcelWriter(output_path, engine = 'openpyxl') writer = pd.ExcelWriter(output_path, engine = 'openpyxl')
df = df[(df['testTime'] > start_date) & (df['testTime'] <= end_date)] df = df[(df['testTime'] > start_date) & (df['testTime'] <= end_date)]
df = df.sort_values(by=['testTime'], ascending=False) 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) df.to_excel(writer, sheet_name = 'data', index=False)
writer.close() writer.close()