Skip to content

Riina Antikainen / Moya

Go to a project
Commit 71ad2c55 by Tuomas Riihimäki
Options

Fix accountevent stuff

1 parent 37af6253
Inline Side-by-side
Showing with 12 additions and 15 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/AccountEventBean.java
...@@ -15,17 +15,10 @@ import javax.ejb.Stateless; ...@@ -15,17 +15,10 @@ import javax.ejb.Stateless;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.codecrew.moya.facade.AccountEventFacade;
import fi.codecrew.moya.beans.AccountEventBeanLocal;
import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.beans.LoggingBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.ProductBeanLocal;
import fi.codecrew.moya.beans.SecurityLogType;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.apps.ShopPermission; import fi.codecrew.moya.enums.apps.ShopPermission;
import fi.codecrew.moya.enums.apps.SpecialPermission; import fi.codecrew.moya.enums.apps.SpecialPermission;
import fi.codecrew.moya.enums.apps.UserPermission; import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.facade.AccountEventFacade;
import fi.codecrew.moya.model.AccountEvent; import fi.codecrew.moya.model.AccountEvent;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Product; import fi.codecrew.moya.model.Product;
...@@ -73,6 +66,8 @@ public class AccountEventBean implements AccountEventBeanLocal { ...@@ -73,6 +66,8 @@ public class AccountEventBean implements AccountEventBeanLocal {
AccountEvent acco = accountfacade.reload(account); AccountEvent acco = accountfacade.reload(account);
EventUser ret = acco.getUser(); EventUser ret = acco.getUser();
ret.getAccountEvents().remove(acco);
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); acco.getUser().getAccountEvents().remove(acco);
......
code/MoyaWeb/WebContent/actionlog/messagelist.xhtml
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<h2>#{i18n['actionlog.tasklist.header']}</h2> <h2>#{i18n['actionlog.tasklist.header']}</h2>
<div id="actionlog"> <div id="actionlog">
<h:form id="refresh"> <h:form id="refresh">
<p:poll interval="1" update="actionlogtable" /> <p:poll interval="1" update="actionlogtable" onerror="location.reload();" />
<p:dataTable styleClass="bordertable" id="actionlogtable" value="#{actionLogMessageView.messages}" var="message" paginator="true" rows="30" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="10,20,30,50,100" > <p:dataTable styleClass="bordertable" id="actionlogtable" value="#{actionLogMessageView.messages}" var="message" paginator="true" rows="30" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="10,20,30,50,100" >
<p:column> <p:column>
<f:facet name="header"> <f:facet name="header">
......
code/MoyaWeb/WebContent/actionlog/taskview.xhtml
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<div> <div>
<h:form> <h:form>
<p:poll interval="1" update="messageresponsetable" /> <p:poll interval="1" update="messageresponsetable" onerror="location.reload();" />
<p:dataTable id="messageresponsetable" value="#{taskModificationView.responses}" var="response" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}"> <p:dataTable id="messageresponsetable" value="#{taskModificationView.responses}" var="response" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}">
<p:column> <p:column>
<f:facet name="header"> <f:facet name="header">
......
code/MoyaWeb/WebContent/admin/incoming/printCard.xhtml
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<ui:define name="content"> <ui:define name="content">
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" /> <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<h:form> <h:form>
<p:poll interval="1" listener="#{incomingView.polledRead}" /> <p:poll interval="1" listener="#{incomingView.polledRead}" onerror="location.reload();" />
</h:form> </h:form>
<h1>#{i18n['incomingflow.userdetails']} (RFID-lukija: #{incomingView.readerId})</h1> <h1>#{i18n['incomingflow.userdetails']} (RFID-lukija: #{incomingView.readerId})</h1>
<h:panelGrid columns="3"> <h:panelGrid columns="3">
......
code/MoyaWeb/WebContent/resources/cditools/reader/readerevents.xhtml
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<composite:implementation> <composite:implementation>
<h:form> <h:form>
<p:poll interval="3" /> <p:poll interval="3" onerror="location.reload();" />
<h:dataTable border="1" id="event" value="#{readerView.readerEvents}" var="event"> <h:dataTable border="1" id="event" value="#{readerView.readerEvents}" var="event">
<h:column> <h:column>
......
code/MoyaWeb/WebContent/resources/cditools/reader/readeventtiles.xhtml
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<composite:implementation> <composite:implementation>
<h:form> <h:form>
<p:poll interval="3" /> <p:poll interval="3" onerror="location.reload();" />
<ui:repeat value="#{readerView.readerEvents}" var="event" > <ui:repeat value="#{readerView.readerEvents}" var="event" >
<h:link styleClass="userimagetile" outcome="/admin/info/general" <h:link styleClass="userimagetile" outcome="/admin/info/general"
rendered="#{!empty event.printedCard.user}"> rendered="#{!empty event.printedCard.user}">
......
code/MoyaWeb/WebContent/useradmin/editAccountevent.xhtml
...@@ -40,13 +40,15 @@ ...@@ -40,13 +40,15 @@
<h:message for="time" /> <h:message for="time" />
<h:outputLabel for="fw" value="#{i18n['accountEvent.foodwave']}" /> <h:outputLabel for="fw" value="#{i18n['accountEvent.foodwave']}" />
<h:link id="fw" value="#{accountEventView.accountevent.foodWave.name}" outcome="/foodmanager/listOrders"> <h:link id="fw" rendered="#{!empty accountEventView.accountevent.foodWave}" value="#{accountEventView.accountevent.foodWave.name}" outcome="/foodmanager/listOrders">
<f:param name="foodwaveid" value="#{accountEventView.accountevent.foodWave.id}" /> <f:param name="foodwaveid" value="#{accountEventView.accountevent.foodWave.id}" />
</h:link> </h:link>
<h:outputText rendered="#{empty accountEventView.accountevent.foodWave}"/>
<h:message for="fw" /> <h:message for="fw" />
<h:outputLabel for="delivered" value="#{i18n['accountEvent.delivered']}" /> <h:outputLabel for="delivered" value="#{i18n['accountEvent.delivered']}" />
<p:calendar id="delivered" value="#{accountEventView.accountevent.delivered.time}" pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <p:calendar rendered="#{!empty accountEventView.accountevent.delivered}" id="delivered" value="#{accountEventView.accountevent.delivered.time}" pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
<h:outputText rendered="#{empty accountEventView.accountevent.delivered}" />
<h:message for="delivered" /> <h:message for="delivered" />
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!