svn updates

diff --git a/dash/app.js b/dash/app.js
index 1212518..701bb7b 100644 (file)
--- 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 (file)
--- 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 (file)
--- a/dash/views/task.js
+++ b/dash/views/task.js
@@ -4,7 +4,7 @@ var TaskView = Backbone.View.extend({
     template: _.template(
         '<td><%= employee %></td>' +
         '<td><%= status %></td>' +
-        '<td><%= title %></td>' +
+        '<td><a target="_blank" href="../task.php?tid=<%= tid %>"><%= title %></a></td>' +
         '<td><%= deadline %></td>'),
     initialize: function(){
         this.listenTo(this.model, 'change', this.render)

diff --git a/fetchTask.php b/fetchTask.php
index 8cabc08..7fe2cd7 100644 (file)
--- a/fetchTask.php
+++ b/fetchTask.php
@@ -1,7 +1,7 @@
 <?php
 try {
     $dbh = new PDO(
-        'pgsql: host=localhost dbname=glmdb user=postgres',
+        'pgsql: host=ds4 dbname=glmdb user=postgres',
         null,
         null,
         array(
@@ -17,7 +17,7 @@ try {
         ? "t.pid = {$pid}"
         : "t.pid IN (3937, 3936, 3878, 3929)";
     $sql = "
-    SELECT t.name as title,t.pid as project,
+    SELECT t.tid,t.name as title,t.pid as project,
            t.status,e.fname as employee,
            to_char(t.deadline, 'Mon DD') as deadline
       FROM tasks t

diff --git a/index.html b/index.html
index 0b849c1..415c034 100644 (file)
--- a/index.html
+++ b/index.html
@@ -25,7 +25,7 @@
                 <!-- Collect the nav links, forms, and other content for toggling -->
                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                     <ul class="nav navbar-nav">
-                        <li class="active"><a href="#">Home <span class="sr-only">(current)</span></a></li>
+                        <li class="active"><a href="index.php">Home <span class="sr-only">(current)</span></a></li>
                         <li><a href="/tasks/">Tasks</a></li>
                     </ul>
                     <ul class="nav navbar-nav navbar-right">
@@ -37,8 +37,68 @@
         <div class="container">
             <div class="row">
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-                    <h3>NLEA</h3>
-                    <table id="nleaList"
+                    <h3><a href="../project.php?pid=3929" target="_blank">Mount Pleasant Wow</a></h3>
+                    <table id="mountList"
+                        class="table table-condensed table-striped table-bordered table-hover">
+                        <thead>
+                            <tr>
+                                <th>Employee</th>
+                                <th>Status</th>
+                                <th>Task Name</th>
+                                <th>Deadline</th>
+                            </tr>
+                        </thead>
+                    </table>
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
+                    <h3><a href="../project.php?pid=3937" target="_blank">Western UP</a></h3>
+                    <table id="westernList"
+                        class="table table-condensed table-striped table-bordered table-hover">
+                        <thead>
+                            <tr>
+                                <th>Employee</th>
+                                <th>Status</th>
+                                <th>Task Name</th>
+                                <th>Deadline</th>
+                            </tr>
+                        </thead>
+                    </table>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
+                    <h3><a href="../project.php?pid=3882" target="_blank">Great Lakes Shipwreck</a></h3>
+                    <table id="shipwreckList"
+                        class="table table-condensed table-striped table-bordered table-hover">
+                        <thead>
+                            <tr>
+                                <th>Employee</th>
+                                <th>Status</th>
+                                <th>Task Name</th>
+                                <th>Deadline</th>
+                            </tr>
+                        </thead>
+                    </table>
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
+                    <h3><a href="../project.php?pid=3928" target="_blank">Michigan Scientific</a></h3>
+                    <table id="misciList"
+                        class="table table-condensed table-striped table-bordered table-hover">
+                        <thead>
+                            <tr>
+                                <th>Employee</th>
+                                <th>Status</th>
+                                <th>Task Name</th>
+                                <th>Deadline</th>
+                            </tr>
+                        </thead>
+                    </table>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
+                    <h3><a href="../project.php?pid=3956" target="_blank">EUPRPDC</a></h3>
+                    <table id="euprdcList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -51,7 +111,7 @@
                     </table>
                 </div>
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-                    <h3>Emmet - Gov't</h3>
+                    <h3><a href="../project.php?pid=3878" target="_blank">Emmet - Gov't</a></h3>
                     <table id="emmetList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
@@ -64,9 +124,11 @@
                         </thead>
                     </table>
                 </div>
+            </div>
+            <div class="row">
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-                    <h3>Western UP</h3>
-                    <table id="westernList"
+                    <h3><a href="../project.php?pid=3727" target="_blank">Starline</a></h3>
+                    <table id="starlineList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -79,8 +141,54 @@
                     </table>
                 </div>
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-                    <h3>Mount Pleasant Wow</h3>
-                    <table id="mountList"
+                    <h3><a href="../project.php?pid=3951" target="_blank">Little Field Township</a></h3>
+                    <table id="littleFieldList"
+                        class="table table-condensed table-striped table-bordered table-hover">
+                        <thead>
+                            <tr>
+                                <th>Employee</th>
+                                <th>Status</th>
+                                <th>Task Name</th>
+                                <th>Deadline</th>
+                            </tr>
+                        </thead>
+                    </table>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
+                    <h3><a href="../project.php?pid=3962" target="_blank">Big Powderhorn Lodging</a></h3>
+                    <table id="bplaList"
+                        class="table table-condensed table-striped table-bordered table-hover">
+                        <thead>
+                            <tr>
+                                <th>Employee</th>
+                                <th>Status</th>
+                                <th>Task Name</th>
+                                <th>Deadline</th>
+                            </tr>
+                        </thead>
+                    </table>
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
+                    <h3><a href="../project.php?pid=3965" target="_blank">Staffords</a></h3>
+                    <table id="staffordsList"
+                        class="table table-condensed table-striped table-bordered table-hover">
+                        <thead>
+                            <tr>
+                                <th>Employee</th>
+                                <th>Status</th>
+                                <th>Task Name</th>
+                                <th>Deadline</th>
+                            </tr>
+                        </thead>
+                    </table>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
+                    <h3><a href="../project.php?pid=3967" target="_blank">Otsego County Government</a></h3>
+                    <table id="otsegoList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>