Update dash with new projects

Getting rid of some old projects.
Adding MCDA Michigan Trail Maps, and MAVB.

diff --git a/dash/app.js b/dash/app.js
index feb8081..38ea758 100644 (file)
--- a/dash/app.js
+++ b/dash/app.js
@@ -1,18 +1,9 @@
 $(document).ready(function(){
-    var prefixUrl = '';//'/glmdb.gaslightmedia.com';
-    //var prefixUrl = '/glmdb.gaslightmedia.com';
+    //var prefixUrl = '';
+    var prefixUrl = '/glmdb.gaslightmedia.com';
     var bDate = new Date();
     var bTime = bDate.getTime();
 
-    // 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});
-
     // Events Plugin
     var eventsTasks = new Tasks([
     ]);
@@ -22,6 +13,15 @@ $(document).ready(function(){
         el: '#eventsList',
         collection: eventsTasks});
 
+    // Coupons Plugin
+    var couponsTasks = new Tasks([
+    ]);
+    couponsTasks.url = prefixUrl + '/Dash/fetchTask.php';
+    couponsTasks.fetch({cache: false, async:true, data: {pid: 4075, t: bTime}});
+    var couponsList = new TaskListView({
+        el: '#couponsList',
+        collection: couponsTasks});
+
     // MemberDB Plugin
     var memberdbTasks = new Tasks([
     ]);
@@ -31,15 +31,6 @@ $(document).ready(function(){
         el: '#memberdbList',
         collection: memberdbTasks});
 
-    // John Hoffman Landscaping
-    var hoffmanTasks = new Tasks([
-    ]);
-    hoffmanTasks.url = prefixUrl + '/Dash/fetchTask.php';
-    hoffmanTasks.fetch({cache: false, async:true, data: {pid: 4016, t: bTime}});
-    var hoffmanList = new TaskListView({
-        el: '#hoffmanList',
-        collection: hoffmanTasks});
-
     // Member Leads
     var leadsTasks = new Tasks([
     ]);
@@ -49,16 +40,6 @@ $(document).ready(function(){
         el: '#leadsList',
         collection: leadsTasks});
 
-
-    // Petoskey.com
-    var petoskeyTasks = new Tasks([
-    ]);
-    petoskeyTasks.url = prefixUrl + '/Dash/fetchTask.php';
-    petoskeyTasks.fetch({cache: false, async:true, data: {pid: 4003, t: bTime}});
-    var petoskeyList = new TaskListView({
-        el: '#petoskeyList',
-        collection: petoskeyTasks});
-
     // Harbor Country
     var harborcountryTasks = new Tasks([
     ]);
@@ -86,4 +67,31 @@ $(document).ready(function(){
         el: '#butterflyList',
         collection: butterflyTasks});
 
+    // MAVB
+    var MAVBTasks = new Tasks([
+    ]);
+    MAVBTasks.url = prefixUrl + '/Dash/fetchTask.php';
+    MAVBTasks.fetch({cache: false, async:true, data: {pid: 4065, t: bTime}});
+    var MAVBList = new TaskListView({
+        el: '#MAVBList',
+        collection: MAVBTasks});
+
+    // MCDA
+    var MCDATasks = new Tasks([
+    ]);
+    MCDATasks.url = prefixUrl + '/Dash/fetchTask.php';
+    MCDATasks.fetch({cache: false, async:true, data: {pid: 4006, t: bTime}});
+    var MCDAList = new TaskListView({
+        el: '#MCDAList',
+        collection: MCDATasks});
+
+    // Mich Trail Maps
+    var trailmapsTasks = new Tasks([
+    ]);
+    trailmapsTasks.url = prefixUrl + '/Dash/fetchTask.php';
+    trailmapsTasks.fetch({cache: false, async:true, data: {pid: 4074, t: bTime}});
+    var trailmapsList = new TaskListView({
+        el: '#trailmapsList',
+        collection: trailmapsTasks});
+
 });

