diff --git a/beat/web/reports/static/reports/app/controllers/groupsController.js b/beat/web/reports/static/reports/app/controllers/groupsController.js index e7432840f60395a92caea6fe40a4c80c753b2a7d..fd2ab9e8c19838c78071ec938ad3ede23b2de801 100644 --- a/beat/web/reports/static/reports/app/controllers/groupsController.js +++ b/beat/web/reports/static/reports/app/controllers/groupsController.js @@ -30,14 +30,14 @@ angular.module('reportApp').controller('GroupsController', ['$http', 'UrlService vm.expNamesToRemove = []; vm.toggleExpName = (expName) => { - console.log(vm.expNamesToRemove); + //console.log(vm.expNamesToRemove); let idx = vm.expNamesToRemove.indexOf(expName); if(idx > -1){ vm.expNamesToRemove.splice(idx, 1); } else { vm.expNamesToRemove.push(expName); } - console.log(vm.expNamesToRemove); + //console.log(vm.expNamesToRemove); }; vm.removeExperiments = () => { diff --git a/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js b/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js index e551dc117f121edae501c76bcf07c4840c45e5eb..de4455da844f15e2cd6e963d3aab883b9050098d 100644 --- a/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js +++ b/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js @@ -67,7 +67,7 @@ angular.module('reportApp') ; const defaultFields = Array.from(defaultFieldsSet); - console.log(defaultFields); + //console.log(defaultFields); // tables have an arr of selected fields // and a float precision @@ -97,7 +97,7 @@ angular.module('reportApp') content.savedPlotter = PlotService.getPlotter(content).name; content.savedConfig = PlotService.getPlotterConfig(content).name; - console.log(content); + //console.log(content); scope.group.addReportItem(id, content); }; diff --git a/beat/web/reports/static/reports/app/services/experimentsService.js b/beat/web/reports/static/reports/app/services/experimentsService.js index 1d96d320b264c3d4639a09db25b4d9ebc1a362b5..1ccc16e335b2d0d1ca1dc7de1042ec3de3cad90f 100644 --- a/beat/web/reports/static/reports/app/services/experimentsService.js +++ b/beat/web/reports/static/reports/app/services/experimentsService.js @@ -41,8 +41,8 @@ angular.module('reportApp').factory('ExperimentsService', ['experimentFactory', const getVarProp = (obj, dontLogErrors) => { let keys = Object.keys(obj); if(keys.length !== 1 && !dontLogErrors){ - console.warn(`Found bad obj for getVarProp:`); - console.log(obj); + //console.warn(`Found bad obj for getVarProp:`); + //console.log(obj); } return obj[keys[0]]; @@ -157,7 +157,7 @@ angular.module('reportApp').factory('ExperimentsService', ['experimentFactory', // only the actual name of the exp is available const partNameValid = validExpNames.includes(e.split('/').pop()); if(!(fullNameValid || partNameValid)){ - console.log(`INVALID EXPERIMENT: ${e}`); + //console.log(`INVALID EXPERIMENT: ${e}`); g.removeExperiment(e); } }); @@ -202,9 +202,11 @@ angular.module('reportApp').factory('ExperimentsService', ['experimentFactory', } }); + /* console.log(expData); console.log(tableData); console.log(plotData); + */ cleanGroups(rawExpNames); diff --git a/beat/web/reports/static/reports/app/services/groupsService.js b/beat/web/reports/static/reports/app/services/groupsService.js index 67e125220119848b513c064bdf20d2587c2e78f9..89913dccb3b6cf7e1e0351a56ab40bff78d1dfee 100644 --- a/beat/web/reports/static/reports/app/services/groupsService.js +++ b/beat/web/reports/static/reports/app/services/groupsService.js @@ -254,7 +254,7 @@ angular.module('reportApp').factory('GroupsService', ['reportFactory', function( Object.entries(aliases).forEach(([e, a]) => g.setAliasToExperiment(a, e)); }); - console.log(groupsServiceInstance.groups); + //console.log(groupsServiceInstance.groups); }; return groupsServiceInstance; diff --git a/beat/web/reports/static/reports/app/services/plotService.js b/beat/web/reports/static/reports/app/services/plotService.js index 1422448a7f995f4caabe7901e15c4664f59c159d..350936756563e17922756861ad07433ce4091cc1 100644 --- a/beat/web/reports/static/reports/app/services/plotService.js +++ b/beat/web/reports/static/reports/app/services/plotService.js @@ -88,6 +88,7 @@ angular.module('reportApp').factory('PlotService', ['UrlService', function(UrlSe const plotter = getPlotter(content); const config = getPlotterConfig(content); + /* if(!content || !plotter || !config){ console.error(`plotter info not found: content: ${content} defaults: ${defaults} plotter: ${plotter} config: ${config}`); console.log(ps.plotters); @@ -104,6 +105,7 @@ angular.module('reportApp').factory('PlotService', ['UrlService', function(UrlSe console.log(plotter); return; }; + */ // the data to be sent to the server const requestData = { @@ -128,12 +130,14 @@ angular.module('reportApp').factory('PlotService', ['UrlService', function(UrlSe const possiblePlotters = getPossiblePlotters(content); const possibleConfigs = getPossibleConfigs(plotter); + /* console.log(`Request data:`); console.log(requestData); console.log(`possible plotters:`); console.log(possiblePlotters); console.log(`possible parameters:`); console.log(possibleConfigs); + */ const returnStruct = [requestData, possiblePlotters, possibleConfigs]; @@ -240,7 +244,7 @@ angular.module('reportApp').factory('PlotService', ['UrlService', function(UrlSe ps.getPossiblePlotters = getPossiblePlotters; ps.getPossibleConfigs = getPossibleConfigs; - console.log(ps); + //console.log(ps); return ps; }]); diff --git a/beat/web/reports/static/reports/app/services/reportService.js b/beat/web/reports/static/reports/app/services/reportService.js index 67c8802d77da101b78b74e4d8c9e6440c4075833..a5e98181aa6b7390f16fbd1b7f1909eec339d380 100644 --- a/beat/web/reports/static/reports/app/services/reportService.js +++ b/beat/web/reports/static/reports/app/services/reportService.js @@ -26,7 +26,7 @@ * Consumes the "report" object from the API and digests it into helper * funcs and report-wide info. Basically an adaptor & bootstrap-er. */ -angular.module('reportApp').factory('ReportService', ['GroupsService', 'plotterFactory', 'PlotService', 'reportFactory', 'UrlService', function(GroupsService, plotterFactory, PlotService, reportFactory, UrlService){ +angular.module('reportApp').factory('ReportService', ['GroupsService', 'plotterFactory', 'PlotService', 'reportFactory', 'UrlService', 'ErrorService', function(GroupsService, plotterFactory, PlotService, reportFactory, UrlService, ErrorService){ const rs = {}; rs.isAnonymous = undefined; @@ -43,7 +43,7 @@ angular.module('reportApp').factory('ReportService', ['GroupsService', 'plotterF // processed the report data received from the server, // and bootstraps the state of various services rs.processReport = (report) => { - console.log(report); + //console.log(report); // useful info about the app rs.isAnonymous = report.anonymous; @@ -61,7 +61,7 @@ angular.module('reportApp').factory('ReportService', ['GroupsService', 'plotterF const isEditable = rs.isOwner && rs.status === 'editable' && !rs.isAnonymous; GroupsService.setEditable(isEditable); - console.log(GroupsService.groups); + //console.log(GroupsService.groups); // fetch all our plotter data // these three fetches do not depend on eachother @@ -137,9 +137,9 @@ angular.module('reportApp').factory('ReportService', ['GroupsService', 'plotterF }; rs.fetchReport() - .catch(e => console.error(e)); + .catch(e => ErrorService.logError(e, `Could not load report.`)); - console.log(rs); + //console.log(rs); return rs; }]);