change output file name and df columns
This commit is contained in:
@@ -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")
|
||||
return send_file(file_data, download_name= output_filename, mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
|
||||
Reference in New Issue
Block a user