r10246002
/
flask_tpm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style change

Browse Source
master
SeanChenTaipei 2 years ago
parent 769143c339
commit f97fc13c0a
5 changed files with 98 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      main.py
  2. 2
      static/js/addStock.js
  3. 4
      templates/base.html
  4. 11
      templates/result_view.html
  5. 151
      templates/strategy_tw.html

18
main.py
Unescape View File

@ -251,11 +251,13 @@ def submit_stock_list():
## Query DB
conn = psycopg2.connect(**SQL_CONFIG)
port = get_stock(conn, stock_list, session['tw'])
if len(port.index) > 750:
port = port.iloc[-750:, :]
if len(port.index) > 908:
port = port.iloc[-908:, :]
conn.close()
port = port.iloc[::3, :]
port = port/port.iloc[0, :]
fig = port.plot(title='資產價格走勢', labels=dict(index="Date", value="Price", variable="Assets"))
fig = port.plot(title='資產價格變化', labels=dict(index="Date", value="Price", variable="Assets"))
fig['layout'] = {}
# 序列化
@ -277,7 +279,7 @@ def buildPort():
if not 'tw' in session:
return redirect(url_for('index'))
# Stop frequently building strategy
if time.time() - session['lastCreateTime'] < 10:
if time.time() - session['lastCreateTime'] < 60:
print("UNTIL: ", time.time()-session['lastCreateTime'])
return '''<span>投資組合建立時間間隔(或與登入時間間隔)必須大於60秒！</span>'''
# print('last_creation', time.time() - session['lastCreateTime'])
@ -305,8 +307,6 @@ def buildPort():
stock_list = json.loads(request.form.get('stockList'))
ratio=0.7
# Algorithm MVO
print("-"*10)
print("Enter Algorithms")
@ -325,9 +325,9 @@ def buildPort():
n = len(port.index)
if n < lookback+backtest+63:
return f'''<span>投資組合無法建立，資料長度與所選參數不符。</span>'''
elif n > 757+lookback:
port = port.iloc[-(757+lookback):, :]
market = market.iloc[-757:]
elif n > 909+lookback:
port = port.iloc[-(909+lookback):, :]
market = market.iloc[-909:]
else:
market = market.iloc[lookback:]

2
static/js/addStock.js
Unescape View File

@ -4,7 +4,7 @@ let currentList = [];
const layout={'autosize': true, 'markers':true,
'title': {'text': ''},
'xaxis': {'anchor': 'y', 'domain': [0.0, 1.0], 'rangeslider': {'visible': true}},
'yaxis': {'anchor': 'x', 'domain': [0.0, 1.0], 'fixedrange': false},
'yaxis': {'anchor': 'x', 'domain': [0.0, 1.0]},
'legend': {'yanchor': 'top', 'y': 1.1, 'xanchor': 'left', 'x': 0.01, 'orientation':'h'},
'margin': {'l': 25, 'r': 5, 't': 10, 'b': 5},
}

4
templates/base.html
Unescape View File

@ -23,8 +23,8 @@
{% endblock %}
<style>
body {
// padding-bottom: 10px;
font-family: Georgia, Arial, Geneva, Helvetica, serif !important;
/* // padding-bottom: 10px; */
font-family: Georgia, Arial, Helvetica, serif !important;
background-color: #eee;
height:95vh;
}

11
templates/result_view.html
Unescape View File

@ -126,11 +126,11 @@
<div class="row justify-content-center font-bold text-xl">
投組價值走勢
</div>
<div class="mb-4" id="price" style="max-height:40vh"></div>
<div class="mb-4" id="price" style="max-height:60vh"></div>
<div class="row justify-content-center font-bold text-xl">
投組季報酬率
</div>
<div class="mb-4" id="bar" style="max-height:40vh"></div>
<div class="mb-4" id="bar" style="max-height:60vh"></div>
</div>
</div>
@ -161,9 +161,10 @@
const rlayout = {
'autosize': true,
'title': {'text': ''},
'xaxis': {'anchor': 'y', 'domain': [0.0, 1.0], 'title':''},
'xaxis': {'anchor': 'y', 'domain': [0.0, 1.0], 'title':'', 'rangeslider': {'visible': true}
},
'yaxis': {'anchor': 'x', 'domain': [0.0, 1.0], 'title':''},
'margin': {'l': 20, 'r': 10, 't': 50, 'b': 50},
'margin': {'l': 40, 'r': 20, 't': 30, 'b': 50},
'legend': {'yanchor': 'top', 'y': 1.3, 'xanchor': 'left', 'x': 0.01, 'orientation':'h'}
};
const blayout = {
@ -171,7 +172,7 @@
'title': {'text': ''},
'xaxis': {'anchor': 'y', 'domain': [0.0, 1.0], 'title':''},
'yaxis': {'anchor': 'x', 'domain': [0.0, 1.0], 'title':''},
'margin': {'l': 40, 'r': 10, 't': 50, 'b': 70},
'margin': {'l': 40, 'r': 20, 't': 50, 'b': 70},
'legend': {'yanchor': 'top', 'y': 1.3, 'xanchor': 'left', 'x': 0.01, 'orientation':'h'}
};
var w = {{ data.weight|safe }};

