From 946730f1be71585d26a71aa152dc7e97f2771b59 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 8 Feb 2023 08:47:05 +0100 Subject: [PATCH] IDEMPIERE-5443 Date Range Filter Component / SystemIDs (#1664) - minor change - reorganize SystemIDs --- .../src/org/compiere/model/SystemIDs.java | 4 ++++ .../org/adempiere/webui/window/DateRangePicker.java | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/SystemIDs.java b/org.adempiere.base/src/org/compiere/model/SystemIDs.java index 4b8e8a76a2..929e80c68e 100644 --- a/org.adempiere.base/src/org/compiere/model/SystemIDs.java +++ b/org.adempiere.base/src/org/compiere/model/SystemIDs.java @@ -169,17 +169,21 @@ public class SystemIDs public final static int REFERENCE_ASSIGNMENT = 200181; public final static int REFERENCE_C_DOCTYPE = 170; public final static int REFERENCE_CHART = 200183; + public final static int REFERENCE_DATESELECTIONMODE = 200217; public final static int REFERENCE_DOCUMENTACTION = 135; public final static int REFERENCE_DOCUMENTSTATUS = 131; public final static int REFERENCE_IMAGE = 200182; public final static int REFERENCE_IMPORT_MODE = 200098; public final static int REFERENCE_LOCATION = 133; public final static int REFERENCE_LOCATOR = 191; + public final static int REFERENCE_MONTHS = 200221; public final static int REFERENCE_PATTRIBUTE = 200180; public final static int REFERENCE_PAYMENTRULE = 195; public final static int REFERENCE_POSTED = 234; public final static int REFERENCE_POSTING_TYPE = 125; + public final static int REFERENCE_QUARTERS = 200222; public final static int REFERENCE_SQLORDERBY = 53296; + public final static int REFERENCE_TIMEUNIT = 53376; public final static int REFERENCE_WFINSTANCE_STATE = 305; public final static int REFERENCE_WIZARDSTATUS = 200003; public final static int REFERENCE_YESNO = 319; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java index 1e3b294f2f..f3989cd65b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/DateRangePicker.java @@ -24,6 +24,11 @@ **********************************************************************/ package org.adempiere.webui.window; +import static org.compiere.model.SystemIDs.REFERENCE_DATESELECTIONMODE; +import static org.compiere.model.SystemIDs.REFERENCE_MONTHS; +import static org.compiere.model.SystemIDs.REFERENCE_QUARTERS; +import static org.compiere.model.SystemIDs.REFERENCE_TIMEUNIT; + import java.sql.Timestamp; import java.util.ArrayList; import java.util.Calendar; @@ -75,18 +80,12 @@ import org.zkoss.zul.Spinner; * */ public class DateRangePicker extends Popup implements EventListener, ValueChangeListener { - /** * */ - private static final long serialVersionUID = -7959690713224781610L; + private static final long serialVersionUID = -1674676283499219325L; // AD_Reference_ID - private static final int REFERENCE_TIMEUNIT = 53376; - private static final int REFERENCE_DATESELECTIONMODE = 200217; - private static final int REFERENCE_MONTHS = 200221; - private static final int REFERENCE_QUARTERS = 200222; - private static final String DATESELECTIONMODE_PREVIOUS = "01"; private static final String DATESELECTIONMODE_NEXT = "02"; private static final String DATESELECTIONMODE_CURRENT = "03";