Skip to content

Minor lint corrections in data.js #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Minor lint corrections in data.js #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 36 additions & 74 deletions js/input/data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,31 +31,28 @@ socr.dataTable = function () {
case 'spreadsheet':
view.toggleScreens({
visible: excelScreen
})
});
break;
case 'fetch':
view.toggleScreens({
visible: [excelScreen, importScreen]
})
});
$urlbox.focus();
break;
case 'worldbank':
view.toggleScreens({
visible: worldbankContainer
})
});
break;
default:
simulationDriven.init($(this).attr('data-rel'));
}
});



var simulationDriven = {
init: function (arg) {
var expId = arg.substr(4);
console.log('Experiments loaded: ' + simulationDriven.expLoaded);
/*
/*
ToDO : Verify .js extension addition in all browsers
*/
// if($.inArray( expId, simulationDriven.expLoaded))
Expand All @@ -67,13 +64,12 @@ socr.dataTable = function () {
loadScript: function (id) {
$.getScript('js/exp/' + id + '.js', function () {
simulationDriven.loadData(id)
})
});
},
loadData: function (id) {
console.log('loadData called ' + id)
$.getJSON('js/exp/experiments.json', function (res) {
console.log(res.experiments);
for (i in res.experiments) {
for (var i in res.experiments) {

if (id == res.experiments[i].id) {
simulationDriven.displayText({
Expand All @@ -83,8 +79,8 @@ socr.dataTable = function () {
break;
}
}
simulationDriven.adjustModel(id)
})
simulationDriven.adjustModel(id);
});
},
adjustModel: function (id) {
socr.exp.current = socr.exp[id];
Expand Down Expand Up @@ -114,8 +110,6 @@ socr.dataTable = function () {

};
//Settings


var dragdrop = {
init: function () {

Expand Down Expand Up @@ -149,15 +143,14 @@ socr.dataTable = function () {

var tableparse = {
init: function (url) {

if (url.substr(0, 7) !== 'http://') {
url = 'http://' + url;
}
//if (tableparse.checkRefer(url) === true) {
if(true){
url = "http://"+window.location.host+window.location.pathname+"/handler.php?url="+url;
tableparse.notify();
tableparse.request(url)
tableparse.request(url);
return true;
}
return false;
Expand Down Expand Up @@ -200,25 +193,22 @@ socr.dataTable = function () {
$dataTable.handsontable({
startCols: 8,
minSpareCols: 0
})
});

// var inputMethod = tableparse.mode() === 'sync' ? 'loadDataSwift' : 'loadData';
$dataTable.handsontable('loadData', matrix);

}).fail(function () {

view.displayResponse('There was an error loadin the dataset', 'error')

})

});

},

filterBySize: function (arrayOfTables) {
var sizes = [];
$(arrayOfTables).each(function (i) {
sizes.push([$(this).find('tr:last').index(), i])
})
});
var maxIndex = 0;
for (k = 0; k < sizes.length - 2; k++) {
if (sizes[k][0] < sizes[k + 1][0])
Expand Down Expand Up @@ -249,14 +239,14 @@ socr.dataTable = function () {
var row = [];
$(this).find('td').each(function () {
row.push($(this).text());
})
});
matrix.push(row);
});

