wip

classes/condition/studentquiz_condition.php

@@ -25,7 +25,7 @@
 namespace mod_studentquiz\condition;
 defined('MOODLE_INTERNAL') || die();
 
-if (class_exists('\core_question\bank\search\condition')) {
+if (!class_exists('\core_question\local\bank\condition')) {
     class_alias('\core_question\bank\search\condition', '\core_question\local\bank\condition');
 }
 

classes/question/bank/anonym_creator_name_column.php

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
 /**
  * A column type for the name of the question creator.

classes/question/bank/attempts_column.php

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
 /**
  * Represent performances column in studentquiz_bank_view

classes/question/bank/comments_column.php → classes/question/bank/comment_column.php

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
 use mod_studentquiz\utils;
 

classes/question/bank/difficulty_level_column.php

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
 /**
  * Representing difficulty level column in studentquiz_bank_view

classes/question/bank/legacy/studentquiz_bank_view_pre_43.php

@@ -29,12 +29,6 @@
 use mod_studentquiz\utils;
 use stdClass;
 use core_question\local\bank\question_version_status;
-use mod_studentquiz\bank\mod_studentquiz_question_bank_filter_form;
-use mod_studentquiz\bank\studentquiz_user_filter_date;
-use mod_studentquiz\bank\user_filter_number;
-use mod_studentquiz\bank\studentquiz_user_filter_text;
-use mod_studentquiz\bank\toggle_filter_checkbox;
-use mod_studentquiz\bank\user_filter_percent;
 
 defined('MOODLE_INTERNAL') || die();
 
@@ -211,8 +205,8 @@ public function get_questions() {
      */
     protected function default_sort(): array {
         return [
-            'mod_studentquiz\bank\anonym_creator_name_column-timecreated' => -1,
-            'mod_studentquiz\bank\question_name_column' => 1,
+            'mod_studentquiz\question\bank\anonym_creator_name_column-timecreated' => -1,
+            'mod_studentquiz\question\bank\question_name_column' => 1,
         ];
     }
 

classes/question/bank/question_bank_filter.php

@@ -21,7 +21,6 @@
  * @copyright  2017 HSR (http://www.hsr.ch)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace mod_studentquiz\bank;
 
 defined('MOODLE_INTERNAL') || die();
 require_once($CFG->dirroot . '/lib/formslib.php');
@@ -35,7 +34,7 @@
  * @copyright  2017 HSR (http://www.hsr.ch)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_studentquiz_question_bank_filter_form extends moodleform {
+class mod_studentquiz_question_bank_filter_form extends \moodleform {
 
     /**
      * Filter fields of question bank
@@ -115,7 +114,7 @@ public function definition() {
  * @author     Huong Nguyen <[email protected]>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class studentquiz_user_filter_text extends user_filter_text {
+class studentquiz_user_filter_text extends \user_filter_text {
 
     /**
      * Adds controls specific to this filter in the form.
@@ -144,7 +143,7 @@ public function setupForm(&$mform) { // @codingStandardsIgnoreLine
  * @author     Huong Nguyen <[email protected]>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class studentquiz_user_filter_date extends user_filter_date {
+class studentquiz_user_filter_date extends \user_filter_date {
 
     /**
      * Adds controls specific to this filter in the form.
@@ -294,7 +293,7 @@ private function generate_creation_label($creationtext, $rowtext, $inputtext, $i
  *
  * They have no own value but refer a the target field which is set to a defined value once toggled.
  */
-class toggle_filter_checkbox extends user_filter_checkbox {
+class toggle_filter_checkbox extends \user_filter_checkbox {
 
     /**
      * Operator is a short form to express if the value

classes/question/bank/question_name_column.php

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
 /**
  * A column type for the name of the question name.

classes/question/bank/question_text_row.php

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
 /**
  * A column type for the name of the question name.

classes/question/bank/rate_column.php

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
 /**
  * Represent rate column in studentquiz_bank_view

classes/question/bank/sq_delete_action.php

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
 use mod_studentquiz\local\studentquiz_helper;
 

classes/question/bank/sq_edit_action.php

@@ -14,11 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
 use mod_studentquiz\local\studentquiz_helper;
 
-if (class_exists('\qbank_editquestion\edit_action_column')) {
+if (!class_exists('\qbank_editquestion\edit_action')) {
     class_alias('\qbank_editquestion\edit_action_column', '\qbank_editquestion\edit_action');
 }
 /**

classes/question/bank/sq_edit_menu_column.php

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
 use core_question\local\bank\edit_menu_column;
 

classes/question/bank/sq_hidden_action.php

@@ -14,9 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
-if (class_exists('\qbank_previewquestion\preview_action_column')) {
+if (!class_exists('\core_question\local\bank\question_action_base')) {
     class_alias('\core_question\local\bank\menu_action_column_base', '\core_question\local\bank\question_action_base');
 }
 /**

classes/question/bank/sq_pin_action.php

@@ -15,9 +15,9 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
-if (class_exists('\core_question\local\bank\menu_action_column_base')) {
+if (!class_exists('\core_question\local\bank\question_action_base')) {
     class_alias('\core_question\local\bank\menu_action_column_base', '\core_question\local\bank\question_action_base');
 }
 

classes/question/bank/sq_preview_action.php

@@ -14,9 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
-if (class_exists('\qbank_previewquestion\preview_action_column')) {
+if (!class_exists('\qbank_previewquestion\preview_action')) {
     class_alias('\qbank_previewquestion\preview_action_column', '\qbank_previewquestion\preview_action');
 }
 

classes/question/bank/state_column.php

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
 /**
  * Represent state column in studentquiz_bank_view

classes/question/bank/state_pin_column.php

@@ -15,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 
-namespace mod_studentquiz\bank;
+namespace mod_studentquiz\question\bank;
 
 /**
  * Represent question is pinned or not in studentquiz_bank_view