midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge IDEMIERE-370 - Remove Link when there is no table or record id

This commit is contained in:
Deepak Pansheriya 2012-10-11 14:27:00 +05:30
parent e41477ec3a a5ab8b00f5
commit 4f3708c49c
108 changed files with 3206 additions and 2531 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migration/360lts-release/oracle/930_IDEMPIERE-369.sql Normal file
View File

@ -0,0 +1,8 @@
-- Sep 12, 2012 6:08:38 PM MYT
-- IDEMPIERE-369 Master Detail layout improvements
UPDATE AD_Field SET IsDisplayed='N', IsActive='N', IsDisplayedGrid='N',Updated=TO_DATE('2012-09-12 18:08:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=6432
;
SELECT register_migration_script('930_IDEMPIERE-369.sql') FROM dual
;

32
migration/360lts-release/oracle/931_IDEMPIERE-375.sql Normal file
View File

@ -0,0 +1,32 @@
-- Oct 10, 2012 4:12:00 PM SGT
-- IDEMPIERE-375 Implement Forgot my Password
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Forgot My Password',200074,'D','edbc8af4-43a1-4966-8ee5-c609cf01a90c','ForgotMyPassword','Y',TO_DATE('2012-10-10 16:11:57','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_DATE('2012-10-10 16:11:57','YYYY-MM-DD HH24:MI:SS'))
;
-- Oct 10, 2012 4:12:00 PM SGT
-- IDEMPIERE-375 Implement Forgot my Password
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200074 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
-- Oct 10, 2012 4:29:44 PM SGT
-- IDEMPIERE-375 Implement Forgot my Password
INSERT INTO AD_Message (MsgType,MsgText,MsgTip,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Passwords for all tenants using ({0}) as email have been reset',' ',200075,'D','51b49e9a-4c26-486a-ac83-e506ce282ab7','PasswordsForAllTenantsReset','Y',TO_DATE('2012-10-10 16:29:43','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_DATE('2012-10-10 16:29:43','YYYY-MM-DD HH24:MI:SS'))
;
-- Oct 10, 2012 4:29:44 PM SGT
-- IDEMPIERE-375 Implement Forgot my Password
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200075 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
-- Oct 10, 2012 4:31:02 PM SGT
-- IDEMPIERE-375 Implement Forgot my Password
INSERT INTO AD_Message (MsgType,MsgText,MsgTip,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','The new password is now valid for all tenants',' ',200076,'D','be10802e-1a38-45cf-afd9-5bbe1776fead','NewPasswordValidForAllTenants','Y',TO_DATE('2012-10-10 16:31:01','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_DATE('2012-10-10 16:31:01','YYYY-MM-DD HH24:MI:SS'))
;
-- Oct 10, 2012 4:31:02 PM SGT
-- IDEMPIERE-375 Implement Forgot my Password
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200076 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
SELECT register_migration_script('931_IDEMPIERE-375.sql') FROM dual
;

8
migration/360lts-release/postgresql/930_IDEMPIERE-369.sql Normal file
View File

@ -0,0 +1,8 @@
-- Sep 12, 2012 6:08:38 PM MYT
-- IDEMPIERE-369 Master Detail layout improvements
UPDATE AD_Field SET IsDisplayed='N', IsActive='N', IsDisplayedGrid='N',Updated=TO_TIMESTAMP('2012-09-12 18:08:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=6432
;
SELECT register_migration_script('930_IDEMPIERE-369.sql') FROM dual
;

32
migration/360lts-release/postgresql/931_IDEMPIERE-375.sql Normal file
View File

@ -0,0 +1,32 @@
-- Oct 10, 2012 4:12:00 PM SGT
-- IDEMPIERE-375 Implement Forgot my Password
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Forgot My Password',200074,'D','edbc8af4-43a1-4966-8ee5-c609cf01a90c','ForgotMyPassword','Y',TO_TIMESTAMP('2012-10-10 16:11:57','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_TIMESTAMP('2012-10-10 16:11:57','YYYY-MM-DD HH24:MI:SS'))
;
-- Oct 10, 2012 4:12:00 PM SGT
-- IDEMPIERE-375 Implement Forgot my Password
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200074 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
-- Oct 10, 2012 4:29:44 PM SGT
-- IDEMPIERE-375 Implement Forgot my Password
INSERT INTO AD_Message (MsgType,MsgText,MsgTip,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','Passwords for all tenants using ({0}) as email have been reset',' ',200075,'D','51b49e9a-4c26-486a-ac83-e506ce282ab7','PasswordsForAllTenantsReset','Y',TO_TIMESTAMP('2012-10-10 16:29:43','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_TIMESTAMP('2012-10-10 16:29:43','YYYY-MM-DD HH24:MI:SS'))
;
-- Oct 10, 2012 4:29:44 PM SGT
-- IDEMPIERE-375 Implement Forgot my Password
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200075 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
-- Oct 10, 2012 4:31:02 PM SGT
-- IDEMPIERE-375 Implement Forgot my Password
INSERT INTO AD_Message (MsgType,MsgText,MsgTip,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Client_ID,AD_Org_ID,Created) VALUES ('I','The new password is now valid for all tenants',' ',200076,'D','be10802e-1a38-45cf-afd9-5bbe1776fead','NewPasswordValidForAllTenants','Y',TO_TIMESTAMP('2012-10-10 16:31:01','YYYY-MM-DD HH24:MI:SS'),100,100,0,0,TO_TIMESTAMP('2012-10-10 16:31:01','YYYY-MM-DD HH24:MI:SS'))
;
-- Oct 10, 2012 4:31:02 PM SGT
-- IDEMPIERE-375 Implement Forgot my Password
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200076 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
SELECT register_migration_script('931_IDEMPIERE-375.sql') FROM dual
;

33
org.adempiere.base/src/org/compiere/model/GridTab.java
View File

@ -1006,11 +1006,6 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
} }
fireStateChangeEvent(new StateChangeEvent(this, StateChangeEvent.DATA_SAVE)); fireStateChangeEvent(new StateChangeEvent(this, StateChangeEvent.DATA_SAVE));
if (retValue) {
// refresh parent tabs
refreshParents();
}
return retValue; return retValue;
} }
catch (Exception e) catch (Exception e)
@ -1059,28 +1054,6 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
return false; return false;
} }
private void refreshParents() {
if (isDetail()) {
// get parent tab
// the parent tab is the first tab above with level = this_tab_level-1
int level = m_vo.TabLevel;
for (int i = m_window.getTabIndex(this) - 1; i >= 0; i--) {
GridTab parentTab = m_window.getTab(i);
if (parentTab.m_vo.TabLevel == level-1) {
parentTab.dataRefresh(false);
// search for the next parent
if (parentTab.isDetail()) {
level = parentTab.m_vo.TabLevel;
} else {
break;
}
}
}
// refresh this tab
dataRefresh(false);
}
}
/** /**
* Do we need to Save? * Do we need to Save?
* @param rowChange row change * @param rowChange row change
@ -2514,7 +2487,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
* @param fireEvents fire events * @param fireEvents fire events
* @return current row * @return current row
*/ */
private int setCurrentRow (int newCurrentRow, boolean fireEvents) public int setCurrentRow (int newCurrentRow, boolean fireEvents)
{ {
int oldCurrentRow = m_currentRow; int oldCurrentRow = m_currentRow;
m_currentRow = verifyRow (newCurrentRow); m_currentRow = verifyRow (newCurrentRow);
@ -3250,4 +3223,8 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
return col; return col;
} }
public boolean isNew() {
return isOpen() && getCurrentRow() >= 0 && getCurrentRow() == m_mTable.getNewRow();
}
} // GridTab } // GridTab

10
org.adempiere.base/src/org/compiere/model/GridTable.java
View File

@ -42,7 +42,6 @@ import javax.swing.event.TableModelListener;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import org.adempiere.exceptions.DBException; import org.adempiere.exceptions.DBException;
import org.adempiere.util.ContextRunnable;
import org.adempiere.util.ServerContext; import org.adempiere.util.ServerContext;
import org.compiere.Adempiere; import org.compiere.Adempiere;
import org.compiere.util.CLogMgt; import org.compiere.util.CLogMgt;
@ -619,13 +618,8 @@ public class GridTable extends AbstractTableModel
m_sort = new ArrayList<MSort>(m_rowCount+10); m_sort = new ArrayList<MSort>(m_rowCount+10);
if (m_rowCount > 0) if (m_rowCount > 0)
{ {
if (m_rowCount < 1000) m_loader.setContext(ServerContext.getCurrentInstance());
m_loader.run(); m_loaderFuture = Adempiere.getThreadPoolExecutor().submit(m_loader);
else
{
m_loader.setContext(ServerContext.getCurrentInstance());
m_loaderFuture = Adempiere.getThreadPoolExecutor().submit(m_loader);
}
} }
else else
m_loader.close(); m_loader.close();

10
org.adempiere.base/src/org/compiere/util/ValueNamePair.java
View File

@ -83,6 +83,16 @@ public final class ValueNamePair extends NamePair
return false; return false;
} // equals } // equals
/**
* Get the Object representation of the value
* @return value
*/
public Object getValueObject()
{
return m_value;
}
/** /**
* Return Hashcode of value * Return Hashcode of value
* @return hascode * @return hascode

629
org.adempiere.server-feature/feature.xml
View File

@ -1,311 +1,318 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<feature <feature
id="org.adempiere.server" id="org.adempiere.server"
label="iDempiere Server-feature" label="iDempiere Server-feature"
version="1.0.0.qualifier"> version="1.0.0.qualifier">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">
[Enter Feature Description here.] [Enter Feature Description here.]
</description> </description>
<copyright url="http://www.example.com/copyright"> <copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.] [Enter Copyright Description here.]
</copyright> </copyright>
<license url="http://www.example.com/license"> <license url="http://www.example.com/license">
[Enter License Description here.] [Enter License Description here.]
</license> </license>
<includes <includes
id="org.adempiere.replication.server" id="org.adempiere.replication.server"
version="0.0.0" version="0.0.0"
optional="true"/> optional="true"/>
<includes <includes
id="org.adempiere.ui.zk" id="org.adempiere.ui.zk"
version="0.0.0"/> version="0.0.0"/>
<includes <includes
id="org.adempiere.webstore" id="org.adempiere.webstore"
version="0.0.0" version="0.0.0"
optional="true"/> optional="true"/>
<includes <includes
id="org.eclipse.gemini.web.feature" id="org.eclipse.gemini.web.feature"
version="0.0.0"/> version="0.0.0"/>
<requires> <requires>
<import feature="org.adempiere.base" version="1.0.0" match="compatible"/> <import feature="org.adempiere.base" version="1.0.0" match="compatible"/>
</requires> </requires>
<plugin <plugin
id="javax.servlet.jsp" id="javax.servlet.jsp"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="javax.servlet.jsp.jstl" id="javax.servlet.jsp.jstl"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.javax.xml.stream" id="com.springsource.javax.xml.stream"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.aopalliance" id="com.springsource.org.aopalliance"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.catalina" id="com.springsource.org.apache.catalina"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.coyote" id="com.springsource.org.apache.coyote"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
fragment="true" fragment="true"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.el" id="com.springsource.org.apache.el"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.eclipse.jdt.core.compiler.batch" id="com.springsource.org.eclipse.jdt.core.compiler.batch"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.jasper" id="com.springsource.org.apache.jasper"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
fragment="true" fragment="true"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.juli.extras" id="com.springsource.org.apache.juli.extras"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.apache.taglibs.standard.glassfish" id="org.apache.taglibs.standard.glassfish"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.slf4j.api" id="com.springsource.slf4j.api"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.adempiere.report.jasper.webapp" id="org.adempiere.report.jasper.webapp"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.adempiere.server" id="org.adempiere.server"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.adempiere.tomcat.config" id="org.adempiere.tomcat.config"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
fragment="true"/> fragment="true"/>
<plugin <plugin
id="org.eclipse.virgo.util.common" id="org.eclipse.virgo.util.common"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.eclipse.virgo.util.io" id="org.eclipse.virgo.util.io"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.eclipse.virgo.util.math" id="org.eclipse.virgo.util.math"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.eclipse.virgo.util.osgi" id="org.eclipse.virgo.util.osgi"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.eclipse.virgo.util.parser.manifest" id="org.eclipse.virgo.util.parser.manifest"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.restlet.ext.servlet" id="org.restlet.ext.servlet"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.springframework.aop" id="org.springframework.aop"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.springframework.beans" id="org.springframework.beans"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.springframework.context" id="org.springframework.context"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.springframework.core" id="org.springframework.core"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.springframework.osgi.core" id="org.springframework.osgi.core"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.springframework.osgi.io" id="org.springframework.osgi.io"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.javax.xml.bind" id="com.springsource.javax.xml.bind"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="javax.annotation" id="javax.annotation"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.javax.persistence" id="com.springsource.javax.persistence"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.slf4j.jcl" id="com.springsource.slf4j.jcl"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
fragment="true" fragment="true"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.catalina.ha" id="com.springsource.org.apache.catalina.ha"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
fragment="true" fragment="true"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.catalina.tribes" id="com.springsource.org.apache.catalina.tribes"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
fragment="true" fragment="true"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.adempiere.install" id="org.adempiere.install"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0"/> version="0.0.0"/>
<plugin <plugin
id="org.adempiere.eclipse.equinox.http.servlet" id="org.adempiere.eclipse.equinox.http.servlet"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.adempiere.eclipse.equinox.http.servletbridge" id="org.adempiere.eclipse.equinox.http.servletbridge"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.adempiere.eclipse.equinox.servletbridge" id="org.adempiere.eclipse.equinox.servletbridge"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.eclipse.equinox.http.registry" id="org.eclipse.equinox.http.registry"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
</feature> <plugin
id="org.idempiere.webservices"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

2
org.adempiere.server-feature/server.product.launch
View File

File diff suppressed because one or more lines are too long

3
org.adempiere.ui.zk/META-INF/MANIFEST.MF
View File

@ -44,7 +44,8 @@ Export-Package: metainfo.zk,
org.adempiere.webui.session, org.adempiere.webui.session,
org.adempiere.webui.theme, org.adempiere.webui.theme,
org.adempiere.webui.util, org.adempiere.webui.util,
org.adempiere.webui.window org.adempiere.webui.window,
metainfo.zk
Require-Bundle: org.adempiere.report.jasper;bundle-version="1.0.0", Require-Bundle: org.adempiere.report.jasper;bundle-version="1.0.0",
org.adempiere.base;bundle-version="1.0.0", org.adempiere.base;bundle-version="1.0.0",
org.adempiere.report.jasper.library;bundle-version="1.0.0", org.adempiere.report.jasper.library;bundle-version="1.0.0",

1
org.adempiere.ui.zk/metainfo/zk/lang-addon.xml → org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
View File

@ -38,6 +38,7 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI).
<javascript src="/js/persist-min.js" charset="UTF-8"/> <javascript src="/js/persist-min.js" charset="UTF-8"/>
<javascript src="/js/token.js" charset="UTF-8"/> <javascript src="/js/token.js" charset="UTF-8"/>
<javascript src="/js/window.js" charset="UTF-8"/> <javascript src="/js/window.js" charset="UTF-8"/>
<javascript src="/js/jquery-patch.js" charset="UTF-8"/>
<javascript package="jawwa.atmosphere" merge="false" /> <javascript package="jawwa.atmosphere" merge="false" />

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereIdGenerator.java
View File

@ -20,6 +20,7 @@ import java.util.regex.Pattern;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Desktop; import org.zkoss.zk.ui.Desktop;
import org.zkoss.zk.ui.Page; import org.zkoss.zk.ui.Page;
import org.zkoss.zk.ui.metainfo.ComponentInfo;
import org.zkoss.zk.ui.sys.IdGenerator; import org.zkoss.zk.ui.sys.IdGenerator;
public class AdempiereIdGenerator implements IdGenerator { public class AdempiereIdGenerator implements IdGenerator {
@ -33,7 +34,7 @@ public class AdempiereIdGenerator implements IdGenerator {
public static final String ZK_COMPONENT_PREFIX_ATTRIBUTE = "zk_component_prefix"; public static final String ZK_COMPONENT_PREFIX_ATTRIBUTE = "zk_component_prefix";
@Override @Override
public String nextComponentUuid(Desktop desktop, Component comp) { public String nextComponentUuid(Desktop desktop, Component comp, ComponentInfo compInfo) {
String prefix = (String) comp.getAttribute(ZK_COMPONENT_PREFIX_ATTRIBUTE); String prefix = (String) comp.getAttribute(ZK_COMPONENT_PREFIX_ATTRIBUTE);
if (prefix == null || prefix.length() == 0) if (prefix == null || prefix.length() == 0)
prefix = DEFAULT_ZK_COMP_PREFIX; prefix = DEFAULT_ZK_COMP_PREFIX;

21
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/LayoutUtils.java
View File

@ -103,4 +103,25 @@ public final class LayoutUtils {
window.doPopup(); window.doPopup();
Clients.response("_openPopupWindow_", new AuScript(window, script.toString())); Clients.response("_openPopupWindow_", new AuScript(window, script.toString()));
} }
/**
* open popup window relative to the ref component
* @param ref
* @param window
* @param position
*/
public static void openOverlappedWindow(Component ref, Window window, String position) {
if (window.getPage() == null)
window.setPage(ref.getPage());
StringBuilder script = new StringBuilder();
script.append("_idempiere_popup_window('#")
.append(ref.getUuid())
.append("','#")
.append(window.getUuid())
.append("','")
.append(position)
.append("');");
window.doOverlapped();
Clients.response("_openPopupWindow_", new AuScript(window, script.toString()));
}
} }

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WLogin.java
View File

@ -69,7 +69,6 @@ public class WLogin extends AbstractUIPart
Center center = new Center(); Center center = new Center();
center.setParent(layout); center.setParent(layout);
center.setBorder("none"); center.setBorder("none");
center.setFlex(true);
center.setAutoscroll(true); center.setAutoscroll(true);
center.setStyle("border: none; background-color: transparent;"); center.setStyle("border: none; background-color: transparent;");
@ -80,6 +79,8 @@ public class WLogin extends AbstractUIPart
vb.setPack("center"); vb.setPack("center");
vb.setAlign("center"); vb.setAlign("center");
vb.setStyle("background-color: transparent;"); vb.setStyle("background-color: transparent;");
vb.setHflex("1");
vb.setVflex("1");
loginWindow = new LoginWindow(app); loginWindow = new LoginWindow(app);
loginWindow.setParent(vb); loginWindow.setParent(vb);

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WRequest.java
View File

@ -18,8 +18,8 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.webui.adwindow.ADWindow;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.window.ADWindow;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.model.MAsset; import org.compiere.model.MAsset;
import org.compiere.model.MBPartner; import org.compiere.model.MBPartner;
@ -212,7 +212,7 @@ public class WRequest implements EventListener
// New - set Table/Record // New - set Table/Record
if (e.getTarget() == m_new) if (e.getTarget() == m_new)
{ {
GridTab tab = frame.getADWindowPanel().getActiveGridTab(); GridTab tab = frame.getADWindowContent().getActiveGridTab();
tab.dataNew (false); tab.dataNew (false);
tab.setValue("AD_Table_ID", new Integer(m_AD_Table_ID)); tab.setValue("AD_Table_ID", new Integer(m_AD_Table_ID));
tab.setValue("Record_ID", new Integer(m_Record_ID)); tab.setValue("Record_ID", new Integer(m_Record_ID));

8
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
View File

@ -511,13 +511,14 @@ public class WAcctViewer extends Window implements EventListener
result.appendChild(resultPanel); result.appendChild(resultPanel);
Center resultCenter = new Center(); Center resultCenter = new Center();
resultCenter.setFlex(true);
resultPanel.appendChild(resultCenter); resultPanel.appendChild(resultCenter);
table.setHflex("1"); table.setHflex("1");
table.setVflex(true); table.setVflex(true);
table.setHeight("99%"); table.setHeight("99%");
table.setStyle("position: absolute;"); table.setStyle("position: absolute;");
resultCenter.appendChild(table); resultCenter.appendChild(table);
table.setHflex("1");
table.setVflex("1");
pagingPanel = new South(); pagingPanel = new South();
resultPanel.appendChild(pagingPanel); resultPanel.appendChild(pagingPanel);
@ -564,17 +565,18 @@ public class WAcctViewer extends Window implements EventListener
Center center = new Center(); Center center = new Center();
center.setParent(layout); center.setParent(layout);
center.setFlex(true);
center.setStyle("background-color: transparent; padding: 2px;"); center.setStyle("background-color: transparent; padding: 2px;");
tabbedPane.setParent(center); tabbedPane.setParent(center);
tabbedPane.setHflex("1");
tabbedPane.setVflex("1");
South south = new South(); South south = new South();
south.setParent(layout); south.setParent(layout);
south.setFlex(true);
south.setStyle("background-color: transparent"); south.setStyle("background-color: transparent");
south.setHeight("36px"); south.setHeight("36px");
southPanel.setParent(south); southPanel.setParent(south);
southPanel.setVflex("1"); southPanel.setVflex("1");
southPanel.setHflex("1");
this.setTitle(TITLE); this.setTitle(TITLE);
this.setClosable(true); this.setClosable(true);

28
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADSortTab.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADSortTab.java
View File

@ -14,7 +14,7 @@
* ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA * * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA *
* or via info@compiere.org or http://www.compiere.org/license.html * * or via info@compiere.org or http://www.compiere.org/license.html *
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.panel; package org.adempiere.webui.adwindow;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
@ -101,7 +101,7 @@ public class ADSortTab extends Panel implements IADTabpanel
private boolean m_IdentifierTranslated = false; private boolean m_IdentifierTranslated = false;
private String m_ParentColumnName = null; private String m_ParentColumnName = null;
private AbstractADWindowPanel adWindowPanel = null; private AbstractADWindowContent adWindowPanel = null;
// UI variables // UI variables
private Label noLabel = new Label(); private Label noLabel = new Label();
@ -137,6 +137,8 @@ public class ADSortTab extends Panel implements IADTabpanel
private GridTab gridTab; private GridTab gridTab;
private boolean uiCreated; private boolean uiCreated;
private boolean active = false;
private boolean isChanged;
/** /**
* Dynamic Init * Dynamic Init
@ -493,12 +495,17 @@ public class ADSortTab extends Panel implements IADTabpanel
* @param value * @param value
*/ */
private void setIsChanged(boolean value) { private void setIsChanged(boolean value) {
isChanged = value;
if (adWindowPanel != null) { if (adWindowPanel != null) {
adWindowPanel.getToolbar().enableSave(value); adWindowPanel.getToolbar().enableSave(value);
adWindowPanel.getToolbar().enableIgnore(value); adWindowPanel.getToolbar().enableIgnore(value);
} }
} }
public boolean isChanged() {
return isChanged;
}
/** /**
* @param event * @param event
*/ */
@ -613,7 +620,7 @@ public class ADSortTab extends Panel implements IADTabpanel
/* (non-Javadoc) /* (non-Javadoc)
* @see org.compiere.grid.APanelTab#registerAPanel(APanel) * @see org.compiere.grid.APanelTab#registerAPanel(APanel)
*/ */
public void registerAPanel (AbstractADWindowPanel panel) public void registerAPanel (AbstractADWindowContent panel)
{ {
adWindowPanel = panel; adWindowPanel = panel;
} // registerAPanel } // registerAPanel
@ -835,6 +842,7 @@ public class ADSortTab extends Panel implements IADTabpanel
} }
public void activate(boolean b) { public void activate(boolean b) {
active = b;
if (b && !uiCreated) createUI(); if (b && !uiCreated) createUI();
} }
@ -912,5 +920,19 @@ public class ADSortTab extends Panel implements IADTabpanel
public boolean onEnterKey() { public boolean onEnterKey() {
return false; return false;
} }
@Override
public boolean isGridView() {
return false;
}
@Override
public boolean isActive() {
return active;
}
@Override
public void setDetailPaneMode(boolean detailMode, boolean vflex) {
}
} //ADSortTab } //ADSortTab

194
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTabpanel.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
View File

