]> git.mjollnir.org Git - moodle.git/commitdiff
MDL-10210 MDL-10207 Tabs implemented.
authornicolasconnault <nicolasconnault>
Mon, 25 Jun 2007 09:37:26 +0000 (09:37 +0000)
committernicolasconnault <nicolasconnault>
Mon, 25 Jun 2007 09:37:26 +0000 (09:37 +0000)
grade/report.php
grade/report/admin/README.txt [deleted file]
grade/report/admin/db/access.php [deleted file]
grade/report/admin/index.php [deleted file]
grade/report/grader/category.php
grade/report/grader/index.php
grade/report/user/index.php
lang/en_utf8/gradereport_admin.php [deleted file]
lang/en_utf8/grades.php

index 1a3909370d49f299113f22d03c255af3048a1c15..b88478d6debc986f313c6b66dfb80fe80731ea65 100644 (file)
@@ -26,7 +26,7 @@
     require_once("../config.php");
     require_once("../lib/gradelib.php");
 
-    $courseid = required_param('courseid');              // course id
+    $courseid = required_param('id');              // course id
     $report   = optional_param('report', 'user', PARAM_FILE);              // course id
 
 
@@ -93,7 +93,7 @@
 /// Print the report selector at the top if there is more than one report
 
     if ($reportnames) {
-        popup_form($CFG->wwwroot.'/grade/report.php?courseid='.$course->id.'&amp;report=', $reportnames, 
+        popup_form($CFG->wwwroot.'/grade/report.php?id='.$course->id.'&amp;report=', $reportnames, 
                    'choosegradereport', $report, '', '', '', false, 'self', get_string('gradereports', 'grades').':');
     }
 
diff --git a/grade/report/admin/README.txt b/grade/report/admin/README.txt
deleted file mode 100644 (file)
index 7836ea2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-The default gradebook interface that teachers will use.
diff --git a/grade/report/admin/db/access.php b/grade/report/admin/db/access.php
deleted file mode 100644 (file)
index a67c2ab..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php  // $Id$
-
-$gradereport_grader_capabilities = array(
-
-    'gradereport/grader:view' => array(
-        'riskbitmask' => RISK_PERSONAL,
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    ),
-
-    'gradereport/grader:manage' => array(
-        'riskbitmask' => RISK_PERSONAL | RISK_CONFIG,
-        'captype' => 'write',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    )
-
-);
-
-?>
diff --git a/grade/report/admin/index.php b/grade/report/admin/index.php
deleted file mode 100644 (file)
index ded3394..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 2001-2007  Martin Dougiamas  http://dougiamas.com       //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-set_time_limit(0);
-require_once $CFG->libdir . '/grade/grade_tree.php';
-require_once $CFG->libdir . '/gradelib.php';
-
-$param = new stdClass();
-
-$param->courseid      = optional_param('courseid', 0 , PARAM_INT);
-$param->moveup        = optional_param('moveup', 0, PARAM_INT);
-$param->movedown      = optional_param('movedown', 0, PARAM_INT);
-$param->source        = optional_param('source', 0, PARAM_INT);
-$param->action        = optional_param('action', 0, PARAM_ALPHA);
-$param->move          = optional_param('move', 0, PARAM_INT);
-$param->type          = optional_param('type', 0, PARAM_ALPHA);
-$param->target        = optional_param('target', 0, PARAM_INT);
-$param->confirm       = optional_param('confirm', 0, PARAM_INT);
-$param->items         = optional_param('items', 0, PARAM_INT);
-$param->categories    = optional_param('categories', 0, PARAM_INT);
-$param->element_type  = optional_param('element_type', 0, PARAM_ALPHA);
-$param->category_name = optional_param('category_name', 0, PARAM_ALPHA);
-
-$report = optional_param('report', 0, PARAM_ALPHANUM);
-
-print_object($param);
-
-$tree = new grade_tree($param->courseid);
-$select_source = false;
-
-if (!empty($param->action) && !empty($param->source) && confirm_sesskey()) {
-    $element = $tree->locate_element($param->source);
-    $element_name = $element->element['object']->get_name();
-    
-    $strselectdestination = get_string('selectdestination', 'grades', $element_name);
-    $strmovingelement     = get_string('movingelement', 'grades', $element_name);
-    $strcancel            = get_string('cancel');
-
-    print_heading($strselectdestination); 
-
-    echo $strmovingelement . ' (<a href="category.php?cancelmove=true' . $tree->commonvars . '">' . $strcancel . '</a>)' . "\n";
-} elseif (!empty($param->source) && confirm_sesskey()) {
-    if (!empty($param->moveup)) {
-        $tree->move_element($param->source, $param->moveup); 
-    } elseif(!empty($param->movedown)) {
-        $tree->move_element($param->source, $param->movedown, 'after');
-    } elseif(!empty($param->move)) {
-        $tree->move_element($param->source, $param->move, 'after');
-    }
-    
-    $tree->renumber();
-    $tree->update_db();
-} elseif (!empty($param->target) && !empty($param->action) && confirm_sesskey()) {
-    $element = $tree->locate_element($param->target);
-    switch ($param->action) {
-        case 'edit':
-            break;
-        case 'delete':
-            if ($param->confirm == 1) { // Perform the deletion
-                $tree->remove_element($param->target);
-                $tree->renumber();
-                $tree->update_db();
-                // Print result message
-                
-            } else { // Print confirmation dialog
-                $strdeletecheckfull = get_string('deletecheck', '', $element->element['object']->get_name());
-                $linkyes = "category.php?target=$param->target&amp;action=delete&amp;confirm=1$tree->commonvars";
-                $linkno = "category.php?$tree->commonvars";
-                notice_yesno($strdeletecheckfull, $linkyes, $linkno);
-            }
-            break;
-        
-        case 'hide':
-        // TODO Implement calendar for selection of a date to hide element until
-            if (!$element->element['object']->set_hidden(1)) {
-                debugging("Could not update the element's hidden state!");
-            } else {
-                $tree = new grade_tree($param->courseid);
-            }
-            break;
-        case 'show':
-            if (!$element->element['object']->set_hidden(0)) {
-                debugging("Could not update the element's hidden state!");
-            } else {
-                $tree = new grade_tree($param->courseid);
-            }
-            break;
-        case 'lock':
-        // TODO Implement calendar for selection of a date to lock element after
-            if (!$element->element['object']->set_locked(1)) {
-                debugging("Could not update the element's locked state!");
-            } else {
-                $tree = new grade_tree($param->courseid);
-            }
-            break;
-        case 'unlock':
-            if (!$element->element['object']->set_locked(0)) {
-                debugging("Could not update the element's locked state!");
-            } else {
-                $tree = new grade_tree($param->courseid);
-            }
-            break;
-        default:
-            break;
-    }
-    unset($param->target);
-} elseif (!empty($param->element_type) && !empty($param->action) && $param->action == 'create' && confirm_sesskey()) {
-    if (empty($param->category_name)) {
-        notice(get_string('createcategoryerror', 'grades') . ': ' . get_string('nocategoryname', 'grades'));
-    } elseif ($param->element_type == 'items') {
-
-        if (!empty($param->items)) {
-            $category = new grade_category();
-            $category->fullname = $param->category_name;
-            $category->courseid = $tree->courseid;
-            $category->insert();
-
-            $items = array();
-            
-            foreach ($param->items as $sortorder => $useless_var) {
-                $element = $tree->locate_element($sortorder);
-                $items[$element->element['object']->id] = $element->element['object'];
-            }
-            
-            if ($category->set_as_parent($items) && $category->update()) {
-                $tree = new grade_tree($param->courseid);
-            } else { // creation of category didn't work, print a message
-                debugging("Could not create a parent category over the items you selected..");
-            } 
-
-        } else { // No items selected. Can't create a category over them...
-            notice(get_string('createcategoryerror', 'grades') . ': ' . get_string('noselecteditems', 'grades'));
-        }
-    } elseif ($param->element_type == 'categories') {
-        if (!empty($param->categories)) {
-            $category = new grade_category();
-            $category->fullname = $param->category_name;
-            $category->courseid = $tree->courseid;
-            $category->insert();
-
-            $categories = array();
-            foreach ($param->categories as $sortorder => $useless_var) {
-                $element = $tree->locate_element($sortorder);
-                $categories[$element->element['object']->id] = $element->element['object'];
-            }
-
-            if ($category->set_as_parent($categories) && $category->update()) {
-                $tree = new grade_tree($param->courseid);
-            } else { // creation of category didn't work, print a message
-                debugging("Could not create a parent category over the categories you selected..");
-            }
-
-        } else { // No categories selected. Can't create a category over them...
-            notice(get_string('createcategoryerror', 'grades') . ': ' . get_string('noselectedcategories', 'grades'));
-        }
-
-    } else { // The element_type wasn't set properly, throw up an error
-
-    }
-}
-print_heading(get_string('graderreport', 'grades'));
-
-// Add tabs
-if (empty($report)) {
-    $report = 'admin';
-}
-
-$tabs = $row = array();
-$row[] = new tabobject('grader', 'report.php?courseid='.$course->id.'&amp;report=grader',
-                       get_string('viewgrades', 'grades'));
-$row[] = new tabobject('admin', 'report.php?courseid='.$course->id.'&amp;report=admin',
-                       get_string('categories', 'grades'));
-$tabs[] = $row;
-
-print_tabs($tabs, $report);
-
-echo $tree->get_edit_tree(1, null, $param->source, $param->action, $param->type);
-?>
index 947514a27325468c68e32d6c3005ae9761d9e83a..2c8e9e1b253b1a0197138ace4729fa07ba37ab4d 100644 (file)
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 set_time_limit(0);
+require_once '../../../config.php';
 require_once $CFG->libdir . '/grade/grade_tree.php';
 require_once $CFG->libdir . '/gradelib.php';
 
 $param = new stdClass();
 
-$param->courseid      = optional_param('courseid', 0 , PARAM_INT);
+$param->courseid      = optional_param('id', 0 , PARAM_INT);
 $param->moveup        = optional_param('moveup', 0, PARAM_INT);
 $param->movedown      = optional_param('movedown', 0, PARAM_INT);
 $param->source        = optional_param('source', 0, PARAM_INT);
@@ -41,8 +42,30 @@ $param->items         = optional_param('items', 0, PARAM_INT);
 $param->categories    = optional_param('categories', 0, PARAM_INT);
 $param->element_type  = optional_param('element_type', 0, PARAM_ALPHA);
 $param->category_name = optional_param('category_name', 0, PARAM_ALPHA);
+$courseid = $param->courseid;
 
-print_object($param);
+/// Make sure they can even access this course
+
+if (!$course = get_record('course', 'id', $courseid)) {
+    print_error('nocourseid');
+}
+
+require_login($course->id);
+
+$context = get_context_instance(CONTEXT_COURSE, $course->id);
+
+$strgrades = get_string('grades');
+$strgraderreport = get_string('graderreport', 'grades');
+$strcategoriesedit = get_string('categoriesedit', 'grades');
+
+$crumbs[] = array('name' => $strgrades, 'link' => '', 'type' => 'misc');
+$crumbs[] = array('name' => $strgraderreport, 'link' => '', 'type' => 'misc');
+$crumbs[] = array('name' => $strcategoriesedit, 'link' => '', 'type' => 'misc');
+
+$navigation = build_navigation($crumbs);
+
+print_header_simple($strgrades.': '.$strgraderreport.': '.$strcategoriesedit, $navigation, 
+                    '', '', true, '', navmenu($course));
 
 $tree = new grade_tree($param->courseid);
 $select_source = false;
@@ -177,6 +200,11 @@ if (!empty($param->action) && !empty($param->source) && confirm_sesskey()) {
 
     }
 }
