Adapt sync.php to new db structure

Author: justusdieckmann

block_evasys_sync.php

@@ -191,7 +191,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' => $hisconnection and (!$startdisabled or is_siteadmin()),
+                'coursemappingenabled' => false,
                 'nostudents' => $nostudents,
                 'emailsentnotice' => $emailsentnotice,
                 'evaluationperiodsetnotice' => $periodsetnotice,

classes/evasys_synchronizer.php

@@ -16,6 +16,8 @@
 
 namespace block_evasys_sync;
 
+use block_evasys_sync\local\entity\evaluation_state;
+
 defined('MOODLE_INTERNAL') || die();
 
 require_once($CFG->libdir . '/adminlib.php');
@@ -56,7 +58,6 @@ private function get_course_information() {
         foreach ($this->get_allocated_courses() as $course) {
             $soapresult = $this->soapclient->GetCourse($course, 'PUBLIC', true, true);
             if (is_soap_fault($soapresult)) {
-                var_dump($soapresult);
                 // var_dump("soap verbindung nicht funktioniert");
                 // This happens e.g. if there is no corresponding course in EvaSys.
                 return null;
@@ -354,26 +355,33 @@ static public function get_assigned_user($course) {
      */
     public function set_evaluation_period($dates) : bool {
         $usestandardtime = ($dates == 'Standard');
+        $course = get_course($this->courseid);
         if ($usestandardtime) {
-            $course = get_course($this->courseid);
             $dates = self::get_standard_timemode($course->category);
         }
         $changed = false;
-        $data = course_evaluation_allocation::get_record_by_course($this->courseid, false);
+        $data = evaluation::for_course($this->courseid);
         if (!$data) {
-            $data = new course_evaluation_allocation(0);
-            $data->set('course', $this->courseid);
-            $data->set('state', course_evaluation_allocation::STATE_MANUAL);
+            $data = new evaluation();
+            $data->courses = [$this->courseid];
+            foreach ($this->courseinformation as $lsfid => $information) {
+                $data->evaluations[$lsfid] = (object) [
+                        'title' => $this->get_raw_course_name($lsfid),
+                        'lsfid' => $lsfid,
+                        'start' => $dates['start'],
+                        'end' => $dates['end'],
+                        'state' => evaluation_state::MANUAL
+                ];
+            }
         } else {
-            // Don't display date changed warning on first sync.
-            if ($data->get('startdate') != $dates['start'] || $data->get('enddate') != $dates['end']) {
-                $changed = true;
+            foreach ($data->evaluations as &$evaluation) {
+                if ($evaluation->start != $dates['start'] || $evaluation['end'] != $dates['end']) {
+                    $changed = true;
+                    $evaluation->start = $dates['start'];
+                    $evaluation->end = $dates['end'];
+                }
             }
         }
-
-        $data->set('startdate', $dates['start']);
-        $data->set('enddate', $dates['end']);
-        $data->set('usestandardtime', $usestandardtime);
         $data->save();
 
         return $changed;

sync.php

@@ -23,6 +23,12 @@
 require_login($courseid);
 require_sesskey();
 
+$PAGE->set_url('/blocks/evasys_sync/sync.php');
+$DB->get_record('course', array('id' => $courseid), 'id', MUST_EXIST);
+
+$PAGE->set_context(context_course::instance($courseid));
+require_capability('block/evasys_sync:synchronize', context_course::instance($courseid));
+
 $returnurl = new moodle_url($CFG->wwwroot . '/course/view.php');
 $returnurl->param('id', $courseid);
 $returnurl->param('evasyssynccheck', 1);
@@ -80,18 +86,12 @@
     $evasyssynchronizer = new \block_evasys_sync\evasys_synchronizer($courseid);
     $datechanged = $evasyssynchronizer->set_evaluation_period($dates);
 } catch (\dml_missing_record_exception $e) {
-    debugging($exception);
+    debugging($e);
     $returnurl->param('status', 'failure');
     notice(get_string('syncnotpossible', 'block_evasys_sync'), $returnurl);
     exit();
 }
 
-$PAGE->set_url('/blocks/evasys_sync/sync.php');
-$DB->get_record('course', array('id' => $courseid), 'id', MUST_EXIST);
-
-$PAGE->set_context(context_course::instance($courseid));
-require_capability('block/evasys_sync:synchronize', context_course::instance($courseid));
-
 try {
     if (count_enrolled_users(context_course::instance($courseid), 'block/evasys_sync:mayevaluate') == 0) {
         $returnurl->param('status', 'nostudents');
@@ -113,11 +113,11 @@
         $event->trigger();
 
         $returnurl->param('status', 'success');
-        redirect($returnurl, get_string('syncsucessful', 'block_evasys_sync'), 0);
+        redirect($returnurl, get_string('syncsucessful', 'block_evasys_sync'));
         exit();
     } else {
         $returnurl->param('status', 'uptodate');
-        redirect($returnurl, get_string('syncalreadyuptodate', 'block_evasys_sync'), 0);
+        redirect($returnurl, get_string('syncalreadyuptodate', 'block_evasys_sync'));
         exit();
     }
 } catch (Exception $exception) {