Commit 17d59d3a authored by Frank Bergmann's avatar Frank Bergmann

Added interval and fact dimension filters for revenue chart

parent 8c3e2dfa
......@@ -78,6 +78,46 @@ Ext.onReady(function () {
renderTo: '@diagram_id@',
layout: 'fit',
header: false,
tbar: [
{
xtype: 'combo',
editable: false,
fieldLabel: '<%=[lang::message::lookup "" intranet-reporting-dashboard.Interval Interval]%>',
store: revenueByYearsIntervalStore,
mode: 'local',
displayField: 'display',
valueField: 'value',
triggerAction: 'all',
width: 250,
forceSelection: true,
value: '@diagram_default_interval@',
listeners:{select:{fn:function(combo, comboValues) {
var value = comboValues[0].data.value;
var extraParams = revenueByYearsStore.getProxy().extraParams;
extraParams.diagram_interval = value;
revenueByYearsStore.load();
}}}
}, '->',
{
xtype: 'combo',
editable: false,
fieldLabel: '<%=[lang::message::lookup "" intranet-reporting-dashboard.Fact_Dimension "Fact Dimension"]%>',
store: revenueByYearsFactStore,
mode: 'local',
displayField: 'display',
valueField: 'value',
triggerAction: 'all',
width: 250,
forceSelection: true,
value: '@diagram_default_fact@',
listeners:{select:{fn:function(combo, comboValues) {
var value = comboValues[0].data.value;
var extraParams = revenueByYearsStore.getProxy().extraParams;
extraParams.diagram_fact = value;
revenueByYearsStore.load();
}}}
}
],
items: revenueByYearsChart
});
......
......@@ -31,6 +31,8 @@ set default_currency [im_parameter -package_id [im_package_cost_id] "DefaultCurr
# Get the list of all years
set year_list [db_list year_list "select distinct 'invoices_' || to_char(im_month_enumerator, 'YYYY') as year from im_month_enumerator(:diagram_min_start_date::date, now()::date) order by year"]
# Fraber 2023-03-31: Why added a year_name?
set year_list_names [db_list year_list_names "select distinct to_char(im_month_enumerator, 'YYYY') as year from im_month_enumerator(:diagram_min_start_date::date, now()::date) order by year"]
set year_list_json "\['[join $year_list "', '"]'\]"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment