@datarailsshared/dr_renderer 1.2.54 → 1.2.55

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/highcharts_renderer.js +34 -187
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@datarailsshared/dr_renderer",
3
- "version": "1.2.54",
3
+ "version": "1.2.55",
4
4
  "description": "DataRails charts and tables renderer",
5
5
  "keywords": [
6
6
  "datarails",
package/src/highcharts_renderer.js CHANGED
@@ -1132,33 +1132,34 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
1132
1132
 
1133
1133
  let weights = { line: 2,spline: 3 ,area:-2, areaspline: -1, scatter:4, column: 1 };
1134
1134
 
1135
- if (opts.comboOptions && opts.comboOptions.seriesOptions.length && chartType.includes('combo')) {
1136
- opts.comboOptions.seriesOptions.forEach(option => {
1137
- chart_series.forEach(series => {
1138
- if (option.series === series.name) {
1139
- switch (option.chartType) {
1140
- case 'line-chart':
1141
- series.type = 'line';
1142
- break;
1143
- case 'line-chart-smooth':
1144
- series.type = 'spline';
1145
- break;
1146
- case 'area-chart':
1147
- series.type = 'area';
1148
- break;
1149
- case 'area-chart-smooth':
1150
- series.type = 'areaspline';
1151
- break;
1152
- case 'scatter-chart':
1153
- series.type = 'scatter';
1154
- break;
1155
- case 'column-chart' || 'column-chart-stacked':
1156
- delete series.type;
1157
- break;
1158
- }
1135
+ if (opts.comboOptions && chartType.includes('combo')) {
1136
+ chart_series.forEach((series, seriesIndex) => {
1137
+ const savedSeriesOption = lodash.find(opts.comboOptions.seriesOptions, {series: series.name});
1138
+ if (savedSeriesOption) {
1139
+ switch (savedSeriesOption.chartType) {
1140
+ case 'line-chart':
1141
+ series.type = 'line';
1142
+ break;
1143
+ case 'line-chart-smooth':
1144
+ series.type = 'spline';
1145
+ break;
1146
+ case 'area-chart':
1147
+ series.type = 'area';
1148
+ break;
1149
+ case 'area-chart-smooth':
1150
+ series.type = 'areaspline';
1151
+ break;
1152
+ case 'scatter-chart':
1153
+ series.type = 'scatter';
1154
+ break;
1155
+ case 'column-chart' || 'column-chart-stacked':
1156
+ delete series.type;
1157
+ break;
1159
1158
  }
1160
- })
1161
- })
1159
+ } else if (seriesIndex === chart_series.length - 1 && !has_delta) {
1160
+ series.type = 'line';
1161
+ }
1162
+ });
1162
1163
  }
1163
1164
 
1164
1165
  if (opts.total) {
@@ -1219,7 +1220,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
1219
1220
  };
1220
1221
  } else if (delta_column_options.chart == 'column' || delta_column_options.chart == 'combo') {
1221
1222
  series.type = 'column';
1222
- } else if (delta_column_options.chart == 'spline') {
1223
+ } else if (delta_column_options.chart == '' || delta_column_options == 'scatter-chart') {
1223
1224
  series.type = 'spline';
1224
1225
  series.lineWidth = 0;
1225
1226
  series.lineColor = varianceColor;
@@ -1265,9 +1266,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
1265
1266
  } else if (delta_column_options.chart == 'areaspline') {
1266
1267
  series.color = varianceColor;
1267
1268
  series.type = 'areaspline'
1268
- } else if (delta_column_options.chart == 'scatter-chart') {
1269
+ } else if (delta_column_options.chart == 'spline') {
1269
1270
  series.color = varianceColor;
1270
- series.type = 'scatter-chart'
1271
+ series.type = 'spline'
1271
1272
  }
1272
1273
  return series;
1273
1274
  }
@@ -5665,160 +5666,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
5665
5666
  value_name: 'is_percentage',
5666
5667
  default_value: false,
5667
5668
  hidden: true,
5668
- }, {
5669
- element_type: 'checkbox',
5670
- element_label: 'Sort by variance',
5671
- value_name: 'sort_by_variance',
5672
- default_value: false
5673
- }, {
5674
- element_type: 'checkbox',
5675
- element_label: 'Sort by absolute variance',
5676
- value_name: 'sort_by_absolute_variance',
5677
- default_value: false
5678
- }, {
5679
- element_type: 'checkbox',
5680
- element_label: 'Filter zero values',
5681
- value_name: 'is_filter_zero',
5682
- default_value: false
5683
- }]
5684
- },
5685
- 'delta_column_combo': {
5686
- category_class: 'google-visualization-charteditor-mini-more',
5687
- category_label: 'Variance',
5688
- category_type: 'delta_column',
5689
- elements: [{
5690
- element_type: 'radio',
5691
- value_name: 'field',
5692
- element_label: 'Select Field',
5693
- element_options: [
5694
- {label: 'None', value: ''},
5695
- {label: 'Axis', value: 'category'},
5696
- {label: 'Legend', value: 'series'},
5697
- ],
5698
- default_value: ''
5699
- }, {
5700
- element_type: 'input',
5701
- value_name: 'name',
5702
- element_label: 'Name',
5703
- default_value: '_Variance'
5704
- }, {
5705
- element_type: 'input',
5706
- value_name: 'formula',
5707
- element_label: 'Formula',
5708
- default_value: 'x2-x1'
5709
- }, {
5710
- hidden: true,
5711
- element_type: 'radio',
5712
- value_name: 'chart',
5713
- element_label: 'Chart',
5714
- element_options: [
5715
- {label: 'Markers', value: ''},
5716
- {label: 'Line', value: 'line'},
5717
- {label: 'Smooth Line', value: 'spline'},
5718
- {label: 'Column', value: 'column'},
5719
- {label: 'Area', value: 'area'},
5720
- {label: 'Smooth Area', value: 'areaspline'},
5721
- ],
5722
- default_value: ''
5723
- }, {
5724
- element_type: 'checkbox',
5725
- element_label: 'Only variance',
5726
- value_name: 'only_variant',
5727
- default_value: false
5728
- }, {
5729
- element_type: 'checkbox',
5730
- element_label: 'Same yAxis',
5731
- value_name: 'same_yaxis',
5732
- default_value: false,
5733
- hidden: true,
5734
- }, {
5735
- element_type: 'checkbox',
5736
- element_label: 'Same xAxis',
5737
- value_name: 'same_xaxis',
5738
- default_value: false
5739
- }, {
5740
- element_type: 'checkbox',
5741
- element_label: 'Percentage',
5742
- value_name: 'is_percentage',
5743
- default_value: false,
5744
- hidden: true,
5745
- }, {
5746
- element_type: 'checkbox',
5747
- element_label: 'Sort by variance',
5748
- value_name: 'sort_by_variance',
5749
- default_value: false
5750
- }, {
5751
- element_type: 'checkbox',
5752
- element_label: 'Sort by absolute variance',
5753
- value_name: 'sort_by_absolute_variance',
5754
- default_value: false
5755
- }]
5756
- },
5757
- 'delta_column_for_drill_down_combo': {
5758
- category_class: 'google-visualization-charteditor-mini-more',
5759
- category_label: 'Variance',
5760
- category_type: 'delta_column',
5761
- elements: [{
5762
- element_type: 'radio',
5763
- value_name: 'field',
5764
- element_label: 'Select Field',
5765
- element_options: [
5766
- {label: 'None', value: ''},
5767
- {label: 'Axis', value: 'category'},
5768
- {label: 'Legend', value: 'series'},
5769
- ],
5770
- default_value: ''
5771
- }, {
5772
- element_type: 'input',
5773
- value_name: 'name',
5774
- element_label: 'Name',
5775
- default_value: '_Variance'
5776
- }, {
5777
- element_type: 'input',
5778
- value_name: 'formula',
5779
- element_label: 'Formula',
5780
- default_value: 'x2-x1'
5781
- }, {
5782
- element_type: 'input',
5783
- value_name: 'color',
5784
- element_label: 'Color',
5785
- default_value: ''
5786
- }, {
5787
- hidden: true,
5788
- element_type: 'radio',
5789
- value_name: 'chart',
5790
- element_label: 'Chart',
5791
- element_options: [
5792
- {label: 'Markers', value: ''},
5793
- {label: 'Line', value: 'line'},
5794
- {label: 'Smooth Line', value: 'spline'},
5795
- {label: 'Column', value: 'column'},
5796
- {label: 'Area', value: 'area'},
5797
- {label: 'Smooth Area', value: 'areaspline'},
5798
- ],
5799
- default_value: ''
5800
- }, {
5801
- element_type: 'checkbox',
5802
- element_label: 'Only variance',
5803
- value_name: 'only_variant',
5804
- default_value: false
5805
- }, {
5806
- element_type: 'checkbox',
5807
- element_label: 'Same yAxis',
5808
- value_name: 'same_yaxis',
5809
- default_value: false,
5810
- hidden: true,
5811
- }, {
5812
- element_type: 'checkbox',
5813
- element_label: 'Same xAxis',
5814
- value_name: 'same_xaxis',
5815
- default_value: false
5816
- }, {
5817
- element_type: 'checkbox',
5818
- element_label: 'Percentage',
5819
- value_name: 'is_percentage',
5820
- default_value: false,
5821
- hidden: true,
5822
5669
  }, {
5823
5670
  element_type: 'checkbox',
5824
5671
  element_label: 'Sort by variance',
@@ -5896,8 +5743,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
5896
5743
 
5897
5744
  highchartsRenderer.chartsTypesInfo = {
5898
5745
  'combo-chart': {
5899
- name: 'Column Combo Chart ',
5900
- label: 'Column Combo Chart ',
5746
+ name: 'Combo Chart ',
5747
+ label: 'Combo Chart ',
5901
5748
  title: 'Allows for multiple chart display formats in one widget',
5902
5749
  description: 'For example, Revenue and Cost of goods sold as clomuns, and Gross margin as a line',
5903
5750
  axisName: 'X - Axis',
@@ -6157,7 +6004,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
6157
6004
  highchartsRenderer.suboptions["table_options_transpose"],
6158
6005
  highchartsRenderer.suboptions["chart_grid"],
6159
6006
  highchartsRenderer.suboptions["negative_number_format"],
6160
- highchartsRenderer.suboptions["delta_column_combo"],
6007
+ highchartsRenderer.suboptions["delta_column"],
6161
6008
  highchartsRenderer.suboptions["error_policy"],
6162
6009
  highchartsRenderer.suboptions["from_version"],
6163
6010
  highchartsRenderer.suboptions["legends"],
@@ -6184,7 +6031,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
6184
6031
  highchartsRenderer.suboptions["table_options"],
6185
6032
  highchartsRenderer.suboptions["chart"],
6186
6033
  highchartsRenderer.suboptions["negative_number_format"],
6187
- highchartsRenderer.suboptions["delta_column_for_drill_down_combo"],
6034
+ highchartsRenderer.suboptions["delta_column_for_drill_down"],
6188
6035
  highchartsRenderer.suboptions["error_policy"],
6189
6036
  highchartsRenderer.suboptions["from_version"],
6190
6037
  highchartsRenderer.suboptions["legends"],