'.get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('exercice', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('exercice', get_lang('YouHaveToSelectATest'), 'numeric');
+
$form->registerRule('validquestiontype', 'callback', 'check_question_type');
$form->addRule('question_type_hidden', get_lang('InvalidQuestionType'), 'validquestiontype');
if ($form->validate()) {
$values = $form->exportValues();
- $question_list = Question::get_question_type_list();
- foreach ($question_list as $question_type_id => $question_type_class_and_name) {
- if (get_lang($question_type_class_and_name[1]) == $values['question_type_hidden']) {
- $answer_type = $question_type_id;
- }
- }
-
+ $answer_type = $values['question_type_hidden'];
+
// check feedback_type from current exercise for type of question delineation
$exercise_id = intval($values['exercice']);
$sql = "SELECT feedback_type FROM $tbl_exercices WHERE c_id = $course_id AND id = '$exercise_id'";
- $rs_feedback_type = Database::query($sql,__FILE__,__LINE__);
+ $rs_feedback_type = Database::query($sql);
$row_feedback_type = Database::fetch_row($rs_feedback_type);
$feedback_type = $row_feedback_type[0];
@@ -88,8 +85,7 @@ if ($form->validate()) {
($feedback_type == 1 && ($answer_type != HOT_SPOT_DELINEATION && $answer_type != UNIQUE_ANSWER))) {
header('Location: question_create.php?'.api_get_cidreq().'&error=true');
exit;
- }
-
+ }
header('Location: admin.php?exerciseId='.$values['exercice'].'&newQuestion=yes&isContent='.$values['is_content'].'&answerType='.$answer_type);
exit;
} else {
@@ -106,49 +102,15 @@ if ($form->validate()) {
// footer
Display::display_footer();
}
-?>
-
-$value) {
- $valid_question_types[] = get_lang($value[1]);
- //$valid_question_types[] = trim($value[1]);
- }
+ foreach ($question_list as $key => $value) {
+ $valid_question_types[] = $key;
+ }
if (in_array($parameter, $valid_question_types)) {
return true;
} else {
return false;
}
-}
+}
\ No newline at end of file
diff --git a/main/inc/lib/javascript/jquery.customselect.js b/main/inc/lib/javascript/jquery.customselect.js
deleted file mode 100644
index 2541fb3769..0000000000
--- a/main/inc/lib/javascript/jquery.customselect.js
+++ /dev/null
@@ -1,205 +0,0 @@
-
-//select表示select本身，view表示跳出的�?�項
-;(function($){
-
- $.fn.extend({
-
- //計算文字Byte數，並回傳
- getByteLength: function(strIN){
- var i, cnt=0;
-
- for (i=0; i
= 4) cnt+=2;
- else cnt++;
- }
-
- return cnt;
- }
-
- });
-
- $.fn.extend({
-
- //檢查文字的Byte數，超�?�limit指定的個數的話，就回傳true 和 未超�?�之�?的文字index
- getIndexByByte: function(strIN,limit){
- var i, cnt=0;
-
- for (i=0; i= 4) cnt+=2;
- else cnt++;
-
- if(cnt>limit)
- {
- return [true,i];
- }
- }
-
- return false;
- }
-
- });
-
- $.fn.extend({
-
- finalselect: function(options) {
-
- var settings =
- {
- id:null,
- animalSpeed:100,
- selectWidth:"190px",
- selectImage:"image/select.png",
- selectText:"My friend",
- zIndex: 0,
- viewHeight:"100px",
- viewWidth:"300px",
- viewMouseoverColor:"#cfdfff",//#dcdcdc
- viewTop:"28px",//top,bottom
- viewLeft:" -1px"//left,right
- };
-
-
- if (typeof(options)!='undefined')
- {
- //將整批options的值assign給settings
- jQuery.extend(settings, options);
- }
-
- var tmp=''
- tmp+='
';
- tmp+='
'+settings.selectText+'
'+itemtext
- +'
'+itemvalue+'
';
-
- $("#"+settings.id+'-selectshow').html($("#"+settings.id+'-selectshow').html()+itemhtml);
-
- bindItemMouseover();
- };
-
- this.removeItem = function(index){
- if($('.selectitem',$('#'+settings.id+'-selectshow')).length>index)
- $($('.selectitem',$('#'+settings.id+'-selectshow')).get(index)).remove();
- if($('.selectborder',$('#'+settings.id+'-selectshow')).length>index)
- $($('.selectborder',$('#'+settings.id+'-selectshow')).get(index)).remove();
- }
-
-
-
- this.getValue = function(){
- return $('.valueshow',$('#'+settings.id+'-Text')).html();
- }
-
- this.getText = function(){
- return $('.textshow',$('#'+settings.id+'-Text')).html();
- }
-
-
- return this.each(_handler);
- }
-
- });
-
-})(jQuery);
\ No newline at end of file