From 8cf80f7569655d87c6e8a96b77a81586893d702c Mon Sep 17 00:00:00 2001
From: Doveliyuchen <yl6394@nyu.edu>
Date: Thu, 30 Mar 2023 10:20:04 +0800
Subject: [PATCH 1/2] Update GameQuestion.html

age and gender
---
 templates/GameQuestion.html | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/templates/GameQuestion.html b/templates/GameQuestion.html
index 14a9bdd..dd52c32 100644
--- a/templates/GameQuestion.html
+++ b/templates/GameQuestion.html
@@ -312,6 +312,22 @@
               None of above
             </label>
             </p>
+            <script> 
+            function renew( ){
+              if ($("input[name='gender']").val()=="D"){ 
+                $("input[name='gender']").val($("input[type='text']").val()) 
+              }
+              
+               if(  $("input[name='age']").val()=="A"){
+                $("input[name='age']").val($("input[type='number']").val())
+              }
+              
+                   
+
+            }
+            
+            
+            </script>
 
             <p>
             <h4>4. How often do you play games?</h4>
@@ -340,12 +356,12 @@
             <p>
             <h4>5. What is your age?</h4>
             <label>
-              <input type="radio" class="option-input radio" name="age" value="">
+              <input type="radio" class="option-input radio" name="age" value= "A">
              <input type="number" value="" step="1" placeholder="Input your age">
             </label>
 
             <label>
-              <input type="radio" class="option-input radio" name="age" value="E">
+              <input type="radio" class="option-input radio" name="age" value="B">
               Prefer not to say
             </label>
             </p>
@@ -364,20 +380,10 @@
               <input type="radio" class="option-input radio" name="gender" value="C">
               Prefer not to say
             </label>
-            <script> 
-            function renew( ){
-              
-              $("input[name='gender']").val($("input[type='text']").val()) 
-                    $("input[name='age']").val($("input[type='number']").val())
 
-            }
-            
-            
-    
-            
-            </script>
+
             <label>
-              <input type="radio" class="option-input radio" name="gender" value=" ">
+              <input type="radio" class="option-input radio" name="gender" value= "D">
               Other: 
               <input type="text" value="">
              

From 76bf66e0831725abc6b00b1696b8acd83480b4c8 Mon Sep 17 00:00:00 2001
From: bigJIU <1572204178@qq.com>
Date: Thu, 30 Mar 2023 15:14:30 +0800
Subject: [PATCH 2/2] Before Accelarate

---
 fromServer/annotation.txt   | 17 +++++++++++++++++
 fromServer/annotation2.txt  |  6 ++++++
 fromServer/ques.txt         | 12 ++++++++++++
 main.py                     |  4 ++--
 templates/GameQuestion.html | 27 ++++++++++++---------------
 templates/Main.html         | 22 ++++++++++++++++++++++
 6 files changed, 71 insertions(+), 17 deletions(-)
 create mode 100644 fromServer/annotation.txt
 create mode 100644 fromServer/annotation2.txt
 create mode 100644 fromServer/ques.txt
 create mode 100644 templates/Main.html

