Skip to content

Codecrew / Moya

Go to a project
Merge Request !90 opened by

Vectoinfo

Lisää vectoinfoilua, tän jälkeen siirryn omaan kivaan branchiin jne.

Edited
Request to merge tkfftk:vectoinfo into master

Merged

  • The changes were merged into master.
  • The source branch has been removed.
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff
    code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CardTemplateBean.java
    371 380 if (markUserPlacesDelivered) {
    372 381 for (GroupMembership membership : gmFacade.findMemberships(user)) {
    373 382 membership.setEnteredEvent(Calendar.getInstance());
    374 membership = gmFacade.merge(membership);
    383 gmFacade.merge(membership);
    • @tuomari commented
      Owner

      Tämäkin merge on tarpeeton, koska membership haetaan facadelta (eli kannasta) se on 100% varmasti attached, jolloin kaikki muutokset olioon siirtyvät myös kantaan
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff
    code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CardTemplateBean.java
    371 380 if (markUserPlacesDelivered) {
    372 381 for (GroupMembership membership : gmFacade.findMemberships(user)) {
    373 382 membership.setEnteredEvent(Calendar.getInstance());
    374 membership = gmFacade.merge(membership);
    383 gmFacade.merge(membership);
    375 384 }
    376 385 }
    377 386  
    378 return eventUserFacade.reload(user);
    387 return user;
    379 388 }
    389
    390 @Override
    391 public void removeCardCode(CardCode code) {
    392 code = cardCodeFacade.merge(code);
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff
    code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CardTemplateBean.java
    371 380 if (markUserPlacesDelivered) {
    372 381 for (GroupMembership membership : gmFacade.findMemberships(user)) {
    373 382 membership.setEnteredEvent(Calendar.getInstance());
    374 membership = gmFacade.merge(membership);
    383 gmFacade.merge(membership);
    375 384 }
    376 385 }
    377 386  
    378 return eventUserFacade.reload(user);
    387 return user;
    379 388 }
    389
    390 @Override
    391 public void removeCardCode(CardCode code) {
    392 code = cardCodeFacade.merge(code);
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff
    code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CardTemplateBean.java
    374 membership = gmFacade.merge(membership);
    383 gmFacade.merge(membership);
    375 384 }
    376 385 }
    377 386  
    378 return eventUserFacade.reload(user);
    387 return user;
    379 388 }
    389
    390 @Override
    391 public void removeCardCode(CardCode code) {
    392 code = cardCodeFacade.merge(code);
    393
    394 if(code.getPrintedCard().getCardCodes().contains(code)) {
    395 code.getPrintedCard().getCardCodes().remove(code);
    396 cardCodeFacade.remove(code);
    • @tuomari commented
      Owner

      Voi olla tilane että koodi on jo poistettu cardCode lististä, jolloin oliota ei poisteta. cardCodeFacade.remove(code) olisi siis hyvä siirtää if-lauseen ulkopuolelle.
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff
    code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/ReaderBean.java
    173 173 @Override
    174 174 public ReaderEvent assocCodeToCard(ReaderEvent readerEvent, PrintedCard card) {
    175 175  
    176 card = cardfacade.reload(card);
    176 177 CardCode code = new CardCode(card, readerEvent.getReader().getType(), readerEvent.getValue(), eventbean.getCurrentEvent());
    177 178  
    178 179 code = cardCodeFacade.create(code);
    179 card = cardfacade.reload(card);
    180 card.getCardCodes().add(code);
    181
    182 card = cardfacade.merge(card);
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff
    code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/PlaceFacade.java
    134 134 CriteriaQuery<Place> cq = cb.createQuery(Place.class);
    135 135 Root<Place> root = cq.from(Place.class);
    136 136 cq.where( cb.equal(root.get(Place_.map).get(EventMap_.event), eventBean.getCurrentEvent()));
    137 cq.orderBy(cb.asc(root.get(Place_.name)));
    137 //cq.orderBy(cb.asc(root.get(Place_.name)));
  • 2a54e04ac87f85d4d091c3be1c8f9cea?s=80&d=identicon
    Tuukka Kivilahti
    @tkfftk started a discussion on an outdated diff
    code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CardTemplateBean.java
    371 380 if (markUserPlacesDelivered) {
    372 381 for (GroupMembership membership : gmFacade.findMemberships(user)) {
    373 382 membership.setEnteredEvent(Calendar.getInstance());
    374 membership = gmFacade.merge(membership);
    383 gmFacade.merge(membership);
    375 384 }
    376 385 }
    377 386  
    378 return eventUserFacade.reload(user);
    387 return user;
    379 388 }
    389
    390 @Override
    391 public void removeCardCode(CardCode code) {
    392 code = cardCodeFacade.merge(code);
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff
    code/MoyaWeb/src/fi/codecrew/moya/web/helper/fieldsetView.java
    2
    3 import java.util.HashMap;
    4
    5 import javax.enterprise.context.SessionScoped;
    6 import javax.inject.Named;
    7
    8 import org.primefaces.event.ToggleEvent;
    9 import org.primefaces.model.Visibility;
    10 import org.slf4j.Logger;
    11 import org.slf4j.LoggerFactory;
    12
    13 import fi.codecrew.moya.web.cdiview.GenericCDIView;
    14
    15 @Named
    16 @SessionScoped
    17 public class fieldsetView extends GenericCDIView {
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!