Skip to content

Max Mecklin / Moya

Go to a project
Commit 24eb9517 by Tuomas Riihimäki
Options

Change event logo to from jsf dynamicImage to cacheable FileDownloadServlet one. 

If image is not set, create text-one from logo textvalue
1 parent f7f04f68
Inline Side-by-side
Showing with 59 additions and 106 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/JaasBean.java
...@@ -95,21 +95,7 @@ public class JaasBean implements MoyaRealmBeanRemote { ...@@ -95,21 +95,7 @@ public class JaasBean implements MoyaRealmBeanRemote {
user = eventUser.getUser(); user = eventUser.getUser();
} }
// no user found, let's see if user is stupid and using email-address instead of username
// this is how it work's in theory, on practice, the fucking UserPrincipal get it's principal
// from used loginname, so, let's do this shit on loginview
/*if(user == null) {
List<User> users = userfacade.findByEmail(username);
// this must be 1, if there is more, it would just be quessing
logger.info("found by email some users {} ",users.size());
if(users.size() == 1) {
user = users.get(0);
eventUser = userbean.getEventUser(user,false);
}
}*/
logger.info("User '{}' with '{}' ", user, username); logger.info("User '{}' with '{}' ", user, username);
// If there is no eventuser found, try to create one. // If there is no eventuser found, try to create one.
......
code/moya-web/WebContent/resources/templates/blipview/template.xhtml
...@@ -31,12 +31,7 @@ ...@@ -31,12 +31,7 @@
<img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" /> <img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p:graphicImage rendered="#{!empty layoutView.headerimage}" value="#{layoutView.headerimage}" /> <img id="eventlogo" src="#{request.contextPath}/dydata/logo/#{layoutView.logoid}" />
<ui:fragment rendered="#{empty layoutView.headerimage}">
<h1>
<h:outputText value="#{layoutView.headertext}" />
</h1>
</ui:fragment>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
......
code/moya-web/WebContent/resources/templates/infoview/template.xhtml
...@@ -31,12 +31,7 @@ ...@@ -31,12 +31,7 @@
<img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" /> <img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p:graphicImage rendered="#{!empty layoutView.headerimage}" value="#{layoutView.headerimage}" /> <img id="eventlogo" src="#{request.contextPath}/dydata/logo/#{layoutView.logoid}" />
<ui:fragment rendered="#{empty layoutView.headerimage}">
<h1>
<h:outputText value="#{layoutView.headertext}" />
</h1>
</ui:fragment>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
......
code/moya-web/WebContent/resources/templates/insomnia2/template.xhtml
...@@ -25,12 +25,7 @@ ...@@ -25,12 +25,7 @@
<img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" /> <img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p:graphicImage rendered="#{!empty layoutView.headerimage}" value="#{layoutView.headerimage}" /> <img id="eventlogo" src="#{request.contextPath}/dydata/logo/#{layoutView.logoid}" />
<ui:fragment rendered="#{empty layoutView.headerimage}">
<h1>
<h:outputText value="#{layoutView.headertext}" />
</h1>
</ui:fragment>
<!-- <img src="#{request.contextPath}/resources/templates/insomnia2/img/logo.png" /> <!-- <img src="#{request.contextPath}/resources/templates/insomnia2/img/logo.png" />
<h1>STREAM INTRA</h1> --> <h1>STREAM INTRA</h1> -->
</c:otherwise> </c:otherwise>
......
code/moya-web/WebContent/resources/templates/moyav2/template.xhtml
...@@ -51,12 +51,7 @@ ...@@ -51,12 +51,7 @@
<img src="#{request.contextPath}/resources/templates/moyav2/img/dev_logo.png" alt="Development" /> <img src="#{request.contextPath}/resources/templates/moyav2/img/dev_logo.png" alt="Development" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p:graphicImage rendered="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" /> <img id="eventlogo" src="#{request.contextPath}/dydata/logo/#{layoutView.logoid}" />
<ui:fragment rendered="#{!layoutView.headerIsImage}">
<h1>
<h:outputText value="#{layoutView.headertext}" />
</h1>
</ui:fragment>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</h:link> </h:link>
......
code/moya-web/WebContent/resources/templates/primelayout/template.xhtml
...@@ -90,10 +90,7 @@ ...@@ -90,10 +90,7 @@
<img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" /> <img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p:graphicImage id="eventlogo" rendered="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" /> <img id="eventlogo" src="#{request.contextPath}/dydata/logo/#{layoutView.logoid}" />
<ui:fragment rendered="#{!layoutView.headerIsImage}">
<h1><h:outputText value="#{layoutView.headertext}" /></h1>
</ui:fragment>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</h:link> </h:link>
......
code/moya-web/WebContent/resources/templates/template1/template.xhtml
...@@ -69,12 +69,7 @@ ...@@ -69,12 +69,7 @@
<img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" /> <img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<p:graphicImage rendered="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" /> <img id="eventlogo" src="#{request.contextPath}/dydata/logo/#{layoutView.logoid}" />
<ui:fragment rendered="#{!layoutView.headerIsImage}">
<h1>
<h:outputText value="#{layoutView.headertext}" />
</h1>
</ui:fragment>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</h:link> </h:link>
......
code/moya-web/src/main/java/fi/codecrew/moya/servlet/FileDownloadServlet.java
...@@ -18,6 +18,13 @@ ...@@ -18,6 +18,13 @@
*/ */
package fi.codecrew.moya.servlet; package fi.codecrew.moya.servlet;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
...@@ -27,11 +34,13 @@ import java.util.regex.Matcher; ...@@ -27,11 +34,13 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.imageio.ImageIO;
import javax.servlet.annotation.WebServlet; import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.krysalis.barcode4j.output.bitmap.BitmapCanvasProvider;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -104,10 +113,26 @@ public class FileDownloadServlet extends GenericImageServlet { ...@@ -104,10 +113,26 @@ public class FileDownloadServlet extends GenericImageServlet {
ret.setResponse(HttpServletResponse.SC_NOT_FOUND); ret.setResponse(HttpServletResponse.SC_NOT_FOUND);
} }
else if (urlparts.get(0).equals("logo")) { else if (urlparts.get(0).equals("logo")) {
// Urlparts.get(1) == event.id. But no need to check, Just return the logo for this event
LanEventProperty logo = orgbean.getProperty(LanEventPropertyKey.EVENT_LOGO); LanEventProperty logo = orgbean.getProperty(LanEventPropertyKey.EVENT_LOGO);
if (logo != null) { if (logo != null) {
ret.setData(logo.getByteValue()); String mime = logo.getByteMime();
ret.setImagetype(logo.getByteMime()); byte[] data = logo.getByteValue();
if (mime == null || data == null || data.length == 0) {
try {
mime = "image/png";
data = makeImage(logo.getTextvalue()).toByteArray();
} catch (IOException e) {
mime = null;
data = null;
logger.warn("Error creating image from logo " + logo, e);
}
}
if (mime != null || data != null) {
ret.setData(data);
ret.setImagetype(mime);
}
} }
} else if (urlparts.get(0).equals("cardtemplate") && urlparts.size() > 2) } else if (urlparts.get(0).equals("cardtemplate") && urlparts.size() > 2)
{ {
...@@ -196,4 +221,24 @@ public class FileDownloadServlet extends GenericImageServlet { ...@@ -196,4 +221,24 @@ public class FileDownloadServlet extends GenericImageServlet {
} }
private ByteArrayOutputStream makeImage(String textvalue) throws IOException {
logger.info("Trying to create image from text {}", textvalue);
int w = 400;
int h = 45;
BufferedImage bufferedImage = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
Graphics2D graphics = bufferedImage.createGraphics();
// graphics.setComposite(AlphaComposite.Clear);
graphics.setColor(new Color(0, 0, 0, 0));
graphics.fillRect(0, 0, w, h);
graphics.setColor(Color.WHITE);
graphics.setFont(new Font("Arial Black", Font.BOLD, 45));
graphics.drawString(textvalue, 10, h);
ByteArrayOutputStream ostr = new ByteArrayOutputStream();
ImageIO.write(bufferedImage, "png", ostr);
return ostr;
}
} }
code/moya-web/src/main/java/fi/codecrew/moya/web/helper/LayoutView.java
...@@ -62,8 +62,6 @@ public class LayoutView implements Serializable { ...@@ -62,8 +62,6 @@ public class LayoutView implements Serializable {
private transient EventBeanLocal eventbean; private transient EventBeanLocal eventbean;
@EJB @EJB
private transient PermissionBeanLocal permbean; private transient PermissionBeanLocal permbean;
private StreamedContent headerimage;
private String headertext;
@Inject @Inject
private SessionStore sessionStore; private SessionStore sessionStore;
@EJB @EJB
...@@ -165,6 +163,8 @@ public class LayoutView implements Serializable { ...@@ -165,6 +163,8 @@ public class LayoutView implements Serializable {
return rb; return rb;
} }
public String getHeader() { public String getHeader() {
return new StringBuilder().append(eventbean.getCurrentEvent().getName()).append(" - ") return new StringBuilder().append(eventbean.getCurrentEvent().getName()).append(" - ")
...@@ -172,58 +172,8 @@ public class LayoutView implements Serializable { ...@@ -172,58 +172,8 @@ public class LayoutView implements Serializable {
} }
// public String header() { public Integer getLogoid(){
// logger.info("Context {}", context); return eventbean.getCurrentEvent().getId();
// UIViewRoot root = context.getViewRoot();
// Map<String, Object> viewmap = root.getViewMap(false);
// if (viewmap != null) {
// for (Entry<String, Object> entry : viewmap.entrySet()) {
// logger.info("Got entry {}: {}", entry.getKey(), entry.getValue());
// }
// }
// logger.info("Attrmap");
// if (context.getAttributes() != null) {
// for (Entry<Object, Object> e : context.getAttributes().entrySet()) {
// logger.info("Got attr {}: {}", e.getKey(), e.getValue());
// }
// }
// return "";
// }
public boolean getHeaderIsImage()
{
return getHeaderimage() != null;
}
public StreamedContent getHeaderimage() {
if (headertext == null && headerimage == null)
{
LanEventProperty logo = eventbean.getProperty(LanEventPropertyKey.EVENT_LOGO);
if (logo != null)
{
logger.info("Logo is not null. mime {}, bytes {}", logo.getByteMime(), logo.getByteValue().length);
if (logo.getByteMime() == null || logo.getByteValue() == null || logo.getByteValue().length == 0) {
headertext = logo.getTextvalue();
} else {
headerimage = new DefaultStreamedContent(new ByteArrayInputStream(logo.getByteValue()), logo.getByteMime());
}
} else {
headertext = "logo_not_set";
}
}
return headerimage;
}
public void setHeaderimage(StreamedContent headerimage) {
this.headerimage = headerimage;
}
public String getHeadertext() {
return headertext;
}
public void setHeadertext(String headertext) {
this.headertext = headertext;
} }
public void setPageName(String menuChange) { public void setPageName(String menuChange) {
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -1009,7 +1009,7 @@ placetoken.pageHeader = Lis\u00E4\u00E4 konepaikkakoodi ...@@ -1009,7 +1009,7 @@ placetoken.pageHeader = Lis\u00E4\u00E4 konepaikkakoodi
placetoken.placelist = Omat paikat placetoken.placelist = Omat paikat
placetoken.token = Paikkakoodi placetoken.token = Paikkakoodi
placetoken.tokenNotFound = Paikkakoodia ei l\u00F6ytynyt! Tarkista koodi. placetoken.tokenNotFound = Paikkakoodia ei l\u00F6ytynyt! Tarkista koodi.
placetoken.topText = Voit yhdist\u00E4\u00E4 paikan omaan k\u00E4ytt\u00E4j\u00E4tunnukseesi sy\u00F6tt\u00E4m\u00E4ll\u00E4 paikkakoodin allaolevaan kentt\u00E4\u00E4n. placetoken.topText = Voit yhdist\u00E4\u00E4 toisen k\u00E4ytt\u00E4j\u00E4n sinulle ostaman paikan omaan k\u00E4ytt\u00E4j\u00E4tunnukseesi sy\u00F6tt\u00E4m\u00E4ll\u00E4 paikkakoodin allaolevaan kentt\u00E4\u00E4n.
poll.answer = Vastaa kyselyyn poll.answer = Vastaa kyselyyn
poll.begin = Avaa kysely poll.begin = Avaa kysely
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!