From 7a61d765d2d09313ef2314b2f558a3345f9667fd Mon Sep 17 00:00:00 2001 From: Flaviu Mates Date: Tue, 26 Nov 2019 13:53:10 +0200 Subject: [PATCH] TT#65503 - Introduce time picker * Change datepicker to datetimepicker to be able to select time as well * datetimepicker is now available only for call lists since this is where a more thorough filtering is needed in case the limit of 1000 entries is passed Change-Id: I48107fa8f7c4d4ee9b40044c8ae5f7842e35c2a5 --- lib/NGCP/Panel/Controller/Subscriber.pm | 2 +- share/templates/helpers/datatables.tt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/NGCP/Panel/Controller/Subscriber.pm b/lib/NGCP/Panel/Controller/Subscriber.pm index c36c988b0a..ae1ab23551 100644 --- a/lib/NGCP/Panel/Controller/Subscriber.pm +++ b/lib/NGCP/Panel/Controller/Subscriber.pm @@ -2672,7 +2672,7 @@ sub calllist_master :Chained('base') :PathPart('calls') :CaptureArgs(0) :Allowed { name => "clir", search => 0, title => $c->loc('CLIR') }, { name => "source_customer_billing_zones_history.detail", search => 0, title => $c->loc('Billing zone'), }, #index required... { name => "call_status", search => 0, title => $c->loc('Status') }, - { name => "start_time", search_from_epoch => 1, search_to_epoch => 1, title => $c->loc('Start Time') }, + { name => "start_time", search_from_epoch => 1, search_to_epoch => 1, search_datetime => 1, title => $c->loc('Start Time') }, { name => "duration", search => 0, title => $c->loc('Duration'), show_total => 'sum' }, { name => "cdr_mos_data.mos_average", search => 0, title => $c->loc('MOS avg') }, { name => "cdr_mos_data.mos_average_packetloss", search => 0, title => $c->loc('MOS packetloss') }, diff --git a/share/templates/helpers/datatables.tt b/share/templates/helpers/datatables.tt index fdc05687ea..36b406c3c7 100644 --- a/share/templates/helpers/datatables.tt +++ b/share/templates/helpers/datatables.tt @@ -238,8 +238,9 @@ $(document).ready(function() { [% IF col.search_from_epoch && !has_from -%] var f = ''; $('#[% helper.id_from_name %]_table_filter').prepend(f); - $('#[% helper.id_from_name %]_datepicker_start').datepicker({ + $('#[% helper.id_from_name %]_datepicker_start').datetimepicker({ "dateFormat": "yy-mm-dd", + showTimepicker: [% IF col.search_datetime %] true [% ELSE %] false [% END %], "onSelect": function(date) { [% helper.id_from_name %]_table.fnFilter(date, 0); } @@ -255,8 +256,9 @@ $(document).ready(function() { } else { $('#[% helper.id_from_name %]_table_filter').prepend(t); } - $('#[% helper.id_from_name %]_datepicker_end').datepicker({ + $('#[% helper.id_from_name %]_datepicker_end').datetimepicker({ "dateFormat": "yy-mm-dd", + showTimepicker: [% IF col.search_datetime %] true [% ELSE %] false [% END %], "onSelect": function(date) { [% helper.id_from_name %]_table.fnFilter(date, 1); }