Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 7eea84ad by Juho Juopperi
Options

CardTemplate

1 parent 1ef4679f
Inline Side-by-side
Showing with 11 additions and 3 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/CardTemplateBean.java
...@@ -18,9 +18,11 @@ import org.slf4j.LoggerFactory; ...@@ -18,9 +18,11 @@ import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.enums.apps.UserPermission; import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.facade.CardTemplateFacade; import fi.insomnia.bortal.facade.CardTemplateFacade;
import fi.insomnia.bortal.facade.EventUserFacade;
import fi.insomnia.bortal.facade.PrintedCardFacade; import fi.insomnia.bortal.facade.PrintedCardFacade;
import fi.insomnia.bortal.facade.UserFacade; import fi.insomnia.bortal.facade.UserFacade;
import fi.insomnia.bortal.model.CardTemplate; import fi.insomnia.bortal.model.CardTemplate;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.IUser; import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.LanEvent; import fi.insomnia.bortal.model.LanEvent;
import fi.insomnia.bortal.model.PrintedCard; import fi.insomnia.bortal.model.PrintedCard;
...@@ -60,6 +62,9 @@ public class CardTemplateBean implements CardTemplateBeanLocal { ...@@ -60,6 +62,9 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
private UserFacade userfacade; private UserFacade userfacade;
@EJB @EJB
private EventUserFacade eventUserFacade;
@EJB
private UserBeanLocal userbean; private UserBeanLocal userbean;
// @Override // @Override
...@@ -100,10 +105,10 @@ public class CardTemplateBean implements CardTemplateBeanLocal { ...@@ -100,10 +105,10 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
* @throws PermissionDeniedException * @throws PermissionDeniedException
*/ */
@Override @Override
public PrintedCard checkPrintedCard(User user) { public PrintedCard checkPrintedCard(EventUser user) {
logger.info("Checking printed card"); logger.info("Checking printed card");
user = userfacade.find(user.getId()); user = eventUserFacade.find(user.getId());
LanEvent currEvent = eventBean.getCurrentEvent(); LanEvent currEvent = eventBean.getCurrentEvent();
List<PrintedCard> myCards = printedcardfacade.getCards(user); List<PrintedCard> myCards = printedcardfacade.getCards(user);
...@@ -169,7 +174,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal { ...@@ -169,7 +174,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
} }
@RolesAllowed(UserPermission.S_WRITE_ROLES) @RolesAllowed(UserPermission.S_WRITE_ROLES)
public CardTemplate getUsersCardtype(User user) { public CardTemplate getUsersCardtype(EventUser user) {
List<Role> roles = userbean.findUsersRoles(user); List<Role> roles = userbean.findUsersRoles(user);
CardTemplate greatestTemplate = null; CardTemplate greatestTemplate = null;
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/CardTemplateBeanLocal.java
...@@ -6,6 +6,7 @@ import java.util.List; ...@@ -6,6 +6,7 @@ import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.insomnia.bortal.model.CardTemplate; import fi.insomnia.bortal.model.CardTemplate;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.IUser; import fi.insomnia.bortal.model.IUser;
import fi.insomnia.bortal.model.PrintedCard; import fi.insomnia.bortal.model.PrintedCard;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
...@@ -40,4 +41,6 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> { ...@@ -40,4 +41,6 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> {
List<CardTemplate> findAll(); List<CardTemplate> findAll();
PrintedCard checkPrintedCard(EventUser user);
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!