diff --git a/app/routes.py b/app/routes.py index 6a89426..45c488a 100644 --- a/app/routes.py +++ b/app/routes.py @@ -1,6 +1,6 @@ from app import app -from flask import render_template -from main import loadClients +from flask import render_template, request, redirect, url_for +from main import * @app.route('/') @app.route('/index') @@ -10,4 +10,30 @@ def index(): ClientName = loadClients() - return render_template('index.html', title='SFU', ClientName=ClientName) \ No newline at end of file + + return render_template('index.html', title='SFU', ClientName=ClientName) + + +@app.route('/runReport', methods=['GET', 'POST']) +def runReport(): + + ClientConfig = [] + + client = request.form['SelectedClient'] + ClientConfig = GetClientConfig(client) + + SF_URL = ClientConfig[0] + SF_HOST = ClientConfig[1] + REPORT_FIELDS = ClientConfig[2] + DETAIL_REPORT_FIELDS = ClientConfig[3] + summary_columnformat = ClientConfig[4] + headers = ClientConfig[5] + detail_columnformat = ClientConfig[6] + detail_headers = ClientConfig[7] + wb = ClientConfig[8] + ws = ClientConfig[9] + ws2 = ClientConfig[10] + + + + return(str(client),SF_URL,SF_HOST,REPORT_FIELDS,DETAIL_REPORT_FIELDS,summary_columnformat,headers,detail_columnformat,detail_headers,wb, ws, ws2 ) diff --git a/app/templates/index.html b/app/templates/index.html index bad8d36..d91101e 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -5,19 +5,17 @@ Title - {% for x in ClientName %} - {{ ClientName[loop.index0] }}
- {% endfor %}

- -
- -

- {{ SelectedClient }} +
+ +
+ +
+ \ No newline at end of file diff --git a/main.py b/main.py index 80bf9a3..65da20f 100644 --- a/main.py +++ b/main.py @@ -307,8 +307,8 @@ def GetClientConfig(Client): for w in y.find_all('client'): for x in w.find_all('name'): if x.text == Client: - SF_URL = x.find_all('storefrontapiurl').text - + SF_URL = x.find('storefrontapiurl') + print("SF_URL" SF_URL) # Get Storefront Host URL temp1 = SF_URL.split('://') temp2 = temp1[1].split('/')