diff --git a/YACOSCore/ejbModule/org/yacos/core/article/ArticleManagerBean.java b/YACOSCore/ejbModule/org/yacos/core/article/ArticleManagerBean.java index 156bc5f..0cefee6 100644 --- a/YACOSCore/ejbModule/org/yacos/core/article/ArticleManagerBean.java +++ b/YACOSCore/ejbModule/org/yacos/core/article/ArticleManagerBean.java @@ -68,7 +68,6 @@ public class ArticleManagerBean implements IArticleManager, Serializable { ut.rollback(); e.printStackTrace(); } catch (Exception e1) { - // TODO Auto-generated catch block e1.printStackTrace(); } } diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java b/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java index 523e091..0fdd18b 100644 --- a/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java +++ b/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java @@ -15,6 +15,7 @@ import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.Temporal; import javax.persistence.TemporalType; +import javax.persistence.Transient; import org.yacos.core.article.Article; import org.yacos.core.evaluation.Criterion; @@ -24,8 +25,11 @@ import org.yacos.core.users.User; @Entity public class Conference implements Serializable{ + private static final long serialVersionUID = 7278920769049538175L; - private static final long serialVersionUID = 1L; + public enum Phase { + CALL_FOR_PAPER, ARTICLE_EVALUATION, PROGRAM_VALIDATED, PAST + }; @Id @GeneratedValue(strategy=GenerationType.AUTO) @@ -201,5 +205,27 @@ public class Conference implements Serializable{ public void setCriterions(List criterions) { this.criterions = criterions; } + + /** + * Gets the current phase of the conference programmation + * Phase.CALL_FOR_PAPER : Before the submission deadline + * Phase.ARTICLE_EVALUATION : Before the evaluation deadline + * Phase.PROGRAM_VALIDATED : Before the end of the conference + * Phase.PAST : After the end of the conference + * @return + */ + @Transient + public Phase getCurrentPhase() { + Date currentDate = new Date(); + if(currentDate.before(this.dateArticle)){ + return Phase.CALL_FOR_PAPER; + } else if(currentDate.before(this.dateEvaluation)){ + return Phase.ARTICLE_EVALUATION; + } else if(currentDate.before(this.dateEnd)){ + return Phase.PROGRAM_VALIDATED; + } else { + return Phase.PAST; + } + } } diff --git a/YACOSCore/ejbModule/org/yacos/core/users/IUserManager.java b/YACOSCore/ejbModule/org/yacos/core/users/IUserManager.java index 154aa15..7fcc222 100644 --- a/YACOSCore/ejbModule/org/yacos/core/users/IUserManager.java +++ b/YACOSCore/ejbModule/org/yacos/core/users/IUserManager.java @@ -1,10 +1,7 @@ package org.yacos.core.users; import java.util.List; - import javax.ejb.Remote; - -import org.yacos.core.exceptions.NoConferenceCreationTokenLeftException; import org.yacos.core.exceptions.PKAlreadyUsedException; import org.yacos.core.exceptions.UserEMailAlreadyExistsException; import org.yacos.core.system.InvitationToken;