Skip to content

Riina Antikainen / Moya

Go to a project
Commit 74e48fdb by Tuukka Kivilahti
Options

Merge branch 'help' into 'master' 

Conversation keepalive

Keep conversation alive ( create ajax query every 20 seconds)
Minor template fixing

See merge request !176
2 parents 8fdb8ed2 f256b97d
Inline Side-by-side
Showing with 258 additions and 112 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ProductPBean.java
......@@ -158,7 +158,7 @@ public class ProductPBean {
// flush changes to db.
// userFacade.flush();
lbean.sendMessage(MoyaEventType.ACCOUNTEVENT_INFO, permbean.getCurrentUser(), "User created accountevent: ", ret.getId());
lbean.sendMessage(MoyaEventType.ACCOUNTEVENT_INFO, user, "User created accountevent: for product ", ret.getProduct().getName(), " count: ", ret.getQuantity());
return ret;
}
}
code/moya-parent/pom.xml
......@@ -47,6 +47,16 @@
<version>0.0.0-2013-08-19</version>
</dependency>
<dependency>
<groupId>net.glxn</groupId>
<artifactId>qrgen</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>net.sf.barcode4j</groupId>
<artifactId>barcode4j</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.4-alpha1</version>
......
code/moya-web/WebContent/resources/script/prime_calendar.js
PrimeFaces.locales ['fi'] = {
PrimeFaces.locales['fi'] = {
closeText: 'Sulje',
prevText: 'Edellinen',
nextText: 'Seuraava',
......@@ -12,7 +12,7 @@ PrimeFaces.locales ['fi'] = {
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix:'',
yearSuffix: '',
timeOnlyTitle: 'Vain aika',
timeText: 'Aika',
hourText: 'Tunti',
......@@ -24,4 +24,140 @@ PrimeFaces.locales ['fi'] = {
week: 'Viikko',
day: 'Päivä',
allDayText: 'Koko päivä'
};
PrimeFaces.locales['swe'] = {
closeText: 'Stäng',
prevText: 'Föregående',
nextText: 'Nästa',
monthNames: ['januari', 'februari', 'mars', 'april', 'maj', 'juni', 'juli', 'augusti', 'september', 'oktober', 'november', 'december' ],
monthNamesShort: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'aug', 'sep', 'okt', 'nov', 'dec' ],
dayNames: ['söndag', 'måndag', 'tisdag', 'onsdag', 'torsdag', 'fredag', 'lördag'],
dayNamesShort: ['sön', 'mån', 'tis', 'ons', 'tor', 'fre', 'lör'],
dayNamesMin: ['sö', 'må', 'ti', 'on', 'to', 'fr', 'lö'],
weekHeader: 'Vecka',
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: '',
timeOnlyTitle: 'Endast tid',
timeText: 'Tid',
hourText: 'timmar',
minuteText: 'minuter',
secondText: 'sekunder',
currentText: 'Nuvarande datum',
ampm: false,
month: 'månad',
week: 'vecka',
day: 'dag',
allDayText: 'Hela dagen'
};
PrimeFaces.locales['de'] = {
closeText: 'Schließen',
prevText: 'Zurück',
nextText: 'Weiter',
currentText: 'Start',
monthNames: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
monthNamesShort: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
dayNames: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
dayNamesShort: ['Son', 'Mon', 'Die', 'Mit', 'Don', 'Fre', 'Sam'],
dayNamesMin: ['S', 'M', 'D', 'M ', 'D', 'F ', 'S'],
weekHeader: 'Woche',
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: '',
timeOnlyTitle: 'Nur Zeit',
timeText: 'Zeitasdads',
hourText: 'Stunde',
minuteText: 'Minute',
secondText: 'Sekunde',
currentText: 'Aktuelles Datum',
ampm: false,
month: 'Monat',
week: 'Woche',
day: 'Tag',
allDayText: 'Ganzer Tag'
};
PrimeFaces.locales['fr'] = {
closeText: 'Fermer',
prevText: 'Précédent',
nextText: 'Suivant',
monthNames: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre' ],
monthNamesShort: ['Jan', 'Fév', 'Mar', 'Avr', 'Mai', 'Jun', 'Jul', 'Aoû', 'Sep', 'Oct', 'Nov', 'Déc' ],
dayNames: ['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'],
dayNamesShort: ['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'],
dayNamesMin: ['D', 'L', 'M', 'M', 'J', 'V', 'S'],
weekHeader: 'Semaine',
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: '',
timeOnlyTitle: 'Choisir l\'heure',
timeText: 'Heure',
hourText: 'Heures',
minuteText: 'Minutes',
secondText: 'Secondes',
currentText: 'Maintenant',
ampm: false,
month: 'Mois',
week: 'Semaine',
day: 'Jour',
allDayText: 'Toute la journée'
};
PrimeFaces.locales['en'] = {
closeText: 'Close',
prevText: 'Previous',
nextText: 'Next',
monthNames: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' ],
monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ],
dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Tue', 'Fri', 'Sat'],
dayNamesMin: ['S', 'M', 'T', 'W ', 'T', 'F ', 'S'],
weekHeader: 'Week',
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: '',
timeOnlyTitle: 'Only Time',
timeText: 'Time',
hourText: 'Time',
minuteText: 'Minute',
secondText: 'Second',
currentText: 'Current Date',
ampm: false,
month: 'Month',
week: 'week',
day: 'Day',
allDayText: 'All Day'
};
PrimeFaces.locales['ru'] = {
closeText: 'Закрыть',
prevText: 'Назад',
nextText: 'Вперёд',
monthNames: ['Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь' ],
monthNamesShort: ['Янв', 'Фев', 'Мар', 'Апр', 'Май', 'Июн', 'Июл', 'Авг', 'Сен', 'Окт', 'Ноя', 'Дек' ],
dayNames: ['Воскресенье', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Субота'],
dayNamesShort: ['Воск', 'Пон', 'Вт', 'Ср', 'Четв', 'Пят', 'Суб'],
dayNamesMin: ['В', 'П', 'Вт', 'С ', 'Ч', 'П ', 'Сб'],
weekHeader: 'Неделя',
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix: '',
timeOnlyTitle: 'Только время',
timeText: 'Время',
hourText: 'Час',
minuteText: 'Минута',
secondText: 'Секунда',
currentText: 'Сегодня',
ampm: false,
month: 'Месяц',
week: 'неделя',
day: 'День',
allDayText: 'Весь день'
};
\ No newline at end of file
code/moya-web/WebContent/resources/templates/primelayout/template.xhtml
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html>
<html class="no-js" xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
<html class="no-js" xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
<f:view contentType="text/html" locale="#{sessionHandler.locale}">
......@@ -19,6 +20,7 @@
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/primelayout/css/skinning.css" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/primelayout/css/structual.css" />
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/custom_components.css" />
<script type="text/javascript" src="#{request.contextPath}/resources/script/prime_calendar.js" ></script>
<ui:insert name="headerdata" />
......@@ -38,10 +40,19 @@
<h:body>
<!-- Javascript-lokalisaatiolippupuljausta -->
<h:form id="conversationKeepaliver">
<p:remoteCommand name="cdiKeepalive" update=":cdiloop" actionListener="#{conversationKeepaliveView.ping()}" />
</h:form>
<h:outputText id="cdiloop" value="#{conversationKeepaliveView.value}" />
<script type="text/javascript">
$(document)
.ready(
function() {
setInterval(function() {
cdiKeepalive();
}, 20000);
<ui:repeat value="#{localeSelectorView.availableLocales}" var="loc" varStatus="idx">
$(
".languageSelector .ui-button:eq(#{idx.index})")
......@@ -63,30 +74,24 @@
<p:layout widgetVar="mainlayout" fullPage="true" id="mainlayoutpanel">
<p:layout widgetVar="mainlayout" fullPage="true" id="mainlayoutpanel" >
<p:layoutUnit id="toppanel" position="north" styleClass="bgColor1" size="60">
<div id="header_box">
<div id="header_left">
<h:link outcome="/index">
<h:link id="logolink" outcome="/index">
<c:choose>
<c:when test="#{sessionHandler.isInDevelopmentMode()}">
<img src="#{request.contextPath}/resources/templates/insomnia2/img/devel_logo.png" />
</c:when>
<c:otherwise>
<p:graphicImage rendered="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" />
<p:graphicImage id="eventlogo" rendered="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" />
<ui:fragment rendered="#{!layoutView.headerIsImage}">
<h1>
<h:outputText value="#{layoutView.headertext}" />
......@@ -100,17 +105,17 @@
<div id="header_center">
<h:form rendered="#{menuView.renderTopmenuChanger}">
<p:button outcome="/index" value="#{i18n['mode.user']}" />
<p:button outcome="/useradmin/list" value="#{i18n['mode.admin']}" />
</h:form>
<h:form id="adminchanger" rendered="#{menuView.renderTopmenuChanger}">
<p:button id="user" outcome="/index" value="#{i18n['mode.user']}" />
<p:button id="admin" outcome="/useradmin/list" value="#{i18n['mode.admin']}" />
</h:form>
<ui:fragment rendered="#{layoutView.canManageContent}">
<div>
<h:form>
<h:form id="contentlinks">
<h:outputLabel for="manageBtn" value="#{i18n['content.showContentEditLinks']}" />
<h:selectBooleanCheckbox value="#{sessionStore.manageContentLinks}" onclick="this.form.submit()" />
<h:selectBooleanCheckbox id="showcontentlinks" value="#{sessionStore.manageContentLinks}" onclick="this.form.submit()" />
</h:form>
</div>
</ui:fragment>
......@@ -123,9 +128,9 @@
</p:layoutUnit>
<p:layoutUnit header="#{i18n['menu']}" collapsible="true" id="leftpanel" position="west" resizable="true" size="225" minSize="100" >
<p:layoutUnit header="#{i18n['menu']}" collapsible="true" id="leftpanel" position="west" resizable="true" size="225" minSize="100">
<p:fieldset rendered="#{sessionHandler.loggedIn}">
<p:fieldset id="leftlogin" rendered="#{sessionHandler.loggedIn}">
<h:outputText value="#{i18n['template.loggedInAs']}" />
<br />
<b><h:outputText value="#{sessionHandler.currentUser.login}" /></b>
......@@ -143,18 +148,20 @@
</h:form>
<h:link style="font-size: 10px;" rendered="#{readerView.shopToOthers}" outcome="/shop/showReaderEvents" value="Readers" />
</nav>
<br />
<p:fieldset rendered="#{!sessionHandler.loggedIn}">
<br />
<p:fieldset id="leftuserinfo" rendered="#{!sessionHandler.loggedIn}">
<div style="text-align: left; padding: 0.7em;">
<h:form>
<p:inputText styleClass="form" id="linelogin" value="#{authView.login}" />
<p:watermark for="linelogin" value="#{i18n['login.username']}" />
<p:watermark for="linelogin" value="#{i18n['login.username']}" />
<br />
<p:password styleClass="form" id="linepwd" value="#{authView.password}" />
<p:watermark for="linepwd" value="#{i18n['login.password']}" />
<br /><br />
<br />
<br />
<p:commandButton update="messages" styleClass="button" id="onelinesubmit" action="#{authView.executeLoginAction}" ajax="false" value="#{i18n['login.submit']}" />
<br /><br />
<br />
<br />
</h:form>
<ui:fragment rendered="#{authView.canCreateUser}">
<h:link value="#{i18n['submenu.user.create']}" outcome="/user/create" />
......@@ -209,8 +216,11 @@
<f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
</h:link>
<footer class="bgColor1"> </footer>
</p:layoutUnit>
</p:layout>
<h:form>
......@@ -222,79 +232,24 @@
<footer class="bgColor1"> </footer>
<script type="text/javascript">
$(function() {
// autoresize for main panels, this is magic :)
PrimeFaces.widgets.mainlayout.layout.loadCookie();
PrimeFaces.widgets.mainlayout.onclose = function() {
PrimeFaces.widgets.mainlayout.layout.saveCookie()
}
PrimeFaces.widgets.mainlayout.onopen = function() {
PrimeFaces.widgets.mainlayout.layout.saveCookie()
}
$(function() {
// autoresize for main panels, this is magic :)
PrimeFaces.widgets.mainlayout.layout.loadCookie();
PrimeFaces.widgets.mainlayout.onclose = function() {
PrimeFaces.widgets.mainlayout.layout.saveCookie()
}
PrimeFaces.widgets.mainlayout.onopen = function() {
PrimeFaces.widgets.mainlayout.layout.saveCookie()
}
});
});
PrimeFaces.locales['fi'] = {
closeText : 'Sulje',
prevText : 'Edellinen',
nextText : 'Seuraava',
currentText : 'Tänään',
monthNames : [ 'Tammikuu', 'Helmikuu', 'Maaliskuu', 'Huhtikuu',
'Toukokuu', 'Kesäkuu', 'Heinäkuu', 'Elokuu', 'Syyskuu',
'Lokakuu', 'Marraskuu', 'Joulukuu' ],
monthNamesShort : [ 'Tammikuu', 'Helmikuu', 'Maaliskuu',
'Huhtikuu', 'Toukokuu', 'Kesäkuu', 'Heinäkuu',
'Elokuu', 'Syyskuu', 'Lokakuu', 'Marraskuu', 'Joulukuu' ],
dayNames : [ 'Sunnuntai', 'Maanantai', 'Tiistain',
'Keskiviikko', 'Torstai', 'Perjantai', 'Lauantai' ],
dayNamesShort : [ 'Su', 'Ma', 'Ti', 'Ke', 'To', 'Pe', 'La' ],
dayNamesMin : [ 'Su', 'Ma', 'Ti', 'Ke', 'To', 'Pe', 'La' ],
weekHeader : 'vk',
firstDay : 1,
isRTL : false,
showMonthAfterYear : false,
yearSuffix : '',
month : 'Kuukausi',
week : 'Viikko',
day : 'Päivä',
allDayText : 'Koko päivä'
};
PrimeFaces.locales['und'] = {
closeText : 'Sulje',
prevText : 'Edellinen',
nextText : 'Seuraava',
currentText : 'Tänään',
monthNames : [ 'Tammikuu', 'Helmikuu', 'Maaliskuu', 'Huhtikuu',
'Toukokuu', 'Kesäkuu', 'Heinäkuu', 'Elokuu', 'Syyskuu',
'Lokakuu', 'Marraskuu', 'Joulukuu' ],
monthNamesShort : [ 'Tammikuu', 'Helmikuu', 'Maaliskuu',
'Huhtikuu', 'Toukokuu', 'Kesäkuu', 'Heinäkuu',
'Elokuu', 'Syyskuu', 'Lokakuu', 'Marraskuu', 'Joulukuu' ],
dayNames : [ 'Sunnuntai', 'Maanantai', 'Tiistain',
'Keskiviikko', 'Torstai', 'Perjantai', 'Lauantai' ],
dayNamesShort : [ 'Su', 'Ma', 'Ti', 'Ke', 'To', 'Pe', 'La' ],
dayNamesMin : [ 'Su', 'Ma', 'Ti', 'Ke', 'To', 'Pe', 'La' ],
weekHeader : 'vk',
firstDay : 1,
isRTL : false,
showMonthAfterYear : false,
yearSuffix : '',
month : 'Kuukausi',
week : 'Viikko',
day : 'Päivä',
allDayText : 'Koko päivä'
};
</script>
<c:if test="#{sessionHandler.isInDevelopmentMode()}">
......
code/moya-web/pom.xml
......@@ -34,27 +34,13 @@
<artifactId>primefaces</artifactId>
<version>5.1</version>
</dependency>
<dependency>
<groupId>net.glxn</groupId>
<artifactId>qrgen</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>org.primefaces.extensions</groupId>
<artifactId>all-themes</artifactId>
<version>1.0.8</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>net.sf.barcode4j</groupId>
<artifactId>barcode4j</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>net.matlux</groupId>
<artifactId>jvm-breakglass</artifactId>
<version>0.0.7</version>
</dependency>
</dependencies>
<parent>
<groupId>fi.codecrew.moya</groupId>
......
code/moya-web/src/main/java/fi/codecrew/moya/handler/SessionStore.java
......@@ -66,7 +66,7 @@ public class SessionStore implements Serializable {
locale = ret;
}
logger.info("Using locale {}",ret);
// logger.info("Using locale {}",ret);
return ret;
}
......
code/moya-web/src/main/java/fi/codecrew/moya/web/ConversationKeepaliveView.java 0 → 100644
/*
* Copyright Codecrew Ry
*
* All rights reserved.
*
* This license applies to any software containing a notice placed by the
* copyright holder. Such software is herein referred to as the Software.
* This license covers modification, distribution and use of the Software.
*
* Any distribution and use in source and binary forms, with or without
* modification is not permitted without explicit written permission from the
* copyright owner.
*
* A non-exclusive royalty-free right is granted to the copyright owner of the
* Software to use, modify and distribute all modifications to the Software in
* future versions of the Software.
*
*/
package fi.codecrew.moya.web;
import java.io.Serializable;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Named;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Named
@ConversationScoped
public class ConversationKeepaliveView implements Serializable {
/**
*
*/
private static final long serialVersionUID = -3393159401702699270L;
private int value = 0;
private static final Logger logger = LoggerFactory.getLogger(ConversationKeepaliveView.class);
public int ping() {
return ++value;
}
public int getValue() {
return value;
}
public void setValue(int value) {
this.value = value;
}
}
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!