-print_heading(get_string('graderreport', 'grades'));
+
+print_heading(get_string('categoriesedit', 'grades'));
+// Add tabs
+$currenttab = 'editcategory'; 
+include('tabs.php');
 echo $tree->get_edit_tree(1, null, $param->source, $param->action, $param->type);
+print_footer($course);
 ?>
index f1767db0a5eb361b28a8dfaf8a47f3da220e2023..c336ff1df4d791fd10b596c4914323b2fd26d6fd 100644 (file)
@@ -6,7 +6,7 @@ require_once($CFG->libdir.'/tablelib.php');
 include_once($CFG->libdir.'/gradelib.php');
 
 // get the params
-$courseid = required_param('courseid', PARAM_INT);
+$courseid = required_param('id', PARAM_INT);
 $context = get_context_instance(CONTEXT_COURSE, $courseid);
 $page = optional_param('page', 0, PARAM_INT);
 $sortitemid = optional_param('sortitemid', 0, PARAM_ALPHANUM); // sort by which grade item
@@ -110,23 +110,13 @@ if ($grades = get_records_sql($sql)) {
 print_heading('Grader Report');
 
 // Add tabs
-if (empty($report)) {
-    $report = 'grader';
-}
-
-$tabs = $row = array();
-$row[] = new tabobject('grader', 'report.php?courseid='.$course->id.'&amp;report=grader',
-                       get_string('viewgrades', 'grades'));
-$row[] = new tabobject('categories', 'report.php?courseid='.$course->id.'&amp;report=admin',
-                       get_string('categories', 'grades'));
-$tabs[] = $row;
-
-print_tabs($tabs, $report);
+$currenttab = 'graderreport'; 
+include('tabs.php');
 
 // base url for sorting by first/last name
-$baseurl = 'report.php?courseid='.$courseid.'&amp;report=grader&amp;page='.$page;
+$baseurl = 'report.php?id='.$courseid.'&amp;report=grader&amp;page='.$page;
 // base url for paging
-$pbarurl = 'report.php?courseid='.$courseid.'&amp;report=grader&amp;';
+$pbarurl = 'report.php?id='.$courseid.'&amp;report=grader&amp;';
 
 print_paging_bar($numusers, $page, $perpage, $pbarurl);
 
index 19dd9226a8289711b380314da83db4219508afd1..07e042856c17583a8cec8d5b03b717b7e407f6bb 100644 (file)
@@ -6,7 +6,7 @@ require_once($CFG->libdir.'/tablelib.php');
 include_once($CFG->libdir.'/gradelib.php');
 
 // get the params
-$courseid = required_param('courseid', PARAM_INT);
+$courseid = required_param('id', PARAM_INT);
 if (!$userid = optional_param('user', 0, PARAM_INT)) {
     // current user
     $userid = $USER->id;  
@@ -22,7 +22,7 @@ if ($gradetree = new grade_tree($courseid)) {
     * Table has 6 columns 
     *| pic  | itemname/description | grade (grade_final) | percentage | rank | feedback |
     */
-    $baseurl = $CFG->wwwroot.'/grade/report?courseid='.$id.'&amp;userid='.$userid;
+    $baseurl = $CFG->wwwroot.'/grade/report?id='.$id.'&amp;userid='.$userid;
  
     // setting up table headers
     $tablecolumns = array('itempic', 'itemname', 'grade', 'percentage', 'rank', 'feedback');
diff --git a/lang/en_utf8/gradereport_admin.php b/lang/en_utf8/gradereport_admin.php
deleted file mode 100644 (file)
index 89d8652..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?PHP // $Id$ 
-
-$string['modulename'] = 'Categories';
-$string['admin:manage'] = 'Edit Grade Categories';
-
-?>
index c6839c7a72f27b42db91cacbfaf5757ea78a96f0..b76b78f5bf5f701fdb5896dac0d0c05b2e0403c4 100644 (file)
@@ -13,6 +13,7 @@ $string['baduser'] = 'Supplied user is invalid';
 $string['bonuspoints'] = 'Bonus Points';
 $string['categories'] = 'Categories';
 $string['category'] = 'Category';
+$string['categoriesedit'] = 'Edit Categories';
 $string['categoryname'] = 'Category name';
 $string['choosecategory'] = 'Select Category';
 $string['createcategory'] = 'Create Category';
@@ -61,6 +62,7 @@ $string['gradeletternote'] = 'To delete a grade letter just empty any of the<br
 $string['gradepreferenceshelp'] = 'Grade Preferences Help';
 $string['grades'] = 'Grades';
 $string['gradereports'] = 'Grades report';
+$string['graderreport'] = 'Grader report';
 $string['gradeweighthelp'] = 'Grade Weight Help';
 $string['hideadvanced'] = 'Hide Advanced Features';
 $string['hidecategory'] = 'Hidden';