Distinct des critères
This commit is contained in:
@@ -3,9 +3,12 @@ package org.yacos.web.chairman.controller;
|
|||||||
import java.text.DateFormat;
|
import java.text.DateFormat;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.Map.Entry;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
@@ -152,6 +155,16 @@ public class AddConferenceController extends AbstractWizardFormController {
|
|||||||
conferenceSession.setCriteriaAll(new HashSet<CriterionBean>());
|
conferenceSession.setCriteriaAll(new HashSet<CriterionBean>());
|
||||||
List<Criterion> listCriterion = evaluationManager.getCriterions();
|
List<Criterion> listCriterion = evaluationManager.getCriterions();
|
||||||
|
|
||||||
|
HashMap<String, Criterion> mapTmp = new HashMap<String, Criterion>();
|
||||||
|
for (Criterion crit : listCriterion) {
|
||||||
|
mapTmp.put(crit.getName(), crit);
|
||||||
|
}
|
||||||
|
|
||||||
|
listCriterion = new ArrayList<Criterion>();
|
||||||
|
for(Entry<String, Criterion> entry : mapTmp.entrySet()) {
|
||||||
|
listCriterion.add(entry.getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
int maxNext = 0;
|
int maxNext = 0;
|
||||||
for (Criterion crit : listCriterion) {
|
for (Criterion crit : listCriterion) {
|
||||||
@@ -208,6 +221,16 @@ public class AddConferenceController extends AbstractWizardFormController {
|
|||||||
List<Criterion> listCriterionForConf = evaluationManager.getCriterions(conf.getId());
|
List<Criterion> listCriterionForConf = evaluationManager.getCriterions(conf.getId());
|
||||||
List<Criterion> listCriterion = evaluationManager.getCriterions();
|
List<Criterion> listCriterion = evaluationManager.getCriterions();
|
||||||
|
|
||||||
|
HashMap<String, Criterion> mapTmp = new HashMap<String, Criterion>();
|
||||||
|
for (Criterion crit : listCriterion) {
|
||||||
|
mapTmp.put(crit.getName(), crit);
|
||||||
|
}
|
||||||
|
|
||||||
|
listCriterion = new ArrayList<Criterion>();
|
||||||
|
for(Entry<String, Criterion> entry : mapTmp.entrySet()) {
|
||||||
|
listCriterion.add(entry.getValue());
|
||||||
|
}
|
||||||
|
|
||||||
int nextId;
|
int nextId;
|
||||||
|
|
||||||
int maxNext = 0;
|
int maxNext = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user