SAK-41193 - Earliest time is displayed as 0 AM in weekly and daily vi…

…ew (sakaiproject#6545)
bot2012 · Feb 12, 2019 · d6d601f · d6d601f
1 parent 026ff10
commit d6d601f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewDay.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewDay.vm
@@ -96,7 +96,7 @@
         <th width="5%" rowspan="2" align="right" bgcolor="#eeeeee" class="borderWhite" nowrap="nowrap" scope="row">
         #foreach ($format in $timeFormat)
             #if ($format == "h")
-                #if ($timer == 0 && $temp2 == 12) #set($timer=12) #end
+                #if ($timer == 0) #set($timer=12) #end
                 $timer
             #elseif ($format == "a")
                 #if ($temp2 >= 12) $pmString

diff --git a/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewWeek.vm b/calendar/calendar-tool/tool/src/webapp/vm/calendar/chef_calendar_viewWeek.vm
@@ -501,7 +501,7 @@
                 <th align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite" scope="row">
                 #foreach ($format in $timeFormat)
                     #if ($format == "h")
-                        #if ($timer == 0 && $temp2 == 12) #set($timer=12) #end
+                        #if ($timer == 0) #set($timer=12) #end
                         $timer
                     #elseif ($format == "a")
                         #if ($temp2 >= 12) $pmString
@@ -821,7 +821,7 @@
                 <th align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite" scope="row">
                 #foreach ($format in $timeFormat)
                     #if ($format == "h")
-                        #if ($timer == 0 && $temp2 == 12) #set($timer=12) #end
+                        #if ($timer == 0) #set($timer=12) #end
                         $timer
                     #elseif ($format == "a")
                         #if ($temp2 >= 12) $pmString
@@ -859,7 +859,7 @@
                 <th align="right" bgcolor="#eeeeee" rowspan="2" class="borderWhite" scope="row">
                 #foreach ($format in $timeFormat)
                     #if ($format == "h")
-                        #if ($timer == 0 && $temp2 == 12) #set($timer=12) #end
+                        #if ($timer == 0) #set($timer=12) #end
                         $timer
                     #elseif ($format == "a")
                         #if ($temp2 >= 12) $pmString