From 77b16b48466646e7948fc280e59414adeee1e2dd Mon Sep 17 00:00:00 2001
From: SeanChenTaipei <sean96545@gmail.com>
Date: Fri, 3 Mar 2023 14:55:05 +0800
Subject: [PATCH] style

---
 main.py                    | 21 ++++++++++----------
 templates/strategy_tw.html | 40 +++++++++++++++++++++-----------------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/main.py b/main.py
index 9a36fc2..e24d84f 100644
--- a/main.py
+++ b/main.py
@@ -20,8 +20,8 @@ pd.options.plotting.backend = "plotly"
 
 # PARAMETERS
 CONFIGS = {
-    "ENV": "development",
-    "DEBUG": True,
+    # "ENV": "development",
+    # "DEBUG": True,
     "SECRET_KEY": os.urandom(30), # Set the secret key for session authentication
     "PERMANENT_SESSION_LIFETIME": timedelta(minutes=60)
 }
@@ -238,16 +238,17 @@ 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:, :]
     conn.close()
 
-    fig = port.plot(title = 'Assets in portfolio',
-            labels=dict(index="Date", value="Price", variable="Assets"))
+    fig = port.plot(title='資產價格走勢', labels=dict(index="Date", value="Price", variable="Assets"))
     fig['layout'] = dict(
         autosize=True,
-        legend={'title': {'text': 'Assets'}, 'tracegroupgap': 0},
+        legend={'title': {'text': '資產價格走勢'}, 'tracegroupgap': 0},
         title= {'text': 'Assets in portfolio'},
-        xaxis= {'anchor': 'y', 'domain': [0.0, 1.0], 'title': {'text': 'Date'}},
-        yaxis= {'anchor': 'x', 'domain': [0.0, 1.0], 'title': {'text': 'Price'}}
+        xaxis= {'anchor': 'y', 'domain': [0.0, 1.0], 'title': {'text': '日期'}},
+        yaxis= {'anchor': 'x', 'domain': [0.0, 0.75], 'title': {'text': '價格'}}
     )
     fig.update_layout(legend=dict(
         yanchor="top",
@@ -395,9 +396,9 @@ def result():
 #     return render_template('result_tw.html')
 
 # handle login failed
-@app.errorhandler(401)
-def page_not_found(e):
-    return Response('<p>Failed</p>')
+# @app.errorhandler(401)
+# def page_not_found(e):
+#     return response('<p>Failed</p>')
 
 
 
diff --git a/templates/strategy_tw.html b/templates/strategy_tw.html
index f59c875..c38d865 100644
--- a/templates/strategy_tw.html
+++ b/templates/strategy_tw.html
@@ -57,7 +57,7 @@ div.card{
                     投資組合名稱
                 </div>
                 <div class="card-body">
-                    <input if="imput1" name="portName" type="text" class="form-control" placeholder="EX. " required>
+                    <input if="imput1" name="portName" type="text" class="form-control" placeholder="EX. 問就是歐應" required>
                 </div>
             </div>
             <div class="card">
@@ -127,23 +127,27 @@ div.card{
                         </li>
                     </ol>
                 </div>
-                <div class="input-group mt-3"> 
-                    <span class="input-group-text bg-info">訓練 / 回測數據比</span>
-                    <select id="ratio-select" class="form-select">
-                        <option value="0.5">5:5</option>
-                        <option value="0.6">6:4</option>
-                        <option selected value="0.7">7:3</option>
-                        <option value="0.8">8:2</option>
-                        <option value="0.9">9:1</option>
-                    </select>
-                </div>
-                <div class="input-group"> 
-                    <span class="input-group-text bg-info">最佳化目標函數</span>
-                    <select id="role-select" class="form-select">
-                        <option selected value="max_sharpe">最大化夏普比率</option>
-                        <option value="max_sortino">最大化索提諾比率</option>
-                        <option value="min_volatility">最小化波動率</option>
-                    </select>
+                <hr>
+                <div>
+                    <div class="d-flex p-2 mt-2 font-bold text-lg">策略參數選擇</div>
+                    <div class="input-group"> 
+                        <span class="input-group-text bg-info">訓練 / 回測數據比</span>
+                        <select id="ratio-select" class="form-select">
+                            <option value="0.5">5:5</option>
+                            <option value="0.6">6:4</option>
+                            <option selected value="0.7">7:3</option>
+                            <option value="0.8">8:2</option>
+                            <option value="0.9">9:1</option>
+                        </select>
+                    </div>
+                    <div class="input-group"> 
+                        <span class="input-group-text bg-info">最佳化目標函數</span>
+                        <select id="role-select" class="form-select">
+                            <option selected value="max_sharpe">最大化夏普比率</option>
+                            <option value="max_sortino">最大化索提諾比率</option>
+                            <option value="min_volatility">最小化波動率</option>
+                        </select>
+                    </div>
                 </div>
             </div>