Merge branch 'master' into ghatighorias/restricts_user_list_clickable…

…_only_to_coordinators
digitalnatives · Sep 14, 2017 · 5aad834 · 5aad834
2 parents 0f438c6 + df6610c
commit 5aad834
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/assets/js/calendar.js b/assets/js/calendar.js
@@ -41,7 +41,7 @@
   }
 
   function renderHour ( hour ) {
-    return `0${hour}:00`.slice( -5 );
+    return `${hour}`.slice(0, 5);
   }
 
   function updatePointer ( ) {
@@ -254,7 +254,7 @@
                     </div>
                     <div class="calendar__class-time">
                       ${ cl.classroom ? cl.classroom + "," : "" }
-                      ${ renderHour( cl.starting_at.slice(0,2) ) }-${ renderHour( cl.finishes_at.slice(0,2) ) }
+                      ${ renderHour( cl.starting_at ) }-${ renderHour( cl.finishes_at ) }
                     </div>
                   </div>
                   <div
@@ -267,7 +267,7 @@
                     ${ cl.course_name }<br />
                     ${ cl.teachers.map( ( teacher ) => renderName( teacher ) ).join( ", " ) }<br />
                     ${ cl.classroom ? cl.classroom + "," : "" }
-                    ${ renderHour( cl.starting_at.slice(0,2) ) }-${ renderHour( cl.finishes_at.slice(0,2) ) }
+                    ${ renderHour( cl.starting_at ) }-${ renderHour( cl.finishes_at ) }
                   </div>
                 `
               ).join( "" )