Skip to content

Commit

Permalink
SAK-42865 T&Q's copy from question pool option should appear the last (
Browse files Browse the repository at this point in the history
  • Loading branch information
bgarciaentornos authored and Miguel Pellicer committed Dec 9, 2019
1 parent 69783da commit f1ccee3
Showing 1 changed file with 4 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
* limitations under the License.
*
**********************************************************************************/


package org.sakaiproject.tool.assessment.ui.bean.author;

import java.io.Serializable;
Expand Down Expand Up @@ -47,7 +45,6 @@
* Also developers could add an administrative configuration later.</p>
*
*/

@ManagedBean(name="itemConfig")
@SessionScoped
public class ItemConfigBean implements Serializable {
Expand Down Expand Up @@ -359,8 +356,6 @@ public List<SelectItem> getItemTypeSelectList()
{
List<SelectItem> list = new ArrayList<SelectItem>();



if (isShowAllMultipleChoice())
list.add(new SelectItem(String.valueOf(TypeIfc.MULTIPLE_CHOICE),
getResourceDisplayName("multiple_choice_type")));
Expand Down Expand Up @@ -405,9 +400,6 @@ public List<SelectItem> getItemTypeSelectList()
if (isShowExtendedMatchingItems())
list.add(new SelectItem(String.valueOf(TypeIfc.EXTENDED_MATCHING_ITEMS),
getResourceDisplayName("extended_matching_items")));

if (isSelectFromQuestionPool())
list.add(new SelectItem("10", getResourceDisplayName("import_from_q")));

if (isShowCalculatedQuestion())
list.add(new SelectItem(String.valueOf(TypeIfc.CALCULATED_QUESTION), getResourceDisplayName("calculated_question"))); // CALCULATED_QUESTION
Expand Down Expand Up @@ -445,7 +437,10 @@ public int compare(SelectItem s1, SelectItem s2) {
};

Collections.sort(list, comparator);

if (isSelectFromQuestionPool()) {
list.add(new SelectItem("10", getResourceDisplayName("import_from_q")));
}

List<SelectItem> ret = new ArrayList<SelectItem>();
ret.add(new SelectItem("", getResourceDisplayName("select_qtype")));
ret.addAll(list);
Expand Down

0 comments on commit f1ccee3

Please sign in to comment.