Merge branch 'dev' into geogebra_stackjs

amd/src/input.js

@@ -440,7 +440,9 @@ define([
         // With JS With instant validation, we don't need the Check button, so hide it.
         if (allok && (questionDiv.classList.contains('dfexplicitvaildate') ||
                 questionDiv.classList.contains('dfcbmexplicitvaildate'))) {
-            questionDiv.querySelector('.im-controls input.submit').hidden = true;
+                    if (!(questionDiv.querySelector('.im-controls input.submit') === null)) {
+                            questionDiv.querySelector('.im-controls input.submit').hidden = true;
+                    }
         }
     }
 

amd/src/stackjsvle.js

@@ -83,7 +83,7 @@ define([
     }
 
     /**
-     * Returns an input element with a given name, if an only if that element
+     * Returns an input element with a given name, if and only if that element
      * exists inside a portion of DOM that represents a question.
      *
      * Note that, the input element may have a name that multiple questions

doc/en/Developer/Development_track.md

@@ -5,8 +5,18 @@
 Requests for features and ideas for developing STACK are all recorded in [Future plans](Future_plans.md). The
 past development history is documented on [Development history](Development_history.md).
 
+## Version 4.6.0
 
-## Version 4.4.6
+This version will require moodle 4.0+, and will no longer support Moodle 3.x (which ends its general support on 14 November 2022, and security support ends on 11 December 2023.)
+
+Todo: 
+
+1. Change 'core/event' to 'core_filters/events' in input.js and stackjsvle.js.
+2. Strip out parallel DB support in reporting etc.  Search for `stack_determine_moodle_version()`
+
+## Version 4.5.0
+
+Please note, this is the _last_ version of STACK which will support Moodle 3.x.
 
 1. Refactor the healthcheck scripts, especially to make unicode requirements for maxima more prominent.
 2. Shape of brackets surrounding matrix/var matrix input types now matches question level option for matrix parentheses.  (TODO: possible option to change shape at the input level?)

lang/en/qtype_stack.php

@@ -999,7 +999,7 @@
 $string['ATInt_const_int']           = 'You need to add a constant of integration. This should be an arbitrary constant, not a number.';
 $string['ATInt_const']               = 'You need to add a constant of integration, otherwise this appears to be correct.  Well done.';
 $string['ATInt_EqFormalDiff']        = 'The formal derivative of your answer does equal the expression that you were asked to integrate.  However, your answer differs from the correct answer in a significant way, that is to say not just, e.g., a constant of integration.  Please ask your teacher about this.';
-$string['ATInt_logabs']              = 'The formal derivative of your answer does equal the expression that you were asked to integrate.  However, your answer differs from the correct answer in a significant way, that is to say not just, e.g., a constant of integration.  Your teacher may expect you to use the result \(\int\frac{1}{x} dx = \log(|x|)+c\), rather than \(\int\frac{1}{x} dx = \log(x)+c\).  Please ask your teacher about this.';
+$string['ATInt_logabs']              = 'Your teacher may expect you to use the result \(\int\frac{1}{x} dx = \log(|x|)+c\), rather than \(\int\frac{1}{x} dx = \log(x)+c\).  Please ask your teacher about this.';
 $string['ATInt_weirdconst']          = 'The formal derivative of your answer does equal the expression that you were asked to integrate.  However, you have a strange constant of integration.  Please ask your teacher about this.';
 $string['ATInt_logabs_inconsistent'] = 'There appear to be strange inconsistencies between your use of \(\log(...)\) and \(\log(|...|)\).  Please ask your teacher about this.  ';
 $string['ATInt_diff']                = 'It looks like you have differentiated instead!';

stack/maxima/stackmaxima.mac

@@ -3019,7 +3019,7 @@ Intfun(SA, SB, SBdisp, constint, acceptformal, var) := block([val,rawmk,ansnote,
            (rawmk:false, fb:StackAddFeedback("", "ATInt_generic", stack_disp(SBdisp, "d"), stack_disp(var, "i"), stack_disp(SAd, "d")), ansnote:StackAddNote("", "ATInt_generic")),
     /* Has the student used log(x) vs log(abs(x)) in their answer? */
     if not(SAUsedLogAbs) and SBUsedLogAbs then
-            (rawmk:false, fb:StackAddFeedback("", "ATInt_logabs"), ansnote:StackAddNote(ansnote, "ATInt_logabs")),
+            (rawmk:false, fb:StackAddFeedback(fb, "ATInt_logabs"), ansnote:StackAddNote(ansnote, "ATInt_logabs")),
     /* Has the student been inconsistent in using log(x) vs log(abs(x)) in their answer? */
     if not(SAConsistentLogs) then
             (rawmk:false, fb:StackAddFeedback("", "ATInt_logabs_inconsistent"), ansnote:StackAddNote(ansnote, "ATInt_logabs_inconsistent")),
@@ -3316,4 +3316,4 @@ is_lang(code):=ev(is(%_STACK_LANG=code),simp=true)$
 
 /* Stack expects some output with the version number the output happens at */
 /* maximalocal.mac after additional library loading */
-stackmaximaversion:2023093000$
+stackmaximaversion:2023102000$

tests/fixtures/answertestfixtures.class.php

@@ -1485,6 +1485,8 @@ class stack_answertest_test_data {
         array('Int', 'x', 'ln(k*(x^2+7*x+7))', 'ln(x^2+7*x+7)+c', 1, 'ATInt_true_equiv.', ''),
         array('Int', 'x', 'ln(x^2+7*x+7)', 'ln(abs(x^2+7*x+7))+c', 0, 'ATInt_EqFormalDiff. ATInt_logabs.', ''),
         array('Int', 'x', 'ln(x^2+7*x+7)+c', 'ln(abs(x^2+7*x+7))+c', 0, 'ATInt_EqFormalDiff. ATInt_logabs.', ''),
+        array('Int', 'x', '-2*log(x)-(10*x^6)/3+x^3/3+5*log(x^4)+c',
+            '-2*log(abs(x))+(10*x^6)/3-x^3/3-5/x^3+c', 0, 'ATInt_generic. ATInt_logabs.', ''),
         array('Int', 'x', 'ln(abs(x^2+7*x+7))+c', 'ln(abs(x^2+7*x+7))+c', 1, 'ATInt_true_equiv.', ''),
         array('Int', 'x', 'ln(k*abs(x^2+7*x+7))', 'ln(abs(x^2+7*x+7))+c', 1, 'ATInt_true_equiv.', ''),
         // In these examples there are two logarithms.  The student should be *consistent*

version.php

@@ -24,12 +24,12 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023093000;
+$plugin->version   = 2023102000;
 $plugin->requires  = 2020061500;
 $plugin->cron      = 0;
 $plugin->component = 'qtype_stack';
 $plugin->maturity  = MATURITY_ALPHA;
-$plugin->release   = '4.4.6 for Moodle 3.9+';
+$plugin->release   = '4.5.0 for Moodle 3.9+';
 
 $plugin->dependencies = array(
     'qbehaviour_adaptivemultipart'     => 2020103000,