Skip to content

Codecrew / Moya

Go to a project
Commit 66de2075 by Tuukka Kivilahti
Options

hyvin härö bugi calendariin ja tietokantaan liittyen

1 parent 40fac604
Inline Side-by-side
Showing with 21 additions and 11 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/LectureBean.java
...@@ -8,6 +8,9 @@ import javax.annotation.security.RolesAllowed; ...@@ -8,6 +8,9 @@ import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.enums.apps.LecturePermission; import fi.codecrew.moya.enums.apps.LecturePermission;
import fi.codecrew.moya.facade.EventUserFacade; import fi.codecrew.moya.facade.EventUserFacade;
import fi.codecrew.moya.facade.LectureFacade; import fi.codecrew.moya.facade.LectureFacade;
...@@ -24,6 +27,8 @@ import fi.codecrew.moya.model.Role; ...@@ -24,6 +27,8 @@ import fi.codecrew.moya.model.Role;
@DeclareRoles({ LecturePermission.S_VIEW, LecturePermission.S_MANAGE }) @DeclareRoles({ LecturePermission.S_VIEW, LecturePermission.S_MANAGE })
public class LectureBean implements LectureBeanLocal { public class LectureBean implements LectureBeanLocal {
private static final Logger logger = LoggerFactory.getLogger(LectureBean.class);
@EJB @EJB
LectureFacade lectureFacade; LectureFacade lectureFacade;
@EJB @EJB
...@@ -92,6 +97,7 @@ public class LectureBean implements LectureBeanLocal { ...@@ -92,6 +97,7 @@ public class LectureBean implements LectureBeanLocal {
} else { } else {
lecture = lectureFacade.merge(lecture); lecture = lectureFacade.merge(lecture);
} }
return lecture; return lecture;
} }
......
code/MoyaDatabase/src/fi/codecrew/moya/model/Lecture.java
...@@ -7,6 +7,7 @@ package fi.codecrew.moya.model; ...@@ -7,6 +7,7 @@ package fi.codecrew.moya.model;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.Column; import javax.persistence.Column;
...@@ -63,7 +64,7 @@ public class Lecture extends GenericEntity { ...@@ -63,7 +64,7 @@ public class Lecture extends GenericEntity {
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@Column(name = "start_time") @Column(name = "start_time")
private Calendar startTime; private Date startTime;
@Column(name = "hours", precision = 10, scale = 2) @Column(name = "hours", precision = 10, scale = 2)
private BigDecimal hours; private BigDecimal hours;
...@@ -133,17 +134,19 @@ public class Lecture extends GenericEntity { ...@@ -133,17 +134,19 @@ public class Lecture extends GenericEntity {
this.maxParticipantsCount = maxParticipantsCount; this.maxParticipantsCount = maxParticipantsCount;
} }
public Calendar getStartTime() { public Date getStartTime() {
if (startTime == null) { if (startTime == null) {
startTime = Calendar.getInstance(); startTime = new Date();
} }
return startTime; return startTime;
} }
public void setStartTime(Calendar startTime) { public void setStartTime(Date startTime) {
this.startTime = startTime; this.startTime = startTime;
} }
/*
@Transient
public Calendar getEndTime() { public Calendar getEndTime() {
if (getStartTime() == null || getHours() == null) if (getStartTime() == null || getHours() == null)
...@@ -155,7 +158,8 @@ public class Lecture extends GenericEntity { ...@@ -155,7 +158,8 @@ public class Lecture extends GenericEntity {
return endTime; return endTime;
} }
@Transient
public void setEndTime(Calendar endTime) { public void setEndTime(Calendar endTime) {
if (endTime == null || getStartTime() == null) { if (endTime == null || getStartTime() == null) {
...@@ -163,7 +167,7 @@ public class Lecture extends GenericEntity { ...@@ -163,7 +167,7 @@ public class Lecture extends GenericEntity {
} }
setHours(new BigDecimal((int) endTime.compareTo(getStartTime()) / 1000 / 60 / 60)); setHours(new BigDecimal((int) endTime.compareTo(getStartTime()) / 1000 / 60 / 60));
} }*/
public BigDecimal getHours() { public BigDecimal getHours() {
return hours; return hours;
...@@ -184,7 +188,7 @@ public class Lecture extends GenericEntity { ...@@ -184,7 +188,7 @@ public class Lecture extends GenericEntity {
newLecture.setName(getName()); newLecture.setName(getName());
newLecture.setHours(getHours()); newLecture.setHours(getHours());
newLecture.setMaxParticipantsCount(getMaxParticipantsCount()); newLecture.setMaxParticipantsCount(getMaxParticipantsCount());
newLecture.setStartTime( (Calendar) getStartTime().clone()); newLecture.setStartTime( (Date) getStartTime().clone());
newLecture.setOpenForRoles(new ArrayList<Role>(getOpenForRoles())); newLecture.setOpenForRoles(new ArrayList<Role>(getOpenForRoles()));
return newLecture; return newLecture;
......
code/MoyaWeb/WebContent/lectureadmin/manageLectures.xhtml
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</p:column> </p:column>
<p:column headerText="#{i18n['lecture.startTime']}"> <p:column headerText="#{i18n['lecture.startTime']}">
<h:outputText value="#{lecture.startTime.time}"> <h:outputText value="#{lecture.startTime}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<p:inputText value="#{lectureView.currentLecture.maxParticipantsCount}" /> <p:inputText value="#{lectureView.currentLecture.maxParticipantsCount}" />
<p:outputLabel value="#{i18n['lecture.startTime']}" /> <p:outputLabel value="#{i18n['lecture.startTime']}" />
<p:calendar value="#{lectureView.currentLecture.startTime.time}" pattern="#{sessionHandler.datetimeFormat}" showOn="button" /> <p:calendar value="#{lectureView.currentLecture.startTime}" pattern="#{sessionHandler.datetimeFormat}" showOn="button" />
<p:outputLabel value="#{i18n['lecture.hours']}" /> <p:outputLabel value="#{i18n['lecture.hours']}" />
<p:inputText value="#{lectureView.currentLecture.hours}" /> <p:inputText value="#{lectureView.currentLecture.hours}" />
......
code/MoyaWeb/WebContent/lectures/viewLectures.xhtml
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<h:outputText value="#{lecture.hours}" /> <h:outputText value="#{lecture.hours}" />
</p:column> </p:column>
<p:column headerText="#{i18n['lecture.startTime']}"> <p:column headerText="#{i18n['lecture.startTime']}">
<h:outputText value="#{lecture.startTime.time}"> <h:outputText value="#{lecture.startTime}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<h:outputText value="#{lecture.hours}" /> <h:outputText value="#{lecture.hours}" />
</p:column> </p:column>
<p:column headerText="#{i18n['lecture.startTime']}"> <p:column headerText="#{i18n['lecture.startTime']}">
<h:outputText value="#{lecture.startTime.time}"> <h:outputText value="#{lecture.startTime}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!