X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fscheduler2%2Fstatic%2Fjs%2Fscheduler2.js;h=6b55b92afd4cf67fa1ab8a401aa2192fa7eb3462;hb=cb3a40dfdc1c79ca57458d1c18732334d58734fd;hp=56d439924eec49b5750be4f52a8c6389988db76b;hpb=ebf8430d850f17659c922d84e94d234aa7391bac;p=unfold.git

diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index 56d43992..6b55b92a 100755
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -739,53 +739,53 @@ var SCHEDULER_COLWIDTH = 50;
                     /* Limit the display to the current day */
                     id_end = this._all_slots.length / colspan_lease
                 }
+                lease_status = manifold.query_store.get_record_state(this.options.query_lease_uuid, lease_key, STATE_SET);
+                // the same slots might be affected multiple times.
+                // PENDING_IN + PENDING_OUT => IN 
+                //
+                // RESERVED vs SELECTED !
+                //
+                // PENDING !!
+                switch(lease_status) {
+                    case STATE_SET_IN:
+                        lease_class = 'selected'; // my leases
+                        lease_success = '';
+                        break;
+                    case STATE_SET_IN_SUCCESS:
+                        lease_class = 'selected'; // my leases
+                        lease_success = 'success';
+                    case STATE_SET_OUT_FAILURE:
+                        lease_class = 'selected'; // my leases
+                        lease_success = 'failure';
+                        break;
+                    case STATE_SET_OUT:
+                        lease_class = 'reserved'; // other leases
+                        lease_success = '';
+                        break;
+                    case STATE_SET_OUT_SUCCESS:
+                        lease_class = 'free'; // other leases
+                        lease_success = 'success';
+                        break;
+                    case STATE_SET_IN_FAILURE:
+                        lease_class = 'free'; // other leases
+                        lease_success = 'failure';
+                        break;
+                    case STATE_SET_IN_PENDING:
+                        lease_class = 'pendingin';
+                        lease_success = '';
+                        break;
+                    case STATE_SET_OUT_PENDING:
+                        // pending_in & pending_out == IN == replacement
+                        if (resource.leases[i].status == 'pendingin')
+                            lease_class = 'pendingin'
+                        else
+                            lease_class = 'pendingout';
+                        lease_success = '';
+                        break;
+                
+                }
 
                 for (i = id_start; i < id_end; i++) {
-                    // the same slots might be affected multiple times.
-                    // PENDING_IN + PENDING_OUT => IN 
-                    //
-                    // RESERVED vs SELECTED !
-                    //
-                    // PENDING !!
-                    lease_status = manifold.query_store.get_record_state(this.options.query_lease_uuid, lease_key, STATE_SET);
-                    switch(lease_status) {
-                        case STATE_SET_IN:
-                            lease_class = 'selected'; // my leases
-                            lease_success = '';
-                            break;
-                        case STATE_SET_IN_SUCCESS:
-                            lease_class = 'selected'; // my leases
-                            lease_success = 'success';
-                        case STATE_SET_OUT_FAILURE:
-                            lease_class = 'selected'; // my leases
-                            lease_success = 'failure';
-                            break;
-                        case STATE_SET_OUT:
-                            lease_class = 'reserved'; // other leases
-                            lease_success = '';
-                            break;
-                        case STATE_SET_OUT_SUCCESS:
-                            lease_class = 'free'; // other leases
-                            lease_success = 'success';
-                            break;
-                        case STATE_SET_IN_FAILURE:
-                            lease_class = 'free'; // other leases
-                            lease_success = 'failure';
-                            break;
-                        case STATE_SET_IN_PENDING:
-                            lease_class = 'pendingin';
-                            lease_success = '';
-                            break;
-                        case STATE_SET_OUT_PENDING:
-                            // pending_in & pending_out == IN == replacement
-                            if (resource.leases[i].status == 'pendingin')
-                                lease_class = 'pendingin'
-                            else
-                                lease_class = 'pendingout';
-                            lease_success = '';
-                            break;
-                    
-                    }
                     resource.leases[i].status = lease_class;
                     resource.leases[i].success = lease_success;
                 }
@@ -815,6 +815,7 @@ var SCHEDULER_COLWIDTH = 50;
                 var num_hidden_cells;
 
                 $("#DateToRes").datepicker({
+                	dateFormat: "D, d M yy",
                     onRender: function(date) {
                         return date.valueOf() < now.valueOf() ? 'disabled' : '';
                     }