SAK-41187 - Items added with start/due time of 12am do not display in…

… month view Removed an unused variable in the template
glennlevine · Jan 14, 2019 · 258363f · 258363f
1 parent 8ab9fe4
commit 258363f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/tool/CalendarAction.java b/calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/tool/CalendarAction.java
@@ -4138,7 +4138,7 @@ public MyMonth calMonth(int month, CalendarUtil m_calObj, CalendarActionState st
 					// Each monthObj contains dayObjs for the number of the days in the month.
 					dateObj.setTodayDate(m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),m_calObj.getYear());
 
-					startTime = TimeService.newTimeLocal(m_calObj.getYear(),m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),00,00,00,001);
+					startTime = TimeService.newTimeLocal(m_calObj.getYear(),m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),00,00,00,000);
 					endTime = TimeService.newTimeLocal(m_calObj.getYear(),m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),23,59,59,999);
 
 					eventList = CalendarEventVectorObj.getEvents(TimeService.newTimeRange(startTime,endTime,true,true));
@@ -4156,7 +4156,7 @@ else if (start == true)
 					// fill empty spaces for the first days in the first week in the month before reach the first day of the month
 					dateObj.setTodayDate(m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),m_calObj.getYear());
 
-					startTime = TimeService.newTimeLocal(m_calObj.getYear(),m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),00,00,00,001);
+					startTime = TimeService.newTimeLocal(m_calObj.getYear(),m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),00,00,00,000);
 					endTime = TimeService.newTimeLocal(m_calObj.getYear(),m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),23,59,59,999);
 
 					timeRange = TimeService.newTimeRange(startTime,endTime,true,true);
@@ -4185,7 +4185,7 @@ else if (start == true)
 						dateObj.setFlag(1);
 
 					dateObj.setTodayDate(m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),m_calObj.getYear());
-					startTime = TimeService.newTimeLocal(m_calObj.getYear(),m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),00,00,00,001);
+					startTime = TimeService.newTimeLocal(m_calObj.getYear(),m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),00,00,00,000);
 					endTime = TimeService.newTimeLocal(m_calObj.getYear(),m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),23,59,59,999);
 
 
@@ -4210,7 +4210,7 @@ else if (start == true)
 						m_calObj.nextDate();
 						dateObj.setTodayDate(m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),m_calObj.getYear());
 
-						startTime = TimeService.newTimeLocal(m_calObj.getYear(),m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),00,00,00,001);
+						startTime = TimeService.newTimeLocal(m_calObj.getYear(),m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),00,00,00,000);
 						endTime = TimeService.newTimeLocal(m_calObj.getYear(),m_calObj.getMonthInteger(),m_calObj.getDayOfMonth(),23,59,59,999);
 
 						timeRange = TimeService.newTimeRange(startTime,endTime,true,true);

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewMonth.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewMonth.vm
@@ -56,9 +56,8 @@
         <tr>          			
             #foreach($u in [0..6])                    
                 #set ($mu = $monthArray.getDay($xn,$u))		
+                #set($eventsn = $mu.getEvents())
                 #if ($mu.getFlag() == 1) ## today
-                    #set($eventsn = $mu.getEvents())   
-                    #set($eventsn = $eventsn1)
                     #set($flag = "false")
 
                     #foreach ($m in $eventsn)                       
@@ -71,12 +70,9 @@
                     #end
 
                 #elseif ($mu.getFlag() == 0)  ## days dropping out of the current month
-                    #set ($eventsn = $mu.getEvents())
                     <td align="right"  valign= "top" bgcolor="#cccccc" height="51"  class="borderGrayMonth">
 
                 #else ## days in the current month, but not today
-                    #set ($eventsn = $mu.getEvents())   
-                    #set($eventsn = $eventsn1)
                     #set($flag = "false")
 
                     #foreach ($m in $eventsn)