Merge branch 'master' into feature/automatic-eval-request-rerun-evaluation

Author: Laur0r

amd/build/initialize.min.js

@@ -20,6 +20,7 @@ define(['jquery', 'core/notification', 'core/str'], function ($, notification, s
         $('[name=year_end]').last()[0].selectedIndex = end.getFullYear() - 2000;
         if ($('#reactivate').length > 0) {
             endenabled = !$('[name=minute_end]')[0].disabled;
+            datedisabled = $('[name=minute_end]')[0].disabled && $('[name=minute_start]')[0].disabled;
             $(document).on("change", "#reactivate", function() {
                 if (this.checked) {
                     // Ask for confirmation, then enable all fields related to re-invitation.
@@ -51,6 +52,9 @@ define(['jquery', 'core/notification', 'core/str'], function ($, notification, s
                                 if ($('#only_end').length > 0) {
                                     $('#only_end').prop("value", false);
                                 }
+                                if ($('#datedisabled').length > 0) {
+                                    $('#datedisabled').prop("value", false);
+                                }
                                 if ($('#evasyssubmitbutton').length > 0) {
                                     $('#evasyssubmitbutton').prop("disabled", false);
                                     $('#evasyssubmitbutton').val(s[4]);
@@ -81,6 +85,9 @@ define(['jquery', 'core/notification', 'core/str'], function ($, notification, s
                     if ($('#only_end').length > 0) {
                         $('#only_end').prop("value", true);
                     }
+                    if ($('#datedisabled').length > 0) {
+                        $('#datedisabled').prop("value", true);
+                    }
                     if ($('#evasyssubmitbutton').length > 0) {
                         if (!endenabled) {
                             $('#evasyssubmitbutton').prop("disabled", true);

amd/build/post_dialog.min.js

@@ -22,6 +22,17 @@ define(['jquery', 'core/notification', 'core/str'], function($, notification, st
         ).fail(notification.exception);
     };
 
+    var show_dialog_success_and_info = function() {
+        str.get_strings([
+            {'key' : 'title_success', component: 'block_evasys_sync'},
+            {'key' : 'content_successandinfo', component: 'block_evasys_sync'},
+            {'key' : 'confirm_box', component: 'block_evasys_sync'},
+        ]).done(function(s) {
+                notification.alert(s[0], s[1], s[2]);
+            }
+        ).fail(notification.exception);
+    }
+
     var show_dialog_nostudents = function() {
         str.get_strings([
             {'key' : 'title_failure', component: 'block_evasys_sync'},
@@ -48,6 +59,7 @@ define(['jquery', 'core/notification', 'core/str'], function($, notification, st
         show_dialog_failure: show_dialog_failure,
         show_dialog_no_students: show_dialog_nostudents,
         show_dialog_success: show_dialog_success,
-        show_dialog_up_to_date: show_dialog_up_to_date
+        show_dialog_up_to_date: show_dialog_up_to_date,
+        show_dialog_success_and_info: show_dialog_success_and_info
     };
 });

amd/build/standardtime.min.js

@@ -34,6 +34,7 @@ define(['jquery', 'core/str'], function($, str) {
         $('[name=month_end]')[0].disabled = true;
         $('[name=year_end]')[0].disabled = true;
         $('#only_end').val(false);
+        $('#datedisabled').val(true);
     };
 
     var enable = function() {

amd/src/initialize.js

@@ -54,8 +54,8 @@ export function init() {
                 {k: 'action', v: a.getAttribute('data-evasys-action')},
                 {k: 'sesskey', v: M.cfg.sesskey}
             ];
-            if (a.getAttribute('data-evasys-forall') === '1') {
-                data.push({k: 'all', v: '1'});
+            if (a.getAttribute('data-evasys-forall') === 1) {
+                data.push({k: 'all', v: 1});
                 redirectPost(window.location, data);
             } else {
                 checkboxes.forEach((c) => {

amd/src/post_dialog.js

@@ -98,6 +98,7 @@ public function get_content() {
         $enddisabled = false;
         $emailsentnotice = false;
         $periodsetnotice = false;
+        $datedisabled = false;
 
         // Set start to today and end to a week from now.
         $start = time();
@@ -115,6 +116,7 @@ public function get_content() {
             $first = array_key_first($evaluations->evaluations);
             $start = $evaluations->evaluations[$first]->start;
             $end = $evaluations->evaluations[$first]->end;
+            $datedisabled = true;
         } elseif ($evasyscategory->default_period_set()) {
             $start = $evasyscategory->get('standard_time_start');
             $end = $evasyscategory->get('standard_time_end');
@@ -186,8 +188,9 @@ public function get_content() {
                 'usestandardtimelayout' => $standardttimemode,
             // Choose mode.
                 'direct' => false,
-                'startdisabled' => $startdisabled || $standardttimemode,
-                'enddisabled' => $enddisabled || $standardttimemode,
+                'startdisabled' => $startdisabled || $standardttimemode || $datedisabled,
+                'enddisabled' => $enddisabled || $standardttimemode || $datedisabled,
+                'datedisabled' => $datedisabled,
                 'onlyend' => $startdisabled && !$standardttimemode,
                 'disablesubmit' => $enddisabled,
             // If the evaluation hasn't ended yet, display option to restart it.
@@ -223,6 +226,8 @@ public function display_status($status) {
             $this->page->requires->js_call_amd('block_evasys_sync/post_dialog', 'show_dialog_success');
         } else if ($status === 'uptodate') {
             $this->page->requires->js_call_amd('block_evasys_sync/post_dialog', 'show_dialog_up_to_date');
+        } else if ($status === 'successandinfo') {
+            $this->page->requires->js_call_amd('block_evasys_sync/post_dialog', 'show_dialog_success_and_info');
         } else if ($status === 'nostudents') {
             $this->page->requires->js_call_amd('block_evasys_sync/post_dialog', 'show_dialog_no_students');
         } else if ($status === 'failure') {

amd/src/standardtime.js

@@ -109,11 +109,13 @@ public static function set_default_evaluation_for($courseids, evasys_category $c
             $data->courseshort = $course->shortname;
             $data->coursefull = $course->fullname;
 
-            foreach ($teachers as $teacher) {
-                email_to_user($teacher, $coordinatoruser,
+            if ($category->send_mail_to_teacher()) {
+                foreach ($teachers as $teacher) {
+                    email_to_user($teacher, $coordinatoruser,
                         get_string('notify_teacher_email_subject', 'block_evasys_sync', $data),
                         get_string('notify_teacher_email_body', 'block_evasys_sync', $data)
-                );
+                    );
+                }
             }
 
             self::clear_error($course->id);