[Rt-commit] rt branch, 4.4/stacked-bar-chart, repushed
? sunnavy
sunnavy at bestpractical.com
Thu Jan 25 13:13:25 EST 2018
The branch 4.4/stacked-bar-chart was deleted and repushed:
was cb1b18e1e3aa905bad93bbe8259e4e81111b54b3
now 23bce9f7a5361c3300b7225760e7ecc3dc7c12a1
1: 9f1105626 ! 1: 1c6400626 basic stacked bar chart support
@@ -114,6 +114,30 @@
SearchType => 'Chart',
SearchFields => [@search_fields],
@@
+ Name => 'GroupBy',
+ Query => $query{Query},
+ Default => $query{'GroupBy'}[0],
++ Stacked => $query{'GroupBy'}[0] eq ($query{StackedGroupBy} // '') ? 1 : 0,
+ &>
+ </fieldset>
+ <fieldset><legend><% loc('and then') %></legend>
+@@
+ Query => $query{Query},
+ Default => $query{'GroupBy'}[1] // q{},
+ ShowEmpty => 1,
++ Stacked => $query{'GroupBy'}[1] && ($query{'GroupBy'}[1] eq $query{StackedGroupBy} // '') ? 1 : 0,
+ &>
+ </fieldset>
+ <fieldset><legend><% loc('and then') %></legend>
+@@
+ Query => $query{Query},
+ Default => $query{'GroupBy'}[2] // q{},
+ ShowEmpty => 1,
++ Stacked => $query{'GroupBy'}[2] && ($query{'GroupBy'}[2] eq ($query{StackedGroupBy}) // '') ? 1 : 0,
+ &>
+ </fieldset>
+ </&>
+@@
<script type="text/javascript">
var updateChartStyle = function() {
var val = jQuery(".chart-picture [name=ChartType]").val();
@@ -168,12 +192,20 @@
--- a/share/html/Search/Elements/SelectGroupBy
+++ b/share/html/Search/Elements/SelectGroupBy
@@
+ $Default => 'Status'
+ $Query => ''
+ $ShowEmpty => 0
++$Stacked => 0
+ </%args>
+ <select name="<% $Name %>" class="cascade-by-optgroup">
+ % if ( $ShowEmpty ) {
+@@
</optgroup>
% }
</select>
+
+<span class="stacked-group">
-+ <% loc('Stacked?') %> <input name="Stacked<% $Name %>" type="checkbox" class="stacked-group-checkbox" value="<% $Default %>" <% $DECODED_ARGS->{"Stacked$Name"} && $DECODED_ARGS->{"Stacked$Name"} eq ($Default||'') ? 'checked="checked"' : '' |n %>/>
++ <% loc('Stacked?') %> <input name="Stacked<% $Name %>" type="checkbox" class="stacked-group-checkbox" value="<% $Default %>" <% $Stacked ? 'checked="checked"' : '' |n %>/>
+</span>
+
<%init>
2: 598dc7e06 = 2: c4f1fdc72 increase chart width/height for better stacked bars rendering
3: cb1b18e1e = 3: 23bce9f7a silence "isn't numeric" warnings in GD::Graph for stacked bar charts
More information about the rt-commit
mailing list