Compare commits

...

10 Commits

Author SHA1 Message Date
Jonathan Bernard
a3941843b1 Added an enable/disable feature. 2014-09-06 23:37:58 -05:00
Jonathan Bernard
7ba8d76843 AJAX calls are now async.
* JS file is now versioned.
* AJAX calls are now asynchronous (since many browsers no longer support
  synchronous calls).
2014-09-06 22:15:06 -05:00
Jonathan Bernard
64e90eaeb5 Removed maximum width on GTD item attributes. 2013-10-29 21:16:53 -05:00
Jonathan Bernard
bf20564858 Added fullscreen button. 2013-10-28 12:05:49 -05:00
Jonathan Bernard
0a083ba8cc Added button to allow the user to open the config dialog on command. 2013-10-28 11:09:36 -05:00
Jonathan Bernard
9bd00cdab7 Added versioning to HTML and JavaScript. 2013-10-09 14:22:17 -05:00
Jonathan Bernard
60e76118e3 Styled refresh and pause/continue buttons. Fixed link behavior. 2013-10-09 14:16:47 -05:00
Jonathan Bernard
98b5208adb Updated version number to 1.1 2013-10-09 13:43:22 -05:00
Jonathan Bernard
0224a1cd0a Added version and build numbers to the build process. 2013-10-09 13:32:55 -05:00
Jonathan Bernard
563edb4f5d Added Pause/Continue and Refresh-on-demand. 2013-10-09 13:32:20 -05:00
5 changed files with 252 additions and 113 deletions

View File

