diff --git a/src/services/calendarHelper.js b/src/services/calendarHelper.js index 93803440..d84fa2d0 100644 --- a/src/services/calendarHelper.js +++ b/src/services/calendarHelper.js @@ -314,7 +314,7 @@ angular var dayViewStartM = moment(dayViewStart || '00:00', 'HH:mm'); var dayViewEndM = moment(dayViewEnd || '23:59', 'HH:mm'); var hourHeight = (60 / dayViewSplit) * 30; - return ((dayViewEndM.diff(dayViewStartM, 'hours') + 1) * hourHeight) + 2; + return ((dayViewEndM.diff(dayViewStartM, 'minutes') / 60) * hourHeight) + 3; } function loadTemplates() { diff --git a/test/unit/services/calendarHelper.spec.js b/test/unit/services/calendarHelper.spec.js index 362897e6..a5289fc4 100644 --- a/test/unit/services/calendarHelper.spec.js +++ b/test/unit/services/calendarHelper.spec.js @@ -586,15 +586,17 @@ describe('calendarHelper', function() { }); describe('getDayViewHeight', function() { - var dayViewHeight; - beforeEach(function() { - dayViewHeight = calendarHelper.getDayViewHeight('01:00', '22:59', 10); + it('should calculate the height of the day view', function() { + var dayViewHeight = calendarHelper.getDayViewHeight('01:00', '22:59', 10); + expect(dayViewHeight).to.equal(3960); }); - it('should calculate the height of the day view', function() { - expect(dayViewHeight).to.equal(3962); + it('should support partial hours', function() { + var dayViewHeight = calendarHelper.getDayViewHeight('01:00', '22:29', 10); + expect(dayViewHeight).to.equal(3870); }); + }); describe('getWeekViewWithTimes', function() {