Skip to content

Commit

Permalink
Convert listing
Browse files Browse the repository at this point in the history
  • Loading branch information
@bochoven
bochoven committed Jul 4, 2019
1 parent 0df0e15 commit 5b71362
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 185 deletions.
64 changes: 64 additions & 0 deletions js/format_displays.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,67 @@
// Formatters
var displayTypeFormat = function(colNumber, row){
var col = $('td:eq('+colNumber+')', row),
status = col.text();
status = status == 1 ? i18n.t('displays_info.external') : //ex
(status == '0' ? i18n.t('displays_info.internal') : '')
col.text(status)
}

var vendorFormat = function(colNumber, row){
// Translating vendors column
// todo: find how the hell Apple translates the EDID/DDC to these values
// http://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/sys/dev/videomode/ediddevs
// https://github.com/GNOME/gnome-desktop/blob/master/libgnome-desktop/gnome-pnp-ids.c
// https://www.opensource.apple.com/source/xnu/xnu-124.7/iokit/Families/IOGraphics/AppleDDCDisplay.cpp
var col = $('td:eq('+colNumber+')', row),
vendor = col.text();
col.text(display_vendors[vendor] || vendor);

}

var naSerialFormat = function(colNumber, row){
// Blank n/a display serial numbers
var col = $('td:eq('+colNumber+')', row),
naserial = col.text();
naserial = naserial == 'n/a' ? '' :
(naserial === ' ' ? '' : naserial)
col.text(naserial)
}

var manufacturedFormat = function(colNumber, row){
// Format manufactured from unix to human friendly and the title to relative
var col = $('td:eq('+colNumber+')', row),
date = col.text();
if(moment(date, 'YYYY-W', true).isValid() && date.toLowerCase().indexOf("model") === -1)
{
var formatted='<time title="'+ moment(date, 'YYYY-W').fromNow() + '" </time>' + moment(date, 'YYYY-W').format("MMMM Do, YYYY");
col.html(formatted);
} else if (date) {
col.text(date)
}
}

// Filters
var displayTypeFilter = function(colNumber, d){
// Look for 'external' keyword
if(d.search.value.match(/^external$/))
{
// Add column specific search
d.columns[colNumber].search.value = '= 1';
// Clear global search
d.search.value = '';
}

// Look for 'internal' keyword
if(d.search.value.match(/^internal/))
{
// Add column specific search
d.columns[colNumber].search.value = '= 0';
// Clear global search
d.search.value = '';
}
}

