Skip to content

Commit

Permalink
New listing format
Browse files Browse the repository at this point in the history
  • Loading branch information
@bochoven
bochoven committed Jul 7, 2019
1 parent 7ef5904 commit 6adec5a
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 162 deletions.
55 changes: 55 additions & 0 deletions js/managedinstalls_functions.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
// Global object to hold the variables
var managedInstallsVariables = {
pkgName: '',
pkgVersion: ''
}

// Init function
var initializeManagedInstalls = function(pkgName, pkgVersion){
// Save the variables to the global space so the filter can use them
managedInstallsVariables.pkgName = pkgName;
managedInstallsVariables.pkgVersion = pkgVersion;
if(pkgName){
// Set name on heading
$('h3>span:first').text(pkgName);

if(pkgVersion){
// Add version to heading
$('h3>span:first').text(pkgName + ' ('+pkgVersion+')');
}
}
}

// Filters
var managedInstallsFilter = function(colNumber, d){

// Add where array to filter the results
d.where = [];

if(managedInstallsVariables.pkgName){
d.where.push({
table: 'managedinstalls',
column: 'name',
value: managedInstallsVariables.pkgName
});

if(managedInstallsVariables.pkgVersion){
d.where.push({
table: 'managedinstalls',
column: 'version',
value: managedInstallsVariables.pkgVersion
});
}
}
}

// Formatters
var managedInstallStatus = function(colNumber, row){
// Show label depending on status
var col = $('td:eq('+colNumber+')', row),
status = col.text();
if(mr.statusFormat[status]){
status = '<span class = "label label-'+mr.statusFormat[status].type+'">'+status+'</span>'
}
col.html(status)
}
202 changes: 40 additions & 162 deletions views/managed_installs_listing.php
View file
Original file line number Diff line number Diff line change
@@ -1,162 +1,40 @@
<?php $this->view('partials/head'); ?>

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

<div class="container">

<div class="row">

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

<h3><span data-i18n="managedinstalls.report"></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="serial" data-colname='reportdata.serial_number'></th>
<th data-i18n="name" data-colname='managedinstalls.name'></th>
<th data-i18n="displayname" data-colname='managedinstalls.display_name'></th>
<th data-i18n="version" data-colname='managedinstalls.version'></th>
<th data-i18n="status" data-colname='managedinstalls.status'></th>
<th data-i18n="listing.checkin" data-colname='reportdata.timestamp'></th>
<th data-i18n="type" data-colname='managedinstalls.type'></th>
<th data-i18n="size" data-colname='managedinstalls.size'></th>
</tr>
</thead>

<tbody>
<tr>
<td data-i18n="listing.loading" colspan="9" 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
pkgName = "<?=$name?>",
pkgVersion = "<?=$version?>";

if(pkgName){
// Set name on heading
$('h3>span:first').text(pkgName);

if(pkgVersion){
$('h3>span:first').text(pkgName + ' ('+pkgVersion+')');
}
}



$('.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 = "managedinstalls.name";

d.where = [];

if(pkgName){
d.where.push({
table: 'managedinstalls',
column: 'name',
value: pkgName
});

if(pkgVersion){
d.where.push({
table: 'managedinstalls',
column: 'version',
value: pkgVersion
});
}
}
}
},
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_munki');
$('td:eq(0)', nRow).html(link);
} else {
$('td:eq(0)', nRow).html(name);
}

var status = $('td:eq(5)', nRow).text();
if(mr.statusFormat[status]){
$('td:eq(5)', nRow).empty()
.append($('<span>')
.addClass('label')
.addClass('label-' + mr.statusFormat[status].type)
.text(status));
}

// Format Check-In timestamp
var checkin = parseInt($('td:eq(6)', nRow).html());
var date = new Date(checkin * 1000);
$('td:eq(6)', nRow).html('<span title="' + moment(date).format('llll') + '">'+moment(date).fromNow()+'</span>');

// Format filesize
$('td:last', nRow).html(fileSize($('td:last', nRow).html() * 1024));

} //end fnCreatedRow

}); //end oTable

});
</script>


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

$this->view('listings/default',
[
"i18n_title" => 'managedinstalls.report',
"js_link" => "module/managedinstalls/js/managedinstalls_functions",
"js_init" => "initializeManagedInstalls('$name', '$version')",
"table" => [
[
"column" => "machine.computer_name",
"i18n_header" => "listing.computername",
"formatter" => "clientDetail",
"tab_link" => "munki",
],
[
"column" => "reportdata.serial_number",
"i18n_header" => "displays_info.machineserial",
"filter" => "managedInstallsFilter",
],
["column" => "managedinstalls.name", "i18n_header" => "name",],
["column" => "managedinstalls.display_name", "i18n_header" => "displayname",],
["column" => "managedinstalls.version", "i18n_header" => "version",],
[
"column" => "managedinstalls.status",
"i18n_header" => "status",
"formatter" => "managedInstallStatus"
],
[
"column" => "reportdata.timestamp",
"i18n_header" => "listing.checkin",
"formatter" => "timestampToMoment",
],
["column" => "managedinstalls.type", "i18n_header" => "type",],
[
"column" => "managedinstalls.size",
"i18n_header" => "size",
"formatter" => "fileSize"
],
]
]);

0 comments on commit 6adec5a

Please sign in to comment.