Searching: Add detail to device search results

2018-04-19 17:06:58 +10:00
parent 8278efb9a6
commit df721d7d6e
8 changed files with 118 additions and 111 deletions
@@ -95,18 +95,21 @@
                "bSort": true,
                "bInfo": false,
                "bAutoWidth": false,
+                "aoColumnDefs": [
+                    { 'aTargets': ['date'], 'sSortDataType': 'disco_datetime', 'sType': 'disco_datetime' }
+                ],
                "aaSorting": [],
                "oLanguage": {
                    "sSearch": "Filter:"
                }
            };

-            var $dataTable = $table.dataTable(dataTableOptions);
-
-            // Contains Decommissioned Devces?
+            // Contains Decommissioned Devices?
            var $tbody = $table.children('tbody');
            var $decommissionedDevices = $tbody.children('tr.decommissioned');

+            var $dataTable = $table.dataTable(dataTableOptions);
+
            if ($decommissionedDevices.length > 0) {
                var wrapper = $(this).closest('.dataTables_wrapper');

@@ -1 +1 @@
-(function(n,t,i){var r=[];i(function(){function t(){var t=i(this).closest(".dataTables_wrapper");t.length>0&&n.setTimeout(function(){var e=i(n),o=t.height(),r=t.offset(),u=e.scrollTop(),s=e.height(),h=u-r.top,f;h>0?i("html").animate({scrollTop:r.top},125):(f=(u+s-(o+r.top))*-1,f>0&&(o>s?i("html").animate({scrollTop:r.top},125):i("html").animate({scrollTop:u+f},125)))},1)}i("table.jobTable").each(function(){var u=i(this),h=!1,l=u.hasClass("enablePaging"),a=u.hasClass("enableFilter"),v=u.find("tr").length>20,y={bPaginate:l,sPaginationType:"full_numbers",bLengthChange:v,iDisplayLength:20,bFilter:a,bSort:!0,bInfo:!1,bAutoWidth:!1,aoColumnDefs:[{aTargets:["dates"],sSortDataType:"disco_datetime",sType:"disco_datetime"}],aaSorting:[],oLanguage:{sSearch:"Filter:"},fnDrawCallback:function(){h?t.apply(u):h=!0}},p=u.dataTable(y),c,o,f,e,n,s;if(u.hasClass("hideStatusClosed")&&(c=u.children("tbody"),o=c.children('tr[data-status="Closed"]'),o.length>0)){f=i(this).closest(".dataTables_wrapper");e=f;f.parent(".jobTable").length>0&&(e=f.parent());n=e.prev();n.length>0&&(n.is("h1")||n.is("h2")||n.is("h3"))?n.data("dataTable_originalContent",n.html()).text("Active "+n.text()):n=null;s=e.find("div.allClosed_container");s.length>0?(u.hide(),f.find(".dataTables_filter").hide()):i('<a class="dataTables_showStatusClosed button small" href="#">').text("Show Closed Jobs ("+o.length+")").appendTo(e);e.on("click","a.dataTables_showStatusClosed",function(){return u.show(),f.find(".dataTables_filter").show(),u.removeClass("hideStatusClosed"),s.remove(),i(this).remove(),n&&n.html(n.data("dataTable_originalContent")),t.apply(u[0]),!1})}r.push(this)});i("table.deviceTable").each(function(){var n=i(this),t=n.find("tr").length>20,u={bPaginate:t,sPaginationType:"full_numbers",bLengthChange:t,iDisplayLength:20,bFilter:!0,bSort:!0,bInfo:!1,bAutoWidth:!1,aaSorting:[],oLanguage:{sSearch:"Filter:"}};n.dataTable(u);r.push(this)});i("table.userTable").each(function(){var n=i(this),t=n.find("tr").length>20,u={bPaginate:t,sPaginationType:"full_numbers",bLengthChange:t,iDisplayLength:20,bFilter:!0,bSort:!0,bInfo:!1,bAutoWidth:!1,aaSorting:[],oLanguage:{sSearch:"Filter:"}};n.dataTable(u);r.push(this)})})})(window,document,$);
+(function(n,t,i){var r=[];i(function(){function t(){var t=i(this).closest(".dataTables_wrapper");t.length>0&&n.setTimeout(function(){var e=i(n),o=t.height(),r=t.offset(),u=e.scrollTop(),s=e.height(),h=u-r.top,f;h>0?i("html").animate({scrollTop:r.top},125):(f=(u+s-(o+r.top))*-1,f>0&&(o>s?i("html").animate({scrollTop:r.top},125):i("html").animate({scrollTop:u+f},125)))},1)}i("table.jobTable").each(function(){var u=i(this),h=!1,l=u.hasClass("enablePaging"),a=u.hasClass("enableFilter"),v=u.find("tr").length>20,y={bPaginate:l,sPaginationType:"full_numbers",bLengthChange:v,iDisplayLength:20,bFilter:a,bSort:!0,bInfo:!1,bAutoWidth:!1,aoColumnDefs:[{aTargets:["dates"],sSortDataType:"disco_datetime",sType:"disco_datetime"}],aaSorting:[],oLanguage:{sSearch:"Filter:"},fnDrawCallback:function(){h?t.apply(u):h=!0}},p=u.dataTable(y),c,o,f,e,n,s;if(u.hasClass("hideStatusClosed")&&(c=u.children("tbody"),o=c.children('tr[data-status="Closed"]'),o.length>0)){f=i(this).closest(".dataTables_wrapper");e=f;f.parent(".jobTable").length>0&&(e=f.parent());n=e.prev();n.length>0&&(n.is("h1")||n.is("h2")||n.is("h3"))?n.data("dataTable_originalContent",n.html()).text("Active "+n.text()):n=null;s=e.find("div.allClosed_container");s.length>0?(u.hide(),f.find(".dataTables_filter").hide()):i('<a class="dataTables_showStatusClosed button small" href="#">').text("Show Closed Jobs ("+o.length+")").appendTo(e);e.on("click","a.dataTables_showStatusClosed",function(){return u.show(),f.find(".dataTables_filter").show(),u.removeClass("hideStatusClosed"),s.remove(),i(this).remove(),n&&n.html(n.data("dataTable_originalContent")),t.apply(u[0]),!1})}r.push(this)});i("table.deviceTable").each(function(){var n=i(this),u=n.find("tr").length>20,o={bPaginate:u,sPaginationType:"full_numbers",bLengthChange:u,iDisplayLength:20,bFilter:!0,bSort:!0,bInfo:!1,bAutoWidth:!1,aoColumnDefs:[{aTargets:["date"],sSortDataType:"disco_datetime",sType:"disco_datetime"}],aaSorting:[],oLanguage:{sSearch:"Filter:"}},s=n.children("tbody"),f=s.children("tr.decommissioned"),c=n.dataTable(o);if(f.length>0){var e=i(this).closest(".dataTables_wrapper"),h=i('<div class="dataTables_decommissioned"><label><input type="checkbox" /><span><\/span><\/label><\/div>').prependTo(e),l=h.find("span").text("Hide Decommissioned ("+f.length+")");e.on("change",".dataTables_decommissioned input",function(){var r=i(this);return r.is(":checked")?n.addClass("hideDecommissioned"):n.removeClass("hideDecommissioned"),t.apply(n[0]),!1})}r.push(this)});i("table.userTable").each(function(){var n=i(this),t=n.find("tr").length>20,u={bPaginate:t,sPaginationType:"full_numbers",bLengthChange:t,iDisplayLength:20,bFilter:!0,bSort:!0,bInfo:!1,bAutoWidth:!1,aaSorting:[],oLanguage:{sSearch:"Filter:"}};n.dataTable(u);r.push(this)})})})(window,document,$);
@@ -95,13 +95,41 @@
                "bSort": true,
                "bInfo": false,
                "bAutoWidth": false,
+                "aoColumnDefs": [
+                    { 'aTargets': ['date'], 'sSortDataType': 'disco_datetime', 'sType': 'disco_datetime' }
+                ],
                "aaSorting": [],
                "oLanguage": {
                    "sSearch": "Filter:"
                }
            };

-            $table.dataTable(dataTableOptions);
+            // Contains Decommissioned Devices?
+            var $tbody = $table.children('tbody');
+            var $decommissionedDevices = $tbody.children('tr.decommissioned');
+
+            var $dataTable = $table.dataTable(dataTableOptions);
+
+            if ($decommissionedDevices.length > 0) {
+                var wrapper = $(this).closest('.dataTables_wrapper');
+
+                var $host = $('<div class="dataTables_decommissioned"><label><input type="checkbox" /><span></span></label></div>').prependTo(wrapper);
+                var $span = $host.find('span').text('Hide Decommissioned (' + $decommissionedDevices.length + ')');
+
+                wrapper.on('change', '.dataTables_decommissioned input', function () {
+                    var $this = $(this);
+
+                    if ($this.is(':checked')) {
+                        $table.addClass('hideDecommissioned');
+                    } else {
+                        $table.removeClass('hideDecommissioned');
+                    }
+
+                    scrollCheck.apply($table[0]);
+                    return false;
+                });
+            }
+
            dataTables.push(this);
        });