From fab006e0d4c0ee3b8b2e5ff968d4a4d4f6c0b7be Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 Mar 2015 11:28:08 +0100
Subject: [PATCH 01/13] Minor - update UI

---
 main/inc/lib/display.lib.php                          | 5 ++++-
 main/inc/lib/formvalidator/Element/DatePicker.php     | 4 ++--
 main/inc/lib/formvalidator/Element/DateTimePicker.php | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index 33ee2765d4..fd78a990ff 100755
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -1758,7 +1758,7 @@ class Display
      * @param string $type
      * @return string
      */
-    public static function label($content, $type = null)
+    public static function label($content, $type = 'default')
     {
         $class = '';
         switch ($type) {
@@ -1777,6 +1777,9 @@ class Display
             case 'inverse':
                 $class = 'label-inverse';
                 break;
+            default:
+                $class = 'label-default';
+                break;
         }
 
         $html = '';
diff --git a/main/inc/lib/formvalidator/Element/DatePicker.php b/main/inc/lib/formvalidator/Element/DatePicker.php
index 1f9d413485..7b87aed88e 100755
--- a/main/inc/lib/formvalidator/Element/DatePicker.php
+++ b/main/inc/lib/formvalidator/Element/DatePicker.php
@@ -2,7 +2,7 @@
 /* For licensing terms, see /license.txt */
 
 /**
- * Form element to select a date and hour (with popup datepicker)
+ * Form element to select a date.
  *
  * Class DatePicker
  */
@@ -18,7 +18,7 @@ class DatePicker extends HTML_QuickForm_text
         if (!isset($attributes['id'])) {
             $attributes['id'] = $elementName;
         }
-        //$attributes['class'] = '';
+        $attributes['class'] = 'form-control';
 
         HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
         $this->_appendName = true;
diff --git a/main/inc/lib/formvalidator/Element/DateTimePicker.php b/main/inc/lib/formvalidator/Element/DateTimePicker.php
index 86be7f29b7..a0bf717a2b 100755
--- a/main/inc/lib/formvalidator/Element/DateTimePicker.php
+++ b/main/inc/lib/formvalidator/Element/DateTimePicker.php
@@ -2,7 +2,7 @@
 /* For licensing terms, see /license.txt */
 
 /**
- * Form element to select a date and hour (with popup datepicker)
+ * Form element to select a date and hour.
  */
 class DateTimePicker extends HTML_QuickForm_text
 {
@@ -14,7 +14,7 @@ class DateTimePicker extends HTML_QuickForm_text
         if (!isset($attributes['id'])) {
             $attributes['id'] = $elementName;
         }
-
+        $attributes['class'] = 'form-control';
         HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes);
         $this->_appendName = true;
         $this->_type = 'date_time_picker';

From 4c50fa27e3f5d3c26e94148b8b7cb0faafb8c2d7 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 Mar 2015 11:28:57 +0100
Subject: [PATCH 02/13] Add group filter to attendance see BT#9421

---
 main/attendance/attendance_add.php           |   9 +-
 main/attendance/attendance_calendar.php      |  24 +-
 main/attendance/attendance_controller.php    |  28 ++-
 main/attendance/attendance_sheet.php         |  66 ++++--
 main/inc/lib/attendance.lib.php              | 233 +++++++++++++++----
 main/inc/lib/database.constants.inc.php      |   1 +
 main/install/db_main.sql                     |  18 +-
 main/install/migrate-db-1.9.0-1.10.0-pre.sql |   7 +-
 8 files changed, 306 insertions(+), 80 deletions(-)

diff --git a/main/attendance/attendance_add.php b/main/attendance/attendance_add.php
index adedd054cc..e806227252 100755
--- a/main/attendance/attendance_add.php
+++ b/main/attendance/attendance_add.php
@@ -30,10 +30,15 @@ $form->addElement('hidden', 'sec_token', $token);
 
 $form->addText('title', get_lang('Title'), true, array('size'=>'50'));
 $form->applyFilter('title','html_filter');
-$form->addHtmlEditor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '150'));
+$form->addHtmlEditor(
+    'description',
+    get_lang('Description'),
+    false,
+    false,
+    array('ToolbarSet' => 'TrainingDescription', 'Width' => '100%', 'Height' => '150')
+);
 
 // Adavanced Parameters
