Browse Source

[svn r10162] Stats of number of courses per course category
deleted HoGent specific code

Bart Mollet 18 years ago
parent
commit
252eed344b
2 changed files with 7 additions and 28 deletions
  1. 5 17
      main/admin/statistics/index.php
  2. 2 11
      main/admin/statistics/statistics.lib.php

+ 5 - 17
main/admin/statistics/index.php

@@ -80,9 +80,8 @@ $strCourse  = get_lang('Courses');
 $strUsers = get_lang('Users');
 
 
-$tools[$strCourse]['action=courses&count_invisible_courses=1'] = get_lang('Statistics_total_amount_of_courses');
-$tools[$strCourse]['action=curriculum_courses'] = get_lang('Statistics_curriculumcourses_a_year');
-$tools[$strCourse]['action=tools'] = get_lang('Statistics_Acces_to_coursemodules');
+$tools[$strCourse]['action=courses'] = get_lang('CountCours');
+$tools[$strCourse]['action=tools'] = get_lang('PlatformToolAccess');
 $tools[$strCourse]['action=courselastvisit'] = get_lang('Statistics_final_visit');
 
 
@@ -113,25 +112,14 @@ $faculties = statistics::get_faculties();
 echo '<br/><br/>';
 switch($_GET['action'])
 {
-	case $strCourse:
+	case 'courses':
 		// total amount of courses
-		statistics::print_stats(
-				get_lang('Statistics_NumberOfCourses'),
-				array(
-					get_lang('Statistics_CurriculumCourses') => statistics::count_courses(true,null,$_GET['count_invisible_courses']),
-					get_lang('Statistics_CommonCourses') => statistics::count_courses(false,null,$_GET['count_invisible_courses'])
-				)
-			);
 		foreach($faculties as $code => $name)
 		{
-			$name = str_replace(get_lang('Statistics_Department'),"",$name);
-			$cur_courses[$name] = statistics::count_courses(true,$code,$_GET['count_invisible_courses']);
-			$alg_courses[$name] = statistics::count_courses(false,$code,$_GET['count_invisible_courses']);
+			$courses[$name] = statistics::count_courses($code);
 		}
 		// curriculum-course for each department
-		statistics::print_stats(get_lang('Statistics_CurriculumCourses'),$cur_courses);
-		// general course for each department
-		statistics::print_stats(get_lang('Statistics_CommonCourses'),$alg_courses);
+		statistics::print_stats(get_lang('CountCours'),$courses);
 
 		break;
 	case $strUsers:

+ 2 - 11
main/admin/statistics/statistics.lib.php

@@ -47,23 +47,14 @@ class Statistics
 	 * @param $string faculty  Code of a faculty. Default: count all courses.
 	 * @return int Number of courses counted
 	 */
-	function count_courses($curriculum, $faculty = NULL, $count_invisible_courses = true)
+	function count_courses($faculty = NULL)
 	{
 		$course_table = Database :: get_main_table(MAIN_COURSE_TABLE);
 		$sql = "SELECT COUNT(*) AS number FROM ".$course_table." ";
-		if ($curriculum)
-		{
-			$sql .= "WHERE visual_code NOT LIKE 'ALG%'";
-		}
-		else
-		{
-			$sql .= "WHERE visual_code LIKE 'ALG%'";
-		}
 		if (isset ($faculty))
 		{
-			$sql .= " AND category_code = '$faculty'";
+			$sql .= " WHERE category_code = '$faculty'";
 		}
-
 		$res = api_sql_query($sql, __FILE__, __LINE__);
 		$obj = mysql_fetch_object($res);
 		return $obj->number;