Added category, added pie chart on categories, removed buggy ba-resize plugin.

This commit is contained in:
Alexis Lahouze
2013-01-12 22:11:48 +01:00
parent 6f36d7970f
commit 868cf3138a
5 changed files with 155 additions and 77 deletions

View File

@ -33,20 +33,28 @@
</div>
</div>
<div class="content" style="margin-top: 116px; margin-bottom: 41px">
<div class="row" style="margin-top: 116px"></div>
<div class="container-fluid">
<div class="span8">
<div id="chart-placeholder" data-bind="chart: $root.entriesChart"></div>
</div>
<div class="span4"></div>
<div class="row">
<div class="span8">
<div id="entries-chart-placeholder" data-bind="chart: $root.entriesChart"></div>
</div>
<div class="span4">
<div id="categories-chart-placeholder" data-bind="pieChart: $root.categoriesChart"></div>
</div>
</div>
<div class="row">
<div id="message-placeholder"></div>
</div>
<div class="row">
<a class="btn btn-primary" data-bind="click: $root.add" href="#" title="Add entry"><i class="icon-plus"></i>&nbsp;Ajouter une entr&eacute;e</a>
</div>
<div class="row">
<table class="table table-striped table-condensed table-hover">
<thead>
<tr>
@ -56,6 +64,7 @@
<th style="width: 50px">Montant</th>
<th style="width: 50px">Solde</th>
<th style="width: 50px">Solde point&eacute;</th>
<th style="width: 100px">Cat&eacute;gorie</th>
<th style="width: 60px">Actions</th>
</tr>
</thead>
@ -64,6 +73,8 @@
</tbody>
</table>
</div>
<div style="margin-bottom: 21px"></div>
</div>
</div>
</div>
@ -89,6 +100,7 @@
<td data-bind="text: value, css: {'text-error': value() < 0 }"></td>
<td data-bind="text: sold, css: {'text-error': sold() < 0 }"></td>
<td data-bind="text: pointedSold, css: {'text-error': pointedSold() < 0 }"></td>
<td data-bind="text: category"></td>
<td class="buttons">
<a class="btn btn-mini" data-bind="click: $root.edit" href="#" title="edit"><i class="icon-edit"></i></a>
<a class="btn btn-mini" data-bind="click: $root.remove" href="#" title="remove"><i class="icon-trash"></i></a>
@ -104,6 +116,7 @@
<td><input type="text" class="input-mini" data-bind="value: value"/></td>
<td data-bind="text: sold"></td>
<td data-bind="text: pointedSold"></td>
<td><input type="text" class="input-small" data-bind="value: category"/></td>
<td class="buttons">
<a class="btn btn-mini btn-success" data-bind="click: $root.save" href="#" title="save"><i class="icon-ok"></i></a>
<a class="btn btn-mini" data-bind="click: $root.cancel" href="#" title="cancel"><i class="icon-ban-circle"></i></a>
@ -112,7 +125,6 @@
</script>
<script type="text/javascript" src="jquery/jquery.js"></script>
<script type="text/javascript" src="jquery/jquery.ba-resize.min.js"></script>
<script type="text/javascript" src="bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="datepicker/js/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="knockout/knockout.js"></script>
@ -122,6 +134,7 @@
<script type="text/javascript" src="jqplot/plugins/jqplot.canvasTextRenderer.min.js"></script>
<script type="text/javascript" src="jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js"></script>
<script type="text/javascript" src="jqplot/plugins/jqplot.ohlcRenderer.min.js"></script>
<script type="text/javascript" src="jqplot/plugins/jqplot.pieRenderer.min.js"></script>
<script type="text/javascript" src="jqplot/plugins/jqplot.highlighter.min.js"></script>
<script type="text/javascript" src="js/entries.js"></script>