From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 20 Mar 2017 14:07:43 +0000 (-0400)
Subject: update dash
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=dac699cf4c12481d1f3c3f15bcfae686f7852e3f;p=prog%2FDash.git

update dash
---

diff --git a/dash/app.js b/dash/app.js
index 629d406..fee886e 100644
--- a/dash/app.js
+++ b/dash/app.js
@@ -4,24 +4,6 @@ $(document).ready(function(){
     var bDate = new Date();
     var bTime = bDate.getTime();
 
-    // Events Plugin
-    var eventsTasks = new Tasks([
-    ]);
-    eventsTasks.url = prefixUrl + '/Dash/fetchTask.php';
-    eventsTasks.fetch({cache: false, async:true, data: {pid: 4100, t: bTime}});
-    var eventsList = new TaskListView({
-        el: '#eventsList',
-        collection: eventsTasks});
-
-    // MemberDB Plugin
-    var memberdbTasks = new Tasks([
-    ]);
-    memberdbTasks.url = prefixUrl + '/Dash/fetchTask.php';
-    memberdbTasks.fetch({cache: false, async:true, data: {pid: 3975, t: bTime}});
-    var memberdbList = new TaskListView({
-        el: '#memberdbList',
-        collection: memberdbTasks});
-
     // Mich Trail Maps
     var trailmapsTasks = new Tasks([
     ]);
@@ -76,6 +58,15 @@ $(document).ready(function(){
         el: '#brewbakersList',
         collection: brewbakersTasks});
 
+    // Starline
+    var starlineTasks = new Tasks([
+    ]);
+    starlineTasks.url = prefixUrl + '/Dash/fetchTask.php';
+    starlineTasks.fetch({cache: false, async:true, data: {pid: 4105, t: bTime}});
+    var starlineList = new TaskListView({
+        el: '#starlineList',
+        collection: starlineTasks});
+
     // Event Calender
     var eventcTasks = new Tasks([
     ]);
@@ -85,4 +76,22 @@ $(document).ready(function(){
         el: '#eventcList',
         collection: eventcTasks});
 
+    // Events Registration Plugin
+    var eventsTasks = new Tasks([
+    ]);
+    eventsTasks.url = prefixUrl + '/Dash/fetchTask.php';
+    eventsTasks.fetch({cache: false, async:true, data: {pid: 4100, t: bTime}});
+    var eventsList = new TaskListView({
+        el: '#eventsList',
+        collection: eventsTasks});
+
+    // MemberDB Plugin
+    var memberdbTasks = new Tasks([
+    ]);
+    memberdbTasks.url = prefixUrl + '/Dash/fetchTask.php';
+    memberdbTasks.fetch({cache: false, async:true, data: {pid: 3975, t: bTime}});
+    var memberdbList = new TaskListView({
+        el: '#memberdbList',
+        collection: memberdbTasks});
+
 });
diff --git a/index.html b/index.html
index 74c4dc8..f9f22e7 100644
--- a/index.html
+++ b/index.html
@@ -118,8 +118,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 Calender</a></h3>
-                    <table id="eventcList"
+                    <h3><a href="../project.php?pid=4105" target="_blank">Starline</a></h3>
+                    <table id="starlineList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -133,16 +133,11 @@
                 </div>
 
             </div>
-            <div class="row">
-
-
-            </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=4020" target="_blank">Events Calender</a></h3>
+                    <table id="eventcList"
                         class="table table-condensed table-striped table-bordered table-hover">
                         <thead>
                             <tr>
@@ -169,6 +164,25 @@
                         </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=3975" target="_blank">GLM Associate</a></h3>
+                    <table id="memberdbList"
+                        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>