From 376307342a51ecd274fc8c0d24a14030c73cd292 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jordan=20Aug=C3=A9?= <jordan.auge@lip6.fr>
Date: Tue, 8 Jul 2014 05:18:54 +0200
Subject: [PATCH] fixed scheduler bugs

---
 plugins/querytable/static/js/querytable.js   |  2 +-
 plugins/scheduler2/static/css/scheduler2.css | 11 ++++++-
 plugins/scheduler2/static/js/scheduler2.js   |  8 ++---
 plugins/scheduler2/templates/scheduler.html  | 31 ++++++++++----------
 portal/templates/base.html                   |  2 +-
 5 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js
index 15477a42..eb5f834d 100644
--- 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 22729f12..ffbe4f1d 100755
--- a/plugins/scheduler2/static/css/scheduler2.css
+++ b/plugins/scheduler2/static/css/scheduler2.css
@@ -285,8 +285,17 @@ background: #E8E8E8;
 
 /* latest stuff */
 .sliderContainer {
-    margin:0;
+	margin-left: -15px;
+	margin-right: 15px;
 }
 .table-responsive{
     overflow: hidden !important;
 }
+input {
+    min-width: 150px !important;
+	margin-left: 5px;
+}
+
+.slider.slider-horizontal {
+	width: 100%;
+}
diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index 77545c02..0b5339fe 100755
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -226,7 +226,7 @@ var SCHEDULER_COLWIDTH = 50;
             }
             manifold.raise_event($scope.instance.options.query_lease_uuid, FIELD_STATE_CHANGED, data);
             /* Remove from local cache also, unless we listen to events from outside */
-            $.grep($scope._leases_by_resource[other.resource], function(x) { return x != other; });
+            $scope._leases_by_resource[other.resource] = $.grep($scope._leases_by_resource[other.resource], function(x) { return x != other; });
 
         }
 
@@ -278,7 +278,7 @@ var SCHEDULER_COLWIDTH = 50;
                             }
                             manifold.raise_event($scope.instance.options.query_lease_uuid, FIELD_STATE_CHANGED, data);
                             /* Remove from local cache also, unless we listen to events from outside */
-                            $.grep($scope._leases_by_resource[model_resource.urn], function(x) { return x != other; });
+                            $scope._leases_by_resource[model_resource.urn] = $.grep($scope._leases_by_resource[model_resource.urn], function(x) { return x != other; });
                             return false; // ~ break
                         });
         
@@ -305,9 +305,9 @@ var SCHEDULER_COLWIDTH = 50;
                                 op   : STATE_SET_REMOVE,
                                 value: other_key
                             }
-                            manifold.raise_event($scope.instance.options.query_lease_uuid, FIELD_STATE_CHANGED, other_key);
+                            manifold.raise_event($scope.instance.options.query_lease_uuid, FIELD_STATE_CHANGED, data);
                             /* Remove from local cache also, unless we listen to events from outside */
-                            $.grep($scope._leases_by_resource[model_resource.urn], function(x) { return x != other; });
+                            $scope._leases_by_resource[model_resource.urn] = $.grep($scope._leases_by_resource[model_resource.urn], function(x) { return x != other; });
                             return false; // ~ break
                         });
                     }
diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index 9d01851f..6edc88eb 100755
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -8,24 +8,25 @@
 </div>
 <div id="plugin-{{ domid }}" class="">
     <div class="row m-b">
-        <div class="col-md-1">
-            <label for="inputEmail3" class="col-sm-2 control-label">Date</label>
+        <div class="col-md-2">
+            <label for="inputEmail3" class="col-sm-2 control-label">Day:</label>
         </div>
-        <div class="col-md-9">
-        	<div class="row">
-        		<div class="col-md-5">
-	            <input id="DateToRes" type="text" placeholder="Reservation Date">
-	            <!-- <input id="DateToRes" type="text" class="form-control" placeholder="Reservation Date"> -->
-	            <span class="glyphicon glyphicon-calendar"></span>
-				</div>
-				<div class="col-md-4">
-					<div class="sliderContainer">
-						<div id="tblSlider"></div>
-					</div>
-				</div>
-			</div>
+        <div class="col-md-10">
+            <label for="inputEmail3" class="col-sm-2 control-label">Time of day:</label>
         </div>
     </div>
+    <div class="row m-b">
+		<div class="col-md-2">
+		<input id="DateToRes" type="text" placeholder="Reservation Date">
+		<!-- <input id="DateToRes" type="text" class="form-control" placeholder="Reservation Date"> -->
+		<span class="glyphicon glyphicon-calendar"></span>
+		</div>
+		<div class="col-md-10">
+			<div class="sliderContainer">
+				<div id="tblSlider"></div>
+			</div>
+		</div>
+    </div>
     <div id="SchedulerCtrl" ng-controller="SchedulerCtrl" class='query-editor-spacer'>
         <div class="table-responsive">
 
diff --git a/portal/templates/base.html b/portal/templates/base.html
index 449c5d22..970eefd8 100644
--- 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>
-- 
2.43.0