From fa40c5eee0c689a08304ec155a7a5ae4edc56137 Mon Sep 17 00:00:00 2001 From: Cristian Fasanando Date: Mon, 22 Mar 2010 14:16:33 -0500 Subject: [PATCH] removed function about thematic inside attendance tool - partial BT#578 --- main/attendance/index.php | 200 +++----------------------------------- 1 file changed, 14 insertions(+), 186 deletions(-) diff --git a/main/attendance/index.php b/main/attendance/index.php index c2150ff473..f6d8c76b58 100644 --- a/main/attendance/index.php +++ b/main/attendance/index.php @@ -14,10 +14,8 @@ $language_file = array ('course_description', 'pedaSuggest', 'userInfo', 'admin' // including files require_once '../inc/global.inc.php'; require_once api_get_path(LIBRARY_PATH).'attendance.lib.php'; -require_once api_get_path(LIBRARY_PATH).'thematic.lib.php'; require_once api_get_path(LIBRARY_PATH).'app_view.php'; require_once 'attendance_controller.php'; -require_once 'thematic_controller.php'; require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php'; require_once api_get_path(LIBRARY_PATH).'course.lib.php'; require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; @@ -30,93 +28,52 @@ $this_section = SECTION_COURSES; // protect a course script api_protect_course_script(true); - -// defining constants -define('ADD_THEMATIC_PLAN', 6); - -$calendar_id = ''; -if (isset($_GET['calendar_id'])) { - $calendar_id = intval($_GET['calendar_id']); -} - // get actions $actions = array('attendance_list', 'attendance_sheet_list', 'attendance_sheet_add', 'attendance_add', 'attendance_edit', 'attendance_delete', 'attendance_delete_select'); $actions_calendar = array('calendar_list', 'calendar_add', 'calendar_edit', 'calendar_delete', 'calendar_all_delete'); -$actions_thematic = array('thematic_details', 'thematic_list', 'thematic_add', 'thematic_edit', 'thematic_delete', 'moveup', 'movedown', - 'thematic_plan_list', 'thematic_plan_add', 'thematic_plan_edit', 'thematic_plan_delete', - 'thematic_advance_list', 'thematic_advance_add', 'thematic_advance_edit', 'thematic_advance_delete'); - $action = 'attendance_list'; -if (isset($_GET['action']) && (in_array($_GET['action'],$actions) || in_array($_GET['action'],$actions_calendar) || in_array($_GET['action'],$actions_thematic))) { +if (isset($_GET['action']) && (in_array($_GET['action'],$actions) || in_array($_GET['action'],$actions_calendar))) { $action = $_GET['action']; } - -if (isset($_POST['action']) && $_POST['action'] == 'thematic_delete_select') { - $action = 'thematic_delete_select'; -} - if (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'true') { $action = 'attendance_list'; } -if ($action == 'thematic_details' || $action == 'thematic_list') { - $_SESSION['thematic_control'] = $action; -} - // get attendance id -$attendance_id = 0; +$attendance_id = 0; if (isset($_GET['attendance_id'])) { $attendance_id = intval($_GET['attendance_id']); } -// get thematic id -if (isset($_GET['thematic_id'])) { - $thematic_id = intval($_GET['thematic_id']); -} - -// get thematic plan description type -if (isset($_GET['description_type'])) { - $description_type = intval($_GET['description_type']); +// get calendar id +$calendar_id = ''; +if (isset($_GET['calendar_id'])) { + $calendar_id = intval($_GET['calendar_id']); } // instance attendance object for using like library here $attendance = new Attendance(); -// instance thematic object for using like library here -$thematic = new Thematic(); - // attendance controller object $attendance_controller = new AttendanceController(); -// thematic controller object -$thematic_controller = new ThematicController(); - +// get attendance data if (!empty($attendance_id)) { // attendance data by id $attendance_data = $attendance->get_attendance_by_id($attendance_id); } -if (!empty($thematic_id)) { - // thematic data by id - $thematic_data = $thematic->get_thematic_list($thematic_id); -} - -// get default thematic plan title -$default_thematic_plan_title = $thematic->get_default_thematic_plan_title(); $htmlHeadXtra[] = ''; $htmlHeadXtra[] = ''; $htmlHeadXtra[] = ''; $htmlHeadXtra[] = ''; - // interbreadcrumbs if (!empty($_GET['gradebook']) && $_GET['gradebook']=='view' ) { $_SESSION['gradebook']=Security::remove_XSS($_GET['gradebook']); @@ -246,12 +134,10 @@ if (!empty($_GET['gradebook']) && $_GET['gradebook']=='view' ) { unset($_SESSION['gradebook']); $gradebook= ''; } - $param_gradebook = ''; if (isset($_SESSION['gradebook'])) { $param_gradebook = '&gradebook='.$gradebook; } - $student_param = ''; if (api_is_drh() && isset($_GET['student_id'])) { $student_id = intval($_GET['student_id']); @@ -260,7 +146,6 @@ if (api_is_drh() && isset($_GET['student_id'])) { $student_name = api_get_person_name($student_info['firstname'],$student_info['lastname']); $interbreadcrumb[] = array ('url' => '/main/mySpace/myStudents.php?student='.$student_id, 'name' => $student_name); } - if (!empty($gradebook)) { $interbreadcrumb[] = array ('url' => '/main/gradebook/index.php', 'name' => get_lang('ToolGradebook')); } @@ -268,42 +153,6 @@ $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action=atte if ($action == 'attendance_add') { $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('CreateANewAttendance')); } -if ($action == 'thematic_list') { - $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicControl')); -} -if ($action == 'thematic_add') { - $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$_SESSION['thematic_control'], 'name' => get_lang('ThematicControl')); - $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('NewThematicSection')); -} -if ($action == 'thematic_edit') { - $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$_SESSION['thematic_control'], 'name' => get_lang('ThematicControl')); - $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('EditThematicSection')); -} -if ($action == 'thematic_details') { - $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicControl')); -} -if ($action == 'thematic_plan_list' || $action == 'thematic_plan_delete') { - $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$_SESSION['thematic_control'], 'name' => get_lang('ThematicControl')); - $interbreadcrumb[] = array ('url' => '#', 'name' => $thematic_data['title'].':'.get_lang('ThematicPlan')); -} -if ($action == 'thematic_plan_add' || $action == 'thematic_plan_edit') { - $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$_SESSION['thematic_control'], 'name' => get_lang('ThematicControl')); - $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$thematic_id, 'name' => $thematic_data['title'].':'.get_lang('ThematicPlan')); - if ($description_type >= ADD_THEMATIC_PLAN) { - $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('NewBloc')); - } else { - $interbreadcrumb[] = array ('url' => '#', 'name' => $default_thematic_plan_title[$description_type]); - } -} -if ($action == 'thematic_advance_list') { - $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$_SESSION['thematic_control'], 'name' => get_lang('ThematicControl')); - $interbreadcrumb[] = array ('url' => '#', 'name' => $thematic_data['title'].':'.get_lang('ThematicAdvance')); -} -if ($action == 'thematic_advance_add' || $action == 'thematic_advance_edit') { - $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$_SESSION['thematic_control'], 'name' => get_lang('ThematicControl')); - $interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$thematic_id, 'name' => $thematic_data['title'].':'.get_lang('ThematicAdvance')); - $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('NewThematicAdvance')); -} if ($action == 'attendance_edit') { $interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('Edit')); } @@ -344,27 +193,6 @@ switch ($action) { case 'calendar_all_delete' : case 'calendar_delete' : $attendance_controller->attendance_calendar($action, $attendance_id, $calendar_id); break; - - case 'thematic_add' : - case 'thematic_edit' : - case 'thematic_delete' : - case 'thematic_delete_select' : - case 'thematic_details' : - case 'moveup' : - case 'movedown' : - case 'thematic_list' : $thematic_controller->thematic($action); - break; - case 'thematic_plan_list' : - case 'thematic_plan_add' : - case 'thematic_plan_edit' : - case 'thematic_plan_delete' : $thematic_controller->thematic_plan($action); - break; - case 'thematic_advance_list' : - case 'thematic_advance_add' : - case 'thematic_advance_edit' : - case 'thematic_advance_delete' : $thematic_controller->thematic_advance($action); - break; - default : $attendance_controller->attendance_list(); }