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

Multiple corrections

Browse Source
This commit is contained in:
Frederic Debuire
2008-02-24 23:17:02 +00:00
parent 461fcf7793
commit 2251288425
15 changed files with 341 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,7 +212,7 @@ step=Step ({0}/{1})
conference.remainingTokens=You have {0} tokens left to create new conferences.<br/>\n You can ask to the admin if you need more. conference.remainingTokens=You have {0} tokens left to create new conferences.<br/>\n You can ask to the admin if you need more.
conference.help.step1= conference.help.step1=
conference.help.step2=This step is used to define some dates like the starting date for the conference.<br/>\nYou just have to click on a field and the calendar will appear. conference.help.step2=This step is used to define some dates like the starting date for the conference.<br/>\nYou just have to click on a field and the calendar will appear.
conference.help.step3=Here you can add some constraints at your conference like the number of pages by articles or the type of file you want the authors to use. conference.help.step3=Here you can add some constraints at your conference like the number of pages by articles (just for indication) or the type of file you want the authors to use.<br/>If you don't select any file types, any file types will be authorized.
conference.help.step4=This step allows you to add criterion which will be used when someone will evaluate an article.<br/>\nYou can add a new criterion using the form, or simply add an existing criterion using the list. conference.help.step4=This step allows you to add criterion which will be used when someone will evaluate an article.<br/>\nYou can add a new criterion using the form, or simply add an existing criterion using the list.
conference.help.step5=This step allows you to add PC Member to the conference.<br/>\nYou can add a Program Committee Member using the list below, or invite someone using his email address. conference.help.step5=This step allows you to add PC Member to the conference.<br/>\nYou can add a Program Committee Member using the list below, or invite someone using his email address.
conference.titleAdd=Add a conference conference.titleAdd=Add a conference

8
YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
View File

@@ -31,7 +31,7 @@
</td> </td>
<td><form:input onfocus="ds_sh(this);" path="dateArticle" <td><form:input onfocus="ds_sh(this);" path="dateArticle"
cssStyle="cursor: text" /> cssStyle="cursor: text" />
<div class="formErrors"> <div class="formError">
<form:errors path="dateArticle" /> <form:errors path="dateArticle" />
</div> </div>
</td> </td>
@@ -41,7 +41,7 @@
</td> </td>
<td><form:input onfocus="ds_sh(this);" path="dateEvaluation" <td><form:input onfocus="ds_sh(this);" path="dateEvaluation"
cssStyle="cursor: text" /> cssStyle="cursor: text" />
<div class="formErrors"> <div class="formError">
<form:errors path="dateEvaluation" /> <form:errors path="dateEvaluation" />
</div> </div>
</td> </td>
@@ -51,7 +51,7 @@
</td> </td>
<td><form:input onfocus="ds_sh(this);" path="dateStart" <td><form:input onfocus="ds_sh(this);" path="dateStart"
cssStyle="cursor: text" /> cssStyle="cursor: text" />
<div class="formErrors"> <div class="formError">
<form:errors path="dateStart" /> <form:errors path="dateStart" />
</div> </div>
</td> </td>
@@ -60,7 +60,7 @@
<td class="formLabel"><fmt:message key="conference2.end" /></td> <td class="formLabel"><fmt:message key="conference2.end" /></td>
<td><form:input onfocus="ds_sh(this);" path="dateEnd" <td><form:input onfocus="ds_sh(this);" path="dateEnd"
cssStyle="cursor: text" /> cssStyle="cursor: text" />
<div class="formErrors"> <div class="formError">
<form:errors path="dateEnd" /> <form:errors path="dateEnd" />
</div> </div>
</td> </td>

81
YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
View File

