Commit 1b7486d5 authored by Gerald Salin's avatar Gerald Salin
Browse files

correction purged icons bug not displayed

parent b6aeeb5f
{*
Copyright (C) 2009 INRA
Copyright (C) 2009 INRA
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......
......@@ -52,9 +52,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{assign var="project_size" value="<span id='size' class='tx-nG6-mini-wait'></span>"}
Raw data and analysis results use <strong>{$project_size}</strong> on the hard drive for the whole project.<br />
<br><label>Managment purged data</label><br>
{assign var="manag_values" value="{$managment_purged_data[$projects[key($projects)].id]}"}
<table class="table table-striped table-bordered dataTable" id="manag_purged_data_table">
<thead>
<tr>
......
......@@ -14,7 +14,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*}
{* Recursive function to display an analysis hierarchy *}
{foreach from=$element item=new_element}
{if ($new_element.data.hidden == 1 && $new_element.data.is_admin) || $new_element.data.hidden == 0}
......@@ -67,22 +66,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<td>{$new_element.data.date|date_format:"%d/%m/%Y"}</td>
<td>{$new_element.data.software}</td>
<td>{$new_element.data.version}</td>
<td>{if $new_element.data.data_state eq "stored"}<i title="Data stored until {$new_element.data.retention_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-saved"></i>
{elseif $new_element.data.data_state eq "purged"}<i title="Data purged since {$new_element.data.purged_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-trash"></i>
{elseif $new_element.data.data_state eq "extended"}<i title="Data stored until {$new_element.data.retention_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-repeat"></i>{/if}
{if $new_element.data.mail_sent_date != 0}<i title="Mail sended since {$new_element.data.mail_sent_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-envelope"></i>{/if}
</td>
{/if}
{else}
<td>{$new_element.data.date|date_format:"%d/%m/%Y"}</td>
<td>{$new_element.data.software}</td>
<td>{$new_element.data.version}</td>
<td>{if $new_element.data.data_state eq "stored"}<i title="Data stored until {$new_element.data.retention_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-saved"></i>
{elseif $new_element.data.data_state eq "purged"}<i title="Data purged since {$new_element.data.purged_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-trash"></i>
{elseif $new_element.data.data_state eq "extended"}<i title="Data stored until {$new_element.data.retention_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-repeat"></i>{/if}
{if $new_element.data.mail_sent_date != 0}<i title="Mail sended since {$new_element.data.mail_sent_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-envelope"></i>{/if}
</td>
{/if}
<td>{if $new_element.data.data_state eq "stored"}<i title="Data stored until {$new_element.data.retention_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-saved"></i>
{elseif $new_element.data.data_state eq "purged"}<i title="Data purged since {$new_element.data.purged_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-trash"></i>
{elseif $new_element.data.data_state eq "extended"}<i title="Data stored until {$new_element.data.retention_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-repeat"></i>{/if}
{if $new_element.data.mail_sent_date != 0}<i title="Mail sended since {$new_element.data.mail_sent_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-envelope"></i>{/if}
</td>
</tr>
{/if}
{* recall *}
......
......@@ -14,7 +14,6 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*}
<table class="table table-striped table-bordered dataTable" id="run_data_table">
<thead>
<tr>
......@@ -48,6 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{if $is_at_least_admin_of_1_run && $login_user}
<th data-column="{$data_col}" id="wf_run_all">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
{assign var="rcolspan" value= $rcolspan + 1}
{$data_col = $data_col+1}
{/if}
<th data-column="{$data_col}">Data state</th>
{$data_col = $data_col+1}
......@@ -88,12 +88,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<span class="editable" data-type="text" data-pk="{$run_values.id}" data-url="index.php?eID=tx_nG6&type=update_db_field&table=tx_nG6_run&field=sequencer" data-original-title="Enter sequencer">{$run_values.sequencer}</span>
</td>
<td id="wf_run_{$run_values.id}"></td>
{* icone change if data stored/purged *}
<td>{if $run_values.data_state eq "stored"}<i title="Data stored until {$run_values.retention_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-saved"></i>
{elseif $run_values.data_state eq "purged"}<i title="Data purged since {$run_values.purged_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-trash"></i>
{elseif $run_values.data_state eq "extended"}<i title="Data stored until {$run_values.retention_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-repeat"></i>{/if}
{if $run_values.mail_sent_date != 0}<i title="Mail sended since {$run_values.mail_sent_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-envelope"></i>{/if}
</td>
{else}
{if $is_at_least_admin_of_1_run && $login_user}
<td></td>
......@@ -111,13 +105,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{if $is_at_least_admin_of_1_run && $login_user}
<td></td>
{/if}
{* icone change if data stored/purged *}
<td>{if $run_values.data_state eq "stored"}<i title="Data stored until {$run_values.retention_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-saved"></i>
{elseif $run_values.data_state eq "purged"}<i title="Data purged since {$run_values.purged_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-trash"></i>
{elseif $run_values.data_state eq "extended"}<i title="Data stored until {$run_values.retention_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-repeat"></i>{/if}
{if $run_values.mail_sent_date != 0}<i title="Mail sended since {$run_values.mail_sent_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-envelope"></i>{/if}
</td>
{/if}
{* icone change if data stored/purged *}
<td>{if $run_values.data_state eq "stored"}<i title="Data stored until {$run_values.retention_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-saved"></i>
{elseif $run_values.data_state eq "purged"}<i title="Data purged since {$run_values.purged_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-trash"></i>
{elseif $run_values.data_state eq "extended"}<i title="Data stored until {$run_values.retention_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-repeat"></i>{/if}
{if $run_values.mail_sent_date != 0}<i title="Mail sended since {$run_values.mail_sent_date|date_format:"%d/%m/%y"}" class="glyphicon glyphicon-envelope"></i>{/if}
</td>
</tr>
{/if}
{/foreach}
......
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