Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.178.2

This commit is contained in:
Antonio Cañas Vargas 2016-04-05 00:45:42 +02:00
parent 2d09d5767b
commit b7fb17f33d
3 changed files with 69 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
css/swad15.178.1.css → css/swad15.178.2.css
View File

106
js/swad15.131.3.js → js/swad15.178.2.js
View File

@ -762,89 +762,115 @@ function enableDisableAns (Formul) {
for (var i=0; i<Formul.elements.length; i++)
if (Formul.elements[i].name == 'AnsInt')
Formul.elements[i].disabled = false;
else if (Formul.elements[i].name == 'AnsMulti' ||
else if (Formul.elements[i].name == 'AnsMulti' ||
Formul.elements[i].name == 'AnsFloatMin' ||
Formul.elements[i].name == 'AnsFloatMax' ||
Formul.elements[i].name == 'AnsTF' ||
Formul.elements[i].name == 'AnsUni' ||
Formul.elements[i].name == 'AnsUni' ||
Formul.elements[i].name == 'Shuffle')
Formul.elements[i].disabled = true;
else enableDisableContAns(Formul.elements[i],true);
else {
enableDisableStrAns(Formul.elements[i],true);
enableDisableImgAns(Formul.elements[i],true);
}
}
else if (Formul.AnswerType[Tst_ANS_FLOAT].checked){
for (var i=0; i<Formul.elements.length; i++)
if (Formul.elements[i].name == 'AnsFloatMin' ||
if (Formul.elements[i].name == 'AnsFloatMin' ||
Formul.elements[i].name == 'AnsFloatMax')
Formul.elements[i].disabled = false;
else if (Formul.elements[i].name == 'AnsInt' ||
Formul.elements[i].name == 'AnsTF' ||
Formul.elements[i].name == 'AnsUni' ||
Formul.elements[i].name == 'AnsMulti' ||
else if (Formul.elements[i].name == 'AnsInt' ||
Formul.elements[i].name == 'AnsTF' ||
Formul.elements[i].name == 'AnsUni' ||
Formul.elements[i].name == 'AnsMulti' ||
Formul.elements[i].name == 'Shuffle')
Formul.elements[i].disabled = true;
else enableDisableContAns(Formul.elements[i],true);
else {
enableDisableStrAns(Formul.elements[i],true);
enableDisableImgAns(Formul.elements[i],true);
}
}
else if (Formul.AnswerType[Tst_ANS_TRUE_FALSE].checked){
for (var i=0; i<Formul.elements.length; i++)
if (Formul.elements[i].name == 'AnsTF')
Formul.elements[i].disabled = false;
else if (Formul.elements[i].name == 'AnsInt' ||
Formul.elements[i].name == 'AnsFloatMin' ||
Formul.elements[i].name == 'AnsFloatMax' ||
Formul.elements[i].name == 'AnsUni' ||
Formul.elements[i].name == 'AnsMulti' ||
else if (Formul.elements[i].name == 'AnsInt' ||
Formul.elements[i].name == 'AnsFloatMin' ||
Formul.elements[i].name == 'AnsFloatMax' ||
Formul.elements[i].name == 'AnsUni' ||
Formul.elements[i].name == 'AnsMulti' ||
Formul.elements[i].name == 'Shuffle')
Formul.elements[i].disabled = true;
else enableDisableContAns(Formul.elements[i],true);
else {
enableDisableStrAns(Formul.elements[i],true);
enableDisableImgAns(Formul.elements[i],true);
}
}
else if (Formul.AnswerType[Tst_ANS_UNIQUE_CHOICE].checked){
for (var i=0; i<Formul.elements.length; i++)
if (Formul.elements[i].name == 'AnsUni' ||
if (Formul.elements[i].name == 'AnsUni' ||
Formul.elements[i].name == 'Shuffle')
Formul.elements[i].disabled = false;
else if (Formul.elements[i].name == 'AnsInt' ||
Formul.elements[i].name == 'AnsFloatMin' ||
Formul.elements[i].name == 'AnsFloatMax' ||
Formul.elements[i].name == 'AnsTF' ||
else if (Formul.elements[i].name == 'AnsInt' ||
Formul.elements[i].name == 'AnsFloatMin' ||
Formul.elements[i].name == 'AnsFloatMax' ||
Formul.elements[i].name == 'AnsTF' ||
Formul.elements[i].name == 'AnsMulti')
Formul.elements[i].disabled = true;
else enableDisableContAns(Formul.elements[i],false);
else {
enableDisableStrAns(Formul.elements[i],false);
enableDisableImgAns(Formul.elements[i],false);
}
}
else if (Formul.AnswerType[Tst_ANS_MULTIPLE_CHOICE].checked){
for (var i=0; i<Formul.elements.length; i++)
if (Formul.elements[i].name == 'AnsMulti' ||
if (Formul.elements[i].name == 'AnsMulti' ||
Formul.elements[i].name == 'Shuffle')
Formul.elements[i].disabled = false;
else if (Formul.elements[i].name == 'AnsInt' ||
Formul.elements[i].name == 'AnsFloatMin' ||
Formul.elements[i].name == 'AnsFloatMax' ||
Formul.elements[i].name == 'AnsTF' ||
else if (Formul.elements[i].name == 'AnsInt' ||
Formul.elements[i].name == 'AnsFloatMin' ||
Formul.elements[i].name == 'AnsFloatMax' ||
Formul.elements[i].name == 'AnsTF' ||
Formul.elements[i].name == 'AnsUni')
Formul.elements[i].disabled = true;
else
enableDisableContAns(Formul.elements[i],false);
else {
enableDisableStrAns(Formul.elements[i],false);
enableDisableImgAns(Formul.elements[i],false);
}
}
else if (Formul.AnswerType[Tst_ANS_TEXT].checked){
for (var i=0; i<Formul.elements.length; i++)
if (Formul.elements[i].name == 'AnsInt' ||
Formul.elements[i].name == 'AnsFloatMin' ||
Formul.elements[i].name == 'AnsFloatMax' ||
Formul.elements[i].name == 'AnsTF' ||
Formul.elements[i].name == 'AnsUni' ||
if (Formul.elements[i].name == 'AnsInt' ||
Formul.elements[i].name == 'AnsFloatMin' ||
Formul.elements[i].name == 'AnsFloatMax' ||
Formul.elements[i].name == 'AnsTF' ||
Formul.elements[i].name == 'AnsUni' ||
Formul.elements[i].name == 'AnsMulti')
Formul.elements[i].disabled = true;
else
enableDisableContAns(Formul.elements[i],false);
else {
enableDisableStrAns(Formul.elements[i],false);
enableDisableImgAns(Formul.elements[i],true);
}
}
}
// Activate or deactivate response contents of a test question
function enableDisableContAns (elem, isDisabled) {
// Activate or deactivate answer strings and feedback of a test question
function enableDisableStrAns (elem, isDisabled) {
var Tst_MAX_OPTIONS_PER_QUESTION = 10;
for ( var i = 0; i < Tst_MAX_OPTIONS_PER_QUESTION; i++)
if (elem.name == ('AnsStr' + i) ||
elem.name == ('FbStr' + i))
for (var i = 0; i < Tst_MAX_OPTIONS_PER_QUESTION; i++)
if (elem.name == ('AnsStr' + i) ||
elem.name == ('FbStr' + i))
elem.disabled = isDisabled;
}
//Activate or deactivate answer images of a test question
function enableDisableImgAns (elem, isDisabled) {
var Tst_MAX_OPTIONS_PER_QUESTION = 10;
for (var i = 0; i < Tst_MAX_OPTIONS_PER_QUESTION; i++)
if (elem.name == ('ImgAct' + i) ||
elem.name == ('FileImg' + i))
elem.disabled = isDisabled;
}

5
swad_changelog.h
View File

@ -134,13 +134,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.178.1 (2016-04-04)"
#define Log_PLATFORM_VERSION "SWAD 15.178.2 (2016-04-05)"
#define CSS_FILE "swad15.178.1.css"
#define JS_FILE "swad15.131.3.js"
#define JS_FILE "swad15.178.2.js"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/*
Version 15.178.2: Apr 04, 2016 Changes in JavaScript related to images in test questions. (198265 lines)
Version 15.178.1: Apr 04, 2016 Changes in CSS related to images in test questions. (198240 lines)
Version 15.178: Apr 04, 2016 Code refactoring related to images in test questions. (198244 lines)
5 changes necessary in database: