From 629726dd3f7bea10bc81774bbce2cc10497cbc59 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 20 Sep 2019 15:07:48 +0800
Subject: [PATCH] MDL-66079 assign: Switch to new gradeitem API

Part of MDL-66074
---
 mod/assign/classes/grades/gradeitems.php | 62 ++++++++++++++++++++++++
 mod/assign/lang/en/assign.php            |  2 +-
 mod/assign/lib.php                       | 10 ----
 3 files changed, 63 insertions(+), 11 deletions(-)
 create mode 100644 mod/assign/classes/grades/gradeitems.php

diff --git a/mod/assign/classes/grades/gradeitems.php b/mod/assign/classes/grades/gradeitems.php
new file mode 100644
index 00000000000..5a9ffed51a6
--- /dev/null
+++ b/mod/assign/classes/grades/gradeitems.php
@@ -0,0 +1,62 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle 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 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle 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.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Grade item mappings for the activity.
+ *
+ * @package   mod_assign
+ * @copyright Andrew Nicols <andrew@nicols.co.uk>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+declare(strict_types = 1);
+
+namespace mod_assign\grades;
+
+use \core_grades\local\gradeitem\itemnumber_mapping;
+use \core_grades\local\gradeitem\advancedgrading_mapping;
+
+/**
+ * Grade item mappings for the activity.
+ *
+ * @package   mod_assign
+ * @copyright Andrew Nicols <andrew@nicols.co.uk>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class gradeitems implements itemnumber_mapping, advancedgrading_mapping {
+
+    /**
+     * Return the list of grade item mappings for the assign.
+     *
+     * @return array
+     */
+    public static function get_itemname_mapping_for_component(): array {
+        return [
+            0 => 'submissions',
+        ];
+    }
+
+    /**
+     * Get the list of advanced grading item names for this component.
+     *
+     * @return array
+     */
+    public static function get_advancedgrading_itemnames(): array {
+        return [
+            'submissions',
+        ];
+    }
+}
diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php
index 0c1836c8db0..592d50b0886 100644
--- a/mod/assign/lang/en/assign.php
+++ b/mod/assign/lang/en/assign.php
@@ -212,6 +212,7 @@ $string['fixrescalednullgrades'] = 'This assignment contains some erroneous grad
 $string['fixrescalednullgradesconfirm'] = 'Are you sure you want to fix erroneous grades? All affected grades will be removed. This may affect course totals.';
 $string['fixrescalednullgradesdone'] = 'Grades fixed.';
 $string['gradecanbechanged'] = 'Grade can be changed';
+$string['gradeitem:submissions'] = 'Submissions';
 $string['gradersubmissionupdatedtext'] = '{$a->username} has updated their assignment submission
 for \'{$a->assignment}\' at {$a->timeupdated}
 
@@ -528,7 +529,6 @@ $string['submissionreceipthtml'] = '<p>You have submitted an assignment submissi
 $string['submissionreceiptsmall'] = 'You have submitted your assignment submission for {$a->assignment}';
 $string['submissionslocked'] = 'This assignment is not accepting submissions';
 $string['submissionslockedshort'] = 'Submission changes not allowed';
-$string['submissions'] = 'Submissions';
 $string['submissionsclosed'] = 'Submissions closed';
 $string['submissionsettings'] = 'Submission settings';
 $string['submissionstatement'] = 'Submission statement';
diff --git a/mod/assign/lib.php b/mod/assign/lib.php
index af12729cfd9..b6b81d33b5e 100644
--- a/mod/assign/lib.php
+++ b/mod/assign/lib.php
@@ -394,16 +394,6 @@ function assign_supports($feature) {
     }
 }
 
-/**
- * Lists all gradable areas for the advanced grading methods gramework
- *
- * @return array('string'=>'string') An array with area names as keys and descriptions as values
- */
-function assign_grading_areas_list() {
-    return array('submissions'=>get_string('submissions', 'assign'));
-}
-
-
 /**
  * extend an assigment navigation settings
  *
-- 
2.17.1