diff --git a/fetchTask.php b/fetchTask.php
index 7fe2cd7..5527018 100644 (file)
--- a/fetchTask.php
+++ b/fetchTask.php
@@ -45,6 +45,9 @@ try {
         case 'ready_for_review':
             $task['status'] = 'Ready For Review';
             break;
+        case 'need_client_review':
+            $task['status'] = 'Need Client Review';
+            break;
         case 'in_progress':
             $task['status'] = 'In Progress';
             break;

diff --git a/index.html b/index.html
index 7f02eb0..7d571c1 100644 (file)
--- a/index.html
+++ b/index.html
@@ -26,7 +26,6 @@
                 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                     <ul class="nav navbar-nav">
                         <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">
                         <li><a href="#">?</a></li>
@@ -39,8 +38,8 @@
             <div class="row">
 
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-                    <h3><a href="../project.php?pid=4038" target="_blank">Harbor Country</a></h3>
-                    <table id="harborcountryList"
+                    <h3><a href="../project.php?pid=4065" target="_blank">MAVB</a></h3>
+                    <table id="MAVBList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -54,8 +53,8 @@
                 </div>
 
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-                    <h3><a href="../project.php?pid=4030" target="_blank">UCMAN</a></h3>
-                    <table id="ucmanList"
+                    <h3><a href="../project.php?pid=4006" target="_blank">MCDA</a></h3>
+                    <table id="MCDAList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -69,12 +68,12 @@
                 </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=4066" target="_blank">Original Butterflyhouse</a></h3>
-                    <table id="butterflyList"
+                    <h3><a href="../project.php?pid=4074" target="_blank">Michigan Trail Maps</a></h3>
+                    <table id="trailmapsList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -88,8 +87,8 @@
                 </div>
 
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-                    <h3><a href="../project.php?pid=4020" target="_blank">Events Plugin</a></h3>
-                    <table id="eventsList"
+                    <h3><a href="../project.php?pid=4030" target="_blank">UCMAN</a></h3>
+                    <table id="ucmanList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -102,13 +101,13 @@
                     </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=3975" target="_blank">GLM Associate</a></h3>
-                    <table id="memberdbList"
+                    <h3><a href="../project.php?pid=4038" target="_blank">Harbor Country</a></h3>
+                    <table id="harborcountryList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -120,10 +119,9 @@
                         </thead>
                     </table>
                 </div>
-
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-                    <h3><a href="../project.php?pid=4047" target="_blank">Member Leads</a></h3>
-                    <table id="leadsList"
+                    <h3><a href="../project.php?pid=4066" target="_blank">Original Butterflyhouse</a></h3>
+                    <table id="butterflyList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -136,13 +134,27 @@
                     </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=3928" target="_blank">Michigan Scientific</a></h3>
-                    <table id="misciList"
+                    <h3><a href="../project.php?pid=4020" target="_blank">Events Plugin</a></h3>
+                    <table id="eventsList"
+                        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=4075" target="_blank">Coupons Plugin</a></h3>
+                    <table id="couponsList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -154,9 +166,13 @@
                         </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=4016" target="_blank">John Hoffman Landscaping</a></h3>
-                    <table id="hoffmanList"
+                    <h3><a href="../project.php?pid=3975" target="_blank">GLM Associate</a></h3>
+                    <table id="memberdbList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -168,9 +184,10 @@
                         </thead>
                     </table>
                 </div>
+
                 <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-                    <h3><a href="../project.php?pid=4003" target="_blank">Petoskey.com</a></h3>
-                    <table id="petoskeyList"
+                    <h3><a href="../project.php?pid=4047" target="_blank">Member Leads</a></h3>
+                    <table id="leadsList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -183,7 +200,9 @@
                     </table>
                 </div>
 
+
             </div>
+
         </div>
 
         <script src="libs/jquery/dist/jquery.min.js"></script>