Random...

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

@@ -77,7 +77,7 @@ public class Menubean implements MenubeanLocal {
 		frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/logout"), null).setVisible(false);
 		frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/logoutResponse"), null).setVisible(false);
 		frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/resetPassword"), null).setVisible(false);
-		frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/resetMailSent"), null).setVisible(false);
+		frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/resetmailSent"), null).setVisible(false);
 		frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/passwordChanged"), null).setVisible(false);
 		frontTopnavi.addPage(menuitemfacade.findOrCreate("/auth/notauthorized"), null).setVisible(false);
 

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

@@ -15,7 +15,7 @@ public interface CheckoutFiBeanLocal {
 
 	List<CheckoutBank> getToken(Bill bill);
 
-	// List<CheckoutBank> testXml();
+//	List<CheckoutBank> testXml();
 
 	boolean validateReturn(CheckoutReturnType returnType, String version, String stamp, String reference, String payment, String status, String algorithm, String mac);
 

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader.java

@@ -14,6 +14,8 @@ import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
@@ -49,6 +51,10 @@ public class Reader extends GenericEntity {
         this.setEvent(ev);
     }
 
+    @Column(nullable = false, name = "type")
+    @Enumerated(EnumType.STRING)
+    private ReaderType type;
+
     public static final String EVENT_ID_COLUMN = "event_id";
     @ManyToOne()
     @JoinColumn(name = EVENT_ID_COLUMN, nullable = false)

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java

@@ -6,7 +6,7 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-05-12T14:43:39.114+0300")
+@Generated(value="Dali", date="2012-09-09T02:58:31.995+0300")
 @StaticMetamodel(Reader.class)
 public class Reader_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Reader, LanEvent> event;
@@ -20,4 +20,5 @@ public class Reader_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Reader, Integer> mapX;
 	public static volatile SingularAttribute<Reader, Integer> mapY;
 	public static volatile ListAttribute<Reader, ReaderEvent> events;
+	public static volatile SingularAttribute<Reader, ReaderType> type;
 }

code/LanBortalWeb/WebContent/bill/showBill.xhtml

@@ -38,7 +38,25 @@
 							});
 				</script>
 			</ui:fragment>
-
+	<ui:fragment rendered="#{billEditView.checkoutFiAvailable}">
+				
+				<table border="0">				
+				<tr>
+				
+				<ui:repeat varStatus="idx" value="#{billEditView.checkoutFiToken}" var="bank">
+				  <td>
+				  <form action="#{bank.url}" method="post">
+					<ui:repeat value="#{bank.postParams}" var="valp" >
+					  <input type="hidden" name="#{valp.key}" value="#{valp.value}" /> 
+					</ui:repeat>
+				    <input type='image' src='#{bank.icon}' />
+			      </form>
+			      </td>
+			      <h:outputText escape="false" value="&lt;/tr>&lt;tr>" rendered="#{idx.index % 4 == 3}"/>				
+				</ui:repeat>
+			  </tr>
+			  </table>
+			</ui:fragment>
 		</ui:define>
 
 	</ui:composition>

code/LanBortalWeb/WebContent/layout/insomnia2/template.xhtml

@@ -16,7 +16,6 @@
 
 	</h:head>
 	<h:body>
-
 		<div id="header">
 			<div id="logo">
 				<h:link outcome="/index">
@@ -93,7 +92,20 @@
 			<h:link  rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editBottom']}" outcome="/pages/manage">
 				<f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
 			</h:link>
-			<div id="container" class="bottom"></div>
+			<div id="container" class="bottom">
+			<!-- Piwik --> 
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://jolez.pingtimeout.net/piwik/" : "http://jolez.pingtimeout.net/piwik/");
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 5);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://jolez.pingtimeout.net/piwik/piwik.php?idsite=5" style="border:0" alt="" /></p></noscript>
+<!-- End Piwik Tracking Code -->
+			</div>
 		</div>
 
 

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties

@@ -502,6 +502,7 @@ submenu.pages.create                 = Create content
 submenu.pages.list                   = List pages
 submenu.place.insertToken            = Insert placecode
 submenu.place.myGroups               = Place reservations
+submenu.place.placemap               = Placemap
 submenu.poll.index                   = Polls
 submenu.product.create               = Create product
 submenu.product.list                 = List products
@@ -524,6 +525,7 @@ submenu.useradmin.create             = Create user
 submenu.useradmin.createCardTemplate = Create cardtemplate
 submenu.useradmin.list               = List users
 submenu.useradmin.listCardTemplates  = Card templates
+submenu.useradmin.validateUser       = Validate user
 submenu.voting.compolist             = Compos
 submenu.voting.create                = Create new compo
 submenu.voting.myEntries             = My entries

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties

@@ -487,6 +487,7 @@ submenu.pages.create                 = Luo sis\u00E4lt\u00F6\u00E4
 submenu.pages.list                   = N\u00E4yt\u00E4 sis\u00E4ll\u00F6t
 submenu.place.insertToken            = Sy\u00F6t\u00E4 paikkakoodi
 submenu.place.myGroups               = Omat paikkavaraukset
+submenu.place.placemap               = Paikkakartta
 submenu.poll.index                   = Kyselyt
 submenu.product.create               = Uusi tuote
 submenu.product.list                 = Listaa tuotteet
@@ -512,6 +513,7 @@ submenu.useradmin.create             = Luo uusi k\u00E4ytt\u00E4j\u00E4
 submenu.useradmin.createCardTemplate = Luo uusi korttipohja
 submenu.useradmin.list               = Listaa k\u00E4ytt\u00E4j\u00E4t
 submenu.useradmin.listCardTemplates  = Listaa korttipohjat
+submenu.useradmin.validateUser       = Validoi k\u00E4ytt\u00E4j\u00E4
 submenu.voting.compolist             = Kilpailut
 submenu.voting.create                = Uusi kilpailu
 submenu.voting.myEntries             = Omat entryt

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi_IN.properties

@@ -2,7 +2,7 @@
 #Bill number
 # Validationmessages
 
-bill.billMarkedPaidMail.message = Laskusi numero {0} on merkitty maksetuksi. Voit nyt siirty\u00E4 lippukauppaan varamaamaan haluamasi paikat. \nTervetuloa tapahtumaan\!\n\nTerveisin,\nInsomnia lippupalvelu\nwww.insomnia.fi
+bill.billMarkedPaidMail.message = Laskusi numero {0} on merkitty maksetuksi. Voit nyt siirty\u00E4 lippukauppaan varamaamaan haluamasi paikat. \nTervetuloa tapahtumaan!\n\nTerveisin,\nInsomnia lippupalvelu\nwww.insomnia.fi
 bill.billMarkedPaidMail.subject = [INSOMNIA] Lasku merkitty maksetuksi
 
 eventorg.edit = Muokkaa

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlaceView.java

@@ -41,6 +41,7 @@ public class PlaceView extends GenericCDIView {
 
 	@EJB
 	private transient UserBeanLocal userbean;
+	
 	@EJB
 	private transient PlaceBeanLocal placebean;
 

code/LanBortalWeb/src/fi/insomnia/bortal/web/helpers/ProductShopItem.java

@@ -25,6 +25,7 @@ public class ProductShopItem {
 	private BigDecimal limit;
 
 	public ProductShopItem(Product prod) {
+		super();
 		this.product = prod;
 		id = this.product.getId();
 		setCount(BigDecimal.ZERO);