From 4802f0a20dcb5df600d252663bd1ede35576ab73 Mon Sep 17 00:00:00 2001
From: bigJIU <1572204178@qq.com>
Date: Thu, 10 Nov 2022 20:12:06 +0800
Subject: [PATCH] Add Hidden Finish

---
 .idea/workspace.xml                  |  10 ++-
 IDManager.py                         |  17 +++++-
 __pycache__/IDManager.cpython-39.pyc | Bin 1671 -> 2102 bytes
 __pycache__/main.cpython-39.pyc      | Bin 3486 -> 3552 bytes
 data/annotation.csv                  |   8 +++
 data/questionare.csv                 |   5 ++
 main.py                              |  13 ++--
 templates/GameAnnotation.html        |   5 +-
 templates/GameOver.html              |  88 +++++++--------------------
 9 files changed, 69 insertions(+), 77 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c35871b..903b913 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,12 @@
   <component name="ChangeListManager">
     <list default="true" id="c32bfd4e-6189-47f3-9d6c-c1825d3d7e5f" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/IDManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/IDManager.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/data/annotation.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/annotation.csv" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/data/questionare.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/questionare.csv" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/templates/GameAnnotation.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameAnnotation.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/templates/GameOver.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameOver.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -159,7 +162,7 @@
       <workItem from="1667456828218" duration="24361000" />
       <workItem from="1667898094682" duration="1595000" />
       <workItem from="1667998268807" duration="2593000" />
-      <workItem from="1668064138807" duration="1888000" />
+      <workItem from="1668064138807" duration="4005000" />
     </task>
     <servers />
   </component>
@@ -178,7 +181,8 @@
     </option>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/MarioWeb$test.coverage" NAME="test Coverage Results" MODIFIED="1668079915300" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1668079537189" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
+    <SUITE FILE_PATH="coverage/MarioWeb$test.coverage" NAME="test Coverage Results" MODIFIED="1668079935841" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1668081798673" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
+    <SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py___1_.coverage" NAME="Flask (main.py) (1) Coverage Results" MODIFIED="1668079945407" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
   </component>
 </project>
\ No newline at end of file
diff --git a/IDManager.py b/IDManager.py
index 121f2a7..f8ba428 100644
--- a/IDManager.py
+++ b/IDManager.py
@@ -2,9 +2,11 @@ import random
 import csv
 class idManager():
     levelNum = 200
+    timeMin = 1
     ip_dic = {}
     ip_recent = {}
     ip_control = {}
+    ip_time = {}
     def __int__(self):
         self.levelNum = 200
 
@@ -32,7 +34,20 @@ class idManager():
             self.ip_control[ip] = 0
         else:
             self.ip_control[ip] = 1
-
+    def getTimes(self,ip):
+        print(self.ip_time[ip])
+        if ip not in self.ip_time.keys():
+            return 0
+        else:
+            if self.ip_time[ip]>=self.timeMin:
+                return 1
+            else:
+                return 0
+    def addTimes(self,ip):
+        if ip not in self.ip_time.keys():
+            self.ip_time[ip] = 0
+        self.ip_time[ip] = self.ip_time[ip]+1
+        return self.ip_time[ip]
 
     def getControl(self,ip):
         return self.ip_control[ip]
diff --git a/__pycache__/IDManager.cpython-39.pyc b/__pycache__/IDManager.cpython-39.pyc
index 510d907d8331a9983b6228e0f1d1ce928b3d32f4..4981508ddbb59809e31f1c571ab9bbf998860d79 100644
GIT binary patch
delta 955
zcmZWnJ8u&~5Z>8)?VTTS9z2p*#-OAykwOz9B+|K{!4#P4gcMnxlexrkqP<g)kR=x&
zL4#1V{D4rp1qmT)3Vs09{e%1qW-jq1gk8-yyR+ZielvUTE8lC?UZoNU8lTRF{a@}$
z6(>l$NQ8hQln9}PGPGk6I%F=HN2bt1`<)1VbkHRqpofZl34IL6m$8Ip@)fLLm3$TF
zutt6k=W&624HvtjwUqfWc6y`UAkt^Q>DDtKIQjDgJX41b1mE_c4pQ6ZgM0vv`5_w{
zE-^A0ABFBPI*x{k_9$=;ijVw3ls?T*ss^lAYs}XR1t(`0#OF~z8l?^M(b{j@#F;`C
z#7DdR!%?aahb>DN*_p>dB458RNTRfT&TpE>_QQ!q-)WO2I|Qj1i#-^_vUm$1#=yH%
z`9&OqZX$GxQ;J*rj^0Aq6&y#=6;tb(=6+~a*0M9_NXMfz^GIMCA4IxL;mqS@Cm!h=
z%%tijSDT@z883*CtkY@22?DA#ZCN9Gvru$@b4Kh-CS43(7v*fzCNDsoLSDda<Z>vs
z!)1_P7AS8GE;g6JuF!SLZAslAm&-2H{v)=Bn2X&cTEcI{Vgp!$t3qcavui(Ez4rD2
zRdMkaTjr}h1=qZE8Y|aW{%akl(QZFE-Zr0|b(l9lo%M;s+U_uv7-|g547q5ZSBnfc
z8CDsZ40jpsG2CakyeeOD5qj3egu9@?zA}}qYDy|c`5VerGN;mCSK+j^S?+%yH3#m>
EU!9b^3jhEB