// Lookup table for display vendors
var display_vendors = {
"610": "Apple",
Expand Down
247 changes: 62 additions & 185 deletions views/displays_listing.php
View file
Original file line number Diff line number Diff line change
@@ -1,185 +1,62 @@
<?php $this->view('partials/head'); ?>

<?php //Initialize models needed for the table
new Displays_info_model;
new Machine_model;
?>

<div class="container">

<div class="row">

<div class="col-lg-12">

<h3><span data-i18n="displays_info.reporttitle"></span> <span id="total-count" class='label label-primary'>…</span></h3>

<table class="table table-striped table-condensed table-bordered">

<thead>
<tr>
<th data-i18n="listing.computername" data-colname='machine.computer_name'></th>
<th data-i18n="displays_info.machineserial" data-colname='reportdata.serial_number'></th>
<th data-i18n="type" data-colname='displays.type'></th>
<th data-i18n="displays_info.vendor" data-colname='displays.vendor'></th>
<th data-i18n="displays_info.model" data-colname='displays.model'></th>
<th data-i18n="serial" data-colname='displays.display_serial'></th>
<th data-i18n="displays_info.manufactured" data-colname='displays.manufactured'></th>
<th data-i18n="displays_info.nativeresolution" data-colname='displays.native'></th>
<th data-i18n="displays_info.current_resolution" data-colname='displays.current_resolution'></th>
<th data-i18n="displays_info.connection_type" data-colname='displays.connection_type'></th>
<th data-i18n="displays_info.display_asleep_short" data-colname='displays.display_asleep'></th>
<th data-i18n="displays_info.display_type" data-colname='displays.display_type'></th>
<th data-i18n="displays_info.television" data-colname='displays.television'></th>
<th data-i18n="displays_info.detected" data-sort="desc" data-colname='displays.timestamp'></th>
</tr>
</thead>

<tbody>
<tr>
<td data-i18n="listing.loading" colspan="14" class="dataTables_empty"></td>
</tr>
</tbody>

</table>

</div> <!-- /span 12 -->

</div> <!-- /row -->

</div> <!-- /container -->

<script type="text/javascript">

$(document).on('appUpdate', function(e){

var oTable = $('.table').DataTable();
oTable.ajax.reload();
return;

});

$(document).on('appReady', function(e, lang) {

// Get modifiers from data attribute
var mySort = [], // Initial sort
hideThese = [], // Hidden columns
col = 0, // Column counter
columnDefs = [{ visible: false, targets: hideThese }]; //Column Definitions

$('.table th').map(function(){

columnDefs.push({name: $(this).data('colname'), targets: col});

if($(this).data('sort')){
mySort.push([col, $(this).data('sort')])
}

if($(this).data('hide')){
hideThese.push(col);
}

col++
});

oTable = $('.table').dataTable( {
ajax: {
url: appUrl + '/datatables/data',
type: "POST",
data: function(d){
d.mrColNotEmpty = "displays.vendor"

// Look for 'external' keyword
if(d.search.value.match(/^external$/))
{
// Add column specific search
d.columns[2].search.value = '= 1';
// Clear global search
d.search.value = '';
}

// Look for 'external' keyword
if(d.search.value.match(/^internal/))
{
// Add column specific search
d.columns[2].search.value = '= 0';
// Clear global search
d.search.value = '';
}

}
},
dom: mr.dt.buttonDom,
buttons: mr.dt.buttons,
order: mySort,
columnDefs: columnDefs,
createdRow: function( nRow, aData, iDataIndex ) {

// Update computer name to link
var name=$('td:eq(0)', nRow).html();
if(name == ''){name = "No Name"};
var sn=$('td:eq(1)', nRow).html();
if(sn){
var link = mr.getClientDetailLink(name, sn, '#tab_displays-tab');
$('td:eq(0)', nRow).html(link);
} else {
$('td:eq(0)', nRow).html(name);
}

// Internal vs External
var status=$('td:eq(2)', nRow).html();
status = status == 1 ? i18n.t('displays_info.external') : //ex
(status == '0' ? i18n.t('displays_info.internal') : '')
$('td:eq(2)', nRow).html(status)

// Translating vendors column
// todo: find how the hell Apple translates the EDID/DDC to these values
// http://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/sys/dev/videomode/ediddevs
// https://github.com/GNOME/gnome-desktop/blob/master/libgnome-desktop/gnome-pnp-ids.c
// https://www.opensource.apple.com/source/xnu/xnu-124.7/iokit/Families/IOGraphics/AppleDDCDisplay.cpp
var vendor=$('td:eq(3)', nRow).html();
$('td:eq(3)', nRow).html(mr.display_vendors[vendor] || vendor);

// Blank n/a display serial numbers
var naserial=$('td:eq(5)', nRow).html();
naserial = naserial == 'n/a' ? '' :
(naserial === ' ' ? '' : naserial)
$('td:eq(5)', nRow).html(naserial)

// Format manufactured from unix to human friendly and the title to relative
date = $('td:eq(6)', nRow).html();
if(moment(date, 'YYYY-W', true).isValid() && date.toLowerCase().indexOf("model") === -1)
{
var formatted='<time title="'+ moment(date, 'YYYY-W').fromNow() + '" </time>' + moment(date, 'YYYY-W').format("MMMM Do, YYYY");
$('td:eq(6)', nRow).html(formatted);
} else if (date) {
$('td:eq(6)', nRow).html(date)
}

// Display Asleep
var asleep=$('td:eq(10)', nRow).html();
asleep = asleep == '1' ? i18n.t('yes') :
(asleep === '0' ? i18n.t('no') : '')
$('td:eq(10)', nRow).html(asleep)

// Television
var asleep=$('td:eq(12)', nRow).html();
asleep = asleep == '1' ? i18n.t('yes') :
(asleep === '0' ? i18n.t('no') : '')
$('td:eq(12)', nRow).html(asleep)

// Format timestamp from unix to relative and the title to timezone detail
date = $('td:eq(13)', nRow).html();
if(date)
{
var formatted='<time title="'+ moment.unix(date).format("LLLL (Z)") + '" </time>' + moment.unix(date).fromNow();
$('td:eq(13)', nRow).html(formatted);
}

} // End fnCreatedRow

}); // End oTable

});
</script>

<?php $this->view('partials/foot'); ?>
<?php

$this->view('listings/default',
[
"i18n_title" => 'displays_info.reporttitle',
"js_link" => "module/displays_info/js/format_displays",
"not_null_column" => "displays.vendor",
"table" => [
[
"column" => "machine.computer_name",
"i18n_header" => "listing.computername",
"formatter" => "clientDetail",
"tab_link" => "displays-tab",
],
[
"column" => "reportdata.serial_number",
"i18n_header" => "displays_info.machineserial",
],
[
"column" => "displays.type",
"i18n_header" => "type",
"formatter" => "displayTypeFormat",
"filter" => "displayTypeFilter"
],
[
"column" => "displays.vendor",
"i18n_header" => "displays_info.vendor",
"formatter" => "vendorFormat"
],
["column" => "displays.model", "i18n_header" => "displays_info.model",],
[
"column" => "displays.display_serial",
"i18n_header" => "serial",
"formatter" => "naSerialFormat",
],
[
"column" => "displays.manufactured",
"i18n_header" => "displays_info.manufactured",
"formatter" => "manufacturedFormat",
],
["column" => "displays.native", "i18n_header" => "displays_info.nativeresolution",],
["column" => "displays.current_resolution", "i18n_header" => "displays_info.current_resolution",],
["column" => "displays.connection_type", "i18n_header" => "displays_info.connection_type",],
[
"column" => "displays.display_asleep",
"i18n_header" => "displays_info.display_asleep_short",
"formatter" => "binaryYesNo",
],
["column" => "displays.display_type", "i18n_header" => "displays_info.display_type",],
[
"column" => "displays.television",
"i18n_header" => "displays_info.television",
"formatter" => "binaryYesNo",
],
[
"column" => "displays.timestamp",
"i18n_header" => "displays_info.detected",
"sort" =>"desc",
"formatter" => "timestampToMoment",
],
]
]);

0 comments on commit 5b71362

Please sign in to comment.