Skip to content

Linnea Samila / Moya

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

* Lisätty primefaces calendar lokalisointi suomeksi 

  * Lisätty syntymäpäiväkenttä käyttäjätietoihin.
  * Muutettu käyttäjän syntymäpäivä Calendar -> Date

P.S. Edellisessä
1 parent adef6888
Inline Side-by-side
Showing with 73 additions and 36 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/CheckoutFiBean.java
...@@ -125,8 +125,6 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal { ...@@ -125,8 +125,6 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
stamp.append(STAMP_SPLITCHAR); stamp.append(STAMP_SPLITCHAR);
stamp.append(Calendar.getInstance().getTimeInMillis() / 1000); stamp.append(Calendar.getInstance().getTimeInMillis() / 1000);
logger.info("Created stamp {}", stamp.toString());
postParams.put(CheckoutFiParam.STAMP, stamp.toString()); postParams.put(CheckoutFiParam.STAMP, stamp.toString());
postParams.put(CheckoutFiParam.AMOUNT, priceInCents); postParams.put(CheckoutFiParam.AMOUNT, priceInCents);
postParams.put(CheckoutFiParam.REFERENCE, bill.getReferenceNumber().toString()); postParams.put(CheckoutFiParam.REFERENCE, bill.getReferenceNumber().toString());
...@@ -160,7 +158,8 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal { ...@@ -160,7 +158,8 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
try { try {
final String calculatedHash = PasswordFunctions.calculateMd5(mdString.toString()); final String calculatedHash = PasswordFunctions.calculateMd5(mdString.toString());
logger.info("Calculated checksum {} from {}", mdString.toString(), calculatedHash); // logger.info("Calculated checksum {} from {}",
// mdString.toString(), calculatedHash);
nameValuePairs.add(new BasicNameValuePair("MAC", calculatedHash)); nameValuePairs.add(new BasicNameValuePair("MAC", calculatedHash));
...@@ -172,7 +171,8 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal { ...@@ -172,7 +171,8 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();
IOUtils.copy(response.getEntity().getContent(), writer, "UTF8"); IOUtils.copy(response.getEntity().getContent(), writer, "UTF8");
String xmlReturn = writer.toString(); String xmlReturn = writer.toString();
logger.info("Got response from checkout.fi msg {}, {} ", response.getStatusLine().getStatusCode(), xmlReturn); // logger.info("Got response from checkout.fi msg {}, {} ",
// response.getStatusLine().getStatusCode(), xmlReturn);
return parseTokenXml(xmlReturn); return parseTokenXml(xmlReturn);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/TestDataBean.java
...@@ -103,7 +103,7 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -103,7 +103,7 @@ public class TestDataBean implements TestDataBeanLocal {
u.setNick("kavija"); u.setNick("kavija");
Calendar bday = Calendar.getInstance(); Calendar bday = Calendar.getInstance();
bday.set(Calendar.YEAR, 1990); bday.set(Calendar.YEAR, 1990);
u.setBirthday(bday); u.setBirthday(bday.getTime());
u.setCreated(Calendar.getInstance()); u.setCreated(Calendar.getInstance());
u.setEmail("kalle.kavija@example.com"); u.setEmail("kalle.kavija@example.com");
u.setFirstnames("Kalle Kauko"); u.setFirstnames("Kalle Kauko");
...@@ -129,7 +129,7 @@ public class TestDataBean implements TestDataBeanLocal { ...@@ -129,7 +129,7 @@ public class TestDataBean implements TestDataBeanLocal {
u.setNick("admin"); u.setNick("admin");
Calendar bday = Calendar.getInstance(); Calendar bday = Calendar.getInstance();
bday.set(Calendar.YEAR, 1980); bday.set(Calendar.YEAR, 1980);
u.setBirthday(bday); u.setBirthday(bday.getTime());
u.setCreated(Calendar.getInstance()); u.setCreated(Calendar.getInstance());
u.setEmail("admin@inter.net"); u.setEmail("admin@inter.net");
u.setFirstnames("Asko Admin"); u.setFirstnames("Asko Admin");
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser.java
...@@ -9,6 +9,7 @@ import java.math.BigDecimal; ...@@ -9,6 +9,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
...@@ -274,12 +275,12 @@ public class EventUser extends GenericEntity implements IUser { ...@@ -274,12 +275,12 @@ public class EventUser extends GenericEntity implements IUser {
} }
@Override @Override
public Calendar getBirthday() { public Date getBirthday() {
return user.getBirthday(); return user.getBirthday();
} }
@Override @Override
public void setBirthday(Calendar birthday) { public void setBirthday(Date birthday) {
user.setBirthday(birthday); user.setBirthday(birthday);
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/IUser.java
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import java.util.List; import java.util.List;
import fi.insomnia.bortal.enums.Gender; import fi.insomnia.bortal.enums.Gender;
...@@ -29,9 +30,9 @@ public interface IUser { ...@@ -29,9 +30,9 @@ public interface IUser {
public abstract void setFirstnames(String firstnames); public abstract void setFirstnames(String firstnames);
public abstract Calendar getBirthday(); public abstract Date getBirthday();
public abstract void setBirthday(Calendar birthday); public abstract void setBirthday(Date birthday);
public abstract String getNick(); public abstract String getNick();
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User.java
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
...@@ -59,7 +60,7 @@ public class User extends GenericEntity implements IUser { ...@@ -59,7 +60,7 @@ public class User extends GenericEntity implements IUser {
@Column(name = "birthday") @Column(name = "birthday")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Calendar birthday; private Date birthday;
@Column(name = "nick") @Column(name = "nick")
private String nick = ""; private String nick = "";
...@@ -173,12 +174,12 @@ public class User extends GenericEntity implements IUser { ...@@ -173,12 +174,12 @@ public class User extends GenericEntity implements IUser {
} }
@Override @Override
public Calendar getBirthday() { public Date getBirthday() {
return birthday; return birthday;
} }
@Override @Override
public void setBirthday(Calendar birthday) { public void setBirthday(Date birthday) {
this.birthday = birthday; this.birthday = birthday;
} }
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User_.java
...@@ -2,12 +2,13 @@ package fi.insomnia.bortal.model; ...@@ -2,12 +2,13 @@ package fi.insomnia.bortal.model;
import fi.insomnia.bortal.enums.Gender; import fi.insomnia.bortal.enums.Gender;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import javax.annotation.Generated; import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute; import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel; import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2012-05-13T14:47:41.939+0300") @Generated(value="Dali", date="2012-09-09T04:13:51.037+0300")
@StaticMetamodel(User.class) @StaticMetamodel(User.class)
public class User_ extends GenericEntity_ { public class User_ extends GenericEntity_ {
public static volatile SingularAttribute<User, Calendar> created; public static volatile SingularAttribute<User, Calendar> created;
...@@ -16,7 +17,7 @@ public class User_ extends GenericEntity_ { ...@@ -16,7 +17,7 @@ public class User_ extends GenericEntity_ {
public static volatile SingularAttribute<User, String> password; public static volatile SingularAttribute<User, String> password;
public static volatile SingularAttribute<User, String> lastname; public static volatile SingularAttribute<User, String> lastname;
public static volatile SingularAttribute<User, String> firstnames; public static volatile SingularAttribute<User, String> firstnames;
public static volatile SingularAttribute<User, Calendar> birthday; public static volatile SingularAttribute<User, Date> birthday;
public static volatile SingularAttribute<User, String> nick; public static volatile SingularAttribute<User, String> nick;
public static volatile SingularAttribute<User, String> email; public static volatile SingularAttribute<User, String> email;
public static volatile SingularAttribute<User, String> address; public static volatile SingularAttribute<User, String> address;
......
code/LanBortalWeb/WebContent/layout/insomnia2/template.xhtml
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia2/css/tyyli.css" /> <link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia2/css/tyyli.css" />
<ui:insert name="headerdata" /> <ui:insert name="headerdata" />
<h:outputScript name="prime_calendar.js" library="script" />
</h:head> </h:head>
<h:body> <h:body>
<div id="header"> <div id="header">
......
code/LanBortalWeb/WebContent/resources/cditools/shop/readerlist.xhtml
...@@ -28,6 +28,11 @@ ...@@ -28,6 +28,11 @@
<f:param value="#{rr.id}" name="readerId" /> <f:param value="#{rr.id}" name="readerId" />
</h:link> </h:link>
</h:column> </h:column>
<h:column>
<h:link outcome="/shop/editReader" value="#{i18n['reader.edit']}">
<f:param value="#{rr.id}" name="readerId" />
</h:link>
</h:column>
</h:dataTable> </h:dataTable>
</composite:implementation> </composite:implementation>
......
code/LanBortalWeb/WebContent/resources/cditools/user/edit.xhtml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:composite="http://java.sun.com/jsf/composite" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:composite="http://java.sun.com/jsf/composite" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools" > xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:p="http://primefaces.org/ui">
<composite:interface> <composite:interface>
...@@ -70,11 +70,6 @@ ...@@ -70,11 +70,6 @@
<h:message for="town" /> <h:message for="town" />
<h:outputLabel rendered="#{sessionHandler.superadmin}" value="#{i18n['user.superadmin']}:" for="superadmin" />
<h:selectBooleanCheckbox disabled="#{!cc.attrs.creating and !userView.canSave()}"
rendered="#{sessionHandler.superadmin}" id="superadmin" value="#{userView.selectedUser.superadmin}"
/>
<h:message rendered="#{sessionHandler.superadmin}" for="superadmin" />
<!-- <!--
<h:outputLabel value="#{i18n['user.defaultImage']}:" for="currentImage" /> <h:outputLabel value="#{i18n['user.defaultImage']}:" for="currentImage" />
...@@ -92,6 +87,11 @@ ...@@ -92,6 +87,11 @@
</h:selectOneRadio> </h:selectOneRadio>
<h:message for="sex" /> <h:message for="sex" />
<h:outputLabel for="birthday" value="#{i18n['user.birthday']}:"/>
<p:calendar id="birthday" navigator="true" yearRange="c-80:c-0" locale="fi" value="#{userView.selectedUser.birthday}" pattern="#{sessionHandler.dateFormat}" timeZone="#{sessionHandler.timezone}" />
<h:message for="birthday" />
<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.password']}:" for="password" /> <h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.password']}:" for="password" />
<h:inputSecret validator="#{userValidator.password}" rendered="#{cc.attrs.creating}" id="password" <h:inputSecret validator="#{userValidator.password}" rendered="#{cc.attrs.creating}" id="password"
...@@ -105,6 +105,14 @@ ...@@ -105,6 +105,14 @@
/> />
<h:message rendered="#{cc.attrs.creating}" for="passwordcheck" /> <h:message rendered="#{cc.attrs.creating}" for="passwordcheck" />
<h:outputLabel rendered="#{sessionHandler.superadmin}" value="#{i18n['user.superadmin']}:" for="superadmin" />
<h:selectBooleanCheckbox disabled="#{!cc.attrs.creating and !userView.canSave()}"
rendered="#{sessionHandler.superadmin}" id="superadmin" value="#{userView.selectedUser.superadmin}"
/>
<h:message rendered="#{sessionHandler.superadmin}" for="superadmin" />
<h:commandButton rendered="#{cc.attrs.creating or userView.canSave()}" id="commitbtn" <h:commandButton rendered="#{cc.attrs.creating or userView.canSave()}" id="commitbtn"
action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}" action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}"
/> />
......
code/LanBortalWeb/WebContent/resources/script/prime_calendar.js 0 → 100644
PrimeFaces.locales ['fi'] = {
closeText: 'Sulje',
prevText: 'Edellinen',
nextText: 'Seuraava',
monthNames: ['Tammikuu', 'Helmikuu', 'Maaliskuu', 'Huhtikuu', 'Toukokuu', 'Kesäkuu', 'Heinäkuu', 'Elokuu', 'Syyskuu', 'Lokakuu', 'Marraskuu', 'Joulukuu' ],
monthNamesShort: ['Tammi', 'Helmi', 'Maalis', 'Huhti', 'Touko', 'Kesä', 'Heinä', 'Elo', 'Syys', 'Loka', 'Marras', 'Joulu' ],
dayNames: ['Sunnuntai', 'Maanantai', 'Tiistai', 'Keskiviikko', 'Torstai', 'Perjantai', 'Lauantai'],
dayNamesShort: ['Su', 'Ma', 'Ti', 'Ke', 'To', 'Pe', 'La'],
dayNamesMin: ['S', 'M', 'T', 'K ', 'T', 'P ', 'L'],
weekHeader: 'Viikko',
firstDay: 1,
isRTL: false,
showMonthAfterYear: false,
yearSuffix:'',
timeOnlyTitle: 'Vain aika',
timeText: 'Aika',
hourText: 'Tunti',
minuteText: 'Minuutti',
secondText: 'Sekunti',
currentText: 'Tämä hetki',
ampm: false,
month: 'Kuukausi',
week: 'Viikko',
day: 'Päivä',
allDayText: 'Koko päivä'
};
\ No newline at end of file
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
...@@ -231,8 +231,6 @@ mapView.errorWhenReservingPlace = Error when reserving place! ...@@ -231,8 +231,6 @@ mapView.errorWhenReservingPlace = Error when reserving place!
mapView.errorWhileBuyingPlaces = Error when buying places. Please try again. If error reoccurs please contact organizers. 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. mapView.notEnoughCreditsToReserve = You don't have enough credits to reserve this place.
mapedit.save = Save
nasty.user = Go away! nasty.user = Go away!
org.hibernate.validator.constraints.Email.message = not a well-formed email address org.hibernate.validator.constraints.Email.message = not a well-formed email address
...@@ -402,8 +400,6 @@ product.totalPrice = Total ...@@ -402,8 +400,6 @@ product.totalPrice = Total
product.unitName = Unit name product.unitName = Unit name
product.vat = VAT product.vat = VAT
productShopView.readBarcode = Read
products.save = Save products.save = Save
productshop.billCreated = Bill created productshop.billCreated = Bill created
...@@ -451,7 +447,6 @@ sendPicture.header = S ...@@ -451,7 +447,6 @@ sendPicture.header = S
shop.accountBalance = Account balance shop.accountBalance = Account balance
shop.cash = Cash deposit shop.cash = Cash deposit
shop.readBarcode = Read viivakoodi
shop.totalPrice = Price of products shop.totalPrice = Price of products
shop.user = Selling to shop.user = Selling to
...@@ -567,6 +562,7 @@ user.accountevents = Account events ...@@ -567,6 +562,7 @@ user.accountevents = Account events
user.address = Address user.address = Address
user.bank = Bank user.bank = Bank
user.bankaccount = Bank number user.bankaccount = Bank number
user.birthday = Birthday
user.cardPower = Usertype user.cardPower = Usertype
user.changePassword = Change password user.changePassword = Change password
user.changepassword.forUser = For user user.changepassword.forUser = For user
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
...@@ -238,8 +238,6 @@ mapView.errorWhenReservingPlace = Paikkaa varatessa tapahtui virhe. ...@@ -238,8 +238,6 @@ 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.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. mapView.notEnoughCreditsToReserve = Sinulla ei ole riitt\u00E4v\u00E4sti suoritettuja konepaikkamaksuja t\u00E4m\u00E4n paikan varaamiseen.
mapedit.save = Tallenna
menu.index = Etusivu menu.index = Etusivu
menu.place.placemap = Paikkakartta menu.place.placemap = Paikkakartta
menu.poll.index = Kyselyt menu.poll.index = Kyselyt
...@@ -391,8 +389,6 @@ product.totalPrice = Summa ...@@ -391,8 +389,6 @@ product.totalPrice = Summa
product.unitName = Tuoteyksikk\u00F6 product.unitName = Tuoteyksikk\u00F6
product.vat = ALV product.vat = ALV
productShopView.readBarcode = Lue
products.save = Tallenna products.save = Tallenna
productshop.billCreated = Lasku luotu productshop.billCreated = Lasku luotu
...@@ -438,7 +434,6 @@ sendPicture.header = L\u00E4het\u00E4 kuva ...@@ -438,7 +434,6 @@ 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
...@@ -555,6 +550,7 @@ user.accountevents = Tilitapahtumat ...@@ -555,6 +550,7 @@ user.accountevents = Tilitapahtumat
user.address = Osoite user.address = Osoite
user.bank = Pankki user.bank = Pankki
user.bankaccount = Pankkitili user.bankaccount = Pankkitili
user.birthday = Syntym\u00E4p\u00E4iv\u00E4
user.cardPower = K\u00E4ytt\u00E4j\u00E4tyyppi user.cardPower = K\u00E4ytt\u00E4j\u00E4tyyppi
user.changePassword = Vaihda salasana user.changePassword = Vaihda salasana
user.changepassword.forUser = K\u00E4ytt\u00E4j\u00E4lle user.changepassword.forUser = K\u00E4ytt\u00E4j\u00E4lle
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/PlaceMap.java
...@@ -90,7 +90,7 @@ public class PlaceMap extends HttpServlet { ...@@ -90,7 +90,7 @@ public class PlaceMap extends HttpServlet {
ostream = response.getOutputStream(); ostream = response.getOutputStream();
if (map == null || map.getMapData() == null) { if (map == null || map.getMapData() == null) {
logger.info("Error handling map {}!", map); logger.warn("Error handling map {}!", map);
response.setStatus(HttpServletResponse.SC_NOT_FOUND); response.setStatus(HttpServletResponse.SC_NOT_FOUND);
ostream.print("Map error!"); ostream.print("Map error!");
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/MapView.java
...@@ -78,7 +78,7 @@ public class MapView extends GenericCDIView { ...@@ -78,7 +78,7 @@ public class MapView extends GenericCDIView {
public Long getPlacesLeftToSelect() { public Long getPlacesLeftToSelect() {
Long ret = placeMapBean.selectablePlaceCount(getActiveMap()); Long ret = placeMapBean.selectablePlaceCount(getActiveMap());
logger.info("Got {} places left for map {}", ret, getActiveMap()); logger.debug("Got {} places left for map {}", ret, getActiveMap());
return ret; return ret;
} }
...@@ -88,7 +88,7 @@ public class MapView extends GenericCDIView { ...@@ -88,7 +88,7 @@ public class MapView extends GenericCDIView {
Long ret = placeMapBean.availablePlaceCount(getActiveMap()); Long ret = placeMapBean.availablePlaceCount(getActiveMap());
logger.info("Got {} availbale places for map {}", ret, getActiveMap()); logger.debug("Got {} availbale places for map {}", ret, getActiveMap());
return ret; return ret;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserView.java
...@@ -186,7 +186,7 @@ public class UserView extends GenericCDIView { ...@@ -186,7 +186,7 @@ public class UserView extends GenericCDIView {
canSave = getCurrentUser().equals(user) || permbean.hasPermission(UserPermission.MODIFY); canSave = getCurrentUser().equals(user) || permbean.hasPermission(UserPermission.MODIFY);
this.beginConversation(); this.beginConversation();
logger.info("Accountevents for user {}", user.getAccountEvents().size()); logger.debug("Accountevents for user {}", user.getAccountEvents().size());
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!