Skip to content

Codecrew / Moya

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

Merge branch 'master' of codecrew.fi:bortal

2 parents 1a2237f0 e2967700
Inline Side-by-side
Showing with 207 additions and 7 deletions
code/LanBortalWeb/WebContent/WEB-INF/faces-config.xml
...@@ -132,6 +132,15 @@ ...@@ -132,6 +132,15 @@
</navigation-case> </navigation-case>
</navigation-rule> </navigation-rule>
<navigation-rule> <navigation-rule>
<display-name>useradmin/sendPicture</display-name>
<from-view-id>/useradmin/sendPicture.xhtml</from-view-id>
<navigation-case>
<from-outcome>accepted</from-outcome>
<to-view-id>/useradmin/edit.xhtml</to-view-id>
<redirect />
</navigation-case>
</navigation-rule>
<navigation-rule>
<display-name>voting/create</display-name> <display-name>voting/create</display-name>
<from-view-id>/voting/create.xhtml</from-view-id> <from-view-id>/voting/create.xhtml</from-view-id>
<navigation-case> <navigation-case>
......
code/LanBortalWeb/WebContent/error.xhtml
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<title>Error</title> <title>Error</title>
</h:head> </h:head>
<h:body> <h:body>
<!-- <c:if test="#{sessionHandler.isInDevelopmentMode() eq true}"> --> <!-- <c:if test="#{sessionHandler.isInDevelopmentMode() eq false}"> -->
<h1>#{i18n['error.error']}</h1> <h1>#{i18n['error.error']}</h1>
<p>${i18n['error.contact']} <p>${i18n['error.contact']}
<br/><h:outputText escape="false" style="color: red;" value="#{errorPageView.time}" /><br/><br/> <br/><h:outputText escape="false" style="color: red;" value="#{errorPageView.time}" /><br/><br/>
......
code/LanBortalWeb/WebContent/resources/cditools/salespoint/list.xhtml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<h:outputText <h:outputText
rendered="#{salespointListView.salespoints.rowCount le 0}" rendered="#{salespointListView.salespoints.rowCount le 0}"
value="#{i18n['salespoint.noSalespoints']}" /> value="#{i18n['salespoint.noSalesPoints']}" />
<h:form rendered="#{salespointListView.salespoints.rowCount gt 0}"> <h:form rendered="#{salespointListView.salespoints.rowCount gt 0}">
<h:dataTable styleClass="bordertable" id="salespointList" <h:dataTable styleClass="bordertable" id="salespointList"
......
code/LanBortalWeb/WebContent/useradmin/sendPicture.xhtml
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{userView.initView}" /> <f:event type="preRenderView" listener="#{userView.initView}" />
<f:event type="preRenderView" listener="#{userView.prepareCardDownload}" />
</f:metadata> </f:metadata>
<ui:define name="title"> <ui:define name="title">
<h1>#{i18n['sendPicture.header']}</h1> <h1>#{i18n['sendPicture.header']}</h1>
...@@ -62,6 +63,12 @@ ...@@ -62,6 +63,12 @@
<ui:fragment rendered="#{userView.canManage()}"> <ui:fragment rendered="#{userView.canManage()}">
<h2>Ylläpito</h2> <h2>Ylläpito</h2>
<h:form> <h:form>
<p:commandButton action="#{userView.prepareCardDownload()}" rendered="#{userView.waitForAcceptance==false}" value="print card" ajax="true" update="@form" onclick="PrimeFaces.monitorDownload(start, stop)">
<p:fileDownload value="#{userView.streamedFile}" />
</p:commandButton>
<p:commandButton action="#{userView.acceptPrintedCard()}" value="accept printed card" />
</h:form>
<!-- <h:form>
<h:commandButton action="#{userView.makeCard()}" value="#{i18n['user.makeCard']}" /> <h:commandButton action="#{userView.makeCard()}" value="#{i18n['user.makeCard']}" />
<h:dataTable var="card" value="#{userCardView.printedCards}"> <h:dataTable var="card" value="#{userCardView.printedCards}">
<h:column> <h:column>
...@@ -77,7 +84,7 @@ ...@@ -77,7 +84,7 @@
</h:column> </h:column>
</h:dataTable> </h:dataTable>
</h:form> </h:form>-->
<h3>RFID</h3> <h3>RFID</h3>
<h:form rendered="#{empty readerNameContainer.readerId}"> <h:form rendered="#{empty readerNameContainer.readerId}">
......
code/LanBortalWeb/WebContent/useradmin/userCartShow.xhtml
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<h:commandButton action="#{userCartView.removeCurrent()}" value="#{i18n['usercart.removeCurrent']}" /> <h:commandButton action="#{userCartView.removeCurrent()}" value="#{i18n['usercart.removeCurrent']}" />
<h:commandButton action="#{userCartView.next()}" value="#{i18n['usercart.next']}" rendered="#{userCartView.userCartSize > (userCartView.current+1)}" /></h:form> <h:commandButton action="#{userCartView.next()}" value="#{i18n['usercart.next']}" rendered="#{userCartView.userCartSize > (userCartView.current+1)}" /></h:form>
<h:link outcome="/card/massprint" value="yarr"> <h:link outcome="/card/massprint" value="Mass Print">
<f:param name="cid" value="#{javax.enterprise.context.conversation.id}"/> <f:param name="cid" value="#{javax.enterprise.context.conversation.id}"/>
</h:link> </h:link>
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n.properties
...@@ -119,7 +119,7 @@ placegroupview.toptext = \ ...@@ -119,7 +119,7 @@ placegroupview.toptext = \
poll.edit = edit poll.edit = edit
product.providedRole = Tuote tarjoaa roolin product.providedRole = Tuote m\u00E4\u00E4ritt\u00E4\u00E4 roolin
product.returnProductEdit = Palaa tuotteeseen: product.returnProductEdit = Palaa tuotteeseen:
product.saved = Tuote tallennettu product.saved = Tuote tallennettu
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
...@@ -30,6 +30,8 @@ actionlog.user = User ...@@ -30,6 +30,8 @@ actionlog.user = User
applicationPermission.description = description applicationPermission.description = description
applicationPermission.name = Rightsgroup applicationPermission.name = Rightsgroup
barcodeReader.readBarcode = Read barcode
bill.addr1 = Address 1 bill.addr1 = Address 1
bill.addr2 = Address 2 bill.addr2 = Address 2
bill.addr3 = Address 3 bill.addr3 = Address 3
...@@ -85,6 +87,12 @@ cardTemplate.roles = Associated roles ...@@ -85,6 +87,12 @@ cardTemplate.roles = Associated roles
cardTemplate.save = Save cardTemplate.save = Save
cardTemplate.sendImage = Upload Image 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.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.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 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 ...@@ -169,10 +177,23 @@ eventorgView.eventname = Name of event
eventorganiser.name = Eventorganiser 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 game.gamepoints = Game points
gamepoints = Gamepoints
global.cancel = Cancel global.cancel = Cancel
global.copyright = Codecrew Ry global.copyright = Codecrew Ry
global.eventname = Event name
global.notAuthorizedExecute = You are not authorized to do that!! global.notAuthorizedExecute = You are not authorized to do that!!
global.notauthorized = You don't have enough rights to enter this site. global.notauthorized = You don't have enough rights to enter this site.
global.save = Save global.save = Save
...@@ -183,6 +204,9 @@ httpsession.invalidate = Invalidate ...@@ -183,6 +204,9 @@ httpsession.invalidate = Invalidate
imagefile.description = Description imagefile.description = Description
imagefile.file = Imagefile imagefile.file = Imagefile
importuser.file = File
importuser.template = Template
invite.emailexists = User with that email address already exists in the system. invite.emailexists = User with that email address already exists in the system.
invite.notFound = Invite invalid or already used invite.notFound = Invite invalid or already used
invite.successfull = Invite sent successfully invite.successfull = Invite sent successfully
...@@ -220,6 +244,7 @@ loginerror.resetpassword = Reset password ...@@ -220,6 +244,7 @@ loginerror.resetpassword = Reset password
map.edit = Edit map.edit = Edit
map.generate = Generate places map.generate = Generate places
map.height = Place height (px) map.height = Place height (px)
map.id = #
map.name = Name map.name = Name
map.namebase = Semicolon separated table prefixes map.namebase = Semicolon separated table prefixes
map.oneRowTable = One row tables map.oneRowTable = One row tables
...@@ -345,6 +370,7 @@ place.description = Description ...@@ -345,6 +370,7 @@ place.description = Description
place.details = Details place.details = Details
place.edit = Edit place.edit = Edit
place.height = Height place.height = Height
place.id = ID
place.mapX = X place.mapX = X
place.mapY = Y place.mapY = Y
place.membership = Associated user place.membership = Associated user
...@@ -395,7 +421,9 @@ placetoken.topText = You can associate a ticket bought by someone else to ...@@ -395,7 +421,9 @@ placetoken.topText = You can associate a ticket bought by someone else to
poll.answer = Answer to poll poll.answer = Answer to poll
poll.begin = Open poll poll.begin = Open poll
poll.create = Create
poll.description = Description poll.description = Description
poll.edit = Edit
poll.end = Close poll poll.end = Close poll
poll.name = Poll name poll.name = Poll name
poll.save = Send answers poll.save = Send answers
...@@ -414,6 +442,7 @@ product.paid = Paid ...@@ -414,6 +442,7 @@ product.paid = Paid
product.prepaid = Prepaid product.prepaid = Prepaid
product.prepaidInstant = Created when prepaid is paid product.prepaidInstant = Created when prepaid is paid
product.price = Price of product product.price = Price of product
product.providedRole = Product defines role
product.save = Save product.save = Save
product.shopInstant = Create automatic cashpayment product.shopInstant = Create automatic cashpayment
product.sort = Sort nr product.sort = Sort nr
...@@ -421,19 +450,29 @@ product.totalPrice = Total ...@@ -421,19 +450,29 @@ product.totalPrice = Total
product.unitName = Unit name product.unitName = Unit name
product.vat = VAT product.vat = VAT
productShopView.readBarcode = Read barcode
products.save = Save products.save = Save
productshop.billCreated = Bill created productshop.billCreated = Bill created
productshop.commit = Buy productshop.commit = Buy
productshop.limits = Available productshop.limits = Available
productshop.minusOne = -1
productshop.minusTen = -10
productshop.noItemsInCart = There are no products in shopping cart productshop.noItemsInCart = There are no products in shopping cart
productshop.plusOne = +1
productshop.plusTen = +10
productshop.total = Total productshop.total = Total
reader.assocToCard = Associate to card reader.assocToCard = Associate to card
reader.createNewCard = Create new card
reader.description = Description reader.description = Description
reader.edit = Edit
reader.identification = Identification
reader.name = Reader name reader.name = Reader name
reader.select = Select reader reader.select = Select reader
reader.tag = Tag reader.tag = Tag
reader.type = Type
reader.user = User reader.user = User
readerView.searchforuser = Search user readerView.searchforuser = Search user
...@@ -453,6 +492,11 @@ resetMail.username = Username ...@@ -453,6 +492,11 @@ resetMail.username = Username
resetmailSent.body = Email has been sent containing a link where you can change the password. resetmailSent.body = Email has been sent containing a link where you can change the password.
resetmailSent.header = Email sent resetmailSent.header = Email sent
rfidevent.empty = Empty
rfidevent.reader = Reader
rfidevent.searchuser = Search user
rfidevent.tag = Tag
role.cardtemplate = Cardtemplate role.cardtemplate = Cardtemplate
role.create = Create role role.create = Create role
role.description = Description role.description = Description
...@@ -465,10 +509,15 @@ role.permissionheader = Role permissions ...@@ -465,10 +509,15 @@ role.permissionheader = Role permissions
role.read = (R) role.read = (R)
role.write = (W) role.write = (W)
salespoint.edit = Edit
salespoint.name = Name
salespoint.noSalesPoints = Amount
sendPicture.header = S sendPicture.header = S
shop.accountBalance = Account balance shop.accountBalance = Account balance
shop.cash = Cash deposit shop.cash = Cash deposit
shop.readBarcode = Read barcode
shop.totalPrice = Price of products shop.totalPrice = Price of products
shop.user = Selling to shop.user = Selling to
...@@ -643,6 +692,10 @@ user.validateUser.header = Please insert credentials ...@@ -643,6 +692,10 @@ user.validateUser.header = Please insert credentials
user.wholeName = Name user.wholeName = Name
user.zipCode = Postal nr. user.zipCode = Postal nr.
userImport.commit = Commit
userView.image = Image
userimage.webcam = Take picture with webcam userimage.webcam = Take picture with webcam
userlist.header = Users userlist.header = Users
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
...@@ -30,6 +30,8 @@ actionlog.user = Tekij\u00E4 ...@@ -30,6 +30,8 @@ actionlog.user = Tekij\u00E4
applicationPermission.description = kuvaus applicationPermission.description = kuvaus
applicationPermission.name = Oikeusryhm\u00E4 applicationPermission.name = Oikeusryhm\u00E4
barcodeReader.readBarcode = Lue viivakoodi
bill.addr1 = Osoite 1 bill.addr1 = Osoite 1
bill.addr2 = Osoite 2 bill.addr2 = Osoite 2
bill.addr3 = Osoite 3 bill.addr3 = Osoite 3
...@@ -83,6 +85,12 @@ cardTemplate.roles = Yhdistetyt roolit ...@@ -83,6 +85,12 @@ cardTemplate.roles = Yhdistetyt roolit
cardTemplate.save = Tallenna cardTemplate.save = Tallenna
cardTemplate.sendImage = Lataa kuva 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.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.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 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 ...@@ -167,10 +175,23 @@ eventorgView.eventname = Tapahtuman nimi
eventorganiser.name = Tapahtumaj\u00E4rjest\u00E4j\u00E4 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: game.gamepoints = Insomnia Game pisteet:
gamepoints = Pelipisteit\u00E4
global.cancel = Peruuta global.cancel = Peruuta
global.copyright = Codecrew Ry global.copyright = Codecrew Ry
global.eventname = Tapahtumanimi
global.notAuthorizedExecute = Sinulla ei ole riitt\u00E4v\u00E4sti oikeuksia suorittaa t\u00E4t\u00E4 toimenpidett\u00E4! 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.notauthorized = Sinulla ei ole riitt\u00E4vi\u00E4 oikeuksia t\u00E4lle sivulle.
global.save = Tallenna global.save = Tallenna
...@@ -188,6 +209,9 @@ httpsession.user = Tunnus ...@@ -188,6 +209,9 @@ httpsession.user = Tunnus
imagefile.description = Kuvaus imagefile.description = Kuvaus
imagefile.file = Kuvatiedosto imagefile.file = Kuvatiedosto
importuser.file = Tiedosto
importuser.template = Malli
index.title = Etusivu index.title = Etusivu
invite.emailexists = J\u00E4rjestelm\u00E4ss\u00E4 on jo k\u00E4ytt\u00E4j\u00E4tunnus samalla s\u00E4hk\u00F6postiosoitteella. invite.emailexists = J\u00E4rjestelm\u00E4ss\u00E4 on jo k\u00E4ytt\u00E4j\u00E4tunnus samalla s\u00E4hk\u00F6postiosoitteella.
...@@ -227,6 +251,7 @@ loginerror.resetpassword = Salasana unohtunut? ...@@ -227,6 +251,7 @@ loginerror.resetpassword = Salasana unohtunut?
map.edit = Muokkaa map.edit = Muokkaa
map.generate = Generoi paikat map.generate = Generoi paikat
map.height = Paikan korkeus (px) map.height = Paikan korkeus (px)
map.id = #
map.name = Nimi map.name = Nimi
map.namebase = Puolipisteell\u00E4 erotetut p\u00F6yt\u00E4-etuliitteet map.namebase = Puolipisteell\u00E4 erotetut p\u00F6yt\u00E4-etuliitteet
map.oneRowTable = Yhden rivin p\u00F6yd\u00E4t map.oneRowTable = Yhden rivin p\u00F6yd\u00E4t
...@@ -332,6 +357,7 @@ place.details = Tiedot ...@@ -332,6 +357,7 @@ place.details = Tiedot
place.edit = Muokkaa place.edit = Muokkaa
place.groupremove = Poista paikka paikkaryhm\u00E4st\u00E4 place.groupremove = Poista paikka paikkaryhm\u00E4st\u00E4
place.height = Korkeus place.height = Korkeus
place.id = ID
place.mapX = X place.mapX = X
place.mapY = Y place.mapY = Y
place.membership = Yhdistetty k\u00E4ytt\u00E4j\u00E4 place.membership = Yhdistetty k\u00E4ytt\u00E4j\u00E4
...@@ -383,7 +409,9 @@ placetoken.topText = Voit yhdist\u00E4\u00E4 paikan omaan k\u00E4ytt\u00E4 ...@@ -383,7 +409,9 @@ placetoken.topText = Voit yhdist\u00E4\u00E4 paikan omaan k\u00E4ytt\u00E4
poll.answer = Vastaa kyselyyn poll.answer = Vastaa kyselyyn
poll.begin = Avaa kysely poll.begin = Avaa kysely
poll.create = Luo
poll.description = Kuvaus poll.description = Kuvaus
poll.edit = Muokkaa
poll.end = Sulje kysely poll.end = Sulje kysely
poll.name = Kyselyn nimi poll.name = Kyselyn nimi
poll.save = L\u00E4het\u00E4 vastauksesi poll.save = L\u00E4het\u00E4 vastauksesi
...@@ -402,6 +430,7 @@ product.paid = Maksettu ...@@ -402,6 +430,7 @@ product.paid = Maksettu
product.prepaid = Prepaid product.prepaid = Prepaid
product.prepaidInstant = Luodaan kun prepaid maksetaan product.prepaidInstant = Luodaan kun prepaid maksetaan
product.price = Tuotteen hinta product.price = Tuotteen hinta
product.providedRole = Tuote m\u00E4\u00E4ritt\u00E4\u00E4 roolin
product.save = Tallenna product.save = Tallenna
product.shopInstant = Luo k\u00E4teismaksu tuotteille product.shopInstant = Luo k\u00E4teismaksu tuotteille
product.sort = J\u00E4rjestys luku product.sort = J\u00E4rjestys luku
...@@ -409,19 +438,29 @@ product.totalPrice = Summa ...@@ -409,19 +438,29 @@ product.totalPrice = Summa
product.unitName = Tuoteyksikk\u00F6 product.unitName = Tuoteyksikk\u00F6
product.vat = ALV product.vat = ALV
productShopView.readBarcode = Lue viivakoodi
products.save = Tallenna products.save = Tallenna
productshop.billCreated = Lasku luotu productshop.billCreated = Lasku luotu
productshop.commit = Osta productshop.commit = Osta
productshop.limits = Vapaana productshop.limits = Vapaana
productshop.minusOne = -1
productshop.minusTen = -10
productshop.noItemsInCart = Ostoskorissa ei ole tuotteita productshop.noItemsInCart = Ostoskorissa ei ole tuotteita
productshop.plusOne = +1
productshop.plusTen = +10
productshop.total = Yhteens\u00E4 productshop.total = Yhteens\u00E4
reader.assocToCard = Yhdist\u00E4 korttiin reader.assocToCard = Yhdist\u00E4 korttiin
reader.createNewCard = Luo uusi kortti
reader.description = Kuvaus reader.description = Kuvaus
reader.edit = Muokkaa
reader.identification = Tunniste
reader.name = Lukijan nimi reader.name = Lukijan nimi
reader.select = Valitse lukija reader.select = Valitse lukija
reader.tag = Tag reader.tag = Tag
reader.type = Tyyppi
reader.user = K\u00E4ytt\u00E4j\u00E4 reader.user = K\u00E4ytt\u00E4j\u00E4
readerView.searchforuser = Etsi k\u00E4ytt\u00E4j\u00E4\u00E4 readerView.searchforuser = Etsi k\u00E4ytt\u00E4j\u00E4\u00E4
...@@ -441,6 +480,11 @@ resetMail.username = K\u00E4ytt\u00E4j\u00E4tunnus ...@@ -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.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 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.cardtemplate = Korttipohja
role.create = Luo rooli role.create = Luo rooli
role.description = Kuvaus role.description = Kuvaus
...@@ -450,10 +494,15 @@ role.name = Nimi ...@@ -450,10 +494,15 @@ role.name = Nimi
role.parents = Periytyy role.parents = Periytyy
role.savePermissions = Tallenna oikeudet role.savePermissions = Tallenna oikeudet
salespoint.edit = Muokkaa
salespoint.name = Nimi
salespoint.noSalesPoints = M\u00E4\u00E4r\u00E4
sendPicture.header = L\u00E4het\u00E4 kuva sendPicture.header = L\u00E4het\u00E4 kuva
shop.accountBalance = Tilin saldo shop.accountBalance = Tilin saldo
shop.cash = K\u00E4teispano shop.cash = K\u00E4teispano
shop.readBarcode = Lue viivakoodi
shop.totalPrice = Tuotteiden hinta shop.totalPrice = Tuotteiden hinta
shop.user = Myyd\u00E4\u00E4n shop.user = Myyd\u00E4\u00E4n
...@@ -484,6 +533,7 @@ sidebar.users = K\u00E4ytt\u00E4j\u00E4t ...@@ -484,6 +533,7 @@ sidebar.users = K\u00E4ytt\u00E4j\u00E4t
sidebar.utils.flushCache = Flush Cache sidebar.utils.flushCache = Flush Cache
sidebar.utils.testdata = Testdata sidebar.utils.testdata = Testdata
sitepage.addContent = Lis\u00E4\u00E4 sis\u00E4lt\u00F6laatikko
sitepage.create = Luo uusi sitepage.create = Luo uusi
sitepage.edit = Muokkaa sitepage.edit = Muokkaa
sitepage.name = Sivun nimi sitepage.name = Sivun nimi
...@@ -627,6 +677,10 @@ user.validateUser.header = Ole hyv\u00E4 ja sy\u00F6t\u00E4 kirjautumisti ...@@ -627,6 +677,10 @@ user.validateUser.header = Ole hyv\u00E4 ja sy\u00F6t\u00E4 kirjautumisti
user.wholeName = Nimi user.wholeName = Nimi
user.zipCode = Postinumero user.zipCode = Postinumero
userImport.commit = Hyv\u00E4ksy
userView.image = Kuva
userimage.webcam = Ota kuva webkameralla userimage.webcam = Ota kuva webkameralla
userlist.header = Etsi k\u00E4ytt\u00E4ji\u00E4 userlist.header = Etsi k\u00E4ytt\u00E4ji\u00E4
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/ErrorPageView.java
...@@ -18,6 +18,8 @@ import java.io.StringWriter; ...@@ -18,6 +18,8 @@ import java.io.StringWriter;
import java.util.Calendar; import java.util.Calendar;
import java.util.Map; import java.util.Map;
import java.util.zip.CRC32;
@Named @Named
@RequestScoped @RequestScoped
public class ErrorPageView implements Serializable { public class ErrorPageView implements Serializable {
...@@ -35,6 +37,7 @@ public class ErrorPageView implements Serializable { ...@@ -35,6 +37,7 @@ public class ErrorPageView implements Serializable {
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(ErrorPageView.class); private static final Logger logger = LoggerFactory.getLogger(ErrorPageView.class);
public String getStackTrace() { public String getStackTrace() {
FacesContext context = FacesContext.getCurrentInstance(); FacesContext context = FacesContext.getCurrentInstance();
...@@ -51,14 +54,29 @@ public class ErrorPageView implements Serializable { ...@@ -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(){ 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() { public String getTrail() {
HttpServletRequest req = (HttpServletRequest) getContext().getExternalContext().getRequest(); HttpServletRequest req = (HttpServletRequest) getContext().getExternalContext().getRequest();
Object trail = req.getSession().getAttribute("trail"); 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() { public FacesContext getContext() {
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserView.java
package fi.insomnia.bortal.web.cdiview.user; package fi.insomnia.bortal.web.cdiview.user;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
...@@ -7,11 +10,15 @@ import javax.ejb.EJB; ...@@ -7,11 +10,15 @@ import javax.ejb.EJB;
import javax.enterprise.context.Conversation; import javax.enterprise.context.Conversation;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
import javax.enterprise.inject.Produces; import javax.enterprise.inject.Produces;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import org.primefaces.event.CaptureEvent; import org.primefaces.event.CaptureEvent;
import org.primefaces.model.CroppedImage; import org.primefaces.model.CroppedImage;
import org.primefaces.model.DefaultStreamedContent;
import org.primefaces.model.StreamedContent;
import org.primefaces.model.UploadedFile; import org.primefaces.model.UploadedFile;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -28,6 +35,7 @@ import fi.insomnia.bortal.model.PrintedCard; ...@@ -28,6 +35,7 @@ import fi.insomnia.bortal.model.PrintedCard;
import fi.insomnia.bortal.model.Role; import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User; import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.model.UserImage; import fi.insomnia.bortal.model.UserImage;
import fi.insomnia.bortal.util.MassPrintResult;
import fi.insomnia.bortal.web.annotations.LoggedIn; import fi.insomnia.bortal.web.annotations.LoggedIn;
import fi.insomnia.bortal.web.annotations.SelectedUser; import fi.insomnia.bortal.web.annotations.SelectedUser;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
...@@ -78,6 +86,12 @@ public class UserView extends GenericCDIView { ...@@ -78,6 +86,12 @@ public class UserView extends GenericCDIView {
@EJB @EJB
private transient CardPrintBeanLocal cardPrintBean; private transient CardPrintBeanLocal cardPrintBean;
private File file;
private StreamedContent streamedFile;
private MassPrintResult mpr = null;
private boolean waitForAcceptance = false;
@Produces @Produces
@LoggedIn @LoggedIn
public EventUser getCurrentUser() { public EventUser getCurrentUser() {
...@@ -144,6 +158,31 @@ public class UserView extends GenericCDIView { ...@@ -144,6 +158,31 @@ public class UserView extends GenericCDIView {
return null; return null;
} }
public void prepareCardDownload() {
file = null;
try {
mpr = cardPrintBean.getUserCardAsPrintablePdf(this.user.getId());
file = File.createTempFile("cardprintout",null);
FileOutputStream fostream = new FileOutputStream(file);
fostream.write(mpr.getPdf());
fostream.close();
setStreamedFile(new DefaultStreamedContent(new FileInputStream(this.file)));
} catch(Exception e) {
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(e.getMessage()));
}
}
public String acceptPrintedCard() {
if(mpr != null && mpr.getAffectedUsers().size() > 0) {
cardPrintBean.acceptMassPrintResult(mpr);
return "accepted";
} else {
return "failure";
}
}
public String makeCard() public String makeCard()
{ {
PrintedCard card = cardBean.checkPrintedCard(user); PrintedCard card = cardBean.checkPrintedCard(user);
...@@ -311,4 +350,24 @@ public class UserView extends GenericCDIView { ...@@ -311,4 +350,24 @@ public class UserView extends GenericCDIView {
public void setUsername(String username) { public void setUsername(String username) {
this.username = username; this.username = username;
} }
public void raiseWaitForAcceptance() {
waitForAcceptance = true;
}
public boolean isWaitForAcceptance() {
return waitForAcceptance;
}
public void setWaitForAcceptance(boolean waitForAcceptance) {
this.waitForAcceptance = waitForAcceptance;
}
public StreamedContent getStreamedFile() {
return streamedFile;
}
public void setStreamedFile(StreamedContent streamedFile) {
this.streamedFile = streamedFile;
}
} }
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!