Skip to content

Riina Antikainen / Moya

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

Le bugs

1 parent 009a807d
Inline Side-by-side
Showing with 67 additions and 53 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/AccountEventBean.java
...@@ -62,17 +62,19 @@ public class AccountEventBean implements AccountEventBeanLocal { ...@@ -62,17 +62,19 @@ public class AccountEventBean implements AccountEventBeanLocal {
@Override @Override
@RolesAllowed(UserPermission.S_MODIFY_ACCOUNTEVENTS) @RolesAllowed(UserPermission.S_MODIFY_ACCOUNTEVENTS)
public void delete(AccountEvent account) { public EventUser delete(AccountEvent account) {
AccountEvent acco = accountfacade.find(account.getId()); AccountEvent acco = accountfacade.reload(account);
EventUser ret = acco.getUser();
loggingbean.logMessage(SecurityLogType.accountEvent, permbean.getCurrentUser(), "Deleting AccountEvent '", acco.getProduct().getName(), "' count: '", acco.getQuantity().toString(), "' unitprice: '", acco.getUnitPrice().toString(), "' accouser: '", acco.getUser().getUser().getLogin(), "'"); loggingbean.logMessage(SecurityLogType.accountEvent, permbean.getCurrentUser(), "Deleting AccountEvent '", acco.getProduct().getName(), "' count: '", acco.getQuantity().toString(), "' unitprice: '", acco.getUnitPrice().toString(), "' accouser: '", acco.getUser().getUser().getLogin(), "'");
acco.getProduct().getAccountEvents().remove(acco); acco.getProduct().getAccountEvents().remove(acco);
acco.getUser().getAccountEvents().remove(acco);
if (acco.getBill() != null) { if (acco.getBill() != null) {
acco.getBill().setAccountEvent(null); acco.getBill().setAccountEvent(null);
} }
accountfacade.remove(acco); accountfacade.remove(acco);
return ret;
} }
@Override @Override
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MenuBean.java
...@@ -88,12 +88,12 @@ public class MenuBean implements MenuBeanLocal { ...@@ -88,12 +88,12 @@ public class MenuBean implements MenuBeanLocal {
// Index // Index
usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.VIEW_ALL); usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.VIEW_ALL);
// kuppa // kuppa
MenuNavigation usershop = usermenu.addPage(null, null); MenuNavigation usershop = usermenu.addPage(null, null);
usermenu.setKey("topnavi.shop.products"); usermenu.setKey("topnavi.shop.products");
usermenu.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW); usermenu.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
usershop.addPage(menuitemfacade.findOrCreate("/place/myGroups"), UserPermission.VIEW_SELF); usershop.addPage(menuitemfacade.findOrCreate("/place/myGroups"), UserPermission.VIEW_SELF);
usershop.addPage(null, null); usershop.addPage(null, null);
usershop.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL); usershop.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL);
...@@ -128,32 +128,48 @@ public class MenuBean implements MenuBeanLocal { ...@@ -128,32 +128,48 @@ public class MenuBean implements MenuBeanLocal {
eventTopmenu.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER); eventTopmenu.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER);
navifacade.create(eventTopmenu); navifacade.create(eventTopmenu);
/* /*
MenuNavigation profileTopmenu = new MenuNavigation(ev, "topnavi.profile", menusort = +10); * MenuNavigation profileTopmenu = new MenuNavigation(ev,
profileTopmenu.addPage(menuitemfacade.findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL); * "topnavi.profile", menusort = +10);
profileTopmenu.addPage(menuitemfacade.findOrCreate("/useradmin/list"), UserPermission.VIEW_ALL).setHeader("submenu.user.manageuserlinks"); * profileTopmenu.addPage(menuitemfacade
profileTopmenu.addPage(menuitemfacade.findOrCreate("/user/edit"), UserPermission.VIEW_SELF); * .findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL);
profileTopmenu.addPage(menuitemfacade.findOrCreate("/user/changePassword"), UserPermission.VIEW_SELF); * profileTopmenu
*/ * .addPage(menuitemfacade.findOrCreate("/useradmin/list"),
* UserPermission.VIEW_ALL).setHeader("submenu.user.manageuserlinks");
MenuNavigation usermgmt = profileTopmenu.addPage(null, null); * profileTopmenu.addPage(menuitemfacade.findOrCreate("/user/edit"),
usermgmt.setKey("topnavi.user.mgmt"); * UserPermission.VIEW_SELF);
usermgmt.addPage(menuitemfacade.findOrCreate("/role/create"), UserPermission.WRITE_ROLES); * profileTopmenu.addPage(menuitemfacade.findOrCreate
usermgmt.addPage(menuitemfacade.findOrCreate("/role/list"), UserPermission.READ_ROLES).setHeader("submenu.user.rolelinks"); * ("/user/changePassword"), UserPermission.VIEW_SELF);
usermgmt.addPage(menuitemfacade.findOrCreate("/orgrole/list"), UserPermission.READ_ORGROLES); */
usermgmt.addPage(menuitemfacade.findOrCreate("/orgrole/create"), UserPermission.WRITE_ORGROLES);
usermgmt.addPage(menuitemfacade.findOrCreate("/useradmin/listCardTemplates"), UserPermission.READ_ROLES); // MenuNavigation usermgmt = profileTopmenu.addPage(null, null);
usermgmt.addPage(menuitemfacade.findOrCreate("/useradmin/createCardTemplate"), UserPermission.WRITE_ROLES); // usermgmt.setKey("topnavi.user.mgmt");
// usermgmt.addPage(menuitemfacade.findOrCreate("/role/create"),
navifacade.create(profileTopmenu); // UserPermission.WRITE_ROLES);
// usermgmt.addPage(menuitemfacade.findOrCreate("/role/list"),
MenuNavigation miscTopmenu = new MenuNavigation(ev, "topnavi.misc", menusort = +10); // UserPermission.READ_ROLES).setHeader("submenu.user.rolelinks");
// usermgmt.addPage(menuitemfacade.findOrCreate("/orgrole/list"),
miscTopmenu.addPage(menuitemfacade.findOrCreate("/pages/list"), ContentPermission.MANAGE_PAGES); // UserPermission.READ_ORGROLES);
miscTopmenu.addPage(menuitemfacade.findOrCreate("/pages/create"), ContentPermission.MANAGE_PAGES); // usermgmt.addPage(menuitemfacade.findOrCreate("/orgrole/create"),
miscTopmenu.addPage(menuitemfacade.findOrCreate("/utils/flushCache"), ContentPermission.MANAGE_PAGES); // UserPermission.WRITE_ORGROLES);
// usermgmt.addPage(menuitemfacade.findOrCreate("/useradmin/listCardTemplates"),
navifacade.create(miscTopmenu); // UserPermission.READ_ROLES);
// usermgmt.addPage(menuitemfacade.findOrCreate("/useradmin/createCardTemplate"),
// UserPermission.WRITE_ROLES);
//
// navifacade.create(profileTopmenu);
//
// MenuNavigation miscTopmenu = new MenuNavigation(ev, "topnavi.misc",
// menusort = +10);
//
// miscTopmenu.addPage(menuitemfacade.findOrCreate("/pages/list"),
// ContentPermission.MANAGE_PAGES);
// miscTopmenu.addPage(menuitemfacade.findOrCreate("/pages/create"),
// ContentPermission.MANAGE_PAGES);
// miscTopmenu.addPage(menuitemfacade.findOrCreate("/utils/flushCache"),
// ContentPermission.MANAGE_PAGES);
//
// navifacade.create(miscTopmenu);
// frontTopnavi.addPage(menuitemfacade.findOrCreate("/user/create"), // frontTopnavi.addPage(menuitemfacade.findOrCreate("/user/create"),
// UserPermission.CREATE_NEW); // UserPermission.CREATE_NEW);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ReaderBean.java
package fi.insomnia.bortal.beans; package fi.insomnia.bortal.beans;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.regex.Pattern; import java.util.regex.Pattern;
...@@ -100,7 +101,7 @@ public class ReaderBean implements ReaderBeanLocal { ...@@ -100,7 +101,7 @@ public class ReaderBean implements ReaderBeanLocal {
} }
} else { } else {
ret.setUpdatetime(Calendar.getInstance()); ret.setUpdatetime(new Date());
} }
if (card == null) if (card == null)
{ {
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/AccountEventBeanLocal.java
...@@ -17,12 +17,11 @@ public interface AccountEventBeanLocal { ...@@ -17,12 +17,11 @@ public interface AccountEventBeanLocal {
AccountEvent merge(AccountEvent account); AccountEvent merge(AccountEvent account);
void delete(AccountEvent account); EventUser delete(AccountEvent account);
AccountEvent find(Integer id); AccountEvent find(Integer id);
void shopCash(EventUser shoppingUser, Map<Product, BigDecimal> void shopCash(EventUser shoppingUser, Map<Product, BigDecimal> shopMap, boolean buyInstant);
shopMap, boolean buyInstant);
List<Role> getRolesFromAccountEvents(EventUser u); List<Role> getRolesFromAccountEvents(EventUser u);
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent.java
package fi.insomnia.bortal.model; package fi.insomnia.bortal.model;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
...@@ -26,11 +27,11 @@ public class ReaderEvent extends GenericEntity { ...@@ -26,11 +27,11 @@ public class ReaderEvent extends GenericEntity {
@Column(name = "event_time", nullable = false) @Column(name = "event_time", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Calendar time; private Date time;
@Column(name = "event_updated") @Column(name = "event_updated")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Calendar updatetime; private Date updatetime;
@Column(name = "value") @Column(name = "value")
private String value; private String value;
...@@ -51,7 +52,7 @@ public class ReaderEvent extends GenericEntity { ...@@ -51,7 +52,7 @@ public class ReaderEvent extends GenericEntity {
private Reader reader; private Reader reader;
public ReaderEvent(Calendar eventTime, PrintedCard card, Reader reader) { public ReaderEvent(Calendar eventTime, PrintedCard card, Reader reader) {
this.time = eventTime; this.time = eventTime.getTime();
this.printedCard = card; this.printedCard = card;
this.reader = reader; this.reader = reader;
} }
...@@ -68,11 +69,11 @@ public class ReaderEvent extends GenericEntity { ...@@ -68,11 +69,11 @@ public class ReaderEvent extends GenericEntity {
this.notes = notes; this.notes = notes;
} }
public Calendar getTime() { public Date getTime() {
return time; return time;
} }
public void setTime(Calendar eventTime) { public void setTime(Date eventTime) {
this.time = eventTime; this.time = eventTime;
} }
...@@ -108,21 +109,21 @@ public class ReaderEvent extends GenericEntity { ...@@ -108,21 +109,21 @@ public class ReaderEvent extends GenericEntity {
return gamePoint; return gamePoint;
} }
public Calendar getUpdatetime() { public Date getUpdatetime() {
return updatetime; return updatetime;
} }
public void setUpdatetime(Calendar updatetime) { public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime; this.updatetime = updatetime;
} }
public String getSeenSince() { public String getSeenSince() {
Calendar comptime = updatetime; Date comptime = updatetime;
if (comptime == null) if (comptime == null)
{ {
comptime = time; comptime = time;
} }
long diffSec = (Calendar.getInstance().getTimeInMillis() - comptime.getTimeInMillis()) / 1000; long diffSec = (new Date().getTime() - comptime.getTime()) / 1000;
long secs = diffSec % 60; long secs = diffSec % 60;
long diffMin = diffSec / 60; long diffMin = diffSec / 60;
long mins = diffMin % 60; long mins = diffMin % 60;
......
code/LanBortalWeb/WebContent/shop/shopToUser.xhtml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" 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:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"
> >
......
code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java
...@@ -66,25 +66,20 @@ public class SessionHandler { ...@@ -66,25 +66,20 @@ public class SessionHandler {
template = "blipview"; template = "blipview";
return template; return template;
} }
public String getAdduserfullscreen() { public String getAdduserfullscreen() {
template = "adduser"; template = "adduser";
return template; return template;
} }
public String getLayout() { public String getLayout() {
// TODO: layout selection code missing!!
template = "template1";
return template;
/*
if (template == null) { if (template == null) {
template = eventbean.getPropertyString(LanEventPropertyKey.EVENT_LAYOUT); template = eventbean.getPropertyString(LanEventPropertyKey.EVENT_LAYOUT);
} }
if (template == null) { if (template == null) {
template = "template1"; template = "template1";
} }
return template; */ return template;
} }
// public boolean hasPermission(String target, String permission) { // public boolean hasPermission(String target, String permission) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!