christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Diverse modif ds ajout conf

Browse Source 
Policy failures:   
Code warning
- failed on resource ConferenceValidator.java. Reason: Class is a raw type. References to generic type Class<T> should be parameterized, line 1
Override reason:   
uhu
This commit is contained in:
Frederic Debuire
2008-02-05 15:21:13 +00:00
parent 55c848c4ae
commit 6db0c1f686
8 changed files with 176 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
YACOSWeb/WebContent/WEB-INF/classes/messages.properties
View File

@@ -113,6 +113,12 @@ conference.linkMenu.title=Adding Conference
conference.linkMenu.choose=Choosing current conference
conference.linkMenu.change=Change current conference
conference.errors.dateStartNonValid=This date is not valid
conference.errors.dateStartSuperiorEnd=The start date must be earlier than the end date
conference.errors.dateStartSuperiorArticle=The article's deadline date must be earlier than the start date
conference.errors.dateStartSuperiorEvaluation=The evaluation's deadline date must be earlier than the start date
conference.errors.dateArticleSuperiorEvaluation=The article's deadline date must be earlier than the evaluation's deadline date
conference2.title=Calendar
conference2.date=Conference's date
conference2.start=Start :
@@ -130,6 +136,8 @@ evaluation.note=The note for the criterion
evaluation.thisArticle=evaluate this article
evaluation.choose=Choose an title to evaluation from the list
invitation.send=Send an invitation
#Validation messages for errors
submissionArticle.title=The title should not be null
submissionArticle.theme=The theme should not be null

16
YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp
View File

@@ -13,13 +13,13 @@
<fieldset><legend>Information</legend>
Page's numbers <form:input path="pageNumber" />
File's type : <form:select path="fileType">
<form:option value="" />
<form:option value="PDF" />
<form:option value="Tex/Latec" />
<form:option value="Word" />
</form:select></fieldset>
<br /> <br />
PDF <form:checkbox path="typePDF"/>
Tex/Latec <form:checkbox path="typeLatec"/>
Word <form:checkbox path="typeWord"/>
OpenOffice <form:checkbox path="typeODT"/>
</fieldset>
<br />
@@ -27,7 +27,7 @@
<br />
Informations compl<70>mentaires : <form:textarea path="sendInfo" />
Complementary Information : <form:textarea path="sendInfo" />
<br />
<br />

2
YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
View File

@@ -82,7 +82,7 @@ function clearPerson() {
<h2 align="center"><fmt:message key="conference.titleMenu" /></h2>
<form:form commandName="formConference" name="monForm" onsubmit="return submitIfNotEnter(this)">
<form:form commandName="formConference" name="monForm">
<fieldset><legend>Criteria</legend>
<table class="plain">

51
YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
View File

@@ -12,9 +12,10 @@
function init() {
dwr.engine.setAsync(false); // a v<>rifier
AddCriteriaJS.initPerson();
//AddCriteriaJS.initPerson();
dwr.engine.setAsync(true);
setTimeout("fillTable()", 500);
setTimeout("fillTable2()", 500);
}
var peopleCache = { };
@@ -29,13 +30,17 @@ function fillTable() {
}});
// Create a new set cloned from the pattern row
var person, id;
people.sort(function(p1, p2) { return p1.name.localeCompare(p2.name); });
people.sort(function(p1, p2) { return p1.firstName.localeCompare(p2.firstName); });
if (people.length == 0)
$("tableName").style.display = "none";
for (var i = 0; i < people.length; i++) {
person = people[i];
id = person.id;
dwr.util.cloneNode("pattern", { idSuffix:id });
dwr.util.setValue("tablePerson" + id, person.name);
dwr.util.setValue("tablePerson" + id, person.firstName + " " + person.lastName);
$("tableName").style.display = "";
$("pattern" + id).style.display = "";
peopleCache[id] = person;
}
@@ -50,15 +55,19 @@ function fillTable2() {
}});
// Create a new set cloned from the pattern row
var person, id;
people.sort(function(p1, p2) { return p1.name.localeCompare(p2.name); });
people.sort(function(p1, p2) { return p1.firstName.localeCompare(p2.lastName); });
if (people.length == 0)
$("tableNameAdded").style.display = "none";
for (var i = 0; i < people.length; i++) {
person = people[i];
id = person.id;
dwr.util.cloneNode("patternadded", { idSuffix:id });
dwr.util.setValue("tablePersonadded" + id, person.name);
dwr.util.setValue("tablePersonadded" + id, person.firstName + " " + person.lastName);
$("tableNameAdded").style.display = "";
$("patternadded" + id).style.display = "";
//peopleCache2[id] = person;
//peopleCache2[id] = person; // voir ici pr re-remplir apr<70>s le back :)
}
});
}
@@ -83,7 +92,7 @@ function addInvitation() {
function deletePerson(eleid) {
var person = peopleCache[eleid.substring(11)];
if (confirm("Are you sure you want to delete " + person.name + "?")) {
if (confirm("Are you sure you want to delete " + person.firstName + " " + person.lastName + "?")) {
dwr.engine.beginBatch();
AddCriteriaJS.deletePerson(person);
filterUser(null, dwr.util.getValue("myfilter"));
@@ -111,8 +120,15 @@ function filterUser(el, value) {
<form:form commandName="formConference" name="monForm">
Filter <input id="myfilter" type="text" />
<table border="1">
Filter <form:input id="myfilter" path="myfilter" />
<br /> <br />
<table border="1" id="tableName" style="display: none;">
<thead>
<tr>
<th>Name</th>
<th>Actions</th>
</tr>
</thead>
<tbody id="personbody">
<tr id="pattern" style="display: none;">
<td><span id="tablePerson">Person</span></td>
@@ -123,12 +139,19 @@ function filterUser(el, value) {
</tbody>
</table>
<fmt:message key="pcmember.invitation.promptMessage"/> <br/>
Mail: <input id="emailAddress" type="text"/> <input type="button" name="invitationEmail" onclick="addInvitation()"/>
<br />
<table border="1">
<fmt:message key="invitation.send"/> <br/>
Mail: <input id="emailAddress" type="text"/> <a id="invitationEmail" href="#" onclick="addInvitation()" >Invite</a>
<br />
<br />
<table border="1" id="tableNameAdded" style="display: none;">
<thead>
<tr>
<th>Name</th>
<th>Actions</th>
</tr>
</thead>
<tbody id="personbodyadded">
<tr id="patternadded" style="display: none;">
<td><span id="tablePersonadded">Person</span></td>