diff --git a/main.py b/main.py index 847f51c..7c0bebc 100644 --- a/main.py +++ b/main.py @@ -342,8 +342,8 @@ def buildPort(): # role, test_info['annual_ret'], test_info['vol'], test_info['mdd'], test_info['annual_sr'], # test_info['beta'], test_info['alpha'], test_info['var10'], test_info['R2'], True, comment, stock_list, list(sol), sep=", ") # print("-"*10) - data = (ts, name, session.get('username').split('@')[0], comp, - role, ratio, test_info['annual_ret'], test_info['vol'], test_info['mdd'], test_info['annual_sr'], + data = (ts, name, session.get('username').split('@')[0], comp, role, ratio, test_info['annual_ret'], + test_info['vol'], test_info['mdd'], test_info['annual_sr'], test_info['beta'], test_info['alpha'], test_info['var10'], test_info['R2'], True, comment, stock_list, list(sol)) sql='insert into strategy \ (date, name, username, competition, role, ratio, annual_ret, vol, mdd, annual_sr, beta, alpha, var10, R2, tw, comment, assets, assets_position)\ @@ -353,7 +353,7 @@ def buildPort(): curs.execute(sql, data) conn.close() print("\n------Write in Success--------\n") - return '''投資組合已完成建立,請至#TODO:insert link查詢分析結果。''' + return '''投資組合已完成建立,請至 #TODO:insert link 查詢分析結果。''' diff --git a/static/js/addStock.js b/static/js/addStock.js index fb3a517..2b97b0b 100644 --- a/static/js/addStock.js +++ b/static/js/addStock.js @@ -101,7 +101,7 @@ $sendPort.click(function(event) { console.log(response); // var res = JSON.parse(response); event.preventDefault(); - // $('#confirmMes').text('') + $('#modalTitle').text('完成建立') $('#confirmMes').replaceWith(response); if (stockList.length > 0){ $('#confirmModal').modal('show'); diff --git a/templates/base.html b/templates/base.html index a11ed53..6beb70e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -99,7 +99,7 @@
-