prelento-commit

code/moya-web/WebContent/place/eticketStandalone.xhtml

@@ -19,30 +19,26 @@
 
             <h:form id="etickets">
 
-                TODO: this will be done
-                #{standaloneEticketView.user.user.wholeName}
-                <!--
+
                                 <br /><br />
                                 <p:commandButton value="#{i18n['print']}" type="button" icon="ui-icon-print"  style="display:block;margin-bottom: 20px">
                                     <p:printer target="eticketpanel"/>
                                 </p:commandButton>
 
-                                <p:commandButton icon="ui-icon-mail-closed" value="#{i18n['etickets.sendAsMail']}" actionListener="#{eticketView.sendAsMail}" /><br/><br/><br/>
-
 
                                 <p:outputPanel id="eticketpanel">
 
                                     <p:fieldset legend="#{i18n['etickets.eticketcode']}" style="width: 250px; ">
                                         <p:outputPanel style="text-align: center;">
 
-                                            <p:barcode id="userqrcode" value="#{eticketView.userTextCode}" type="qr" width="200" height="200"/><br />
-                                            <p:outputLabel for="userqrcode" value="#{eticketView.userTextCode}"/>
+                                            <p:barcode id="userqrcode" value="#{standaloneEticketView.userTextCode}" type="qr" width="200" height="200"/><br />
+                                            <p:outputLabel for="userqrcode" value="#{standaloneEticketView.userTextCode}"/>
                                         </p:outputPanel>
                                     </p:fieldset>
                                     <br /><br />
 
                                     <p:fieldset legend="#{i18n['etickets.placeinfo']}">
-                                        <p:dataTable value="#{eticketView.groupMemberships}" var="member" id="placestable">
+                                        <p:dataTable value="#{standaloneEticketView.groupMemberships}" var="member" id="placestable">
 
                                             <p:column>
                                                 <f:facet name="header">
@@ -68,12 +64,15 @@
                                     </p:fieldset>
                                     <br /><br />
 
+
+
                                     <h2>#{i18n['etickets.placemap']}</h2>
-                                    <p:graphicImage rendered="" url="/PlaceMap?mapid=#{mapView.activeMap.id}&amp;userid=#{userView.selectedUser.user.id}" styleClass="printImage"/>
+                                    <p:commandButton rendered="#{!standaloneEticketView.mapVisible}" value="#{i18n['etickets.showMap']}" actionListener="#{standaloneEticketView.showMap}" update="mapImage" />
+                                    <p:graphicImage id="mapImage" rendered="#{standaloneEticketView.mapVisible}" url="/PlaceMap?mapid=#{mapView.activeMap.id}&amp;token=#{standaloneEticketView.token}" styleClass="printImage"/>
 
 
                 </p:outputPanel>
-                 -->
+
 
             </h:form>
 

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/eticket/StandaloneEticketView.java

@@ -81,6 +81,8 @@ public class StandaloneEticketView extends GenericCDIView {
 
 	private Map<Integer, String> inviteMails = new HashMap<>();
 
+	private boolean mapVisible = false;
+
 
 
 
@@ -117,6 +119,10 @@ public class StandaloneEticketView extends GenericCDIView {
 		return "width: " + (width+100) + "px;";
 	}
 
+	public void showMap() {
+		mapVisible = true;
+	}
+
 
 	public EventUser getUser() {
 		return user;
@@ -133,6 +139,14 @@ public class StandaloneEticketView extends GenericCDIView {
 	public void setToken(String token) {
 		this.token = token;
 	}
+
+	public boolean isMapVisible() {
+		return mapVisible;
+	}
+
+	public void setMapVisible(boolean mapVisible) {
+		this.mapVisible = mapVisible;
+	}
 }
 
 

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties

@@ -516,3 +516,4 @@ place.mapY=
 place.cancelSend=Peruuta siirto
 place.buyable=
 etickets.sendAsMail=L\u00E4het\u00E4 s\u00E4hk\u00F6postina
+etickets.showMap=N\u00E4yt\u00E4 kartta

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties

@@ -1663,3 +1663,4 @@ placegroupview.owner=Owner
 place.send=Transfer place
 place.cancelSend=Cancel transfer
 etickets.sendAsMail=Send as mail
+etickets.showMap=Show map

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties

@@ -1644,3 +1644,4 @@ placegroupview.owner=Omistaja
 place.send=Siirr\u00E4 paikka
 place.cancelSend=Peruuta siirto
 etickets.sendAsMail=L\u00E4het\u00E4 s\u00E4hk\u00F6postiin
+etickets.showMap=N\u00E4yt\u00E4 kartta