From 2ea6533a366a39cc19385292a4d1b650f025a067 Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Thu, 24 May 2012 22:24:30 +0800
Subject: [PATCH] MDL-33307 format_weeks - highlight current week

---
 course/format/renderer.php       | 16 ++++++++++++++--
 course/format/weeks/renderer.php | 20 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/course/format/renderer.php b/course/format/renderer.php
index d969e8bc7c7..fb59c386a52 100644
--- a/course/format/renderer.php
+++ b/course/format/renderer.php
@@ -92,7 +92,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
 
         if ($section->section != 0) {
             // Only in the non-general sections.
-            if ($course->marker == $section->section) {
+            if ($this->is_section_current($section, $course)) {
                 $o = get_accesshide(get_string('currentsection', 'format_'.$course->format));
             }
         }
@@ -121,7 +121,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
             // Only in the non-general sections.
             if (!$section->visible) {
                 $sectionstyle = ' hidden';
-            } else if ($course->marker == $section->section) {
+            } else if ($this->is_section_current($section, $course)) {
                 $sectionstyle = ' current';
             }
             $linktitle = ($course->coursedisplay == COURSE_DISPLAY_MULTIPAGE);
@@ -669,4 +669,16 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
         $options->overflowdiv = true;
         return format_text($summarytext, $section->summaryformat, $options);
     }
+
+    /**
+     * Is the section passed in the current section? (Note this isn't strictly
+     * a renderering method, but neater here).
+     *
+     * @param stdClass $course The course entry from DB
+     * @param stdClass $section The course_section entry from the DB
+     * @return bool true if the section is current
+     */
+    protected function is_section_current($section, $course) {
+        return ($course->marker == $section->section);
+    }
 }
diff --git a/course/format/weeks/renderer.php b/course/format/weeks/renderer.php
index 33d640281b6..5184f04abfc 100644
--- a/course/format/weeks/renderer.php
+++ b/course/format/weeks/renderer.php
@@ -58,4 +58,24 @@ class format_weeks_renderer extends format_section_renderer_base {
     protected function page_title() {
         return get_string('weeklyoutline');
     }
+
+    /**
+     * Is the section passed in the current section?
+     *
+     * @param stdClass $course The course entry from DB
+     * @param stdClass $section The course_section entry from the DB
+     * @return bool true if the section is current
+     */
+    protected function is_section_current($section, $course) {
+        if ($section->section < 1) {
+            return false;
+        }
+        $oneweekseconds = 604800;
+        $startdate = $course->startdate + ($oneweekseconds * ($section->section - 1));
+        $enddate = $startdate + $oneweekseconds;
+
+        $timenow = time();
+
+        return (($timenow >= $startdate) && ($timenow < $enddate));
+    }
 }