Merge pull request 'updateds folder path and regex' (#14) from pankaj-dev into main

Reviewed-on: #14

app/routes/file_format.py

@@ -1,5 +1,6 @@
 from flask import Blueprint, render_template, send_from_directory, abort, current_app
 from app.utils.helpers import login_required
+from app.utils.file_utils import get_download_format_folder
 import os
 
 file_format_bp  = Blueprint("file_format", __name__)
@@ -14,10 +15,7 @@ def download_format():
 @login_required
 def download_excel_format(filename):
 
-    download_folder = os.path.join(
+    download_folder = get_download_format_folder()
-        current_app.root_path, "static", "downloads/format"
-    )
-
     file_path = os.path.join(download_folder, filename)
 
     if not os.path.exists(file_path):

app/routes/generate_comparison_report.py

@@ -224,15 +224,12 @@ def comparison_report():
             subcontractor_id=subcontractor_id
         ).all()]
         df_dc = build_comparison(dc_client, dc_sub, "MH_NO")
-        # df_dc = build_comparison_mh_dc(dc_client, dc_sub, "MH_NO")
  
         lay_client = [r.serialize() for r in LayingClient.query.all()]
         lay_sub = [r.serialize() for r in Laying.query.filter_by(
             subcontractor_id=subcontractor_id
         ).all()]
         df_lay = build_comparison(lay_client, lay_sub, "MH_NO")
-        # df_lay = build_comparison_laying(lay_client, lay_sub, "MH_NO")
- 
  
         # -------- EXCEL --------
         output = io.BytesIO()

app/utils/file_utils.py

@@ -1,6 +1,16 @@
 import os
+from flask import current_app
 from app.config import Config
 
+
+def get_download_format_folder():
+    return os.path.join(
+        current_app.root_path,
+        "static",
+        "downloads",
+        "format"
+    )
+
 def ensure_upload_folder():
     if not os.path.exists(Config.UPLOAD_FOLDER):
         os.makedirs(Config.UPLOAD_FOLDER)