Index: lams_tool_forum/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_forum/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:33:20 -0000 1.1.2.3 +++ lams_tool_forum/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:41:27 -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_gmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:33:22 -0000 1.1.2.3 +++ lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:41:25 -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_images/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_images/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:33:23 -0000 1.1.2.3 +++ lams_tool_images/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:41:28 -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_imscc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:33:21 -0000 1.1.2.3 +++ lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:41:26 -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_kaltura/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:33:19 -0000 1.1.2.3 +++ lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:41:54 -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_lamc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:18 -0000 1.1.2.3 +++ lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:41:51 -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_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:10 -0000 1.1.2.3 +++ lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:41:52 -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_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:06 -0000 1.1.2.3 +++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:41:53 -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_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:17 -0000 1.1.2.3 +++ lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:42: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_tool_mindmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:22 -0000 1.1.2.3 +++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:42: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_nb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_nb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:09 -0000 1.1.2.3 +++ lams_tool_nb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:42:21 -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_notebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:14 -0000 1.1.2.3 +++ lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:42:39 -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_pixlr/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:13 -0000 1.1.2.3 +++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:42: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_tool_sbmt/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:19 -0000 1.1.2.3 +++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:43:00 -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_scratchie/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:11 -0000 1.1.2.3 +++ lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:43:01 -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_scribe/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:07 -0000 1.1.2.3 +++ lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:43:02 -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_spreadsheet/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:16 -0000 1.1.2.3 +++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:42:59 -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_survey/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_survey/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:15 -0000 1.1.2.3 +++ lams_tool_survey/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:43: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_task/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_task/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:08 -0000 1.1.2.3 +++ lams_tool_task/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:43: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_vote/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_vote/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:21 -0000 1.1.2.3 +++ lams_tool_vote/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:43:41 -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_wiki/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:12 -0000 1.1.2.3 +++ lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:43:32 -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_www/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/Attic/AuthoringRatingAllStyleCriteria.tag,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_www/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 11 Nov 2016 05:36:20 -0000 1.1.2.3 +++ lams_www/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag 16 Nov 2016 04:43:31 -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 {