delta 545
zcmZWlyKcfT6piz6oIoh*V<?R>fe=$ChR&!9f~8%mEGWu#X#@(96VV^2)EW63I?%OM
zzoFld52(b_{z9(<q7t=r&#~`4_hElDpS?!pd9H@5|2~Vq%vA#>BfN1fB%p;lkkCl9
z&_uJ)DCl53X`u}!SjY@0*vJkraFAVap@v+8I(W!+XxwVOqtZ!W9Hr5ei_Pcidq}9f
zB4fhdo{3NN4UsSU<<P{oC5^I-r+^9BMDUoWMQP-P=o!LNVLi!0I_FD1&jm%t7Hk!A
zro0$ck-7|whqls-<GrR*?}ay2X<xn?vw?$}H7Q-}7%$R7EatmzRd#7BC(d!$&&_!;
z*y;m$XZEE*yB7yDxj55K(~;M7O)U9CgVuq{c@#;(Cvm>)%C6lZo*dhqGxZ&!rl6_d
zTmh3S`{dqN$F_pMLi^_l9Rmhheu}_|x!cTSO{O!O>6HSX=&1^U0+sTwmh@Tc7g)S=
A!T<mO

diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc
index 3b0b9e39b0fbed34c1fa0f60d9077d47253b03f3..36656570a67fecb3bcb2f469cf12c8ec6f5d9768 100644
GIT binary patch
delta 441
zcmXAm&r1S96vy|?{u)QOAL1bsYw0GE5Y(}gL>I|OBiKtV&aQ5$$T)hil@6Ucc-ng?
zbPmFQCOmcRzv#_2@IHLs@cq8WFz=<GlH)rL)9}3g_B;76C$Vi?1acyV$%p+6uy!c}
zs3+CT`HO)zidDxNj}TIOgt;Q&@I-_sbxvLZ)QvF*smG9Z=F*C_70ih=m$sy_789-)
z6%8bCv#52A6~Uaj%qVB7SensgmRqsT?FG4QX%%`U^0;`Gxo)=F?#0ya3&37f5uP4S
zhBN2V9|X;5AZk51=vQE4h0!n?_bNGID(9BMp2C4bG1+HFrylh=Z%2b*?9px@Qzg`M
zD~52D?GWM7Xmk^Ff}s>=*d}+ZTyCHk7Z4h;2m=Zh76TU;VPw5vE<l)kW+x{e>5M!Y
vM*ZNPN5adbYUIn_212oo`G4#vRYUkmJNFHZ<k)%GWjK;<0V`1a3$@@69HL(}

delta 348
zcmXYtO-=$a7>4_`15@e@$WB6{s4Eh~4b+7icc{2AY-B<Uj{K$+7do@z2u)lXS-CbG
z#I2c?Uch(+zY?3gPu@Q1Puj2QOErwbP!JqP-@|V39$Me?`pVch{|VS?p9_F9+bA3k
z7_Q-%6U^)eVaPp57*Ks_sH6)3XIM%MP00VuOTpw`^9d{=rPzGK6G*6J6@v7TMCK}_
z?=30rF39`>u1VduKZWW+#(MMdV|X5o)Ww6+jXN_M)`iaD&3emW+o9r6w8vuaN_*Jr
zOz${VL$rB3ZK<vr8(ng4jZJJ>fG=!CGM=19CTgOYIZdbl4*7Ki)Y$4n)Bu$I-I$j$
n+MTv}FCMB}8SBiNU>7>}IrxO8orIloz(MdLh%(0?b4UCE2<J+o

diff --git a/data/annotation.csv b/data/annotation.csv
index 6e4caf4..5223c4b 100644
--- a/data/annotation.csv
+++ b/data/annotation.csv
@@ -10,3 +10,11 @@
 10.16.33.201,28,73,A

 10.27.169.251,160,10,N

 10.27.169.251,143,173,N

+127.0.0.1,139,181,N

+127.0.0.1,58,70,B

+127.0.0.1,83,183,N

+127.0.0.1,74,191,E

+127.0.0.1,22,188,A

+127.0.0.1,11,162,A

+127.0.0.1,156,22,E

+127.0.0.1,47,30,E

diff --git a/data/questionare.csv b/data/questionare.csv
index 5498ca9..db31561 100644
--- a/data/questionare.csv
+++ b/data/questionare.csv
@@ -46,3 +46,8 @@ IP,Style,Frequency,Age,Gender
 127.0.0.1,D,E,D,,

 127.0.0.1,,,,,

 127.0.0.1,D,,,,

+127.0.0.1,D,C,G,,

+127.0.0.1,D,A,A,A,

+127.0.0.1,,,,,

+127.0.0.1,,,,,

+127.0.0.1,,,,,

diff --git a/main.py b/main.py
index 4e6df64..2c9a4a8 100644
--- a/main.py
+++ b/main.py
@@ -57,12 +57,10 @@ def gameplay(id):
 def getJSONData(id):
     if request.method == 'POST':
         print("POST Game")
-        # print(request.form)
-        # print(list(request.form))
         resultList = list(request.form)[0].split(",")
         print(resultList)
         saveFile(replayDataPath, id + resultList[0][:-2], resultList[1:])
-    return "get!"
+    return "return!"
 
 
 
@@ -77,16 +75,19 @@ def gameanno(id):
 
 @app.route('/annotation/radioresult', methods=['POST'])
 def getRadioData():
+    ip = request.remote_addr
+
     if request.method == 'POST':
         print("POST Eval")
         result = request.form
         print(result)
-        ip = request.remote_addr
         ipRecent = idm.getRecent(ip)
         idm.write_csv(annotationPath, [ip, ipRecent[0], ipRecent[1], result["fun"]])
-
+        idm.addTimes(ip)
         # saveFile(evalDataPath,"gameanno",request.json[0]+request.json[1]+request.json[2])
-    return render_template("GameOver.html")
+    finish = idm.getTimes(ip)
+
+    return render_template("GameOver.html",finish = finish)
 
 
 
diff --git a/templates/GameAnnotation.html b/templates/GameAnnotation.html
index b009226..2b545ad 100644
--- a/templates/GameAnnotation.html
+++ b/templates/GameAnnotation.html
@@ -17,7 +17,6 @@
   
   <script src="../templates/Web/dynamics.js"></script>
   <script src="../templates/Web/font_3071663_oravow8bb8q.js"></script>
-  <script src="../templates/data.js"></script>
   <!-- Custom styles for this template -->
   <link href="../templates/Web/scrolling-nav.css" rel="stylesheet">
   <link href="../templates/Web/css2" rel="stylesheet">
@@ -221,6 +220,10 @@ function Replay(id){
   </script>
 
   <script>
+    function closeReplayWindow(){
+    var replayWindow=document.getElementById("replayWindow");
+    replayWindow.style.visibility = 'hidden';	
+}
     window.onload=function(){
         closeReplayWindow();
     }
diff --git a/templates/GameOver.html b/templates/GameOver.html
index 6561dbc..43c58fd 100644
--- a/templates/GameOver.html
+++ b/templates/GameOver.html
@@ -106,58 +106,7 @@
   display:block;
   line-height:30px;
 }
-.option-input {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  -ms-appearance: none;
-  -o-appearance: none;
-  appearance: none;
-  position: relative;
-  top: 10px;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  height: 30px;
-  width: 30px;
-  transition: all 0.15s ease-out 0s;
-  background: #cbd1d8;
-  border: none;
-  color: #fff;
-  cursor: pointer;
-  display: inline-block;
-  margin-right: 0.5rem;
-  outline: none;
-  position: relative;
-  z-index: 1000;
-}
-.option-input:hover {
-  background: #9faab7;
-}
-.option-input:checked {
-  background: #0d007e;
-}
-.option-input.radio {
-  border-radius: 50%;
-}
-.option-input.radio::after {
-  border-radius: 50%;
-}
 
-@keyframes click-wave {
-  0% {
-    height: 40px;
-    width: 40px;
-    opacity: 0.35;
-    position: relative;
-  }
-  100% {
-    height: 200px;
-    width: 200px;
-    margin-left: -80px;
-    margin-top: -80px;
-    opacity: 0;
-  }
-}
     
   </style>
 
@@ -191,7 +140,17 @@
       </div>
     </div>
   </nav>
-
+<script>
+      window.onload=function(){
+        console.log("{{finish}}");
+        console.log("{{finish}}" == "1")
+        if("{{finish}}" == "1"){
+          document.getElementById("Finish").style.visibility = "visible";
+        }else{
+          document.getElementById("Finish").style.visibility = "hidden";
+        }
+      }
+</script>
 
 <section id="Over">
     <div class="container">
@@ -200,18 +159,17 @@
         </h1>
         <br>
         <button onclick='window.location.href = "/again"'>Play And Annotate Again!</button>
-        <button>Finish!</button>
+        <button id = "Finish" onclick="if(firefox) {
+          var opened=window.open('about:blank','_self');   
+          opened.opener=null;
+          opened.close();
+       } else {  
+          window.opener = null;
+          window.open('', '_self');
+          window.close();
+       }
+       ;">Finish!</button>
       </div>
-  <!-- <div class="row clearfix">
-    <div class="col-md-2"></div>
-    <div class="col-md-8">
-      <button onclick="getRadioValue()" class="cirButton"> <h3>Submit</h3> </button>.
-      <br><br>
-    </div> 
-
-
-    
-  </div> -->
 </section>
 
 
@@ -223,9 +181,7 @@
   <footer class="py-5 bg-dark">
     <div class="container">
       <div class="row clearfix">
-        <!-- <div class="col-md-2 column">
-          <img class="img-fluid" alt="" src="../templates/Web/Wechat.png" style="width: 100px;">
-      </div> -->
+
         <div class="col-md-10 column"> 
           <br><br>
           <p class="m-0 text-center text-white">Copyright © Jialin Liu</p>