Commit 6afb85d9 authored by Celine Noirot's avatar Celine Noirot
Browse files

Size pretty Display

parent 77b86a62
......@@ -279,7 +279,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<h4>1. Filter on size greater than</h4>
<div class="text">
<label class="text">
<input type="text" name="size" id="filter_size" > Go
<input type="text" name="size" id="filter_size" > bytes
</label>
</div>
</fieldset>
......@@ -300,7 +300,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<fieldset class="col-sm-12">
<h4>3. Which create user ?</h4>
<div id="wrapper_datatable_create">
<table class="table table-striped table-bordered dataTable" id="data_table_laboratories">
<table class="table table-striped table-bordered dataTable" id="data_table_users">
<thead>
<th></th>
<th>Create user</th>
......@@ -321,7 +321,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<fieldset class="col-sm-12">
<h4>4. Without laboratories implie ?</h4>
<div id="wrapper_datatable_laboratories">
<table class="table table-striped table-bordered dataTable" id="data_table_laboratories">
<table class="table table-striped table-bordered dataTable" id="data_table_select_lab">
<thead>
<th></th>
<th>Laboratories</th>
......@@ -379,14 +379,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<td><center><input type="checkbox" id="chk_project_{$c_project_id}" value="project_{$c_project_id}" /></center></td>
<td><a href="index.php?id=3&tx_nG6_pi1[project_id]={$c_project_id}">{$project_values.project_name}</a> </td>
<td>{$project_values.nb_runs}</td>
<td>{if $project_values.state.purged.nb_run}{$project_values.state.purged.nb_run} ({$project_values.state.purged.size_run} Go){else} - {/if}</td>
<td><input type="hidden" values="{$project_values.state.stored.run_ids}" id="rstored_project_{$c_project_id}" />{if $project_values.state.stored.nb_run}{$project_values.state.stored.nb_run} ({$project_values.state.stored.size_run} Go){else} - {/if}</td>
<td><input type="hidden" values="{$project_values.state.extended.run_ids}" id="rextended_project_{$c_project_id}" />{if $project_values.state.extended.nb_run}{$project_values.state.extended.nb_run} ({$project_values.state.extended.size_run} Go) {else} - {/if}</td>
<td>{if $project_values.state.purged.nb_run}{$project_values.state.purged.nb_run} ({$tx_nG6_utils->get_octet_string_representation($project_values.state.purged.size_run)}){else} - {/if}</td>
<td><input type="hidden" values="{$project_values.state.stored.run_ids}" id="rstored_project_{$c_project_id}" />{if $project_values.state.stored.nb_run}{$project_values.state.stored.nb_run} ({$tx_nG6_utils->get_octet_string_representation($project_values.state.stored.size_run)} ){else} - {/if}</td>
<td><input type="hidden" values="{$project_values.state.extended.run_ids}" id="rextended_project_{$c_project_id}" />{if $project_values.state.extended.nb_run}{$project_values.state.extended.nb_run} ({$tx_nG6_utils->get_octet_string_representation($project_values.state.extended.size_run)}) {else} - {/if}</td>
<td>{$project_values.nb_analyses}</td>
<td>{if $project_values.state.purged.nb_analyze}{$project_values.state.purged.nb_analyze} ({$project_values.state.purged.size_analyze} Go){else} - {/if}</td>
<td><input type="hidden" values="{$project_values.state.stored.analysis_ids}" id="astored_project_{$c_project_id}" />{if $project_values.state.stored.nb_analyze}{$project_values.state.stored.nb_analyze} ({$project_values.state.stored.size_analyze} Go){else} - {/if}</td>
<td><input type="hidden" values="{$project_values.state.extended.analysis_ids}" id="aextended_project_{$c_project_id}" />{if $project_values.state.extended.nb_analyze}{$project_values.state.extended.nb_analyze} ({$project_values.state.extended.size_analyze} Go){else} - {/if}</td>
<td>{$project_values.total_purgeable_size}</td>
<td>{if $project_values.state.purged.nb_analyze}{$project_values.state.purged.nb_analyze} ({$tx_nG6_utils->get_octet_string_representation($project_values.state.purged.size_analyze)}){else} - {/if}</td>
<td><input type="hidden" values="{$project_values.state.stored.analysis_ids}" id="astored_project_{$c_project_id}" />{if $project_values.state.stored.nb_analyze}{$project_values.state.stored.nb_analyze} ({$tx_nG6_utils->get_octet_string_representation($project_values.state.stored.size_analyze)}){else} - {/if}</td>
<td><input type="hidden" values="{$project_values.state.extended.analysis_ids}" id="aextended_project_{$c_project_id}" />{if $project_values.state.extended.nb_analyze}{$project_values.state.extended.nb_analyze} ({$tx_nG6_utils->get_octet_string_representation($project_values.state.extended.size_analyze)}){else} - {/if}</td>
<td>{$tx_nG6_utils->get_octet_string_representation($project_values.total_purgeable_size)}</td>
<td>
{foreach from=$project_values.users key=c_user_i item=user_values}
{$user_values.user_name} {if $user_values.right_level_label=="manager"} {$user_values.email} {/if},
......
......@@ -95,6 +95,8 @@ class tx_nG6_pi6 extends tslib_pibase {
$smarty->assign('distribution', $distribution);
$smarty->assign('ng6_admin_users', tx_nG6_db::get_ng6_admin_users() );
$smarty->assign('ng6_purge_projects', tx_nG6_db::select_obsolete_list_retention_data_info( ));
$txNG6Utils = new tx_nG6_utils;
$smarty->assign_by_ref('tx_nG6_utils', $txNG6Utils);
return $smarty->fetch('administration_view.tpl');
}
}
......
......@@ -384,7 +384,7 @@ $(function () {
dataType: 'json',
success: function(val, status, xhr) {
oTable = stat_tables["obsolete"];
oTable.clear()
oTable.clear();
$.each(val, function(key,values){
......@@ -392,37 +392,37 @@ $(function () {
var row=[checkbox, "<a href='index.php?id=3&tx_nG6_pi1[project_id]="+key+"'>"+values["project_name"]+"</a>", values["nb_runs"]];
if (values["state"].hasOwnProperty('purged') && values["state"]["purged"] != null && values["state"]["purged"]['nb_run'] != null) {
row.push(values["state"]["purged"]['nb_run'] + " (" + values["state"]["purged"]['size_run'] + ")")
row.push(values["state"]["purged"]['nb_run'] + " (" +get_octet_string_representation(values["state"]["purged"]['size_run'],2) + ")")
}else{
row.push("-")
}
if (values["state"].hasOwnProperty('stored') && values["state"]["stored"] != null && values["state"]["stored"]['nb_run'] != null) {
row.push(values["state"]["stored"]['nb_run']+ " (" + values["state"]["stored"]['size_run'] + ")")
row.push(values["state"]["stored"]['nb_run']+ " (" + get_octet_string_representation(values["state"]["stored"]['size_run'],2) + ")")
}else{
row.push("-")
}
if (values["state"].hasOwnProperty('extended') && values["state"]["extended"] != null && values["state"]["extended"]['nb_run'] != null) {
row.push(values["state"]["extended"]['nb_run']+ " (" + values["state"]["extended"]['size_run'] + ")")
row.push(values["state"]["extended"]['nb_run']+ " (" + get_octet_string_representation(values["state"]["extended"]['size_run'],2) + ")")
}else{
row.push("-")
}
row.push(values["nb_analyses"])
if (values["state"].hasOwnProperty('purged') && values["state"]["purged"] != null && values["state"]["purged"]['nb_analyze'] != null) {
row.push(values["state"]["purged"]['nb_analyze']+ " (" + values["state"]["purged"]['size_analyze'] + ")")
row.push(values["state"]["purged"]['nb_analyze']+ " (" + get_octet_string_representation(values["state"]["purged"]['size_analyze'],2) + ")")
}else{
row.push("-")
}
if (values["state"].hasOwnProperty('stored') && values["state"]["stored"] != null && values["state"]["stored"]['nb_analyze'] != null) {
row.push(values["state"]["stored"]['nb_analyze']+ " (" + values["state"]["stored"]['size_analyze'] + ")")
row.push(values["state"]["stored"]['nb_analyze']+ " (" + get_octet_string_representation(values["state"]["stored"]['size_analyze'],2) + ")")
}else{
row.push("-")
}
if (values["state"].hasOwnProperty('extended') && values["state"]["extended"] != null && values["state"]["extended"]['nb_analyze'] != null) {
row.push(values["state"]["extended"]['nb_analyze']+ " (" + values["state"]["extended"]['size_analyze'] + ")")
row.push(values["state"]["extended"]['nb_analyze']+ " (" + get_octet_string_representation(values["state"]["extended"]['size_analyze'],2) + ")")
}else{
row.push("-")
}
row.push(values["total_purgeable_size"])
row.push(get_octet_string_representation(values["total_purgeable_size"],2))
var string_user= "";
$.each(values["users"], function(key_user,values_user){
......@@ -812,8 +812,17 @@ function initStatMenuDataTables () {
null,
null]
});
stat_tables["obsolete"] = $("#data_table_obsolete").DataTable({
"language": {
"info": 'Showing _START_ to _END_ of _MAX_ entries <strong><small id="nb_selected_span"></small></strong>'
},
"order": [[ 1, "asc" ]],
"columns": [
{ "orderable": false },
null,null,null,null,null,null,null,null,null,null,null]
});
$("#data_table_laboratories, #data_table_organizations, #data_table_locations ").on( 'draw.dt', function () {
$("#data_table_laboratories, #data_table_organizations, #data_table_locations").on( 'draw.dt', function () {
var $table = $('div[id^=wrapper_datatable]:visible'),
oDatatable = stat_tables[ $table.attr('id').split('_')[2] ];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment