From 96bc35552a134e22a080df1dce0ffcd874aa3753 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 14 Nov 2016 15:11:37 +0800 Subject: [PATCH 001/112] =?UTF-8?q?=E6=9C=AA=E6=94=B6=E8=97=8F=E7=9A=84?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=92=8C=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c95366835..cf1fc7f4e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1653,8 +1653,8 @@ class UsersController < ApplicationController shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id) shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id) @page = params[:page] ? params[:page].to_i + 1 : 0 - user_project_ids = (@user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")" - user_course_ids = (@user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")" + user_project_ids = (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.favorite_projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")" + user_course_ids = (@user.favorite_courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.favorite_courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")" course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')" project_types = "('Message','Issue','Project')" principal_types = "JournalsForMessage" From 0ed878e718df24c2b75489ce6e675f10d6aa9816 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 14 Nov 2016 15:36:36 +0800 Subject: [PATCH 002/112] =?UTF-8?q?404=E3=80=81403=E3=80=81500=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- app/views/common/403.html | 56 ++++++++++++++++-------- app/views/common/404.html | 59 ++++++++++++++++++-------- public/500.html | 48 +++++++++++++++++++-- public/images/404/pic_403.jpg | Bin 0 -> 26392 bytes public/images/404/pic_404.jpg | Bin 0 -> 28199 bytes public/images/404/pic_500.jpg | Bin 0 -> 27994 bytes public/stylesheets/css/common.css | 30 +++++++++++++ public/stylesheets/css/public.css | 8 +++- 9 files changed, 162 insertions(+), 41 deletions(-) create mode 100644 public/images/404/pic_403.jpg create mode 100644 public/images/404/pic_404.jpg create mode 100644 public/images/404/pic_500.jpg diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 4af7d6644..0bb027153 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -1457,7 +1457,7 @@ class CoursesController < ApplicationController WHERE student_works.homework_common_id = homework_commons.id AND homework_commons.course_id = #{@course.id} AND student_works.user_id = members.user_id - ) AS score,(SELECT (message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 + + ) AS score,(SELECT max(message_num*2 + message_reply_num*1 + news_reply_num*1 + news_num*1 + resource_num*5 + journal_num*1 + homework_journal_num*1 ) FROM `course_contributor_scores` AS ccs WHERE ccs.course_id = #{@course.id} AND ccs.user_id = members.user_id ) AS act_score,(SELECT SUM(exercise_users.score) FROM exercise_users,exercises WHERE exercise_users.exercise_id = exercises.id AND exercises.course_id = #{@course.id} AND exercise_users.user_id = members.user_id) AS ex_score, diff --git a/app/views/common/403.html b/app/views/common/403.html index d063b315e..78dc6dae7 100644 --- a/app/views/common/403.html +++ b/app/views/common/403.html @@ -12,13 +12,6 @@ .cl{ clear:both; overflow:hidden; } a{ text-decoration:none !important; } a:hover{ } - - .error_content{ width:550px; height:200px; margin:0 auto; padding:10px 0;} - .error_left{color:#15bccf; font-size:100px; font-weight:bold; font-style:oblique; width:200px; height:120px; padding-right:30px; float:left;} - .error_right{ width:240px; height:120px; float:left;color:#15bccf; font-size: 17px; font-weight:bold; padding-left:30px; margin-top:40px; border-left:1px dashed #CCC; } - .error_link{ margin-top:8px;} - .error_link a{ display:block; width:80px; height:28px; font-size:14px; font-weight:bold; color:#fff; text-align:center; background:#15bccf; float:left; margin-right:10px;} - .error_link a:hover{ background:#ff8417;} - -
-
403
-
-

ERROR FORBIDDEN
- 没有访问权限！建议您

-
- - 后退一步 - 给我留言 +
+
+ +

+ 您没有访问权限，请先获取相应权限。 + 返回上页>> + 给我留言>> + QQ反馈>> +

+
-
diff --git a/app/views/common/404.html b/app/views/common/404.html index 0d632c4c8..b1883f116 100644 --- a/app/views/common/404.html +++ b/app/views/common/404.html @@ -12,30 +12,55 @@ ul,li{ list-style-type:none} .cl{ clear:both; overflow:hidden; } a{ text-decoration:none; } a:hover{ } - -.error_content{ width:550px; height:200px; margin:0 auto; padding:10px 0;} -.error_left{color:#15bccf; font-size:100px; font-weight:bold; font-style:oblique; width:200px; height:120px; padding-right:30px; float:left;} -.error_right{ width:240px; height:120px; float:left;color:#15bccf; font-size: 18px; font-weight:bold; padding-left:30px; margin-top:40px; border-left:1px dashed #CCC; } -.error_link{ margin-top:8px;} -.error_link a{ display:block; width:80px; height:28px; font-size:14px; font-weight:bold; color:#fff; text-align:center; background:#15bccf; float:left; margin-right:10px;} -.error_link a:hover{ background:#ff8417;} + +
+
+ +

+ 非常抱歉，您访问的页面不存在或已删除。 + 返回上页>> + 给我留言>> + QQ反馈>> +

-
-
404
-
-

ERROR PAGE
- 页面不见了！建议您

-
- - 后退一步 - 给我留言 +
-
diff --git a/public/500.html b/public/500.html index 6b6aad46d..1890e545f 100644 --- a/public/500.html +++ b/public/500.html @@ -23,15 +23,55 @@ color: #ff0077; } + -
-

Back

-
- +
+
+ +

网站正在维护，请稍后重试。 + 返回上页>> + 给我留言>> + QQ反馈>> +

+ +
+
diff --git a/public/images/404/pic_403.jpg b/public/images/404/pic_403.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5af764812262421682ae4c4c19331e46c075ed86 GIT binary patch literal 26392 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 z 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 literal 0 HcmV?d00001 diff --git a/public/images/404/pic_404.jpg b/public/images/404/pic_404.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2398a88f6e5c570e2d9204f0997c7c8a5a920c58 GIT binary patch literal 28199 zcmeFZ1z4NQ+Af^BAT3UT8d}_;SXl*vOOX&PWFdhPtOWN}f#MV>P@q6@NJ!8?gSN%J zNN{N>?(T8|t6h74d#|GspeMUjej0H!BMOKuL)M za2fEY-|+%~OwQTN+8uBPaGnq>2>={_Js0}e$?1tWFRz^=kBPaxDU8R=-j>(R5eJP(#lSXak;#j@s5?b6eCzzjZf`~EbOtBq6Y$|?V+w?=3#9n zX3i-6;Etr5xSQ=0TbPr{9XDGWJ4bOhDaKRb;)LguU|z;Mr%9Zwr5GQclzK-`?a>`s zdj#x`Fpmhg8J~#g9Z@kJeqm8jAyKY70(|_!ynKSZf_&Tpg5pAa;z9yB-g6DKQsyE`WmO-${boun8EHT|^-wola5eiQt=y=7~A(yr6gj!s&zKUL#*Q#!DIYiNz7UN2zL1F^x1fM9pMa=I%gz~9U(E{lMfIN2j~ z?CouSXu+e$_D=SWkL{n_k(E9D>UZvet?bP0T^-p^KGUzQmV+UzTwvz%2z%Q*r~NE$ z^*ePCFuyOtFCZYuEg~pt#w}z@4kqLxey~Sp^CgGs`F>6 z^dpF%pC^yM4GhA|Z$k@aM;K2C!oWFR0+5~#2Y~qp!T>#UJOp?FxOo2j`3vVSUbt}a z%0GdX?zvRpRT!r@!mOq}Q%rBPFJwproXrV4$a`XSn^_@64r3mq>_7 zXs=(VrK2LFqWdl4?|nG_03f@3M)<7Uxie&dvt(z^k)1iN1=JE|k#lEGe!tBy=PzEm zaPI7x%Y>klnBT$yfOF?BTs(W`I^fK?Gw03|UnIG5>FlMG_%mnEohQ3+kzBj`(%pxV zU1>!+POqt`Y4|lwD1<={Pa_H#Wu8ZUqlAfwrU+=67BbZo13x03r3yN}Ske6?%Pf@6 zs$fn=kaFhI<;xe(os@b~C_$=bN~hNO3shtuzakKNm5A9N%Ft-6Z4wqjJ2!tb(HL1Xix2ZHK zI3h4ZgG&`@UatkyTg?iMvx9GvToq(w)x~J(limBLivGh)=Q&ro zalGeOyH(%PMd|N^9(C9Hch;CMiy!>niJg_kZ160lSPQLc; z4=eGHN37&M#ZwAXE*9Jr(g;OX5gFmtqJ~A?je;4I7)4w0N{=vK44gS znc!j!C4wCI9gdu$*Txmx#DSA*2SGH>aVr(0_HpJ&WLA1sWM;}N13#83 zz~0AFGd<0f@(x~O+nKCrm9oXqwhYh?KkKKej&Q~uGKyNe4@HITV-kBu;vuwKv4b}! zEQeNmjrs76rBc0v3M$j)V6I4s@wB%AL7{6lH>k7s`*sV>g%?V^yCrdmL>Zjk9_9vys7%!

nz+d2i9LWB_LPF;Q?ujl*qLXqS zFUcR!BgmcX3`eW8hiJ?OiwBBE7UkCE__=9CD#y_R^aN3gG0@Yp5a1 z_iB}eSqj}F?}8nzjgwK;O8Y%!_3a?1lG$qs`@C6}KMfm9y7Wf;2)uaIGCS~Dlo|)Y zraSW#6h%Y0%N|x2?zuRT)M3E3RyS30Z6?7gcCYLgsuB~=Iao&z87OGY(~E(+hSKT( zBk-hS|I>&62h>I_*L+|-+VJ)OOdUB;?2v zUR2+(c=TwWfi@>P@pk8CO#kP^h(qatcO%<=++P)LLO9pHMsRD;@eFdfeXa{6(Oc%& zOn8#YG#I9y`tZixtD9ArA*6^BL^NKBN=vAq9i+3;9|~lBerA=1Nt>Pc@q&Mx5sp+c zzNRMhpihNu+iZ+eh25p@=qk$nlahLLLjY!fP7JCT4*!%LDIh1O(_B*54`vBAePzJa z{vu~;H->8~vktg+5Ef^Y|FlsVPCw4ck3%fdgq#71e^X1=%rm5ub!T4XTOg){kc=Kf+G?_CJ00FR4baH}&lyfzSbE-8$j&>cHCRhp_)RcN}GN_`! zSQC)m7+op{OdoEO7Fkz7MD3}P!m;ZE^8`j0XiAPTCEUv6`{pZF*mO86n*Czl9e8wg z)>a=dWpN4@|iLYSNQ(+%)sH% zvO&o(`_{-mx~~>uG-F|0A=KNNen7Hq5IpHN{c32ZePKn$y87AZ7}b4)&!ECZ6&IQg zWLCjcORUD^z}qa(BPm>1bm#LYBfxH;WRJU6+j%X;WibweX?`l*TIVG4%e^yb&j^|n zDj!9?rzS6^ghApUimCLf8WTI2JDm_n2$G;1jKG`hOY@_Dk>)+reilU%Y)W zcV2NpgnGh=YiPBj9xd>QZ%5eDK*1!xl<}*@SeTEnRpir`A5r365+r^&8X}Pc$5oW- zYvKna`n?hTHr$Qx^-I4chZ>l_Gg*PR7l(Z>kl_H{&2sMAb6w|j7kVND54G*iX%%R_ z=!(!x`Td3wPm1gtr0I&Ae)>)l|B!-dLChlR8`Tg?vaqIMeF=DYpl2VPGvVHoG8WtI8V zfBD-(>?HP#b}#hZyJ^+&2_a0?Nj8DaubCwi0&2jzmVmwg*b`EA}yU2t{Ob1R7}31h;>)^-;?8A2wVUnBqd|GR8L>G5OG zfX;QK#z4sE(?wsfrP$8VqHw~St`LfMf)E1_7a#bMfS||5NtML*Q2}MR&nHoThiIM6 z*qM7`-S=@MoOvhNS}WbG&~ZvT^h;Qp=GBh7rK^bpUtaY2UZ||%c;cLPC^&fx@HZ;+ zxGMDvK^2M9Kqi_JgqO@;Z$ZIZY%S`m0 zClo)>?jv2UW-%p{c7BGqPd6zsIlek1WVG@=p-$>PbK^W1r<16^Lo}5XZ0{+g;(YkM{OKZ*M+62B_}(evRcxZYdH|-#+kk zq;7fs8SE0IB-DtSUH9mV%RF0Um}0vkZ{x+6;yw z226)61}qw9Y<<9+RJOJOQ|2#wwf1852AVN3BX?1!Td5lo!A6+DE{`swy*gV}b*JtE zvPR@Ahrt%3;c7z6y!N1El~gR_25bBCp*sd^S;~u6LfXV59Q~i3Q|a{lG@k@6Nz5&j z2Xe?Pl!IX)qZX|ekv4itMQ-3Io5tqr_EOo9NwvWZU-zrqKXzt3%O~5l3;$F0aMFf| zd3ttfPpyOpR48~BZHn1|xn2A7xu3Aji)hwB<$)m;A~-{Mwl!Upl;qV7xn`ZMR#7C( zC{cc%%qu50cT+Oy7s7y975ZF5krB5T#LAKvF&7GF3kA7c%MLO#;`b=JP%_~@$y{H8C^I1jSf4%*A;qqHh6Y@C&5 z(h``rb2%8+bY5GIQnbS4s@b)%P-_G;8oG6g(gLM-zuLY)8w?v6cZUC zMh;1TnkpY-^lncM4%GL`o9G&Fw3fayYG-5ps93w)gb68UYIwK-vMkHE+~=h0RhYE` zeeN#f+rfAYU_oQ7RY{zGU`u{&PAzZMgH7iGv)Vw+d90JF;hDeye zmW{JC`)=)m^ap%olzA zD-T{Tij@O%R>5<|9TD|hR3A=eiGr_QuD&MQ*y6R_Jx-sS3`k^)$eKuhRYR$jR=26S zah2a|oJC2kAHHjVB#&r(D2uFfcTRMowN@intExkcF0X2gJf+>hChr-J2C1E1WDs{l zpcErptjqNa;G(s+50gTBj%TOim>apC z160><&=lI}dW$|Tk9Po4}JcSs9IouEg zQcpq4XUffqS&A9qz`3hZw|+Y5d;owILR0D84W)7>Mp4PBz&YHgLo5xx4h>^G9k z=XVoR3(Wuh>&Df?kHINbymUdV+Tynb`lJduBL>v0Bg)xL^{R=QA;o$z6q*Bw$$JCn z9ICnDI05Rj5pJhVyr7})^Xz$|VDPK1vYlX5B5_OKiE)wqv}#_{E01A~-uK2x(q%Q* z6~m$NtV;&c-4CEUu$HW~g?8=AW5BK9y239TR3mLBZ1V2MFF zJP?L7Q_w}>4Yv{=ku}yT9M*O*n$?#SCIyATn_rqgRBuq?tWbj+WM%RjWe4_V#a7Y< zp?Y4f`!iL;^IFDJSF;VN!TOXggCU{P{DBK>lj8f5l>W7F2Io}qIuD$>3ICOi`UeWw z5P0RXjlxetpZph7NoUbh47gIskWJ-kU5k*O`#w0NDBG|=2|-s3!KJSp7- zVnVBylUXq^IwzVG0^(LG7o7 zP~hz${$yWz5_LLYe&;_wZ#C$JK5g#vJ}&6c5>|b?wjB6Csi{rB${92`RbugO*fbNB zVb^$p-)diS#JxOMCN@x^cmf$3bV!q`7Yb!hu`XX@i%ZnHv8B?`TBVnWh?Tw9E7)dK zBLD^Ec`^*Y0b#IIT!>1P>8=Y&d0SJt#=@tv!SV)Qd4E&-cc(S_hxXCpokwwN$AB6h zh;*z4B5`?VYl=Je(mTwO^)>2lkpq2{`%vhbO_5jC2+NOt-ON25Nr_u1J9$h|D+=WH{B zI(#=KOUV<$kHR!?7kxxboSuJ}1(MkMvA- zt?(6)PFT=P;8;b}hgqX!vgE;XY`kN1OSDIO;_2eRS7|j0cJ|?l*x<1qB3AXcGAs;_4w?ti*wyOT7d!RY zh>FnQ*R|hNj0>;&Bu7%6-Aw|Bw&_86DpnH36&G@5qOHt9EB&=V%Uy;5L|@2lW>AEO zI&v{|`bA{cLz{cCt-X5(^5KbEKCKoT*R1!-#X1_ct#XI!U;mtVCVsBFyJ#J}8j;YK zMIv0p-Z5eX#JBqsqJH=5oCIC~Q+;`F&+H7lD#CFLAR78&Ueyse3U%r%7>c>wwG^{+ zqon1m++M=xWr{4n$IAv1N%wh0C)N9SWNj5VnfjaHIPQ{9L}vZdla`vM^$jJr6gCqP zIgfuW?`&3X^}~nladnMW5U-P(z~*bzY??Jbj5%jlfy3NMsza7K&a;;9a4)WEKS$r5 zP3AoinC#wlv1A`T287$04m|O=x-^x)YAa~VpkU1#m}T*`6eM|Ng89R*1^mVTwb%x| zBGXLmp%p8uH$&3;b9ta`hL=iCMa*1%rEi}vlnk0f;0D#aE zOd}g4`YG7TS9??dy>(5xx1+p43GF(1OC#kNVDJANcG%PDrOy~qr6Amf@C*uiDb*F^ z1i9+(2+0||Q9!|QC!uw?qeN*|Yq$hQv(5zVbe#|$@W9=j(Ak?5xb1{Bg#q`Ng~SaE zJe1vLbJA=c$@Q2!6mVG^Bq*BWnkSnpEs6|6RReo0=o)(!_DZ>1ctfM3L!ee>q1p%S zTdxMomyQ8#hXJO>G%vrj;{}RrY5)KdSuLudXqpW2ypN7daXI6x*O+|K5$K#rn9HqlRRX2OE~GWd(BSqg?5SF!_v}$>I^)$o7dD{nkqci`>Sq z-zU77Ea78dSnsNYJZB*%Ncz7FL;- zJ1=h-3u93(!|(|UT^SW}L*}rdMx7PWW`BJAr(V$x3c`l`X6EpAdDFFHK)U?gF@U@$ zRYjAFJ7S1qAl)%}5oNG(kdAWuWG}d8#1nmBjOYD+QtSf7X=_>-%AHs2R5HOOl zpPVt$lt%mCD(vjs{Po&6hc@**yJjY44~apLnfGeoC*xvhSf^i|`fHt?g$I}lZ6700 zldM;IgdiG}$8qOSYhkBa`Qk6JZcEchAXv=P-ZJ?U2>u9lb> zZAdRd}vuPMe8hTe};e}Axe{P z5-eh!mb#NU%7!ixQ>*=`?Sibp(qk8P%Loud-%t^~v{KdTQ;$MAF{%g0fVj^iya8w( zXwih#MX`LX%`8Yjj@<>roEWXD-o74waC<@Umja3p_?>nkyIxr*4OHHQ#i)Hizpnzg z^;7$sDMB%4-pzr)#dxb#pY(n2WC^lp&y^@cf%raYDrd)(qPMf1ap=vR(A(nahi}?u zZuM=tI3|ZLb?f6o?|l?MCydX^vYg8M#w41jP5_a#lgr){41E$p)L+c9fA)HbjT%%H zOWLPK*MAHUeHD~MxgI8Ocx2iZ8Zd(favI)3znGNCdZtfuq0SS!WU3_0g_sa_iKIQ4 zkC3i}(}_Nh?xepqf$O`Q;3`Z{()qwDP9P3#AyOCZd@XSstpndIWxN5UplIwZ(7fIQ z3!~6xiq7XAv_#~`sDh@@+2KhFr9;-y233Q%shh6&Qg7eZ>Z6iobB*_&)Ep#%YC`eE z*4AbR+rnHWO}dx%)e*28B2FU))O6k`d2Qp*0Qb_WWc45Ko0Y&6xPp_zF}f1t&X_P6_0EhS7T zyH$uA%N1Ws*rF!c9sXjO_V-n0Py22XE@d_S-6kObKxdb3#W1(uh3R|t=Zn*kMLB|MuEb`kMqkM;ip)VPnHP4nhC^=m(eQm#U z46rNO)s40FnM}^xW7n4|A{ZuXW*1j~`7a;pVvXYwsq7K&^y^Qql{-j#(E%@A36J6p z%7fVhBbaA*Ks>Ie!1+m^p#XJ_Q1^eyN_c78>~<`(E)3fYEkQH&-iVf#F%$rKzZB`P z=`UlPK$K|H?f6A!?-F~BiLIO&__!@4wHkQOZtf-L&x!NXAnH2Zf}l+}@4R_G7z@;U zf^X{e3ua~xB%`ZT_62JFp5+|*tL0pIYB>v%m|HU)8pce<);BlT^A;D>=NwsjD%wJ} zeW#9U`FV+IRxIIh`Xwguq!?__d`{4B_{klzA3XFY5ly-rWcBfrV3q{~bB)5UqDbz%>#W>n)4O9ivD%+S}y zgI*u`Nl!~b_qugp6ZqX6&wFD%eQT#!!TX(phV!d*51f_u`4c`%<;^WjOWz*JEOMmN zeCBk~8l|D$(FU!Tw>N%EILOSBc6Oivi=RaO0UyiQDyy2qFV*rqot;BcnNcHE@zc^LxxAXnj=v#NN_C|fXno4bI zpEsz%UN`Aka-wu_NS=oS1z0?W2SYb+A=7UW|MOXN2p@XVTjwD+w=8XAT;vQ4%w&rN zvkPbraefi9(Jhey0%gTV%)CHAc=XaD@9-hdlG+Vd%9l);=_!74(M6vnimM$r%5g$w zr(q_VEH)dY-_z07-EExBq190`lsZ?gvMsGr9wpDOh!BU%Q<3X-{It|{*wM8#(HWw} z5EdWtzd;!GuWCj!6yxtfgh`5Y_d3WgX;3OEDnywY7AKwOPpeg^GzyHM9DGWmR}060 zWUR>e$+ybc^Hd5mmvdB1azf1ziy2jy*rHK|FJ7f`GK6VFFzB6f+#uNQQo5qucM_?r>(|VC&{Bw$K*nV zfe!|`J8CvXc!aAVu!t-JYE+AXTVd6bGtop4btO)qjfg6;lIBwoPC3wiE|oH6BtL#x zR5>=)*ui*=SLSqg37}4Ru1^~?k+K&pF`g7xJu8rc+zcDZL>b|W8Z&6Oz3zvt^U53p zF3ixp(6c2R#`v;b+^n=-Hkh?WW#}U<42?JY`_*2^$@R<0am)JmiZ+j?=IUWQE86E7 z$;lE!*j{E;FE@Ku3F!oac{1g8B1G3?_bHmeSOrB@uq!oJJ~d}20R!wjq$lQ=CAu4! z-Ixj&5Mg^t*Hb_y^+Jpa1ZvLuIUpeJ`u>C4s{h{2E#RDAn9scKK`g_k$>$-XV;9(s z8E9PGQVicqlR8}5cTR3DF1Oz1I`r*SZdy#<_l=?z4IzxTLu;dHCW9ahsDMla1p0|b z1!?nhtZScSkC?j{RJ#Q#ZRy{_)mYl}+S2ri*MPWhbwrw9{o3TrQ58&V!SmLX6tWKs zV!*3VQHfAdQGNyrMho0#`wZZDqoPZbaSTw}oXu3eDtZifw_RYoD~X2X?mRG5od=Eg zt4zwRv!}tzAykshRXX=~O0R&wqCOU5d2BkBhs!+t4Fa}O`^$;G=nTo!#q{*IHNT)n zalR{Od@InT0|1E7C$AuGulh=6QdBP2X}edoj28^yv)*M*Ym9&69DOT?Z_fxu`Iim6 zD!GyQR|l78BXV4Q+8tS`-CNx!_EPpGt0;f?bcD9Fn7RmgFuqF zMgkvJArotaqsSfOyG8nvWW-%SZ@)gX0o0syUS~xfe@J}<60^2Nn@MyfDu7H2nW^_; zbBicj-klS!swPXD)=4h9QF(6g2-EJkdN^n;%AY~Y_LD_f@y5ad{=nQ~bM^#aaNGuy z5iH)5s6S1gfBE#)EV&F{&C*HgUgDmnAz78hCMDW*ZZ;Nm+haske$-aQ z@~H^9lUnhiuUBWj;X$(O(HO}^+pn(64@$g8#Z_T{ty(jh>JHj>-@)g>>XkQdE_%wN z%MEakep>WP)VB529@`==_pWZ*5L{a6vL>ve$@9KL-`)*KI}<~x@2A;Epsfv(#u@K+ zI3W{hWbXP~OHg+~w{!V5y*R|rdom^5-$uf4(%>&FFI8OibtyoQ-fwRz&`MM@p>tNM zLaJW?fPZW``OE$XTwr5>_l6y|VBYC=jg}ZpLIS3WHWpSSHY>Z88{D{fGe)>q1i4EQ zz*F?;Mx|YF^Bl^V<*WLh`_QU!!qp@Zq>Y$lwiDktb~YLnP3pqMCTkR?8YIiibW+y2 zEC-YF@dM;u<%s$$h-*C(Q)>ep^6WE_TBGgtmr=!NJ*IZ8GYXZp`RI0aspiQpUMHtw zLWKpX(+}tMD@fg;X!#0lbaW}VPUBI}Y;-D-Ao@AexK!Cd8AxdRzZV(?0PgEeFJbMQ z99ntw?zb(jXhnbh=xP~6RsMWs`nqqa{sBs*q#DuDcSxC=G(fOxcKM&XeIPXQ!pn=_ zI1YrN(@Z4>H$ddbXs}7sp4zII$m<;ILJ>i4C=2%hx81X4jW&|CKT^tyUzJik`&Xr8 z;QR)5^VqDuTbUJVu!Y9*iPW0UCCBF-4N0=R(cK9#Es&6YmTP!kwDMMEb(6(m55Je* zcxaV877h0d2=IFlt+gz3H)NhhFR#*gA35hyvH%~DoXsyn+Oo}gPRstB@BX0laFkBn zWu-ziS@yx$&5J(pxI2Wl{A22LHX-N0=697&}|_amu?M;la31if!}bSVmi_P2+mVx;+cw^ElW_+7Eoi9YFAAFp@BtT zN`|Q0f>lvQ7PY={6nD|)zs%UIAt#x~bOifGoGD+aOtHk_xT7r1VAOR*R$f;X&NA}P zOsZzTi1>=?M*|y?kIKK>Ar|c?V3bnuziR39{*~DTwKKRe!&By=G`YU^Y3L?vdwVlF z(5}nvdVM(AtxW{0oHqQtuo)Q=2fC6jccM~(?jtm?S@q&RKOtwnyr+dMCA^`iukhVR zkqlsdf)PSi`=T#XfmP=oxIP2Z^mdj9+0ezYkS@rUXqg{|#c0@dYf&vt>_@RjQ%}PW zgI}TWbG|e(s41U3odjb$)#$Hee!Zjlv3VSniB9$Exk0jOy5HWS#BpSjK0ZX!Hc{kH z4PfuWiNkfB(vuZ(T0sJ-JxXfIBNbVwkwqrDiGy^F$`m$T5DToE%46-W4Gt^p(1j~B z29bj+MZ5-mrg&}1K=Wny8gB&#}@B=c)OauLZ2(#{gHo>V#WesXT2lZihAUB#9vw zYi!^q;{L6dmHY1@zQV88?J$q0Krt(r?Ccz$)<~>DOx{ix@E|LrVmOfm&Ui~}9=?HV zMy(zuLk5lX_t3*0f>Z3|@*PUsS6^~w63|Eo%ehjAnfjA3#ZM{Cv)MPlr{fQjizw>i z%SM#J3BVP#56bmch-n0~%|-|Z116q;M%E=GM;Zudq!PUp)2Xmsm$S|s?k!1c*_qjP zEr{VD{2Gsp=&1Ib@dLY;SgLEmuI?TtI87xt&+ENPdizN`ra<@Fn1b2-0fPjQj0Ea| zqJpnX#RKu7qq4K6ttuA9I7oTm=Z&`ouZg}8RO2syXFfGZJEMG5!b}h!>+S8Iz0M;g zDwlkO9=`qZ{`14Kj!6Ruc0b0adM3kstK+b`DTKcMR0LgpmYu}j`Iz+>@Iz-Ek$P=0 z>0XzffZ*NiB&q73KUJE^LNmmTlEp~oGl}K)VpC9SuX~8KZBX;nQ&r1Gk~=&((RuL6 z4%GxA35s#1YVHKs(0N?}R&bV$AN?nyaoNVYh1Va98w!@p2GO1%%{H9^O>GlRP4x`Q zNvcy*i~yhePaiP6Jb-qvzgYHM)fu%f+{ty>w3=bx?cRCcyq!fR?3iOZ_Z3rO&h2lN z`IimME6M z79+|zT?@g7*UPr#jQuAy7S@&(7TRymbm(aiX4SXQ?gvjt!w23%6KUke7kM6Twz5S7(V%7ptw#cA; z8bsCX+7eVWF1RP#yF$BVG9dAB#`{*`|I$m}U;a6ZoB&Og;k)w`6g-VPQFgr;o$C@N zmO4Ywp6$cu9Aoxt-o*PALh*gxW7B(MTRSr%8Y8kabz%30Caev5v)%^;IF4{+0Y3*= z(2TyXs5_)|wNXo&ecC)2i>b*hHPIE`$sP;-Ch~4X-{cTNsvn}*SE87#p+b?jD`cIy z^{z6T5t9Jj)VRtsWR#$s@Yo#qVoIWUsmPR4x7I$c63D4nRt8&W7%kN%D^1WE z_@eeAk-}CQIwoX8eGK@HL?pOD_B+tYu3=F(Ja0AN!r|COkb~5*9^htBtm!dy(UF%pZ=ub& zKpNEAgC(B89akp>EJIMDH2IBH-g`C(tft2U7M5W>%u-cWB%R)r*|?oyj4qbE#byQD zJ}|&ktT%Q=0GYy_)Zd8A?$N45pI5P~8#+AdAn>(IPx#ttCw%R|z3-&&7oyM;dtUhT z^w5yF`*#nU|2YflimOJ?UT^Sx^}e(;O|NYmEEBqG%M={jTxDF5c>YzPdv_Z?HvK5x z`iuGHEnH}pHMezyCT)n^O6m?*{x<|i-kM9CCdCdv+H{_38#U$((a;?UHDpT^p>|eF zKh*G=v7x@k)_V*nuTg3rrSV^%u_V~w9c|jo`Co=%P=D0HgiDJoM=D4QxgbV34q#*L zisp8aueV1{WR$a@KSO4BQ>q}M*b9pf3G|{IZpj=1y-3q#aAHtrNH#Y3N~>%1h$ZMM zr>SV`Xc}vu)R3#T@dij|(V7Fr}nhM^dSC z<@bMVO=(Uh+w8LU*627QlX$BnX95Sbb9XRKpICPwmMJ0>>xD9z%?0zwsbmw)U)-U?ne3b%1=Es33Mve6ULtXFSU(6| z>mid#LqP2wI#Qirf3C3(796EyvlmaoeyTGe;Cwf~r+esEOMnIW^$0khg1alVDazs2 zD-#C-EJ&<-g7b|+>fRuS71C*qPGG_R2s`cD{}Fwr*q4-V2S=4)V(!DWl)gr?awgC* za`vNDY&;fhB4x@=g=dgCpL14w6sXtzr#LlfGN_f6M0vlqzU|H1N@ogRs;%gu_jVDunu-k|eO|-anZ*7!Jm_i!JXow*um4g#RV-raU zmNh~f1u0MynX(c#CSr--{d4rDPkeSb|H!Q-&c$RXej$4OQFpq46pqwIdl)A&WLe`_ zA*X4}&&aC4qxD!89(1}NY#t%n{yQh4}D|x5H`xDsw$J+a6 zfB#uK`8N^tBpo|q*LJFtw6BbAkLOg3!B+Jmp013vxQ_^QKs2T^Y?eYXEfLihXzL2= zaXDWR!QMz_(Ntjst1@s5_L3|Jql${%JtCs{?v(V}{ls;NsQ*8{MF0Qrx>6$F{`lT5 zX%?MCCmCn*OrOd1ZM2P}9x~Xptm6t7y%Sg}8}%8P%*+&S@}gHvQ(Ti~Dl4&N$B|7K zb(nLl;IMCDxZ%yMPG`tlc=u=R^{iEg;M222h>>t_t6zSb(1#1~YQXR&HVV`ttgIvv zy)0iD!FL>DTj9v-N=6Kf-iGeTBMli&KW$rT(u-3)&_-M`Kn>1i$D zEF1r6`UgeX z|I`=`?Vn%D#{Wg#NmiPA_ z?m&;8Rk-I48wTbc$j`F{l4SWWf>!R+$PTs{s&3l|7e@!7CVooIqMkht9AEv&)@Tq^N?Wuof#))SAPCxy@ zCi3GaUkCf-UFnu$oDJbr$4l8o+U6KAbnw=OkqZQ`&JmXjo0iu!(`jFO5Ihq}o)UaGT_I1s z^=o>pF0$M@@!0%t5*AqCq92^mj-!IMQ@b47{2qVFYf-}k~)GAaPtzVBqOdjMEhy3eU)Xka0xSB)S6X~?oncn9r zZx`M7O`|0sT}(6^9q(Mzwk)r0m|fXaOaD*Vf7s`4;Q8D0PElGlX8G)NubK$H8|u2Myjpp3s%m=eWNG1xN*7D* zMtN9=Wl_qKtn@yh;cwDlsGhCz)Mmi|`ys)E1GW4NH?i3(pybQO<%11CIbU7GbnZ>P z8ZMrSrK>J=LRPlG^GasMJv*JklB61)8l=4)FU4!zki0RB8!Ad^_T`$|Z6xC6@0!Rk zU?xo}Bb2GA-56Qr>kp0A?=R_Ie@JA{d33QwlhKfbI3UdCaXCWRg{ozb^UIbOE%kgI z$Sc1uRr_83NOs^pNu^kOr#J5LP28v9(q{>7Vwdrj%JO$F7PtKLUDn4&d6c*o|7GD!gG+W# zO1Zyej*`j<>vu&2JVXn8mT>gL*n3CC=````MW2aE&S$y3*M+(38X~4#-b7*9wQ>9 zNiM=2gQGDsUv~$3nldsXom38!Fpa8C!eB;T)#OjqcJJO-LR8lImsO8USu9<1(pqGZ zqZ2nDI(U@DPMM8{odjl2rr_-nq(4$B@RJvn_aHvcmEtZvGBUA#t8W-*%77$HfoyNQ*@I}R+jc+>hwl-8U)GD_xYo1n6a6dIH zQq_}%^GoPPleSLJ(>8d6nU?D7CY{3CqMwICwpkK5c-7^n_`VdNtk#fDFjoclcfScY zJuOkK{U54^Y}JxVyhMDJ;tYEn6MLrPt$s5gP!X@GsVPErb?6&FzfCS zG$=90-@2svw4dUK|F?AB|5ac2pXk;JO&@CfI^FVk43j6pY1Xvj_Tw^4y9t}3qrx0V z>L7u`Z~@SVb;$L_xTE5CqmBXk`OV6uynE$}4SBOWvEMu&Fc5wEIJq}~Usoc1wp<}O zCcAf}!fs=6wWhU}wAxTL8G!_OLnjy@cyi2M-Q|Rp0w~Rm&Sye?-wVMa?%w?TYyx(kxUTiJ2XBU=XE; z_6h_GiNGrJAt1Nk!uKEG8vZCKYB1*I6%YXf&U%;asMW`;>NgiS*#wk)!0fV#>aN&o zd~$OujplvCkAXk??R17v`iG{MD?-IWI-!nMR^PI$V+dtflYv_z1Khk6B$hzhLwB*& zgoEIQ=ly`3AHXu*uSRT~#|puD@RjsI=@Cv}lwet>OYc;1Qv5iGY_vb!JzD=2YwJw> zaCJbJBeHtn)oA#lukMuC&aFk~#J9iRhjE#PKrYL>Wi3iQZY@n#)-*0_^|c)2bu|f9 zopbPVm4x%e%(Z~rCV2I2nI+u$^BvYx-@U7=Q$-GTtVOHzxk=0-N%UCo2h0yWjx{^g z6S7;C`=Y&U^UVSPmx+Om#Ai=UuN3J=m2MB8P??jD2fR6mJi8DRka}y=^ zd+Tg2SM48IV~ZV2<~?fn47YX?Z$4XA^wq9fK8IGxRTa|?fFK$~YgFi|bQ|I#4PDHv zD|}d1cyTtQ`ErUr&gva;CM7#|ffK;RU8)hYxv!k$hEr2P&BfSFrx1-zFMCs;)$}3;Wi|R-pT+DJ-C#$eZ*zIl-vRbI37Ts6T-F7#_n#-+f zp-0DrE-@pkE<0{IKyPwSf@DQML}s8HoBMYhI1X-GH1NJxbFTsOGbD3O&=|>C<5BCa z#>@1WX9OCiM}OpF&BhHlD#0wW2MC0xF1}ewEu))+PiVursB2ZjRI?p_+$dCVdhd|# z-+vL1Qmn;I9Ht2>Od>AJH1uj3Ce;#UTjC`uQ46H*CTBE9OtSjHUXmcN0yoLeJ~>qo z%23!S-=T5L5eZlOoIun-n%y{4A*|7`AQKC#%sxtS zQs8D0%7LjC>JezV?43istqgyK!sZ7X;yuD9}go zzRa-TIlUmTh@w`bwI;@+GH2CXKDC@(TE*VJ<)uwI6}au%^qQ!RYbujh!2_tEbX{yT z$#eh;HDk7}Q`8hq58?vt+zXo2=tXc=7U{N;wEBm-8r;y$4)p>$dc2;9if&u~ftOAF zde=|pKLeOu{0`UO5T317Gn$h~e%O0Ggoww)u~9b;7#Q@6T%h0A3^ zZcREnZ0KhYR6=}0jQ?ARwk!4yGBD56g*zv-&9~Gvzp&&o?<{kPs*Wpfm= z|0ZKtDgA-TlS!u@VqNCYB*IbAuVJ)CVi4hTRDn#EgmWjKDRx(KtBW+G1PH6nRFME{ zO^)G$Ahq!i{c57SAMxu&ig*ytot8{v9avxeZxR-@I{2X$d#^ydj>z2QlQ`}0^uFS> zl=R(Ao_@7ikTIUfUEWoO(d91hwV#LT%doths|+E{EqWOPkqWl3)E)W>ElxFDu6-oo z-p4Cky)>1hZpnvSZr{m)_xexCfrqE$!0W=_=_*Zmr>g}0fA=c!1wy&5GuI1$OqUn$ zq1-rb>IUl2H|W{ItHiuyG$_o|;&h~3SOgVLsAH{*-Ut%>F$^Yj5Zpn*`Ptb{S$saH z1N0J_g&PP_)hS-kXNzlW>>r5+6RrsUbLKEwZS05UPV=1JQkDLuMy0?<*M`pGRL!ny*!HC=;wGZv;<)-(ggV}VmL`KngsB=k?&qhP7r2mt+T}B4ItrG&`SCeb-Sf zn07a(OD8=ecT&57U)fgz8Sg>H{0Uhvr4uBA2};Vzi5&Q5o{e8gmCBx%W)CDw0&^&4 zPKfTthecmA`?zqbB7n0u*C{e^^Qoo=yX=$J+ReE-GI~T2i_po-X_41CcoPmHBeRokg%71fXGJ@HofL6r8(Ii zLK2;)feg7E=p|V{6-^W}p#zmxW+nM8@l}&<u6alVO{B(lXpU_3bn9Eb z^{4&j9E`Qrq+HwSK$wF$wvyt`gc_mY1Xn|ab9&8@kYXM5Ks-Eiw`36=>gc_l;<7N~ znYbqZ+Fm_IxLVl3_7C_LyYcs?0#}-cvnSvMi_o*!CexHnWH#>6&Qxk9P>?R(`rD;3 zBFW2n86HUfxtKzEo_5)V6*1DM7+6LeP2Pv;q{bM%IBisI{=?js3^QO-jEmB0eCx~7 zL6D==coZgUaz=-zWXnSRwRZQ9>s;MWuXvUE_h0+^dT;uxc+j*45$cY=0_?&0AU1uw z=85w5jKD?q91nT$Tt>wz;BvTZ6Y|KL9G5r>7bVd#h?ZyN?ODc-1d2eUoGS| zSNgDAs$$96r9ge?;u*Zmvq$^*%P~NmI!)6B@5O4w8-2KynKj?+J~vPbeIYHssF7m*2%z*$Z$uTMF1KhPuW!XIHuhCw`paERV0L zD{d}!xS3nUicRnz(OF@874_>J2LP~Zu^5w8OeIE$TL%>kXvo{-szdj-KKE*HX9UC{ zaa###KwgxW{%fuO%Eme1-+gB=u@7iWL)kg5ZlZmJH z={ILpFPZSBFlMLCPWydL7SnF{`s_=If4$`KU6HNd|9+PJ8839u+4se-@`}(JjrVW2 zAAcj3Y`Y=x-L0K5d$U3tj=Od4DN4yIRm?Z$b$|sRv-zZ_*Njd){k&Cs({9~WSxUb- zp9`HYxa;vPX0GSv1qUL;_Uz5xy5uM9RIB#8;FGC-4&~#jKI+L|jd}2pL`Q!PZ;qt_fz>(~} z!%6d84;|hw^9M9s&fg2%Sx_b|@<~rj_Q&%Fz~OR|9ZjWw(ioE6OER?UGfERM1l|J$P=s zV|BQ<2*Qr(EYUi3#Hs6|Pq&_>_^DFF1iottNh5zxG zsw2gr>uSActxVdQb!)}S&+S*XL;}yzW4ie^ZtYqXIcU~W1!p8h+Gm^jYY$4SUFUAr z8}%eQ@T88%irpKw{V+PSMLy^~Xvff8SeSB@gHHBqiaomi>QK1n$?Mp)YCVb42Vk|w;H8=W-vj`kR%|T* literal 0 HcmV?d00001 diff --git a/public/images/404/pic_500.jpg b/public/images/404/pic_500.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ef85ef96199468bf6bceea6a0e5e2a97cab2bad2 GIT binary patch literal 27994 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 literal 0 HcmV?d00001 diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index 00f8ddc2a..f485baba1 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -611,6 +611,36 @@ a.sy_btn_blue{ border-radius:3px; } a:hover.sy_btn_blue{ background: #2788d0;} +a.sy_btn_blue_mini{ + display:inline-block; + color: #fff; + background: #3b94d6; + text-align: center; + font-size: 12px; + padding:0 10px; + height: 26px; + line-height: 26px; + -webkit-border-radius:3px; + -moz-border-radius:3px; + -o-border-radius:3px; + border-radius:3px; +} +a:hover.sy_btn_blue_mini{ background: #2788d0;} +a.sy_btn_grey_mini{ + display:inline-block; + color: #333; + background: #e1e1e1; + text-align: center; + font-size: 12px; + padding:0 10px; + height: 26px; + line-height: 26px; + -webkit-border-radius:3px; + -moz-border-radius:3px; + -o-border-radius:3px; + border-radius:3px; +} +a:hover.sy_btn_grey_mini{ background: #c3c3c3;} a.sy_btn_green{ display:inline-block; color: #fff; diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index aa4b28f79..baffbe737 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -1537,4 +1537,10 @@ a.syllabusbox_a_blue{ .icons_project_favorite {background: url(/images/syllabus/sy_icons_star.png) 0px 0px no-repeat; width:20px; height:20px; display:block; float:left;} .icons_project_star{background: url(/images/syllabus/sy_icons_star.png) 0px -27px no-repeat; width:20px; height:20px; display:block; float:left;} .new_projectlist_more{ text-align:center;} -.new_projectlist_more a:hover{ color:#3b94d6;} \ No newline at end of file +.new_projectlist_more a:hover{ color:#3b94d6;} + +/*403、404、500界面*/ +.muban_conbox_max{width: 998px; background-color: #fff; color: #333; margin:0 auto;} +.pages_new_404{ margin:160px 209px 0px 209px; height: 580px;} +.pages_new_404_txt{ font-size: 16px; color: #888; text-align: center;} +.feedbackText{box-shadow:none; width:550px; height:80px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;} From 6261b92c7f75386c965757bd4e62cdc4142fa3a3 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Mon, 14 Nov 2016 17:04:26 +0800 Subject: [PATCH 003/112] =?UTF-8?q?=E5=BF=BD=E7=95=A5oneapm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9d33b264c..601f691a1 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ public/javascripts/wechat/node_modules/ .access_token tmux*.log config/wechat.yml +config/oneapm.yml From ef9b389cfc2394cd6c019b9c06b77c0b5c48f7b2 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 14 Nov 2016 17:32:18 +0800 Subject: [PATCH 004/112] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/student_work.rb | 2 +- ...092115_delete_null_studnet_work_project.rb | 17 +++++++++++ db/schema.rb | 28 ++++++++++++------- 3 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 db/migrate/20161114092115_delete_null_studnet_work_project.rb diff --git a/app/models/student_work.rb b/app/models/student_work.rb index 9b3124797..794faa774 100644 --- a/app/models/student_work.rb +++ b/app/models/student_work.rb @@ -4,7 +4,7 @@ class StudentWork < ActiveRecord::Base belongs_to :homework_common belongs_to :user - has_many :student_work_projects + has_many :student_work_projects, :dependent => :destroy has_many :student_works_evaluation_distributions, :dependent => :destroy has_many :student_works_scores, :dependent => :destroy belongs_to :project diff --git a/db/migrate/20161114092115_delete_null_studnet_work_project.rb b/db/migrate/20161114092115_delete_null_studnet_work_project.rb new file mode 100644 index 000000000..25282e894 --- /dev/null +++ b/db/migrate/20161114092115_delete_null_studnet_work_project.rb @@ -0,0 +1,17 @@ +class DeleteNullStudnetWorkProject < ActiveRecord::Migration + def up + count = StudentWorkProject.all.count / 30 + 2 + transaction do + for i in 1 ... count do i + StudentWorkProject.page(i).per(30).each do |sp| + if !sp.student_work_id.nil? && sp.student_work.nil? + sp.destroy + end + end + end + end + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index bb1f1bc1c..fd75bb020 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20161111081619) do +ActiveRecord::Schema.define(:version => 20161114092115) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -325,16 +325,14 @@ ActiveRecord::Schema.define(:version => 20161111081619) do add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids" create_table "changesets", :force => true do |t| - t.integer "repository_id", :null => false - t.string "revision", :null => false + t.integer "repository_id", :null => false + t.string "revision", :null => false t.string "committer" - t.datetime "committed_on", :null => false + t.datetime "committed_on", :null => false t.text "comments" t.date "commit_date" t.string "scmid" t.integer "user_id" - t.integer "project_id" - t.integer "type", :default => 0 end add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on" @@ -518,6 +516,20 @@ ActiveRecord::Schema.define(:version => 20161111081619) do t.integer "container_id", :default => 0 end + create_table "course_class_post", :id => false, :force => true do |t| + t.integer "班级id", :default => 0, :null => false + t.string "班级名" + t.integer "帖子id", :default => 0, :null => false + t.integer "主贴id" + t.string "帖子标题", :default => "", :null => false + t.text "帖子内容" + t.integer "帖子用户id" + t.integer "帖子回复数", :default => 0, :null => false + t.integer "最后回帖id" + t.datetime "发帖时间", :null => false + t.datetime "帖子更新时间", :null => false + end + create_table "course_contributor_scores", :force => true do |t| t.integer "course_id" t.integer "user_id" @@ -995,10 +1007,6 @@ ActiveRecord::Schema.define(:version => 20161111081619) do t.datetime "updated_at", :null => false end - create_table "innodb_monitor", :id => false, :force => true do |t| - t.integer "a" - end - create_table "invite_lists", :force => true do |t| t.integer "project_id" t.integer "user_id" From e33146813d260db65ddfd1a985ed31562e43a283 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Tue, 15 Nov 2016 09:25:58 +0800 Subject: [PATCH 005/112] =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/message.rb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/models/message.rb b/app/models/message.rb index 1d76c8ef6..6b2e29428 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -147,6 +147,7 @@ class Message < ActiveRecord::Base # 删除帖子的时候更新帖子总数, 删除回复的时候总数不减少 def decrease_boards_count + tStarttime = Time.now if self.project && !project.project_score.nil? # 讨论区 if self.parent_id.nil? @@ -157,13 +158,22 @@ class Message < ActiveRecord::Base self.project.project_score.update_attribute(:board_message_num, count < 0 ? 0 : count) end end + + tEndtime = Time.now + tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000 + logger.info "message_time decrease_boards_count! user wait time = #{tUsedtime} ms" end def reset_counters! + tStarttime = Time.now if parent && parent.id Message.update_all({:last_reply_id => parent.children.maximum(:id)}, {:id => parent.id}) end board.reset_counters! + + tEndtime = Time.now + tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000 + logger.info "message_time reset_counters! user wait time = #{tUsedtime} ms" end def sticky=(arg) @@ -358,6 +368,7 @@ class Message < ActiveRecord::Base #减少用户分数 def down_user_score + tStarttime = Time.now if self.parent_id.nil? && !self.board.project.nil? UserScore.joint(:delete_message, self.author,nil,self, { message_id: self.id }) update_memo_number(User.current,1) @@ -371,6 +382,10 @@ class Message < ActiveRecord::Base update_replay_for_memo(self.author,2,self.board.project) end end + + tEndtime = Time.now + tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000 + logger.info "message_time down_user_score! user wait time = #{tUsedtime} ms" end def send_mail @@ -381,7 +396,13 @@ class Message < ActiveRecord::Base # Author lizanle # Description 删除对应消息的图片资源 def delete_kindeditor_assets + tStarttime = Time.now + delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE + + tEndtime = Time.now + tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000 + logger.info "message_time delete_kindeditor_assets! user wait time = #{tUsedtime} ms" end # 课程成员得分（活跃度） @@ -399,6 +420,7 @@ class Message < ActiveRecord::Base # 删除帖子的时候更新课程帖子总数, 删除回复的时候减少总数 def down_course_score + tStarttime = Time.now if self.course if self.parent_id.nil? # 发帖 down_course_score_num(self.course.id, self.author_id, "Message") @@ -407,6 +429,9 @@ class Message < ActiveRecord::Base down_course_score_num(self.course.id, self.author_id, "MessageReply") end end + tEndtime = Time.now + tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000 + logger.info "message_time down_course_score! user wait time = #{tUsedtime} ms" end def delete_org_activities From 85938bf3f1fb2ff069ea5ee24b44a2fa0e12e2a2 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Tue, 15 Nov 2016 09:28:42 +0800 Subject: [PATCH 006/112] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/message.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/models/message.rb b/app/models/message.rb index 6b2e29428..0ae8d442b 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -147,6 +147,7 @@ class Message < ActiveRecord::Base # 删除帖子的时候更新帖子总数, 删除回复的时候总数不减少 def decrease_boards_count + logger.info 'decrease_boards_count! start' tStarttime = Time.now if self.project && !project.project_score.nil? # 讨论区 @@ -165,6 +166,7 @@ class Message < ActiveRecord::Base end def reset_counters! + logger.info 'reset_counters! start' tStarttime = Time.now if parent && parent.id Message.update_all({:last_reply_id => parent.children.maximum(:id)}, {:id => parent.id}) @@ -368,6 +370,7 @@ class Message < ActiveRecord::Base #减少用户分数 def down_user_score + logger.info 'down_user_score start' tStarttime = Time.now if self.parent_id.nil? && !self.board.project.nil? UserScore.joint(:delete_message, self.author,nil,self, { message_id: self.id }) @@ -396,6 +399,7 @@ class Message < ActiveRecord::Base # Author lizanle # Description 删除对应消息的图片资源 def delete_kindeditor_assets + logger.info 'delete_kindeditor_assets start' tStarttime = Time.now delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE @@ -420,6 +424,7 @@ class Message < ActiveRecord::Base # 删除帖子的时候更新课程帖子总数, 删除回复的时候减少总数 def down_course_score + logger.info 'down_course_score start' tStarttime = Time.now if self.course if self.parent_id.nil? # 发帖 From 79b6a9932446927e259fce824419268409a55114 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 15 Nov 2016 09:30:45 +0800 Subject: [PATCH 007/112] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E7=9A=84=E5=8F=91=E5=B8=83icon?= =?UTF-8?q?=E7=AE=80=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/sy/icons_sy.png | Bin 4254 -> 6481 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/images/sy/icons_sy.png b/public/images/sy/icons_sy.png index d9cf42db84f404fbe7b9ba13b87aa3c7b4d1ab43..36619735310df77141f2206c24b19d944ddd20b4 100644 GIT binary patch delta 5977 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 Hu0mjf^1$7l delta 3745 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 QYk!mkCpX7i4#CO)2ccAFIRF3v From 19e2c349177e6334be556c63f35f7c0bf230fd49 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Tue, 15 Nov 2016 10:33:28 +0800 Subject: [PATCH 008/112] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/message.rb | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/app/models/message.rb b/app/models/message.rb index 0ae8d442b..1d76c8ef6 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -147,8 +147,6 @@ class Message < ActiveRecord::Base # 删除帖子的时候更新帖子总数, 删除回复的时候总数不减少 def decrease_boards_count - logger.info 'decrease_boards_count! start' - tStarttime = Time.now if self.project && !project.project_score.nil? # 讨论区 if self.parent_id.nil? @@ -159,23 +157,13 @@ class Message < ActiveRecord::Base self.project.project_score.update_attribute(:board_message_num, count < 0 ? 0 : count) end end - - tEndtime = Time.now - tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000 - logger.info "message_time decrease_boards_count! user wait time = #{tUsedtime} ms" end def reset_counters! - logger.info 'reset_counters! start' - tStarttime = Time.now if parent && parent.id Message.update_all({:last_reply_id => parent.children.maximum(:id)}, {:id => parent.id}) end board.reset_counters! - - tEndtime = Time.now - tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000 - logger.info "message_time reset_counters! user wait time = #{tUsedtime} ms" end def sticky=(arg) @@ -370,8 +358,6 @@ class Message < ActiveRecord::Base #减少用户分数 def down_user_score - logger.info 'down_user_score start' - tStarttime = Time.now if self.parent_id.nil? && !self.board.project.nil? UserScore.joint(:delete_message, self.author,nil,self, { message_id: self.id }) update_memo_number(User.current,1) @@ -385,10 +371,6 @@ class Message < ActiveRecord::Base update_replay_for_memo(self.author,2,self.board.project) end end - - tEndtime = Time.now - tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000 - logger.info "message_time down_user_score! user wait time = #{tUsedtime} ms" end def send_mail @@ -399,14 +381,7 @@ class Message < ActiveRecord::Base # Author lizanle # Description 删除对应消息的图片资源 def delete_kindeditor_assets - logger.info 'delete_kindeditor_assets start' - tStarttime = Time.now - delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE - - tEndtime = Time.now - tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000 - logger.info "message_time delete_kindeditor_assets! user wait time = #{tUsedtime} ms" end # 课程成员得分（活跃度） @@ -424,8 +399,6 @@ class Message < ActiveRecord::Base # 删除帖子的时候更新课程帖子总数, 删除回复的时候减少总数 def down_course_score - logger.info 'down_course_score start' - tStarttime = Time.now if self.course if self.parent_id.nil? # 发帖 down_course_score_num(self.course.id, self.author_id, "Message") @@ -434,9 +407,6 @@ class Message < ActiveRecord::Base down_course_score_num(self.course.id, self.author_id, "MessageReply") end end - tEndtime = Time.now - tUsedtime = (tEndtime.to_i-tStarttime.to_i)*1000+(tEndtime.usec - tStarttime.usec)/1000 - logger.info "message_time down_course_score! user wait time = #{tUsedtime} ms" end def delete_org_activities From d8906db1aa95bb64417f983865e3e905315add17 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 15 Nov 2016 10:34:14 +0800 Subject: [PATCH 009/112] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=9A=E2=80=9C=E6=9C=AA=E5=88=86=E7=8F=AD?= =?UTF-8?q?=E2=80=9D=E5=88=97=E8=A1=A8=E5=AF=B9=E6=88=90=E5=91=98=E5=88=86?= =?UTF-8?q?=E7=8F=AD=EF=BC=8C=E6=88=90=E5=91=98=E6=98=BE=E7=A4=BA=E6=9C=AA?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=EF=BC=9B=E5=85=B7=E4=BD=93?= =?UTF-8?q?=E5=88=86=E7=8F=AD=E5=88=97=E8=A1=A8=E5=AF=B9=E6=88=90=E5=91=98?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=86=E7=8F=AD=EF=BC=8C=E5=88=86=E7=8F=AD?= =?UTF-8?q?=E6=88=90=E5=91=98=E6=95=B0=E7=BB=9F=E8=AE=A1=E6=9C=AA=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 25 +++++++++++-------- app/views/courses/_new_member_list.html.erb | 2 +- app/views/courses/teacher_assign_group.js.erb | 7 +++--- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 0bb027153..bd17b79a1 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -303,18 +303,21 @@ class CoursesController < ApplicationController @member = Member.where(:course_id => @course.id, :user_id => params[:user_id]).first @member.course_group_id = params[:course_group_id].to_i @member.save - if params[:group_id] && params[:group_id] != "-1" - @group = CourseGroup.find params[:group_id] - results = student_homework_score(@group.id,0,0,"desc") - @limit = 50 - @page = params[:page].nil? ? 1 : params['page'].to_i - @members_count = results.count - @mem_pages = Paginator.new @members_count, @limit, @page - @results = paginateHelper results, @limit - else - @course_groups = @course.course_groups - @no_group_count = @course.student.count - @course.members.where("course_group_id != 0").count + if params[:group_id] != "0" + if params[:group_id] == "-1" + @group = "-1" + else + @group = CourseGroup.find params[:group_id] + end + # results = student_homework_score(@group.id,0,0,"desc") + # @limit = 50 + # @page = params[:page].nil? ? 1 : params['page'].to_i + # @members_count = results.count + # @mem_pages = Paginator.new @members_count, @limit, @page + # @results = paginateHelper results, @limit end + @course_groups = @course.course_groups + @no_group_count = @course.student.count - @course.members.where("course_group_id != 0").count @canShowCode = isCourseTeacher(User.current.id,@course) respond_to do |format| format.js diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb index d04e14cc8..41f36d018 100644 --- a/app/views/courses/_new_member_list.html.erb +++ b/app/views/courses/_new_member_list.html.erb @@ -120,7 +120,7 @@ <% if @course.course_groups.empty? %> <%=member.course_group_id == 0 ? "暂无" : member.course_group.name %> <% else %> - <%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id,:user_id => member.user_id, :group_id => @group && @group != -1 ? @group.id : -1},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %> + <%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id,:user_id => member.user_id, :group_id => @group && @group != -1 ? @group.id : (@group && @group == -1 ? -1 : 0)},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %>

