From 4188e697a1782a3a01b73bf8f61a30ebdb16fd2e Mon Sep 17 00:00:00 2001
From: bigJIU <1572204178@qq.com>
Date: Thu, 24 Nov 2022 15:44:32 +0800
Subject: [PATCH] Update Part2
---
.idea/workspace.xml | 9 ++---
IDManager.py | 4 ++-
__pycache__/IDManager.cpython-39.pyc | Bin 2570 -> 2963 bytes
__pycache__/main.cpython-39.pyc | Bin 3761 -> 5158 bytes
data/annotation.csv | 2 ++
data/questionare.csv | 16 +++++++++
main.py | 11 ++++---
templates/GameAnnotation2.html | 47 ++++++++++++---------------
templates/GameOver.html | 4 +--
templates/GamePlay2.html | 43 ++++--------------------
templates/GameQuestion.html | 2 +-
11 files changed, 62 insertions(+), 76 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 00e25b0..9d678f8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,12 +4,13 @@
+
+
-
+
-
@@ -173,7 +174,7 @@
-
+
@@ -193,7 +194,7 @@
-
+
\ No newline at end of file
diff --git a/IDManager.py b/IDManager.py
index 63ca591..9b917a8 100644
--- a/IDManager.py
+++ b/IDManager.py
@@ -4,7 +4,7 @@ import csv
class idManager():
levelNum = 200
- timeMin = 2
+ timeMin = 1
tutorialMax = 3
ip_dic = {}
ip_recent = {}
@@ -35,6 +35,8 @@ class idManager():
return self.ip_recent[ip]
def getLevel(self, ip):
+ if ip not in self.ip_dic.keys():
+ self.ip_dic[ip] = []
level = random.randint(1, self.levelNum)
while level in self.ip_dic[ip]:
level = random.randint(1, self.levelNum)
diff --git a/__pycache__/IDManager.cpython-39.pyc b/__pycache__/IDManager.cpython-39.pyc
index 906af83fc0a8acc303bbfdebb065bd211dc5e349..c05e56f6da93e54b43568aec517abf84225fc88b 100644
GIT binary patch
delta 699
zcmY+CJ!lkB5P;vj-M4?{F3XbKCFeyi(Yxg0Pe2I>ilRnPh-nN2BBF=8BzK%4zFn`7
zJtCM&ZNfA*LIO6{sRcX5%F1F9Y(xl_c2>@;iIDf0@6F7cH*enTz8J!Cu~jH|f(9Jh
zc=*-ZDu(cCEABVK(M_>D99F`kw3fo^9nl=i+;(`owbojR^xh{rvIl6v8yMVu3svy7
zNiGe9%;@&I@9>N4K!6vGmoR}Jjao(0*1<4H;rQz$aR!l>v8J(tLB
zBLwo8JF+hyHxBl;RVsG?L>_IWa7lzRu~YdR%7Usi7XB4-gfi;^LetPT>qCT0b)#O?
z)ebvyxa@USqU78>@6^eReS&}@cqB#eX?pN9`2Y5^6rBg-Ph%cTJa1lw8GK@1t{3TC
zUNSv`%Hne5Lf(=lWOjS~e$svvVNI24ag;2Q9?$Z9d1DUU5aRQF}IPTxJ52QvzcfHB6XG4fRWpXg!62&2L{&KPHK>vV(BWK1(o
uF=p|ZTb)y+##00b%)?VUhU1fXjtvW{Tnf
delta 395
zcmY+O+Ce1*^7>4ZJ24n^)MRP`zd!e
z)`Hevv)epvhsi51Nd&av3DVCmumDy9{3s-1v2)pR@m)9v3+v)NIQS+y_$k%Fz>2&L
zdAyRh&{t};UF)Q!BtOHncCO;h|oHEZ*v?H%sF}!Xze%dBP#a*U-1aEHOhY
z5_zIPtPmxlO!x%*k49U8Bk~c^oeZSk?*1)+Nz7sblbOa8mgciCj<{ktL2(a{3?JYJ
D^43c#
diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc
index 33b75c96f85c7bc47f60d44eaa84c1f4e8794e8a..aa757d0aaf558ab85713afa247d30d54a4e2df4b 100644
GIT binary patch
delta 2616
zcmai0%}-lL5P$nV%(MOM5+I=@0h|N~E(sqFYM8!+()9Y3Si
z0a&722cvEz64LN@_;BT3a^I8aVfM$9p+9?8+ITOIE-~J^sq+{=@>qMs(p|#YYU4+@
zne1cZ6*U>!X8Z&{sXlirWEhbVKB|x&g^VGR;HMPQtB`R-CirQE#1wJ{k+b}qLXHRr
zw?ALs{sNy=_)-2gpL(pNkMWEA(&Lj_x=)1p^aK4%2EX$e;Vkx}sex^cX=q@8&+yqz
z#x%}STKuy7oP8|^tgFEt4Z;{MgymEH(m`j*&4~|7qUdD``F6yMI+3A6L_XJlV^R5&
zF*CTsd_BYC4p{if59EZmT;RTWzW_Nu3?f(X#G=bN$X4@qxM~~~!I3$0l*QzCR)uxR
zLxH3H9RxQh(3CbEz-M>kcKOV_K17;3CIm>Mg#>L4Z<5$suSSk!*8a#4e%ZCqFYgB4
zOT1z)zm=l(N?rjnZkD^AJKC^pKt2zwUTZ@nZbBEn(!nL+-4tsgTLcs5ehBBYg}eua
zY+Q%^2*Gg@dmcG7J%(aJ{?PIa>6^31_8lOw8-;IXGer+NJg?Oj7q1WbCZEkob
z53K9!25;FkQX1DV-RxvK3@*XAyyJ1~aXn6|6C|4Xf-%Hy;8WwtW)2InR{Vo8848_dAg4q5idl6M9fT+<
zzX;CXN-e~$tho(-rH%Wg{EG-WCvL3?7+&^r*&W>v+|T4Q#pSeB^xP#;tA=Vy)=wBZ
z$umkGI8EXp3O`E0doESjyYsHMoVKx87BV?e^lc1Rjdla=rByvB(spLGN(9j9zZ9+S
z5KlxfrN@GN818PJLbY;eM0uCMJ?NKTdL?3v(#0|xiTReIC|+ad45~IHtf^J7
z|J9lsHH()L56H8J_!Ox%6F+TCVdeJ5Kt`%{e~)x_e+CZfu~Bt++6vnssblxip~o}0
z{)knu^=K>R2J@_~fNDUx*Mec{+~k(ZfIzi&;VjyKb142MLg74$xZQA3ys9eSCQUlp
zxB>NAYpSqeRG?PtM=@K7zC<;aPY|p1mVoNQD0P_o<=e2udYgNZADmngdGXOIOnpWB
zU6;Q)$Jhz^movdqvNLk3(yR}-r}hQeSO1ByD3aQS{Y&9Z9HNd!!O|%xXDC0YTdS_C
zC(9ivcTL2uX0jrN*K@2|&2d((g!-=6s;8>L3>I+(El4~iqbfHU+`+MLFD~ZXOnz~3
zA&zOo#of|U{J3wf6bpH{jSBFN{3bG6QSEL7=V?b^Bc+Z+Z4M5R$|M=GpiuGzL)^n={;YU2Rnj&0j!hz0QO{SUO`9IXHV
delta 1397
zcmZux&u<$=6yDigJDc^!wVjIK(!@?1+E{7gBrR=)tn$O5g{n=WCTh_Nu$Iom*|0y%
z+jRtyOAhoJiE1PcNI-I_$PsZzLY%m9>R~x^K>P=scyFCFX;iP~+nI0Qn|be>_xyD7
z=h3_~G-N9H%QOGsPu7$CS!O?(`fF^r#4CG@SNZs3GuEB2_!@#)XhZy4O?Gs0?(32V2qr!WOwDtw05cNkMRTTyDWQdhr~{~EWa_gSL4
zd|!two(uy78H6MU!VhE7ayW;51y0e2Q}Q46?Q*W|_@V>C34(AK=}1LTR4B@(_A4t%
zRe!evIizY
zlET5+9nbmlownl!7mz&+U;^jzJN0J$rLGpae%=*P?1sVAF}DlyKYg2>kz1K_ucxOU
z9ZYA!2txgs{fK;!{b>Frmi_4BZXAN^c-)Dd%g5X%<=@%P`>!BV)8P!h?7_B(?}$y|
zMWEB##C0V;l6N54x7^-
zQ|zfC2`O?B)jGYZnS<-&uIn2
zbJd}Yj%oOCg=ViIBzej-cBs^rop{|gu#N7ny1s~P19MDghuKxhtAbz~Zl|9;TqW+r
zjaej)!`+asY+07AQFi^84+|MqIbk^1Xp2C6(SaKqw9T8cS3J+AIQrVLJS*X2v6N4YR?EjeYqeHUhzu8>cH6aTqHjcD08QGyA^$8jx2d3E7Qwaz
zN}7gA`#;R)UH7Nn|2sX(u`^w<_PE>;W`0@2X_$?4Z6WGRnj!l
qzXc=T@I&79#0@H|=%)OAcye4bn0Yw#JTpyP8~8qL7$(bNjsFj2fF$7n
diff --git a/data/annotation.csv b/data/annotation.csv
index 849ba38..a6e2570 100644
--- a/data/annotation.csv
+++ b/data/annotation.csv
@@ -1,2 +1,4 @@
IP,A-ID,B-ID,Anno,
127.0.0.1,28,96,A,
+127.0.0.1,19,166,A,
+127.0.0.1,193,112,E,
diff --git a/data/questionare.csv b/data/questionare.csv
index d523dc8..86a52e3 100644
--- a/data/questionare.csv
+++ b/data/questionare.csv
@@ -69,3 +69,19 @@ IP,Style,Frequency,Age,Gender
127.0.0.1,,,,,,
127.0.0.1,,,,,,
127.0.0.1,D,B,B,A,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,,,,,,
+127.0.0.1,A,,,,,
diff --git a/main.py b/main.py
index fbcefb3..b0476cd 100644
--- a/main.py
+++ b/main.py
@@ -100,18 +100,19 @@ def getRadioData():
@app.route('/stage2pre')
def getStage2():
- return redirect(url_for('gameplay2', id=request.remote_addr, w = False))
+ return redirect(url_for('gameplay2', id=request.remote_addr))
@app.route('/stage2game')
def getStage2game():
- return redirect(url_for('gameplay2', id=request.remote_addr, w = True))
+
+ return redirect(url_for('gameplay2', id=request.remote_addr))
@app.route('/gameplay2/')
-def gameplay2(id, w):
-
- return render_template('GamePlay2.html', gamelevel=idm.getLevel(id), control=idm.getControl(id), w=w)
+def gameplay2(id):
+ print("id "+id)
+ return render_template('GamePlay2.html', gamelevel=idm.getLevel(id), control=idm.getControl(id))
@app.route('/annotation2')
diff --git a/templates/GameAnnotation2.html b/templates/GameAnnotation2.html
index 96c6a84..fd14f67 100644
--- a/templates/GameAnnotation2.html
+++ b/templates/GameAnnotation2.html
@@ -200,18 +200,24 @@
+
-
+
@@ -164,7 +164,7 @@
window.location.href = 'about:blank';
window.close();
}else{
- window.location.href = 'about:blank';
+ window.location.href = '/stage2pre';
}
">Finish!
diff --git a/templates/GamePlay2.html b/templates/GamePlay2.html
index 534548e..72a3880 100644
--- a/templates/GamePlay2.html
+++ b/templates/GamePlay2.html
@@ -2,7 +2,6 @@
-
@@ -119,51 +118,23 @@
diff --git a/templates/GameQuestion.html b/templates/GameQuestion.html
index d382b01..1f5704c 100644
--- a/templates/GameQuestion.html
+++ b/templates/GameQuestion.html
@@ -17,7 +17,7 @@
-
+