Index: lams_gradebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_gradebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:32:38 -0000 1.1.2.3 +++ lams_gradebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:25:38 -0000 1.1.2.4 @@ -196,9 +196,15 @@ reactivateArrows(); } - function generateSelect(id, validate, zeroDescription, orderId, currentValue) { - var str = ''; + if ( zeroDescription ) { + str += ''; + } for (var i = 1; i < 11; i++) { str += ''; } @@ -263,12 +269,7 @@ } else if ( style == 2 ) { var rankingStr = '
 ' - + '
'; + + generateSelect('maxRating' + orderId, null, null, orderId, maxRating); row.append(jQuery('', { 'class': 'criteria-info', html: '
'+ inputField + rankingStr @@ -330,7 +331,25 @@ var maxRateDropDown = document.getElementById("maximumRates" + orderId); var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value); - if ((minLimit > maxLimit) && !(maxLimit == 0)) { + // RANK ALL + if ( minLimit == -1 || maxLimit == -1 ) { + if ( isMinimum ) { + if ( minLimit == -1 ) { + maxRateDropDown.selectedIndex = 0; + } else { + maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex; + } + } else { + if ( maxLimit == -1 ) { + minRateDropDown.selectedIndex = 0; + } else { + minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; + } + } + } + + // OTHERWISE MIN <= MAX + else if ((minLimit > maxLimit) && !(maxLimit == 0)) { if (isMinimum) { minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; } else { Index: lams_learning/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_learning/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:32:35 -0000 1.1.2.3 +++ lams_learning/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:30:20 -0000 1.1.2.4 @@ -196,9 +196,15 @@ reactivateArrows(); } - function generateSelect(id, validate, zeroDescription, orderId, currentValue) { - var str = ''; + if ( zeroDescription ) { + str += ''; + } for (var i = 1; i < 11; i++) { str += ''; } @@ -263,12 +269,7 @@ } else if ( style == 2 ) { var rankingStr = '
 ' - + '
'; + + generateSelect('maxRating' + orderId, null, null, orderId, maxRating); row.append(jQuery('', { 'class': 'criteria-info', html: '
'+ inputField + rankingStr @@ -330,7 +331,25 @@ var maxRateDropDown = document.getElementById("maximumRates" + orderId); var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value); - if ((minLimit > maxLimit) && !(maxLimit == 0)) { + // RANK ALL + if ( minLimit == -1 || maxLimit == -1 ) { + if ( isMinimum ) { + if ( minLimit == -1 ) { + maxRateDropDown.selectedIndex = 0; + } else { + maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex; + } + } else { + if ( maxLimit == -1 ) { + minRateDropDown.selectedIndex = 0; + } else { + minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; + } + } + } + + // OTHERWISE MIN <= MAX + else if ((minLimit > maxLimit) && !(maxLimit == 0)) { if (isMinimum) { minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; } else { Index: lams_monitoring/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_monitoring/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:32:36 -0000 1.1.2.3 +++ lams_monitoring/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:30:17 -0000 1.1.2.4 @@ -196,9 +196,15 @@ reactivateArrows(); } - function generateSelect(id, validate, zeroDescription, orderId, currentValue) { - var str = ''; + if ( zeroDescription ) { + str += ''; + } for (var i = 1; i < 11; i++) { str += ''; } @@ -263,12 +269,7 @@ } else if ( style == 2 ) { var rankingStr = '
 ' - + '
'; + + generateSelect('maxRating' + orderId, null, null, orderId, maxRating); row.append(jQuery('', { 'class': 'criteria-info', html: '
'+ inputField + rankingStr @@ -330,7 +331,25 @@ var maxRateDropDown = document.getElementById("maximumRates" + orderId); var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value); - if ((minLimit > maxLimit) && !(maxLimit == 0)) { + // RANK ALL + if ( minLimit == -1 || maxLimit == -1 ) { + if ( isMinimum ) { + if ( minLimit == -1 ) { + maxRateDropDown.selectedIndex = 0; + } else { + maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex; + } + } else { + if ( maxLimit == -1 ) { + minRateDropDown.selectedIndex = 0; + } else { + minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; + } + } + } + + // OTHERWISE MIN <= MAX + else if ((minLimit > maxLimit) && !(maxLimit == 0)) { if (isMinimum) { minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; } else { Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:33:05 -0000 1.1.2.3 +++ lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:30:18 -0000 1.1.2.4 @@ -196,9 +196,15 @@ reactivateArrows(); } - function generateSelect(id, validate, zeroDescription, orderId, currentValue) { - var str = ''; + if ( zeroDescription ) { + str += ''; + } for (var i = 1; i < 11; i++) { str += ''; } @@ -263,12 +269,7 @@ } else if ( style == 2 ) { var rankingStr = '
 ' - + '
'; + + generateSelect('maxRating' + orderId, null, null, orderId, maxRating); row.append(jQuery('', { 'class': 'criteria-info', html: '
'+ inputField + rankingStr @@ -330,7 +331,25 @@ var maxRateDropDown = document.getElementById("maximumRates" + orderId); var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value); - if ((minLimit > maxLimit) && !(maxLimit == 0)) { + // RANK ALL + if ( minLimit == -1 || maxLimit == -1 ) { + if ( isMinimum ) { + if ( minLimit == -1 ) { + maxRateDropDown.selectedIndex = 0; + } else { + maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex; + } + } else { + if ( maxLimit == -1 ) { + minRateDropDown.selectedIndex = 0; + } else { + minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; + } + } + } + + // OTHERWISE MIN <= MAX + else if ((minLimit > maxLimit) && !(maxLimit == 0)) { if (isMinimum) { minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; } else { Index: lams_tool_bbb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_bbb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:33:04 -0000 1.1.2.3 +++ lams_tool_bbb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:30:19 -0000 1.1.2.4 @@ -196,9 +196,15 @@ reactivateArrows(); } - function generateSelect(id, validate, zeroDescription, orderId, currentValue) { - var str = ''; + if ( zeroDescription ) { + str += ''; + } for (var i = 1; i < 11; i++) { str += ''; } @@ -263,12 +269,7 @@ } else if ( style == 2 ) { var rankingStr = '
 ' - + '
'; + + generateSelect('maxRating' + orderId, null, null, orderId, maxRating); row.append(jQuery('', { 'class': 'criteria-info', html: '
'+ inputField + rankingStr @@ -330,7 +331,25 @@ var maxRateDropDown = document.getElementById("maximumRates" + orderId); var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value); - if ((minLimit > maxLimit) && !(maxLimit == 0)) { + // RANK ALL + if ( minLimit == -1 || maxLimit == -1 ) { + if ( isMinimum ) { + if ( minLimit == -1 ) { + maxRateDropDown.selectedIndex = 0; + } else { + maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex; + } + } else { + if ( maxLimit == -1 ) { + minRateDropDown.selectedIndex = 0; + } else { + minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; + } + } + } + + // OTHERWISE MIN <= MAX + else if ((minLimit > maxLimit) && !(maxLimit == 0)) { if (isMinimum) { minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; } else { Index: lams_tool_chat/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_chat/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:33:06 -0000 1.1.2.3 +++ lams_tool_chat/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:30:16 -0000 1.1.2.4 @@ -196,9 +196,15 @@ reactivateArrows(); } - function generateSelect(id, validate, zeroDescription, orderId, currentValue) { - var str = ''; + if ( zeroDescription ) { + str += ''; + } for (var i = 1; i < 11; i++) { str += ''; } @@ -263,12 +269,7 @@ } else if ( style == 2 ) { var rankingStr = '
 ' - + '
'; + + generateSelect('maxRating' + orderId, null, null, orderId, maxRating); row.append(jQuery('', { 'class': 'criteria-info', html: '
'+ inputField + rankingStr @@ -330,7 +331,25 @@ var maxRateDropDown = document.getElementById("maximumRates" + orderId); var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value); - if ((minLimit > maxLimit) && !(maxLimit == 0)) { + // RANK ALL + if ( minLimit == -1 || maxLimit == -1 ) { + if ( isMinimum ) { + if ( minLimit == -1 ) { + maxRateDropDown.selectedIndex = 0; + } else { + maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex; + } + } else { + if ( maxLimit == -1 ) { + minRateDropDown.selectedIndex = 0; + } else { + minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; + } + } + } + + // OTHERWISE MIN <= MAX + else if ((minLimit > maxLimit) && !(maxLimit == 0)) { if (isMinimum) { minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; } else { Index: lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:33:07 -0000 1.1.2.3 +++ lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:31:04 -0000 1.1.2.4 @@ -196,9 +196,15 @@ reactivateArrows(); } - function generateSelect(id, validate, zeroDescription, orderId, currentValue) { - var str = ''; + if ( zeroDescription ) { + str += ''; + } for (var i = 1; i < 11; i++) { str += ''; } @@ -263,12 +269,7 @@ } else if ( style == 2 ) { var rankingStr = '
 ' - + '
'; + + generateSelect('maxRating' + orderId, null, null, orderId, maxRating); row.append(jQuery('', { 'class': 'criteria-info', html: '
'+ inputField + rankingStr @@ -330,7 +331,25 @@ var maxRateDropDown = document.getElementById("maximumRates" + orderId); var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value); - if ((minLimit > maxLimit) && !(maxLimit == 0)) { + // RANK ALL + if ( minLimit == -1 || maxLimit == -1 ) { + if ( isMinimum ) { + if ( minLimit == -1 ) { + maxRateDropDown.selectedIndex = 0; + } else { + maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex; + } + } else { + if ( maxLimit == -1 ) { + minRateDropDown.selectedIndex = 0; + } else { + minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; + } + } + } + + // OTHERWISE MIN <= MAX + else if ((minLimit > maxLimit) && !(maxLimit == 0)) { if (isMinimum) { minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex; } else {