SAK-41194 - Calendar: Week view not displaying calendar table correctly (sakaiproject#6497)

Looks like my logic was incorrect, tested on a lot more calendar events

Author: jonespm

calendar/calendar-tool/tool/src/webapp/velocity.properties

@@ -79,11 +79,16 @@ classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.Cl
 velocimacro.library = VM_chef_library.vm
 
 ###velocimacro.permissions.allow.inline = true
-###velocimacro.permissions.allow.inline.to.replace.global = false
 ###velocimacro.permissions.allow.inline.local.scope = false
 
 ###velocimacro.context.localscope = false
 
+## Set these 3 values to allow inline macro changes (to help debug)
+
+#velocimacro.library.autoreload=true
+#file.resource.loader.cache=false
+#velocimacro.permissions.allow.inline.to.replace.global=true
+
 #----------------------------------------------------------------------------
 # INTERPOLATION
 #----------------------------------------------------------------------------

calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewWeek.vm

@@ -337,8 +337,6 @@
 	#end
 
     #set ($du = $endTime.getTime().intValue() - $startTime.getTime().intValue())
-    ## The Real non-fudged endtime
-    #set ($dureal = $endTime.getTime().intValue() - $startTime.getTime().intValue())
     #set($dhour = $helper.getduration($du.longValue(),3600000))
     #set($dminute = $helper.getFractionIn($du.longValue(),$dhour))
 
@@ -372,7 +370,7 @@
     	#set ($rowspan = $rowspan + 1)
     #end
     ## This endtime may have been fudged, if so it will need an extra row as it's being returned from getNewEvents
-    #if ($endTime != $endTimeActual)
+    #if ($endTime == $endTimeActual)
     	#set ($rowspan = $rowspan + 1)
     #end