Commit 1c22d9ef by Tuukka Kivilahti

style rewert and participant remove stuff, Also one bugfix

1 parent 0d96f0c3
......@@ -13,6 +13,11 @@
<ui:define name="content">
<p:confirmDialog global="true" showEffect="fade" hideEffect="fade">
<p:commandButton value="#{i18n['yes']}" type="button" styleClass="ui-confirmdialog-yes" icon="ui-icon-check" />
<p:commandButton value="#{i18n['no']}" type="button" styleClass="ui-confirmdialog-no" icon="ui-icon-close" />
</p:confirmDialog>
<p:fieldset legend="#{lectureReportsView.currentLecture.name}">
<p:panelGrid columns="2">
<p:outputLabel value="#{i18n['lecture.description']}" />
......@@ -46,6 +51,12 @@
<p:column>
<h:outputText value="#{user.user.firstnames}" />
</p:column>
<p:column>
<p:commandButton value="#{i18n['lecture.unparticipate']}" actionListener="#{lectureReportsView.unParticipateCurrent}" update="participants :participants_count" onerror="location.reload(true)">
<f:attribute name="userid" value="#{user.id}" />
<p:confirm header="#{i18n['lecture.unparticipate.confirm.title']}" message="#{i18n['lecture.unparticipate.confirm.message']}" icon="ui-icon-alert" />
</p:commandButton>
</p:column>
</p:dataTable>
</h:form>
<br />
......
.ui-widget,.ui-widget .ui-widget,.ui-button-text,.ui-wizard-step-title {
font-size: 10pt !important;
/* Muutin takas -TKjne.
Syy: listoja yms. meni rikki kun sinne tarkoitettu sisältö ei enää mahtunutkaan paikoilleen -> jos tähän koskee kannattaa testata n. kaikki.
Fonttimuutoksen vois esmes yhdistää siihen kun säätää mahdollista uutta leiskaa käyttöön.
*/
font-size: 90% !important;
}
.ui-panelmenu-header {
......
......@@ -235,6 +235,8 @@ lecture.selectgroup = Valitse aihealue
lecture.showParticipants = N\u00E4yt\u00E4 osallistujat
lecture.startTime = Aloitusaika
lecture.unparticipate = Poista ilmoittautuminen
lecture.unparticipate.confirm.message = Oletko varma ett\u00E4 haluat poistaa k\u00E4ytt\u00E4j\u00E4n kurssilta?
lecture.unparticipate.confirm.title = Poistetaanko
lectureGroup.createLectureGroup = Luo kurssikokonaisuus
lectureGroup.createNew = Luo uusi
......@@ -271,6 +273,8 @@ navi.auth.login = frontpage
navi.auth.loginerror = frontpage
navi.auth.logout = frontpage
no = Ei
off = Poissa
on = P\u00E4\u00E4ll\u00E4
......@@ -374,3 +378,5 @@ usercart.downloadCsv = CSV
usercart.showoverview = Vie tarkastusn\u00E4kym\u00E4\u00E4n
viewlectures.title = Kurssit ja luennot
yes = Kyll\u00E4
......@@ -612,6 +612,8 @@ lecture.selectgroup = Select lecturegroup
lecture.showParticipants = Show participants
lecture.startTime = Start time
lecture.unparticipate = Remove participation
lecture.unparticipate.confirm.message = Are you sure you want to remove participator from lecture?
lecture.unparticipate.confirm.title = Do we remove
lectureGroup.createLectureGroup = Create lecturegroup
lectureGroup.createNew = Create new
......@@ -733,6 +735,8 @@ newsgroup.writerRole = Writer roles
newslist.header = Newsgroups
no = No
off = Off
on = On
......@@ -1580,3 +1584,5 @@ voting.create.submitEnd = Submit close
voting.create.submitStart = Submit start
voting.create.voteEnd = Voting close
voting.create.voteStart = Voting start
yes = Yes
......@@ -621,6 +621,8 @@ lecture.saveLecture = Muokkaa
lecture.selectgroup = Valitse aihealue
lecture.startTime = Aloitusaika
lecture.unparticipate = Poista ilmoittautuminen
lecture.unparticipate.confirm.message = Oletko varma ett\u00E4 haluat poistaa k\u00E4ytt\u00E4j\u00E4n kurssilta?
lecture.unparticipate.confirm.title = Poistetaanko
lectureGroup.createLectureGroup = Luo kurssikokonaisuus
lectureGroup.createNew = Luo uusi
......@@ -742,6 +744,8 @@ newsgroup.writerRole = Kirjoittajaryhm\u00E4
newslist.header = Uutisryhm\u00E4t
no = Ei
off = Poissa
on = P\u00E4\u00E4ll\u00E4
......@@ -1408,13 +1412,13 @@ user.game.gameid_removed = Peli-ID poistettu
user.game.manage = Hallitse
user.game.remove_gameid = Poista
user.hasImage = Kuva
user.image = Kuva
user.imageCropRefresh = P\u00E4ivit\u00E4
user.imageTooBig = Kuva on liian suuri
user.imageUpload.imageNotFound = Valitse ensin kuva jonka haluat l\u00E4hett\u00E4\u00E4
user.imageUploaded = Kuva l\u00E4hetetty.
user.imagelist = Tallennetut kuvat
user.imagesubmit = L\u00E4het\u00E4 kuva
user.image = Kuva
user.insert = Sy\u00F6t\u00E4 arvo
user.invalidLoginCredentials = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana v\u00E4\u00E4rin.
user.invite = Kutsu
......@@ -1561,3 +1565,5 @@ voting.create.submitEnd = Submit kiinni
voting.create.submitStart = Submit auki
voting.create.voteEnd = \u00C4\u00E4nestys kiinni
voting.create.voteStart = \u00C4\u00E4nestys auki
yes = Kyll\u00E4
......@@ -4,6 +4,7 @@ import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.event.ActionEvent;
import javax.faces.model.ListDataModel;
import javax.inject.Inject;
import javax.inject.Named;
......@@ -106,6 +107,20 @@ public class LectureReportsView extends GenericCDIView {
}
public void unParticipateCurrent(ActionEvent event) {
Integer userId = (Integer) event.getComponent().getAttributes().get("userid");
// sometimes you just are lazy
for(EventUser user : getCurrentLecture().getParticipants()) {
if(user.getId() == userId) {
lectureBean.unparticipate(user, getCurrentLecture());
break;
}
}
}
public int getCurrentGroupParticipateCount() {
return lectureBean.userLectureSelects(getCurrentLectureGroup(), userView.getCurrentUser());
}
......
......@@ -145,6 +145,10 @@ public class LectureUserView extends GenericCDIView {
public void onLecureCalendarEventSelect(SelectEvent selectEvent) {
if (!isParticipateActive()) {
return;
}
Lecture lecture = (Lecture) ((DefaultScheduleEvent) selectEvent.getObject()).getData();
lectureBean.participate(userView.getCurrentUser(), lecture);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!