Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 107fc909 by Tuukka Kivilahti
Options

vectoinfoa lissää, hiukan siistimistä ja yks currentuser vs selecteduser -bugi

1 parent 2210a671
Inline Side-by-side
Showing with 94 additions and 53 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CardTemplateBean.java
......@@ -358,14 +358,17 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
public EventUser giveCard(EventUser user, boolean markUserPlacesDelivered) {
PrintedCard card = checkPrintedCard(user);
if (card.getCardState() != CardState.DELIVERED) {
card.setCardState(CardState.DELIVERED);
card = printedcardfacade.merge(card);
} else {
logger.info("Not marking card to delivered: " + card.getCardState() + " : " + card.getId());
}
if (markUserPlacesDelivered) {
for (GroupMembership membership : gmFacade.findMemberships(user)) {
membership.setEnteredEvent(Calendar.getInstance());
membership = gmFacade.merge(membership);
......
code/MoyaWeb/WebContent/info/incoming.xhtml
......@@ -12,24 +12,7 @@
</f:metadata>
<ui:define name="content">
<!--
<h1>#{i18n['incomingflow.search']}</h1>
<h:form>
<h:panelGrid columns="2" >
<h:outputText value="#{i18n['incomingflow.multisearch']}" />
<h:outputText value="#{i18n['incomingflow.barcode']}" />
<p:autoComplete id="acsb" value="#{incomingView.searchMulti}" completeMethod="#{incomingView.matchMulti}" converter="#{eventUserConverter}" var="usrx" itemLabel="#{usrx.shortUserDescriptor}" itemValue="#{usrx}">
<p:ajax event="itemSelect" listener="#{incomingView.changeUser}" />
</p:autoComplete>
<p:autoComplete id="acs" value="#{incomingView.searchBarcode}" completeMethod="#{incomingView.matchBarcode}">
<p:ajax event="itemSelect" listener="#{incomingView.changeUser}" />
</p:autoComplete>
</h:panelGrid>
</h:form>
yhtäsuurimerkit -->
......@@ -56,36 +39,49 @@
</h:form>
<!-- infoviilausta, kauppa infoon -->
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<h1>#{i18n['incomingflow.userdetails']}</h1>
<h:panelGrid id="cropper" columns="3">
<h:panelGroup>
<user:edit id="usereditor" commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" camAlwaysOn="true" photocamupdate="@all" />
</h:panelGroup>
<br />
<br />
<h1>
<p:outputLabel value="#{userView.selectedUser.firstnames}" />
(
<p:outputLabel value="#{userView.selectedUser.nick}" />
)
<p:outputLabel value="#{userView.selectedUser.lastname}" />
</h1>
<br />
<h:panelGrid id="cropper" columns="2">
<h:panelGroup>
<h:form id="imgCropperForm" rendered="#{!empty userView.selectedUser.currentImage}">
<p:commandButton value="#{i18n['user.imageCropRefresh']}" ajax="false" update="imgCropperForm" />
<h:outputLabel value="#{i18n['user.cropUserImage']}:" />
<p:imageCropper id="imgCropper" value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.selectedUser.currentImage.id}.img" />
<br />
<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
</h:form>
<p:fieldset legend="#{i18n['incomingflow.usereditor']}" toggleable="true">
<user:edit id="usereditor" commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" camAlwaysOn="true" photocamupdate="@all" />
</p:fieldset>
</h:panelGroup>
<h:panelGroup>
<h:form>
<p:graphicImage url="/dydata/usercard/#{userView.selectedUser.user.id}.png" width="300" />
<br />
<h:commandButton action="#{incomingView.printCard}" value="#{i18n['print']}" /> (status: #{incomingView.printedStatus})
</h:form>
</h:panelGroup>
<p:fieldset legend="#{i18n['incomingflow.printedCard']}" toggleable="true">
<h:panelGrid columns="2">
<h:panelGroup>
<h:form id="imgCropperForm" rendered="#{!empty userView.selectedUser.currentImage}">
<p:commandButton value="#{i18n['user.imageCropRefresh']}" ajax="false" update="imgCropperForm" />
<h:outputLabel value="#{i18n['user.cropUserImage']}:" />
<p:imageCropper id="imgCropper" value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.selectedUser.currentImage.id}.img" />
<br />
<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
</h:form>
</h:panelGroup>
<h:panelGroup>
<h:form>
<p:graphicImage url="/dydata/usercard/#{userView.selectedUser.user.id}.png" width="300" />
<br />
<h:commandButton action="#{incomingView.printCard}" value="#{i18n['print']}" /> (status: <p:outputLabel value="#{incomingView.printedStatus}" />)
</h:form>
</h:panelGroup>
</h:panelGrid>
</p:fieldset>
</h:panelGroup>
</h:panelGrid>
<h:outputText rendered="#{empty incomingView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" />
......
code/MoyaWeb/WebContent/resources/cditools/reader/backendReader.xhtml
......@@ -49,7 +49,7 @@ xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
</p:dataTable>
<p:outputLabel value="#{i18n['reader.autopoll']}" />
<p:outputLabel value="#{i18n['reader.autopoll']}" />&nbsp;
<p:selectBooleanButton offLabel="#{i18n['off']}" onLabel="#{i18n['on']}" value="#{readerView.pollingMode}" immediate="true">
<p:ajax update="reader_autopoll,readerevents" />
</p:selectBooleanButton>
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
......@@ -167,6 +167,8 @@ incomingflow.codeattached.title = Koodi liittetty
incomingflow.giveplace = Merkitse annetuksi
incomingflow.invalidbarcode.message = Viivakoodilla ei l\u00F6ytynyt mit\u00E4\u00E4n
incomingflow.invalidbarcode.title = virheellinen koodi
incomingflow.printedCard = Kortti
incomingflow.usereditor = K\u00E4ytt\u00E4j\u00E4
lanEventPrivateProperty.defaultValue = Default value
lanEventPrivateProperty.editProperty = Edit property
......@@ -196,6 +198,10 @@ navi.auth.login = frontpage
navi.auth.loginerror = frontpage
navi.auth.logout = frontpage
off = Pois
on = P\u00E4\u00E4ll\u00E4
page.bill.billSummary.header = Summary of bills
page.bill.edit.header = Edit bill
page.bill.list.header = Bills
......@@ -230,6 +236,8 @@ productshop.minusTen = -10
productshop.plusOne = +1
productshop.plusTen = +10
reader.autopoll = Jatkuva lukijan seuraaminen
registerleaflet.title = Rekisteriseloste
resetMail.header = Reset lost password
......@@ -242,8 +250,9 @@ submenu.NotImplementedYet = Not implemented
submenu.admin.adduser = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
submenu.admin.adduser.index = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
submenu.frontpage = Frontpage
submenu.info.incoming = Incomingview
submenu.info.incoming = Sis\u00E4\u00E4ntulo
submenu.info.index = Infon\u00E4kym\u00E4
submenu.info.shop = Kauppa
subnavi.cards = \u0009\u0009
subnavi.info = Info
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
......@@ -472,9 +472,11 @@ incomingflow.giveplace = Mark given
incomingflow.invalidbarcode.message = Nothing found with barcode, you can now add it to the user
incomingflow.invalidbarcode.title = Invalid code
incomingflow.multisearch = Multisearch
incomingflow.printedCard = Card
incomingflow.search = Search
incomingflow.ungiveplace = Mark not given
incomingflow.userdetails = User details
incomingflow.usereditor = User
infoview.back = Back
infoview.computerplace = Computer places
......@@ -630,6 +632,10 @@ newsgroup.writerRole = Writer roles
newslist.header = Newsgroups
off = Off
on = On
org.hibernate.validator.constraints.Email.message = not a well-formed email address
org.hibernate.validator.constraints.Length.message = length must be between {min} and {max}
org.hibernate.validator.constraints.NotEmpty.message = may not be empty
......@@ -857,6 +863,7 @@ productshop.total = Total
reader.assocToCard = Associate to card
reader.automaticProduct = Default product
reader.automaticProductCount = Amount
reader.autopoll = Reader autopoll
reader.create = Create reader
reader.createNewCard = Create new card
reader.description = Description
......@@ -1026,8 +1033,9 @@ submenu.foodmanager.listFoodwaves = List active foodwaves
submenu.foodwave.list = Foodwaves
submenu.foodwave.listTemplates = Food provides
submenu.index = Frontpage
submenu.info.incoming = Sis\u00E4\u00E4ntulo
submenu.info.incoming = Incomingview
submenu.info.index = Infoview
submenu.info.shop = Shop
submenu.license.manageCodes = Manage codes
submenu.license.viewCodes = View codes
submenu.map.create = Create map
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
......@@ -480,9 +480,11 @@ incomingflow.giveplace = Merkitse annetuksi
incomingflow.invalidbarcode.message = Piipatulla koodilla ei l\u00F6ytynyt mit\u00E4\u00E4n, voit lis\u00E4t\u00E4 koodin k\u00E4ytt\u00E4j\u00E4\u00E4n
incomingflow.invalidbarcode.title = Virheellinen koodi
incomingflow.multisearch = Monihaku
incomingflow.printedCard = Kortti
incomingflow.search = Etsi
incomingflow.ungiveplace = Ei olekkaan annettu
incomingflow.userdetails = K\u00E4ytt\u00E4j\u00E4n tiedot
incomingflow.usereditor = K\u00E4ytt\u00E4j\u00E4
index.title = Etusivu
......@@ -639,6 +641,10 @@ newsgroup.writerRole = Kirjoittajaryhm\u00E4
newslist.header = Uutisryhm\u00E4t
off = Pois
on = P\u00E4\u00E4ll\u00E4
org.hibernate.validator.constraints.Email.message = V\u00E4\u00E4rin muotoiltu s\u00E4hk\u00F6postiosoite
org.hibernate.validator.constraints.Length.message = length must be between {min} and {max}
org.hibernate.validator.constraints.NotEmpty.message = may not be empty
......@@ -842,6 +848,7 @@ productshop.total = Yhteens\u00E4
reader.assocToCard = Yhdist\u00E4 korttiin
reader.automaticProduct = Oletustuote
reader.automaticProductCount = M\u00E4\u00E4r\u00E4
reader.autopoll = Jatkuva lukijan seuraaminen
reader.create = Luo lukija
reader.createNewCard = Luo uusi kortti
reader.description = Kuvaus
......@@ -1006,8 +1013,9 @@ submenu.foodmanager.listFoodwaves = Aktiiviset ruokatilaukset
submenu.foodwave.list = Ruokatilaukset
submenu.frontpage = Etusivu
submenu.index = Etusivu
submenu.info.incoming = Incomingview
submenu.info.incoming = Sis\u00E4\u00E4ntulo
submenu.info.index = Infon\u00E4kym\u00E4
submenu.info.shop = Kauppa
submenu.license.manageCodes = Hallinnoi lisenssej\u00E4
submenu.license.viewCodes = N\u00E4yt\u00E4 koodit
submenu.map.create = Uusi kartta
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserView.java
......@@ -122,6 +122,11 @@ public class UserView extends GenericCDIView {
printedCard = card;
}
/**
* This is the user that is currently logged in.
* @return
*/
@Produces
@LoggedIn
public EventUser getCurrentUser() {
......@@ -149,6 +154,11 @@ public class UserView extends GenericCDIView {
}
/**
* This is the user we are currently editing, if that is not found we user current user
* @return
*/
@Produces
@SelectedUser
public EventUser getSelectedUser() {
......@@ -403,6 +413,11 @@ public class UserView extends GenericCDIView {
this.user = user;
}
/**
* This is user what is currently on "user" -variable, you should almost newer use this.
* Use getCurrentUser() -instead.
* @return
*/
public EventUser getUser() {
return user;
}
......
code/MoyaWeb/src/fi/codecrew/moya/web/flow/IncomingView.java
......@@ -176,13 +176,16 @@ public class IncomingView extends GenericCDIView {
public void attachCodeToCard() {
if (eventToAttach == null) {
throw new RuntimeException("mitä kettua?");
return;
}
cardBean.giveCard(userview.getCurrentUser(), autoGivePlaces);
cardBean.giveCard(userview.getSelectedUser(), autoGivePlaces);
userview.attachCodeToCard(eventToAttach);
eventToAttach = null;
showAttachDialog = false;
userview.setUser(null); // refresh user
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(I18n.get("incomingflow.codeattached.title"), I18n.get("incomingflow.codeattached.message")));
}
......@@ -214,7 +217,7 @@ public class IncomingView extends GenericCDIView {
*/
public CardState getPrintedStatus() {
PrintedCard card = cardBean.checkPrintedCard(userview.getUser());
PrintedCard card = cardBean.checkPrintedCard(userview.getSelectedUser());
CardState ret = null;
if (card != null) {
ret = card.getCardState();
......@@ -230,8 +233,7 @@ public class IncomingView extends GenericCDIView {
}
public ListDataModel<GroupMembership> getGroupMemberships() {
memberlist = new ListDataModel<GroupMembership>(
placegroupBean.getMembershipsAndCreations(userview.getUser()));
memberlist = new ListDataModel<GroupMembership>(placegroupBean.getMembershipsAndCreations(userview.getSelectedUser()));
return memberlist;
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!