diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
index dbe08ba..d9ed3a4 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
@@ -18,7 +18,7 @@ function init() {
}
var peopleCache = { };
-var peopleCache2 = { };
+//var peopleCache2 = { };
var viewed = -1;
function fillTable() {
@@ -58,60 +58,36 @@ function fillTable2() {
dwr.util.cloneNode("patternadded", { idSuffix:id });
dwr.util.setValue("tablePersonadded" + id, person.name);
$("patternadded" + id).style.display = "";
- peopleCache2[id] = person;
+ //peopleCache2[id] = person;
}
});
}
function addPerson(eleid) {
var person = peopleCache[eleid.substring(6)];
- /*dwr.util.cloneNode("patternadded", { idSuffix:person.id });
- dwr.util.setValue("tablePersonadded" + person.id, person.name);
- $("patternadded" + person.id).style.display = "";
- peopleCache[person.id] = person;*/
-
dwr.engine.beginBatch();
AddCriteriaJS.setPerson(person);
+ fillTable();
fillTable2();
dwr.engine.endBatch();
}
function deletePerson(eleid) {
- // we were an id of the form "delete{id}", eg "delete42". We lookup the "42"
- var person = peopleCache2[eleid.substring(11)];
+ var person = peopleCache[eleid.substring(11)];
if (confirm("Are you sure you want to delete " + person.name + "?")) {
dwr.engine.beginBatch();
AddCriteriaJS.deletePerson(person);
+ fillTable();
fillTable2();
dwr.engine.endBatch();
}
}
-function writePerson() {
- var person = { id:viewed, label:null, min:null, max:null };
- dwr.util.getValues(person);
-
- dwr.engine.beginBatch();
- AddCriteriaJS.setPerson(person);
- fillTable();
- dwr.engine.endBatch();
-}
-
-function clearPerson() {
- viewed = -1;
- dwr.util.setValues({ id:-1, label:null, min:null, max:null });
-}
-
-
-
-
-
-
diff --git a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
index 576be6a..9311b4a 100644
--- a/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
+++ b/YACOSWeb/src/org/yacos/web/chairman/controller/AddConferenceController.java
@@ -72,12 +72,16 @@ public class AddConferenceController extends AbstractWizardFormController {
b.setId(getNextPerson());
}
- listPersonAdded.remove(b);
+ //listPersonAdded.remove(b);
listPersonAdded.add(b);
+ listPersonBean.remove(b);
}
public void deletePerson(PersonBean b) {
listPersonAdded.remove(b);
+ listPersonBean.add(b);
+
+ // FIXME b different du b d'avant (dans le set...)
}
private static synchronized int getNextPerson()