Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/TestDataBean.java

@@ -6,6 +6,7 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.net.URISyntaxException;
 import java.net.URISyntaxException;
 import java.util.Calendar;
 import java.util.Calendar;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
@@ -16,19 +17,22 @@ import javax.ejb.Stateless;
 
 
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
+import fi.insomnia.bortal.facade.CompoEntryFacade;
+import fi.insomnia.bortal.facade.CompoFacade;
 import fi.insomnia.bortal.facade.BillFacade;
 import fi.insomnia.bortal.facade.BillFacade;
 import fi.insomnia.bortal.facade.BillLineFacade;
 import fi.insomnia.bortal.facade.BillLineFacade;
 import fi.insomnia.bortal.facade.EventMapFacade;
 import fi.insomnia.bortal.facade.EventMapFacade;
 import fi.insomnia.bortal.facade.EventOrganiserFacade;
 import fi.insomnia.bortal.facade.EventOrganiserFacade;
 import fi.insomnia.bortal.facade.PlaceFacade;
 import fi.insomnia.bortal.facade.PlaceFacade;
 import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.facade.UserFacade;
+import fi.insomnia.bortal.model.Compo;
+import fi.insomnia.bortal.model.CompoEntry;
 import fi.insomnia.bortal.model.Bill;
 import fi.insomnia.bortal.model.Bill;
 import fi.insomnia.bortal.model.BillLine;
 import fi.insomnia.bortal.model.BillLine;
 import fi.insomnia.bortal.model.Event;
 import fi.insomnia.bortal.model.Event;
 import fi.insomnia.bortal.model.EventMap;
 import fi.insomnia.bortal.model.EventMap;
 import fi.insomnia.bortal.model.Place;
 import fi.insomnia.bortal.model.Place;
 import fi.insomnia.bortal.model.User;
 import fi.insomnia.bortal.model.User;
-import java.util.List;
 
 
 /**
 /**
  * Session Bean implementation class TestDataBean
  * Session Bean implementation class TestDataBean
@@ -53,6 +57,10 @@ public class TestDataBean implements TestDataBeanLocal {
     @EJB
     @EJB
     private PlaceFacade placeFacade;
     private PlaceFacade placeFacade;
     @EJB
     @EJB
+    private CompoFacade compoFacade;
+    @EJB
+    private CompoEntryFacade compoEntryFacade;
+    @EJB
     private BillFacade billFacade;
     private BillFacade billFacade;
     @EJB
     @EJB
     private BillLineFacade billLineFacade;
     private BillLineFacade billLineFacade;
@@ -203,7 +211,7 @@ public class TestDataBean implements TestDataBeanLocal {
                 place.setMapY(y);
                 place.setMapY(y);
                 place.setWidth(50);
                 place.setWidth(50);
                 place.setHeight(50);
                 place.setHeight(50);
-//                map.getPlaces().add(place);
+                // map.getPlaces().add(place);
                 placeFacade.create(place);
                 placeFacade.create(place);
             }
             }
         }
         }
@@ -214,7 +222,27 @@ public class TestDataBean implements TestDataBeanLocal {
 
 
         logger.info("Printing info from places");
         logger.info("Printing info from places");
         for (Place place : places) {
         for (Place place : places) {
-            logger.info("Place id: {}. Event Map id: {}.",place.getId().getId(), place.getMap().getId().getId());
+            logger.info("Place id: {}. Event Map id: {}.", place.getId().getId(), place.getMap().getId().getId());
         }
         }
     }
     }
+
+    @Override
+    public void generateTestCompos(Event event) {
+        Compo compo = new Compo(event);
+        compo.setName("Test compo");
+        compo.setHoldVoting(false);
+        compoFacade.create(compo);
+
+        CompoEntry compoEntry1 = new CompoEntry(event);
+        compoEntry1.setCompo(compo);
+        compoEntry1.setCreated(Calendar.getInstance());
+        compoEntry1.setName("Test entry for test compo");
+        compoEntryFacade.create(compoEntry1);
+
+        CompoEntry compoEntry2 = new CompoEntry(event);
+        compoEntry2.setCompo(compo);
+        compoEntry2.setCreated(Calendar.getInstance());
+        compoEntry2.setName("Another test entry for test compo");
+        compoEntryFacade.create(compoEntry2);
+    }
 }
 }

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/TestDataBeanLocal.java

 package fi.insomnia.bortal.beans;
 package fi.insomnia.bortal.beans;
+
 import javax.ejb.Local;
 import javax.ejb.Local;
 
 
 import fi.insomnia.bortal.model.Bill;
 import fi.insomnia.bortal.model.Bill;
@@ -11,7 +12,6 @@ public interface TestDataBeanLocal {
 
 
     EventMap generateTestMap(Event event);
     EventMap generateTestMap(Event event);
 
 
-
     void generateTestPlaces(EventMap map);
     void generateTestPlaces(EventMap map);
 
 
 
 
@@ -23,4 +23,6 @@ public interface TestDataBeanLocal {
 
 
     public void printPlacesInfo();
     public void printPlacesInfo();
 
 
+    void generateTestCompos(Event event);
+
 }
 }

code/LanBortalWeb/src/fi/insomnia/bortal/view/TestDataView.java

@@ -23,14 +23,12 @@ import fi.insomnia.bortal.model.User;
 @RequestScoped
 @RequestScoped
 public class TestDataView {
 public class TestDataView {
 
 
-
-    @EJB 
+    @EJB
     private TestDataBeanLocal testdatabean;
     private TestDataBeanLocal testdatabean;
-    
+
     @ManagedProperty("#{sessionHandler}")
     @ManagedProperty("#{sessionHandler}")
     private SessionHandler sessionhandler;
     private SessionHandler sessionhandler;
-    
-    
+
     public void generateData() {
     public void generateData() {
         
         
         Event event = getSessionhandler().getCurrentEvent();
         Event event = getSessionhandler().getCurrentEvent();
@@ -39,24 +37,21 @@ public class TestDataView {
         EventMap map = testdatabean.generateTestMap(event);
         EventMap map = testdatabean.generateTestMap(event);
         testdatabean.generateTestPlaces(map);
         testdatabean.generateTestPlaces(map);
 
 
+        testdatabean.generateTestCompos(event);
     }
     }
 
 
-
     /** Creates a new instance of TestDataView */
     /** Creates a new instance of TestDataView */
     public TestDataView() {
     public TestDataView() {
     }
     }
 
 
-
     public void setSessionhandler(SessionHandler sessionhandler) {
     public void setSessionhandler(SessionHandler sessionhandler) {
         this.sessionhandler = sessionhandler;
         this.sessionhandler = sessionhandler;
     }
     }
 
 
-
     public SessionHandler getSessionhandler() {
     public SessionHandler getSessionhandler() {
         return sessionhandler;
         return sessionhandler;
     }
     }
 
 
-
     public String printPlacesInfo() {
     public String printPlacesInfo() {
         testdatabean.printPlacesInfo();
         testdatabean.printPlacesInfo();