From fa8188043c167e08435f0917abb2890c810534c7 Mon Sep 17 00:00:00 2001 From: hieplq Date: Fri, 16 Sep 2016 12:47:07 +0700 Subject: [PATCH] IDEMPIERE-3191:time to update performance gadget should use configuration --- org.adempiere.base/src/org/compiere/model/MGoal.java | 11 +++++++++-- .../src/org/compiere/model/MSysConfig.java | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MGoal.java b/org.adempiere.base/src/org/compiere/model/MGoal.java index be8ff1d75a..7ab7b9bef7 100644 --- a/org.adempiere.base/src/org/compiere/model/MGoal.java +++ b/org.adempiere.base/src/org/compiere/model/MGoal.java @@ -30,7 +30,6 @@ import org.compiere.util.CLogger; import org.compiere.util.DB; import org.compiere.util.Env; import org.compiere.util.Msg; -import org.compiere.util.TimeUtil; /** * Performance Goal @@ -373,9 +372,17 @@ public class MGoal extends X_PA_Goal { if (log.isLoggable(Level.CONFIG)) log.config("Force=" + force); MMeasure measure = MMeasure.get(getCtx(), getPA_Measure_ID()); + + boolean isUpdateByInterfal = false; + if (getDateLastRun() != null){ + // default 30 minute 1800000 + long interval = MSysConfig.getIntValue(MSysConfig.ZK_DASHBOARD_PERFORMANCE_REFRESH_INTERVAL, 1800000); + isUpdateByInterfal = (System.currentTimeMillis() - getDateLastRun().getTime()) > interval; + } + if (force || getDateLastRun() == null - || !TimeUtil.isSameHour(getDateLastRun(), null)) + || isUpdateByInterfal) { measure.set_TrxName(get_TrxName()); if (measure.updateGoals()) // saves diff --git a/org.adempiere.base/src/org/compiere/model/MSysConfig.java b/org.adempiere.base/src/org/compiere/model/MSysConfig.java index 7240006485..656688101e 100644 --- a/org.adempiere.base/src/org/compiere/model/MSysConfig.java +++ b/org.adempiere.base/src/org/compiere/model/MSysConfig.java @@ -147,6 +147,7 @@ public class MSysConfig extends X_AD_SysConfig public static final String ZK_BUTTON_STYLE = "ZK_BUTTON_STYLE"; public static final String ZK_DASHBOARD_CALENDAR_REQUEST_DISPLAY_MODE = "ZK_DASHBOARD_CALENDAR_REQUEST_DISPLAY_MODE"; public static final String ZK_DASHBOARD_PERFORMANCE_TIMEOUT = "ZK_DASHBOARD_PERFORMANCE_TIMEOUT"; + public static final String ZK_DASHBOARD_PERFORMANCE_REFRESH_INTERVAL = "ZK_DASHBOARD_PERFORMANCE_REFRESH_INTERVAL"; public static final String ZK_DASHBOARD_REFRESH_INTERVAL = "ZK_DASHBOARD_REFRESH_INTERVAL"; public static final String ZK_DECIMALBOX_PROCESS_DOTKEYPAD = "ZK_DECIMALBOX_PROCESS_DOTKEYPAD"; public static final String ZK_DESKTOP_CLASS = "ZK_DESKTOP_CLASS";