Skip to content

Commit

Permalink
Merge pull request #39 from 4teamwork/merge-some-fixes
Browse files Browse the repository at this point in the history 
Some misc. changes/fixes.
  • Loading branch information
Denis Krienbühl committed Oct 28, 2013
2 parents 6ddde4d + c15e6de commit 83ece91
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 68 deletions.
117 changes: 58 additions & 59 deletions seantis/reservation/js/jquery.timetable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,61 +72,60 @@ if (!this.seantis.tablecache) this.seantis.tablecache = {};
} else {
table = seantis.tablecache[key].clone();
}

this.$.append(table);
};

Plugin.prototype.parse_time = function(time) {
var split = time.split(':');
if (!split.length == 2) {
console.log('unable to parse ' + time);
return undefined;
return undefined;
}

return {
hour: parseInt(split[0], 10),
hour: parseInt(split[0], 10),
minute: parseInt(split[1], 10)
};
};

// Parses the given timestrings and bounds them to the min / max hour
Plugin.prototype.normalize_range = function(_start, _end) {
var start = this.parse_time(_start);
var end = this.parse_time(_end);

if (start.hour < this.options.min_hour)
start = {hour: this.options.min_hour, minute: 0};
if (end.hour > this.options.max_hour)
end = {hour: this.options.max_hour + 1, minute: 0};
return {"start":start, "end":end};

return {"start":start, "end":end};
};

// Goes through the min / max timerange and returns an item
// for each cell that should be drawn in the table.

// Each item offers the following properties:
// * left distance from start of the cell in %
// * right distance from end of the cell in %
// * span number of cells the item spans
// * state occupied / free
// * text text of the occupied cell containing the start / end time
Plugin.prototype.merged_divisions = function(_start, _end) {

var range = this.normalize_range(_start, _end);
var start = range.start;
var end = range.end;

var result = new Array();

for (var hour=this.options.min_hour; hour <= this.options.max_hour; hour++) {

// outside of start & end are the free cells
if (hour < start.hour || end.hour < hour) {
result.push({left: 0, right: 0, span: 1, state:'free', text:''});
continue;
}

// one single occupied cell
if (hour == start.hour && hour == end.hour) {
result.push({
Expand All @@ -136,7 +135,7 @@ if (!this.seantis.tablecache) this.seantis.tablecache = {};
state: 'occupied',
text: _start + ' - ' + _end
});
continue;
continue;
}

// a item which will span multiple cells
Expand All @@ -147,44 +146,44 @@ if (!this.seantis.tablecache) this.seantis.tablecache = {};
span: 1,
state: 'occupied',
text: _start + ' - ' + _end
});
});
continue;
}

var previous = result[result.length - 1];

// increment span of most recent item
if (start.hour < hour && hour < end.hour) {
previous.span += 1;

continue;
continue;
}

// close last item
if (hour == end.hour) {

// if the hour ends on zero the last cell is free
if (end.minute === 0) {
if (end.minute === 0) {
result.push({
left: 0, right: 0, state: 'free', span: 1
left: 0, right: 0, state: 'free', span: 1
});
} else {
previous.right = ((60 - end.minute) / 60) * 100;
previous.span += 1;
}

previous.left = (previous.left / (previous.span * 100)) * 100;
previous.right = (previous.right / (previous.span * 100)) * 100;

continue;
}
}
return result;
}

return result;
};

