From 6e596b18d9de39152f0a9722a333705f950f57b9 Mon Sep 17 00:00:00 2001 From: Shivansh Anand Date: Tue, 19 Mar 2019 06:39:24 +0530 Subject: [PATCH 1/4] Redirect issued solved. --- db.sqlite3 | Bin 241664 -> 241664 bytes myapp/__pycache__/views.cpython-36.pyc | Bin 4749 -> 4888 bytes myapp/views.py | 5 +++++ static/js/questions.js | 1 + 4 files changed, 6 insertions(+) diff --git a/db.sqlite3 b/db.sqlite3 index 639c21aa27cfb8397809203d12f2a68994576b01..393f515b0eb5aed16a0bc8478790e322f1829286 100644 GIT binary patch delta 1816 zcmah~U2M}<6t?5EP29#ebeqc0klJnqA#mdBpE&Nc4L5Dlls0KXN$O})>-;ov;y5OM zZHiD~Y!4tF27QQ-*w`ebNz>5AB9WJ=+N3>B8rs7ico^La5sO0t-|E}WUKC&Doki5s_{#agyq!XbYqq7HVf=6FnuW6THbncQ zE))9oIdSL8sqU_hsgH-mJmmQ-=T6sDuB34}UXhm+#>FpI;?>H6yqJm2gcf5yiH>De zWoqUK42-I(lnpDvnQ&gp=8W-BEtVbQ0;B%r;LH>)(SAx=)_H&4o0Vt*#iUx|Y=yoobsBt4LQY^|*ax{=h z`qXMXcmC6%!&GoIlAl@@sj2LQ63Yj&QglKIj`}$%e+0&6lG)&>1PvXml=Ux3*<^NV z*+^TX-lZuhkQ7T&bUy`$DR!9S95hP_0&J{ZnCR>Tc`!~qY7n1q5<~yD@LdRk46Tax zfyVeZ-%~h7q!ExM?hxq)u`UrSClR~{nG-F$`)n4gI4~dxG6i)n6&$1aure8)EqQ&M zKj%}$P}MJSUX>RrBQbsYu|$T1!ZV2!1EHHQWt6I{l`^s>YsnXBl*27BEEFEo%%u!u zSMO}x+GfO|hFNA9at>Z#D2{IYardns@b`$b2zUs71J~;Z*U=FZake@AEjmnec3>!K z@ifn`p~V5rVAZ?U(PIYOfc=(d=muI0;TX7qfcxM!xX~mIntld=zy{DQnUKYsw}U1P z5YMl4JvC>#WHEs?1l$B`jcxPaf%?sY$@V($W(8VsyJ(&hIEv>OfiX7?WT@X_vh^Xv zWm})2q1(1{3O8Gk9lR)_9~IJtLRw8h>Lt!EE)nhES(bv_D-h^*rq@=Ul2k>@wcIo1vR)c?I(4;Day-t$ zktpPyubfy{66H#usx<#rUZqI>4NGx0E)q@1EC28`A+f9s=d z9#_s;o}3DXmt_6unCR3qg>u1>)zj@vQd%-qY{|^aYN|D&780#DVw9&cX$%rrk> zF%ee~5GAe{oA`xs;`f>@$cJy(MATZ7X~E%Bnb1fjB*sHbW;`KPOL31lRZ@_AWbAzPx#)mfΠ=mJkmnGq z2;OidkoGM4Yg~0P!j4dp)Tmh8f5@L6I~rXGCuK&93o-HEyG*x>opP{@n`WT79{t61 z#W;ia5byxpGvwa_M5oz`qGofu!?0`f*q^|Jo0|{sn(%{7^E|c*>}GSTI4}%1O5X(T zBUkm)V0GG_+HS_IhO6@fdpo)jo5e5`Mc?nha0p3AlhCMf zmV_J$Nt$FxmgLC#g*j~hgb|!D+7ml~bt4Gca<-uUzkmh0NXV1WZCnr}O_BeJ)l!Cm zjaFrEf(>K(bFvJQy$8RD@3DSq-EI7W t9$2uGU7q@-Ggx)!*5$!)4nc5nZvOZPj)48>$sP3{b7dIS47x`dnvc^bIGI6pN|DD>;yvcU77rH8NJ|m7TferP%DBf7y(LY$V&Z?oB0tWbwBqigJi*y=eE;dM zJ8E`m-|UaepAU{sUO01BQS;HE@aWJNQ;J;3o{Ns3IX@AZ$f z(mITg-ZPv{rn|FxqIa^dBNggPcZQRR?p!i4IHD(phxH!Q`$Gc`o6mmqnfmoiw=t5M zcnyq_rWhlJqNlrtlW9ZM@+n0t<#KxIY{*c1!$$s?tR*@pw8XKXcCxEgm6cY%9P-Pm zPnKh{8Vf}N(Qr6;M70)Yx|~k>67q1|qCaoaL+=YxgAh7o#@&t9@r66GNa!kp5xVO7 z&Z1R=nkU>>%+>YBbrGK$jH#hmC>jVxf@*8Xdbn}mp7<%9Mz9U{VX4wq#qDMLJ!Kv0n3LcUA}~YX513*4IjDo@D9=8BTkMf3$LlLI{ao`w zFIS5Y&kFOnc{i^d@hcI(67{nKtFr%%!CQ{+oh~?RN0n@X{qGp(a(^TV^9U{gqSq*r ru1Ux>>+;mj);5W=Vv{h>w(+eXTxu5)G~=%tD!&)Ffc@Yq_i@uJ|7`Xp diff --git a/myapp/__pycache__/views.cpython-36.pyc b/myapp/__pycache__/views.cpython-36.pyc index 22210d4099f64db1329029bc8bf08f04891135a7..e8aa5997b9a711bf284e07b7b65395b5a0ae3029 100644 GIT binary patch delta 386 zcmeBGouS5M%*)FaYdaxETV^BIS5{vI1_p*2hAf6G#w?~3#%!h{u@dGKre?-qh7y(< zh8o6ZreFq5X1^jvpt>qf{i6KRoYaz%R87_*L7+&H7>M8p5o|zWvJjggCy2qo$j8Vr z*@I1n%I24|8Sq&FjW32b(5|Za}v}ywuDvfw9PG@-g1& zj4_kr_|zFqCb#jadDSp9Gcq!i2&Axq{0UadlqFcpUc#EfUc;6p)Xc=l0HlS1SOkbg zfmjTP#erA?h=pp{Q#j^u)N+(aPJYKXfl+F5J--j5%H-qxbJ@Bz>% delta 275 zcmbQC)~m{8%*)Gl-(W(FgY-tOudKpc3=9k<3^fcjjLl5J44RC7nv9cu*bGgWfZ_~{ zMH)adnHj_e0uT+t&Ols@P2+nu11<}YBv|)mUG_9aMw`u3IQUo@Jtr^b?H90PWB}Tg z#gN6=%rJqm$ZE0^-*m>1$+!5_8FeNz@vAwdur)IVLzFOO3DmNeu%@uruw@B0Gchs% zX(1pM24WE)76oE4AQlH=!5a1yjyW8)93>Kyi})unN={}L@R=MUFq5qv Z%LpD}T(tS2pdKS93kM4aFOMCMGyseHIlKS> diff --git a/myapp/views.py b/myapp/views.py index 1ada31f..5df95c6 100644 --- a/myapp/views.py +++ b/myapp/views.py @@ -50,10 +50,14 @@ def l_out(request): def intro(request, filename): + if request.user.userdata.current_reality == 0: + return HttpResponseRedirect('/roulette') return render(request, filename) def quiz(request, filename, basename): + if request.user.userdata.current_reality == 0: + return HttpResponseRedirect('/roulette') return render(request, filename) @@ -151,6 +155,7 @@ def getquestion(request): request.user.userdata.current_reality = 0 request.user.userdata.save() question = Question.objects.get(question_no=1) + roulette(request) return HttpResponseRedirect('/roulette') score = request.user.userdata.score print("correct_choice=", question.correct_choice) diff --git a/static/js/questions.js b/static/js/questions.js index 759b34f..d37858b 100644 --- a/static/js/questions.js +++ b/static/js/questions.js @@ -79,6 +79,7 @@ $(document).ready(function () { xhr.setRequestHeader("X-CSRFToken", csrftoken); } }); + if(counter%5==0 && counter!=0)window.location.href='roulette.html'; $.ajax({ type: "POST", url: "/answer/ajax/post", From ed17bba12291fe098929976aa75cda4b314a83b9 Mon Sep 17 00:00:00 2001 From: Shivansh Anand Date: Tue, 19 Mar 2019 06:55:26 +0530 Subject: [PATCH 2/4] redirect issues solved. --- db.sqlite3 | Bin 241664 -> 241664 bytes myapp/__pycache__/views.cpython-36.pyc | Bin 4888 -> 4873 bytes myapp/views.py | 1 - 3 files changed, 1 deletion(-) diff --git a/db.sqlite3 b/db.sqlite3 index 393f515b0eb5aed16a0bc8478790e322f1829286..c958fb80bbd2f49319b7431c56fa2959c0c82b67 100644 GIT binary patch delta 1006 zcmaizZ)h839LMjuGsz{k_jE8A)m2irN$0%V^W4AWGGtzRAx+x5n3^`byfC@6P15Aj zCUr?Kfw8pcU?Ae`i#TCbQ5X!yl)&frJ|LL8!_H77@TY&*`+)9xzv`Ek={Q3!6=Znf4vdhHa^TR zn3dGVfnauYY*tKcWD@0M#^m){3hN!)HaaEI>qf_QaX9hsfjIu~$rc+|zEH#)U)(P>+29kjN-=rrpEdA+_;6q}V$ z1>ycjH%M^wkrj_3g1`xiAjzTr?)53}G3GDA$LtZX22a3g_&prJ_n19quYV+ek2!sk z(!rC8^1Dc!(o#~y)k=#p8KeLrS;x4$NDT_%XllN3#C!C@8n+ZL~IF}szTtTofijYJrU@m#SI(@V>X z(|o;dB${|ZEha1@YT@F1!@liOCDIg$BA1&FF>obo+E}#mXjU*4y@KJX4>6a+;U z27iA;`nvQC0e^$n;fx#MWjHeH86t)OP1Aq|n?BOhyPTt*8O4~zJd0fyk;M`#vmrLj zDlA65cXE^hIQIx%WQM4x3BuhxSRSVD=BcNG6r^{0zAiOJ(mU=~bZGx2EkM9CU~{y0 guTF8jAFfiNBQBYH0yu&MPC~LINQ1Gf)Xy*c10w$!rH;|TB%FQU7k_aa1S5ai%qEGKEQ@P%NbOi@?AU3# zk-rjZ0qua)1MLo>2PPqLnzjLowA?Br?hJ9@#GwNrabjowsNlgsAR+ON@BQ9;zu)`m zZ69*mhunKl(~aF{(sbj~HTfK!9^X8tt<6&uHO)ebyF1rEo;ddF%mEA86XWFLN8u2C zYd3jv>z&!~RQ}ph(nq4`lKA?-BUf9bDLQ7~iN?fU$LeiWzwG4FN?l*AKyyVxHC!32Vy`K?8v%*rf7FzQj^FSs zzv!rr(y+4qhP_(a$o);C*m*R|(Y3-ALwkxeYXg#c2r@JRO|8(dvtHL~?tQRy396Zj zpC2Y+-c=mKFSxp$ z=Q)^wI3b9^bP>hL^_L#JAEbn60+EO)MIpiC`wvckcI*{yhXOx?ufdn2R}bmTr2Gku zx!sHGWaohHpJIaYD11o2IYx^tH`)1-?wcp3L6!pFg3rN6;2NldEO;RxI1fh0tD(r; zKP81H^=fGIFDkJ}TtEoNC*R))J$q`30vdNaX#9{H-ToqUbL*`$3`@QJsl$zbXlXA6o zvtF^G6dN`)(#hGWq&! zIohu>5s3>P?NPkQ%u*En5X92*FMvfc9*I1P2TOPid4za`c@*pvctrTSYs_Pd3^%hd T3U4zD!Ds%&P8Qx}zB}_fajPZ$ diff --git a/myapp/__pycache__/views.cpython-36.pyc b/myapp/__pycache__/views.cpython-36.pyc index e8aa5997b9a711bf284e07b7b65395b5a0ae3029..7d46a8b67969ec41aeb8e4051770c0328c08334b 100644 GIT binary patch delta 151 zcmbQC)~Uv6%*)F)!)Zbc&qhv7J^?#M28J4jEQTz`W`+rjMOKrY_@*<4OuogZ&Zsk) ziC@hrg{_$}7@~wJOQ4p$gf)e|hAm65nTe4BNDBe6Fc6CXu_zFW0kJp`3)ZlwaLnPT p