Commit a6b43c7e authored by Jerome Mariette's avatar Jerome Mariette
Browse files

No commit message

No commit message
parent fe454b0c
......@@ -525,7 +525,6 @@ class tx_nG6_eid {
$usergroup = intVal(trim(t3lib_div::_GP('usergroup')));
$data_folder = trim(t3lib_div::_GP('data_folder'));
$step = intVal(trim(t3lib_div::_GP('step')));
$get_analyzes = false;
if(trim(t3lib_div::_GP('get_analyzes')) == '1'){
$get_analyzes = true;
......@@ -534,7 +533,7 @@ class tx_nG6_eid {
if(trim(t3lib_div::_GP('get_cumulatives')) == '1'){
$get_cumulatives = true;
}
$size_tab = tx_nG6_db::get_size($usergroup, $data_folder, $get_analyzes, $get_cumulatives, $step);
$size_tab = tx_nG6_db::get_size($usergroup, $data_folder, $get_analyzes, $get_cumulatives, 0);
$encode_size_tab = json_encode($size_tab);
print $encode_size_tab;
......
......@@ -22,31 +22,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<input type="hidden" id="data_folder" value="{$data_folder}" />
<input type="hidden" id="usergroup" value="{$group_info.uid}" />
<div id="size_chart"></div>
<div id="chart_options">
Groupe :
<select id="group_list">
{foreach from=$group_list key=g_id item=g_val}
<option value="{$g_val.uid}">{$g_val.uid}: {$g_val.title}</option>
{/foreach}
</select>
&nbsp;&nbsp;|&nbsp;&nbsp;
Pas :
<select id="zoom_rank">
<option value="0" selected="selected">Un mois</option>
<option value="1">Six mois</option>
<option value="2">Une année</option>
</select>
&nbsp;&nbsp;|&nbsp;&nbsp;
<label for="chk_get_analyzes">Inclure les analyses</label>
<input type="checkbox" id="chk_get_analyzes" />
&nbsp;&nbsp;|&nbsp;&nbsp;
<div class="administration">
<h2>{$llang.administration_center_title}</h2>
<p>{$llang.administration_center_msg}<br /></p>
</div>
<br />
<ul id="myTab" class="nav nav-tabs">
<li class="active"><a href="#runs_size" data-toggle="tab">{$llang.run_size}</a></li>
</ul>
<div id="myTabContent" class="tab-content">
<div class="tab-pane fade in active" id="runs_size">
<div id="size_chart"></div>
<div id="chart_options">
{$llang.group}
<select id="group_list">
{foreach from=$group_list key=g_id item=g_val}
<option value="{$g_val.uid}">{$g_val.uid}: {$g_val.title}</option>
{/foreach}
</select>
&nbsp;&nbsp;|&nbsp;&nbsp;
<label for="chk_get_analyzes">{$llang.include_analyses}</label>
<input type="checkbox" id="chk_get_analyzes" />
&nbsp;&nbsp;|&nbsp;&nbsp;
<label for="chk_get_cumulative">{$llang.cumulate}</label>
<input type="checkbox" id="chk_get_cumulative" />
</div>
</div>
<label for="chk_get_cumulative">Données cumulées</label>
<input type="checkbox" id="chk_get_cumulative" />
</div>
......@@ -6,8 +6,20 @@
</meta>
<data type="array">
<languageKey index="default" type="array">
<label index="administration_center_title">Administration center</label>
<label index="administration_center_msg">Select a graph to display.</label>
<label index="run_size">Runs size</label>
<label index="group">Select a user group:</label>
<label index="include_analyses">Includes analyses:</label>
<label index="cumulate">Cumulate values:</label>
</languageKey>
<languageKey index="fr" type="array">
<label index="administration_center_title">Centre d'administration</label>
<label index="administration_center_msg">Séléctioner un graphique à afficher.</label>
<label index="run_size">Espace disque</label>
<label index="group">Groupe utilisateur:</label>
<label index="include_analyses">Inclure les analyses:</label>
<label index="cumulate">Cumuler les valeurs:</label>
</languageKey>
</data>
</T3locallang>
</T3locallang>
\ No newline at end of file
......@@ -141,6 +141,9 @@ button.pill-r span {
.download {
margin-left: 0px; padding-left: 120px; margin-top: 2px; padding-top: 10px; height: 130px; background: url(../img/download-icon.png) left no-repeat ;
}
.administration {
margin-left: 0px; padding-left: 120px; margin-top: 2px; padding-top: 10px; height: 130px; background: url(../img/download-icon.png) left no-repeat ;
}
.underline {
border-bottom: 1px dotted #666; position: relative;
}
......
......@@ -29,6 +29,7 @@
$(function () {
$('#myTab').tab();
redraw_chart();
// group list
......@@ -36,11 +37,6 @@ $(function () {
redraw_chart();
});
// zoom level
$("select[id=zoom_rank]").change(function(){
redraw_chart();
});
// get analyzes ?
$("#chk_get_analyzes").change(function(){
redraw_chart();
......@@ -55,13 +51,11 @@ $(function () {
function lock_fields(lock){
if(lock==1){
$("select[id=group_list]").attr('disabled','disabled');
$("select[id=zoom_rank]").attr('disabled','disabled');
$("#chk_get_analyzes").attr('disabled','disabled');
$("#chk_get_cumulative").attr('disabled','disabled');
$("#chart_options").attr('disabled','disabled');
}else{
$("select[id=group_list]").removeAttr('disabled');
$("select[id=zoom_rank]").removeAttr('disabled');
$("#chk_get_analyzes").removeAttr('disabled');
$("#chk_get_cumulative").removeAttr('disabled');
$("#chart_options").removeAttr('disabled');
......@@ -74,7 +68,6 @@ $(function () {
var size_url = "index.php?eID=tx_nG6&type=get_size_per_group";
size_url += "&usergroup="+$("#group_list option:selected").val();
size_url += "&data_folder="+$("#data_folder").val();
size_url += "&step="+$("#zoom_rank option:selected").val();
if($("#chk_get_analyzes").is(':checked')){
size_url += "&get_analyzes=1";
......
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