151
templates/strategy_tw.html
Unescape View File

@ -38,69 +38,83 @@ div.card{
{% endblock style %}
{% block content %}
<div class="container-fliud">
<div class="card p-3">
<div class="card mb-3" style="border-radius:10px;border:0.5rem outset #eee;">
<!-- <img src="{{ url_for("static", filename="img/stock.jpeg") }}" class="card-img-top" alt="..."> -->
<div class="card-body">
<h5 class="card-title text-xl font-bold accordion-header">
{% if session.tw == 1 %}台股{% endif %}投資組合建立指南 <i class="bi bi-caret-left-fill" style="animation: cursor 1s 3;"></i></h5>
<ol class="list-group list-group-flush list-group-numbered" id="collapseExample">
<li class="list-group-item">
<span class="ps-2">輸入投資組合名稱</span>
<input if="imput1" name="portName" type="text" class="form-control" placeholder="EX. 韓總 No.1" required>
</li>
<li class="list-group-item">
<span class="ps-2">選擇所參加的課程或競賽</span>
<select id="competition" class="form-select" size="1">
{% include 'competitions.html' %}
</select>
</li>
<li class="list-group-item"><span class="ps-2">選擇資產後按下<span class="badge bg-secondary">加入</span></span></li>
<li class="list-group-item"><span class="ps-2">確認資產後按下<span class="badge bg-info">確認資產</span> 查看資產價格動態圖表</span></li>
<li class="list-group-item"><span class="ps-2">選擇建立策略相關參數</span></li>
<li class="list-group-item"><span class="ps-2">確認後按下<span class="badge bg-danger">確認建立</span> 查看回傳訊息</span></li>
</ol>
</div>
<div class="container-fluid" style="background-color: #ffffff;">
<div class="container-fluid py-2">
<div class="alert alert-dark m-0" role="alert">
<ul class="fa-ul">
<li><span class="fa-li"><i class="fa-solid fa-scroll"></i></span>兩次建立投資組合時間需大於60秒。</li>
<li><span class="fa-li"><i class="fa-solid fa-scroll"></i></span>資產數量大於1檔才會開始建立投資組合。</li>
<li><span class="fa-li"><i class="fa-solid fa-scroll"></i></span>未輸入投資組合名稱則會由系統隨機生成。</li>
</ul>
</div>
<div class="card">
<div class="card-header d-flex">
<div class="py-2 font-bold text-lg">
已選擇的資產
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="card my-2 font-bold" style="border-radius: 7px;">
<div class="card-header">
<h5 class="card-title text-xl font-bold pt-2">
{% if session.tw == 1 %}台股{% endif %}投資組合策略建立指南</h5>
</div>
<div class="card-body mb-0">
<ol class="list-group list-group-flush list-group-numbered">
<li class="list-group-item">
<span class="ps-2">輸入投資組合名稱。</span>
<input if="imput1" name="portName" type="text" class="form-control" placeholder="EX. 韓總 No.1" required>
</li>
<li class="list-group-item">
<span class="ps-2">選擇所參加的課程或競賽。</span>
<select id="competition" class="form-select" size="1">
{% include 'competitions.html' %}
</select>
</li>
<li class="list-group-item"><span class="ps-2">選擇資產後按下 <span class="badge bg-secondary">加入</span>。</li>
<li class="list-group-item"><span class="ps-2">按下 <button type="button" class="btn btn-outline-primary btn-sm" disabled>確認資產</button> 後查看資產價格動態圖表。</span></li>
<li class="list-group-item"><span class="ps-2">刪除不加入投資組合的資產。</span></li>
<li class="list-group-item"><span class="ps-2">選擇建立策略相關參數。</span></li>
<li class="list-group-item"><span class="ps-2">按下 <button type="button" class="btn btn-outline-danger btn-sm" disabled>確認建立</button> 並查看回傳訊息。</span></li>
</ol>
</div>
</div>
</div>
<div class="card-body d-flex mb-0">
<input name="assetSelect" class="form-control" list="datalistOptions" id="stockAll" placeholder="輸入資產名稱...">
<datalist id="datalistOptions">
{% if session.tw==0 %}
{% for key, data in data_us.items() -%}
<option value="{{ key|e }}">{{ key|e }} | {{ data|e }}</option>
{% endfor %}
{% endif %}
{% for key, data in data_tw.items() -%}
<option value="{{ key|e }}">{{ key|e }} | {{ data|e }} </option>
{% endfor %}
</datalist>
<button class="btn btn-secondary btn-sm"
type="button"
id="addStockBtn">
加入
</button>
</div>
<div>
<ol class="list-group list-group-numbered px-3 pb-3" id="stock-list" type="1">
<li class="list-group-item">
<span class="px-2">2330.TW</span>
<a class="btn btn-sm btn-danger float-right delete-btn">
<i class="fas fa-trash-alt"></i>
</a>
</li>
</ol>
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="card my-2" style="border-radius: 7px;">
<div class="card-header d-flex">
<div class="py-2 font-bold text-lg">
已選擇的資產
</div>
</div>
<div class="card-body d-flex mb-0">
<input name="assetSelect" class="form-control" list="datalistOptions" id="stockAll" placeholder="輸入資產名稱...">
<datalist id="datalistOptions">
{% if session.tw==0 %}
{% for key, data in data_us.items() -%}
<option value="{{ key|e }}">{{ key|e }} | {{ data|e }}</option>
{% endfor %}
{% endif %}
{% for key, data in data_tw.items() -%}
<option value="{{ key|e }}">{{ key|e }} | {{ data|e }} </option>
{% endfor %}
</datalist>
<button class="btn btn-secondary btn-sm"
type="button"
id="addStockBtn">
加入
</button>
</div>
<div>
<ol class="list-group list-group-numbered px-3 pb-3" id="stock-list" type="1">
<li class="list-group-item">
<span class="px-2">2330.TW</span>
<a class="btn btn-sm btn-danger float-right delete-btn">
<i class="fas fa-trash-alt"></i>
</a>
</li>
</ol>
</div>
</div>
</div>
</div>
<div class="card" style="border-radius: 7px;">
<div class="card-header d-flex">
<div class="py-2 font-bold text-lg">
價格動態圖表
@ -115,21 +129,18 @@ div.card{
<div class="card-body">
<div id="graph" style="max-height:50vh">
<span>
按下
<button type="button" class="btn btn-outline-primary btn-sm" disabled>確認資產</button>
後，圖表將在此渲染。
圖表將在此渲染。
</span>
</div>
</div>
</div>
<hr>
<div class="card mt-3">
<div class="d-flex p-2">
<div class="p-2 font-bold text-lg">
投組最佳化配置
</div>
<div class="btn-group ms-auto">
<button type="button" class="btn btn-outline-danger btn-sm" id="submit-port">
<button type="button p-0" class="btn btn-outline-danger btn-sm" id="submit-port">
確認建立
</button>
</div>
@ -174,13 +185,14 @@ div.card{
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title font-bold text-xl">確認建立投資組合</h5>
<h5 class="modal-title font-bold text-xl py-2">確認建立投資組合</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<span>
確認後將會暫時關閉建立按鈕，請等待完成訊息！
</span>
<ol class="list-group list-group-flush list-group-numbered">
<li class="list-group-item">確認後將會暫時關閉建立功能，請等待完成訊息，勿頻繁提交建立請求。</li>
<li class="list-group-item">兩次投資組合建立時間需大於60秒。</li>
</ol>
<div class="input-group mt-3">
<span class="input-group-text">輸入筆記</span>
<textarea id="commentPort" class="form-control" aria-label="With textarea"></textarea>
@ -193,9 +205,6 @@ div.card{
</div>
</div>
</div>
<div class="modal" id="confirmModal" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content">

Write Preview
Loading…
Cancel
Save