Skip to content

Small scope issue fix #44 #45

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
friou wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Small scope issue fix #44 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a408d65
Small scope issue fix #44
friou Sep 1, 2018
6be701f
Hours (start, end) precisely displayed on mouse hover
friou Sep 3, 2018
7fb0239
Small scope issue fix #44
friou Sep 1, 2018
33396c6
Locations usabled as objects instead of strings
friou Sep 3, 2018
0a8925b
Merge remote-tracking branch 'origin/dev-riouf-hours' into dev-fri-lo…
friou Sep 5, 2018
8010dc2
Merge branch 'master' into master
friou Nov 15, 2018
71bf3a0
Merge branch 'master' into dev-riouf-hours
friou Jul 3, 2019
7692344
Merge pull request #1 from friou/dev-riouf-hours
friou Jul 3, 2019
6da8511
Merge branch 'master' into dev-fri-location-object
friou Jul 3, 2019
579c18f
Merge pull request #2 from friou/dev-fri-location-object
friou Jul 3, 2019
8893334
Timetable working on 24 hours scope (example: 0 to 0)
friou Jul 5, 2019
7fadad7
Merge pull request #7 from friou/dev-friou-twenty-four-hours-timetable
friou Jul 5, 2019
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
36 changes: 23 additions & 13 deletions app/demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,31 @@ <h1>Timetable.js demo</h1>
<script>
var timetable = new Timetable();

timetable.setScope(9,3)

timetable.addLocations(['Rotterdam', 'Madrid', 'Los Angeles', 'London', 'New York', 'Jakarta', 'Tokyo']);

timetable.addEvent('Sightseeing', 'Rotterdam', new Date(2015,7,17,9,00), new Date(2015,7,17,11,30), { url: '#' });
timetable.addEvent('Zumba', 'Madrid', new Date(2015,7,17,12), new Date(2015,7,17,13), { url: '#' });
timetable.addEvent('Zumbu', 'Madrid', new Date(2015,7,17,13,30), new Date(2015,7,17,15), { url: '#' });
timetable.addEvent('Lasergaming', 'London', new Date(2015,7,17,17,45), new Date(2015,7,17,19,30), { class: 'vip-only', data: { maxPlayers: 14, gameType: 'Capture the flag' } });
timetable.addEvent('All-you-can-eat grill', 'New York', new Date(2015,7,17,21), new Date(2015,7,18,1,30), { url: '#' });
timetable.addEvent('Hackathon', 'Tokyo', new Date(2015,7,17,11,30), new Date(2015,7,17,20)); // options attribute is not used for this event
timetable.addEvent('Tokyo Hackathon Livestream', 'Los Angeles', new Date(2015,7,17,12,30), new Date(2015,7,17,16,15)); // options attribute is not used for this event
timetable.addEvent('Lunch', 'Jakarta', new Date(2015,7,17,9,30), new Date(2015,7,17,11,45), { onClick: function(event) {
timetable.setScope(9,3);
timetable.addLocations([
{'id': '1', 'name': 'Rotterdam'},
{'id': '2', 'name': 'Madrid'},
{'id': '3', 'name': 'Los Angeles'},
{'id': '4', 'name': 'London'},
{'id': '5', 'name': 'New York'},
{'id': '6', 'name': 'Jakarta'}
]);

timetable.addLocation(
{'id': '7', 'name': 'Tokyo'}
);

timetable.addEvent('Sightseeing', '1', new Date(2015,7,17,9,00), new Date(2015,7,17,11,30), { url: '#' });
timetable.addEvent('Zumba', '2', new Date(2015,7,17,12), new Date(2015,7,17,13), { url: '#' });
timetable.addEvent('Zumbu', '2', new Date(2015,7,17,13,30), new Date(2015,7,17,15), { url: '#' });
timetable.addEvent('Lasergaming', '4', new Date(2015,7,17,17,45), new Date(2015,7,17,19,30), { class: 'vip-only', data: { maxPlayers: 14, gameType: 'Capture the flag' } });
timetable.addEvent('All-you-can-eat grill', '5', new Date(2015,7,17,21), new Date(2015,7,18,1,30), { url: '#' });
timetable.addEvent('Hackathon', '7', new Date(2015,7,17,11,30), new Date(2015,7,17,20)); // options attribute is not used for this event
timetable.addEvent('Tokyo Hackathon Livestream', '3', new Date(2015,7,17,12,30), new Date(2015,7,17,16,15)); // options attribute is not used for this event
timetable.addEvent('Lunch', '6', new Date(2015,7,17,9,30), new Date(2015,7,17,11,45), { onClick: function(event) {
window.alert('You clicked on the ' + event.name + ' event in ' + event.location + '. This is an example of a click handler');
}});
timetable.addEvent('Cocktails', 'Rotterdam', new Date(2015,7,18,00,00), new Date(2015,7,18,02,00), { class: 'vip-only' });
timetable.addEvent('Cocktails', '1', new Date(2015,7,18,00,00), new Date(2015,7,18,02,00), { class: 'vip-only' });

var renderer = new Timetable.Renderer(timetable);
renderer.draw('.timetable');
Expand Down
Loading