Merge branch 'MDL-77346-master' of https://github.com/meirzamoodle/mo…

…odle
moodle · Mar 30, 2023 · a5eda30 · a5eda30
2 parents 813800d + 98c55a7
commit a5eda30
Show file tree

Hide file tree

Showing 10 changed files with 148 additions and 3 deletions.
diff --git a/mod/workshop/allocation/random/lib.php b/mod/workshop/allocation/random/lib.php
@@ -731,6 +731,8 @@ class workshop_random_allocator_setting {
     public $assesswosubmission;
     /** @var bool add self-assessments */
     public $addselfassessment;
+    /** @var bool scheduled allocation status */
+    public $enablescheduled;
 
     /**
      * Use the factory method {@link self::instance_from_object()}

diff --git a/mod/workshop/eval/best/lib.php b/mod/workshop/eval/best/lib.php
@@ -35,9 +35,6 @@
  */
 class workshop_best_evaluation extends workshop_evaluation {
 
-    /** @var workshop the parent workshop instance */
-    protected $workshop;
-
     /** @var the recently used settings in this workshop */
     protected $settings;
 

diff --git a/mod/workshop/eval/lib.php b/mod/workshop/eval/lib.php
@@ -31,6 +31,9 @@
  */
 abstract class workshop_evaluation {
 
+    /** @var workshop the parent workshop instance */
+    protected $workshop;
+
     /**
      * Calculates grades for assessment and updates 'gradinggrade' fields in 'workshop_assessments' table
      *

diff --git a/mod/workshop/form/accumulative/tests/privacy/provider_test.php b/mod/workshop/form/accumulative/tests/privacy/provider_test.php
@@ -39,6 +39,36 @@
  */
 class provider_test extends provider_testcase {
 
+    /** @var \testing_data_generator data generator. */
+    protected $generator;
+
+    /** @var \mod_workshop_generator workshop generator. */
+    protected $workshopgenerator;
+
+    /** @var \stdClass course data. */
+    protected $course1;
+
+    /** @var \stdClass student data. */
+    protected $student1;
+
+    /** @var \stdClass student data. */
+    protected $student2;
+
+    /** @var \stdClass first workshop in course1 */
+    protected $workshop11;
+
+    /** @var int ID of the submission in workshop11 by student1 */
+    protected $submission111;
+
+    /** @var int ID of the assessment of submission111 by student2 */
+    protected $assessment1112;
+
+    /** @var bool|int true or new id */
+    protected $dim1;
+
+    /** @var bool|int true or new id */
+    protected $dim2;
+
     /**
      * Test {@link workshopform_accumulative\privacy\provider::export_assessment_form()} implementation.
      */

diff --git a/mod/workshop/form/assessment_form.php b/mod/workshop/form/assessment_form.php
@@ -37,6 +37,18 @@
  */
 class workshop_assessment_form extends moodleform {
 
+    /** @var string Mode to open the form in: preview/assessment. */
+    public $mode;
+
+    /** @var workshop_strategy workshop strategy */
+    public $strategy;
+
+    /** @var workshop workshop. */
+    public $workshop;
+
+    /** @var array options. */
+    public $options;
+
     /**
      * Add the fields that are common for all grading strategies.
      *

diff --git a/mod/workshop/form/comments/tests/privacy/provider_test.php b/mod/workshop/form/comments/tests/privacy/provider_test.php
@@ -39,6 +39,36 @@
  */
 class provider_test extends provider_testcase {
 
+    /** @var \testing_data_generator data generator. */
+    protected $generator;
+
+    /** @var \mod_workshop_generator workshop generator. */
+    protected $workshopgenerator;
+
+    /** @var \stdClass course data. */
+    protected $course1;
+
+    /** @var \stdClass student data. */
+    protected $student1;
+
+    /** @var \stdClass student data. */
+    protected $student2;
+
+    /** @var \stdClass first workshop in course1 */
+    protected $workshop11;
+
+    /** @var int ID of the submission in workshop11 by student1 */
+    protected $submission111;
+
+    /** @var int ID of the assessment of submission111 by student2 */
+    protected $assessment1112;
+
+    /** @var bool|int true or new id */
+    protected $dim1;
+
+    /** @var bool|int true or new id */
+    protected $dim2;
+
     /**
      * Test {@link workshopform_comments\privacy\provider::export_assessment_form()} implementation.
      */

diff --git a/mod/workshop/form/edit_form.php b/mod/workshop/form/edit_form.php
@@ -40,6 +40,9 @@ class workshop_edit_strategy_form extends moodleform {
     /** strategy logic instance that this class is editor of */
     protected $strategy;
 
+    /** @var workshop workshop. */
+    protected $workshop;
+
     /**
      * Add the fields that are common for all grading strategies.
      *

diff --git a/mod/workshop/form/numerrors/tests/privacy/provider_test.php b/mod/workshop/form/numerrors/tests/privacy/provider_test.php
@@ -39,6 +39,36 @@
  */
 class provider_test extends provider_testcase {
 
+    /** @var \testing_data_generator data generator. */
+    protected $generator;
+
+    /** @var \mod_workshop_generator workshop generator. */
+    protected $workshopgenerator;
+
+    /** @var \stdClass course data. */
+    protected $course1;
+
+    /** @var \stdClass student data. */
+    protected $student1;
+
+    /** @var \stdClass student data. */
+    protected $student2;
+
+    /** @var \stdClass first workshop in course1 */
+    protected $workshop11;
+
+    /** @var int ID of the submission in workshop11 by student1 */
+    protected $submission111;
+
+    /** @var int ID of the assessment of submission111 by student2 */
+    protected $assessment1112;
+
+    /** @var bool|int true or new id */
+    protected $dim1;
+
+    /** @var bool|int true or new id */
+    protected $dim2;
+
     /**
      * Test {@link workshopform_numerrors\privacy\provider::export_assessment_form()} implementation.
      */

diff --git a/mod/workshop/form/rubric/tests/privacy/provider_test.php b/mod/workshop/form/rubric/tests/privacy/provider_test.php
@@ -39,6 +39,36 @@
  */
 class provider_test extends provider_testcase {
 
+    /** @var \testing_data_generator data generator. */
+    protected $generator;
+
+    /** @var \mod_workshop_generator workshop generator. */
+    protected $workshopgenerator;
+
+    /** @var \stdClass course data. */
+    protected $course1;
+
+    /** @var \stdClass student data. */
+    protected $student1;
+
+    /** @var \stdClass student data. */
+    protected $student2;
+
+    /** @var \stdClass first workshop in course1 */
+    protected $workshop11;
+
+    /** @var int ID of the submission in workshop11 by student1 */
+    protected $submission111;
+
+    /** @var int ID of the assessment of submission111 by student2 */
+    protected $assessment1112;
+
+    /** @var bool|int true or new id */
+    protected $dim1;
+
+    /** @var bool|int true or new id */
+    protected $dim2;
+
     /**
      * Test {@link workshopform_rubric\privacy\provider::export_assessment_form()} implementation.
      */

diff --git a/mod/workshop/tests/external/external_test.php b/mod/workshop/tests/external/external_test.php
@@ -65,6 +65,14 @@ class external_test extends externallib_advanced_testcase {
     private $studentrole;
     /** @var stdClass teacher role object */
     private $teacherrole;
+    /** @var \stdClass student object. */
+    private $anotherstudentg1;
+    /** @var \stdClass student object. */
+    private $anotherstudentg2;
+    /** @var \stdClass group object. */
+    private $group1;
+    /** @var \stdClass group object. */
+    private $group2;
 
     /**
      * Set up for every test