diff --git a/app/views/courses/teacher_assign_group.js.erb b/app/views/courses/teacher_assign_group.js.erb index 4ddad588f..4df0924ea 100644 --- a/app/views/courses/teacher_assign_group.js.erb +++ b/app/views/courses/teacher_assign_group.js.erb @@ -1,8 +1,9 @@ -<% if @group %> +<% if params[:group_id] != "0" %> $("#member_li_<%=@member.id %>").html(""); +<% end %> +<% if @group && @group != "-1" %> //$("#member_content").html("<%#= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @results})%>"); $("#join_or_add").html("<%= escape_javascript( render :partial => 'join_or_add')%>"); -<% else %> -$("#st_groups").html("<%=escape_javascript(render :partial => 'new_groups_name', :locals => {:course_groups => @course_groups}) %>"); <% end %> +$("#st_groups").html("<%=escape_javascript(render :partial => 'new_groups_name', :locals => {:course_groups => @course_groups}) %>"); $("#group_children_list").html("<%= escape_javascript( render :partial => 'layouts/group_children_list', :locals => {:course => @course})%>"); From 5d0954d1081ff0cf09aee92dc64c2249301ec360 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 15 Nov 2016 10:54:31 +0800 Subject: [PATCH 010/112] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=EF=BC=8C=E5=A6=82=E5=9B=BE?= =?UTF-8?q?=E4=BB=A5=E7=9C=81=E7=95=A5=E5=8F=B7=E7=BB=93=E6=9D=9F=E7=9A=84?= =?UTF-8?q?=E6=B6=88=E6=81=AF=EF=BC=8C=E5=BD=93=E9=BC=A0=E6=A0=87=E7=A7=BB?= =?UTF-8?q?=E8=87=B3=E6=AD=A4=E6=B6=88=E6=81=AF=EF=BC=8C=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA=E5=AE=8C=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_join_course_course_message.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/users/_join_course_course_message.html.erb b/app/views/users/_join_course_course_message.html.erb index 79f1f6e67..c69d66ad0 100644 --- a/app/views/users/_join_course_course_message.html.erb +++ b/app/views/users/_join_course_course_message.html.erb @@ -5,8 +5,9 @@
  • - <%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_id), - :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> + <% content = User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "教辅"}" %> + <%= link_to content, user_path(User.find(ma.course_message_id), :course_id => ma.course_id), + :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank', :title => "#{content}" %> From 7988257e100a421ee375b5f56e858772d7b0d4a9 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 15 Nov 2016 11:19:31 +0800 Subject: [PATCH 011/112] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA=EF=BC=9A=E5=A6=82=E5=9B=BE=E5=A4=9A=E7=BA=A7=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E2=80=9C=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E2=80=9D=E8=A6=81=E7=94=A8=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/_project_message_contents.html.erb | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/views/projects/_project_message_contents.html.erb b/app/views/projects/_project_message_contents.html.erb index cbdf6c960..b0b38cc8e 100644 --- a/app/views/projects/_project_message_contents.html.erb +++ b/app/views/projects/_project_message_contents.html.erb @@ -7,20 +7,17 @@ <% parents_rely = get_reply_parents_no_root parents_rely, comment %> <% length = parents_rely.length %>
    - <% if length <= 3 %> + <% if length <= 2 %> <%=render :partial => 'projects/journal_comment_reply', :locals => {:comment => comment.parent} %> <% else %>
    -
    - <%=render :partial => 'projects/journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %> -
    - <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %> + <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[length - 1]} %>
    -
    +
    ↓ - - <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %> + 已经隐藏<%=(length - 2).to_s %>个楼层 + <%= link_to '[点击展开]', show_all_replies_users_path(:comment => comment, :type => comment.class), :remote=>true, :class => 'linkBlue2' %>
    <%=render :partial => 'projects/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
    From f754ac870de30b60606e874e58c7c0de67521a28 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 15 Nov 2016 14:18:15 +0800 Subject: [PATCH 012/112] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E9=A2=98?= =?UTF-8?q?=E5=BA=93-=E5=8F=91=E9=80=81=EF=BC=9A=E5=A6=82=E5=9B=BE?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=BC=B9=E6=A1=86=E4=B8=AD=E5=BD=93=E9=BC=A0?= =?UTF-8?q?=E6=A0=87=E7=A7=BB=E8=87=B3=E4=B8=8B=E6=8B=89=E6=9D=A1=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E9=BC=A0=E6=A0=87=E5=85=89=E6=A0=87=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=88=90=E5=8F=AF=E4=BB=A5=E5=B7=A6=E5=8F=B3?= =?UTF-8?q?=E6=8B=89=E5=8A=A8=E7=9A=84=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/application.js | 2 +- public/stylesheets/css/common.css | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/public/javascripts/application.js b/public/javascripts/application.js index a7126c002..3f5a739f9 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1631,7 +1631,7 @@ function pop_box_new(value, Width, Height){ new Drag("popupWrap"); - $("#popupWrap input, #popupWrap textarea").mousedown(function(event){ + $("#popupWrap input, #popupWrap textarea, #popupWrap ul").mousedown(function(event){ event.stopPropagation(); new Drag("popupWrap"); }); diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index f485baba1..8d8712049 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -703,3 +703,5 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;} /*禁用*/ .disabled {background-color:#f5f5f5;} + +#popupWrap ul{cursor: default;} From 57c82effed79d1ef96f0d72ae52520b677ef7875 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 15 Nov 2016 15:04:24 +0800 Subject: [PATCH 013/112] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=B8=96?= =?UTF-8?q?=E5=AD=90=EF=BC=9A=E6=96=B0=E5=BB=BA=E6=97=B6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=AD=97=E6=95=B0=E9=99=90=E5=88=B6=EF=BC=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=97=B6=E5=8D=B4=E6=9C=89=E5=AD=97=E6=95=B0=E9=99=90=E5=88=B6?= =?UTF-8?q?=E4=BA=86=EF=BC=8C=E4=B8=8D=E5=90=88=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/boards/_course_new.html.erb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb index 71f9d7c69..774d1c100 100644 --- a/app/views/boards/_course_new.html.erb +++ b/app/views/boards/_course_new.html.erb @@ -20,10 +20,6 @@ { params.contentmsg.text("描述不能为空"); params.contentmsg.css('color','#ff0000'); - } - else if(params.content.html().length >=20000){ - params.contentmsg.text("描述最多20000个汉字(或40000个英文字符)"); - params.contentmsg.css('color','#ff0000'); result=false; } else @@ -177,7 +173,7 @@ 或 取消 <% else %> - 确定 + 确定 或 <%= link_to "取消",board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "fr mr10 mt3"%> <% end %> From 9f79408e32d1f34a0ef6c17cd1ef85cdab8640b6 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 15 Nov 2016 16:57:07 +0800 Subject: [PATCH 014/112] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=AF=95=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 14 +++ app/views/exercise/_exercises_list.html.erb | 2 +- app/views/exercise/_other_exercises.html.erb | 117 +++++++++++++++++++ app/views/exercise/other_exercise.js.erb | 8 ++ app/views/poll/other_poll.js.erb | 12 +- config/routes.rb | 1 + public/images/sy/icons_sy.png | Bin 6481 -> 27524 bytes 7 files changed, 144 insertions(+), 10 deletions(-) create mode 100644 app/views/exercise/_other_exercises.html.erb create mode 100644 app/views/exercise/other_exercise.js.erb diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index e3caaf9fb..214a538cf 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -618,6 +618,20 @@ class ExerciseController < ApplicationController score = score1 + score2 + score3 end + #导入试卷的弹框 + def other_exercise + # 查作者是我，或者作者是当前课程的老师，且不在当前课程内的试卷 进行导入 + courses = User.current.courses.not_deleted.select { |course| User.current.allowed_to?(:as_teacher,course)} + course_ids = courses.empty? ? "(-1)" : "(" + courses.map { |course| course.id}.join(',') + ")" + #none_courses = User.current.courses.where("is_delete = 1 or #{Course.table_name}.id = #{params[:course_id].to_i}") + #none_course_ids = none_courses.empty? ? "(-1)" : "(" + none_courses.map { |course| course.id}.join(',') + ")" + @exercises = Exercise.where("(user_id = #{User.current.id} or course_id in #{course_ids}) and course_id != #{params[:course_id].to_i}") + @course_id = params[:course_id] + respond_to do |format| + format.js + end + end + private #测验列表转换为excel def exercise_to_xls items diff --git a/app/views/exercise/_exercises_list.html.erb b/app/views/exercise/_exercises_list.html.erb index 89964f032..8057361d7 100644 --- a/app/views/exercise/_exercises_list.html.erb +++ b/app/views/exercise/_exercises_list.html.erb @@ -3,7 +3,7 @@ （<%= @obj_count%>） <% if @is_teacher%> - <%#= link_to "导入", other_poll_poll_index_path(:polls_group_id => @course.id), :remote=>true,:class => "newbtn"%> + <%= link_to "导入试卷", other_exercise_exercise_index_path(:course_id => @course.id), :remote=>true,:class => "newbtn"%> <%= link_to "新建试卷 ", new_exercise_path(:course_id => @course.id), :class => "newbtn" %> <% end%>
    diff --git a/app/views/exercise/_other_exercises.html.erb b/app/views/exercise/_other_exercises.html.erb new file mode 100644 index 000000000..446334005 --- /dev/null +++ b/app/views/exercise/_other_exercises.html.erb @@ -0,0 +1,117 @@ +
    +
    +

    选择试卷导入本班级

    + +
    +
    +
    +
    +
    + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     试卷标题来源引用数创建时间

    软件测试小测

    软件测试软件测试软件测试软件测试软件测试软件测试软件测试软件测试

    		3000002016-10-26

    数据库查询系统数据库查询系统课数据库查询系统课数据库查询系统课数据库查询系统课课件练习.doc

    软件测试

    		12016-10-26

    软件测试小测

    软件测试软件测试软件测试软件测试软件测试软件测试软件测试软件测试

    		32016-10-26

    数据库查询系统数据库查询系统课数据库查询系统课数据库查询系统课数据库查询系统课课件练习.doc

    软件测试

    		12016-10-26

    软件测试小测

    软件测试软件测试软件测试软件测试软件测试软件测试软件测试软件测试

    		32016-10-26

    数据库查询系统数据库查询系统课数据库查询系统课数据库查询系统课数据库查询系统课课件练习.doc

    软件测试

    		12016-10-26

    软件测试小测

    软件测试软件测试软件测试软件测试软件测试软件测试软件测试软件测试

    		32016-10-26

    数据库查询系统数据库查询系统课数据库查询系统课数据库查询系统课数据库查询系统课课件练习.doc

    软件测试

    		12016-10-26

    软件测试小测

    软件测试软件测试软件测试软件测试软件测试软件测试软件测试软件测试

    		32016-10-26

    数据库查询系统数据库查询系统课数据库查询系统课数据库查询系统课数据库查询系统课课件练习.doc

    软件测试

    		12016-10-26
    +
    +
    + + +
    +
    + 上一页 + 1 + 2 + 3 + ... + 31 + 下一页 +
    +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/app/views/exercise/other_exercise.js.erb b/app/views/exercise/other_exercise.js.erb new file mode 100644 index 000000000..13f0197a9 --- /dev/null +++ b/app/views/exercise/other_exercise.js.erb @@ -0,0 +1,8 @@ +<% if @exercises.blank? %> +var htmlvalue = '

    提示

    '+ + '

    您的其它班级下没有试卷可供导入

    确定
    '; +pop_box_new(htmlvalue, 300, 140); +<% else %> +var html_value = '<%= escape_javascript(render :partial => 'other_exercises',:locals => {:exercises => @exercises, :course_id=>@course_id}) %>'; +pop_box_new(html_value, 510, 550); +<% end %> \ No newline at end of file diff --git a/app/views/poll/other_poll.js.erb b/app/views/poll/other_poll.js.erb index 80b5e4719..a70faded0 100644 --- a/app/views/poll/other_poll.js.erb +++ b/app/views/poll/other_poll.js.erb @@ -1,14 +1,8 @@ <% if @polls.empty? %> - alert('您的其它班级下没有问卷可供导入'); +var htmlvalue = '

    提示

    '+ + '

    您的其它班级下没有问卷可供导入

    确定
    '; + pop_box_new(htmlvalue, 300, 140); <% else %> var html_value = '<%= escape_javascript(render :partial => 'other_poll',:locals => {:polls => @polls,:polls_group_id=>@polls_group_id}) %>'; pop_box_new(html_value, 510, 550); -// $('#ajax-modal').html('<%= escape_javascript(render :partial => 'other_poll',:locals => {:polls => @polls,:polls_group_id=>@polls_group_id}) %>'); -// -// -// showModal('ajax-modal', '513px'); -// $('#ajax-modal').siblings().remove(); -// $('#ajax-modal').before(""); -// $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9"); -// $('#ajax-modal').parent().addClass("popbox_polls"); <% end %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index e25689099..1ad680abd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -296,6 +296,7 @@ RedmineApp::Application.routes.draw do collection do #生成路径为 /exercise/方法名 delete 'delete_exercise_question' post 'update_exercise_question' + get 'other_exercise' end end diff --git a/public/images/sy/icons_sy.png b/public/images/sy/icons_sy.png index 36619735310df77141f2206c24b19d944ddd20b4..b019fc9ad5af2357707cef7ead93a4e187f4910d 100644 GIT binary patch literal 27524 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 NPD)9#Sll@9{{UHQHRAvP literal 6481 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 Date: Wed, 16 Nov 2016 11:26:17 +0800 Subject: [PATCH 015/112] =?UTF-8?q?=E6=88=91=E7=9A=84issue=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 16 +- app/helpers/users_helper.rb | 11 + app/views/users/_all_issue_list.html.erb | 24 ++ app/views/users/_my_issue_list.html.erb | 82 +++++++ app/views/users/user_issues.html.erb | 277 ++++++++++++++++++++++- app/views/users/user_issues.js.erb | 3 + public/stylesheets/css/common.css | 125 ++++++++++ 7 files changed, 534 insertions(+), 4 deletions(-) create mode 100644 app/views/users/_all_issue_list.html.erb create mode 100644 app/views/users/_my_issue_list.html.erb create mode 100644 app/views/users/user_issues.js.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 89accca9e..54a2c59ad 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -90,11 +90,21 @@ class UsersController < ApplicationController # order 排序条件 # subject 主题：搜索用（注意：搜索和列表调用同一方法，通过参数或者remote区分） def user_issues - subject = params[:subject] + @subject = params[:subject] author_id = params[:author_id] - @issues = Issue.where("author_id =? or assigned_to_id =? and subject like ?", (author_id ? author_id : @user.id) , @user, "%#{subject}%") + #@issues = Issue.where("author_id =? or assigned_to_id =? and subject like ?", (author_id ? author_id : @user.id) , @user.id, "%#{@subject}%") + @issues_filter = Issue.where("author_id =? or assigned_to_id =?", (author_id ? author_id : @user.id) , @user).order('updated_on desc') + @issue_open_count = Issue.where(" (author_id =? or assigned_to_id =?) and status_id in (1,2,3,4,6)", (author_id ? author_id : @user.id) , @user).count + @issue_close_count = Issue.where("(author_id =? or assigned_to_id =?) and status_id = 5", (author_id ? author_id : @user.id) , @user.id).count + @issue_count = @issues_filter.count + @limit = 10 + @is_remote = true + @issue_pages = Paginator.new @issue_count, @limit, params['page'] || 1 + @offset ||= @issue_pages.offset + @issues = paginateHelper @issues_filter, @limit + respond_to do |format| - format.html{render :layout => 'new_base_user'} + format.html{render :layout => 'static_base'} format.api format.js end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 95cd844f3..4c178c543 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -29,6 +29,17 @@ module UsersHelper ["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", '3']], selected.to_s) end + def issue_list(issues, &block) + ancestors = [] + issues.each do |issue| + while (ancestors.any? && !issue.is_descendant_of?(ancestors.last)) + ancestors.pop + end + yield issue, ancestors.size + ancestors << issue unless issue.leaf? + end + end + def get_resource_type type case type when 'Course' diff --git a/app/views/users/_all_issue_list.html.erb b/app/views/users/_all_issue_list.html.erb new file mode 100644 index 000000000..3c21dc3c8 --- /dev/null +++ b/app/views/users/_all_issue_list.html.erb @@ -0,0 +1,24 @@ +<% issue_list(issues) do |issue| -%> + + <%= render :partial => 'users/my_issue_list', :locals => {:activity => issue, :user_activity_id => issue.id} %> +<% end %> + +
    + + +
    +
      + <%= pagination_links_full @issue_pages, @issue_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%> +
    +
    +
    + +
    \ No newline at end of file diff --git a/app/views/users/_my_issue_list.html.erb b/app/views/users/_my_issue_list.html.erb new file mode 100644 index 000000000..a855a710f --- /dev/null +++ b/app/views/users/_my_issue_list.html.erb @@ -0,0 +1,82 @@ +<% unless activity.author.nil? %> +
    +
    + <% if activity.status_id.to_i == 5 %> + + <% else %> + + <% end %> +
    +
    +
    + <%= activity.subject.to_s %> +
    +
    +
    + <%# if activity.try(:author).try(:realname) == ' ' %> + <%#= link_to activity.try(:author), user_path(activity.author_id), :class => "fl issues_list_name" %> + <%# else %> + <%#= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "fl issues_list_name" %> + <%# end %> + +

    <%= format_time(activity.created_on) %> 发布

    +

    <%= format_time(activity.updated_on) %> 更新

    +
    +
    +
      +
    • + <% if activity.try(:author).try(:realname) == ' ' %> + <%= link_to activity.try(:author), user_path(activity.author_id)%> + <% else %> + <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id)%> + <% end %> +
      • +
    • + <% if !activity.assigned_to_id.nil? && activity.assigned_to_id != 0 %> + <% if activity.try(:assigned_to).try(:realname).empty? %> + <%= link_to activity.assigned_to, user_path(activity.assigned_to_id)%> + <% else %> + <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id)%> + <% end %> + <% end %>
      • +
    • + <% case activity.tracker_id %> + <% when 1%> + 缺陷 + <% when 2%> + 功能 + <% when 3%> + 支持 + <% when 4%> + 任务 + <% when 5%> + 周报 + <% end %> +
      • +
    • + <%= activity.priority.name %> +
      • +
    • + <% if activity.try(:author).try(:realname) == ' ' %> + <%= link_to activity.try(:author), user_path(activity.author_id), :class => "c_grey" %> + <% else %> + <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "c_grey" %> + <% end %> +
      • + +
    • <%= activity.fixed_version %>
      • +
    • <%= activity.status.name %>
      • +
    • <%= activity.done_ratio %>%
      • +
    • + <% if activity.journals.count > 0 %> + + <%= activity.journals.count %> + <% end %> +
      • +
    +
    +<% end %> + + + diff --git a/app/views/users/user_issues.html.erb b/app/views/users/user_issues.html.erb index 56b6510f1..c925f33d7 100644 --- a/app/views/users/user_issues.html.erb +++ b/app/views/users/user_issues.html.erb @@ -1 +1,276 @@ -11111 \ No newline at end of file +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: true,init_activity: true) %> +<% end %> + + + + +
    +
    +

    我的缺陷

    +
    +
    +
    + +
    + +
    + <%= form_tag({:controller => 'users', :action => 'user_issues'}, :remote=>'xls', :id=>"issue_query_form", :class => 'query_form') do %> +
    +
    + + +
    + 清除 + +
    + +
    + +
    + + + + + + + + + + +
    + <% end %> + <% if @issues.empty? %> +

    <%= l(:label_no_data) %>

    + <% else %> +
    + <%#= render :partial => 'users/all_issue_list', :locals => {:issues => @issues, :issue_pages => @issue_pages,:issue_count => @issue_count, :subject => @subject } %> +
    + <% end %> + +
    +
    + +
    + +
    + ddd + +
    +
    + + ddd +
    +
    + +
    + + + + diff --git a/app/views/users/user_issues.js.erb b/app/views/users/user_issues.js.erb new file mode 100644 index 000000000..97b9f760d --- /dev/null +++ b/app/views/users/user_issues.js.erb @@ -0,0 +1,3 @@ +/*$("#issue_filter_all").html("<%#= escape_javascript(render :partial => 'issues/issue_filter_all') %>");*/ +$("#issue_list").html("<%= escape_javascript(render :partial => 'users/all_issue_list',:locals => {:issues => @issues, :issue_pages=> @issue_pages, :issue_count => @issue_count })%>"); +$("#issue_list_pagination").html('<%= pagination_links_full @issue_pages, @issue_count, :issues => @issues, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>'); \ No newline at end of file diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index afe6192fb..973f7a7b9 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -676,3 +676,128 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;} /*禁用*/ .disabled {background-color:#f5f5f5;} + +/* 缺陷列表 */ +.issues_greycirbg_btn{ background-color:#dedede; padding:1px 5px;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; } +.issues_greycirbg_btn:hover{background-color:#cbcbcb;} +input:focus,select:focus{ border:none;outline:medium;border-right:none;} +.issues_con{ width:718px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; } +.issues_statistics{ line-height:35px;} +.issues_statistics ul li{ float:left; } +.issues_statistics ul li a{ font-size:12px; margin:5px; color:#888; } +.issues_statistics ul li a.act{} + + +.issues_form_filter select{ width:84px; height:35px; font-size:14px; border:1px solid #c8c8c8; border-right:none; background-color:#fff; margin-bottom: 10px; color: #888;} +.issues_form_filter input{ height:33px;width:91px; border:1px solid #c8c8c8;background-color:#fff;} +.issues_form_filter select:focus,.issues_form_filter input:focus{border:1px solid #c8c8c8; border-right:none;} +.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("../images/project/arrow.png") no-repeat scroll right center transparent;} +input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} +.issues_data_img{ display:block; width:25px; height:33px; border:1px solid #c8c8c8; border-left:none; background: url("../images/public_icon.png") -29px 9px no-repeat; } +/* 缺陷Tab */ +.issues_con_list{border:1px solid #c8c8c8; } +#issues_list_nav {border-bottom:1px solid #d0d0d0;} +#issues_list_nav li {float:left; padding:10px 15px; text-align:center; } +#issues_list_nav li a{font-size:12px; color:#444;} +.issues_nav_hover{border-bottom:3px solid #3498db; font-weight:bold; } +.issues_nav_nomall {border-bottom:none; } +.issues_nav_tag{ background-color:#eaeaea; padding:2px 8px;-webkit-border-radius:15px;-moz-border-radius:15px;-o-border-radius:15px;border-radius:15px; font-size:12px;} +.undis {display:none;} +.dis {display:block;} +.issues_form_filter{ position: absolute; top:0; right: 0;} +.issues_form_filter select{ width:70px; height:30px; border:none; font-size:14px; border:none;border-right:none; color: #888; font-size: 12px; line-height: 30px; padding-right:10px;} +.issues_form_filter select.issues_filter_select_min{width:50px; } +.issues_form_filter select:focus,.issues_form_filter input:focus{border:none; } +.issues_filter_data input{height:28px;width:91px; border:1px solid #c8c8c8;background-color:#fff;} +.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("../images/project/arrow.png") no-repeat scroll right center transparent;} +input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} +.issues_data_img{ display:block; width:25px; height:28px; border:1px solid #c8c8c8; border-left:none; background: url("../images/public_icon.png") -29px 9px no-repeat; } + +.issues_list_box{ padding:15px; padding-right: 0px; border-bottom:1px dashed #c8c8c8;} +.issues_list_titlebox{ font-size:14px; font-weight:bold; margin-bottom:8px;} +a.issues_list_title{ color:#444; max-width:260px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap; } +a:hover.issues_list_title{color:#3b94d6;} +.issues_list_titlebox span{ font-size: 12px;color: #888; font-weight: normal; } +.issues_ciricons_01{ width: 22px; height: 22px; display: inline-block; background: url("../images/project/icons_issue.png") 0 0 no-repeat;} +.issues_ciricons_02{ width: 22px; height: 22px; display: inline-block; background: url("../images/project/icons_issue.png") 0 -30px no-repeat;} +.issues_icons_mes{width: 17px; height: 17px; display: inline-block; background: url("../images/project/icons_issue.png") 0 -57px no-repeat; } +.issues_list_name{ font-size: 12px;} +.issues_list_name:hover{ color: #3b94d6;} +.issues_list_small{ font-size: 12px; color: #666;} +.issues_list_txt li{ height: 50px; line-height: 50px; float: left; font-size: 12px; width: 70px; text-align: center; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;} +.issues_list_txt li.issues_list_min{ width: 50px;} + + +/* 搜索 与课程相同 */ +.hw_search_box{ position:relative; } +.hw_search_box input.hw_search-input{ width:293px; height:28px; border:none; border:1px solid #e7e7e7; background:#fff; padding-left:5px;} +.hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(../images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px; cursor:pointer;} +.hw_search_box a:hover.hw_btn_search{background:url(../images/hw/icons_hw.png) -40px -57px no-repeat;} +.hw_files_icon{display:block; width:17px; height:14px; background:url(../images/hw/icons_hw.png) 0 -135px no-repeat;} +/* 编辑删除 与课程相同 */ +.sy_icons_edit{ display: inline-block; padding:9px;background:url(../images/sy/sy_icons02.png) 0 1px no-repeat; } +.sy_icons_del{ padding:9px;background:url(../images/sy/sy_icons02.png) 0 -21px no-repeat;} +.sy_icons_edit:hover{ background:url(../images/sy/sy_icons02.png) -20px 1px no-repeat; } +.sy_icons_del:hover{ background:url(../images/sy/sy_icons02.png) -20px -21px no-repeat;} +/* 翻页 与课程相同*/ +.pages a{ + display:block; + border:1px solid #d1d1d1; + color:#888; + float:left; + width:30px; + text-align:center; + padding:3px 0; + line-height:1.9; + margin-right:5px; +} +.pages a:hover{ + background-color:#3b94d6; + border:1px solid #3b94d6; + color:#fff; +} +a.pages-big{ + width:50px; +} +.pages .active{ + background-color:#3b94d6; + border:1px solid #3b94d6; + color:#fff; +} +.pages{ + width:330px; + + margin:20px auto 10px; +} +.sy_corange{ color: #ee4a1f;} +.sy_new_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;} +.sy_cgrey{ color: #888;} +a.sy_cgrey{ color: #888;} +.sy_corange{ color: #ee4a1f;} +a.sy_corange{ color: #ee4a1f;} +a.sy_cblue{ color: #3b94d6;} +/* 新增粉色关注按钮*/ +a.sy_btn_pink{ + display: inline-block; + color: #fff; + background: #ff7d7d; + text-align: center; + font-size: 12px; + padding:0 15px; + height: 30px; + line-height: 30px; + -webkit-border-radius:3px; + -moz-border-radius:3px; + -o-border-radius:3px; + border-radius:3px; +} +a:hover.sy_btn_pink{ background: #e64c4c;} + +/* 我的缺陷列表*/ +.myissues_con{ width:968px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; } +.myissues_head{ width: 100%; height: 40px; line-height: 40px; background: #f4f4f4; } +.myissues_head h2{ font-size: 14px;} +select.issues_filter_active { font-weight: bold; color: #333;} +.issues_form_filter select.issues_filter_select_min02{width:60px; } +.issues_form_filter select.issues_filter_select_max{width:90px; } +.issues_list_txt li.issues_list_max{ width:90px } \ No newline at end of file From e956d20d6eccb538981ac3d66ded87ad8f424ead Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 16 Nov 2016 16:57:02 +0800 Subject: [PATCH 016/112] =?UTF-8?q?=E6=88=91=E7=9A=84issue=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 12 ++-- app/helpers/users_helper.rb | 5 ++ app/views/users/_all_issue_list.html.erb | 16 ------ app/views/users/_my_issue_filter_all.html.erb | 1 + app/views/users/_my_issue_list.html.erb | 56 ++++++++++++------- app/views/users/user_issues.html.erb | 27 +++++---- app/views/users/user_issues.js.erb | 2 +- config/routes.rb | 2 +- public/stylesheets/css/common.css | 6 +- 9 files changed, 70 insertions(+), 57 deletions(-) create mode 100644 app/views/users/_my_issue_filter_all.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 54a2c59ad..70e4a3124 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -92,17 +92,21 @@ class UsersController < ApplicationController def user_issues @subject = params[:subject] author_id = params[:author_id] - #@issues = Issue.where("author_id =? or assigned_to_id =? and subject like ?", (author_id ? author_id : @user.id) , @user.id, "%#{@subject}%") + params[:project_id].to_i == 0 ? @project_id = nil : @project_id = params[:project_id] + if @project_id.nil? + @issues = Issue.where("(author_id =? or assigned_to_id =? ) and subject like ?", (author_id ? author_id : @user.id) , @user.id, "%#{@subject}%").order('updated_on desc') + else + @issues = Issue.where("(author_id =? or assigned_to_id =? ) and project_id=? and subject like ?", (author_id ? author_id : @user.id) , @user.id, @project_id, "%#{@subject}%").order('updated_on desc') + end @issues_filter = Issue.where("author_id =? or assigned_to_id =?", (author_id ? author_id : @user.id) , @user).order('updated_on desc') @issue_open_count = Issue.where(" (author_id =? or assigned_to_id =?) and status_id in (1,2,3,4,6)", (author_id ? author_id : @user.id) , @user).count @issue_close_count = Issue.where("(author_id =? or assigned_to_id =?) and status_id = 5", (author_id ? author_id : @user.id) , @user.id).count - @issue_count = @issues_filter.count + @issue_count = @issues.count @limit = 10 @is_remote = true @issue_pages = Paginator.new @issue_count, @limit, params['page'] || 1 @offset ||= @issue_pages.offset - @issues = paginateHelper @issues_filter, @limit - + @issues = paginateHelper @issues, @limit respond_to do |format| format.html{render :layout => 'static_base'} format.api diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 4c178c543..c81b3b84e 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -40,6 +40,11 @@ module UsersHelper end end + def options_for_issue_project_list( issues ) + issues = issues.group_by{|issue| issue.project_id} + issues.map{ |issue| [Project.find(issue[0]).name, issue[0]]}.unshift(["来源", 0]) + end + def get_resource_type type case type when 'Course' diff --git a/app/views/users/_all_issue_list.html.erb b/app/views/users/_all_issue_list.html.erb index 3c21dc3c8..a3554b7e2 100644 --- a/app/views/users/_all_issue_list.html.erb +++ b/app/views/users/_all_issue_list.html.erb @@ -6,19 +6,3 @@ <%= render :partial => 'users/my_issue_list', :locals => {:activity => issue, :user_activity_id => issue.id} %> <% end %> - -
    - - -
    -
      - <%= pagination_links_full @issue_pages, @issue_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%> -
    -
    -
    - -
    \ No newline at end of file diff --git a/app/views/users/_my_issue_filter_all.html.erb b/app/views/users/_my_issue_filter_all.html.erb new file mode 100644 index 000000000..64242df9b --- /dev/null +++ b/app/views/users/_my_issue_filter_all.html.erb @@ -0,0 +1 @@ +<%= @issue_count %> \ No newline at end of file diff --git a/app/views/users/_my_issue_list.html.erb b/app/views/users/_my_issue_list.html.erb index a855a710f..e214a27ed 100644 --- a/app/views/users/_my_issue_list.html.erb +++ b/app/views/users/_my_issue_list.html.erb @@ -19,11 +19,14 @@ <%#= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "fl issues_list_name" %> <%# end %> -

    <%= format_time(activity.created_on) %> 发布

    +

    <%= format_time(activity.created_on) %> 发布

    <%= format_time(activity.updated_on) %> 更新

      • +
    • + <%= Project.find(activity.project_id).name %> +
    • <% if activity.try(:author).try(:realname) == ' ' %> <%= link_to activity.try(:author), user_path(activity.author_id)%> @@ -31,15 +34,7 @@ <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id)%> <% end %>
      • -
    • - <% if !activity.assigned_to_id.nil? && activity.assigned_to_id != 0 %> - <% if activity.try(:assigned_to).try(:realname).empty? %> - <%= link_to activity.assigned_to, user_path(activity.assigned_to_id)%> - <% else %> - <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id)%> - <% end %> - <% end %>
      • -
    • +
    • <% case activity.tracker_id %> <% when 1%> 缺陷 @@ -53,23 +48,24 @@ 周报 <% end %>
      • -
    • - <%= activity.priority.name %> -
    • - <% if activity.try(:author).try(:realname) == ' ' %> - <%= link_to activity.try(:author), user_path(activity.author_id), :class => "c_grey" %> - <% else %> - <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "c_grey" %> - <% end %> + <% if !activity.assigned_to_id.nil? && activity.assigned_to_id != 0 %> + <% if activity.try(:assigned_to).try(:realname).empty? %> + <%= link_to activity.assigned_to, user_path(activity.assigned_to_id)%> + <% else %> + <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id)%> + <% end %> + <% end %>
      • +
    • + <%= activity.priority.name %>
    • <%= activity.fixed_version %>
      • -
    • <%= activity.status.name %>
      • +
    • <%= activity.status.name %>
    • <%= activity.done_ratio %>%
    • <% if activity.journals.count > 0 %> - + <%= activity.journals.count %> <% end %>
      • @@ -78,5 +74,25 @@ <% end %> diff --git a/app/views/users/user_issues.html.erb b/app/views/users/user_issues.html.erb index c925f33d7..3bb5d6e6a 100644 --- a/app/views/users/user_issues.html.erb +++ b/app/views/users/user_issues.html.erb @@ -77,9 +77,6 @@ }); function remote_function() { - if($.trim($("#issue_create_date_end_show").val()) !="" && Date.parse($.trim($("#issue_create_date_end_show").val())) < Date.parse($.trim($("#issue_create_date_start_show").val()))){ - alert("开始日期不能大于结束日期！"); - } $("#issue_query_form").submit(); } @@ -173,7 +170,7 @@ -
      +

      我的缺陷

      @@ -187,7 +184,7 @@
      - <%= form_tag({:controller => 'users', :action => 'user_issues'}, :remote=>'xls', :id=>"issue_query_form", :class => 'query_form') do %> + <%= form_tag( user_issues_user_path(@user), :remote=>'xls', :method => "post", :id=>"issue_query_form", :class => 'query_form') do %>
      @@ -203,7 +200,8 @@
      -
      - @@ -243,14 +246,14 @@ - +
      <% end %> <% if @issues.empty? %>

      <%= l(:label_no_data) %>

      <% else %>
      - <%#= render :partial => 'users/all_issue_list', :locals => {:issues => @issues, :issue_pages => @issue_pages,:issue_count => @issue_count, :subject => @subject } %> + <%= render :partial => 'users/all_issue_list', :locals => {:issues => @issues, :issue_pages => @issue_pages,:issue_count => @issue_count, :subject => @subject } %>
      <% end %> diff --git a/app/views/users/user_issues.js.erb b/app/views/users/user_issues.js.erb index 97b9f760d..0c7f67ac1 100644 --- a/app/views/users/user_issues.js.erb +++ b/app/views/users/user_issues.js.erb @@ -1,3 +1,3 @@ -/*$("#issue_filter_all").html("<%#= escape_javascript(render :partial => 'issues/issue_filter_all') %>");*/ +$("#issue_filter_all").html("<%= escape_javascript(render :partial => 'users/my_issue_filter_all') %>"); $("#issue_list").html("<%= escape_javascript(render :partial => 'users/all_issue_list',:locals => {:issues => @issues, :issue_pages=> @issue_pages, :issue_count => @issue_count })%>"); $("#issue_list_pagination").html('<%= pagination_links_full @issue_pages, @issue_count, :issues => @issues, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>'); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 48fc637b8..df7bdb3b1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -638,7 +638,7 @@ RedmineApp::Application.routes.draw do get 'edit_brief_introduction' get "user_resource" - get "user_issues", :to => 'users#user_issues', :via => :get, :as => "user_issues" + match "user_issues", :to => 'users#user_issues', :via => [:get, :post], :as => "user_issues" get "import_resources" get "import_resources_search" post "import_into_container" diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index 973f7a7b9..4ca947af4 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -718,9 +718,9 @@ input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} a.issues_list_title{ color:#444; max-width:260px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap; } a:hover.issues_list_title{color:#3b94d6;} .issues_list_titlebox span{ font-size: 12px;color: #888; font-weight: normal; } -.issues_ciricons_01{ width: 22px; height: 22px; display: inline-block; background: url("../images/project/icons_issue.png") 0 0 no-repeat;} -.issues_ciricons_02{ width: 22px; height: 22px; display: inline-block; background: url("../images/project/icons_issue.png") 0 -30px no-repeat;} -.issues_icons_mes{width: 17px; height: 17px; display: inline-block; background: url("../images/project/icons_issue.png") 0 -57px no-repeat; } +.issues_ciricons_01{ width: 22px; height: 22px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 0 no-repeat;} +.issues_ciricons_02{ width: 22px; height: 22px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 -30px no-repeat;} +.issues_icons_mes{width: 17px; height: 17px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 -57px no-repeat; } .issues_list_name{ font-size: 12px;} .issues_list_name:hover{ color: #3b94d6;} .issues_list_small{ font-size: 12px; color: #666;} From 1ad0c1cbff5018ce54132a3919ca7247e674355d Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 17 Nov 2016 09:06:44 +0800 Subject: [PATCH 017/112] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 77 +++++++- .../exercise/_all_import_exercises.html.erb | 30 ++++ app/views/exercise/_exercise.html.erb | 117 +++++++----- app/views/exercise/_exercises_list.html.erb | 4 +- app/views/exercise/_other_exercises.html.erb | 168 +++++++----------- app/views/exercise/destroy.js.erb | 1 + .../exercise/import_other_exercise.js.erb | 9 + app/views/exercise/other_exercise.js.erb | 2 +- app/views/exercise/search_exercises.js.erb | 3 + config/routes.rb | 2 + public/stylesheets/css/common.css | 2 + public/stylesheets/css/courses.css | 12 ++ public/stylesheets/css/moduel.css | 52 +++++- 13 files changed, 324 insertions(+), 155 deletions(-) create mode 100644 app/views/exercise/_all_import_exercises.html.erb create mode 100644 app/views/exercise/import_other_exercise.js.erb create mode 100644 app/views/exercise/search_exercises.js.erb diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index 214a538cf..ec89b9bc2 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -621,12 +621,87 @@ class ExerciseController < ApplicationController #导入试卷的弹框 def other_exercise # 查作者是我，或者作者是当前课程的老师，且不在当前课程内的试卷 进行导入 + @order,@b_sort = params[:order] || "created_at",params[:sort] || "desc" + @r_sort = @b_sort == "desc" ? "asc" : "desc" courses = User.current.courses.not_deleted.select { |course| User.current.allowed_to?(:as_teacher,course)} course_ids = courses.empty? ? "(-1)" : "(" + courses.map { |course| course.id}.join(',') + ")" #none_courses = User.current.courses.where("is_delete = 1 or #{Course.table_name}.id = #{params[:course_id].to_i}") #none_course_ids = none_courses.empty? ? "(-1)" : "(" + none_courses.map { |course| course.id}.join(',') + ")" - @exercises = Exercise.where("(user_id = #{User.current.id} or course_id in #{course_ids}) and course_id != #{params[:course_id].to_i}") + @exercises = Exercise.where("(user_id = #{User.current.id} or course_id in #{course_ids}) and course_id != #{params[:course_id].to_i}").order("#{@order} #{@b_sort}") @course_id = params[:course_id] + @is_remote = true + @ex_count = @exercises.count + @ex_pages = Paginator.new @ex_count, 10, params['page'] || 1 + @offset ||= @ex_pages.offset + @exercises = paginateHelper @exercises,10 + respond_to do |format| + format.js + end + end + + #搜索导入页面的试卷 + def search_exercises + @order,@b_sort = params[:order] || "created_at",params[:sort] || "desc" + @r_sort = @b_sort == "desc" ? "asc" : "desc" + search = params[:name].to_s.strip.downcase + courses = User.current.courses.not_deleted.select { |course| User.current.allowed_to?(:as_teacher,course)} + course_ids = courses.empty? ? "(-1)" : "(" + courses.map { |course| course.id}.join(',') + ")" + @exercises = Exercise.where("(user_id = #{User.current.id} or course_id in #{course_ids}) and course_id != #{params[:course_id].to_i} and exercise_name like '%#{search}%'").order("#{@order} #{@b_sort}") + @is_remote = true + @ex_count = @exercises.count + @ex_pages = Paginator.new @ex_count, 10, params['page'] || 1 + @offset ||= @ex_pages.offset + @exercises = paginateHelper @exercises,10 + @course_id = params[:course_id] + respond_to do |format| + format.js + end + end + + #将选择的试卷导入到班级 + def import_other_exercise + course_id = params[:course_id] + @course = Course.find(course_id) + params[:exercise_id].each_with_index do |ex,i| + exercise = Exercise.find(ex) + option = { + :exercise_name => exercise.exercise_name, + :exercise_status => 1, + :user_id => User.current.id, + :show_result => 1, + :course_id => @course.id, + :time => exercise.time, + :exercise_description => exercise.exercise_description + } + @exercise = Exercise.create option + + exercise.exercise_questions.each do |q| + option = { + :question_title => q[:question_title], + :question_type => q[:question_type] || 1, + :question_number => q[:question_number], + :question_score => q[:question_score] + } + @exercise_question = @exercise.exercise_questions.new option + + for i in 1..q.exercise_choices.count + choice_option = { + :choice_position => i, + :choice_text => q.exercise_choices[i-1][:choice_text] + } + @exercise_question.exercise_choices.new choice_option + end + + for i in 1..q.exercise_standard_answers.count + standard_answer_option = { + :exercise_choice_id => q.exercise_standard_answers[i-1][:exercise_choice_id], + :answer_text => q.exercise_standard_answers[i-1][:answer_text] + } + @exercise_question.exercise_standard_answers.new standard_answer_option + end + end + @exercise.save + end respond_to do |format| format.js end diff --git a/app/views/exercise/_all_import_exercises.html.erb b/app/views/exercise/_all_import_exercises.html.erb new file mode 100644 index 000000000..07f35a212 --- /dev/null +++ b/app/views/exercise/_all_import_exercises.html.erb @@ -0,0 +1,30 @@ + + + + + + + + + + + <% exercises.each do |exercise| %> + + + + + + + <% end %> + +
        + <%= link_to "试卷标题", search_exercises_exercise_index_path(:course_id => course_id, :order => "exercise_name", :sort => @r_sort), :remote => true%> + <% if order == "exercise_name" %> + <%= link_to "", search_exercises_exercise_index_path(:course_id => course_id, :order => "exercise_name", :sort => @r_sort), :class => "#{@r_sort == 'desc' ? 'sortupbtn' : 'sortdownbtn'}", :style => "position: absolute; top: 8px; left: 172px;", :remote => true %> + <% end %> + 来源 + <%= link_to "创建时间", search_exercises_exercise_index_path(:course_id => course_id, :order => "created_at", :sort => @r_sort), :remote => true%> + <% if order == "created_at" %> + <%= link_to "", search_exercises_exercise_index_path(:course_id => course_id, :order => "created_at", :sort => @r_sort), :class => "#{@r_sort == 'desc' ? 'sortupbtn' : 'sortdownbtn'}", :style => "position: absolute; top: 8px; left: 75px;", :remote => true %> + <% end %> +

      <%=exercise.exercise_name %>

      <%=exercise.course.name %>

      		<%=format_date(exercise.created_at) %>
      \ No newline at end of file diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb index 0edf26511..7a871591e 100644 --- a/app/views/exercise/_exercise.html.erb +++ b/app/views/exercise/_exercise.html.erb @@ -1,54 +1,69 @@ <%# has_commit = has_commit_poll?(poll.id ,User.current)%> <% exercise_name = exercise.exercise_name.empty? ? l(:label_poll_new) : exercise.exercise_name%> <% if @is_teacher%> -
    • -
      - <%# if has_commit %> - <%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%> +
      +
      +
      + <%# if has_commit %> + <%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%> + <%# else %> + <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %> + <%# end %> + <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %> + <% if exercise.exercise_status == 1 %> + + <% elsif exercise.exercise_status == 2 %> + + <% else %> + + <% end%> +
      +
      + + <%# if exercise.exercise_status == 2 %> + <%# else %> - <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %> - <%# end %> - <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %> + + <%# end%> + + <%# if exercise.exercise_status == 1%> + + <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %> + + <%# end%> + <% if exercise.exercise_status == 1 %> + + <% elsif exercise.exercise_status == 2%> + + <% else%> +
      发布试卷
      + <% end%> + + <% if exercise.exercise_status == 1%> +
      统计结果
      + <% else %> +
      <%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%>
      + <% end%> +
      +
      + +
      + 测试时长：<%= exercise.time.nil? || exercise.time == -1 ? '不限' : exercise.time.to_s + "分钟" %> + 截止时间：<%= exercise.end_time.nil? ? '未设置' : format_time(exercise.end_time) %> + 发布时间：<%= exercise.publish_time.nil? ? '未设置' : format_time(exercise.publish_time) %> + <% if exercise.exercise_status > 2 %> + 已提交：<%= exercise.exercise_users.where("created_at >= #{exercise.end_time.to_i}").count %> + 未提交：<%= exercise.course.student.count - exercise.exercise_users.where("created_at >= #{exercise.end_time.to_i}").count %> + <% end %> + +
      + + <% if exercise.exercise_status == 1 %> + <%= link_to '', edit_exercise_path(exercise.id), :class => "ex_icon_edit mt0"%> + <% end%>
      -
      • - - <%# if exercise.exercise_status == 2 %> - - <%# else %> - - <%# end%> - - <%# if exercise.exercise_status == 1%> - - <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %> - - <%# end%> - <% if exercise.exercise_status == 1 %> -
    • 发布试卷
      • - <% elsif exercise.exercise_status == 2%> -
    • 取消发布
      • - <% else%> -
    • 发布试卷
      • - <% end%> - - <% if exercise.exercise_status == 1%> -
    • 统计结果
      • - <% else %> -
    • <%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%>
      • - <% end%> - - <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10") %> - - <% if exercise.exercise_status == 1 %> -
    • <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml10"%>
      • -
    • <%=exercise.publish_time.nil? ? "未发布" : "将于"+format_time(exercise.publish_time.to_s)+"发布"%>
      • - <% elsif exercise.exercise_status == 2 %> -
    • 编辑
      • -
    • 已发布
      • - <% else %> -
    • 编辑
      • -
    • 已截止
      • - <% end%> +
      +
      <% else%> <% if exercise.exercise_status != 1%> @@ -71,4 +86,12 @@
    • 统计结果
      • <%end%> <% end %> -<% end%> \ No newline at end of file +<% end%> + \ No newline at end of file diff --git a/app/views/exercise/_exercises_list.html.erb b/app/views/exercise/_exercises_list.html.erb index 8057361d7..b39d3d947 100644 --- a/app/views/exercise/_exercises_list.html.erb +++ b/app/views/exercise/_exercises_list.html.erb @@ -3,15 +3,15 @@ （<%= @obj_count%>） <% if @is_teacher%> - <%= link_to "导入试卷", other_exercise_exercise_index_path(:course_id => @course.id), :remote=>true,:class => "newbtn"%> <%= link_to "新建试卷 ", new_exercise_path(:course_id => @course.id), :class => "newbtn" %> + <%= link_to "导入试卷", other_exercise_exercise_index_path(:course_id => @course.id), :remote=>true,:class => "newbtn"%> <% end%>
      <% @exercises.each_with_index do |exercise,index|%> -
        +
          <%= render :partial => 'exercise', :locals => {:exercise => exercise,:index => index} %>
        diff --git a/app/views/exercise/_other_exercises.html.erb b/app/views/exercise/_other_exercises.html.erb index 446334005..8b9a10cc3 100644 --- a/app/views/exercise/_other_exercises.html.erb +++ b/app/views/exercise/_other_exercises.html.erb @@ -7,111 +7,75 @@
        - +
        -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         试卷标题来源引用数创建时间

        软件测试小测

        软件测试软件测试软件测试软件测试软件测试软件测试软件测试软件测试

        		3000002016-10-26

        数据库查询系统数据库查询系统课数据库查询系统课数据库查询系统课数据库查询系统课课件练习.doc

        软件测试

        		12016-10-26

        软件测试小测

        软件测试软件测试软件测试软件测试软件测试软件测试软件测试软件测试

        		32016-10-26

        数据库查询系统数据库查询系统课数据库查询系统课数据库查询系统课数据库查询系统课课件练习.doc

        软件测试

        		12016-10-26

        软件测试小测

        软件测试软件测试软件测试软件测试软件测试软件测试软件测试软件测试

        		32016-10-26

        数据库查询系统数据库查询系统课数据库查询系统课数据库查询系统课数据库查询系统课课件练习.doc

        软件测试

        		12016-10-26

        软件测试小测

        软件测试软件测试软件测试软件测试软件测试软件测试软件测试软件测试

        		32016-10-26

        数据库查询系统数据库查询系统课数据库查询系统课数据库查询系统课数据库查询系统课课件练习.doc

        软件测试

        		12016-10-26

        软件测试小测

        软件测试软件测试软件测试软件测试软件测试软件测试软件测试软件测试

        		32016-10-26

        数据库查询系统数据库查询系统课数据库查询系统课数据库查询系统课数据库查询系统课课件练习.doc

        软件测试

        		12016-10-26
        -
        -
        - - + <%=form_tag import_other_exercise_exercise_index_path, + method: :post, + remote: true, + id: "import_other_exercise_form" do %> + +
        +
        + <%=render :partial => 'all_import_exercises', :locals => {:exercises => exercises, :course_id => course_id, :order => @order} %> +
        +
        +

        +
        + 确定 + 取消 +
        +
        +
        +
          + <%= pagination_links_full @ex_pages, @ex_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%> +
        +
        +
        +
        +
        -
        - 上一页 - 1 - 2 - 3 - ... - 31 - 下一页 -
        -
        -
        -
        + <% end %>
        -
      \ No newline at end of file +
      + \ No newline at end of file diff --git a/app/views/exercise/destroy.js.erb b/app/views/exercise/destroy.js.erb index c17b5a0f6..82fbc95b3 100644 --- a/app/views/exercise/destroy.js.erb +++ b/app/views/exercise/destroy.js.erb @@ -1 +1,2 @@ +hideModal(); $("#exercise").html("<%= escape_javascript(render :partial => 'exercises_list') %>"); \ No newline at end of file diff --git a/app/views/exercise/import_other_exercise.js.erb b/app/views/exercise/import_other_exercise.js.erb new file mode 100644 index 000000000..5227d7cd2 --- /dev/null +++ b/app/views/exercise/import_other_exercise.js.erb @@ -0,0 +1,9 @@ +var htmlvalue = '

      提示

      '+ + '

      试卷已导入
      但需要您设置发布时间和截止时间，以激活相应的试卷

      ' + + '知道了
      '; +pop_box_new(htmlvalue, 400, 152); + +function click_OK(){ + hideModal(); + window.location.href = "<%= exercise_index_path(:course_id => @course.id) %>"; +} \ No newline at end of file diff --git a/app/views/exercise/other_exercise.js.erb b/app/views/exercise/other_exercise.js.erb index 13f0197a9..68d5c804b 100644 --- a/app/views/exercise/other_exercise.js.erb +++ b/app/views/exercise/other_exercise.js.erb @@ -4,5 +4,5 @@ var htmlvalue = '
      'all_import_exercises', :locals => {:exercises => @exercises, :course_id => @course_id, :order => @order})%>'); +$("#exercise_ref_pages").html('<%= pagination_links_full @ex_pages, @ex_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>'); +$("#choose_exercise_notice").html(""); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 86ad64b6e..e523bbf9a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -297,6 +297,8 @@ RedmineApp::Application.routes.draw do delete 'delete_exercise_question' post 'update_exercise_question' get 'other_exercise' + post 'import_other_exercise' + get 'search_exercises' end end diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index c26f21a79..55617868f 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -708,3 +708,5 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;} .disabled {background-color:#f5f5f5;} #popupWrap ul{cursor: default;} + +.bg_checked{background-color: #64bdd9;} \ No newline at end of file diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index b5b90bf22..ba2f9cea8 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -586,3 +586,15 @@ a:hover.blueCir{ background:#3598db; color:#fff;} .group_work_tip_box {width:200px; position:absolute; padding:5px 10px; white-space:nowrap; background-color:#fff; right:-255px; top:-90px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);} .group_work_tip_box em {display:block; border-width:10px; position:absolute;top:26px; left:-20px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;} .group_work_tip_box span {display:block; border-width:10px; position:absolute;top:26px; left:-18px; border-style:dashed solid dashed dashed; border-color:transparent #fff transparent transparent; font-size:0; line-height:0;} + +/*试卷*/ +.exercise_list_div{ padding-left:10px; border-bottom:1px dashed #c9c9c9; height:62px; padding-top:8px;} +.exercise_status_nop{ display:block; width:33px; height:22px; background:url(/images/sy/icons_sy.png) 0 -636px no-repeat; color:#fff; font-size:12px; padding-left:10px; line-height: 22px;} +.exercise_status_pub{ display:block; width:33px; height:22px; background:url(/images/sy/icons_sy.png) 0 -613px no-repeat; color:#fff; font-size:12px; padding-left:10px; line-height: 22px;} +.exercise_status_end{ display:block; width:33px; height:22px; background:url(/images/sy/icons_sy.png) 0 -659px no-repeat; color:#fff; font-size:12px; padding-left:10px; line-height: 22px;} +.exercise_status_com{ display:block; width:33px; height:22px; background:url(/images/sy/icons_sy.png) 0 -681px no-repeat; color:#fff; font-size:12px; padding-left:10px; line-height: 22px;} +.exercise_status_nocom{ display:block; width:33px; height:22px; background:url(/images/sy/icons_sy.png) 0 -705px no-repeat; color:#fff; font-size:12px; padding-left:10px; line-height: 22px;} +a.ex_icon_de{ background:url(/images/course/icons.png) 0px -342px no-repeat; width:16px; height:27px; display:block;float:right;} +a:hover.ex_icon_de{ background:url(/images/course/icons.png) -20px -342px no-repeat;} +.ex_icon_edit{ background:url(/images/course/icons.png) 0px -276px no-repeat; width:16px; height:27px; display:block;float:right; margin-right:10px;} +a:hover.ex_icon_edit{ background:url(/images/course/icons.png) -21px -276px no-repeat;} \ No newline at end of file diff --git a/public/stylesheets/css/moduel.css b/public/stylesheets/css/moduel.css index e772cd911..97623c1d2 100644 --- a/public/stylesheets/css/moduel.css +++ b/public/stylesheets/css/moduel.css @@ -63,10 +63,58 @@ a:hover.sub_btn{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;} /*模板form 20161013byLB*/ textarea.muban_textarea{ width: 98.5%;border:1px solid #ddd; background:#fff; color:#666; padding:5px;} /*模板图标20161020byLB*/ -.muban-icons-clock{ background: url("../images/project/icons_issue.png") 0 -224px no-repeat; display: inline-block; width: 19px; height: 13px;} +.muban-icons-clock{ background: url("/images/project/icons_issue.png") 0 -224px no-repeat; display: inline-block; width: 19px; height: 13px;} /*提示条20161020byLB*/ .alert{ padding:10px;border: 1px solid transparent; text-align: center;} .alert-blue{ background-color: #d9edf7;border-color: #bce8f1; color: #3a87ad;} .alert-orange{ background-color: #fff9e9;border-color: #f6d0b1; color:#ee4a20;} .close{padding: 0;cursor: pointer; background: transparent; border: 0; -webkit-appearance: none; font-size: 21px; font-weight: bold;line-height: 1; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.3;} -.close:hover{opacity: 0.5;} \ No newline at end of file +.close:hover{opacity: 0.5;} + +/*新版上传资源弹框20161103byLB*/ +.newuploadbox li{ line-height: 30px;} +.icons_new_file{display:block; width:16px; height:16px; background: url("/images/icons_newpublic.png") 0px 0px no-repeat; } +.icons_new_del{display:block; width:16px; height:17px; background: url("/images/icons_newpublic.png") 0px -26px no-repeat; } +.newupload_txt{ display: block; max-width:280px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} +#muban_popup_box select.newupload_select{ width: 164px; height: 30px;} +.newupload_textarea{ width: 316px; padding:5px; border:1px solid #c8c8c8;} +#muban_popup_box label.newupload_innnerlabel{ width: auto; text-align: left;} +/*新版导入资源弹框20161107byLB*/ +.newupload_conbox{ background: #fff; padding:15px; padding-bottom: 0;} +.newupload_navbox{border-bottom:1px solid #dbdbdb;} +.newupload_nav { height: 30px; line-height: 30px; background: #e7e7e7; } +.newupload_nav li {float:left; padding:0 15px; display: block; text-align:center; } +.newupload_nav li:last-child{ border-right: none;} +.newupload_nav li a{font-size:12px; color:#444;} +.newupload_nav_hover{ background: #3498db; } +.newupload_nav_nomal { } +.newupload_nav_hover a{color: #fff !important; } +.lightheight28{ line-height: 28px;} +/* 搜索 */ +.newupload_search_box{ position:relative; } +#muban_popup_box input.newupload_search_input{ width:683px; height:38px; border:none; border:1px solid #d3d8e7; background:#fff; padding-left:5px; padding-right:25px;} +.newupload_search_box a.newupload_btn_search{display:block; width:20px; height:20px; background:url(/images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:10px; cursor:pointer;} +.newupload_search_box a:hover.newupload_btn_search{background:url(/images/hw/icons_hw.png) -40px -57px no-repeat;} + +/*表格*/ +.newupload_table{ width:715px; background:#fff; border:1px solid #e5e5e5; border-bottom: none; text-align: center;} +.newupload_table thead tr,.sy_new_table tbody tr{ height:30px; line-height:30px; border-bottom:1px solid #e5e5e5;} +.newupload_table thead tr th{ border-bottom:1px solid #e5e5e5; font-weight: bold; background-image: linear-gradient(#fcfcfc, #eee);} +.newupload_table tbody tr:hover{ background:#f5f5f5;} +.newupload_table tbody tr td{ height:30px; border-bottom:1px solid #e5e5e5; color:#888;} +.newupload_table td{ padding:0 5px;} +.newupload_td01{ } +.newupload_td02{width:285px; text-align: left; } +.newupload_td02 p{ width:285px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis; display: inline-block;} +.newupload_td03{width:200px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} +.newupload_td04{width:100px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} +.icons_rslock{ width:13px; height:13px; background:url("/images/icons_newpublic.png") 0px -52px no-repeat; display: inline-block;} +.icons_uploadfiles{width:18px; height:15px; background:url("/images/icons_newpublic.png") 0px -75px no-repeat; display: inline-block;} +.upload_select_box{ width: 337px; height:240px; overflow-y:scroll; padding: 10px; background:#f7f9fd; color: #333; } +#muban_popup_box label.upload_select_label{ width:275px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis; text-align: left; display: inline-block; } +.newupload_tishi{ text-align: center; font-size: 14px;} +.newupload_label_name{ display: inline-block;max-width:130px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} +.newupload_table_name{ display: inline-block;max-width:90px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} +.newupload_table_name02{ display: inline-block;max-width:90px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} + +.newupload_td06{max-width:200px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} \ No newline at end of file From efd0bf6707f32084b555c186f614ab2974ab0bc7 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 17 Nov 2016 10:23:13 +0800 Subject: [PATCH 018/112] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AD=A6=E7=94=9F/?= =?UTF-8?q?=E9=80=80=E5=87=BA=E7=8F=AD=E7=BA=A7=E6=97=B6=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=BD=9C=E5=93=81=E3=80=81=E9=80=80=E5=87=BA?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 4 +++- app/models/homework_common.rb | 2 +- app/models/students_for_course.rb | 12 +++++++++++- app/services/courses_service.rb | 14 +++++++++++--- app/views/courses/_set_join.js.erb | 1 + app/views/layouts/_course_base_info.html.erb | 14 +++++++++++++- app/views/layouts/base_courses.html.erb | 7 +++++++ ...0161117015856_add_is_delete_to_student_works.rb | 5 +++++ db/schema.rb | 3 ++- public/stylesheets/css/common.css | 1 + 10 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20161117015856_add_is_delete_to_student_works.rb diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 0bb027153..e3d7c9d06 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -561,6 +561,7 @@ class CoursesController < ApplicationController def delete_member member = @course.members.find params[:member_id] student_role = member.member_roles.where("role_id = 10").first + teacher_role = member.member_roles.where("role_id = 7 || role_id = 9").first if member && member.deletable? && student_role user_admin = CourseInfos.where("user_id = ? and course_id = ?", member.user_id, @course.id) if user_admin.size > 0 @@ -569,8 +570,9 @@ class CoursesController < ApplicationController joined = StudentsForCourse.where('student_id = ? and course_id = ?', member.user_id,@course.id) joined.destroy_all - if member.member_roles.count > 1 + if member.member_roles.count > 1&& student_role && teacher_role student_role.destroy + teacher_role.update_attribute("is_current", 1) member.update_attribute("course_group_id", 0) else member.destroy diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb index c87cd3d42..3690df1f3 100644 --- a/app/models/homework_common.rb +++ b/app/models/homework_common.rb @@ -15,7 +15,7 @@ class HomeworkCommon < ActiveRecord::Base has_one :homework_detail_group, :dependent => :destroy has_many :student_work_projects, :dependent => :destroy has_many :homework_tests, :dependent => :destroy - has_many :student_works, :dependent => :destroy, :conditions => "is_test=0" + has_many :student_works, :dependent => :destroy, :conditions => "is_test=0 and is_delete != 1" has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表 has_many :journals_for_messages, :as => :jour, :dependent => :destroy has_many :apply_homeworks, :dependent => :destroy diff --git a/app/models/students_for_course.rb b/app/models/students_for_course.rb index 767d65b10..d9bf96770 100644 --- a/app/models/students_for_course.rb +++ b/app/models/students_for_course.rb @@ -9,11 +9,21 @@ class StudentsForCourse < ActiveRecord::Base validates_uniqueness_of :student_id, :scope => :course_id after_destroy :delete_student_works + after_create :recovery_student_works + #退出班级或删除学生时隐藏学生的作品 def delete_student_works course = self.course homework_ids = course.homework_commons.blank? ? "(-1)" : "(" + course.homework_commons.map{|hw| hw.id}.join(",") + ")" student_works = StudentWork.where("user_id = #{self.student_id} && homework_common_id in #{homework_ids}") - student_works.destroy_all + student_works.update_all(:is_delete => 1) + end + + #加入班级时还原作品 + def recovery_student_works + course = self.course + homework_ids = course.homework_commons.blank? ? "(-1)" : "(" + course.homework_commons.map{|hw| hw.id}.join(",") + ")" + student_works = StudentWork.where("user_id = #{self.student_id} && homework_common_id in #{homework_ids}") + student_works.update_all(:is_delete => 0) end end diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index f72623d84..43bdf9e09 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -452,12 +452,20 @@ class CoursesService @state = 2 return @state end - @member = Member.where('course_id = ? and user_id = ?', params[:object_id], user.id) - if @member.nil? || @member.count == 0 + @member = Member.where('course_id = ? and user_id = ?', params[:object_id], user.id).first + if @member.nil? @state = 1 return @state end - @member.first.destroy + student_role = @member.member_roles.where("role_id = 10").first + teacher_role = @member.member_roles.where("role_id = 7 || role_id = 9").first + if @member.member_roles.count > 1 && student_role && teacher_role + student_role.destroy + teacher_role.update_attribute("is_current", 1) + @member.update_attribute("course_group_id", 0) + else + @member.destroy + end joined = StudentsForCourse.where('student_id = ? and course_id = ?', user.id, params[:object_id]) joined.each do |join| join.destroy diff --git a/app/views/courses/_set_join.js.erb b/app/views/courses/_set_join.js.erb index 822757dfe..7c395e54e 100644 --- a/app/views/courses/_set_join.js.erb +++ b/app/views/courses/_set_join.js.erb @@ -1,3 +1,4 @@ +hideModal(); <% if object_id && @state != 6%> $("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(course, user)) %>"); <% end %> diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb index e3041f92c..3b1c70fe8 100644 --- a/app/views/layouts/_course_base_info.html.erb +++ b/app/views/layouts/_course_base_info.html.erb @@ -26,6 +26,18 @@
    +<% elsif User.current.logged? && User.current.member_of_course?(@course) %> +
    + +
    <% end %>
    @@ -84,7 +96,7 @@ <% elsif is_teacher && is_ST %> <%= link_to '学生身份', switch_role_course_path(@course, :user_id => User.current.id, :curr_role => (is_TA ? 7 : 9), :tar_role => 10), :class => "sy_btn_orange mr10 fl", :title => "由教师身份切换至学生身份" %> <% end %> - <% unless (is_teacher || is_TA || is_TE) %> + <% unless (is_teacher || is_TA || is_TE || is_ST) %>
    <%= join_in_course_header(@course, User.current) %>
    <% end %>
    diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 19f7694b3..957f720be 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -276,6 +276,13 @@ $("#expand_tools_expand a").addClass('active'); $("#navContentCourse").toggle(); }); + + function delete_confirm(){ + var htmlvalue = '

    提示

    '+ + '

    您确认要退出该班级吗？

    确  定'+ + '取  消
    '; + pop_box_new(htmlvalue, 300, 140); + } \ No newline at end of file diff --git a/db/migrate/20161117015856_add_is_delete_to_student_works.rb b/db/migrate/20161117015856_add_is_delete_to_student_works.rb new file mode 100644 index 000000000..f6b3abdd6 --- /dev/null +++ b/db/migrate/20161117015856_add_is_delete_to_student_works.rb @@ -0,0 +1,5 @@ +class AddIsDeleteToStudentWorks < ActiveRecord::Migration + def change + add_column :student_works, :is_delete, :integer, :default => 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index fd75bb020..b95fd7a56 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20161114092115) do +ActiveRecord::Schema.define(:version => 20161117015856) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1910,6 +1910,7 @@ ActiveRecord::Schema.define(:version => 20161114092115) do t.float "work_score" t.integer "work_status", :default => 0 t.datetime "commit_time" + t.integer "is_delete", :default => 0 end add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id" diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index afe6192fb..08d12745d 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -169,6 +169,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/ .mr70{margin-right: 70px;} .mr75{margin-right: 75px;} .mr80{margin-right: 80px;} +.mr85{margin-right: 85px;} .mr95 {margin-right:95px !important;} .mr100 {margin-right:100px !important;} .mr118 {margin-right:118px !important;} From 6c8736bea829f3f6130cdb8d3d3f6d99d623aa79 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 17 Nov 2016 11:10:48 +0800 Subject: [PATCH 019/112] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/join_course_multi_role.js.erb | 103 ++++++++++++------ 1 file changed, 69 insertions(+), 34 deletions(-) diff --git a/app/views/courses/join_course_multi_role.js.erb b/app/views/courses/join_course_multi_role.js.erb index a4762d62b..0f663c467 100644 --- a/app/views/courses/join_course_multi_role.js.erb +++ b/app/views/courses/join_course_multi_role.js.erb @@ -1,52 +1,87 @@ -<% if @object_id && @state != 6 && @state !=4 %> -$("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(@course, @user)) %>"); -<% end %> +<%# if @object_id && @state != 6 && @state !=4 %> +//$("#join_in_course_header").html("<%#= escape_javascript(join_in_course_header(@course, @user)) %>"); +<%# end %> <% if @state %> <% if @state == 0 %> -alert("加入成功"); -hideModal(); -$("#try_join_course_link").replaceWith(" 'index',:course=>@course.id, :host=>Setting.host_course)%>' target='_blank' class='blue_n_btn fr mt20'>提交作品"); -window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>" +var htmlvalue = '

    提示

    '+ + '

    加入成功

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% elsif @state == 1 %> -alert("密码错误"); +var htmlvalue = '

    提示

    '+ + '

    密码错误

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% elsif @state == 2 %> -alert("班级已过期\n请联系班级管理员重启班级。(在配置班级处)"); +var htmlvalue = '

    提示

    '+ + '

    班级已过期
    请联系班级管理员重启班级。(在配置班级处)

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% elsif @state == 3 %> -alert("您已经加入了班级"); -window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>" +var htmlvalue = '

    提示

    '+ + '

    您已经加入了班级

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% elsif @state == 4 %> -alert("您输入的邀请码错误"); +var htmlvalue = '

    提示

    '+ + '

    您输入的邀请码错误

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% elsif @state == 5 %> -alert("您还未登录"); +var htmlvalue = '

    提示

    '+ + '

    您还未登录

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% elsif @state == 6 %> -alert("申请成功，请等待审核"); -hidden_join_course_form(); +var htmlvalue = '

    提示

    '+ + '

    申请成功，请等待审核

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% elsif @state == 7%> -alert("您已经发送过申请了，请耐心等待"); -hidden_join_course_form(); +var htmlvalue = '

    提示

    '+ + '

    您已经发送过申请了，请耐心等待

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% elsif @state == 8%> -alert("您已经是该班级的教师了"); -hidden_join_course_form(); -window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>" +var htmlvalue = '

    提示

    '+ + '

    您已经是该班级的教师了

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% elsif @state == 9%> -alert("您已经是该班级的教辅了"); -hidden_join_course_form(); -window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>" +var htmlvalue = '

    提示

    '+ + '

    您已经是该班级的教辅了

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% elsif @state == 10%> -alert("您已经是该班级的管理员了"); -hidden_join_course_form(); -window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>" +var htmlvalue = '

    提示

    '+ + '

    您已经是该班级的管理员了

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% elsif @state == 11%> -alert("该班级已被删除"); -hidden_join_course_form(); -window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>" +var htmlvalue = '

    提示

    '+ + '

    该班级已被删除

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% elsif @state == 12 %> -alert("您已经发送过申请了，请耐心等待"); -window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>" +var htmlvalue = '

    提示

    '+ + '

    您已经发送过申请了，请耐心等待

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% elsif @state == 13 %> -alert("申请成功，请等待审核"); -window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>" +var htmlvalue = '

    提示

    '+ + '

    申请成功，请等待审核

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% else %> -alert("未知错误，请稍后再试"); +var htmlvalue = '

    提示

    '+ + '

    未知错误，请稍后再试

    '+ + '确  定
    '; +pop_box_new(htmlvalue, 300, 140); <% end %> <% end %> +function refresh_current_course(){ + hideModal(); + <% if @course %> + window.location.href= "<%=course_path(@course.id) %>"; + <% end %> +} From edb86615a2053ae2c51b71ec66f85d8322fe0b59 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 17 Nov 2016 12:20:12 +0800 Subject: [PATCH 020/112] =?UTF-8?q?=E4=B8=AA=E5=88=AB=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99500=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/my/account.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 81be9f2a0..2a4b3b480 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -106,7 +106,7 @@ <% else %> - + <% end %>

    From d65a06273745296263ba5ac849bdf21a54c2c9ac Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 17 Nov 2016 17:02:02 +0800 Subject: [PATCH 021/112] =?UTF-8?q?=E6=89=80=E6=9C=89=E6=88=91=E7=9A=84iss?= =?UTF-8?q?ue=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 32 +++++++++- app/helpers/users_helper.rb | 8 +++ app/views/users/_all_issue_list.html.erb | 14 +++++ .../users/_my_issue_assigned_filter.html.erb | 1 + app/views/users/user_issues.html.erb | 63 +++++++++++-------- public/stylesheets/css/common.css | 12 +++- 6 files changed, 99 insertions(+), 31 deletions(-) create mode 100644 app/views/users/_my_issue_assigned_filter.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 70e4a3124..56b536d30 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -91,14 +91,40 @@ class UsersController < ApplicationController # subject 主题：搜索用（注意：搜索和列表调用同一方法，通过参数或者remote区分） def user_issues @subject = params[:subject] - author_id = params[:author_id] + # author_id = params[:author_id] + params[:assigned_to_id].to_i == 0 ? @assigned_to = nil : @assigned_to = params[:assigned_to_id].to_i + params[:author_id].to_i == 0 ? author_id = nil : author_id = params[:author_id].to_i params[:project_id].to_i == 0 ? @project_id = nil : @project_id = params[:project_id] if @project_id.nil? - @issues = Issue.where("(author_id =? or assigned_to_id =? ) and subject like ?", (author_id ? author_id : @user.id) , @user.id, "%#{@subject}%").order('updated_on desc') + if @assigned_to.nil? + if author_id.nil? + @issues = Issue.where("(author_id =? or assigned_to_id =? ) and subject like ?", + @user.id , @user.id, "%#{@subject}%").order('updated_on desc') + else + @issues = Issue.where("author_id =? and subject like ?", + author_id , "%#{@subject}%").order('updated_on desc') + end + else + @issues = Issue.where("assigned_to_id =? and subject like ?", @assigned_to, "%#{@subject}%").order('updated_on desc') + end + else - @issues = Issue.where("(author_id =? or assigned_to_id =? ) and project_id=? and subject like ?", (author_id ? author_id : @user.id) , @user.id, @project_id, "%#{@subject}%").order('updated_on desc') + if @assigned_to.nil? + if author_id.nil? + @issues = Issue.where("(author_id =? or assigned_to_id =? ) and project_id=? and subject like ?", + (author_id ? author_id : @user.id) , @user.id, @project_id, "%#{@subject}%").order('updated_on desc') + else + @issues = Issue.where("author_id =? and project_id=? and subject like ?", + author_id , @project_id, "%#{@subject}%").order('updated_on desc') + end + else + @issues = Issue.where("assigned_to_id =? and project_id=? and subject like ?", + @assigned_to, @project_id, "%#{@subject}%").order('updated_on desc') + end end @issues_filter = Issue.where("author_id =? or assigned_to_id =?", (author_id ? author_id : @user.id) , @user).order('updated_on desc') + @issues_assigned_count = Issue.where("assigned_to_id =? and subject like ?", @user.id, "%#{@subject}%").count + @issues_author_count = Issue.where("author_id =? and subject like ?", @user.id, "%#{@subject}%").count @issue_open_count = Issue.where(" (author_id =? or assigned_to_id =?) and status_id in (1,2,3,4,6)", (author_id ? author_id : @user.id) , @user).count @issue_close_count = Issue.where("(author_id =? or assigned_to_id =?) and status_id = 5", (author_id ? author_id : @user.id) , @user.id).count @issue_count = @issues.count diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index c81b3b84e..228e83080 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -40,11 +40,19 @@ module UsersHelper end end + # 我的issue 来源 def options_for_issue_project_list( issues ) issues = issues.group_by{|issue| issue.project_id} issues.map{ |issue| [Project.find(issue[0]).name, issue[0]]}.unshift(["来源", 0]) end + # 我的issue指派给我 + def options_for_my_issue_list(issues) + # issues = issues.group_by{|issue| issue.assigned_to_id } + # issues.map{ |issue| [User.find(issue[0]).show_name, issue[0]]}.unshift(["指派给", 0]) + + end + def get_resource_type type case type when 'Course' diff --git a/app/views/users/_all_issue_list.html.erb b/app/views/users/_all_issue_list.html.erb index a3554b7e2..02ed8c689 100644 --- a/app/views/users/_all_issue_list.html.erb +++ b/app/views/users/_all_issue_list.html.erb @@ -6,3 +6,17 @@ <%= render :partial => 'users/my_issue_list', :locals => {:activity => issue, :user_activity_id => issue.id} %> <% end %> + +

    +
    + +
    +
    +
      + <%= pagination_links_full @issue_pages, @issue_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%> +
    +
    +
    +
    diff --git a/app/views/users/_my_issue_assigned_filter.html.erb b/app/views/users/_my_issue_assigned_filter.html.erb new file mode 100644 index 000000000..52994bf85 --- /dev/null +++ b/app/views/users/_my_issue_assigned_filter.html.erb @@ -0,0 +1 @@ +<%= @issues_assigned_count %> \ No newline at end of file diff --git a/app/views/users/user_issues.html.erb b/app/views/users/user_issues.html.erb index 3bb5d6e6a..07483694f 100644 --- a/app/views/users/user_issues.html.erb +++ b/app/views/users/user_issues.html.erb @@ -4,6 +4,7 @@ -
    +

    我的缺陷

    @@ -199,16 +200,20 @@
    @@ -220,34 +225,45 @@ --> <%= select( :project, :project_id, options_for_issue_project_list(@issues_filter), { :include_blank => false,:selected => @project_id ? @project_id : 0 }, - { :onchange => "remote_function();add_style();",:id => "proeject_id", :name => "project_id",:class => "fl mr10"} + { :onchange => "remote_function();add_style();",:id => "proeject_id", :name => "project_id", :class => "fl mr20", :style=>"width:90px;padding-left:40px;"} )%> - - - - - - - -
    +
    <% end %> <% if @issues.empty? %>

    <%= l(:label_no_data) %>

    @@ -256,23 +272,18 @@ <%= render :partial => 'users/all_issue_list', :locals => {:issues => @issues, :issue_pages => @issue_pages,:issue_count => @issue_count, :subject => @subject } %>
    <% end %> - -
    +
    +
    +
    -
    -
    - ddd -
    - - ddd
    -
    + + - diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index 4ca947af4..a5eb0bc6d 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -709,7 +709,8 @@ input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} .issues_form_filter select.issues_filter_select_min{width:50px; } .issues_form_filter select:focus,.issues_form_filter input:focus{border:none; } .issues_filter_data input{height:28px;width:91px; border:1px solid #c8c8c8;background-color:#fff;} -.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("../images/project/arrow.png") no-repeat scroll right center transparent;} +.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("/images/new_project/arrow.png") no-repeat scroll right center transparent;} +.issues_form_filter select.my_issues_filter{ background:none; width:70px; padding-right:10px;padding-left:10px;} input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} .issues_data_img{ display:block; width:25px; height:28px; border:1px solid #c8c8c8; border-left:none; background: url("../images/public_icon.png") -29px 9px no-repeat; } @@ -800,4 +801,11 @@ a:hover.sy_btn_pink{ background: #e64c4c;} select.issues_filter_active { font-weight: bold; color: #333;} .issues_form_filter select.issues_filter_select_min02{width:60px; } .issues_form_filter select.issues_filter_select_max{width:90px; } -.issues_list_txt li.issues_list_max{ width:90px } \ No newline at end of file +.issues_list_txt li.issues_list_max{ width:90px } +.btn_newpro_grey{display: inline-block;color: #7b7b7b; border:1px solid #dbdbdb;background:#fff;text-align: center;font-size: 12px; padding:0 15px; height:24px; line-height: 24px; -webkit-border-radius:3px; -moz-border-radius:3px; -o-border-radius:3px; border-radius:3px;} +a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;} + +.my_issues_form_filter{ position: absolute; top:0; right: 0;} +.my_issues_form_filter select{ width:70px; height:30px; border:none; font-size:14px; border:none;border-right:none; color: #888; font-size: 12px; line-height: 30px; text-align:center} +.my_issues_form_filter select.issues_filter_select_min{width:50px; } +.my_issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none;} \ No newline at end of file From 3ebc3c649288bdcc82967eb3662ec850a837fc5b Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 17 Nov 2016 17:04:00 +0800 Subject: [PATCH 022/112] =?UTF-8?q?=E8=80=81=E5=B8=88=E3=80=81=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E6=B5=8B=E9=AA=8C=E5=88=97=E8=A1=A8=E7=9A=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercise_controller.rb | 13 ++- app/models/exercise_user.rb | 1 + app/views/exercise/_exercise.html.erb | 104 +++++++++--------- app/views/exercise/_student_table.html.erb | 8 +- app/views/exercise/index.html.erb | 71 +++++------- app/views/exercise/publish_exercise.js.erb | 13 +-- app/views/exercise/republish_exercise.js.erb | 13 +-- ...1117060138_add_column_to_exercise_users.rb | 15 +++ db/schema.rb | 8 +- lib/tasks/exercise_publish.rake | 4 +- public/stylesheets/css/common.css | 1 + public/stylesheets/css/moduel.css | 2 + 12 files changed, 129 insertions(+), 124 deletions(-) create mode 100644 db/migrate/20161117060138_add_column_to_exercise_users.rb diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb index ec89b9bc2..02a8400a7 100644 --- a/app/controllers/exercise_controller.rb +++ b/app/controllers/exercise_controller.rb @@ -374,12 +374,13 @@ class ExerciseController < ApplicationController =end @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin? @all_exercises = @course.exercises.where("exercise_status > 1").order("created_at desc") - @exercise_count = @exercise.exercise_users.where('score is not NULL').count - if @is_teacher || (!@exercise.exercise_users.where(:user_id => User.current.id).empty? && @exercise.end_time <= Time.now) - @exercise_users_list = @exercise.exercise_users.where('score is not NULL') + student_id = @course.student.blank? ? "(-1)" : "(" + @course.student.map{|student| student.student_id}.join(",") + ")" + @exercise_count = @exercise.exercise_users.where("score is not NULL and user_id in #{student_id}").count + if @is_teacher || (!@exercise.exercise_users.where("user_id = #{User.current.id} and user_id in #{student_id}").empty? && @exercise.end_time <= Time.now) + @exercise_users_list = @exercise.exercise_users.where("score is not NULL and user_id in #{student_id}") @show_all = true; - elsif !@exercise.exercise_users.where(:user_id => User.current.id).empty? && @exercise.end_time > Time.now - @exercise_users_list = @exercise.exercise_users.where("user_id = ? and score is not NULL",User.current.id) + elsif !@exercise.exercise_users.where("user_id = #{User.current.id} and user_id in #{student_id}").empty? && @exercise.end_time > Time.now + @exercise_users_list = @exercise.exercise_users.where("user_id = ? and score is not NULL and user_id in #{student_id}",User.current.id) else @exercise_users_list = [] end @@ -537,7 +538,7 @@ class ExerciseController < ApplicationController else # 更新提交状态 cur_exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", User.current, @exercise.id).first - cur_exercise_user.update_attributes(:status => 1) + cur_exercise_user.update_attributes(:status => 1, :commit_status => 1) # 答题过程中需要统计完成量 @uncomplete_question = get_uncomplete_question(@exercise, User.current) # 获取改学生的考试得分 diff --git a/app/models/exercise_user.rb b/app/models/exercise_user.rb index 2d5da5d95..c675f35a3 100644 --- a/app/models/exercise_user.rb +++ b/app/models/exercise_user.rb @@ -1,4 +1,5 @@ class ExerciseUser < ActiveRecord::Base + #commit_status 0:未交 1:已交 include Redmine::SafeAttributes belongs_to :user diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb index 7a871591e..fbad24aed 100644 --- a/app/views/exercise/_exercise.html.erb +++ b/app/views/exercise/_exercise.html.erb @@ -3,13 +3,8 @@ <% if @is_teacher%>
    -
    - <%# if has_commit %> - <%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%> - <%# else %> - <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %> - <%# end %> - <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %> +
    + <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue mw450", :title => "#{exercise_name}" %> <% if exercise.exercise_status == 1 %> <% elsif exercise.exercise_status == 2 %> @@ -20,19 +15,9 @@
    - <%# if exercise.exercise_status == 2 %> - - <%# else %> - - <%# end%> - - <%# if exercise.exercise_status == 1%> - - <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %> - - <%# end%> <% if exercise.exercise_status == 1 %> - + <% end_time_status = exercise.end_time.nil? ? 1 : (exercise.end_time <= Time.now ? 2 : 3) %> + <% elsif exercise.exercise_status == 2%> <% else%> @@ -51,15 +36,15 @@ 测试时长：<%= exercise.time.nil? || exercise.time == -1 ? '不限' : exercise.time.to_s + "分钟" %> 截止时间：<%= exercise.end_time.nil? ? '未设置' : format_time(exercise.end_time) %> 发布时间：<%= exercise.publish_time.nil? ? '未设置' : format_time(exercise.publish_time) %> - <% if exercise.exercise_status > 2 %> - 已提交：<%= exercise.exercise_users.where("created_at >= #{exercise.end_time.to_i}").count %> - 未提交：<%= exercise.course.student.count - exercise.exercise_users.where("created_at >= #{exercise.end_time.to_i}").count %> + <% if @is_teacher && exercise.exercise_status > 2 %> + 已提交：<%= exercise.exercise_users.where("commit_status = 1").count %> + 未提交：<%= exercise.course.student.count - exercise.exercise_users.where("commit_status = 1").count %> <% end %>
    - + <% if exercise.exercise_status == 1 %> - <%= link_to '', edit_exercise_path(exercise.id), :class => "ex_icon_edit mt0"%> + <%= link_to '', edit_exercise_path(exercise.id), :title => "编辑试卷", :class => "ex_icon_edit mt0"%> <% end%>
    @@ -67,31 +52,50 @@ <% else%> <% if exercise.exercise_status != 1%> - <%# if has_commit%> - - <%#else%> - <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%> <% eu = ExerciseUser.where("exercise_id=? and user_id=? and status=?",exercise.id, User.current.id, true).first %> - <% if exercise.end_time <= Time.now && eu && exercise.end_time >= eu.created_at %> -
  • 已答
    • - <% end %> - <%#end%> +
    + <%= link_to (index.to_i+1).to_s+". "+exercise_name, exercise_path(exercise.id), :title => "#{exercise_name}", :class => "polls_title polls_title_st fl c_dblue "%> + <% if exercise.exercise_status == 1 %> + + <% elsif exercise.exercise_status == 2 %> + + <% else %> + + <% end%> + <% if eu && exercise.end_time >= eu.created_at %> + + <% else %> + + <% end %> +
    +
    +
    + 测试时长：<%= exercise.time.nil? || exercise.time == -1 ? '不限' : exercise.time.to_s + "分钟" %> + 截止时间：<%= exercise.end_time.nil? ? '未设置' : format_time(exercise.end_time) %> + 发布时间：<%= exercise.publish_time.nil? ? '未设置' : format_time(exercise.publish_time) %> + + <% exercise_end = exercise.end_time > Time.now + if exercise.time == -1 || exercise.time.nil? + can_edit_excercise = exercise_end + else + can_edit_excercise = !has_commit_exercise?(exercise.id,User.current.id)&& exercise_end + end%> + <% if can_edit_excercise && eu %> + 继续答题 + <% elsif can_edit_excercise %> + 开始答题 + <% else %> + 查看答题 + <% end %> + <% if exercise.show_result == 1 %> + <% if exercise.end_time <= Time.now %> + <%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%> + <% else %> +
    统计结果
    + <%end%> + <% end %> +
    +
    <% end%> -
  • 截止时间：<%= format_time(exercise.end_time.to_s)%>
    • - <% if exercise.show_result == 1 %> - <% if exercise.end_time <= Time.now %> -
  • <%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%>
    • - <% else %> -
  • 统计结果
    • - <%end%> - <% end %> -<% end%> - \ No newline at end of file + +<% end%> \ No newline at end of file diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb index 13f928a0e..6d4b25a44 100644 --- a/app/views/exercise/_student_table.html.erb +++ b/app/views/exercise/_student_table.html.erb @@ -23,9 +23,9 @@ <%=exercise.user.show_name %> - - - + + + -- @@ -33,7 +33,7 @@ <% if exercise.created_at%> <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>  - <% if @exercise.end_time <= exercise.created_at %> + <% if exercise.commit_status == 0 %> [未答] <% end %> <% end %> diff --git a/app/views/exercise/index.html.erb b/app/views/exercise/index.html.erb index 68adfb4d4..c8ca72a59 100644 --- a/app/views/exercise/index.html.erb +++ b/app/views/exercise/index.html.erb @@ -5,31 +5,16 @@ }); function republish_exercise(exercise_id,index) { - $('#ajax-modal').html("
    " + - "
    " + - "
    " + - "

    取消发布后学生答题将会被清空
    是否确定取消发布该测验？

    " + - "
    " + - "确  定" + - "取  消" + - "
    " + - "
    " + - "
    " + - "
    " + - "
    "); - showModal('ajax-modal', '310px'); - $('#ajax-modal').css('height','120px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before("" + - ""); - $('#ajax-modal').parent().removeClass("alert_praise"); - $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9"); - $('#ajax-modal').parent().addClass("popbox_polls"); + var htmlvalue = '

    提示

    '+ + '

    取消发布后学生答题将会被清空
    是否确定取消发布该试卷？

    ' + + '取  消' + + '确  定
    '; + pop_box_new(htmlvalue, 400, 152); } function clickCanel(){hideModal("#popbox02");} - function exercise_submit(exercise_id,exercise_name,index) + function exercise_submit(status, exercise_id,exercise_name,index) { if(exercise_name == 0) { @@ -37,29 +22,31 @@ } else { - $('#ajax-modal').html("
    " + - "
    " + - "
    " + - "

    测验发布后将不能对测验进行修改，
    是否确定发布该测验？

    " + - "
    " + - "确  定" + - "取  消" + - "
    " + - "
    " + - "
    " + - "
    " + - "
    "); - showModal('ajax-modal', '310px'); - $('#ajax-modal').css('height','120px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before("" + - ""); - $('#ajax-modal').parent().removeClass("alert_praise"); - $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9"); - $('#ajax-modal').parent().addClass("popbox_polls"); + if (status == 1){ + var htmlvalue = '

    提示

    '+ + '

    您还没有设置截止时间，请先设置截止时间再发布

    ' + + '知道了
    '; + pop_box_new(htmlvalue, 400, 152); + } else if(status == 2){ + var htmlvalue = '

    提示

    '+ + '

    您设置的截止时间已过期，请重新设置

    ' + + '知道了
    '; + pop_box_new(htmlvalue, 400, 152); + } else{ + var htmlvalue = '

    提示

    '+ + '

    发布后不能再对试卷进行修改
    是否确定发布

    ' + + '取  消' + + '确  定
    '; + pop_box_new(htmlvalue, 400, 152); + } } } - + function delete_exercise(id){ + var htmlvalue = '

    提示

    '+ + '

    您是否确定删除

    确定'+ + '取消
    '; + pop_box_new(htmlvalue, 300, 140); + }
    diff --git a/app/views/exercise/publish_exercise.js.erb b/app/views/exercise/publish_exercise.js.erb index 004ca9625..70faa477b 100644 --- a/app/views/exercise/publish_exercise.js.erb +++ b/app/views/exercise/publish_exercise.js.erb @@ -1,10 +1,5 @@ $("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index =>@index}) %>"); -$('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_memo_create_succ)}) %>"); -showModal('ajax-modal', '250px'); -//$('#ajax-modal').css('height','111px'); -$('#ajax-modal').siblings().remove(); -$('#ajax-modal').before("" + - ""); -$('#ajax-modal').parent().removeClass("alert_praise"); -$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9"); -$('#ajax-modal').parent().addClass("poll_alert_form"); \ No newline at end of file +var htmlvalue = '

    提示

    '+ + '

    发布成功

    ' + + '知道了
    '; +pop_box_new(htmlvalue, 400, 152); \ No newline at end of file diff --git a/app/views/exercise/republish_exercise.js.erb b/app/views/exercise/republish_exercise.js.erb index a55cefbde..372cd08dc 100644 --- a/app/views/exercise/republish_exercise.js.erb +++ b/app/views/exercise/republish_exercise.js.erb @@ -1,10 +1,5 @@ $("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index => @index}) %>"); -$('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_poll_republish_success)}) %>"); -showModal('ajax-modal', '250px'); -//$('#ajax-modal').css('height','80px'); -$('#ajax-modal').siblings().remove(); -$('#ajax-modal').before("" + - ""); -$('#ajax-modal').parent().removeClass("alert_praise"); -$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9"); -$('#ajax-modal').parent().addClass("poll_alert_form"); \ No newline at end of file +var htmlvalue = '

    提示

    '+ + '

    取消成功

    ' + + '知道了
    '; +pop_box_new(htmlvalue, 400, 152); \ No newline at end of file diff --git a/db/migrate/20161117060138_add_column_to_exercise_users.rb b/db/migrate/20161117060138_add_column_to_exercise_users.rb new file mode 100644 index 000000000..02ef19007 --- /dev/null +++ b/db/migrate/20161117060138_add_column_to_exercise_users.rb @@ -0,0 +1,15 @@ +class AddColumnToExerciseUsers < ActiveRecord::Migration + def change + add_column :exercise_users, :commit_status, :integer, :default => 0 + count = ExerciseUser.all.count / 30 + 2 + transaction do + for i in 1 ... count do i + ExerciseUser.page(i).per(30).each do |eu| + if eu.exercise && eu.exercise.end_time < Time.now && eu.exercise.end_time > eu.created_at + eu.update_column('commit_status', 1) + end + end + end + end + end +end diff --git a/db/schema.rb b/db/schema.rb index fd75bb020..b645ba5ad 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20161114092115) do +ActiveRecord::Schema.define(:version => 20161117060138) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -806,10 +806,11 @@ ActiveRecord::Schema.define(:version => 20161114092115) do t.integer "exercise_id" t.integer "score" t.datetime "start_at" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.datetime "end_at" t.integer "status" + t.integer "commit_status", :default => 0 end create_table "exercises", :force => true do |t| @@ -1910,6 +1911,7 @@ ActiveRecord::Schema.define(:version => 20161114092115) do t.float "work_score" t.integer "work_status", :default => 0 t.datetime "commit_time" + t.integer "is_delete", :default => 0 end add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id" diff --git a/lib/tasks/exercise_publish.rake b/lib/tasks/exercise_publish.rake index de93b3861..3683847dd 100644 --- a/lib/tasks/exercise_publish.rake +++ b/lib/tasks/exercise_publish.rake @@ -24,8 +24,10 @@ namespace :exercise_publish do course = exercise.course exercise.update_column('exercise_status', 3) course.student.each do |student| - if ExerciseUser.where("user_id = ? && exercise_id = ?",student.student_id,exercise.id).empty? + if ExerciseUser.where("user_id = ? && exercise_id = ?",student.student_id,exercise.id).blank? ExerciseUser.create(:user_id => student.student_id, :exercise_id => exercise.id, :start_at => exercise.end_time, :status => true,:score=>0) + else + ExerciseUser.where("user_id = ? && exercise_id = ?",student.student_id,exercise.id).first.update_column('commit_status', 1) end =begin s_score = calculate_student_score(exercise, student.student) diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index 55617868f..e957e0127 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -181,6 +181,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/ .mw20{ margin: 0 20px;} .mw380 {max-width: 380px !important;} .mw400 {max-width: 400px !important;} +.mw450 {max-width: 450px !important;} .mt-20 {margin-top:-20px;} .mt-10 {margin-top:-10px;} .mt-4 {margin-top:-4px;} diff --git a/public/stylesheets/css/moduel.css b/public/stylesheets/css/moduel.css index 97623c1d2..2161753b1 100644 --- a/public/stylesheets/css/moduel.css +++ b/public/stylesheets/css/moduel.css @@ -21,6 +21,8 @@ input.radio-width90{ width: 90px; } /*模板buttons 20161013byLB*/ .btn{display: inline-block;border:none; padding:0 10px;color: #333;background: #e1e1e1; text-align:center;font-size: 12px; height: 30px;line-height: 30px;-webkit-border-radius: 3px;-moz-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; } .btn:hover{background: #c3c3c3; color: #333;} +.btn-grey{background: #d9d9d9; color: #656565;} +.btn-grey:hover{background: #717171; color: #fff;} .btn-green{background: #60b25e; color: #fff;} .btn-green:hover{background: #51a74f; color: #fff;} .btn-blue{background: #3b94d6; color: #fff;} From 4d7dbc1fc6d0d3c841f9fc40ee7b345fd0b8f1bf Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 17 Nov 2016 17:07:01 +0800 Subject: [PATCH 023/112] =?UTF-8?q?=E5=B7=B2=E5=8F=91=E5=B8=83=E7=9A=84?= =?UTF-8?q?=E8=AF=95=E5=8D=B7=E6=98=BE=E7=A4=BA=E6=8F=90=E4=BA=A4=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb index fbad24aed..a1dd20627 100644 --- a/app/views/exercise/_exercise.html.erb +++ b/app/views/exercise/_exercise.html.erb @@ -36,7 +36,7 @@ 测试时长：<%= exercise.time.nil? || exercise.time == -1 ? '不限' : exercise.time.to_s + "分钟" %> 截止时间：<%= exercise.end_time.nil? ? '未设置' : format_time(exercise.end_time) %> 发布时间：<%= exercise.publish_time.nil? ? '未设置' : format_time(exercise.publish_time) %> - <% if @is_teacher && exercise.exercise_status > 2 %> + <% if @is_teacher && exercise.exercise_status > 1 %> 已提交：<%= exercise.exercise_users.where("commit_status = 1").count %> 未提交：<%= exercise.course.student.count - exercise.exercise_users.where("commit_status = 1").count %> <% end %> From 8f7e6004fd3d3e8593d084930e005d833c6fe76e Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 17 Nov 2016 17:09:07 +0800 Subject: [PATCH 024/112] =?UTF-8?q?=E6=88=91=E7=9A=84issue=E5=B1=85?= =?UTF-8?q?=E4=B8=AD=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/css/common.css | 2 +- public/stylesheets/css/project.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index a5eb0bc6d..132543367 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -795,7 +795,7 @@ a.sy_btn_pink{ a:hover.sy_btn_pink{ background: #e64c4c;} /* 我的缺陷列表*/ -.myissues_con{ width:968px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; } +.myissues_con{ width:968px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; margin: 0 auto; } .myissues_head{ width: 100%; height: 40px; line-height: 40px; background: #f4f4f4; } .myissues_head h2{ font-size: 14px;} select.issues_filter_active { font-weight: bold; color: #333;} diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index a5ea850f2..cf56102b3 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -832,7 +832,7 @@ a.sy_corange{ color: #ee4a1f;} a.sy_cblue{ color: #3b94d6;} /* 我的缺陷列表*/ -.myissues_con{ width:968px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; } +.myissues_con{ width:968px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444;} .myissues_head{ width: 100%; height: 40px; line-height: 40px; background: #f4f4f4; } .myissues_head h2{ font-size: 14px;} select.issues_filter_active { font-weight: bold; color: #333;} From db71b1578b8840ffb659188dc5ff3c748565a1db Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 18 Nov 2016 10:43:49 +0800 Subject: [PATCH 025/112] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=BF=85=E9=A1=BB=E5=85=88?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 4 + app/views/homework_common/index.html.erb | 2 + app/views/users/_user_homework_form.html.erb | 112 +++++++++++-------- app/views/users/user_select_homework.js.erb | 3 +- 4 files changed, 71 insertions(+), 50 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c4746ff29..992cfcaf0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3724,6 +3724,9 @@ end #作业类型 def homework_type_option type = [] + option0 = [] + option0 << "请选择" + option0 << 0 option1 = [] option1 << "普通作业" option1 << 1 @@ -3733,6 +3736,7 @@ def homework_type_option option3 = [] option3 << "分组作业" option3 << 3 + type << option0 type << option1 type << option2 type << option3 diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb index a388d2270..8fd06e166 100644 --- a/app/views/homework_common/index.html.erb +++ b/app/views/homework_common/index.html.erb @@ -12,6 +12,8 @@ $("#homework_end_time_span").text(""); $("#homework_course_id_span").text(""); $("#homework_editor").toggle(); + $("#select_type_nitice").show(); + document.getElementById("homework_type_option").options[0].selected = true; } $(function(){ diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 842cf50f4..32ca4e50e 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -6,17 +6,23 @@ \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index e523bbf9a..781b5acbd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1243,6 +1243,7 @@ RedmineApp::Application.routes.draw do get 'search_not_group_member' post 'add_members' get 'delete_member' + get 'archive_course' end collection do match 'join_private_courses', :via => [:get, :post] diff --git a/public/javascripts/course.js b/public/javascripts/course.js index 188c383d7..338930548 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -81,7 +81,11 @@ function regex_course_name(str) if($("#new_syllabus_id").length > 0){ syl_title = $("#new_syllabus_id").find("option:selected").text(); } else{ - syl_title = $("#edit_syllabus_id").html(); + if(str == "edit"){ + syl_title = $("#edit_syllabus_id").html(); + } else{ + syl_title = $("#course_syllabus_title").html(); + } } if(name.length < 2) { diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index e957e0127..5a7f18e26 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -549,6 +549,24 @@ a:hover.BlueCirBtnMini{ background:#3598db; color:#fff;} a.BlueCirBtnMiddle{ display:block;width:50px; height:24px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} a:hover.BlueCirBtnMiddle{ background:#3598db; color:#fff;} /* 按钮*/ +a.btn_grey_big{ + display: inline-block; + border: 1px solid #ccc; + color: #747474; + text-align: center; + font-size: 14px; + padding:0 10px; + height: 30px; + line-height: 30px; + -webkit-border-radius:3px; + -moz-border-radius:3px; + -o-border-radius:3px; + border-radius:3px; +} +a:hover.btn_grey_big{ + background: #c3c3c3; + color: #fff; +} a.btn_orange_big{ display:inline-block; border: 1px solid #ee4a1f; From 9a30369cef5d04a6c53476906f06a4964457b801 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 18 Nov 2016 16:37:25 +0800 Subject: [PATCH 028/112] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=EF=BC=9A=E4=B8=A4=E7=A7=8D=E8=BA=AB=E4=BB=BD=EF=BC=88=E5=8A=A9?= =?UTF-8?q?=E6=95=99=E5=92=8C=E5=AD=A6=E7=94=9F=EF=BC=89=E7=9A=84=E6=88=90?= =?UTF-8?q?=E5=91=98=E5=8C=BF=E8=AF=84=E6=89=A3=E5=88=86=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_common_controller.rb | 6 +++--- app/controllers/student_work_controller.rb | 6 +++--- lib/tasks/homework_evaluation.rake | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index b479fa206..b9a49dbcb 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -261,20 +261,20 @@ class HomeworkCommonController < ApplicationController work_ids = "(" + @homework.student_works.has_committed.map(&:id).join(",") + ")" if @homework.homework_type != 3 @homework.student_works.has_committed.each do |student_work| - absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count + absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids} and reviewer_role = 3").count student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0 student_work.save end else @homework.student_works.has_committed.each do |student_work| - absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count + absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids} and reviewer_role = 3").count student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0 student_work.save pros = student_work.student_work_projects.where("is_leader = 0") user_ids = pros.empty? ? "(-1)" : "(" + pros.map{|stu|stu.user_id}.join(",") + ")" student_works = @homework.student_works.where("user_id in #{user_ids}") student_works.each do |st_work| - absence_penalty_count = st_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - st_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count + absence_penalty_count = st_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - st_work.user.student_works_scores.where("student_work_id IN #{work_ids} and reviewer_role = 3").count st_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0 st_work.save end diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index f788efd3f..fb99f6507 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -988,20 +988,20 @@ class StudentWorkController < ApplicationController work_ids = "(" + @homework.student_works.has_committed.map(&:id).join(",") + ")" if @homework.homework_type != 3 @homework.student_works.has_committed.each do |student_work| - absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count + absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids} and reviewer_role = 3").count student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0 student_work.save end else @homework.student_works.has_committed.each do |student_work| - absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count + absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids} and reviewer_role = 3").count student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0 student_work.save pros = student_work.student_work_projects.where("is_leader = 0") user_ids = pros.empty? ? "(-1)" : "(" + pros.map{|stu|stu.user_id}.join(",") + ")" student_works = @homework.student_works.where("user_id in #{user_ids}") student_works.each do |st_work| - absence_penalty_count = st_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - st_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count + absence_penalty_count = st_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - st_work.user.student_works_scores.where("student_work_id IN #{work_ids} and reviewer_role = 3").count st_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0 st_work.save end diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake index 2252bdaf5..7494e80f8 100644 --- a/lib/tasks/homework_evaluation.rake +++ b/lib/tasks/homework_evaluation.rake @@ -84,13 +84,13 @@ namespace :homework_evaluation do work_ids = "(" + homework_common.student_works.has_committed.map(&:id).join(",") + ")" if homework_common.homework_type != 3 homework_common.student_works.has_committed.each do |student_work| - absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count + absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids} and reviewer_role = 3").count student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0 student_work.save end else homework_common.student_works.has_committed.each do |student_work| - absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count + absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids} and reviewer_role = 3").count student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0 student_work.save if student_work.absence_penalty != 0 @@ -98,7 +98,7 @@ namespace :homework_evaluation do user_ids = pros.empty? ? "(-1)" : "(" + pros.map{|stu|stu.user_id}.join(",") + ")" student_works = homework_common.student_works.where("user_id in #{user_ids}") student_works.each do |st_work| - absence_penalty_count = st_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - st_work.user.student_works_scores.where("student_work_id IN #{work_ids}").count + absence_penalty_count = st_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - st_work.user.student_works_scores.where("student_work_id IN #{work_ids} and reviewer_role = 3").count st_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * @homework_detail_manual.absence_penalty : 0 st_work.save end From b1b456e63e76e6e1ac75f99281fa391cbb704d6a Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 18 Nov 2016 16:57:45 +0800 Subject: [PATCH 029/112] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A7=93=E5=90=8D=EF=BC=8C=E5=8D=95=E8=AF=8D?= =?UTF-8?q?=E4=B8=8D=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_project_top.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/layouts/_base_project_top.html.erb b/app/views/layouts/_base_project_top.html.erb index d86ffca11..afd78117a 100644 --- a/app/views/layouts/_base_project_top.html.erb +++ b/app/views/layouts/_base_project_top.html.erb @@ -9,7 +9,6 @@
    <% unless @project.is_public? %><% end %> - <%=link_to "#{@project.owner.try(:show_name)}/".html_safe, user_path(@project.owner), :class => "pro_new_username" %> <%=link_to @project.name, project_path(@project), :class => "pro_new_username break_word" %>
    From 7f1d12de04ad65b2ed8be6e7bce32ab948da4a6d Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 18 Nov 2016 17:08:36 +0800 Subject: [PATCH 030/112] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E6=A0=87=E9=A2=98=E6=94=B9=E6=88=90=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E5=8A=A0=E7=89=88=E6=9C=AC=E5=BA=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/_top.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/repositories/_top.html.erb b/app/views/repositories/_top.html.erb index bc26ba2b0..1684c4975 100644 --- a/app/views/repositories/_top.html.erb +++ b/app/views/repositories/_top.html.erb @@ -1,5 +1,6 @@

    - <%=link_to @project.owner, user_path(@project.owner), :class => "repository-title-dec" %> / <%= link_to @project.name, project_path(@project), :class => "repository-title-dec" %> + <%=link_to @project.owner, user_path(@project.owner), :class => "repository-title-dec" %> / + <%=link_to @repository.identifier,({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => gitlab_repository(@project).try(:identifier)}), :class => "repository-title-dec" %>

    \ No newline at end of file From 6bb4e650c442ae1f06d2935c31fd748e7d605692 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 18 Nov 2016 17:21:23 +0800 Subject: [PATCH 031/112] =?UTF-8?q?QQ=E5=8F=8D=E9=A6=88=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=A9=BA=E7=99=BD=E9=A1=B5=E3=80=81=E2=80=9C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E4=B8=8A=E4=B8=80=E9=A1=B5=E2=80=9D=E4=B8=8D=E8=83=BD=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=97=B6=E5=AD=97=E4=BD=93=E7=BD=AE=E7=81=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/common/403.html | 5 +++-- app/views/common/404.html | 9 +++++++-- public/500.html | 9 +++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/views/common/403.html b/app/views/common/403.html index 78dc6dae7..dcfeb9f41 100644 --- a/app/views/common/403.html +++ b/app/views/common/403.html @@ -17,7 +17,8 @@ $(function(){ if(window.history.length == 1) { - $("#history_back").css("background","#CCC"); + $("#history_back").css("color","#CCC"); + $("#history_back").css("cursor","default"); } $("#subject").keydown(function(){ var curLength=$("#subject").val().length; @@ -50,7 +51,7 @@ 您没有访问权限，请先获取相应权限。 返回上页>> 给我留言>> - QQ反馈>> + QQ反馈>>