remove commented code
This commit is contained in:
@@ -1,28 +1,16 @@
|
||||
import os
|
||||
import config
|
||||
import ast
|
||||
import re
|
||||
from flask_login import login_required
|
||||
import openpyxl
|
||||
from flask import Blueprint, request, render_template, redirect, url_for, jsonify, current_app
|
||||
from flask_login import current_user
|
||||
from flask_login import login_required
|
||||
from flask import Blueprint, request, render_template, redirect, url_for, jsonify
|
||||
|
||||
from model.Log import LogHelper
|
||||
import config
|
||||
from model.FolderAndFile import FolderAndFile
|
||||
|
||||
excel_bp = Blueprint('excel', __name__)
|
||||
|
||||
# Default folder in case config not set
|
||||
# DEFAULT_UPLOAD_FOLDER = 'uploads'
|
||||
|
||||
|
||||
# def get_upload_folder():
|
||||
# """Returns the upload folder from Flask config or default, ensures it exists."""
|
||||
# folder = current_app.config.get('UPLOAD_FOLDER', DEFAULT_UPLOAD_FOLDER)
|
||||
# if not os.path.exists(folder):
|
||||
# os.makedirs(folder)
|
||||
# return folder
|
||||
|
||||
|
||||
# ---------------- Upload Excel File ----------------
|
||||
@excel_bp.route('/upload_excel_file', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
@@ -30,9 +18,6 @@ def upload():
|
||||
if request.method == 'POST':
|
||||
file = request.files.get('file')
|
||||
if file and file.filename.endswith('.xlsx'):
|
||||
# upload_folder = get_upload_folder()
|
||||
# filepath = os.path.join(upload_folder, file.filename)
|
||||
|
||||
filepath =FolderAndFile.get_upload_path(file.filename)
|
||||
|
||||
file.save(filepath)
|
||||
@@ -42,6 +27,9 @@ def upload():
|
||||
f"User {current_user.id} Upload Excel File '{file.filename}'"
|
||||
)
|
||||
return redirect(url_for('excel.show_table', filename=file.filename))
|
||||
else:
|
||||
return redirect(url_for('upload_excel_file'))
|
||||
|
||||
return render_template('uploadExcelFile.html')
|
||||
|
||||
|
||||
@@ -51,7 +39,6 @@ def show_table(filename):
|
||||
global data
|
||||
data = []
|
||||
|
||||
# filepath = os.path.join(get_upload_folder(), filename)
|
||||
filepath = FolderAndFile.get_upload_path(filename)
|
||||
wb = openpyxl.load_workbook(filepath, data_only=True)
|
||||
sheet = wb.active
|
||||
|
||||
Reference in New Issue
Block a user