From 58d573949f363d5c797b0153ef0790822a9109b4 Mon Sep 17 00:00:00 2001 From: hieplq Date: Tue, 19 Sep 2017 18:43:48 +0700 Subject: [PATCH] IDEMPIERE-1926:Workflow/Wizard type - > Node Action Info Window MiSSING --- .../oracle/201406081604_IDEMPIERE-1926.sql | 81 +++++++++++++++++++ .../201406081604_IDEMPIERE-1926.sql | 78 ++++++++++++++++++ .../src/org/compiere/model/I_AD_WF_Node.java | 15 ++++ .../src/org/compiere/model/MTreeNode.java | 3 +- .../src/org/compiere/model/X_AD_WF_Node.java | 34 +++++++- .../src/org/compiere/wf/MWFActivity.java | 6 ++ .../src/org/compiere/wf/MWFNode.java | 11 +++ .../webui/apps/form/WSetupWizard.java | 2 + .../org/adempiere/webui/apps/wf/WFPanel.java | 2 + .../adempiere/webui/apps/wf/WWFActivity.java | 6 +- .../org/compiere/apps/wf/WFNodeWidget.java | 2 + 11 files changed, 236 insertions(+), 4 deletions(-) create mode 100644 migration/i4.1z/oracle/201406081604_IDEMPIERE-1926.sql create mode 100644 migration/i4.1z/postgresql/201406081604_IDEMPIERE-1926.sql diff --git a/migration/i4.1z/oracle/201406081604_IDEMPIERE-1926.sql b/migration/i4.1z/oracle/201406081604_IDEMPIERE-1926.sql new file mode 100644 index 0000000000..4356469511 --- /dev/null +++ b/migration/i4.1z/oracle/201406081604_IDEMPIERE-1926.sql @@ -0,0 +1,81 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Aug 6, 2014 1:21:20 AM ICT +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200261,302,'Show a info window','User Info','eaf4fa91-3fa3-47f9-9b7f-6ac5b475da68','I',TO_DATE('2014-08-06 01:21:19','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2014-08-06 01:21:19','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) +; + +-- Aug 6, 2014 1:21:21 AM ICT +INSERT INTO AD_Column (IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,IsSecure,FKConstraintName,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES ('Y',0,211619,'N','N','N',0,'N',10,'N','N','N','Y','85c2fb04-a9ea-48da-b8b5-f665cd351f59','Y','AD_InfoWindow_ID','Info and search/select Window','The Info window is used to search and select records as well as display information relevant to the selection.','Info Window','Y',TO_DATE('2014-08-06 01:21:20','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2014-08-06 01:21:20','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N','N','ADInfoWindow_ADWFNode','N',3068,19,129) +; + +-- Aug 6, 2014 1:21:21 AM ICT +ALTER TABLE AD_WF_Node ADD AD_InfoWindow_ID NUMBER(10) DEFAULT NULL +; + +-- Aug 6, 2014 1:21:22 AM ICT +INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,DisplayLogic,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,Created) VALUES ('N',122,14,'N','N',190,'Y',203315,'N','The Info window is used to search and select records as well as display information relevant to the selection.','@Action@=I','Info and search/select Window','Info Window','90092f42-98b1-42cc-915d-86cf77336874','Y','N',100,0,100,TO_DATE('2014-08-06 01:21:21','YYYY-MM-DD HH24:MI:SS'),'Y','Y',180,1,'N',0,2,1,'N','N',211619,'D',TO_DATE('2014-08-06 01:21:21','YYYY-MM-DD HH24:MI:SS')) +; + +-- Aug 6, 2014 1:21:22 AM ICT +UPDATE AD_Field SET SeqNo=200, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1264 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=210, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3666 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=220, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10088 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=230, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10091 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=240, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10090 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=250, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12615 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=260, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12614 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=270, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12616 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=280, DisplayLogic='@Action@=C | @Action@=W | @Action@=X | @Action@=B | @Action@=I', AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8761 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=290, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1269 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=300, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1268 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=310, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8766 +; + +-- Aug 6, 2014 1:21:24 AM ICT +UPDATE AD_Field SET SeqNo=320, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2578 +; + +-- Aug 6, 2014 1:21:24 AM ICT +UPDATE AD_Field SET DisplayLogic='@Action@=C | @Action@=W | @Action@=X | @Action@=B | @Action@=I', AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10920 +; + +-- Aug 6, 2014 1:21:24 AM ICT +UPDATE AD_Field SET DisplayLogic='@Action@=C | @Action@=W | @Action@=X | @Action@=B | @Action@=I', AD_Org_ID=0, AD_Client_ID=0,Updated=TO_DATE('2014-08-06 01:21:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10921 +; +SELECT register_migration_script('201406081604_IDEMPIERE-1926.sql') FROM dual +; diff --git a/migration/i4.1z/postgresql/201406081604_IDEMPIERE-1926.sql b/migration/i4.1z/postgresql/201406081604_IDEMPIERE-1926.sql new file mode 100644 index 0000000000..bc3ebd67a0 --- /dev/null +++ b/migration/i4.1z/postgresql/201406081604_IDEMPIERE-1926.sql @@ -0,0 +1,78 @@ +-- Aug 6, 2014 1:21:20 AM ICT +-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200261,302,'Show a info window','User Info','eaf4fa91-3fa3-47f9-9b7f-6ac5b475da68','I',TO_TIMESTAMP('2014-08-06 01:21:19','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2014-08-06 01:21:19','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) +; + +-- Aug 6, 2014 1:21:21 AM ICT +INSERT INTO AD_Column (IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,IsSecure,FKConstraintName,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES ('Y',0,211619,'N','N','N',0,'N',10,'N','N','N','Y','85c2fb04-a9ea-48da-b8b5-f665cd351f59','Y','AD_InfoWindow_ID','Info and search/select Window','The Info window is used to search and select records as well as display information relevant to the selection.','Info Window','Y',TO_TIMESTAMP('2014-08-06 01:21:20','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2014-08-06 01:21:20','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N','N','ADInfoWindow_ADWFNode','N',3068,19,129) +; + +-- Aug 6, 2014 1:21:21 AM ICT +ALTER TABLE AD_WF_Node ADD COLUMN AD_InfoWindow_ID NUMERIC(10) DEFAULT NULL +; + +-- Aug 6, 2014 1:21:22 AM ICT +INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,DisplayLogic,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,Created) VALUES ('N',122,14,'N','N',190,'Y',203315,'N','The Info window is used to search and select records as well as display information relevant to the selection.','@Action@=I','Info and search/select Window','Info Window','90092f42-98b1-42cc-915d-86cf77336874','Y','N',100,0,100,TO_TIMESTAMP('2014-08-06 01:21:21','YYYY-MM-DD HH24:MI:SS'),'Y','Y',180,1,'N',0,2,1,'N','N',211619,'D',TO_TIMESTAMP('2014-08-06 01:21:21','YYYY-MM-DD HH24:MI:SS')) +; + +-- Aug 6, 2014 1:21:22 AM ICT +UPDATE AD_Field SET SeqNo=200, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:22','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1264 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=210, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=3666 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=220, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10088 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=230, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10091 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=240, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10090 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=250, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12615 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=260, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12614 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=270, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12616 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=280, DisplayLogic='@Action@=C | @Action@=W | @Action@=X | @Action@=B | @Action@=I', AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8761 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=290, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1269 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=300, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1268 +; + +-- Aug 6, 2014 1:21:23 AM ICT +UPDATE AD_Field SET SeqNo=310, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8766 +; + +-- Aug 6, 2014 1:21:24 AM ICT +UPDATE AD_Field SET SeqNo=320, AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2578 +; + +-- Aug 6, 2014 1:21:24 AM ICT +UPDATE AD_Field SET DisplayLogic='@Action@=C | @Action@=W | @Action@=X | @Action@=B | @Action@=I', AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10920 +; + +-- Aug 6, 2014 1:21:24 AM ICT +UPDATE AD_Field SET DisplayLogic='@Action@=C | @Action@=W | @Action@=X | @Action@=B | @Action@=I', AD_Org_ID=0, AD_Client_ID=0,Updated=TO_TIMESTAMP('2014-08-06 01:21:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10921 +; +SELECT register_migration_script('201406081604_IDEMPIERE-1926.sql') FROM dual +; diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node.java b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node.java index 66e33837d7..74a09ff455 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_WF_Node.java @@ -118,6 +118,21 @@ public interface I_AD_WF_Node public org.compiere.model.I_AD_Image getAD_Image() throws RuntimeException; + /** Column name AD_InfoWindow_ID */ + public static final String COLUMNNAME_AD_InfoWindow_ID = "AD_InfoWindow_ID"; + + /** Set Info Window. + * Info and search/select Window + */ + public void setAD_InfoWindow_ID (int AD_InfoWindow_ID); + + /** Get Info Window. + * Info and search/select Window + */ + public int getAD_InfoWindow_ID(); + + public org.compiere.model.I_AD_InfoWindow getAD_InfoWindow() throws RuntimeException; + /** Column name AD_Org_ID */ public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID"; diff --git a/org.adempiere.base/src/org/compiere/model/MTreeNode.java b/org.adempiere.base/src/org/compiere/model/MTreeNode.java index 98ded4562f..766968416f 100644 --- a/org.adempiere.base/src/org/compiere/model/MTreeNode.java +++ b/org.adempiere.base/src/org/compiere/model/MTreeNode.java @@ -268,7 +268,8 @@ public class MTreeNode extends DefaultMutableTreeNode if (imageIndicator == null) ; else if (imageIndicator.equals(MWFNode.ACTION_UserWindow) // Window - || imageIndicator.equals(MWFNode.ACTION_UserForm)) + || imageIndicator.equals(MWFNode.ACTION_UserForm) + || imageIndicator.equals(MWFNode.ACTION_UserInfo)) imageIndex = TYPE_WINDOW; else if (imageIndicator.equals(MWFNode.ACTION_AppsReport)) // Report imageIndex = TYPE_REPORT; diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java index 280e41ca63..d31558d022 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_WF_Node.java @@ -33,7 +33,7 @@ public class X_AD_WF_Node extends PO implements I_AD_WF_Node, I_Persistent /** * */ - private static final long serialVersionUID = 20161030L; + private static final long serialVersionUID = 20170919L; /** Standard Constructor */ public X_AD_WF_Node (Properties ctx, int AD_WF_Node_ID, String trxName) @@ -48,7 +48,7 @@ public class X_AD_WF_Node extends PO implements I_AD_WF_Node, I_Persistent setCost (Env.ZERO); setDuration (0); setEntityType (null); -// 'U' +// @SQL=select get_sysconfig('DEFAULT_ENTITYTYPE','U',0,0) from dual setIsCentrallyMaintained (true); // Y setJoinElement (null); @@ -118,6 +118,8 @@ public class X_AD_WF_Node extends PO implements I_AD_WF_Node, I_Persistent public static final String ACTION_EMail = "M"; /** User Workbench = B */ public static final String ACTION_UserWorkbench = "B"; + /** User Info = I */ + public static final String ACTION_UserInfo = "I"; /** Set Action. @param Action Indicates the Action to be performed @@ -245,6 +247,34 @@ public class X_AD_WF_Node extends PO implements I_AD_WF_Node, I_Persistent return ii.intValue(); } + public org.compiere.model.I_AD_InfoWindow getAD_InfoWindow() throws RuntimeException + { + return (org.compiere.model.I_AD_InfoWindow)MTable.get(getCtx(), org.compiere.model.I_AD_InfoWindow.Table_Name) + .getPO(getAD_InfoWindow_ID(), get_TrxName()); } + + /** Set Info Window. + @param AD_InfoWindow_ID + Info and search/select Window + */ + public void setAD_InfoWindow_ID (int AD_InfoWindow_ID) + { + if (AD_InfoWindow_ID < 1) + set_Value (COLUMNNAME_AD_InfoWindow_ID, null); + else + set_Value (COLUMNNAME_AD_InfoWindow_ID, Integer.valueOf(AD_InfoWindow_ID)); + } + + /** Get Info Window. + @return Info and search/select Window + */ + public int getAD_InfoWindow_ID () + { + Integer ii = (Integer)get_Value(COLUMNNAME_AD_InfoWindow_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + public org.compiere.model.I_AD_Process getAD_Process() throws RuntimeException { return (org.compiere.model.I_AD_Process)MTable.get(getCtx(), org.compiere.model.I_AD_Process.Table_Name) diff --git a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java index ecf5286d99..954bd49eed 100644 --- a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java +++ b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java @@ -1261,6 +1261,12 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable if (log.isLoggable(Level.FINE)) log.fine("Window:AD_Window_ID=" + m_node.getAD_Window_ID()); return false; } + /****** User Info ******/ + else if (MWFNode.ACTION_UserInfo.equals(action)) + { + if (log.isLoggable(Level.FINE)) log.fine("InfoWindow:AD_InfoWindow_ID=" + m_node.getAD_InfoWindow_ID()); + return false; + } // throw new IllegalArgumentException("Invalid Action (Not Implemented) =" + action); } // performWork diff --git a/org.adempiere.base/src/org/compiere/wf/MWFNode.java b/org.adempiere.base/src/org/compiere/wf/MWFNode.java index 434c037abd..34c1824201 100644 --- a/org.adempiere.base/src/org/compiere/wf/MWFNode.java +++ b/org.adempiere.base/src/org/compiere/wf/MWFNode.java @@ -360,6 +360,8 @@ public class MWFNode extends X_AD_WF_Node return "Form:AD_Form_ID=" + getAD_Form_ID(); else if (ACTION_UserWindow.equals(action)) return "Window:AD_Window_ID=" + getAD_Window_ID(); + else if (ACTION_UserInfo.equals(action)) + return "Window:AD_InfoWindow_ID=" + getAD_InfoWindow_ID(); else if (ACTION_WaitSleep.equals(action)) return "Sleep:WaitTime=" + getWaitTime(); return "??"; @@ -426,6 +428,7 @@ public class MWFNode extends X_AD_WF_Node { if (ACTION_UserForm.equals(getAction()) || ACTION_UserWindow.equals(getAction()) + || ACTION_UserInfo.equals(getAction()) /*|| ACTION_UserWorkbench.equals(getAction())*/) return true; return false; @@ -647,6 +650,14 @@ public class MWFNode extends X_AD_WF_Node return false; } } + else if (action.equals(ACTION_UserInfo)) + { + if (getAD_InfoWindow_ID() == 0) + { + log.saveError("FillMandatory", Msg.getElement(getCtx(), "AD_InfoWindow_ID")); + return false; + } + } // else if (action.equals(ACTION_UserWorkbench)) // { // && getAD_Workbench_ID() == 0) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java index 76e919efe3..812e64e8db 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java @@ -600,6 +600,8 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL ADForm form = ADForm.openForm(AD_Form_ID); form.setAttribute(Window.MODE_KEY, form.getWindowMode()); AEnv.showWindow(form); + }else if (MWFNode.ACTION_UserInfo.equals(m_node.getAction())){ + SessionManager.getAppDesktop().openInfo(m_node.getAD_InfoWindow_ID()); } } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java index 26b3e6ed83..142c6dad39 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java @@ -291,6 +291,8 @@ public class WFPanel extends Borderlayout implements EventListener, IHelp SessionManager.getAppDesktop().openTask(wfn.getAD_Task_ID()); } else if (MWFNode.ACTION_SubWorkflow.equals(action) && wfn.getWorkflow_ID() > 0) { SessionManager.getAppDesktop().openWorkflow(wfn.getWorkflow_ID()); + }else if (wfn.getAD_InfoWindow_ID() > 0) { + SessionManager.getAppDesktop().openInfo(wfn.getAD_InfoWindow_ID()); } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java index c34a1568de..8d1f8d8d78 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java @@ -38,6 +38,7 @@ import org.adempiere.webui.component.Window; import org.adempiere.webui.editor.WSearchEditor; import org.adempiere.webui.panel.ADForm; import org.adempiere.webui.panel.StatusBarPanel; +import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.theme.ThemeManager; import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.window.FDialog; @@ -556,7 +557,8 @@ public class WWFActivity extends ADForm implements EventListener } // -- else if (MWFNode.ACTION_UserWindow.equals(node.getAction()) - || MWFNode.ACTION_UserForm.equals(node.getAction())) + || MWFNode.ACTION_UserForm.equals(node.getAction()) + || MWFNode.ACTION_UserInfo.equals(node.getAction())) { fAnswerButton.setLabel(node.getName()); fAnswerButton.setTooltiptext(node.getDescription()); @@ -611,6 +613,8 @@ public class WWFActivity extends ADForm implements EventListener ADForm form = ADForm.openForm(AD_Form_ID); form.setAttribute(Window.MODE_KEY, form.getWindowMode()); AEnv.showWindow(form); + }else if (MWFNode.ACTION_UserInfo.equals(node.getAction())){ + SessionManager.getAppDesktop().openInfo(node.getAD_InfoWindow_ID()); } else log.log(Level.SEVERE, "No User Action:" + node.getAction()); diff --git a/org.adempiere.ui/src/org/compiere/apps/wf/WFNodeWidget.java b/org.adempiere.ui/src/org/compiere/apps/wf/WFNodeWidget.java index d40b2f9faa..ca86004b3a 100644 --- a/org.adempiere.ui/src/org/compiere/apps/wf/WFNodeWidget.java +++ b/org.adempiere.ui/src/org/compiere/apps/wf/WFNodeWidget.java @@ -146,6 +146,8 @@ public class WFNodeWidget extends Widget { return "Form"; else if (MWFNode.ACTION_UserWindow.equals(action)) return "Window"; + else if (MWFNode.ACTION_UserInfo.equals(action)) + return "Info"; else if (MWFNode.ACTION_WaitSleep.equals(action)) return "Sleep:WaitTime=" + node.getWaitTime(); return "";