diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java b/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java index 0fdd18b..1f8db21 100644 --- a/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java +++ b/YACOSCore/ejbModule/org/yacos/core/conferences/Conference.java @@ -48,6 +48,13 @@ public class Conference implements Serializable{ @Temporal(TemporalType.DATE) private Date dateEnd; + private Integer pageNumber; + private boolean typePDF; + private boolean typeLatec; + private boolean typeWord; + private boolean typeODT; + private String sendInfo; + /** * Roles of users for this conference */ @@ -155,16 +162,23 @@ public class Conference implements Serializable{ this.roles = new ArrayList(); } - public Conference(String titre, String descirption, String infoComplementray, Date dateAbstract, Date dateArticle, Date dateEvaluation, Date dateStart, Date dateEnd) { + public Conference(String titre, String description, String infoComplementray, Date dateAbstract, Date dateArticle, Date dateEvaluation, Date dateStart, Date dateEnd, + Integer pageNumber, boolean typePDF, boolean typeLatec, boolean typeWord, boolean typeODT, String sendInfo) { this(); this.title = titre; - this.description = descirption; + this.description = description; this.otherInformations = infoComplementray; this.dateAbstract = dateAbstract; this.dateArticle = dateArticle; this.dateEvaluation = dateEvaluation; this.dateStart = dateStart; this.dateEnd = dateEnd; + this.pageNumber = pageNumber; + this.typePDF = typePDF; + this.typeLatec = typeLatec; + this.typeWord = typeWord; + this.typeODT = typeODT; + this.sendInfo = sendInfo; } /* @@ -228,4 +242,52 @@ public class Conference implements Serializable{ } } + public Integer getPageNumber() { + return pageNumber; + } + + public void setPageNumber(Integer pageNumber) { + this.pageNumber = pageNumber; + } + + public boolean isTypePDF() { + return typePDF; + } + + public void setTypePDF(boolean typePDF) { + this.typePDF = typePDF; + } + + public boolean isTypeLatec() { + return typeLatec; + } + + public void setTypeLatec(boolean typeLatec) { + this.typeLatec = typeLatec; + } + + public boolean isTypeWord() { + return typeWord; + } + + public void setTypeWord(boolean typeWord) { + this.typeWord = typeWord; + } + + public boolean isTypeODT() { + return typeODT; + } + + public void setTypeODT(boolean typeODT) { + this.typeODT = typeODT; + } + + public String getSendInfo() { + return sendInfo; + } + + public void setSendInfo(String sendInfo) { + this.sendInfo = sendInfo; + } + } diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java b/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java index bfb5748..2e99278 100644 --- a/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java +++ b/YACOSCore/ejbModule/org/yacos/core/conferences/ConferenceManagerBean.java @@ -39,8 +39,15 @@ public class ConferenceManagerBean implements IConferenceManager { Date dateArticle, Date dateEvaluation, Date dateStart, - Date dateEnd) throws NoConferenceCreationTokenLeftException { - Conference conf = new Conference(titre, description, complementaryInfo, dataAbstract, dateArticle, dateEvaluation, dateStart, dateEnd); + Date dateEnd, + Integer pageNumber, + boolean typePDF, + boolean typeLatec, + boolean typeWord, + boolean typeODT, + String sendInfo) throws NoConferenceCreationTokenLeftException { + Conference conf = new Conference(titre, description, complementaryInfo, dataAbstract, dateArticle, dateEvaluation, dateStart, dateEnd, pageNumber, typePDF, + typeLatec, typeWord, typeODT, sendInfo); if( ! canCreateConference(chairmanLogin)){ throw new NoConferenceCreationTokenLeftException(); } @@ -93,6 +100,12 @@ public class ConferenceManagerBean implements IConferenceManager { persistedConf.setDateStart(conf.getDateStart()); persistedConf.setOtherInformations(conf.getOtherInformations()); persistedConf.setTitle(conf.getTitle()); + persistedConf.setPageNumber(conf.getPageNumber()); + persistedConf.setTypePDF(conf.isTypePDF()); + persistedConf.setTypeLatec(conf.isTypeLatec()); + persistedConf.setTypeWord(conf.isTypeWord()); + persistedConf.setTypeODT(conf.isTypeODT()); + persistedConf.setSendInfo(conf.getSendInfo()); ut.commit(); } catch (Exception e) { try { diff --git a/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java b/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java index 70344e9..289b5d4 100644 --- a/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java +++ b/YACOSCore/ejbModule/org/yacos/core/conferences/IConferenceManager.java @@ -27,7 +27,13 @@ public interface IConferenceManager { Date dateArticle, Date dateEvaluation, Date dateStart, - Date dateEnd) throws NoConferenceCreationTokenLeftException; + Date dateEnd, + Integer pageNumber, + boolean typePDF, + boolean typeLatec, + boolean typeWord, + boolean typeODT, + String sendInfo) throws NoConferenceCreationTokenLeftException; public Conference getConference(Integer id); public void addCriterionToConference(Integer conferenceId,String name,Integer minRating, Integer maxRating); public void removeCriterionToConference(Integer conferenceId);