fixed scheduler bugs

diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js
index 15477a4..eb5f834 100644 (file)
--- a/plugins/querytable/static/js/querytable.js
+++ b/plugins/querytable/static/js/querytable.js
@@ -97,7 +97,7 @@ QUERYTABLE_BGCOLOR_REMOVED = 2;
                 sPaginationType: 'bootstrap',
                 // Handle the null values & the error : Datatables warning Requested unknown parameter
                 // http://datatables.net/forums/discussion/5331/datatables-warning-...-requested-unknown-parameter/p2
-                aoColumnDefs: [{sDefaultContent: '',aTargets: [ '_all' ]}],
+                aoColumnDefs: [{sDefaultContent: '', aTargets: [ '_all' ]}],
                 // WARNING: this one causes tables in a 'tabs' that are not exposed at the time this is run to show up empty
                 // sScrollX: '100%',       /* Horizontal scrolling */
                 bProcessing: true,      /* Loading */

diff --git a/plugins/scheduler2/static/css/scheduler2.css b/plugins/scheduler2/static/css/scheduler2.css
index 22729f1..ffbe4f1 100755 (executable)
--- a/plugins/scheduler2/static/css/scheduler2.css
+++ b/plugins/scheduler2/static/css/scheduler2.css
@@ -285,8 +285,17 @@ background: #E8E8E8;
 \r
 /* latest stuff */\r
 .sliderContainer {\r
-    margin:0;\r
+       margin-left: -15px;\r
+       margin-right: 15px;\r
 }\r
 .table-responsive{\r
     overflow: hidden !important;\r
 }\r
+input {\r
+    min-width: 150px !important;\r
+       margin-left: 5px;\r
+}\r
+\r
+.slider.slider-horizontal {\r
+       width: 100%;\r
+}\r

diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index 77545c0..0b5339f 100755 (executable)
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -226,7 +226,7 @@ var SCHEDULER_COLWIDTH = 50;
             }\r
             manifold.raise_event($scope.instance.options.query_lease_uuid, FIELD_STATE_CHANGED, data);\r
             /* Remove from local cache also, unless we listen to events from outside */\r
-            $.grep($scope._leases_by_resource[other.resource], function(x) { return x != other; });\r
+            $scope._leases_by_resource[other.resource] = $.grep($scope._leases_by_resource[other.resource], function(x) { return x != other; });\r
 \r
         }\r
 \r
@@ -278,7 +278,7 @@ var SCHEDULER_COLWIDTH = 50;
                             }\r
                             manifold.raise_event($scope.instance.options.query_lease_uuid, FIELD_STATE_CHANGED, data);\r
                             /* Remove from local cache also, unless we listen to events from outside */\r
-                            $.grep($scope._leases_by_resource[model_resource.urn], function(x) { return x != other; });\r
+                            $scope._leases_by_resource[model_resource.urn] = $.grep($scope._leases_by_resource[model_resource.urn], function(x) { return x != other; });\r
                             return false; // ~ break\r
                         });\r
         \r
@@ -305,9 +305,9 @@ var SCHEDULER_COLWIDTH = 50;
                                 op   : STATE_SET_REMOVE,\r
                                 value: other_key\r
                             }\r
-                            manifold.raise_event($scope.instance.options.query_lease_uuid, FIELD_STATE_CHANGED, other_key);\r
+                            manifold.raise_event($scope.instance.options.query_lease_uuid, FIELD_STATE_CHANGED, data);\r
                             /* Remove from local cache also, unless we listen to events from outside */\r
-                            $.grep($scope._leases_by_resource[model_resource.urn], function(x) { return x != other; });\r
+                            $scope._leases_by_resource[model_resource.urn] = $.grep($scope._leases_by_resource[model_resource.urn], function(x) { return x != other; });\r
                             return false; // ~ break\r
                         });\r
                     }\r

diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index 9d01851..6edc88e 100755 (executable)
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -8,24 +8,25 @@
 </div>\r
 <div id="plugin-{{ domid }}" class="">\r
     <div class="row m-b">\r
-        <div class="col-md-1">\r
-            <label for="inputEmail3" class="col-sm-2 control-label">Date</label>\r
+        <div class="col-md-2">\r
+            <label for="inputEmail3" class="col-sm-2 control-label">Day:</label>\r
         </div>\r
-        <div class="col-md-9">\r
-               <div class="row">\r
-                       <div class="col-md-5">\r
-                   <input id="DateToRes" type="text" placeholder="Reservation Date">\r
-                   <!-- <input id="DateToRes" type="text" class="form-control" placeholder="Reservation Date"> -->\r
-                   <span class="glyphicon glyphicon-calendar"></span>\r
-                               </div>\r
-                               <div class="col-md-4">\r
-                                       <div class="sliderContainer">\r
-                                               <div id="tblSlider"></div>\r
-                                       </div>\r
-                               </div>\r
-                       </div>\r
+        <div class="col-md-10">\r
+            <label for="inputEmail3" class="col-sm-2 control-label">Time of day:</label>\r
         </div>\r
     </div>\r
+    <div class="row m-b">\r
+               <div class="col-md-2">\r
+               <input id="DateToRes" type="text" placeholder="Reservation Date">\r
+               <!-- <input id="DateToRes" type="text" class="form-control" placeholder="Reservation Date"> -->\r
+               <span class="glyphicon glyphicon-calendar"></span>\r
+               </div>\r
+               <div class="col-md-10">\r
+                       <div class="sliderContainer">\r
+                               <div id="tblSlider"></div>\r
+                       </div>\r
+               </div>\r
+    </div>\r
     <div id="SchedulerCtrl" ng-controller="SchedulerCtrl" class='query-editor-spacer'>\r
         <div class="table-responsive">\r
 \r

diff --git a/portal/templates/base.html b/portal/templates/base.html
index 449c5d2..970eefd 100644 (file)
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -7,7 +7,7 @@
 {# This is where insert_str will end up #}{% media_container prelude %}
 {% include 'messages-transient-header.html' %}
 <script type="text/javascript"> {# raw js code - use {% insert prelude_js %} ... {% endinsert %} #} {% container prelude_js %}</script>
-<script src="{{ STATIC_URL }}js/jquery-ui.js"></script>
+<!--<script src="{{ STATIC_URL }}js/jquery-ui.js"></script>-->
 <script src="{{ STATIC_URL }}js/jquery.dataTables.min.js"></script>
 <script src="{{ STATIC_URL }}js/jquery.qtip.min.js"></script>
 <script src="{{ STATIC_URL }}js/bootstrap.datatables.js"></script>