From 2b4bbbe820fb5f6d3df2a9ddc4cb69c67fda0889 Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Tue, 26 Feb 2013 17:22:52 +0800
Subject: [PATCH] Moved the rendering of the header form element for each
 customcert element to edit_form.php

The render_common_form_elements function was removed in the base class and it's contents put into the render_form_element function. These changes mean that some elements may not be required to override the render_form_element function, such as the studentname element, where this function was removed.
---
 edit_form.php                    |  3 +++
 elements/element.class.php       | 14 +-------------
 elements/grade/lib.php           |  6 +-----
 elements/grade/version.php       |  2 +-
 elements/studentname/lib.php     | 17 -----------------
 elements/studentname/version.php |  2 +-
 6 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/edit_form.php b/edit_form.php
index e782ac1..7a2cd32 100644
--- a/edit_form.php
+++ b/edit_form.php
@@ -244,6 +244,9 @@ class mod_customcert_edit_form extends moodleform {
                 // It's possible this element was added to the database then the folder was deleted, if
                 // this is the case we do not want to render these elements as an error will occur.
                 if (file_exists($classfile)) {
+                    // Add element header.
+                    $mform->addElement('header', 'headerelement_' . $element->id, get_string('page', 'customcert', $pagenum) . " - " .
+                        get_string('pluginname', 'customcertelement_' . $element->element));
                     // Add the page number to the element so we can use within the element.
                     $element->pagenum = $pagenum;
                     // Get the classname.
diff --git a/elements/element.class.php b/elements/element.class.php
index 55c39ae..f41823e 100644
--- a/elements/element.class.php
+++ b/elements/element.class.php
@@ -69,23 +69,11 @@ class customcert_element_base {
 
     /**
      * This function renders the form elements when adding a customcert element.
-     * Must be overriden.
+     * Can be overridden if more functionality is needed.
      *
      * @param stdClass $mform the edit_form instance.
-     * @return array the form elements
      */
     public function render_form_elements($mform) {
-        // Must be overriden.
-        return false;
-    }
-
-    /**
-     * This function renders the common form elements when adding a customcert element.
-     *
-     * @param stdClass $mform the edit_form instance.
-     * @return array the form elements
-     */
-    public function render_common_form_elements($mform) {
         // The identifier.
         $id = $this->element->id;
 
diff --git a/elements/grade/lib.php b/elements/grade/lib.php
index 17a31e2..6f7943a 100644
--- a/elements/grade/lib.php
+++ b/elements/grade/lib.php
@@ -60,15 +60,11 @@ class customcert_element_grade extends customcert_element_base {
             $gradeformat = $gradeinfo->gradeformat;
         }
 
-        // Add element header.
-        $mform->addElement('header', 'headerelement_' . $id, get_string('page', 'customcert', $this->element->pagenum) . " - " .
-            get_string('pluginname', 'customcertelement_grade'));
-
         // The elements unique to this field.
         $mform->addElement('select', 'gradeitem_' . $id, get_string('gradeitem', 'customcertelement_grade'), $this->get_grade_items());
         $mform->addElement('select', 'gradeformat_' . $id, get_string('gradeformat', 'customcertelement_grade'), $this->get_grade_format_options());
 
-        parent::render_common_form_elements($mform);
+        parent::render_form_elements($mform);
 
         $mform->setDefault('gradeitem_' . $id, $gradeitem);
         $mform->setDefault('gradeformat_' . $id, $gradeformat);
diff --git a/elements/grade/version.php b/elements/grade/version.php
index 5450b0b..6705531 100644
--- a/elements/grade/version.php
+++ b/elements/grade/version.php
@@ -1,6 +1,6 @@
 <?php
 
-// This file is part of Moodle - http://moodle.org/
+// This file is part of the customcert module for 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
diff --git a/elements/studentname/lib.php b/elements/studentname/lib.php
index ac39747..748ab48 100644
--- a/elements/studentname/lib.php
+++ b/elements/studentname/lib.php
@@ -38,23 +38,6 @@ class customcert_element_studentname extends customcert_element_base {
         parent::__construct($element);
     }
 
-    /**
-     * This function renders the form elements when adding a customcert element.
-     *
-     * @param stdClass $mform the edit_form instance.
-     * @return array the form elements
-     */
-    public function render_form_elements($mform) {
-        // The identifier.
-        $id = $this->element->id;
-
-        // Add element header.
-        $mform->addElement('header', 'headerelement_' . $id, get_string('page', 'customcert', $this->element->pagenum) . " - "
-            . get_string('pluginname', 'customcertelement_studentname'));
-
-        parent::render_common_form_elements($mform);
-    }
-
     /**
      * Handles displaying the element on the pdf.
      *
diff --git a/elements/studentname/version.php b/elements/studentname/version.php
index 487d020..9c2cea4 100644
--- a/elements/studentname/version.php
+++ b/elements/studentname/version.php
@@ -1,6 +1,6 @@
 <?php
 
-// This file is part of Moodle - http://moodle.org/
+// This file is part of the customcert module for 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