Skip to content

Commit 916e95b

Browse files
committed
issue #4 finished: display chart legends enable and ready to use and customize
1 parent 34fce0f commit 916e95b

File tree

6 files changed

+21
-7
lines changed

6 files changed

+21
-7
lines changed

src/ChartLine.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public function render($canvas, array $data, array $options = null)
3535
$dataset = [];
3636
$colours = [];
3737
$labels = [];
38+
$legends = [];
3839

3940
// Datasets quantity
4041
foreach($data as $label => $info) {
@@ -48,13 +49,18 @@ public function render($canvas, array $data, array $options = null)
4849
$dataset[$i] = array_column($data, $i);
4950
$dataset[$i] = implode(", ", $dataset[$i]);
5051
$colours[$i] = $this->colours[$i];
52+
53+
if(isset($options['legends'])) {
54+
$legends[$i] = $options['legends'][$i];
55+
}
5156
}
5257

5358
return view('chart-line::chart-line')
5459
->with(['element' => $canvas,
5560
'dataset' => $dataset,
5661
'labels' => $labels,
5762
'colours' => $colours,
63+
'legends' => $legends,
5864
'qtdDatasets' => $datasetQnt
5965
]);
6066

src/ChartRadar.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public function render($canvas, array $data, array $options = null)
3535
$dataset = [];
3636
$colours = [];
3737
$labels = [];
38+
$legends = [];
3839

3940
// Datasets quantity
4041
foreach($data as $label => $info) {
@@ -48,12 +49,17 @@ public function render($canvas, array $data, array $options = null)
4849
$dataset[$i] = array_column($data, $i);
4950
$dataset[$i] = implode(", ", $dataset[$i]);
5051
$colours[$i] = $this->colours[$i];
52+
53+
if(isset($options['legends'])) {
54+
$legends[$i] = $options['legends'][$i];
55+
}
5156
}
5257

5358
return view('chart-radar::chart-radar')
5459
->with(['element' => $canvas,
5560
'dataset' => $dataset,
5661
'labels' => $labels,
62+
'legends' => $legends,
5763
'colours' => $colours,
5864
'qtdDatasets' => $datasetQnt
5965
]);

src/resources/views/chart-bar.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
{
5555
responsive:true
5656
});
57-
document.getElementById('js-legend').innerHTML = myBar.generateLegend();
57+
document.getElementById('js-legend-bar').innerHTML = myBar.generateLegend();
5858
// End options section
5959
6060
});

src/resources/views/chart-line.blade.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
echo '{';
3434
?>
3535
36-
label: "Dados primários",
36+
label: "<?php echo $legends[$i]; ?>",
3737
fillColor: "<?php echo $colours[$i]; ?>",
3838
strokeColor: "<?php echo $colours[$i]; ?>",
3939
pointColor: "<?php echo $colours[$i]; ?>",
@@ -58,6 +58,7 @@
5858
5959
responsive:true
6060
});
61+
document.getElementById('js-legend-line').innerHTML = myLine.generateLegend();
6162
// End options section
6263
6364
});

src/resources/views/chart-pie-doughnut.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
// Options section
3434
// ---------------------------------------------------------------
3535
{
36-
responsive:true
37-
}
36+
responsive:true,
37+
});
3838
// End options section
39-
);
39+
document.getElementById('js-legend-pie').innerHTML = PizzaChart.generateLegend();
4040
});
4141
</script>

src/resources/views/chart-radar.blade.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
addLoadEvent(function() {
2121
var <?php echo $element; ?> = document.getElementById("<?php echo $element; ?>").getContext("2d");
2222
23-
window.myBar = new Chart(<?php echo $element; ?>).Radar(
23+
window.myRadar = new Chart(<?php echo $element; ?>).Radar(
2424
// ---------------------------------------------------------------
2525
// Data sections
2626
// ---------------------------------------------------------------
@@ -34,7 +34,7 @@
3434
echo '{';
3535
?>
3636
37-
label: "Dados primários",
37+
label: "<?php echo $legends[$i]; ?>",
3838
fillColor: "<?php echo $colours[$i]; ?>",
3939
strokeColor: "<?php echo $colours[$i]; ?>",
4040
pointColor: "<?php echo $colours[$i]; ?>",
@@ -58,6 +58,7 @@
5858
{
5959
responsive:true
6060
});
61+
document.getElementById('js-legend-radar').innerHTML = myRadar.generateLegend();
6162
// End options section
6263
6364
});

0 commit comments

Comments
 (0)