Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 7 additions & 8 deletions js/TimeExplorer.js
Original file line number Diff line number Diff line change
Expand Up @@ -515,15 +515,14 @@ class TimeExplorer {
* @param {string} sheet_id - ID of Google spreadsheet containing data
*/
get_sheet_data(sheet_id) {
var self = this;
var dfd = $.Deferred();
var request_url = `https://sheets.googleapis.com/v4/spreadsheets/${sheet_id}/values/A:ZZZ?key=${this.api_key}`;
let self = this;
let dfd = $.Deferred();
const request_url = `https://sheets.googleapis.com/v4/spreadsheets/${sheet_id}/values/A:ZZZ?key=${this.api_key}`;
$.getJSON(request_url).done(function(data) {
var columns = data.values[0];
for (var i = 1; i < data.values.length; i++) {
var values = zip_arrays(columns, data.values[i]);
self.sheet_data.push(values);
};
let columns = data.values[0];
self.sheet_data = data.values.slice(1).map( (item)=> {
return zip_arrays(columns,item);
});
dfd.resolve();
});
return dfd.promise();
Expand Down
12 changes: 12 additions & 0 deletions js/TimeExplorerSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,18 @@ describe('Testing the TimeExplorer class', () => {
expect(tags).toEqual('Tags');
})

it('TimeExplorer.create_timeline() should create a timeline', ()=> {
explorer = new_explorer()
const timeline = explorer.create_timeline(explorer.options);
expect(Object.keys(timeline)).toContain('itemsData');
})

it('TimeExplorer.get_sheet_data() should return a promise', ()=> {
explorer = new_explorer()
const sheetData = explorer.get_sheet_data(api_key);
expect(Object.keys(sheetData)).toContain("promise");
})

it('TimeExplorer.set_options() should extend options', ()=> {
explorer = new_explorer()
const r = explorer.set_options(["Joe"])
Expand Down