NCGEARS/cheesy-arena-lite
1
0
Fork 0
mirror of https://github.com/Team254/cheesy-arena-lite.git synced 2026-03-09 21:56:50 -04:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Refactor schedule JS to be less buggy (fixes #12).

Browse Source
This commit is contained in:
Patrick Fairbank
2017-09-02 19:18:15 -07:00
parent 4e418434da
commit 11b6b5f856
4 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
static/js/setup_schedule.js
View File

@@ -4,17 +4,22 @@
// Client-side methods for the schedule generation page.
var blockTemplate = Handlebars.compile($("#blockTemplate").html());
var lastBlockNumber = 0;
var blockMatches = {};
// Adds a new scheduling block to the page.
var addBlock = function(startTime, numMatches, matchSpacingSec) {
var lastBlockNumber = getLastBlockNumber();
if (!startTime) {
// Start the next block where the last one left off and use the same spacing.
var lastStartTime = moment(Date.parse($("#startTime" + lastBlockNumber).val()));
var lastNumMatches = blockMatches[lastBlockNumber];
matchSpacingSec = getMatchSpacingSec(lastBlockNumber);
startTime = moment(lastStartTime + lastNumMatches * matchSpacingSec * 1000);
if ($.isEmptyObject(blockMatches)) {
matchSpacingSec = 360;
startTime = moment().add(1, "hour").startOf("hour");
} else {
// Start the next block where the last one left off and use the same spacing.
var lastStartTime = moment($("#startTime" + lastBlockNumber).val(), "YYYY-MM-DD hh:mm:ss A");
var lastNumMatches = blockMatches[lastBlockNumber];
matchSpacingSec = getMatchSpacingSec(lastBlockNumber);
startTime = moment(lastStartTime + lastNumMatches * matchSpacingSec * 1000);
}
numMatches = 10;
}
var endTime = moment(startTime + numMatches * matchSpacingSec * 1000);
@@ -31,8 +36,8 @@ var addBlock = function(startTime, numMatches, matchSpacingSec) {
// Updates the per-block and global schedule statistics.
var updateBlock = function(blockNumber) {
var startTime = moment(Date.parse($("#startTime" + blockNumber).val()));
var endTime = moment(Date.parse($("#endTime" + blockNumber).val()));
var startTime = moment($("#startTime" + blockNumber).val(), "YYYY-MM-DD hh:mm:ss A");
var endTime = moment($("#endTime" + blockNumber).val(), "YYYY-MM-DD hh:mm:ss A");
var matchSpacingSec = getMatchSpacingSec(blockNumber);
var numMatches = Math.floor((endTime - startTime) / matchSpacingSec / 1000);
var actualEndTime = moment(startTime + numMatches * matchSpacingSec * 1000).format("hh:mm:ss A");
@@ -97,3 +102,14 @@ var getMatchSpacingSec = function(blockNumber) {
var matchSpacingMinSec = $("#matchSpacingMinSec" + blockNumber).val().split(":");
return parseInt(matchSpacingMinSec[0]) * 60 + parseInt(matchSpacingMinSec[1]);
};
var getLastBlockNumber = function() {
var max = 0;
$.each(blockMatches, function(k, v) {
var number = parseInt(k);
if (number > max) {
max = number;
}
});
return max;
};