Readd block_evasys_sync_courses

Author: justusdieckmann

addcourse.php

@@ -25,9 +25,8 @@
 $PAGE->set_context(context_course::instance($id));
 $PAGE->set_title(get_string('add_course_header', 'block_evasys_sync'));
 
-$record = $DB->get_record('block_evasys_sync_courseeval', array('course' => $id));
-if ($record !== false and (($record->state > \block_evasys_sync\course_evaluation_allocation::STATE_AUTO_NOTOPENED) and
-    !is_siteadmin() or !get_config('block_evasys_sync', 'default_his_connection'))) {
+$evaluation = \block_evasys_sync\evaluation::for_course($id);
+if ($evaluation and !is_siteadmin() or !get_config('block_evasys_sync', 'default_his_connection')) {
     echo $OUTPUT->header();
     echo get_string('forbidden', 'block_evasys_sync');
     echo $OUTPUT->footer();

block_evasys_sync.php

@@ -67,6 +67,8 @@ public function get_content() {
             if ($inlsf) {
                 $href = new moodle_url('/course/view.php', array('id' => $this->page->course->id, "evasyssynccheck" => true));
                 $this->content->text .= $OUTPUT->single_button($href, get_string('checkstatus', 'block_evasys_sync'), 'get');
+            } else {
+                $this->content->text .= get_string('missing_course_id', 'block_evasys_sync');
             }
             return $this->content;
         }
@@ -191,7 +193,7 @@ public function get_content() {
             // If the evaluation hasn't ended yet, display option to restart it.
                 'startoption' => $startoption,
             // Only allow coursemapping before starting an evaluation.
-                'coursemappingenabled' => false,
+                'coursemappingenabled' => $hisconnection and (!$startdisabled or is_siteadmin()),
                 'nostudents' => $nostudents,
                 'emailsentnotice' => $emailsentnotice,
                 'evaluationperiodsetnotice' => $periodsetnotice,

classes/evasys_synchronizer.php

@@ -45,11 +45,27 @@ public function get_allocated_courses() {
         }
         $course = get_course($this->courseid);
 
-        $this->evasyscourses = [];
-
         if ($course->idnumber) {
-            $this->evasyscourses = [$course->idnumber];
+            $maincourse = $course->idnumber;
+        }
+        // Fetch persistent object id.
+        $pid = $DB->get_field('block_evasys_sync_courses', 'id', array('course' => $this->courseid));
+
+        // Get all associated courses.
+        if (!$pid === false) {
+            $extras = new \block_evasys_sync\course_evasys_courses_allocation($pid);
+            $extras = explode('#', $extras->get('evasyscourses'));
+        } else {
+            $extras = [];
         }
+        // If noone has associated the course itself, we force that.
+        if (isset($maincourse) && !empty($maincourse)) {
+            if (!in_array($maincourse, $extras)) {
+                $extras[] = $maincourse;
+            }
+        }
+        $extras = array_filter($extras);
+        $this->evasyscourses = $extras;
         return $this->evasyscourses;
     }
 
@@ -110,7 +126,7 @@ public function get_course_name($coursekey) {
         if (isset($this->courseinformation[$coursekey])) {
             return $this->courseinformation[$coursekey]->m_sCourseTitle;
         }
-        return "Unknown";
+        return get_string('no_evasys_course_found', 'block_evasys_sync');
     }
 
     public function get_raw_course_name($courseid): ?string {

db/install.xml

@@ -23,6 +23,20 @@
         <KEY NAME="userid" TYPE="foreign" FIELDS="userid" REFTABLE="user" REFFIELDS="id"/>
       </KEYS>
     </TABLE>
+    <TABLE NAME="block_evasys_sync_courses" COMMENT="Maps one moodle course to multiple EvaSys-courses">
+      <FIELDS>
+        <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
+        <FIELD NAME="course" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
+        <FIELD NAME="evasyscourses" TYPE="text" NOTNULL="true" SEQUENCE="false"/>
+        <FIELD NAME="usermodified" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
+        <FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
+        <FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
+      </FIELDS>
+      <KEYS>
+        <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
+        <KEY NAME="survey" TYPE="foreign-unique" FIELDS="course" REFTABLE="course" REFFIELDS="id"/>
+      </KEYS>
+    </TABLE>
     <TABLE NAME="block_evasys_sync_ereq" COMMENT="Table of outstanding evaluation (change) requests">
       <FIELDS>
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>

db/upgrade.php

@@ -487,9 +487,9 @@ function xmldb_block_evasys_sync_upgrade ($oldversion) {
         $table = new xmldb_table('block_evasys_sync_courses');
 
         // Conditionally launch drop table for block_evasys_sync_courses.
-        if ($dbman->table_exists($table)) {
+        /*if ($dbman->table_exists($table)) {
             $dbman->drop_table($table);
-        }
+        }*/
 
         /// Edit block_evasys_sync_categories ///
 

lang/de/block_evasys_sync.php

@@ -287,3 +287,5 @@
 $string['no_eval_planned'] = 'Es ist keine Evaluation geplant.';
 $string['evaluation_will_be_created_for_you'] = 'Eine Evaluation wird für Sie erstellt.';
 
+$string['missing_course_id'] = 'Fehlende Kurs-ID';
+$string['no_evasys_course_found'] = 'Kein passender EvaSys-Kurs gefunden';

lang/en/block_evasys_sync.php

@@ -296,4 +296,7 @@
 $string['request_eval'] = 'Request evaluation';
 
 $string['no_eval_planned'] = 'There is no evaluation planned.';
-$string['evaluation_will_be_created_for_you'] = 'An evaluation will be created for you.';
+$string['evaluation_will_be_created_for_you'] = 'An evaluation will be created for you.';
+
+$string['missing_course_id'] = 'Missing course id';
+$string['no_evasys_course_found'] = 'No matching EvaSys-Course found';