@@ -7,8 +7,15 @@
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
function HideRegistered() { function ShowRegistered() {
var listElem = $$('.isRegistered');
// faux tt ca
var listElem;
if ($('ongoing').checked)
listElem = $$('.isRegistered', 'confPost');
else
listElem = $$('.isRegistered');
for (var i = 0; i < listElem.length; i++) { for (var i = 0; i < listElem.length; i++) {
if (listElem[i].visible()) if (listElem[i].visible())
listElem[i].style.display = "none"; listElem[i].style.display = "none";
@@ -17,8 +24,23 @@
} }
} }
function HideNotRegistered() { function ShowNotRegistered() {
var listElem = $$('.notRegistered'); var listElem;
if ($('ongoing').checked)
listElem = $$('.notRegistered', 'confPost');
else
listElem = $$('.notRegistered');
for (var i = 0; i < listElem.length; i++) {
if (listElem[i].visible())
listElem[i].style.display = "none";
else
listElem[i].style.display = "";
}
}
function ShowOngoing() {
var listElem = $$('.confPast');
for (var i = 0; i < listElem.length; i++) { for (var i = 0; i < listElem.length; i++) {
if (listElem[i].visible()) if (listElem[i].visible())
listElem[i].style.display = "none"; listElem[i].style.display = "none";
@@ -66,9 +88,10 @@
<table width="100%"> <table width="100%">
<tr> <tr>
<td width="7%">Hide</td> <td width="7%">Show</td>
<td width="93%"><input type="checkbox" name="register" value="Register" onchange="HideRegistered()"> Conference you are registered in<br /> <td width="93%"><input id="register" type="checkbox" name="register" value="Register" onchange="ShowRegistered()" checked="checked"> Conference you are registered in<br />
<input type="checkbox" name="notregister" value="NotRegister" onchange="HideNotRegistered()"> Conference you are not registered in <input id="notregister" type="checkbox" name="notregister" value="NotRegister" onchange="ShowNotRegistered()" checked="checked"> Conference you are not registered in<br />
<input id="ongoing" type="checkbox" name="ongoing" value="Ongoing" onchange="ShowOngoing()"> Only ongoing conferences<br />
</td> </td>
</tr> </tr>
</table> </table>
@@ -82,12 +105,14 @@
</c:forEach> </c:forEach>
<c:choose> <c:choose>
<c:when test="${varName == 'true'}"> <c:when test="${varName == 'true'}">
<div class="conferenceBloc cbb isRegistered"> <c:choose>
<c:when test="${conference.currentPhase == 'PAST'}">
<div class="conferenceBloc cbb isRegistered confPast">
<h2> <h2>
${conference.title} - In this conference you are: ${conference.title} - In this conference you are:
<c:forEach items="${listRole}" var="role"> <c:forEach items="${listRole}" var="role">
<c:if test="${conference.id == role.conference.id}"> <c:if test="${conference.id == role.conference.id}">
${fn:toLowerCase(role.type)} <span style="color: #8D0000; text-transform: capitalize;">${fn:toLowerCase(role.type)}</span>
</c:if> </c:if>
</c:forEach> </c:forEach>
</h2> </h2>
@@ -97,6 +122,35 @@
</center> </center>
</div> </div>
</c:when> </c:when>
<c:otherwise>
<div class="conferenceBloc cbb isRegistered">
<h2>
${conference.title} - In this conference you are:
<c:forEach items="${listRole}" var="role">
<c:if test="${conference.id == role.conference.id}">
<span style="color: #8D0000; text-transform: capitalize;">${fn:toLowerCase(role.type)}</span>
</c:if>
</c:forEach>
</h2>
<b>Description:</b> ${conference.description}<br />
<center>
<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">Select</a><br />
</center>
</div>
</c:otherwise>
</c:choose>
</c:when>
<c:otherwise>
<c:choose>
<c:when test="${conference.currentPhase == 'PAST'}">
<div class="conferenceBloc cbb notRegistered confPast">
<h2>${conference.title} - You haven't any role in this conference</h2>
<b>Description:</b> ${conference.description}<br />
<center>
<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">View details</a><br />
</center>
</div>
</c:when>
<c:otherwise> <c:otherwise>
<div class="conferenceBloc cbb notRegistered"> <div class="conferenceBloc cbb notRegistered">
<h2>${conference.title} - You haven't any role in this conference</h2> <h2>${conference.title} - You haven't any role in this conference</h2>
@@ -107,15 +161,10 @@
</div> </div>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:otherwise>
</c:choose>
</c:forEach> </c:forEach>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
<br />
<a href="<c:url value="main.htm"/>">Home</a>
</body> </body>
</html> </html>

22
YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp
View File

@@ -6,8 +6,6 @@
<h4 class="title"><fmt:message key="evaluation.choose" /></h4> <h4 class="title"><fmt:message key="evaluation.choose" /></h4>
<p class="formHelp"> <p class="formHelp">
<fmt:message key="evaluation.help"/> <fmt:message key="evaluation.help"/>
</p> </p>
@@ -21,19 +19,27 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<!--<td align="left"> <td align="left">
Topic: <b>${article.article.topic}</b><br/> <c:choose>
Abstract: ${article.article.abstractText} <c:when test="${not empty article.referee}">
Delegated to:<br />
<c:forEach var="referee" items="${article.referee}">
${referee.firstName} ${referee.lastName}<br/>
</c:forEach>
</c:when>
<c:otherwise>
&nbsp;
</c:otherwise>
</c:choose>
</td> </td>
-->
<td align="right"> <td align="right">
<c:if test="${article.evaluated == false}"> <c:if test="${article.evaluated == false and empty article.referee}">
<c:if test="${article.article.state != 'REJECTED' and article.article.state != 'ACCEPTED'}"> <c:if test="${article.article.state != 'REJECTED' and article.article.state != 'ACCEPTED'}">
<a title="Click to evaluate" href="<c:url value="evaluation.htm?id=${article.article.id}"/>">Evaluate <img src="./images/button_follow_32x32.png" alt="Click to evaluate" /></a> <a title="Click to evaluate" href="<c:url value="evaluation.htm?id=${article.article.id}"/>">Evaluate <img src="./images/button_follow_32x32.png" alt="Click to evaluate" /></a>
</c:if> </c:if>
</c:if> </c:if>
<c:if test="${article.evaluated == true}"> <c:if test="${article.evaluated == true and empty article.referee}">
<c:if test="${article.article.state != 'REJECTED' and article.article.state != 'ACCEPTED'}"> <c:if test="${article.article.state != 'REJECTED' and article.article.state != 'ACCEPTED'}">
<a title="Click to modify evaluation" href="<c:url value="evaluation.htm?id=${article.article.id}&action=modify"/>">Modify the evaluation <img src="./images/cc-kedit-32x32.png" alt="Click to modify evaluation" /></a> <a title="Click to modify evaluation" href="<c:url value="evaluation.htm?id=${article.article.id}&action=modify"/>">Modify the evaluation <img src="./images/cc-kedit-32x32.png" alt="Click to modify evaluation" /></a>
</c:if> </c:if>

34
YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
View File

@@ -38,7 +38,39 @@
<b><fmt:message key="conference.detail.date.end" /></b>&nbsp;<fmt:formatDate value="${currentConference.dateEnd }" dateStyle="long" /><br /><br /> <b><fmt:message key="conference.detail.date.end" /></b>&nbsp;<fmt:formatDate value="${currentConference.dateEnd }" dateStyle="long" /><br /><br />
<b><fmt:message key="conference.detail.date.article" /></b>&nbsp;<fmt:formatDate value="${currentConference.dateArticle }" dateStyle="long" /><br /> <b><fmt:message key="conference.detail.date.article" /></b>&nbsp;<fmt:formatDate value="${currentConference.dateArticle }" dateStyle="long" /><br />
<b><fmt:message key="conference.detail.date.evaluation" /></b>&nbsp;<fmt:formatDate value="${currentConference.dateEvaluation }" dateStyle="long" /><br /> <b><fmt:message key="conference.detail.date.evaluation" /></b>&nbsp;<fmt:formatDate value="${currentConference.dateEvaluation }" dateStyle="long" /><br />
</div><br /> </div>
<h3 class="descriptionTitle">Submission Informations</h3>
<div class="textBox">
<c:if test="${currentConference.pageNumber != 0}">
The number of pages for an article is about ${currentConference.pageNumber}.<br/><br/>
</c:if>
The following file's type are allowed:&nbsp;
<c:choose>
<c:when test="${currentConference.typePDF == true or currentConference.typeLatec == true or currentConference.typeWord == true or currentConference.typeODT == true}">
<c:if test="${currentConference.typePDF == true}">
.pdf&nbsp;
</c:if>
<c:if test="${currentConference.typeLatec == true}">
.tex&nbsp;
</c:if>
<c:if test="${currentConference.typeWord == true}">
.doc&nbsp;.docx&nbsp;
</c:if>
<c:if test="${currentConference.typeODT == true}">
.odt&nbsp;
</c:if>
</c:when>
<c:otherwise>
Any file's type.
</c:otherwise>
</c:choose>
<br /><br />
Other informations about the submission: ${currentConference.sendInfo}
</div>
<br />
<center><a href="<c:url value="submissionArticle.htm" />" class="submitLink"><fmt:message key="conference.detail.link.submit" /></a></center> <center><a href="<c:url value="submissionArticle.htm" />" class="submitLink"><fmt:message key="conference.detail.link.submit" /></a></center>
</c:when> </c:when>

21
YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp
View File

@@ -10,8 +10,23 @@
<body> <body>
<h4 class="title"><fmt:message key="manageArticle.title" /></h4> <h4 class="title"><fmt:message key="manageArticle.title" /></h4>
<br />
<c:if test="${param['delete'] eq 'ok'}">
<p class="formOk">
Your article has been successfully deleted.<br/>
</p>
</c:if>
<c:choose>
<c:when test="${empty listArticle}">
<div class="warningBox">
You have no article at the moment.<br />
You can submit an article in clicking
<a href="submissionArticle.htm">here</a>
or using the item menu.<br />
</div>
</c:when>
<c:otherwise>
<div id="articleList" class="dynamicFredList"> <div id="articleList" class="dynamicFredList">
<c:forEach var="article" items="${listArticle}" varStatus="i"> <c:forEach var="article" items="${listArticle}" varStatus="i">
@@ -48,9 +63,11 @@
</table> </table>
</div> </div>
</c:forEach> </c:forEach>
</div> </div>
</c:otherwise>
</c:choose>
</body> </body>
</html> </html>

45
YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp
View File

@@ -38,21 +38,56 @@
<b><fmt:message key="conference.detail.date.evaluation" /></b>&nbsp;<fmt:formatDate value="${conferenceReport.dateEvaluation }" dateStyle="long" /><br /> <b><fmt:message key="conference.detail.date.evaluation" /></b>&nbsp;<fmt:formatDate value="${conferenceReport.dateEvaluation }" dateStyle="long" /><br />
</div> </div>
<h3 class="descriptionTitle"></h3> <h3 class="dateTitle">Submission Informations</h3>
<div class="textBox">
<c:if test="${conferenceReport.pageNumber == 0}">
The number of pages for an article is undefined.<br/><br/>
</c:if>
<c:if test="${conferenceReport.pageNumber != 0}">
The number of pages for an article is about ${conferenceReport.pageNumber}.<br/><br/>
</c:if>
The following file's type are allowed:&nbsp;
<c:choose>
<c:when test="${conferenceReport.typePDF == true or conferenceReport.typeLatec == true or conferenceReport.typeWord == true or conferenceReport.typeODT == true}">
<c:if test="${conferenceReport.typePDF == true}">
.pdf&nbsp;
</c:if>
<c:if test="${conferenceReport.typeLatec == true}">
.tex&nbsp;
</c:if>
<c:if test="${conferenceReport.typeWord == true}">
.doc&nbsp;.docx&nbsp;
</c:if>
<c:if test="${conferenceReport.typeODT == true}">
.odt&nbsp;
</c:if>
</c:when>
<c:otherwise>
Any file's type.
</c:otherwise>
</c:choose>
<br /><br />
Other informations about the submission: ${conferenceReport.sendInfo}
</div>
<h3 class="descriptionTitle">Criterion</h3>
<div class="textBox"> <div class="textBox">
<c:if test="${not empty criterionReport}"> <c:if test="${not empty criterionReport}">
<b>Criterion's list </b><br /> <b>Criterion's list: </b><br />
</c:if> </c:if>
<c:forEach items="${criterionReport}" var="crit"> <c:forEach items="${criterionReport}" var="crit">
${crit.name} From ${crit.min_rating} to ${crit.max_rating}<br /> ${crit.name} From <b>${crit.min_rating}</b> to <b>${crit.max_rating}</b><br />
</c:forEach> </c:forEach>
</div> </div>
<h3 class="descriptionTitle"></h3> <h3 class="descriptionTitle">User</h3>
<div class="textBox"> <div class="textBox">
<b>Chairman:</b> ${conferenceReport.chairman.firstName} ${conferenceReport.chairman.lastName}<br /><br /> <b>Chairman:</b> ${conferenceReport.chairman.firstName} ${conferenceReport.chairman.lastName}<br /><br />
<c:if test="${not empty userReport}"> <c:if test="${not empty userReport}">
<b>PCmember's list </b><br /> <b>PCmember's list: </b><br />
</c:if> </c:if>
<c:forEach items="${userReport}" var="user"> <c:forEach items="${userReport}" var="user">
${user.firstName} ${user.lastName}<br /> ${user.firstName} ${user.lastName}<br />

14
YACOSWeb/WebContent/WEB-INF/jsp/submissionArticle.jsp
View File

@@ -38,17 +38,17 @@
<span class="info"><fmt:message key="form.field.necessary" /></span> <span class="info"><fmt:message key="form.field.necessary" /></span>
<div> <div>
<form:label path="title"><fmt:message key="form.submission.article.title" /></form:label> <form:label path="title"><fmt:message key="form.submission.article.title" /></form:label>
<form:input path="title"/>* * <form:input path="title"/>
<span class="formError"><form:errors path="title" /></span> <span class="formError"><form:errors path="title" /></span>
</div> </div>
<div> <div>
<form:label path="theme"><fmt:message key="form.submission.article.theme" /></form:label> <form:label path="theme"><fmt:message key="form.submission.article.theme" /></form:label>
<form:input path="theme"/>* * <form:input path="theme"/>
<span class="formError"><form:errors path="theme" /></span> <span class="formError"><form:errors path="theme" /></span>
</div> </div>
<div> <div>
<form:label path="abstractText"><fmt:message key="form.submission.article.abstractText" /></form:label> <form:label path="abstractText"><fmt:message key="form.submission.article.abstractText" /></form:label>
<form:textarea path="abstractText" cols="60" rows="10" />*<br /> * <form:textarea path="abstractText" cols="60" rows="10" />
<span class="formError"><form:errors path="abstractText" /></span> <span class="formError"><form:errors path="abstractText" /></span>
</div> </div>
</fieldset> </fieldset>
@@ -83,8 +83,14 @@
<fieldset> <fieldset>
<div> <div>
<c:if test="${currentConference.pageNumber != 0}">
<p class="formHelp">
Remember that the page's number of an article should be about ${currentConference.pageNumber}.
</p>
</c:if>
<form:label path="file"><fmt:message key="form.article.file" /></form:label> <form:label path="file"><fmt:message key="form.article.file" /></form:label>
<input type="file" name="file" />* * <input type="file" name="file" />
<span class="formError"><form:errors path="file" /></span> <span class="formError"><form:errors path="file" /></span>
</div> </div>
</fieldset> </fieldset>

47
YACOSWeb/WebContent/WEB-INF/jsp/userBoard.jsp
View File

@@ -76,6 +76,16 @@ function showArticleReferee() {
<a name="listConf"></a> <a name="listConf"></a>
<h3 class="descriptionTitle">Generals informations</h3> <h3 class="descriptionTitle">Generals informations</h3>
<div class="textBox"> <div class="textBox">
<c:choose>
<c:when test="${numberCreationTokens != 0}">
You can create <b>${numberCreationTokens}</b> conference(s). Click
<a href="addConference.htm">here</a> to create one now.<br /><br />
</c:when>
<c:otherwise>
You can't create a conference at the moment. If you want to create a conference, you should address to the <a href="mailto:admin@yacos.org">administrator</a> of this site.<br /><br />
</c:otherwise>
</c:choose>
You currently follow <b>${numberConference}</b> conference(s)<br /><br /> You currently follow <b>${numberConference}</b> conference(s)<br /><br />
<c:if test="${not empty listConfForUser}"> <c:if test="${not empty listConfForUser}">
@@ -129,7 +139,7 @@ function showArticleReferee() {
<a name="listArticleAuthor"></a> <a name="listArticleAuthor"></a>
You have posted <b>${numberArticle}</b> article(s).<br /><br /> You have posted <b>${numberArticle}</b> article(s).<br /><br />
<c:if test="${not empty listConfForUser}"> <c:if test="${not empty listAllArticle}">
If you want to see the list of articles you have submitted, click <a href="#listArticleAuthor" onclick="showArticleAll();">here</a>. If you want to see the list of articles you have submitted, click <a href="#listArticleAuthor" onclick="showArticleAll();">here</a>.
@@ -197,7 +207,9 @@ function showArticleReferee() {
</c:if> </c:if>
<a name="listArticleReferee"></a> <a name="listArticleReferee"></a>
You have <b>${numberArticleReferee}</b> article(s) in your evaluation list.<br /><br /> You have <b>${numberArticleReferee}</b> article(s) in your evaluation list.<br />
You have evaluated <b>${numberEvaluatedReferee}</b> article(s)<br />
You have to evaluate <b>${numberNotEvaluatedReferee}</b> article(s)<br /><br />
<c:if test="${not empty listArticleReferee}"> <c:if test="${not empty listArticleReferee}">
If you want to see the list of articles you have in your evaluation list, click <a href="#listArticleReferee" onclick="showArticleReferee();">here</a>. If you want to see the list of articles you have in your evaluation list, click <a href="#listArticleReferee" onclick="showArticleReferee();">here</a>.
@@ -210,12 +222,16 @@ function showArticleReferee() {
<tr> <tr>
<td align="center" width="25%">${article.title}</td> <td align="center" width="25%">${article.title}</td>
<td align="center" width="25%"> <td align="center" width="25%">
<c:if test="${article.state == 'SUBMITED'}"> <c:if test="${article.evaluated == false}">
<c:if test="${article.state != 'REJECTED' and article.state != 'ACCEPTED'}">
To evaluate To evaluate
</c:if> </c:if>
<c:if test="${article.state == 'EVALUATED'}"> </c:if>
<c:if test="${article.evaluated == true}">
<c:if test="${article.state != 'REJECTED' and article.state != 'ACCEPTED'}">
Evaluated Evaluated
</c:if> </c:if>
</c:if>
<c:if test="${article.state == 'REJECTED'}"> <c:if test="${article.state == 'REJECTED'}">
Rejected Rejected
</c:if> </c:if>
@@ -268,7 +284,9 @@ function showArticleReferee() {
<a name="listArticlePcMember"></a> <a name="listArticlePcMember"></a>
You have <b>${numberArticlePCMember}</b> article(s) in your evaluation list.<br /><br /> You have <b>${numberArticlePCMember}</b> article(s) in your evaluation list.<br />
You have evaluated <b>${numberEvaluatedPCMember}</b> article(s)<br />
You have to evaluate <b>${numberNotEvaluatedPCMember}</b> article(s)<br /><br />
<c:if test="${not empty listArticlePCMember}"> <c:if test="${not empty listArticlePCMember}">
If you want to see the list of articles you have in your evaluation list, click <a href="#listArticlePcMember" onclick="showArticlePcMember();">here</a>. If you want to see the list of articles you have in your evaluation list, click <a href="#listArticlePcMember" onclick="showArticlePcMember();">here</a>.
@@ -289,12 +307,16 @@ function showArticleReferee() {
</c:forEach> </c:forEach>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:if test="${article.state == 'SUBMITED'}"> <c:if test="${article.evaluated == false}">
<c:if test="${article.state != 'REJECTED' and article.state != 'ACCEPTED'}">
To evaluate To evaluate
</c:if> </c:if>
<c:if test="${article.state == 'EVALUATED'}"> </c:if>
<c:if test="${article.evaluated == true}">
<c:if test="${article.state != 'REJECTED' and article.state != 'ACCEPTED'}">
Evaluated Evaluated
</c:if> </c:if>
</c:if>
<c:if test="${article.state == 'REJECTED'}"> <c:if test="${article.state == 'REJECTED'}">
Rejected Rejected
</c:if> </c:if>
@@ -324,19 +346,8 @@ function showArticleReferee() {
<div class="textBox"> <div class="textBox">
You are Chairman in <b>${numberChairman}</b> conference(s)<br /><br /> You are Chairman in <b>${numberChairman}</b> conference(s)<br /><br />
<c:choose>
<c:when test="${numberCreationTokens} != 0">
You can create <b>${numberCreationTokens}</b> conference(s). Click
<a href="addConference.htm">here</a> to create one now.
</c:when>
<c:otherwise>
You can't create a conference at the moment. If you want to create a conference, you should address to the <a href="mailto:admin@yacos.org">administrator</a> of this site.
</c:otherwise>
</c:choose>
<a name="listConfChairman"></a> <a name="listConfChairman"></a>
<c:if test="${not empty listConfForUser}"> <c:if test="${not empty listConfForUser}">
<br /><br />
If you want to see the list of conferences you are registered in, click <a href="#listConfChairman" onclick="showConfChairman();">here</a>. If you want to see the list of conferences you are registered in, click <a href="#listConfChairman" onclick="showConfChairman();">here</a>.

8
YACOSWeb/src/org/yacos/web/PCmember/controller/ListEvaluationController.java
View File

@@ -18,6 +18,7 @@ import org.yacos.core.conferences.Conference;
import org.yacos.core.evaluation.IEvaluationManager; import org.yacos.core.evaluation.IEvaluationManager;
import org.yacos.core.evaluation.Report; import org.yacos.core.evaluation.Report;
import org.yacos.core.users.IUserManager; import org.yacos.core.users.IUserManager;
import org.yacos.core.users.User;
import org.yacos.core.users.Role.RoleType; import org.yacos.core.users.Role.RoleType;
import org.yacos.web.PCmember.form.EvaluationArticleBean; import org.yacos.web.PCmember.form.EvaluationArticleBean;
import org.yacos.web.system.controller.NoConferenceSelectedException; import org.yacos.web.system.controller.NoConferenceSelectedException;
@@ -86,6 +87,13 @@ public class ListEvaluationController extends SimpleFormController {
else { else {
eab.setEvaluated(true); eab.setEvaluated(true);
} }
List<User> referee = userManager.getRefereesOfPcMemberForArticle(SessionService.getInstance().getCurrentUserLogin(), a.getId());
if (referee != null)
eab.setReferee(referee);
else
eab.setReferee(null);
listArticleBean.add(eab); listArticleBean.add(eab);
} }

10
YACOSWeb/src/org/yacos/web/PCmember/form/EvaluationArticleBean.java
View File

@@ -1,12 +1,22 @@
package org.yacos.web.PCmember.form; package org.yacos.web.PCmember.form;
import java.util.List;
import org.yacos.core.article.Article; import org.yacos.core.article.Article;
import org.yacos.core.users.User;
public class EvaluationArticleBean { public class EvaluationArticleBean {
private Article article; private Article article;
private boolean evaluated; private boolean evaluated;
private List<User> referee;
public List<User> getReferee() {
return referee;
}
public void setReferee(List<User> referee) {
this.referee = referee;
}
public Article getArticle() { public Article getArticle() {
return article; return article;
} }

3
YACOSWeb/src/org/yacos/web/author/controller/ArticleDeleteController.java
View File

@@ -35,13 +35,12 @@ public class ArticleDeleteController implements Controller {
articleManager.removeArticle(articleId); articleManager.removeArticle(articleId);
} }
catch(NumberFormatException e) { catch(NumberFormatException e) {
throw new ModelAndViewDefiningException(new ModelAndView("404error")); throw new ModelAndViewDefiningException(new ModelAndView("404error"));
} }
return new ModelAndView(new RedirectView("manageArticle.htm")); return new ModelAndView(new RedirectView("manageArticle.htm?delete=ok"));
} }
} }

4
YACOSWeb/src/org/yacos/web/system/controller/ListConferenceController.java
View File

@@ -1,12 +1,9 @@
package org.yacos.web.system.controller; package org.yacos.web.system.controller;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
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;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
@@ -65,7 +62,6 @@ public class ListConferenceController implements Controller{
model.put("ac", msgAccount); model.put("ac", msgAccount);
} }
return new ModelAndView("listConference", model); return new ModelAndView("listConference", model);
} }
} }

44
YACOSWeb/src/org/yacos/web/system/controller/UserBoardController.java
View File

@@ -15,9 +15,11 @@ import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.SimpleFormController; import org.springframework.web.servlet.mvc.SimpleFormController;
import org.yacos.core.article.Article; import org.yacos.core.article.Article;
import org.yacos.core.article.IArticleManager; import org.yacos.core.article.IArticleManager;
import org.yacos.core.article.Article.State;
import org.yacos.core.conferences.Conference; import org.yacos.core.conferences.Conference;
import org.yacos.core.conferences.IConferenceManager; import org.yacos.core.conferences.IConferenceManager;
import org.yacos.core.evaluation.IEvaluationManager; import org.yacos.core.evaluation.IEvaluationManager;
import org.yacos.core.evaluation.Report;
import org.yacos.core.users.IUserManager; import org.yacos.core.users.IUserManager;
import org.yacos.core.users.Role; import org.yacos.core.users.Role;
import org.yacos.core.users.User; import org.yacos.core.users.User;
@@ -119,15 +121,6 @@ public class UserBoardController extends SimpleFormController {
listAllArticleBean.add(ab); listAllArticleBean.add(ab);
} }
//Map<Integer, Object> listConfForArticle = new HashMap<Integer, Object>();
/*List<Conference> listConfForArticle = new ArrayList<Conference>();
for (Article a : listAllArticle) {
listConfForArticle.add(articleManager.getConferenceForArticle(a.getId()));
}
model.put("listConfForArticle", listConfForArticle);*/
model.put("numberArticle", numberArticle); model.put("numberArticle", numberArticle);
model.put("listAllArticle", listAllArticleBean); model.put("listAllArticle", listAllArticleBean);
@@ -144,6 +137,9 @@ public class UserBoardController extends SimpleFormController {
List<UserBoardArticleBean> listArticleRefereeBean = new ArrayList<UserBoardArticleBean>(); List<UserBoardArticleBean> listArticleRefereeBean = new ArrayList<UserBoardArticleBean>();
List<Conference> listConfPCMember = new ArrayList<Conference>(); List<Conference> listConfPCMember = new ArrayList<Conference>();
Integer numberEvaluatedPCMember = 0;
Integer numberNotEvaluatedPCMember = 0;
for (Conference c : listConfForUser) { for (Conference c : listConfForUser) {
if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.PCMEMBER, c.getId())) if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.PCMEMBER, c.getId()))
listConfPCMember.add(c); listConfPCMember.add(c);
@@ -168,13 +164,39 @@ public class UserBoardController extends SimpleFormController {
ab.setReferee(referee); ab.setReferee(referee);
else else
ab.setReferee(null); ab.setReferee(null);
Report rpt = evaluationManager.getReportforArticleAndReferee(a.getId(), SessionService.getInstance().getCurrentUserLogin());
if (rpt == null) {
ab.setEvaluated(false);
if (! a.getState().equals(State.ACCEPTED) && ! a.getState().equals(State.REJECTED))
numberNotEvaluatedPCMember++;
}
else {
ab.setEvaluated(true);
numberEvaluatedPCMember++;
}
listArticlePCMemberBean.add(ab); listArticlePCMemberBean.add(ab);
} }
listArticleReferee = articleManager.getArticlesOfReferee(SessionService.getInstance().getCurrentUserLogin()); listArticleReferee = articleManager.getArticlesOfReferee(SessionService.getInstance().getCurrentUserLogin());
Integer numberEvaluatedReferee = 0;
Integer numberNotEvaluatedReferee = 0;
for (Article a : listArticleReferee) { for (Article a : listArticleReferee) {
UserBoardArticleBean ab = new UserBoardArticleBean(); UserBoardArticleBean ab = new UserBoardArticleBean();
Report rpt = evaluationManager.getReportforArticleAndReferee(a.getId(), SessionService.getInstance().getCurrentUserLogin());
if (rpt == null) {
ab.setEvaluated(false);
if (! a.getState().equals(State.ACCEPTED) && ! a.getState().equals(State.REJECTED))
numberNotEvaluatedReferee++;
}
else {
ab.setEvaluated(true);
numberEvaluatedReferee++;
}
ab.setAbstractText(a.getAbstractText()); ab.setAbstractText(a.getAbstractText());
ab.setTitle(a.getTitle()); ab.setTitle(a.getTitle());
ab.setTopic(a.getTopic()); ab.setTopic(a.getTopic());
@@ -186,6 +208,10 @@ public class UserBoardController extends SimpleFormController {
listArticleRefereeBean.add(ab); listArticleRefereeBean.add(ab);
} }
model.put("numberEvaluatedReferee", numberEvaluatedReferee);
model.put("numberNotEvaluatedReferee", numberNotEvaluatedReferee);
model.put("numberEvaluatedPCMember", numberEvaluatedPCMember);
model.put("numberNotEvaluatedPCMember", numberNotEvaluatedPCMember);
model.put("listArticlePCMember", listArticlePCMemberBean); model.put("listArticlePCMember", listArticlePCMemberBean);
model.put("numberArticlePCMember", listArticlePCMember.size()); model.put("numberArticlePCMember", listArticlePCMember.size());
model.put("listArticleReferee", listArticleRefereeBean); model.put("listArticleReferee", listArticleRefereeBean);

7
YACOSWeb/src/org/yacos/web/system/form/UserBoardArticleBean.java
View File

@@ -22,6 +22,7 @@ public class UserBoardArticleBean {
private List<User> referee; private List<User> referee;
private List<Preference> preferences; private List<Preference> preferences;
private List<Report> report; private List<Report> report;
private boolean evaluated;
private State state; private State state;
@@ -103,4 +104,10 @@ public class UserBoardArticleBean {
public void setReferee(List<User> referee) { public void setReferee(List<User> referee) {
this.referee = referee; this.referee = referee;
} }
public boolean isEvaluated() {
return evaluated;
}
public void setEvaluated(boolean evaluated) {
this.evaluated = evaluated;
}
} }