diff --git a/admin/tool/analytics/classes/output/models_list.php b/admin/tool/analytics/classes/output/models_list.php index c42ca55cd6b9b..fbbc2275da2ce 100644 --- a/admin/tool/analytics/classes/output/models_list.php +++ b/admin/tool/analytics/classes/output/models_list.php @@ -216,10 +216,11 @@ public function export_for_template(\renderer_base $output) { // Get predictions. if (!$onlycli && $modeldata->enabled && !empty($modeldata->timesplitting)) { - $urlparams['action'] = 'getpredictions'; + $urlparams['action'] = 'scheduledanalysis'; $url = new \moodle_url('model.php', $urlparams); - $icon = new \action_menu_link_secondary($url, new \pix_icon('i/notifications', - get_string('getpredictions', 'tool_analytics')), get_string('getpredictions', 'tool_analytics')); + $icon = new \action_menu_link_secondary($url, + new \pix_icon('i/notifications', get_string('executescheduledanalysis', 'tool_analytics')), + get_string('executescheduledanalysis', 'tool_analytics')); $actionsmenu->add($icon); } diff --git a/admin/tool/analytics/classes/output/renderer.php b/admin/tool/analytics/classes/output/renderer.php index 67c4406375262..743844ea0b66a 100644 --- a/admin/tool/analytics/classes/output/renderer.php +++ b/admin/tool/analytics/classes/output/renderer.php @@ -90,9 +90,9 @@ public function render_evaluate_results($results, $logs = array()) { $langstrdata = (object)array('name' => $timesplitting->get_name(), 'id' => $timesplittingid); if (CLI_SCRIPT) { - $output .= $OUTPUT->heading(get_string('getpredictionsresultscli', 'tool_analytics', $langstrdata), 3); + $output .= $OUTPUT->heading(get_string('scheduledanalysisresultscli', 'tool_analytics', $langstrdata), 3); } else { - $output .= $OUTPUT->heading(get_string('getpredictionsresults', 'tool_analytics', $langstrdata), 3); + $output .= $OUTPUT->heading(get_string('scheduledanalysisresults', 'tool_analytics', $langstrdata), 3); } } diff --git a/admin/tool/analytics/lang/en/deprecated.txt b/admin/tool/analytics/lang/en/deprecated.txt new file mode 100644 index 0000000000000..f308e25bf1947 --- /dev/null +++ b/admin/tool/analytics/lang/en/deprecated.txt @@ -0,0 +1 @@ +getpredictions,tool_analytics \ No newline at end of file diff --git a/admin/tool/analytics/lang/en/tool_analytics.php b/admin/tool/analytics/lang/en/tool_analytics.php index d9644eceba94e..0979652d5a8b0 100644 --- a/admin/tool/analytics/lang/en/tool_analytics.php +++ b/admin/tool/analytics/lang/en/tool_analytics.php @@ -26,6 +26,7 @@ $string['allpredictions'] = 'All predictions'; $string['alltimesplittingmethods'] = 'All analysis intervals'; $string['analysingsitedata'] = 'Analysing the site'; +$string['analysis'] = 'Analysis'; $string['analyticmodels'] = 'Analytics models'; $string['bettercli'] = 'Evaluating models and generating predictions may involve heavy processing. It is recommended to run these actions from the command line.'; $string['cantguessstartdate'] = 'Can\'t guess the start date'; @@ -71,15 +72,13 @@ $string['evaluationmodecolconfiguration'] = 'Configuration'; $string['evaluationmodeconfiguration'] = 'Evaluate the model configuration'; $string['evaluationinbatches'] = 'The site contents are calculated and stored in batches. The evaluation process may be stopped at any time. The next time it is run, it will continue from the point when it was stopped.'; +$string['executescheduledanalysis'] = 'Execute scheduled analysis'; $string['export'] = 'Export'; $string['exportincludeweights'] = 'Include the weights of the trained model'; $string['exportmodel'] = 'Export configuration'; $string['exporttrainingdata'] = 'Export training data'; -$string['getpredictionsresultscli'] = 'Results using {$a->name} (id: {$a->id}) analysis interval'; -$string['getpredictionsresults'] = 'Results using {$a->name} analysis interval'; $string['extrainfo'] = 'Info'; $string['generalerror'] = 'Evaluation error. Status code {$a}'; -$string['getpredictions'] = 'Get predictions'; $string['goodmodel'] = 'This is a good model for using to obtain predictions. Enable it to start obtaining predictions.'; $string['importmodel'] = 'Import model'; $string['indicators'] = 'Indicators'; @@ -107,8 +106,8 @@ $string['newmodel'] = 'New model'; $string['nextpage'] = 'Next page'; $string['nodatatoevaluate'] = 'There is no data to evaluate the model'; -$string['nodatatopredict'] = 'No new elements to get predictions for'; -$string['nodatatotrain'] = 'There is no new data that can be used for training'; +$string['nodatatopredict'] = 'No new elements to get predictions for.'; +$string['nodatatotrain'] = 'There is no new data that can be used for training.'; $string['noinvalidanalysables'] = 'This site does not contain any invalid analysable element.'; $string['notdefined'] = 'Not yet defined'; $string['pluginname'] = 'Analytic models'; @@ -125,6 +124,8 @@ $string['restoredefaultsubmit'] = 'Restore selected'; $string['samestartdate'] = 'Current start date is good'; $string['sameenddate'] = 'Current end date is good'; +$string['scheduledanalysisresults'] = 'Results using {$a->name} analysis interval'; +$string['scheduledanalysisresultscli'] = 'Results using {$a->name} (id: {$a->id}) analysis interval'; $string['selecttimesplittingforevaluation'] = 'Select the analysis interval you want to use to evaluate the model configuration.'; $string['target'] = 'Target'; $string['target_help'] = 'The target is what the model will predict.'; @@ -140,3 +141,6 @@ $string['weeksenddateautomaticallyset'] = 'End date automatically set based on start date and the number of sections'; $string['weeksenddatedefault'] = 'End date automatically calculated from the course start date.'; $string['privacy:metadata'] = 'The Analytic models plugin does not store any personal data.'; + +// Deprecated since Moodle 3.8. +$string['getpredictions'] = 'Get predictions'; \ No newline at end of file diff --git a/admin/tool/analytics/model.php b/admin/tool/analytics/model.php index c6cc9509a71e8..ae2c8dc84a683 100644 --- a/admin/tool/analytics/model.php +++ b/admin/tool/analytics/model.php @@ -45,8 +45,8 @@ case 'evaluate': $title = get_string('evaluatemodel', 'tool_analytics'); break; - case 'getpredictions': - $title = get_string('getpredictions', 'tool_analytics'); + case 'scheduledanalysis': + $title = get_string('analysis', 'tool_analytics'); break; case 'log': $title = get_string('viewlog', 'tool_analytics'); @@ -200,7 +200,7 @@ echo $renderer->render_evaluate_results($results, $model->get_analyser()->get_logs()); break; - case 'getpredictions': + case 'scheduledanalysis': confirm_sesskey(); if ($onlycli) { diff --git a/lang/en/analytics.php b/lang/en/analytics.php index d1d2d7ad74baf..99627374bd8e3 100644 --- a/lang/en/analytics.php +++ b/lang/en/analytics.php @@ -95,9 +95,8 @@ $string['nodata'] = 'No data to analyse'; $string['noinsightsmodel'] = 'This model does not generate insights'; $string['noinsights'] = 'No insights reported'; -$string['nonewdata'] = 'No new data available'; -$string['nonewranges'] = 'No new predictions yet'; -$string['nonewtimeranges'] = 'No new time ranges; nothing to predict.'; +$string['nonewdata'] = 'No new data available. It will be analysed after the next analysis interval.'; +$string['nonewranges'] = 'No new predictions yet. It will be analysed after the next analysis interval.'; $string['nopredictionsyet'] = 'No predictions available yet'; $string['noranges'] = 'No predictions yet'; $string['notrainingbasedassumptions'] = 'Models based on assumptions do not need training'; diff --git a/report/insights/lang/en/report_insights.php b/report/insights/lang/en/report_insights.php index e21e8dbf31a55..646a6e6694d4d 100644 --- a/report/insights/lang/en/report_insights.php +++ b/report/insights/lang/en/report_insights.php @@ -43,7 +43,7 @@ $string['predictiondetails'] = 'Prediction details'; $string['nodetailsavailable'] = 'No prediction details are relevant.'; $string['timecreated'] = 'Time predicted'; -$string['timerange'] = 'Time range'; +$string['timerange'] = 'Analysis interval'; $string['timerangewithdata'] = '{$a->timestart} to {$a->timeend}'; $string['selectotherinsights'] = 'Select other insights...'; $string['privacy:metadata'] = 'The Insights plugin does not store any personal data.';