/*
Check if the table has th elements instead
@Todo
*/
/*
Check if the table has th elements instead
@Todo
*/
if (matrix[0][0] === '') {
var row = [];
$stats.find('tr').filter(':eq(0)').find('th').each(function (i, v) {
Expand All @@ -268,8 +258,8 @@ socr.dataTable = function () {
return matrix;
},
/*
Setter-Getter for mode toggling
*/
Setter-Getter for mode toggling
*/
mode: function (option) {
if (arguments.length) {
method = option;
Expand All @@ -280,10 +270,10 @@ socr.dataTable = function () {
switchMode: function () {
$('#fetchinstant').click(function () {
tableparse.mode('sync');
})
});
$('#fetchasync').click(function () {
tableparse.mode('async');
})
});
}


Expand Down Expand Up @@ -317,16 +307,14 @@ socr.dataTable = function () {
editTitles: function () {

var colHeader = $dataTable.handsontable('getColHeader');


var content = '<form class="form form-horizontal" id="input-titles"><fieldset><legend>Add titles to Spreadsheet</legend>';

if (colHeader[0] !== '') {
for (var i = 0; i < colHeader.length; i++) {
// var label = (colHeader[i] !== '') ? : '';
content += '<div class="control-group"><label class="control-label">Column ' + i + ' :</label><div class="controls"><input type="text" placeholder="Input field" value="' + colHeader[i] + '"></div></div>';
}
} else {

var k = 0;
while (k < colHeader.length) {
content += '<div class="control-group"><label class="control-label">Title ' + k + '</label><div class="controls"><input type="text" placeholder="Input field"></div></div>';
Expand All @@ -343,7 +331,7 @@ socr.dataTable = function () {
var titles = [];
$('#input-titles').find('input[type="text"]').each(function () {
titles.push($(this).val());
})
});
spreadSheet.addColHeaders(titles);
$('#input-modal').modal('toggle');
view.displayResponse('Titles altered successfully', 'success');
Expand Down Expand Up @@ -384,7 +372,7 @@ socr.dataTable = function () {

}

}
};
/*
Hookups for spreadsheet opterations
*/
Expand Down Expand Up @@ -468,21 +456,7 @@ socr.dataTable = function () {
socr.model.reset();

$("#accordion").accordion("activate", 0);

//LoadController called once when 'proceed' is clicked.
/*try {
$(this).update({
to: 'dataDriven'
});
} catch (e) {
console.log(e)
} finally {
//$.update({to:'dataDriven'});
socr.controller.loadController({
to: 'dataDriven',
from: "spreadSheet"
});
}*/


if (spreadSheet.validate(dataset)) {
// model.setDataset({
Expand All @@ -501,8 +475,6 @@ socr.dataTable = function () {
console.log("Dataset isn't valid")
// view.displayResponse(' There is some error in the dataset ', 'error');
}

// console.log(dataset);
},
refresh : function(){
$dataTable.handsontable({});
Expand All @@ -518,9 +490,8 @@ socr.dataTable = function () {
// [ startrow , startCol, endRow, endCol ]

}
// var ht = $dataTable.handsontable('getInstance');
// console.log(ht.getSelected());
console.log(selectedCoords);

console.log(selectedCoords);
if (selectedCoords) {

console.log(' Select Data request with ' + selectedCoords)
Expand All @@ -541,7 +512,7 @@ socr.dataTable = function () {
// model.setDataset({

// data: dataset ,
// //range:selected,
// ra nge:selected,
// type: 'getSelected',
// processed: false

Expand Down Expand Up @@ -574,17 +545,13 @@ socr.dataTable = function () {
},

sort : function(){
console.log(lastColselected);

var d = $dataTable.handsontable('getData');
var d = $dataTable.handsontable('getData');
/***
Matrix Form
row 1
row 2
***/

var sorted = d.sort(spreadSheet.compare);

$dataTable.handsontable('loadData', sorted);

//Empty The Spreadsheet
Expand All @@ -600,7 +567,6 @@ socr.dataTable = function () {
},

compare : function(a,b) {

if (b[lastColselected] == '')
return 1;
if (a[lastColselected] == '')
Expand Down Expand Up @@ -628,7 +594,7 @@ socr.dataTable = function () {
$dataTable.handsontable('clear');
$dataTable.handsontable({
colHeaders: []
})
});
$response.html('<div class="alert"><a class="close" data-dismiss="alert" href="#">x</a>Clear! Enter some value to get started!</div>'); //display the message in the status div below the done and reset buttons
$(this).dialog("close"); //close the confirmation window
// $dataTable.handsontable({'colHeaders' : false});
Expand All @@ -643,8 +609,7 @@ socr.dataTable = function () {
}
});
}

}
};

/*
All member functions that involve selecting / highlighting
Expand Down Expand Up @@ -740,7 +705,7 @@ socr.dataTable = function () {
stage.content = [];
stage.showContent();
}
}
};
//General Pattern
// stage.content = {

Expand All @@ -753,7 +718,7 @@ socr.dataTable = function () {
resetStage.on('click', function (e) {
e.preventDefault();
stage.reset();
})
});

var worldbank = {

Expand Down Expand Up @@ -786,7 +751,7 @@ socr.dataTable = function () {
$('#worldbank-form').find('input[type="submit"]').attr('disabled', false);
$('.worldbank-response').addClass('alert-error').html('There was an error requesting data');
}
}
};

$controls.find('input[value="Use Entire Dataset"]').on('click', spreadSheet.parseAll);
$controls.find('.reset-spreadsheet').on('click', spreadSheet.reset);
Expand All @@ -799,7 +764,7 @@ socr.dataTable = function () {
$dataTable.parent().on('mouseup', select.checkSelected);
$('a.dragdrop').on('click', function () {
$('#fetchURL').slideToggle();
})
});

$controls.find('.edittitles').on('click', view.editTitles);
$controls.find('.firstrowtitles').on('click', spreadSheet.firstRowTitles);
Expand All @@ -816,9 +781,6 @@ socr.dataTable = function () {

});

// $('.handsontable').find('th').on('click', spreadSheet.setCol);


spreadSheet.init();
dragdrop.init();

Expand All @@ -827,5 +789,5 @@ socr.dataTable = function () {
spreadSheet: spreadSheet,
view: view,
worldbank : worldbank,
}
};
}();