From ee4f7404e20e445804231dd40990e0b2767c2186 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 23 Dec 2010 20:05:48 +0100 Subject: [PATCH] Adding some exercises alpha improvements ... --- main/css/chamilo/default.css | 2 +- main/exercice/admin.php | 9 ++ main/exercice/exercice.php | 31 ++++-- main/exercice/exercice_submit.php | 2 +- main/exercice/exercise.lib.php | 40 ++++--- main/exercice/question_admin.inc.php | 1 + main/exercice/question_list_admin.inc.php | 126 +++++++++++++++------- main/img/clean_group.png | Bin 0 -> 1237 bytes main/img/delete.png | Bin 0 -> 1455 bytes main/img/export_db.png | Bin 1107 -> 1378 bytes main/img/settings.png | Bin 0 -> 1210 bytes main/inc/ajax/exercise.ajax.php | 25 +++++ main/inc/ajax/message.ajax.php | 2 +- main/newscorm/learnpath_functions.inc.php | 2 +- 14 files changed, 169 insertions(+), 71 deletions(-) create mode 100644 main/img/clean_group.png create mode 100644 main/img/delete.png create mode 100644 main/img/settings.png create mode 100644 main/inc/ajax/exercise.ajax.php diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css index f1102b76e8..14613363de 100755 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -1547,7 +1547,7 @@ div.row div.form_header { div.row div.label { float: left; - width: 8%; + width: 9%; text-align: right; } div.row div.formw { diff --git a/main/exercice/admin.php b/main/exercice/admin.php index ae96980dd4..3412be8eaf 100755 --- a/main/exercice/admin.php +++ b/main/exercice/admin.php @@ -286,6 +286,13 @@ if($modifyIn == 'thisExercise') { } } +$htmlHeadXtra[] = ''; //jQuery +$htmlHeadXtra[] = ''; //jQuery +$htmlHeadXtra[] = ''; + + + + $htmlHeadXtra[] = " + - - - - - - - -'; +//we filter the type of questions we can add +Question :: display_type_menu ($objExercise->feedbacktype); +echo '
'; +echo '
ddddddddd
'; $token = Security::get_token(); -if($nbrQuestions) { - $questionList=$objExercise->selectQuestionList(); +if ($nbrQuestions) { + $my_exercise = new Exercise(); + //forces the query to the database + $my_exercise->read($_GET['exerciseId']); + $questionList=$my_exercise->selectQuestionList(); + $i=1; - if (is_array($questionList)) { + if (is_array($questionList)) { + echo '
'; foreach($questionList as $id) { //To avoid warning messages if (!is_numeric($id)) { continue; - } + } $objQuestionTmp = Question :: read($id); - - //showQuestion($id); - ?> -
> - - - - + - - '; + echo ''; + echo ''; + unset($objQuestionTmp); } + echo ''; } } ?> diff --git a/main/img/clean_group.png b/main/img/clean_group.png new file mode 100644 index 0000000000000000000000000000000000000000..bbc77eb3d6c723dabcdf4660f81fcbeca56aaa66 GIT binary patch literal 1237 zcmV;`1SL zlYMB_RUF1Y=l6Q={oUO=x3;-?r)|E?8R>FZVnchAVkJg`G{}GQYEY>WL?O*wg_W37 zN+A_B8BtOhXo_HFin>jw)6JJnMb~mKZF6t;-rbkq@AOAk$y%WJg@<$Ca6aeZ;W=X6 z%ZeXZqzJKG3Xv+LvtenKy@LB3MF`%_8B_T2thvF!lcleCJ-!jkD$CRb_YGE6Jy=*g z+YDbjNWAw7Qy-mUDS~yCWvYH(V8@QfoJ0aeH5hC=i)DGp8a37rEZMqJys+aV^VnBQ z#63Tv0Nc;i9EkYxXJcheroW|zf}#?SnZ_E!mGZ5WOcOce-MeGSithGnl}Gk}Go+1} zfSL9nEuBY58=LN$w{W>TJ9k`EBzX8a((D)~yq;Qn~o&4N?~uXgRsL8&yqQ-&`){ z-&GXbR*Ah*=yOuj{9#XH%;W3`X$2Xh7>dWZ+SkRHPsWq=OaOOEF?~Jl)c&?V+}G35 z7>_$;!3uf#f58A-R*3)(lSY1~d^aI&WNLRbM7I_tZ@t7bTE#Ry=!S*M`v{t+h(E4f zkjD@13CE&?s~tyv8my3sVZpa%ud2RptMY@CS@|O8o$EqzNi@yGG(8xm2Te24H7~j~ zjkwI`boDQhD-B0_W3lKeV0*AaMu!ChY*{IyrDd-hp{|`sCxoUMn5KncTIhNj$S7{N z2USl6vxxoyi~8z);j0&F<5D_n9fvi_f2e?>(i$G@Ml~`4kWwP~+km1Bp_u_9p(xUh zA)+VoyXtxT=~B=0Wy}0hC@XHa;@=}3c6YV4IEHIHAW6g%NZSES?1YW3hR{6|>Fw#q zkp>`9R4NdArZHUhI`Rn=?q0A;od8F z{Q0>2CDb0;89(vskC%FS?UG=HjNAbhLMTEAACLuPA3n+2v$fSx(<(;QGci1wga?O+ zg|Cv5F`e#im4SZA@xyzfr|TL|tlXGb@b>2@LI|G_LMTb70IZ}^0AJP5+-UFUX}C~# zAYrA?#c|@eePijn396BYVU1(|uJy5#r<(RHT^%oP?Z8alwE*jO-GmU{~fB-uaXH(}4{@7Q4b6PHX%{s>9Ebr!Kom&Gf583%ti$Fg%v=kf00000NkvXXu0mjfl$J&e literal 0 HcmV?d00001 diff --git a/main/img/delete.png b/main/img/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..ce835181e0200da442b1550e45785a5622687ce5 GIT binary patch literal 1455 zcmV;g1yK5lP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igo5 z4mlc*H%je*RNnJgO=Zk^LzXe7i+3+==Sgzr+2LSN|n z@$3RxyE(TfIXTHW&-vwlp7VclfX(Rl`OqiJ0DxNs1r`A4ljY1>cJ#?I`h7kCz>izD z{AX@vvB%>%aeLpsaF5%42LBVkI2>nwYiSAhxLhZ)880dA^?KU|+uKQf@W2>4eVPK5 zmFK?u7nNTF2vk&@i(I)vq^d^n>{;rqsA$X16OP#JXbFW7sH|*r9ysv5qppsnCMQ`@ zbu~%F#f`?)lzMYv;qDQ;9RP51ejcBBz2~Y|e%nb8KBER08pGS||{YAyG zV;7zK_mi=*!bsPlD+(*9t!1f|6@T;e^o&0m9S{Kkf^gW`&;T_UgqWWXh$5II!B|*e z-o{3fY_nh;wL)f~xj*JiB%4Fn|sb02tBnM_pY} zdGB6^WD;aD0g?oWBJ@~{xpwV>mP~%bBngh)yP?Hm3`8IRM6?07SlI7vZQzo08~}tq zSw`!~Nc8F$+d|c>oSh=DQ6Gg^32j?72*I}=&W<^dXGZG1qssgGCLsdblN`@%1 zaA#*M{^-%$2S-PT`(zm`{gN%A5PCeG9l52Y!JU3Tcp^c9&BjEV4Lm0Y+-wGMzM;}E zpc@AC)m1V~CN|L3g~YRGH3vsWANTuwXdW8c0B6H{z255Lnwqe`Z@_V8{-xW zxFmr97^(_=c^UfRB54*2i-bb)SSZxsk3_<0D1aB>Z1~SkXH9;2`MtNAnsUX}Rd7K7 z7z1=2hNgj36c#qtT%>oMl4`tE+FnZnYNCgv&mn1OGA#U9Y0-!G~ZInsVV5Cye6@~cr z?QBL-Vhh8=@A;$Ap?;rlLvg_C_2d*4{qbf|5wx)}aI+bL$ppUHf#SApSg=?O04P)x zt}QLW*z~cHNEFhKg+8uVlm+UhFQL;}og zrntp|$-%)>lY@h&7IJdHEEdud324bAv}6+c`Z|&iACjxK79DgK-0Rj zTYBI_QJgV(Jk4fBVQMVK#KJ;S%F5VuFnHcSGIFs`mT|;xN9*wL?Ss0mnO&|%ae0|i zb8}3x+evXcjo6bXC;THL9euJ4kujEbMMnTYfy;Hx?sCzhAh6j`==@YTeCeM)p9+UB zfiaX+RehE3aL}Blv3NB4X=^y#(eLwth+Y_)u3iNI+;F?k1R5H~JKgTfn_IcB80d7n zF9#YL#&2wXV`;`qVc}c^koS(&`Wk>d2IS)vV{004R=004l4008;_004mL004C`008P>0026e000+nl3&F}000EoNkl3Q5M46eHU4ht;gMWiV@7J$iyxiQ}Z-4*( zeg4arFQ0Mh^g#DXjcbUh;v4^M@Xl2QdfKR+KUD=S!>k&%(% z-@kt#c^{zR4Da8+fBNFZi*g`;DM$_*00nh zV1wVhd7}pmTMtl}fm{m>7Gwj!02CZBAA<1DpFcr9^8xw*Zm_ntHkbwoAh5w#uU_Q_ zD&hu)FW6vE*n-#~i-4|yhcPI8zkU10@b&9gFdL+H+kdugdUNK?VNg&|U_ed?009Ix z*wWJS|A`YP{@=fUA8eqIkPrhf*1@iYVUXb<8e{<|{6BvD2=*1o0uXrk@F7Z200a=& zpYPti`>m>~`Ue;!V1-;uMbkPD$n4UR!TNPw3?&)A9K$G6Wfuo(;xK;WRz)6-*k^5h8v zFsU(kczA#_2`s!p-Urbj13^9jx%|iHHw*{gNHA=EC&%#d1rIZ}v@zyM6!48R-)%4uNB zBt(BO++>U|{$HO!_SwUtK(x zE@l8T7$AVaF81{F{J_V@_hIeYwG5`Frl6Q+0Odef+64s%%VC*n7EoSmoZ{;{}HB|9}7fGcbLB^Xm8ak6-`%`3p=)|G-WL2p~pURi*#|1^|K29ueyS R$SD8-002ovPDHLkV1n(}RILC2 delta 1086 zcmV-E1i|~_3eyOXB!2{RLP=Bz2nYy#2xN!=000SaNLh0L003kF003kGc#-u>0000V zbVXQnQ*UN;cVTj608L?Ia&K*AWNBd_Mrm?ocW-iQb09diXwrB900YWNL_t(IjkT3Q zXdG1-$A52jW-_~*ZnLJ1sZB#rHj7d*)mlnPBdw*EUM!{F6n{JwkwOJeiWi}`LN8vF zBB(b-0~G{I5s}gsr4RxwnxuBS2}!z}-DGEW=gr&fyywLXNxRjH{osRd80Po>^Z&m0 zo-oGnB*K2&i@CYESF+jcej&uL);ew5b|a4CS>N}6D;A4$|4BB+Y{^oo^hT{#yV-0u zjg-HEHas#q*u?It(@Pft(3p2=jcdY-ohxVaWWY^j4FSgzG-FOH9ouRIJ+Jg!!&r+4hw zfl>+pt#ty}P-%=wo`n#!TCKr)y*>ea|5$LjTuv*cuzzhE+qOxk(|Df8hAjZ=>+6JJ zNEAhAtqH@B#l^*K-K`j>$;@VY0~L5wUsK{dOZ#t zIMDf5@PEB~_fiuR6ZH4@Ck@kDqqQcE>iS+M(=J@oAyW$MPyRyVM{32da4?Ay1G zAPBZ7-LL{c2ncHH{Ia-*`TIL@+pW~eF5qO`W@l%=n4Fw^r?0P%LZOf}s@ZHJr6ixv zlh5Zda*c0pr}#5-h!bNuepu8~*XG^V%m=pLRey20To%WVA7^T6ib|z|=XppeSzTSF z*=*uCF0N^Ft)!USd4hKj4=|F4?YkHod6rASn_a;R3ky~lhK!Gov$nQ|5CX?>lF1-$ z^ZV`llt+&6*2@EAGB6jx&~`YvjnnVX^3lZt=O3}6R4QG(eEIUZY&J`wP@vsz6NVwJ zR)32~N_0nYXZR>%V?}HM^$s9F0WV}AYr&Tf*ng?Otu0d#MbWp%jvdpzy}eYcRg_Xh zQAE97XL)&vy9>+gdU`vJ6wHKB>p-OqH3dIa;emvgT=qVq7~sm4D<2LG4V{mo2msf0 zlMUiG8Z5RtTwm$1HhLJ_vFK=MYgkfzEq?@`op_2nXP;yB5wH+~3l}cDJvusi&a$jA zrIhe}A1Nh+gM$dw;#RrVy#DHYo^fnD)(~lshO^U0__S;DAUVmt5<>iV=FFMHxm<3) z@B2ex7mRZ`n-MJm`+#lrUh1j$$xV5A2*5N z!rozTZ0Vx*a=Q^|jESv3Zv3ji0TQryQg>e0eg1#M-w<*Gcuu2$EdT%j07*qoM6N<$ Ef_*y*-T(jq diff --git a/main/img/settings.png b/main/img/settings.png new file mode 100644 index 0000000000000000000000000000000000000000..915c499f885a154b74ed8d4349063b34b370423c GIT binary patch literal 1210 zcmV;r1V#IaP)3k zK~zY`y_H>TlT{eUe{VasF~`_gHdrT)1q~x8v~0lyN~jJ{Ha-+XWTJ^6iy&7zjes-9 zHzX@~V!v2^xj8w{ z`=0;r{GW54bKpO2O1z*DLI59yhwlSTs;bugYg8eG^m#op5EzmzEjOhQLRM5%luopu zm<8*i1G))*G<X)P+RF#@jBRWI}A+Jad{6hDJfG41%pT_ky4HdrKM+3 zRb>S*gj2};7xo#GXFO`Ve7KCIyH24f3M0b-Q*-t9=5YWaL{4&Y@{Q+L7pKo(@Dz%o zjP7agy}J(~)6=Q4?gua&{_66~>;)@r=RbLcwI6)L@KEonYqb@1lh%O{!kCwrciiD{ z6h>l8mMjUaTv^C zU^!5`ckiB2Cz)9@QB{@di*9;u{b+jNz7bdapA?=^2q861lU-i7?DD#$rfE_LAtOh7 zq9Z)1gQD`99G|1jH5}+A_`u7qb#oCy(B0)7<0QQCK42tPLqD0gztib@v3M>e%L~X( zgX*(327NbKQ&P&{KtF>6{j4b|rM|wt!eX&}U0+}C`CEX9_@>qKcx}BIm(xK)%5=2A zUCv(iGT^=%53<8zv7Cv8=q3{1zHt%THm=~?y6Uz2IT z???k?0GW2XJ!H4rOI20HkUN`0hYr!(+dD=(Av#5Qb7nK5Nqn8{ za_<5DsN#$WM_xEBEI1q`F2_~!;%(KY9*?^zGESYA_}I1D3Qx?vqQvQClq)Sfmi!;> YPf;`lvH|Qgr2qf`07*qoM6N<$f{ENN5dZ)H literal 0 HcmV?d00001 diff --git a/main/inc/ajax/exercise.ajax.php b/main/inc/ajax/exercise.ajax.php new file mode 100644 index 0000000000..881865cbab --- /dev/null +++ b/main/inc/ajax/exercise.ajax.php @@ -0,0 +1,25 @@ +$counter), array('question_id = ? '=>$new_order_id)); + $counter++; + } + Display::display_confirmation_message(get_lang('Saved')); + break; + default: + echo ''; + +} +exit; +?> \ No newline at end of file diff --git a/main/inc/ajax/message.ajax.php b/main/inc/ajax/message.ajax.php index 08bd113263..689ec1ee40 100755 --- a/main/inc/ajax/message.ajax.php +++ b/main/inc/ajax/message.ajax.php @@ -1,5 +1,5 @@
selectTitle(); ?>selectLevel(); ?> - <?php echo get_lang('Modify'); ?> - - - <?php echo get_lang('Delete'); ?> + $question_class = get_class($objQuestionTmp); + $label = $question_class->$explanationLangVar; + + //echo get_lang($question_class.$label); + echo '
'; + echo '

'.$objQuestionTmp->selectTitle().'

'; + echo '
'; + echo '

'; + + //echo $objQuestionTmp->selectLevel(); + + echo $edit_link = ''.get_lang('Modify').''; - '.get_lang('Delete').''; } + + showQuestion($id, false, '', '',false); + + /* if($i != 1) { ?> <?php echo get_lang('MoveUp'); ?> <?php echo get_lang('MoveDown'); ?> -

".get_lang('Question')." "; // Call the showQuestion() function from exercise.lib.php. This basically displays the question in a table. - $test .= showQuestion($questionId, false, 'export', $i, $nbrQuestions); + $test .= showQuestion($questionId, false, 'export', $i); } // end foreach()