Commit 4bcd9116 by Tuomas Riihimäki

Merge branch 'vectorama2017muutokset' into 'master'

bugikorjailuja

See merge request !373
2 parents 15355127 7e27ce8f
...@@ -177,6 +177,14 @@ public interface UserBeanLocal { ...@@ -177,6 +177,14 @@ public interface UserBeanLocal {
*/ */
String findUsernameByEmailUsername(String filter); String findUsernameByEmailUsername(String filter);
/**
* Find user by email or username, this is kind of login-helper.
*
* @param filter
* @return
*/
User findUserByEmailUsername(String filter);
EventUser findEventuserByLogin(String username); EventUser findEventuserByLogin(String username);
/** /**
......
...@@ -1088,22 +1088,35 @@ public class UserBean implements UserBeanLocal { ...@@ -1088,22 +1088,35 @@ public class UserBean implements UserBeanLocal {
@Override @Override
public String findUsernameByEmailUsername(String filter) { public String findUsernameByEmailUsername(String filter) {
User user = findUserByEmailUsername(filter);
if(user == null)
return null;
return user.getLogin();
}
@Override
public User findUserByEmailUsername(String filter) {
User user = userFacade.findByLogin(filter); User user = userFacade.findByLogin(filter);
List<User> users = userFacade.findByEmail(filter); List<User> users = userFacade.findByEmail(filter);
if (users.size() == 1 && user != null) { if (users.size() == 1 && user != null) {
if (user.equals(users.get(0))) if (user.equals(users.get(0)))
return user.getLogin(); return user;
return null; return null;
} }
if (user != null) if (user != null)
return user.getLogin(); return user;
if (users.size() == 1) { if (users.size() == 1) {
return users.get(0).getLogin(); return users.get(0);
} }
return null; return null;
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<h1>#{i18n['incomingView.attachDialogTitle']}</h1> <h1>#{i18n['incomingView.attachDialogTitle']}</h1>
<!-- napin painaminen aiheuttaa aina NullPOinterExceptionin, mutta tekee siitä huolimatta tarvittavat asiat --> <!-- napin painaminen aiheuttaa aina NullPOinterExceptionin, mutta tekee siitä huolimatta tarvittavat asiat -->
<!-- tarjoan oluen sille ketä ratkasee ton exceptionin -TKjne --> <!-- tarjoan oluen sille ketä ratkasee ton exceptionin -TKjne -->
<p:commandButton styleClass="attachbuttonidclass" value="#{i18n['incomingView.attach']}" actionListener="#{incomingView.attachCodeToCard}" update=":cardcodeform :placelistform :imgCropperForm :cardsetform" onerror="location.reload(true);" /> <p:commandButton styleClass="attachbuttonidclass" value="#{i18n['incomingView.attach']}" actionListener="#{incomingView.attachCodeToCard}" update=":cardcodeform :placelistform :imgCropperForm :cardsetform:" onerror="location.reload(true);" />
<p:commandButton value="#{i18n['incomingView.cancel']}" actionListener="#{incomingView.hideAttachDialog}" update=":attachform:attachBarcode" /> <p:commandButton value="#{i18n['incomingView.cancel']}" actionListener="#{incomingView.hideAttachDialog}" update=":attachform:attachBarcode" />
</div> </div>
</h:panelGroup> </h:panelGroup>
...@@ -162,6 +162,7 @@ ...@@ -162,6 +162,7 @@
<p:outputLabel value="#{i18n['incomingflow.cardfiling.label']}" rendered="#{!empty incomingView.cardFiling}" /> <p:outputLabel value="#{i18n['incomingflow.cardfiling.label']}" rendered="#{!empty incomingView.cardFiling}" />
<p:outputLabel value="#{incomingView.cardFiling}" rendered="#{!empty incomingView.cardFiling}" /> <p:outputLabel value="#{incomingView.cardFiling}" rendered="#{!empty incomingView.cardFiling}" />
</b> </b>
<p:commandButton actionListener="#{incomingView.deliverCard}" update="cardsetform" value="#{i18n['deliver']}" />
</p:fieldset> </p:fieldset>
......
...@@ -57,7 +57,7 @@ xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader" ...@@ -57,7 +57,7 @@ xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
</p:inputSwitch> </p:inputSwitch>
<br /> <br />
<p:commandLink actionListener="#{readerView.changeReader}" value="#{i18n['incomingflow.changereader']}" update="@all" /> <p:commandLink actionListener="#{readerView.changeReader}" value="#{i18n['incomingflow.changereader']}" />
<h:panelGroup id="readerevents"> <h:panelGroup id="readerevents">
<reader:readerevents rendered="#{!empty readerNameContainer.readerId and !readerView.pollingMode}" showAssociateToUser="#{cc.attrs.showAssociateToUser}" selectvalue="#{cc.attrs.selectvalue}" selectaction="#{cc.attrs.selectaction}" linkvalue="#{cc.attrs.linkvalue}" linkoutcome="#{cc.attrs.linkoutcome}" /> <reader:readerevents rendered="#{!empty readerNameContainer.readerId and !readerView.pollingMode}" showAssociateToUser="#{cc.attrs.showAssociateToUser}" selectvalue="#{cc.attrs.selectvalue}" selectaction="#{cc.attrs.selectaction}" linkvalue="#{cc.attrs.linkvalue}" linkoutcome="#{cc.attrs.linkoutcome}" />
</h:panelGroup> </h:panelGroup>
......
...@@ -290,13 +290,21 @@ public class UserRestView { ...@@ -290,13 +290,21 @@ public class UserRestView {
return Response.status(Status.FORBIDDEN).build(); return Response.status(Status.FORBIDDEN).build();
} }
EventUser eventUser;
User user = null;
// If username not given, try to find username by email // If username not given, try to find username by email
if (userName == null || userName.isEmpty()) { if (userName == null || userName.isEmpty()) {
userName = userbean.findUsernameByEmailUsername(email); user = userbean.findUserByEmailUsername(email);
}
if(user != null) {
eventUser = userbean.getEventUser(user, true);
} else {
// Get the user
eventUser = userbean.findEventuserByLogin(userName);
} }
// Get the user
EventUser eventUser = userbean.findEventuserByLogin(userName);
if (eventUser == null) { if (eventUser == null) {
return Response.status(Status.NOT_FOUND).build(); return Response.status(Status.NOT_FOUND).build();
} }
......
...@@ -363,6 +363,7 @@ public class ReaderView extends GenericCDIView { ...@@ -363,6 +363,7 @@ public class ReaderView extends GenericCDIView {
public void changeReader() { public void changeReader() {
namecontainer.setReaderId(null); namecontainer.setReaderId(null);
navihandler.forward("/info/index");
} }
......
...@@ -189,6 +189,9 @@ public class IncomingView extends GenericCDIView { ...@@ -189,6 +189,9 @@ public class IncomingView extends GenericCDIView {
eventToAttach = null; eventToAttach = null;
showAttachDialog = false; showAttachDialog = false;
// refresh all shit, purkkaa!!
super.navihandler.redirectNavigation("incoming.jsf?userid=" + userview.getUser().getId());
userview.setUser(null); // refresh user userview.setUser(null); // refresh user
userview.setPrintedCard(null); // refresh card userview.setPrintedCard(null); // refresh card
...@@ -266,6 +269,14 @@ public class IncomingView extends GenericCDIView { ...@@ -266,6 +269,14 @@ public class IncomingView extends GenericCDIView {
} }
public void deliverCard() {
PrintedCard card = cardBean.checkPrintedCard(userview.getUser());
card.setCardState(CardState.DELIVERED);
cardBean.saveCard(card);
}
public ListDataModel<GroupMembership> getGroupMemberships() { public ListDataModel<GroupMembership> getGroupMemberships() {
memberlist = new ListDataModel<GroupMembership>(ticketBean.findMembershipPrintlistForUser(userview.getSelectedUser())); memberlist = new ListDataModel<GroupMembership>(ticketBean.findMembershipPrintlistForUser(userview.getSelectedUser()));
return memberlist; return memberlist;
......
...@@ -1612,3 +1612,4 @@ mapEdit.removeSelectedPlaces=Delete places ...@@ -1612,3 +1612,4 @@ mapEdit.removeSelectedPlaces=Delete places
bortalApplication.map.MOVE_PLACES =Selfservice place moving bortalApplication.map.MOVE_PLACES =Selfservice place moving
bill.list.header =Orders bill.list.header =Orders
placemove.noMovablePlaces =No movable places placemove.noMovablePlaces =No movable places
deliver=Toimita
...@@ -1893,3 +1893,4 @@ mapEdit.removeSelectedPlaces=Delete places ...@@ -1893,3 +1893,4 @@ mapEdit.removeSelectedPlaces=Delete places
bortalApplication.map.MOVE_PLACES = Selfservice place moving bortalApplication.map.MOVE_PLACES = Selfservice place moving
bill.list.header = Orders bill.list.header = Orders
placemove.noMovablePlaces = No movable places placemove.noMovablePlaces = No movable places
deliver=Deliver
...@@ -1880,3 +1880,4 @@ mapEdit.removeSelectedPlaces=Poista paikat ...@@ -1880,3 +1880,4 @@ mapEdit.removeSelectedPlaces=Poista paikat
bortalApplication.map.MOVE_PLACES = Paikkojen itsepalvelusiirto bortalApplication.map.MOVE_PLACES = Paikkojen itsepalvelusiirto
bill.list.header = Tilaukset bill.list.header = Tilaukset
placemove.noMovablePlaces = Ei siirrett\u00E4vi\u00E4 paikkoja placemove.noMovablePlaces = Ei siirrett\u00E4vi\u00E4 paikkoja
deliver=Toimita
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!