Commit 81d5ea1e by Tuukka Kivilahti

daefix, ja cropfix, maybe cropfix, I atleast hope so

1 parent df222c46
...@@ -84,4 +84,7 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> { ...@@ -84,4 +84,7 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> {
void removeCardCode(CardCode code); void removeCardCode(CardCode code);
CardTemplate removeCardObjectData(CardObjectData data); CardTemplate removeCardObjectData(CardObjectData data);
CardTemplate removeCardTextData(CardTextData data); CardTemplate removeCardTextData(CardTextData data);
void cardImageUpdated(Integer cardId);
} }
...@@ -438,4 +438,22 @@ public class CardTemplateBean implements CardTemplateBeanLocal { ...@@ -438,4 +438,22 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
codFacade.remove(data); codFacade.remove(data);
return template; return template;
} }
@Override
public void cardImageUpdated(Integer cardId) {
PrintedCard card = printedcardfacade.find(cardId);
if (card == null) return;
switch (card.getCardState()) {
case PRINTED:
case PRINTING_IN_PROGRESS:
case DELIVERED:
return;
}
card.setCardState(CardState.PENDING_VALIDATION);
}
} }
...@@ -349,6 +349,11 @@ public class UserBean implements UserBeanLocal { ...@@ -349,6 +349,11 @@ public class UserBean implements UserBeanLocal {
// setting uploaded image as the default. // setting uploaded image as the default.
user.getUser().setCurrentImage(userimage); user.getUser().setCurrentImage(userimage);
PrintedCard card = ctbean.checkPrintedCard(user);
if(card != null)
ctbean.cardImageUpdated(card.getId());
return userimage; return userimage;
} }
......
...@@ -40,10 +40,16 @@ import fi.codecrew.moya.utilities.jpa.FacadeCallback; ...@@ -40,10 +40,16 @@ import fi.codecrew.moya.utilities.jpa.FacadeCallback;
public class EventUserCardStateFilter implements FacadeCallback<EventUser> { public class EventUserCardStateFilter implements FacadeCallback<EventUser> {
private final List<CardState> states; private final List<CardState> states;
//private final boolean includeMissing;
private static final Logger logger = LoggerFactory.getLogger(EventUserCardStateFilter.class); private static final Logger logger = LoggerFactory.getLogger(EventUserCardStateFilter.class);
public EventUserCardStateFilter(List<CardState> statelist) { public EventUserCardStateFilter(List<CardState> statelist) {
this.states = statelist; this.states = statelist;
/*if(statelist.contains(CardState.PENDING_VALIDATION)) {
includeMissing = true;
} else {
includeMissing = false;
}*/
} }
public void exec(CriteriaBuilder cb, CriteriaQuery<?> cq, Path<EventUser> root, List<Predicate> predicates, boolean isFullQuery) { public void exec(CriteriaBuilder cb, CriteriaQuery<?> cq, Path<EventUser> root, List<Predicate> predicates, boolean isFullQuery) {
...@@ -55,6 +61,7 @@ public class EventUserCardStateFilter implements FacadeCallback<EventUser> { ...@@ -55,6 +61,7 @@ public class EventUserCardStateFilter implements FacadeCallback<EventUser> {
} }
logger.debug("Requiring states {}", states); logger.debug("Requiring states {}", states);
Path<Integer> rootId = root.get(EventUser_.id); Path<Integer> rootId = root.get(EventUser_.id);
Subquery<Integer> subq = cq.subquery(Integer.class); Subquery<Integer> subq = cq.subquery(Integer.class);
Root<PrintedCard> subroot = subq.from(PrintedCard.class); Root<PrintedCard> subroot = subq.from(PrintedCard.class);
......
...@@ -241,8 +241,7 @@ ...@@ -241,8 +241,7 @@
<h:form id="imgCropperForm"> <h:form id="imgCropperForm">
<p:fieldset id="cropperandcardset" legend="#{i18n['incomingflow.printedCard']}" toggleable="true" collapsed="#{fieldsetView.isCollapsed(component.id)}"> <p:fieldset id="cropperandcardset" legend="#{i18n['incomingflow.printedCard']}" >
<p:ajax event="toggle" listener="#{fieldsetView.handleToggle}" />
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!