Allow getting upcomingEvents for any interval

akkana · Mar 4, 2013 · a4d4c4c · a4d4c4c
1 parent 9b28c24
commit a4d4c4c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/jsjupiter/index.html b/jsjupiter/index.html
@@ -242,7 +242,7 @@
     return;
   }
 
-  upcoming.innerHTML = upcomingEvents(date);
+  upcoming.innerHTML = upcomingEvents(date, 8);
 }
 
 </script>

diff --git a/jsjupiter/jupiter.js b/jsjupiter/jupiter.js
@@ -305,17 +305,38 @@ function Jupiter()
     }
 }
 
-function upcomingEvents(date)
+function prettytime(tothrs)
+{
+    if (tothrs < 24)
+        prettytime = tothrs + " hours";
+    else {
+        hrs = tothrs % 24;
+        days = (tothrs-hrs) / 24;
+        prettytime = days + " day";
+        if (days != 1)
+            prettytime += "s";
+
+        if (hrs == 1)
+            prettytime += ", 1 hour";
+        else if (hrs != 1)
+            prettytime += ", " + hrs + " hours";
+    }
+    return prettytime;
+}
+
+//
+// Build a table of upcoming moon events for a given interval.
+//
+function upcomingEvents(date, tothrs)
 {
     var saveDate = jup.curdate;
     if (!saveDate) {
         //alert("upcoming events, but curdate is " + jup.curdate);
         saveDate = date;
     }
 
-    tothrs = 8;
     interval = 1;   // minutes
-    upcoming = "Moon events in the next " + tothrs + " hours:\n";
+    upcoming = "<b>Moon events in the next " + prettytime(tothrs) + "</b>\n\n";
 
     moonnames = [ "Io", "Europa", "Ganymede", "Callisto" ];