Skip to content

Codecrew / Moya

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

Le bugs

1 parent 009a807d
Inline Side-by-side
Showing with 60 additions and 46 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/AccountEventBean.java
......@@ -62,17 +62,19 @@ public class AccountEventBean implements AccountEventBeanLocal {
@Override
@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(), "'");
acco.getProduct().getAccountEvents().remove(acco);
acco.getUser().getAccountEvents().remove(acco);
if (acco.getBill() != null) {
acco.getBill().setAccountEvent(null);
}
accountfacade.remove(acco);
return ret;
}
@Override
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MenuBean.java
......@@ -129,31 +129,47 @@ public class MenuBean implements MenuBeanLocal {
navifacade.create(eventTopmenu);
/*
MenuNavigation profileTopmenu = new MenuNavigation(ev, "topnavi.profile", menusort = +10);
profileTopmenu.addPage(menuitemfacade.findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL);
profileTopmenu.addPage(menuitemfacade.findOrCreate("/useradmin/list"), UserPermission.VIEW_ALL).setHeader("submenu.user.manageuserlinks");
profileTopmenu.addPage(menuitemfacade.findOrCreate("/user/edit"), UserPermission.VIEW_SELF);
profileTopmenu.addPage(menuitemfacade.findOrCreate("/user/changePassword"), UserPermission.VIEW_SELF);
* MenuNavigation profileTopmenu = new MenuNavigation(ev,
* "topnavi.profile", menusort = +10);
* profileTopmenu.addPage(menuitemfacade
* .findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL);
* profileTopmenu
* .addPage(menuitemfacade.findOrCreate("/useradmin/list"),
* UserPermission.VIEW_ALL).setHeader("submenu.user.manageuserlinks");
* profileTopmenu.addPage(menuitemfacade.findOrCreate("/user/edit"),
* UserPermission.VIEW_SELF);
* profileTopmenu.addPage(menuitemfacade.findOrCreate
* ("/user/changePassword"), UserPermission.VIEW_SELF);
*/
MenuNavigation usermgmt = profileTopmenu.addPage(null, null);
usermgmt.setKey("topnavi.user.mgmt");
usermgmt.addPage(menuitemfacade.findOrCreate("/role/create"), UserPermission.WRITE_ROLES);
usermgmt.addPage(menuitemfacade.findOrCreate("/role/list"), UserPermission.READ_ROLES).setHeader("submenu.user.rolelinks");
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);
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);
// MenuNavigation usermgmt = profileTopmenu.addPage(null, null);
// usermgmt.setKey("topnavi.user.mgmt");
// usermgmt.addPage(menuitemfacade.findOrCreate("/role/create"),
// UserPermission.WRITE_ROLES);
// usermgmt.addPage(menuitemfacade.findOrCreate("/role/list"),
// UserPermission.READ_ROLES).setHeader("submenu.user.rolelinks");
// 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);
// 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"),
// UserPermission.CREATE_NEW);
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ReaderBean.java
package fi.insomnia.bortal.beans;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.regex.Pattern;
......@@ -100,7 +101,7 @@ public class ReaderBean implements ReaderBeanLocal {
}
} else {
ret.setUpdatetime(Calendar.getInstance());
ret.setUpdatetime(new Date());
}
if (card == null)
{
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/AccountEventBeanLocal.java
......@@ -17,12 +17,11 @@ public interface AccountEventBeanLocal {
AccountEvent merge(AccountEvent account);
void delete(AccountEvent account);
EventUser delete(AccountEvent account);
AccountEvent find(Integer id);
void shopCash(EventUser shoppingUser, Map<Product, BigDecimal>
shopMap, boolean buyInstant);
void shopCash(EventUser shoppingUser, Map<Product, BigDecimal> shopMap, boolean buyInstant);
List<Role> getRolesFromAccountEvents(EventUser u);
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent.java
package fi.insomnia.bortal.model;
import java.util.Calendar;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
......@@ -26,11 +27,11 @@ public class ReaderEvent extends GenericEntity {
@Column(name = "event_time", nullable = false)
@Temporal(TemporalType.TIMESTAMP)
private Calendar time;
private Date time;
@Column(name = "event_updated")
@Temporal(TemporalType.TIMESTAMP)
private Calendar updatetime;
private Date updatetime;
@Column(name = "value")
private String value;
......@@ -51,7 +52,7 @@ public class ReaderEvent extends GenericEntity {
private Reader reader;
public ReaderEvent(Calendar eventTime, PrintedCard card, Reader reader) {
this.time = eventTime;
this.time = eventTime.getTime();
this.printedCard = card;
this.reader = reader;
}
......@@ -68,11 +69,11 @@ public class ReaderEvent extends GenericEntity {
this.notes = notes;
}
public Calendar getTime() {
public Date getTime() {
return time;
}
public void setTime(Calendar eventTime) {
public void setTime(Date eventTime) {
this.time = eventTime;
}
......@@ -108,21 +109,21 @@ public class ReaderEvent extends GenericEntity {
return gamePoint;
}
public Calendar getUpdatetime() {
public Date getUpdatetime() {
return updatetime;
}
public void setUpdatetime(Calendar updatetime) {
public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime;
}
public String getSeenSince() {
Calendar comptime = updatetime;
Date comptime = updatetime;
if (comptime == null)
{
comptime = time;
}
long diffSec = (Calendar.getInstance().getTimeInMillis() - comptime.getTimeInMillis()) / 1000;
long diffSec = (new Date().getTime() - comptime.getTime()) / 1000;
long secs = diffSec % 60;
long diffMin = diffSec / 60;
long mins = diffMin % 60;
......
code/LanBortalWeb/WebContent/shop/shopToUser.xhtml
......@@ -2,7 +2,7 @@
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"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"
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:shop="http://java.sun.com/jsf/composite/cditools/shop"
>
......
code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java
......@@ -73,18 +73,13 @@ public class SessionHandler {
}
public String getLayout() {
// TODO: layout selection code missing!!
template = "template1";
return template;
/*
if (template == null) {
template = eventbean.getPropertyString(LanEventPropertyKey.EVENT_LAYOUT);
}
if (template == null) {
template = "template1";
}
return template; */
return template;
}
// 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!