From d201e2c4bff674f7bdd955774a8f006cbf5270d6 Mon Sep 17 00:00:00 2001 From: Irina Hoppe Date: Wed, 20 Dec 2023 10:34:08 +0100 Subject: [PATCH] fixed sql query and minified js files --- amd/build/initialize.min.js | 2 +- amd/build/post_dialog.min.js | 2 +- amd/build/standardtime.min.js | 2 +- sync.php | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/amd/build/initialize.min.js b/amd/build/initialize.min.js index c94c3d7..e5b3b42 100644 --- a/amd/build/initialize.min.js +++ b/amd/build/initialize.min.js @@ -1,3 +1,3 @@ -define("block_evasys_sync/initialize",["jquery","core/notification","core/str"],(function($,notification,str){return{init:function(starttime,endtime,mode){var endenabled,start=new Date(1e3*starttime),end=new Date(1e3*endtime);0!=$("[name=minute_start]").length&&($("[name=minute_start]").last()[0].selectedIndex=start.getMinutes(),$("[name=hour_start]").last()[0].selectedIndex=start.getHours(),$("[name=day_start]").last()[0].selectedIndex=start.getDate()-1,$("[name=month_start]").last()[0].selectedIndex=start.getMonth(),$("[name=year_start]").last()[0].selectedIndex=start.getFullYear()-2e3,$("[name=minute_end]").last()[0].selectedIndex=end.getMinutes(),$("[name=hour_end]").last()[0].selectedIndex=end.getHours(),$("[name=day_end]").last()[0].selectedIndex=end.getDate()-1,$("[name=month_end]").last()[0].selectedIndex=end.getMonth(),$("[name=year_end]").last()[0].selectedIndex=end.getFullYear()-2e3,$("#reactivate").length>0&&(endenabled=!$("[name=minute_end]")[0].disabled,$(document).on("change","#reactivate",(function(){this.checked?str.get_strings([{key:"confirm"},{key:"content_confirm_reactivate_"+mode,component:"block_evasys_sync"},{key:"yes"},{key:"no"},{key:"requestagain",component:"block_evasys_sync"}]).done((function(s){notification.confirm(s[0],s[1],s[2],s[3],(function(){$("[name=minute_start]")[0].disabled=!1,$("[name=hour_start]")[0].disabled=!1,$("[name=day_start]")[0].disabled=!1,$("[name=month_start]")[0].disabled=!1,$("[name=year_start]")[0].disabled=!1,endenabled||($("[name=minute_end]")[0].disabled=!1,$("[name=hour_end]")[0].disabled=!1,$("[name=day_end]")[0].disabled=!1,$("[name=month_end]")[0].disabled=!1,$("[name=year_end]")[0].disabled=!1),$("#direct_invite").length>0&&$("#direct_invite").prop("disabled",!1),$("#only_end").length>0&&$("#only_end").prop("value",!1),$("#evasyssubmitbutton").length>0&&($("#evasyssubmitbutton").prop("disabled",!1),$("#evasyssubmitbutton").val(s[4]))}),(function(){$("#reactivate").prop("checked",!1)}))})):($("[name=minute_start]")[0].disabled=!0,$("[name=hour_start]")[0].disabled=!0,$("[name=day_start]")[0].disabled=!0,$("[name=month_start]")[0].disabled=!0,$("[name=year_start]")[0].disabled=!0,endenabled||($("[name=minute_end]")[0].disabled=!0,$("[name=hour_end]")[0].disabled=!0,$("[name=day_end]")[0].disabled=!0,$("[name=month_end]")[0].disabled=!0,$("[name=year_end]")[0].disabled=!0),$("#direct_invite").length>0&&$("#direct_invite").prop("disabled",!0),$("#only_end").length>0&&$("#only_end").prop("value",!0),$("#evasyssubmitbutton").length>0&&(endenabled||$("#evasyssubmitbutton").prop("disabled",!0),str.get_strings([{key:"planorstartevaluation",component:"block_evasys_sync"},{key:"invitestudents",component:"block_evasys_sync"}]).done((function(s){$("#direct_invite").length>0?$("#evasyssubmitbutton").val(s[0]):$("#evasyssubmitbutton").val(s[1])}))))}))),$("#direct_invite").length>0&&$(document).on("change","#direct_invite",(function(){this.checked?($("[name=minute_start]")[0].disabled=!0,$("[name=hour_start]")[0].disabled=!0,$("[name=day_start]")[0].disabled=!0,$("[name=month_start]")[0].disabled=!0,$("[name=year_start]")[0].disabled=!0):($("[name=minute_start]")[0].disabled=!1,$("[name=hour_start]")[0].disabled=!1,$("[name=day_start]")[0].disabled=!1,$("[name=month_start]")[0].disabled=!1,$("[name=year_start]")[0].disabled=!1)})))}}})); +define("block_evasys_sync/initialize",["jquery","core/notification","core/str"],(function($,notification,str){return{init:function(starttime,endtime,mode){var endenabled,start=new Date(1e3*starttime),end=new Date(1e3*endtime);0!=$("[name=minute_start]").length&&($("[name=minute_start]").last()[0].selectedIndex=start.getMinutes(),$("[name=hour_start]").last()[0].selectedIndex=start.getHours(),$("[name=day_start]").last()[0].selectedIndex=start.getDate()-1,$("[name=month_start]").last()[0].selectedIndex=start.getMonth(),$("[name=year_start]").last()[0].selectedIndex=start.getFullYear()-2e3,$("[name=minute_end]").last()[0].selectedIndex=end.getMinutes(),$("[name=hour_end]").last()[0].selectedIndex=end.getHours(),$("[name=day_end]").last()[0].selectedIndex=end.getDate()-1,$("[name=month_end]").last()[0].selectedIndex=end.getMonth(),$("[name=year_end]").last()[0].selectedIndex=end.getFullYear()-2e3,$("#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(){this.checked?str.get_strings([{key:"confirm"},{key:"content_confirm_reactivate_"+mode,component:"block_evasys_sync"},{key:"yes"},{key:"no"},{key:"requestagain",component:"block_evasys_sync"}]).done((function(s){notification.confirm(s[0],s[1],s[2],s[3],(function(){$("[name=minute_start]")[0].disabled=!1,$("[name=hour_start]")[0].disabled=!1,$("[name=day_start]")[0].disabled=!1,$("[name=month_start]")[0].disabled=!1,$("[name=year_start]")[0].disabled=!1,endenabled||($("[name=minute_end]")[0].disabled=!1,$("[name=hour_end]")[0].disabled=!1,$("[name=day_end]")[0].disabled=!1,$("[name=month_end]")[0].disabled=!1,$("[name=year_end]")[0].disabled=!1),$("#direct_invite").length>0&&$("#direct_invite").prop("disabled",!1),$("#only_end").length>0&&$("#only_end").prop("value",!1),$("#datedisabled").length>0&&$("#datedisabled").prop("value",!1),$("#evasyssubmitbutton").length>0&&($("#evasyssubmitbutton").prop("disabled",!1),$("#evasyssubmitbutton").val(s[4]))}),(function(){$("#reactivate").prop("checked",!1)}))})):($("[name=minute_start]")[0].disabled=!0,$("[name=hour_start]")[0].disabled=!0,$("[name=day_start]")[0].disabled=!0,$("[name=month_start]")[0].disabled=!0,$("[name=year_start]")[0].disabled=!0,endenabled||($("[name=minute_end]")[0].disabled=!0,$("[name=hour_end]")[0].disabled=!0,$("[name=day_end]")[0].disabled=!0,$("[name=month_end]")[0].disabled=!0,$("[name=year_end]")[0].disabled=!0),$("#direct_invite").length>0&&$("#direct_invite").prop("disabled",!0),$("#only_end").length>0&&$("#only_end").prop("value",!0),$("#datedisabled").length>0&&$("#datedisabled").prop("value",!0),$("#evasyssubmitbutton").length>0&&(endenabled||$("#evasyssubmitbutton").prop("disabled",!0),str.get_strings([{key:"planorstartevaluation",component:"block_evasys_sync"},{key:"invitestudents",component:"block_evasys_sync"}]).done((function(s){$("#direct_invite").length>0?$("#evasyssubmitbutton").val(s[0]):$("#evasyssubmitbutton").val(s[1])}))))}))),$("#direct_invite").length>0&&$(document).on("change","#direct_invite",(function(){this.checked?($("[name=minute_start]")[0].disabled=!0,$("[name=hour_start]")[0].disabled=!0,$("[name=day_start]")[0].disabled=!0,$("[name=month_start]")[0].disabled=!0,$("[name=year_start]")[0].disabled=!0):($("[name=minute_start]")[0].disabled=!1,$("[name=hour_start]")[0].disabled=!1,$("[name=day_start]")[0].disabled=!1,$("[name=month_start]")[0].disabled=!1,$("[name=year_start]")[0].disabled=!1)})))}}})); //# sourceMappingURL=initialize.min.js.map \ No newline at end of file diff --git a/amd/build/post_dialog.min.js b/amd/build/post_dialog.min.js index 5a942fa..7362af1 100644 --- a/amd/build/post_dialog.min.js +++ b/amd/build/post_dialog.min.js @@ -1,3 +1,3 @@ -define("block_evasys_sync/post_dialog",["jquery","core/notification","core/str"],(function($,notification,str){return{show_dialog_failure:function(){str.get_strings([{key:"title_failure",component:"block_evasys_sync"},{key:"content_failure",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)},show_dialog_no_students:function(){str.get_strings([{key:"title_failure",component:"block_evasys_sync"},{key:"content_nostudents",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)},show_dialog_success:function(){str.get_strings([{key:"title_success",component:"block_evasys_sync"},{key:"content_success",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)},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)},show_dialog_up_to_date:function(){str.get_strings([{key:"title_uptodate",component:"block_evasys_sync"},{key:"content_uptodate",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)}}})); +define("block_evasys_sync/post_dialog",["jquery","core/notification","core/str"],(function($,notification,str){return{show_dialog_failure:function(){str.get_strings([{key:"title_failure",component:"block_evasys_sync"},{key:"content_failure",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)},show_dialog_no_students:function(){str.get_strings([{key:"title_failure",component:"block_evasys_sync"},{key:"content_nostudents",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)},show_dialog_success:function(){str.get_strings([{key:"title_success",component:"block_evasys_sync"},{key:"content_success",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)},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)},show_dialog_up_to_date:function(){str.get_strings([{key:"title_uptodate",component:"block_evasys_sync"},{key:"content_uptodate",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)}}})); //# sourceMappingURL=post_dialog.min.js.map \ No newline at end of file diff --git a/amd/build/standardtime.min.js b/amd/build/standardtime.min.js index 6014c1f..d231837 100644 --- a/amd/build/standardtime.min.js +++ b/amd/build/standardtime.min.js @@ -1,3 +1,3 @@ -define("block_evasys_sync/standardtime",["jquery","core/str"],(function($,str){var disable=function(){$("[name=minute_start]")[0].disabled=!0,$("[name=hour_start]")[0].disabled=!0,$("[name=day_start]")[0].disabled=!0,$("[name=month_start]")[0].disabled=!0,$("[name=year_start]")[0].disabled=!0,$("[name=minute_end]")[0].disabled=!0,$("[name=hour_end]")[0].disabled=!0,$("[name=day_end]")[0].disabled=!0,$("[name=month_end]")[0].disabled=!0,$("[name=year_end]")[0].disabled=!0,$("#only_end").val(!1)},enable=function(){$("[name=minute_start]")[0].disabled=!1,$("[name=hour_start]")[0].disabled=!1,$("[name=day_start]")[0].disabled=!1,$("[name=month_start]")[0].disabled=!1,$("[name=year_start]")[0].disabled=!1,$("[name=minute_end]")[0].disabled=!1,$("[name=hour_end]")[0].disabled=!1,$("[name=day_end]")[0].disabled=!1,$("[name=month_end]")[0].disabled=!1,$("[name=year_end]")[0].disabled=!1};return{init:function(){$("#deactivate_standard").length>0&&($("#deactivate_standard").prop("disabled",!1),$(document).on("change","#deactivate_standard",(function(){this.checked?($("#inputfieldset").prop("disabled",!1),$("#activate_standard").prop("value",!1),str.get_string("different_period","block_evasys_sync").done((function(s){$("#evaluationperiod").text(s)})),enable()):($("#inputfieldset").prop("disabled",!0),$("#activate_standard").prop("value",!0),str.get_string("standard_period","block_evasys_sync").done((function(s){$("#evaluationperiod").text(s)})),disable())})))}}})); +define("block_evasys_sync/standardtime",["jquery","core/str"],(function($,str){var disable=function(){$("[name=minute_start]")[0].disabled=!0,$("[name=hour_start]")[0].disabled=!0,$("[name=day_start]")[0].disabled=!0,$("[name=month_start]")[0].disabled=!0,$("[name=year_start]")[0].disabled=!0,$("[name=minute_end]")[0].disabled=!0,$("[name=hour_end]")[0].disabled=!0,$("[name=day_end]")[0].disabled=!0,$("[name=month_end]")[0].disabled=!0,$("[name=year_end]")[0].disabled=!0,$("#only_end").val(!1)},$("#datedisabled").val(!0)},enable=function(){$("[name=minute_start]")[0].disabled=!1,$("[name=hour_start]")[0].disabled=!1,$("[name=day_start]")[0].disabled=!1,$("[name=month_start]")[0].disabled=!1,$("[name=year_start]")[0].disabled=!1,$("[name=minute_end]")[0].disabled=!1,$("[name=hour_end]")[0].disabled=!1,$("[name=day_end]")[0].disabled=!1,$("[name=month_end]")[0].disabled=!1,$("[name=year_end]")[0].disabled=!1};return{init:function(){$("#deactivate_standard").length>0&&($("#deactivate_standard").prop("disabled",!1),$(document).on("change","#deactivate_standard",(function(){this.checked?($("#inputfieldset").prop("disabled",!1),$("#activate_standard").prop("value",!1),str.get_string("different_period","block_evasys_sync").done((function(s){$("#evaluationperiod").text(s)})),enable()):($("#inputfieldset").prop("disabled",!0),$("#activate_standard").prop("value",!0),str.get_string("standard_period","block_evasys_sync").done((function(s){$("#evaluationperiod").text(s)})),disable())})))}}})); //# sourceMappingURL=standardtime.min.js.map \ No newline at end of file diff --git a/sync.php b/sync.php index 127af98..1894f13 100644 --- a/sync.php +++ b/sync.php @@ -38,7 +38,7 @@ if (optional_param('datedisabled', false, PARAM_BOOL)) { // We already have an evaluation request for this course: fetch the start- and enddates $sql = 'SELECT v.id, v.starttime, v.endtime, max(v.timemodified) as time FROM {' . \block_evasys_sync\dbtables::EVAL_VERANSTS . '} v INNER JOIN ' . - '{' . \block_evasys_sync\dbtables::EVAL_COURSES . '} c on v.evalid=c.evalid WHERE c.courseid = :courseid ORDER BY time DESC'; + '{' . \block_evasys_sync\dbtables::EVAL_COURSES . '} c on v.evalid=c.evalid WHERE c.courseid = :courseid GROUP BY v.id, v.starttime ORDER BY time DESC'; $record = $DB->get_record_sql($sql, ['courseid' => $courseid]); // $record = course_evaluation_allocation::get_record_by_course($courseid); $startdate = new \DateTime('@' . $record->starttime, \core_date::get_server_timezone_object()); @@ -49,7 +49,7 @@ if (optional_param('only_end', false, PARAM_BOOL)) { // Existing start date should not be changed; just the end date. Fetch start date from record. $sql = 'SELECT v.id, v.starttime, max(v.timemodified) as time FROM {' . \block_evasys_sync\dbtables::EVAL_VERANSTS . '} v INNER JOIN ' . - '{' . \block_evasys_sync\dbtables::EVAL_COURSES . '} c on v.evalid=c.evalid WHERE c.courseid = :courseid ORDER BY time DESC'; + '{' . \block_evasys_sync\dbtables::EVAL_COURSES . '} c on v.evalid=c.evalid WHERE c.courseid = :courseid GROUP BY v.id, v.starttime ORDER BY time DESC'; $record = $DB->get_record_sql($sql, ['courseid' => $courseid]); $startdate = new \DateTime('@' . $record->starttime, \core_date::get_server_timezone_object()); } else {