Skip to content

Riina Antikainen / Moya

Go to a project
Commit 5c776ce2 by Tuukka Kivilahti
Options

lecturemanagement almost ready

1 parent 823f1edd
Inline Side-by-side
Showing with 123 additions and 11 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/LectureBean.java
...@@ -59,4 +59,25 @@ public class LectureBean implements LectureBeanLocal { ...@@ -59,4 +59,25 @@ public class LectureBean implements LectureBeanLocal {
return lectureGroupFacade.find(id); return lectureGroupFacade.find(id);
} }
@Override
public Lecture saveLecture(Lecture lecture) {
if(lecture == null || lecture.getLectureGroup() == null) {
throw new NullPointerException("Lecture must be in some lecturegroup!");
}
if(lecture.getId() == null) {
lecture = lectureFacade.create(lecture);
if(!lecture.getLectureGroup().getLectures().contains(lecture))
lecture.getLectureGroup().getLectures().add(lecture);
} else {
lecture = lectureFacade.merge(lecture);
}
return lecture;
}
} }
code/MoyaDatabase/src/fi/codecrew/moya/model/Lecture.java
...@@ -139,6 +139,9 @@ public class Lecture extends GenericEntity { ...@@ -139,6 +139,9 @@ public class Lecture extends GenericEntity {
} }
public Calendar getStartTime() { public Calendar getStartTime() {
if(startTime == null) {
startTime = Calendar.getInstance();
}
return startTime; return startTime;
} }
......
code/MoyaWeb/WebContent/lectureadmin/manageLectureGroups.xhtml
...@@ -28,9 +28,7 @@ ...@@ -28,9 +28,7 @@
<p:column> <p:column>
<p:commandButton value="#{i18n['edit']}" actionListener="#{lectureGroupView.editCurrent}" update=":managelecturegroups:editcreate" /> <p:commandButton value="#{i18n['edit']}" actionListener="#{lectureGroupView.editCurrent}" update=":managelecturegroups:editcreate" />
</p:column> </p:column>
<p:column>
<p:commandButton value="#{i18n['lectureGroup.manageLectures']}" actionListener="#{lectureGroupView.editCurrent}" update=":managelecturegroups:editcreate" />
</p:column>
<p:column> <p:column>
<h:link outcome="/lectureadmin/manageLectures" value="#{i18n['lectureGroup.manageLectures']}"> <h:link outcome="/lectureadmin/manageLectures" value="#{i18n['lectureGroup.manageLectures']}">
<f:param name="lecturegroupid" value="#{lectureGroup.id}" /> <f:param name="lecturegroupid" value="#{lectureGroup.id}" />
......
code/MoyaWeb/WebContent/lectureadmin/manageLectures.xhtml
...@@ -23,21 +23,21 @@ ...@@ -23,21 +23,21 @@
<p:column headerText="#{i18n['lecture.description']}"> <p:column headerText="#{i18n['lecture.description']}">
<h:outputText value="#{lecture.description}" /> <h:outputText value="#{lecture.description}" />
</p:column> </p:column>
<p:column headerText="#{i18n['lecture.maxParticipantsCount}']}"> <p:column headerText="#{i18n['lecture.maxParticipantsCount']}">
<h:outputText value="#{lecture.maxParticipantsCount}}" /> <h:outputText value="#{lecture.maxParticipantsCount}" />
</p:column> </p:column>
<p:column headerText="#{i18n['lecture.hours']}"> <p:column headerText="#{i18n['lecture.hours']}">
<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}"> <h:outputText value="#{lecture.startTime.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column> <p:column>
<p:commandButton value="#{i18n['edit']}" actionListener="#{lectureGroupView.editCurrent}" update=":managelectures:editcreate" /> <p:commandButton value="#{i18n['edit']}" actionListener="#{lectureView.editCurrent}" update=":managelectures:editcreate" />
</p:column> </p:column>
</p:dataTable> </p:dataTable>
</p:fieldset> </p:fieldset>
...@@ -54,13 +54,17 @@ ...@@ -54,13 +54,17 @@
<p:outputLabel value="#{i18n['lecture.description']}" /> <p:outputLabel value="#{i18n['lecture.description']}" />
<p:inputTextarea value="#{lectureView.currentLecture.description}" /> <p:inputTextarea value="#{lectureView.currentLecture.description}" />
<p:outputLabel value="#{i18n['lecture.maxParticipantsCount}']}" /> <p:outputLabel value="#{i18n['lecture.maxParticipantsCount']}" />
<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}" pattern="#{sessionHandler.datetimeFormat}" showOn="button" /> <p:calendar value="#{lectureView.currentLecture.startTime.time}" pattern="#{sessionHandler.datetimeFormat}" showOn="button" />
<p:outputLabel value="#{i18n['lecture.roles}']}" /> <p:outputLabel value="#{i18n['lecture.hours']}" />
<p:inputText value="#{lectureView.currentLecture.hours}" />
<p:outputLabel value="#{i18n['lecture.roles']}" />
<h:selectManyCheckbox converter="#{roleConverter}" layout="pageDirection" id="roles" value="#{lectureView.currentLecture.openForRoles}"> <h:selectManyCheckbox converter="#{roleConverter}" layout="pageDirection" id="roles" value="#{lectureView.currentLecture.openForRoles}">
<f:selectItems var="roleitem" itemLabel="#{roleitem.name}" value="#{roleDataView.roles}" /> <f:selectItems var="roleitem" itemLabel="#{roleitem.name}" value="#{roleDataView.roles}" />
</h:selectManyCheckbox> </h:selectManyCheckbox>
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
...@@ -119,6 +119,11 @@ code.inputfield = Sy\u00F6t\u00E4 viivakoodi ...@@ -119,6 +119,11 @@ code.inputfield = Sy\u00F6t\u00E4 viivakoodi
delete = Poista delete = Poista
create = Luo
edit = Muokkaa
error = Virhe error = Virhe
...@@ -199,7 +204,25 @@ lanEventProperty.defaultValue = Default value ...@@ -199,7 +204,25 @@ lanEventProperty.defaultValue = Default value
lanEventProperty.save = Save lanEventProperty.save = Save
lanEventProperty.textValue = Text value lanEventProperty.textValue = Text value
lecture.createLecture = Uuden tiedot
lecture.createNew = Luo uusi
lecture.description = Kuvaus
lecture.hours = Kesto, tunteja
lecture.maxParticipantsCount = Max. osallistujia
lecture.name = Nimi
lecture.roles = Roolit
lecture.saveLecture = Muokkaa
lecture.startTime = Aloitusaika
lectureGroup.createLectureGroup = Luo luetokokonaisuus
lectureGroup.createNew = Luo uusi
lectureGroup.description = Kuvaus
lectureGroup.manageLectures = Hallitse luentoja
lectureGroup.name = Nimi
lectureGroup.selectCount = Montako kurssia saa valita
lecturegroup.create.success = Kurssiryhm\u00E4 luotu onnistuneesti. lecturegroup.create.success = Kurssiryhm\u00E4 luotu onnistuneesti.
lecturegroup.list.title = Luennot
lecturegroup.save.success = Kurssiryhm\u00E4 tallennettu onnistuneesti. lecturegroup.save.success = Kurssiryhm\u00E4 tallennettu onnistuneesti.
login.login = Login login.login = Login
...@@ -267,6 +290,8 @@ resetMail.username = Username ...@@ -267,6 +290,8 @@ resetMail.username = Username
resetmailSent.body = Email has been sent containing a link where you can change the password. resetmailSent.body = Email has been sent containing a link where you can change the password.
resetmailSent.header = Email sent resetmailSent.header = Email sent
save = Tallenna
submenu.NotImplementedYet = Not implemented submenu.NotImplementedYet = Not implemented
submenu.admin.adduser = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys submenu.admin.adduser = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
submenu.admin.adduser.index = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys submenu.admin.adduser.index = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
...@@ -284,8 +284,12 @@ compofile.uploadTime = Upload time ...@@ -284,8 +284,12 @@ compofile.uploadTime = Upload time
content.showContentEditLinks = Show content edit links content.showContentEditLinks = Show content edit links
delete = Delete delete = Delete
create = Create
discount.active = Active discount.active = Active
discount.amountMax = Max amount discount.amountMax = Max amount
discount.amountMin = Min amount discount.amountMin = Min amount
...@@ -303,6 +307,8 @@ discount.shortdesc = Description ...@@ -303,6 +307,8 @@ discount.shortdesc = Description
discount.validFrom = Valid from discount.validFrom = Valid from
discount.validTo = Valid to discount.validTo = Valid to
edit = Edit
editplace.header = Edit place editplace.header = Edit place
editplace.placegroup.title = Placegroup editplace.placegroup.title = Placegroup
...@@ -549,7 +555,25 @@ layout.editBottom = Edit bottom content ...@@ -549,7 +555,25 @@ layout.editBottom = Edit bottom content
layout.editContent = Edit center layout.editContent = Edit center
layout.editTop = Edit topcontent layout.editTop = Edit topcontent
lecture.createLecture = New lecture
lecture.createNew = Create new
lecture.description = Description
lecture.hours = Duration hours
lecture.maxParticipantsCount = Max participants
lecture.name = Name
lecture.roles = Roles
lecture.saveLecture = Edit
lecture.startTime = Start time
lectureGroup.createLectureGroup = Create lecturegroup
lectureGroup.createNew = Create new
lectureGroup.description = Description
lectureGroup.manageLectures = Manage lectures
lectureGroup.name = Name
lectureGroup.selectCount = Max lecture select count
lecturegroup.create.success = Lecturegroup created successfully. lecturegroup.create.success = Lecturegroup created successfully.
lecturegroup.list.title = Lectures
lecturegroup.save.success = Lecturegroup saved succesfully. lecturegroup.save.success = Lecturegroup saved succesfully.
license.active = Active license.active = Active
...@@ -950,6 +974,8 @@ salespoint.edit = Edit ...@@ -950,6 +974,8 @@ salespoint.edit = Edit
salespoint.name = Name salespoint.name = Name
salespoint.noSalesPoints = Amount salespoint.noSalesPoints = Amount
save = Save
sendPicture.header = S sendPicture.header = S
shop.accountBalance = Credits shop.accountBalance = Credits
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -286,8 +286,12 @@ compofile.uploadTime = Tallennusaika ...@@ -286,8 +286,12 @@ compofile.uploadTime = Tallennusaika
content.showContentEditLinks = N\u00E4yt\u00E4 sis\u00E4ll\u00F6nmuokkauslinkit content.showContentEditLinks = N\u00E4yt\u00E4 sis\u00E4ll\u00F6nmuokkauslinkit
delete = Poista delete = Poista
create = Luo
discount.active = Aktiivinen discount.active = Aktiivinen
discount.amountMax = Enimm\u00E4ism\u00E4\u00E4r\u00E4 discount.amountMax = Enimm\u00E4ism\u00E4\u00E4r\u00E4
discount.amountMin = V\u00E4himm\u00E4ism\u00E4\u00E4r\u00E4 discount.amountMin = V\u00E4himm\u00E4ism\u00E4\u00E4r\u00E4
...@@ -305,6 +309,8 @@ discount.shortdesc = Kuvaus ...@@ -305,6 +309,8 @@ discount.shortdesc = Kuvaus
discount.validFrom = Voimassa alkaen discount.validFrom = Voimassa alkaen
discount.validTo = Voimassa asti discount.validTo = Voimassa asti
edit = Muokkaa
editplace.header = Muokkaa paikkaa editplace.header = Muokkaa paikkaa
editplace.placegroup.title = Paikkaryhm\u00E4 editplace.placegroup.title = Paikkaryhm\u00E4
...@@ -560,7 +566,25 @@ layout.editBottom = Muokkaa alasis\u00E4lt\u00F6\u00E4 ...@@ -560,7 +566,25 @@ layout.editBottom = Muokkaa alasis\u00E4lt\u00F6\u00E4
layout.editContent = Muokkaa sis\u00E4lt\u00F6\u00E4 layout.editContent = Muokkaa sis\u00E4lt\u00F6\u00E4
layout.editTop = Muokkaa yl\u00E4sis\u00E4lt\u00F6\u00E4 layout.editTop = Muokkaa yl\u00E4sis\u00E4lt\u00F6\u00E4
lecture.createLecture = Uuden tiedot
lecture.createNew = Luo uusi
lecture.description = Kuvaus
lecture.hours = Kesto tunteina
lecture.maxParticipantsCount = Osallistujia enint.
lecture.name = Nimi
lecture.roles = Roolit
lecture.saveLecture = Muokkaa
lecture.startTime = Aloitusaika
lectureGroup.createLectureGroup = Luo Luentokokonaisuus
lectureGroup.createNew = Luo uusi
lectureGroup.description = Kuvaus
lectureGroup.manageLectures = Hallitse luentoja
lectureGroup.name = Nimi
lectureGroup.selectCount = Monellekko saa osallistua
lecturegroup.create.success = Kurssiryhm\u00E4 luotu onnistuneesti. lecturegroup.create.success = Kurssiryhm\u00E4 luotu onnistuneesti.
lecturegroup.list.title = Luennot
lecturegroup.save.success = Kurssiryhm\u00E4 tallennettu onnistuneesti. lecturegroup.save.success = Kurssiryhm\u00E4 tallennettu onnistuneesti.
license.active = Aktiivinen license.active = Aktiivinen
...@@ -933,6 +957,8 @@ salespoint.edit = Muokkaa ...@@ -933,6 +957,8 @@ salespoint.edit = Muokkaa
salespoint.name = Nimi salespoint.name = Nimi
salespoint.noSalesPoints = M\u00E4\u00E4r\u00E4 salespoint.noSalesPoints = M\u00E4\u00E4r\u00E4
save = Tallenna
sendPicture.header = L\u00E4het\u00E4 kuva sendPicture.header = L\u00E4het\u00E4 kuva
shop.accountBalance = Credits shop.accountBalance = Credits
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/lecture/LectureView.java
...@@ -81,6 +81,11 @@ public class LectureView extends GenericCDIView { ...@@ -81,6 +81,11 @@ public class LectureView extends GenericCDIView {
} }
} }
public void createNew() {
creatingLecture = true;
currentLecture = null;
}
...@@ -132,6 +137,10 @@ public class LectureView extends GenericCDIView { ...@@ -132,6 +137,10 @@ public class LectureView extends GenericCDIView {
public Lecture getCurrentLecture() { public Lecture getCurrentLecture() {
if(currentLecture == null) {
currentLecture = new Lecture(currentLectureGroup);
}
return currentLecture; return currentLecture;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!