Skip to content

Codecrew / Moya

Go to a project
Commit e2967700 by Antti Tönkyrä
Options

Merge branch 'master' of codecrew.fi:bortal

2 parents abbcf698 bd79cb55
Inline Side-by-side
Showing with 129 additions and 4 deletions
code/LanBortalWeb/WebContent/error.xhtml
......@@ -6,7 +6,7 @@
<title>Error</title>
</h:head>
<h:body>
<!-- <c:if test="#{sessionHandler.isInDevelopmentMode() eq true}"> -->
<!-- <c:if test="#{sessionHandler.isInDevelopmentMode() eq false}"> -->
<h1>#{i18n['error.error']}</h1>
<p>${i18n['error.contact']}
<br/><h:outputText escape="false" style="color: red;" value="#{errorPageView.time}" /><br/><br/>
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n.properties
......@@ -119,7 +119,7 @@ placegroupview.toptext = \
poll.edit = edit
product.providedRole = Tuote tarjoaa roolin
product.providedRole = Tuote m\u00E4\u00E4ritt\u00E4\u00E4 roolin
product.returnProductEdit = Palaa tuotteeseen:
product.saved = Tuote tallennettu
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
......@@ -30,6 +30,8 @@ actionlog.user = User
applicationPermission.description = description
applicationPermission.name = Rightsgroup
barcodeReader.readBarcode = Read barcode
bill.addr1 = Address 1
bill.addr2 = Address 2
bill.addr3 = Address 3
......@@ -85,6 +87,12 @@ cardTemplate.roles = Associated roles
cardTemplate.save = Save
cardTemplate.sendImage = Upload Image
cart.item = Item
cart.item_quantity = Quantity
cart.item_total = Total
cart.item_unitprice = Price
cart.total = Total
checkout.cancel.errorMessage = Error confirming the cancel\u2026 Please report this to code@codecrew.fi
checkout.cancel.successMessage = You can retry payment at your own bills.
checkout.reject.errorMessage = Error while processing rejected payment. Please report this error to code@codecrew.fi
......@@ -169,10 +177,23 @@ eventorgView.eventname = Name of event
eventorganiser.name = Eventorganiser
food = Food
foodWave.description = Description
foodWave.name = Name
foodWave.template.name = Name
foodWave.time = Time
foodshop.buyFromCounter = Pay at info
foodshop.buyFromInternet = Pay at Internet
game.gamepoints = Game points
gamepoints = Gamepoints
global.cancel = Cancel
global.copyright = Codecrew Ry
global.eventname = Event name
global.notAuthorizedExecute = You are not authorized to do that!!
global.notauthorized = You don't have enough rights to enter this site.
global.save = Save
......@@ -183,6 +204,9 @@ httpsession.invalidate = Invalidate
imagefile.description = Description
imagefile.file = Imagefile
importuser.file = File
importuser.template = Template
invite.emailexists = User with that email address already exists in the system.
invite.notFound = Invite invalid or already used
invite.successfull = Invite sent successfully
......@@ -220,6 +244,7 @@ loginerror.resetpassword = Reset password
map.edit = Edit
map.generate = Generate places
map.height = Place height (px)
map.id = #
map.name = Name
map.namebase = Semicolon separated table prefixes
map.oneRowTable = One row tables
......@@ -345,6 +370,7 @@ place.description = Description
place.details = Details
place.edit = Edit
place.height = Height
place.id = ID
place.mapX = X
place.mapY = Y
place.membership = Associated user
......@@ -395,7 +421,9 @@ placetoken.topText = You can associate a ticket bought by someone else to
poll.answer = Answer to poll
poll.begin = Open poll
poll.create = Create
poll.description = Description
poll.edit = Edit
poll.end = Close poll
poll.name = Poll name
poll.save = Send answers
......@@ -414,6 +442,7 @@ product.paid = Paid
product.prepaid = Prepaid
product.prepaidInstant = Created when prepaid is paid
product.price = Price of product
product.providedRole = Product defines role
product.save = Save
product.shopInstant = Create automatic cashpayment
product.sort = Sort nr
......@@ -421,19 +450,29 @@ product.totalPrice = Total
product.unitName = Unit name
product.vat = VAT
productShopView.readBarcode = Read barcode
products.save = Save
productshop.billCreated = Bill created
productshop.commit = Buy
productshop.limits = Available
productshop.minusOne = -1
productshop.minusTen = -10
productshop.noItemsInCart = There are no products in shopping cart
productshop.plusOne = +1
productshop.plusTen = +10
productshop.total = Total
reader.assocToCard = Associate to card
reader.createNewCard = Create new card
reader.description = Description
reader.edit = Edit
reader.identification = Identification
reader.name = Reader name
reader.select = Select reader
reader.tag = Tag
reader.type = Type
reader.user = User
readerView.searchforuser = Search user
......@@ -453,6 +492,11 @@ resetMail.username = Username
resetmailSent.body = Email has been sent containing a link where you can change the password.
resetmailSent.header = Email sent
rfidevent.empty = Empty
rfidevent.reader = Reader
rfidevent.searchuser = Search user
rfidevent.tag = Tag
role.cardtemplate = Cardtemplate
role.create = Create role
role.description = Description
......@@ -465,10 +509,15 @@ role.permissionheader = Role permissions
role.read = (R)
role.write = (W)
salespoint.edit = Edit
salespoint.name = Name
salespoint.noSalesPoints = Amount
sendPicture.header = S
shop.accountBalance = Account balance
shop.cash = Cash deposit
shop.readBarcode = Read barcode
shop.totalPrice = Price of products
shop.user = Selling to
......@@ -643,6 +692,10 @@ user.validateUser.header = Please insert credentials
user.wholeName = Name
user.zipCode = Postal nr.
userImport.commit = Commit
userView.image = Image
userimage.webcam = Take picture with webcam
userlist.header = Users
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
......@@ -30,6 +30,8 @@ actionlog.user = Tekij\u00E4
applicationPermission.description = kuvaus
applicationPermission.name = Oikeusryhm\u00E4
barcodeReader.readBarcode = Lue viivakoodi
bill.addr1 = Osoite 1
bill.addr2 = Osoite 2
bill.addr3 = Osoite 3
......@@ -83,6 +85,12 @@ cardTemplate.roles = Yhdistetyt roolit
cardTemplate.save = Tallenna
cardTemplate.sendImage = Lataa kuva
cart.item = Tuote
cart.item_quantity = M\u00E4\u00E4r\u00E4
cart.item_total = Yhteens\u00E4
cart.item_unitprice = Hinta
cart.total = Yhteens\u00E4
checkout.cancel.errorMessage = Virhe peruutuksen vahvistuksessa\u2026 Ilmoita t\u00E4st\u00E4 osoitteeseen code@codecrew.fi
checkout.cancel.successMessage = Voit yritt\u00E4\u00E4 maksua uudelleen omista laskuistasi.
checkout.reject.errorMessage = Virhe hyl\u00E4tyn maksun k\u00E4sittelyss\u00E4. Raportoi t\u00E4m\u00E4 virhe osoitteeseen: code@codecrew.fi
......@@ -167,10 +175,23 @@ eventorgView.eventname = Tapahtuman nimi
eventorganiser.name = Tapahtumaj\u00E4rjest\u00E4j\u00E4
food = Ruoka
foodWave.description = Kuvaus
foodWave.name = Nimi
foodWave.template.name = Nimi
foodWave.time = Aika
foodshop.buyFromCounter = Maksa infossa
foodshop.buyFromInternet = Maksa Internetiss\u00E4
game.gamepoints = Insomnia Game pisteet:
gamepoints = Pelipisteit\u00E4
global.cancel = Peruuta
global.copyright = Codecrew Ry
global.eventname = Tapahtumanimi
global.notAuthorizedExecute = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia suorittaa t\u00E4t\u00E4 toimenpidett\u00E4!
global.notauthorized = Sinulla ei ole riitt\u00E4vi\u00E4 oikeuksia t\u00E4lle sivulle.
global.save = Tallenna
......@@ -188,6 +209,9 @@ httpsession.user = Tunnus
imagefile.description = Kuvaus
imagefile.file = Kuvatiedosto
importuser.file = Tiedosto
importuser.template = Malli
index.title = Etusivu
invite.emailexists = J\u00E4rjestelm\u00E4ss\u00E4 on jo k\u00E4ytt\u00E4j\u00E4tunnus samalla s\u00E4hk\u00F6postiosoitteella.
......@@ -227,6 +251,7 @@ loginerror.resetpassword = Salasana unohtunut?
map.edit = Muokkaa
map.generate = Generoi paikat
map.height = Paikan korkeus (px)
map.id = #
map.name = Nimi
map.namebase = Puolipisteell\u00E4 erotetut p\u00F6yt\u00E4-etuliitteet
map.oneRowTable = Yhden rivin p\u00F6yd\u00E4t
......@@ -332,6 +357,7 @@ place.details = Tiedot
place.edit = Muokkaa
place.groupremove = Poista paikka paikkaryhm\u00E4st\u00E4
place.height = Korkeus
place.id = ID
place.mapX = X
place.mapY = Y
place.membership = Yhdistetty k\u00E4ytt\u00E4j\u00E4
......@@ -383,7 +409,9 @@ placetoken.topText = Voit yhdist\u00E4\u00E4 paikan omaan k\u00E4ytt\u00E4
poll.answer = Vastaa kyselyyn
poll.begin = Avaa kysely
poll.create = Luo
poll.description = Kuvaus
poll.edit = Muokkaa
poll.end = Sulje kysely
poll.name = Kyselyn nimi
poll.save = L\u00E4het\u00E4 vastauksesi
......@@ -402,6 +430,7 @@ product.paid = Maksettu
product.prepaid = Prepaid
product.prepaidInstant = Luodaan kun prepaid maksetaan
product.price = Tuotteen hinta
product.providedRole = Tuote m\u00E4\u00E4ritt\u00E4\u00E4 roolin
product.save = Tallenna
product.shopInstant = Luo k\u00E4teismaksu tuotteille
product.sort = J\u00E4rjestys luku
......@@ -409,19 +438,29 @@ product.totalPrice = Summa
product.unitName = Tuoteyksikk\u00F6
product.vat = ALV
productShopView.readBarcode = Lue viivakoodi
products.save = Tallenna
productshop.billCreated = Lasku luotu
productshop.commit = Osta
productshop.limits = Vapaana
productshop.minusOne = -1
productshop.minusTen = -10
productshop.noItemsInCart = Ostoskorissa ei ole tuotteita
productshop.plusOne = +1
productshop.plusTen = +10
productshop.total = Yhteens\u00E4
reader.assocToCard = Yhdist\u00E4 korttiin
reader.createNewCard = Luo uusi kortti
reader.description = Kuvaus
reader.edit = Muokkaa
reader.identification = Tunniste
reader.name = Lukijan nimi
reader.select = Valitse lukija
reader.tag = Tag
reader.type = Tyyppi
reader.user = K\u00E4ytt\u00E4j\u00E4
readerView.searchforuser = Etsi k\u00E4ytt\u00E4j\u00E4\u00E4
......@@ -441,6 +480,11 @@ resetMail.username = K\u00E4ytt\u00E4j\u00E4tunnus
resetmailSent.body = Antamasi k\u00E4ytt\u00E4j\u00E4tunnuksen s\u00E4hk\u00F6postiosoitteeseen on l\u00E4hetetty osoite jossa voit vaihtaa tunnuksen salasanan.
resetmailSent.header = S\u00E4hk\u00F6posti l\u00E4hetetty
rfidevent.empty = Tyhj\u00E4
rfidevent.reader = Lukija
rfidevent.searchuser = Hae k\u00E4ytt\u00E4j\u00E4\u00E4
rfidevent.tag = T\u00E4gi
role.cardtemplate = Korttipohja
role.create = Luo rooli
role.description = Kuvaus
......@@ -450,10 +494,15 @@ role.name = Nimi
role.parents = Periytyy
role.savePermissions = Tallenna oikeudet
salespoint.edit = Muokkaa
salespoint.name = Nimi
salespoint.noSalesPoints = M\u00E4\u00E4r\u00E4
sendPicture.header = L\u00E4het\u00E4 kuva
shop.accountBalance = Tilin saldo
shop.cash = K\u00E4teispano
shop.readBarcode = Lue viivakoodi
shop.totalPrice = Tuotteiden hinta
shop.user = Myyd\u00E4\u00E4n
......@@ -484,6 +533,7 @@ sidebar.users = K\u00E4ytt\u00E4j\u00E4t
sidebar.utils.flushCache = Flush Cache
sidebar.utils.testdata = Testdata
sitepage.addContent = Lis\u00E4\u00E4 sis\u00E4lt\u00F6laatikko
sitepage.create = Luo uusi
sitepage.edit = Muokkaa
sitepage.name = Sivun nimi
......@@ -627,6 +677,10 @@ user.validateUser.header = Ole hyv\u00E4 ja sy\u00F6t\u00E4 kirjautumisti
user.wholeName = Nimi
user.zipCode = Postinumero
userImport.commit = Hyv\u00E4ksy
userView.image = Kuva
userimage.webcam = Ota kuva webkameralla
userlist.header = Etsi k\u00E4ytt\u00E4ji\u00E4
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/ErrorPageView.java
......@@ -18,6 +18,8 @@ import java.io.StringWriter;
import java.util.Calendar;
import java.util.Map;
import java.util.zip.CRC32;
@Named
@RequestScoped
public class ErrorPageView implements Serializable {
......@@ -35,6 +37,7 @@ public class ErrorPageView implements Serializable {
@SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(ErrorPageView.class);
public String getStackTrace() {
FacesContext context = FacesContext.getCurrentInstance();
......@@ -51,14 +54,29 @@ public class ErrorPageView implements Serializable {
}
public String getStackTraceHash() {
FacesContext context = FacesContext.getCurrentInstance();
Map requestMap = context.getExternalContext().getRequestMap();
Throwable ex =
(Throwable) requestMap.get("javax.servlet.error.exception");
CRC32 stackHash = new CRC32();
stackHash.update(ex.getStackTrace().toString().getBytes());
return "0x" + Long.toHexString(stackHash.getValue());
}
public String getTime(){
return "0x" + Long.toHexString(Calendar.getInstance().getTimeInMillis());
String stamp = "0x" + Long.toHexString(Calendar.getInstance().getTimeInMillis());
logger.error("Error occured at {} trail {}", stamp, getTrail());
return stamp;
}
public String getTrail() {
HttpServletRequest req = (HttpServletRequest) getContext().getExternalContext().getRequest();
Object trail = req.getSession().getAttribute("trail");
return trail != null ? trail.toString().replace(", ", "\n") : "u gots no trail!";
return trail != null ? trail.toString() : "";
}
public FacesContext getContext() {
......
code/haeLocalisoimattomat.sh 100644 → 100755
File mode changed
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!