many cosmetic changes

[unfold.git] / plugins / scheduler2 / static / js / scheduler2.js

diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index 9890251..6b55b92 100755 (executable)
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -234,13 +234,13 @@ var SCHEDULER_COLWIDTH = 50;
         {\r
             var data, resource_granularity;\r
 \r
-            resource_granularity = model_resource.granularity === undefined ? RESOURCE_DEFAULT_GRANULARITY : model_resource.granularity;\r
+            //resource_granularity = model_resource.granularity === undefined ? RESOURCE_DEFAULT_GRANULARITY : model_resource.granularity;\r
 \r
             console.log("Selected", index, model_lease, model_resource);\r
 \r
             var day_timestamp = SchedulerDateSelected.getTime() / 1000;\r
-            var start_time = day_timestamp + index       * resource_granularity;\r
-            var end_time   = day_timestamp + (index + 1) * resource_granularity;\r
+            var start_time = day_timestamp + index       * model_resource.granularity; // XXX resource_granularity\r
+            var end_time   = day_timestamp + (index + 1) * model_resource.granularity; //\r
             var start_date = new Date(start_time * 1000);\r
             var end_date   = new Date(end_time   * 1000);\r
 \r
@@ -578,7 +578,9 @@ var SCHEDULER_COLWIDTH = 50;
                     var resource = jQuery.extend(true, {}, record);\r
 \r
                     // Fix granularity\r
-                    resource_granularity = ((resource.granularity === undefined) || (typeof(resource.granularity) != "number")) ? RESOURCE_DEFAULT_GRANULARITY : resource.granularity;\r
+                    //resource_granularity = ((resource.granularity === undefined) || (typeof(resource.granularity) != "number")) ? RESOURCE_DEFAULT_GRANULARITY : resource.granularity;\r
+                    if (typeof(resource.granularity) != "number")\r
+                        resource.granularity = RESOURCE_DEFAULT_GRANULARITY;\r
                     resource.leases = []; // a list of occupied timeslots\r
 \r
                     self.scope_resources_by_key[resource['urn']] = resource;\r
@@ -737,53 +739,53 @@ var SCHEDULER_COLWIDTH = 50;
                     /* Limit the display to the current day */\r
                     id_end = this._all_slots.length / colspan_lease\r
                 }\r
+                lease_status = manifold.query_store.get_record_state(this.options.query_lease_uuid, lease_key, STATE_SET);\r
+                // the same slots might be affected multiple times.\r
+                // PENDING_IN + PENDING_OUT => IN \r
+                //\r
+                // RESERVED vs SELECTED !\r
+                //\r
+                // PENDING !!\r
+                switch(lease_status) {\r
+                    case STATE_SET_IN:\r
+                        lease_class = 'selected'; // my leases\r
+                        lease_success = '';\r
+                        break;\r
+                    case STATE_SET_IN_SUCCESS:\r
+                        lease_class = 'selected'; // my leases\r
+                        lease_success = 'success';\r
+                    case STATE_SET_OUT_FAILURE:\r
+                        lease_class = 'selected'; // my leases\r
+                        lease_success = 'failure';\r
+                        break;\r
+                    case STATE_SET_OUT:\r
+                        lease_class = 'reserved'; // other leases\r
+                        lease_success = '';\r
+                        break;\r
+                    case STATE_SET_OUT_SUCCESS:\r
+                        lease_class = 'free'; // other leases\r
+                        lease_success = 'success';\r
+                        break;\r
+                    case STATE_SET_IN_FAILURE:\r
+                        lease_class = 'free'; // other leases\r
+                        lease_success = 'failure';\r
+                        break;\r
+                    case STATE_SET_IN_PENDING:\r
+                        lease_class = 'pendingin';\r
+                        lease_success = '';\r
+                        break;\r
+                    case STATE_SET_OUT_PENDING:\r
+                        // pending_in & pending_out == IN == replacement\r
+                        if (resource.leases[i].status == 'pendingin')\r
+                            lease_class = 'pendingin'\r
+                        else\r
+                            lease_class = 'pendingout';\r
+                        lease_success = '';\r
+                        break;\r
+                \r
+                }\r
 \r
                 for (i = id_start; i < id_end; i++) {\r
-                    // the same slots might be affected multiple times.\r
-                    // PENDING_IN + PENDING_OUT => IN \r
-                    //\r
-                    // RESERVED vs SELECTED !\r
-                    //\r
-                    // PENDING !!\r
-                    lease_status = manifold.query_store.get_record_state(this.options.query_lease_uuid, lease_key, STATE_SET);\r
-                    switch(lease_status) {\r
-                        case STATE_SET_IN:\r
-                            lease_class = 'selected'; // my leases\r
-                            lease_success = '';\r
-                            break;\r
-                        case STATE_SET_IN_SUCCESS:\r
-                            lease_class = 'selected'; // my leases\r
-                            lease_success = 'success';\r
-                        case STATE_SET_OUT_FAILURE:\r
-                            lease_class = 'selected'; // my leases\r
-                            lease_success = 'failure';\r
-                            break;\r
-                        case STATE_SET_OUT:\r
-                            lease_class = 'reserved'; // other leases\r
-                            lease_success = '';\r
-                            break;\r
-                        case STATE_SET_OUT_SUCCESS:\r
-                            lease_class = 'free'; // other leases\r
-                            lease_success = 'success';\r
-                            break;\r
-                        case STATE_SET_IN_FAILURE:\r
-                            lease_class = 'free'; // other leases\r
-                            lease_success = 'failure';\r
-                            break;\r
-                        case STATE_SET_IN_PENDING:\r
-                            lease_class = 'pendingin';\r
-                            lease_success = '';\r
-                            break;\r
-                        case STATE_SET_OUT_PENDING:\r
-                            // pending_in & pending_out == IN == replacement\r
-                            if (resource.leases[i].status == 'pendingin')\r
-                                lease_class = 'pendingin'\r
-                            else\r
-                                lease_class = 'pendingout';\r
-                            lease_success = '';\r
-                            break;\r
-                    \r
-                    }\r
                     resource.leases[i].status = lease_class;\r
                     resource.leases[i].success = lease_success;\r
                 }\r
@@ -813,6 +815,7 @@ var SCHEDULER_COLWIDTH = 50;
                 var num_hidden_cells;\r
 \r
                 $("#DateToRes").datepicker({\r
+                       dateFormat: "D, d M yy",\r
                     onRender: function(date) {\r
                         return date.valueOf() < now.valueOf() ? 'disabled' : '';\r
                     }\r