@ -1,5 +1,5 @@
/****************************************************************************** /******************************************************************************
* Product: Posterita Ajax UI * f * Product: Posterita Ajax UI *
* Copyright (C) 2007 Posterita Ltd. All Rights Reserved. * * Copyright (C) 2007 Posterita Ltd. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published * * under the terms version 2 of the GNU General Public License as published *
@ -15,7 +15,7 @@
* or via info@posterita.org or http://www.posterita.org/ * * or via info@posterita.org or http://www.posterita.org/ *
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.panel; package org.adempiere.webui.adwindow;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -31,7 +31,6 @@ import org.adempiere.webui.component.Column;
import org.adempiere.webui.component.Columns; import org.adempiere.webui.component.Columns;
import org.adempiere.webui.component.EditorBox; import org.adempiere.webui.component.EditorBox;
import org.adempiere.webui.component.Grid; import org.adempiere.webui.component.Grid;
import org.adempiere.webui.component.GridPanel;
import org.adempiere.webui.component.Group; import org.adempiere.webui.component.Group;
import org.adempiere.webui.component.Label; import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.NumberBox; import org.adempiere.webui.component.NumberBox;
@ -72,10 +71,10 @@ import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center; import org.zkoss.zul.Center;
import org.zkoss.zul.DefaultTreeNode; import org.zkoss.zul.DefaultTreeNode;
import org.zkoss.zul.Div; import org.zkoss.zul.Div;
import org.zkoss.zul.Groupfoot;
import org.zkoss.zul.Separator; import org.zkoss.zul.Separator;
import org.zkoss.zul.Space; import org.zkoss.zul.Space;
import org.zkoss.zul.Treeitem; import org.zkoss.zul.Treeitem;
import org.zkoss.zul.Vlayout;
import org.zkoss.zul.West; import org.zkoss.zul.West;
import org.zkoss.zul.impl.XulElement; import org.zkoss.zul.impl.XulElement;
@ -114,11 +113,11 @@ DataStatusListener, IADTabpanel
@SuppressWarnings("unused") @SuppressWarnings("unused")
private GridWindow gridWindow; private GridWindow gridWindow;
private AbstractADWindowPanel windowPanel; private AbstractADWindowContent windowPanel;
private int windowNo; private int windowNo;
private Grid grid; private Grid form;
private ArrayList<WEditor> editors = new ArrayList<WEditor>(); private ArrayList<WEditor> editors = new ArrayList<WEditor>();
@ -126,7 +125,7 @@ DataStatusListener, IADTabpanel
private boolean uiCreated = false; private boolean uiCreated = false;
private GridPanel listPanel; private GridView listPanel;
private Map<String, List<Row>> fieldGroupContents = new HashMap<String, List<Row>>(); private Map<String, List<Row>> fieldGroupContents = new HashMap<String, List<Row>>();
@ -136,19 +135,20 @@ DataStatusListener, IADTabpanel
List<Group> allCollapsibleGroups = new ArrayList<Group>(); List<Group> allCollapsibleGroups = new ArrayList<Group>();
private Component formComponent = null; private Component formContainer = null;
private ADTreePanel treePanel = null; private ADTreePanel treePanel = null;
private GridTabDataBinder dataBinder; private GridTabDataBinder dataBinder;
private Map<Integer, Group> includedTab = new HashMap<Integer, Group>();
private Map<Integer, Groupfoot> includedTabFooter = new HashMap<Integer, Groupfoot>();
private boolean active = false; private boolean active = false;
private Group currentGroup; private Group currentGroup;
private Component detailPane;
public static final String ON_TOGGLE_EVENT = "onToggle";
public ADTabpanel() public ADTabpanel()
{ {
init(); init();
@ -164,16 +164,46 @@ DataStatusListener, IADTabpanel
{ {
LayoutUtils.addSclass("adtab-content", this); LayoutUtils.addSclass("adtab-content", this);
grid = new Grid(); this.setWidth("100%");
//have problem moving the following out as css class
grid.setHflex("1"); form = new Grid();
grid.setHeight("100%"); form.setHflex("1");
grid.setVflex(true); form.setHeight(null);
grid.setSclass("grid-layout"); form.setVflex(false);
form.setSclass("grid-layout");
listPanel = new GridPanel(); listPanel = new GridView();
listPanel.getListbox().addEventListener(Events.ON_DOUBLE_CLICK, this); listPanel.getListbox().addEventListener(Events.ON_DOUBLE_CLICK, this);
} }
public void addDetails(Component component) {
if (formContainer.isVisible()) {
detailPane = component;
if (formContainer instanceof Borderlayout) {
form.getParent().appendChild(detailPane);
} else {
formContainer.appendChild(component);
}
} else {
listPanel.addDetails(component);
}
}
public Component removeDetails() {
Component details = null;
if (listPanel.isVisible()) {
details = listPanel.removeDetails();
} else {
if (detailPane != null) {
if (detailPane.getParent() != null) {
details = detailPane;
detailPane.detach();
}
detailPane = null;
}
}
return details;
}
/** /**
* *
@ -182,7 +212,7 @@ DataStatusListener, IADTabpanel
* @param gridTab * @param gridTab
* @param gridWindow * @param gridWindow
*/ */
public void init(AbstractADWindowPanel winPanel, int windowNo, GridTab gridTab, public void init(AbstractADWindowContent winPanel, int windowNo, GridTab gridTab,
GridWindow gridWindow) GridWindow gridWindow)
{ {
this.windowNo = windowNo; this.windowNo = windowNo;
@ -214,12 +244,15 @@ DataStatusListener, IADTabpanel
layout.appendChild(west); layout.appendChild(west);
Center center = new Center(); Center center = new Center();
center.setFlex(true); Vlayout div = new Vlayout();
center.appendChild(grid); div.appendChild(form);
center.setSclass("adtab-form"); center.appendChild(div);
div.setVflex("1");
div.setHflex("1");
div.setSclass("adtab-form");
layout.appendChild(center); layout.appendChild(center);
formComponent = layout; formContainer = layout;
treePanel.getTree().addEventListener(Events.ON_SELECT, this); treePanel.getTree().addEventListener(Events.ON_SELECT, this);
if (AEnv.isTablet()) if (AEnv.isTablet())
@ -230,16 +263,18 @@ DataStatusListener, IADTabpanel
} }
else else
{ {
Div div = new Div(); Vlayout div = new Vlayout();
div.setSclass("adtab-form"); div.setSclass("adtab-form");
div.appendChild(grid); div.appendChild(form);
div.setVflex("1");
div.setWidth("100%");
this.appendChild(div); this.appendChild(div);
formComponent = div; formContainer = div;
if (AEnv.isTablet()) if (AEnv.isTablet())
{ {
LayoutUtils.addSclass("tablet-scrolling", div); LayoutUtils.addSclass("tablet-scrolling", div);
} }
} }
this.appendChild(listPanel); this.appendChild(listPanel);
listPanel.setVisible(false); listPanel.setVisible(false);
@ -264,7 +299,7 @@ DataStatusListener, IADTabpanel
// set size in percentage per column leaving a MARGIN on right // set size in percentage per column leaving a MARGIN on right
Columns columns = new Columns(); Columns columns = new Columns();
grid.appendChild(columns); form.appendChild(columns);
String numColsS=String.valueOf(numCols); String numColsS=String.valueOf(numCols);
int equalWidth = 98 / numCols; int equalWidth = 98 / numCols;
@ -274,7 +309,7 @@ DataStatusListener, IADTabpanel
columns.appendChild(col); columns.appendChild(col);
} }
Rows rows = grid.newRows(); Rows rows = form.newRows();
GridField fields[] = gridTab.getFields(); GridField fields[] = gridTab.getFields();
Row row = new Row(); Row row = new Row();
int actualxpos = 0; int actualxpos = 0;
@ -286,55 +321,6 @@ DataStatusListener, IADTabpanel
if (!field.isDisplayed()) if (!field.isDisplayed())
continue; continue;
//included tab
if (field.getIncluded_Tab_ID() > 0)
{
// NOT CHANGING INCLUDED TAB AS THIS IS BEING REDESIGNED WITH
// IDEMPIERE-369 Master Detail layout improvements
if (row.getChildren().size() == 2)
{
row.appendChild(createSpacer());
row.appendChild(createSpacer());
row.appendChild(createSpacer());
rows.appendChild(row);
if (rowList != null)
rowList.add(row);
} else if (row.getChildren().size() > 0)
{
rows.appendChild(row);
if (rowList != null)
rowList.add(row);
}
//end current field group
if (currentGroup != null) {
Groupfoot rowg = new Groupfoot();
rows.appendChild(rowg);
currentGroup = null;
currentFieldGroup = null;
}
row = new Row();
row.setSpans("5");
row.appendChild(new Separator());
rows.appendChild(row);
Group rowg = new Group();
rowg.setSpans("2,3");
rows.appendChild(rowg);
includedTab.put(field.getIncluded_Tab_ID(), (Group)rowg);
Groupfoot rowgf = new Groupfoot();
rows.appendChild(rowgf);
includedTabFooter.put(field.getIncluded_Tab_ID(), (Groupfoot)rowgf);
row = new Row();
row.setSpans("5");
row.appendChild(new Separator());
rows.appendChild(row);
row = new Row();
continue;
}
// field group // field group
String fieldGroup = field.getFieldGroup(); String fieldGroup = field.getFieldGroup();
if (!Util.isEmpty(fieldGroup) && !fieldGroup.equals(currentFieldGroup)) // group changed if (!Util.isEmpty(fieldGroup) && !fieldGroup.equals(currentFieldGroup)) // group changed
@ -569,7 +555,7 @@ DataStatusListener, IADTabpanel
} // all components } // all components
//hide row if all editor within the row is invisible //hide row if all editor within the row is invisible
List<Component> rows = grid.getRows().getChildren(); List<Component> rows = form.getRows().getChildren();
for (Component comp : rows) for (Component comp : rows)
{ {
if (comp instanceof Row) { if (comp instanceof Row) {
@ -759,7 +745,7 @@ DataStatusListener, IADTabpanel
listPanel.deactivate(); listPanel.deactivate();
} else { } else {
if (activate) { if (activate) {
formComponent.setVisible(activate); formContainer.setVisible(activate);
setFocusToField(); setFocusToField();
} }
} }
@ -767,6 +753,9 @@ DataStatusListener, IADTabpanel
if (gridTab.getRecord_ID() > 0 && gridTab.isTreeTab() && treePanel != null) { if (gridTab.getRecord_ID() > 0 && gridTab.isTreeTab() && treePanel != null) {
setSelectedNode(gridTab.getRecord_ID()); setSelectedNode(gridTab.getRecord_ID());
} }
Event event = new Event("onActivate", this, activate);
Events.sendEvent(event);
} }
/** /**
@ -806,11 +795,7 @@ DataStatusListener, IADTabpanel
{ {
if (event.getTarget() == listPanel.getListbox()) if (event.getTarget() == listPanel.getListbox())
{ {
if (windowPanel != null) { Events.sendEvent(this, new Event(ON_TOGGLE_EVENT, this));
windowPanel.onToggle();
} else {
this.switchRowPresentation();
}
} }
else if (event.getTarget() == treePanel.getTree()) { else if (event.getTarget() == treePanel.getTree()) {
Treeitem item = treePanel.getTree().getSelectedItem(); Treeitem item = treePanel.getTree().getSelectedItem();
@ -820,7 +805,7 @@ DataStatusListener, IADTabpanel
if (gridTab.getRecord_ID() > 0 && gridTab.isTreeTab() && treePanel != null) { if (gridTab.getRecord_ID() > 0 && gridTab.isTreeTab() && treePanel != null) {
setSelectedNode(gridTab.getRecord_ID()); setSelectedNode(gridTab.getRecord_ID());
} }
} }
} }
private void navigateTo(DefaultTreeNode value) { private void navigateTo(DefaultTreeNode value) {
@ -995,19 +980,25 @@ DataStatusListener, IADTabpanel
* Toggle between form and grid view * Toggle between form and grid view
*/ */
public void switchRowPresentation() { public void switchRowPresentation() {
if (formComponent.isVisible()) { Component details = removeDetails();
formComponent.setVisible(false); if (formContainer.isVisible()) {
formContainer.setVisible(false);
} else { } else {
formComponent.setVisible(true); formContainer.setVisible(true);
formComponent.getParent().invalidate(); formContainer.getParent().invalidate();
} }
listPanel.setVisible(!formComponent.isVisible()); listPanel.setVisible(!formContainer.isVisible());
if (listPanel.isVisible()) { if (listPanel.isVisible()) {
listPanel.refresh(gridTab); listPanel.refresh(gridTab);
listPanel.scrollToCurrentRow(); listPanel.scrollToCurrentRow();
} else { } else {
listPanel.deactivate(); listPanel.deactivate();
} }
if (details != null)
addDetails(details);
Events.sendEvent(this, new Event("onSwitchView", this));
} }
class ZoomListener implements EventListener { class ZoomListener implements EventListener {
@ -1035,14 +1026,14 @@ DataStatusListener, IADTabpanel
@Override @Override
public void focus() { public void focus() {
if (formComponent.isVisible()) if (formContainer.isVisible())
this.setFocusToField(); this.setFocusToField();
else else
listPanel.focus(); listPanel.focus();
} }
public void setFocusToField(String columnName) { public void setFocusToField(String columnName) {
if (formComponent.isVisible()) { if (formContainer.isVisible()) {
boolean found = false; boolean found = false;
for (WEditor editor : editors) { for (WEditor editor : editors) {
if (found) if (found)
@ -1079,8 +1070,23 @@ DataStatusListener, IADTabpanel
* *
* @return GridPanel * @return GridPanel
*/ */
public GridPanel getGridView() { public GridView getGridView() {
return listPanel; return listPanel;
} }
public boolean isActive() {
return active;
}
@Override
public void setDetailPaneMode(boolean detailPaneMode, boolean vflex) {
if (detailPaneMode) {
detailPane = null;
this.setVflex("true");
} else {
this.setVflex(Boolean.toString(vflex));
}
listPanel.setDetailPaneMode(detailPaneMode, vflex);
}
} }

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADTreePanel.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTreePanel.java
View File

@ -11,11 +11,12 @@
* with this program; if not, write to the Free Software Foundation, Inc., * * with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.panel; package org.adempiere.webui.adwindow;
import org.adempiere.webui.component.SimpleTreeModel; import org.adempiere.webui.component.SimpleTreeModel;
import org.adempiere.webui.component.ToolBarButton; import org.adempiere.webui.component.ToolBarButton;
import org.adempiere.webui.panel.TreeSearchPanel;
import org.adempiere.webui.util.TreeUtils; import org.adempiere.webui.util.TreeUtils;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;

19
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ADWindow.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindow.java
View File

@ -15,12 +15,11 @@
* or via info@posterita.org or http://www.posterita.org/ * * or via info@posterita.org or http://www.posterita.org/ *
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.window; package org.adempiere.webui.adwindow;
import java.util.Properties; import java.util.Properties;
import org.adempiere.webui.desktop.IDesktop; import org.adempiere.webui.desktop.IDesktop;
import org.adempiere.webui.panel.ADWindowPanel;
import org.adempiere.webui.part.AbstractUIPart; import org.adempiere.webui.part.AbstractUIPart;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
@ -34,7 +33,7 @@ import org.zkoss.zk.ui.Component;
*/ */
public class ADWindow extends AbstractUIPart public class ADWindow extends AbstractUIPart
{ {
private ADWindowPanel windowPanel; private ADWindowContent windowContent;
private Properties ctx; private Properties ctx;
private int adWindowId; private int adWindowId;
private String _title; private String _title;
@ -63,7 +62,7 @@ public class ADWindow extends AbstractUIPart
private void init() private void init()
{ {
windowPanel = new ADWindowPanel(ctx, windowNo); windowContent = new ADWindowContent(ctx, windowNo);
} }
public String getTitle() public String getTitle()
@ -73,12 +72,12 @@ public class ADWindow extends AbstractUIPart
protected Component doCreatePart(Component parent) protected Component doCreatePart(Component parent)
{ {
windowPanelComponent = windowPanel.createPart(parent); windowPanelComponent = windowContent.createPart(parent);
windowPanelComponent.setAttribute("ADWindow", this); windowPanelComponent.setAttribute("ADWindow", this);
windowPanelComponent.setAttribute(IDesktop.WINDOWNO_ATTRIBUTE, windowNo); windowPanelComponent.setAttribute(IDesktop.WINDOWNO_ATTRIBUTE, windowNo);
if (windowPanel.initPanel(adWindowId, query)) if (windowContent.initPanel(adWindowId, query))
{ {
_title = windowPanel.getTitle(); _title = windowContent.getTitle();
return windowPanelComponent; return windowPanelComponent;
} }
else else
@ -93,9 +92,9 @@ public class ADWindow extends AbstractUIPart
} }
/** /**
* @return ADWindowPanel * @return ADWindowContent
*/ */
public ADWindowPanel getADWindowPanel() { public ADWindowContent getADWindowContent() {
return windowPanel; return windowContent;
} }
} }

81
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ADWindowPanel.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowContent.java
View File

@ -21,17 +21,16 @@
* - Idalica Corporation * * - Idalica Corporation *
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.panel; package org.adempiere.webui.adwindow;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
import org.adempiere.webui.LayoutUtils; import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.component.CompositeADTab;
import org.adempiere.webui.component.IADTab;
import org.adempiere.webui.component.Tabbox; import org.adempiere.webui.component.Tabbox;
import org.adempiere.webui.component.Tabpanel; import org.adempiere.webui.component.Tabpanel;
import org.adempiere.webui.component.Tabs; import org.adempiere.webui.component.Tabs;
import org.adempiere.webui.panel.ITabOnCloseHandler;
import org.adempiere.webui.part.ITabOnSelectHandler; import org.adempiere.webui.part.ITabOnSelectHandler;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.util.UserPreference; import org.adempiere.webui.util.UserPreference;
@ -48,6 +47,7 @@ import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.event.KeyEvent; import org.zkoss.zk.ui.event.KeyEvent;
import org.zkoss.zul.Borderlayout; import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center; import org.zkoss.zul.Center;
import org.zkoss.zul.Div;
import org.zkoss.zul.East; import org.zkoss.zul.East;
import org.zkoss.zul.North; import org.zkoss.zul.North;
import org.zkoss.zul.South; import org.zkoss.zul.South;
@ -64,10 +64,10 @@ import org.zkoss.zul.West;
* @date Feb 25, 2007 * @date Feb 25, 2007
* @version $Revision: 0.10 $ * @version $Revision: 0.10 $
*/ */
public class ADWindowPanel extends AbstractADWindowPanel public class ADWindowContent extends AbstractADWindowContent
{ {
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static final CLogger logger = CLogger.getCLogger(ADWindowPanel.class); private static final CLogger logger = CLogger.getCLogger(ADWindowContent.class);
private Borderlayout layout; private Borderlayout layout;
@ -77,15 +77,14 @@ public class ADWindowPanel extends AbstractADWindowPanel
private East east; private East east;
private Keylistener keyListener; private Keylistener keyListener;
public ADWindowPanel(Properties ctx, int windowNo) public ADWindowContent(Properties ctx, int windowNo)
{ {
super(ctx, windowNo); super(ctx, windowNo);
} }
protected Component doCreatePart(Component parent)
protected Component doCreatePart(Component parent)
{ {
layout = new Borderlayout(); layout = new Borderlayout();
if (parent != null) { if (parent != null) {
@ -100,8 +99,15 @@ public class ADWindowPanel extends AbstractADWindowPanel
n.setParent(layout); n.setParent(layout);
n.setCollapsible(false); n.setCollapsible(false);
n.setSclass("adwindow-north"); n.setSclass("adwindow-north");
toolbar.setParent(n); Div div = new Div();
div.setHflex("1");
div.setVflex("1");
n.appendChild(div);
toolbar.setParent(div);
toolbar.setWindowNo(getWindowNo()); toolbar.setWindowNo(getWindowNo());
breadCrumb = new BreadCrumb(getWindowNo());
breadCrumb.setToolbarListener(this);
div.appendChild(breadCrumb);
//status bar //status bar
South s = new South(); South s = new South();
@ -112,51 +118,10 @@ public class ADWindowPanel extends AbstractADWindowPanel
LayoutUtils.addSclass("adwindow-status", statusBar); LayoutUtils.addSclass("adwindow-status", statusBar);
if (adTab.isUseExternalSelection())
{
String tabPlacement = SessionManager.getSessionApplication().getUserPreference().getProperty(UserPreference.P_WINDOW_TAB_PLACEMENT);
if (tabPlacement == null || "left".equalsIgnoreCase(tabPlacement))
{
west = new West();
layout.appendChild(west);
west.setSplittable(false);
west.setAutoscroll(true);
west.setFlex(true);
LayoutUtils.addSclass("adwindow-nav adwindow-left-nav", west);
adTab.setTabplacement(IADTab.LEFT);
adTab.getTabSelectionComponent().setParent(west);
if (SessionManager.getSessionApplication().getUserPreference().isPropertyBool(UserPreference.P_WINDOW_TAB_COLLAPSIBLE))
{
west.setTitle(Msg.getElement(Env.getCtx(), "AD_Tab_ID"));
west.setCollapsible(true);
}
}
else
{
east = new East();
layout.appendChild(east);
east.setSplittable(false);
east.setAutoscroll(true);
east.setFlex(true);
LayoutUtils.addSclass("adwindow-nav adwindow-right-nav", east);
adTab.setTabplacement(IADTab.RIGHT);
adTab.getTabSelectionComponent().setParent(east);
if (SessionManager.getSessionApplication().getUserPreference().isPropertyBool(UserPreference.P_WINDOW_TAB_COLLAPSIBLE))
{
east.setTitle(Msg.getElement(Env.getCtx(), "AD_Tab_ID"));
east.setCollapsible(true);
}
}
LayoutUtils.addSclass("adwindow-nav-content", (HtmlBasedComponent) adTab.getTabSelectionComponent());
}
contentArea = new Center(); contentArea = new Center();
contentArea.setParent(layout); contentArea.setParent(layout);
contentArea.setAutoscroll(true); contentArea.setAutoscroll(true);
contentArea.setFlex(true); adTabbox.createPart(contentArea);
adTab.createPart(contentArea);
if (parent instanceof Tabpanel) { if (parent instanceof Tabpanel) {
TabOnCloseHanlder handler = new TabOnCloseHanlder(); TabOnCloseHanlder handler = new TabOnCloseHanlder();
@ -174,7 +139,7 @@ public class ADWindowPanel extends AbstractADWindowPanel
layout.setAttribute(ITabOnSelectHandler.ATTRIBUTE_KEY, new ITabOnSelectHandler() { layout.setAttribute(ITabOnSelectHandler.ATTRIBUTE_KEY, new ITabOnSelectHandler() {
public void onSelect() { public void onSelect() {
IADTab adTab = getADTab(); IADTabbox adTab = getADTab();
if (adTab != null) { if (adTab != null) {
IADTabpanel iadTabpanel = adTab.getSelectedTabpanel(); IADTabpanel iadTabpanel = adTab.getSelectedTabpanel();
if (iadTabpanel != null && iadTabpanel instanceof ADTabpanel) { if (iadTabpanel != null && iadTabpanel instanceof ADTabpanel) {
@ -191,9 +156,9 @@ public class ADWindowPanel extends AbstractADWindowPanel
return layout; return layout;
} }
protected IADTab createADTab() protected IADTabbox createADTab()
{ {
CompositeADTab composite = new CompositeADTab(); CompositeADTabbox composite = new CompositeADTabbox();
return composite; return composite;
} }
@ -206,7 +171,7 @@ public class ADWindowPanel extends AbstractADWindowPanel
@Override @Override
public boolean initPanel(int adWindowId, MQuery query) { public boolean initPanel(int adWindowId, MQuery query) {
boolean retValue = super.initPanel(adWindowId, query); boolean retValue = super.initPanel(adWindowId, query);
if (adTab.getTabCount() == 1) { if (adTabbox.getTabCount() == 1) {
if (west != null) if (west != null)
west.setVisible(false); west.setVisible(false);
else if (east != null) else if (east != null)
@ -225,7 +190,7 @@ public class ADWindowPanel extends AbstractADWindowPanel
KeyEvent keyEvent = (KeyEvent) event; KeyEvent keyEvent = (KeyEvent) event;
//enter == 13 //enter == 13
if (keyEvent.getKeyCode() == 13 && this.getComponent().getParent().isVisible()) { if (keyEvent.getKeyCode() == 13 && this.getComponent().getParent().isVisible()) {
IADTabpanel panel = adTab.getSelectedTabpanel(); IADTabpanel panel = adTabbox.getSelectedTabpanel();
if (panel != null) { if (panel != null) {
if (panel.onEnterKey()) { if (panel.onEnterKey()) {
keyEvent.stopPropagation(); keyEvent.stopPropagation();
@ -240,7 +205,7 @@ public class ADWindowPanel extends AbstractADWindowPanel
class TabOnCloseHanlder implements ITabOnCloseHandler { class TabOnCloseHanlder implements ITabOnCloseHandler {
public void onClose(Tabpanel tabPanel) { public void onClose(Tabpanel tabPanel) {
if (ADWindowPanel.this.onExit()) { if (ADWindowContent.this.onExit()) {
Tab tab = tabPanel.getLinkedTab(); Tab tab = tabPanel.getLinkedTab();
Tabbox tabbox = (Tabbox) tab.getTabbox(); Tabbox tabbox = (Tabbox) tab.getTabbox();
if (tabbox.getSelectedTab() == tab) { if (tabbox.getSelectedTab() == tab) {

48
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/CWindowToolbar.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
View File

@ -15,7 +15,7 @@
* or via info@posterita.org or http://www.posterita.org/ * * or via info@posterita.org or http://www.posterita.org/ *
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.component; package org.adempiere.webui.adwindow;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -28,6 +28,8 @@ import java.util.logging.Level;
import org.adempiere.webui.AdempiereIdGenerator; import org.adempiere.webui.AdempiereIdGenerator;
import org.adempiere.webui.LayoutUtils; import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.component.FToolbar;
import org.adempiere.webui.component.ToolBarButton;
import org.adempiere.webui.event.ToolbarListener; import org.adempiere.webui.event.ToolbarListener;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.compiere.model.MRole; import org.compiere.model.MRole;
@ -52,7 +54,7 @@ import org.zkoss.zul.Space;
* @author Cristina Ghita, www.arhipac.ro * @author Cristina Ghita, www.arhipac.ro
* <li>FR [ 2076330 ] Add new methods in CWindowToolbar class * <li>FR [ 2076330 ] Add new methods in CWindowToolbar class
*/ */
public class CWindowToolbar extends FToolbar implements EventListener<Event> public class ADWindowToolbar extends FToolbar implements EventListener<Event>
{ {
/** /**
* *
@ -61,7 +63,7 @@ public class CWindowToolbar extends FToolbar implements EventListener<Event>
private static final String BTNPREFIX = "Btn"; private static final String BTNPREFIX = "Btn";
private static CLogger log = CLogger.getCLogger(CWindowToolbar.class); private static CLogger log = CLogger.getCLogger(ADWindowToolbar.class);
private ToolBarButton btnIgnore; private ToolBarButton btnIgnore;
@ -75,8 +77,6 @@ public class CWindowToolbar extends FToolbar implements EventListener<Event>
private ToolBarButton btnParentRecord, btnDetailRecord; private ToolBarButton btnParentRecord, btnDetailRecord;
private ToolBarButton btnFirst, btnPrevious, btnNext, btnLast;
private ToolBarButton btnReport, btnArchive, btnPrint; private ToolBarButton btnReport, btnArchive, btnPrint;
private ToolBarButton btnZoomAcross, btnActiveWorkflows, btnRequests, btnProductInfo; private ToolBarButton btnZoomAcross, btnActiveWorkflows, btnRequests, btnProductInfo;
@ -114,12 +114,12 @@ public class CWindowToolbar extends FToolbar implements EventListener<Event>
// public int lastModifiers; // public int lastModifiers;
// //
public CWindowToolbar() public ADWindowToolbar()
{ {
this(0); this(0);
} }
public CWindowToolbar(int windowNo) { public ADWindowToolbar(int windowNo) {
setWindowNo(windowNo); setWindowNo(windowNo);
init(); init();
} }
@ -145,11 +145,7 @@ public class CWindowToolbar extends FToolbar implements EventListener<Event>
btnGridToggle = createButton("Toggle", "Multi", "Multi"); btnGridToggle = createButton("Toggle", "Multi", "Multi");
addSeparator(); addSeparator();
btnParentRecord = createButton("ParentRecord", "Parent", "Parent"); btnParentRecord = createButton("ParentRecord", "Parent", "Parent");
btnDetailRecord = createButton("DetailRecord", "Detail", "Detail"); btnDetailRecord = createButton("DetailRecord", "Detail", "Detail");
btnFirst = createButton("First", "First", "First");
btnPrevious = createButton("Previous", "Previous", "Previous");
btnNext = createButton("Next", "Next", "Next");
btnLast = createButton("Last", "Last", "Last");
addSeparator(); addSeparator();
btnReport = createButton("Report", "Report", "Report"); btnReport = createButton("Report", "Report", "Report");
btnArchive = createButton("Archive", "Archive", "Archive"); btnArchive = createButton("Archive", "Archive", "Archive");
@ -259,11 +255,7 @@ public class CWindowToolbar extends FToolbar implements EventListener<Event>
keyMap.put(KeyEvent.F12, btnPrint); keyMap.put(KeyEvent.F12, btnPrint);
altKeyMap.put(KeyEvent.LEFT, btnParentRecord); altKeyMap.put(KeyEvent.LEFT, btnParentRecord);
altKeyMap.put(KeyEvent.RIGHT, btnDetailRecord); altKeyMap.put(KeyEvent.RIGHT, btnDetailRecord);
altKeyMap.put(KeyEvent.UP, btnPrevious);
altKeyMap.put(KeyEvent.DOWN, btnNext);
altKeyMap.put(KeyEvent.PAGE_UP, btnFirst);
altKeyMap.put(KeyEvent.PAGE_DOWN, btnLast);
altKeyMap.put(VK_P, btnReport); altKeyMap.put(VK_P, btnReport);
altKeyMap.put(VK_Z, btnIgnore); altKeyMap.put(VK_Z, btnIgnore);
@ -363,15 +355,7 @@ public class CWindowToolbar extends FToolbar implements EventListener<Event>
} }
this.event = null; this.event = null;
} }
public void enableNavigation(boolean enabled)
{
this.btnFirst.setDisabled(!enabled);
this.btnPrevious.setDisabled(!enabled);
this.btnNext.setDisabled(!enabled);
this.btnLast.setDisabled(!enabled);
}
public void enableTabNavigation(boolean enabled) public void enableTabNavigation(boolean enabled)
{ {
enableTabNavigation(enabled, enabled); enableTabNavigation(enabled, enabled);
@ -383,18 +367,6 @@ public class CWindowToolbar extends FToolbar implements EventListener<Event>
this.btnDetailRecord.setDisabled(!enableDetail); this.btnDetailRecord.setDisabled(!enableDetail);
} }
public void enableFirstNavigation(boolean enabled)
{
this.btnFirst.setDisabled(!enabled);
this.btnPrevious.setDisabled(!enabled);
}
public void enableLastNavigation(boolean enabled)
{
this.btnLast.setDisabled(!enabled);
this.btnNext.setDisabled(!enabled);
}
public void enableRefresh(boolean enabled) public void enableRefresh(boolean enabled)
{ {
this.btnRefresh.setDisabled(!enabled); this.btnRefresh.setDisabled(!enabled);

15
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/AbstractADTab.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADTabbox.java
View File

@ -15,16 +15,13 @@
* or via info@posterita.org or http://www.posterita.org/ * * or via info@posterita.org or http://www.posterita.org/ *
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.component; package org.adempiere.webui.adwindow;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.adempiere.webui.panel.ADTabpanel;
import org.adempiere.webui.panel.AbstractADWindowPanel;
import org.adempiere.webui.panel.CustomizeGridViewPanel; import org.adempiere.webui.panel.CustomizeGridViewPanel;
import org.adempiere.webui.panel.IADTabpanel;
import org.adempiere.webui.part.AbstractUIPart; import org.adempiere.webui.part.AbstractUIPart;
import org.compiere.model.DataStatusEvent; import org.compiere.model.DataStatusEvent;
import org.compiere.model.GridField; import org.compiere.model.GridField;
@ -41,18 +38,18 @@ import org.compiere.util.Evaluator;
* @date Feb 25, 2007 * @date Feb 25, 2007
* @version $Revision: 0.10 $ * @version $Revision: 0.10 $
*/ */
public abstract class AbstractADTab extends AbstractUIPart implements IADTab public abstract class AbstractADTabbox extends AbstractUIPart implements IADTabbox
{ {
/** Logger */ /** Logger */
private static CLogger log = CLogger.getCLogger (AbstractADTab.class); private static CLogger log = CLogger.getCLogger (AbstractADTabbox.class);
/** List of dependent Variables */ /** List of dependent Variables */
private ArrayList<String> m_dependents = new ArrayList<String>(); private ArrayList<String> m_dependents = new ArrayList<String>();
/** Tabs associated to this tab box */ /** Tabs associated to this tab box */
protected List<IADTabpanel> tabPanelList = new ArrayList<IADTabpanel>(); protected List<IADTabpanel> tabPanelList = new ArrayList<IADTabpanel>();
protected AbstractADWindowPanel adWindowPanel; protected AbstractADWindowContent adWindowPanel;
public AbstractADTab() public AbstractADTabbox()
{ {
} }
@ -336,7 +333,7 @@ public abstract class AbstractADTab extends AbstractUIPart implements IADTab
updateSelectedIndex(oldIndex, newIndex); updateSelectedIndex(oldIndex, newIndex);
} }
public void setADWindowPanel(AbstractADWindowPanel abstractADWindowPanel) { public void setADWindowPanel(AbstractADWindowContent abstractADWindowPanel) {
this.adWindowPanel = abstractADWindowPanel; this.adWindowPanel = abstractADWindowPanel;
} }
} }

811
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
View File

File diff suppressed because it is too large Load Diff

434
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/BreadCrumb.java Normal file
View File

@ -0,0 +1,434 @@
/******************************************************************************
* Copyright (C) 2012 Heng Sin Low *
* Copyright (C) 2012 Trek Global *
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/
package org.adempiere.webui.adwindow;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import org.adempiere.webui.AdempiereIdGenerator;
import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.Menupopup;
import org.adempiere.webui.component.ToolBar;
import org.adempiere.webui.component.ToolBarButton;
import org.adempiere.webui.component.Window;
import org.adempiere.webui.event.ToolbarListener;
import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.window.WRecordInfo;
import org.compiere.model.DataStatusEvent;
import org.compiere.model.MRole;
import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.zkoss.zhtml.Text;
import org.zkoss.zk.ui.Execution;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.Page;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.event.KeyEvent;
import org.zkoss.zk.ui.event.MouseEvent;
import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Caption;
import org.zkoss.zul.Div;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.Hlayout;
import org.zkoss.zul.Image;
import org.zkoss.zul.Menuitem;
import org.zkoss.zul.Space;
/**
* @author hengsin
*
*/
public class BreadCrumb extends Div implements EventListener<Event>{
private static final String INFO_INDICATOR_IMAGE = "/images/InfoIndicator16.png";
private static final String ERROR_INDICATOR_IMAGE = "/images/ErrorIndicator16.png";
/**
* generated serial id
*/
private static final long serialVersionUID = 929253935475618911L;
private static final String BTNPREFIX = "Btn";
private Hbox layout;
private ToolBarButton btnFirst, btnPrevious, btnNext, btnLast, btnRecordInfo;
private LinkedHashMap<String, String> links;
private int windowNo;
private HashMap<String, ToolBarButton> buttons = new HashMap<String, ToolBarButton>();
private Map<Integer, ToolBarButton> altKeyMap = new HashMap<Integer, ToolBarButton>();
private DataStatusEvent m_dse;
private String m_text;
private boolean m_statusError;
private String m_statusText;
private Window msgPopup;
private Div msgPopupCnt;
private ToolbarListener toolbarListener;
private Hlayout toolbarContainer;
private Hbox messageContainer;
private Caption msgPopupCaption;
/**
*
*/
public BreadCrumb(int windowNo) {
this.windowNo = windowNo;
layout = new Hbox();
layout.setPack("start");
layout.setAlign("center");
this.appendChild(layout);
layout.setHeight("100%");
layout.setStyle("float: left");
this.setVisible(false);
this.setSclass("adwindow-breadcrumb");
toolbarContainer = new Hlayout();
layout.appendChild(toolbarContainer);
ToolBar toolbar = new ToolBar();
toolbarContainer.appendChild(toolbar);
btnFirst = createButton("First", "First", "First");
toolbar.appendChild(btnFirst);
btnPrevious = createButton("Previous", "Previous", "Previous");
toolbar.appendChild(btnPrevious);
btnRecordInfo = new ToolBarButton();
btnRecordInfo.setLabel("");
btnRecordInfo.setStyle("font-size: 12px");
btnRecordInfo.setTooltiptext("Record Info");
btnRecordInfo.addEventListener(Events.ON_CLICK, this);
toolbar.appendChild(btnRecordInfo);
btnNext = createButton("Next", "Next", "Next");
toolbar.appendChild(btnNext);
btnLast = createButton("Last", "Last", "Last");
toolbar.appendChild(btnLast);
messageContainer = new Hbox();
messageContainer.setStyle("float: right; height: 30px;");
messageContainer.setAlign("center");
appendChild(messageContainer);
altKeyMap.put(KeyEvent.UP, btnPrevious);
altKeyMap.put(KeyEvent.DOWN, btnNext);
altKeyMap.put(KeyEvent.PAGE_UP, btnFirst);
altKeyMap.put(KeyEvent.PAGE_DOWN, btnLast);
createPopup();
toolbar.setStyle("background-image: none; background-color: transparent; border: none;");
}
public void setToolbarListener(ToolbarListener listener) {
this.toolbarListener = listener;
}
public void addPath(String label, String id, boolean clickable) {
if (clickable) {
BreadCrumbLink a = new BreadCrumbLink();
a.setLabel(label);
a.setPathId(id);
a.addEventListener(Events.ON_CLICK, this);
if (layout.getChildren().size() > 1) {
Label symbol = new Label();
symbol.setValue(" > ");
layout.insertBefore(symbol, toolbarContainer);
}
layout.insertBefore(a, toolbarContainer);
} else {
Label pathLabel = new Label();
pathLabel.setValue(label);
if (layout.getChildren().size() > 1) {
Label symbol = new Label();
symbol.setValue(" > ");
layout.insertBefore(symbol, toolbarContainer);
}
pathLabel.setStyle("font-weight: bold");
layout.insertBefore(pathLabel, toolbarContainer);
}
}
public void addLinks(LinkedHashMap<String, String> links) {
this.links = links;
final Label pathLabel = (Label) layout.getChildren().get(layout.getChildren().size()-2);
pathLabel.setStyle("cursor: pointer; font-weight: bold");
pathLabel.addEventListener(Events.ON_CLICK, new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
Menupopup popup = new Menupopup();
for(Map.Entry<String, String>entry : BreadCrumb.this.links.entrySet()) {
final Menuitem item = new Menuitem();
item.setLabel(entry.getValue());
item.setValue(entry.getKey());
item.addEventListener(Events.ON_CLICK, BreadCrumb.this);
popup.appendChild(item);
}
popup.setPage(pathLabel.getPage());
popup.open(pathLabel);
}
});
}
@Override
public void onEvent(Event event) throws Exception {
if (event.getTarget() == btnRecordInfo) {
if (m_dse == null
|| m_dse.CreatedBy == null
|| !MRole.getDefault().isShowPreference())
return;
String title = Msg.getMsg(Env.getCtx(), "Who") + m_text;
new WRecordInfo (title, m_dse);
} else if (event.getTarget().getParent() == messageContainer) {
showPopup();
} else if (event.getTarget() == btnFirst) {
if (toolbarListener != null)
toolbarListener.onFirst();
} else if (event.getTarget() == btnPrevious) {
if (toolbarListener != null)
toolbarListener.onPrevious();
} else if (event.getTarget() == btnNext) {
if (toolbarListener != null)
toolbarListener.onNext();
} else if (event.getTarget() == btnLast) {
if (toolbarListener != null)
toolbarListener.onLast();
} else {
MouseEvent me = (MouseEvent) event;
Events.sendEvent(this, me);
}
}
public void reset() {
layout.getChildren().clear();
layout.appendChild(toolbarContainer);
this.links = null;
}
private void enableFirstNavigation(boolean enabled)
{
this.btnFirst.setDisabled(!enabled);
this.btnPrevious.setDisabled(!enabled);
}
private void enableLastNavigation(boolean enabled)
{
this.btnLast.setDisabled(!enabled);
this.btnNext.setDisabled(!enabled);
}
public void enableNavigation(boolean enabled)
{
this.btnFirst.setDisabled(!enabled);
this.btnPrevious.setDisabled(!enabled);
this.btnNext.setDisabled(!enabled);
this.btnLast.setDisabled(!enabled);
}
private ToolBarButton createButton(String name, String image, String tooltip)
{
ToolBarButton btn = new ToolBarButton("");
btn.setName(BTNPREFIX+name);
if (windowNo > 0)
btn.setAttribute(AdempiereIdGenerator.ZK_COMPONENT_PREFIX_ATTRIBUTE, "unq" + btn.getName() + "_" + windowNo);
else
btn.setAttribute(AdempiereIdGenerator.ZK_COMPONENT_PREFIX_ATTRIBUTE, btn.getName());
btn.setImage("/images/"+image + "24.png");
btn.setTooltiptext(Msg.getMsg(Env.getCtx(),tooltip));
btn.setSclass("toolbar-button");
buttons.put(name, btn);
this.appendChild(btn);
//make toolbar button last to receive focus
btn.setTabindex(0);
btn.addEventListener(Events.ON_CLICK, this);
btn.setDisabled(true);
return btn;
}
/**
* @param text
*/
public void setStatusDB (String text)
{
setStatusDB(text, null);
}
/**
* @param text
* @param dse
*/
public void setStatusDB (String text, DataStatusEvent dse)
{
if (text == null || text.length() == 0)
{
btnRecordInfo.setLabel("");
}
else
{
btnRecordInfo.setLabel(text);
}
m_text = text;
m_dse = dse;
if (m_dse != null) {
enableFirstNavigation(m_dse.getCurrentRow() > 0);
enableLastNavigation(m_dse.getTotalRows() > m_dse.getCurrentRow()+1);
}
}
/**
* @param text
*/
public void setStatusLine (String text)
{
setStatusLine(text, false);
}
/**
* @param text
* @param error
*/
public void setStatusLine (String text, boolean error)
{
Execution execution = Executions.getCurrent();
if (execution != null) {
String key = this.getClass().getName()+"."+getUuid();
Object o = execution.getAttribute(key);
if (o != null) {
if (text == null || text.trim().length() == 0)
return;
} else {
execution.setAttribute(key, Boolean.TRUE);
}
}
m_statusText = text;
m_statusError = error;
messageContainer.getChildren().clear();
if (text == null || text.trim().length() == 0 )
return;
Image image = null;
if (error)
image = new Image(ERROR_INDICATOR_IMAGE);
else
image = new Image(INFO_INDICATOR_IMAGE);
image.setAttribute("org.zkoss.zul.image.preload", Boolean.TRUE);
messageContainer.appendChild(image);
String labelText = buildLabelText(m_statusText);
if (error) {
Clients.showNotification(labelText, "error", image, "overlap_start", 3500, true);
}
Label label = new Label(labelText);
messageContainer.appendChild(label);
if (labelText.length() != m_statusText.length()) {
image.addEventListener(Events.ON_CLICK, this);
image.setStyle("cursor: pointer");
label.addEventListener(Events.ON_CLICK, this);
label.setStyle("cursor: pointer");
label = new Label(" ...");
label.setStyle("cursor: pointer");
messageContainer.appendChild(label);
label.addEventListener(Events.ON_CLICK, this);
}
messageContainer.appendChild(new Space());
createPopupContent();
}
private String buildLabelText(String statusText) {
if (statusText == null)
return "";
if (statusText.length() <= 80)
return statusText;
int index = statusText.indexOf(" - java.lang.Exception");
if (index > 0)
return statusText.substring(0, index);
return statusText.substring(0, 80);
}
protected void createPopupContent() {
Text t = new Text(m_statusText);
msgPopupCnt.getChildren().clear();
msgPopupCnt.appendChild(t);
}
/**
*
* @return current status line text
*/
public String getStatusLine() {
return m_statusText;
}
private void createPopup() {
msgPopupCnt = new Div();
msgPopupCnt.setVflex("1");
msgPopup = new Window();
msgPopup.setBorder(true);
msgPopup.setClosable(true);
msgPopup.setSizable(true);
msgPopup.setContentStyle("overflow: auto");
msgPopup.setWidth("500px");
msgPopup.appendChild(msgPopupCnt);
msgPopup.setPage(SessionManager.getAppDesktop().getComponent().getPage());
msgPopup.setShadow(true);
msgPopupCaption = new Caption();
msgPopup.appendChild(msgPopupCaption);
}
private void showPopup() {
msgPopupCaption.setImage(m_statusError ? ERROR_INDICATOR_IMAGE : INFO_INDICATOR_IMAGE);
LayoutUtils.openOverlappedWindow(messageContainer, msgPopup, "overlap_end");
}
@Override
public void onPageDetached(Page page) {
super.onPageDetached(page);
if (msgPopup != null)
msgPopup.detach();
}
public void setNavigationToolbarVisibility(boolean visible) {
toolbarContainer.setVisible(visible);
}
}

28
org.zkoss.zk.library/src/org/zkoss/util/resource/IResourceLocator.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/BreadCrumbLink.java
View File

@ -11,21 +11,29 @@
* with this program; if not, write to the Free Software Foundation, Inc., * * with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/ *****************************************************************************/
package org.zkoss.util.resource; package org.adempiere.webui.adwindow;
import java.net.URL; import org.zkoss.zul.A;
/** /**
*
* @author hengsin * @author hengsin
* *
*/ */
public interface IResourceLocator { public class BreadCrumbLink extends A {
/**
* @param name
* @return resource url
*/
public URL getResource(String name);
/**
* generated serial id
*/
private static final long serialVersionUID = 170361731431877695L;
private String pathId;
public String getPathId() {
return pathId;
}
public void setPathId(String pathId) {
this.pathId = pathId;
}
} }

663
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java Normal file
View File

@ -0,0 +1,663 @@
/******************************************************************************
* Product: Posterita Ajax UI *
* Copyright (C) 2007 Posterita Ltd. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
* For the text or an alternative of this public license, you may reach us *
* Posterita Ltd., 3, Draper Avenue, Quatre Bornes, Mauritius *
* or via info@posterita.org or http://www.posterita.org/ *
*****************************************************************************/
package org.adempiere.webui.adwindow;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import org.adempiere.util.Callback;
import org.adempiere.webui.component.ADTabListModel;
import org.adempiere.webui.component.ADTabListModel.ADTabLabel;
import org.adempiere.webui.window.FDialog;
import org.compiere.model.DataStatusEvent;
import org.compiere.model.DataStatusListener;
import org.compiere.model.GridField;
import org.compiere.model.GridTab;
import org.compiere.util.CLogger;
import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Execution;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.HtmlBasedComponent;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Menuitem;
import org.zkoss.zul.Vlayout;
/**
*
* @author <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
* @author <a href="mailto:hengsin@gmail.com">Low Heng Sin</a>
* @date Feb 25, 2007
* @version $Revision: 0.10 $
*/
public class CompositeADTabbox extends AbstractADTabbox
{
private static final String ON_SWITCH_VIEW_EVENT = "onSwitchView";
private static final String ON_ACTIVATE_EVENT = "onActivate";
public static final String ON_SELECTION_CHANGED_EVENT = "onSelectionChanged";
public static final String ADTAB_INDEX_ATTRIBUTE = "adtab.index";
/** Logger */
@SuppressWarnings("unused")
private static CLogger log = CLogger.getCLogger (CompositeADTabbox.class);
private List<ADTabListModel.ADTabLabel> tabLabelList = new ArrayList<ADTabListModel.ADTabLabel>();
private List<IADTabpanel> tabPanelList = new ArrayList<IADTabpanel>();
private Vlayout layout;
protected DetailPane detailPane;
private EventListener<Event> selectionListener;
private IADTabpanel headerTab;
private int selectedIndex = 0;
public CompositeADTabbox()
{
detailPane = new DetailPane();
detailPane.setEventListener(new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
if (DetailPane.ON_EDIT_EVENT.equals(event.getName())) {
final int row = detailPane.getSelectedADTabpanel() != null
? detailPane.getSelectedADTabpanel().getGridTab().getCurrentRow()
: 0;
adWindowPanel.saveAndNavigate(new Callback<Boolean>() {
@Override
public void onCallback(Boolean result) {
if (result)
onEditDetail(row);
}
});
}
else if (DetailPane.ON_NEW_EVENT.equals(event.getName())) {
final int row = detailPane.getSelectedADTabpanel() != null
? detailPane.getSelectedADTabpanel().getGridTab().getCurrentRow()
: 0;
adWindowPanel.saveAndNavigate(new Callback<Boolean>() {
@Override
public void onCallback(Boolean result) {
if (result) {
onEditDetail(row);
adWindowPanel.onNew();
}
}
});
}
else if (DetailPane.ON_DELETE_EVENT.equals(event.getName())) {
final IADTabpanel tabPanel = detailPane.getSelectedADTabpanel();
if (tabPanel != null && tabPanel.getGridTab().getRowCount() > 0
&& tabPanel.getGridTab().getCurrentRow() >= 0) {
FDialog.ask(tabPanel.getGridTab().getWindowNo(), null, "DeleteRecord?", new Callback<Boolean>() {
@Override
public void onCallback(Boolean result) {
if (!result) return;
if (!tabPanel.getGridTab().dataDelete()) {
showLastError();
} else {
adWindowPanel.onRefresh(false);
}
}
});
}
}
}
});
}
protected void onEditDetail(int row) {
int oldIndex = selectedIndex;
IADTabpanel selectedPanel = detailPane.getSelectedADTabpanel();
int newIndex = (Integer)selectedPanel.getAttribute(ADTAB_INDEX_ATTRIBUTE);
Event selectionChanged = new Event(ON_SELECTION_CHANGED_EVENT, layout, new Object[]{oldIndex, newIndex});
try {
selectionListener.onEvent(selectionChanged);
} catch (Exception e) {
throw new RuntimeException(e);
}
headerTab.setDetailPaneMode(false, true);
if (headerTab.isGridView()) {
headerTab.switchRowPresentation();
}
headerTab.getGridTab().setCurrentRow(row, true);
}
protected Component doCreatePart(Component parent)
{
layout = new Vlayout();
layout.setHeight("100%");
layout.setWidth("100%");
layout.setStyle("position: relative");
if (parent != null) {
layout.setParent(parent);
} else {
layout.setPage(page);
}
BreadCrumb breadCrumb = getBreadCrumb();
breadCrumb.addEventListener(Events.ON_CLICK, new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
int oldIndex = selectedIndex;
if (event.getTarget() instanceof BreadCrumbLink) {
BreadCrumbLink link = (BreadCrumbLink) event.getTarget();
int newIndex = Integer.parseInt(link.getPathId());
Event selectionChanged = new Event(ON_SELECTION_CHANGED_EVENT, layout, new Object[]{oldIndex, newIndex});
selectionListener.onEvent(selectionChanged);
} else if (event.getTarget() instanceof Menuitem) {
Menuitem item = (Menuitem) event.getTarget();
int newIndex = Integer.parseInt(item.getValue());
Event selectionChanged = new Event(ON_SELECTION_CHANGED_EVENT, layout, new Object[]{oldIndex, newIndex});
selectionListener.onEvent(selectionChanged);
}
}
});
return layout;
}
@Override
protected void doAddTab(GridTab gTab, IADTabpanel tabPanel) {
ADTabListModel.ADTabLabel tabLabel = new ADTabListModel.ADTabLabel(gTab.getName(), gTab.getTabLevel(),gTab.getDescription(),
gTab.getWindowNo(),gTab.getAD_Tab_ID());
tabLabelList.add(tabLabel);
tabPanelList.add(tabPanel);
tabPanel.setAttribute(ADTAB_INDEX_ATTRIBUTE, tabPanelList.size()-1);
tabPanel.addEventListener(ON_ACTIVATE_EVENT, new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
Boolean b = (Boolean) event.getData();
if (b != null && !b.booleanValue())
return;
IADTabpanel tabPanel = (IADTabpanel) event.getTarget();
if (tabPanel == headerTab) {
if (b != null && b.booleanValue()) {
activateDetailADTabpanel();
}
if (selectedIndex > 0 && tabPanel.isGridView()) {
tabPanel.switchRowPresentation();
}
} else {
onActivateDetail(tabPanel);
}
}
});
tabPanel.addEventListener(DetailPane.ON_ACTIVATE_DETAIL_EVENT, new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
final IADTabpanel tabPanel = (IADTabpanel) event.getTarget();
int oldIndex = (Integer) event.getData();
if (oldIndex != detailPane.getSelectedIndex()) {
IADTabpanel prevTabPanel = detailPane.getADTabpanel(oldIndex);
if (prevTabPanel != null && prevTabPanel.getGridTab().needSave(true, true)) {
final int newIndex = detailPane.getSelectedIndex();
detailPane.setSelectedIndex(oldIndex);
adWindowPanel.saveAndNavigate(new Callback<Boolean>() {
@Override
public void onCallback(Boolean result) {
if (result) {
detailPane.setSelectedIndex(newIndex);
onActivateDetail(tabPanel);
}
}
});
} else {
onActivateDetail(tabPanel);
}
} else {
onActivateDetail(tabPanel);
}
}
});
tabPanel.addEventListener(ON_SWITCH_VIEW_EVENT, new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
IADTabpanel tabPanel = (IADTabpanel) event.getTarget();
if (tabPanel == headerTab) {
IADTabpanel detailPanel = getSelectedDetailADTabpanel();
if (detailPanel != null) {
detailPanel.setDetailPaneMode(true, headerTab.isGridView());
}
detailPane.setVflex(Boolean.toString(headerTab.isGridView()));
layout.invalidate();
}
}
});
tabPanel.addEventListener(ADTabpanel.ON_TOGGLE_EVENT, new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
IADTabpanel tabPanel = (IADTabpanel) event.getTarget();
if (tabPanel == headerTab) {
adWindowPanel.onToggle();
} else {
detailPane.onEdit();
}
}
});
if (layout.getChildren().isEmpty()) {
layout.appendChild(tabPanel);
headerTab = tabPanel;
updateBreadCrumb();
} else if (tabLabel.tabLevel <= 1) {
boolean activate = false;
if (detailPane.getParent() == null) {
ADTabpanel adtabpanel = (ADTabpanel) headerTab;
adtabpanel.addDetails(detailPane);
activate = true;
} else
tabPanel.setVisible(false);
detailPane.setHflex("1");
detailPane.setStyle("min-height: 200px; overflow-y: visible;");
detailPane.addADTabpanel(tabPanel, tabLabel);
tabPanel.setDetailPaneMode(true, headerTab.isGridView());
detailPane.setVflex(Boolean.toString(headerTab.isGridView()));
if (activate)
activateDetailADTabpanel();
} else {
detailPane.addADTabpanel(tabPanel, tabLabel, false);
tabPanel.setDetailPaneMode(true, headerTab.isGridView());
detailPane.setVflex(Boolean.toString(headerTab.isGridView()));
}
HtmlBasedComponent htmlComponent = (HtmlBasedComponent) tabPanel;
htmlComponent.setVflex("1");
htmlComponent.setWidth("100%");
tabPanel.getGridTab().addDataStatusListener(new SyncDataStatusListener(tabPanel));
}
protected void activateDetailADTabpanel() {
if (detailPane != null && detailPane.getParent() != null) {
IADTabpanel tabPanel = detailPane.getSelectedADTabpanel();
tabPanel.activate(true);
if (!tabPanel.isGridView()) {
tabPanel.switchRowPresentation();
}
}
}
/**
* Evaluate Tab Logic
* @param e event
*/
public void evaluate (DataStatusEvent e)
{
super.evaluate(e);
} // evaluate
@Override
protected void updateTabState() {
detailPane.refresh();
}
/**
* Return the selected Tab Panel
*/
public IADTabpanel getSelectedTabpanel()
{
return tabPanelList.isEmpty() ? null : tabPanelList.get(selectedIndex);
}
public int getSelectedIndex() {
return selectedIndex;
}
public void setSelectionEventListener(EventListener<Event> listener) {
selectionListener = listener;
}
@Override
protected void doTabSelectionChanged(int oldIndex, int newIndex) {
selectedIndex = newIndex;
IADTabpanel oldTabpanel = oldIndex >= 0 ? tabPanelList.get(oldIndex) : null;
IADTabpanel newTabpanel = tabPanelList.get(newIndex);
if (oldTabpanel != null) {
oldTabpanel.setVisible(false);
}
newTabpanel.createUI();
newTabpanel.setVisible(true);
headerTab = newTabpanel;
layout.getChildren().clear();
layout.appendChild(headerTab);
detailPane.detach();
detailPane.reset();
int currentLevel = headerTab.getTabLevel();
for (int i = selectedIndex + 1; i< tabPanelList.size(); i++) {
IADTabpanel tabPanel = tabPanelList.get(i);
int tabLevel = tabPanel.getTabLevel();
ADTabListModel.ADTabLabel tabLabel = tabLabelList.get(i);
if ((tabLevel - currentLevel) == 1 || (tabLevel == 0 && currentLevel == 0)) {
if (tabPanel.isActive() && !tabPanel.isGridView()) {
tabPanel.switchRowPresentation();
}
if (tabPanel.getParent() != null) tabPanel.detach();
detailPane.addADTabpanel(tabPanel, tabLabel);
tabPanel.setDetailPaneMode(true, headerTab.isGridView());
} else if (tabLevel > currentLevel ){
detailPane.addADTabpanel(tabPanel, tabLabel, false);
tabPanel.setDetailPaneMode(true, headerTab.isGridView());
}
}
if (detailPane.getTabcount() > 0 && !headerTab.getGridTab().isSortTab()) {
ADTabpanel adtabpanel = (ADTabpanel) headerTab;
adtabpanel.addDetails(detailPane);
detailPane.setVflex(Boolean.toString(headerTab.isGridView()));
detailPane.setSelectedIndex(0);
}
updateBreadCrumb();
}
private void updateBreadCrumb() {
BreadCrumb breadCrumb = getBreadCrumb();
breadCrumb.reset();
if (selectedIndex > 0) {
List<ADTabLabel> parents = new ArrayList<ADTabListModel.ADTabLabel>();
List<Integer> parentIndex = new ArrayList<Integer>();
int currentLevel = headerTab.getTabLevel();
for(int i = selectedIndex - 1; i >= 0; i--) {
ADTabLabel tabLabel = tabLabelList.get(i);
if (tabLabel.tabLevel == currentLevel-1) {
parents.add(tabLabel);
parentIndex.add(i);
currentLevel = tabLabel.tabLevel;
}
}
Collections.reverse(parents);
Collections.reverse(parentIndex);
for(ADTabLabel tabLabel : parents) {
int index = parentIndex.remove(0);
breadCrumb.addPath(tabLabel.label, Integer.toString(index), true);
}
}
ADTabLabel tabLabel = tabLabelList.get(selectedIndex);
breadCrumb.addPath(tabLabel.label, Integer.toString(selectedIndex), false);
breadCrumb.setVisible(true);
LinkedHashMap<String, String> links = new LinkedHashMap<String, String>();
int parentIndex = 0;
if (headerTab.getTabLevel() > 1) {
for(int i = selectedIndex - 1; i > 0; i--) {
tabLabel = tabLabelList.get(i);
if (tabLabel.tabLevel == (headerTab.getTabLevel()-1)) {
parentIndex = i;
break;
}
}
}
for(int i = parentIndex+1; i < tabLabelList.size(); i++) {
if (i == selectedIndex) continue;
tabLabel = tabLabelList.get(i);
if (tabLabel.tabLevel == headerTab.getTabLevel()) {
links.put(Integer.toString(i), tabLabel.label);
} else if (tabLabel.tabLevel < headerTab.getTabLevel()) {
break;
}
}
if (!links.isEmpty()) {
breadCrumb.addLinks(links);
}
}
protected BreadCrumb getBreadCrumb() {
ADWindowContent window = (ADWindowContent) adWindowPanel;
BreadCrumb breadCrumb = window.getBreadCrumb();
return breadCrumb;
}
public Component getComponent() {
return layout;
}
@Override
public IADTabpanel findADTabpanel(GridTab gTab) {
for (IADTabpanel tabpanel : tabPanelList) {
if (tabpanel.getGridTab() == gTab) {
return tabpanel;
}
}
return null;
}
// public void refresh() {
// }
class SyncDataStatusListener implements DataStatusListener {
private IADTabpanel tabPanel;
SyncDataStatusListener(IADTabpanel tabpanel) {
this.tabPanel = tabpanel;
}
@Override
public void dataStatusChanged(DataStatusEvent e) {
Execution execution = Executions.getCurrent();
if (execution == null) return;
if (tabPanel == headerTab && detailPane.getPage() != null && e.getChangedColumn() == -1) {
ArrayList<String> parentColumnNames = new ArrayList<String>();
GridField[] parentFields = headerTab.getGridTab().getFields();
for (GridField parentField : parentFields) {
parentColumnNames.add(parentField.getColumnName());
}
IADTabpanel detailTab = detailPane.getSelectedADTabpanel();
//check data action
String uuid = (String) execution.getAttribute(CompositeADTabbox.class.getName()+".dataAction");
if (uuid != null && uuid.equals(detailTab.getUuid())) {
//refresh current row
detailTab.getGridTab().dataRefresh(false);
//keep focus
onDetailRecord();
return;
}
GridTab tab = detailTab.getGridTab();
GridField[] fields = tab.getFields();
for (GridField field : fields)
{
if (!parentColumnNames.contains(field.getColumnName()))
Env.setContext(Env.getCtx(), field.getWindowNo(), field.getColumnName(), "");
}
detailTab.query(false, 0, 0);
detailTab.activate(true);
detailTab.setDetailPaneMode(true, headerTab.isGridView());
detailPane.setVflex(Boolean.toString(headerTab.isGridView()));
}
}
}
@Override
public void onDetailRecord() {
if (detailPane != null && detailPane.getParent() != null) {
Clients.scrollIntoView(detailPane);
detailPane.focus();
}
}
@Override
public void onParentRecord() {
Clients.scrollIntoView(headerTab);
((HtmlBasedComponent)headerTab).focus();
}
@Override
public boolean isSortTab() {
return headerTab != null ? headerTab.getGridTab().isSortTab() : false;
}
@Override
public IADTabpanel getSelectedDetailADTabpanel() {
if (detailPane != null && detailPane.getParent() != null) {
return detailPane.getSelectedADTabpanel();
}
return null;
}
@Override
public boolean needSave(boolean rowChange, boolean onlyRealChange) {
boolean b = headerTab.getGridTab().needSave(rowChange, onlyRealChange);
if (b)
return b;
IADTabpanel detailPanel = getSelectedDetailADTabpanel();
if (detailPanel != null) {
b = detailPanel.getGridTab().needSave(rowChange, onlyRealChange);
}
return b;
}
@Override
public void dataIgnore() {
IADTabpanel detailPanel = getSelectedDetailADTabpanel();
if (detailPanel != null) {
detailPanel.getGridTab().dataIgnore();
}
headerTab.getGridTab().dataIgnore();
}
@Override
public GridTab getSelectedGridTab() {
IADTabpanel tabpanel = getSelectedTabpanel();
return tabpanel == null ? null : tabpanel.getGridTab();
}
@Override
public boolean dataSave(boolean onSaveEvent) {
IADTabpanel detail = getSelectedDetailADTabpanel();
if (detail != null && detail.getGridTab().needSave(true, true)) {
Execution execution = Executions.getCurrent();
if (execution != null) {
execution.setAttribute(getClass().getName()+".dataAction", detail.getUuid());
}
return detail.getGridTab().dataSave(onSaveEvent);
}
return headerTab.getGridTab().dataSave(onSaveEvent);
}
@Override
public void setDetailPaneStatusMessage(String status, boolean error) {
detailPane.setStatusMessage(status, error);
}
@Override
public IADTabpanel getDirtyADTabpanel() {
IADTabpanel detail = getSelectedDetailADTabpanel();
if (detail != null && detail.getGridTab().needSave(true, true)) {
return detail;
} else if (detail != null && detail instanceof ADSortTab && ((ADSortTab)detail).isChanged()) {
return detail;
} else if (headerTab.getGridTab().needSave(true, true)) {
return headerTab;
} else if (headerTab instanceof ADSortTab && ((ADSortTab)headerTab).isChanged()) {
return headerTab;
}
return null;
}
protected void onActivateDetail(IADTabpanel tabPanel) {
tabPanel.createUI();
tabPanel.query(false, 0, 0);
if (!tabPanel.isVisible())
tabPanel.setVisible(true);
if (!tabPanel.isGridView()) {
tabPanel.switchRowPresentation();
}
tabPanel.setDetailPaneMode(true, headerTab.isGridView());
detailPane.setVflex(Boolean.toString(headerTab.isGridView()));
if (tabPanel instanceof ADSortTab) {
detailPane.invalidate();
detailPane.updateToolbar(false, true);
onDetailRecord();
}
}
private void showLastError() {
String msg = CLogger.retrieveErrorString(null);
if (msg != null)
{
detailPane.setStatusMessage(Msg.getMsg(Env.getCtx(), msg), true);
}
//other error will be catch in the dataStatusChanged event
}
@Override
public void updateDetailPaneToolbar(boolean changed, boolean readOnly) {
detailPane.updateToolbar(changed, readOnly);
}
@Override
public void setDetailpaneSelection(int tabIndex, int currentRow) {
if (detailPane.getTabcount() > 0) {
for(int i = 0; i < detailPane.getTabcount(); i++) {
IADTabpanel adtab = detailPane.getADTabpanel(i);
int index = (Integer) adtab.getAttribute(ADTAB_INDEX_ATTRIBUTE);
if (index == tabIndex) {
if (i != detailPane.getSelectedIndex()) {
detailPane.setSelectedIndex(i);
detailPane.fireActivateDetailEvent();
}
if (adtab.getGridTab().getCurrentRow() != currentRow)
adtab.getGridTab().setCurrentRow(currentRow, true);
break;
}
}
}
}
}

418
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java Normal file
View File

@ -0,0 +1,418 @@
/**
*
*/
package org.adempiere.webui.adwindow;
import java.util.HashMap;
import java.util.Map;
import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.Panel;
import org.adempiere.webui.component.Tab;
import org.adempiere.webui.component.Tabbox;
import org.adempiere.webui.component.Tabpanel;
import org.adempiere.webui.component.ToolBar;
import org.adempiere.webui.component.ToolBarButton;
import org.adempiere.webui.component.Window;
import org.adempiere.webui.component.ADTabListModel.ADTabLabel;
import org.adempiere.webui.session.SessionManager;
import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.compiere.util.Util;
import org.zkoss.zhtml.Text;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Execution;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.Page;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Caption;
import org.zkoss.zul.Div;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.Image;
import org.zkoss.zul.Space;
import org.zkoss.zul.Tabpanels;
import org.zkoss.zul.Tabs;
import org.zkoss.zul.Toolbar;
/**
* @author hengsin
*
*/
public class DetailPane extends Panel implements EventListener<Event> {
private static final String STATUS_TEXT_ATTRIBUTE = "status.text";
private static final String STATUS_ERROR_ATTRIBUTE = "status.error";
private static final String TABBOX_STYLE = "min-height: 200px; overflow-y: visible; width: 99%; margin: auto;";
private static final String DELETE_IMAGE = "/images/Delete16.png";
private static final String EDIT_IMAGE = "/images/EditRecord16.png";
private static final String NEW_IMAGE = "/images/New16.png";
private static final String STYLE = "min-height: 200px; width: 100%; overflow-y: visible;";
/**
* generated serial id
*/
private static final long serialVersionUID = -7914602940626352282L;
private static final String INFO_INDICATOR_IMAGE = "/images/InfoIndicator16.png";
private static final String ERROR_INDICATOR_IMAGE = "/images/ErrorIndicator16.png";
private Tabbox tabbox;
private EventListener<Event> eventListener;
private Map<Integer, Hbox> messageContainers = new HashMap<Integer, Hbox>();
private Div msgPopupCnt;
private Window msgPopup;
private Caption msgPopupCaption;
private int prevSelectedIndex = 0;
public static final String ON_ACTIVATE_DETAIL_EVENT = "onActivateDetail";
public static final String ON_DELETE_EVENT = "onDelete";
public static final String ON_NEW_EVENT = "onNew";
public static final String ON_EDIT_EVENT = "onEdit";
public DetailPane() {
tabbox = new Tabbox();
tabbox.setParent(this);
tabbox.addEventListener(Events.ON_SELECT, new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
fireActivateDetailEvent();
}
});
tabbox.setStyle(TABBOX_STYLE);
createPopup();
this.setStyle(STYLE);
//TODO: this probably not needed
this.setHflex("true");
}
public int getSelectedIndex() {
return tabbox.getSelectedIndex();
}
public void setSelectedIndex(int curTabIndex) {
tabbox.setSelectedIndex(curTabIndex);
prevSelectedIndex = curTabIndex;
}
public int getTabcount() {
int count = 0;
Tabs tabs = tabbox.getTabs();
if (tabs != null)
count = tabs.getChildren().size();
return count;
}
public void undoLastTabSelection() {
tabbox.setSelectedIndex(prevSelectedIndex);
}
public void refresh() {
tabbox.invalidate();
}
public void addADTabpanel(IADTabpanel tabPanel, ADTabLabel tabLabel) {
addADTabpanel(tabPanel, tabLabel, true);
}
public void addADTabpanel(IADTabpanel tabPanel, ADTabLabel tabLabel, boolean enabled) {
Tabs tabs = tabbox.getTabs();
if (tabs == null) {
tabs = new Tabs();
tabbox.appendChild(tabs);
}
Tab tab = new Tab();
tabs.appendChild(tab);
tab.setLabel(tabLabel.label);
if (!enabled) {
tab.setDisabled(true);
}
Tabpanels tabpanels = tabbox.getTabpanels();
if (tabpanels == null) {
tabpanels = new Tabpanels();
//TODO: is this style needed ?
tabpanels.setStyle("min-height: 200px; overflow-y: visible;");
tabpanels.setWidth("100%");
tabbox.appendChild(tabpanels);
}
Tabpanel tp = new Tabpanel();
//TODO: is this style needed
tp.setStyle("min-height: 180px; overflow-y: visible; width: 99%; margin: auto;");
tabpanels.appendChild(tp);
tp.setStyle("background-color: #fff");
ToolBar toolbar = new ToolBar();
tp.appendChild(toolbar);
ToolBarButton button = new ToolBarButton();
button = new ToolBarButton();
button.setImage(NEW_IMAGE);
toolbar.appendChild(button);
button.addEventListener(Events.ON_CLICK, new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
Event openEvent = new Event(ON_NEW_EVENT, DetailPane.this);
eventListener.onEvent(openEvent);
}
});
button.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "New")));
button = new ToolBarButton();
button.setImage(EDIT_IMAGE);
toolbar.appendChild(button);
button.addEventListener(Events.ON_CLICK, new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
onEdit();
}
});
button.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "EditRecord")));
button = new ToolBarButton();
button.setImage(DELETE_IMAGE);
toolbar.appendChild(button);
button.addEventListener(Events.ON_CLICK, new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
Event openEvent = new Event(ON_DELETE_EVENT, DetailPane.this);
eventListener.onEvent(openEvent);
}
});
button.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Delete")));
Hbox messageContainer = new Hbox();
messageContainer.setPack("end");
messageContainer.setHflex("1");
messageContainer.setStyle("float: right");
toolbar.appendChild(messageContainer);
toolbar.setSclass("adtab-detail-toolbar");
toolbar.setVflex("0");
messageContainers.put(tabLabel.AD_Tab_ID, messageContainer);
tabPanel.setAttribute("AD_Tab_ID", tabLabel.AD_Tab_ID);
tp.appendChild(tabPanel);
}
public void setEventListener(EventListener<Event> listener) {
eventListener = listener;
}
public void reset() {
if (tabbox.getTabs() != null) {
tabbox.getTabs().getChildren().clear();
}
if (tabbox.getTabpanels() != null) {
tabbox.getTabpanels().getChildren().clear();
}
}
public IADTabpanel getADTabpanel(int index) {
if (index < 0 || index >= tabbox.getTabpanels().getChildren().size())
return null;
org.zkoss.zul.Tabpanel tabPanel = tabbox.getTabpanel(index);
for(Component c : tabPanel.getChildren()) {
if (c instanceof IADTabpanel)
return (IADTabpanel)c;
}
return null;
}
public IADTabpanel getSelectedADTabpanel() {
org.zkoss.zul.Tabpanel selectedPanel = tabbox.getSelectedPanel();
if (selectedPanel != null) {
for(Component c : selectedPanel.getChildren()) {
if (c instanceof IADTabpanel)
return (IADTabpanel)c;
}
}
return null;
}
public void setStatusMessage(String status, boolean error) {
IADTabpanel tabPanel = getSelectedADTabpanel();
Hbox messageContainer = messageContainers.get(tabPanel.getAttribute("AD_Tab_ID"));
Execution execution = Executions.getCurrent();
if (execution != null) {
String key = this.getClass().getName()+"."+messageContainer.getUuid();
Object o = execution.getAttribute(key);
if (o != null) {
if (status == null || status.trim().length() == 0)
return;
} else {
execution.setAttribute(key, Boolean.TRUE);
}
}
messageContainer.getChildren().clear();
messageContainer.setAttribute(STATUS_ERROR_ATTRIBUTE, error);
messageContainer.setAttribute(STATUS_TEXT_ATTRIBUTE, status);
if (status == null || status.trim().length() == 0)
return;
Image image = null;
if (error)
image = new Image(ERROR_INDICATOR_IMAGE);
else
image = new Image(INFO_INDICATOR_IMAGE);
image.setAttribute("org.zkoss.zul.image.preload", Boolean.TRUE);
messageContainer.appendChild(image);
String labelText = buildLabelText(status);
if (error) {
Clients.showNotification(labelText, "error", image, "overlap_start", 3500, true);
}
Label label = new Label(labelText);
messageContainer.appendChild(label);
if (labelText.length() != status.length()) {
image.addEventListener(Events.ON_CLICK, this);
image.setStyle("cursor: pointer");
label.addEventListener(Events.ON_CLICK, this);
label.setStyle("cursor: pointer");
label = new Label(" ...");
label.setStyle("cursor: pointer");
messageContainer.appendChild(label);
label.addEventListener(Events.ON_CLICK, this);
}
messageContainer.appendChild(new Space());
}
private String buildLabelText(String statusText) {
if (statusText == null)
return "";
if (statusText.length() <= 80)
return statusText;
int index = statusText.indexOf(" - java.lang.Exception");
if (index > 0)
return statusText.substring(0, index);
return statusText.substring(0, 80);
}
@Override
public void onEvent(Event event) throws Exception {
Component messageContainer = event.getTarget().getParent();
Boolean error = (Boolean) messageContainer.getAttribute(STATUS_ERROR_ATTRIBUTE);
String status = (String) messageContainer.getAttribute(STATUS_TEXT_ATTRIBUTE);
createPopupContent(status);
showPopup(error, messageContainer);
}
protected void createPopupContent(String status) {
Text t = new Text(status);
msgPopupCnt.getChildren().clear();
msgPopupCnt.appendChild(t);
}
private void showPopup(boolean error, Component messageContainer) {
msgPopupCaption.setImage(error ? ERROR_INDICATOR_IMAGE : INFO_INDICATOR_IMAGE);
LayoutUtils.openOverlappedWindow(messageContainer, msgPopup, "overlap_end");
}
private void createPopup() {
msgPopupCnt = new Div();
msgPopupCnt.setVflex("1");
msgPopup = new Window();
msgPopup.setBorder(true);
msgPopup.setClosable(true);
msgPopup.setSizable(true);
msgPopup.setContentStyle("overflow: auto");
msgPopup.setWidth("500px");
msgPopup.appendChild(msgPopupCnt);
msgPopup.setPage(SessionManager.getAppDesktop().getComponent().getPage());
msgPopup.setShadow(true);
msgPopupCaption = new Caption();
msgPopup.appendChild(msgPopupCaption);
}
@Override
public void onPageDetached(Page page) {
super.onPageDetached(page);
if (msgPopup != null)
msgPopup.detach();
}
/* (non-Javadoc)
* @see org.zkoss.zk.ui.HtmlBasedComponent#setVflex(java.lang.String)
*/
@Override
public void setVflex(String flex) {
super.setVflex(flex);
tabbox.setVflex(flex);
}
public void updateToolbar(boolean changed, boolean readOnly) {
int index = getSelectedIndex();
if (index < 0 || index >= getTabcount()) return;
Tabpanel tabpanel = tabbox.getTabpanel(index);
Toolbar toolbar = (Toolbar) tabpanel.getFirstChild();
IADTabpanel adtab = getADTabpanel(index);
if (adtab.getGridTab().isSortTab())
readOnly = true;
boolean insertRecord = !readOnly;
if (insertRecord)
{
insertRecord = adtab.getGridTab().isInsertRecord();
}
boolean enableNew = !changed && insertRecord && !adtab.getGridTab().isSortTab();
boolean enableDelete = !changed && !readOnly && !adtab.getGridTab().isSortTab();
int newBtn = 0;
int deleteBtn = 0;
for(Component c : toolbar.getChildren()) {
if (c instanceof ToolBarButton) {
ToolBarButton btn = (ToolBarButton) c;
if (NEW_IMAGE.equals(btn.getImage())) {
btn.setDisabled(!enableNew);
newBtn++;
} else if (DELETE_IMAGE.equals(btn.getImage())) {
btn.setDisabled(!enableDelete);
deleteBtn++;
}
if (newBtn > 0 && deleteBtn > 0)
break;
}
}
}
public void onEdit() throws Exception {
Event openEvent = new Event(ON_EDIT_EVENT, DetailPane.this);
eventListener.onEvent(openEvent);
}
public void fireActivateDetailEvent() {
int index = tabbox.getSelectedIndex();
IADTabpanel tabPanel = (IADTabpanel) tabbox.getTabpanel(index).getChildren().get(1);
Event activateEvent = new Event(ON_ACTIVATE_DETAIL_EVENT, tabPanel, prevSelectedIndex);
Events.sendEvent(activateEvent);
}
}

18
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabRowRenderer.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java
View File

@ -10,7 +10,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * * with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.component; package org.adempiere.webui.adwindow;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -23,6 +23,9 @@ import java.util.Map.Entry;
import org.adempiere.util.GridRowCtx; import org.adempiere.util.GridRowCtx;
import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.Checkbox;
import org.adempiere.webui.component.EditorBox;
import org.adempiere.webui.component.NumberBox;
import org.adempiere.webui.editor.WButtonEditor; import org.adempiere.webui.editor.WButtonEditor;
import org.adempiere.webui.editor.WEditor; import org.adempiere.webui.editor.WEditor;
import org.adempiere.webui.editor.WEditorPopupMenu; import org.adempiere.webui.editor.WEditorPopupMenu;
@ -30,16 +33,13 @@ import org.adempiere.webui.editor.WebEditorFactory;
import org.adempiere.webui.event.ActionEvent; import org.adempiere.webui.event.ActionEvent;
import org.adempiere.webui.event.ActionListener; import org.adempiere.webui.event.ActionListener;
import org.adempiere.webui.event.ContextMenuListener; import org.adempiere.webui.event.ContextMenuListener;
import org.adempiere.webui.panel.AbstractADWindowPanel;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.util.GridTabDataBinder; import org.adempiere.webui.util.GridTabDataBinder;
import org.adempiere.webui.window.ADWindow;
import org.compiere.model.GridField; import org.compiere.model.GridField;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.NamePair; import org.compiere.util.NamePair;
import org.zkoss.xml.XMLs;
import org.zkoss.zk.au.out.AuFocus; import org.zkoss.zk.au.out.AuFocus;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.HtmlBasedComponent; import org.zkoss.zk.ui.HtmlBasedComponent;
@ -80,12 +80,12 @@ public class GridTabRowRenderer implements RowRenderer<Object[]>, RowRendererExt
private RowListener rowListener; private RowListener rowListener;
private Grid grid = null; private Grid grid = null;
private GridPanel gridPanel = null; private GridView gridPanel = null;
private Row currentRow; private Row currentRow;
private Object[] currentValues; private Object[] currentValues;
private boolean editing = false; private boolean editing = false;
private int currentRowIndex = -1; private int currentRowIndex = -1;
private AbstractADWindowPanel m_windowPanel; private AbstractADWindowContent m_windowPanel;
/** /**
* *
@ -122,7 +122,7 @@ public class GridTabRowRenderer implements RowRenderer<Object[]>, RowRendererExt
Object window = SessionManager.getAppDesktop().findWindow(windowNo); Object window = SessionManager.getAppDesktop().findWindow(windowNo);
if (window != null && window instanceof ADWindow) if (window != null && window instanceof ADWindow)
{ {
AbstractADWindowPanel windowPanel = ((ADWindow)window).getADWindowPanel(); AbstractADWindowContent windowPanel = ((ADWindow)window).getADWindowContent();
((WButtonEditor)editor).addActionListener(windowPanel); ((WButtonEditor)editor).addActionListener(windowPanel);
} }
} }
@ -625,7 +625,7 @@ public class GridTabRowRenderer implements RowRenderer<Object[]>, RowRendererExt
* *
* @param gridPanel * @param gridPanel
*/ */
public void setGridPanel(GridPanel gridPanel) { public void setGridPanel(GridView gridPanel) {
this.gridPanel = gridPanel; this.gridPanel = gridPanel;
} }
@ -664,7 +664,7 @@ public class GridTabRowRenderer implements RowRenderer<Object[]>, RowRendererExt
/** /**
* @param windowPanel * @param windowPanel
*/ */
public void setADWindowPanel(AbstractADWindowPanel windowPanel) { public void setADWindowPanel(AbstractADWindowContent windowPanel) {
this.m_windowPanel = windowPanel; this.m_windowPanel = windowPanel;
} }
} }

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTableListModel.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTableListModel.java
View File

@ -10,7 +10,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * * with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.component; package org.adempiere.webui.adwindow;
import java.util.Comparator; import java.util.Comparator;

164
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridPanel.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java
View File

@ -10,7 +10,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * * with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.component; package org.adempiere.webui.adwindow;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -22,11 +22,14 @@ import java.util.Map;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import org.adempiere.model.MTabCustomization; import org.adempiere.model.MTabCustomization;
import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.Borderlayout;
import org.adempiere.webui.component.Columns;
import org.adempiere.webui.component.EditorBox;
import org.adempiere.webui.component.Grid;
import org.adempiere.webui.component.NumberBox;
import org.adempiere.webui.editor.WEditor; import org.adempiere.webui.editor.WEditor;
import org.adempiere.webui.event.TouchEventHelper; import org.adempiere.webui.event.TouchEventHelper;
import org.adempiere.webui.panel.AbstractADWindowPanel;
import org.adempiere.webui.util.SortComparator; import org.adempiere.webui.util.SortComparator;
import org.compiere.model.GridField; import org.compiere.model.GridField;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
@ -34,6 +37,8 @@ import org.compiere.model.GridTable;
import org.compiere.model.MSysConfig; import org.compiere.model.MSysConfig;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.compiere.util.Util;
import org.zkoss.zk.au.out.AuFocus; import org.zkoss.zk.au.out.AuFocus;
import org.zkoss.zk.au.out.AuScript; import org.zkoss.zk.au.out.AuScript;
import org.zkoss.zk.ui.AbstractComponent; import org.zkoss.zk.ui.AbstractComponent;
@ -42,14 +47,14 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.util.Clients; import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center; import org.zkoss.zul.Center;
import org.zkoss.zul.Frozen; import org.zkoss.zul.Frozen;
import org.zkoss.zul.South;
import org.zkoss.zul.Column; import org.zkoss.zul.Column;
import org.zkoss.zul.Div; import org.zkoss.zul.Div;
import org.zkoss.zul.North;
import org.zkoss.zul.Paging; import org.zkoss.zul.Paging;
import org.zkoss.zul.Row; import org.zkoss.zul.Row;
import org.zkoss.zul.Vbox;
import org.zkoss.zul.event.ZulEvents; import org.zkoss.zul.event.ZulEvents;
/** /**
@ -57,8 +62,12 @@ import org.zkoss.zul.event.ZulEvents;
* @author Low Heng Sin * @author Low Heng Sin
* *
*/ */
public class GridPanel extends Borderlayout implements EventListener<Event> public class GridView extends Vbox implements EventListener<Event>
{ {
private static final int DEFAULT_DETAIL_PAGE_SIZE = 10;
private static final int DEFAULT_PAGE_SIZE = 50;
/** /**
* generated serial version ID * generated serial version ID
*/ */
@ -74,7 +83,7 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
private Grid listbox = null; private Grid listbox = null;
private int pageSize = 100; private int pageSize = DEFAULT_PAGE_SIZE;
private GridField[] gridField; private GridField[] gridField;
private AbstractTableModel tableModel; private AbstractTableModel tableModel;
@ -93,19 +102,23 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
private GridTabRowRenderer renderer; private GridTabRowRenderer renderer;
private South south; private Div gridFooter;
private boolean modeless = true; private boolean modeless = true;
private String columnOnClick; private String columnOnClick;
private AbstractADWindowPanel windowPanel; private AbstractADWindowContent windowPanel;
private boolean refreshing; private boolean refreshing;
private Map<Integer, String> columnWidthMap; private Map<Integer, String> columnWidthMap;
public GridPanel() private Component detail;
private Borderlayout borderLayout;
public GridView()
{ {
this(0); this(0);
} }
@ -113,14 +126,29 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
/** /**
* @param windowNo * @param windowNo
*/ */
public GridPanel(int windowNo) public GridView(int windowNo)
{ {
this.windowNo = windowNo; this.windowNo = windowNo;
listbox = new Grid(); createListbox();
listbox.addEventListener(ZulEvents.ON_AFTER_RENDER, this);
south = new South();
this.appendChild(south);
this.setHflex("1");
gridFooter = new Div();
gridFooter.setHflex("1");
gridFooter.setVflex("0");
borderLayout = new Borderlayout();
borderLayout.setStyle("position: absolute; height: 100%; width: 100%;");
appendChild(borderLayout);
Center center = new Center();
borderLayout.appendChild(center);
North north = new North();
north.setVflex("min");
borderLayout.appendChild(north);
borderLayout.appendCenter(listbox);
borderLayout.appendNorth(gridFooter);
//default paging size //default paging size
if (AEnv.isTablet()) if (AEnv.isTablet())
{ {
@ -129,7 +157,7 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
} }
else else
{ {
pageSize = MSysConfig.getIntValue(MSysConfig.ZK_PAGING_SIZE, 100); pageSize = MSysConfig.getIntValue(MSysConfig.ZK_PAGING_SIZE, 50);
} }
//default true for better UI experience //default true for better UI experience
@ -137,6 +165,51 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
} }
protected void createListbox() {
listbox = new Grid();
listbox.setEmptyMessage(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "FindZeroRecords")));
listbox.addEventListener(ZulEvents.ON_AFTER_RENDER, this);
listbox.setSizedByContent(true);
listbox.setVflex("1");
listbox.setHflex("1");
}
public void setDetailPaneMode(boolean detailPaneMode, boolean vflex) {
if (detailPaneMode) {
pageSize = DEFAULT_DETAIL_PAGE_SIZE;
updatePaging();
if (borderLayout.getParent() != null) {
listbox.detach();
gridFooter.detach();
borderLayout.detach();
appendChild(listbox);
appendChild(gridFooter);
}
//false work for header form, true work for header grid
listbox.setVflex(vflex);
this.setVflex(Boolean.toString(vflex));
} else {
pageSize = MSysConfig.getIntValue(MSysConfig.ZK_PAGING_SIZE, 50);
updatePaging();
if (borderLayout.getParent() == null) {
listbox.detach();
gridFooter.detach();
appendChild(borderLayout);
borderLayout.appendCenter(listbox);
borderLayout.appendNorth(gridFooter);
}
listbox.setVflex("true");
this.setVflex("true");
}
}
private void updatePaging() {
if (paging != null && paging.getPageSize() != pageSize) {
paging.setPageSize(pageSize);
updateModel();
}
}
/** /**
* *
* @param gridTab * @param gridTab
@ -260,6 +333,10 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
if (pageSize > 0) { if (pageSize > 0) {
if (paging.getTotalSize() != gridTab.getRowCount()) if (paging.getTotalSize() != gridTab.getRowCount())
paging.setTotalSize(gridTab.getRowCount()); paging.setTotalSize(gridTab.getRowCount());
if (paging.getPageCount() > 1 && !gridFooter.isVisible()) {
gridFooter.setVisible(true);
borderLayout.invalidate();
}
int pgIndex = rowIndex >= 0 ? rowIndex % pageSize : 0; int pgIndex = rowIndex >= 0 ? rowIndex % pageSize : 0;
int pgNo = rowIndex >= 0 ? (rowIndex - pgIndex) / pageSize : 0; int pgNo = rowIndex >= 0 ? (rowIndex - pgIndex) / pageSize : 0;
if (listModel.getPage() != pgNo) { if (listModel.getPage() != pgNo) {
@ -282,6 +359,11 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
if (paging.getActivePage() != pgNo) { if (paging.getActivePage() != pgNo) {
paging.setActivePage(pgNo); paging.setActivePage(pgNo);
} }
if (paging.getPageCount() == 1) {
gridFooter.setVisible(false);
} else {
gridFooter.setVisible(true);
}
if (rowIndex >= 0 && pgIndex >= 0) { if (rowIndex >= 0 && pgIndex >= 0) {
Events.echoEvent("onPostSelectedRowChanged", this, null); Events.echoEvent("onPostSelectedRowChanged", this, null);
} }
@ -389,36 +471,29 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
private void render() private void render()
{ {
LayoutUtils.addSclass("adtab-grid-panel", this);
listbox.setVflex(true);
//true might looks better, false for better performance
listbox.setSizedByContent(false);
listbox.addEventListener(Events.ON_CLICK, this); listbox.addEventListener(Events.ON_CLICK, this);
updateModel(); updateModel();
Center center = new Center();
center.appendChild(listbox);
if (AEnv.isTablet()) {
LayoutUtils.addSclass("tablet-scrolling", center);
}
this.appendChild(center);
if (pageSize > 0) if (pageSize > 0)
{ {
paging = new Paging(); paging = new Paging();
paging.setPageSize(pageSize); paging.setPageSize(pageSize);
paging.setTotalSize(tableModel.getRowCount()); paging.setTotalSize(tableModel.getRowCount());
paging.setDetailed(true); paging.setDetailed(true);
south.appendChild(paging); gridFooter.appendChild(paging);
south.setSclass("adtab-grid-south"); gridFooter.setSclass("adtab-grid-south");
paging.addEventListener(ZulEvents.ON_PAGING, this); paging.addEventListener(ZulEvents.ON_PAGING, this);
renderer.setPaging(paging); renderer.setPaging(paging);
if (paging.getPageCount() == 1) {
gridFooter.setVisible(false);
} else {
gridFooter.setVisible(true);
}
} }
else else
{ {
south.setVisible(false); gridFooter.setVisible(false);
} }
if (AEnv.isTablet()) { if (AEnv.isTablet()) {
@ -531,8 +606,6 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
if (!isRowRendered(row, pgIndex)) { if (!isRowRendered(row, pgIndex)) {
listbox.renderRow(row); listbox.renderRow(row);
} else { } else {
// Row old = renderer.getCurrentRow();
// int oldIndex = renderer.getCurrentRowIndex();
renderer.setCurrentRow(row); renderer.setCurrentRow(row);
//remark: following 3 line cause the previously selected row being render twice //remark: following 3 line cause the previously selected row being render twice
// if (old != null && old != row && oldIndex >= 0 && oldIndex != gridTab.getCurrentRow()) // if (old != null && old != row && oldIndex >= 0 && oldIndex != gridTab.getCurrentRow())
@ -556,8 +629,6 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
if (!isRowRendered(row, rowIndex)) { if (!isRowRendered(row, rowIndex)) {
listbox.renderRow(row); listbox.renderRow(row);
} else { } else {
// Row old = renderer.getCurrentRow();
// int oldIndex = renderer.getCurrentRowIndex();
renderer.setCurrentRow(row); renderer.setCurrentRow(row);
//remark: following 3 line cause the previously selected row being render twice //remark: following 3 line cause the previously selected row being render twice
// if (old != null && old != row && oldIndex >= 0 && oldIndex != gridTab.getCurrentRow()) // if (old != null && old != row && oldIndex >= 0 && oldIndex != gridTab.getCurrentRow())
@ -758,7 +829,7 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
/** /**
* @param winPanel * @param winPanel
*/ */
public void setADWindowPanel(AbstractADWindowPanel winPanel) { public void setADWindowPanel(AbstractADWindowContent winPanel) {
windowPanel = winPanel; windowPanel = winPanel;
if (renderer != null) if (renderer != null)
renderer.setADWindowPanel(windowPanel); renderer.setADWindowPanel(windowPanel);
@ -782,4 +853,25 @@ public class GridPanel extends Borderlayout implements EventListener<Event>
public GridField[] getFields() { public GridField[] getFields() {
return gridField; return gridField;
} }
public void addDetails(Component component) {
detail = component;
borderLayout.appendSouth(detail);
borderLayout.getSouth().setCollapsible(true);
borderLayout.getSouth().setTitle(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Detail")));
borderLayout.getSouth().setOpen(false);
borderLayout.getSouth().setHeight("250px");
}
public Component removeDetails() {
Component details = null;
if (detail != null) {
if (detail.getParent() != null) {
detail.detach();
details = detail;
}
detail = null;
}
return details;
}
} }

58
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/IADTab.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/IADTabbox.java
View File

@ -10,14 +10,12 @@
* with this program; if not, write to the Free Software Foundation, Inc., * * with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.component; package org.adempiere.webui.adwindow;
import org.adempiere.webui.panel.AbstractADWindowPanel;
import org.adempiere.webui.panel.IADTabpanel;
import org.adempiere.webui.part.UIPart; import org.adempiere.webui.part.UIPart;
import org.compiere.model.DataStatusEvent; import org.compiere.model.DataStatusEvent;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
/** /**
@ -25,7 +23,7 @@ import org.zkoss.zk.ui.event.EventListener;
* @author <a href="mailto:hengsin@gmail.com">Low Heng Sin</a> * @author <a href="mailto:hengsin@gmail.com">Low Heng Sin</a>
* *
*/ */
public interface IADTab extends UIPart { public interface IADTabbox extends UIPart {
/** /**
* *
@ -91,17 +89,7 @@ public interface IADTab extends UIPart {
* *
* @param listener * @param listener
*/ */
public void addSelectionEventListener(EventListener listener); public void setSelectionEventListener(EventListener<Event> listener);
/**
* @return tab selection component
*/
public Component getTabSelectionComponent();
/**
* @return boolean
*/
public boolean isUseExternalSelection();
/** /**
* @param index * @param index
@ -109,18 +97,6 @@ public interface IADTab extends UIPart {
*/ */
public IADTabpanel getADTabpanel(int index); public IADTabpanel getADTabpanel(int index);
/**
* constant for tab placement
*/
public final int LEFT = 0;
public final int RIGHT = 1;
/**
* Set tab placement ( left or right )
* @param tabPlacement
*/
public void setTabplacement(int tabPlacement);
/** /**
* @param gTab * @param gTab
* @return IADTabpanel or null if not found * @return IADTabpanel or null if not found
@ -131,5 +107,29 @@ public interface IADTab extends UIPart {
* *
* @param abstractADWindowPanel * @param abstractADWindowPanel
*/ */
public void setADWindowPanel(AbstractADWindowPanel abstractADWindowPanel); public void setADWindowPanel(AbstractADWindowContent abstractADWindowPanel);
public void onDetailRecord();
public void onParentRecord();
public boolean isSortTab();
public boolean needSave(boolean rowChange, boolean onlyRealChange);
public void dataIgnore();
public GridTab getSelectedGridTab();
public boolean dataSave(boolean onSaveEvent);
public void setDetailPaneStatusMessage(String status, boolean error);
IADTabpanel getSelectedDetailADTabpanel();
IADTabpanel getDirtyADTabpanel();
public void updateDetailPaneToolbar(boolean changed, boolean readOnly);
public void setDetailpaneSelection(int tabIndex, int currentRow);
} }

11
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/IADTabpanel.java → org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/IADTabpanel.java
View File

@ -10,7 +10,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * * with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.panel; package org.adempiere.webui.adwindow;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.util.Evaluatee; import org.compiere.util.Evaluatee;
@ -111,4 +111,13 @@ public interface IADTabpanel extends Component, Evaluatee {
* @return true if the event is process * @return true if the event is process
*/ */
public boolean onEnterKey(); public boolean onEnterKey();
/**
* @return boolean
*/
public boolean isGridView();
public boolean isActive();
public void setDetailPaneMode(boolean detailMode, boolean vflex);
} }

90
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/StatusBar.java Normal file
View File

@ -0,0 +1,90 @@
/******************************************************************************
. * Product: Posterita Ajax UI *
* Copyright (C) 2007 Posterita Ltd. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
* For the text or an alternative of this public license, you may reach us *
* Posterita Ltd., 3, Draper Avenue, Quatre Bornes, Mauritius *
* or via info@posterita.org or http://www.posterita.org/ *
*****************************************************************************/
package org.adempiere.webui.adwindow;
import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.Panel;
import org.zkoss.zul.Cell;
import org.zkoss.zul.Div;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.Vbox;
/**
* This class is based on org.compiere.apps.StatusBar written by Jorg Janke.
* @author Jorg Janke
*
* @author <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
* @date Mar 12, 2007
* @version $Revision: 0.10 $
*/
public class StatusBar extends Panel
{
/**
*
*/
private static final long serialVersionUID = -3262889055635240201L;
private Label infoLine;
private Div west;
public StatusBar()
{
super();
init();
}
private void init()
{
Hbox hbox = new Hbox();
hbox.setWidth("100%");
hbox.setHeight("100%");
hbox.setHflex("1");
hbox.setPack("center");
Cell leftCell = new Cell();
hbox.appendChild(leftCell);
leftCell.setWidth("100%");
infoLine = new Label();
west = new Div();
west.setStyle("text-align: left; ");
west.appendChild(infoLine);
Vbox vbox = new Vbox();
vbox.setPack("center");
LayoutUtils.addSclass("status", vbox);
vbox.appendChild(west);
leftCell.appendChild(vbox);
this.appendChild(hbox);
}
/**
* Set Info Line
* @param text text
*/
public void setInfo (String text)
{
infoLine.setValue(text != null ? text : "");
infoLine.setTooltiptext(text);
infoLine.setStyle("font-weight: bold;");
} // setInfo
}

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
View File

@ -160,7 +160,8 @@ public class ProcessDialog extends Window implements EventListener<Event>, IProc
center = new Center(); center = new Center();
layout.appendChild(center); layout.appendChild(center);
center.appendChild(centerPanel); center.appendChild(centerPanel);
center.setFlex(true); centerPanel.setHflex("1");
centerPanel.setVflex("1");
center.setAutoscroll(true); center.setAutoscroll(true);
center.setStyle("border: none"); center.setStyle("border: none");
@ -460,6 +461,8 @@ public class ProcessDialog extends Window implements EventListener<Event>, IProc
messageDiv.setStyle(""); messageDiv.setStyle("");
north.setVisible(false); north.setVisible(false);
center.appendChild(messageDiv); center.appendChild(messageDiv);
messageDiv.setVflex("1");
messageDiv.setHflex("1");
invalidate(); invalidate();
Clients.response(new AuEcho(this, "onAfterProcess", null)); Clients.response(new AuEcho(this, "onAfterProcess", null));

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
View File

@ -268,9 +268,10 @@ public class WAllocation extends Allocation
center.setStyle("border: none"); center.setStyle("border: none");
// //
center = new Center(); center = new Center();
center.setFlex(true);
mainLayout.appendChild(center); mainLayout.appendChild(center);
center.appendChild(infoPanel); center.appendChild(infoPanel);
infoPanel.setHflex("1");
infoPanel.setVflex("1");
infoPanel.setStyle("border: none"); infoPanel.setStyle("border: none");
infoPanel.setWidth("100%"); infoPanel.setWidth("100%");
@ -284,9 +285,10 @@ public class WAllocation extends Allocation
north.setSplittable(true); north.setSplittable(true);
center = new Center(); center = new Center();
center.setStyle("border: none"); center.setStyle("border: none");
center.setFlex(true);
infoPanel.appendChild(center); infoPanel.appendChild(center);
center.appendChild(invoicePanel); center.appendChild(invoicePanel);
invoicePanel.setHflex("1");
invoicePanel.setVflex("1");
} // jbInit } // jbInit
/** /**

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCharge.java
View File

@ -261,10 +261,11 @@ public class WCharge extends Charge implements IFormController, EventListener
Center center = new Center(); Center center = new Center();
center.setBorder("none"); center.setBorder("none");
center.setFlex(true);
center.setAutoscroll(true); center.setAutoscroll(true);
borderlayout.appendChild(center); borderlayout.appendChild(center);
center.appendChild(m_tblData); center.appendChild(m_tblData);
m_tblData.setVflex("1");
m_tblData.setHflex("1");
South south = new South(); South south = new South();
south.setBorder("none"); south.setBorder("none");

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java
View File

@ -143,9 +143,10 @@ public class WFileImport extends ADForm implements EventListener
layout.appendChild(north); layout.appendChild(north);
north.appendChild(northPanel); north.appendChild(northPanel);
Center center = new Center(); Center center = new Center();
center.setFlex(true);
layout.appendChild(center); layout.appendChild(center);
center.appendChild(centerPanel); center.appendChild(centerPanel);
centerPanel.setVflex("1");
centerPanel.setHflex("1");
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);
south.appendChild(confirmPanel); south.appendChild(confirmPanel);

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
View File

@ -126,7 +126,8 @@ public class WGenForm extends ADForm implements EventListener, WTableModelListen
center.setStyle("border: none"); center.setStyle("border: none");
contentPane.appendChild(center); contentPane.appendChild(center);
center.appendChild(tabbedPane); center.appendChild(tabbedPane);
center.setFlex(true); tabbedPane.setVflex("1");
tabbedPane.setHflex("1");
South south = new South(); South south = new South();
south.setStyle("border: none"); south.setStyle("border: none");
contentPane.appendChild(south); contentPane.appendChild(south);
@ -178,7 +179,8 @@ public class WGenForm extends ADForm implements EventListener, WTableModelListen
Center center = new Center(); Center center = new Center();
selPanel.appendChild(center); selPanel.appendChild(center);
center.appendChild(miniTable); center.appendChild(miniTable);
center.setFlex(true); miniTable.setVflex("1");
miniTable.setHflex("1");
miniTable.setHeight("99%"); miniTable.setHeight("99%");
confirmPanelSel.addActionListener(this); confirmPanelSel.addActionListener(this);
// //

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java
View File

@ -272,7 +272,8 @@ public class WMatch extends Match
Center center = new Center(); Center center = new Center();
mainLayout.appendChild(center); mainLayout.appendChild(center);
center.appendChild(centerPanel); center.appendChild(centerPanel);
center.setFlex(true); centerPanel.setHflex("1");
centerPanel.setVflex("1");
centerLayout.setWidth("100%"); centerLayout.setWidth("100%");
centerLayout.setHeight("100%"); centerLayout.setHeight("100%");
north = new North(); north = new North();
@ -298,9 +299,10 @@ public class WMatch extends Match
center = new Center(); center = new Center();
centerLayout.appendChild(center); centerLayout.appendChild(center);
center.setStyle("border: none"); center.setStyle("border: none");
center.setFlex(false);
// center.setHeight("6%"); // center.setHeight("6%");
center.appendChild(xPanel); center.appendChild(xPanel);
xPanel.setVflex("1");
xPanel.setHflex("1");
xPanel.appendChild(sameBPartner); xPanel.appendChild(sameBPartner);
xPanel.appendChild(new Space()); xPanel.appendChild(new Space());
xPanel.appendChild(sameProduct); xPanel.appendChild(sameProduct);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java
View File

@ -251,7 +251,8 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
West west = new West(); West west = new West();
mainLayout.appendChild(west); mainLayout.appendChild(west);
west.appendChild(wfnodeTree); west.appendChild(wfnodeTree);
west.setFlex(true); wfnodeTree.setVflex("1");
wfnodeTree.setHflex("1");
west.setAutoscroll(true); west.setAutoscroll(true);
west.setWidth("30%"); west.setWidth("30%");

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java
View File

@ -228,7 +228,8 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener
mainLayout.appendChild(center); mainLayout.appendChild(center);
center.appendChild(dataPane); center.appendChild(dataPane);
dataPane.appendChild(tableBOM); dataPane.appendChild(tableBOM);
center.setFlex(true); dataPane.setHflex("1");
dataPane.setVflex("1");
center.setAutoscroll(true); center.setAutoscroll(true);
} }

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeMaintenance.java
View File

@ -169,7 +169,8 @@ public class WTreeMaintenance extends TreeMaintenance implements IFormController
Center center = new Center(); Center center = new Center();
mainLayout.appendChild(center); mainLayout.appendChild(center);
center.appendChild(centerTree); center.appendChild(centerTree);
center.setFlex(true); centerTree.setVflex("1");
centerTree.setHflex("1");
center.setAutoscroll(true); center.setAutoscroll(true);
East east = new East(); East east = new East();

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java
View File

@ -21,6 +21,7 @@ import java.util.Properties;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.webui.LayoutUtils; import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.adwindow.ADTabpanel;
import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.ConfirmPanel;
import org.adempiere.webui.component.Grid; import org.adempiere.webui.component.Grid;
@ -36,7 +37,6 @@ import org.adempiere.webui.editor.WTableDirEditor;
import org.adempiere.webui.event.ValueChangeEvent; import org.adempiere.webui.event.ValueChangeEvent;
import org.adempiere.webui.event.ValueChangeListener; import org.adempiere.webui.event.ValueChangeListener;
import org.adempiere.webui.panel.ADForm; import org.adempiere.webui.panel.ADForm;
import org.adempiere.webui.panel.ADTabpanel;
import org.adempiere.webui.panel.CustomForm; import org.adempiere.webui.panel.CustomForm;
import org.adempiere.webui.panel.IFormController; import org.adempiere.webui.panel.IFormController;
import org.adempiere.webui.panel.StatusBarPanel; import org.adempiere.webui.panel.StatusBarPanel;
@ -212,8 +212,9 @@ public class WTrxMaterial extends TrxMaterial
m_gridController.switchRowPresentation(); m_gridController.switchRowPresentation();
Center center = new Center(); Center center = new Center();
mainLayout.appendChild(center); mainLayout.appendChild(center);
center.setFlex(true);
center.appendChild(m_gridController); center.appendChild(m_gridController);
m_gridController.setVflex("1");
m_gridController.setHflex("1");
} // dynInit } // dynInit

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WFPanel.java
View File

@ -108,7 +108,6 @@ public class WFPanel extends Borderlayout implements EventListener
center.appendChild(table); center.appendChild(table);
contentPanel.setStyle("width: 100%; heigh: 100%;"); contentPanel.setStyle("width: 100%; heigh: 100%;");
center.setAutoscroll(true); center.setAutoscroll(true);
center.setFlex(false);
South south = new South(); South south = new South();
this.appendChild(south); this.appendChild(south);
@ -120,7 +119,8 @@ public class WFPanel extends Borderlayout implements EventListener
south.setSplittable(true); south.setSplittable(true);
south.setCollapsible(true); south.setCollapsible(true);
south.setAutoscroll(true); south.setAutoscroll(true);
south.setFlex(true); div.setVflex("1");
div.setHflex("1");
} // jbInit } // jbInit
private void createTable() { private void createTable() {

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java
View File

@ -243,7 +243,8 @@ public class WWFActivity extends ADForm implements EventListener
North north = new North(); North north = new North();
north.appendChild(listbox); north.appendChild(listbox);
north.setSplittable(true); north.setSplittable(true);
north.setFlex(true); listbox.setVflex("1");
listbox.setHflex("1");
north.setHeight("50%"); north.setHeight("50%");
layout.appendChild(north); layout.appendChild(north);
north.setStyle("background-color: transparent"); north.setStyle("background-color: transparent");
@ -253,7 +254,8 @@ public class WWFActivity extends ADForm implements EventListener
center.appendChild(grid); center.appendChild(grid);
layout.appendChild(center); layout.appendChild(center);
center.setStyle("background-color: transparent"); center.setStyle("background-color: transparent");
center.setFlex(true); grid.setVflex("1");
grid.setHflex("1");
South south = new South(); South south = new South();
south.appendChild(statusBar); south.appendChild(statusBar);

179
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADButtonTabList.java
View File

@ -1,179 +0,0 @@
/******************************************************************************
* Copyright (C) 2008 Low Heng Sin *
* Copyright (C) 2009 Idalica Corporation *
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/
package org.adempiere.webui.component;
import java.util.ArrayList;
import java.util.List;
import org.adempiere.webui.AdempiereIdGenerator;
import org.adempiere.webui.component.ADTabListModel.ADTabLabel;
import org.zkoss.zhtml.Button;
import org.zkoss.zhtml.Text;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
/**
*
* @author <a href="mailto:hengsin@gmail.com">Low Heng Sin</a>
*
*/
public class ADButtonTabList extends Panel implements IADTabList, EventListener {
/**
*
*/
private static final long serialVersionUID = -9203013067784673646L;
private List<ADTabLabel> listItems = new ArrayList<ADTabLabel>();
private List<EventListener> listeners = new ArrayList<EventListener>();
private IADTab tabbox;
private int selectedIndex = 0;
private int tabPlacement = IADTab.LEFT;
public ADButtonTabList() {
this.setStyle("margin:0;padding:0");
}
/**
* Set tab placement ( left or right )
* @param tabPlacement
*/
public void setTabplacement(int tabPlacement) {
if (tabPlacement != IADTab.LEFT && tabPlacement != IADTab.RIGHT)
return;
else if (tabPlacement == this.tabPlacement)
return;
else {
this.tabPlacement = tabPlacement;
this.invalidate();
}
}
public synchronized void refresh() {
List<?> childs = getChildren();
int childCount = childs.size();
for (int c = childCount - 1; c >=0; c--) {
removeChild((Component) childs.get(c));
}
Object[] items = listItems.toArray();
int tabWidth = 100;
List<Button> btnList = new ArrayList<Button>();
for (int i = 0; i < items.length; i++) {
ADTabLabel tabLabel = (ADTabLabel) items[i];
Button button = new Button();
button.setDynamicProperty("Title", tabLabel.description);
button.setAttribute(AdempiereIdGenerator.ZK_COMPONENT_PREFIX_ATTRIBUTE, "unqADButtonTab_" + tabLabel.windowNo + "_" + i);
Text text = new Text(tabLabel.label);
text.setAttribute("ad_tab_id", tabLabel.AD_Tab_ID);
button.appendChild(text);
int s = tabbox.getSelectedIndex();
if ( s == i) {
button.setSclass("adwindow-navbtn-sel " + (tabPlacement == IADTab.LEFT ? "adwindow-left-navbtn-sel" : "adwindow-right-navbtn-sel"));
button.setDynamicProperty("disabled", null);
} else {
if (!tabbox.canNavigateTo(s, i)) {
button.setDynamicProperty("disabled", "disabled");
button.setSclass("adwindow-navbtn-dis " + (tabPlacement == IADTab.LEFT ? "adwindow-left-navbtn-dis" : "adwindow-right-navbtn-dis"));
if (!tabbox.isDisplay(i))
button.setVisible(false);
else
button.setVisible(true);
} else {
button.setDynamicProperty("disabled", null);
button.setSclass("adwindow-navbtn-uns " + (tabPlacement == IADTab.LEFT ? "adwindow-left-navbtn-uns" : "adwindow-right-navbtn-uns"));
button.setVisible(true);
}
}
String style = (tabPlacement == IADTab.LEFT ? "margin-left:" : "margin-right:") + (tabLabel.tabLevel*15+5) + "px";
if (button.isVisible()) {
int width = tabLabel.label.length() * 10 + 20;
if (width > tabWidth)
tabWidth = width;
}
btnList.add(button);
button.setStyle(style);
button.setParent(this);
button.addEventListener(Events.ON_CLICK, this);
if (i == 0) {
button.setSclass(button.getSclass() + " " + "adwindow-navbtn-first");
}
}
//set width
if (tabWidth > 190)
tabWidth = 190;
for (int i = 0; i < items.length; i++) {
ADTabLabel tabLabel = (ADTabLabel) items[i];
Button button = btnList.get(i);
if (!button.isVisible())
continue;
String width = (tabWidth - tabLabel.tabLevel*15)+"px";
button.setStyle(button.getStyle() + "; display: block; width:" + width);
}
}
public int getSelectedIndex() {
return selectedIndex;
}
public void setSelectedIndex(int index) {
this.selectedIndex = index;
}
public synchronized void setItems(List<ADTabLabel> listItems) {
this.listItems = listItems;
refresh();
}
public void setADTab(IADTab adTab) {
this.tabbox = adTab;
}
public void addSelectionEventListener(EventListener listener) {
listeners.add(listener);
}
public boolean removeSelectionEventListener(EventListener listener) {
return listeners.remove(listener);
}
public void onEvent(Event event) throws Exception {
Event selectEvent = new Event(Events.ON_SELECT, this);
Button button = (Button) event.getTarget();
int i = 0;
for (ADTabLabel tabLabel : listItems) {
Text text = (Text) button.getFirstChild();
if (tabLabel.label.equals(text.getValue())) {
if (text.getAttribute("ad_tab_id") == null) {
break;
}
Integer tabId = (Integer) text.getAttribute("ad_tab_id");
if (tabLabel.AD_Tab_ID == tabId) {
break;
}
}
i++;
}
selectedIndex = i;
for (EventListener listener : listeners) {
listener.onEvent(selectEvent);
}
}
}

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ADTabListModel.java
View File

@ -14,6 +14,7 @@ package org.adempiere.webui.component;
import java.util.List; import java.util.List;
import org.adempiere.webui.adwindow.IADTabbox;
import org.zkoss.zul.AbstractListModel; import org.zkoss.zul.AbstractListModel;
import org.zkoss.zul.Listbox; import org.zkoss.zul.Listbox;
import org.zkoss.zul.Listcell; import org.zkoss.zul.Listcell;
@ -28,9 +29,9 @@ public class ADTabListModel extends AbstractListModel implements ListitemRendere
*/ */
private static final long serialVersionUID = 7683969121090679214L; private static final long serialVersionUID = 7683969121090679214L;
List<ADTabLabel> listItems = null; List<ADTabLabel> listItems = null;
private IADTab tabbox; private IADTabbox tabbox;
public ADTabListModel(List<ADTabLabel> listItems, IADTab tabbox) { public ADTabListModel(List<ADTabLabel> listItems, IADTabbox tabbox) {
this.listItems = listItems; this.listItems = listItems;
this.tabbox = tabbox; this.tabbox = tabbox;
} }

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Accordion.java
View File

@ -54,8 +54,7 @@ public class Accordion extends Borderlayout implements EventListener {
north.setCollapsible(false); north.setCollapsible(false);
Center center = new Center(); Center center = new Center();
center.setFlex(true); appendChild(center);
appendChild(new Center());
South south = new South(); South south = new South();
appendChild(south); appendChild(south);

162
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/CompositeADTab.java
View File

@ -1,162 +0,0 @@
/******************************************************************************
* Product: Posterita Ajax UI *
* Copyright (C) 2007 Posterita Ltd. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
* For the text or an alternative of this public license, you may reach us *
* Posterita Ltd., 3, Draper Avenue, Quatre Bornes, Mauritius *
* or via info@posterita.org or http://www.posterita.org/ *
*****************************************************************************/
package org.adempiere.webui.component;
import java.util.ArrayList;
import java.util.List;
import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.panel.IADTabpanel;
import org.compiere.model.DataStatusEvent;
import org.compiere.model.GridTab;
import org.compiere.util.CLogger;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zul.Div;
/**
*
* @author <a href="mailto:agramdass@gmail.com">Ashley G Ramdass</a>
* @author <a href="mailto:hengsin@gmail.com">Low Heng Sin</a>
* @date Feb 25, 2007
* @version $Revision: 0.10 $
*/
public class CompositeADTab extends AbstractADTab
{
/** Logger */
@SuppressWarnings("unused")
private static CLogger log = CLogger.getCLogger (CompositeADTab.class);
private List<ADTabListModel.ADTabLabel> tabLabelList = new ArrayList<ADTabListModel.ADTabLabel>();
private Div div;
protected ADButtonTabList tabList;
public CompositeADTab()
{
tabList = new ADButtonTabList();
tabList.setADTab(this);
}
protected Component doCreatePart(Component parent)
{
div= new Div();
if (parent != null) {
div.setParent(parent);
LayoutUtils.addSclass("adtab-body", div);
} else {
div.setPage(page);
}
return div;
}
@Override
protected void doAddTab(GridTab gTab, IADTabpanel tabPanel) {
tabPanel.setParent(div);
tabPanel.setVisible(false);
ADTabListModel.ADTabLabel tabLabel = new ADTabListModel.ADTabLabel(gTab.getName(), gTab.getTabLevel(),gTab.getDescription(),
gTab.getWindowNo(),gTab.getAD_Tab_ID());
tabLabelList.add(tabLabel);
}
/**
* Evaluate Tab Logic
* @param e event
*/
public void evaluate (DataStatusEvent e)
{
tabList.setItems(tabLabelList);
super.evaluate(e);
} // evaluate
@Override
protected void updateTabState() {
tabList.refresh();
}
/**
* Return the selected Tab Panel
*/
public IADTabpanel getSelectedTabpanel()
{
for(int i = 0; i < tabPanelList.size(); i++) {
if (tabPanelList.get(i).isVisible())
return tabPanelList.get(i);
}
return null;
}
public int getSelectedIndex() {
for(int i = 0; i < tabPanelList.size(); i++) {
if (tabPanelList.get(i).isVisible())
return i;
}
return -1;
}
public void addSelectionEventListener(EventListener listener) {
tabList.addSelectionEventListener(listener);
}
public Component getTabSelectionComponent() {
return tabList;
}
@Override
protected void doTabSelectionChanged(int oldIndex, int newIndex) {
IADTabpanel oldTabpanel = oldIndex >= 0 ? tabPanelList.get(oldIndex) : null;
IADTabpanel newTabpanel = tabPanelList.get(newIndex);
if (oldTabpanel != null) {
oldTabpanel.setVisible(false);
}
newTabpanel.createUI();
newTabpanel.setVisible(true);
if (tabList.getSelectedIndex() != newIndex)
tabList.setSelectedIndex(newIndex);
}
public boolean isUseExternalSelection() {
return true;
}
public Component getComponent() {
return div;
}
/**
* @param tabPlacement
*/
public void setTabplacement(int tabPlacement) {
tabList.setTabplacement(tabPlacement);
}
@Override
public IADTabpanel findADTabpanel(GridTab gTab) {
for (IADTabpanel tabpanel : tabPanelList) {
if (tabpanel.getGridTab() == gTab) {
return tabpanel;
}
}
return null;
}
}

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/FolderBrowser.java
View File

@ -90,9 +90,10 @@ public class FolderBrowser extends Window implements EventListener
north.appendChild(txtPath); north.appendChild(txtPath);
Center center = new Center(); Center center = new Center();
center.setFlex(true);
contentLayout.appendChild(center); contentLayout.appendChild(center);
center.appendChild(listDir); center.appendChild(listDir);
listDir.setVflex("1");
listDir.setHflex("1");
South south = new South(); South south = new South();
south.setStyle("border: none"); south.setStyle("border: none");

418
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/GridTabListItemRenderer.java
View File

@ -1,418 +0,0 @@
/******************************************************************************
* Copyright (C) 2008 Low Heng Sin *
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/
package org.adempiere.webui.component;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.adempiere.webui.component.ListPanel;
import org.adempiere.webui.editor.WButtonEditor;
import org.adempiere.webui.editor.WEditor;
import org.adempiere.webui.editor.WEditorPopupMenu;
import org.adempiere.webui.editor.WebEditorFactory;
import org.adempiere.webui.event.ContextMenuListener;
import org.adempiere.webui.panel.AbstractADWindowPanel;
import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.util.GridTabDataBinder;
import org.adempiere.webui.window.ADWindow;
import org.compiere.model.GridField;
import org.compiere.model.GridTab;
import org.compiere.util.DisplayType;
import org.compiere.util.NamePair;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Image;
import org.zkoss.zul.Listbox;
import org.zkoss.zul.Listcell;
import org.zkoss.zul.Listitem;
import org.zkoss.zul.ListitemRenderer;
import org.zkoss.zul.ListitemRendererExt;
import org.zkoss.zul.Paging;
import org.zkoss.zul.RendererCtrl;
/**
* ListItem renderer for GridTab list box.
* @author hengsin
*
*/
public class GridTabListItemRenderer implements ListitemRenderer, ListitemRendererExt, RendererCtrl {
private static final int MAX_TEXT_LENGTH = 60;
private GridTab gridTab;
private int windowNo;
private GridTabDataBinder dataBinder;
private Map<GridField, WEditor> editors = new HashMap<GridField, WEditor>();
private Paging paging;
private ListPanel listPanel;
/**
*
* @param gridTab
* @param windowNo
*/
public GridTabListItemRenderer(GridTab gridTab, int windowNo) {
this.gridTab = gridTab;
this.windowNo = windowNo;
this.dataBinder = new GridTabDataBinder(gridTab);
}
/**
* @param listitem
* @param data
* @see ListitemRenderer#render(Listitem, Object)
*/
@Override
public void render(Listitem listitem, Object data, int index) throws Exception {
//don't render if not visible
if (listPanel != null && !listPanel.isVisible()) {
return;
}
GridField[] listPanelFields = listPanel.getFields();
int columnCount = listPanelFields.length;
GridField[] gridTabFields = gridTab.getFields();
boolean isGridViewCustomized = gridTabFields.length != listPanelFields.length;
if (!isGridViewCustomized) {
for(int i = 0; i < gridTabFields.length; i++) {
if (listPanelFields[i].getAD_Field_ID() != gridTabFields[i].getAD_Field_ID()) {
isGridViewCustomized = true;
break;
}
}
}
for(Component c = listitem.getParent(); c != null; c = c.getParent()) {
if (!c.isVisible())
return;
}
Object[] values = null;
if (!isGridViewCustomized) {
values = (Object[])data;
} else {
List<Object> dataList = new ArrayList<Object>();
for(GridField gridField : listPanelFields) {
for(int i = 0; i < gridTabFields.length; i++) {
if (gridField.getAD_Field_ID() == gridTabFields[i].getAD_Field_ID()) {
dataList.add(((Object[])data)[i]);
break;
}
}
}
values = dataList.toArray(new Object[0]);
}
for (int i = 0; i < columnCount; i++) {
if (!listPanelFields[i].isDisplayedGrid()) {
continue;
}
if (editors.get(listPanelFields[i]) == null)
editors.put(listPanelFields[i], WebEditorFactory.getEditor(listPanelFields[i], true));
int rowIndex = listitem.getIndex();
if (paging != null && paging.getPageSize() > 0) {
rowIndex = (paging.getActivePage() * paging.getPageSize()) + rowIndex;
}
Listcell cell = null;
if (rowIndex == gridTab.getCurrentRow() && listPanelFields[i].isEditable(true)) {
cell = getEditorCell(listPanelFields[i], values[i], i);
cell.setParent(listitem);
} else {
if (listPanelFields[i].getDisplayType() == DisplayType.YesNo) {
cell = new Listcell("", null);
cell.setParent(listitem);
cell.setStyle("text-align:center");
createReadonlyCheckbox(values[i], cell);
} else {
String text = getDisplayText(values[i], i);
String display = text;
if (text != null && text.length() > MAX_TEXT_LENGTH)
display = text.substring(0, MAX_TEXT_LENGTH - 3) + "...";
cell = new Listcell(display, null);
cell.setParent(listitem);
if (text != null && text.length() > MAX_TEXT_LENGTH)
cell.setTooltiptext(text);
if (DisplayType.isNumeric(listPanelFields[i].getDisplayType())) {
cell.setStyle("text-align:right");
} else if (listPanelFields[i].getDisplayType() == DisplayType.Image) {
cell.setStyle("text-align:center");
}
}
}
CellListener listener = new CellListener((Listbox) listitem.getParent());
cell.addEventListener(Events.ON_DOUBLE_CLICK, listener);
}
}
private void createReadonlyCheckbox(Object value, Listcell cell) {
Checkbox checkBox = new Checkbox();
if (value != null && "true".equalsIgnoreCase(value.toString()))
checkBox.setChecked(true);
else
checkBox.setChecked(false);
checkBox.setDisabled(true);
checkBox.setParent(cell);
}
private Listcell getEditorCell(GridField gridField, Object object, int i) {
Listcell cell = new Listcell("", null);
WEditor editor = editors.get(gridField);
if (editor != null) {
if (editor instanceof WButtonEditor)
{
Object window = SessionManager.getAppDesktop().findWindow(windowNo);
if (window != null && window instanceof ADWindow)
{
AbstractADWindowPanel windowPanel = ((ADWindow)window).getADWindowPanel();
((WButtonEditor)editor).addActionListener(windowPanel);
}
}
else
{
editor.addValueChangeListener(dataBinder);
}
cell.appendChild(editor.getComponent());
if (editor.getComponent() instanceof Checkbox || editor.getComponent() instanceof Image) {
cell.setStyle("text-align:center");
}
else if (DisplayType.isNumeric(gridField.getDisplayType())) {
cell.setStyle("text-align:right");
}
gridField.addPropertyChangeListener(editor);
editor.setValue(gridField.getValue());
WEditorPopupMenu popupMenu = editor.getPopupMenu();
if (popupMenu != null)
{
popupMenu.addMenuListener((ContextMenuListener)editor);
cell.appendChild(popupMenu);
}
//streach component to fill grid cell
editor.fillHorizontal();
}
return cell;
}
/**
* Detach all editor and optionally set the current value of the editor as cell label.
* @param updateCellLabel
*/
public void stopEditing(boolean updateCellLabel) {
for (Entry<GridField, WEditor> entry : editors.entrySet()) {
if (entry.getValue().getComponent().getParent() != null) {
if (updateCellLabel) {
Listcell cell = (Listcell) entry.getValue().getComponent().getParent();
if (entry.getKey().getDisplayType() == DisplayType.YesNo) {
cell.setLabel("");
createReadonlyCheckbox(entry.getValue().getValue(), cell);
} else {
cell.setLabel(getDisplayText(entry.getValue().getValue(), getColumnIndex(entry.getKey())));
}
}
entry.getValue().getComponent().detach();
entry.getKey().removePropertyChangeListener(entry.getValue());
entry.getValue().removeValuechangeListener(dataBinder);
}
}
}
private int getColumnIndex(GridField field) {
GridField[] fields = listPanel.getFields();
for(int i = 0; i < fields.length; i++) {
if (fields[i] == field)
return i;
}
return 0;
}
/**
* @see ListitemRendererExt#getControls()
*/
public int getControls() {
return DETACH_ON_RENDER;
}
/**
* @param item
* @see ListitemRendererExt#newListcell(Listitem)
*/
public Listcell newListcell(Listitem item) {
ListCell listCell = new ListCell();
listCell.applyProperties();
listCell.setParent(item);
return listCell;
}
/**
* @param listbox
* @see ListitemRendererExt#newListitem(Listbox)
*/
public Listitem newListitem(Listbox listbox) {
ListItem item = new ListItem();
item.applyProperties();
return item;
}
private Map<Integer, Map<Object, String>> lookupCache = null;
private String getDisplayText(Object value, int columnIndex)
{
if (value == null)
return "";
GridField[] gridField = listPanel.getFields();
if (gridField[columnIndex].isEncryptedField())
{
return "********";
}
else if (gridField[columnIndex].isLookup())
{
if (value == null) return "";
if (lookupCache != null)
{
Map<Object, String> cache = lookupCache.get(columnIndex);
if (cache != null && cache.size() >0)
{
String text = cache.get(value);
if (text != null)
{
return text;
}
}
}
NamePair namepair = gridField[columnIndex].getLookup().get(value);
if (namepair != null)
{
String text = namepair.getName();
if (lookupCache != null)
{
Map<Object, String> cache = lookupCache.get(columnIndex);
if (cache == null)
{
cache = new HashMap<Object, String>();
lookupCache.put(columnIndex, cache);
}
cache.put(value, text);
}
return text;
}
else
return "";
}
else if (DisplayType.getClass(gridField[columnIndex].getDisplayType(), false).equals(Timestamp.class))
{
SimpleDateFormat dateFormat = DisplayType.getDateFormat(DisplayType.Date);
return dateFormat.format((Timestamp)value);
}
else if (DisplayType.isNumeric(gridField[columnIndex].getDisplayType()))
{
return DisplayType.getNumberFormat(gridField[columnIndex].getDisplayType()).format(value);
}
else if (DisplayType.Button == gridField[columnIndex].getDisplayType())
{
return "";
}
else if (DisplayType.Image == gridField[columnIndex].getDisplayType())
{
if (value == null || (Integer)value <= 0)
return "";
else
return "...";
}
else
return value.toString();
}
class CellListener implements EventListener {
private Listbox _listbox;
public CellListener(Listbox listbox) {
_listbox = listbox;
}
public void onEvent(Event event) throws Exception {
if (Events.ON_DOUBLE_CLICK.equals(event.getName())) {
Event evt = new Event(Events.ON_DOUBLE_CLICK, _listbox);
Events.sendEvent(_listbox, evt);
}
}
}
/**
* Is renderer initialize
* @return boolean
*/
public boolean isInitialize() {
return !editors.isEmpty();
}
/**
*
* @return active editor list
*/
public List<WEditor> getEditors() {
List<WEditor> editorList = new ArrayList<WEditor>();
if (!editors.isEmpty())
editorList.addAll(editors.values());
return editorList;
}
/**
* @param paging
*/
public void setPaging(Paging paging) {
this.paging = paging;
}
/**
* @see RendererCtrl#doCatch(Throwable)
*/
public void doCatch(Throwable ex) throws Throwable {
lookupCache = null;
}
/**
* @see RendererCtrl#doFinally()
*/
public void doFinally() {
lookupCache = null;
}
/**
* @see RendererCtrl#doTry()
*/
public void doTry() {
lookupCache = new HashMap<Integer, Map<Object,String>>();
}
public void setListPanel(ListPanel listPanel) {
this.listPanel = listPanel;
}
public ListPanel getListPanel() {
return listPanel;
}
}

16
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/IADTabList.java
View File

@ -1,16 +0,0 @@
package org.adempiere.webui.component;
/**
*
* @author <a href="mailto:hengsin@gmail.com">Low Heng Sin</a>
*
*/
public interface IADTabList {
int getSelectedIndex();
void setSelectedIndex(int curTabIndex);
void refresh();
}

484
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ListPanel.java
View File

@ -1,484 +0,0 @@
/******************************************************************************
* Copyright (C) 2008 Low Heng Sin *
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/
package org.adempiere.webui.component;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.swing.table.AbstractTableModel;
import org.adempiere.model.MTabCustomization;
import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.editor.WEditor;
import org.compiere.model.GridField;
import org.compiere.model.GridTab;
import org.compiere.model.GridTable;
import org.compiere.model.MSysConfig;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center;
import org.zkoss.zul.South;
import org.zkoss.zul.Paging;
import org.zkoss.zul.event.ZulEvents;
/**
* Grid view implemented using the Listbox component
* @author Low Heng Sin
*
*/
public class ListPanel extends Borderlayout implements EventListener
{
/**
*
*/
private static final long serialVersionUID = 4145737989132101461L;
private static final int MIN_COLUMN_WIDTH = 100;
private static final int MAX_COLUMN_WIDTH = 300;
private Listbox listbox = null;
private int pageSize = 100;
private GridField[] gridField;
private AbstractTableModel tableModel;
private int numColumns = 5;
private int windowNo;
private GridTab gridTab;
private boolean init;
private GridTableListModel listModel;
private Paging paging;
private GridTabListItemRenderer renderer;
private South south;
private Map<Integer, String> columnWidthMap;
public ListPanel()
{
this(0);
}
/**
* @param windowNo
*/
public ListPanel(int windowNo)
{
this.windowNo = windowNo;
listbox = new Listbox();
south = new South();
this.appendChild(south);
//default paging size
pageSize = MSysConfig.getIntValue(MSysConfig.ZK_PAGING_SIZE, 100);
}
/**
*
* @param gridTab
*/
public void init(GridTab gridTab)
{
if (init) return;
setupFields(gridTab);
setupColumns();
render();
updateListIndex(true);
this.init = true;
}
private void setupFields(GridTab gridTab) {
this.gridTab = gridTab;
tableModel = gridTab.getTableModel();
GridField[] tmpFields = ((GridTable)tableModel).getFields();
MTabCustomization tabCustomization = MTabCustomization.get(Env.getCtx(), Env.getAD_User_ID(Env.getCtx()), gridTab.getAD_Tab_ID(), null);
if (tabCustomization != null && tabCustomization.getAD_Tab_Customization_ID() > 0
&& tabCustomization.getCustom() != null && tabCustomization.getCustom().trim().length() > 0) {
String custom = tabCustomization.getCustom().trim();
String[] customComponent = custom.split(";");
String[] fieldIds = customComponent[0].split("[,]");
List<GridField> fieldList = new ArrayList<GridField>();
for(String fieldIdStr : fieldIds) {
fieldIdStr = fieldIdStr.trim();
if (fieldIdStr.length() == 0) continue;
int AD_Field_ID = Integer.parseInt(fieldIdStr);
for(GridField gridField : tmpFields) {
if (gridField.getAD_Field_ID() == AD_Field_ID) {
fieldList.add(gridField);
break;
}
}
}
gridField = fieldList.toArray(new GridField[0]);
if (customComponent.length == 2) {
String[] widths = customComponent[1].split("[,]");
for(int i = 0; i< gridField.length; i++) {
columnWidthMap.put(gridField[i].getAD_Field_ID(), widths[i]);
}
}
} else {
gridField = tmpFields;
}
numColumns = gridField.length;
}
/**
*
* @return boolean
*/
public boolean isInit() {
return init;
}
/**
*
* @param gridTab
*/
public void activate(GridTab gridTab) {
if (isInit())
{
if (this.gridTab != gridTab)
{
init = false;
init(gridTab);
}
else
{
if (renderer != null)
renderer.stopEditing(false);
int oldSelected = listbox.getSelectedIndex();
updateListIndex(false);
if (listbox.getSelectedIndex() == oldSelected && oldSelected >= 0)
listModel.updateComponent(oldSelected);
}
}
else
init(gridTab);
}
/**
*
* @param gridTab
*/
public void refresh(GridTab gridTab) {
if (this.gridTab != gridTab)
{
init = false;
init(gridTab);
}
else
{
renderer.stopEditing(false);
listbox.setModel(listModel);
updateListIndex(true);
}
}
/**
* Update listbox selection to sync with grid current row pointer changes
*/
public void updateListIndex() {
updateListIndex(false);
}
/**
* Update listbox selection to sync with grid current row pointer changes
* @param updateSelectionOnly if true, doesn't attempt to refresh current row from model
*/
public void updateListIndex(boolean updateSelectionOnly) {
int rowIndex = gridTab.isOpen() ? gridTab.getCurrentRow() : -1;
if (pageSize > 0) {
if (paging.getTotalSize() != gridTab.getRowCount())
paging.setTotalSize(gridTab.getRowCount());
int pgIndex = rowIndex % pageSize;
int pgNo = (rowIndex - pgIndex) / pageSize;
boolean pgChange = false;
if (listModel.getPage() != pgNo) {
listModel.setPage(pgNo);
pgChange = true;
}
if (paging.getActivePage() != pgNo) {
paging.setActivePage(pgNo);
}
if (listbox.getSelectedIndex() != pgIndex) {
if (!updateSelectionOnly) {
renderer.stopEditing(false);
if (!pgChange) {
listModel.updateComponent(listbox.getSelectedIndex());
}
listModel.updateComponent(pgIndex);
}
listbox.setSelectedIndex(pgIndex);
}
} else {
if (listbox.getSelectedIndex() != rowIndex) {
if (!updateSelectionOnly) {
renderer.stopEditing(false);
listModel.updateComponent(listbox.getSelectedIndex());
listModel.updateComponent(rowIndex);
}
listbox.setSelectedIndex(rowIndex);
}
}
}
/**
* Set paging size
* @param pageSize
*/
public void setPageSize(int pageSize)
{
this.pageSize = pageSize;
}
public void clear()
{
this.getChildren().clear();
}
/**
*
* @param bool
*/
public void showGrid(boolean bool)
{
if (bool)
this.setVisible(true);
else
this.setVisible(false);
}
private void setupColumns()
{
if (init) return;
ListHead header = new ListHead();
header.setSizable(true);
Map<Integer, String> colnames = new HashMap<Integer, String>();
int index = 0;
for (int i = 0; i < numColumns; i++)
{
if (gridField[i].isDisplayed())
{
colnames.put(index, gridField[i].getHeader());
index++;
ListHeader colHeader = new ListHeader();
colHeader.setSort("auto");
colHeader.setLabel(gridField[i].getHeader());
if (columnWidthMap != null && columnWidthMap.get(gridField[i].getAD_Field_ID()) != null) {
colHeader.setWidth(columnWidthMap.get(gridField[i].getAD_Field_ID()));
} else {
int l = DisplayType.isNumeric(gridField[i].getDisplayType())
? 100 : gridField[i].getDisplayLength() * 9;
if (gridField[i].getHeader().length() * 9 > l)
l = gridField[i].getHeader().length() * 9;
if (l > MAX_COLUMN_WIDTH)
l = MAX_COLUMN_WIDTH;
else if ( l < MIN_COLUMN_WIDTH)
l = MIN_COLUMN_WIDTH;
colHeader.setWidth(Integer.toString(l) + "px");
}
header.appendChild(colHeader);
}
}
listbox.appendChild(header);
}
private void render()
{
LayoutUtils.addSclass("adtab-grid-panel", this);
listbox.setVflex(true);
listbox.setFixedLayout(true);
listbox.addEventListener(Events.ON_SELECT, this);
LayoutUtils.addSclass("adtab-grid", listbox);
updateModel();
Center center = new Center();
center.appendChild(listbox);
this.appendChild(center);
if (pageSize > 0)
{
paging = new Paging();
paging.setPageSize(pageSize);
paging.setTotalSize(tableModel.getRowCount());
paging.setDetailed(true);
south.appendChild(paging);
paging.addEventListener(ZulEvents.ON_PAGING, this);
renderer.setPaging(paging);
this.getParent().invalidate();
}
else
{
south.setVisible(false);
}
}
private void updateModel() {
listModel = new GridTableListModel((GridTable)tableModel, windowNo);
listModel.setPageSize(pageSize);
if (renderer != null)
renderer.stopEditing(false);
renderer = new GridTabListItemRenderer(gridTab, windowNo);
listbox.setItemRenderer(renderer);
listbox.setModel(listModel);
}
/**
* deactive panel
*/
public void deactivate() {
if (renderer != null)
renderer.stopEditing(false);
}
public void onEvent(Event event) throws Exception
{
if (event == null)
return;
else if (event.getTarget() == listbox)
{
int index = listbox.getSelectedIndex();
onSelectedRowChange(index);
}
else if (event.getTarget() == paging)
{
int pgNo = paging.getActivePage();
if (pgNo != listModel.getPage())
{
listbox.clearSelection();
listModel.setPage(pgNo);
listbox.setSelectedIndex(0);
onSelectedRowChange(0);
}
}
}
private void onSelectedRowChange(int index) {
if (updateModelIndex()) {
listModel.updateComponent(index);
listbox.setSelectedIndex(index);
} else if (!renderer.isInitialize()) {
listModel.updateComponent(index);
listbox.setSelectedIndex(index);
}
}
private boolean updateModelIndex() {
int rowIndex = listbox.getSelectedIndex();
if (pageSize > 0) {
int start = listModel.getPage() * listModel.getPageSize();
rowIndex = start + rowIndex;
}
if (gridTab.getCurrentRow() != rowIndex) {
renderer.stopEditing(true);
gridTab.navigate(rowIndex);
return true;
}
return false;
}
/**
*
* @return Listbox
*/
public Listbox getListbox() {
return listbox;
}
/**
* validate the display properties of fields of current row
* @param col
*/
public void dynamicDisplay(int col) {
if (!gridTab.isOpen())
{
return;
}
// Selective
if (col > 0)
return;
boolean noData = gridTab.getRowCount() == 0;
List<WEditor> list = renderer.getEditors();
for (WEditor comp : list)
{
GridField mField = comp.getGridField();
if (mField != null && mField.getIncluded_Tab_ID() <= 0)
{
if (noData)
{
comp.setReadWrite(false);
}
else
{
comp.dynamicDisplay();
boolean rw = mField.isEditable(true); // r/w - check Context
comp.setReadWrite(rw);
}
}
} // all components
}
/**
*
* @param windowNo
*/
public void setWindowNo(int windowNo) {
this.windowNo = windowNo;
}
public void reInit() {
this.setupFields(gridTab);
if (listbox.getListHead() != null) {
listbox.removeChild(listbox.getListHead());
}
init = false;
setupColumns();
init = true;
updateModel();
}
public GridField[] getFields() {
return gridField;
}
}

30
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
View File

@ -24,15 +24,13 @@ import java.text.ParseException;
import org.adempiere.webui.LayoutUtils; import org.adempiere.webui.LayoutUtils;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.zkoss.zhtml.Table;
import org.zkoss.zhtml.Td;
import org.zkoss.zhtml.Tr;
import org.zkoss.zk.ui.Page; import org.zkoss.zk.ui.Page;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Decimalbox; import org.zkoss.zul.Decimalbox;
import org.zkoss.zul.Div; import org.zkoss.zul.Div;
import org.zkoss.zul.Hbox; import org.zkoss.zul.Hbox;
import org.zkoss.zul.Hlayout;
import org.zkoss.zul.Popup; import org.zkoss.zul.Popup;
import org.zkoss.zul.Vbox; import org.zkoss.zul.Vbox;
@ -75,35 +73,23 @@ public class NumberBox extends Div
private void init() private void init()
{ {
Table grid = new Table(); Hlayout hlayout = new Hlayout();
appendChild(grid); hlayout.setHflex("1");
grid.setStyle("border: none; padding: 0px; margin: 0px;"); appendChild(hlayout);
grid.setDynamicProperty("border", "0");
grid.setDynamicProperty("cellpadding", "0");
grid.setDynamicProperty("cellspacing", "0");
Tr tr = new Tr();
grid.appendChild(tr);
tr.setStyle("border: none; padding: 0px; margin: 0px; white-space:nowrap; ");
Td td = new Td();
tr.appendChild(td);
td.setStyle("border: none; padding: 0px; margin: 0px;");
decimalBox = new Decimalbox(); decimalBox = new Decimalbox();
if (integral) if (integral)
decimalBox.setScale(0); decimalBox.setScale(0);
decimalBox.setStyle("display: inline;text-align:right"); decimalBox.setStyle("display: inline;text-align:right");
td.appendChild(decimalBox); decimalBox.setHflex("1");
hlayout.appendChild(decimalBox);
Td btnColumn = new Td();
tr.appendChild(btnColumn);
btnColumn.setStyle("border: none; padding: 0px; margin: 0px;");
btnColumn.setSclass("editor-button");
btn = new Button(); btn = new Button();
btn.setImage("/images/Calculator10.png"); btn.setImage("/images/Calculator10.png");
btn.setTabindex(-1); btn.setTabindex(-1);
btn.setHflex("min");
LayoutUtils.addSclass("editor-button", btn); LayoutUtils.addSclass("editor-button", btn);
btnColumn.appendChild(btn); hlayout.appendChild(btn);
popup = getCalculatorPopup(); popup = getCalculatorPopup();
appendChild(popup); appendChild(popup);

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPFavourites.java
View File

@ -15,11 +15,11 @@ package org.adempiere.webui.dashboard;
import java.util.Enumeration; import java.util.Enumeration;
import org.adempiere.webui.adwindow.ADWindow;
import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.event.TouchEventHelper; import org.adempiere.webui.event.TouchEventHelper;
import org.adempiere.webui.exception.ApplicationException; import org.adempiere.webui.exception.ApplicationException;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.window.ADWindow;
import org.adempiere.webui.window.FDialog; import org.adempiere.webui.window.FDialog;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.model.MMenu; import org.compiere.model.MMenu;
@ -293,7 +293,7 @@ public class DPFavourites extends DashboardPanel implements EventListener<Event>
if(frame == null) if(frame == null)
return; return;
GridTab tab = frame.getADWindowPanel().getActiveGridTab(); GridTab tab = frame.getADWindowContent().getActiveGridTab();
tab.dataNew(false); tab.dataNew(false);
} }
catch (Exception e) catch (Exception e)

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/EventWindow.java
View File

@ -131,7 +131,8 @@ public class EventWindow extends Window implements EventListener<Event> {
Center center = new Center(); Center center = new Center();
borderlayout.appendChild(center); borderlayout.appendChild(center);
center.appendChild(grid); center.appendChild(grid);
center.setFlex(true); grid.setVflex("1");
grid.setHflex("1");
South south = new South(); South south = new South();
borderlayout.appendChild(south); borderlayout.appendChild(south);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/RequestWindow.java
View File

@ -237,7 +237,8 @@ public class RequestWindow extends Window implements EventListener<Event> {
Center center = new Center(); Center center = new Center();
borderlayout.appendChild(center); borderlayout.appendChild(center);
center.appendChild(grid); center.appendChild(grid);
center.setFlex(true); grid.setVflex("1");
grid.setHflex("1");
South south = new South(); South south = new South();
borderlayout.appendChild(south); borderlayout.appendChild(south);

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
View File

@ -34,6 +34,7 @@ import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.util.IServerPushCallback; import org.adempiere.webui.util.IServerPushCallback;
import org.adempiere.webui.util.ServerPushTemplate; import org.adempiere.webui.util.ServerPushTemplate;
import org.adempiere.webui.util.UserPreference; import org.adempiere.webui.util.UserPreference;
import org.compiere.Adempiere;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
@ -120,7 +121,6 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
w.setSclass("desktop-left-column"); w.setSclass("desktop-left-column");
w.setCollapsible(true); w.setCollapsible(true);
w.setSplittable(true); w.setSplittable(true);
w.setFlex(false);
w.setHflex("1"); w.setHflex("1");
w.addEventListener(Events.ON_OPEN, new EventListener<Event>() { w.addEventListener(Events.ON_OPEN, new EventListener<Event>() {
@Override @Override
@ -139,7 +139,6 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
windowArea = new Center(); windowArea = new Center();
windowArea.setParent(layout); windowArea.setParent(layout);
windowArea.setFlex(true);
windowArea.setSclass("desktop-center"); windowArea.setSclass("desktop-center");
windowContainer.createPart(windowArea); windowContainer.createPart(windowArea);
@ -178,8 +177,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
} }
}; };
Thread thread = new Thread(runnable); Adempiere.getThreadPoolExecutor().submit(runnable);
thread.start();
return layout; return layout;
} }

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/IDesktop.java
View File

@ -14,12 +14,12 @@
package org.adempiere.webui.desktop; package org.adempiere.webui.desktop;
import org.adempiere.webui.ClientInfo; import org.adempiere.webui.ClientInfo;
import org.adempiere.webui.adwindow.ADWindow;
import org.adempiere.webui.apps.ProcessDialog; import org.adempiere.webui.apps.ProcessDialog;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.adempiere.webui.panel.ADForm; import org.adempiere.webui.panel.ADForm;
import org.adempiere.webui.part.UIPart; import org.adempiere.webui.part.UIPart;
import org.adempiere.webui.util.ServerPushTemplate; import org.adempiere.webui.util.ServerPushTemplate;
import org.adempiere.webui.window.ADWindow;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
import org.compiere.util.WebDoc; import org.compiere.util.WebDoc;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;

7
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBar2Desktop.java
View File

@ -17,6 +17,7 @@ import java.io.Serializable;
import java.util.Properties; import java.util.Properties;
import org.adempiere.util.ServerContext; import org.adempiere.util.ServerContext;
import org.adempiere.webui.adwindow.ADWindow;
import org.adempiere.webui.apps.BusyDialog; import org.adempiere.webui.apps.BusyDialog;
import org.adempiere.webui.apps.ProcessDialog; import org.adempiere.webui.apps.ProcessDialog;
import org.adempiere.webui.component.Accordion; import org.adempiere.webui.component.Accordion;
@ -32,7 +33,6 @@ import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.util.IServerPushCallback; import org.adempiere.webui.util.IServerPushCallback;
import org.adempiere.webui.util.ServerPushTemplate; import org.adempiere.webui.util.ServerPushTemplate;
import org.adempiere.webui.util.UserPreference; import org.adempiere.webui.util.UserPreference;
import org.adempiere.webui.window.ADWindow;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
@ -118,7 +118,6 @@ public class NavBar2Desktop extends TabbedDesktop implements MenuListener, Seria
w.setWidth("300px"); w.setWidth("300px");
w.setCollapsible(true); w.setCollapsible(true);
w.setSplittable(true); w.setSplittable(true);
w.setFlex(true);
w.addEventListener(Events.ON_OPEN, new EventListener<Event>() { w.addEventListener(Events.ON_OPEN, new EventListener<Event>() {
@Override @Override
public void onEvent(Event event) throws Exception { public void onEvent(Event event) throws Exception {
@ -136,12 +135,13 @@ public class NavBar2Desktop extends TabbedDesktop implements MenuListener, Seria
Center center = new Center(); Center center = new Center();
center.setParent(layout); center.setParent(layout);
center.setFlex(true);
Borderlayout innerLayout = new Borderlayout(); Borderlayout innerLayout = new Borderlayout();
innerLayout.setHeight("100%"); innerLayout.setHeight("100%");
innerLayout.setWidth("100%"); innerLayout.setWidth("100%");
innerLayout.setParent(center); innerLayout.setParent(center);
innerLayout.setVflex("1");
innerLayout.setHflex("1");
West innerW = new West(); West innerW = new West();
innerW.setWidth("200px"); innerW.setWidth("200px");
@ -173,7 +173,6 @@ public class NavBar2Desktop extends TabbedDesktop implements MenuListener, Seria
windowArea = new Center(); windowArea = new Center();
windowArea.setParent(innerLayout); windowArea.setParent(innerLayout);
windowArea.setFlex(true);
windowContainer.createPart(windowArea); windowContainer.createPart(windowArea);

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/NavBarDesktop.java
View File

@ -17,6 +17,7 @@ import java.io.Serializable;
import java.util.Properties; import java.util.Properties;
import org.adempiere.util.ServerContext; import org.adempiere.util.ServerContext;
import org.adempiere.webui.adwindow.ADWindow;
import org.adempiere.webui.apps.BusyDialog; import org.adempiere.webui.apps.BusyDialog;
import org.adempiere.webui.apps.ProcessDialog; import org.adempiere.webui.apps.ProcessDialog;
import org.adempiere.webui.component.Accordion; import org.adempiere.webui.component.Accordion;
@ -34,7 +35,6 @@ import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.util.IServerPushCallback; import org.adempiere.webui.util.IServerPushCallback;
import org.adempiere.webui.util.ServerPushTemplate; import org.adempiere.webui.util.ServerPushTemplate;
import org.adempiere.webui.util.UserPreference; import org.adempiere.webui.util.UserPreference;
import org.adempiere.webui.window.ADWindow;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
@ -127,7 +127,6 @@ public class NavBarDesktop extends TabbedDesktop implements MenuListener, Serial
leftRegion.setCollapsible(true); leftRegion.setCollapsible(true);
leftRegion.setSplittable(true); leftRegion.setSplittable(true);
leftRegion.setTitle("Navigation"); leftRegion.setTitle("Navigation");
leftRegion.setFlex(true);
leftRegion.addEventListener(Events.ON_OPEN, new EventListener<Event>() { leftRegion.addEventListener(Events.ON_OPEN, new EventListener<Event>() {
@Override @Override
public void onEvent(Event event) throws Exception { public void onEvent(Event event) throws Exception {
@ -174,7 +173,6 @@ public class NavBarDesktop extends TabbedDesktop implements MenuListener, Serial
windowArea = new Center(); windowArea = new Center();
windowArea.setParent(layout); windowArea.setParent(layout);
windowArea.setFlex(true);
windowContainer.createPart(windowArea); windowContainer.createPart(windowArea);

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/TabbedDesktop.java
View File

@ -15,6 +15,7 @@ package org.adempiere.webui.desktop;
import java.util.List; import java.util.List;
import org.adempiere.webui.adwindow.ADWindow;
import org.adempiere.webui.apps.ProcessDialog; import org.adempiere.webui.apps.ProcessDialog;
import org.adempiere.webui.apps.wf.WFPanel; import org.adempiere.webui.apps.wf.WFPanel;
import org.adempiere.webui.component.DesktopTabpanel; import org.adempiere.webui.component.DesktopTabpanel;
@ -24,7 +25,6 @@ import org.adempiere.webui.component.Window;
import org.adempiere.webui.panel.ADForm; import org.adempiere.webui.panel.ADForm;
import org.adempiere.webui.part.WindowContainer; import org.adempiere.webui.part.WindowContainer;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.window.ADWindow;
import org.adempiere.webui.window.WTask; import org.adempiere.webui.window.WTask;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
import org.compiere.model.MTask; import org.compiere.model.MTask;

14
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WEditor.java
View File

@ -37,6 +37,7 @@ import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.HtmlBasedComponent; import org.zkoss.zk.ui.HtmlBasedComponent;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
@ -315,11 +316,20 @@ public abstract class WEditor implements EventListener<Event>, PropertyChangeLis
/** /**
* @param evt * @param evt
*/ */
public void propertyChange(PropertyChangeEvent evt) public void propertyChange(final PropertyChangeEvent evt)
{ {
if (evt.getPropertyName().equals(org.compiere.model.GridField.PROPERTY)) if (evt.getPropertyName().equals(org.compiere.model.GridField.PROPERTY))
{ {
setValue((evt.getNewValue())); if (Executions.getCurrent() == null) {
Executions.schedule(this.getComponent().getDesktop(), new EventListener<Event>() {
@Override
public void onEvent(Event event) throws Exception {
setValue((evt.getNewValue()));
}
}, new Event("onPropertyChange"));
} else {
setValue((evt.getNewValue()));
}
} }
} }

19
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java
View File

@ -55,20 +55,32 @@ public class WNumberEditor extends WEditor implements ContextMenuListener
private int displayType; private int displayType;
private boolean tableEditor;
public WNumberEditor() public WNumberEditor()
{ {
this("Number", false, false, true, DisplayType.Number, ""); this("Number", false, false, true, DisplayType.Number, "");
} }
/**
*
* @param gridField
*/
public WNumberEditor(GridField gridField)
{
this(false, gridField);
}
/** /**
* *
* @param gridField * @param gridField
*/ */
public WNumberEditor(GridField gridField) public WNumberEditor(boolean tableEditor, GridField gridField)
{ {
super(new NumberBox(gridField.getDisplayType() == DisplayType.Integer), super(new NumberBox(gridField.getDisplayType() == DisplayType.Integer),
gridField); gridField);
this.displayType = gridField.getDisplayType(); this.displayType = gridField.getDisplayType();
this.tableEditor = tableEditor;
init(); init();
} }
@ -112,7 +124,10 @@ public class WNumberEditor extends WEditor implements ContextMenuListener
displayLength = MAX_DISPLAY_LENGTH; displayLength = MAX_DISPLAY_LENGTH;
else if (displayLength <= 0 || displayLength < MIN_DISPLAY_LENGTH) else if (displayLength <= 0 || displayLength < MIN_DISPLAY_LENGTH)
displayLength = MIN_DISPLAY_LENGTH; displayLength = MIN_DISPLAY_LENGTH;
getComponent().getDecimalbox().setCols(displayLength); if (!tableEditor)
getComponent().getDecimalbox().setCols(displayLength);
// else
// getComponent().getDecimalbox().setCols(0);
} }
if (DisplayType.isID(displayType)) if (DisplayType.isID(displayType))

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPasswordEditor.java
View File

@ -34,4 +34,9 @@ public class WPasswordEditor extends WStringEditor
super.setTypePassword(true); super.setTypePassword(true);
} }
public WPasswordEditor(GridField gridField, boolean tableEditor)
{
super(gridField, tableEditor);
super.setTypePassword(true);
}
} }

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
View File

@ -114,7 +114,8 @@ public class WStringEditor extends WEditor implements ContextMenuListener
{ {
displayLength = MAX_DISPLAY_LENGTH; displayLength = MAX_DISPLAY_LENGTH;
} }
getComponent().setCols(displayLength); if (!tableEditor)
getComponent().setCols(displayLength);
if (gridField.getDisplayType() == DisplayType.Text) if (gridField.getDisplayType() == DisplayType.Text)
{ {
getComponent().setMultiline(true); getComponent().setMultiline(true);

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultEditorFactory.java
View File

@ -70,7 +70,7 @@ public class DefaultEditorFactory implements IEditorFactory {
{ {
if (gridField.isEncryptedField()) if (gridField.isEncryptedField())
{ {
editor = new WPasswordEditor(gridField); editor = new WPasswordEditor(gridField, tableEditor);
} }
else else
{ {
@ -90,7 +90,7 @@ public class DefaultEditorFactory implements IEditorFactory {
/** Number */ /** Number */
else if (DisplayType.isNumeric(displayType)) else if (DisplayType.isNumeric(displayType))
{ {
editor = new WNumberEditor(gridField); editor = new WNumberEditor(tableEditor, gridField);
} }
/** YesNo */ /** YesNo */
@ -104,7 +104,7 @@ public class DefaultEditorFactory implements IEditorFactory {
/** Text */ /** Text */
else if (displayType == DisplayType.Text || displayType == DisplayType.Memo || displayType == DisplayType.TextLong) else if (displayType == DisplayType.Text || displayType == DisplayType.Memo || displayType == DisplayType.TextLong)
{ {
editor = new WStringEditor(gridField); editor = new WStringEditor(gridField, tableEditor);
} }
/** Date */ /** Date */

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/AbstractMenuPanel.java
View File

@ -20,12 +20,12 @@ import java.util.Collection;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.Properties; import java.util.Properties;
import org.adempiere.webui.adwindow.ADWindow;
import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.event.TouchEventHelper; import org.adempiere.webui.event.TouchEventHelper;
import org.adempiere.webui.event.TouchEvents; import org.adempiere.webui.event.TouchEvents;
import org.adempiere.webui.exception.ApplicationException; import org.adempiere.webui.exception.ApplicationException;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.window.ADWindow;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.model.MMenu; import org.compiere.model.MMenu;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
@ -311,7 +311,7 @@ public abstract class AbstractMenuPanel extends Panel implements EventListener<E
if(frame == null) if(frame == null)
return; return;
GridTab tab = frame.getADWindowPanel().getActiveGridTab(); GridTab tab = frame.getADWindowContent().getActiveGridTab();
tab.dataNew(false); tab.dataNew(false);
} }
catch (Exception e) catch (Exception e)

14
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
View File

@ -18,11 +18,14 @@ package org.adempiere.webui.panel;
import java.util.Properties; import java.util.Properties;
import org.adempiere.exceptions.AdempiereException; import org.adempiere.exceptions.AdempiereException;
import org.adempiere.util.Callback;
import org.adempiere.webui.AdempiereIdGenerator; import org.adempiere.webui.AdempiereIdGenerator;
import org.adempiere.webui.LayoutUtils; import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.Combobox; import org.adempiere.webui.component.Combobox;
import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.ConfirmPanel;
import org.adempiere.webui.component.Label; import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.Messagebox;
import org.adempiere.webui.component.Textbox; import org.adempiere.webui.component.Textbox;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
@ -331,7 +334,7 @@ public class ChangePasswordPanel extends Window implements EventListener<Event>
user.saveEx(trx.getTrxName()); user.saveEx(trx.getTrxName());
} }
trx.commit(); trx.commit();
} }
catch (AdempiereException e) catch (AdempiereException e)
{ {
@ -345,6 +348,13 @@ public class ChangePasswordPanel extends Window implements EventListener<Event>
trx.close(); trx.close();
} }
wndLogin.loginOk(m_userName, m_show, m_clientKNPairs); String msg = Msg.getMsg(m_ctx, "NewPasswordValidForAllTenants");
Messagebox.showDialog(msg, AEnv.getDialogHeader(Env.getCtx(), 0), Messagebox.OK, Messagebox.INFORMATION, new Callback<Integer>() {
@Override
public void onCallback(Integer result) {
wndLogin.loginOk(m_userName, m_show, m_clientKNPairs);
}
});
} }
} }

9
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/CustomizeGridViewPanel.java
View File

@ -27,9 +27,9 @@ import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.model.MTabCustomization; import org.adempiere.model.MTabCustomization;
import org.adempiere.webui.adwindow.GridView;
import org.adempiere.webui.component.Button; import org.adempiere.webui.component.Button;
import org.adempiere.webui.component.Checkbox; import org.adempiere.webui.component.Checkbox;
import org.adempiere.webui.component.GridPanel;
import org.adempiere.webui.component.Label; import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.ListHead; import org.adempiere.webui.component.ListHead;
import org.adempiere.webui.component.ListHeader; import org.adempiere.webui.component.ListHeader;
@ -68,7 +68,7 @@ public class CustomizeGridViewPanel extends Panel
private static final long serialVersionUID = 4289328613547509587L; private static final long serialVersionUID = 4289328613547509587L;
private Map<Integer, String> m_columnsWidth; private Map<Integer, String> m_columnsWidth;
ArrayList<Integer> tableSeqs; ArrayList<Integer> tableSeqs;
GridPanel gridPanel = null; GridView gridPanel = null;
/** /**
* Sort Tab Constructor * Sort Tab Constructor
* *
@ -260,7 +260,8 @@ public class CustomizeGridViewPanel extends Panel
centerPanel.appendChild(div); centerPanel.appendChild(div);
center.appendChild(centerPanel); center.appendChild(centerPanel);
center.setFlex(true); centerPanel.setVflex("1");
centerPanel.setHflex("1");
layout.appendChild(center); layout.appendChild(center);
South south = new South(); South south = new South();
@ -765,7 +766,7 @@ public class CustomizeGridViewPanel extends Panel
public boolean isSaved() { public boolean isSaved() {
return m_saved; return m_saved;
} }
public void setGridPanel(GridPanel gridPanel){ public void setGridPanel(GridView gridPanel){
this.gridPanel = gridPanel; this.gridPanel = gridPanel;
} }
} //ADSortTab } //ADSortTab

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java
View File

@ -109,7 +109,8 @@ public class HeaderPanel extends Panel implements EventListener<Event>
userPanel.setHeight("100%"); userPanel.setHeight("100%");
userPanel.setAlign("right"); userPanel.setAlign("right");
userPanel.setStyle("position: absolute; text-align:right;"); userPanel.setStyle("position: absolute; text-align:right;");
center.setFlex(true); userPanel.setVflex("1");
userPanel.setHflex("1");
LayoutUtils.addSclass("desktop-header-right", center); LayoutUtils.addSclass("desktop-header-right", center);
} }

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssetPanel.java
View File

@ -204,7 +204,6 @@ public class InfoAssetPanel extends InfoPanel implements ValueChangeListener, Ev
Center center = new Center(); Center center = new Center();
layout.appendChild(center); layout.appendChild(center);
center.setFlex(true);
Div div = new Div(); Div div = new Div();
div.appendChild(contentPanel); div.appendChild(contentPanel);
if (isLookup()) if (isLookup())
@ -214,6 +213,8 @@ public class InfoAssetPanel extends InfoPanel implements ValueChangeListener, Ev
contentPanel.setVflex(true); contentPanel.setVflex(true);
div.setStyle("width :100%; height: 100%"); div.setStyle("width :100%; height: 100%");
center.appendChild(div); center.appendChild(div);
div.setVflex("1");
div.setHflex("1");
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoAssignmentPanel.java
View File

@ -237,7 +237,6 @@ public class InfoAssignmentPanel extends InfoPanel implements EventListener, Val
Center center = new Center(); Center center = new Center();
layout.appendChild(center); layout.appendChild(center);
center.setFlex(true);
div = new Div(); div = new Div();
div.appendChild(contentPanel); div.appendChild(contentPanel);
if (isLookup()) if (isLookup())
@ -247,6 +246,8 @@ public class InfoAssignmentPanel extends InfoPanel implements EventListener, Val
contentPanel.setVflex(true); contentPanel.setVflex(true);
div.setStyle("width :100%; height: 100%"); div.setStyle("width :100%; height: 100%");
center.appendChild(div); center.appendChild(div);
div.setVflex("1");
div.setHflex("1");
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoBPartnerPanel.java
View File

@ -248,7 +248,6 @@ public class InfoBPartnerPanel extends InfoPanel implements EventListener, WTabl
Center center = new Center(); Center center = new Center();
layout.appendChild(center); layout.appendChild(center);
center.setFlex(true);
Div div = new Div(); Div div = new Div();
div.appendChild(contentPanel); div.appendChild(contentPanel);
if (isLookup()) if (isLookup())
@ -258,6 +257,8 @@ public class InfoBPartnerPanel extends InfoPanel implements EventListener, WTabl
contentPanel.setVflex(true); contentPanel.setVflex(true);
div.setStyle("width :100%; height: 100%"); div.setStyle("width :100%; height: 100%");
center.appendChild(div); center.appendChild(div);
div.setVflex("1");
div.setHflex("1");
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoCashLinePanel.java
View File

@ -263,7 +263,6 @@ public class InfoCashLinePanel extends InfoPanel implements ValueChangeListener,
Center center = new Center(); Center center = new Center();
layout.appendChild(center); layout.appendChild(center);
center.setFlex(true);
Div div = new Div(); Div div = new Div();
div.appendChild(contentPanel); div.appendChild(contentPanel);
if (isLookup()) if (isLookup())
@ -273,6 +272,8 @@ public class InfoCashLinePanel extends InfoPanel implements ValueChangeListener,
contentPanel.setVflex(true); contentPanel.setVflex(true);
div.setStyle("width :100%; height: 100%"); div.setStyle("width :100%; height: 100%");
center.appendChild(div); center.appendChild(div);
div.setVflex("1");
div.setHflex("1");
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
View File

@ -160,7 +160,6 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener
Center center = new Center(); Center center = new Center();
layout.appendChild(center); layout.appendChild(center);
center.setFlex(true);
Div div = new Div(); Div div = new Div();
div.appendChild(contentPanel); div.appendChild(contentPanel);
if (isLookup()) if (isLookup())
@ -170,6 +169,8 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener
contentPanel.setVflex(true); contentPanel.setVflex(true);
div.setStyle("width :100%; height: 100%"); div.setStyle("width :100%; height: 100%");
center.appendChild(div); center.appendChild(div);
div.setVflex("1");
div.setHflex("1");
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java
View File

@ -230,7 +230,6 @@ public class InfoInOutPanel extends InfoPanel implements ValueChangeListener, Ev
Center center = new Center(); Center center = new Center();
layout.appendChild(center); layout.appendChild(center);
center.setFlex(true);
Div div = new Div(); Div div = new Div();
div.appendChild(contentPanel); div.appendChild(contentPanel);
if (isLookup()) if (isLookup())
@ -240,6 +239,8 @@ public class InfoInOutPanel extends InfoPanel implements ValueChangeListener, Ev
contentPanel.setVflex(true); contentPanel.setVflex(true);
div.setStyle("width :100%; height: 100%"); div.setStyle("width :100%; height: 100%");
center.appendChild(div); center.appendChild(div);
div.setVflex("1");
div.setHflex("1");
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java
View File

@ -260,7 +260,6 @@ public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener
Center center = new Center(); Center center = new Center();
layout.appendChild(center); layout.appendChild(center);
center.setFlex(true);
Div div = new Div(); Div div = new Div();
div.appendChild(contentPanel); div.appendChild(contentPanel);
if (isLookup()) if (isLookup())
@ -270,6 +269,8 @@ public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener
contentPanel.setVflex(true); contentPanel.setVflex(true);
div.setStyle("width :100%; height: 100%"); div.setStyle("width :100%; height: 100%");
center.appendChild(div); center.appendChild(div);
div.setVflex("1");
div.setHflex("1");
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java
View File

@ -237,7 +237,6 @@ public class InfoOrderPanel extends InfoPanel implements ValueChangeListener
Center center = new Center(); Center center = new Center();
layout.appendChild(center); layout.appendChild(center);
center.setFlex(true);
Div div = new Div(); Div div = new Div();
div.appendChild(contentPanel); div.appendChild(contentPanel);
if (isLookup()) if (isLookup())
@ -247,6 +246,8 @@ public class InfoOrderPanel extends InfoPanel implements ValueChangeListener
contentPanel.setVflex(true); contentPanel.setVflex(true);
div.setStyle("width :100%; height: 100%"); div.setStyle("width :100%; height: 100%");
center.appendChild(div); center.appendChild(div);
div.setVflex("1");
div.setHflex("1");
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributeInstancePanel.java
View File

@ -135,9 +135,10 @@ public class InfoPAttributeInstancePanel extends Window implements EventListener
Center center = new Center(); Center center = new Center();
center.setAutoscroll(true); center.setAutoscroll(true);
center.setFlex(true); borderlayout.appendChild(center);
borderlayout.appendChild(center);
center.appendChild(m_table); center.appendChild(m_table);
m_table.setVflex("1");
m_table.setHflex("1");
South south = new South(); South south = new South();
borderlayout.appendChild(south); borderlayout.appendChild(south);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java
View File

@ -245,7 +245,6 @@ public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener,
Center center = new Center(); Center center = new Center();
layout.appendChild(center); layout.appendChild(center);
center.setFlex(true);
Div div = new Div(); Div div = new Div();
div.appendChild(contentPanel); div.appendChild(contentPanel);
if (isLookup()) if (isLookup())
@ -255,6 +254,8 @@ public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener,
contentPanel.setVflex(true); contentPanel.setVflex(true);
div.setStyle("width :100%; height: 100%"); div.setStyle("width :100%; height: 100%");
center.appendChild(div); center.appendChild(div);
div.setVflex("1");
div.setHflex("1");
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);

8
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java
View File

@ -501,20 +501,22 @@ public class InfoProductPanel extends InfoPanel implements EventListener
Center center = new Center(); Center center = new Center();
//true will conflict with listbox scrolling //true will conflict with listbox scrolling
center.setAutoscroll(false); center.setAutoscroll(false);
center.setFlex(true); borderlayout.appendChild(center);
borderlayout.appendChild(center);
center.appendChild(contentPanel); center.appendChild(contentPanel);
contentPanel.setVflex("1");
contentPanel.setHflex("1");
South south = new South(); South south = new South();
int detailHeight = (height * 25 / 100); int detailHeight = (height * 25 / 100);
south.setHeight(detailHeight + "px"); south.setHeight(detailHeight + "px");
south.setCollapsible(true); south.setCollapsible(true);
south.setSplittable(true); south.setSplittable(true);
south.setFlex(true);
south.setTitle(Msg.translate(Env.getCtx(), "WarehouseStock")); south.setTitle(Msg.translate(Env.getCtx(), "WarehouseStock"));
south.setTooltiptext(Msg.translate(Env.getCtx(), "WarehouseStock")); south.setTooltiptext(Msg.translate(Env.getCtx(), "WarehouseStock"));
borderlayout.appendChild(south); borderlayout.appendChild(south);
tabbedPane.setSclass("info-product-tabbedpane"); tabbedPane.setSclass("info-product-tabbedpane");
south.appendChild(tabbedPane); south.appendChild(tabbedPane);
tabbedPane.setVflex("1");
tabbedPane.setHflex("1");
Borderlayout mainPanel = new Borderlayout(); Borderlayout mainPanel = new Borderlayout();
mainPanel.setWidth("100%"); mainPanel.setWidth("100%");

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java
View File

@ -190,9 +190,10 @@ public class InvoiceHistory extends Window implements EventListener
Center center = new Center(); Center center = new Center();
center.setStyle("border: none"); center.setStyle("border: none");
center.setAutoscroll(true); center.setAutoscroll(true);
center.setFlex(true); borderlayout.appendChild(center);
borderlayout.appendChild(center);
center.appendChild(tabbox); center.appendChild(tabbox);
tabbox.setVflex("1");
tabbox.setHflex("1");
South south = new South(); South south = new South();
south.setStyle("border: none"); south.setStyle("border: none");

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
View File

@ -348,7 +348,7 @@ public class LoginPanel extends Window implements EventListener<Event>
chkSelectRole = new Checkbox(Msg.getMsg(Language.getBaseAD_Language(), "SelectRole")); chkSelectRole = new Checkbox(Msg.getMsg(Language.getBaseAD_Language(), "SelectRole"));
btnResetPassword = new ToolBarButton(Msg.getMsg(Language.getBaseAD_Language(), "ResetPassword")); btnResetPassword = new ToolBarButton(Msg.getMsg(Language.getBaseAD_Language(), "ForgotMyPassword"));
// Make the default language the language of client System // Make the default language the language of client System
String defaultLanguage = MClient.get(ctx, 0).getAD_Language(); String defaultLanguage = MClient.get(ctx, 0).getAD_Language();
@ -455,7 +455,7 @@ public class LoginPanel extends Window implements EventListener<Event>
lblLanguage.setValue(Msg.getMsg(language, "Language")); lblLanguage.setValue(Msg.getMsg(language, "Language"));
chkRememberMe.setLabel(Msg.getMsg(language, "RememberMe")); chkRememberMe.setLabel(Msg.getMsg(language, "RememberMe"));
chkSelectRole.setLabel(Msg.getMsg(language, "SelectRole")); chkSelectRole.setLabel(Msg.getMsg(language, "SelectRole"));
btnResetPassword.setLabel(Msg.getMsg(language, "ResetPassword")); btnResetPassword.setLabel(Msg.getMsg(language, "ForgotMyPassword"));
} }
private Language findLanguage(String langName) { private Language findLanguage(String langName) {

35
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
View File

@ -21,10 +21,13 @@ import java.util.List;
import java.util.Properties; import java.util.Properties;
import org.adempiere.exceptions.AdempiereException; import org.adempiere.exceptions.AdempiereException;
import org.adempiere.util.Callback;
import org.adempiere.webui.AdempiereIdGenerator; import org.adempiere.webui.AdempiereIdGenerator;
import org.adempiere.webui.LayoutUtils; import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.ConfirmPanel;
import org.adempiere.webui.component.Label; import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.Messagebox;
import org.adempiere.webui.component.Textbox; import org.adempiere.webui.component.Textbox;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
@ -112,7 +115,7 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
{ {
Div div = new Div(); Div div = new Div();
div.setSclass(ITheme.LOGIN_BOX_HEADER_CLASS); div.setSclass(ITheme.LOGIN_BOX_HEADER_CLASS);
Label label = new Label(Msg.getMsg(m_ctx, "ResetPassword")); Label label = new Label(Msg.getMsg(m_ctx, "ForgotMyPassword"));
label.setSclass(ITheme.LOGIN_BOX_HEADER_TXT_CLASS); label.setSclass(ITheme.LOGIN_BOX_HEADER_TXT_CLASS);
div.appendChild(label); div.appendChild(label);
this.appendChild(div); this.appendChild(div);
@ -229,15 +232,18 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
txtUserId.setCols(25); txtUserId.setCols(25);
txtUserId.setMaxlength(40); txtUserId.setMaxlength(40);
txtUserId.setWidth("220px"); txtUserId.setWidth("220px");
txtUserId.setReadonly(false);
if (! m_noSecurityQuestion) if (! m_noSecurityQuestion)
{ {
lblSecurityQuestion = new Label(); lblSecurityQuestion = new Label();
lblSecurityQuestion.setId("lblSecurityQuestion"); lblSecurityQuestion.setId("lblSecurityQuestion");
lblSecurityQuestion.setValue(Msg.getMsg(m_ctx, "SecurityQuestion")); lblSecurityQuestion.setValue(Msg.getMsg(m_ctx, "SecurityQuestion"));
lblSecurityQuestion.setVisible(false);
lblAnswer = new Label(); lblAnswer = new Label();
lblAnswer.setId("lblAnswer"); lblAnswer.setId("lblAnswer");
lblAnswer.setValue(Msg.getMsg(m_ctx, "Answer")); lblAnswer.setValue(Msg.getMsg(m_ctx, "Answer"));
lblAnswer.setVisible(false);
txtSecurityQuestion = new Textbox(); txtSecurityQuestion = new Textbox();
txtSecurityQuestion.setId("txtSecurityQuestion"); txtSecurityQuestion.setId("txtSecurityQuestion");
@ -245,6 +251,7 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
txtSecurityQuestion.setCols(25); txtSecurityQuestion.setCols(25);
txtSecurityQuestion.setWidth("220px"); txtSecurityQuestion.setWidth("220px");
txtSecurityQuestion.setReadonly(true); txtSecurityQuestion.setReadonly(true);
txtSecurityQuestion.setVisible(false);
txtAnswer = new Textbox(); txtAnswer = new Textbox();
txtAnswer.setId("txtAnswer"); txtAnswer.setId("txtAnswer");
@ -253,6 +260,7 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
txtAnswer.setCols(25); txtAnswer.setCols(25);
txtAnswer.setWidth("220px"); txtAnswer.setWidth("220px");
txtAnswer.setReadonly(true); txtAnswer.setReadonly(true);
txtAnswer.setVisible(false);
} }
} }
@ -283,10 +291,22 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
sql.append("ORDER BY AD_Client_ID DESC"); sql.append("ORDER BY AD_Client_ID DESC");
String securityQuestion = DB.getSQLValueString(null, sql.toString(), userid, email); String securityQuestion = DB.getSQLValueString(null, sql.toString(), userid, email);
if (securityQuestion == null)
{
m_noSecurityQuestion = true;
validateResetPassword();
return;
}
txtSecurityQuestion.setValue(securityQuestion); txtSecurityQuestion.setValue(securityQuestion);
txtUserId.setReadonly(true);
txtEmail.setReadonly(true); txtEmail.setReadonly(true);
txtAnswer.setReadonly(false); txtAnswer.setReadonly(false);
lblSecurityQuestion.setVisible(true);
lblAnswer.setVisible(true);
txtSecurityQuestion.setVisible(true);
txtAnswer.setVisible(true);
} }
public void onEvent(Event event) public void onEvent(Event event)
@ -457,9 +477,16 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
throw new AdempiereException(Msg.getMsg(m_ctx, "RequestActionEMailError") + ": " + errorMsg); throw new AdempiereException(Msg.getMsg(m_ctx, "RequestActionEMailError") + ": " + errorMsg);
else else
{ {
SessionManager.logoutSession(); // Passwords for all tenants using ({0}) as email have been reset
wndLogin.loginCancelled(); String msg = Msg.getMsg(m_ctx, "PasswordsForAllTenantsReset", new Object[] {email});
// FDialog.info(0, this, Msg.getMsg(m_ctx, "RequestActionEMailOK")); Messagebox.showDialog(msg, AEnv.getDialogHeader(Env.getCtx(), 0), Messagebox.OK, Messagebox.INFORMATION, new Callback<Integer>() {
@Override
public void onCallback(Integer result) {
SessionManager.logoutSession();
wndLogin.loginCancelled();
}
});
} }
} }

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
View File

@ -267,9 +267,10 @@ public class WAttachment extends Window implements EventListener<Event>
Center centerPane = new Center(); Center centerPane = new Center();
centerPane.setAutoscroll(true); centerPane.setAutoscroll(true);
centerPane.setFlex(true);
mainPanel.appendChild(centerPane); mainPanel.appendChild(centerPane);
centerPane.appendChild(previewPanel); centerPane.appendChild(previewPanel);
previewPanel.setVflex("1");
previewPanel.setHflex("1");
South southPane = new South(); South southPane = new South();
mainPanel.appendChild(southPane); mainPanel.appendChild(southPane);

12
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java
View File

@ -24,16 +24,16 @@ import java.util.Set;
import org.adempiere.base.IGridTabExporter; import org.adempiere.base.IGridTabExporter;
import org.adempiere.base.Service; import org.adempiere.base.Service;
import org.adempiere.exceptions.AdempiereException; import org.adempiere.exceptions.AdempiereException;
import org.adempiere.webui.adwindow.AbstractADWindowContent;
import org.adempiere.webui.adwindow.IADTabbox;
import org.adempiere.webui.adwindow.IADTabpanel;
import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.Checkbox; import org.adempiere.webui.component.Checkbox;
import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.ConfirmPanel;
import org.adempiere.webui.component.IADTab;
import org.adempiere.webui.component.Label; import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.ListItem; import org.adempiere.webui.component.ListItem;
import org.adempiere.webui.component.Listbox; import org.adempiere.webui.component.Listbox;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.adempiere.webui.panel.AbstractADWindowPanel;
import org.adempiere.webui.panel.IADTabpanel;
import org.adempiere.webui.window.FDialog; import org.adempiere.webui.window.FDialog;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -53,7 +53,7 @@ import org.zkoss.zul.Vbox;
*/ */
public class ExportAction implements EventListener<Event> public class ExportAction implements EventListener<Event>
{ {
private AbstractADWindowPanel panel; private AbstractADWindowContent panel;
private Map<String, IGridTabExporter> exporterMap = null; private Map<String, IGridTabExporter> exporterMap = null;
private Map<String, String> extensionMap = null; private Map<String, String> extensionMap = null;
@ -66,7 +66,7 @@ public class ExportAction implements EventListener<Event>
/** /**
* @param panel * @param panel
*/ */
public ExportAction(AbstractADWindowPanel panel) public ExportAction(AbstractADWindowContent panel)
{ {
this.panel = panel; this.panel = panel;
} }
@ -162,7 +162,7 @@ public class ExportAction implements EventListener<Event>
boolean currentRowOnly = chkCurrentRow.isSelected(); boolean currentRowOnly = chkCurrentRow.isSelected();
File file = File.createTempFile("Export", "."+ext); File file = File.createTempFile("Export", "."+ext);
IADTab adTab = panel.getADTab(); IADTabbox adTab = panel.getADTab();
int selected = adTab.getSelectedIndex(); int selected = adTab.getSelectedIndex();
int tabLevel = panel.getActiveGridTab().getTabLevel(); int tabLevel = panel.getActiveGridTab().getTabLevel();
Set<String> tables = new HashSet<String>(); Set<String> tables = new HashSet<String>();

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
View File

@ -27,6 +27,7 @@ import java.util.logging.Level;
import javax.sql.RowSet; import javax.sql.RowSet;
import org.adempiere.webui.LayoutUtils; import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.adwindow.AbstractADWindowContent;
import org.adempiere.webui.apps.WProcessCtl; import org.adempiere.webui.apps.WProcessCtl;
import org.adempiere.webui.component.Checkbox; import org.adempiere.webui.component.Checkbox;
import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.ConfirmPanel;
@ -34,7 +35,6 @@ import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.ListItem; import org.adempiere.webui.component.ListItem;
import org.adempiere.webui.component.Listbox; import org.adempiere.webui.component.Listbox;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.adempiere.webui.panel.AbstractADWindowPanel;
import org.adempiere.webui.window.FDialog; import org.adempiere.webui.window.FDialog;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
@ -66,7 +66,7 @@ public class ReportAction implements EventListener<Event>
{ {
private static CLogger log = CLogger.getCLogger(ReportAction.class); private static CLogger log = CLogger.getCLogger(ReportAction.class);
private AbstractADWindowPanel panel; private AbstractADWindowContent panel;
private Window winReport = null; private Window winReport = null;
private ConfirmPanel confirmPanel = new ConfirmPanel(true); private ConfirmPanel confirmPanel = new ConfirmPanel(true);
@ -78,7 +78,7 @@ public class ReportAction implements EventListener<Event>
private ArrayList<KeyNamePair> printFormatList = new ArrayList<KeyNamePair>(); private ArrayList<KeyNamePair> printFormatList = new ArrayList<KeyNamePair>();
public ReportAction(AbstractADWindowPanel panel) public ReportAction(AbstractADWindowContent panel)
{ {
this.panel = panel; this.panel = panel;
getPrintFormats(panel.getActiveGridTab().getAD_Table_ID()); getPrintFormats(panel.getActiveGridTab().getAD_Table_ID());

8
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/part/WindowContainer.java
View File

@ -57,12 +57,16 @@ public class WindowContainer extends AbstractUIPart
tabbox.setSclass("desktop-tabbox"); tabbox.setSclass("desktop-tabbox");
Tabpanels tabpanels = new Tabpanels(); Tabpanels tabpanels = new Tabpanels();
tabpanels.setVflex("1");
tabpanels.setHflex("1");
Tabs tabs = new Tabs(); Tabs tabs = new Tabs();
tabbox.appendChild(tabs); tabbox.appendChild(tabs);
tabbox.appendChild(tabpanels); tabbox.appendChild(tabpanels);
tabbox.setWidth("100%"); tabbox.setWidth("100%");
tabbox.setHeight("100%"); tabbox.setHeight("100%");
tabbox.setVflex("1");
tabbox.setHflex("1");
if (parent != null) if (parent != null)
tabbox.setParent(parent); tabbox.setParent(parent);
@ -135,7 +139,9 @@ public class WindowContainer extends AbstractUIPart
} }
tabpanel.setHeight("100%"); tabpanel.setHeight("100%");
tabpanel.setWidth("100%"); tabpanel.setWidth("100%");
tabpanel.setZclass("desktop-tabpanel"); tabpanel.setVflex("1");
tabpanel.setHflex("1");
tabpanel.setSclass("desktop-tabpanel");
if (refTab == null) if (refTab == null)
{ {

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
View File

@ -32,12 +32,10 @@ import javax.servlet.http.HttpServletResponse;
import org.compiere.Adempiere; import org.compiere.Adempiere;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Ini; import org.compiere.util.Ini;
import org.zkoss.util.resource.ClassLocator;
import org.zkoss.zk.ui.http.DHtmlLayoutServlet; import org.zkoss.zk.ui.http.DHtmlLayoutServlet;
import org.adempiere.util.ServerContext; import org.adempiere.util.ServerContext;
import org.adempiere.util.ServerContextURLHandler; import org.adempiere.util.ServerContextURLHandler;
import org.adempiere.webui.util.ZkResourceLocator;
/** /**
* *
@ -54,8 +52,6 @@ public class WebUIServlet extends DHtmlLayoutServlet
public void init(ServletConfig servletConfig) throws ServletException public void init(ServletConfig servletConfig) throws ServletException
{ {
ClassLocator.addResourceLocator(new ZkResourceLocator());
super.init(servletConfig); super.init(servletConfig);
/** Initialise context for the current thread*/ /** Initialise context for the current thread*/

49
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/LogEventInterceptor.java Normal file
View File

@ -0,0 +1,49 @@
/**
*
*/
package org.adempiere.webui.util;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.util.EventInterceptor;
/**
* @author hengsin
*
*/
public class LogEventInterceptor implements EventInterceptor {
/* (non-Javadoc)
* @see org.zkoss.zk.ui.util.EventInterceptor#beforeSendEvent(org.zkoss.zk.ui.event.Event)
*/
@Override
public Event beforeSendEvent(Event event) {
// System.out.println("beforeSendEvent, event="+event.getName()+",target="+event.getTarget());
return event;
}
/* (non-Javadoc)
* @see org.zkoss.zk.ui.util.EventInterceptor#beforePostEvent(org.zkoss.zk.ui.event.Event)
*/
@Override
public Event beforePostEvent(Event event) {
// System.out.println("beforePostEvent, event="+event.getName()+",target="+event.getTarget());
return event;
}
/* (non-Javadoc)
* @see org.zkoss.zk.ui.util.EventInterceptor#beforeProcessEvent(org.zkoss.zk.ui.event.Event)
*/
@Override
public Event beforeProcessEvent(Event event) {
System.out.println("beforeProcessEvent, event="+event.getName()+",target="+event.getTarget());
return event;
}
/* (non-Javadoc)
* @see org.zkoss.zk.ui.util.EventInterceptor#afterProcessEvent(org.zkoss.zk.ui.event.Event)
*/
@Override
public void afterProcessEvent(Event event) {
// System.out.println("afterProcessEvent, event="+event.getName()+",target="+event.getTarget());
}
}

12
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/UserPreference.java
View File

@ -56,14 +56,6 @@ public final class UserPreference implements Serializable {
/** Language Name Context **/ /** Language Name Context **/
public static final String LANGUAGE_NAME = "#LanguageName"; public static final String LANGUAGE_NAME = "#LanguageName";
/** window tab placement **/
public static final String P_WINDOW_TAB_PLACEMENT = "WindowTabPlacement";
public static final String DEFAULT_WINDOW_TAB_PLACEMENT = "Right";
/** window tab collapsible **/
public static final String P_WINDOW_TAB_COLLAPSIBLE = "WindowTabCollapsible";
public static final String DEFAULT_WINDOW_TAB_COLLAPSIBLE = "N";
/** Auto New **/ /** Auto New **/
public static final String P_AUTO_NEW = "AutoNew"; public static final String P_AUTO_NEW = "AutoNew";
public static final String DEFAULT_AUTO_NEW = "Y"; public static final String DEFAULT_AUTO_NEW = "Y";
@ -81,8 +73,6 @@ public final class UserPreference implements Serializable {
P_WAREHOUSE, P_WAREHOUSE,
P_AUTO_COMMIT, P_AUTO_COMMIT,
P_AUTO_NEW, P_AUTO_NEW,
P_WINDOW_TAB_PLACEMENT,
P_WINDOW_TAB_COLLAPSIBLE,
P_MENU_COLLAPSED}; P_MENU_COLLAPSED};
/** Ini Property Values */ /** Ini Property Values */
private static final String[] VALUES = new String[] { private static final String[] VALUES = new String[] {
@ -93,8 +83,6 @@ public final class UserPreference implements Serializable {
DEFAULT_WAREHOUSE, DEFAULT_WAREHOUSE,
DEFAULT_AUTO_COMMIT, DEFAULT_AUTO_COMMIT,
DEFAULT_AUTO_NEW, DEFAULT_AUTO_NEW,
DEFAULT_WINDOW_TAB_PLACEMENT,
DEFAULT_WINDOW_TAB_COLLAPSIBLE,
DEFAULT_MENU_COLLAPSED}; DEFAULT_MENU_COLLAPSED};
/** Container for Properties */ /** Container for Properties */

45
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ZkResourceLocator.java
View File

@ -1,45 +0,0 @@
/******************************************************************************
* Copyright (C) 2012 Heng Sin Low *
* Copyright (C) 2012 Trek Global *
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*****************************************************************************/
package org.adempiere.webui.util;
import java.net.URL;
import org.adempiere.webui.WebUIActivator;
import org.zkoss.util.resource.IResourceLocator;
/**
* @author hengsin
*
*/
public class ZkResourceLocator implements IResourceLocator {
private static ZkResourceLocator INSTANCE;
public ZkResourceLocator() {
INSTANCE = this;
}
/* (non-Javadoc)
* @see org.zkoss.util.resource.IResourceLocator#getResource(java.lang.String)
*/
@Override
public URL getResource(String name) {
return WebUIActivator.getBundleContext().getBundle().getEntry(name);
}
public static boolean isStarted() {
return INSTANCE != null;
}
}

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/CustomizeGridViewDialog.java
View File

@ -3,8 +3,8 @@ package org.adempiere.webui.window;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
import org.adempiere.webui.adwindow.GridView;
import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.GridPanel;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.adempiere.webui.panel.CustomizeGridViewPanel; import org.adempiere.webui.panel.CustomizeGridViewPanel;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -51,7 +51,7 @@ public class CustomizeGridViewDialog extends Window {
return customizePanel.isSaved(); return customizePanel.isSaved();
} }
public void setGridPanel(GridPanel gridPanel){ public void setGridPanel(GridView gridPanel){
customizePanel.setGridPanel(gridPanel); customizePanel.setGridPanel(gridPanel);
} }
@ -61,7 +61,7 @@ public class CustomizeGridViewDialog extends Window {
* @param AD_Tab_ID * @param AD_Tab_ID
* @param columnsWidth * @param columnsWidth
*/ */
public static boolean showCustomize (int WindowNo, int AD_Tab_ID, Map<Integer, String> columnsWidth,ArrayList<Integer> gridFieldIds,GridPanel gridPanel) public static boolean showCustomize (int WindowNo, int AD_Tab_ID, Map<Integer, String> columnsWidth,ArrayList<Integer> gridFieldIds,GridView gridPanel)
{ {
CustomizeGridViewDialog customizeWindow = new CustomizeGridViewDialog(WindowNo, AD_Tab_ID, Env.getAD_User_ID(Env.getCtx()), columnsWidth,gridFieldIds); CustomizeGridViewDialog customizeWindow = new CustomizeGridViewDialog(WindowNo, AD_Tab_ID, Env.getAD_User_ID(Env.getCtx()), columnsWidth,gridFieldIds);
customizeWindow.setGridPanel(gridPanel); customizeWindow.setGridPanel(gridPanel);

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
View File

@ -363,7 +363,8 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
Center center = new Center(); Center center = new Center();
layout.appendChild(center); layout.appendChild(center);
center.appendChild(contentSimple); center.appendChild(contentSimple);
center.setFlex(true); contentSimple.setVflex("1");
contentSimple.setHflex("1");
South south = new South(); South south = new South();
layout.appendChild(south); layout.appendChild(south);

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java
View File

@ -22,6 +22,7 @@ import java.sql.SQLException;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.util.Callback; import org.adempiere.util.Callback;
import org.adempiere.webui.adwindow.ADTabpanel;
import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.ConfirmPanel;
import org.adempiere.webui.component.Grid; import org.adempiere.webui.component.Grid;
@ -35,7 +36,6 @@ import org.adempiere.webui.editor.WEditor;
import org.adempiere.webui.editor.WebEditorFactory; import org.adempiere.webui.editor.WebEditorFactory;
import org.adempiere.webui.event.ValueChangeEvent; import org.adempiere.webui.event.ValueChangeEvent;
import org.adempiere.webui.event.ValueChangeListener; import org.adempiere.webui.event.ValueChangeListener;
import org.adempiere.webui.panel.ADTabpanel;
import org.adempiere.webui.panel.StatusBarPanel; import org.adempiere.webui.panel.StatusBarPanel;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.compiere.model.DataStatusEvent; import org.compiere.model.DataStatusEvent;

32
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPreference.java
View File

@ -13,9 +13,6 @@
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.window; package org.adempiere.webui.window;
import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.Listbox;
import org.adempiere.webui.component.ListboxFactory;
import org.adempiere.webui.component.ToolBar; import org.adempiere.webui.component.ToolBar;
import org.adempiere.webui.component.ToolBarButton; import org.adempiere.webui.component.ToolBarButton;
import org.adempiere.webui.editor.WYesNoEditor; import org.adempiere.webui.editor.WYesNoEditor;
@ -29,7 +26,6 @@ import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Div; import org.zkoss.zul.Div;
import org.zkoss.zul.Popup; import org.zkoss.zul.Popup;
import org.zkoss.zul.Separator; import org.zkoss.zul.Separator;
import org.zkoss.zul.Space;
/** /**
* *
@ -44,10 +40,8 @@ public class WPreference extends Popup implements EventListener<Event> {
private WYesNoEditor autoCommit; private WYesNoEditor autoCommit;
private WYesNoEditor autoNew; private WYesNoEditor autoNew;
private WYesNoEditor tabCollapsible;
private WYesNoEditor adempiereSys; private WYesNoEditor adempiereSys;
private WYesNoEditor logMigrationScript; private WYesNoEditor logMigrationScript;
private Listbox tabPlacement;
public WPreference() { public WPreference() {
super(); super();
@ -72,26 +66,6 @@ public class WPreference extends Popup implements EventListener<Event> {
div.appendChild(autoNew.getComponent()); div.appendChild(autoNew.getComponent());
this.appendChild(div); this.appendChild(div);
tabCollapsible = new WYesNoEditor("WindowTabCollapsible", Msg.getMsg(Env.getCtx(), "WindowTabCollapsible", true),
null, false, false, true);
tabCollapsible.getComponent().setTooltiptext(Msg.getMsg(Env.getCtx(), "WindowTabCollapsible", false));
div = new Div();
div.setStyle("background-color: transparent !important; border: none; margin: 5px;");
div.appendChild(tabCollapsible.getComponent());
this.appendChild(div);
div = new Div();
div.setStyle("background-color: transparent !important; border: none; margin: 5px;");
Label label = new Label(Msg.getMsg(Env.getCtx(), "WindowTabPlacement", true));
label.setTooltiptext(Msg.getMsg(Env.getCtx(), "WindowTabPlacement", false));
div.appendChild(label);
div.appendChild(new Space());
tabPlacement = ListboxFactory.newDropdownListbox();
tabPlacement.appendItem(Msg.getMsg(Env.getCtx(), "Left", true), "Left");
tabPlacement.appendItem(Msg.getMsg(Env.getCtx(), "Right", true), "Right");
div.appendChild(tabPlacement);
this.appendChild(div);
if (Env.getAD_Client_ID(Env.getCtx()) <= 20 && Env.getAD_User_ID(Env.getCtx()) <= 102) { if (Env.getAD_Client_ID(Env.getCtx()) <= 20 && Env.getAD_User_ID(Env.getCtx()) <= 102) {
adempiereSys = new WYesNoEditor("AdempiereSys", Msg.getMsg(Env.getCtx(), "AdempiereSys", true), adempiereSys = new WYesNoEditor("AdempiereSys", Msg.getMsg(Env.getCtx(), "AdempiereSys", true),
null, false, false, true); null, false, false, true);
@ -133,8 +107,6 @@ public class WPreference extends Popup implements EventListener<Event> {
UserPreference preference = SessionManager.getSessionApplication().getUserPreference(); UserPreference preference = SessionManager.getSessionApplication().getUserPreference();
autoCommit.setValue(preference.getProperty(UserPreference.P_AUTO_COMMIT)); autoCommit.setValue(preference.getProperty(UserPreference.P_AUTO_COMMIT));
autoNew.setValue(preference.getProperty(UserPreference.P_AUTO_NEW)); autoNew.setValue(preference.getProperty(UserPreference.P_AUTO_NEW));
tabCollapsible.setValue(preference.getProperty(UserPreference.P_WINDOW_TAB_COLLAPSIBLE));
tabPlacement.setValue(preference.getProperty(UserPreference.P_WINDOW_TAB_PLACEMENT));
} }
public void onEvent(Event event) throws Exception { public void onEvent(Event event) throws Exception {
@ -149,10 +121,6 @@ public class WPreference extends Popup implements EventListener<Event> {
(Boolean)autoCommit.getValue() ? "Y" : "N"); (Boolean)autoCommit.getValue() ? "Y" : "N");
preference.setProperty(UserPreference.P_AUTO_NEW, preference.setProperty(UserPreference.P_AUTO_NEW,
(Boolean)autoNew.getValue() ? "Y" : "N"); (Boolean)autoNew.getValue() ? "Y" : "N");
preference.setProperty(UserPreference.P_WINDOW_TAB_COLLAPSIBLE,
(Boolean)tabCollapsible.getValue() ? "Y" : "N");
preference.setProperty(UserPreference.P_WINDOW_TAB_PLACEMENT,
(String)tabPlacement.getSelectedItem().getValue());
preference.savePreference(); preference.savePreference();

14
org.adempiere.ui.zk/WEB-INF/zk.xml
View File

@ -12,13 +12,18 @@
</listener-class> </listener-class>
</listener> </listener>
<!-- uncomment following to debug server event flow -->
<!-- listener>
<listener-class>org.adempiere.webui.util.LogEventInterceptor</listener-class>
</listener -->
<log> <log>
<description>[Optional] Monitor i3-log.conf and register a <description>[Optional] Monitor i3-log.conf and register a
handler for the specified log-base</description> handler for the specified log-base</description>
<log-base></log-base> <log-base></log-base>
</log> </log>
<!-- change to false to use compress js which is much smaller --> <!-- false to use compress js which is much smaller. change to true if you need to debug -->
<client-config> <client-config>
<debug-js>false</debug-js> <debug-js>false</debug-js>
<processing-prompt-delay>500</processing-prompt-delay> <processing-prompt-delay>500</processing-prompt-delay>
@ -41,9 +46,10 @@
</system-config> </system-config>
--> -->
<system-config> <!-- uncomment the following for selenium testing -->
<!-- system-config>
<id-generator-class>org.adempiere.webui.AdempiereIdGenerator</id-generator-class> <id-generator-class>org.adempiere.webui.AdempiereIdGenerator</id-generator-class>
</system-config> </system-config -->
<!-- <!--
polling - org.zkoss.zkex.ui.impl.PollingServerPush polling - org.zkoss.zkex.ui.impl.PollingServerPush
@ -51,10 +57,10 @@
--> -->
<device-config> <device-config>
<device-type>ajax</device-type> <device-type>ajax</device-type>
<!-- <server-push-class>org.zkoss.zk.ui.impl.PollingServerPush</server-push-class> -->
<server-push-class>fi.jawsy.jawwa.zk.atmosphere.AtmosphereServerPush</server-push-class> <server-push-class>fi.jawsy.jawwa.zk.atmosphere.AtmosphereServerPush</server-push-class>
</device-config> </device-config>
<!-- true for better performance and lower resource usage -->
<system-config> <system-config>
<disable-event-thread>true</disable-event-thread> <disable-event-thread>true</disable-event-thread>
</system-config> </system-config>

BIN
org.adempiere.ui.zk/images/EditRecord16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 603 B

Some files were not shown because too many files have changed in this diff Show More