w

step_question/apis/static/index2.html

@@ -60,7 +60,7 @@
         <h2 class="fs-title">裝修資料</h2>
         <h3 class="fs-subtitle">步驟 3</h3>
           <div class="fs-label">
-            <label class="fs-label"><i class="fas fa-chevron-right"></i>喜歡的裝修風格?</label>
+            <label class="fs-label"><i class="fas fa-chevron-right"></i>喜歡的裝修風格?(複選)</label>
             <input type="checkbox" value="簡單大方" name="q6" id="6a" />
             <label class="mr fs-label-info" for="6a">簡單大方</label>
             <input type="checkbox" value="北歐風" name="q6" id="6b" />
@@ -75,7 +75,7 @@
           </div>
           <br/>
           <div class="fs-label">
-            <label class="fs-label"><i class="fas fa-chevron-right"></i>預計裝修預算(不含活動型傢俱/廚具/空調/窗簾/主燈)?</label>
+            <label class="fs-label"><i class="fas fa-chevron-right"></i>預計裝修預算(不含活動型傢俱/廚具/空調/窗簾/主燈)?(單選)</label>
             <input type="radio" value="50萬以下" name="q7" id="7a" />
             <label class="mr fs-label-info" for="7a">50萬以下</label>
             <input type="radio" value="50~100萬" name="q7" id="7b" />
@@ -97,7 +97,7 @@
             <br/>
           </div>
           <div class="fs-label">
-            <label class="fs-label"><i class="fas fa-chevron-right"></i>喜歡的裝修風格?</label>
+            <label class="fs-label"><i class="fas fa-chevron-right"></i>預計裝修坪數?(單選)</label>
             <input type="radio" value="20坪以下" name="q8" id="8a" />
             <label class="mr fs-label-info" for="8a">20坪以下</label>
             <input type="radio" value="20~30坪" name="q8" id="8b" />

step_question/tests/dftest.py

@@ -14,7 +14,7 @@ import datetime
 from gspread_pandas import Spread, Client
 from oauth2client.service_account import ServiceAccountCredentials
 import os
-import thread
+import threading
 
 def save_sheet(df,filename,tabname,startpos='A1'):
 
@@ -28,24 +28,20 @@ def save_sheet(df,filename,tabname,startpos='A1'):
     spread.df_to_sheet(df, index=False, sheet=tabname, start=startpos, replace=False)
 
 
+def do_jobs():
+    db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/hhh?charset=utf8mb4')
+    cursor=db.query('SELECT sex,phone,email,building_case_name,building_case_type,decoration_style,decoration_budget,decoration_size FROM hhh.step_questions;')
+    df = pd.DataFrame(columns=('sex','phone','email','building_case_name','building_case_type','decoration_style','decoration_budget','decoration_size'))
 
+    idx=0
 
-db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/hhh?charset=utf8mb4')
+    for c in cursor:
+        df.loc[idx]=[c['sex'],c['phone'],c['email'],c['building_case_name'],c['building_case_type'],c['decoration_style'],c['decoration_budget'],c['decoration_size']]
+    #    df.loc[idx]=['okok',333]
+        idx+=1
+    save_sheet(df,'SurveyResult','result')
 
-#db = dataset.connect('mysql://jared:Sstc_5202@home.a4.monster:7036/finance2?charset=utf8mb4')
-
-#db=get_db()
-cursor=db.query('SELECT sex,phone,email,building_case_name,building_case_type,decoration_style,decoration_budget,decoration_size FROM hhh.step_questions;')
-df = pd.DataFrame(columns=('sex','phone','email','building_case_name','building_case_type','decoration_style','decoration_budget','decoration_size'))
-
-idx=0
-
-for c in cursor:
-    df.loc[idx]=[c['sex'],c['phone'],c['email'],c['building_case_name'],c['building_case_type'],c['decoration_style'],c['decoration_budget'],c['decoration_size']]
-#    df.loc[idx]=['okok',333]
-    idx+=1
-
-
-
-save_sheet(df,'SurveyResult','result')
+t = threading.Thread(target = do_jobs)
+t.start()
+t.join()