fixed failed merge

Author: r.tschu

block_evasys_sync.php

@@ -220,6 +220,7 @@ public function get_content() {
             'startdisabled' => $startdisabled || $standardttimemode,
             'enddisabled' => $enddisabled || $standardttimemode,
             'onlyend' => $startdisabled && !$standardttimemode,
+            'disablesubmit' => $enddisabled,
             // If the evaluation hasn't ended yet, display option to restart it.
             'startoption' => $startoption,
             // Only allow coursemapping before starting an evaluation.

classes/evasys_synchronizer.php

@@ -302,9 +302,11 @@ public function notify_evaluation_responsible_person($dates, $newparticipantsadd
             "Falls Sie für diesen Kurs bereits eine E-Mail erhalten haben, wurden gerade neue Teilnehmer*innen ".
             "hinzugefügt oder der Zeitraum angepasst. Dies ist ggf. unten angegeben.\r\n\r\n";
 
+        $standardtime = false;
         if ($dates != "Standard") {
             $notifsubject .= ' SONDERWUNSCH';
         } else {
+            $standardtime = true;
             $dates = self::getstandardtimemode($course->category);
         }
         $startdate = new \DateTime('@' . $dates["start"], \core_date::get_server_timezone_object());
@@ -315,7 +317,7 @@ public function notify_evaluation_responsible_person($dates, $newparticipantsadd
         $formattedenddate = $enddate->format('d.m.Y H:i');
 
         $notiftext .= "Gewünschter Evaluationszeitraum: " . $formattedstartdate . " bis " .
-            $formattedenddate . $textdatechanged . "\r\n\r\n";
+            $formattedenddate . $textdatechanged . ($standardtime ? " (Standardzeitraum)" : "") . "\r\n\r\n";
         if ($newparticipantsadded) {
             $notiftext .= "Der Evaluation wurden neue Teilnehmer*innen hinzugefügt.\r\n\r\n";
         }
@@ -395,10 +397,11 @@ public function set_evaluation_period($dates) : bool {
             $data = new course_evaluation_allocation(0);
             $data->set('course', $this->courseid);
             $data->set('state', course_evaluation_allocation::STATE_MANUAL);
-        }
-
-        if ($data->get('startdate') != $dates['start'] || $data->get('enddate') != $dates['end']) {
-            $changed = true;
+        } else {
+            // Don't display date changed warning on first sync.
+            if ($data->get('startdate') != $dates['start'] || $data->get('enddate') != $dates['end']) {
+                $changed = true;
+            }
         }
 
         $data->set('startdate', $dates['start']);

templates/block.mustache

@@ -25,6 +25,8 @@ Example context (json):
     "startdisabled": false,
     "enddisabled": false,
     "startoption": false,
+    "onlyend": false,
+    "disablesubmit": false,
     "coursemappingenabled": true,
     "nostudents": false,
     "emailsentnotice": true,
@@ -41,7 +43,7 @@ Example context (json):
     {{#courses}}
         {{#.}}
             <div title="{{# str}}evacourseid, block_evasys_sync{{/str}} {{evasyscourseid}}
-{{# str}}evainternalid, block_evasys_sync{{/str}} {{technicalid}}">
+                {{# str}}evainternalid, block_evasys_sync{{/str}} {{technicalid}}">
                 <span class="emphasize">{{# str}}evacoursename, block_evasys_sync{{/str}}</span> {{evasyscoursetitle}}</div>
             <div>
                 <span class="emphasize">{{# str}}countparticipants, block_evasys_sync{{/str}}</span>
@@ -64,10 +66,6 @@ Example context (json):
 {{#coursemappingenabled}}
     {{> block_evasys_sync/coursemapping}}
 {{/coursemappingenabled}}
-<form action="{{href}}" method="post" id="evasys_block_form">
-    <input type="hidden" name="sesskey" value="{{sesskey}}">
-    <input type="hidden" name="courseid" value="{{courseid}}">
-{{#startdisabled}}<input id="only_end" type="hidden" name="only_end" value="true">{{/startdisabled}}
 {{#warning}}<div style="color: red; ">{{# str}}warning_inconsistent_states, block_evasys_sync{{/str}}</div>{{/warning}}
 {{#emailsentnotice}}<div style="color: limegreen; ">{{# str}}emailsentnotice, block_evasys_sync{{/str}}</div>{{/emailsentnotice}}
 {{#evaluationperiodsetnotice}}<div style="color: limegreen; ">{{# str}}evalperiodsetnotice, block_evasys_sync{{/str}}</div>{{/evaluationperiodsetnotice}}
@@ -110,10 +108,10 @@ Example context (json):
             {{/block_evasys_sync/datetimepicker}}
         </fieldset>
         {{^direct}}
-            <input id='evasyssubmitbutton' class="in_box_button" type="submit" value="{{# str}}invitestudents, block_evasys_sync{{/str}}" {{#enddisabled}}disabled{{/enddisabled}}/>
+            <input id='evasyssubmitbutton' class="in_box_button" type="submit" value="{{# str}}invitestudents, block_evasys_sync{{/str}}" {{#disablesubmit}}disabled{{/disablesubmit}}/>
         {{/direct}}
         {{#direct}}
-            <input id='evasyssubmitbutton' class="in_box_button" type="submit" value="{{# str}}planorstartevaluation, block_evasys_sync{{/str}}" {{#enddisabled}}disabled{{/enddisabled}}/>
+            <input id='evasyssubmitbutton' class="in_box_button" type="submit" value="{{# str}}planorstartevaluation, block_evasys_sync{{/str}}" {{#disablesubmit}}disabled{{/disablesubmit}}/>
         {{/direct}}
     {{/showcontrols}}
 </form>