yep
This commit is contained in:
parent
43f64a47cf
commit
91188fb6f6
|
@ -44,8 +44,8 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="one-half column u-pull-right">
|
<div class="one-half column u-pull-right">
|
||||||
<div class="nav-button">
|
<div class="nav-button">
|
||||||
<button class="button" onclick="decArray()">Previous</button>
|
<button class="button" onclick="decArray(), resetStopWatch()">Previous</button>
|
||||||
<button class="button" onclick="incArray()">Next</button>
|
<button class="button" onclick="incArray(), resetStopWatch()">Next</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -72,6 +72,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div id="currentStartEnd"></div>
|
<div id="currentStartEnd"></div>
|
||||||
|
<div id="stopwatch"></div>
|
||||||
</div>
|
</div>
|
||||||
<div calss="row">
|
<div calss="row">
|
||||||
<div class="notes" id="notes"></div>
|
<div class="notes" id="notes"></div>
|
||||||
|
|
|
@ -44,7 +44,7 @@ function toggleDebug() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function selectEvent(id) {
|
function selectEvent(id) {
|
||||||
console.log(`inside selectEvent()`);
|
// console.log(`inside selectEvent()`);
|
||||||
|
|
||||||
currentObject = id;
|
currentObject = id;
|
||||||
array_counter = id;
|
array_counter = id;
|
||||||
|
@ -77,7 +77,7 @@ function selectEvent(id) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function incArray() {
|
function incArray() {
|
||||||
console.log("inside incArray");
|
// console.log("inside incArray");
|
||||||
console.log(`array_counter = ${array_counter}`);
|
console.log(`array_counter = ${array_counter}`);
|
||||||
console.log(`eventsLength = ${eventsLength}`);
|
console.log(`eventsLength = ${eventsLength}`);
|
||||||
console.log(`events = ${events}`);
|
console.log(`events = ${events}`);
|
||||||
|
@ -88,7 +88,7 @@ function incArray() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function decArray() {
|
function decArray() {
|
||||||
console.log("inside decArray");
|
// console.log("inside decArray");
|
||||||
console.log(`array_counter = ${array_counter}`);
|
console.log(`array_counter = ${array_counter}`);
|
||||||
console.log(`eventsLength = ${eventsLength}`);
|
console.log(`eventsLength = ${eventsLength}`);
|
||||||
console.log(`events = ${events}`);
|
console.log(`events = ${events}`);
|
||||||
|
@ -100,7 +100,7 @@ function decArray() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function genList() {
|
function genList() {
|
||||||
console.log(`inside gen list `);
|
// console.log(`inside gen list `);
|
||||||
list = "<table class=events><th class=events>Event</th><th class=events>Time</th><th class=events>Time Until</th>";
|
list = "<table class=events><th class=events>Event</th><th class=events>Time</th><th class=events>Time Until</th>";
|
||||||
|
|
||||||
if (eventsLength > 15) {
|
if (eventsLength > 15) {
|
||||||
|
@ -143,7 +143,7 @@ function main(array, dataLoad, aLen) {
|
||||||
isEventsArray = Array.isArray(events);
|
isEventsArray = Array.isArray(events);
|
||||||
eventsLength = aLen;
|
eventsLength = aLen;
|
||||||
|
|
||||||
console.log(`inside main`);
|
// console.log(`inside main`);
|
||||||
console.log(`events = ${events}`);
|
console.log(`events = ${events}`);
|
||||||
console.log(`dataLoad = ${dataLoad}`);
|
console.log(`dataLoad = ${dataLoad}`);
|
||||||
console.log(`${isEventsArray}`);
|
console.log(`${isEventsArray}`);
|
||||||
|
@ -160,7 +160,7 @@ function main(array, dataLoad, aLen) {
|
||||||
currentStart = currentDate;
|
currentStart = currentDate;
|
||||||
currentEnd = nextDate;
|
currentEnd = nextDate;
|
||||||
nextStart = nextDate;
|
nextStart = nextDate;
|
||||||
nextEnd = events[(nextObject + 1)].date;
|
nextEnd = events[(nextObject)].date;
|
||||||
currentSubject = events[currentObject].subject;
|
currentSubject = events[currentObject].subject;
|
||||||
nextSubject = events[nextObject].subject;
|
nextSubject = events[nextObject].subject;
|
||||||
|
|
||||||
|
@ -183,6 +183,42 @@ console.log(`nextDate = ${nextDate}`);
|
||||||
// Update the count down every 1 second
|
// Update the count down every 1 second
|
||||||
var x = setInterval(function() {
|
var x = setInterval(function() {
|
||||||
|
|
||||||
|
window.stopwatch++;
|
||||||
|
stopwatch = window.stopwatch;
|
||||||
|
|
||||||
|
// console.log(stopwatch);
|
||||||
|
|
||||||
|
swDays = Math.floor(stopwatch / (60 * 60 * 24));
|
||||||
|
swHours = Math.floor((stopwatch % (60 * 60 * 24)) / (1000 * 60 * 60));
|
||||||
|
swSeconds = Math.floor(stopwatch % (60));
|
||||||
|
swMinutes = Math.floor(stopwatch / 60);
|
||||||
|
// swMinutes = Math.floor((nextDistance % (1000 * 60 * 60)) / (1000 * 60));
|
||||||
|
if (swDays === 0) {
|
||||||
|
var swd = '';
|
||||||
|
} else {
|
||||||
|
var swd = swDays + 'Days ';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (swHours < 10) {
|
||||||
|
var swh = '0' + swHours;
|
||||||
|
} else {
|
||||||
|
var swh = swHours;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (swMinutes < 10) {
|
||||||
|
var swm = '0' + swMinutes;
|
||||||
|
} else {
|
||||||
|
var swm = swMinutes;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (swSeconds < 10) {
|
||||||
|
var sws = '0' + swSeconds;
|
||||||
|
} else {
|
||||||
|
var sws = swSeconds;
|
||||||
|
}
|
||||||
|
|
||||||
|
document.getElementById("stopwatch").innerHTML = swDays + swHours + ":" + swMinutes + ":" + swSeconds;
|
||||||
|
|
||||||
document.getElementById("meta").innerHTML = "Version: " + version + "<br />Debug: <a onclick=toggleDebug()>" + debug + "</a>";
|
document.getElementById("meta").innerHTML = "Version: " + version + "<br />Debug: <a onclick=toggleDebug()>" + debug + "</a>";
|
||||||
document.getElementById("events-list").innerHTML = genList();
|
document.getElementById("events-list").innerHTML = genList();
|
||||||
|
|
||||||
|
@ -355,4 +391,7 @@ function countdown(targetDate, nextDate, current) {
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function resetStopWatch() {
|
||||||
|
console.log("Reset Stopwatch");
|
||||||
|
window.stopwatch = 0;
|
||||||
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
var version = "0.14.031"
|
var version = "0.14.032"
|
||||||
var debug = false;
|
var debug = false;
|
||||||
var jsonUrl = 'https://api.myjson.com/bins/13hsch';
|
var jsonUrl = 'https://api.myjson.com/bins/13hsch';
|
||||||
|
|
||||||
|
@ -13,4 +13,4 @@ var initialized = false;
|
||||||
var style = 'green';
|
var style = 'green';
|
||||||
var eventStyle = "events";
|
var eventStyle = "events";
|
||||||
var array_counter = 0;
|
var array_counter = 0;
|
||||||
|
window.stopwatch = 0;
|
||||||
|
|
Loading…
Reference in New Issue