diff --git a/fromServer/annotation.txt b/fromServer/annotation.txt
new file mode 100644
index 0000000..71186fb
--- /dev/null
+++ b/fromServer/annotation.txt
@@ -0,0 +1,17 @@
+fe5ff393-55d2-4684-b2b5-8cb19272dde7,53,122,N,
+385a4d26-20f6-497c-a720-0e86e41a9cc1,131,173,A,
+f6db5b9f-bebf-4f86-b80f-c49e55cde2a9,189,13,N,
+e13f1fc9-59f4-4585-aa3b-eb807afb3db9,61,118,A,
+d6feb5dc-b6d9-4f73-9688-29c33edb6d4d,172,177,B,
+d13e979d-7ecb-43ae-a6cb-c94bfee93d3a,150,108,A,
+f6db5b9f-bebf-4f86-b80f-c49e55cde2a9,169,185,N,
+e13f1fc9-59f4-4585-aa3b-eb807afb3db9,176,107,A,
+4a84a334-88c1-4fae-8fbb-447dcb10e516,136,28,B,
+d6feb5dc-b6d9-4f73-9688-29c33edb6d4d,59,24,A,
+b5d826e2-cc95-4d1c-b1e2-ae6971fa67e7,167,104,N,
+940ae292-bc5d-4607-ad43-9928777fb329,2,82,B,
+d13e979d-7ecb-43ae-a6cb-c94bfee93d3a,7,89,B,
+b5d826e2-cc95-4d1c-b1e2-ae6971fa67e7,153,184,B,
+acea72c7-0e2d-405a-9a5c-459840869add,33,49,E,
+940ae292-bc5d-4607-ad43-9928777fb329,88,69,B,
+acea72c7-0e2d-405a-9a5c-459840869add,42,144,B,
\ No newline at end of file
diff --git a/fromServer/annotation2.txt b/fromServer/annotation2.txt
new file mode 100644
index 0000000..49185cb
--- /dev/null
+++ b/fromServer/annotation2.txt
@@ -0,0 +1,6 @@
+e13f1fc9-59f4-4585-aa3b-eb807afb3db9,r,c,k,Collector-21,Killer-89,Runner-31,,
+f6db5b9f-bebf-4f86-b80f-c49e55cde2a9,c,k,r,Collector-21,Killer-81,Runner-35,,
+d6feb5dc-b6d9-4f73-9688-29c33edb6d4d,r,k,c,Collector-20,Killer-36,Runner-15,,
+d13e979d-7ecb-43ae-a6cb-c94bfee93d3a,r,c,k,Collector-77,Killer-91,Runner-16,,
+b5d826e2-cc95-4d1c-b1e2-ae6971fa67e7,r,k,c,Collector-81,Killer-63,Runner-17,,
+acea72c7-0e2d-405a-9a5c-459840869add,c,k,r,Collector-71,Killer-39,Runner-24,,
\ No newline at end of file
diff --git a/fromServer/ques.txt b/fromServer/ques.txt
new file mode 100644
index 0000000..ed2b436
--- /dev/null
+++ b/fromServer/ques.txt
@@ -0,0 +1,12 @@
+fe5ff393-55d2-4684-b2b5-8cb19272dde7,A,A,B,A,B,A,,
+385a4d26-20f6-497c-a720-0e86e41a9cc1,A,A,A,A,22,A,,
+a10c9649-0941-4ddf-8c50-c2d4c67d1d43,A,A,A,A,,C,,
+f6db5b9f-bebf-4f86-b80f-c49e55cde2a9,A,A,A,A,,C,,
+d6feb5dc-b6d9-4f73-9688-29c33edb6d4d,B,C,A,D,26,A,,
+acea72c7-0e2d-405a-9a5c-459840869add,A,A,C,C,22,A,,
+e13f1fc9-59f4-4585-aa3b-eb807afb3db9,B,B,A,B,24,A,,
+d13e979d-7ecb-43ae-a6cb-c94bfee93d3a,C,B,A,C,25,A,,
+4a84a334-88c1-4fae-8fbb-447dcb10e516,B,B,A,C,23,A,,
+940ae292-bc5d-4607-ad43-9928777fb329,C,B,C,A,,C,,
+acea72c7-0e2d-405a-9a5c-459840869add,A,A,C,C,22,A,,
+b5d826e2-cc95-4d1c-b1e2-ae6971fa67e7,B,A,A,B,22,A,,
\ No newline at end of file
diff --git a/main.py b/main.py
index 5a3cb8d..2690f86 100644
--- a/main.py
+++ b/main.py
@@ -55,8 +55,8 @@ def gamepreplay():
                        result.get("playedp"),
                        result.get("gamestyle"),
                        result.get("frequency"),
-                       result.get("age"),
-                       result.get("gender"),
+                       result.get("age")+result.get("myAge"),
+                       result.get("gender")+result.get("myGender"),
                        ""])
         idm.setControl(cid, result.get("control"))
         print(result.get("gamestyle"))
diff --git a/templates/GameQuestion.html b/templates/GameQuestion.html
index 14a9bdd..04a1cb0 100644
--- a/templates/GameQuestion.html
+++ b/templates/GameQuestion.html
@@ -340,8 +340,8 @@
             <p>
             <h4>5. What is your age?</h4>
             <label>
-              <input type="radio" class="option-input radio" name="age" value="">
-             <input type="number" value="" step="1" placeholder="Input your age">
+              <input type="radio" class="option-input radio" name="age" value="A">
+             <input type="number" name="myAge" value="" step="1" placeholder="Input your age">
             </label>
 
             <label>
@@ -364,22 +364,11 @@
               <input type="radio" class="option-input radio" name="gender" value="C">
               Prefer not to say
             </label>
-            <script> 
-            function renew( ){
-              
-              $("input[name='gender']").val($("input[type='text']").val()) 
-                    $("input[name='age']").val($("input[type='number']").val())
 
-            }
-            
-            
-    
-            
-            </script>
             <label>
               <input type="radio" class="option-input radio" name="gender" value=" ">
               Other: 
-              <input type="text" value="">
+              <input type="text" name="myGender" value="">
              
             </label>
             </p>
@@ -397,10 +386,18 @@
 
             </p>
 
+            <script>
+            function renew( ){
+
+              $("input[name='gender']").val($("input[type='text']").val())
+                    $("input[name='age']").val($("input[type='number']").val())
+
+            }
+            </script>
 
             <br>
             <p><b><input type="submit" value="Submit" class="cirButton"
-                  style="font-weight: 700; font-size: large; width: 60%;" onclick ="renew()" /></b></p>
+                  style="font-weight: 700; font-size: large; width: 60%;" onclick ="" /></b></p>
           </form>
 
         </div>
diff --git a/templates/Main.html b/templates/Main.html
new file mode 100644
index 0000000..7ac6198
--- /dev/null
+++ b/templates/Main.html
@@ -0,0 +1,22 @@
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <button onclick="showPage(1)">显示页面1</button>
+    <button onclick="showPage(2)">显示页面2</button>
+    <iframe id="page1" src="page1.html"></iframe>
+    <iframe id="page2" src="page2.html"></iframe>
+    <script>
+      function showPage(pageIndex) {
+        if (pageIndex === 1) {
+          document.getElementById('page1').style.display = 'block';
+          document.getElementById('page2').style.display = 'none';
+        } else if (pageIndex === 2) {
+          document.getElementById('page1').style.display = 'none';
+          document.getElementById('page2').style.display = 'block';
+        }
+      }
+    </script>
+
+
+
+</head>
\ No newline at end of file