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

IDEMPIERE-5402 Replace Jfree Chart with Billboard (#2165) 

* IDEMPIERE-5402 Replace Jfree Chart with Billboard

- Add client SysConfig definition

* - add deprecation warnings for deprecated keys
This commit is contained in:
Carlos Ruiz 2024-01-04 15:14:45 +01:00
parent f39dfd1dc3
commit bd18f2bd5d
4 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
migration/iD11/oracle/202312281615_IDEMPIERE-5402.sql Normal file
View File

@ -0,0 +1,14 @@
-- IDEMPIERE-5402 Replace Jfree Chart with Billboard
SELECT register_migration_script('202312281615_IDEMPIERE-5402.sql') FROM dual;
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Dec 28, 2023, 4:15:58 PM CET
INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200241,0,0,TO_TIMESTAMP('2023-12-28 16:15:57','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2023-12-28 16:15:57','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','CHART_MIN_WIDTH_3_PERIOD','230','D','C','7476f049-f648-4e25-8ab6-f975e5d0a875')
;
-- Dec 28, 2023, 4:16:09 PM CET
INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200242,0,0,TO_TIMESTAMP('2023-12-28 16:16:09','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2023-12-28 16:16:09','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','CHART_MIN_WIDTH_6_PERIOD','320','D','C','16da07e3-5862-4cbd-9dd5-78f4e3095905')
;

11
migration/iD11/postgresql/202312281615_IDEMPIERE-5402.sql Normal file
View File

@ -0,0 +1,11 @@
-- IDEMPIERE-5402 Replace Jfree Chart with Billboard
SELECT register_migration_script('202312281615_IDEMPIERE-5402.sql') FROM dual;
-- Dec 28, 2023, 4:15:58 PM CET
INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200241,0,0,TO_TIMESTAMP('2023-12-28 16:15:57','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2023-12-28 16:15:57','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','CHART_MIN_WIDTH_3_PERIOD','230','D','C','7476f049-f648-4e25-8ab6-f975e5d0a875')
;
-- Dec 28, 2023, 4:16:09 PM CET
INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200242,0,0,TO_TIMESTAMP('2023-12-28 16:16:09','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2023-12-28 16:16:09','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','CHART_MIN_WIDTH_6_PERIOD','320','D','C','16da07e3-5862-4cbd-9dd5-78f4e3095905')
;

11
org.adempiere.base/src/org/compiere/model/MSysConfig.java
View File

@ -44,7 +44,7 @@ public class MSysConfig extends X_AD_SysConfig
/**
*
*/
private static final long serialVersionUID = 7338447655641380126L;
private static final long serialVersionUID = 4879268878721712444L;
/** Constant for Predefine System Configuration Names (in alphabetical order) */
@ -56,7 +56,8 @@ public class MSysConfig extends X_AD_SysConfig
public static final String ALLOW_OVER_APPLIED_PAYMENT = "ALLOW_OVER_APPLIED_PAYMENT";
public static final String ALLOW_REVERSAL_OF_RECONCILED_PAYMENT = "ALLOW_REVERSAL_OF_RECONCILED_PAYMENT";
public static final String ALogin_ShowDate = "ALogin_ShowDate";
public static final String ALogin_ShowOneRole = "ALogin_ShowOneRole"; // deprecated
@Deprecated(forRemoval = true, since = "11")
public static final String ALogin_ShowOneRole = "ALogin_ShowOneRole";
public static final String APPLICATION_DATABASE_VERSION = "APPLICATION_DATABASE_VERSION";
public static final String APPLICATION_DATABASE_VERSION_SHOWN = "APPLICATION_DATABASE_VERSION_SHOWN";
public static final String APPLICATION_HOST_SHOWN = "APPLICATION_HOST_SHOWN";
@ -84,6 +85,8 @@ public class MSysConfig extends X_AD_SysConfig
public static final String CALENDAR_ALTERNATE_TIMEZONE = "CALENDAR_ALTERNATE_TIMEZONE";
public static final String CASH_AS_PAYMENT = "CASH_AS_PAYMENT";
public static final String CHANGE_PASSWORD_MUST_DIFFER = "CHANGE_PASSWORD_MUST_DIFFER";
public static final String CHART_MIN_WIDTH_3_PERIOD = "CHART_MIN_WIDTH_3_PERIOD";
public static final String CHART_MIN_WIDTH_6_PERIOD = "CHART_MIN_WIDTH_6_PERIOD";
public static final String CHECK_CREDIT_ON_CASH_POS_ORDER = "CHECK_CREDIT_ON_CASH_POS_ORDER";
public static final String CHECK_CREDIT_ON_PREPAY_ORDER = "CHECK_CREDIT_ON_PREPAY_ORDER";
public static final String CLIENT_ACCOUNTING = "CLIENT_ACCOUNTING";
@ -120,7 +123,9 @@ public class MSysConfig extends X_AD_SysConfig
public static final String IBAN_VALIDATION = "IBAN_VALIDATION";
public static final String IDENTIFIER_SEPARATOR = "IDENTIFIER_SEPARATOR";
public static final String IMAGE_DB_STORAGE_SAVE_AS_ZIP = "IMAGE_DB_STORAGE_SAVE_AS_ZIP";
@Deprecated(forRemoval = true, since = "11")
public static final String INFO_DEFAULTSELECTED = "INFO_DEFAULTSELECTED";
@Deprecated(forRemoval = true, since = "11")
public static final String INFO_DOUBLECLICKTOGGLESSELECTION = "INFO_DOUBLECLICKTOGGLESSELECTION";
public static final String INFO_PRODUCT_SHOW_PRODUCTS_WITHOUT_PRICE = "INFO_PRODUCT_SHOW_PRODUCTS_WITHOUT_PRICE";
public static final String Invoice_ReverseUseNewNumber = "Invoice_ReverseUseNewNumber";
@ -186,7 +191,7 @@ public class MSysConfig extends X_AD_SysConfig
public static final String SYSTEM_INSERT_CHANGELOG = "SYSTEM_INSERT_CHANGELOG";
public static final String SYSTEM_NATIVE_SEQUENCE = "SYSTEM_NATIVE_SEQUENCE";
public static final String SSO_SELECT_ROLE = "SSO_SELECT_ROLE";
public static final String TAX_LOOKUP_SERVICE="TAX_LOOKUP_SERVICE";
public static final String TAX_LOOKUP_SERVICE = "TAX_LOOKUP_SERVICE";
public static final String TOP_MARGIN_PIXELS_FOR_HEADER = "TOP_MARGIN_PIXELS_FOR_HEADER";
public static final String TRACE_ALL_TRX_CONNECTION_GET = "TRACE_ALL_TRX_CONNECTION_GET";
public static final String TRX_AUTOSET_DISPLAY_NAME = "TRX_AUTOSET_DISPLAY_NAME";

4
org.idempiere.zk.billboard.chart/src/org/idempiere/zk/billboard/chart/ChartRendererServiceImpl.java
View File

@ -108,9 +108,9 @@ public class ChartRendererServiceImpl implements IChartRendererService {
billboard.setTimeSeries(true);
int noOfPeriod = 0;
if (width < MSysConfig.getIntValue("CHART_MIN_WIDTH_3_PERIOD", 230, chartModel.chart.getAD_Client_ID()))
if (width < MSysConfig.getIntValue(MSysConfig.CHART_MIN_WIDTH_3_PERIOD, 230, chartModel.chart.getAD_Client_ID()))
noOfPeriod = 3;
else if (width < MSysConfig.getIntValue("CHART_MIN_WIDTH_6_PERIOD", 320, chartModel.chart.getAD_Client_ID()))
else if (width < MSysConfig.getIntValue(MSysConfig.CHART_MIN_WIDTH_6_PERIOD, 320, chartModel.chart.getAD_Client_ID()))
noOfPeriod = 6;
Calendar c = Calendar.getInstance();