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 (executable)
index 0000000..0de4cb9
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 9a93d26..c7f4556 100755 (executable)
--- 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) {
 //\r
 //Find Resource By Id\r
 function schedulerFindResourceById(Resources, id) {\r
-\r
     for (var i = 0, len = Resources.length; i < len; i++) {\r
         if (Resources[i].id == id)\r
             return Resources[i]; // Return as soon as the object is found\r

diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index cf3742b..cd84cd8 100755 (executable)
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -226,6 +226,9 @@ var tmpSchedulerLeases = [];
             //End init Slider\r
 \r
             //other stuff\r
+            $("#plugin-scheduler-loader").hide();\r
+            $("#plugin-scheduler").show();\r
+\r
             //fixOddEvenClasses();\r
             //$("#" + schedulerTblId + " td:not([class])").addClass("free");\r
             if (schedulerDebug) console.timeEnd("_initUI");\r
@@ -236,7 +239,7 @@ var tmpSchedulerLeases = [];
                 var tmpLea = tmpSchedulerLeases[i];\r
                 var tmpRes = schedulerFindResourceById(SchedulerData, tmpLea.resource);\r
                 if (tmpRes != null) {\r
-                    alert(tmpLea.id + '-' + tmpLea.start_time);\r
+                    //alert(tmpLea.id + '-' + tmpLea.start_time);\r
                     tmpRes.leases[tmpLea.id] = tmpLea;\r
                 }\r
             }\r

diff --git a/plugins/scheduler2/static/js/table-selector.js b/plugins/scheduler2/static/js/table-selector.js
index ec8c132..275894a 100755 (executable)
--- a/plugins/scheduler2/static/js/table-selector.js
+++ b/plugins/scheduler2/static/js/table-selector.js
@@ -1,15 +1,14 @@
 ////version 3\r
-var dragStart_td = 0;\r
-var dragStart_tr = 0;\r
-var dragEnd_td = 0;\r
-var dragEnd_tr = 0;\r
+var scheduler_table_dragStart_td = 0;\r
+var scheduler_table_dragStart_tr = 0;\r
+var scheduler_table_dragEnd_td = 0;\r
+var scheduler_table_dragEnd_tr = 0;\r
 //tmp gia ta loops & check gia to last state\r
-var tmp_dragStart_td;\r
-var tmp_dragStart_tr;\r
-var tmp_dragEnd_td;\r
-var tmp_dragEnd_tr;\r
-var isDragging = false;\r
-var ctrlPressed = false;\r
+var tmp_scheduler_table_dragStart_td;\r
+var tmp_scheduler_table_dragStart_tr;\r
+var tmp_scheduler_table_dragEnd_td;\r
+var tmp_scheduler_table_dragEnd_tr;\r
+var schedulerTableIsDragging = false;\r
 // try stop \r
 var continueExecuting = false;\r
 var isExecuting = false;\r
@@ -21,18 +20,18 @@ function rangeMouseDown(e) {
     if (schedulerIsRightClick(e)) {\r
         return false;\r
     } else {\r
-        dragStart_tr = $(this).parent().index();\r
-        dragStart_td = $(this).index();\r
-        dragEnd_tr = dragStart_tr;\r
-        dragEnd_td = dragStart_td;\r
-        //alert(dragStart_tr);\r
+        scheduler_table_dragStart_tr = $(this).parent().index();\r
+        scheduler_table_dragStart_td = $(this).index();\r
+        scheduler_table_dragEnd_tr = scheduler_table_dragStart_tr;\r
+        scheduler_table_dragEnd_td = scheduler_table_dragStart_td;\r
+        //alert(scheduler_table_dragStart_tr);\r
         //var allCells = $("#tblReservation td");\r
         //dragStart = allCells.index($(this));\r
 \r
         if ( $(this).hasClass("free"))\r
             $(this).addClass("selected_tmp");\r
 \r
-        isDragging = true;\r
+        schedulerTableIsDragging = true;\r
         //selectRange();\r
 \r
         if (typeof e.preventDefault != 'undefined') { e.preventDefault(); }\r
@@ -49,10 +48,10 @@ function rangeMouseUp(e) {
         //var allCells = $("#tblReservation td");\r
         //dragEnd = allCells.index($(this));\r
 \r
-        dragEnd_tr = $(this).parent().index();\r
-        dragEnd_td = $(this).index();\r
+        scheduler_table_dragEnd_tr = $(this).parent().index();\r
+        scheduler_table_dragEnd_td = $(this).index();\r
 \r
-        isDragging = false;\r
+        schedulerTableIsDragging = false;\r
         selectRange(false);\r
 \r
         document.documentElement.onselectstart = function () { return true; };\r
@@ -62,79 +61,79 @@ function rangeMouseUp(e) {
 \r
 function rangeMouseMove(e) {\r
     //if (Debug) console.time("mouse:rangeMouseMove");\r
-    if (isDragging) {\r
-        dragEnd_tr = $(this).parent().attr('data-trindex');\r
-        dragEnd_td = $(this).attr('data-tdindex');\r
+    if (schedulerTableIsDragging) {\r
+        scheduler_table_dragEnd_tr = $(this).parent().attr('data-trindex');\r
+        scheduler_table_dragEnd_td = $(this).attr('data-tdindex');\r
 \r
         //if (Debug) this.debug('foo');\r
 \r
-        if ((dragEnd_tr != tmp_dragEnd_tr) || (dragEnd_td != tmp_dragEnd_td)) {\r
-            //console.log(dragEnd_tr + " - " + tmp_dragEnd_tr);\r
-            //console.log(dragEnd_td + " - " + tmp_dragEnd_td);\r
+        if ((scheduler_table_dragEnd_tr != tmp_scheduler_table_dragEnd_tr) || (scheduler_table_dragEnd_td != tmp_scheduler_table_dragEnd_td)) {\r
+            //console.log(scheduler_table_dragEnd_tr + " - " + tmp_scheduler_table_dragEnd_tr);\r
+            //console.log(scheduler_table_dragEnd_td + " - " + tmp_scheduler_table_dragEnd_td);\r
             //selectRange(true);\r
         }\r
     }\r
     //if (Debug) console.timeEnd("mouse:rangeMouseMove");\r
 }\r
 \r
-function selectRange(IsTemp) {\r
+function selectRange(isTemp) {\r
     if (Debug) console.time("mouse:---selectRange");\r
 \r
-    if (!ctrlPressed)\r
+    if (!schedulerCtrlPressed)\r
         $("#" + rsvrTblNm + "  td:not([class='info'],[class='closed'])").removeClass('selected selected_tmp').addClass('free');\r
 \r
-    tmp_dragStart_td = dragStart_td;\r
-    tmp_dragStart_tr = dragStart_tr;\r
-    tmp_dragEnd_td = dragEnd_td;\r
-    tmp_dragEnd_tr = dragEnd_tr;\r
+    tmp_scheduler_table_dragStart_td = scheduler_table_dragStart_td;\r
+    tmp_scheduler_table_dragStart_tr = scheduler_table_dragStart_tr;\r
+    tmp_scheduler_table_dragEnd_td = scheduler_table_dragEnd_td;\r
+    tmp_scheduler_table_dragEnd_tr = scheduler_table_dragEnd_tr;\r
 \r
-    if (tmp_dragStart_td > tmp_dragEnd_td) {\r
-        var tmp = tmp_dragStart_td;\r
-        tmp_dragStart_td = tmp_dragEnd_td;\r
-        tmp_dragEnd_td = tmp;\r
+    if (tmp_scheduler_table_dragStart_td > tmp_scheduler_table_dragEnd_td) {\r
+        var tmp = tmp_scheduler_table_dragStart_td;\r
+        tmp_scheduler_table_dragStart_td = tmp_scheduler_table_dragEnd_td;\r
+        tmp_scheduler_table_dragEnd_td = tmp;\r
     }\r
 \r
-    if (tmp_dragStart_tr > tmp_dragEnd_tr) {\r
-        var tmp = tmp_dragStart_tr;\r
-        tmp_dragStart_tr = tmp_dragEnd_tr;\r
-        tmp_dragEnd_tr = tmp;\r
+    if (tmp_scheduler_table_dragStart_tr > tmp_scheduler_table_dragEnd_tr) {\r
+        var tmp = tmp_scheduler_table_dragStart_tr;\r
+        tmp_scheduler_table_dragStart_tr = tmp_scheduler_table_dragEnd_tr;\r
+        tmp_scheduler_table_dragEnd_tr = tmp;\r
     }\r
 \r
-    //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);\r
+    //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);\r
 \r
 \r
-    for (i = tmp_dragStart_tr; i <= tmp_dragEnd_tr; i++) {\r
-        for (j = tmp_dragStart_td; j <= tmp_dragEnd_td; j++) {\r
+    for (var i = tmp_scheduler_table_dragStart_tr; i <= tmp_scheduler_table_dragEnd_tr; i++) {\r
+        for (var j = tmp_scheduler_table_dragStart_td; j <= tmp_scheduler_table_dragEnd_td; j++) {\r
             //alert("i:" + i + "j:" + j);\r
             var cell = $('#' + rsvrTblNm + '  tbody tr:eq(' + i + ') td:eq(' + j + ')');\r
             //$(cell)\r
-            curClass = $(cell).attr("class");\r
+            var curClass = $(cell).attr("class");\r
             //alert(curClass);\r
             switch (curClass) {\r
                 case "free_tmp":\r
                     $(cell).removeClass();\r
-                    if (IsTemp)\r
+                    if (isTemp)\r
                         $(cell).addClass("free_tmp");\r
                     else\r
                         $(cell).addClass("free");\r
                     break;\r
                 case "free":\r
                     $(cell).removeClass();\r
-                    if (IsTemp)\r
+                    if (isTemp)\r
                         $(cell).addClass("selected_tmp");\r
                     else\r
                         $(cell).addClass("selected");\r
                     break;\r
                 case "selected_tmp":\r
                     $(cell).removeClass();\r
-                    if (IsTemp)\r
+                    if (isTemp)\r
                         $(cell).addClass("selected_tmp");\r
                     else\r
                         $(cell).addClass("selected");\r
                     break;\r
                 case "selected":\r
                     $(cell).removeClass();\r
-                    if (IsTemp)\r
+                    if (isTemp)\r
                         $(cell).addClass("free_tmp");\r
                     else\r
                         $(cell).addClass("free");\r

diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index 4e58fcd..2b58229 100755 (executable)
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -1,4 +1,8 @@
-<div id="plugin-{{ domid }}" class="" ng-app="myApp">\r
+<div id="plugin-{{ domid }}-loader" style="text-align:center;">\r
+    <img src="../../static/img/loading-7b6dc55620a355b55b835f6b4c300f9b.gif" alt="loading" style="width:100px;" />\r
+    <h3>Loading Data...</h3>\r
+</div>\r
+<div id="plugin-{{ domid }}" class="" ng-app="myApp" style="display:none;">\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