Skip to content

Antti Väyrynen / Moya

Go to a project
Commit c5592bac by Antti Tonkyra
Options

Merge branch 'devel' of codecrew.fi:bortal into devel

2 parents d6fa9ae9 dca86dcc
Inline Side-by-side
Showing with 179 additions and 80 deletions
code/MoyaWeb/WebContent/license/manageCodes.xhtml
......@@ -58,25 +58,25 @@
<h:outputLabel rendered="#{licenseView.currentLicense.id == null}" value="#{i18n['game.create']}" />
<h:outputLabel rendered="#{licenseView.currentLicense.id != null}" value="#{i18n['game.edit']}" />
</f:facet>
<h:outputLabel value="service" />
<h:outputLabel value="#{i18n['license.service']}" />
<p:inputText value="#{licenseView.currentLicense.service}" />
<h:outputLabel value="name" />
<h:outputLabel value="#{i18n['license.name']}" />
<p:inputText value="#{licenseView.currentLicense.name}" />
<h:outputLabel value="description" />
<h:outputLabel value="#{i18n['license.description']}" />
<p:inputText value="#{licenseView.currentLicense.description}" />
<h:outputLabel value="url" />
<h:outputLabel value="#{i18n['license.url']}" />
<p:inputText value="#{licenseView.currentLicense.codeUrl}" />
<h:outputLabel value="active" />
<h:outputLabel value="#{i18n['license.active']}" />
<p:selectBooleanCheckbox value="#{licenseView.currentLicense.active}" />
<h:outputLabel value="product" />
<h:outputLabel value="#{i18n['license.product']}" />
<h:selectOneMenu converter="#{productConverter}" value="#{licenseView.currentLicense.product}">
<f:selectItems var="product" itemLabel="#{product.name}" value="#{licenseView.productsForLicenses}" />
</h:selectOneMenu>
<p:commandButton action="#{licenseView.saveCurrentLicense}" update=":licenseForm" value="save" />
<p:commandButton action="#{licenseView.saveCurrentLicense}" update=":licenseForm" value="#{i18n['license.save']}" />
</p:panelGrid>
</h:form>
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
......@@ -131,6 +131,14 @@ global.save = Save
httpsession.creationTime = Created
license.active = Active
license.description = Description
license.name = Name
license.product = Product
license.save = Save
license.service = Service
license.url = Url
login.login = Login
login.logout = Logout
login.logoutmessage = You have logged out of the system
......@@ -142,7 +150,7 @@ loginerror.header = Login failed
loginerror.message = Username of password incorrect.
loginerror.resetpassword = Reset password
map.id = #
map.id = #
navi.auth.login = frontpage
navi.auth.loginerror = frontpage
......@@ -171,9 +179,12 @@ placegroupview.toptext = \
poll.edit = edit
product.providedRole = Tuote tarjoaa roolin
product.returnProductEdit = Palaa tuotteeseen:
product.saved = Tuote tallennettu
product.providedRole = Product defines role
product.returnProductEdit = Return to product:
product.save = Save
product.saved = Product saved
productFlag.USER_SHOPPABLE = User shoppable
productshop.minusOne = -1
productshop.minusTen = -10
......@@ -188,6 +199,8 @@ resetMail.username = Username
resetmailSent.body = Email has been sent containing a link where you can change the password.
resetmailSent.header = Email sent
submenu.license.manageCodes = Manage codes
subnavi.cards = \u0009\u0009
topnavi.license = Lisenssikoodit
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
......@@ -420,6 +420,14 @@ layout.editBottom = Edit bottom content
layout.editContent = Edit center
layout.editTop = Edit topcontent
license.active = Active
license.description = Description
license.name = Name
license.product = Product
license.save = Save
license.service = Service
license.url = Url
login.login = Login
login.logout = Logout
login.logoutmessage = You have logged out of the system
......@@ -431,6 +439,8 @@ loginerror.header = Login failed
loginerror.message = Username of password incorrect.
loginerror.resetpassword = Reset password
map.create = Create map
map.createTimeMap = Create tilemap
map.edit = Edit
map.generate = Generate places
map.height = Place height (px)
......@@ -460,8 +470,13 @@ mapView.errorWhenReservingPlace = Error when reserving place!
mapView.errorWhileBuyingPlaces = Error when buying places. Please try again. If error reoccurs please contact organizers.
mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve this place.
mapedit.save = Save map changes
menu.index = Index
menu.item = Item
menu.name = Name
menu.place.placemap = Placemap
menu.poll.index = Polls
menu.select = Select
menu.sort = Sort
menu.toAdmin = Adminview
......@@ -471,6 +486,20 @@ menuitem.navigation.key = Product flag
nasty.user = Go away!
news.abstract = Abstract
news.expire = Expire
news.publish = Publish
news.save = Save
news.title = Title
newsgroup.edit = Edit
newsgroup.name = Newsgroup name
newsgroup.priority = Priority
newsgroup.readerRole = Reader roles
newsgroup.writerRole = Writer roles
newslist.header = Newsgroups
org.hibernate.validator.constraints.Email.message = not a well-formed email address
org.hibernate.validator.constraints.Length.message = length must be between {min} and {max}
org.hibernate.validator.constraints.NotEmpty.message = may not be empty
......@@ -484,15 +513,17 @@ page.account.edit.header = Edit account events
page.account.list.header = Account events
page.admin.sendimage.header = Send image
page.auth.login.header = Login error
page.auth.login.loginerror.header = Kirjautumisvirhe
page.auth.login.loginerror.header = Login error
page.auth.login.loginerror.pagegroup = frontpage
page.auth.login.logout.header = Uloskirjautuminen
page.auth.login.logout.header = Logout
page.auth.login.logout.pagegroup = frontpage
page.auth.login.pagegroup = frontpage
page.auth.login.title = Login error
page.auth.loginerror.header = Login failed
page.auth.loginerror.pagegroup = frontpage
page.auth.logout.header = Logout
page.auth.logout.pagegroup = frontpage
page.auth.logoutsuccess.header = Logout
page.auth.notauthorized.pagegroup = frontpage
page.auth.resetPassword.header = Reset password
page.bill.billSummary.header = Summary of bills
......@@ -628,30 +659,39 @@ poll.end = Close poll
poll.name = Poll name
poll.save = Send answers
product.barcode = Barcode
product.billed = Billed
product.boughtTotal = Products billed
product.buyInPrice = Buy in price
product.cart.count = To shoppingcart
product.cashed = Cashpaid
product.color = Color in UI
product.create = Create product
product.createDiscount = Add volumediscount
product.edit = edit
product.inventoryQuantity = Inventory count
product.name = Name of product
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
product.totalPrice = Total
product.unitName = Unit name
product.vat = VAT
product.barcode = Barcode
product.billed = Billed
product.boughtTotal = Products billed
product.buyInPrice = Buy in price
product.cart.count = To shoppingcart
product.cashed = Cashpaid
product.color = Color in UI
product.create = Create product
product.createDiscount = Add volumediscount
product.edit = edit
product.inventoryQuantity = Inventory count
product.name = Name of product
product.paid = Paid
product.prepaid = Prepaid
product.prepaidInstant = Created when prepaid is paid
product.price = Price of product
product.providedRole = Product defines role
product.returnProductEdit = Return to product:
product.save = Save
product.saved = Product saved
product.shopInstant = Create automatic cashpayment
product.sort = Sort nr
product.totalPrice = Total
product.unitName = Unit name
product.vat = VAT
productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Create new place bought
productFlag.PREPAID_CREDIT = Prepaid credit
productFlag.PREPAID_INSTANT_CREATE = Prepaid instant create
productFlag.RESERVE_PLACE_WHEN_BOUGHT = Reserve place when bought
productFlag.USER_SHOPPABLE = User shoppable
products.create = Create product
products.save = Save
productsShopView.readBarcode = Read
......@@ -712,8 +752,11 @@ role.name = Name
role.parents = Parents
role.permissionheader = Role permissions
role.read = (R)
role.savePermissions = Save permissions
role.write = (W)
roleView.save = Save changes
salespoint.edit = Edit
salespoint.name = Name
salespoint.noSalesPoints = Amount
......@@ -792,6 +835,7 @@ submenu.foodmanager.listFoodwaves = List active foodwaves
submenu.foodwave.list = Foodwaves
submenu.foodwave.listTemplates = Food provides
submenu.index = Frontpage
submenu.license.manageCodes = Manage codes
submenu.map.create = Create map
submenu.map.list = List maps
submenu.orgrole.create = Create organisationrole
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
......@@ -430,6 +430,14 @@ layout.editBottom = Muokkaa alasis\u00E4lt\u00F6\u00E4
layout.editContent = Muokkaa sis\u00E4lt\u00F6\u00E4
layout.editTop = Muokkaa yl\u00E4sis\u00E4lt\u00F6\u00E4
license.active = Aktiivinen
license.description = Kuvaus
license.name = Nimi
license.product = Tuote
license.save = Tallenna
license.service = Palvelu
license.url = Osoite
login.login = Kirjaudu sis\u00E4\u00E4n
login.logout = Kirjaudu ulos
login.logoutmessage = Olet kirjautunut ulos j\u00E4rjestelm\u00E4st\u00E4.
......@@ -441,6 +449,8 @@ loginerror.header = Kirjautuminen ep\u00E4onnistui
loginerror.message = K\u00E4ytt\u00E4j\u00E4tunnus tai salasana ei ollut oikein.
loginerror.resetpassword = Salasana unohtunut?
map.create = Luo kartta
map.createTimeMap = Luo tilekartta
map.edit = Muokkaa
map.generate = Generoi paikat
map.height = Paikan korkeus (px)
......@@ -470,16 +480,20 @@ mapView.errorWhenReservingPlace = Paikkaa varatessa tapahtui virhe.
mapView.errorWhileBuyingPlaces = Virhe paikkojen ostossa. Ole hyv\u00E4 ja yrit\u00E4 uudelleen. Jos virhe toistuu ota yhteytt\u00E4 j\u00E4rjest\u00E4jiin.
mapView.notEnoughCreditsToReserve = Sinulla ei ole riitt\u00E4v\u00E4sti suoritettuja konepaikkamaksuja t\u00E4m\u00E4n paikan varaamiseen.
menu.index = Etusivu
menu.name = Nimi
menu.place.placemap = Paikkakartta
menu.poll.index = Kyselyt
menu.select = Valitse
menu.shop.createBill = Kauppa
menu.sort = J\u00E4rjest\u00E4
menu.toAdmin = Yll\u00E4piton\u00E4kym\u00E4
menu.toUser = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
menu.user.edit = Omat tiedot
mapedit.save = Tallenna muutokset
menu.index = Etusivu
menu.name = Nimi
menu.place.placemap = Paikkakartta
menu.poll.index = Kyselyt
menu.select = Valitse
menu.shop.createBill = Kauppa
menu.sort = J\u00E4rjest\u00E4
menu.toAdmin = Yll\u00E4piton\u00E4kym\u00E4
menu.toUser = K\u00E4ytt\u00E4j\u00E4n\u00E4kym\u00E4
menu.user.edit = Omat tiedot
nasty.user = Mene pois!
news.abstract = Lyhennelm\u00E4
news.expire = Lopeta julkaisu
......@@ -489,13 +503,13 @@ news.title = Otsikko
newsgroup.edit = Muokkaa
newsgroup.name = Uutisryhm\u00E4n nimi
newsgroup.priority = J\u00E4rjestysnumero
newsgroup.priority = Painoarvo
newsgroup.readerRole = Lukijoiden roolit
newsgroup.writerRole = Kirjoittajaryhm\u00E4
newslist.header = Uutisryhm\u00E4t
org.hibernate.validator.constraints.Email.message = not a well-formed email address
org.hibernate.validator.constraints.Email.message = V\u00E4\u00E4rin muotoiltu s\u00E4hk\u00F6postiosoite
org.hibernate.validator.constraints.Length.message = length must be between {min} and {max}
org.hibernate.validator.constraints.NotEmpty.message = may not be empty
org.hibernate.validator.constraints.Range.message = must be between {min} and {max}
......@@ -504,10 +518,22 @@ orgrole.create = Luo
orgrole.name = Nimi
orgrole.parents = Periytyy
page.account.edit.header = Muokkaa tilitapahtumia
page.account.list.header = Tilitapahtumat
page.admin.sendimage.header = L\u00E4het\u00E4 kuva
page.auth.login.header = Kirjautumisvirhe
page.auth.login.loginerror.header = Kirjautumisvirhe
page.auth.login.loginerror.pagegroup = Etusivu
page.auth.login.logout.header = Uloskirjautuminen
page.auth.login.logout.pagegroup = Etusivu
page.auth.login.pagegroup = Etusivu
page.auth.login.title = Kirjautumisvirhe
page.auth.loginerror.header = kirjautuminen ep\u00E4onnistui
page.auth.loginerror.pagegroup = etusivu
page.auth.logout.header = Uloskirjautuminen
page.auth.logoutsuccess.header = Logout
page.auth.logout.pagegroup = Etusivu
page.auth.logoutsuccess.header = Uloskirjauduttu
page.auth.notauthorized.pagegroup = etusivu
page.auth.resetPassword.header = Nollaa salasana
page.bill.billSummary.header = Laskujen yhteenveto
page.bill.edit.header = Muokkaa laskua
......@@ -617,30 +643,41 @@ poll.end = Sulje kysely
poll.name = Kyselyn nimi
poll.save = L\u00E4het\u00E4 vastauksesi
product.barcode = Viivakoodi
product.billed = Laskutettu
product.boughtTotal = Tuotteita laskutettu
product.cart.count = Ostoskoriin
product.cashed = Ostettu k\u00E4teisell\u00E4
product.color = V\u00E4ri k\u00E4ytt\u00F6liittym\u00E4ss\u00E4
product.create = Luo tuote
product.createDiscount = Lis\u00E4\u00E4 m\u00E4\u00E4r\u00E4alennus
product.edit = Muokkaa
product.inventoryQuantity = Varastotilanne
product.name = Tuotteen nimi
product.paid = Maksettu
product.prepaid = Prepaid
product.prepaidInstant = Luodaan kun prepaid maksetaan
product.price = Tuotteen hinta
product.save = Tallenna
product.shopInstant = Luo k\u00E4teismaksu tuotteille
product.sort = J\u00E4rjestys luku
product.totalPrice = Summa
product.unitName = Tuoteyksikk\u00F6
product.vat = ALV
product.barcode = Viivakoodi
product.billed = Laskutettu
product.boughtTotal = Tuotteita laskutettu
product.buyInPrice = Sis\u00E4\u00E4nostohinta
product.cart.count = Ostoskoriin
product.cashed = Ostettu k\u00E4teisell\u00E4
product.color = V\u00E4ri k\u00E4ytt\u00F6liittym\u00E4ss\u00E4
product.create = Luo tuote
product.createDiscount = Lis\u00E4\u00E4 m\u00E4\u00E4r\u00E4alennus
product.edit = Muokkaa
product.inventoryQuantity = Varastotilanne
product.name = Tuotteen nimi
product.paid = Maksettu
product.prepaid = Prepaid
product.prepaidInstant = Luodaan kun prepaid maksetaan
product.price = Tuotteen hinta
product.providedRole = Tuote tarjoaa roolin
product.returnProductEdit = Palaa tuotteeseen:
product.save = Tallenna
product.saved = Tuote tallennettu
product.shopInstant = Luo k\u00E4teismaksu tuotteille
product.sort = J\u00E4rjestys luku
product.totalPrice = Summa
product.unitName = Tuoteyksikk\u00F6
product.vat = ALV
productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Luo uusi paikka ostettaessa
productFlag.PREPAID_CREDIT = Prepaid credit
productFlag.PREPAID_INSTANT_CREATE = Ostettaessa luotava tuote
productFlag.RESERVE_PLACE_WHEN_BOUGHT = Varaa paikka ostettaessa
productFlag.USER_SHOPPABLE = K\u00E4ytt\u00E4jien ostettavissa
productShopView.readBarcode = Lue viivakoodi
products.create = Luo tuote
products.save = Tallenna
productsShopView.readBarcode = Lue
......@@ -691,14 +728,17 @@ 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
role.edit = Muokkaa
role.edit.save = Tallenna
role.name = Nimi
role.parents = Periytyy
role.savePermissions = Tallenna oikeudet
role.cardtemplate = Korttipohja
role.create = Luo rooli
role.description = Kuvaus
role.edit = Muokkaa
role.edit.save = Tallenna
role.name = Nimi
role.parents = Periytyy
role.permissionheader = Roolin oikeudet
role.savePermissions = Tallenna oikeudet
roleView.save = Tallenna muutokset
salespoint.edit = Muokkaa
salespoint.name = Nimi
......@@ -775,6 +815,7 @@ submenu.foodadmin.listTemplates = Muokkaa tilauspohjia
submenu.foodmanager.listFoodwaves = Aktiiviset ruokatilaukset
submenu.foodwave.list = Ruokailu
submenu.index = Etusivu
submenu.license.manageCodes = Hallinnoi lisenssej\u00E4
submenu.map.create = Uusi kartta
submenu.map.list = N\u00E4yt\u00E4 kartat
submenu.orgrole.create = Luo j\u00E4rjest\u00E4j\u00E4rooli
......
code/MoyaWeb/src/fi/codecrew/moya/servlet/UploadServlet.java
package fi.codecrew.moya.servlet;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.PrintWriter;
......@@ -110,7 +111,7 @@ public class UploadServlet extends HttpServlet {
String type = request.getParameter("type");
if (type.equals("userimage")) {
logger.debug("Uploading userimage for user {}");
UserImage userimage = userbean.uploadImage(userbean.findByEventUserId(destId), contenttype, imagedata, filename, description);
UserImage userimage = userbean.uploadImage(userbean.findByEventUserId(destId), contenttype, new ByteArrayInputStream(imagedata), filename, description);
utilbean.convertImage(userimage.getUser());
} else if (type.equals("mapimage")) {
eventmapbean.sendImage(destId, imagedata);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!