Latest code before move back to laptop.

This commit is contained in:
James Cole 2014-06-30 11:24:58 +02:00
parent 39dd382e87
commit aa53ceddc0
4 changed files with 48 additions and 2 deletions

View File

@ -10,8 +10,7 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h2>Accounts</h2>
<div id="accounts">
</div>
<canvas id="myChart" width="1100" height="300"></canvas>
<p><small>[settings]</small></p>
</div>
</div>
@ -26,4 +25,6 @@
</div>
@stop
@section('scripts')
<script src="assets/javascript/Chart.min.js"></script>
<script src="assets/javascript/index.js"></script>
@stop

View File

@ -26,5 +26,6 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="assets/bootstrap/js/bootstrap.min.js"></script>
@yield('scripts')
</body>
</html>

10
public/assets/javascript/Chart.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,34 @@
// Get context with jQuery - using jQuery's .get() method.
var ctx = $("#myChart").get(0).getContext("2d");
// This will get the first returned node in the jQuery collection.
// grab data from JSON point somewhere?
var data = {
labels: ["January", "February", "March", "April", "May", "June", "July"],
datasets: [
{
label: "My First dataset",
fillColor: "rgba(220,220,220,0.2)",
strokeColor: "rgba(220,220,220,1)",
pointColor: "rgba(220,220,220,1)",
pointStrokeColor: "#fff",
pointHighlightFill: "#fff",
pointHighlightStroke: "rgba(220,220,220,1)",
data: [65, 59, 80, 81, 56, 55, 40]
},
{
label: "My Second dataset",
fillColor: "rgba(151,187,205,0.2)",
strokeColor: "rgba(151,187,205,1)",
pointColor: "rgba(151,187,205,1)",
pointStrokeColor: "#fff",
pointHighlightFill: "#fff",
pointHighlightStroke: "rgba(151,187,205,1)",
data: [28, 48, 40, 19, 86, 27, 90]
}
]
};
options = [];
var myLineChart = new Chart(ctx).Line(data, options);