-
 $advanced = '<a href="javascript://" class = "advanced_parameters" ><span id="img_plus_and_minus">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedParameters').'</span></a>';
 if ((api_get_session_id() != 0 && Gradebook::is_active()) || api_get_session_id() == 0) {
     $form -> addElement('advanced_settings',$advanced);
diff --git a/main/attendance/attendance_calendar.php b/main/attendance/attendance_calendar.php
index 807d1a62ed..7a4544e7e4 100755
--- a/main/attendance/attendance_calendar.php
+++ b/main/attendance/attendance_calendar.php
@@ -29,7 +29,6 @@ if (!$is_locked_attendance || api_is_platform_admin()) {
     echo '</div>';
 }
 
-
 $message_information = get_lang('AttendanceCalendarDescription');
 
 if (!empty($message_information)) {
@@ -48,6 +47,12 @@ if (isset($error_checkdate) && $error_checkdate) {
     Display::display_error_message($message, false);
 }
 
+$groupList = GroupManager::get_group_list();
+$groupIdList = array('--');
+foreach ($groupList as $group) {
+    $groupIdList[$group['id']] = $group['name'];
+}
+
 if (isset($action) && $action == 'calendar_add') {
     // calendar add form
     $form = new FormValidator(
@@ -91,15 +96,19 @@ if (isset($action) && $action == 'calendar_add') {
 
     $defaults['repeat_type'] = 'weekly';
 
+    $form->addSelect('groups', get_lang('Group'), $groupIdList);
+
     $form->addButtonCreate(get_lang('Save'));
     $form->setDefaults($defaults);
     $form->display();
 } else {
-    // calendar list
+    // Calendar list
+
     echo Display::page_subheader(get_lang('CalendarList'));
     echo '<div class="attendance-calendar-list">';
     if (!empty($attendance_calendar)) {
         foreach ($attendance_calendar as $calendar) {
+
             echo '<div class="attendance-calendar-row">';
             if ((isset($action) && $action == 'calendar_edit') &&
                 (isset($calendar_id) && $calendar_id == $calendar['id'])
@@ -112,6 +121,7 @@ if (isset($action) && $action == 'calendar_add') {
                     'index.php?action=calendar_edit&attendance_id=' . $attendance_id . '&calendar_id=' . $calendar_id . '&' . api_get_cidreq() . $param_gradebook,
                     ''
                 );
+
                 $form->addElement('date_time_picker', 'date_time', '', array('form_name'=>'attendance_calendar_edit'), 5);
                 $defaults['date_time'] = $calendar['date_time'];
                 $form->addElement('style_submit_button', null, get_lang('Save'), 'class="save"');
@@ -120,7 +130,15 @@ if (isset($action) && $action == 'calendar_add') {
                 $form->display();
                 echo '</div>';
             } else {
-                echo Display::return_icon('lp_calendar_event.png', get_lang('DateTime')).' '.substr($calendar['date_time'], 0, strlen($calendar['date_time'])- 3) .'&nbsp;';
+                echo Display::return_icon(
+                        'lp_calendar_event.png', get_lang('DateTime')
+                    ).' '.substr($calendar['date_time'], 0, strlen($calendar['date_time'])- 3) .'&nbsp;';
+                if (isset($calendar['groups']) && !empty($calendar['groups'])) {
+                    foreach ($calendar['groups'] as $group) {
+                        echo '&nbsp;'.Display::label($groupIdList[$group['group_id']]);
+                    }
+                }
+
                 if (!$is_locked_attendance || api_is_platform_admin()) {
                     if (api_is_allowed_to_edit()) {
                         echo '<span style="margin-left:20px;">';
diff --git a/main/attendance/attendance_controller.php b/main/attendance/attendance_controller.php
index 979d097f6e..16f4c8f7a8 100755
--- a/main/attendance/attendance_controller.php
+++ b/main/attendance/attendance_controller.php
@@ -264,10 +264,10 @@ class AttendanceController
         $attendance = new Attendance();
         $data = array();
         $data['attendance_id'] = $attendance_id;
-        $data['users_in_course'] = $attendance->get_users_rel_course($attendance_id);
+        $groupId = isset($_REQUEST['group_id']) ? $_REQUEST['group_id'] : null;
+        $data['users_in_course'] = $attendance->get_users_rel_course($attendance_id, $groupId);
 
         $filter_type = 'today';
-
         if (!empty($_REQUEST['filter'])) {
             $filter_type = $_REQUEST['filter'];
         }
@@ -278,7 +278,6 @@ class AttendanceController
         );
 
         if ($edit == true) {
-
             if (api_is_allowed_to_edit(null, true) || $isDrhOfCourse) {
                 $data['users_presence'] = $attendance->get_users_attendance_sheet($attendance_id);
             }
@@ -312,24 +311,33 @@ class AttendanceController
                     if (isset($_POST['check_presence'][$cal_id])) {
                         $users_present = $_POST['check_presence'][$cal_id];
                     }
-                    $attendance->attendance_sheet_add($cal_id,$users_present,$attendance_id);
+                    $attendance->attendance_sheet_add(
+                        $cal_id,
+                        $users_present,
+                        $attendance_id
+                    );
                 }
             }
 
-            $data['users_in_course'] = $attendance->get_users_rel_course($attendance_id);
+            $data['users_in_course'] = $attendance->get_users_rel_course($attendance_id, $groupId);
             $my_calendar_id = null;
             if (is_numeric($filter_type)) {
                 $my_calendar_id = $filter_type;
                 $filter_type = 'calendar_id';
             }
-            $data['attendant_calendar'] = $attendance->get_attendance_calendar($attendance_id, $filter_type, $my_calendar_id);
+            $data['attendant_calendar'] = $attendance->get_attendance_calendar(
+                $attendance_id,
+                $filter_type,
+                $my_calendar_id,
+                $groupId
+            );
             $data['attendant_calendar_all'] = $attendance->get_attendance_calendar($attendance_id);
             $data['users_presence'] = $attendance->get_users_attendance_sheet($attendance_id);
             $data['next_attendance_calendar_id'] = $attendance->get_next_attendance_calendar_id($attendance_id);
             $data['next_attendance_calendar_datetime'] = $attendance->get_next_attendance_calendar_datetime($attendance_id);
         } else {
             $data['attendant_calendar_all'] = $attendance->get_attendance_calendar($attendance_id);
-            $data['attendant_calendar'] = $attendance->get_attendance_calendar($attendance_id, $filter_type);
+            $data['attendant_calendar'] = $attendance->get_attendance_calendar($attendance_id, $filter_type, null, $groupId);
         }
 
         $data['edit_table'] = intval($edit);
@@ -354,6 +362,7 @@ class AttendanceController
         $data = array();
         $data['attendance_id'] = $attendance_id;
         $attendance_id = intval($attendance_id);
+        $groupList = isset($_POST['groups']) ? array($_POST['groups']) : array();
 
         if ($action == 'calendar_add') {
             if (strtoupper($_SERVER['REQUEST_METHOD']) == "POST") {
@@ -373,7 +382,8 @@ class AttendanceController
                                 $attendance_id,
                                 $start_datetime,
                                 $end_datetime,
-                                $repeat_type
+                                $repeat_type,
+                                $groupList
                             );
                             $action = 'calendar_list';
                         } else {
@@ -390,7 +400,7 @@ class AttendanceController
                         $datetimezone = api_get_utc_datetime($datetime);
                         if (!empty($datetime)) {
                             $attendance->set_date_time($datetimezone);
-                            $affected_rows = $attendance->attendance_calendar_add($attendance_id);
+                            $affected_rows = $attendance->attendance_calendar_add($attendance_id, $groupList);
                             $action = 'calendar_list';
                         } else {
                             $data['error_date'] = true;
diff --git a/main/attendance/attendance_sheet.php b/main/attendance/attendance_sheet.php
index fa6c43d095..5e3f7a1236 100755
--- a/main/attendance/attendance_sheet.php
+++ b/main/attendance/attendance_sheet.php
@@ -25,6 +25,8 @@ if (api_is_allowed_to_edit(null, true) ||
         $param_gradebook = '&gradebook='.$_SESSION['gradebook'];
     }
 
+    $groupId = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null;
+
     $form = new FormValidator(
         'filter',
         'post',
@@ -45,11 +47,25 @@ if (api_is_allowed_to_edit(null, true) ||
 
     if (!empty($attendant_calendar_all)) {
         $values[''] = '---------------';
-        foreach($attendant_calendar_all as $attendance_date) {
+        foreach ($attendant_calendar_all as $attendance_date) {
+            $includeCalendar = true;
+            if (isset($attendance_date['groups']) && !empty($groupId)) {
+                foreach ($attendance_date['groups'] as $group) {
+                    if ($groupId == $group['group_id']) {
+                        $includeCalendar = true;
+                        break;
+                    } else {
+                        $includeCalendar = false;
+                    }
+                }
+            }
+
             if ($today == $attendance_date['date']) {
                 $exists_attendance_today = true;
             }
-            $values[$attendance_date['id']] = $attendance_date['date_time'];
+            if ($includeCalendar) {
+                $values[$attendance_date['id']] = $attendance_date['date_time'];
+            }
         }
     }
 
@@ -58,6 +74,17 @@ if (api_is_allowed_to_edit(null, true) ||
     }
 
     $form->addElement('select', 'filter', get_lang('Filter'), $values, array('id' => 'filter_id'));
+
+    $groupList = GroupManager::get_group_list();
+    $groupIdList = array('--');
+    foreach ($groupList as $group) {
+        $groupIdList[$group['id']] = $group['name'];
+    }
+
+    if (!empty($groupList)) {
+        $form->addSelect('group_id', get_lang('Group'), $groupIdList);
+    }
+
     $form->addButtonFilter(get_lang('Filter'));
 
     if (isset($_REQUEST['filter'])) {
@@ -71,7 +98,12 @@ if (api_is_allowed_to_edit(null, true) ||
     $renderer = $form->defaultRenderer();
     $renderer->setElementTemplate('{label} {element} ');
 
-    $form->setDefaults(array('filter'=>$default_filter));
+    $form->setDefaults(
+        array(
+            'filter' => $default_filter,
+            'group_id' => $groupId
+        )
+    );
 
     if (!$is_locked_attendance || api_is_platform_admin()) {
         echo '<div class="actions">';
@@ -96,10 +128,9 @@ if (api_is_allowed_to_edit(null, true) ||
         Display::display_warning_message(get_lang('TheAttendanceSheetIsLocked'), false);
     }
 
-    $param_filter = '&filter='.Security::remove_XSS($default_filter);
+    $param_filter = '&filter='.Security::remove_XSS($default_filter).'&group_id='.$groupId;
 
     if (count($users_in_course) > 0) {
-
         ?>
         <script>
             var original_url = '';
@@ -195,14 +226,13 @@ if (api_is_allowed_to_edit(null, true) ||
                             <th width="100px"><?php echo get_lang('AttendancesFaults')?></th>
                         </tr>
                         </thead>
-
                         <tbody>
                         <?php
                         $i = 1;
                         $class = '';
                         foreach ($users_in_course as $data) {
                             $faults = 0;
-                            if ($i%2 == 0) {
+                            if ($i % 2 == 0) {
                                 $class='row_odd';
                             } else {
                                 $class='row_even';
@@ -227,7 +257,6 @@ if (api_is_allowed_to_edit(null, true) ||
                         </tbody>
                     </table>
                 </div>
-
                 <?php
 
                 echo '<div class="divTableWithFloatingHeader attendance-calendar-table" style="margin:0px;padding:0px;float:left;width:55%;overflow:auto;overflow-y:hidden;">';
@@ -278,7 +307,6 @@ if (api_is_allowed_to_edit(null, true) ||
                 echo $result;
                 echo '</tr>';
                 echo '</thead>';
-
                 echo '<tbody>';
                 $i = 0;
                 foreach ($users_in_course as $user) {
@@ -304,7 +332,9 @@ if (api_is_allowed_to_edit(null, true) ||
                                 }
                             } else {
                                 //if the user wasn't registered at that time, consider unchecked
-                                if ($next_attendance_calendar_datetime == 0 || $calendar['date_time'] < $next_attendance_calendar_datetime) {
+                                if ($next_attendance_calendar_datetime == 0 ||
+                                    $calendar['date_time'] < $next_attendance_calendar_datetime
+                                ) {
                                     $checked = '';
                                 }
                             }
@@ -330,7 +360,7 @@ if (api_is_allowed_to_edit(null, true) ||
                                     echo $presence ? Display::return_icon('checkbox_on.gif',get_lang('Presence')) : Display::return_icon('checkbox_off.gif',get_lang('Presence'));
                                 }
                             } else {
-                                switch($presence) {
+                                switch ($presence) {
                                     case 1:
                                         echo Display::return_icon('accept.png',get_lang('Attended'));
                                         break;
@@ -365,13 +395,13 @@ if (api_is_allowed_to_edit(null, true) ||
                 ?>
                 <div class="clear"></div>
                 <div style="margin-top:20px;">
-                    <?php if (!$is_locked_attendance || api_is_platform_admin()) {
-                        if (api_is_allowed_to_edit(null, true)) {
-                            ?>
-                            <button type="submit" class="save"><?php echo get_lang('Save') ?></button>
-                        <?php }
-                    }
-                    ?>
+                <?php if (!$is_locked_attendance || api_is_platform_admin()) {
+                    if (api_is_allowed_to_edit(null, true)) {
+                        ?>
+                        <button type="submit" class="save"><?php echo get_lang('Save') ?></button>
+                    <?php }
+                }
+                ?>
                 </div>
         </form>
     <?php
diff --git a/main/inc/lib/attendance.lib.php b/main/inc/lib/attendance.lib.php
index 67279813fb..51c9a5624f 100755
--- a/main/inc/lib/attendance.lib.php
+++ b/main/inc/lib/attendance.lib.php
@@ -563,12 +563,16 @@ class Attendance
 	/**
 	 * Get registered users inside current course
 	 * @param 	int	   $attendance_id attendance id for showing attendance result field (optional)
+	 * @param int $groupId
 	 * @return 	array  users data
 	 */
-	public function get_users_rel_course($attendance_id = 0)
+	public function get_users_rel_course($attendance_id = 0, $groupId = null)
 	{
 		$current_session_id = api_get_session_id();
 		$current_course_id  = api_get_course_id();
+
+		$studentInGroup = array();
+
 		if (!empty($current_session_id)) {
 			$a_course_users = CourseManager:: get_user_list_from_course_code(
 				$current_course_id,
@@ -583,14 +587,29 @@ class Attendance
 				'',
 				'lastname'
 			);
+			if (!empty($groupId)) {
+				$students = GroupManager::getStudents($groupId);
+				if (!empty($students)) {
+					foreach ($students as $student) {
+						$studentInGroup[$student['user_id']] = true;
+					}
+				}
+			}
 		}
+
 		// get registered users inside current course
 		$a_users = array();
-		foreach ($a_course_users as $key =>$user_data) {
-			$value	= array();
-			$uid 	= $user_data['user_id'];
+		foreach ($a_course_users as $key => $user_data) {
+			$value = array();
+			$uid = $user_data['user_id'];
 			$status = $user_data['status'];
 
+			if (!empty($studentInGroup)) {
+				if (!isset($studentInGroup[$uid])) {
+					continue;
+				}
+			}
+
 			$user_status_in_session = null;
 			$user_status_in_course  = null;
 
@@ -607,8 +626,14 @@ class Attendance
 				);
 			}
 
-			//Not taking into account DRH or COURSEMANAGER
-			if ($uid <= 1 || $status == DRH || $user_status_in_course == COURSEMANAGER || $user_status_in_session == 2) continue;
+			// Not taking into account DRH or COURSEMANAGER
+			if ($uid <= 1 ||
+				$status == DRH ||
+				$user_status_in_course == COURSEMANAGER ||
+				$user_status_in_session == 2
+			) {
+				continue;
+			}
 
 			if (!empty($attendance_id)) {
 				$user_faults = $this->get_faults_of_user($uid, $attendance_id);
@@ -617,24 +642,26 @@ class Attendance
 			}
 
 			// user's picture
-			$image_path 	= UserManager::get_user_picture_path_by_id($uid, 'web', false);
-			$user_profile 	= UserManager::get_picture_user($uid, $image_path['file'], 22, USER_IMAGE_SIZE_SMALL, ' width="22" height="22" ');
+			$image_path = UserManager::get_user_picture_path_by_id($uid, 'web', false);
+			$user_profile = UserManager::get_picture_user($uid, $image_path['file'], 22, USER_IMAGE_SIZE_SMALL, ' width="22" height="22" ');
 
 			if (!empty($image_path['file'])) {
-				$photo = '<center><a class="thickbox" href="'.$image_path['dir'].$image_path['file'].'"  ><img src="'.$user_profile['file'].'" '.$user_profile['style'].' alt="'.api_get_person_name($user_data['firstname'], $user_data['lastname']).'"  title="'.api_get_person_name($user_data['firstname'], $user_data['lastname']).'" /></a></center>';
+				$photo = '<center><a class="thickbox" href="'.$image_path['dir'].$image_path['file'].'"  >
+						  <img src="'.$user_profile['file'].'" '.$user_profile['style'].' alt="'.api_get_person_name($user_data['firstname'], $user_data['lastname']).'"  title="'.api_get_person_name($user_data['firstname'], $user_data['lastname']).'" /></a></center>';
 			} else {
 				$photo = '<center><img src="'.$user_profile['file'].'" '.$user_profile['style'].' alt="'.api_get_person_name($user_data['firstname'], $user_data['lastname']).'"  title="'.api_get_person_name($user_data['firstname'], $user_data['lastname']).'" /></center>';
 			}
 
-			$value['photo']      = $photo;
-			$value['firstname']  = $user_data['firstname'];
-			$value['lastname']	 = $user_data['lastname'];
-			$value['username']   = $user_data['username'];
-			$value['user_id']    = $uid;
+			$value['photo'] = $photo;
+			$value['firstname'] = $user_data['firstname'];
+			$value['lastname'] = $user_data['lastname'];
+			$value['username'] = $user_data['username'];
+			$value['user_id'] = $uid;
 
 			//Sending only 5 items in the array instead of 60
 			$a_users[$key] = $value;
 		}
+
 		return $a_users;
 	}
 
@@ -1171,17 +1198,37 @@ class Attendance
 
 	/**
 	 * Get all attendance calendar data inside current attendance
-	 * @param	int	attendance id
+	 * @param	int	$attendance_id
+	 * @param	string $type
+	 * @param	int $calendar_id
+	 * @param	int $groupId
+	 *
 	 * @return	array attendance calendar data
 	 */
-	public function get_attendance_calendar($attendance_id, $type = 'all', $calendar_id = null)
-	{
+	public function get_attendance_calendar(
+		$attendance_id,
+		$type = 'all',
+		$calendar_id = null,
+		$groupId = null
+	) {
 		global $dateFormatShort, $timeNoSecFormat;
 		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
 		$attendance_id = intval($attendance_id);
 		$course_id = api_get_course_int_id();
+		$groupCondition = null;
+
 		$sql = "SELECT * FROM $tbl_attendance_calendar
 				WHERE c_id = $course_id AND attendance_id = '$attendance_id' ";
+
+		if (!empty($groupId)) {
+			$groupId = intval($groupId);
+			$table = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
+			$sql = "SELECT c.* FROM $tbl_attendance_calendar c INNER JOIN $table g
+					ON c.c_id = g.c_id AND c.id = g.calendar_id
+					WHERE c.c_id = $course_id AND g.group_id = '$groupId' ";
+
+		}
+
 		if (!in_array($type, array('today', 'all', 'all_done', 'all_not_done','calendar_id'))) {
 			$type = 'all';
 		}
@@ -1211,10 +1258,11 @@ class Attendance
 		$data = array();
 		if (Database::num_rows($rs) > 0) {
 			while ($row = Database::fetch_array($rs,'ASSOC')) {
-				$row['db_date_time']    = $row['date_time'];
-				$row['date_time']       = api_get_local_time($row['date_time']);
-				$row['date']            = api_format_date($row['date_time'], DATE_FORMAT_SHORT);
-				$row['time']            = api_format_date($row['date_time'], TIME_NO_SEC_FORMAT);
+				$row['db_date_time'] = $row['date_time'];
+				$row['date_time'] = api_get_local_time($row['date_time']);
+				$row['date'] = api_format_date($row['date_time'], DATE_FORMAT_SHORT);
+				$row['time'] = api_format_date($row['date_time'], TIME_NO_SEC_FORMAT);
+				$row['groups'] = $this->getGroupListByAttendanceCalendar($row['id'], $course_id);
 				if ($type == 'today') {
 					if (date('d-m-Y', api_strtotime($row['date_time'], 'UTC')) == date('d-m-Y', time())) {
 						$data[] = $row;
@@ -1302,10 +1350,11 @@ class Attendance
 
 	/**
 	 * Add new datetime inside attendance calendar table
-	 * @param	int	attendance id
+	 * @param	int		$attendance_id
+	 * @param 	array 	$groupList
 	 * @return	int affected rows
 	 */
-	public function attendance_calendar_add($attendance_id)
+	public function attendance_calendar_add($attendance_id, $groupList = array())
 	{
 		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
 		$affected_rows = 0;
@@ -1319,12 +1368,14 @@ class Attendance
 		        	attendance_id = '$attendance_id'";
 		$rs = Database::query($sql);
 		if (Database::num_rows($rs) == 0) {
-			$sql = "INSERT INTO $tbl_attendance_calendar SET
-					c_id			= $course_id,
-					date_time		= '".Database::escape_string($this->date_time)."',
-					attendance_id 	= '$attendance_id'";
-			Database::query($sql);
+			$params = array(
+				'c_id' =>  $course_id,
+				'date_time' => $this->date_time,
+				'attendance_id' => $attendance_id
+			);
+			$id = Database::insert($tbl_attendance_calendar, $params);
 			$affected_rows = Database::affected_rows();
+			$this->addAttendanceCalendarToGroup($id, $course_id, $groupList);
 		}
 
 		// update locked attendance
@@ -1338,30 +1389,124 @@ class Attendance
 	}
 
 	/**
-	 * save repeated date inside attendance calendar table
-	 * @param   int $attendance_id
-	 * @param   int $start_date start date in tms
-	 * @param   int $end_date end date in tms
-	 * @param   string $repeat_type daily, weekly, monthlyByDate
+	 * @param int   $calendarId
+	 * @param int 	 $courseId
+	 * @param array $groupList
+	 */
+	public function addAttendanceCalendarToGroup($calendarId, $courseId, $groupList)
+	{
+		if (empty($groupList)) {
+			return false;
+		}
+
+		$table = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
+
+		foreach ($groupList as $groupId) {
+			$result = $this->getAttendanceCalendarGroup(
+				$calendarId,
+				$courseId,
+				$groupId
+			);
+
+			if (empty($result)) {
+				$params = array(
+					'calendar_id' => $calendarId,
+					'c_id' => $courseId,
+					'group_id' => $groupId,
+				);
+				Database::insert($table, $params);
+			}
+		}
+	}
+
+	/**
+	 * @param int $calendarId
+	 * @param int $courseId
+	 * @param int $groupId
+	 * @return array
+	 */
+	public function getGroupListByAttendanceCalendar($calendarId, $courseId)
+	{
+		$table = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
+		return Database::select(
+			'*',
+			$table,
+			array('where'=>
+				array(
+					'calendar_id = ? AND c_id = ?' => array($calendarId, $courseId)
+				)
+			)
+		);
+	}
+
+	/**
+	 * @param int $calendarId
+	 * @param int $courseId
+	 * @param int $groupId
+	 * @return array
+	 */
+	public function getAttendanceCalendarGroup($calendarId, $courseId, $groupId)
+	{
+		$table = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
+		return Database::select(
+			'*',
+			$table,
+			array('where'=>
+				array(
+					'calendar_id = ? AND c_id = ? AND group_id = ?' => array($calendarId, $courseId, $groupId)
+				)
+			)
+		);
+	}
+
+	/**
+	 * @param int $calendarId
+	 * @param int $courseId
+	 * @param int $groupId
+	 * @return array
 	 */
-	public function attendance_repeat_calendar_add($attendance_id, $start_date, $end_date, $repeat_type)
+	public function deleteAttendanceCalendarGroup($calendarId, $courseId)
 	{
+		$table = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR_REL_GROUP);
+		Database::delete(
+			$table,
+			array(
+				'calendar_id = ? AND c_id = ?' => array($calendarId, $courseId)
+			)
+		);
+	}
+
+	/**
+	 * save repeated date inside attendance calendar table
+	 * @param int $attendance_id
+	 * @param int $start_date start date in tms
+	 * @param int $end_date end date in tms
+	 * @param string $repeat_type daily, weekly, monthlyByDate
+	 * @param array $groupList
+	 */
+	public function attendance_repeat_calendar_add(
+		$attendance_id,
+		$start_date,
+		$end_date,
+		$repeat_type,
+		$groupList = array()
+	) {
 		$attendance_id = intval($attendance_id);
 		// save start date
 		$datetimezone = api_get_utc_datetime($start_date);
 		$this->set_date_time($datetimezone);
-		$res = $this->attendance_calendar_add($attendance_id);
+		$res = $this->attendance_calendar_add($attendance_id, $groupList);
 
-		//86400 = 24 hours in seconds
-		//604800 = 1 week in seconds
+		// 86400 = 24 hours in seconds
+		// 604800 = 1 week in seconds
 		// Saves repeated dates
-		switch($repeat_type) {
+		switch ($repeat_type) {
 			case 'daily':
 				$j = 1;
 				for ($i = $start_date + 86400; ($i <= $end_date); $i += 86400) {
 					$datetimezone = api_get_utc_datetime($i);
 					$this->set_date_time($datetimezone);
-					$this->attendance_calendar_add($attendance_id);
+					$this->attendance_calendar_add($attendance_id, $groupList);
 					$j++;
 				}
 				break;
@@ -1370,7 +1515,7 @@ class Attendance
 				for ($i = $start_date + 604800; ($i <= $end_date); $i += 604800) {
 					$datetimezone = api_get_utc_datetime($i);
 					$this->set_date_time($datetimezone);
-					$this->attendance_calendar_add($attendance_id);
+					$this->attendance_calendar_add($attendance_id, $groupList);
 					$j++;
 				}
 				break;
@@ -1380,7 +1525,7 @@ class Attendance
 				for ($i = $start_date + 2419200; ($i <= $end_date); $i += 2419200) {
 					$datetimezone = api_get_utc_datetime($i);
 					$this->set_date_time($datetimezone);
-					$this->attendance_calendar_add($attendance_id);
+					$this->attendance_calendar_add($attendance_id, $groupList);
 					$j++;
 				}
 				break;
@@ -1460,7 +1605,7 @@ class Attendance
 	public function attendance_calendar_delete($calendar_id, $attendance_id , $all_delete = false)
 	{
 		$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
-		$tbl_attendance_sheet 	 = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
+		$tbl_attendance_sheet = Database::get_course_table(TABLE_ATTENDANCE_SHEET);
 
 		$attendance_id = intval($attendance_id);
 		// get all registered users inside current course
@@ -1481,6 +1626,8 @@ class Attendance
 					$sql = "DELETE FROM $tbl_attendance_calendar
 							WHERE c_id = $course_id AND id = '".intval($cal['id'])."'";
 					Database::query($sql);
+
+					$this->deleteAttendanceCalendarGroup($cal['id'], $course_id);
 				}
 			}
 		} else {
@@ -1492,6 +1639,8 @@ class Attendance
 			$sql = "DELETE FROM $tbl_attendance_calendar
 					WHERE c_id = $course_id AND id = '".intval($calendar_id)."'";
 			Database::query($sql);
+
+			$this->deleteAttendanceCalendarGroup($calendar_id, $course_id);
 		}
 
 		$affected_rows = Database::affected_rows();
diff --git a/main/inc/lib/database.constants.inc.php b/main/inc/lib/database.constants.inc.php
index fa5221b88d..e94c0c6624 100755
--- a/main/inc/lib/database.constants.inc.php
+++ b/main/inc/lib/database.constants.inc.php
@@ -303,6 +303,7 @@ define('TABLE_METADATA', 'metadata');
 // Attendance Sheet
 define('TABLE_ATTENDANCE',          'attendance');
 define('TABLE_ATTENDANCE_CALENDAR', 'attendance_calendar');
+define('TABLE_ATTENDANCE_CALENDAR_REL_GROUP', 'attendance_calendar_rel_group');
 define('TABLE_ATTENDANCE_SHEET_LOG','attendance_sheet_log');
 
 define('TABLE_ATTENDANCE_SHEET',    'attendance_sheet');
diff --git a/main/install/db_main.sql b/main/install/db_main.sql
index 23a3a848e0..6a642288b0 100755
--- a/main/install/db_main.sql
+++ b/main/install/db_main.sql
@@ -885,7 +885,7 @@ VALUES
 ('tool_visible_by_default_at_creation','gradebook','checkbox','Tools','true','ToolVisibleByDefaultAtCreationTitle','ToolVisibleByDefaultAtCreationComment',NULL,'Gradebook', 1),
 ('prevent_session_admins_to_manage_all_users', NULL, 'radio', 'Session', 'false', 'PreventSessionAdminsToManageAllUsersTitle', 'PreventSessionAdminsToManageAllUsersComment', NULL, NULL, 1),
 ('documents_default_visibility_defined_in_course', NULL,'radio','Tools','false','DocumentsDefaultVisibilityDefinedInCourseTitle','DocumentsDefaultVisibilityDefinedInCourseComment',NULL, NULL, 1),
-('chamilo_database_version', NULL, 'textfield',NULL, '1.10.0.19','DatabaseVersion','', NULL, NULL, 0);
+('chamilo_database_version', NULL, 'textfield',NULL, '0', 'DatabaseVersion','', NULL, NULL, 0);
 UNLOCK TABLES;
 /*!40000 ALTER TABLE settings_current ENABLE KEYS */;
 
@@ -3464,10 +3464,22 @@ CREATE TABLE track_e_attempt_coeff (
 );
 
 -- Course
+
 DROP TABLE IF EXISTS c_student_publication_rel_document;
-CREATE TABLE IF NOT EXISTS c_student_publication_rel_document (id  INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, document_id INT NOT NULL, c_id INT NOT NULL);
+CREATE TABLE IF NOT EXISTS c_student_publication_rel_document (id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, document_id INT NOT NULL, c_id INT NOT NULL);
 DROP TABLE IF EXISTS c_student_publication_rel_user;
-CREATE TABLE IF NOT EXISTS c_student_publication_rel_user ( id  INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, user_id INT NOT NULL, c_id INT NOT NULL);
+CREATE TABLE IF NOT EXISTS c_student_publication_rel_user ( id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, user_id INT NOT NULL, c_id INT NOT NULL);
 DROP TABLE IF EXISTS c_student_publication_comment;
 CREATE TABLE IF NOT EXISTS c_student_publication_comment ( id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, c_id INT NOT NULL, comment text, file VARCHAR(255), user_id int NOT NULL, sent_at datetime NOT NULL);
 
+DROP TABLE IF EXISTS c_attendance_calendar_rel_group;
+CREATE TABLE c_attendance_calendar_rel_group (
+  id int NOT NULL auto_increment PRIMARY KEY,
+  c_id INT NOT NULL,
+  group_id INT NOT NULL,
+  calendar_id INT NOT NULL
+);
+
+
+-- Version
+UPDATE settings_current SET selected_value = '1.10.0.20' WHERE variable = 'chamilo_database_version';
diff --git a/main/install/migrate-db-1.9.0-1.10.0-pre.sql b/main/install/migrate-db-1.9.0-1.10.0-pre.sql
index 29c605b9f6..5a9366e889 100644
--- a/main/install/migrate-db-1.9.0-1.10.0-pre.sql
+++ b/main/install/migrate-db-1.9.0-1.10.0-pre.sql
@@ -90,7 +90,7 @@ INSERT INTO settings_options (variable, value, display_text) VALUES ('documents_
 INSERT INTO settings_options (variable, value, display_text) VALUES ('documents_default_visibility_defined_in_course', 'false', 'No');
 
 -- Do not move this query
-UPDATE settings_current SET selected_value = '1.10.0.19' WHERE variable = 'chamilo_database_version';
+UPDATE settings_current SET selected_value = '1.10.0.20' WHERE variable = 'chamilo_database_version';
 
 -- xxCOURSExx
 
@@ -100,6 +100,7 @@ ALTER TABLE c_lp_item ADD COLUMN prerequisite_max_score float;
 ALTER TABLE c_student_publication ADD COLUMN document_id int DEFAULT 0;
 
 CREATE TABLE IF NOT EXISTS c_student_publication_rel_document (id  INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, document_id INT NOT NULL, c_id INT NOT NULL);
-CREATE TABLE IF NOT EXISTS c_student_publication_rel_user ( id  INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, user_id INT NOT NULL, c_id INT NOT NULL);
-CREATE TABLE IF NOT EXISTS c_student_publication_comment ( id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, c_id INT NOT NULL, comment text, file VARCHAR(255), user_id int NOT NULL, sent_at datetime NOT NULL);
+CREATE TABLE IF NOT EXISTS c_student_publication_rel_user (id  INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, user_id INT NOT NULL, c_id INT NOT NULL);
+CREATE TABLE IF NOT EXISTS c_student_publication_comment (id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, c_id INT NOT NULL, comment text, file VARCHAR(255), user_id int NOT NULL, sent_at datetime NOT NULL);
 
+CREATE TABLE c_attendance_calendar_rel_group (id int NOT NULL auto_increment PRIMARY KEY, c_id INT NOT NULL, group_id INT NOT NULL, calendar_id INT NOT NULL);

From 5db9e540466e4918aef72286c310e6f342cb431d Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 Mar 2015 11:52:28 +0100
Subject: [PATCH 03/13] Minor - UI changes see BT#9421

---
 main/attendance/attendance_controller.php | 6 +++---
 main/attendance/attendance_sheet.php      | 4 ++--
 main/inc/lib/attendance.lib.php           | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/main/attendance/attendance_controller.php b/main/attendance/attendance_controller.php
index 16f4c8f7a8..7544143a1d 100755
--- a/main/attendance/attendance_controller.php
+++ b/main/attendance/attendance_controller.php
@@ -452,11 +452,11 @@ class AttendanceController
     {
         $attendance = new Attendance();
         $courseInfo = CourseManager::get_course_information($course_id);
-
         $attendance->set_course_id($courseInfo['code']);
+        $groupId = isset($_REQUEST['group_id']) ? $_REQUEST['group_id'] : null;
         $data_array = array();
         $data_array['attendance_id'] = $attendance_id;
-        $data_array['users_in_course'] = $attendance->get_users_rel_course($attendance_id);
+        $data_array['users_in_course'] = $attendance->get_users_rel_course($attendance_id, $groupId);
 
         $filter_type = 'today';
 
@@ -470,7 +470,7 @@ class AttendanceController
             $filter_type = 'calendar_id';
         }
 
-        $data_array['attendant_calendar'] = $attendance->get_attendance_calendar($attendance_id, $filter_type, $my_calendar_id);
+        $data_array['attendant_calendar'] = $attendance->get_attendance_calendar($attendance_id, $filter_type, $my_calendar_id, $groupId);
 
         if (api_is_allowed_to_edit(null, true) || api_is_drh()) {
             $data_array['users_presence'] = $attendance->get_users_attendance_sheet($attendance_id);
diff --git a/main/attendance/attendance_sheet.php b/main/attendance/attendance_sheet.php
index 5e3f7a1236..b7b77ca8d8 100755
--- a/main/attendance/attendance_sheet.php
+++ b/main/attendance/attendance_sheet.php
@@ -109,9 +109,9 @@ if (api_is_allowed_to_edit(null, true) ||
         echo '<div class="actions">';
         echo '<a style="float:left;" href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.$param_gradebook.'">'.
             Display::return_icon('attendance_calendar.png',get_lang('AttendanceCalendar'),'',ICON_SIZE_MEDIUM).'</a>';
-        if (count($users_in_course) > 0) {
+        //if (count($users_in_course) > 0) {
             $form->display();
-        }
+        //}
         echo '<a id="pdf_export" style="float:left;"  href="index.php?'.api_get_cidreq().'&action=attendance_sheet_export_to_pdf&attendance_id='.$attendance_id.$param_gradebook.'&filter='.$default_filter.'">'.
             Display::return_icon('pdf.png',get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
diff --git a/main/inc/lib/attendance.lib.php b/main/inc/lib/attendance.lib.php
index 51c9a5624f..00545b8029 100755
--- a/main/inc/lib/attendance.lib.php
+++ b/main/inc/lib/attendance.lib.php
@@ -587,6 +587,7 @@ class Attendance
 				'',
 				'lastname'
 			);
+
 			if (!empty($groupId)) {
 				$students = GroupManager::getStudents($groupId);
 				if (!empty($students)) {
@@ -604,7 +605,7 @@ class Attendance
 			$uid = $user_data['user_id'];
 			$status = $user_data['status'];
 
-			if (!empty($studentInGroup)) {
+			if (!empty($groupId)) {
 				if (!isset($studentInGroup[$uid])) {
 					continue;
 				}

From 387f7b763253b50f6cc7f76b12f311e29d3ee546 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 Mar 2015 11:52:43 +0100
Subject: [PATCH 04/13] Moving database version at the end.

---
 main/install/migrate-db-1.9.0-1.10.0-pre.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/install/migrate-db-1.9.0-1.10.0-pre.sql b/main/install/migrate-db-1.9.0-1.10.0-pre.sql
index 5a9366e889..e5731c5330 100644
--- a/main/install/migrate-db-1.9.0-1.10.0-pre.sql
+++ b/main/install/migrate-db-1.9.0-1.10.0-pre.sql
@@ -89,9 +89,6 @@ INSERT INTO settings_current (variable, subkey, type, category, selected_value,
 INSERT INTO settings_options (variable, value, display_text) VALUES ('documents_default_visibility_defined_in_course', 'true', 'Yes');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('documents_default_visibility_defined_in_course', 'false', 'No');
 
--- Do not move this query
-UPDATE settings_current SET selected_value = '1.10.0.20' WHERE variable = 'chamilo_database_version';
-
 -- xxCOURSExx
 
 ALTER TABLE c_survey ADD visible_results INT UNSIGNED DEFAULT 0;
@@ -102,5 +99,8 @@ ALTER TABLE c_student_publication ADD COLUMN document_id int DEFAULT 0;
 CREATE TABLE IF NOT EXISTS c_student_publication_rel_document (id  INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, document_id INT NOT NULL, c_id INT NOT NULL);
 CREATE TABLE IF NOT EXISTS c_student_publication_rel_user (id  INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, user_id INT NOT NULL, c_id INT NOT NULL);
 CREATE TABLE IF NOT EXISTS c_student_publication_comment (id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, c_id INT NOT NULL, comment text, file VARCHAR(255), user_id int NOT NULL, sent_at datetime NOT NULL);
+CREATE TABLE IF NOT EXISTS c_attendance_calendar_rel_group (id int NOT NULL auto_increment PRIMARY KEY, c_id INT NOT NULL, group_id INT NOT NULL, calendar_id INT NOT NULL);
 
-CREATE TABLE c_attendance_calendar_rel_group (id int NOT NULL auto_increment PRIMARY KEY, c_id INT NOT NULL, group_id INT NOT NULL, calendar_id INT NOT NULL);
+
+-- Do not move this query
+UPDATE settings_current SET selected_value = '1.10.0.20' WHERE variable = 'chamilo_database_version';

From c0792c792cf65315421d4f591211f2cf67ba5a34 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 Mar 2015 12:12:33 +0100
Subject: [PATCH 05/13] Undo change 001b1a078af6be1cd08578fc2b039b486ac33ff8

---
 main/inc/lib/pdf.lib.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/main/inc/lib/pdf.lib.php b/main/inc/lib/pdf.lib.php
index 84f8352e41..86ecb0a4fe 100755
--- a/main/inc/lib/pdf.lib.php
+++ b/main/inc/lib/pdf.lib.php
@@ -140,7 +140,12 @@ class PDF
 
         $css_file = api_get_path(TO_SYS, WEB_CSS_PATH).'/print.css';
         $css = file_exists($css_file) ? @file_get_contents($css_file) : '';
-        self::content_to_pdf($html, $css, $this->params['filename'], $this->params['course_code']);
+        self::content_to_pdf(
+            $html,
+            $css,
+            $this->params['filename'],
+            $this->params['course_code']
+        );
     }
 
     /**
@@ -439,8 +444,7 @@ class PDF
             $output_file = 'pdf_'.date('Y-m-d-his').'.pdf';
         } else {
             $pdf_name = replace_dangerous_char($pdf_name);
-            // Save temporally into Archive folder
-            $output_file = api_get_path(SYS_ARCHIVE_PATH) . $pdf_name.'.pdf';
+            $output_file = $pdf_name.'.pdf';
         }
         $this->pdf->Output($output_file, $outputMode); // F to save the pdf in a file
         if ($outputMode == 'F') {

From 21e6fcacf578ba4cfd5e63440b1b81106097a29c Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 Mar 2015 12:13:16 +0100
Subject: [PATCH 06/13] Fix PHP warning, adding group id see BT#9421

---
 main/attendance/attendance_controller.php | 7 +++----
 main/attendance/attendance_sheet.php      | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/main/attendance/attendance_controller.php b/main/attendance/attendance_controller.php
index 7544143a1d..7b20dd73f5 100755
--- a/main/attendance/attendance_controller.php
+++ b/main/attendance/attendance_controller.php
@@ -545,10 +545,10 @@ class AttendanceController
             $changed = 1;
 
             for ($i= 0; $i <= $rows; $i++) {
-                $row = $data_table[$i];
+                $row = isset($data_table[$i]) ? $data_table[$i] : null;
                 $key = 1;
                 $max_dates_per_page = 10;
-                $item = $data_table[$i];
+                $item = isset($data_table[$i]) ? $data_table[$i] : null;
                 $count_j = 0;
 
                 if (!empty($item)) {
@@ -567,14 +567,13 @@ class AttendanceController
             }
 
             $content = null;
-
             if (!empty($tables)) {
                 foreach ($tables as $sub_table) {
                     $content .= Export::convert_array_to_html($sub_table).'<br /><br />';
                 }
             }
         } else {
-            $content .= Export::convert_array_to_html($data_table, array('header_attributes' =>   array('align' => 'center')));
+            $content = Export::convert_array_to_html($data_table, array('header_attributes' =>  array('align' => 'center')));
         }
 
         $params = array(
diff --git a/main/attendance/attendance_sheet.php b/main/attendance/attendance_sheet.php
index b7b77ca8d8..885919b737 100755
--- a/main/attendance/attendance_sheet.php
+++ b/main/attendance/attendance_sheet.php
@@ -112,7 +112,7 @@ if (api_is_allowed_to_edit(null, true) ||
         //if (count($users_in_course) > 0) {
             $form->display();
         //}
-        echo '<a id="pdf_export" style="float:left;"  href="index.php?'.api_get_cidreq().'&action=attendance_sheet_export_to_pdf&attendance_id='.$attendance_id.$param_gradebook.'&filter='.$default_filter.'">'.
+        echo '<a id="pdf_export" style="float:left;"  href="index.php?'.api_get_cidreq().'&action=attendance_sheet_export_to_pdf&attendance_id='.$attendance_id.$param_gradebook.'&filter='.$default_filter.'&group_id='.$groupId.'">'.
             Display::return_icon('pdf.png',get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a>';
         echo '</div>';
     }

From fb84c74b5cc9afd79c425c685a5196f73ae310bc Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 Mar 2015 13:34:10 +0100
Subject: [PATCH 07/13] Add group visibility see BT#9425

---
 main/attendance/attendance_calendar.php       |  2 +-
 main/attendance/attendance_sheet.php          |  2 +-
 main/group/group.php                          | 15 ++-
 main/group/group_space.php                    |  4 +-
 main/group/member_settings.php                |  2 +-
 main/group/settings.php                       |  6 +-
 main/group/tutor_settings.php                 |  4 +-
 main/inc/lib/add_course.lib.inc.php           |  1 +
 .../lib/formvalidator/FormValidator.class.php | 13 ++-
 main/inc/lib/groupmanager.lib.php             | 94 ++++++++++++++++---
 main/install/db_main.sql                      |  2 +-
 main/install/migrate-db-1.9.0-1.10.0-pre.sql  |  4 +-
 12 files changed, 118 insertions(+), 31 deletions(-)

diff --git a/main/attendance/attendance_calendar.php b/main/attendance/attendance_calendar.php
index 7a4544e7e4..0a69e47f6b 100755
--- a/main/attendance/attendance_calendar.php
+++ b/main/attendance/attendance_calendar.php
@@ -47,7 +47,7 @@ if (isset($error_checkdate) && $error_checkdate) {
     Display::display_error_message($message, false);
 }
 
-$groupList = GroupManager::get_group_list();
+$groupList = GroupManager::get_group_list(null, null, 1);
 $groupIdList = array('--');
 foreach ($groupList as $group) {
     $groupIdList[$group['id']] = $group['name'];
diff --git a/main/attendance/attendance_sheet.php b/main/attendance/attendance_sheet.php
index 885919b737..e92fcd12c2 100755
--- a/main/attendance/attendance_sheet.php
+++ b/main/attendance/attendance_sheet.php
@@ -75,7 +75,7 @@ if (api_is_allowed_to_edit(null, true) ||
 
     $form->addElement('select', 'filter', get_lang('Filter'), $values, array('id' => 'filter_id'));
 
-    $groupList = GroupManager::get_group_list();
+    $groupList = GroupManager::get_group_list(null, null, 1);
     $groupIdList = array('--');
     foreach ($groupList as $group) {
         $groupIdList[$group['id']] = $group['name'];
diff --git a/main/group/group.php b/main/group/group.php
index 1c4fd28470..f5e354023d 100755
--- a/main/group/group.php
+++ b/main/group/group.php
@@ -14,9 +14,9 @@
  *	@author Isaac Flores, code cleaning and improvements
  *	@package chamilo.group
  */
-/*		INIT SECTION	*/
+
 // Name of the language file that needs to be included
-$language_file = 'group';
+$language_file = array('group', 'document');
 
 require_once '../inc/global.inc.php';
 
@@ -73,6 +73,14 @@ $my_get_id  = isset($_GET['id']) ? Security::remove_XSS($_GET['id']) : null;
 
 if (isset($_GET['action']) && $is_allowed_in_course) {
     switch ($_GET['action']) {
+        case 'set_visible':
+            GroupManager::setVisible($my_get_id);
+            Display :: display_confirmation_message(get_lang('ItemUpdated'));
+            break;
+        case 'set_invisible':
+            GroupManager::setInvisible($my_get_id);
+            Display :: display_confirmation_message(get_lang('ItemUpdated'));
+            break;
         case 'self_reg':
             if (GroupManager::is_self_registration_allowed($userId, $my_group_id)) {
                 GroupManager::subscribe_users($userId, $my_group_id);
@@ -138,7 +146,6 @@ if (api_is_allowed_to_edit(false, true)) {
                 GroupManager :: delete_groups($my_get_id);
                 Display :: display_confirmation_message(get_lang('GroupDel'));
                 break;
-
             case 'fill_one':
                 GroupManager :: fill_groups($my_get_id);
                 Display :: display_confirmation_message(get_lang('GroupFilledGroups'));
@@ -191,7 +198,7 @@ echo '</div>';
 /*  List all categories */
 if (api_get_setting('allow_group_categories') == 'true') {
     foreach ($group_cats as $index => $category) {
-        $group_list = GroupManager :: get_group_list($category['id']);
+        $group_list = GroupManager::get_group_list($category['id']);
         $label = Display::label(count($group_list).' '.get_lang('ExistingGroups'), 'info');
 
         $actions = null;
diff --git a/main/group/group_space.php b/main/group/group_space.php
index 3813d0bd1a..8be8cf5b46 100755
--- a/main/group/group_space.php
+++ b/main/group/group_space.php
@@ -34,7 +34,7 @@ if (empty($current_group)) {
 
 $this_section = SECTION_COURSES;
 $nameTools = get_lang('GroupSpace');
-$interbreadcrumb[] = array ('url' => 'group.php', 'name' => get_lang('Groups'));
+$interbreadcrumb[] = array('url' => 'group.php', 'name' => get_lang('Groups'));
 
 /*	Ensure all private groups // Juan Carlos Raña Trabado */
 
@@ -57,7 +57,7 @@ if ($current_group['doc_state'] != 1 &&
     $current_group['chat_state'] != 1 &&
     $forum_state_public != 1
 ) {
-    if (!api_is_allowed_to_edit(null,true) &&
+    if (!api_is_allowed_to_edit(null, true) &&
         !GroupManager::is_user_in_group($user_id, $group_id)) {
         api_not_allowed($print_headers);
     }
diff --git a/main/group/member_settings.php b/main/group/member_settings.php
index 471639164f..48adfb3747 100755
--- a/main/group/member_settings.php
+++ b/main/group/member_settings.php
@@ -178,7 +178,7 @@ $group_members_element = $form->addElement(
 $form->addFormRule('check_group_members');
 
 // submit button
-$form->addElement('style_submit_button', 'submit', get_lang('SaveSettings'), 'class="save"');
+$form->addButtonSave(get_lang('SaveSettings'));
 
 if ($form->validate()) {
     $values = $form->exportValues();
diff --git a/main/group/settings.php b/main/group/settings.php
index 9c707611bf..2aca6c9e2b 100755
--- a/main/group/settings.php
+++ b/main/group/settings.php
@@ -11,8 +11,6 @@
  *	@todo course admin functionality to create groups based on who is in which course (or class).
  */
 
-/*	INIT SECTION */
-
 // Name of the language file that needs to be included
 $language_file = 'group';
 
@@ -70,7 +68,7 @@ $form->addElement('html', '</div>');
 
 $form->addElement('html', '<div class="span6">');
 // Description
-$form->addElement('textarea', 'description', get_lang('Description'), array ('class' => 'span6', 'rows' => 6));
+$form->addElement('textarea', 'description', get_lang('Description'));
 $form->addElement('html', '</div>');
 
 $form->addElement('html', '<div class="span12">');
@@ -148,7 +146,7 @@ $form->addGroup($group, '', Display::return_icon('chat.png', get_lang('Chat'), a
 $form->addElement('html', '</div>');
 $form->addElement('html', '<div class="span12">');
 // Submit button
-$form->addElement('style_submit_button', 'submit', get_lang('SaveSettings'), 'class="save"');
+$form->addButtonSave(get_lang('SaveSettings'));
 $form->addElement('html', '</div>');
 
 if ($form->validate()) {
diff --git a/main/group/tutor_settings.php b/main/group/tutor_settings.php
index 56210fd1f6..2c9935cf0a 100755
--- a/main/group/tutor_settings.php
+++ b/main/group/tutor_settings.php
@@ -11,8 +11,6 @@
  *	@todo course admin functionality to create groups based on who is in which course (or class).
  */
 
-/*	INIT SECTION */
-
 // Name of the language file that needs to be included
 $language_file = 'group';
 
@@ -155,7 +153,7 @@ if (!empty($complete_user_list)) {
 $group_tutors_element = $form->addElement('advmultiselect', 'group_tutors', get_lang('GroupTutors'), $possible_users, 'style="width: 280px;"');
 
 // submit button
-$form->addElement('style_submit_button', 'submit', get_lang('SaveSettings'), 'class="save"');
+$form->addButtonSave(get_lang('SaveSettings'));
 
 if ($form->validate()) {
     $values = $form->exportValues();
diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php
index 9c7a612cb6..1118f292d0 100755
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@@ -1162,6 +1162,7 @@ class AddCourse
             $add_to_all_tables
             id int unsigned NOT NULL auto_increment,
             name varchar(100) default NULL,
+            status tinyint DEFAULT 1,
             category_id int unsigned NOT NULL default 0,
             description text,
             max_student int unsigned NOT NULL default 8,
diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php
index 197d2be3de..3d1a7d4498 100755
--- a/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/main/inc/lib/formvalidator/FormValidator.class.php
@@ -253,6 +253,14 @@ EOT;
         );
     }
 
+    /**
+     * @param string $label
+     */
+    public function addButtonSave($label, $name = 'submit')
+    {
+        $this->addButton($name, $label, 'check', 'primary');
+    }
+
     /**
      * @param string $label
      */
@@ -292,8 +300,11 @@ EOT;
      * Shortcut to search button
      * @param string $label
      */
-    public function addButtonSearch($label)
+    public function addButtonSearch($label = null)
     {
+        if (empty($label))  {
+            $label = get_lang('Search');
+        }
         return $this->addButton('submit', $label, 'search');
     }
 
diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php
index 3bacd4d713..72d9f10041 100755
--- a/main/inc/lib/groupmanager.lib.php
+++ b/main/inc/lib/groupmanager.lib.php
@@ -78,7 +78,7 @@ class GroupManager
      * @param string $course_code Default is current course
      * @return array An array with all information about the groups.
      */
-    public static function get_group_list($category = null, $course_code = null)
+    public static function get_group_list($category = null, $course_code = null, $status = null)
     {
         $course_info = api_get_course_info($course_code);
         $session_id = api_get_session_id();
@@ -96,6 +96,7 @@ class GroupManager
                     g.self_registration_allowed,
                     g.self_unregistration_allowed,
                     g.session_id,
+                    g.status,
                     ug.user_id is_member
                 FROM $table_group g
                 LEFT JOIN $table_group_user ug
@@ -118,6 +119,10 @@ class GroupManager
             $session_condition = api_get_session_condition($session_id, true);
         }
 
+        if (!is_null($status)) {
+            $sql .= "  AND  g.status = '".intval($status)."' ";
+        }
+
         $sql .= " AND g.c_id = $course_id ";
 
         if (!empty($session_condition)) {
@@ -471,6 +476,7 @@ class GroupManager
         if ($db_object) {
             $result['id'] = $db_object->id;
             $result['name'] = $db_object->name;
+            $result['status'] = $db_object->status;
             $result['tutor_id'] = isset($db_object->tutor_id) ? $db_object->tutor_id : null;
             $result['description'] = $db_object->description;
             $result['maximum_number_of_students'] = $db_object->max_student;
@@ -1949,24 +1955,28 @@ class GroupManager
                 return false;
         }
 
-        $user_is_in_group = self :: is_user_in_group($user_id, $group_id);
+        $user_is_in_group = self::is_user_in_group($user_id, $group_id);
 
         // Check group properties
-        $group_info = self :: get_group_properties($group_id);
+        $groupInfo = self::get_group_properties($group_id);
+
+        if (empty($groupInfo)) {
+            return false;
+        }
 
-        if (empty($group_info)) {
+        if (!$user_is_in_group && $groupInfo['status'] == 0) {
             return false;
         }
 
-        if ($group_info[$state_key] == self::TOOL_NOT_AVAILABLE) {
+        if ($groupInfo[$state_key] == self::TOOL_NOT_AVAILABLE) {
             return false;
-        } elseif ($group_info[$state_key] == self::TOOL_PUBLIC) {
+        } elseif ($groupInfo[$state_key] == self::TOOL_PUBLIC) {
             return true;
         } elseif (api_is_allowed_to_edit(false, true)) {
             return true;
-        } elseif ($group_info['tutor_id'] == $user_id) { //this tutor implementation was dropped
+        } elseif ($groupInfo['tutor_id'] == $user_id) { //this tutor implementation was dropped
             return true;
-        } elseif ($group_info[$state_key] == self::TOOL_PRIVATE && !$user_is_in_group) {
+        } elseif ($groupInfo[$state_key] == self::TOOL_PRIVATE && !$user_is_in_group) {
             return false;
         } else {
             return $user_is_in_group;
@@ -2139,13 +2149,21 @@ class GroupManager
             // Create a new table-row
             $row = array();
 
+            if (!api_is_allowed_to_edit(false, true)) {
+                if ($this_group['status'] == 0) {
+                    continue;
+                }
+            }
+
             // Checkbox
             if (api_is_allowed_to_edit(false, true) && count($group_list) > 1) {
                 $row[] = $this_group['id'];
             }
 
+
             // Group name
             if ((api_is_allowed_to_edit(false, true) ||
+                    (
                     in_array($user_id, $tutorsids_of_group) ||
                     $this_group['is_member'] ||
                     self::user_has_access($user_id, $this_group['id'], self::GROUP_TOOL_FORUM) ||
@@ -2155,10 +2173,16 @@ class GroupManager
                     self::user_has_access($user_id, $this_group['id'], self::GROUP_TOOL_WORK) ||
                     self::user_has_access($user_id, $this_group['id'], self::GROUP_TOOL_WIKI) ||
                     self::user_has_access($user_id, $this_group['id'], self::GROUP_TOOL_CHAT)
+                    )
                 )
                 && !(api_is_course_coach() && intval($this_group['session_id']) != $session_id)
             ) {
-                $group_name = '<a href="group_space.php?cidReq='.api_get_course_id().'&amp;origin='.$orig.'&amp;gidReq='.$this_group['id'].'">'.
+
+                $groupNameClass = null;
+                if ($this_group['status'] == 0) {
+                    $groupNameClass = 'muted';
+                }
+                $group_name = '<a class="'.$groupNameClass.'" href="group_space.php?cidReq='.api_get_course_id().'&amp;origin='.$orig.'&amp;gidReq='.$this_group['id'].'">'.
                     Security::remove_XSS($this_group['name']).'</a> ';
                 if (!empty($user_id) && !empty($this_group['id_tutor']) && $user_id == $this_group['id_tutor']) {
                     $group_name .= Display::label(get_lang('OneMyGroups'), 'success');
@@ -2218,10 +2242,20 @@ class GroupManager
             }
             $url = api_get_path(WEB_CODE_PATH).'group/';
             // Edit-links
-            if (api_is_allowed_to_edit(false, true)  && !(api_is_course_coach() && intval($this_group['session_id']) != $session_id)) {
+            if (api_is_allowed_to_edit(false, true) &&
+                !(api_is_course_coach() && intval($this_group['session_id']) != $session_id)
+            ) {
                 $edit_actions = '<a href="'.$url.'settings.php?'.api_get_cidreq(true, false).'&gidReq='.$this_group['id'].'"  title="'.get_lang('Edit').'">'.
                     Display::return_icon('edit.png', get_lang('EditGroup'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
 
+                if ($this_group['status'] == 1) {
+                    $edit_actions .= '<a href="' . api_get_self() . '?' . api_get_cidreq(true,false) . '&category=' . $category_id . '&amp;action=set_invisible&amp;id=' . $this_group['id'] . '" title="' . get_lang('Hide') . '">' .
+                        Display::return_icon('visible.png', get_lang('Hide'), '', ICON_SIZE_SMALL) . '</a>&nbsp;';
+                } else {
+                    $edit_actions .= '<a href="' . api_get_self() . '?' . api_get_cidreq(true, false) . '&category=' . $category_id . '&amp;action=set_visible&amp;id=' . $this_group['id'] . '" title="' . get_lang('Show') . '">' .
+                        Display::return_icon('invisible.png', get_lang('Show'), '', ICON_SIZE_SMALL) . '</a>&nbsp;';
+                }
+
                 $edit_actions .= '<a href="'.$url.'member_settings.php?'.api_get_cidreq(true, false).'&gidReq='.$this_group['id'].'"  title="'.get_lang('GroupMembers').'">'.
                     Display::return_icon('user.png', get_lang('GroupMembers'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
 
@@ -2694,7 +2728,45 @@ class GroupManager
         $url = api_get_path(WEB_CODE_PATH).'group/group_overview.php?'.api_get_cidreq();
         $form = new FormValidator('search_groups', 'get', $url, null, array(), FormValidator::LAYOUT_INLINE);
         $form->addElement('text', 'keyword');
-        $form->addElement('button', 'submit', get_lang('Search'));
+        $form->addButtonSearch();
         return $form->toHtml();
     }
+
+    /**
+     * @param int $groupId
+     * @param int $status
+     */
+    public static function setStatus($groupId, $status)
+    {
+        $groupInfo = self::get_group_properties($groupId);
+
+        $courseId = api_get_course_int_id();
+        if (!empty($groupInfo)) {
+            $table = Database::get_course_table(TABLE_GROUP);
+            $params = array(
+                'status' => intval($status)
+            );
+            Database::update(
+                $table,
+                $params,
+                array('c_id = ? AND id = ?' => array($courseId, $groupId))
+            );
+        }
+    }
+
+    /**
+     * @param int $groupId
+     */
+    public static function setVisible($groupId)
+    {
+        self::setStatus($groupId, 1);
+    }
+
+    /**
+     * @param int $groupId
+     */
+    public static function setInvisible($groupId)
+    {
+        self::setStatus($groupId, 0);
+    }
 }
diff --git a/main/install/db_main.sql b/main/install/db_main.sql
index 6a642288b0..2058683019 100755
--- a/main/install/db_main.sql
+++ b/main/install/db_main.sql
@@ -3482,4 +3482,4 @@ CREATE TABLE c_attendance_calendar_rel_group (
 
 
 -- Version
-UPDATE settings_current SET selected_value = '1.10.0.20' WHERE variable = 'chamilo_database_version';
+UPDATE settings_current SET selected_value = '1.10.0.21' WHERE variable = 'chamilo_database_version';
diff --git a/main/install/migrate-db-1.9.0-1.10.0-pre.sql b/main/install/migrate-db-1.9.0-1.10.0-pre.sql
index e5731c5330..d52a449612 100644
--- a/main/install/migrate-db-1.9.0-1.10.0-pre.sql
+++ b/main/install/migrate-db-1.9.0-1.10.0-pre.sql
@@ -95,12 +95,12 @@ ALTER TABLE c_survey ADD visible_results INT UNSIGNED DEFAULT 0;
 ALTER TABLE c_lp_item ADD COLUMN prerequisite_min_score float;
 ALTER TABLE c_lp_item ADD COLUMN prerequisite_max_score float;
 ALTER TABLE c_student_publication ADD COLUMN document_id int DEFAULT 0;
+ALTER TABLE c_group_info ADD COLUMN status tinyint DEFAULT 1;
 
 CREATE TABLE IF NOT EXISTS c_student_publication_rel_document (id  INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, document_id INT NOT NULL, c_id INT NOT NULL);
 CREATE TABLE IF NOT EXISTS c_student_publication_rel_user (id  INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, user_id INT NOT NULL, c_id INT NOT NULL);
 CREATE TABLE IF NOT EXISTS c_student_publication_comment (id INT PRIMARY KEY NOT NULL AUTO_INCREMENT, work_id INT NOT NULL, c_id INT NOT NULL, comment text, file VARCHAR(255), user_id int NOT NULL, sent_at datetime NOT NULL);
 CREATE TABLE IF NOT EXISTS c_attendance_calendar_rel_group (id int NOT NULL auto_increment PRIMARY KEY, c_id INT NOT NULL, group_id INT NOT NULL, calendar_id INT NOT NULL);
 
-
 -- Do not move this query
-UPDATE settings_current SET selected_value = '1.10.0.20' WHERE variable = 'chamilo_database_version';
+UPDATE settings_current SET selected_value = '1.10.0.21' WHERE variable = 'chamilo_database_version';

From 3fe972ff764c8105a87dcf2422c257ea4d542572 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 Mar 2015 13:54:02 +0100
Subject: [PATCH 08/13] Minor - Fix PHP warning.

---
 main/course_description/course_description_controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/course_description/course_description_controller.php b/main/course_description/course_description_controller.php
index 323d6c87e8..ed4cb79a78 100755
--- a/main/course_description/course_description_controller.php
+++ b/main/course_description/course_description_controller.php
@@ -34,7 +34,7 @@ class CourseDescriptionController
         $course_description->set_session_id($session_id);
         $data = array();
         $course_description_data = $course_description->get_description_data();
-        $data['descriptions'] = $course_description_data['descriptions'];
+        $data['descriptions'] = isset($course_description_data['descriptions']) ? $course_description_data['descriptions'] : null;
         $data['default_description_titles'] = $course_description->get_default_description_title();
         $data['default_description_title_editable'] = $course_description->get_default_description_title_editable();
         $data['default_description_icon'] = $course_description->get_default_description_icon();

From f55beab024f72109f08983a85a98853272c83739 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 Mar 2015 14:00:20 +0100
Subject: [PATCH 09/13] Fix sticky footer.

---
 main/css/base.css                            | 17 ++++++++++-------
 main/template/default/layout/main.tpl        |  1 -
 main/template/default/layout/show_footer.tpl |  1 -
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/main/css/base.css b/main/css/base.css
index 6f436db91b..1ff8bce775 100755
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -2,8 +2,6 @@
  * Common CSS for all themes
 */
 
-/* @import url('bootstrap.css');*/
-
 /* some changes to the bootstrap.css */
 
 /* when doing a var_dump*/
@@ -410,9 +408,9 @@ html, body {
     padding: 0;
 }
 
-/* the sticky effect */
 html {
-    height: 100%;
+    position: relative;
+    min-height: 100%;
 }
 
 body {
@@ -437,10 +435,15 @@ body {
 }
 
 footer {
-    margin-top: 17px;
-    padding-top: 17px;
-    height: 9em;
+    position: absolute;
+    bottom: 0;
     width: 100%;
+    height: 80px;
+    background-color: #f5f5f5;
+}
+
+#footer_left, #footer_center, #footer_right {
+    margin: 20px 0 0 0;
 }
 
 /* Sticky footer*/
diff --git a/main/template/default/layout/main.tpl b/main/template/default/layout/main.tpl
index 94e57a89d5..d37549b910 100755
--- a/main/template/default/layout/main.tpl
+++ b/main/template/default/layout/main.tpl
@@ -13,7 +13,6 @@
     {% if show_footer == true %}
         </div> <!-- end of #row" -->
         </div> <!-- end of #main" -->
-        <div class="push"></div>
         </div> <!-- end of #page section -->
         </div> <!-- end of #wrapper section -->
     {% endif %}
diff --git a/main/template/default/layout/show_footer.tpl b/main/template/default/layout/show_footer.tpl
index 29acf0383a..24da11e707 100755
--- a/main/template/default/layout/show_footer.tpl
+++ b/main/template/default/layout/show_footer.tpl
@@ -19,7 +19,6 @@
 {% if show_footer == true %}
         </div> <!-- end of #row" -->
     </div> <!-- end of #main" -->
-    <div class="push"></div>
     </div> <!-- end of #page section -->
 </div> <!-- end of #wrapper section -->
 

From 24d9b606718219dbdc198ff72f2ab83a6314cb36 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 Mar 2015 14:24:01 +0100
Subject: [PATCH 10/13] Remove custom progress bar css.

---
 main/css/base.css | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/main/css/base.css b/main/css/base.css
index 1ff8bce775..c7821e6200 100755
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -4427,28 +4427,6 @@ footer {
     margin:0;
 }
 
-.progress .bar {
-  font-weight: bold;
-  text-shadow: 0px 1px 1px rgba(0,0,0,1);
-}
-.progress {
-  text-align:center;
-  position: relative;
-  background: #98bede; /* Old browsers */
-  background: -moz-linear-gradient(top, #98bede 1%, #deefff 98%); /* FF3.6+ */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(1%,#98bede), color-stop(98%,#deefff)); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top, #98bede 1%,#deefff 98%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top, #98bede 1%,#deefff 98%); /* Opera 11.10+ */
-  background: -ms-linear-gradient(top, #98bede 1%,#deefff 98%); /* IE10+ */
-  background: linear-gradient(to bottom, #98bede 1%,#deefff 98%); /* W3C */
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#98bede', endColorstr='#deefff',GradientType=0 ); /* IE6-9 */
-
-}
-.bar span {
-  position:absolute;
-  display: block;
-  width: 100%;
-}
 
 .ui-state-highlight_lp {
     border: 1px solid #FEAA18;

From 88632f1839f3988f1f4917bf80784038fe1120a5 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 Mar 2015 14:24:28 +0100
Subject: [PATCH 11/13] Fix LP layout.

---
 main/inc/lib/template.lib.php                |   1 -
 main/template/default/layout/main_header.tpl | 134 +++++++++----------
 2 files changed, 67 insertions(+), 68 deletions(-)

diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index 2ddc00b308..8353081863 100755
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -332,7 +332,6 @@ class Template
      */
     public function set_header($status)
     {
-        $status = false;
         $this->show_header = $status;
         $this->assign('show_header', $status);
 
diff --git a/main/template/default/layout/main_header.tpl b/main/template/default/layout/main_header.tpl
index 838ed70dca..1d5ca77ae6 100755
--- a/main/template/default/layout/main_header.tpl
+++ b/main/template/default/layout/main_header.tpl
@@ -34,81 +34,81 @@
     </form>
 {% endif %}
 
-<div id="page" class="container"> <!-- page section -->
-        {# Bug and help notifications #}
-        {% block help_notifications %}
-        <ul id="navigation" class="notification-panel">
-            {{ help_content }}
-            {{ bug_notification_link }}
-        </ul>
-        {% endblock %}
 
-        {# topbar #}
-        {% block topbar %}
-        {% include template ~ "/layout/topbar.tpl" %}
-        {% endblock %}
-            <header>
-                <div id="main" class="container">
-                    {% if plugin_header_main %}
-                    <div class="row">
-                        <div class="col-lg-12">
-                            {{ plugin_header_main }}
+{% if show_header == true %}
+
+<div id="page" class="container"><!-- page section -->
+    {# Bug and help notifications #}
+    {% block help_notifications %}
+    <ul id="navigation" class="notification-panel">
+        {{ help_content }}
+        {{ bug_notification_link }}
+    </ul>
+    {% endblock %}
+
+    {# topbar #}
+    {% block topbar %}
+    {% include template ~ "/layout/topbar.tpl" %}
+    {% endblock %}
+        <header>
+            <div id="main" class="container">
+                {% if plugin_header_main %}
+                <div class="row">
+                    <div class="col-lg-12">
+                        {{ plugin_header_main }}
+                    </div>
+                </div>
+                {% endif %}
+                <div class="row">
+                    <div class="col-lg-3">
+                        <div class="logo">
+                            {{ logo }}
                         </div>
                     </div>
-                    {% endif %}
-                    <div class="row">
-                        <div class="col-lg-3">
-                            <div class="logo">
-                                {{ logo }}
+                    <div class="col-lg-9">
+                        <div class="col-4">
+                            {% if plugin_header_left is not null %}
+                            <div id="plugin_header_left">
+                                {{ plugin_header_left }}
                             </div>
+                            {% endif %}
                         </div>
-                        <div class="col-lg-9">
-                            <div class="col-4">
-                                {% if plugin_header_left is not null %}
-                                <div id="plugin_header_left">
-                                    {{ plugin_header_left }}
-                                </div>
-                                {% endif %}
+                        <div class="col-4">
+                            {% if plugin_header_center is not null %}
+                            <div id="plugin_header_center">
+                                {{ plugin_header_center }}
                             </div>
-                            <div class="col-4">
-                                {% if plugin_header_center is not null %}
-                                <div id="plugin_header_center">
-                                    {{ plugin_header_center }}
-                                </div>
-                                {% endif %}
+                            {% endif %}
+                        </div>
+                        <div class="col-4">
+                            {% if plugin_header_right is not null %}
+                            <div id="plugin_header_right">
+                                {{ plugin_header_right }}
                             </div>
-                            <div class="col-4">
-                                {% if plugin_header_right is not null %}
-                                <div id="plugin_header_right">
-                                    {{ plugin_header_right }}
-                                </div>
-                                {% endif %}
-                                <div class="section-notifications">
-                                    <ul id="notifications" class="nav nav-pills pull-right">
-                                        {{ notification_menu }}
-                                    </ul>
-                                </div>
+                            {% endif %}
+                            <div class="section-notifications">
+                                <ul id="notifications" class="nav nav-pills pull-right">
+                                    {{ notification_menu }}
+                                </ul>
                             </div>
                         </div>
                     </div>
                 </div>
-            </header>
-            <section id="menu-bar">
-                {# menu #}
-                {% block menu %}
-                {% include template ~ "/layout/menu.tpl" %}
-                {% endblock %}
-            </section>
-            <section id="breadcrumb-bar">
-                {# breadcrumb #}
-                {% block breadcrumb %}
-                {{ breadcrumb }}
-                {% endblock %}
-            </section>
-
-
-        
-        <div id="top_main_content">
-
-        {# course navigation links/shortcuts need to be activated by the admin #}
-        {% include template ~ "/layout/course_navigation.tpl" %}
\ No newline at end of file
+            </div>
+        </header>
+        <section id="menu-bar">
+            {# menu #}
+            {% block menu %}
+            {% include template ~ "/layout/menu.tpl" %}
+            {% endblock %}
+        </section>
+        <section id="breadcrumb-bar">
+            {# breadcrumb #}
+            {% block breadcrumb %}
+            {{ breadcrumb }}
+            {% endblock %}
+        </section>
+    <div id="top_main_content">
+    {# course navigation links/shortcuts need to be activated by the admin #}
+    {% include template ~ "/layout/course_navigation.tpl" %}
+{% endif %}

From 2aff115f9a14ee2192a594df7666cbd220af0bb9 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 Mar 2015 15:01:37 +0100
Subject: [PATCH 12/13] Minor - add return.

---
 main/inc/lib/formvalidator/FormValidator.class.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php
index 3d1a7d4498..9698b7d4e4 100755
--- a/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/main/inc/lib/formvalidator/FormValidator.class.php
@@ -258,7 +258,7 @@ EOT;
      */
     public function addButtonSave($label, $name = 'submit')
     {
-        $this->addButton($name, $label, 'check', 'primary');
+        return $this->addButton($name, $label, 'check', 'primary');
     }
 
     /**
@@ -266,7 +266,7 @@ EOT;
      */
     public function addButtonCreate($label, $name = 'submit')
     {
-        $this->addButton($name, $label, 'plus', 'primary');
+        return $this->addButton($name, $label, 'plus', 'primary');
     }
 
     /**
@@ -344,8 +344,6 @@ EOT;
         return $this->addButton($name, $label, 'filter', 'primary');
     }
 
-
-
     /**
      * @param string $name
      * @param string $label

From 50ba38ae213abbf9c710f67545ed49329218756d Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 11 Mar 2015 15:11:25 +0100
Subject: [PATCH 13/13] Fix progress bar

---
 main/inc/lib/display.lib.php | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index fd78a990ff..b8ede6db4d 100755
--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@@ -59,6 +59,7 @@ class Display
         if (isset($origin) && $origin == 'learnpath') {
             $showHeader = false;
         }
+
         self::$global_template = new Template($tool_name, $showHeader, $showHeader);
 
         // Fixing tools with any help it takes xxx part of main/xxx/index.php
@@ -88,6 +89,7 @@ class Display
         if (!empty($page_header)) {
             self::$global_template->assign('header', $page_header);
         }
+
         echo self::$global_template->show_header_template();
     }
 
@@ -98,7 +100,7 @@ class Display
     {
         global $show_learnpath, $tool_name;
         self::$global_template = new Template($tool_name, false, false, $show_learnpath);
-        echo self::$global_template ->show_header_template();
+        echo self::$global_template->show_header_template();
     }
 
     public static function display_no_header()
@@ -112,7 +114,8 @@ class Display
     /**
      * Displays the reduced page header (without banner)
      */
-    public static function set_header() {
+    public static function set_header()
+    {
         global $show_learnpath;
         self::$global_template = new Template($tool_name, false, false, $show_learnpath);
     }
@@ -120,8 +123,9 @@ class Display
     /**
      * Display the page footer
      */
-    public static function display_footer() {
-        echo self::$global_template ->show_footer_template();
+    public static function display_footer()
+    {
+        echo self::$global_template->show_footer_template();
     }
 
     public static function page()
@@ -1696,19 +1700,33 @@ class Display
         return $html;
     }
 
+    /**
+     * @param $percentage
+     * @param bool $show_percentage
+     * @param null $extra_info
+     * @return string
+     */
     public static function bar_progress($percentage, $show_percentage = true, $extra_info = null)
     {
         $percentage = intval($percentage);
-        $div = '<div class="progress progress-striped">
-                    <div class="bar" style="width: '.$percentage.'%;"></div>
-                </div>';
+        $div = '<div class="progress">
+                <div
+                    class="progress-bar progress-bar-striped"
+                    role="progressbar"
+                    aria-valuenow="'.$percentage.'"
+                    aria-valuemin="0"
+                    aria-valuemax="100"
+                    style="width: '.$percentage.'%;"
+                >';
         if ($show_percentage) {
-            $div .= '<div class="progresstext">'.$percentage.'%</div>';
+            $div .= $percentage.'%';
         } else {
             if (!empty($extra_info)) {
-                $div .= '<div class="progresstext">'.$extra_info.'</div>';
+                $div .= $extra_info;
             }
         }
+        $div .= '</div>';
+
         return $div;
     }