Merge branch 'learnweb-master' into behat2

Author: rtschu

amd/build/initialize.min.js

@@ -1,5 +1,5 @@
 define(['jquery', 'core/notification', 'core/str'], function ($, notification, str) {
-    var init = function(starttime, endtime) {
+    var init = function(starttime, endtime, mode) {
         var start = new Date(starttime * 1000);
         var end = new Date(endtime * 1000);
         var endenabled;
@@ -25,7 +25,7 @@ define(['jquery', 'core/notification', 'core/str'], function ($, notification, s
                     // Ask for confirmation, then enable all fields related to re-invitation.
                     str.get_strings([
                         {'key': 'confirm'},
-                        {'key': 'content_confirm_reactivate', component: 'block_evasys_sync'},
+                        {'key': 'content_confirm_reactivate_'+mode, component: 'block_evasys_sync'},
                         {'key': 'yes'},
                         {'key': 'no'},
                         {'key': 'requestagain', component: 'block_evasys_sync'}

amd/src/initialize.js

@@ -55,6 +55,10 @@ public function get_content() {
         // If there has been a status in the url, show the prompt.
         $this->display_status($status);
 
+        // Get the evasys-persistenceclass for the current course if it exists.
+        // The persistencelass only gets created when the teacher sets the evaluation period or sends an email to the coordinator.
+        $record = course_evaluation_allocation::get_record_by_course($this->page->course->id, false);
+
         // If we are not in sync mode, we display either the course mapping or the check status button.
         if ($evasyssynccheck !== 1) {
             $inlsf = (!empty($this->page->course->idnumber) or $this->page->course->idnumber === '0');
@@ -79,8 +83,12 @@ public function get_content() {
         if ($ismodeautomated) {
             $this->page->requires->js_call_amd('block_evasys_sync/invite_manager', 'init');
         } else {
-            $hasstandardtime = \block_evasys_sync\evasys_synchronizer::get_standard_timemode($this->page->course->category);
-            $this->page->requires->js_call_amd('block_evasys_sync/standardtime', 'init');
+            $categoryhasstandardtime = \block_evasys_sync\evasys_synchronizer::get_standard_timemode($this->page->course->category);
+
+            // Only use standardtime js if no record exists.
+            if (!$record) {
+                $this->page->requires->js_call_amd('block_evasys_sync/standardtime', 'init');
+            }
         }
         $evasyssynchronizer = new \block_evasys_sync\evasys_synchronizer($this->page->course->id);
         try {
@@ -110,15 +118,13 @@ public function get_content() {
         $oneweeklater->add(new \DateInterval("P7D"));
         $end = $oneweeklater->getTimestamp();
 
-        // Get the evasys-persistenceclass for the current course if it exists.
-        // The persistencelass only gets created when the teacher sets the evaluation period or sends an email to the coordinator.
-        $record = course_evaluation_allocation::get_record_by_course($this->page->course->id, false);
-
         // See if there are any students that can evaluate.
         // If there are no students we disable all controls.
         $nostudents = (count_enrolled_users(
                 context_course::instance($this->page->course->id), 'block/evasys_sync:mayevaluate') == 0);
 
+        $recordhasstandardtime = false;
+
         if ($record !== false) {
             $state = $record->get('state');
             if ($state == course_evaluation_allocation::STATE_MANUAL) {
@@ -144,14 +150,18 @@ public function get_content() {
             // Set start and end to match the period that had been set.
             $start = $record->get('startdate');
             $end = $record->get('enddate');
+            $recordhasstandardtime = $record->get('usestandardtime');
         } else {
-            if (!$ismodeautomated && $hasstandardtime) {
-                $start = $hasstandardtime['start'];
-                $end = $hasstandardtime['end'];
+            if (!$ismodeautomated && $categoryhasstandardtime) {
+                $start = $categoryhasstandardtime['start'];
+                $end = $categoryhasstandardtime['end'];
+                $recordhasstandardtime = true;
             }
         }
         // This javascript module sets the start and end fields to the correct values.
-        $this->page->requires->js_call_amd('block_evasys_sync/initialize', 'init', array($start, $end));
+        $jsmodestring = $ismodeautomated ? 'automated' : 'manual';
+        $jsmodestring .= $enddisabled ? '_closed' : '_open';
+        $this->page->requires->js_call_amd('block_evasys_sync/initialize', 'init', array($start, $end, $jsmodestring));
 
         // Initialize variables to pass to mustache.
         $unknownidnumbercourse = false;
@@ -222,7 +232,7 @@ public function get_content() {
             // Append this course.
             $courses[] = $course;
         }
-        $standardttimemode = (!$ismodeautomated && $hasstandardtime && !$record);
+        $standardttimemode = (!$ismodeautomated && $recordhasstandardtime && !$record);
         // Create the data object for the mustache table.
         $data = array(
             'href' => $href,
@@ -233,7 +243,7 @@ public function get_content() {
             * In case of the automated workflow, we require surveys
             * in order to be able to automatically trigger the evaluation. */
             'showcontrols' => ($hassurveys || !$ismodeautomated) && count($evasyscourses) > 0 && !$invalidcourses,
-            'usestandardtimelayout' => (!$ismodeautomated && $hasstandardtime && !$wasstarted),
+            'usestandardtimelayout' => (!$ismodeautomated && $recordhasstandardtime && !$wasstarted && !$record),
             // Choose mode.
             'direct' => $ismodeautomated,
             'startdisabled' => $startdisabled || $standardttimemode,

block_evasys_sync.php

@@ -53,6 +53,10 @@ protected static function define_properties() {
                 'type' => PARAM_INT,
                 'message' => new \lang_string('invaliddate', 'block_evasys_sync')
             ),
+            'usestandardtime' => array(
+                'type' => PARAM_BOOL,
+                'default' => false
+            ),
             'state' => array(
                 'type' => PARAM_INT,
                 'required' => true,

classes/course_evaluation_allocation.php

@@ -355,7 +355,8 @@ static public function get_assigned_user($course) {
      * @throws \dml_missing_record_exception
      */
     public function set_evaluation_period($dates) : bool {
-        if ($dates == 'Standard') {
+        $usestandardtime = ($dates == 'Standard');
+        if ($usestandardtime) {
             $course = get_course($this->courseid);
             $dates = self::get_standard_timemode($course->category);
         }
@@ -374,6 +375,7 @@ public function set_evaluation_period($dates) : bool {
 
         $data->set('startdate', $dates['start']);
         $data->set('enddate', $dates['end']);
+        $data->set('usestandardtime', $usestandardtime);
         $data->save();
 
         return $changed;

classes/evasys_synchronizer.php

@@ -222,5 +222,20 @@ function xmldb_block_evasys_sync_upgrade ($oldversion) {
         upgrade_block_savepoint(true, 2019201400, 'evasys_sync');
     }
 
+    if ($oldversion < 2019203100) {
+
+        // Define field usestandardtime to be added to block_evasys_sync_courseeval.
+        $table = new xmldb_table('block_evasys_sync_courseeval');
+        $field = new xmldb_field('usestandardtime', XMLDB_TYPE_INTEGER, '1', null, XMLDB_NOTNULL, null, '0', 'timemodified');
+
+        // Conditionally launch add field usestandardtime.
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+
+        // Evasys_sync savepoint reached.
+        upgrade_block_savepoint(true, 2019203100, 'evasys_sync');
+    }
+
     return true;
 }

db/upgrade.php

@@ -37,6 +37,8 @@
 $string['end'] = 'Ende';
 $string['direct_invite_checkbox'] = 'Evaluation sofort starten';
 $string['reactivate_invite'] = 'Einladung erneut durchführen';
+$string['reactivate_startdate'] = 'Startdatum anpassen';
+$string['warning_inconsistent_states'] = "Einige Umfragen sind geöffnet, aber alle Umfragen sollten geschlossen sein.";
 $string['change_mapping'] = "Weitere Veranstaltungen zuordnen";
 $string['semester'] = "Semester";
 $string['optional'] = "(Optional)";
@@ -127,9 +129,13 @@
                              "Bitte wenden Sie sich an den Support.";
 
 $string['confirm_box'] = "Verstanden";
-$string['content_confirm_reactivate'] = "Diese Option wird die Startzeit erneut freigeben. Eine erneutes Setzen der Startzeit wird " .
-                                " alle Evaluationen neu anstoßen, für die mindestens ein*e neue*r Teilnehmer*in vorhanden ist. <br />" .
-                                "Sind Sie sicher, dass sie die Startzeit freigeben möchten?";
+$string['content_confirm_reactivate_automated_closed'] = 'Sind Sie sicher, dass Sie die Evaluation erneut beginnen möchten?';
+$string['content_confirm_reactivate_automated_open'] = 'Sind Sie sicher, dass Sie die Startzeit ändern möchten?';
+$string['content_confirm_reactivate_manual_closed'] = 'Sind Sie sicher, dass Sie die Evaluation erneut beginnen möchten? ' .
+    'Evaluationskoordinator*innen werden über die Änderung informiert und können die Evaluation anschließend neu starten.';
+$string['content_confirm_reactivate_manual_open'] = 'Sind Sie sicher, dass Sie die Startzeit ändern möchten? ' .
+    'Evaluationskoordinator*innen werden über die Änderung informiert und können die Evaluation anpassen, ' .
+    'aber es ist nicht sicher, dass dies rechtzeitig geschieht.';
 
 // Survey status.
 $string['surveystatusopen'] = 'offen';

lang/de/block_evasys_sync.php

@@ -39,6 +39,8 @@
 $string['semester'] = "Semester";
 $string['direct_invite_checkbox'] = 'Start evaluation immediately';
 $string['reactivate_invite'] = 'Invite students again';
+$string['reactivate_startdate'] = 'Modify start date';
+$string['warning_inconsistent_states'] = "There are some open surveys, but all surveys should be closed.";
 $string['optional'] = '(optional)';
 $string['standard_period'] = "Standard evaluationperiod:";
 $string['different_period'] = "Exceptional evaluationperiod:";
@@ -106,8 +108,14 @@
 $string['direct_title_info'] = "Invitation already complete";
 $string['title_send_rejected'] = "Invalid Date";
 $string['content_send_rejected'] = "One or more dates have been set to a date in the past. <br />" .
-    "This is not allowed. Some evaluationperiods may have been altered.<br />";
-$string['content_confirm_reactivate'] = "Are you sure you want to reactivate the invite options? This will restart all surveys with at least one new participant";
+    "This is not allowed. Some evaluation periods may have been altered.<br />";
+$string['content_confirm_reactivate_automated_closed'] = 'Are you sure you want to change the start date?';
+$string['content_confirm_reactivate_automated_open'] = 'Are you sure you want to restart the evaluation?';
+$string['content_confirm_reactivate_manual_closed'] = 'Are you sure you want to restart the evaluation? ' .
+    'Submitting the form will cause the coordinator to be notified of the change, who is then able to restart the evaluation.';
+$string['content_confirm_reactivate_manual_open'] = 'Are you sure you want to change the start date? ' .
+    'Submitting the form will cause the coordinator to be notified of the change, but there is no guarantee ' .
+    'that the dates will be modified in time.';
 
 // Alert Coordinator mail.
 $string['alert_email_subject'] = 'Evaluationszeitraum gesetzt für {$a}';

lang/en/block_evasys_sync.php

@@ -19,9 +19,13 @@
 
 require_once('../../config.php');
 
-require_login();
-require_sesskey();
 $courseid = required_param('courseid', PARAM_INT);
+require_login($courseid);
+require_sesskey();
+
+$returnurl = new moodle_url($CFG->wwwroot . '/course/view.php');
+$returnurl->param('id', $courseid);
+$returnurl->param('evasyssynccheck', 1);
 
 if (!optional_param('activate_standard', false, PARAM_BOOL)) {
     if (optional_param('only_end', false, PARAM_BOOL)) {
@@ -57,6 +61,15 @@
     $enddate->setTime($endhour, $endmin);
 
     $dates = ["start" => $startdate->getTimestamp(), "end" => $enddate->getTimestamp()];
+
+    if ($dates['start'] > $dates['end']) {
+        redirect($returnurl, get_string('syncstartafterend', 'block_evasys_sync'), 0, \core\output\notification::NOTIFY_ERROR);
+        exit();
+    }
+    if (time() > $dates['end']) {
+        redirect($returnurl, get_string('syncendinthepast', 'block_evasys_sync'), 0, \core\output\notification::NOTIFY_ERROR);
+        exit();
+    }
 } else {
     $dates = "Standard";
     // We can't detect that anyways since we don't know the dates.
@@ -79,19 +92,6 @@
 $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);
-
-if ($dates['start'] > $dates['end']) {
-    redirect($returnurl, get_string('syncstartafterend', 'block_evasys_sync'), 0, \core\output\notification::NOTIFY_ERROR);
-    exit();
-}
-if (time() > $dates['end']) {
-    redirect($returnurl, get_string('syncendinthepast', 'block_evasys_sync'), 0, \core\output\notification::NOTIFY_ERROR);
-    exit();
-}
-
 try {
     if (count_enrolled_users(context_course::instance($courseid), 'block/evasys_sync:mayevaluate') == 0) {
         $returnurl->param('status', 'nostudents');