From adbfaad89fffa77911e01f44cd19c9250f62a016 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 30 Oct 2015 12:50:37 -0400 Subject: [PATCH] svn updates --- dash/app.js | 116 +++++++++++++++++++++++++++++++++-------- dash/models/Task.js | 1 + dash/views/task.js | 2 +- fetchTask.php | 4 +- index.html | 124 +++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 215 insertions(+), 32 deletions(-) diff --git a/dash/app.js b/dash/app.js index 1212518..701bb7b 100644 --- a/dash/app.js +++ b/dash/app.js @@ -1,11 +1,12 @@ $(document).ready(function(){ + var prefixUrl = '';//'/glmdb.gaslightmedia.com'; var bDate = new Date(); var bTime = bDate.getTime(); // Emmet Government var emmetTasks = new Tasks([ ]); - emmetTasks.url = '/fetchTask.php'; - emmetTasks.fetch({async:true, data: {pid: 3878, t: bTime}}); + emmetTasks.url = prefixUrl + '/Dash/fetchTask.php'; + emmetTasks.fetch({cache: false, async:true, data: {pid: 3878, t: bTime}}); var emmetList = new TaskListView({ el: '#emmetList', collection: emmetTasks}); @@ -13,38 +14,111 @@ $(document).ready(function(){ // Western UP var westernTasks = new Tasks([ ]); - westernTasks.url = '/fetchTask.php'; - westernTasks.fetch({async:true, data: {pid: 3937, t: bTime}}); + westernTasks.url = prefixUrl + '/Dash/fetchTask.php'; + westernTasks.fetch({cache: false, async:true, data: {pid: 3937, t: bTime}}); var westernList = new TaskListView({ el: '#westernList', collection: westernTasks}); - // NLEA - var nleaTasks = new Tasks([ + // Shipwreck + var shipwreckTasks = new Tasks([ ]); - nleaTasks.url = '/fetchTask.php'; - nleaTasks.fetch({async:true, data: {pid: 3936, t: bTime}}); - var nleaList = new TaskListView({ - el: '#nleaList', - collection: nleaTasks}); + shipwreckTasks.url = prefixUrl + '/Dash/fetchTask.php'; + shipwreckTasks.fetch({cache: false, async:true, data: {pid: 3882, t: bTime}}); + var shipwreckList = new TaskListView({ + el: '#shipwreckList', + collection: shipwreckTasks}); + + // MI Sci + var misciTasks = new Tasks([ + ]); + misciTasks.url = prefixUrl + '/Dash/fetchTask.php'; + misciTasks.fetch({cache: false, async:true, data: {pid: 3928, t: bTime}}); + var misciList = new TaskListView({ + el: '#misciList', + collection: misciTasks}); // Mount Pleasant Wow var mountTasks = new Tasks([ ]); - mountTasks.url = '/fetchTask.php'; - mountTasks.fetch({async:true, data: {pid: 3929, t: bTime}}); + mountTasks.url = prefixUrl + '/Dash/fetchTask.php'; + mountTasks.fetch({cache: false, async:true, data: {pid: 3929, t: bTime}}); var mountList = new TaskListView({ el: '#mountList', collection: mountTasks}); - setInterval(function(){ - var curDate = new Date(); - var curTime = curDate.getTime(); - emmetTasks.fetch({async:true, data: {pid: 3878, t: curTime}, reset: true}); - westernTasks.fetch({async:true, data: {pid: 3937, t: curTime}, reset: true}); - nleaTasks.fetch({async:true, data: {pid: 3936, t: curTime}, reset: true}); - mountTasks.fetch({async:true, data: {pid: 3929, t: curTime}, reset: true}); - }, 20000); + // Gaslight + var gaslightTasks = new Tasks([ + ]); + gaslightTasks.url = prefixUrl + '/Dash/fetchTask.php'; + gaslightTasks.fetch({cache: false, async:true, data: {pid: 2188, t: bTime}}); + var gaslightList = new TaskListView({ + el: '#gaslightList', + collection: gaslightTasks}); + + // Starline + var starlineTasks = new Tasks([ + ]); + starlineTasks.url = prefixUrl + '/Dash/fetchTask.php'; + starlineTasks.fetch({cache: false, async:true, data: {pid: 3727, t: bTime}}); + var starlineList = new TaskListView({ + el: '#starlineList', + collection: starlineTasks}); + + // Little Field + var littleFieldTasks = new Tasks([ + ]); + littleFieldTasks.url = prefixUrl + '/Dash/fetchTask.php'; + littleFieldTasks.fetch({cache: false, async:true, data: {pid: 3951, t: bTime}}); + var littleFieldList = new TaskListView({ + el: '#littleFieldList', + collection: littleFieldTasks}); + + // BPLA + var bplaTasks = new Tasks([ + ]); + bplaTasks.url = prefixUrl + '/Dash/fetchTask.php'; + bplaTasks.fetch({cache: false, async:true, data: {pid: 3962, t: bTime}}); + var bplaList = new TaskListView({ + el: '#bplaList', + collection: bplaTasks}); + + // Otsego County + var otsegoTasks = new Tasks([ + ]); + otsegoTasks.url = prefixUrl + '/Dash/fetchTask.php'; + otsegoTasks.fetch({cache: false, async:true, data: {pid: 3967, t: bTime}}); + var otsegoList = new TaskListView({ + el: '#otsegoList', + collection: otsegoTasks}); + + // Chx Design + var chxDesignTasks = new Tasks([ + ]); + chxDesignTasks.url = prefixUrl + '/Dash/fetchTask.php'; + chxDesignTasks.fetch({cache: false, async:true, data: {pid: 3949, t: bTime}}); + var chxDesignList = new TaskListView({ + el: '#chxDesignList', + collection: chxDesignTasks}); + + // EUPRDC + var euprdcTasks = new Tasks([ + ]); + euprdcTasks.url = prefixUrl + '/Dash/fetchTask.php'; + euprdcTasks.fetch({cache: false, async:true, data: {pid: 3956, t: bTime}}); + var euprdcList = new TaskListView({ + el: '#euprdcList', + collection: euprdcTasks}); + + // Staffords + var staffordsTasks = new Tasks([ + ]); + staffordsTasks.url = prefixUrl + '/Dash/fetchTask.php'; + staffordsTasks.fetch({cache: false, async:true, data: {pid: 3965, t: bTime}}); + var staffordsList = new TaskListView({ + el: '#staffordsList', + collection: staffordsTasks}); + }); diff --git a/dash/models/Task.js b/dash/models/Task.js index 00250fd..c6e6f43 100644 --- a/dash/models/Task.js +++ b/dash/models/Task.js @@ -1,5 +1,6 @@ var Task = Backbone.Model.extend({ defaults: { + tid: "", title: "untitled", employee: "", status: "new", diff --git a/dash/views/task.js b/dash/views/task.js index b706e1b..0faa588 100644 --- a/dash/views/task.js +++ b/dash/views/task.js @@ -4,7 +4,7 @@ var TaskView = Backbone.View.extend({ template: _.template( '<%= employee %>' + '<%= status %>' + - '<%= title %>' + + '<%= title %>' + '<%= deadline %>'), initialize: function(){ this.listenTo(this.model, 'change', this.render) diff --git a/fetchTask.php b/fetchTask.php index 8cabc08..7fe2cd7 100644 --- a/fetchTask.php +++ b/fetchTask.php @@ -1,7 +1,7 @@