-
-
- De {{ filter_form.from_date|add_class:"form-control" }} -
- à {{ filter_form.to_date|add_class:"form-control" }} -
- Caisses {{ filter_form.checkouts }} -
- Comptes {{ filter_form.accounts }} -
+ {{ filter_form|bootstrap}}
@@ -48,30 +43,13 @@ $(document).ready(function() {
khistory = new KHistory();
- var $from_date = $('#id_from_date');
- var $to_date = $('#id_to_date');
- var $checkouts = $('#id_checkouts');
- var $accounts = $('#id_accounts');
-
- function getSelectedMultiple($el) {
- var selected = [];
- $el.find(':selected').each(function() {
- selected.push($(this).val())
- });
- return selected;
- }
+ var $from_date = $('#id_start');
+ var $to_date = $('#id_end');
+ var $checkout = $('#id_checkout');
+ var $account = $('#id_account');
function getHistory() {
- var data = {};
- if ($from_date.val())
- data['from'] = moment($from_date.val()).format('YYYY-MM-DD HH:mm:ss');
- if ($to_date.val())
- data['to'] = moment($to_date.val()).format('YYYY-MM-DD HH:mm:ss');
- var checkouts = getSelectedMultiple($checkouts);
- if ($checkouts)
- data['checkouts'] = checkouts;
- var accounts = getSelectedMultiple($accounts);
- data['accounts'] = accounts;
+ data = $("#history-form").find("input, select, textarea").serialize();
khistory.fetch(data).done(function () {
var nb_opes = khistory.$container.find('.entry:not(.canceled)').length;
@@ -101,14 +79,6 @@ $(document).ready(function() {
$('#from_date').data("DateTimePicker").maxDate(e.date);
});
- $("select").multipleSelect({
- width: '100%',
- filter: true,
- allSelected: " ",
- selectAllText: "Tout-te-s",
- countSelected: "# sur %"
- });
-
$("#btn-fetch").on('click', function() {
khistory.reset();
getHistory();