From d2bff43979c3199d8f77ca08f7dc510cbdce8859 Mon Sep 17 00:00:00 2001
From: Jaden Diefenbaugh <blakcap@users.noreply.github.com>
Date: Mon, 13 Feb 2017 12:33:53 +0100
Subject: [PATCH] var to let for true blockscoping
---
.../reports/app/directives/addReportItem.js | 152 +++++++++---------
.../reports/app/directives/aliasExperiment.js | 24 +--
.../app/directives/buttonDeleteItem.js | 2 +-
.../app/directives/buttonExportItem.js | 72 ++++-----
.../reports/app/directives/buttonSettings.js | 6 +-
.../static/reports/app/directives/item.js | 6 +-
.../reports/app/directives/myReportInfo.js | 4 +-
.../reports/app/directives/saveReportItems.js | 8 +-
.../static/reports/app/directives/sortData.js | 48 +++---
.../reports/app/directives/tableDynamic.js | 8 +-
.../reports/app/directives/tablePrecision.js | 12 +-
.../reports/app/directives/theColumn.js | 28 ++--
.../reports/app/factories/dataFactory.js | 4 +-
.../reports/app/factories/plotterFactory.js | 2 +-
.../reports/app/factories/reportFactory.js | 4 +-
15 files changed, 190 insertions(+), 190 deletions(-)
diff --git a/beat/web/reports/static/reports/app/directives/addReportItem.js b/beat/web/reports/static/reports/app/directives/addReportItem.js
index 3255768f7..6b2f46f49 100644
--- a/beat/web/reports/static/reports/app/directives/addReportItem.js
+++ b/beat/web/reports/static/reports/app/directives/addReportItem.js
@@ -24,8 +24,8 @@
angular.module('reportApp').directive("addreportitem", function($compile){
return function(scope, element, attrs){
scope.$on("addSavedElement", function(event, id_content, type){
- var num_tables_in_content = 0;
- var num_figures_in_content = 0;
+ let num_tables_in_content = 0;
+ let num_figures_in_content = 0;
for(var i = 0; i < Object.keys(scope.report.content).length; i++){
if(Object.keys(scope.report.content)[i].indexOf("table_") == 0){
num_tables_in_content++;
@@ -36,8 +36,8 @@ angular.module('reportApp').directive("addreportitem", function($compile){
}
if(type == "table"){
- var table_id = id_content;
- var table_details = undefined;
+ let table_id = id_content;
+ let table_details = undefined;
//take the one with more elements
if(Object.keys(scope.tables_details).length > num_tables_in_content){
@@ -47,7 +47,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
table_details = scope.report.content[id_content];
}
- var name_to_remove = "experiment";
+ let name_to_remove = "experiment";
for(var i = 0; i < table_details.length; i++){
if(table_details[i].name == "experiment"){
table_details.splice(i,1);
@@ -75,10 +75,10 @@ angular.module('reportApp').directive("addreportitem", function($compile){
}
else if(type == "chart"){
- var content_detail = {};
- var chart_id = id_content;
+ let content_detail = {};
+ let chart_id = id_content;
- var plot_details = undefined;
+ let plot_details = undefined;
//take the one with more elements
if(Object.keys(scope.plots_details).length > num_figures_in_content){
@@ -107,8 +107,8 @@ angular.module('reportApp').directive("addreportitem", function($compile){
var html_div_code = '<div class="panel panel-default" id="' + chart_id + '"><div class="panel-heading" role="tab"><h4 class="panel-title"><a role="button" data-toggle="collapse" data-parent="#info-heading" href="#collapse-' + chart_id + '" aria-expanded="true" aria-controls="collapse-info"><i class="fa fa-area-chart"> ' + content_detail.name + '</i></a></h4></div><div id="collapse-' + chart_id + '" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="info-heading"><div id="'+chart_id+'" class="panel-body chart {$ report.status $}"></div></div></div>';
generate_element(scope, "plot", html_div_code);
- var element = document.getElementById(chart_id);
- var label_element = $(document.createElement('div'));
+ let element = document.getElementById(chart_id);
+ let label_element = $(document.createElement('div'));
label_element.addClass('row');
var accessnumber = "no_number";
@@ -116,12 +116,12 @@ angular.module('reportApp').directive("addreportitem", function($compile){
accessnumber = "number";
}
- var prepend_buttons = '<div class="col-sm-12"><div class="action-buttons report-buttons pull-left">';
- var append_buttons = '</div></div>';
+ let prepend_buttons = '<div class="col-sm-12"><div class="action-buttons report-buttons pull-left">';
+ let append_buttons = '</div></div>';
- var a_export = '<div class="btn-group"><button type="button" class="btn btn-primary btn-sm dropdown-toggle item_export ' + scope.report.status + ' ' + accessnumber + '" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-download fa-lg"></i> Export Figure <span class="caret"></span></button><ul class="dropdown-menu"><li id="PNG" buttonexportitem><a>PNG</a></li><li id="JPEG" buttonexportitem><a>JPEG</a></li><li id="PDF" buttonexportitem><a>PDF</a></li></ul></div>';
+ let a_export = '<div class="btn-group"><button type="button" class="btn btn-primary btn-sm dropdown-toggle item_export ' + scope.report.status + ' ' + accessnumber + '" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-download fa-lg"></i> Export Figure <span class="caret"></span></button><ul class="dropdown-menu"><li id="PNG" buttonexportitem><a>PNG</a></li><li id="JPEG" buttonexportitem><a>JPEG</a></li><li id="PDF" buttonexportitem><a>PDF</a></li></ul></div>';
if(scope.report.status == "editable" && scope.report.number != scope.report_number) {
- var a_element = '<button class="btn btn-danger btn-sm item_delete ' + scope.report.status + ' ' + accessnumber + '" buttondeleteitem><i class="fa fa-times fa-lg"></i> Delete</button>';
+ let a_element = '<button class="btn btn-danger btn-sm item_delete ' + scope.report.status + ' ' + accessnumber + '" buttondeleteitem><i class="fa fa-times fa-lg"></i> Delete</button>';
label_element.html(prepend_buttons + a_element + a_export + append_buttons);
}
else {
@@ -148,8 +148,8 @@ angular.module('reportApp').directive("addreportitem", function($compile){
);
scope.$on("redrawGraphElement", function(event, id_content, type){
- var content_detail = {};
- var chart_id = id_content;
+ let content_detail = {};
+ let chart_id = id_content;
content_detail["name"] = scope.report.content[chart_id].data.output[0];
//content_detail["description"] = scope.report.content[chart_id].data.plotter;
if(scope.report.content[chart_id].data.plotter != undefined){
@@ -162,23 +162,23 @@ angular.module('reportApp').directive("addreportitem", function($compile){
content_detail["merged"] = scope.report.content[chart_id].data.merged;
}
- var html_div_code = '<div class="panel panel-default" id="' + chart_id + '"><div class="panel-heading" role="tab"><h4 class="panel-title"><a role="button" data-toggle="collapse" data-parent="#info-heading" href="#collapse-' + chart_id + '" aria-expanded="true" aria-controls="collapse-info"><i class="fa fa-area-chart"> ' + content_detail.name + '</i></a></h4></div><div id="collapse-' + chart_id + '" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="info-heading"><div id="'+chart_id+'" class="panel-body chart"></div></div></div>';
+ let html_div_code = '<div class="panel panel-default" id="' + chart_id + '"><div class="panel-heading" role="tab"><h4 class="panel-title"><a role="button" data-toggle="collapse" data-parent="#info-heading" href="#collapse-' + chart_id + '" aria-expanded="true" aria-controls="collapse-info"><i class="fa fa-area-chart"> ' + content_detail.name + '</i></a></h4></div><div id="collapse-' + chart_id + '" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="info-heading"><div id="'+chart_id+'" class="panel-body chart"></div></div></div>';
generate_element(scope, "plot", html_div_code);
- var element = document.getElementById(chart_id);
- var label_element = $(document.createElement('div'));
+ let element = document.getElementById(chart_id);
+ let label_element = $(document.createElement('div'));
label_element.addClass('row');
- var accessnumber = "no_number";
+ let accessnumber = "no_number";
if(scope.report.number == scope.report_number){
accessnumber = "number";
}
- var prepend_buttons = '<div class="col-sm-12"><div class="action-buttons report-buttons pull-left">';
- var append_buttons = '</div></div>';
+ let prepend_buttons = '<div class="col-sm-12"><div class="action-buttons report-buttons pull-left">';
+ let append_buttons = '</div></div>';
- var a_export = '<div class="btn-group"><button type="button" class="btn btn-primary btn-sm dropdown-toggle item_export ' + scope.report.status + ' ' + accessnumber + '" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-download fa-lg"></i> Export Figure <span class="caret"></span></button><ul class="dropdown-menu"><li id="PNG" buttonexportitem><a>PNG</a></li><li id="JPEG" buttonexportitem><a>JPEG</a></li><li id="PDF" buttonexportitem><a>PDF</a></li></ul></div>';
+ let a_export = '<div class="btn-group"><button type="button" class="btn btn-primary btn-sm dropdown-toggle item_export ' + scope.report.status + ' ' + accessnumber + '" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-download fa-lg"></i> Export Figure <span class="caret"></span></button><ul class="dropdown-menu"><li id="PNG" buttonexportitem><a>PNG</a></li><li id="JPEG" buttonexportitem><a>JPEG</a></li><li id="PDF" buttonexportitem><a>PDF</a></li></ul></div>';
if(scope.report.status == "editable" && scope.report.number != scope.report_number) {
- var a_element = '<button class="btn btn-danger btn-sm item_delete ' + scope.report.status + ' ' + accessnumber + '" buttondeleteitem><i class="fa fa-times fa-lg"></i> Delete</button>';
+ let a_element = '<button class="btn btn-danger btn-sm item_delete ' + scope.report.status + ' ' + accessnumber + '" buttondeleteitem><i class="fa fa-times fa-lg"></i> Delete</button>';
label_element.html(prepend_buttons + a_element + a_export + append_buttons);
}
else {
@@ -196,12 +196,12 @@ angular.module('reportApp').directive("addreportitem", function($compile){
//add new report item
element.bind("click", function(){
- var left = $('.add_item').offset().left - $('.add_item').width() + 400;
- var top = $('.add_item').offset().top;
+ let left = $('.add_item').offset().left - $('.add_item').width() + 400;
+ let top = $('.add_item').offset().top;
smart_selector.display(scope.item_content.content, left, top);
- var allblocks = [];
- for(var i = 0; i < scope.report_experiments_blocks_merged_blocks.length; i++){
+ let allblocks = [];
+ for(let i = 0; i < scope.report_experiments_blocks_merged_blocks.length; i++){
allblocks.push(scope.report_experiments_blocks_merged_blocks[i]);
}
scope.report.common_blocks = arraysInCommon(allblocks);
@@ -211,10 +211,10 @@ angular.module('reportApp').directive("addreportitem", function($compile){
if(smart_selector != undefined){
smart_selector.onEntrySelected = function(item_selected){
- var left = $('.add_item').offset().left - $('.add_item').width() + 400;
- var top = $('.add_item').offset().top;
+ let left = $('.add_item').offset().left - $('.add_item').width() + 400;
+ let top = $('.add_item').offset().top;
- var next_items_for_selector = prepareContent(scope, smart_selector.entries[smart_selector.selected_entry].identifier);
+ let next_items_for_selector = prepareContent(scope, smart_selector.entries[smart_selector.selected_entry].identifier);
smart_selector_detail.display(next_items_for_selector, left, top);
};
}
@@ -222,11 +222,11 @@ angular.module('reportApp').directive("addreportitem", function($compile){
//handles next selector detail selection
if(smart_selector_detail != undefined){
smart_selector_detail.onEntrySelected = function(item_selected){
- var left = $('.add_item').offset().left - $('.add_item').width() + 400;
- var top = $('.add_item').offset().top;
+ let left = $('.add_item').offset().left - $('.add_item').width() + 400;
+ let top = $('.add_item').offset().top;
- var result_next_items = nextDetailContent(scope, smart_selector.entries[smart_selector.selected_entry].identifier, smart_selector_detail.entries[smart_selector_detail.selected_entry]);
+ let result_next_items = nextDetailContent(scope, smart_selector.entries[smart_selector.selected_entry].identifier, smart_selector_detail.entries[smart_selector_detail.selected_entry]);
if(!result_next_items[0]){
multiple_selector.display(result_next_items[1], left, top);
@@ -237,7 +237,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
//handles first creation of table based on options
if(multiple_selector != undefined){
multiple_selector.onEntrySelected = function(item_selected, data){
- for(var i = 0; i < multiple_selector.entries.length; i++){
+ for(let i = 0; i < multiple_selector.entries.length; i++){
if(multiple_selector.entries[i].name == item_selected){
multiple_selector.entries[i].selected = true;
}
@@ -245,7 +245,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
};
multiple_selector.onEntryDeselected = function(item_selected, data){
- for(var i = 0; i < multiple_selector.entries.length; i++){
+ for(let i = 0; i < multiple_selector.entries.length; i++){
if(multiple_selector.entries[i].name == item_selected){
multiple_selector.entries[i].selected = false;
}
@@ -254,18 +254,18 @@ angular.module('reportApp').directive("addreportitem", function($compile){
multiple_selector.onClose = function(){
//check if at least one item is selected
- var checkOneSelected = false;
+ let checkOneSelected = false;
angular.forEach(multiple_selector.entries, function(value, key){
if(value.selected)
checkOneSelected = true;
});
if(checkOneSelected){
- var table_id = 'table' + '_' + scope.num_report_items;
+ let table_id = 'table' + '_' + scope.num_report_items;
scope.tables_details[table_id] = multiple_selector.entries;
- var html_div_code = '<div class="panel panel-default" id="' + table_id + '"><div class="panel-heading" role="tab"><h4 class="panel-title"><a role="button" data-toggle="collapse" data-parent="#info-heading" href="#collapse-' + table_id + '" aria-expanded="true" aria-controls="collapse-info"><i class="fa fa-table"> Table</i></a></h4></div><div id="collapse-' + table_id + '" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="info-heading"><div class="panel-body" table-dynamic monster=' + scope.num_report_items + " tableid=" + table_id + " reportstatus=" + scope.report.status + " urlprefix=" + scope.url_prefix + '></div></div></div>';
+ let html_div_code = '<div class="panel panel-default" id="' + table_id + '"><div class="panel-heading" role="tab"><h4 class="panel-title"><a role="button" data-toggle="collapse" data-parent="#info-heading" href="#collapse-' + table_id + '" aria-expanded="true" aria-controls="collapse-info"><i class="fa fa-table"> Table</i></a></h4></div><div id="collapse-' + table_id + '" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="info-heading"><div class="panel-body" table-dynamic monster=' + scope.num_report_items + " tableid=" + table_id + " reportstatus=" + scope.report.status + " urlprefix=" + scope.url_prefix + '></div></div></div>';
angular.element(document.getElementById('space-for-report-items')).append($compile(html_div_code)(scope));
@@ -278,7 +278,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
//handles single table updates via settings option
if(multiple_selector_updater != undefined){
multiple_selector_updater.onEntrySelected = function(item_selected, data){
- for(var i = 0; i < multiple_selector_updater.entries.length; i++){
+ for(let i = 0; i < multiple_selector_updater.entries.length; i++){
if(multiple_selector_updater.entries[i].name == item_selected){
multiple_selector_updater.entries[i].selected = true;
}
@@ -286,7 +286,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
};
multiple_selector_updater.onEntryDeselected = function(item_selected, data){
- for(var i = 0; i < multiple_selector_updater.entries.length; i++){
+ for(let i = 0; i < multiple_selector_updater.entries.length; i++){
if(multiple_selector_updater.entries[i].name == item_selected){
multiple_selector_updater.entries[i].selected = false;
}
@@ -296,14 +296,14 @@ angular.module('reportApp').directive("addreportitem", function($compile){
multiple_selector_updater.onClose = function(){
//check if at least one item is selected
- var checkOneSelected = false;
+ let checkOneSelected = false;
angular.forEach(multiple_selector_updater.entries, function(value, key){
if(value.selected)
checkOneSelected = true;
});
if(checkOneSelected){
- var element = document.getElementById(multiple_selector_updater.current_table);
+ let element = document.getElementById(multiple_selector_updater.current_table);
$(element).attr('id', null);
$compile(element)(scope);
@@ -315,7 +315,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
//Prepare the content for selector initialization
function prepareContent(scope, content_identifier){
- var next_content_items = [];
+ let next_content_items = [];
switch(content_identifier){
case 'table':
@@ -329,7 +329,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
}
});
- var plottable_result = [];
+ let plottable_result = [];
angular.forEach(value.results[scope.report_experiments[key].analyzer_block], function(value_result_item, key_result_item){
if(value_result_item.type.startsWith("plot/")){
plottable_result.push(key_result_item);
@@ -347,8 +347,8 @@ angular.module('reportApp').directive("addreportitem", function($compile){
//create smart_selector items
angular.forEach(scope.report_experiments[single_experiment].plottable_blocks, function(value_plottable, key_plottable){
- var plot_type = scope.report_experiments[single_experiment].results[scope.report_experiments[single_experiment].analyzer_block][value_plottable].type;
- var item_dict = {};
+ let plot_type = scope.report_experiments[single_experiment].results[scope.report_experiments[single_experiment].analyzer_block][value_plottable].type;
+ let item_dict = {};
item_dict["identifier"] = value_plottable;
item_dict["name"] = value_plottable;
item_dict["description"] = plot_type;
@@ -363,9 +363,9 @@ angular.module('reportApp').directive("addreportitem", function($compile){
//Get the detailed content for next selector
function nextDetailContent(scope, content_identifier, sub_content){
- var is_end = false;
- var next_items = [];
- var return_contents = [];
+ let is_end = false;
+ let next_items = [];
+ let return_contents = [];
switch(content_identifier){
case 'table':
is_end = false;
@@ -376,7 +376,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
}
});
- var table_result = [];
+ let table_result = [];
angular.forEach(value.results[scope.report_experiments[key].analyzer_block], function(value_result_item, key_result_item){
if(!(value_result_item.type.startsWith("plot/"))){
table_result.push(key_result_item);
@@ -395,8 +395,8 @@ angular.module('reportApp').directive("addreportitem", function($compile){
//create smart_selector items
angular.forEach(scope.report_experiments[single_experiment].table_result_blocks, function(value_table_result, key_table_result){
- var table_item_data = scope.report_experiments[single_experiment].results[scope.report_experiments[single_experiment].analyzer_block][value_table_result];
- var item_dict = {};
+ let table_item_data = scope.report_experiments[single_experiment].results[scope.report_experiments[single_experiment].analyzer_block][value_table_result];
+ let item_dict = {};
item_dict["identifier"] = value_table_result;
item_dict["name"] = value_table_result;
item_dict["description"] = table_item_data.type;
@@ -411,7 +411,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
//adding execution time entry information for common blocks
angular.forEach(scope.report.common_blocks, function(value_table_result, key_table_result){
- var item_dict = {};
+ let item_dict = {};
item_dict["identifier"] = "execution_time." + value_table_result;
item_dict["name"] = "execution_time." + value_table_result;
item_dict["selected"] = false;
@@ -428,8 +428,8 @@ angular.module('reportApp').directive("addreportitem", function($compile){
//adding globals algorithms parameters
angular.forEach(scope.report_algorithm_parameters, function(value_algorithm_parameters, key_algorithm_parameters){
- for(var i = 0; i < Object.keys(value_algorithm_parameters).length; i++){
- var item_dict = {};
+ for(let i = 0; i < Object.keys(value_algorithm_parameters).length; i++){
+ let item_dict = {};
item_dict["identifier"] = "algorithm_parameter." + key_algorithm_parameters + "__" +Object.keys(value_algorithm_parameters)[i];
item_dict["name"] = "algorithm_parameter." + key_algorithm_parameters + "__" +Object.keys(value_algorithm_parameters)[i];
item_dict["selected"] = false;
@@ -458,7 +458,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
var a_export = '<div class="btn-group"><button type="button" class="btn btn-primary btn-sm dropdown-toggle item_export ' + scope.report.status + ' ' + accessnumber + '" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-download fa-lg"></i> Export Figure <span class="caret"></span></button><ul class="dropdown-menu"><li id="PNG" buttonexportitem><a>PNG</a></li><li id="JPEG" buttonexportitem><a>JPEG</a></li><li id="PDF" buttonexportitem><a>PDF</a></li></ul></div>';
if(scope.report.status == "editable" && scope.report.number != scope.report_number) {
- var a_element = '<button class="btn btn-danger btn-sm item_delete ' + scope.report.status + ' ' + accessnumber + '" buttondeleteitem><i class="fa fa-times fa-lg"></i> Delete</button>';
+ let a_element = '<button class="btn btn-danger btn-sm item_delete ' + scope.report.status + ' ' + accessnumber + '" buttondeleteitem><i class="fa fa-times fa-lg"></i> Delete</button>';
label_element.html(prepend_buttons + a_element + a_export + append_buttons);
}
else {
@@ -496,12 +496,12 @@ angular.module('reportApp').directive("addreportitem", function($compile){
//Retrieve chart from api and display on proper item
function _get_chart(scope, sub_content, content_type, chart_id){
- var required_plotter = [];
- var set_plotter = '';
+ let required_plotter = [];
+ let set_plotter = '';
if(sub_content.selected_plotter != undefined){
//required_plotter.push(sub_content.selected_plotter);
set_plotter = sub_content.selected_plotter;
- var requested_dataformat = '';
+ let requested_dataformat = '';
//Get other plotters for required dataformat
for (var i = 0; i < scope.report.plotters.length; i++){
if(scope.report.plotters[i].name == sub_content.selected_plotter){
@@ -547,16 +547,16 @@ angular.module('reportApp').directive("addreportitem", function($compile){
}
}
- var plotterparameter = [];
+ let plotterparameter = [];
//Get other plotterparameter
for (var i = 0; i < scope.report.plotterparameter.length; i++){
plotterparameter.push(scope.report.plotterparameter[i].name);
}
- var chart_name = sub_content.name;
+ let chart_name = sub_content.name;
- var legend_experiments = '';
- var alias_experiments = [];
+ let legend_experiments = '';
+ let alias_experiments = [];
for(var i = 0; i < scope.report.experiments.length; i++){
if(i == 0)
legend_experiments = scope.report_experiments_alias[scope.report.experiments[i]];
@@ -566,7 +566,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
alias_experiments.push(scope.report_experiments_alias[scope.report.experiments[i]]);
}
- var request_data = {
+ let request_data = {
experiment: alias_experiments,
analyzer: [scope.report.analyzer],
output: [chart_name],
@@ -579,7 +579,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
base_url = scope.report.url_prefix;
- var plot_detail = {};
+ let plot_detail = {};
plot_detail["required_plotter"] = required_plotter;
plot_detail["data"] = {
analyzer: [scope.report.analyzer],
@@ -616,12 +616,12 @@ angular.module('reportApp').directive("addreportitem", function($compile){
//Retrieve chart from api and display on proper item
function _retrieve_chart(scope, sub_content, container){
- var required_plotter = [];
- var set_plotter = '';
+ let required_plotter = [];
+ let set_plotter = '';
if(sub_content.selected_plotter != undefined){
//required_plotter.push(sub_content.selected_plotter);
set_plotter = sub_content.selected_plotter;
- var requested_dataformat = '';
+ let requested_dataformat = '';
//Get other plotters for required dataformat
for (var i = 0; i < scope.report.plotters.length; i++){
if(scope.report.plotters[i].name == sub_content.selected_plotter){
@@ -667,16 +667,16 @@ angular.module('reportApp').directive("addreportitem", function($compile){
}
}
- var plotterparameter = [];
+ let plotterparameter = [];
//Get other plotterparameter
for (var i = 0; i < scope.report.plotterparameter.length; i++){
plotterparameter.push(scope.report.plotterparameter[i].name);
}
- var chart_name = sub_content.name;
+ let chart_name = sub_content.name;
- var legend_experiments = '';
- var alias_experiments = [];
+ let legend_experiments = '';
+ let alias_experiments = [];
for(var i = 0; i < scope.report.experiments.length; i++){
if(i == 0)
@@ -690,7 +690,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
alias_experiments.push(scope.report_experiments_alias_from_content[scope.report.experiments[i]]);
}
- var request_data = {
+ let request_data = {
experiment: alias_experiments,
analyzer: [scope.report.analyzer],
output: [chart_name],
@@ -704,7 +704,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
base_url = scope.report.url_prefix;
//scope.plots_details[container.id];
- var plot_detail = {};
+ let plot_detail = {};
plot_detail["required_plotter"] = required_plotter;
plot_detail["data"] = {
analyzer: [scope.report.analyzer],
@@ -755,7 +755,7 @@ angular.module('reportApp').directive("addreportitem", function($compile){
}
function arraysInCommon(arrays){
- var i, common,
+ let i, common,
L= arrays.length, min= Infinity;
while(L){
if(arrays[--L].length<min){
diff --git a/beat/web/reports/static/reports/app/directives/aliasExperiment.js b/beat/web/reports/static/reports/app/directives/aliasExperiment.js
index 7254b4dbd..5fda415e6 100644
--- a/beat/web/reports/static/reports/app/directives/aliasExperiment.js
+++ b/beat/web/reports/static/reports/app/directives/aliasExperiment.js
@@ -24,13 +24,13 @@
angular.module('reportApp').directive("aliasexperiment", function($compile){
return {
link:function(scope, element, attrs){
- var alias_name = scope.$parent.$parent.$parent.$parent.report_experiments_alias[scope.name];
+ let alias_name = scope.$parent.$parent.$parent.$parent.report_experiments_alias[scope.name];
createAlias(scope.name, alias_name);
element.bind("click", function(){
- var input_element = document.getElementById("input_"+scope.name);
- var icon_element = document.getElementById("icon_"+scope.name);
- var button_element = document.getElementById("button_alias_"+scope.name);
+ let input_element = document.getElementById("input_"+scope.name);
+ let icon_element = document.getElementById("icon_"+scope.name);
+ let button_element = document.getElementById("button_alias_"+scope.name);
if(! $(input_element).hasClass("input-disabled")){
if ($(input_element).val()){
$(input_element).addClass("input-disabled");
@@ -38,8 +38,8 @@ angular.module('reportApp').directive("aliasexperiment", function($compile){
$(icon_element).removeClass("fa-unlock");
$(icon_element).addClass("fa-lock");
$(button_element).addClass("setalias");
- var experiment_name = attrs.id.split("button_alias_")[1];
- var alias_name = $(input_element).val();
+ let experiment_name = attrs.id.split("button_alias_")[1];
+ let alias_name = $(input_element).val();
$(input_element).val(alias_name);
createAlias(experiment_name, alias_name);
}
@@ -63,16 +63,16 @@ angular.module('reportApp').directive("aliasexperiment", function($compile){
if(!scope.$$phase){
//$digest or $apply
- var parent_scope = scope.$parent.$parent.$parent.$parent;
- var table_details = parent_scope.tables_details;
+ let parent_scope = scope.$parent.$parent.$parent.$parent;
+ let table_details = parent_scope.tables_details;
- for(var i = 0; i < parent_scope.report.orderedcontent.length; i++){
- var element = document.getElementById(parent_scope.report.orderedcontent[i]);
+ for(let i = 0; i < parent_scope.report.orderedcontent.length; i++){
+ let element = document.getElementById(parent_scope.report.orderedcontent[i]);
$(element).remove();
- var id_content = parent_scope.report.orderedcontent[i];
- var type = id_content.split("_")[0];
+ let id_content = parent_scope.report.orderedcontent[i];
+ let type = id_content.split("_")[0];
parent_scope.$parent.$broadcast("addSavedElement", id_content, type);
}
}
diff --git a/beat/web/reports/static/reports/app/directives/buttonDeleteItem.js b/beat/web/reports/static/reports/app/directives/buttonDeleteItem.js
index 04412d83f..d23011aea 100644
--- a/beat/web/reports/static/reports/app/directives/buttonDeleteItem.js
+++ b/beat/web/reports/static/reports/app/directives/buttonDeleteItem.js
@@ -25,7 +25,7 @@ angular.module('reportApp').directive("buttondeleteitem", function(){
return {
link:function(scope, element, attrs){
element.bind("click", function(){
- var elementToRemove = element.context.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement;
+ let elementToRemove = element.context.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement;
beat.ui.report.remove_item('report_remove_item', elementToRemove, scope);
});
}
diff --git a/beat/web/reports/static/reports/app/directives/buttonExportItem.js b/beat/web/reports/static/reports/app/directives/buttonExportItem.js
index 97f6abbf3..f6b9c20a5 100644
--- a/beat/web/reports/static/reports/app/directives/buttonExportItem.js
+++ b/beat/web/reports/static/reports/app/directives/buttonExportItem.js
@@ -25,10 +25,10 @@ angular.module('reportApp').directive("buttonexportitem", function(){
return {
link:function(scope, element, attrs){
element.bind("click", function(){
- var the_element = element.context.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement;
+ let the_element = element.context.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement;
if(the_element.id.indexOf("chart_") == 0){
- var content_detail = {};
- var chart_id = the_element.id;
+ let content_detail = {};
+ let chart_id = the_element.id;
content_detail["name"] = scope.plots_details[chart_id].data.output[0];
@@ -42,16 +42,16 @@ angular.module('reportApp').directive("buttonexportitem", function(){
content_detail["merged"] = scope.plots_details[chart_id].data.merged;
}
- var accessnumber = "no_number";
+ let accessnumber = "no_number";
if(scope.report.number == scope.report_number){
accessnumber = "number";
}
_get_chart(scope, content_detail, element[0].id, chart_id);
}
else if(the_element.id.indexOf("table_") == 0){
- var separator = ",";
- var csv_text = export_table_as_csv(scope, the_element.id, separator);
- var output_filename = the_element.id + ".csv";
+ let separator = ",";
+ let csv_text = export_table_as_csv(scope, the_element.id, separator);
+ let output_filename = the_element.id + ".csv";
download(csv_text, output_filename, "text/plain");
}
});
@@ -59,12 +59,12 @@ angular.module('reportApp').directive("buttonexportitem", function(){
};
function export_table_as_csv(scope, table_id, separator){
- var report_experiments = scope.$parent.report_experiments;
- var report_experiments_alias = scope.$parent.report_experiments_alias;
- var floating_point_precision = scope.$parent.floating_point_precision;
- var report = scope.report;
- var final_table = [];
- var table_headers = [];
+ let report_experiments = scope.$parent.report_experiments;
+ let report_experiments_alias = scope.$parent.report_experiments_alias;
+ let floating_point_precision = scope.$parent.floating_point_precision;
+ let report = scope.report;
+ let final_table = [];
+ let table_headers = [];
angular.forEach(scope.tables_details[table_id], function(table_value, table_key){
if(table_value.selected){
table_headers.push(table_value.name);
@@ -74,12 +74,12 @@ angular.module('reportApp').directive("buttonexportitem", function(){
final_table.push(table_headers);
angular.forEach(report_experiments, function(experiment_value, experiment_key){
- var table_items = [];
+ let table_items = [];
angular.forEach(table_headers, function(table_value, table_key){
- var experiment_name = experiment_key;
- var analyzer_block = report_experiments[experiment_name].analyzer_block;
- var report_algorithm_parameters_experiment = scope.$parent.report_algorithm_parameters_experiment;
+ let experiment_name = experiment_key;
+ let analyzer_block = report_experiments[experiment_name].analyzer_block;
+ let report_algorithm_parameters_experiment = scope.$parent.report_algorithm_parameters_experiment;
if(table_value != "experiment"){
if(analyzer_block == undefined){
@@ -111,7 +111,7 @@ angular.module('reportApp').directive("buttonexportitem", function(){
else if(table_value.indexOf("experiment.") == 0){
//total execution time information
var block_name = table_value.split("execution_time.")[1];
- var total_time = 0;
+ let total_time = 0;
if(Object.keys(report_experiments[experiment_name].execution_info).length === 0){
total_time = "-";
}
@@ -126,11 +126,11 @@ angular.module('reportApp').directive("buttonexportitem", function(){
else if(table_value.indexOf("algorithm_parameter.") == 0){
//total execution time information
var block_name = table_value.split("algorithm_parameter.")[1];
- var algorithm_name = block_name.split("__")[0];
- var parameter_name = block_name.split("__")[1];
+ let algorithm_name = block_name.split("__")[0];
+ let parameter_name = block_name.split("__")[1];
if(report_algorithm_parameters_experiment[experiment_name][algorithm_name] != undefined){
- var value = "";
- for(var i = 0; i < report_algorithm_parameters_experiment[experiment_name][algorithm_name][parameter_name].length; i++){
+ let value = "";
+ for(let i = 0; i < report_algorithm_parameters_experiment[experiment_name][algorithm_name][parameter_name].length; i++){
if(i > 0 && i < report_algorithm_parameters_experiment[experiment_name][algorithm_name][parameter_name].length -1 ){
value += ",";
}
@@ -149,7 +149,7 @@ angular.module('reportApp').directive("buttonexportitem", function(){
}
}
else{
- var experiment_alias = report_experiments_alias[experiment_name];
+ let experiment_alias = report_experiments_alias[experiment_name];
table_items.push(experiment_alias);
}
@@ -159,13 +159,13 @@ angular.module('reportApp').directive("buttonexportitem", function(){
});
- var csv_text = "";
- for(var i = 0; i < final_table.length; i++){
+ let csv_text = "";
+ for(let i = 0; i < final_table.length; i++){
if(i != 0){
csv_text += "\n";
}
- for(var j = 0; j < final_table[i].length; j++){
+ for(let j = 0; j < final_table[i].length; j++){
if( j != 0){
csv_text += separator;
}
@@ -173,19 +173,19 @@ angular.module('reportApp').directive("buttonexportitem", function(){
}
}
- var pre_base64_text = "data:text/plain;base64,";
- var base_64_csv_text = pre_base64_text + Base64.encode(csv_text);
+ let pre_base64_text = "data:text/plain;base64,";
+ let base_64_csv_text = pre_base64_text + Base64.encode(csv_text);
return base_64_csv_text;
}
//Retrieve chart from api and display on proper item
function _get_chart(scope, sub_content, content_type, chart_id){
- var required_plotter = [];
- var set_plotter = '';
+ let required_plotter = [];
+ let set_plotter = '';
if(sub_content.selected_plotter != undefined){
//required_plotter.push(sub_content.selected_plotter);
set_plotter = sub_content.selected_plotter;
- var requested_dataformat = '';
+ let requested_dataformat = '';
//Get other plotters for required dataformat
for (var i = 0; i < scope.report.plotters.length; i++){
if(scope.report.plotters[i].name == sub_content.selected_plotter){
@@ -231,15 +231,15 @@ angular.module('reportApp').directive("buttonexportitem", function(){
}
}
- var plotterparameter = [];
+ let plotterparameter = [];
//Get other plotterparameter
for (var i = 0; i < scope.report.plotterparameter.length; i++){
plotterparameter.push(scope.report.plotterparameter[i].name);
}
- var chart_name = sub_content.name;
+ let chart_name = sub_content.name;
- var legend_experiments = '';
+ let legend_experiments = '';
for(var i = 0; i < scope.report.experiments.length; i++){
if(i == 0)
legend_experiments = scope.report_experiments_alias[scope.report.experiments[i]];
@@ -247,7 +247,7 @@ angular.module('reportApp').directive("buttonexportitem", function(){
legend_experiments = legend_experiments+ "&" +scope.report_experiments_alias[scope.report.experiments[i]];
}
- var request_data = {
+ let request_data = {
experiment: scope.report.experiments,
analyzer: [scope.report.analyzer],
output: [chart_name],
@@ -259,7 +259,7 @@ angular.module('reportApp').directive("buttonexportitem", function(){
base_url = scope.report.url_prefix;
- var plot_detail = {};
+ let plot_detail = {};
plot_detail["required_plotter"] = required_plotter;
plot_detail["data"] = request_data;
if(sub_content.selected_template != undefined){// && sub_content.selected_template != "Default")
diff --git a/beat/web/reports/static/reports/app/directives/buttonSettings.js b/beat/web/reports/static/reports/app/directives/buttonSettings.js
index ab33d446f..06062c6b2 100644
--- a/beat/web/reports/static/reports/app/directives/buttonSettings.js
+++ b/beat/web/reports/static/reports/app/directives/buttonSettings.js
@@ -25,9 +25,9 @@ angular.module('reportApp').directive("buttonsettings", function(){
return {
link:function(scope, element, attrs){
element.bind("click", function(){
- var name_to_remove = "experiment";
- var tables_details = scope.$parent.tables_details[scope.dattrs.tableid];
- for(var i = 0; i < tables_details.length; i++){
+ let name_to_remove = "experiment";
+ let tables_details = scope.$parent.tables_details[scope.dattrs.tableid];
+ for(let i = 0; i < tables_details.length; i++){
if(tables_details[i].name == "experiment"){
tables_details.splice(i,1);
break;
diff --git a/beat/web/reports/static/reports/app/directives/item.js b/beat/web/reports/static/reports/app/directives/item.js
index ea6c8a7b6..5e383a474 100644
--- a/beat/web/reports/static/reports/app/directives/item.js
+++ b/beat/web/reports/static/reports/app/directives/item.js
@@ -23,13 +23,13 @@
//Dynamic tables items
angular.module('reportApp').directive('item', function ($compile) {
function createTDElement(column) {
- var table = angular.element('<table><tr><td class="tableitemspace" thecolumn="' + column + '"></td></tr></table>');
+ let table = angular.element('<table><tr><td class="tableitemspace" thecolumn="' + column + '"></td></tr></table>');
return table.find('td');
}
function render(element, scope) {
- var column, html, i;
- var columns = scope.$parent.tables_details[scope.$parent.dattrs.tableid];
+ let column, html, i;
+ let columns = scope.$parent.tables_details[scope.$parent.dattrs.tableid];
for (i = 0; i < columns.length ; i++) {
if(i == 0 && columns.length > 0){
diff --git a/beat/web/reports/static/reports/app/directives/myReportInfo.js b/beat/web/reports/static/reports/app/directives/myReportInfo.js
index 38e96d2fd..f8f0c4cb0 100644
--- a/beat/web/reports/static/reports/app/directives/myReportInfo.js
+++ b/beat/web/reports/static/reports/app/directives/myReportInfo.js
@@ -28,8 +28,8 @@ angular.module('reportApp').directive("myreportinfo", function(){
replace: true,
    //templateUrl: "/reports/partials/reportTable/",
    templateUrl: function(scope, elem, attrs){
- var prefix = elem['urlprefix'];
- Â Â Â Â var the_url = prefix + "/reports/partials/reportInfo/";
+ let prefix = elem['urlprefix'];
+ Â Â Â Â let the_url = prefix + "/reports/partials/reportInfo/";
return the_url;
},
link: function(scope, elem, attrs){
diff --git a/beat/web/reports/static/reports/app/directives/saveReportItems.js b/beat/web/reports/static/reports/app/directives/saveReportItems.js
index 217865157..0c75086e0 100644
--- a/beat/web/reports/static/reports/app/directives/saveReportItems.js
+++ b/beat/web/reports/static/reports/app/directives/saveReportItems.js
@@ -26,7 +26,7 @@ angular.module('reportApp').directive("savereportitems", function($compile){
//add new report item
element.bind("click", function(){
//var savecontent = [];
- var savecontent = {};
+ let savecontent = {};
if(scope.plots_details != undefined){
angular.forEach(scope.plots_details, function(value, key){
//savecontent.push(key, value);
@@ -44,7 +44,7 @@ angular.module('reportApp').directive("savereportitems", function($compile){
}
}
if(scope.report_experiments_alias != undefined){
- var alias_experiments = {};
+ let alias_experiments = {};
angular.forEach(scope.report_experiments_alias, function(value, key){
alias_experiments[key] = value;
});
@@ -58,11 +58,11 @@ angular.module('reportApp').directive("savereportitems", function($compile){
savecontent["sorted_tables_sortkey"] = scope.sorted_experiments_keys_tables_sortkey;
}
//call set report content from factory
- var mydict = {};
+ let mydict = {};
mydict["experiments"] = scope.report.experiments;
mydict["content"] = savecontent;
- for(var i = 0; i < scope.report.experiments.length; i++){
+ for(let i = 0; i < scope.report.experiments.length; i++){
scope.report_experiments_alias_from_content[scope.report.experiments[i]] = scope.report_experiments_alias[scope.report.experiments[i]];
}
diff --git a/beat/web/reports/static/reports/app/directives/sortData.js b/beat/web/reports/static/reports/app/directives/sortData.js
index e2a39dade..75f31fff6 100644
--- a/beat/web/reports/static/reports/app/directives/sortData.js
+++ b/beat/web/reports/static/reports/app/directives/sortData.js
@@ -25,11 +25,11 @@ angular.module('reportApp').directive("sortdata", function($compile){
return {
link:function(scope, element, attrs){
element.bind("click", function(){
- var the_parent = scope.$parent.$parent.$parent.$parent;
- var analyzer_block = undefined;
- var report_experiments = the_parent.report_experiments;
- var report = the_parent.report;
- var table_id = attrs.sorttblid; //get table id
+ let the_parent = scope.$parent.$parent.$parent.$parent;
+ let analyzer_block = undefined;
+ let report_experiments = the_parent.report_experiments;
+ let report = the_parent.report;
+ let table_id = attrs.sorttblid; //get table id
the_parent.sorted_tables.push(table_id);
if(the_parent.sorted_experiments_keys_reverse[table_id] == undefined){
@@ -42,7 +42,7 @@ angular.module('reportApp').directive("sortdata", function($compile){
the_parent.sorted_experiments_keys_tables_sortkey[table_id] = attrs.sortth; //set the sortKey to the param passed
if(the_parent.sorted_experiments_keys_tables_sortkey[table_id] != "experiment"){
- var local_sort_list = [];
+ let local_sort_list = [];
if(analyzer_block == undefined){
angular.forEach(report_experiments, function(value, key){
@@ -59,9 +59,9 @@ angular.module('reportApp').directive("sortdata", function($compile){
//execution time information
var block_name = the_parent.sorted_experiments_keys_tables_sortkey[table_id].split("execution_time.")[1].split("[s]")[0];
angular.forEach(report_experiments, function(value, key){
- var local_sort_dict = {};
+ let local_sort_dict = {};
local_sort_dict["experiment"] = key;
- var itemValue = "";
+ let itemValue = "";
if(Object.keys(report_experiments[key].execution_info).length === 0){
itemValue = "-";
@@ -84,10 +84,10 @@ angular.module('reportApp').directive("sortdata", function($compile){
var block_name = the_parent.sorted_experiments_keys_tables_sortkey[table_id].split("execution_time.")[1];
angular.forEach(report_experiments, function(value, key){
- var local_sort_dict = {};
+ let local_sort_dict = {};
local_sort_dict["experiment"] = key;
- var itemValue = "";
- var total_time = 0;
+ let itemValue = "";
+ let total_time = 0;
if(Object.keys(report_experiments[key].execution_info).length === 0){
total_time = "-";
@@ -107,19 +107,19 @@ angular.module('reportApp').directive("sortdata", function($compile){
else if(the_parent.sorted_experiments_keys_tables_sortkey[table_id].indexOf("algorithm_parameter.") == 0){
//total execution time information
var block_name = the_parent.sorted_experiments_keys_tables_sortkey[table_id].split("algorithm_parameter.")[1];
- var algorithm_name = block_name.split("__")[0];
- var parameter_name = block_name.split("__")[1];
+ let algorithm_name = block_name.split("__")[0];
+ let parameter_name = block_name.split("__")[1];
angular.forEach(report_experiments, function(value, key){
- var local_sort_dict = {};
+ let local_sort_dict = {};
local_sort_dict["experiment"] = key;
- var itemValue = "";
+ let itemValue = "";
if(the_parent.report_algorithm_parameters_experiment[key][algorithm_name] != undefined){
var value = "";
if(the_parent.report_algorithm_parameters_experiment[key][algorithm_name][parameter_name] != undefined){
- for(var i = 0; i < the_parent.report_algorithm_parameters_experiment[key][algorithm_name][parameter_name].length; i++){
+ for(let i = 0; i < the_parent.report_algorithm_parameters_experiment[key][algorithm_name][parameter_name].length; i++){
if(i > 0 && i < the_parent.report_algorithm_parameters_experiment[key][algorithm_name][parameter_name].length -1 ){
value += ",";
}
@@ -148,7 +148,7 @@ angular.module('reportApp').directive("sortdata", function($compile){
else{
//results information
angular.forEach(report_experiments, function(value, key){
- var local_sort_dict = {};
+ let local_sort_dict = {};
local_sort_dict["experiment"] = key;
local_sort_dict["value"] = report_experiments[key].results[analyzer_block][the_parent.sorted_experiments_keys_tables_sortkey[table_id]].value;
@@ -180,10 +180,10 @@ angular.module('reportApp').directive("sortdata", function($compile){
}
else{
- var experiments_aliases = [];
+ let experiments_aliases = [];
for(var i = 0; i < the_parent.report.experiments.length; i++){
- var experiment_name = the_parent.report.experiments[i];
- var experiment_alias = the_parent.report_experiments_alias[experiment_name];
+ let experiment_name = the_parent.report.experiments[i];
+ let experiment_alias = the_parent.report_experiments_alias[experiment_name];
experiments_aliases.push(experiment_alias);
}
@@ -201,7 +201,7 @@ angular.module('reportApp').directive("sortdata", function($compile){
the_parent.sorted_experiments_keys_tables[table_id] = [];
the_parent.sorted_experiments_alias_keys_tables[table_id] = [];
for(var i = 0; i < experiments_aliases.length; i++){
- for(var the_experiment_key in the_parent.report_experiments_alias){
+ for(let the_experiment_key in the_parent.report_experiments_alias){
if(the_parent.report_experiments_alias[the_experiment_key] == experiments_aliases[i]){
the_parent.sorted_experiments_keys_tables[table_id].push(the_experiment_key);
if(the_parent.report.status == "editable"){
@@ -213,8 +213,8 @@ angular.module('reportApp').directive("sortdata", function($compile){
}
}
- var name_to_remove = "experiment";
- var tables_details = the_parent.tables_details[table_id];
+ let name_to_remove = "experiment";
+ let tables_details = the_parent.tables_details[table_id];
for(var i = 0; i < tables_details.length; i++){
if(tables_details[i].name == "experiment"){
tables_details.splice(i,1);
@@ -222,7 +222,7 @@ angular.module('reportApp').directive("sortdata", function($compile){
}
}
- var element = document.getElementById(table_id);
+ let element = document.getElementById(table_id);
$(element).attr('id', null);
$compile(element)(scope.$parent.$parent);
diff --git a/beat/web/reports/static/reports/app/directives/tableDynamic.js b/beat/web/reports/static/reports/app/directives/tableDynamic.js
index 6a116415b..40d296db4 100644
--- a/beat/web/reports/static/reports/app/directives/tableDynamic.js
+++ b/beat/web/reports/static/reports/app/directives/tableDynamic.js
@@ -28,19 +28,19 @@ angular.module('reportApp').directive("tableDynamic", function(){
replace: true,
    //templateUrl: "/reports/partials/reportTable/",
    templateUrl: function(scope, elem, attrs){
- var prefix = elem['urlprefix'];
- Â Â Â Â var the_url = prefix + "/reports/partials/reportTable/";
+ let prefix = elem['urlprefix'];
+ Â Â Â Â let the_url = prefix + "/reports/partials/reportTable/";
return the_url;
},
link: function(scope, elem, attrs){
- var prepend_item = {};
+ let prepend_item = {};
prepend_item["name"] = "experiment";
prepend_item["selected"] = true;
scope.tables_details[attrs.tableid].unshift(prepend_item);
angular.forEach(scope.tables_details, function(table_value, table_key){
- for(var i = 0; i < table_value.length; i++){
+ for(let i = 0; i < table_value.length; i++){
if(table_value[i].name.indexOf("execution_time") > -1 &&
table_value[i].name.indexOf("[s]") == -1){
table_value[i].name = table_value[i].name + "[s]";
diff --git a/beat/web/reports/static/reports/app/directives/tablePrecision.js b/beat/web/reports/static/reports/app/directives/tablePrecision.js
index 7f82452bd..ac3d58249 100644
--- a/beat/web/reports/static/reports/app/directives/tablePrecision.js
+++ b/beat/web/reports/static/reports/app/directives/tablePrecision.js
@@ -31,16 +31,16 @@ angular.module('reportApp').directive("tableprecision", function($compile){
function fixFloatingPoint(selected_precision){
if(!scope.$$phase){
//$digest or $apply
- var parent_scope = scope.$parent;
- var table_details = parent_scope.tables_details;
+ let parent_scope = scope.$parent;
+ let table_details = parent_scope.tables_details;
- for(var i = 0; i < parent_scope.report.orderedcontent.length; i++){
- var element = document.getElementById(parent_scope.report.orderedcontent[i]);
+ for(let i = 0; i < parent_scope.report.orderedcontent.length; i++){
+ let element = document.getElementById(parent_scope.report.orderedcontent[i]);
$(element).remove();
- var id_content = parent_scope.report.orderedcontent[i];
- var type = id_content.split("_")[0];
+ let id_content = parent_scope.report.orderedcontent[i];
+ let type = id_content.split("_")[0];
parent_scope.$parent.$parent.$broadcast("addSavedElement", id_content, type);
}
}
diff --git a/beat/web/reports/static/reports/app/directives/theColumn.js b/beat/web/reports/static/reports/app/directives/theColumn.js
index 30e2de5b8..d1cdcaf2e 100644
--- a/beat/web/reports/static/reports/app/directives/theColumn.js
+++ b/beat/web/reports/static/reports/app/directives/theColumn.js
@@ -31,19 +31,19 @@ angular.module('reportApp').directive("thecolumn",['$compile', function ($compil
template: '{{itemValue}}',
controller: ['$scope', function ($scope) {
- var the_parent = $scope.$parent.$parent.$parent.$parent;
- var report_experiments = $scope.$parent.$parent.$parent.$parent.report_experiments;
- var report_experiments_alias = $scope.$parent.$parent.$parent.$parent.report_experiments_alias;
- var floating_point_precision = $scope.$parent.$parent.$parent.$parent.floating_point_precision;
- var report = $scope.$parent.$parent.$parent.report;
- var experiment_name = $scope.$parent.item;
+ let the_parent = $scope.$parent.$parent.$parent.$parent;
+ let report_experiments = $scope.$parent.$parent.$parent.$parent.report_experiments;
+ let report_experiments_alias = $scope.$parent.$parent.$parent.$parent.report_experiments_alias;
+ let floating_point_precision = $scope.$parent.$parent.$parent.$parent.floating_point_precision;
+ let report = $scope.$parent.$parent.$parent.report;
+ let experiment_name = $scope.$parent.item;
if(jQuery.isEmptyObject(report_experiments) || (report_experiments[experiment_name] == undefined)){
return;
}
- var analyzer_block = report_experiments[experiment_name].analyzer_block;
- var report_algorithm_parameters_experiment = $scope.$parent.$parent.$parent.$parent.report_algorithm_parameters_experiment;
+ let analyzer_block = report_experiments[experiment_name].analyzer_block;
+ let report_algorithm_parameters_experiment = $scope.$parent.$parent.$parent.$parent.report_algorithm_parameters_experiment;
if($scope.thecolumn != "experiment"){
if(analyzer_block == undefined){
@@ -75,7 +75,7 @@ angular.module('reportApp').directive("thecolumn",['$compile', function ($compil
else if($scope.thecolumn.indexOf("experiment.") == 0){
//total execution time information
var block_name = $scope.thecolumn.split("execution_time.")[1];
- var total_time = 0;
+ let total_time = 0;
if(Object.keys(report_experiments[experiment_name].execution_info).length === 0){
total_time = "-";
}
@@ -90,12 +90,12 @@ angular.module('reportApp').directive("thecolumn",['$compile', function ($compil
else if($scope.thecolumn.indexOf("algorithm_parameter.") == 0){
//total execution time information
var block_name = $scope.thecolumn.split("algorithm_parameter.")[1];
- var algorithm_name = block_name.split("__")[0];
- var parameter_name = block_name.split("__")[1];
+ let algorithm_name = block_name.split("__")[0];
+ let parameter_name = block_name.split("__")[1];
if(report_algorithm_parameters_experiment[experiment_name][algorithm_name] != undefined){
- var value = "";
+ let value = "";
if(report_algorithm_parameters_experiment[experiment_name][algorithm_name][parameter_name] != undefined){
- for(var i = 0; i < report_algorithm_parameters_experiment[experiment_name][algorithm_name][parameter_name].length; i++){
+ for(let i = 0; i < report_algorithm_parameters_experiment[experiment_name][algorithm_name][parameter_name].length; i++){
if(i > 0 && i < report_algorithm_parameters_experiment[experiment_name][algorithm_name][parameter_name].length -1 ){
value += ",";
}
@@ -123,7 +123,7 @@ angular.module('reportApp').directive("thecolumn",['$compile', function ($compil
}
}
else{
- var experiment_alias = report_experiments_alias[experiment_name];
+ let experiment_alias = report_experiments_alias[experiment_name];
$scope.itemValue = experiment_alias;
}
}]//,
diff --git a/beat/web/reports/static/reports/app/factories/dataFactory.js b/beat/web/reports/static/reports/app/factories/dataFactory.js
index f3fb497e0..aeb3cb67f 100644
--- a/beat/web/reports/static/reports/app/factories/dataFactory.js
+++ b/beat/web/reports/static/reports/app/factories/dataFactory.js
@@ -21,9 +21,9 @@
*/
//This factory retrieves data from the static files and associates it with the $scope
angular.module('reportApp').factory('dataFactory', function($http){
- var getData = function (URL) {
+ let getData = function (URL) {
//return $http.get(URL + 'itemcontent.json');
- var obj = {content:null};
+ let obj = {content:null};
//return $http.get(URL);
$http.get(URL).success(function(data){
obj.content = data;
diff --git a/beat/web/reports/static/reports/app/factories/plotterFactory.js b/beat/web/reports/static/reports/app/factories/plotterFactory.js
index f19e23ec6..e10b72e37 100644
--- a/beat/web/reports/static/reports/app/factories/plotterFactory.js
+++ b/beat/web/reports/static/reports/app/factories/plotterFactory.js
@@ -21,7 +21,7 @@
*/
//This factory retrieves data from the REST API and associates it with the $scope
angular.module('reportApp').factory('plotterFactory', ['$http', function($http){
- var plotterFactory = {};
+ let plotterFactory = {};
plotterFactory.getPlotters = function (url_prefix){
urlBase = url_prefix + '/api/v1/plotters';
diff --git a/beat/web/reports/static/reports/app/factories/reportFactory.js b/beat/web/reports/static/reports/app/factories/reportFactory.js
index 431abd8bd..d7bb01802 100644
--- a/beat/web/reports/static/reports/app/factories/reportFactory.js
+++ b/beat/web/reports/static/reports/app/factories/reportFactory.js
@@ -21,8 +21,8 @@
*/
//This factory retrieves data from the REST API and associates it with the $scope
angular.module('reportApp').factory('reportFactory', ['$http', 'experimentFactory', function($http, experimentFactory) {
- var urlBase = '/api/v1/reports';
- var reportFactory = {};
+ let urlBase = '/api/v1/reports';
+ let reportFactory = {};
reportFactory.getReportInformation = function (user, report_id, url_prefix){
urlBase = url_prefix + '/api/v1/reports';
--
GitLab