\r
$scope.select = function(index, model_lease, model_resource)\r
{\r
- var data;\r
+ var data, resource_granularity;\r
+\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 * model_resource.granularity;\r
- var end_time = day_timestamp + (index + 1) * model_resource.granularity;\r
+ var start_time = day_timestamp + index * resource_granularity;\r
+ var end_time = day_timestamp + (index + 1) * resource_granularity;\r
var start_date = new Date(start_time * 1000);\r
var end_date = new Date(end_time * 1000);\r
\r
var resource = jQuery.extend(true, {}, record);\r
\r
// Fix granularity\r
- resource.granularity = typeof(resource.granularity) == "number" ? resource.granularity : RESOURCE_DEFAULT_GRANULARITY;\r
+ resource_granularity = ((resource.granularity === undefined) || (typeof(resource.granularity) != "number")) ? RESOURCE_DEFAULT_GRANULARITY : resource.granularity;\r
resource.leases = []; // a list of occupied timeslots\r
\r
self.scope_resources_by_key[resource['urn']] = resource;\r
init_cell = (new Date().getHours() - 1) * 3600 / self._granularity;\r
if (init_cell > num_hidden_cells)\r
init_cell = num_hidden_cells;\r
- \r
+\r
$('#tblSlider').slider({\r
min: 0,\r
max: num_hidden_cells,\r