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

Implemented login date support, set zk component id prefix for selenium test support.

This commit is contained in:
Heng Sin Low 2011-02-07 17:58:26 +08:00
parent 23bd9decf2
commit ba9cc04439
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
View File

@ -23,9 +23,11 @@
package org.adempiere.webui.panel; package org.adempiere.webui.panel;
import java.sql.Timestamp;
import java.util.Properties; import java.util.Properties;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import org.adempiere.webui.AdempiereIdGenerator;
import org.adempiere.webui.LayoutUtils; import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.component.ComboItem; import org.adempiere.webui.component.ComboItem;
import org.adempiere.webui.component.Combobox; import org.adempiere.webui.component.Combobox;
@ -38,6 +40,7 @@ import org.adempiere.webui.theme.ITheme;
import org.adempiere.webui.theme.ThemeManager; import org.adempiere.webui.theme.ThemeManager;
import org.adempiere.webui.util.UserPreference; import org.adempiere.webui.util.UserPreference;
import org.adempiere.webui.window.LoginWindow; import org.adempiere.webui.window.LoginWindow;
import org.adempiere.webui.editor.WDateEditor;
import org.compiere.model.MRole; import org.compiere.model.MRole;
import org.compiere.model.MSysConfig; import org.compiere.model.MSysConfig;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -82,7 +85,8 @@ public class RolePanel extends Window implements EventListener, Deferrable
private KeyNamePair rolesKNPairs[]; private KeyNamePair rolesKNPairs[];
private Combobox lstRole, lstClient, lstOrganisation, lstWarehouse; private Combobox lstRole, lstClient, lstOrganisation, lstWarehouse;
private Label lblRole, lblClient, lblOrganisation, lblWarehouse; private Label lblRole, lblClient, lblOrganisation, lblWarehouse, lblDate;
private WDateEditor lstDate;
private Button btnOk, btnCancel; private Button btnOk, btnCancel;
public RolePanel(Properties ctx, LoginWindow loginWindow, String userName, String password) public RolePanel(Properties ctx, LoginWindow loginWindow, String userName, String password)
@ -176,6 +180,18 @@ public class RolePanel extends Window implements EventListener, Deferrable
tr.appendChild(td); tr.appendChild(td);
td.appendChild(lstWarehouse); td.appendChild(lstWarehouse);
tr = new Tr();
tr.setId("rowDate");
table.appendChild(tr);
td = new Td();
tr.appendChild(td);
td.setSclass(ITheme.LOGIN_LABEL_CLASS);
td.appendChild(lblDate.rightAlign());
td = new Td();
td.setSclass(ITheme.LOGIN_FIELD_CLASS);
tr.appendChild(td);
td.appendChild(lstDate.getComponent());
div = new Div(); div = new Div();
div.setSclass(ITheme.LOGIN_BOX_FOOTER_CLASS); div.setSclass(ITheme.LOGIN_BOX_FOOTER_CLASS);
ConfirmPanel pnlButtons = new ConfirmPanel(true); ConfirmPanel pnlButtons = new ConfirmPanel(true);
@ -210,10 +226,16 @@ public class RolePanel extends Window implements EventListener, Deferrable
lblWarehouse.setId("lblWarehouse"); lblWarehouse.setId("lblWarehouse");
lblWarehouse.setValue(res.getString("Warehouse")); lblWarehouse.setValue(res.getString("Warehouse"));
lblDate = new Label();
lblDate.setId("lblDate");
lblDate.setValue(res.getString("Date"));
lstRole = new Combobox(); lstRole = new Combobox();
lstRole.setAutocomplete(true); lstRole.setAutocomplete(true);
lstRole.setAutodrop(true); lstRole.setAutodrop(true);
lstRole.setId("lstRole"); lstRole.setId("lstRole");
lstRole.setAttribute(AdempiereIdGenerator.ZK_COMPONENT_PREFIX_ATTRIBUTE, lstRole.getId());
lstRole.addEventListener(Events.ON_SELECT, this); lstRole.addEventListener(Events.ON_SELECT, this);
lstRole.setWidth("220px"); lstRole.setWidth("220px");
@ -221,6 +243,8 @@ public class RolePanel extends Window implements EventListener, Deferrable
lstClient.setAutocomplete(true); lstClient.setAutocomplete(true);
lstClient.setAutodrop(true); lstClient.setAutodrop(true);
lstClient.setId("lstClient"); lstClient.setId("lstClient");
lstClient.setAttribute(AdempiereIdGenerator.ZK_COMPONENT_PREFIX_ATTRIBUTE, lstClient.getId());
lstClient.addEventListener(Events.ON_SELECT, this); lstClient.addEventListener(Events.ON_SELECT, this);
lstClient.setWidth("220px"); lstClient.setWidth("220px");
@ -228,6 +252,8 @@ public class RolePanel extends Window implements EventListener, Deferrable
lstOrganisation.setAutocomplete(true); lstOrganisation.setAutocomplete(true);
lstOrganisation.setAutodrop(true); lstOrganisation.setAutodrop(true);
lstOrganisation.setId("lstOrganisation"); lstOrganisation.setId("lstOrganisation");
lstOrganisation.setAttribute(AdempiereIdGenerator.ZK_COMPONENT_PREFIX_ATTRIBUTE, lstOrganisation.getId());
lstOrganisation.addEventListener(Events.ON_SELECT, this); lstOrganisation.addEventListener(Events.ON_SELECT, this);
lstOrganisation.setWidth("220px"); lstOrganisation.setWidth("220px");
@ -235,9 +261,14 @@ public class RolePanel extends Window implements EventListener, Deferrable
lstWarehouse.setAutocomplete(true); lstWarehouse.setAutocomplete(true);
lstWarehouse.setAutodrop(true); lstWarehouse.setAutodrop(true);
lstWarehouse.setId("lstWarehouse"); lstWarehouse.setId("lstWarehouse");
lstWarehouse.setAttribute(AdempiereIdGenerator.ZK_COMPONENT_PREFIX_ATTRIBUTE, lstWarehouse.getId());
lstWarehouse.addEventListener(Events.ON_SELECT, this); lstWarehouse.addEventListener(Events.ON_SELECT, this);
lstWarehouse.setWidth("220px"); lstWarehouse.setWidth("220px");
lstDate = new WDateEditor();
lstDate.setValue(new Timestamp(System.currentTimeMillis()));
btnOk = new Button(); btnOk = new Button();
btnOk.setId("btnOk"); btnOk.setId("btnOk");
btnOk.setLabel("Ok"); btnOk.setLabel("Ok");
@ -428,7 +459,10 @@ public class RolePanel extends Window implements EventListener, Deferrable
throw new WrongValueException(msg); throw new WrongValueException(msg);
} }
msg = login.loadPreferences(orgKNPair, warehouseKNPair, null, null); Timestamp date = (Timestamp)lstDate.getValue();
msg = login.loadPreferences(orgKNPair, warehouseKNPair, date, null);
if(!(msg == null || msg.length() == 0)) if(!(msg == null || msg.length() == 0))
{ {
throw new WrongValueException(msg); throw new WrongValueException(msg);