Skip to content

support day of week launches #109

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

Merged
LukePrior merged 1 commit into from
Aug 20, 2021
Merged

support day of week launches #109

Show file tree
Hide file tree
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
47 changes: 34 additions & 13 deletions js/tracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,26 +652,40 @@ function launchSitePredictions(times, station, marker) {
times = times.split(",");
position = station.split(",");
var now = new Date();
var maxCount = 7
var count = 0;
var day = 0;
var dates = [];
while (count < 7) {
while (day < 8) {
for (var i = 0; i < times.length; i++) {
var date = new Date();
var time = times[i].split(":");
date.setUTCHours(time[0]);
date.setUTCMinutes(time[1]);
if (time[0] != 0) {
date.setDate(date.getDate() + (7 + time[0]-1 - date.getDay()) % 7);
}
date.setUTCHours(time[1]);
date.setUTCMinutes(time[2]);
date.setSeconds(0);
date.setMilliseconds(0);
if (date < now) {
date.setDate(date.getDate() + 1);
if (time[0] == 0) {
date.setDate(date.getDate() + 1);
} else {
date.setDate(date.getDate() + 7);
}
}
if (day > 0) {
date.setDate(date.getDate() + day);
if (time[0] == 0) {
date.setDate(date.getDate() + day);
} else {
date.setDate(date.getDate() + (7*day));
}
}
if (count < 7) {
dates.push(date.toISOString().split('.')[0]+"Z");
count += 1;
if (count < maxCount) {
if (((date - now) / 36e5) < 170) {
dates.push(date.toISOString().split('.')[0]+"Z");
count += 1;
}
}
}
day += 1;
Expand All @@ -685,15 +699,15 @@ function launchSitePredictions(times, station, marker) {
function handleData(data) {
completed += 1;
plotPrediction(data, dates, marker);
if (completed == 7) {
if (completed == dates.length) {
popupContent += "<button onclick='deletePredictions(" + marker + ")' style='margin-bottom:0;'>Delete</button>";
popup.setContent(popupContent);
}
}
function handleError(error) {
completed += 1;
console.log(error);
if (completed == 7) {
if (completed == dates.length) {
popupContent += "<button onclick='deletePredictions(" + marker + ")' style='margin-bottom:0;'>Delete</button>";
popup.setContent(popupContent);
}
Expand Down Expand Up @@ -814,11 +828,18 @@ function showLaunchSites() {
var date = new Date();
var now = new Date();
var time = json[key]['times'][i].split(":");
date.setUTCHours(time[0]);
date.setUTCMinutes(time[1]);
if (time[0] != 0) {
date.setDate(date.getDate() + (7 + time[0]-1 - date.getDay()) % 7);
}
date.setUTCHours(time[1]);
date.setUTCMinutes(time[2]);
date.setSeconds(0);
if (date < now) {
date.setDate(date.getDate() + 1);
if (time[0] == 0) {
date.setDate(date.getDate() + 1);
} else {
date.setDate(date.getDate() + 7);
}
}
if (tempDate) {
if (date < tempDate) {
Expand Down
Loading