From: Chrysostomos Kolovos <xrklvs@gmail.com>
Date: Wed, 2 Apr 2014 17:53:00 +0000 (+0300)
Subject: Chrysostomos for scheduler
X-Git-Tag: myslice-1.1~157^2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=dc85c90ae585a11d616330f0180c974f5b35072d;p=myslice.git

Chrysostomos for scheduler
---

diff --git a/plugins/scheduler2/static/img/loading-7b6dc55620a355b55b835f6b4c300f9b.gif b/plugins/scheduler2/static/img/loading-7b6dc55620a355b55b835f6b4c300f9b.gif
new file mode 100755
index 00000000..0de4cb92
Binary files /dev/null and b/plugins/scheduler2/static/img/loading-7b6dc55620a355b55b835f6b4c300f9b.gif differ
diff --git a/plugins/scheduler2/static/js/scheduler-helpers.js b/plugins/scheduler2/static/js/scheduler-helpers.js
index 9a93d268..c7f45565 100755
--- a/plugins/scheduler2/static/js/scheduler-helpers.js
+++ b/plugins/scheduler2/static/js/scheduler-helpers.js
@@ -88,7 +88,6 @@ function schedulerGetSlotId(startTime, duration, granularity) {
 //
 //Find Resource By Id
 function schedulerFindResourceById(Resources, id) {
-
     for (var i = 0, len = Resources.length; i < len; i++) {
         if (Resources[i].id == id)
             return Resources[i]; // Return as soon as the object is found
diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index cf3742ba..cd84cd8b 100755
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -226,6 +226,9 @@ var tmpSchedulerLeases = [];
             //End init Slider
 
             //other stuff
+            $("#plugin-scheduler-loader").hide();
+            $("#plugin-scheduler").show();
+
             //fixOddEvenClasses();
             //$("#" + schedulerTblId + " td:not([class])").addClass("free");
             if (schedulerDebug) console.timeEnd("_initUI");
@@ -236,7 +239,7 @@ var tmpSchedulerLeases = [];
                 var tmpLea = tmpSchedulerLeases[i];
                 var tmpRes = schedulerFindResourceById(SchedulerData, tmpLea.resource);
                 if (tmpRes != null) {
-                    alert(tmpLea.id + '-' + tmpLea.start_time);
+                    //alert(tmpLea.id + '-' + tmpLea.start_time);
                     tmpRes.leases[tmpLea.id] = tmpLea;
                 }
             }
diff --git a/plugins/scheduler2/static/js/table-selector.js b/plugins/scheduler2/static/js/table-selector.js
index ec8c1321..275894a3 100755
--- a/plugins/scheduler2/static/js/table-selector.js
+++ b/plugins/scheduler2/static/js/table-selector.js
@@ -1,15 +1,14 @@
 ////version 3
-var dragStart_td = 0;
-var dragStart_tr = 0;
-var dragEnd_td = 0;
-var dragEnd_tr = 0;
+var scheduler_table_dragStart_td = 0;
+var scheduler_table_dragStart_tr = 0;
+var scheduler_table_dragEnd_td = 0;
+var scheduler_table_dragEnd_tr = 0;
 //tmp gia ta loops & check gia to last state
-var tmp_dragStart_td;
-var tmp_dragStart_tr;
-var tmp_dragEnd_td;
-var tmp_dragEnd_tr;
-var isDragging = false;
-var ctrlPressed = false;
+var tmp_scheduler_table_dragStart_td;
+var tmp_scheduler_table_dragStart_tr;
+var tmp_scheduler_table_dragEnd_td;
+var tmp_scheduler_table_dragEnd_tr;
+var schedulerTableIsDragging = false;
 // try stop 
 var continueExecuting = false;
 var isExecuting = false;
@@ -21,18 +20,18 @@ function rangeMouseDown(e) {
     if (schedulerIsRightClick(e)) {
         return false;
     } else {
-        dragStart_tr = $(this).parent().index();
-        dragStart_td = $(this).index();
-        dragEnd_tr = dragStart_tr;
-        dragEnd_td = dragStart_td;
-        //alert(dragStart_tr);
+        scheduler_table_dragStart_tr = $(this).parent().index();
+        scheduler_table_dragStart_td = $(this).index();
+        scheduler_table_dragEnd_tr = scheduler_table_dragStart_tr;
+        scheduler_table_dragEnd_td = scheduler_table_dragStart_td;
+        //alert(scheduler_table_dragStart_tr);
         //var allCells = $("#tblReservation td");
         //dragStart = allCells.index($(this));
 
         if ( $(this).hasClass("free"))
             $(this).addClass("selected_tmp");
 
-        isDragging = true;
+        schedulerTableIsDragging = true;
         //selectRange();
 
         if (typeof e.preventDefault != 'undefined') { e.preventDefault(); }
@@ -49,10 +48,10 @@ function rangeMouseUp(e) {
         //var allCells = $("#tblReservation td");
         //dragEnd = allCells.index($(this));
 
-        dragEnd_tr = $(this).parent().index();
-        dragEnd_td = $(this).index();
+        scheduler_table_dragEnd_tr = $(this).parent().index();
+        scheduler_table_dragEnd_td = $(this).index();
 
-        isDragging = false;
+        schedulerTableIsDragging = false;
         selectRange(false);
 
         document.documentElement.onselectstart = function () { return true; };
@@ -62,79 +61,79 @@ function rangeMouseUp(e) {
 
 function rangeMouseMove(e) {
     //if (Debug) console.time("mouse:rangeMouseMove");
-    if (isDragging) {
-        dragEnd_tr = $(this).parent().attr('data-trindex');
-        dragEnd_td = $(this).attr('data-tdindex');
+    if (schedulerTableIsDragging) {
+        scheduler_table_dragEnd_tr = $(this).parent().attr('data-trindex');
+        scheduler_table_dragEnd_td = $(this).attr('data-tdindex');
 
         //if (Debug) this.debug('foo');
 
-        if ((dragEnd_tr != tmp_dragEnd_tr) || (dragEnd_td != tmp_dragEnd_td)) {
-            //console.log(dragEnd_tr + " - " + tmp_dragEnd_tr);
-            //console.log(dragEnd_td + " - " + tmp_dragEnd_td);
+        if ((scheduler_table_dragEnd_tr != tmp_scheduler_table_dragEnd_tr) || (scheduler_table_dragEnd_td != tmp_scheduler_table_dragEnd_td)) {
+            //console.log(scheduler_table_dragEnd_tr + " - " + tmp_scheduler_table_dragEnd_tr);
+            //console.log(scheduler_table_dragEnd_td + " - " + tmp_scheduler_table_dragEnd_td);
             //selectRange(true);
         }
     }
     //if (Debug) console.timeEnd("mouse:rangeMouseMove");
 }
 
-function selectRange(IsTemp) {
+function selectRange(isTemp) {
     if (Debug) console.time("mouse:---selectRange");
 
-    if (!ctrlPressed)
+    if (!schedulerCtrlPressed)
         $("#" + rsvrTblNm + "  td:not([class='info'],[class='closed'])").removeClass('selected selected_tmp').addClass('free');
 
-    tmp_dragStart_td = dragStart_td;
-    tmp_dragStart_tr = dragStart_tr;
-    tmp_dragEnd_td = dragEnd_td;
-    tmp_dragEnd_tr = dragEnd_tr;
+    tmp_scheduler_table_dragStart_td = scheduler_table_dragStart_td;
+    tmp_scheduler_table_dragStart_tr = scheduler_table_dragStart_tr;
+    tmp_scheduler_table_dragEnd_td = scheduler_table_dragEnd_td;
+    tmp_scheduler_table_dragEnd_tr = scheduler_table_dragEnd_tr;
 
-    if (tmp_dragStart_td > tmp_dragEnd_td) {
-        var tmp = tmp_dragStart_td;
-        tmp_dragStart_td = tmp_dragEnd_td;
-        tmp_dragEnd_td = tmp;
+    if (tmp_scheduler_table_dragStart_td > tmp_scheduler_table_dragEnd_td) {
+        var tmp = tmp_scheduler_table_dragStart_td;
+        tmp_scheduler_table_dragStart_td = tmp_scheduler_table_dragEnd_td;
+        tmp_scheduler_table_dragEnd_td = tmp;
     }
 
-    if (tmp_dragStart_tr > tmp_dragEnd_tr) {
-        var tmp = tmp_dragStart_tr;
-        tmp_dragStart_tr = tmp_dragEnd_tr;
-        tmp_dragEnd_tr = tmp;
+    if (tmp_scheduler_table_dragStart_tr > tmp_scheduler_table_dragEnd_tr) {
+        var tmp = tmp_scheduler_table_dragStart_tr;
+        tmp_scheduler_table_dragStart_tr = tmp_scheduler_table_dragEnd_tr;
+        tmp_scheduler_table_dragEnd_tr = tmp;
     }
 
-    //alert("tmp_dragStart_td:" + tmp_dragStart_td + "\n tmp_dragStart_tr:" + tmp_dragStart_tr + "\n tmp_dragEnd_td:" + tmp_dragEnd_td + "\n tmp_dragEnd_tr:" + tmp_dragEnd_tr);
+    //alert("tmp_scheduler_table_dragStart_td:" + tmp_scheduler_table_dragStart_td + "\n tmp_scheduler_table_dragStart_tr:" + tmp_scheduler_table_dragStart_tr + "\n tmp_scheduler_table_dragEnd_td:" + tmp_scheduler_table_dragEnd_td + "\n tmp_scheduler_table_dragEnd_tr:" + tmp_scheduler_table_dragEnd_tr);
 
 
-    for (i = tmp_dragStart_tr; i <= tmp_dragEnd_tr; i++) {
-        for (j = tmp_dragStart_td; j <= tmp_dragEnd_td; j++) {
+    for (var i = tmp_scheduler_table_dragStart_tr; i <= tmp_scheduler_table_dragEnd_tr; i++) {
+        for (var j = tmp_scheduler_table_dragStart_td; j <= tmp_scheduler_table_dragEnd_td; j++) {
             //alert("i:" + i + "j:" + j);
             var cell = $('#' + rsvrTblNm + '  tbody tr:eq(' + i + ') td:eq(' + j + ')');
             //$(cell)
-            curClass = $(cell).attr("class");
+            var curClass = $(cell).attr("class");
             //alert(curClass);
             switch (curClass) {
                 case "free_tmp":
                     $(cell).removeClass();
-                    if (IsTemp)
+                    if (isTemp)
                         $(cell).addClass("free_tmp");
                     else
                         $(cell).addClass("free");
                     break;
                 case "free":
                     $(cell).removeClass();
-                    if (IsTemp)
+                    if (isTemp)
                         $(cell).addClass("selected_tmp");
                     else
                         $(cell).addClass("selected");
                     break;
                 case "selected_tmp":
                     $(cell).removeClass();
-                    if (IsTemp)
+                    if (isTemp)
                         $(cell).addClass("selected_tmp");
                     else
                         $(cell).addClass("selected");
                     break;
                 case "selected":
                     $(cell).removeClass();
-                    if (IsTemp)
+                    if (isTemp)
                         $(cell).addClass("free_tmp");
                     else
                         $(cell).addClass("free");
diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index 4e58fcd2..2b58229b 100755
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -1,4 +1,8 @@
-<div id="plugin-{{ domid }}" class="" ng-app="myApp">
+<div id="plugin-{{ domid }}-loader" style="text-align:center;">
+    <img src="../../static/img/loading-7b6dc55620a355b55b835f6b4c300f9b.gif" alt="loading" style="width:100px;" />
+    <h3>Loading Data...</h3>
+</div>
+<div id="plugin-{{ domid }}" class="" ng-app="myApp" style="display:none;">
     <div class="row m-b">
         <div class="col-md-1">
             <label for="inputEmail3" class="col-sm-2 control-label">Date</label>