Skip to content

Riina Antikainen / Moya

Go to a project
Commit d4fbb11c by Tuomas Riihimäki
Options

Make cdi keepalive fail more gracefuly ( javascript alert() instead on reloading to error )

1 parent b10e766e
Inline Side-by-side
Showing with 46 additions and 41 deletions
code/moya-web/WebContent/resources/templates/primelayout/template.xhtml
......@@ -20,7 +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>
<script type="text/javascript" src="#{request.contextPath}/resources/script/prime_calendar.js"></script>
<ui:insert name="headerdata" />
......@@ -41,9 +41,8 @@
<h:body>
<!-- Javascript-lokalisaatiolippupuljausta -->
<h:form id="conversationKeepaliver">
<p:remoteCommand name="cdiKeepalive" onerror="location.reload();" update=":cdiloop" actionListener="#{conversationKeepaliveView.ping()}" />
<p:remoteCommand name="cdiKeepalive" onerror="alert('#{i18n['template.keepaliveError']}'); location.reload();" update=":cdiloop" actionListener="#{conversationKeepaliveView.ping()}" />
</h:form>
<h:outputText id="cdiloop" value="#{conversationKeepaliveView.value}" />
<script type="text/javascript">
$(document)
......@@ -93,9 +92,7 @@
<c:otherwise>
<p:graphicImage id="eventlogo" rendered="#{layoutView.headerIsImage}" value="#{layoutView.headerimage}" />
<ui:fragment rendered="#{!layoutView.headerIsImage}">
<h1>
<h:outputText value="#{layoutView.headertext}" />
</h1>
<h1><h:outputText value="#{layoutView.headertext}" /></h1>
</ui:fragment>
</c:otherwise>
</c:choose>
......@@ -213,10 +210,15 @@
<f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
</h:link>
<footer class="bgColor1"> </footer>
</p:layoutUnit>
<p:layoutUnit position="south" size="30">
<footer class="bgColor1">
<h:outputText id="cdiloop" value="#{conversationKeepaliveView.date}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText>
</footer>
</p:layoutUnit>
</p:layout>
......@@ -252,8 +254,6 @@
}
});
</script>
<c:if test="#{sessionHandler.isInDevelopmentMode()}">
......
code/moya-web/src/main/java/fi/codecrew/moya/web/ConversationKeepaliveView.java
......@@ -19,6 +19,7 @@
package fi.codecrew.moya.web;
import java.io.Serializable;
import java.util.Date;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Named;
......@@ -35,12 +36,10 @@ 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;
}
......@@ -52,6 +51,9 @@ public class ConversationKeepaliveView implements Serializable {
public void setValue(int value) {
this.value = value;
}
public Date getDate() {
return new Date();
}
}
\ No newline at end of file
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
......@@ -170,6 +170,7 @@ event.domains.title = Domain
event.edit = Edit
event.endTime = End time
event.id = Event ID
event.listFutureEvents.title = Lista tulevista tapahtumista
event.name = Event name
event.nextBillNumber = Initial bill number
event.nodates.message = Lis\u00E4\u00E4 tapahtumaan v\u00E4hint\u00E4\u00E4n aloitusp\u00E4iv\u00E4, lopetusp\u00E4iv\u00E4 sek\u00E4 lipunmyynnin aloitusp\u00E4iv\u00E4.
......@@ -194,7 +195,13 @@ eventmap.uploaderror = Virhe lis\u00E4tess\u00E4 karttapohjaa
eventmap.width = Kartan leveys (px)
eventorg.basicDetails = Perustiedot
eventorg.codecrewDetails = Tapahtuman j\u00E4rjest\u00E4j\u00E4tiedot
eventorg.codecrewNotes = Codecrew -muistiinpanot
eventorg.codecrewResponsible = Codecrewin tukihenkil\u00F6
eventorg.create = Create
eventorg.create.title = Luo tapahtumaj\u00E4rjest\u00E4j\u00E4
eventorg.list.title = Tapahtumaj\u00E4rjest\u00E4j\u00E4t
eventorg.organiserResponsible = J\u00E4rjest\u00E4j\u00E4n vastaava
eventorg.title = Tapahtuman tiedot
foodWave.closeNow = Close now
......@@ -383,6 +390,7 @@ placegroup.showEticket = N\u00E4yt\u00E4 lippu
placegroupview.groupCreator = Tilaaja
placegroupview.owner = Omistaja
placegroupview.placetransferred = Paikka annettu eteenp\u00E4in
placegroupview.reserveForSelf = Valitse paikka itsellesi
placegroupview.toptext = \
placeslot.add = Lis\u00E4\u00E4 placeslot
......@@ -528,11 +536,3 @@ vipProduct.name = Tuote
vipProduct.quantity = Lukum\u00E4\u00E4r\u00E4
yes = Kyll\u00E4
placegroupview.reserveForSelf=Valitse paikka itsellesi
eventorg.codecrewDetails=Tapahtuman j\u00E4rjest\u00E4j\u00E4tiedot
eventorg.codecrewResponsible=Codecrewin tukihenkil\u00F6
eventorg.organiserResponsible=J\u00E4rjest\u00E4j\u00E4n vastaava
eventorg.codecrewNotes=Codecrew -muistiinpanot
eventorg.list.title=Tapahtumaj\u00E4rjest\u00E4j\u00E4t
eventorg.create.title=Luo tapahtumaj\u00E4rjest\u00E4j\u00E4
event.listFutureEvents.title=Lista tulevista tapahtumista
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
......@@ -379,6 +379,7 @@ event.domains.title = Domain
event.edit = Edit
event.endTime = End time
event.id = Event ID
event.listFutureEvents.title = List of future events
event.name = Event name
event.nextBillNumber = Initial bill number
event.nodates.message = Remember to add event start-date, end-date and ticket's sales start-date.
......@@ -418,13 +419,19 @@ eventorg.billAddress2 = Billing address 2
eventorg.billAddress3 = Billing address 3
eventorg.billAddress4 = Billing address 4
eventorg.bundleCountry = Country bundle
eventorg.codecrewDetails = Event organizer information
eventorg.codecrewNotes = Codecrew notes
eventorg.codecrewResponsible = Codecrew support
eventorg.create = Create
eventorg.create.title = Create eventorganiser
eventorg.createEvent = Create event
eventorg.createevent = Create new event
eventorg.edit = Edit
eventorg.events = Event of the organisation
eventorg.id = Event ID
eventorg.list.title = Event organisers
eventorg.organisation = Organisation name
eventorg.organiserResponsible = Organizer responsible
eventorg.save = Save
eventorg.title = Event details
......@@ -977,6 +984,7 @@ placegroupview.placetransferred = Place is transferred
placegroupview.releasePlace = Release
placegroupview.reservationName = Place
placegroupview.reservationProduct = Ticket
placegroupview.reserveForSelf = Select place for yourself
placegroupview.token = Placecode / user
placeslot.add = Add placeslot
......@@ -1379,7 +1387,8 @@ svm.pending.successMessage = Payment pending. You will receive email after payme
svm.success.errorMessage = Payment could not be verified!
svm.success.successMessage = Payment was successfull.
template.loggedInAs = Logged in as
template.keepaliveError = Page has expired. Please refresh the page.
template.loggedInAs = Logged in as
topmenu.admin = Admin View
topmenu.helpdesk = Helpdesk
......@@ -1749,11 +1758,3 @@ voting.create.voteEnd = Voting close
voting.create.voteStart = Voting start
yes = Yes
placegroupview.reserveForSelf=Select place for yourself
eventorg.codecrewDetails=Event organizer information
eventorg.codecrewResponsible=Codecrew support
eventorg.organiserResponsible=Organizer responsible
eventorg.codecrewNotes=Codecrew notes
eventorg.list.title=Event organisers
eventorg.create.title=Create eventorganiser
event.listFutureEvents.title=List of future events
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
......@@ -381,10 +381,11 @@ event.domains.title = Verkkotunnus
event.edit = Muokkaa
event.endTime = Lopetusp\u00E4iv\u00E4
event.id = Eventin id
event.listFutureEvents.title = Lista tulevista tapahtumista
event.name = Tapahtuman nimi
event.nextBillNumber = Seuraavan laskun numero
event.nodates.message = Lis\u00E4\u00E4 tapahtumaan v\u00E4hint\u00E4\u00E4n aloitusp\u00E4iv\u00E4, lopetusp\u00E4iv\u00E4 sek\u00E4 lipunmyynnin aloitusp\u00E4iv\u00E4.
event.nodates.title = P\u00E4iv\u00E4m\u00E4\u00E4ri\u00E4 puuttuu\!
event.nodates.title = P\u00E4iv\u00E4m\u00E4\u00E4ri\u00E4 puuttuu!
event.privateProperties.title = Yksityiset ominaisuudet
event.properties.title = Ominaisuudet
event.referenceNumberBase = Viitenumeron pohja
......@@ -420,13 +421,19 @@ eventorg.billAddress2 = Laskutusosoite 2
eventorg.billAddress3 = Laskutusosoite 3
eventorg.billAddress4 = Laskutusosoite 4
eventorg.bundleCountry = Kieli-bundle
eventorg.codecrewDetails = Tapahtuman j\u00E4rjest\u00E4j\u00E4tiedot
eventorg.codecrewNotes = Codecrew -muistiinpanot
eventorg.codecrewResponsible = Codecrewin tukihenkil\u00F6
eventorg.create = Luo
eventorg.create.title = Luo tapahtumaj\u00E4rjest\u00E4j\u00E4
eventorg.createEvent = Luo tapahtuma
eventorg.createevent = Luo uusi tapahtuma
eventorg.edit = Muokkaa
eventorg.events = Organisaation tapahtumat
eventorg.id = Tapahtuman ID
eventorg.list.title = Tapahtumaj\u00E4rjest\u00E4j\u00E4t
eventorg.organisation = Organisaation nimi
eventorg.organiserResponsible = J\u00E4rjest\u00E4j\u00E4n vastaava
eventorg.save = Tallenna
eventorg.title = Tapahtuman tiedot
......@@ -962,6 +969,7 @@ placegroupview.placetransferred = Paikka on annettu eteenp\u00E4in.
placegroupview.releasePlace = Vapauta
placegroupview.reservationName = Paikka
placegroupview.reservationProduct = Lippu
placegroupview.reserveForSelf = Valitse paikka itsellesi
placegroupview.token = Paikkakoodi / k\u00E4ytt\u00E4j\u00E4
placeslot.add = Lis\u00E4\u00E4 placeslot
......@@ -1364,7 +1372,8 @@ svm.pending.successMessage = Maksukuittausta odotetaan. Kuittauksesta l\u00E4het
svm.success.errorMessage = Verkkomaksua ei voitu verifioida! Virheest\u00E4 on raportoitu eteenp\u00E4in.
svm.success.successMessage = Verkkomaksu onnistui.
template.loggedInAs = Kirjautunut tunnuksella
template.keepaliveError = Sivu on vanhentunut. Ole hyv\u00E4 ja p\u00E4ivit\u00E4 sivu.
template.loggedInAs = Kirjautunut tunnuksella
topmenu.admin = Yll\u00E4piton\u00E4kym\u00E4
topmenu.helpdesk = Helpdesk
......@@ -1733,11 +1742,3 @@ voting.create.voteEnd = \u00C4\u00E4nestys kiinni
voting.create.voteStart = \u00C4\u00E4nestys auki
yes = Kyll\u00E4
placegroupview.reserveForSelf=Valitse paikka itsellesi
eventorg.codecrewDetails=Tapahtuman j\u00E4rjest\u00E4j\u00E4tiedot
eventorg.codecrewResponsible=Codecrewin tukihenkil\u00F6
eventorg.organiserResponsible=J\u00E4rjest\u00E4j\u00E4n vastaava
eventorg.codecrewNotes=Codecrew -muistiinpanot
eventorg.list.title=Tapahtumaj\u00E4rjest\u00E4j\u00E4t
eventorg.create.title=Luo tapahtumaj\u00E4rjest\u00E4j\u00E4
event.listFutureEvents.title=Lista tulevista tapahtumista
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!