@ -1,14 +1,27 @@
build :
VERSION =1.5
BUILD_NUMBER_FILE = build-number.txt
BUILD_NUMBER = $$(cat $(BUILD_NUMBER_FILE))
build : increment-build-number
mkdir -p build/css
mkdir -p build/js
cp src/www/*.* build
cp -r src/www/js build
cp -r resources/* build/.
cp src/www/js/personal-display.js build/js/personal-display-$(VERSION).$(BUILD_NUMBER).js
sed -i "s/%VERSION%/$(VERSION).$(BUILD_NUMBER)/g" build/index.html
sass src/www/css/personal-display.scss build/css/personal-display.css
tar czf personal-display.tar.gz build
tar czf personal-display-$(VERSION).$(BUILD_NUMBER).tar.gz build
clean :
rm -r build
-rm -r build
local-deploy: build
cp -r build ~/temp/server
ssh jdb-server 'rm -r ~/public_html/personal-display; mv temp/build ~/public_html/personal-display'
increment-build-number:
if ! test -f $(BUILD_NUMBER_FILE); then echo 0 > $(BUILD_NUMBER_FILE); fi
echo $$(($$(cat $(BUILD_NUMBER_FILE)) + 1)) > $(BUILD_NUMBER_FILE)
test-build-number:
touch $(BUILD_NUMBER).text.txt

1
build-number.txt Normal file
View File

@ -0,0 +1 @@
19

View File

@ -142,7 +142,8 @@ body > section {
display: inline-block;
font-size: 66%;
margin: 0 0.5rem;
max-width: 33%;
max-width: 66%;
overflow: hidden;
padding: 0 0.5rem;
white-space: nowrap; }
@ -250,3 +251,23 @@ body > section {
margin: 0;
padding: 0 } }
}
#main-buttons {
border-top: solid 2px $accent1;
ul {
list-style: none;
padding: 0;
margin: 0;
li {
display: inline-block;
margin: 0;
a {
border: $accent2 solid thin;
border-radius: 5px;
display: block;
cursor: pointer;
padding: 0.1rem 0.3rem; } } }
}

View File

@ -1,6 +1,7 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>What I am Doing</title>
<link rel="stylesheet" href="css/personal-display.css" type="text/css">
<link href='//fonts.googleapis.com/css?family=Play|Advent+Pro' rel='stylesheet' type='text/css'>
@ -17,9 +18,10 @@
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/backbone.js/1.0.0/backbone.js" defer></script>
-->
<script src="js/personal-display.js" type="text/javascript" defer></script>
<script src="js/personal-display-%VERSION%.js" type="text/javascript" defer></script>
<meta name="viewport" content="width=device-width, user-scalable=no">
<meta name=version content="1.5">
</head>
<body>
<section id=current-task>
@ -30,12 +32,22 @@
<section id=priorities>
<h3>Next Actions (unsorted)</h3>
</section>
<section id=main-buttons>
<ul>
<li><a href="#" class=pause-continue>Pause Monitoring</a></li>
<li><a href="#" class=refresh>Refresh Now</a></li>
<li><a href="#" class=show-config>Config</a></li>
<li><a href="#" class=toggle-fullscreen>Go Fullscreen</a></li>
</ul>
</section>
<section id=config-dialog>
<form>
<h3>Configuration</h3>
<span class=validate-tips></span>
<section class=timestamper-config>
<span class=config-section-header>TimeStamper</span>
<div class=enabled><label>Enabled?</label>
<input type=checkbox class=enabled></div>
<div><label>Server Name: </label>
<input type=text class=host></div>
<div><label>Username: </label>
@ -49,6 +61,8 @@
</section>
<section class=gtd-config>
<span class=config-section-header>Getting Things Done</span>
<div class=enabled><label>Enabled?</label>
<input type=checkbox class=enabled></div>
<div><label>Server Name: </label>
<input type=text class=host></div>
<div><label>Username: </label>
@ -63,7 +77,7 @@
<div class=button-panel>
<div class=global-config>
<label>Refresh (sec): </label>
<input type=text class=refresh></div>
<input type=text class=refresh-period></div>
<div class=save-button><a href="#">Save and Close</a></div>
</div>
<div class=wait-overlay><img src="img/loading-spinner.gif"><br><span></span></div>

View File

@ -2,6 +2,7 @@
var root = this;
var PD = root.PersonalDisplay = {};
PD.version = "1.5"
PD.hasHTML5LocalStorage = function() {
try {
@ -109,12 +110,13 @@
"change .gtd-config .category" : "addCategory",
"click .remove-button" : "removeCategory",
"click .save-button" : "saveAndClose" },
"click .save-button" : "saveAndClose",
"change input.enabled" : "enableDisable"},
initialize: function() {
_.bindAll(this, "show", "hide", "tsLogin", "gtdLogin",
"loadTsData", "loadGtdData", "addCategory", "makeCategoryItem",
"removeCategory", "saveAndClose"); },
_.bindAll(this, "addCategory", "enableDisable", "gtdLogin", "hide",
"loadGtdData", "loadTsData", "makeCategoryItem", "removeCategory",
"saveAndClose", "show", "tsLogin"); },
show: function() {
var $tsSection = this.$el.find(".timestamper-config");
@ -125,11 +127,13 @@
$tsSection.find(".username").val(PD.tsCfg.username);
$tsSection.find(".password").val(PD.tsCfg.password);
$tsSection.find(".host").val(PD.tsCfg.host);
$tsSection.find("input.enabled")[0].checked = PD.tsCfg.enabled;
if (PD.tsAuth) {
this.loadTsData(PD.tsCfg.host, PD.tsCfg.username); }
this.$el.find('.timeline').val(PD.tsCfg.timelineId); }
this.$el.find('.timeline').val(PD.tsCfg.timelineId);
this.enableDisable({target: $tsSection.find("input.enabled")[0]}); }
// Or suggest a default server.
else { $tsSection.find(".host").val("timestamper.jdb-labs.com"); }
@ -139,14 +143,17 @@
$gtdSection.find(".username").val(PD.gtdCfg.username);
$gtdSection.find(".password").val(PD.gtdCfg.password);
$gtdSection.find(".host").val(PD.gtdCfg.host);
$gtdSection.find("input.enabled")[0].checked = PD.gtdCfg.enabled;
if (PD.gtdAuth) { this.loadGtdData(PD.gtdCfg.host); }
// Create the items for the selected categories
$(".category-name").parent().remove();
_.forEach(PD.gtdCfg.categories, this.makeCategoryItem); }
_.forEach(PD.gtdCfg.categories, this.makeCategoryItem);
this.enableDisable({target: $gtdSection.find("input.enabled")[0]}); }
this.$el.find('.refresh').val(
this.$el.find('.refresh-period').val(
PD.refreshPeriod ? PD.refreshPeriod / 1000 : 15);
this.$el.fadeIn(); },
@ -157,6 +164,7 @@
var username = this.$el.find(".timestamper-config .username").val();
var password = this.$el.find(".timestamper-config .password").val();
var host = this.$el.find(".timestamper-config .host").val();
var thisView = this;
if (!PD.tsCfg) { PD.tsCfg = {}; }
@ -170,7 +178,6 @@
xhrFields: { withCredentials: true },
processData: false,
type: 'POST',
async: false,
data: JSON.stringify(
{"username": username, "password": password}),
@ -182,7 +189,10 @@
else { $(".validate-tips").text("There was an error " +
"trying to log into the TimeStamper service: " +
error); }
PD.tsAuth = false; },
PD.tsAuth = false;
// Hide the wait overlay.
thisView.$el.find(".wait-overlay").fadeOut(); },
success: function(data, textStatus, jqXHR) {
PD.tsAuth = true;
@ -191,11 +201,10 @@
// Load the user's timelines.
PD.configDialog.loadTsData(host, username);
}
});
// Success or failure we hide the wait overlay.
this.$el.find(".wait-overlay").fadeOut();
// Hide the wait overlay.
thisView.$el.find(".wait-overlay").fadeOut(); }
});
},
@ -203,6 +212,7 @@
var username = this.$el.find(".gtd-config .username").val();
var password = this.$el.find(".gtd-config .password").val();
var host = this.$el.find(".gtd-config .host").val();
var thisView = this;
if (!PD.gtdCfg) { PD.gtdCfg = {}; }
@ -216,7 +226,6 @@
xhrFields: { withCredentials: true },
processData: false,
type: 'POST',
async: false,
data: JSON.stringify(
{"username": username, "password": password}),
@ -228,61 +237,71 @@
else { $(".validate-tips").text("There was an error " +
"trying to log into the Getting Things Done service: " +
error); }
PD.gtdAuth = false; },
PD.gtdAuth = false;
thisView.$el.find(".wait-overlay").fadeOut(); },
success: function(data, textStatus, jqXHR) {
PD.gtdAuth = true;
$(".validate-tips").text("");
PD.configDialog.loadGtdData(host); }
PD.configDialog.loadGtdData(host);
thisView.$el.find(".wait-overlay").fadeOut(); }
});
this.$el.find(".wait-overlay").fadeOut();
},
loadTsData: function(host, username) {
var thisView = this;
// (Re)load the user's timelines.
PD.tsCfg.timelines = JSON.parse($.ajax({
$.ajax({
url: 'https://' + host + '/ts_api/timelines/' + username,
xhrFields: { withCredentials: true },
async: false}).responseText);
success: function(data, textStatus, jqXHR) {
PD.tsCfg.timelines = data;
// Populate the available timelines list.
var $timelineSelectEl = this.$el.find(".timestamper-config .timeline");
$timelineSelectEl.empty();
_.forEach(PD.tsCfg.timelines, function(timeline) {
var $optionEl = $(document.createElement("option"));
$optionEl.attr("value", timeline.id);
$optionEl.text(timeline.description);
$timelineSelectEl.append($optionEl); }); },
// Populate the available timelines list.
var $timelineSelectEl = $(".timestamper-config .timeline");
$timelineSelectEl.empty();
_.forEach(PD.tsCfg.timelines, function(timeline) {
var $optionEl = $(document.createElement("option"));
$optionEl.attr("value", timeline.id);
$optionEl.text(timeline.description);
$timelineSelectEl.append($optionEl); });
}}); },
loadGtdData: function(host) {
// Load the user's contexts
PD.gtdCfg.contexts = JSON.parse($.ajax({
var contextLoaded = $.ajax({
url: 'http://' + host + '/gtd/contexts',
xhrFields: { withCredentials: true },
async: false }).responseText);
success: function(data, textStatus, jqXHR) {
PD.gtdCfg.contexts = data;} });
// Load the user's projects
PD.gtdCfg.projects = JSON.parse($.ajax({
var projectsLoaded = $.ajax({
url: 'http://' + host + '/gtd/projects',
xhrFields: { withCredentials: true },
async: false }).responseText);
success: function(data, statuxText, jqXHR) {
PD.gtdCfg.projects = data;} });
// Populate the available contexts and projects drop-down.
var $categorySelectEl = $(".gtd-config .category")
$categorySelectEl.empty();
$categorySelectEl.append(
"<option class=default-option value='none'>" +
"Add a category...</option>");
_.forEach(PD.gtdCfg.contexts.concat(PD.gtdCfg.projects),
function(category) {
var $optionEl = $(document.createElement("option"));
$optionEl.attr("value", category.id);
$optionEl.text(category.id);
$categorySelectEl.append($optionEl); });
$categorySelectEl[0].selectedIndex = 0; },
$.when(contextLoaded, projectsLoaded).then(function() {
// Populate the available contexts and projects drop-down.
var $categorySelectEl = $(".gtd-config .category")
$categorySelectEl.empty();
$categorySelectEl.append(
"<option class=default-option value='none'>" +
"Add a category...</option>");
_.forEach(PD.gtdCfg.contexts.concat(PD.gtdCfg.projects),
function(category) {
var $optionEl = $(document.createElement("option"));
$optionEl.attr("value", category.id);
$optionEl.text(category.id);
$categorySelectEl.append($optionEl); });
$categorySelectEl[0].selectedIndex = 0; }); },
makeCategoryItem: function(catName) {
var $liEl = $(
@ -301,6 +320,18 @@
removeCategory: function(source) {
$(source.target).parent().remove(); },
enableDisable: function (e) {
var cbEl = e.target;
var $cbEl = $(cbEl);
var $section = $cbEl.closest('section');
if (cbEl.checked) {
$section.find('div, ul').show(); }
else {
$section.find('div, ul').hide();
$section.find('div.enabled').show(); } },
saveAndClose: function() {
if (!PD.tsCfg) { PD.tsCfg = {}; }
if (!PD.gtdCfg) { PD.gtdCfg = {}; }
@ -311,18 +342,20 @@
PD.tsCfg.username = $tsEl.find(".username").val();
PD.tsCfg.password = $tsEl.find(".password").val();
PD.tsCfg.timelineId = $tsEl.find(".timeline").val();
PD.tsCfg.enabled = $tsEl.find("input.enabled")[0].checked;
// Save Getting Things Done configuration.
var $gtdEl = this.$el.find(".gtd-config");
PD.gtdCfg.host = $gtdEl.find(".host").val();
PD.gtdCfg.username = $gtdEl.find(".username").val();
PD.gtdCfg.password = $gtdEl.find(".password").val();
PD.gtdCfg.enabled = $gtdEl.find("input.enabled")[0].checked;
PD.gtdCfg.categories = _.map(
this.$el.find(".category-name"),
function(span) { return $(span).text(); });
// Save global data
PD.refreshPeriod = parseInt(this.$el.find(".refresh").val()) * 1000;
PD.refreshPeriod = parseInt(this.$el.find(".refresh-period").val()) * 1000;
if (PD.hasHTML5LocalStorage()) {
localStorage.setItem("tsCfg", JSON.stringify(PD.tsCfg));
@ -330,16 +363,22 @@
localStorage.setItem("refreshPeriod",
JSON.stringify(PD.refreshPeriod)); }
this.hide();
this.hide(400, PD.main.refresh);
}
});
PD.Main = Backbone.View.extend({
el: $("body"),
events: {
"click a.refresh" : "refresh",
"click a.pause-continue" : "toggleSync",
"click a.show-config" : "showConfig",
"click a.toggle-fullscreen" : "toggleFullscreen" },
initialize: function() {
_.bindAll(this, "refresh");
_.bindAll(this, "refresh", "toggleSync");
// Create our config dialog view.
PD.configDialog = new PD.ConfigDialog();
@ -366,10 +405,11 @@
this.refresh();
// Schedule future refreshes.
setInterval(this.refresh, PD.refreshPeriod ? PD.refreshPeriod : 15000);
PD.refreshIntervalId = setInterval(this.refresh, PD.refreshPeriod ? PD.refreshPeriod : 15000);
},
refresh: function() {
refresh: function(evt) {
// If the dialog is still open we skip this sync to give the user
// a chance to finish configuration.
if ($("#config-dialog").is(":visible")) { return; }
@ -380,13 +420,12 @@
// Check that we are authenticated to the services we need. Try to
// authenticate if we are not.
if (!PD.tsAuth) {
if (PD.tsCfg.enabled && !PD.tsAuth) {
$.ajax({
url: "https://" + PD.tsCfg.host + "/ts_api/login",
xhrFields: { withCredentials: true },
processData: false,
type: "POST",
async: false,
data: JSON.stringify(
{ "username": PD.tsCfg.username,
@ -402,13 +441,12 @@
success: function(data, textStatus, jqXHR) {
PD.tsAuth = true; }}); }
if (!PD.gtdAuth) {
if (PD.gtdCfg.enabled && !PD.gtdAuth) {
$.ajax({
url: "http://" + PD.gtdCfg.host + "/gtd/login",
xhrFields: { withCredentials: true },
processData: false,
type: "POST",
async: false,
data: JSON.stringify(
{ "username": PD.gtdCfg.username,
@ -427,71 +465,123 @@
// Check that we have successfully authenticated to both services.
// If we are not, we will skip this refresh.
if (!(PD.tsAuth && PD.gtdAuth)) { return; }
if ((PD.tsCfg.enabled && !PD.tsAuth) ||
(PD.gtdCfg.enabled && !PD.gtdAuth)) { return; }
// Get the latest timestamp from the TimeStamper service.
$.ajax({
url: "https://" + PD.tsCfg.host + "/ts_api/entries/" +
PD.tsCfg.username + "/" + PD.tsCfg.timelineId,
xhrFields: { withCredentials: true },
data: {"order": "asc" },
dataType: 'json',
type: 'GET',
async: true,
if (PD.tsCfg.enabled) {
$("section#current-task").show();
$.ajax({
url: "https://" + PD.tsCfg.host + "/ts_api/entries/" +
PD.tsCfg.username + "/" + PD.tsCfg.timelineId,
xhrFields: { withCredentials: true },
data: {"order": "asc" },
dataType: 'json',
type: 'GET',
async: true,
error: function(jqXHR, textStatus, errorText) {
if (jqXHR.status == 401) { PD.tsAuth = false; }
else {
alert("Unable to retrieve current timestamp: " + errorText);
PD.configDialog.show(); }
},
error: function(jqXHR, textStatus, errorText) {
if (jqXHR.status == 401) { PD.tsAuth = false; }
else {
alert("Unable to retrieve current timestamp: " +
errorText);
PD.configDialog.show(); } },
success: function(data, textStatus, jqXHR) {
PD.currentActivityModel.set(data[0]); }
});
success: function(data, textStatus, jqXHR) {
PD.currentActivityModel.set(data[0]); } }); }
// If the TimeStamper section is not enabled, hide the UI for it
else $("section#current-task").hide();
// Get the list of GTD entries for each of our categories.
var categories = _.reduce(
PD.gtdCfg.categories,
function(acc, cat) { return acc ? acc + "," + cat : cat; }, "");
if (PD.gtdCfg.enabled) {
var categories = _.reduce(
PD.gtdCfg.categories,
function(acc, cat) { return acc ? acc + "," + cat : cat; }, "");
$.ajax({
url: "http://" + PD.gtdCfg.host + "/gtd/next-actions/" +
categories,
xhrFields: { withCredentials: true },
dataType: 'json',
type: 'GET',
async: true,
$("section#priorities").show();
$.ajax({
url: "http://" + PD.gtdCfg.host + "/gtd/next-actions/" +
categories,
xhrFields: { withCredentials: true },
dataType: 'json',
type: 'GET',
async: true,
error: function(jqXHR, textStatus, errorText) {
if (jqXHR.status == 401) { PD.gtdAtuh = false; }
else if (jqXHR.status == 500) { return; }
else {
alert("Unable to retrieve next actions: " + errorText);
PD.configDialog.show(); }
},
error: function(jqXHR, textStatus, errorText) {
if (jqXHR.status == 401) { PD.gtdAtuh = false; }
else if (jqXHR.status == 500) { return; }
else {
alert("Unable to retrieve next actions: " +
errorText);
PD.configDialog.show(); } },
success: function(data, textStatus, jqXHR) {
var collection = PD.gtdNextActionCollection;
success: function(data, textStatus, jqXHR) {
var collection = PD.gtdNextActionCollection;
// Add all the retrieved items to the collection.
_.forEach(data, function(actionAttr) {
// Add all the retrieved items to the collection.
_.forEach(data, function(actionAttr) {
// Try to find this entry in out collection.
var model = collection.get(actionAttr.id);
// Update it if found
if (model) { model.set(actionAttr); }
// Insert a new model if not found.
else { collection.add(
new PD.GTDEntryModel(actionAttr)); }});
// Try to find this entry in out collection.
var model = collection.get(actionAttr.id);
// Update it if found
if (model) { model.set(actionAttr); }
// Insert a new model if not found.
else { collection.add(
new PD.GTDEntryModel(actionAttr)); }});
// Look through our collection for entries that are no
// longer in our retrieved data and remove them.
collection.forEach(function(model) {
if (!_.any(data, model.equals)) {
collection.remove(model); }});
}
});
// Look through our collection for entries that are no
// longer in our retrieved data and remove them.
collection.forEach(function(model) {
if (!_.any(data, model.equals)) {
collection.remove(model); }}); } }); }
// If the GTD section is not enabled, hid the UI.
else $("section#priorities").hide();
if (evt) evt.preventDefault();
},
showConfig: function() { PD.configDialog.show(); },
toggleFullscreen: function(evt) {
var $button = $(evt.target);
if ($button.text() == "Go Fullscreen") {
if (document.documentElement.requestFullscreen) {
document.documentElement.requestFullscreen(); }
else if (document.documentElement.webkitRequestFullscreen) {
document.documentElement.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT); }
else if (document.documentElement.mozRequestFullScreen) {
document.documentElement.mozRequestFullScreen(); }
else { alert ("Not supported by this browser."); }
$button.text("Leave Fullscreen"); }
else {
if (document.exitFullscreen) {
document.exitFullscreen(); }
else if (document.webkitExitFullscreen) {
document.webkitExitFullscreen(); }
else if (document.mozCancelFullscreen) {
document.documentElement.mozCancelFullscreen(); }
else { alert ("Not supported by this browser."); }
$button.text("Go Fullscreen"); } },
toggleSync: function(evt) {
if (PD.refreshIntervalId == null) {
PD.refreshIntervalId = setInterval(this.refresh,
PD.refreshPeriod ? PD.refreshPeriod : 15000);
$('.pause-continue').text('Pause Monitoring'); }
else {
clearInterval(PD.refreshIntervalId);
PD.refreshIntervalId = null;
$('.pause-continue').text('Resume Monitoring'); }
if (evt) evt.preventDefault();
}
});