details: /erp/devel/pi/rev/b26053672b18
changeset: 11364:b26053672b18
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Mar 25 10:32:36 2011 +0100
summary: Added alert status field. Deprecated old isfixed column.
Alert background process has been updated and a modulescript is provided to
initialize properly the new column.
details: /erp/devel/pi/rev/712dcd227b20
changeset: 11365:712dcd227b20
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Mar 25 10:33:14 2011 +0100
summary: [OBUIAPP] Added new ob-section-stack.
details: /erp/devel/pi/rev/9e1bf405c596
changeset: 11366:9e1bf405c596
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Mar 25 10:34:18 2011 +0100
summary: [OBUIAPP] Added OBSectionItemControlLink.
details: /erp/devel/pi/rev/a64a4edec787
changeset: 11367:a64a4edec787
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Mar 25 10:47:27 2011 +0100
summary: Added new alert management view implementation.
This view replaces old alert management form.
Fixes issue 3415
Fixes issue 16476
diffstat:
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml
|
12 +
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
|
88 +++
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml
|
11 +
modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml
| 12 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
| 10 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java
| 166 +++++
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
| 9 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
| 278 ++++++++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
| 170 ++++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-alert-manager.js
| 10 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-section-stack.js
| 26 +
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
| 35 +
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
| 14 +
src-db/database/model/tables/AD_ALERT.xml
| 4 +
src-db/database/sourcedata/AD_COLUMN.xml
| 42 +-
src-db/database/sourcedata/AD_ELEMENT.xml
| 16 +
src-db/database/sourcedata/AD_FIELD.xml
| 34 +-
src-db/database/sourcedata/AD_MENU.xml
| 2 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 44 +
src-db/database/sourcedata/AD_REFERENCE.xml
| 13 +
src-db/database/sourcedata/AD_REF_LIST.xml
| 48 +
src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeAlertStatus.class
| 0
src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeAlertStatusData.class
| 0
src-util/modulescript/src/org/openbravo/modulescript/InitializeAlertStatus.java
|
40 +
src-util/modulescript/src/org/openbravo/modulescript/InitializeAlertStatus_data.xsql
|
58 ++
src/org/openbravo/erpCommon/ad_process/AlertProcess_data.xsql
| 18 +-
26 files changed, 1136 insertions(+), 24 deletions(-)
diffs (truncated from 1441 to 300 lines):
diff -r b96d9a39520e -r a64a4edec787
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml
Fri Mar 25 09:38:37 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml
Fri Mar 25 10:47:27 2011 +0100
@@ -26,4 +26,16 @@
<!--B487FABEB36F45C28E22CD309914FD71-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--B487FABEB36F45C28E22CD309914FD71--></AD_MENU>
+<!--FF8080812EB90459012EBA72B4E7004D--><AD_MENU>
+<!--FF8080812EB90459012EBA72B4E7004D-->
<AD_MENU_ID><![CDATA[FF8080812EB90459012EBA72B4E7004D]]></AD_MENU_ID>
+<!--FF8080812EB90459012EBA72B4E7004D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EB90459012EBA72B4E7004D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EB90459012EBA72B4E7004D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EB90459012EBA72B4E7004D--> <NAME><![CDATA[Alert
Management]]></NAME>
+<!--FF8080812EB90459012EBA72B4E7004D--> <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
+<!--FF8080812EB90459012EBA72B4E7004D-->
<ACTION><![CDATA[OBUIAPP_OpenView]]></ACTION>
+<!--FF8080812EB90459012EBA72B4E7004D-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EB90459012EBA72B4E7004D-->
<EM_OBUIAPP_VIEW_IMPL_ID><![CDATA[FF8080812EB90459012EBA225DDB0029]]></EM_OBUIAPP_VIEW_IMPL_ID>
+<!--FF8080812EB90459012EBA72B4E7004D--></AD_MENU>
+
</data>
diff -r b96d9a39520e -r a64a4edec787
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Fri Mar 25 09:38:37 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Fri Mar 25 10:47:27 2011 +0100
@@ -761,6 +761,94 @@
<!--FF8080812E8126B7012E8134F22F0013-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8080812E8126B7012E8134F22F0013--></AD_MESSAGE>
+<!--FF8080812EDE8228012EE38964E00054--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38964E00054-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38964E00054]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38964E00054-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38964E00054--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38964E00054--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38964E00054-->
<VALUE><![CDATA[OBUIAPP_AlertSectionHeader]]></VALUE>
+<!--FF8080812EDE8228012EE38964E00054--> <MSGTEXT><![CDATA[%0 (%1)]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38964E00054--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38964E00054-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38964E00054--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38B157A005C--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38B157A005C-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38B157A005C]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38B157A005C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38B157A005C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38B157A005C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38B157A005C-->
<VALUE><![CDATA[OBUIAPP_MoveSelectedToStatus]]></VALUE>
+<!--FF8080812EDE8228012EE38B157A005C--> <MSGTEXT><![CDATA[[Move selected to
%0]]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38B157A005C--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38B157A005C-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38B157A005C--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38C83950064--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38C83950064-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38C83950064]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38C83950064-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38C83950064--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38C83950064--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38C83950064-->
<VALUE><![CDATA[OBUIAPP_AlertGrid_AlertRule]]></VALUE>
+<!--FF8080812EDE8228012EE38C83950064--> <MSGTEXT><![CDATA[Alert
Rule]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38C83950064--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38C83950064-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38C83950064--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38CD7B70069--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38CD7B70069-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38CD7B70069]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38CD7B70069-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38CD7B70069--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38CD7B70069--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38CD7B70069-->
<VALUE><![CDATA[OBUIAPP_AlertGrid_Alert]]></VALUE>
+<!--FF8080812EDE8228012EE38CD7B70069--> <MSGTEXT><![CDATA[Alert]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38CD7B70069--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38CD7B70069-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38CD7B70069--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38D27B2006F--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38D27B2006F-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38D27B2006F]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38D27B2006F-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38D27B2006F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38D27B2006F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38D27B2006F-->
<VALUE><![CDATA[OBUIAPP_AlertGrid_Time]]></VALUE>
+<!--FF8080812EDE8228012EE38D27B2006F--> <MSGTEXT><![CDATA[Time]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38D27B2006F--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38D27B2006F-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38D27B2006F--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38D601B0074--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38D601B0074-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38D601B0074]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38D601B0074-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38D601B0074--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38D601B0074--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38D601B0074-->
<VALUE><![CDATA[OBUIAPP_AlertGrid_Note]]></VALUE>
+<!--FF8080812EDE8228012EE38D601B0074--> <MSGTEXT><![CDATA[Note]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38D601B0074--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38D601B0074-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38D601B0074--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38DA0290079--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38DA0290079-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38DA0290079]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38DA0290079-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38DA0290079--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38DA0290079--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38DA0290079-->
<VALUE><![CDATA[OBUIAPP_AlertGrid_Record]]></VALUE>
+<!--FF8080812EDE8228012EE38DA0290079--> <MSGTEXT><![CDATA[Record]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38DA0290079--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38DA0290079-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38DA0290079--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38E0C69007E--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38E0C69007E-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38E0C69007E]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38E0C69007E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38E0C69007E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38E0C69007E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38E0C69007E-->
<VALUE><![CDATA[OBUIAPP_MoveToStatus]]></VALUE>
+<!--FF8080812EDE8228012EE38E0C69007E--> <MSGTEXT><![CDATA[Move to
%0]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38E0C69007E--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38E0C69007E-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38E0C69007E--></AD_MESSAGE>
+
<!--FF8081812D6761CF012D676DF2A70045--><AD_MESSAGE>
<!--FF8081812D6761CF012D676DF2A70045-->
<AD_MESSAGE_ID><![CDATA[FF8081812D6761CF012D676DF2A70045]]></AD_MESSAGE_ID>
<!--FF8081812D6761CF012D676DF2A70045-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r b96d9a39520e -r a64a4edec787
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml
Fri Mar 25 09:38:37 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml
Fri Mar 25 10:47:27 2011 +0100
@@ -22,4 +22,15 @@
<!--8AB1608C49C946D99AFB540DD2EE3543--> <SEQNO><![CDATA[60]]></SEQNO>
<!--8AB1608C49C946D99AFB540DD2EE3543--></AD_TREENODE>
+<!--9E88163FFD3D4B41E040007F01005CF5--><AD_TREENODE>
+<!--9E88163FFD3D4B41E040007F01005CF5-->
<AD_TREENODE_ID><![CDATA[9E88163FFD3D4B41E040007F01005CF5]]></AD_TREENODE_ID>
+<!--9E88163FFD3D4B41E040007F01005CF5-->
<AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
+<!--9E88163FFD3D4B41E040007F01005CF5-->
<NODE_ID><![CDATA[FF8080812EB90459012EBA72B4E7004D]]></NODE_ID>
+<!--9E88163FFD3D4B41E040007F01005CF5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E88163FFD3D4B41E040007F01005CF5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E88163FFD3D4B41E040007F01005CF5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E88163FFD3D4B41E040007F01005CF5--> <PARENT_ID><![CDATA[161]]></PARENT_ID>
+<!--9E88163FFD3D4B41E040007F01005CF5--> <SEQNO><![CDATA[280]]></SEQNO>
+<!--9E88163FFD3D4B41E040007F01005CF5--></AD_TREENODE>
+
</data>
diff -r b96d9a39520e -r a64a4edec787
modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml
Fri Mar 25 10:47:27 2011 +0100
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--FF8080812EB90459012EBA225DDB0029--><OBUIAPP_VIEW_IMPL>
+<!--FF8080812EB90459012EBA225DDB0029-->
<OBUIAPP_VIEW_IMPL_ID><![CDATA[FF8080812EB90459012EBA225DDB0029]]></OBUIAPP_VIEW_IMPL_ID>
+<!--FF8080812EB90459012EBA225DDB0029-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EB90459012EBA225DDB0029--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EB90459012EBA225DDB0029-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EB90459012EBA225DDB0029-->
<NAME><![CDATA[OBUIAPP_AlertManagement]]></NAME>
+<!--FF8080812EB90459012EBA225DDB0029--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EB90459012EBA225DDB0029--></OBUIAPP_VIEW_IMPL>
+
+</data>
diff -r b96d9a39520e -r a64a4edec787
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
Fri Mar 25 09:38:37 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
Fri Mar 25 10:47:27 2011 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2009 Openbravo SLU
+ * All portions are Copyright (C) 2009-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -97,10 +97,10 @@
final AlertRule alertRule = (AlertRule) o;
final String whereClause = new UsedByLink().getWhereClause(vars, "",
alertRule
.getFilterClause() == null ? "" : alertRule.getFilterClause());
- final String sql = "select * from AD_ALERT where ISACTIVE='Y'" + " AND
ISFIXED ='N'"
- + " AND AD_CLIENT_ID " +
OBDal.getInstance().getReadableClientsInClause()
- + " AND AD_ORG_ID " +
OBDal.getInstance().getReadableOrganizationsInClause()
- + " AND AD_ALERTRULE_ID = ? " + (whereClause == null ? "" :
whereClause);
+ final String sql = "select * from AD_ALERT where STATUS='NEW'" + " AND
AD_CLIENT_ID "
+ + OBDal.getInstance().getReadableClientsInClause() + " AND
AD_ORG_ID "
+ + OBDal.getInstance().getReadableOrganizationsInClause() + " AND
AD_ALERTRULE_ID = ? "
+ + (whereClause == null ? "" : whereClause);
final SQLQuery sqlQuery =
OBDal.getInstance().getSession().createSQLQuery(sql).addEntity(
Alert.ENTITY_NAME);
sqlQuery.setParameter(0, alertRule.getId());
diff -r b96d9a39520e -r a64a4edec787
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java
Fri Mar 25 10:47:27 2011 +0100
@@ -0,0 +1,166 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.1 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.client.application;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.servlet.ServletException;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.hibernate.SQLQuery;
+import org.openbravo.client.kernel.BaseActionHandler;
+import org.openbravo.client.kernel.RequestContext;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.dal.service.OBDao;
+import org.openbravo.dal.service.OBQuery;
+import org.openbravo.erpCommon.utility.UsedByLink;
+import org.openbravo.model.ad.alert.Alert;
+import org.openbravo.model.ad.alert.AlertRecipient;
+import org.openbravo.model.ad.alert.AlertRule;
+
+/**
+ * @author gorkaion
+ *
+ */
+@ApplicationScoped
+public class AlertManagementActionHandler extends BaseActionHandler {
+ private static final Logger log =
Logger.getLogger(AlertManagementActionHandler.class);
+ private static final String GET_ALERT_RULES = "getAlertRules";
+ private static final String MOVE_TO_STATUS = "moveToStatus";
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.openbravo.client.kernel.BaseActionHandler#execute(java.util.Map,
java.lang.String)
+ */
+ @Override
+ protected JSONObject execute(Map<String, Object> parameters, String content)
{
+ JSONObject object = new JSONObject();
+
+ OBContext.setAdminMode();
+ try {
+ JSONObject o = new JSONObject(content);
+ final String strEventType = o.getString("eventType");
+ if (GET_ALERT_RULES.equals(strEventType)) {
+ object.put("alertRules", getAlertRules());
+ } else if (MOVE_TO_STATUS.equals(strEventType)) {
+ final String alertIDs = o.getString("alertIDs");
+ final String oldStatus = o.getString("oldStatus");
+ final String newStatus = o.getString("newStatus");
+ setNewStatus(alertIDs, newStatus);
+ object.put("oldStatus", oldStatus);
+ object.put("newStatus", newStatus);
+ } else {
+ log.error("Unsupported event type: " + strEventType);
+ }
+
+ } catch (JSONException e) {
+ log.error("Error executing action: " + e.getMessage(), e);
+ } finally {
+ OBContext.restorePreviousMode();
+ }
+
+ return object;
+ }
+
+ private JSONArray getAlertRules() {
+ // Get alert rules visible for context's the role/user.
+ StringBuffer whereClause = new StringBuffer();
+ whereClause.append(" as ar ");
+ whereClause.append("\nwhere exists (select 1 from ar."
+ + AlertRule.PROPERTY_ADALERTRECIPIENTLIST + " as arr");
+ whereClause.append("\n where arr." +
AlertRecipient.PROPERTY_USERCONTACT + ".id = :user");
+ whereClause.append("\n or (");
+ whereClause.append("arr." + AlertRecipient.PROPERTY_USERCONTACT + " is
null");
+ whereClause.append("\n and arr." + AlertRecipient.PROPERTY_ROLE +
".id = :role))");
+
+ OBQuery<AlertRule> alertRulesQuery =
OBDal.getInstance().createQuery(AlertRule.class,
+ whereClause.toString());
+ alertRulesQuery.setNamedParameter("user",
OBContext.getOBContext().getUser().getId());
+ alertRulesQuery.setNamedParameter("role",
OBContext.getOBContext().getRole().getId());
+
+ JSONArray alertRules = new JSONArray();
+ try {
+ if (alertRulesQuery.count() > 0) {
+ for (AlertRule alertRule : alertRulesQuery.list()) {
+ JSONObject alertRuleJson = new JSONObject();
+ alertRuleJson.put("name", alertRule.getIdentifier());
+ alertRuleJson.put("alertRuleId", alertRule.getId());
+ alertRuleJson.put("tabId", alertRule.getTab().getId());
+ String filterClause = null;
+ if (alertRule.getFilterClause() != null) {
+ try {
+ filterClause = new
UsedByLink().getWhereClause(RequestContext.get()
------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software
be a part of the solution? Download the Intel(R) Manageability Checker
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
