From e2abea7831d63f9e41efbe29c815ebbd55db3495 Mon Sep 17 00:00:00 2001
From: bigJIU <1572204178@qq.com>
Date: Thu, 10 Nov 2022 21:14:06 +0800
Subject: [PATCH] Add Finish to exit

---
 .idea/workspace.xml     |  7 ++-----
 data/annotation.csv     |  2 ++
 data/questionare.csv    |  1 +
 templates/GameOver.html | 14 ++++----------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 903b913..7ffa4d1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,11 +3,8 @@
   <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" />
@@ -162,7 +159,7 @@
       <workItem from="1667456828218" duration="24361000" />
       <workItem from="1667898094682" duration="1595000" />
       <workItem from="1667998268807" duration="2593000" />
-      <workItem from="1668064138807" duration="4005000" />
+      <workItem from="1668064138807" duration="5381000" />
     </task>
     <servers />
   </component>
@@ -182,7 +179,7 @@
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <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_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1668084426080" 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/data/annotation.csv b/data/annotation.csv
index 5223c4b..86f936b 100644
--- a/data/annotation.csv
+++ b/data/annotation.csv
@@ -18,3 +18,5 @@
 127.0.0.1,11,162,A

 127.0.0.1,156,22,E

 127.0.0.1,47,30,E

+127.0.0.1,47,30,E

+127.0.0.1,136,104,E

diff --git a/data/questionare.csv b/data/questionare.csv
index db31561..3e8b8f5 100644
--- a/data/questionare.csv
+++ b/data/questionare.csv
@@ -51,3 +51,4 @@ IP,Style,Frequency,Age,Gender
 127.0.0.1,,,,,

 127.0.0.1,,,,,

 127.0.0.1,,,,,

+127.0.0.1,,,,,

diff --git a/templates/GameOver.html b/templates/GameOver.html
index 43c58fd..d010375 100644
--- a/templates/GameOver.html
+++ b/templates/GameOver.html
@@ -159,16 +159,10 @@
         </h1>
         <br>
         <button onclick='window.location.href = "/again"'>Play And Annotate Again!</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>
+        <button id = "Finish" onclick="
+         window.location.href = "about:blank";
+        window.close();
+       ">Finish!</button>
       </div>
 </section>