Plugin.prototype.render = function() {

var table = $('<table />').addClass('timetable hidden');
var colcount = (this.options.max_hour - this.options.min_hour + 1);
var hwidth = 100 / colcount;
Expand All @@ -193,73 +192,73 @@ if (!this.seantis.tablecache) this.seantis.tablecache = {};
if (this.options.show_header) {
var thead = $('<thead />');
var th_row = $('<tr />');

thead.appendTo(table);
th_row.appendTo(thead);

for (var h=this.options.min_hour; h <= this.options.max_hour; h++) {
var hour = this.pad(h, 2) + ':00';
th_row.append($('<th />').width(hwidth + '%').text(hour));
}

}

// render the table
var tbody = $('<tbody />');
tbody.appendTo(table);

// empoty rows are added between the timespans for easier styling
var add_empty_row = function() {
var empty_row = $('<tr />').addClass('empty_row');
for (var i=0; i<colcount; i++) {
empty_row.append($('<td />').width(hwidth + '%'));
empty_row.append($('<td />').width(hwidth + '%'));
}
tbody.append(empty_row);
};
if (this.options.timespans.length > 0)

if (this.options.timespans.length > 0)
add_empty_row();

// render a row for each timespan
var plugin = this;
$.each(this.options.timespans, function(index, timerow) {

var row = $('<tr />');

// add the columns
$.each(plugin.merged_divisions(timerow.start, timerow.end), function(index, cell) {

// ie 9+ does not understand colspan if added dynamically, only colSpan
var td = $('<td />').attr('colSpan', cell.span);
td.appendTo(row);

var wrapper = $('<div />').addClass('timespan');
wrapper.appendTo(td);

var left = cell.left + '%';
var middle = (100 - cell.left - cell.right) + '%';
var right = cell.right + '%';
var right = cell.right + '%';

var occupied = $('<div />').addClass(cell.state).width(middle).css({
"margin-left": left,
"margin-right": right
});

if (plugin.options.show_text && cell.text) {
occupied.append($('<span />').text(cell.text));
occupied.append($('<span />').text(cell.text));
}
wrapper.append(occupied);

wrapper.append(occupied);
});

tbody.append(row);

add_empty_row();
});
});

return table;
};

// Pads the given number
Plugin.prototype.pad = function(number, length) {
var str = '' + number;
Expand Down Expand Up @@ -300,19 +299,19 @@ if (!this.seantis.tablecache) this.seantis.tablecache = {};
// creating the tables is quite fast thanks to caching
$.each($('.timetable'), function(ix, el) {
setTimeout(function() {
$(el).removeClass('hidden');
$(el).removeClass('hidden');
}, 0);
});

}
};

// initialize each timetable with a timeout wrapper
// initialize each timetable with a timeout wrapper
// which makes it a bit slower but ensures that the browser
// is not completely blocked if a large number of elements
// need to be created
wrappers.each(function(ix, el) {
setTimeout(function() { init_timetable(ix, el); }, 0);
});
});
})(jQuery);
})(jQuery);
2 changes: 0 additions & 2 deletions seantis/reservation/js/locale.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ seantis.locale = function(text) {

var lang = locale.language();
if (typeof locale.dictionary[text] === 'undefined') {
console.log(text + ' is untranslated');
return text;
}

var ix = locale.ix(lang);
if (ix < 0) {
console.log('language ' + lang + ' is not supported');
return text;
}

Expand Down
2 changes: 1 addition & 1 deletion seantis/reservation/js/report.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,4 +233,4 @@
init_reservations(report);

});
})(jQuery);
})(jQuery);
8 changes: 4 additions & 4 deletions seantis/reservation/tests/test_session.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ def test_sessionstore(self):
t1.join()
t2.join()

self.assertFalse(t1.serial_id == None)
self.assertFalse(t2.serial_id == None)
self.assertFalse(t1.serial_id == t2.serial_id)
self.assertFalse(t1.readonly_id == t2.readonly_id)
self.assertIsNotNone(t1.serial_id)
self.assertIsNotNone(t2.serial_id)
self.assertNotEqual(t1.serial_id, t2.serial_id)
self.assertNotEqual(t1.readonly_id, t2.readonly_id)

def test_readonly_protection(self):
add_something()
Expand Down
7 changes: 5 additions & 2 deletions seantis/reservation/utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

from seantis.reservation import error
from seantis.reservation import _
from Products.CMFPlone.utils import safe_unicode


try:
Expand Down Expand Up @@ -563,14 +564,16 @@ def get_resource_by_uuid(uuid,


def get_resource_title(resource):
resource_title = safe_unicode(resource.title)
if hasattr(resource, '__parent__'):
parent = resource.__parent__.title
elif hasattr(resource, 'parent'):
parent = resource.parent().title
else:
return resource.title
return resource_title

return ' - '.join((parent, resource.title))
parent = safe_unicode(parent)
return u' - '.join((parent, resource_title))


def get_reservation_quota_statement(quota):
Expand Down

0 comments on commit 83ece91

Please sign in to comment.