Commit d3e301af authored by Kevin Yumang's avatar Kevin Yumang

SERV-2286 - bar chart element configuration WIP

parent b1e2d700
<div class="chart-container"> <div class="chart-container">
<div class="chart has-fixed-height LimitlessLineChart" <div class="chart has-fixed-height LimitlessBarChart"
charts="{{ $charts }}" title="{{ $title }}"
titles="{{ json_encode($titles) }}"
colors="{{ json_encode($colors) }}" colors="{{ json_encode($colors) }}"
point-values="{{ $pointValues }}" bar-values="{{ $barValues }}"
boundary-gap="{{ $boundaryGap }}"
inverted="{{ $inverted }}" inverted="{{ $inverted }}"
data-zoom="{{ $dataZoom }}"
stacked="{{ $stacked }}" stacked="{{ $stacked }}"
is-area="{{ $isArea }}"
animation-duration="{{ $animationDuration }}" animation-duration="{{ $animationDuration }}"
@if($yAxisLabelValueFormat != null) y-axis-label-value-format="{{ $yAxisLabelValueFormat }}" @endif @if($yAxisLabelValueFormat != null) y-axis-label-value-format="{{ $yAxisLabelValueFormat }}" @endif
@if($markLine != null) mark-line="{{ $markLine }}" @endif @if($markLine != null) mark-line="{{ $markLine }}" @endif
categories="{{ json_encode($categories) }}" categories="{{ json_encode($categories) }}"
series="{{ json_encode($series) }}" series="{{ json_encode($series) }}"
raw="{{ $raw }}" raw="{{ json_encode(json_decode($raw)) }}"
> >
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -63,16 +63,12 @@ ...@@ -63,16 +63,12 @@
*/ */
public function barChart($parameters) public function barChart($parameters)
{ {
return View('Limitless::Barchart.barChart') return View('Limitless::Barchart.BarChart')
->withCharts($parameters['charts'] ?? 1) ->withTitle($parameters['title'] ?? null)
->withTitles($parameters['titles'] ?? null)
->withColors($parameters['colors'] ?? null) ->withColors($parameters['colors'] ?? null)
->withPointValues($parameters['point-values'] ?? false) ->withBarValues($parameters['bar-values'] ?? false)
->withBoundaryGap($parameters['boundary-gap'] ?? true)
->withInverted($parameters['inverted'] ?? false) ->withInverted($parameters['inverted'] ?? false)
->withDataZoom($parameters['data-zoom'] ?? false)
->withStacked($parameters['stacked'] ?? false) ->withStacked($parameters['stacked'] ?? false)
->withIsArea($parameters['is-area'] ?? false)
->withAnimationDuration($parameters['animation-duration'] ?? 750) ->withAnimationDuration($parameters['animation-duration'] ?? 750)
->withYAxisLabelValueFormat($parameters['y-axis-label-value-format'] ?? null) ->withYAxisLabelValueFormat($parameters['y-axis-label-value-format'] ?? null)
->withMarkLine($parameters['mark-line'] ?? null) ->withMarkLine($parameters['mark-line'] ?? null)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// sample backend data // sample backend data
$categories = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'July', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; $categories = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'July', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
$series = ['ONC', 'APR', 'SPR', 'PHX', 'SIG', 'BRG', 'MNT', 'SDK', 'OCT']; $series = ['ONC', 'APR', 'PHX', 'BRG'];
$seriesData = []; $seriesData = [];
foreach ($series as $s) { foreach ($series as $s) {
...@@ -43,21 +43,27 @@ ...@@ -43,21 +43,27 @@
@endphp @endphp
@Limitless::CardStart(['title' => "Basic Setup", 'icon' => 'icon-info22' ] ) @Limitless::CardStart(['title' => "Basic Setup", 'icon' => 'icon-info22' ] )
@Limitless::LineChart([ @Limitless::BarChart([
'mark-line' => 'average',
'categories' => $categories, 'categories' => $categories,
'series' => $seriesData, 'series' => $seriesData,
]) ])
@Limitless::CardStop @Limitless::CardStop
@Limitless::CardStart(['title' => "Chart 2 (raw)", 'icon' => 'icon-info22' ] ) @Limitless::CardStart(['title' => "Stacked Setup", 'icon' => 'icon-info22' ] )
@Limitless::LineChart([ @Limitless::BarChart([
'raw' => $rawData 'stacked' => true,
'categories' => $categories,
'series' => $seriesData,
]) ])
@Limitless::CardStop @Limitless::CardStop
{{-- @Limitless::CardStart(['title' => "Chart 3", 'icon' => 'icon-info22' ] )--}} @Limitless::CardStart(['title' => "Stacked Setup", 'icon' => 'icon-info22' ] )
{{-- @Limitless::LineChartStart--}} @Limitless::BarChart([
{{-- @Limitless::LineChartStop--}} 'stacked' => true,
{{-- @Limitless::CardStop--}} 'categories' => $categories,
'series' => $seriesData,
])
@Limitless::CardStop
@stop @stop
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
]) ])
@Limitless::CardStop @Limitless::CardStop
@Limitless::CardStart(['title' => "Area Setup", 'icon' => 'icon-info22' ] ) @Limitless::CardStart(['title' => "Stacked Area Setup", 'icon' => 'icon-info22' ] )
@Limitless::LineChart([ @Limitless::LineChart([
'is-area' => true, 'is-area' => true,
'stacked' => true, 'stacked' => true,
......
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