diff --git a/resources/js/eb_list.js b/resources/js/eb_list.js index 580f24c..9ce8423 100644 --- a/resources/js/eb_list.js +++ b/resources/js/eb_list.js @@ -13,7 +13,8 @@ EventBillingList = (function () { await load_events(0); $(".event_billing_list_load").off("click").on("click", load_events); $("#event_billing_list_num_of_res").on("change", function(){ - limit = $("#eventlist_num_of_res option:selected").data("num"); + limit = $("#event_billing_list_num_of_res option:selected").data("num"); + pag.set_limit(limit); load_events(); }); }; @@ -135,11 +136,12 @@ EventBillingList = (function () { } await Promise.all(event_loading_queue).then((values) => { + $("#event_billing_list_accordion").empty(); for(val of values){ $("#event_billing_list_accordion").append(templates.eb_list_card(val)) } $("#event_billing_list_accordion").show(); - pag.render(values.length, offset); + pag.render(data.total_event_count, offset); }) } } diff --git a/resources/js/pagination.js b/resources/js/pagination.js index 61c0386..1550347 100644 --- a/resources/js/pagination.js +++ b/resources/js/pagination.js @@ -9,6 +9,9 @@ class Pagination{ this.dest = destination; this.callback = callback; } + set_limit(limit){ + this.limit = limit; + } render(total_count, offset){ this.total_count = total_count; this.offset = offset; diff --git a/resources/templates/module_eb_list.html.hbs b/resources/templates/module_eb_list.html.hbs index cfc7a42..02e49d2 100644 --- a/resources/templates/module_eb_list.html.hbs +++ b/resources/templates/module_eb_list.html.hbs @@ -11,7 +11,7 @@
- +
diff --git a/src/modules/api/events/read.rs b/src/modules/api/events/read.rs index 3c754c1..b1c8180 100644 --- a/src/modules/api/events/read.rs +++ b/src/modules/api/events/read.rs @@ -65,11 +65,7 @@ pub fn read_events( } }, None => { - if states.is_some(){ - Local::now().naive_local() - Duration::days(365) - }else{ - Local::now().naive_local() - } + Local::now().naive_local() } }; let end = match end {