Commit 8e9818a4 authored by Penom Nom's avatar Penom Nom
Browse files

update analyses templates

parent 9ab1765f
...@@ -65,9 +65,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -65,9 +65,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<table class="table table-striped table-bordered dataTable analysis-result-table"> <table class="table table-striped table-bordered dataTable analysis-result-table">
<thead> <thead>
<tr> <tr>
{if $analyse_results|@count > 1 } <th class = "string-sort">Samples {if $analyse_results|@count > 1 }({$analyse_results|@count}){/if}</th>
<th class = "string-sort">Samples ({$analyse_results|@count})</th>
{/if}
<th class = "numeric-sort">Before cleaning</th> <th class = "numeric-sort">Before cleaning</th>
<th class = "numeric-sort">After cleaning</th> <th class = "numeric-sort">After cleaning</th>
<th class = "numeric-sort">Only adaptor found</th> <th class = "numeric-sort">Only adaptor found</th>
...@@ -79,9 +77,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -79,9 +77,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{foreach from=$analyse_results_sorted key=sample item=sample_results} {foreach from=$analyse_results_sorted key=sample item=sample_results}
{if $sample != "all"} {if $sample != "all"}
<tr> <tr>
{if $analyse_results|@count > 1 }
<td>{$sample|get_description:$descriptions}</td> <td>{$sample|get_description:$descriptions}</td>
{/if}
<td>{$sample_results["default"].nb_reads_begining|number_format:0:' ':' '}</td> <td>{$sample_results["default"].nb_reads_begining|number_format:0:' ':' '}</td>
<td>{$sample_results["default"].nb_reads_end|number_format:0:' ':' '}</td> <td>{$sample_results["default"].nb_reads_end|number_format:0:' ':' '}</td>
<td>{$sample_results["default"].del_only_adaptator|number_format:0:' ':' '}</td> <td>{$sample_results["default"].del_only_adaptator|number_format:0:' ':' '}</td>
...@@ -107,9 +103,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -107,9 +103,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<table id="adaptor-table" class="table table-striped table-bordered dataTable analysis-result-table"> <table id="adaptor-table" class="table table-striped table-bordered dataTable analysis-result-table">
<thead> <thead>
<tr> <tr>
{if $analyse_results|@count > 1 } <th>Samples {if $analyse_results|@count > 1 }({$analyse_results|@count}){/if}</th>
<th>Samples ({$analyse_results|@count})</th>
{/if}
{foreach $adaptors as $adaptor} {foreach $adaptors as $adaptor}
<th> {$adaptor} </th> <th> {$adaptor} </th>
{/foreach} {/foreach}
...@@ -119,9 +113,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -119,9 +113,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{foreach from=$analyse_results_sorted key=sample item=sample_results} {foreach from=$analyse_results_sorted key=sample item=sample_results}
{if $sample != "all"} {if $sample != "all"}
<tr> <tr>
{if $analyse_results|@count > 1 }
<td>{$sample|get_description:$descriptions}</td> <td>{$sample|get_description:$descriptions}</td>
{/if}
{foreach $adaptors as $adaptor} {foreach $adaptors as $adaptor}
<td>{$sample_results["adaptor"][$adaptor]|number_format:0:' ':' '}</td> <td>{$sample_results["adaptor"][$adaptor]|number_format:0:' ':' '}</td>
{/foreach} {/foreach}
...@@ -165,4 +157,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -165,4 +157,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</div> </div>
</div> </div>
{/block} {/block}
\ No newline at end of file
...@@ -40,23 +40,28 @@ function process_img() { ...@@ -40,23 +40,28 @@ function process_img() {
var index = $(":checked[id^=chk_sample_]").attr("id").split("_")[2]; var index = $(":checked[id^=chk_sample_]").attr("id").split("_")[2];
var img_link = $('#cigarlinegraph_img_' + index).val() ; var img_link = $('#cigarlinegraph_img_' + index).val() ;
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>"); // Autoload image size
$("#modal-body-tmpl").html('<div id="img_container"><img src="' + img_link + '" alt="Cannot display"></div>'); var imgLoad = $("<img />")
$("#modal-foot-tmpl").html('<button class="btn" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i> Close</button>'); .attr("src", img_link)
$("#img_container").css('width', '845px'); .attr('alt', 'Cannot display')
$("#ng6modal").css('width', 'auto'); .unbind("load")
$("#ng6modal").css('margin-left', '-435px'); .bind("load", function () {
$("#ng6modal").modal(); var imgwidth = ( this.width > 900 ) ? 900 : this.width ;
resize_center_btmodal('#ng6modal', imgwidth + 50);
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>");
$("#modal-body-tmpl").html('<div id="img_container" style="overflow-x : auto"><img src="' + img_link + '" alt="Cannot display"></div>');
$("#modal-foot-tmpl").html('<button class="btn btn-default" data-dismiss="modal" aria-hidden="true"><i class="glyphicon glyphicon-remove"></i> Close</button>');
$("#ng6modal").modal();
});
} }
//Displaying Cigargraph with corresponding dataset //Displaying Cigargraph with corresponding dataset
function process_highcharts(read) { function process_highcharts(read) {
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>"); $("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>");
$("#modal-body-tmpl").html('<div id="highcharts_container"></div>'); $("#modal-body-tmpl").html('<div id="highcharts_container"></div>');
$("#modal-foot-tmpl").html('<button class="btn" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i> Close</button>'); $("#modal-foot-tmpl").html('<button class="btn btn-default" data-dismiss="modal" aria-hidden="true"><i class="glyphicon glyphicon-remove"></i> Close</button>');
$("#highcharts_container").css('width', '845px'); $("#highcharts_container").css('width', '845px');
$("#ng6modal").css('width', 'auto');
$("#ng6modal").css('margin-left', '-435px');
var index = $(":checked[id^=chk_sample_]").attr("id").split("_")[2]; var index = $(":checked[id^=chk_sample_]").attr("id").split("_")[2];
// Highcharts graph initialisation // // Highcharts graph initialisation //
...@@ -135,5 +140,6 @@ function process_highcharts(read) { ...@@ -135,5 +140,6 @@ function process_highcharts(read) {
} }
// Create the chart // // Create the chart //
var chart = new Highcharts.Chart(options); var chart = new Highcharts.Chart(options);
resize_center_btmodal('#ng6modal', chart.chartWidth + 50);
$("#ng6modal").modal(); $("#ng6modal").modal();
}; };
\ No newline at end of file
...@@ -55,30 +55,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -55,30 +55,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<table class="table table-striped table-bordered dataTable analysis-result-table"> <table class="table table-striped table-bordered dataTable analysis-result-table">
<thead> <thead>
<tr> <tr>
<th></th> <th rowspan="2" style="vertical-align:Middle"><center><input type="checkbox" id="chk_all_sample"></center></th>
{if $analyse_results|@count > 1 } <th rowspan="2" class="string-sort" style="vertical-align:Middle">Samples {if $analyse_results|@count > 1 }({$analyse_results|@count}){/if}</th>
<th></th>
{/if}
<th colspan="3">Reads</th> <th colspan="3">Reads</th>
<th colspan="3">Duplication</th> <th colspan="3">Duplication</th>
<th colspan="5">Alignment</th> <th colspan="5">Alignment</th>
</tr> </tr>
<tr> <tr>
<th style="vertical-align:Middle"><center><input type="checkbox" id="chk_all_sample"></center></th> <th class="numeric-sort" style="vertical-align:Middle"><center>Paired</center></th>
{if $analyse_results|@count > 1 } <th class="numeric-sort" style="vertical-align:Middle"><center>Read1</center></th>
<th class = "string-sort" style="vertical-align:Middle">Samples ({$analyse_results|@count})</th> <th class="numeric-sort" style="vertical-align:Middle"><center>Read2</center></th>
{/if} <th class="numeric-sort" style="vertical-align:Middle"><center>Duplicated</center></th>
<th class = "numeric-sort" style="vertical-align:Middle"><center>Paired</center></th> <th class="numeric-sort" style="vertical-align:Middle"><center>Read pair duplicates</center></th>
<th class = "numeric-sort" style="vertical-align:Middle"><center>Read1</center></th> <th class="numeric-sort" style="vertical-align:Middle"><center>Read pair optical duplicates</center></th>
<th class = "numeric-sort" style="vertical-align:Middle"><center>Read2</center></th> <th class="numeric-sort" style="vertical-align:Middle"><center>Mapped</center></th>
<th class = "numeric-sort" style="vertical-align:Middle"><center>Duplicated</center></th> <th class="numeric-sort" style="vertical-align:Middle"><center>Properly paired</center></th>
<th class = "numeric-sort" style="vertical-align:Middle"><center>Read pair duplicates</center></th> <th class="numeric-sort" style="vertical-align:Middle"><center>With itself and mate mapped</center></th>
<th class = "numeric-sort" style="vertical-align:Middle"><center>Read pair optical duplicates</center></th> <th class="numeric-sort" style="vertical-align:Middle"><center>Singletons</center></th>
<th class = "numeric-sort" style="vertical-align:Middle"><center>Mapped</center></th> <th class="numeric-sort" style="vertical-align:Middle"><center>Mate mapped on a different chr</center></th>
<th class = "numeric-sort" style="vertical-align:Middle"><center>Properly paired</center></th>
<th class = "numeric-sort" style="vertical-align:Middle"><center>With itself and mate mapped</center></th>
<th class = "numeric-sort" style="vertical-align:Middle"><center>Singletons</center></th>
<th class = "numeric-sort" style="vertical-align:Middle"><center>Mate mapped on a different chr</center></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -108,9 +102,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -108,9 +102,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{/if} {/if}
</td> </td>
{if $analyse_results|@count > 1 } <td>{$sample|get_description:$descriptions}</td>
<td>{$sample|get_description:$descriptions}</td>
{/if}
<td>{$sample_results["default"].paired|number_format:0:' ':' '}</td> <td>{$sample_results["default"].paired|number_format:0:' ':' '}</td>
<td>{$sample_results["default"].read1|number_format:0:' ':' '}</td> <td>{$sample_results["default"].read1|number_format:0:' ':' '}</td>
<td>{$sample_results["default"].read2|number_format:0:' ':' '}</td> <td>{$sample_results["default"].read2|number_format:0:' ':' '}</td>
...@@ -137,15 +129,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -137,15 +129,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<th align="left" colspan="{if $analyse_results|@count > 1}13{else}12{/if}"> <th align="left" colspan="13">
<div id="buttons_cigargraph">With selection : <div id="buttons_cigargraph">With selection :
{if !isset($sample_results["read1"]) && !isset($sample_results["all"])} {if !isset($sample_results["read1"]) && !isset($sample_results["all"])}
<button type="button" class="btn single-selection-btn" id="cigarlinegraph-view-btn"><i class="icon-picture"></i> CigarlineGraph</button> <button type="button" class="btn btn-default single-selection-btn" id="cigarlinegraph-view-btn"><i class="glyphicon glyphicon-picture"></i> CigarlineGraph</button>
{elseif !isset($sample_results["read2"]) || isset($sample_results["all"])} {elseif !isset($sample_results["read2"]) || isset($sample_results["all"])}
<button type="button" class="btn single-selection-btn" id="merge-view-btn"><i class="icon-signal"></i> CigarlineGraph</button> <button type="button" class="btn btn-default single-selection-btn" id="merge-view-btn"><i class="glyphicon glyphicon-signal"></i> CigarlineGraph</button>
{else} {else}
<button type="button" class="btn single-selection-btn" id="read1-view-btn"><i class="icon-signal"></i> Read1 CigarlineGraph</button> <button type="button" class="btn btn-default single-selection-btn" id="read1-view-btn"><i class="glyphicon glyphicon-signal"></i> Read1 CigarlineGraph</button>
<button type="button" class="btn single-selection-btn" id="read2-view-btn"><i class="icon-signal"></i> Read2 CigarlineGraph</button> <button type="button" class="btn btn-default single-selection-btn" id="read2-view-btn"><i class="glyphicon glyphicon-signal"></i> Read2 CigarlineGraph</button>
{/if} {/if}
</div> </div>
</th> </th>
...@@ -153,4 +145,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -153,4 +145,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</tfoot> </tfoot>
</table> </table>
{/block} {/block}
\ No newline at end of file
...@@ -22,9 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -22,9 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<table class="table table-striped table-bordered dataTable analysis-result-table"> <table class="table table-striped table-bordered dataTable analysis-result-table">
<thead> <thead>
<tr> <tr>
{if $analyse_results|@count > 1 } <th>Samples {if $analyse_results|@count > 1 }({$analyse_results|@count}){/if}</th>
<th>Samples ({$analyse_results|@count})</th>
{/if}
<th># pairs analysed</th> <th># pairs analysed</th>
<th># pairs with unique best hit</th> <th># pairs with unique best hit</th>
<th># pairs with no hit</th> <th># pairs with no hit</th>
...@@ -45,9 +43,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -45,9 +43,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{foreach from=$analyse_results_sorted key=sample item=sample_results} {foreach from=$analyse_results_sorted key=sample item=sample_results}
{assign var="mappingEfficiency" value=0} {assign var="mappingEfficiency" value=0}
<tr> <tr>
{if $analyse_results|@count > 1 } <td>{$sample|get_description:$descriptions}</td>
<td>{$sample|get_description:$descriptions}</td>
{/if}
{$totalPairs=$totalPairs+$sample_results["default"].totalPairs} {$totalPairs=$totalPairs+$sample_results["default"].totalPairs}
{$totalPairsUniqueHit=$totalPairsUniqueHit+$sample_results["default"].nbrPairsBestHit} {$totalPairsUniqueHit=$totalPairsUniqueHit+$sample_results["default"].nbrPairsBestHit}
{$totalPairsNoHit=$totalPairsNoHit+$sample_results["default"].nbrPairsNoAlignment} {$totalPairsNoHit=$totalPairsNoHit+$sample_results["default"].nbrPairsNoAlignment}
......
...@@ -92,14 +92,16 @@ $(function () { ...@@ -92,14 +92,16 @@ $(function () {
// Display images table // Display images table
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>"); $("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>");
$("#modal-body-tmpl").html('<div id="table_container"></div>'); $("#modal-body-tmpl").html('<div id="table_container" style="overflow-x : auto"></div>');
$("#modal-foot-tmpl").html('<button class="btn" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i> Close</button>'); $("#modal-foot-tmpl").html('<button class="btn btn-default" data-dismiss="modal" aria-hidden="true"><i class="glyphicon glyphicon-remove"></i> Close</button>');
$("#ng6modal").css('width', '870px'); $("#table_container ").css({
$("#ng6modal").css('top', '0%'); 'max-height' : modal_height(200, 50)+'px',
$("#ng6modal").css('margin-top', '20px'); 'overflow-x' : 'auto',
$("#modal-body-tmpl").css('max-height', modal_height(200, 50)+'px'); 'overflow-y' : 'auto'
$("#ng6modal").css('margin-left', '-435px'); });
$("#table_container").append( '<table class="table table-striped table-bordered dataTable">' + thead + tbody + '</table>' ); $("#ng6modal .modal-content").css('width' , '870px');
$("#ng6modal").css('margin-left', '-135px');
$("#table_container").append( '<table class="table table-striped table-bordered ">' + thead + tbody + '</table>' );
$("#ng6modal").modal(); $("#ng6modal").modal();
} }
...@@ -119,11 +121,9 @@ $(function () { ...@@ -119,11 +121,9 @@ $(function () {
// Set dialog window // Set dialog window
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>"); $("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>");
$("#modal-body-tmpl").html('<div id="highcharts_container"></div>'); $("#modal-body-tmpl").html('<div id="highcharts_container"></div>');
$("#modal-foot-tmpl").html('<button class="btn" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i> Close</button>'); $("#modal-foot-tmpl").html('<button class="btn btn-default" data-dismiss="modal" aria-hidden="true"><i class="glyphicon glyphicon-remove"></i> Close</button>');
$("#highcharts_container").css('width', '845px'); $("#highcharts_container").css('width', '845px');
$("#ng6modal").css('width', 'auto');
$("#ng6modal").css('margin-left', '-435px');
// Set graph // Set graph
var description = new Array(); var description = new Array();
var valeur = new Array(); var valeur = new Array();
...@@ -137,9 +137,9 @@ $(function () { ...@@ -137,9 +137,9 @@ $(function () {
valeur.push(parseInt(value_nombreC)); valeur.push(parseInt(value_nombreC));
}); });
// Draw graph var options = {
$('#highcharts_container').highcharts({
chart: { chart: {
renderTo: 'highcharts_container',
type: 'column', type: 'column',
margin: [50, 50, 100, 80] margin: [50, 50, 100, 80]
}, },
...@@ -186,8 +186,12 @@ $(function () { ...@@ -186,8 +186,12 @@ $(function () {
} }
} }
}] }]
}); };
// Draw graph
var chart = new Highcharts.Chart(options);
resize_center_btmodal('#ng6modal', chart.chartWidth + 50);
//Display //Display
$("#ng6modal").modal(); $("#ng6modal").modal();
} }
...@@ -208,10 +212,8 @@ $(function () { ...@@ -208,10 +212,8 @@ $(function () {
// Set dialog window // Set dialog window
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>"); $("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>");
$("#modal-body-tmpl").html('<div id="highcharts_container4"></div>'); $("#modal-body-tmpl").html('<div id="highcharts_container4"></div>');
$("#modal-foot-tmpl").html('<button class="btn" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i> Close</button>'); $("#modal-foot-tmpl").html('<button class="btn btn-default" data-dismiss="modal" aria-hidden="true"><i class="glyphicon glyphicon-remove"></i> Close</button>');
$("#highcharts_container4").css('width', '845px'); $("#highcharts_container4").css('width', '845px');
$("#ng6modal").css('width', 'auto');
$("#ng6modal").css('margin-left', '-435px');
// Set graph // Set graph
var description = new Array(); var description = new Array();
...@@ -240,7 +242,7 @@ $(function () { ...@@ -240,7 +242,7 @@ $(function () {
}); });
// Draw graph // Draw graph
$('#highcharts_container4').highcharts({ var options = {
chart: { chart: {
type: 'column' type: 'column'
}, },
...@@ -282,7 +284,12 @@ $(function () { ...@@ -282,7 +284,12 @@ $(function () {
{ name: '% C in CPG', data: valeurCPG }, { name: '% C in CPG', data: valeurCPG },
{ name: '% C in CHG', data: valeurCHG }, { name: '% C in CHG', data: valeurCHG },
{ name: '% C in CHH', data: valeurCHH }] { name: '% C in CHH', data: valeurCHH }]
}); };
// Draw graph
var chart = new Highcharts.Chart(options);
resize_center_btmodal('#ng6modal', chart.chartWidth + 50);
//Display //Display
$("#ng6modal").modal(); $("#ng6modal").modal();
} }
......
...@@ -23,9 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -23,9 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<thead> <thead>
<tr> <tr>
<th><center><input type="checkbox" id="chk_all_sample"></center></th> <th><center><input type="checkbox" id="chk_all_sample"></center></th>
{if $analyse_results|@count > 1 } <th>Samples {if $analyse_results|@count > 1 }({$analyse_results|@count}){/if}</th>
<th>Samples ({$analyse_results|@count})</th>
{/if}
<th class="numeric-sort" ># C analysed</th> <th class="numeric-sort" ># C analysed</th>
<th class="numeric-sort" ># mC in CpG</th> <th class="numeric-sort" ># mC in CpG</th>
<th class="numeric-sort" ># C in CpG</th> <th class="numeric-sort" ># C in CpG</th>
...@@ -74,9 +72,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -74,9 +72,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<input type="hidden" id="nb_C_{$i}" value="{$sample_results["default"].totalC}"/> <input type="hidden" id="nb_C_{$i}" value="{$sample_results["default"].totalC}"/>
<input type="hidden" id="descrip_{$i}" value="{$sample|get_description}"/> <input type="hidden" id="descrip_{$i}" value="{$sample|get_description}"/>
<td><center><input type="checkbox" id="chk_sample_{$i}" value="sample"/></center></td> <td><center><input type="checkbox" id="chk_sample_{$i}" value="sample"/></center></td>
{if $analyse_results|@count > 1 } <td id="sample_{$i}_col_1">{$sample|get_description:$descriptions}</td>
<td id="sample_{$i}_col_1">{$sample|get_description:$descriptions}</td>
{/if}
<td id="sample_{$i}_col_2">{$sample_results["default"].totalC|number_format:0:' ':' '}</td> <td id="sample_{$i}_col_2">{$sample_results["default"].totalC|number_format:0:' ':' '}</td>
<td id="sample_{$i}_col_3">{$sample_results["default"].totalMethylatedCinCpG|number_format:0:' ':' '}</td> <td id="sample_{$i}_col_3">{$sample_results["default"].totalMethylatedCinCpG|number_format:0:' ':' '}</td>
<td id="sample_{$i}_col_4">{$sample_results["default"].totalUnmethylatedCinCpG|number_format:0:' ':' '}</td> <td id="sample_{$i}_col_4">{$sample_results["default"].totalUnmethylatedCinCpG|number_format:0:' ':' '}</td>
...@@ -132,7 +128,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -132,7 +128,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<th></th> <th></th>
</tr> </tr>
<tr> <tr>
{if $analyse_results|@count > 1 }<th colspan="2">{else}<th>{/if}</th> <th colspan="2"></th>
<th></th> <th></th>
<th></th> <th></th>
<th></th> <th></th>
...@@ -147,11 +143,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -147,11 +143,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<th><center><input type="checkbox" id="chk_col_13"></center></th> <th><center><input type="checkbox" id="chk_col_13"></center></th>
</tr> </tr>
<tr> <tr>
<th align="left" colspan="{if $analyse_results|@count > 1}14{else}13{/if}"> <th align="left" colspan="14">
With selection : With selection :
<button type="button" class="btn multiple-selection-btn" id="columns_extract"><i class="icon-picture"></i> Compare</button> <button type="button" class="btn btn-default multiple-selection-btn" id="columns_extract"><i class="glyphicon glyphicon-picture"></i> Compare</button>
<button type="button" class="btn multiple-selection-btn length-view-btn"><i class="icon-signal"></i> # C analysed</button> <button type="button" class="btn btn-default multiple-selection-btn length-view-btn"><i class="glyphicon glyphicon-signal"></i> # C analysed</button>
<button type="button" class="btn multiple-selection-btn length-view-btn4"><i class="icon-signal"></i> % C in all context</button> <button type="button" class="btn btn-default multiple-selection-btn length-view-btn4"><i class="glyphicon glyphicon-signal"></i> % C in all context</button>
</th> </th>
</tr> </tr>
</tfoot> </tfoot>
......
...@@ -42,12 +42,13 @@ $(function () { ...@@ -42,12 +42,13 @@ $(function () {
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>"); $("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>");
$("#modal-body-tmpl").html('<div id="highcharts_container"></div>'); $("#modal-body-tmpl").html('<div id="highcharts_container"></div>');
$("#modal-body-tmpl").css('max-height', modal_height(200, 100)+'px'); $("#modal-body-tmpl").css('max-height', modal_height(200, 100)+'px');
$("#modal-foot-tmpl").html('<button class="btn" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i> Close</button>'); $("#modal-foot-tmpl").html('<button class="btn btn-default" data-dismiss="modal" aria-hidden="true"><i class="glyphicon glyphicon-remove"></i> Close</button>');
$("#highcharts_container").css('max-width', '700px'); $("#highcharts_container").css('max-width', '700px');
$("#ng6modal").css('width', 'auto'); $("#ng6modal").css('width', 'auto');
// Build graph // Build graph
build_depth_boxplot( 'highcharts_container' ); var chart = build_depth_boxplot( 'highcharts_container' );
resize_center_btmodal('#ng6modal', chart.chartWidth + 50);
// Display // Display
$("#ng6modal").modal(); $("#ng6modal").modal();
...@@ -58,33 +59,12 @@ $(function () { ...@@ -58,33 +59,12 @@ $(function () {
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>"); $("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>");
$("#modal-body-tmpl").html('<div id="highcharts_container"></div>'); $("#modal-body-tmpl").html('<div id="highcharts_container"></div>');
$("#modal-body-tmpl").css('max-height', modal_height(200, 100)+'px'); $("#modal-body-tmpl").css('max-height', modal_height(200, 100)+'px');
$("#modal-foot-tmpl").html( $("#modal-foot-tmpl").html('<button class="btn btn-default" data-dismiss="modal" aria-hidden="true"><i class="glyphicon glyphicon-remove"></i> Close</button>');
/*'<button id="linear_scale" class="btn" aria-hidden="true">Linear scale</button>' +
'<button id="log_scale" class="btn btn-primary disabled" aria-hidden="true">Log scale</button>' +*/
'<button class="btn" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i> Close</button>'
);
$("#highcharts_container").css('width', '845px'); $("#highcharts_container").css('width', '845px');
$("#ng6modal").css('width', 'auto');
$("#ng6modal").css('margin-left', '-435px');
// Build graph // Build graph
build_depth_histogram( 'highcharts_container', 'logarithmic' ); var chart = build_depth_histogram( 'highcharts_container', 'logarithmic' );
resize_center_btmodal('#ng6modal', chart.chartWidth + 50);
// Add listeners
/*$("#linear_scale").click(function() {
$("#highcharts_container").empty();
build_depth_histogram( 'highcharts_container', 'linear' );
$("#linear_scale").attr("class", "btn btn-primary disabled");
$("#log_scale").attr("class", "btn");
$("#ng6modal").modal();
});
$("#log_scale").click(function() {
$("#highcharts_container").empty();
build_depth_histogram( 'highcharts_container', 'logarithmic' );
$("#linear_scale").attr("class", "btn");
$("#log_scale").attr("class", "btn btn-primary disabled");
$("#ng6modal").modal();
});*/
// Display // Display
$("#ng6modal").modal(); $("#ng6modal").modal();
...@@ -95,13 +75,12 @@ $(function () { ...@@ -95,13 +75,12 @@ $(function () {
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>"); $("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>");
$("#modal-body-tmpl").html('<div id="highcharts_container"></div>'); $("#modal-body-tmpl").html('<div id="highcharts_container"></div>');
$("#modal-body-tmpl").css('max-height', modal_height(200, 100)+'px'); $("#modal-body-tmpl").css('max-height', modal_height(200, 100)+'px');
$("#modal-foot-tmpl").html('<button class="btn" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i> Close</button>'); $("#modal-foot-tmpl").html('<button class="btn btn-default" data-dismiss="modal" aria-hidden="true"><i class="glyphicon glyphicon-remove"></i> Close</button>');
$("#highcharts_container").css('width', '845px'); $("#highcharts_container").css('width', '845px');
$("#ng6modal").css('width', 'auto');
$("#ng6modal").css('margin-left', '-435px');
// Build graph // Build graph
build_reads_curve( 'highcharts_container' ); var chart = build_reads_curve( 'highcharts_container' );
resize_center_btmodal('#ng6modal', chart.chartWidth + 50);
// Display // Display
$("#ng6modal").modal(); $("#ng6modal").modal();
...@@ -112,11 +91,9 @@ $(function () { ...@@ -112,11 +91,9 @@ $(function () {
$("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>"); $("#modal-label-tmpl").html("NG6 <small> " + $("#analyse_name").val() + "</small>");
$("#modal-body-tmpl").html('<div id="d3_container"></div>'); $("#modal-body-tmpl").html('<div id="d3_container"></div>');
$("#modal-body-tmpl").css('max-height', modal_height(200, 100)+'px'); $("#modal-body-tmpl").css('max-height', modal_height(200, 100)+'px');
$("#modal-foot-tmpl").html('<button class="btn" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i> Close</button>'); $("#modal-foot-tmpl").html('<button class="btn btn-default" data-dismiss="modal" aria-hidden="true"><i class="glyphicon glyphicon-remove"></i> Close</button>');
$("#d3_container").css('width', '845px'); $("#d3_container").css('width', '845px');
$("#d3_container").css('height', '500px');