diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 210c0555a2..2c372d5c0a 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl liberapay: # Replace with a single Liberapay username issuehunt: # Replace with a single IssueHunt username otechie: # Replace with a single Otechie username -custom: ["https://webwork.maa.org/wiki"] +custom: ['https://wiki.openwebwork.org/wiki'] diff --git a/.github/workflows/check-formats.yml b/.github/workflows/check-formats.yml index 092dabe309..5c06bdbc10 100644 --- a/.github/workflows/check-formats.yml +++ b/.github/workflows/check-formats.yml @@ -18,26 +18,26 @@ jobs: image: perl:5.38 steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install dependencies - run: cpanm -n Perl::Tidy@20240903 + run: cpanm -n Perl::Tidy@20260204 - name: Run perltidy shell: bash run: | git config --global --add safe.directory "$GITHUB_WORKSPACE" shopt -s extglob globstar nullglob - perltidy --pro=./.perltidyrc -b -bext='/' ./**/*.p[lm] ./**/*.t && git diff --exit-code + perltidy --pro=./.perltidyrc -b -bext='/' ./**/*.p[lm] ./**/*.t ./**/*.at && git diff --exit-code prettier: name: Check JavaScript, style, and HTML file formatting with prettier runs-on: ubuntu-24.04 steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install Node - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: - node-version: '20' + node-version: '24' - name: Install Dependencies run: cd htdocs && npm ci --ignore-scripts - name: Check formatting with prettier diff --git a/DockerfileStage2 b/DockerfileStage2 index 4706f5bfb5..e196cd2f6b 100644 --- a/DockerfileStage2 +++ b/DockerfileStage2 @@ -33,7 +33,7 @@ RUN echo Cloning branch $PG_BRANCH branch from $PG_GIT_URL \ # We need to change FROM before setting the ENV variables. -FROM webwork-base:forWW220 +FROM webwork-base:forWW221 ENV WEBWORK_URL=/webwork2 \ WEBWORK_ROOT_URL=http://localhost:8080 \ diff --git a/LICENSE b/LICENSE index 821f53097f..5f4df6a5fb 100644 --- a/LICENSE +++ b/LICENSE @@ -2,7 +2,7 @@ Online Homework Delivery System Version 2.* - Copyright 2000-2025, The WeBWorK Project + Copyright 2000-2026, The WeBWorK Project All rights reserved. @@ -13,19 +13,19 @@ Software Foundation; either version 2, or (at your option) any later version, or - b) the "Artistic License" which comes with this package. + b) the "Artistic License" 1.0 which comes with this package. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See either the GNU General Public License or the Artistic License for more details. - You should have received a copy of the Artistic License with this - package, in the file named "Artistic" inside the `doc` folder. If not, we'll be glad to provide - one. + You should have received a copy of the Artistic License 1.0 with this + package, in the file named "Artistic" inside the `doc` folder. If not, + you can find a copy at https://github.com/openwebwork/webwork2/blob/main/doc/Artistic + or https://perlfoundation.org/artistic-license-10.html. You should also have received a copy of the GNU General Public License - along with this program in the file named "Copying" inside the `doc` folder. If not, write to the - Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307, USA or visit their web page on the internet at - http://www.gnu.org/copyleft/gpl.html. + along with this program in the file named "Copying" inside the `doc` folder. + If not, you can find a copy at https://github.com/openwebwork/webwork2/blob/main/doc/Copying + or https://www.gnu.org/licenses/old-licenses/gpl-2.0.html. diff --git a/README.md b/README.md index db8e9a149c..7d213d39db 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,35 @@ - WeBWorK - Online Homework Delivery System - Version 2.* - Branch: github.com/openwebwork - - https://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.20 - Copyright 2000-2025, The WeBWorK Project - https://openwebwork.org/ - All rights reserved. - # Welcome to WeBWorK -WeBWorK is an open-source online homework system for math and sciences courses. WeBWorK is supported by the MAA and the NSF and comes with an Open Problem Library (OPL) of over 30,000 homework problems. Problems in the OPL target most lower division undergraduate math courses, some advanced courses and some other STEM subjects. Supported courses include college algebra, discrete mathematics, probability and statistics, single and multivariable calculus, differential equations, linear algebra and complex analysis. Find out more at the main WeBWorK [webpage](https://openwebwork.org). +WeBWorK is an open-source online homework system for math and sciences courses. WeBWorK is supported by the MAA and the +NSF and comes with an Open Problem Library (OPL) of over 30,000 homework problems. Problems in the OPL target most lower +division undergraduate math courses, some advanced courses and some other STEM subjects. Supported courses include +college algebra, discrete mathematics, probability and statistics, single and multivariable calculus, differential +equations, linear algebra and complex analysis. Find out more at the main WeBWorK [webpage](https://openwebwork.org). ## Information for Users -New users interested in getting started with their own WeBWorK server, or instructors looking to learn more about how to use WeBWorK in their classes, should take a look at one of the following resources: +New users interested in getting started with their own WeBWorK server, or instructors looking to learn more about how to +use WeBWorK in their classes, should take a look at one of the following resources: -* The [WeBWorK project home page](https://openwebwork.org/) - General information and resources including announcements of events and important project news -* [WeBWorK wiki](https://webwork.maa.org/wiki/Main_Page) - The main WeBWorK wiki -* [Installing WeBWorK](https://webwork.maa.org/wiki/Manual_Installation_Guides) - Installing WeBWorK -* [Instructors](https://webwork.maa.org/wiki/Instructors) - Information for Instructors -* [Problem Authors](https://webwork.maa.org/wiki/Authors) - Information for Problem Authors -* [Forum](http://webwork.maa.org/moodle/mod/forum/index.php?id=3) - The WeBWorK Forum for getting help from the community -* [Frequently Asked Questions](https://github.com/openwebwork/webwork2/wiki/Frequently-Asked-Questions) - A list of frequently asked questions. +- The [WeBWorK project home page](https://openwebwork.org/) - General information and resources including announcements + of events and important project news +- [WeBWorK wiki](https://wiki.openwebwork.org/wiki/Main_Page) - The main WeBWorK wiki +- [Installing WeBWorK](https://wiki.openwebwork.org/wiki/Manual_Installation_Guides) - Installing WeBWorK +- [Instructors](https://wiki.openwebwork.org/wiki/Instructors) - Information for Instructors +- [Problem Authors](https://wiki.openwebwork.org/wiki/Authors) - Information for Problem Authors +- [Forum](https://forums.openwebwork.org/mod/forum/index.php?id=3) - The WeBWorK Forum for getting help from the + community +- [Frequently Asked Questions](https://github.com/openwebwork/webwork2/wiki/Frequently-Asked-Questions) - A list of + frequently asked questions. ## Information for Downloading -* Installation manuals can be found at https://webwork.maa.org/wiki/Category:Installation_Manuals +- See the [installation manuals](https://wiki.openwebwork.org/wiki/Category:Installation_Manuals). ## Information For Developers -* People interested in developing new features for WeBWorK can start at https://webwork.maa.org/wiki/Category:Developers, or start a [discussion on GitHub](https://github.com/openwebwork/webwork2/discussions) to engage with the current developers. -* People interested in developing new problems for WeBWorK should visit [Problem Authors](http://webwork.maa.org/wiki/Authors). +- People interested in developing new features for WeBWorK can start at the wiki + [development page](https://wiki.openwebwork.org/wiki/Category:Developers), or start a + [discussion on GitHub](https://github.com/openwebwork/webwork2/discussions) to engage with the current developers. +- People interested in developing new problems for WeBWorK should visit the wiki + [problem authoring page](https://wiki.openwebwork.org/wiki/Authors). diff --git a/VERSION b/VERSION index 450fad3c87..b6669a5671 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -$WW_VERSION = '2.20'; -$WW_COPYRIGHT_YEARS = '1996-2025'; +$WW_VERSION = '2.21'; +$WW_COPYRIGHT_YEARS = '1996-2026'; 1; diff --git a/assets/hardcopyThemes/basic.xml b/assets/hardcopyThemes/basic.xml index 46b8b8f7ab..34a859df84 100644 --- a/assets/hardcopyThemes/basic.xml +++ b/assets/hardcopyThemes/basic.xml @@ -3,7 +3,7 @@ This theme produces hardcopies with minimal page headers displaying the set -title and useername, and minimal problem numbering. +title and username, and minimal problem numbering. diff --git a/assets/hardcopyThemes/basicTwoCol.xml b/assets/hardcopyThemes/basicTwoCol.xml index ccb11b0dc9..44b1a455ee 100644 --- a/assets/hardcopyThemes/basicTwoCol.xml +++ b/assets/hardcopyThemes/basicTwoCol.xml @@ -3,7 +3,7 @@ This theme produces hardcopies with minimal page headers displaying the set -title and useername, and minimal problem numbering. With two columns. +title and username, and minimal problem numbering. With two columns. diff --git a/assets/pg/PGMLLab/PGML-lab.pg b/assets/pg/PGMLLab/PGML-lab.pg index b58c76614c..931fe40867 100644 --- a/assets/pg/PGMLLab/PGML-lab.pg +++ b/assets/pg/PGMLLab/PGML-lab.pg @@ -682,9 +682,9 @@ TEXT(tag( >> At the right >> Several lines combined. - >> right justfied + >> right justified - >> Or a whole paragaph + >> Or a whole paragraph that is pushed to the right >> Or two lines diff --git a/assets/pg/Student_Orientation/discriminant.png b/assets/pg/Student_Orientation/discriminant.png new file mode 100644 index 0000000000..636d7719af Binary files /dev/null and b/assets/pg/Student_Orientation/discriminant.png differ diff --git a/assets/pg/Student_Orientation/enteringMath.pg b/assets/pg/Student_Orientation/enteringMath.pg index 8db6992a59..0e20c0d9fc 100644 --- a/assets/pg/Student_Orientation/enteringMath.pg +++ b/assets/pg/Student_Orientation/enteringMath.pg @@ -21,9 +21,9 @@ expression automatically is converted to look like [::pi/sqrt(x+1)::]. [_]{Conte Occasionally you will want to answer with raw text that should not be converted into a math expression. For example, if the answer is a word. For this kind of answer, you should enter "text mode". There is a "Tt" button on the palette that -enters and exits text mode. You can also use the [|"|]* character to enter text mode, and then exit with the [|tab|]* -key or right arrow. Try answering the following with and without using text mode. The answer is [|pirate|]*: -[_]{Context("Numeric")->strings->add(pirate => {}), 'pirate'}{16}. +enters and exits text mode. You can also use the double quote character ([|"|]*) to enter text mode, and then exit with +the [|tab|]* key or right arrow. Try answering the following with and without using text mode. The answer is [|web|]*: +[_]{Context("Numeric")->strings->add(web => {}), 'web'}{16}. The palette tool might be a distraction, especially to keyboard-only users. You can disable it by right-clicking (or control-clicking) in an answer blank. To "right click" without a mouse: diff --git a/assets/pg/Student_Orientation/explorerfull.png b/assets/pg/Student_Orientation/explorerfull.png index 6b52703fcc..a563a3b4e7 100644 Binary files a/assets/pg/Student_Orientation/explorerfull.png and b/assets/pg/Student_Orientation/explorerfull.png differ diff --git a/assets/pg/Student_Orientation/explorerpiece.png b/assets/pg/Student_Orientation/explorerpiece.png index a4fb755b36..36c4b884d5 100644 Binary files a/assets/pg/Student_Orientation/explorerpiece.png and b/assets/pg/Student_Orientation/explorerpiece.png differ diff --git a/assets/pg/Student_Orientation/mathInteraction.pg b/assets/pg/Student_Orientation/mathInteraction.pg index 3cf56a7111..162750be9e 100644 --- a/assets/pg/Student_Orientation/mathInteraction.pg +++ b/assets/pg/Student_Orientation/mathInteraction.pg @@ -26,37 +26,54 @@ Once focus is on a math expression, using the space bar will activate the "MathJ by right-clicking (Windows/Linux) or [|control|]*-clicking (MacOS) a piece of math. Try activating the MathJax menu now. It should look like the following. ->> [!MathJax contextual menu!]{'mathjaxmenu.png'} << +>> [!MathJax contextual menu!]{'mathjaxmenu.png'}{140} << There are many features that help you to engage with math content. Explore the menu options to survey what is available. -We will now point out a few important features. In the main menu, there is a "Math Settings" submenu. The "Zoom Trigger" -and "Zoom Factor" items allow you to control if/how math content is magnified. Magnification may help users with some -vision disabilities see the content better. And it may help all users to see some details of math notation better. Take -a moment to explore these settings and select options that you would be comfortable with. (Of course you can change -these settings at any time.) - -Also in the main menu, there is an "Accessibility" submenu. In that menu, if accessibility is not already activated, -select "Activate". After activating this, you may need to refresh the web page to see the math expression again. Now you -have the option to see math content verbalized. To do this, place focus onto a math expression and hit [|enter|]*. -* At first, the entire expression is highlighted and there will be a verbal rendering of the expression. -[!Speech string for the quadratic formula!]{'explorerfull.png'}{600} -* Use the down arrow to navigate "down" into a smaller piece of the math expression. -* Use the left/right arrows to navigate to similar pieces of the math expression. -* At any time you can navigate back "up" to a larger part of the expression, or "down" into smaller pieces. For example, -you can see a verbalization for just this part of the expression above: -[!Speech string for the radicand of the quadratic formula!]{'explorerpiece.png'}{600} -* Return to the MathJax menu, Accessibility submenu, to explore options for how this explorer tool works. -* Under "Speech" you will find options to use MathSpeak, ClearSpeak, or ChromeVox rules. The default is to use -"MathSpeak verbose" rules, which try try to read math "literally" without context. For example, it reads [`(1,3)`] as -"left parenthesis 1 comma 3 right parenthesis". Other speech rules can produce more meaningful verbal renderings. For -example with the right ClearSpeak settings, the same math expression produces "the point with coordinates 1 comma 3" -or "the interval from 1 to 3 not including 1 or 3". +### Enlarging Math + +In the main menu, there is a "Math Settings" submenu. The "Zoom Trigger" and "Zoom Factor" items allow you to control +if/how math content is magnified. Magnification may help users with some vision disabilities see the content better. +And it may help all users to see some details of math notation better. Take a moment to explore these settings and +select options that you would be comfortable with. (Of course you can change these settings at any time.) + +### Navigating Math + +When focus is on a piece of math content, there is a small help icon in the upper right. Click this icon to see a guide +for how to navigate inside the math content. This can help you understand the meaning of the math content. For example, +here we have navigated to the piece of math content inside the radical: + +[!Highlighting the discriminant in the quadratic formula!]{'discriminant.png'}{600} + +### Subtitles for Math + +Also in the main menu, there is an "Accessibility" submenu. Accessibility is enabled by default, but you can also select +"Show Subtitles" in the "Speech" submenu. This allows you to see math content verbalized. To do this, place focus onto +a math expression and hit [|enter|]*. At first, the entire expression is highlighted and there will be a verbal +rendering of the expression. +[!Speech string for the quadratic formula!]{'explorerfull.png'}{735} + +As you navigate within the math using arrows, you can see verbalizations of the corresponding pieces: + +[!Speech string for the radicand of the quadratic formula!]{'explorerpiece.png'}{735} + +Under "Speech" you will find options for MathSpeak and ClearSpeak rules. The default is to use "MathSpeak verbose" +rules, which try try to read math "literally" without context. For example, it reads [`(1,3)`] as "left parenthesis 1 +comma 3 right parenthesis". Other speech rules can produce more meaningful verbal renderings. For example with the right +ClearSpeak settings, the same math expression produces "the point with coordinates 1 comma 3" or "the interval from 1 to +3 not including 1 or 3". + +### Voicing Math Out Loud + +When focus is on math content, use the [|s|]* character to hear the math spoken. If you would like math to always be +spoken whenever focus lands on math, check Auto Voicing in the Speech menu. + +### Disabling Tab Indexing Some keyboard-navigating users might find it undesirable for each piece of math content to be tab-indexed. If this is -the case, then in the "Accessibility" sub menu you can uncheck "Include in Tab Order". Just note that in order to undo -this and make math content tabbable again, you will need to access the menu, and so you will need some way other than -tabbing to bring focus back to a piece of math content. +the case, then in the "Options" submenu of the "Accessibility" submenu you can uncheck "Include in Tab Order" and +"Semantic Enrichment". Just note that in order to undo this and make math content tabbable again, you will need to +access the menu, and so you will need some way other than tabbing to bring focus back to a piece of math content. END_BODY $images = <dirname->dirname; } @@ -33,20 +33,21 @@ my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} }); print "\nDownloading the latest OPL release.\n"; runScript("$ENV{WEBWORK_ROOT}/bin/download-OPL-metadata-release.pl"); -if ($ce->{problemLibrary}{showLibraryLocalStats} || - $ce->{problemLibrary}{showLibraryGlobalStats}) { - print "\nUpdating Library Statistics.\n"; - runScript("$ENV{WEBWORK_ROOT}/bin/update-OPL-statistics.pl"); - - print "\nLoading global statistics (if possible).\n"; - runScript("$ENV{WEBWORK_ROOT}/bin/load-OPL-global-statistics.pl"); - - if ( $ENV{SKIP_UPLOAD_OPL_STATISTICS} ) { - print "\nSkipping upload-OPL-statistics as requested\n"; - } else { - print "\nSharing aggregated statistics\n"; - runScript("$ENV{WEBWORK_ROOT}/bin/upload-OPL-statistics.pl"); - } +if ($ce->{problemLibrary}{showLibraryLocalStats} + || $ce->{problemLibrary}{showLibraryGlobalStats}) +{ + print "\nUpdating Library Statistics.\n"; + runScript("$ENV{WEBWORK_ROOT}/bin/update-OPL-statistics.pl"); + + print "\nLoading global statistics (if possible).\n"; + runScript("$ENV{WEBWORK_ROOT}/bin/load-OPL-global-statistics.pl"); + + if ($ENV{SKIP_UPLOAD_OPL_STATISTICS}) { + print "\nSkipping upload-OPL-statistics as requested\n"; + } else { + print "\nSharing aggregated statistics\n"; + runScript("$ENV{WEBWORK_ROOT}/bin/upload-OPL-statistics.pl"); + } } print "\nDone.\n"; diff --git a/bin/OPL-update-legacy b/bin/OPL-update-legacy index 39232570c9..d47790d6b3 100755 --- a/bin/OPL-update-legacy +++ b/bin/OPL-update-legacy @@ -19,55 +19,54 @@ use File::Basename; use Cwd; use DBI; - #(maximum varchar length is 255 for mysql version < 5.0.3. - #You can increase path length to 4096 for mysql > 5.0.3) +#(maximum varchar length is 255 for mysql version < 5.0.3. +#You can increase path length to 4096 for mysql > 5.0.3) # Taxonomy global variables # Make a hash of hashes of hashes to record what is legal # Also create list for json file -my $taxo={}; +my $taxo = {}; #my $taxsubs = []; ### Data for creating the database tables my %OPLtables = ( - dbsubject => 'OPL_DBsubject', - dbchapter => 'OPL_DBchapter', - dbsection => 'OPL_DBsection', - author => 'OPL_author', - path => 'OPL_path', - pgfile => 'OPL_pgfile', - keyword => 'OPL_keyword', - pgfile_keyword => 'OPL_pgfile_keyword', - textbook => 'OPL_textbook', - chapter => 'OPL_chapter', - section => 'OPL_section', - problem => 'OPL_problem', - morelt => 'OPL_morelt', - pgfile_problem => 'OPL_pgfile_problem', + dbsubject => 'OPL_DBsubject', + dbchapter => 'OPL_DBchapter', + dbsection => 'OPL_DBsection', + author => 'OPL_author', + path => 'OPL_path', + pgfile => 'OPL_pgfile', + keyword => 'OPL_keyword', + pgfile_keyword => 'OPL_pgfile_keyword', + textbook => 'OPL_textbook', + chapter => 'OPL_chapter', + section => 'OPL_section', + problem => 'OPL_problem', + morelt => 'OPL_morelt', + pgfile_problem => 'OPL_pgfile_problem', ); - my %NPLtables = ( - dbsubject => 'NPL-DBsubject', - dbchapter => 'NPL-DBchapter', - dbsection => 'NPL-DBsection', - author => 'NPL-author', - path => 'NPL-path', - pgfile => 'NPL-pgfile', - keyword => 'NPL-keyword', - pgfile_keyword => 'NPL-pgfile-keyword', - textbook => 'NPL-textbook', - chapter => 'NPL-chapter', - section => 'NPL-section', - problem => 'NPL-problem', - morelt => 'NPL-morelt', - pgfile_problem => 'NPL-pgfile-problem', + dbsubject => 'NPL-DBsubject', + dbchapter => 'NPL-DBchapter', + dbsection => 'NPL-DBsection', + author => 'NPL-author', + path => 'NPL-path', + pgfile => 'NPL-pgfile', + keyword => 'NPL-keyword', + pgfile_keyword => 'NPL-pgfile-keyword', + textbook => 'NPL-textbook', + chapter => 'NPL-chapter', + section => 'NPL-section', + problem => 'NPL-problem', + morelt => 'NPL-morelt', + pgfile_problem => 'NPL-pgfile-problem', ); BEGIN { use Mojo::File qw(curfile); - use Env qw(WEBWORK_ROOT); + use Env qw(WEBWORK_ROOT); $WEBWORK_ROOT = curfile->dirname->dirname; } @@ -84,17 +83,17 @@ my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} }); # decide whether the mysql installation can handle # utf8mb4 and that should be used for the OPL -my $ENABLE_UTF8MB4 = ($ce->{ENABLE_UTF8MB4})?1:0; -print "using utf8mb4 \n\n" if $ENABLE_UTF8MB4; +my $ENABLE_UTF8MB4 = ($ce->{ENABLE_UTF8MB4}) ? 1 : 0; +print "using utf8mb4 \n\n" if $ENABLE_UTF8MB4; # The DBD::MariaDB driver should not get the # mysql_enable_utf8mb4 or mysql_enable_utf8 settings, # but DBD::mysql should. my %utf8_parameters = (); -if ( $ce->{database_driver} =~ /^mysql$/i ) { +if ($ce->{database_driver} =~ /^mysql$/i) { # Only needed for older DBI:mysql driver - if ( $ENABLE_UTF8MB4 ) { + if ($ENABLE_UTF8MB4) { $utf8_parameters{mysql_enable_utf8mb4} = 1; } else { $utf8_parameters{mysql_enable_utf8} = 1; @@ -112,8 +111,8 @@ my $dbh = DBI->connect( }, ); -my $character_set=''; -$character_set=($ENABLE_UTF8MB4)?"utf8mb4":"utf8"; +my $character_set = ''; +$character_set = ($ENABLE_UTF8MB4) ? "utf8mb4" : "utf8"; $dbh->prepare("SET NAMES '$character_set'")->execute(); print "using character set $character_set to build OPL database\n"; @@ -125,13 +124,13 @@ $contribRoot =~ s|/+$||; print "using libraryRoot $libraryRoot\n"; print "using contribRoot $contribRoot\n"; print "WEBWORK_ROOT $ENV{WEBWORK_ROOT}\n"; -my $libraryVersion = $ce->{problemLibrary}->{version}; +my $libraryVersion = $ce->{problemLibrary}->{version}; my $db_storage_engine = $ce->{problemLibrary_db}->{storage_engine}; my $verbose = 0; -my $cnt2 = 0; +my $cnt2 = 0; # Can force library version -$libraryVersion = $ARGV[0] if(@ARGV); +$libraryVersion = $ARGV[0] if (@ARGV); # auto flush printing my $old_fh = select(STDOUT); @@ -139,15 +138,15 @@ $| = 1; select($old_fh); sub dbug { - my $msg = shift; + my $msg = shift; my $insignificance = shift || 2; - print $msg if($verbose>=$insignificance); + print $msg if ($verbose >= $insignificance); } ##Figure out which set of tables to use my %tables; -if($libraryVersion eq '2.5') { +if ($libraryVersion eq '2.5') { %tables = %OPLtables; my $lib = 'OPL'; warn "Library version is $libraryVersion; using OPLtables!\n"; @@ -158,29 +157,36 @@ if($libraryVersion eq '2.5') { } @create_tables = ( -[$tables{dbsubject}, ' + [ + $tables{dbsubject}, ' DBsubject_id int(15) NOT NULL auto_increment, name varchar(245) NOT NULL, KEY DBsubject (name), PRIMARY KEY (DBsubject_id) -'], -[$tables{dbchapter}, ' +' + ], + [ + $tables{dbchapter}, ' DBchapter_id int(15) NOT NULL auto_increment, name varchar(245) NOT NULL, DBsubject_id int(15) DEFAULT 0 NOT NULL, KEY DBchapter (name), KEY (DBsubject_id), PRIMARY KEY (DBchapter_id) -'], -[$tables{dbsection}, ' +' + ], + [ + $tables{dbsection}, ' DBsection_id int(15) NOT NULL auto_increment, name varchar(245) NOT NULL, DBchapter_id int(15) DEFAULT 0 NOT NULL, KEY DBsection (name), KEY (DBchapter_id), PRIMARY KEY (DBsection_id) -'], -[$tables{author}, ' +' + ], + [ + $tables{author}, ' author_id int (15) NOT NULL auto_increment, institution tinyblob, lastname varchar (255) NOT NULL, @@ -188,16 +194,20 @@ if($libraryVersion eq '2.5') { email varchar (255), KEY author (lastname(100), firstname(100)), PRIMARY KEY (author_id) -'], -[$tables{path}, ' +' + ], + [ + $tables{path}, ' path_id int(15) NOT NULL auto_increment, path varchar(245) NOT NULL, machine varchar(255), user varchar(255), KEY (path), PRIMARY KEY (path_id) -'], -[$tables{pgfile}, ' +' + ], + [ + $tables{pgfile}, ' pgfile_id int(15) NOT NULL auto_increment, DBsection_id int(15) NOT NULL, author_id int(15), @@ -211,20 +221,26 @@ if($libraryVersion eq '2.5') { static TINYINT, MO TINYINT, PRIMARY KEY (pgfile_id) -'], -[$tables{keyword}, ' +' + ], + [ + $tables{keyword}, ' keyword_id int(15) NOT NULL auto_increment, keyword varchar(245) NOT NULL, KEY (keyword), PRIMARY KEY (keyword_id) -'], -[$tables{pgfile_keyword}, ' +' + ], + [ + $tables{pgfile_keyword}, ' pgfile_id int(15) DEFAULT 0 NOT NULL, keyword_id int(15) DEFAULT 0 NOT NULL, KEY pgfile_keyword (keyword_id, pgfile_id), KEY pgfile (pgfile_id) -'], -[$tables{textbook}, ' +' + ], + [ + $tables{textbook}, ' textbook_id int (15) NOT NULL auto_increment, title varchar (255) NOT NULL, edition int (15) DEFAULT 0 NOT NULL, @@ -233,8 +249,10 @@ if($libraryVersion eq '2.5') { isbn char (15), pubdate varchar (255), PRIMARY KEY (textbook_id) -'], -[$tables{chapter}, ' +' + ], + [ + $tables{chapter}, ' chapter_id int (15) NOT NULL auto_increment, textbook_id int (15), number int(3), @@ -243,8 +261,10 @@ if($libraryVersion eq '2.5') { KEY (textbook_id, name), KEY (number), PRIMARY KEY (chapter_id) -'], -[$tables{section}, ' +' + ], + [ + $tables{section}, ' section_id int(15) NOT NULL auto_increment, chapter_id int (15), number int(3), @@ -253,8 +273,10 @@ if($libraryVersion eq '2.5') { KEY (chapter_id, name), KEY (number), PRIMARY KEY section (section_id) -'], -[$tables{problem}, ' +' + ], + [ + $tables{problem}, ' problem_id int(15) NOT NULL auto_increment, section_id int(15), number int(4) NOT NULL, @@ -262,20 +284,26 @@ if($libraryVersion eq '2.5') { #KEY (page, number), KEY (section_id), PRIMARY KEY (problem_id) -'], -[$tables{morelt}, ' +' + ], + [ + $tables{morelt}, ' morelt_id int(15) NOT NULL auto_increment, name varchar(245) NOT NULL, DBsection_id int(15), leader int(15), # pgfile_id of the MLT leader KEY (name), PRIMARY KEY (morelt_id) -'], -[$tables{pgfile_problem}, ' +' + ], + [ + $tables{pgfile_problem}, ' pgfile_id int(15) DEFAULT 0 NOT NULL, problem_id int(15) DEFAULT 0 NOT NULL, PRIMARY KEY (pgfile_id, problem_id) -']); +' + ] +); ### End of database data @@ -288,20 +316,19 @@ $dbh->do("DROP TABLE IF EXISTS `NPL-pgfile-institution`"); for my $tableinfo (@create_tables) { my $tabname = $tableinfo->[0]; my $tabinit = $tableinfo->[1]; - my $query = "DROP TABLE IF EXISTS `$tabname`"; + my $query = "DROP TABLE IF EXISTS `$tabname`"; $dbh->do($query); $query = "CREATE TABLE `$tabname` ( $tabinit ) ENGINE=$db_storage_engine CHARACTER SET $character_set"; $dbh->do($query); - if($lib eq 'OPL') { + if ($lib eq 'OPL') { $old_tabname = $tabname; $old_tabname =~ s/OPL/NPL/; $old_tabname =~ s/_/-/g; $query = "DROP TABLE IF EXISTS `$old_tabname`"; - $dbh -> do($query); + $dbh->do($query); } } - print "Mysql database reinitialized.\n"; # From pgfile @@ -318,53 +345,55 @@ print "Mysql database reinitialized.\n"; # Get an id, and add entry to the database if needed sub safe_get_id { - my $tablename = shift; - my $idname = shift; - my $whereclause = shift; - my $wherevalues = shift; - my $addifnew = shift; + my $tablename = shift; + my $idname = shift; + my $whereclause = shift; + my $wherevalues = shift; + my $addifnew = shift; my @insertvalues = @_; #print "\nCalled with $tablename, $idname, $whereclause, [".join(',', @$wherevalues)."], (".join(',', @insertvalues).")\n"; - for my $j (0..$#insertvalues) { + for my $j (0 .. $#insertvalues) { $insertvalues[$j] =~ s/"/\\\"/g; } - my $query = "SELECT $idname FROM `$tablename` ".$whereclause; - my $sth = $dbh->prepare($query); + my $query = "SELECT $idname FROM `$tablename` " . $whereclause; + my $sth = $dbh->prepare($query); $sth->execute(@$wherevalues); my $idvalue, @row; - unless(@row = $sth->fetchrow_array()) { + unless (@row = $sth->fetchrow_array()) { return 0 unless $addifnew; - for my $j (0..$#insertvalues) { + for my $j (0 .. $#insertvalues) { #print "Looking at ".$insertvalues[$j]."\n"; if ($insertvalues[$j] ne "") { - $insertvalues[$j] = '"'.$insertvalues[$j].'"'; + $insertvalues[$j] = '"' . $insertvalues[$j] . '"'; } else { $insertvalues[$j] = NULL; } } - $dbh->do("INSERT INTO `$tablename` VALUES(". join(',',@insertvalues) .")"); - dbug "INSERT INTO $tablename VALUES( ".join(',',@insertvalues).")\n"; + $dbh->do("INSERT INTO `$tablename` VALUES(" . join(',', @insertvalues) . ")"); + dbug "INSERT INTO $tablename VALUES( " . join(',', @insertvalues) . ")\n"; $sth = $dbh->prepare($query); $sth->execute(@$wherevalues); @row = $sth->fetchrow_array(); } $idvalue = $row[0]; - return($idvalue); + return ($idvalue); } sub isvalid { my $tags = shift; - if(not defined $taxo->{$tags->{DBsubject}}) { - print "\nInvalid subject ".$tags->{DBsubject}."\n"; + if (not defined $taxo->{ $tags->{DBsubject} }) { + print "\nInvalid subject " . $tags->{DBsubject} . "\n"; return 0; } - if(not ($tags->{DBchapter} eq 'Misc.') and not defined $taxo->{$tags->{DBsubject}}->{$tags->{DBchapter}}) { - print "\nInvalid chapter ".$tags->{DBchapter}."\n"; + if (not($tags->{DBchapter} eq 'Misc.') and not defined $taxo->{ $tags->{DBsubject} }->{ $tags->{DBchapter} }) { + print "\nInvalid chapter " . $tags->{DBchapter} . "\n"; return 0; } - if(not ($tags->{DBsection} eq 'Misc.') and not defined $taxo->{$tags->{DBsubject}}->{$tags->{DBchapter}}->{$tags->{DBsection}}) { - print "\nInvalid section ".$tags->{DBsection}."\n"; + if (not($tags->{DBsection} eq 'Misc.') + and not defined $taxo->{ $tags->{DBsubject} }->{ $tags->{DBchapter} }->{ $tags->{DBsection} }) + { + print "\nInvalid section " . $tags->{DBsection} . "\n"; return 0; } return 1; @@ -372,39 +401,50 @@ sub isvalid { #### First read in textbook information -if(open(IN, '<:encoding(UTF-8)', "$libraryRoot/Textbooks")) { +if (open(IN, '<:encoding(UTF-8)', "$libraryRoot/Textbooks")) { print "Reading in textbook data from Textbooks in the library $libraryRoot.\n"; - my %textinfo = ( TitleText => '', EditionText =>'', AuthorText=>''); - my $bookid = undef; + my %textinfo = (TitleText => '', EditionText => '', AuthorText => ''); + my $bookid = undef; while (my $line = ) { $line =~ s|#*$||; - if($line =~ /^\s*(.*?)\s*>>>\s*(.*?)\s*$/) { # Should have chapter or section information + if ($line =~ /^\s*(.*?)\s*>>>\s*(.*?)\s*$/) { # Should have chapter or section information my $chapsec = $1; - my $title = $2; - if($chapsec=~ /(\d+)\.(\d+)/) { # We have a section - if(defined($bookid)) { - my $query = "SELECT chapter_id FROM `$tables{chapter}` WHERE textbook_id = \"$bookid\" AND number = \"$1\""; + my $title = $2; + if ($chapsec =~ /(\d+)\.(\d+)/) { # We have a section + if (defined($bookid)) { + my $query = + "SELECT chapter_id FROM `$tables{chapter}` WHERE textbook_id = \"$bookid\" AND number = \"$1\""; my $chapid = $dbh->selectrow_array($query); - if(defined($chapid)) { - my $sectid = safe_get_id($tables{section}, 'section_id', - qq(WHERE chapter_id = ? and name = ?), [$chapid, $title], 1, "", $chapid, $2, $title, ""); + if (defined($chapid)) { + my $sectid = safe_get_id( + $tables{section}, 'section_id', + qq(WHERE chapter_id = ? and name = ?), + [ $chapid, $title ], + 1, "", $chapid, $2, $title, "" + ); } else { - print "Cannot enter section $chapsec because textbook information is missing the chapter entry\n"; + print + "Cannot enter section $chapsec because textbook information is missing the chapter entry\n"; } } else { print "Cannot enter section $chapsec because textbook information is incomplete\n"; } - } else { # We have a chapter entry - if(defined($bookid)) { - my $chapid = safe_get_id($tables{chapter}, 'chapter_id', - qq(WHERE textbook_id = ? AND number = ?), [$bookid, $chapsec], 1, "", $bookid, $chapsec, $title, ""); - - # Add dummy section entry for problems tagged to the chapter - # without a section - $query = "SELECT section_id FROM `$tables{section}` WHERE chapter_id = \"$chapid\" AND number = -1"; - my $sectid = $dbh->selectrow_array($query); - if (!defined($sectid)) { - $dbh->do("INSERT INTO `$tables{section}` + } else { # We have a chapter entry + if (defined($bookid)) { + my $chapid = safe_get_id( + $tables{chapter}, 'chapter_id', + qq(WHERE textbook_id = ? AND number = ?), + [ $bookid, $chapsec ], + 1, "", $bookid, $chapsec, $title, "" + ); + + # Add dummy section entry for problems tagged to the chapter + # without a section + $query = "SELECT section_id FROM `$tables{section}` WHERE chapter_id = \"$chapid\" AND number = -1"; + my $sectid = $dbh->selectrow_array($query); + if (!defined($sectid)) { + $dbh->do( + "INSERT INTO `$tables{section}` VALUES( NULL, \"$chapid\", @@ -412,31 +452,36 @@ if(open(IN, '<:encoding(UTF-8)', "$libraryRoot/Textbooks")) { \"\", NULL )" - ); + ); dbug "INSERT INTO section VALUES(\"\", \"$chapid\", \"-1\", \"\", \"\" )\n"; - } + } } else { print "Cannot enter chapter $chapsec because textbook information is incomplete\n"; } } - } elsif($line =~ /^\s*(TitleText|EditionText|AuthorText)\(\s*'(.*?)'\s*\)/) { + } elsif ($line =~ /^\s*(TitleText|EditionText|AuthorText)\(\s*'(.*?)'\s*\)/) { # Textbook information, maybe new my $type = $1; - if(defined($textinfo{$type})) { # signals new text - %textinfo = ( TitleText => undef, - EditionText =>undef, - AuthorText=> undef); + if (defined($textinfo{$type})) { # signals new text + %textinfo = ( + TitleText => undef, + EditionText => undef, + AuthorText => undef + ); $textinfo{$type} = $2; $bookid = undef; } else { $textinfo{$type} = $2; - if(defined($textinfo{TitleText}) and - defined($textinfo{AuthorText}) and - defined($textinfo{EditionText})) { - my $query = "SELECT textbook_id FROM `$tables{textbook}` WHERE title = \"$textinfo{TitleText}\" AND edition = \"$textinfo{EditionText}\" AND author=\"$textinfo{AuthorText}\""; + if (defined($textinfo{TitleText}) + and defined($textinfo{AuthorText}) + and defined($textinfo{EditionText})) + { + my $query = + "SELECT textbook_id FROM `$tables{textbook}` WHERE title = \"$textinfo{TitleText}\" AND edition = \"$textinfo{EditionText}\" AND author=\"$textinfo{AuthorText}\""; $bookid = $dbh->selectrow_array($query); if (!defined($bookid)) { - $dbh->do("INSERT INTO `$tables{textbook}` + $dbh->do( + "INSERT INTO `$tables{textbook}` VALUES( NULL, \"$textinfo{TitleText}\", @@ -446,8 +491,9 @@ if(open(IN, '<:encoding(UTF-8)', "$libraryRoot/Textbooks")) { NULL, NULL )" - ); - dbug "INSERT INTO textbook VALUES( \"\", \"$textinfo{TitleText}\", \"$textinfo{EditionText}\", \"$textinfo{AuthorText}\", \"\", \"\", \"\" )\n"; + ); + dbug + "INSERT INTO textbook VALUES( \"\", \"$textinfo{TitleText}\", \"$textinfo{EditionText}\", \"$textinfo{AuthorText}\", \"\", \"\", \"\" )\n"; $bookid = $dbh->selectrow_array($query); } } @@ -463,18 +509,18 @@ if(open(IN, '<:encoding(UTF-8)', "$libraryRoot/Textbooks")) { #### End of textbooks #### Next read in the taxonomy -my $clsep = '<<<'; +my $clsep = '<<<'; my $clinner = '__'; -my @cllist = (); +my @cllist = (); # Record full taxonomy for tagging menus (does not include cross-lists) my $tagtaxo = []; -my ($chaplist, $seclist) = ([],[]); +my ($chaplist, $seclist) = ([], []); my $canopenfile = 0; -if(open(IN, '<:encoding(UTF-8)', "$libraryRoot/Taxonomy2")) { +if (open(IN, '<:encoding(UTF-8)', "$libraryRoot/Taxonomy2")) { print "Reading in OPL taxonomy from Taxonomy2 in the library $libraryRoot.\n"; $canopenfile = 1; -} elsif(open(IN, '<:encoding(UTF-8)', "$libraryRoot/Taxonomy")) { +} elsif (open(IN, '<:encoding(UTF-8)', "$libraryRoot/Taxonomy")) { print "Reading in OPL taxonomy from Taxonomy in the library $libraryRoot.\n"; $canopenfile = 1; } else { @@ -484,20 +530,20 @@ if(open(IN, '<:encoding(UTF-8)', "$libraryRoot/Taxonomy2")) { } # Taxonomy is a subset of Taxonomy2, so we can use the same code either way -if($canopenfile) { - my ($cursub,$curchap); # these are strings - my ($subj, $chap, $sect); # these are indeces - while(my $line = ) { +if ($canopenfile) { + my ($cursub, $curchap); # these are strings + my ($subj, $chap, $sect); # these are indeces + while (my $line = ) { $line =~ /^(\t*)/; my $count = length($1); my $oktag = 1; chomp($line); - if($line =~ m/$clsep/) { + if ($line =~ m/$clsep/) { $oktag = 0; my @cross = split $clsep, $line; @cross = map(trim($_), @cross); - if(scalar(@cross) > 1) { - push @cllist, [join($clinner, ($cursub,$curchap,$cross[0])) ,$cross[1]]; + if (scalar(@cross) > 1) { + push @cllist, [ join($clinner, ($cursub, $curchap, $cross[0])), $cross[1] ]; } $line = $cross[0]; } @@ -507,31 +553,38 @@ if($canopenfile) { # but crosslists are not put in the heierarchy of legal tags # instead they go in a list of crosslists to deal with after # the full taxonomy is read in - if($count == 0) { #DBsubject + if ($count == 0) { #DBsubject $cursub = $line; - if($oktag) { + if ($oktag) { $taxo->{$line} = {}; - ($chaplist, $seclist) = ([],[]); - push @{$tagtaxo}, {name=>$line, subfields=>$chaplist}; + ($chaplist, $seclist) = ([], []); + push @{$tagtaxo}, { name => $line, subfields => $chaplist }; } - $subj = safe_get_id($tables{dbsubject}, 'DBsubject_id', - qq(WHERE name = ?), [$line], 1, "", $line); - } elsif($count == 1) { #DBchapter - if($oktag) { + $subj = safe_get_id($tables{dbsubject}, 'DBsubject_id', qq(WHERE name = ?), [$line], 1, "", $line); + } elsif ($count == 1) { #DBchapter + if ($oktag) { $taxo->{$cursub}->{$line} = {}; - $seclist=[]; - push @{$chaplist}, {name=>$line, subfields=>$seclist}; + $seclist = []; + push @{$chaplist}, { name => $line, subfields => $seclist }; } $curchap = $line; - $chap = safe_get_id($tables{dbchapter}, 'DBchapter_id', - qq(WHERE name = ? and DBsubject_id = ?), [$line, $subj], 1, "", $line, $subj); - } else { #DBsection - if($oktag) { + $chap = safe_get_id( + $tables{dbchapter}, 'DBchapter_id', + qq(WHERE name = ? and DBsubject_id = ?), + [ $line, $subj ], + 1, "", $line, $subj + ); + } else { #DBsection + if ($oktag) { $taxo->{$cursub}->{$curchap}->{$line} = []; - push @{$seclist}, {name=>$line}; + push @{$seclist}, { name => $line }; } - $sect = safe_get_id($tables{dbsection}, 'DBsection_id', - qq(WHERE name = ? and DBchapter_id = ?), [$line, $chap], 1, "", $line, $chap); + $sect = safe_get_id( + $tables{dbsection}, 'DBsection_id', + qq(WHERE name = ? and DBchapter_id = ?), + [ $line, $chap ], + 1, "", $line, $chap + ); } } close(IN); @@ -540,16 +593,16 @@ if($canopenfile) { #### Save the official taxonomy in json format my $webwork_htdocs = $ce->{webworkDirs}{htdocs}; -my $file = "$webwork_htdocs/DATA/tagging-taxonomy.json"; +my $file = "$webwork_htdocs/DATA/tagging-taxonomy.json"; -writeJSONtoFile($tagtaxo,$file); +writeJSONtoFile($tagtaxo, $file); print "Saved taxonomy to $file.\n"; #### Now deal with cross-listed sections for my $clinfo (@cllist) { my @scs = split /$clinner/, $clinfo->[1]; - if(defined $taxo->{$scs[0]}->{$scs[1]}->{$scs[2]}) { - push @{$taxo->{$scs[0]}->{$scs[1]}->{$scs[2]}}, $clinfo->[0]; + if (defined $taxo->{ $scs[0] }->{ $scs[1] }->{ $scs[2] }) { + push @{ $taxo->{ $scs[0] }->{ $scs[1] }->{ $scs[2] } }, $clinfo->[0]; } else { print "Faulty cross-list: pointing to $scs[0] / $scs[1] / $scs[2]\n"; } @@ -561,8 +614,8 @@ print "Number of files processed:\n"; #### Now search for tagged problems #recursive search for all pg files -File::Find::find( { wanted => \&pgfiles, follow_fast => 1 }, $libraryRoot ); -File::Find::find( { wanted => \&pgfiles, follow_fast => 1 }, $contribRoot ); +File::Find::find({ wanted => \&pgfiles, follow_fast => 1 }, $libraryRoot); +File::Find::find({ wanted => \&pgfiles, follow_fast => 1 }, $contribRoot); sub trim { my $str = shift; @@ -576,14 +629,14 @@ sub kwtidy { $s =~ s/\W//g; $s =~ s/_//g; $s = lc($s); - return($s); + return ($s); } sub keywordcleaner { my $string = shift; - my @spl1 = split /,/, $string; - my @spl2 = map(kwtidy($_), @spl1); - return(@spl2); + my @spl1 = split /,/, $string; + my @spl2 = map(kwtidy($_), @spl1); + return (@spl2); } # Save on passing these values around @@ -594,22 +647,28 @@ sub maybenewtext { my $textno = shift; return if defined($textinfo{$textno}); # So, not defined yet - $textinfo{$textno} = { title => '', author =>'', edition =>'', - section => '', chapter =>'', problems => [] }; + $textinfo{$textno} = { + title => '', + author => '', + edition => '', + section => '', + chapter => '', + problems => [] + }; } # process each file returned by the find command. sub pgfiles { my $name = $File::Find::name; my ($text, $edition, $textauthor, $textsection, $textproblem); - %textinfo=(); + %textinfo = (); my @textproblems = (-1); -#print "\n$name"; + #print "\n$name"; if ($name =~ /\.pg$/) { $cnt2++; - printf("%6d", $cnt2) if(($cnt2 % 100) == 0); - print "\n" if(($cnt2 % 1000) == 0); + printf("%6d", $cnt2) if (($cnt2 % 100) == 0); + print "\n" if (($cnt2 % 1000) == 0); my $pgfile = basename($name); my $pgpath = dirname($name); @@ -629,48 +688,68 @@ sub pgfiles { # DBsubject table - if(isvalid($tags)) { - my $DBsubject_id = safe_get_id($tables{dbsubject}, 'DBsubject_id', - qq(WHERE BINARY name = ?), [$tags->{DBsubject}], 1, "", $tags->{DBsubject}); - if(not $DBsubject_id) { + if (isvalid($tags)) { + my $DBsubject_id = safe_get_id( + $tables{dbsubject}, 'DBsubject_id', + qq(WHERE BINARY name = ?), + [ $tags->{DBsubject} ], + 1, "", $tags->{DBsubject} + ); + if (not $DBsubject_id) { print "\nInvalid subject '$tags->{DBsubject}' in $name\n"; return; } # DBchapter table - $DBchapter_id = safe_get_id($tables{dbchapter}, 'DBchapter_id', - qq(WHERE BINARY name = ? and DBsubject_id = ?), [$tags->{DBchapter}, $DBsubject_id], 1, "", $tags->{DBchapter}, $DBsubject_id); - if(not $DBchapter_id) { + $DBchapter_id = safe_get_id( + $tables{dbchapter}, 'DBchapter_id', + qq(WHERE BINARY name = ? and DBsubject_id = ?), + [ $tags->{DBchapter}, $DBsubject_id ], + 1, "", $tags->{DBchapter}, $DBsubject_id + ); + if (not $DBchapter_id) { print "\nInvalid chapter '$tags->{DBchapter}' in $name\n"; return; } # DBsection table - $aDBsection_id = safe_get_id($tables{dbsection}, 'DBsection_id', - qq(WHERE BINARY name = ? and DBchapter_id = ?), [$tags->{DBsection}, $DBchapter_id], 1, "", $tags->{DBsection}, $DBchapter_id); - if(not $aDBsection_id) { + $aDBsection_id = safe_get_id( + $tables{dbsection}, 'DBsection_id', + qq(WHERE BINARY name = ? and DBchapter_id = ?), + [ $tags->{DBsection}, $DBchapter_id ], + 1, "", $tags->{DBsection}, $DBchapter_id + ); + if (not $aDBsection_id) { print "\nInvalid section '$tags->{DBsection}' in $name\n"; return; } - } else { # tags are not valid, error printed by validation part + } else { # tags are not valid, error printed by validation part print "File $name\n"; return; } - my @DBsection_ids=($aDBsection_id); + my @DBsection_ids = ($aDBsection_id); # Now add crosslisted section - my @CL_array = @{$taxo->{$tags->{DBsubject}}->{$tags->{DBchapter}}->{$tags->{DBsection}}}; + my @CL_array = @{ $taxo->{ $tags->{DBsubject} }->{ $tags->{DBchapter} }->{ $tags->{DBsection} } }; for my $clsect (@CL_array) { my @np = split /$clinner/, $clsect; @np = map(trim($_), @np); - my $new_dbsubj_id = safe_get_id($tables{dbsubject}, 'DBsubject_id', - qq(WHERE name = ?), [$np[0]], 1, "", $np[0]); - my $new_dbchap_id = safe_get_id($tables{dbchapter}, 'DBchapter_id', - qq(WHERE name = ? and DBsubject_id = ?), [$np[1], $new_dbsubj_id], 1, "", $np[1], $new_dbsubj_id); - my $new_dbsect_id = safe_get_id($tables{dbsection}, 'DBsection_id', - qq(WHERE name = ? and DBchapter_id = ?), [$np[2], $new_dbchap_id], 1, "", $np[2], $new_dbchap_id); + my $new_dbsubj_id = + safe_get_id($tables{dbsubject}, 'DBsubject_id', qq(WHERE name = ?), [ $np[0] ], 1, "", $np[0]); + my $new_dbchap_id = safe_get_id( + $tables{dbchapter}, 'DBchapter_id', + qq(WHERE name = ? and DBsubject_id = ?), + [ $np[1], $new_dbsubj_id ], + 1, "", $np[1], $new_dbsubj_id + ); + my $new_dbsect_id = safe_get_id( + $tables{dbsection}, 'DBsection_id', + qq(WHERE name = ? and DBchapter_id = ?), + [ $np[2], $new_dbchap_id ], + 1, "", $np[2], $new_dbchap_id + ); push @DBsection_ids, $new_dbsect_id; } @@ -678,22 +757,25 @@ sub pgfiles { $tags->{Author} =~ /(.*?)\s(\w+)\s*$/; my $firstname = $1; - my $lastname = $2; + my $lastname = $2; #remove leading and trailing spaces from firstname, which includes any middle name too. $firstname =~ s/^\s*//; $firstname =~ s/\s*$//; - $lastname =~ s/^\s*//; - $lastname =~ s/\s*$//; + $lastname =~ s/^\s*//; + $lastname =~ s/\s*$//; my $author_id = 0; - if($lastname) { - $author_id = safe_get_id($tables{author}, 'author_id', - qq(WHERE lastname = ? AND firstname = ?), [$lastname, $firstname], 1, "", $tags->{Institution}, $lastname, $firstname,""); + if ($lastname) { + $author_id = safe_get_id( + $tables{author}, 'author_id', + qq(WHERE lastname = ? AND firstname = ?), + [ $lastname, $firstname ], + 1, "", $tags->{Institution}, $lastname, $firstname, "" + ); } # path table - my $path_id = safe_get_id($tables{path}, 'path_id', - qq(WHERE path = ?), [$pgpath], 1, "", $pgpath, "", ""); + my $path_id = safe_get_id($tables{path}, 'path_id', qq(WHERE path = ?), [$pgpath], 1, "", $pgpath, "", ""); # pgfile table -- set 4 defaults first @@ -706,29 +788,38 @@ sub pgfiles { my @pgfile_ids = (); for my $DBsection_id (@DBsection_ids) { - my $pgfile_id = safe_get_id($tables{pgfile}, 'pgfile_id', + my $pgfile_id = safe_get_id( + $tables{pgfile}, 'pgfile_id', qq(WHERE filename = ? AND path_id = ? AND DBsection_id = ? AND libraryroot = ?), - [$pgfile, $path_id, $DBsection_id, $pglib], 1, "", $DBsection_id, $author_id, - $tags->{Institution}, $pglib, $path_id, $pgfile, 0, $level, $lang, $static, $mathobj); + [ $pgfile, $path_id, $DBsection_id, $pglib ], 1, "", $DBsection_id, $author_id, + $tags->{Institution}, $pglib, $path_id, $pgfile, 0, $level, $lang, $static, $mathobj + ); push @pgfile_ids, $pgfile_id; } # morelt table my $morelt_id; - if($tags->{MLT}) { + if ($tags->{MLT}) { for my $DBsection_id (@DBsection_ids) { - $morelt_id = safe_get_id($tables{morelt}, 'morelt_id', - qq(WHERE name = ?), [$tags->{MLT}], 1, "", $tags->{MLT}, $DBsection_id, ""); + $morelt_id = safe_get_id( + $tables{morelt}, 'morelt_id', qq(WHERE name = ?), [ $tags->{MLT} ], + 1, "", $tags->{MLT}, $DBsection_id, + "" + ); for my $pgfile_id (@pgfile_ids) { - $dbh->do("UPDATE `$tables{pgfile}` SET - morelt_id = \"$morelt_id\" WHERE pgfile_id = \"$pgfile_id\" "); + $dbh->do( + "UPDATE `$tables{pgfile}` SET + morelt_id = \"$morelt_id\" WHERE pgfile_id = \"$pgfile_id\" " + ); dbug "UPDATE pgfile morelt_id for $pgfile_id to $morelt_id\n"; - if($tags->{MLTleader}) { - $dbh->do("UPDATE `$tables{morelt}` SET - leader = \"$pgfile_id\" WHERE morelt_id = \"$morelt_id\" "); + if ($tags->{MLTleader}) { + $dbh->do( + "UPDATE `$tables{morelt}` SET + leader = \"$pgfile_id\" WHERE morelt_id = \"$morelt_id\" " + ); dbug "UPDATE morelt leader for $morelt_id to $pgfile_id\n"; } } @@ -737,49 +828,54 @@ sub pgfiles { # keyword table, and problem_keyword many-many table - foreach my $keyword (@{$tags->{keywords}}) { + foreach my $keyword (@{ $tags->{keywords} }) { $keyword =~ s/[\'\"]//g; $keyword = kwtidy($keyword); - # skip it if it is empty - next unless $keyword; - my $keyword_id = safe_get_id($tables{keyword}, 'keyword_id', - qq(WHERE keyword = ?), [$keyword], 1, "", $keyword); + # skip it if it is empty + next unless $keyword; + my $keyword_id = + safe_get_id($tables{keyword}, 'keyword_id', qq(WHERE keyword = ?), [$keyword], 1, "", $keyword); for my $pgfile_id (@pgfile_ids) { - $query = "SELECT pgfile_id FROM `$tables{pgfile_keyword}` WHERE keyword_id = \"$keyword_id\" and pgfile_id=\"$pgfile_id\""; + $query = + "SELECT pgfile_id FROM `$tables{pgfile_keyword}` WHERE keyword_id = \"$keyword_id\" and pgfile_id=\"$pgfile_id\""; my $ok = $dbh->selectrow_array($query); if (!defined($ok)) { - $dbh->do("INSERT INTO `$tables{pgfile_keyword}` + $dbh->do( + "INSERT INTO `$tables{pgfile_keyword}` VALUES( \"$pgfile_id\", \"$keyword_id\" )" - ); + ); dbug "INSERT INTO pgfile_keyword VALUES( \"$pgfile_id\", \"$keyword_id\" )\n"; } } - } #end foreach keyword + } #end foreach keyword # Textbook section # problem table contains textbook problems - for my $texthashref (@{$tags->{textinfo}}) { + for my $texthashref (@{ $tags->{textinfo} }) { # textbook table - $text = $texthashref->{TitleText}; + $text = $texthashref->{TitleText}; $edition = $texthashref->{EditionText} || 0; $edition =~ s/[^\d\.]//g; $textauthor = $texthashref->{AuthorText}; - next unless($text and $textauthor); + next unless ($text and $textauthor); my $chapnum = $texthashref->{chapter} || -1; - my $secnum = $texthashref->{section} || -1; - $query = "SELECT textbook_id FROM `$tables{textbook}` WHERE title = \"$text\" AND edition = \"$edition\" AND author=\"$textauthor\""; + my $secnum = $texthashref->{section} || -1; + $query = + "SELECT textbook_id FROM `$tables{textbook}` WHERE title = \"$text\" AND edition = \"$edition\" AND author=\"$textauthor\""; my $textbook_id = $dbh->selectrow_array($query); + if (!defined($textbook_id)) { - # make sure edition is an integer - $edition = 0 unless $edition; - $dbh->do("INSERT INTO `$tables{textbook}` + # make sure edition is an integer + $edition = 0 unless $edition; + $dbh->do( + "INSERT INTO `$tables{textbook}` VALUES( NULL, \"$text\", @@ -789,37 +885,45 @@ sub pgfiles { NULL, NULL )" - ); - dbug "INSERT INTO textbook VALUES( \"\", \"$text\", \"$edition\", \"$textauthor\", \"\", \"\", \"\" )\n"; + ); + dbug + "INSERT INTO textbook VALUES( \"\", \"$text\", \"$edition\", \"$textauthor\", \"\", \"\", \"\" )\n"; dbug "\nLate add into $tables{textbook} \"$text\", \"$edition\", \"$textauthor\"\n", 1; $textbook_id = $dbh->selectrow_array($query); } # chapter weak table of textbook - $query = "SELECT chapter_id FROM `$tables{chapter}` WHERE textbook_id = \"$textbook_id\" AND number = \"$chapnum\""; + $query = + "SELECT chapter_id FROM `$tables{chapter}` WHERE textbook_id = \"$textbook_id\" AND number = \"$chapnum\""; my $chapter_id = $dbh->selectrow_array($query); if (!defined($chapter_id) && defined($textbook_id)) { - $dbh->do("INSERT INTO `$tables{chapter}` + $dbh->do( + "INSERT INTO `$tables{chapter}` VALUES( NULL, \"$textbook_id\", - \"".$chapnum."\", + \"" . $chapnum . "\", \"$tags->{DBchapter}\", NULL )" - ); - dbug "\nLate add into $tables{chapter} \"$text\", \"$edition\", \"$textauthor\", $chapnum $tags->{chapter} from $name\n", 1; - dbug "INSERT INTO chapter VALUES(\"\", \"$textbook_id\", \"".$chapnum."\", \"$tags->{DBchapter}\", \"\" )\n"; + ); + dbug + "\nLate add into $tables{chapter} \"$text\", \"$edition\", \"$textauthor\", $chapnum $tags->{chapter} from $name\n", + 1; + dbug "INSERT INTO chapter VALUES(\"\", \"$textbook_id\", \"" . $chapnum + . "\", \"$tags->{DBchapter}\", \"\" )\n"; $chapter_id = $dbh->selectrow_array($query); } # section weak table of textbook # $tags->{DBsection} = '' if ($secnum < 0); - $query = "SELECT section_id FROM `$tables{section}` WHERE chapter_id = \"$chapter_id\" AND number = \"$secnum\""; + $query = + "SELECT section_id FROM `$tables{section}` WHERE chapter_id = \"$chapter_id\" AND number = \"$secnum\""; my $section_id = $dbh->selectrow_array($query); if (!defined($section_id) && defined($chapter_id) && defined($textbook_id)) { - $dbh->do("INSERT INTO `$tables{section}` + $dbh->do( + "INSERT INTO `$tables{section}` VALUES( NULL, \"$chapter_id\", @@ -827,41 +931,48 @@ sub pgfiles { \"$tags->{DBsection}\", NULL )" - ); - dbug "INSERT INTO section VALUES(\"\", \"$textbook_id\", \"$secnum\", \"$tags->{DBsection}\", \"\" )\n"; - dbug "\nLate add into $tables{section} \"$text\", \"$edition\", \"$textauthor\", $secnum $tags->{DBsection} from $name\n", 1; + ); + dbug + "INSERT INTO section VALUES(\"\", \"$textbook_id\", \"$secnum\", \"$tags->{DBsection}\", \"\" )\n"; + dbug + "\nLate add into $tables{section} \"$text\", \"$edition\", \"$textauthor\", $secnum $tags->{DBsection} from $name\n", + 1; $section_id = $dbh->selectrow_array($query); } - @textproblems = @{$texthashref->{problems}}; + @textproblems = @{ $texthashref->{problems} }; if ($section_id) { for my $tp (@textproblems) { - $query = "SELECT problem_id FROM `$tables{problem}` WHERE section_id = \"$section_id\" AND number = \"$tp\""; + $query = + "SELECT problem_id FROM `$tables{problem}` WHERE section_id = \"$section_id\" AND number = \"$tp\""; my $problem_id = $dbh->selectrow_array($query); if (!defined($problem_id)) { - $dbh->do("INSERT INTO `$tables{problem}` + $dbh->do( + "INSERT INTO `$tables{problem}` VALUES( NULL, \"$section_id\", \"$tp\", NULL )" - ); + ); dbug "INSERT INTO problem VALUES( \"\", \"$section_id\", \"$tp\", \"\" )\n"; $problem_id = $dbh->selectrow_array($query); } # pgfile_problem table associates pgfiles with textbook problems for my $pgfile_id (@pgfile_ids) { - $query = "SELECT problem_id FROM `$tables{pgfile_problem}` WHERE problem_id = \"$problem_id\" AND pgfile_id = \"$pgfile_id\""; + $query = + "SELECT problem_id FROM `$tables{pgfile_problem}` WHERE problem_id = \"$problem_id\" AND pgfile_id = \"$pgfile_id\""; my $pg_problem_id = $dbh->selectrow_array($query); if (!defined($pg_problem_id)) { - $dbh->do("INSERT INTO `$tables{pgfile_problem}` + $dbh->do( + "INSERT INTO `$tables{pgfile_problem}` VALUES( \"$pgfile_id\", \"$problem_id\" )" - ); + ); dbug "INSERT INTO pgfile_problem VALUES( \"$pgfile_id\", \"$problem_id\" )\n"; } } @@ -869,11 +980,12 @@ sub pgfiles { } #reset tag vars, they may not match the next text/file - $textauthor=""; $textsection=""; + $textauthor = ""; + $textsection = ""; } - } else { # This file was not tagged - # Message if not a pointer - # print STDERR "File $name is not tagged\n" if not $tags->isplaceholder(); + } else { # This file was not tagged + # Message if not a pointer + # print STDERR "File $name is not tagged\n" if not $tags->isplaceholder(); ; } } @@ -892,7 +1004,7 @@ my $dbsects = $dbh->selectall_arrayref("SELECT DBsection_id from `$tables{dbsect for my $sect (@{$dbsects}) { $sect = $sect->[0]; my $srar = $dbh->selectall_arrayref("SELECT * FROM `$tables{pgfile}` WHERE DBsection_id=$sect"); - if(scalar(@{$srar})==0) { + if (scalar(@{$srar}) == 0) { $dbh->do("DELETE FROM `$tables{dbsection}` WHERE DBsection_id=$sect"); } } @@ -901,7 +1013,7 @@ my $dbchaps = $dbh->selectall_arrayref("SELECT DBchapter_id from `$tables{dbchap for my $chap (@{$dbchaps}) { $chap = $chap->[0]; my $srar = $dbh->selectall_arrayref("SELECT * FROM `$tables{dbsection}` WHERE DBchapter_id=$chap"); - if(scalar(@{$srar})==0) { + if (scalar(@{$srar}) == 0) { $dbh->do("DELETE FROM `$tables{dbchapter}` WHERE DBchapter_id=$chap"); } } @@ -912,13 +1024,14 @@ for my $chap (@{$dbchaps}) { $dbh->disconnect; -if ($ce->{problemLibrary}{showLibraryLocalStats} || - $ce->{problemLibrary}{showLibraryGlobalStats}) { - print "\nUpdating Library Statistics.\n"; - do $ENV{WEBWORK_ROOT}.'/bin/update-OPL-statistics.pl'; +if ($ce->{problemLibrary}{showLibraryLocalStats} + || $ce->{problemLibrary}{showLibraryGlobalStats}) +{ + print "\nUpdating Library Statistics.\n"; + do $ENV{WEBWORK_ROOT} . '/bin/update-OPL-statistics.pl'; - print "\nLoading global statistics (if possible).\n"; - do $ENV{WEBWORK_ROOT}.'/bin/load-OPL-global-statistics.pl'; + print "\nLoading global statistics (if possible).\n"; + do $ENV{WEBWORK_ROOT} . '/bin/load-OPL-global-statistics.pl'; } print "\nDone.\n"; diff --git a/bin/addcourse b/bin/addcourse index 42ea11ac5d..ae65783715 100755 --- a/bin/addcourse +++ b/bin/addcourse @@ -49,7 +49,7 @@ use Getopt::Long; BEGIN { use Mojo::File qw(curfile); - use Env qw(WEBWORK_ROOT); + use Env qw(WEBWORK_ROOT); $WEBWORK_ROOT = curfile->dirname->dirname; } @@ -59,9 +59,9 @@ use lib "$ENV{WEBWORK_ROOT}/lib"; use WeBWorK::CourseEnvironment; use WeBWorK::File::Classlist; -use WeBWorK::Utils qw(runtime_use cryptPassword); +use WeBWorK::Utils qw(runtime_use cryptPassword); use WeBWorK::Utils::CourseManagement qw(addCourse); -use WeBWorK::File::Classlist qw(parse_classlist); +use WeBWorK::File::Classlist qw(parse_classlist); use WeBWorK::DB::Record::User; use WeBWorK::DB::Record::Password; use WeBWorK::DB::Record::PermissionLevel; @@ -124,6 +124,8 @@ if ($users) { $record{permission} = $ce->{userRoles}{professor}; } + $record{accommodation_time_factor} = 1; + delete $professors{$user_id}; push @users, diff --git a/bin/change_user_id b/bin/change_user_id index 2ec44a5034..a68f538871 100755 --- a/bin/change_user_id +++ b/bin/change_user_id @@ -1,18 +1,19 @@ #!/usr/bin/env perl + +# Sometimes a webwork user id changes. This script transfers the webwork data for the old user_id to the new user_id. # -#Sometimes a webwork user id changes. This script transfers the webwork data for the old user_id to the new user_id -# Update database tables -#user -#permission -#password -#key -#set_user -#problem_user -#set_locations_user -#global_achievement_user -#achievement_user +# The script updates the following database database tables +# user +# permission +# password +# key +# set_user +# problem_user +# set_locations_user +# global_achievement_user +# achievement_user # -# Update answer_log +# and updates the answer_log. use strict; use warnings; @@ -21,7 +22,7 @@ use File::Basename; BEGIN { use Mojo::File qw(curfile); - use Env qw(WEBWORK_ROOT); + use Env qw(WEBWORK_ROOT); $WEBWORK_ROOT = curfile->dirname->dirname; } @@ -32,13 +33,13 @@ use WeBWorK::CourseEnvironment; use WeBWorK::DB; use Data::Dumper; -if((scalar(@ARGV) != 3)) { - print "\nSyntax is: change_user_id course_id old_user_id new_user_id"; - print "\n (e.g. newpassword MAT_123 jjones jsmith\n\n"; - exit(); +if ((scalar(@ARGV) != 3)) { + print "\nSyntax is: change_user_id course_id old_user_id new_user_id"; + print "\n (e.g. newpassword MAT_123 jjones jsmith\n\n"; + exit(); } -my $courseID = shift; +my $courseID = shift; my $old_user_id = shift; my $new_user_id = shift; @@ -50,63 +51,63 @@ my $ce = WeBWorK::CourseEnvironment->new({ my $db = WeBWorK::DB->new($ce); die "Error: $old_user_id does not exist!" unless $db->existsUser($old_user_id); -unless($db->existsUser($new_user_id)) { - my $user = $db->getUser($old_user_id); - $user->{user_id}=$new_user_id; - $user->{comment} = $user->{comment}."Record created from $old_user_id record"; - $db->addUser($user); +unless ($db->existsUser($new_user_id)) { + my $user = $db->getUser($old_user_id); + $user->{user_id} = $new_user_id; + $user->{comment} = $user->{comment} . "Record created from $old_user_id record"; + $db->addUser($user); } -unless($db->existsPassword($new_user_id)) { - my $password = $db->getPassword($old_user_id); - $password->{user_id} = $new_user_id; - $db->addPassword($password); +if (!$db->existsPassword($new_user_id) && (my $password = $db->getPassword($old_user_id))) { + $password->{user_id} = $new_user_id; + $db->addPassword($password); } -unless($db->existsPermissionLevel($new_user_id)) { - my $permission = $db->getPermissionLevel($old_user_id); - $permission->{user_id} = $new_user_id; - $db->addPermissionLevel($permission); +unless ($db->existsPermissionLevel($new_user_id)) { + my $permission = $db->getPermissionLevel($old_user_id); + $permission->{user_id} = $new_user_id; + $db->addPermissionLevel($permission); } my @old_user_sets = $db->listUserSets($old_user_id); -foreach(@old_user_sets) { - my $set_id = $_; - my $new_set = $db->newUserSet; - $new_set->user_id($new_user_id); - $new_set->set_id($set_id); - eval{$db->addUserSet($new_set)}; - my $old_set = $db->getUserSet($old_user_id,$set_id); - foreach(keys %$old_set) { - next if /user_id|set_id/; - $new_set->$_($old_set->$_); - } - - $db->putUserSet($new_set) unless $db->existsUserSet($new_user_id,$set_id); - my @global_problems = grep { defined $_} $db->getAllGlobalProblems($set_id); - foreach(@global_problems) { - if($db->existsUserProblem($old_user_id,$set_id,$_->{problem_id})) { - my $old_user_problem = $db->getUserProblem($old_user_id,$set_id,$_->{problem_id}); - my $new_user_problem = $db->newUserProblem; - $new_user_problem->user_id($new_user_id); - $new_user_problem->set_id($set_id); - $new_user_problem->problem_id($_->{problem_id}); - $db->addUserProblem($new_user_problem) unless $db->existsUserProblem($new_user_id,$set_id,$_->{problem_id}); - foreach(keys %$old_user_problem) { - next if /(user_id|set_id|problem_id)/; - $new_user_problem->$_($old_user_problem->$_); - } - $db->putUserProblem($new_user_problem); - } - } +foreach (@old_user_sets) { + my $set_id = $_; + my $new_set = $db->newUserSet; + $new_set->user_id($new_user_id); + $new_set->set_id($set_id); + eval { $db->addUserSet($new_set) }; + my $old_set = $db->getUserSet($old_user_id, $set_id); + foreach (keys %$old_set) { + next if /user_id|set_id/; + $new_set->$_($old_set->$_); + } + + $db->putUserSet($new_set) unless $db->existsUserSet($new_user_id, $set_id); + my @global_problems = grep { defined $_ } $db->getAllGlobalProblems($set_id); + foreach (@global_problems) { + if ($db->existsUserProblem($old_user_id, $set_id, $_->{problem_id})) { + my $old_user_problem = $db->getUserProblem($old_user_id, $set_id, $_->{problem_id}); + my $new_user_problem = $db->newUserProblem; + $new_user_problem->user_id($new_user_id); + $new_user_problem->set_id($set_id); + $new_user_problem->problem_id($_->{problem_id}); + $db->addUserProblem($new_user_problem) + unless $db->existsUserProblem($new_user_id, $set_id, $_->{problem_id}); + foreach (keys %$old_user_problem) { + next if /(user_id|set_id|problem_id)/; + $new_user_problem->$_($old_user_problem->$_); + } + $db->putUserProblem($new_user_problem); + } + } } my $answer_log = $ce->{courseFiles}->{logs}->{answer_log}; -my $dirname = dirname($answer_log); -copy($answer_log,"$dirname/answer_log.bak"); -open(my $in,'<',"$dirname/answer_log.bak") or die "Can't open $dirname/answer_log.bak:$!"; -open(my $out,'>',$answer_log); -while(<$in>) { - s/$old_user_id/$new_user_id/g; - print $out $_; +my $dirname = dirname($answer_log); +copy($answer_log, "$dirname/answer_log.bak"); +open(my $in, '<', "$dirname/answer_log.bak") or die "Can't open $dirname/answer_log.bak:$!"; +open(my $out, '>', $answer_log); +while (<$in>) { + s/$old_user_id/$new_user_id/g; + print $out $_; } diff --git a/bin/check_latex b/bin/check_latex index 8c5a6ee567..a806cea296 100755 --- a/bin/check_latex +++ b/bin/check_latex @@ -13,8 +13,8 @@ use feature 'say'; BEGIN { use Mojo::File qw(curfile); - use YAML::XS qw(LoadFile); - use Env qw(WEBWORK_ROOT PG_ROOT); + use YAML::XS qw(LoadFile); + use Env qw(WEBWORK_ROOT PG_ROOT); $WEBWORK_ROOT = curfile->dirname->dirname->to_string; @@ -51,7 +51,9 @@ my $latex_cmd = . shell_quote($ce->{webworkDirs}{assetsTex}) . ':' . shell_quote($ce->{pg}{directories}{assetsTex}) . ': ' . $ce->{externalPrograms}{latex2pdf} - . ' -interaction nonstopmode check_latex_exam.tex >> check_latex.nfo 2>&1'; + . ' -interaction nonstopmode check_latex_exam.tex >> check_latex.nfo 2>&1 &&' + . "TEXINPUTS=$ENV{WEBWORK_ROOT}/bin: $ce->{externalPrograms}{latex2pdf}" + . ' -interaction nonstopmode check_latex_standalone.tex > check_latex.nfo 2>&1'; if ((system $latex_cmd) >> 8) { if (open(my $fh, '<', "$temp_dir/check_latex.nfo")) { diff --git a/bin/check_latex_article.tex b/bin/check_latex_article.tex index 76036857ee..21d58de3e6 100644 --- a/bin/check_latex_article.tex +++ b/bin/check_latex_article.tex @@ -8,7 +8,7 @@ \usepackage{multicol} \usepackage{tcolorbox} -\usepackage[active,textmath,displaymath]{preview} % needed for dvipng +\usepackage[textmath,displaymath]{preview} % needed for dvipng \setlength{\columnsep}{.25in} \setlength{\columnseprule}{.4pt} diff --git a/bin/check_latex_exam.tex b/bin/check_latex_exam.tex index bd48c01ef5..384a8ba693 100644 --- a/bin/check_latex_exam.tex +++ b/bin/check_latex_exam.tex @@ -9,7 +9,7 @@ \usepackage{bidi} \fi -\usepackage[active,textmath,displaymath]{preview} % needed for dvipng +\usepackage[textmath,displaymath]{preview} % needed for dvipng \setlength{\columnsep}{.25in} \setlength{\columnseprule}{.4pt} diff --git a/bin/check_latex_standalone.tex b/bin/check_latex_standalone.tex new file mode 100644 index 0000000000..7f8daeecd6 --- /dev/null +++ b/bin/check_latex_standalone.tex @@ -0,0 +1,22 @@ +\documentclass{standalone} + +\usepackage[svgnames]{xcolor} +\usepackage{tikz} +\usepackage{pgfplots} +\usetikzlibrary{arrows.meta,plotmarks,calc,spath3} +\usepgfplotslibrary{fillbetween} +\pgfplotsset{compat = 1.18} + +\begin{document} + +\begin{tikzpicture} + \begin{axis} + \addplot[name path=pathA, domain=-3:3, draw=none, mark=triangle*] {(x^2)}; + \draw[{Stealth}-{Stealth}, spath/use=pathA]; + \draw ($(-1, 0) + (10pt, 10pt)$) -- ($(1, 3) - (10pt, 10pt)$); + \addplot[name path=pathB, domain=-3:3] {(-x^2 + 3)}; + \addplot[green, fill opacity=0.3] fill between[of=pathA and pathB]; + \end{axis} +\end{tikzpicture} + +\end{document} diff --git a/bin/check_modules.pl b/bin/check_modules.pl index 3b73cee2bf..661e8e7331 100755 --- a/bin/check_modules.pl +++ b/bin/check_modules.pl @@ -9,9 +9,37 @@ =head1 SYNOPSIS check_modules.pl [options] - Options: - -m|--modules Check that the perl modules needed by webwork2 can be loaded. - -p|--programs Check that the programs needed by webwork2 exist. +Options: + +=over 4 + +=item C<-m|--modules> + +Check that the perl modules needed by webwork2 can be loaded. + +=item C<-p|--programs> + +Check that the programs needed by webwork2 exist. + +=item C<-d|--distribution> + +Specify your linux distribution. Currently supported options are + +=over 4 + +=item C + +Tested on ubuntu 24. May work for other distributions using the apt package +manager + +=item C + +For RedHat Enterprise Linux and equivalents with the EPEL and CodeReady +Builder repositories enabled (e.g. Rocky Linux, Oracle Linux) + +=back + +=back Both programs and modules are checked if no options are given. @@ -30,98 +58,496 @@ =head1 DESCRIPTION use Getopt::Long qw(:config bundling); use Pod::Usage; -my @modulesList = qw( - Archive::Tar - Archive::Zip - Archive::Zip::SimpleZip - Benchmark - Carp - Class::Accessor - Crypt::JWT - Crypt::PK::RSA - Data::Dump - Data::Dumper - Data::Structure::Util - Data::UUID - Date::Format - Date::Parse - DateTime - DBI - Digest::MD5 - Digest::SHA - Email::Address::XS - Email::Sender::Transport::SMTP - Email::Stuffer - Errno - Exception::Class - File::Copy - File::Copy::Recursive - File::Fetch - File::Find - File::Find::Rule - File::Path - File::Spec - File::stat - File::Temp - Future::AsyncAwait - GD - GD::Barcode::QRcode - Getopt::Long - Getopt::Std - HTML::Entities - HTTP::Async - IO::File - Iterator - Iterator::Util - Locale::Maketext::Lexicon - Locale::Maketext::Simple - LWP::Protocol::https - MIME::Base32 - MIME::Base64 - Math::Random::Secure - Minion - Minion::Backend::SQLite - Mojolicious - Mojolicious::Plugin::NotYAMLConfig - Mojolicious::Plugin::RenderFile - Net::IP - Net::OAuth - Opcode - Pandoc - Perl::Tidy - PHP::Serialization - Pod::Simple::Search - Pod::Simple::XHTML - Pod::Usage - Pod::WSDL - Scalar::Util - SOAP::Lite - Socket - SQL::Abstract - String::ShellQuote - SVG - Text::CSV - Text::Wrap - Tie::IxHash - Time::HiRes - Time::Zone - Types::Serialiser - URI::Escape - UUID::Tiny - XML::LibXML - XML::Parser - XML::Parser::EasyTree - XML::Writer - YAML::XS +my %modulesList = ( + 'Archive::Tar' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Archive-Tar' + } + }, + 'Archive::Zip' => { + package => { + ubuntu => 'libarchive-zip-perl', + rhel => 'perl-Archive-Zip' + } + }, + 'Archive::Zip::SimpleZip' => { + package => { + rhel => 'perl-Archive-Zip-SimpleZip' + } + }, + 'Benchmark' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Benchmark' + } + }, + 'Carp' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Carp' + } + }, + 'Class::Accessor' => { + package => { + ubuntu => 'libclass-accessor-perl', + rhel => 'perl-Class-Accessor' + } + }, + 'Crypt::JWT' => { + package => { + ubuntu => 'libcrypt-jwt-perl', + rhel => 'perl-Crypt-JWT' + } + }, + 'Crypt::PK::RSA' => { + package => { + ubuntu => 'libcryptx-perl', + rhel => 'perl-CryptX' + } + }, + 'DBI' => { + package => { + ubuntu => 'libdbi-perl', + rhel => 'perl-DBI' + } + }, + 'Data::Dump' => { + package => { + ubuntu => 'libdata-dump-perl', + rhel => 'perl-Data-Dump' + } + }, + 'Data::Dumper' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Data-Dumper' + } + }, + 'Data::Structure::Util' => { + package => { + ubuntu => 'libdata-structure-util-perl' + } + }, + 'Data::UUID' => { + package => { + ubuntu => 'libossp-uuid-perl', + rhel => 'perl-Data-UUID' + } + }, + 'Date::Format' => { + package => { + ubuntu => 'libtimedate-perl', + rhel => 'perl-TimeDate' + } + }, + 'Date::Parse' => { + package => { + ubuntu => 'libtimedate-perl', + rhel => 'perl-TimeDate' + } + }, + 'DateTime' => { + package => { + ubuntu => 'libdatetime-perl', + rhel => 'perl-DateTime' + } + }, + 'Digest::MD5' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Digest-MD5' + } + }, + 'Digest::SHA' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Digest-SHA' + } + }, + 'Email::Address::XS' => { + package => { + ubuntu => 'libemail-address-xs-perl', + rhel => 'perl-Email-Address-XS' + } + }, + 'Email::Sender::Transport::SMTP' => { + package => { + ubuntu => 'libemail-sender-perl', + rhel => 'perl-Email-Sender' + } + }, + 'Email::Stuffer' => { + package => { + ubuntu => 'libemail-stuffer-perl' + } + }, + 'Errno' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Errno' + } + }, + 'Exception::Class' => { + package => { + ubuntu => 'libexception-class-perl', + rhel => 'perl-Exception-Class' + } + }, + 'File::Copy' => { + package => { + ubuntu => 'perl', + rhel => 'perl-File-Copy' + } + }, + 'File::Copy::Recursive' => { + package => { + ubuntu => 'libfile-copy-recursive-perl', + rhel => 'perl-File-Copy-Recursive' + } + }, + 'File::Fetch' => { + package => { + ubuntu => 'perl', + rhel => 'perl-File-Fetch' + } + }, + 'File::Find' => { + package => { + ubuntu => 'perl', + rhel => 'perl-File-Find' + } + }, + 'File::Find::Rule' => { + package => { + ubuntu => 'libfile-find-rule-perl', + rhel => 'perl-File-Find-Rule' + } + }, + 'File::Path' => { + package => { + ubuntu => 'perl', + rhel => 'perl-File-Path' + } + }, + 'File::Spec' => { + package => { + ubuntu => 'perl-base', + rhel => 'perl-PathTools' + } + }, + 'File::Temp' => { + package => { + ubuntu => 'perl', + rhel => 'perl-File-Temp' + } + }, + 'File::stat' => { + package => { + ubuntu => 'perl', + rhel => 'perl-File-stat' + } + }, + 'Future::AsyncAwait' => { + minversion => '0.52', + package => { + ubuntu => 'libfuture-asyncawait-perl' + } + }, + 'GD' => { + package => { + ubuntu => 'libgd-perl', + rhel => 'perl-GD' + } + }, + 'GD::Barcode::QRcode' => { + package => { + ubuntu => 'libgd-barcode-perl' + } + }, + 'Getopt::Long' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Getopt-Long' + } + }, + 'Getopt::Std' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Getopt-Std' + } + }, + 'HTML::Entities' => { + package => { + ubuntu => 'libhtml-parser-perl', + rhel => 'perl-HTML-Parser' + } + }, + 'HTTP::Async' => { + package => { + ubuntu => 'libhttp-async-perl' + } + }, + 'IO::File' => { + package => { + ubuntu => 'perl-base', + rhel => 'perl-IO' + } + }, + 'Iterator' => { + package => { + ubuntu => 'libiterator-perl', + } + }, + 'Iterator::Util' => { + package => { + ubuntu => 'libiterator-util-perl' + } + }, + 'LWP::Protocol::https' => { + minversion => '6.06', + package => { + ubuntu => 'liblwp-protocol-https-perl', + rhel => 'perl-LWP-Protocol-https' + } + }, + 'Locale::Maketext::Lexicon' => { + package => { + ubuntu => 'liblocale-maketext-lexicon-perl' + } + }, + 'Locale::Maketext::Simple' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Locale-Maketext-Simple' + } + }, + 'MIME::Base32' => { + package => { + ubuntu => 'libmime-base32-perl' + } + }, + 'MIME::Base64' => { + package => { + ubuntu => 'perl', + rhel => 'perl-MIME-Base64' + } + }, + 'Math::Random::Secure' => { + package => { + ubuntu => 'libmath-random-secure-perl', + rhel => 'perl-Math-Random-Secure' + } + }, + 'Minion' => { + package => { + ubuntu => 'libminion-perl' + } + }, + 'Minion::Backend::SQLite' => { + package => { + ubuntu => 'libminion-backend-sqlite-perl' + } + }, + 'Mojolicious' => { + minversion => '9.34', + incompatibleVersions => [ '9.43', '9.44', '9.45', '9.46' ], + package => { + ubuntu => 'libmojolicious-perl', + rhel => 'perl-Mojolicious' + } + }, + 'Mojolicious::Plugin::NotYAMLConfig' => { + package => { + ubuntu => 'libmojolicious-perl', + rhel => 'perl-Mojolicious' + } + }, + 'Mojolicious::Plugin::RenderFile' => { + package => { + ubuntu => 'libmojolicious-plugin-renderfile-perl' + } + }, + 'Net::IP' => { + package => { + ubuntu => 'libnet-ip-perl', + rhel => 'perl-Net-IP' + } + }, + 'Net::OAuth' => { + package => { + ubuntu => 'libnet-oauth-perl', + rhel => 'perl-Net-OAuth' + } + }, + 'Opcode' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Opcode' + } + }, + 'PHP::Serialization' => { + package => { + ubuntu => 'libphp-serialization-perl', + rhel => 'perl-PHP-Serialization' + } + }, + 'Pandoc' => { + package => { + ubuntu => 'libpandoc-wrapper-perl' + } + }, + 'Perl::Critic' => { + package => { + ubuntu => 'libperl-critic-perl', + rhel => 'perl-Perl-Critic' + } + }, + 'Perl::Tidy' => { + package => { + ubuntu => 'perltidy', + rhel => 'perltidy' + } + }, + 'Pod::Simple::Search' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Pod-Simple' + } + }, + 'Pod::Simple::XHTML' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Pod-Simple' + } + }, + 'Pod::Usage' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Pod-Usage' + } + }, + 'Pod::WSDL' => { + package => { + ubuntu => 'libpod-wsdl-perl' + } + }, + 'SOAP::Lite' => { + package => { + ubuntu => 'libsoap-lite-perl', + rhel => 'perl-SOAP-Lite' + } + }, + 'SQL::Abstract' => { + minversion => '2', + package => { + ubuntu => 'libsql-abstract-perl', + rhel => 'perl-SQL-Abstract' + } + }, + 'SVG' => { + package => { + ubuntu => 'libsvg-perl', + } + }, + 'Scalar::Util' => { + package => { + ubuntu => 'perl-base', + rhel => 'perl-Scalar-List-Utils' + } + }, + 'Socket' => { + package => { + ubuntu => 'perl-base', + rhel => 'perl-Socket' + } + }, + 'String::ShellQuote' => { + package => { + ubuntu => 'libstring-shellquote-perl', + rhel => 'perl-String-ShellQuote' + } + }, + 'Text::CSV' => { + package => { + ubuntu => 'libtext-csv-perl', + rhel => 'perl-Text-CSV' + } + }, + 'Text::Wrap' => { + package => { + ubuntu => 'perl-base', + rhel => 'perl-Text-Tabs+Wrap' + } + }, + 'Tie::IxHash' => { + package => { + ubuntu => 'libtie-ixhash-perl', + rhel => 'perl-Tie-IxHash' + } + }, + 'Time::HiRes' => { + package => { + ubuntu => 'perl', + rhel => 'perl-Time-HiRes' + } + }, + 'Time::Zone' => { + package => { + ubuntu => 'libtimedate-perl', + rhel => 'perl-TimeDate' + } + }, + 'Types::Serialiser' => { + package => { + ubuntu => 'libtypes-serialiser-perl', + rhel => 'perl-Types-Serialiser' + } + }, + 'URI::Escape' => { + package => { + ubuntu => 'liburi-perl', + rhel => 'perl-URI' + } + }, + 'UUID::Tiny' => { + package => { + ubuntu => 'libuuid-tiny-perl', + rhel => 'perl-UUID-Tiny' + } + }, + 'XML::LibXML' => { + package => { + ubuntu => 'libxml-libxml-perl', + rhel => 'perl-XML-LibXML' + } + }, + 'XML::Parser' => { + package => { + ubuntu => 'libxml-parser-perl', + rhel => 'perl-XML-Parser' + } + }, + 'XML::Parser::EasyTree' => { + package => { + ubuntu => 'libxml-parser-easytree-perl' + } + }, + 'XML::Writer' => { + package => { + ubuntu => 'libxml-writer-perl', + rhel => 'perl-XML-Writer' + } + }, + 'YAML::XS' => { + package => { + ubuntu => 'libyaml-libyaml-perl', + rhel => 'perl-YAML-LibYAML' + } + } ); -my %moduleVersion = ( - 'Future::AsyncAwait' => 0.52, - 'IO::Socket::SSL' => 2.007, - 'LWP::Protocol::https' => 6.06, - 'Mojolicious' => 9.34, - 'SQL::Abstract' => 2.000000 -); +my %cpanm_package = (ubuntu => 'cpanminus', rhel => 'perl-App-cpanminus'); my @programList = qw( convert @@ -141,19 +567,37 @@ =head1 DESCRIPTION dvipng ); -my ($test_modules, $test_programs, $show_help); +my ($test_modules, $test_programs, $packagetype, $show_help); GetOptions( - 'm|modules' => \$test_modules, - 'p|programs' => \$test_programs, - 'h|help' => \$show_help, + 'm|modules' => \$test_modules, + 'p|programs' => \$test_programs, + 'd|distribution=s' => \$packagetype, + 'h|help' => \$show_help, ); + pod2usage(2) if $show_help; +if ($packagetype && $packagetype ne 'rhel' && $packagetype ne 'ubuntu') { + die 'packagetype must be one of \'ubuntu\' or \'rhel\''; +} + +if (!$packagetype) { + if (determine_distribution()) { + say 'Distribution was not specified. Detected that the distribution is ' . $packagetype . ' or equivalent.'; + } else { + say 'Distribution was not specified and could not be detected. Use the -d option to specify your distribution.'; + } +} + +my %packagemgrcommand = (ubuntu => 'sudo apt install ', rhel => 'sudo dnf install '); + $test_modules = $test_programs = 1 unless $test_programs || $test_modules; my @PATH = split(/:/, $ENV{PATH}); +my (@missing_packages, @missing_modules); + check_modules() if $test_modules; say '' if $test_modules && $test_programs; check_apps() if $test_programs; @@ -166,6 +610,45 @@ sub which { return; } +sub determine_distribution { + my %os_attrs; + + #code adapted from Sys::OsRelease + if (open my $fh, "<", '/etc/os-release') { + while (my $line = <$fh>) { + chomp $line; # remove trailing nl + if (substr($line, -1, 1) eq "\r") { + $line = substr($line, 0, -1); # remove trailing cr + } + + # skip comments and blank lines + if ($line =~ /^ \s+ #/x or $line =~ /^ \s+ $/x) { + next; + } + + # read attribute assignment lines + if ($line =~ /^ ([A-Z0-9_]+) = "(.*)" $/x + or $line =~ /^ ([A-Z0-9_]+) = '(.*)' $/x + or $line =~ /^ ([A-Z0-9_]+) = (.*) $/x) + { + next if $1 eq "_config"; # don't overwrite _config + $os_attrs{ lc($1) } = $2; + } + } + close $fh; + if ($os_attrs{id} =~ 'ubuntu' || ($os_attrs{id_like} && $os_attrs{id_like} =~ 'ubuntu')) { + $packagetype = 'ubuntu'; + return 1; + } elsif ($os_attrs{id} =~ 'fedora' || ($os_attrs{id_like} && $os_attrs{id_like} =~ 'fedora')) { + $packagetype = 'rhel'; + return 1; + } + } else { + return 0; + } + +} + sub check_modules { say "Checking for modules required by WeBWorK..."; @@ -181,27 +664,54 @@ sub check_modules { my $file = ($module =~ s|::|/|gr) . '.pm'; if ($@ =~ /Can't locate $file in \@INC/) { say "** $module not found in \@INC"; + if ($packagetype) { + if ($modulesList{$module}{package}{$packagetype}) { + push(@missing_packages, $modulesList{$module}{package}{$packagetype}); + } else { + push(@missing_modules, $module); + } + } } else { say "** $module found, but failed to load: $@"; } - } elsif (defined($moduleVersion{$module}) - && version->parse(${ $module . '::VERSION' }) < version->parse($moduleVersion{$module})) + } elsif (defined($modulesList{$module}{minversion}) + && version->parse(${ $module . '::VERSION' }) < version->parse($modulesList{$module}{minversion})) + { + $moduleNotFound = 1; + say "** $module found, but not version $modulesList{$module}{minversion} or better"; + } elsif ( + ref $modulesList{$module}{incompatibleVersions} eq 'ARRAY' + && (grep { version->parse(${ $module . '::VERSION' }) == version->parse($_) } + @{ $modulesList{$module}{incompatibleVersions} }) + ) { $moduleNotFound = 1; - say "** $module found, but not version $moduleVersion{$module} or better"; + say "** $module found, but is an incompatible version (incompatible versions: " + . join(', ', @{ $modulesList{$module}{incompatibleVersions} }) . ')'; } else { say " $module found and loaded"; } use strict 'refs'; }; - for my $module (@modulesList) { + for my $module (sort keys(%modulesList)) { $checkModule->($module); } if ($moduleNotFound) { say ''; - say 'Some requred modules were not found, could not be loaded, or were not at the sufficient version.'; + say 'Some required modules were not found, could not be loaded, or were not a sufficient version.'; + if (@missing_modules || @missing_packages) { + say 'You can try to install the missing modules with the following command(s):' . "\n"; + if (@missing_modules) { + say 'sudo cpanm ' . join(' ', @missing_modules) . "\n"; + } + if (@missing_packages) { + say $packagemgrcommand{$packagetype} . join(' ', @missing_packages) . "\n"; + } + say 'If the cpanm command is not installed, you can try installing it using the following command:' . "\n"; + say $packagemgrcommand{$packagetype} . $cpanm_package{$packagetype}; + } say 'Exiting as this is required to check the database driver and programs.'; exit 0; } @@ -246,8 +756,8 @@ sub check_apps { my $node_version_str = qx/node -v/; my ($node_version) = $node_version_str =~ m/v(\d+)\./; - say "\n**The version of node should be at least 18. You have version $node_version." - if $node_version < 18; + say "\n**The version of node should be at least 22. You have version $node_version." + if $node_version < 22; return; } diff --git a/bin/delcourse b/bin/delcourse index a04871be27..65d6dec565 100755 --- a/bin/delcourse +++ b/bin/delcourse @@ -29,7 +29,7 @@ use warnings; BEGIN { use Mojo::File qw(curfile); - use Env qw(WEBWORK_ROOT); + use Env qw(WEBWORK_ROOT); $WEBWORK_ROOT = curfile->dirname->dirname; } diff --git a/bin/dev_scripts/PODtoHTML.pm b/bin/dev_scripts/PODtoHTML.pm deleted file mode 100644 index a922314011..0000000000 --- a/bin/dev_scripts/PODtoHTML.pm +++ /dev/null @@ -1,201 +0,0 @@ -package PODtoHTML; - -use strict; -use warnings; -use utf8; - -use Pod::Simple::Search; -use Mojo::Template; -use Mojo::DOM; -use Mojo::Collection qw(c); -use File::Path qw(make_path); -use File::Basename qw(dirname); -use IO::File; -use POSIX qw(strftime); - -use WeBWorK::Utils::PODParser; - -our @sections = ( - doc => 'Documentation', - bin => 'Scripts', - macros => 'Macros', - lib => 'Libraries', -); -our %macro_names = ( - answers => 'Answers', - contexts => 'Contexts', - core => 'Core', - deprecated => 'Deprecated', - graph => 'Graph', - math => 'Math', - misc => 'Miscellaneous', - parsers => 'Parsers', - ui => 'User Interface' -); - -sub new { - my ($invocant, %o) = @_; - my $class = ref $invocant || $invocant; - - my @section_list = ref($o{sections}) eq 'ARRAY' ? @{ $o{sections} } : @sections; - my $section_hash = {@section_list}; - my $section_order = [ map { $section_list[ 2 * $_ ] } 0 .. $#section_list / 2 ]; - delete $o{sections}; - - my $self = { - %o, - idx => {}, - section_hash => $section_hash, - section_order => $section_order, - macros_hash => {}, - }; - return bless $self, $class; -} - -sub convert_pods { - my $self = shift; - my $source_root = $self->{source_root}; - my $dest_root = $self->{dest_root}; - - my $regex = join('|', map {"^$_"} @{ $self->{section_order} }); - - my ($name2path, $path2name) = Pod::Simple::Search->new->inc(0)->limit_re(qr!$regex!)->survey($self->{source_root}); - for (keys %$path2name) { - print "Processing file: $_\n" if $self->{verbose} > 1; - $self->process_pod($_, $name2path); - } - - $self->write_index("$dest_root/index.html"); - - return; -} - -sub process_pod { - my ($self, $pod_path, $pod_files) = @_; - - my $pod_name; - - my ($subdir, $filename) = $pod_path =~ m|^$self->{source_root}/(?:(.*)/)?(.*)$|; - - my ($subdir_first, $subdir_rest) = ('', ''); - - if (defined $subdir) { - if ($subdir =~ m|/|) { - ($subdir_first, $subdir_rest) = $subdir =~ m|^([^/]*)/(.*)|; - } else { - $subdir_first = $subdir; - } - } - - $pod_name = (defined $subdir_rest ? "$subdir_rest/" : '') . $filename; - if ($filename =~ /\.pl$/) { - $filename =~ s/\.pl$/.html/; - } elsif ($filename =~ /\.pod$/) { - $pod_name =~ s/\.pod$//; - $filename =~ s/\.pod$/.html/; - } elsif ($filename =~ /\.pm$/) { - $pod_name =~ s/\.pm$//; - $pod_name =~ s|/+|::|g; - $filename =~ s/\.pm$/.html/; - } elsif ($filename !~ /\.html$/) { - $filename .= '.html'; - } - - $pod_name =~ s/^(\/|::)//; - - my $html_dir = $self->{dest_root} . (defined $subdir ? "/$subdir" : ''); - my $html_path = "$html_dir/$filename"; - my $html_rel_path = defined $subdir ? "$subdir/$filename" : $filename; - - $self->update_index($subdir, $html_rel_path, $pod_name); - make_path($html_dir); - my $html = $self->do_pod2html( - pod_path => $pod_path, - pod_name => $pod_name, - pod_files => $pod_files - ); - my $fh = IO::File->new($html_path, '>:encoding(UTF-8)') - or die "Failed to open file '$html_path' for writing: $!\n"; - print $fh $html; - - return; -} - -sub update_index { - my ($self, $subdir, $html_rel_path, $pod_name) = @_; - - $subdir =~ s|/.*$||; - my $idx = $self->{idx}; - my $sections = $self->{section_hash}; - if ($subdir eq 'macros') { - $idx->{macros} = []; - if ($pod_name =~ m!^(.+)/(.+)$!) { - push @{ $self->{macros_hash}{$1} }, [ $html_rel_path, $2 ]; - } else { - push @{ $idx->{doc} }, [ $html_rel_path, $pod_name ]; - } - } elsif (exists $sections->{$subdir}) { - push @{ $idx->{$subdir} }, [ $html_rel_path, $pod_name ]; - } else { - warn "no section for subdir '$subdir'\n"; - } - - return; -} - -sub write_index { - my ($self, $out_path) = @_; - - my $fh = IO::File->new($out_path, '>:encoding(UTF-8)') or die "Failed to open index '$out_path' for writing: $!\n"; - print $fh Mojo::Template->new(vars => 1)->render_file( - "$self->{template_dir}/category-index.mt", - { - title => 'POD for ' . ($self->{source_root} =~ s|^.*/||r), - base_url => $self->{dest_url}, - pod_index => $self->{idx}, - sections => $self->{section_hash}, - section_order => $self->{section_order}, - macros => $self->{macros_hash}, - macros_order => [ sort keys %{ $self->{macros_hash} } ], - macro_names => \%macro_names, - date => strftime('%a %b %e %H:%M:%S %Z %Y', localtime) - } - ); - - return; -} - -sub do_pod2html { - my ($self, %o) = @_; - - my $psx = WeBWorK::Utils::PODParser->new($o{pod_files}); - $psx->{source_root} = $self->{source_root}; - $psx->{verbose} = $self->{verbose}; - $psx->{assert_html_ext} = 1; - $psx->{base_url} = ($self->{dest_url} // '') . '/' . (($self->{source_root} // '') =~ s|^.*/||r); - $psx->output_string(\my $html); - $psx->html_header(''); - $psx->html_footer(''); - $psx->parse_file($o{pod_path}); - - my $dom = Mojo::DOM->new($html); - my $podIndexUL = $dom->at('ul[id="index"]'); - my $podIndex = $podIndexUL ? $podIndexUL->find('ul[id="index"] > li') : c(); - for (@$podIndex) { - $_->attr({ class => 'nav-item' }); - $_->at('a')->attr({ class => 'nav-link p-0' }); - for (@{ $_->find('ul') }) { - $_->attr({ class => 'nav flex-column w-100' }); - } - for (@{ $_->find('li') }) { - $_->attr({ class => 'nav-item' }); - $_->at('a')->attr({ class => 'nav-link p-0' }); - } - } - my $podHTML = $podIndexUL ? $podIndexUL->remove : $html; - - return Mojo::Template->new(vars => 1)->render_file("$self->{template_dir}/pod.mt", - { title => $o{pod_name}, base_url => dirname($psx->{base_url}), index => $podIndex, content => $podHTML }); -} - -1; diff --git a/bin/dev_scripts/generate-ww-pg-pod.pl b/bin/dev_scripts/generate-ww-pg-pod.pl index f1591ae485..d20902a171 100755 --- a/bin/dev_scripts/generate-ww-pg-pod.pl +++ b/bin/dev_scripts/generate-ww-pg-pod.pl @@ -9,17 +9,16 @@ =head1 SYNOPSIS generate-ww-pg-pod.pl [options] Options: - -p|--pg-root Directory containing a git clone of pg. - If this option is not set, then the environment - variable $PG_ROOT will be used if it is set. -o|--output-dir Directory to save the output files to. (required) -b|--base-url Base url location used on server. (default: /) This is needed for internal POD links to work correctly. -v|--verbose Increase the verbosity of the output. (Use multiple times for more verbosity.) -Note that --pg-root must be provided or the PG_ROOT environment variable set -if the POD for pg is desired. +Note that C must be set in the C file, or +if that file does not exist then the clone of the PG repository must be located +at C as defined in the C +file. =head1 DESCRIPTION @@ -30,37 +29,47 @@ =head1 DESCRIPTION use strict; use warnings; +my ($webwork_root, $pg_root); + +BEGIN { + use File::Basename qw(dirname); + use Cwd qw(abs_path); + use YAML::XS qw(LoadFile); + + $webwork_root = abs_path(dirname(dirname(dirname(__FILE__)))); + + # Load the configuration file to obtain the PG root directory. + my $config_file = "$webwork_root/conf/webwork2.mojolicious.yml"; + $config_file = "$webwork_root/conf/webwork2.mojolicious.dist.yml" unless -e $config_file; + my $config = LoadFile($config_file); + + $pg_root = $config->{pg_dir}; +} + use Getopt::Long qw(:config bundling); use Pod::Usage; -my ($pg_root, $output_dir, $base_url); +my ($output_dir, $base_url); my $verbose = 0; GetOptions( - 'p|pg-root=s' => \$pg_root, 'o|output-dir=s' => \$output_dir, 'b|base-url=s' => \$base_url, 'v|verbose+' => \$verbose ); -$pg_root = $ENV{PG_ROOT} if !$pg_root; - -pod2usage(2) unless $output_dir; +pod2usage(2) unless $output_dir && $pg_root && -d $pg_root; $base_url = "/" if !$base_url; use Mojo::Template; use IO::File; use File::Copy; -use File::Path qw(make_path remove_tree); -use File::Basename qw(dirname); -use Cwd qw(abs_path); - -use lib dirname(dirname(dirname(__FILE__))) . '/lib'; -use lib dirname(__FILE__); +use File::Path qw(make_path remove_tree); -use PODtoHTML; +use lib "$webwork_root/lib"; +use lib "$pg_root/lib"; -my $webwork_root = abs_path(dirname(dirname(dirname(__FILE__)))); +use WeBWorK::Utils::PODtoHTML; for my $dir ($webwork_root, $pg_root) { next unless $dir && -d $dir; @@ -73,10 +82,10 @@ =head1 DESCRIPTION write_index($index_fh); make_path("$output_dir/assets"); -copy("$webwork_root/htdocs/js/PODViewer/podviewer.css", "$output_dir/assets/podviewer.css"); -print "copying $webwork_root/htdocs/js/PODViewer/podviewer.css to $output_dir/assets/podviewer.css\n" if $verbose; -copy("$webwork_root/htdocs/js/PODViewer/podviewer.js", "$output_dir/assets/podviewer.js"); -print "copying $webwork_root/htdocs/js/PODViewer/podviewer.css to $output_dir/assets/podviewer.js\n" if $verbose; +copy("$pg_root/htdocs/js/PODViewer/podviewer.css", "$output_dir/assets/podviewer.css"); +print "copying $pg_root/htdocs/js/PODViewer/podviewer.css to $output_dir/assets/podviewer.css\n" if $verbose; +copy("$pg_root/htdocs/js/PODViewer/podviewer.js", "$output_dir/assets/podviewer.js"); +print "copying $pg_root/htdocs/js/PODViewer/podviewer.css to $output_dir/assets/podviewer.js\n" if $verbose; sub process_dir { my $source_dir = shift; @@ -89,12 +98,15 @@ sub process_dir { remove_tree($dest_dir); make_path($dest_dir); - my $htmldocs = PODtoHTML->new( - source_root => $source_dir, - dest_root => $dest_dir, - template_dir => "$webwork_root/bin/dev_scripts/pod-templates", - dest_url => $base_url, - verbose => $verbose + my $htmldocs = WeBWorK::Utils::PODtoHTML->new( + source_root => $source_dir, + dest_root => $dest_dir, + template_dir => "$pg_root/assets/pod-templates", + dest_url => $base_url, + home_url => $base_url, + home_url_link_name => 'WeBWorK POD Home', + page_url => $base_url . ($source_dir =~ s|^.*/||r), + verbose => $verbose ); $htmldocs->convert_pods; diff --git a/bin/dev_scripts/pod-templates/category-index.mt b/bin/dev_scripts/pod-templates/category-index.mt deleted file mode 100644 index a5d980d599..0000000000 --- a/bin/dev_scripts/pod-templates/category-index.mt +++ /dev/null @@ -1,95 +0,0 @@ - - -% - - - - <%= $title %> - - - - - - -% - -
-
-

<%= $title %>

- -
-
- % - % my ($index, $macro_index, $content, $macro_content) = ('', '', '', ''); - % for my $macro (@$macros_order) { - % my $new_index = begin - <%= $macro_names->{$macro} // $macro %> - % end - % $macro_index .= $new_index->(); - % my $new_content = begin -

<%= $macro_names->{$macro} // $macro %>

-
- % for my $file (sort { $a->[1] cmp $b->[1] } @{ $macros->{$macro} }) { - <%= $file->[1] %> - % } -
- % end - % $macro_content .= $new_content->(); - % } - % for my $section (@$section_order) { - % next unless defined $pod_index->{$section}; - % my $new_index = begin - <%= $sections->{$section} %> - % if ($section eq 'macros') { -
- <%= $macro_index %> -
- % } - % end - % $index .= $new_index->(); - % my $new_content = begin -

<%= $sections->{$section} %>

-
- % if ($section eq 'macros') { - <%= $macro_content =%> - % } else { - % for my $file (sort { $a->[1] cmp $b->[1] } @{ $pod_index->{$section} }) { - - <%= $file->[1] %> - - % } - % } -
- % end - % $content .= $new_content->(); - % } - % - -
-
- <%= $content =%> -

Generated <%= $date %>

-
-
- -% - diff --git a/bin/dev_scripts/pod-templates/main-index.mt b/bin/dev_scripts/pod-templates/main-index.mt index d9bfe39e8d..6a6d2f1e7f 100644 --- a/bin/dev_scripts/pod-templates/main-index.mt +++ b/bin/dev_scripts/pod-templates/main-index.mt @@ -4,19 +4,18 @@ - - + WeBWorK/PG POD % -
+
-
+ +

(Plain Old Documentation)

-
+ % diff --git a/bin/dev_scripts/pod-templates/pod.mt b/bin/dev_scripts/pod-templates/pod.mt deleted file mode 100644 index 0ea8e6c5b4..0000000000 --- a/bin/dev_scripts/pod-templates/pod.mt +++ /dev/null @@ -1,55 +0,0 @@ - - -% - - - - <%= $title %> - - - - - - -% - -
-
-

<%= $title %>

- -
-
- -
-
- <%= $content =%> -
-
- -% - diff --git a/bin/dev_scripts/run-perltidy.pl b/bin/dev_scripts/run-perltidy.pl index 37c9463353..f86e833292 100755 --- a/bin/dev_scripts/run-perltidy.pl +++ b/bin/dev_scripts/run-perltidy.pl @@ -49,8 +49,8 @@ =head1 OPTIONS my $webwork_root = curfile->dirname->dirname->dirname; -die "Version 20240903 of perltidy is required for this script.\nThe installed version is $Perl::Tidy::VERSION.\n" - unless $Perl::Tidy::VERSION == 20240903; +die "Version 20260204 of perltidy is required for this script.\nThe installed version is $Perl::Tidy::VERSION.\n" + unless $Perl::Tidy::VERSION == 20260204; die "The .perltidyrc file in the webwork root directory is not readable.\n" unless -r "$webwork_root/.perltidyrc"; @@ -65,8 +65,8 @@ =head1 OPTIONS # Validate options that were passed. my %options; my $err = Perl::Tidy::perltidy(argv => \@args, dump_options => \%options); -exit $err if $err; -die "The -pro option is not suppored by this script.\n" if defined $options{profile}; +exit $err if $err; +die "The -pro option is not supported by this script.\n" if defined $options{profile}; unshift(@args, '-bext=/') unless defined $options{'backup-file-extension'}; @@ -91,7 +91,7 @@ =head1 OPTIONS return; } - return unless $path =~ /\.p[lm]$/ || $path =~ /\.t$/; + return unless $path =~ /\.p[lm]$/ || $path =~ /\.t$/ || $path =~ /\.at$/; say "Tidying file: $path" if $verbose; diff --git a/bin/dev_scripts/update-localization-files b/bin/dev_scripts/update-localization-files index 8ad0cc1c11..20d60a7ccc 100755 --- a/bin/dev_scripts/update-localization-files +++ b/bin/dev_scripts/update-localization-files @@ -45,7 +45,7 @@ if [ -z "$WEBWORK_ROOT" ]; then fi command -v xgettext.pl >/dev/null 2>&1 || { - echo >&2 "xgettext.pl needs to be installed. It is inlcuded in the perl package Locale::Maketext::Extract. Aborting."; + echo >&2 "xgettext.pl needs to be installed. It is included in the perl package Locale::Maketext::Extract. Aborting."; exit 1; } diff --git a/bin/dev_scripts/webwork2-morbo b/bin/dev_scripts/webwork2-morbo index dde0b82708..63bef76e43 100755 --- a/bin/dev_scripts/webwork2-morbo +++ b/bin/dev_scripts/webwork2-morbo @@ -43,7 +43,7 @@ use Mojo::Base -strict; use Mojo::Server::Morbo; use Mojo::Util qw(extract_usage getopt); use Mojo::File qw(curfile); -use YAML::XS qw(LoadFile); +use YAML::XS qw(LoadFile); getopt 'b|backend=s' => \$ENV{MOJO_MORBO_BACKEND}, diff --git a/bin/newpassword b/bin/newpassword index 2611690ae7..f66289c733 100755 --- a/bin/newpassword +++ b/bin/newpassword @@ -37,7 +37,7 @@ use warnings; BEGIN { use Mojo::File qw(curfile); - use Env qw(WEBWORK_ROOT); + use Env qw(WEBWORK_ROOT); $WEBWORK_ROOT = curfile->dirname->dirname; } @@ -48,36 +48,36 @@ use WeBWorK::CourseEnvironment; use WeBWorK::DB; use WeBWorK::Utils qw(cryptPassword); -if((scalar(@ARGV) != 3)) { - print "\nSyntax is: newpassword CourseID User NewPassword"; - print "\n (e.g. newpassword MAT_123 jjones abracadabra\n\n"; - exit(); +if ((scalar(@ARGV) != 3)) { + print "\nSyntax is: newpassword CourseID User NewPassword"; + print "\n (e.g. newpassword MAT_123 jjones abracadabra\n\n"; + exit(); } ##### get command-line options ##### my $courseID = shift; -my $user = shift; -my $newP = shift; +my $user = shift; +my $newP = shift; ##### main function ##### sub dopasswd { - my ($db, $user, $newpass) = @_; - my $passwordRecord = eval {$db->getPassword($user)}; - die "Can't get password for user |$user| $@" if $@ or not defined($passwordRecord); - my $cryptedPassword = cryptPassword($newpass); - $passwordRecord->password($cryptedPassword); - eval {$db->putPassword($passwordRecord) }; - if ($@) { - die "Errors $@ "; - } + my ($db, $user, $newpass) = @_; + my $passwordRecord = eval { $db->getPassword($user) }; + die "Can't get password for user |$user| $@" if $@ or not defined($passwordRecord); + my $cryptedPassword = cryptPassword($newpass); + $passwordRecord->password($cryptedPassword); + eval { $db->putPassword($passwordRecord) }; + if ($@) { + die "Errors $@ "; + } } # bring up a minimal course environment my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT}, - courseName => $courseID + courseName => $courseID }); my $db = WeBWorK::DB->new($ce); diff --git a/bin/remove_stale_images b/bin/remove_stale_images index b5a7064e17..f88e4cc5b8 100755 --- a/bin/remove_stale_images +++ b/bin/remove_stale_images @@ -56,7 +56,7 @@ use DBI; BEGIN { use Mojo::File qw(curfile); - use Env qw(WEBWORK_ROOT); + use Env qw(WEBWORK_ROOT); $WEBWORK_ROOT = curfile->dirname->dirname; } @@ -69,200 +69,204 @@ use WeBWorK::Utils::Files qw(readFile); use constant ACCESSED => 8; use constant MODIFIED => 9; -my $now = time(); +my $now = time(); my $which = ACCESSED; ##### global variables to hold information from the find my $num_removed = 0; -my %kept = (); -my %days=(); -my %week=(); -my %depths=(); -my $grandtotal=0; +my %kept = (); +my %days = (); +my %week = (); +my %depths = (); +my $grandtotal = 0; my $depthConnection; ##### get command-line options ##### -my $start = $now; # way too big, but definitely before the beginning of the epoch -my $end = -1; -my $help = 0; -my $deloption = 0; +my $start = $now; # way too big, but definitely before the beginning of the epoch +my $end = -1; +my $help = 0; +my $deloption = 0; my $reportoption = 0; -my $modifydate = 0; -my $accessdate = 0; - -GetOptions('from=s' => \$start, - 'days=s' => \$end, - 'delete|remove' => \$deloption, - 'report' => \$reportoption, - 'modify-dates' => \$modifydate, - 'access-dates' => \$accessdate, - 'help' => \$help) or pod2usage(1); +my $modifydate = 0; +my $accessdate = 0; + +GetOptions( + 'from=s' => \$start, + 'days=s' => \$end, + 'delete|remove' => \$deloption, + 'report' => \$reportoption, + 'modify-dates' => \$modifydate, + 'access-dates' => \$accessdate, + 'help' => \$help +) or pod2usage(1); pod2usage(1) if $help; -$reportoption = 1 if(not $deloption); +$reportoption = 1 if (not $deloption); -if($modifydate and $accessdate) { - print "You cannot specify using both access dates and modify dates\n"; - pod2usage(1); +if ($modifydate and $accessdate) { + print "You cannot specify using both access dates and modify dates\n"; + pod2usage(1); } ## now fix up type my $type = $accessdate ? ACCESSED : MODIFIED; -if(scalar(@ARGV)>0) { - if(scalar(@ARGV)>1) { - print "Too many arguments given\n"; - pod2usage(1); - } - $end = $ARGV[0]; +if (scalar(@ARGV) > 0) { + if (scalar(@ARGV) > 1) { + print "Too many arguments given\n"; + pod2usage(1); + } + $end = $ARGV[0]; } -$end = 7 if($end == -1 and $deloption); +$end = 7 if ($end == -1 and $deloption); -if($start<= $end) { - print "The start time must be greater than the end length\n"; - exit(); +if ($start <= $end) { + print "The start time must be greater than the end length\n"; + exit(); } ## Fix up the start and end times -$start = $now - 24*60*60*$start; -$end = $now - 24*60*60*$end; +$start = $now - 24 * 60 * 60 * $start; +$end = $now - 24 * 60 * 60 * $end; ##### "wanted" function for find ##### sub wanted { - if(-f $File::Find::name and $File::Find::name =~ /\.png$/) { - my @stat = stat(_); - - if($deloption) { - my $fullmd5 = $File::Find::name; - if(length($_) > (4+32)) { # this is an old style path - $fullmd5 = $_; - $fullmd5 =~ s/\.png$//; - } else { - $fullmd5 =~ s|.*/([^/]+)/([^/]+)$|$1$2|; - $fullmd5 =~ s/\.png$//; - } - if($stat[$type]<$start or $stat[$type]>$end) { - $kept{$fullmd5} = ''; - if($depthConnection) { # hold dvipng depths - my $fetchdepth = $depthConnection->selectall_arrayref(" + if (-f $File::Find::name and $File::Find::name =~ /\.png$/) { + my @stat = stat(_); + + if ($deloption) { + my $fullmd5 = $File::Find::name; + if (length($_) > (4 + 32)) { # this is an old style path + $fullmd5 = $_; + $fullmd5 =~ s/\.png$//; + } else { + $fullmd5 =~ s|.*/([^/]+)/([^/]+)$|$1$2|; + $fullmd5 =~ s/\.png$//; + } + if ($stat[$type] < $start or $stat[$type] > $end) { + $kept{$fullmd5} = ''; + if ($depthConnection) { # hold dvipng depths + my $fetchdepth = $depthConnection->selectall_arrayref(" SELECT depth FROM depths WHERE md5=\"$fullmd5\""); - my $fetchdepthval = $fetchdepth->[0]->[0]; - $depths{$fullmd5} = $fetchdepthval if($fetchdepthval); + my $fetchdepthval = $fetchdepth->[0]->[0]; + $depths{$fullmd5} = $fetchdepthval if ($fetchdepthval); + } + } else { + my $result = unlink($File::Find::name); + if ($result) { + $num_removed++; + return (); + } else { + # If you don't have permissions to delete a file, you will probably + # mess up the permissions on the equation cache + die "Tried, but could not remove $File::Find::name\n"; + } + } + } + + if ($reportoption) { + return () if (not $deloption and ($stat[$type] < $start or $stat[$type] > $end)); + my $lapse = $now - $stat[$type]; + my $val = int(($lapse) / (60 * 60 * 24)); + $val = " " . $val if ($val < 10); + $val = " " . $val if ($val < 100); + if (defined($days{$val})) { $days{$val} += 1; } + else { $days{$val} = 1; } + $val = int($val / 7); + if (defined($week{$val})) { $week{$val} += 1; } + else { $week{$val} = 1; } + $grandtotal++; + } + } - } else { - my $result = unlink($File::Find::name); - if($result) { - $num_removed++; - return(); - } else { - # If you don't have permissions to delete a file, you will probably - # mess up the permissions on the equation cache - die "Tried, but could not remove $File::Find::name\n"; - } - } - } - - if($reportoption) { - return() if(not $deloption and ($stat[$type]<$start or $stat[$type]>$end)); - my $lapse = $now - $stat[$type]; - my $val = int(($lapse)/(60*60*24)); - $val = " ".$val if($val<10); - $val = " ".$val if($val<100); - if(defined($days{$val})) {$days{$val} += 1;} else {$days{$val} = 1;} - $val = int($val/7); - if(defined($week{$val})) {$week{$val} += 1;} else {$week{$val} = 1;} - $grandtotal++; - } - - } } ##### reporting function ##### sub count_report { - my $j; - print "Days\n"; - for $j (sort {$a <=> $b} keys(%days)) { - print "$j $days{$j}\n"; - } - - print "\nWeeks\n"; - for $j (sort {$a <=> $b} keys(%week)) { - print " $j $week{$j}\n"; - } - - print "\nTotal: $grandtotal\n"; + my $j; + print "Days\n"; + for $j (sort { $a <=> $b } keys(%days)) { + print "$j $days{$j}\n"; + } + + print "\nWeeks\n"; + for $j (sort { $a <=> $b } keys(%week)) { + print " $j $week{$j}\n"; + } + + print "\nTotal: $grandtotal\n"; } ##### main function ##### - # bring up a minimal course environment my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} }); -my $dirHead = $ce->{webworkDirs}->{equationCache}; +my $dirHead = $ce->{webworkDirs}->{equationCache}; my $cachePath = $ce->{webworkFiles}->{equationCacheDB}; -my $tmpdir = $ce->{webworkDirs}->{tmp}; -my $tmpfile = "$tmpdir/equationcache.tmp"; +my $tmpdir = $ce->{webworkDirs}->{tmp}; +my $tmpfile = "$tmpdir/equationcache.tmp"; # Prepare to handle depths database table my $alignType = $ce->{pg}->{displayModeOptions}->{images}->{dvipng_align}; -if($alignType eq 'mysql' and $deloption) { +if ($alignType eq 'mysql' and $deloption) { my $dbinfo = $ce->{pg}->{displayModeOptions}->{images}->{dvipng_depth_db}; - $depthConnection = DBI->connect_cached( - $dbinfo->{dbsource}, - $dbinfo->{user}, - $dbinfo->{passwd}, - { PrintError => 0, RaiseError => 1 }, - ); + $depthConnection = + DBI->connect_cached($dbinfo->{dbsource}, $dbinfo->{user}, $dbinfo->{passwd}, + { PrintError => 0, RaiseError => 1 }, + ); print "Could not make database connection for dvipng image depths.\n" unless defined $depthConnection; } -find({wanted => \&wanted, follow_fast => 1}, $dirHead); - -print "Removed $num_removed images.\n\n" if($deloption); -count_report() if($reportoption); +find({ wanted => \&wanted, follow_fast => 1 }, $dirHead); +print "Removed $num_removed images.\n\n" if ($deloption); +count_report() if ($reportoption); # For depth database, empty it and insert only values for the images # we kept. my $ent; -if($depthConnection) { # clean out database and put back in good values +if ($depthConnection) { # clean out database and put back in good values $depthConnection->do("TRUNCATE depths"); for my $ent (keys %depths) { - $depthConnection->do("INSERT INTO `depths` VALUES( - \"$ent\", \"$depths{$ent}\")"); + $depthConnection->do( + "INSERT INTO `depths` VALUES( + \"$ent\", \"$depths{$ent}\")" + ); } } ## The rest is updating the equation cache if we deleted images and there is a cache -exit() unless($deloption and $num_removed); +exit() unless ($deloption and $num_removed); exit() unless ($cachePath); print "Updating the equation cache\n"; -my ($perms, $uid, $groupID) = (stat $cachePath)[2,4,5]; #Get values from current cache file +my ($perms, $uid, $groupID) = (stat $cachePath)[ 2, 4, 5 ]; #Get values from current cache file my $cachevalues = readFile($cachePath); -my @cachelines = split "\n", $cachevalues; +my @cachelines = split "\n", $cachevalues; for $ent (@cachelines) { - chomp($ent); - my $entmd5 = $ent; - $entmd5 =~ s/^(\S+)\s+(\S+)\s+.*$/$1$2/; - if(defined($kept{$entmd5})) { - $kept{$entmd5} = $ent; - } + chomp($ent); + my $entmd5 = $ent; + $entmd5 =~ s/^(\S+)\s+(\S+)\s+.*$/$1$2/; + if (defined($kept{$entmd5})) { + $kept{$entmd5} = $ent; + } } #print "Temp file $tmpfile\n"; #print "Cache file had group $groupID and perms $perms\n"; open(OUTF, ">$tmpfile") or die "Could not write to temp file $tmpfile"; for $ent (keys %kept) { - if($kept{$ent}) { - print OUTF $kept{$ent}."\n"; - } else {print "could not find $ent\n";} + if ($kept{$ent}) { + print OUTF $kept{$ent} . "\n"; + } else { + print "could not find $ent\n"; + } } close(OUTF); rename($tmpfile, $cachePath); @@ -271,7 +275,4 @@ rename($tmpfile, $cachePath); chmod $perms, $cachePath; chown $uid, $groupID, $cachePath; - - - 1; diff --git a/bin/setfilepermissions b/bin/setfilepermissions index 9b428cb6c1..2388e00bb8 100755 --- a/bin/setfilepermissions +++ b/bin/setfilepermissions @@ -19,7 +19,7 @@ use warnings; BEGIN { use Mojo::File qw(curfile); - use Env qw(WEBWORK_ROOT); + use Env qw(WEBWORK_ROOT); $WEBWORK_ROOT = curfile->dirname->dirname; } diff --git a/bin/upgrade-database-to-utf8mb4.pl b/bin/upgrade-database-to-utf8mb4.pl index 2d99c84ea6..9c1a1f9a25 100755 --- a/bin/upgrade-database-to-utf8mb4.pl +++ b/bin/upgrade-database-to-utf8mb4.pl @@ -32,7 +32,7 @@ =head1 DESCRIPTION Upgrade webwork course database tables from latin1 to utf8mb4. This script assumes that you have already properly configured the database to -work with the utf8mb4 character set. See L. +work with the utf8mb4 character set. See L. Also, make sure to upgrade the course via webwork2/admin "Upgrade Courses" before running this script for the course. @@ -81,7 +81,7 @@ =head1 OPTIONS this option is enabled then the second pass will change those back to the smaller text datatypes as defined in the webwork database schema. -This second pass is not strictly neccessary. The larger text datatypes should +This second pass is not strictly necessary. The larger text datatypes should still work with WeBWorK. This pass is not run by default. Note that running this script again will also diff --git a/bin/webwork2 b/bin/webwork2 index 48ba93bd16..860a734131 100755 --- a/bin/webwork2 +++ b/bin/webwork2 @@ -5,8 +5,8 @@ use warnings; BEGIN { use Mojo::File qw(curfile); - use YAML::XS qw(LoadFile); - use Env qw(WEBWORK_ROOT PG_ROOT); + use YAML::XS qw(LoadFile); + use Env qw(WEBWORK_ROOT PG_ROOT); $WEBWORK_ROOT = curfile->dirname->dirname->to_string; diff --git a/bin/ww_purge_old_nonces b/bin/ww_purge_old_nonces index d8ee043bd7..274361282e 100755 --- a/bin/ww_purge_old_nonces +++ b/bin/ww_purge_old_nonces @@ -32,7 +32,7 @@ use warnings; BEGIN { use Mojo::File qw(curfile); - use Env qw(WEBWORK_ROOT); + use Env qw(WEBWORK_ROOT); $WEBWORK_ROOT = curfile->dirname->dirname; } @@ -42,7 +42,7 @@ use lib "$ENV{WEBWORK_ROOT}/lib"; use WeBWorK::CourseEnvironment; use WeBWorK::DB; -use constant NONCE_LIFETIME => 21600; # 6 hours +use constant NONCE_LIFETIME => 21600; # 6 hours sub usage { print STDERR "usage: $0 course \n"; @@ -51,7 +51,7 @@ sub usage { my ($course) = @ARGV; -usage() unless $course ; +usage() unless $course; my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT}, @@ -62,24 +62,23 @@ my $db = WeBWorK::DB->new($ce); my @errors; -my @listKeys = $db -> listKeys(); +my @listKeys = $db->listKeys(); foreach my $user_id (@listKeys) { my $Key; - eval { $Key = $db->getKey($user_id);}; - if ($@) { push @errors, "$user_id: ". $@ ;} + eval { $Key = $db->getKey($user_id); }; + if ($@) { push @errors, "$user_id: " . $@; } else { - if ($Key->key eq "nonce" && - (time()-$Key->timestamp > NONCE_LIFETIME) - ) { - eval {$db->deleteKey($user_id);}; - if ($@) { push @errors, "$user_id: ". $@ ;} + if ($Key->key eq "nonce" + && (time() - $Key->timestamp > NONCE_LIFETIME)) + { + eval { $db->deleteKey($user_id); }; + if ($@) { push @errors, "$user_id: " . $@; } } } } - if (@errors) { - warn "The following errors occurred:\n", map { "* $_\n" } @errors; + warn "The following errors occurred:\n", map {"* $_\n"} @errors; exit 1; } diff --git a/bin/wwsh b/bin/wwsh index e55e969305..4aa3aa46ff 100755 --- a/bin/wwsh +++ b/bin/wwsh @@ -11,7 +11,7 @@ use warnings; BEGIN { use Mojo::File qw(curfile); - use Env qw(WEBWORK_ROOT); + use Env qw(WEBWORK_ROOT); $WEBWORK_ROOT = curfile->dirname->dirname; } @@ -25,8 +25,8 @@ use WeBWorK::CourseEnvironment; use WeBWorK::DB; use Data::Dumper; -my $courseID = shift @ARGV; -my $scriptFile = shift @ARGV; +my $courseID = shift @ARGV; +my $scriptFile = shift @ARGV; unless ($courseID and $scriptFile) { die "usage: $0 courseID scriptFile\n"; @@ -39,7 +39,6 @@ $ce = WeBWorK::CourseEnvironment->new({ courseName => $courseID, }); - $db = WeBWorK::DB->new($ce); print <<'EOF'; @@ -52,9 +51,8 @@ EOF print "courseID: $courseID and scriptFile: $scriptFile\n--------------------------------\n"; do $scriptFile; if ($@) { - print "errors ", $@,"\n" ; + print "errors ", $@, "\n"; } else { print "--------------------------------\ndone\n"; } - diff --git a/conf/README.md b/conf/README.md index 45ebac0def..0331c407a7 100644 --- a/conf/README.md +++ b/conf/README.md @@ -190,7 +190,7 @@ sudo systemctl enable /opt/webwork/webwork2/conf/webwork2.service sudo systemctl start webwork2 ``` -### Deployment of the webwork2 job queue for all server arrangments +### Deployment of the webwork2 job queue for all server arrangements Some long running processes are not directly run by the webwork2 Mojolicious app. Particularly mass grade updates via LTI and sending of instructor emails. Instead these tasks are executed via the webwork2 Minion job queue. diff --git a/conf/authen_LTI.conf.dist b/conf/authen_LTI.conf.dist index 20196f4f49..b32287f517 100644 --- a/conf/authen_LTI.conf.dist +++ b/conf/authen_LTI.conf.dist @@ -213,7 +213,6 @@ $LTISendGradesEarlyThreshold = 'attempted'; # page, then a new mass passback job will begin. Set this to -1 to disable mass passback. $LTIMassUpdateInterval = 86400; - ################################################################################################ # Add an 'LTI' tab to the Course Configuration page ################################################################################################ @@ -255,15 +254,15 @@ $LTIMassUpdateInterval = 86400; # By default only admin users can modify the LTI secrets and lms_context_id. The following # permissions need to be modified to allow other users the permission to modify the values. -#$permissionLevels{'change_config_LTI{v1p1}{BasicConsumerSecret}'} = "admin", -#$permissionLevels{'change_config_LTI{v1p3}{PlatformID}'} = "admin", -#$permissionLevels{'change_config_LTI{v1p3}{ClientID}'} = "admin", -#$permissionLevels{'change_config_LTI{v1p3}{DeploymentID}'} = "admin", -#$permissionLevels{'change_config_LTI{v1p3}{PublicKeysetURL}'} = "admin", -#$permissionLevels{'change_config_LTI{v1p3}{AccessTokenURL}'} = "admin", -#$permissionLevels{'change_config_LTI{v1p3}{AccessTokenAUD}'} = "admin", -#$permissionLevels{'change_config_LTI{v1p3}{AuthReqURL}'} = "admin", -#$permissionLevels{'change_config_lms_context_id'} = "admin", +#$permissionLevels{'change_config_LTI{v1p1}{BasicConsumerSecret}'} = "admin"; +#$permissionLevels{'change_config_LTI{v1p3}{PlatformID}'} = "admin"; +#$permissionLevels{'change_config_LTI{v1p3}{ClientID}'} = "admin"; +#$permissionLevels{'change_config_LTI{v1p3}{DeploymentID}'} = "admin"; +#$permissionLevels{'change_config_LTI{v1p3}{PublicKeysetURL}'} = "admin"; +#$permissionLevels{'change_config_LTI{v1p3}{AccessTokenURL}'} = "admin"; +#$permissionLevels{'change_config_LTI{v1p3}{AccessTokenAUD}'} = "admin"; +#$permissionLevels{'change_config_LTI{v1p3}{AuthReqURL}'} = "admin"; +#$permissionLevels{'change_config_lms_context_id'} = "admin"; # Note that the lms_context_id is actually a database setting. It must be set for a course in # order for the instructor to utilize LTI content selection. This can also be set in the admin diff --git a/conf/authen_saml2.conf.dist b/conf/authen_saml2.conf.dist index a4403134a1..bf7a08e156 100644 --- a/conf/authen_saml2.conf.dist +++ b/conf/authen_saml2.conf.dist @@ -55,7 +55,7 @@ $saml2{twoFAOnlyWithBypass} = 0; # prevents users from attempting to login in to WeBWorK directly. $external_auth = 0; -# The $saml2{idps} hash contains names of identity proviers and their SAML2 +# The $saml2{idps} hash contains names of identity providers and their SAML2 # metadata URLs that are used by this server. Webwork will request the identity # provider's metadata from the URL of the $saml2{active_idp} during the # authentication process. Additional identity providers can also be added for a diff --git a/conf/defaults.config b/conf/defaults.config index b9c2448d99..2435293206 100644 --- a/conf/defaults.config +++ b/conf/defaults.config @@ -14,7 +14,7 @@ # file, you can put a directive in localOverrides.conf. include("conf/site.conf"); -include("VERSION"); # get WW version +include("VERSION"); # get WW version # The version of PG is now obtained from the file pg/VERSION # using code added to CourseEnvironment.pm # with this one exception include can only read files under the webwork2 directory @@ -34,9 +34,9 @@ $generic_sender_name = ''; # The following variables will override the "From:" address in messages sent by # the named feature. -$feedback_sender_email = ''; # For student feedback -$instructor_sender_email = ''; # For instructors emailing students -$jitar_sender_email = ''; # For notifications of incomplete JiTaR sets +$feedback_sender_email = ''; # For student feedback +$instructor_sender_email = ''; # For instructors emailing students +$jitar_sender_email = ''; # For notifications of incomplete JiTaR sets # By default, feedback is sent to all users who have permission to # receive_feedback in a course. If this list is non-empty, feedback is also sent @@ -57,7 +57,7 @@ $jitar_sender_email = ''; # For notifications of incomplete JiTaR sets # The advantage of this form is that the resulting email will include the name # of the recipient in the "To" field of the email. -$mail{feedbackRecipients} = [ +$mail{feedbackRecipients} = [ #'prof1@yourserver.yourdomain.edu', #'prof2@yourserver.yourdomain.edu', ]; @@ -73,13 +73,13 @@ $mail{feedbackRecipients} = [ # %% = literal percent sign # -$mail{feedbackSubjectFormat} = "[WWfeedback] course:%c user:%u set:%s prob:%p sec:%x rec:%r"; +$mail{feedbackSubjectFormat} = '[WWfeedback] course:%c user:%u{ set:%s}{ prob:%p}{ sec:%x}{ rec:%r}'; # feedbackVerbosity: # 0: send only the feedback comment and context link # 1: as in 0, plus user, set, problem, and PG data # 2: as in 1, plus the problem environment (debugging data) -$mail{feedbackVerbosity} = 1; +$mail{feedbackVerbosity} = 1; # Should the studentID be included in the feedback email when feedbackVerbosity > 0: # The default is yes @@ -88,7 +88,7 @@ $blockStudentIDinFeedback = 0; # Defines the initial height of the Mail Merge editor window # FIXME: should this be here? it's UI, not mail # FIXME: replace this with the auto-size method that TWiki uses -$mail{editor_window_rows} = 15; +$mail{editor_window_rows} = 15; ################################################################################## # Customizing the action of the "Email your instructor" button @@ -135,23 +135,24 @@ $institutionName = 'MAA (Mathematical Association of America)'; ################################################################################ # Achievements ################################################################################ -$achievementsEnabled = 0; -$achievementItemsEnabled = 0; -$achievementPointsPerProblem = 5; +$achievementsEnabled = 0; +$achievementItemsEnabled = 0; +$achievementPointsPerProblem = 5; $achievementPointsPerProblemReduced = 3; -$achievementPreambleFile = "preamble.at"; -$achievementExcludeSet = []; -$mail{achievementEmailFrom} = ''; -$showCourseHomeworkTotals = 1; +$achievementPreambleFile = "preamble.at"; +$achievementExcludeSet = []; +$achievementExtensionFactor = 1; +$mail{achievementEmailFrom} = ''; +$showCourseHomeworkTotals = 1; ################################################################################ # Editor ################################################################################ -$editor{author} = ''; +$editor{author} = ''; $editor{authorInstitute} = ''; -$editor{textTitle} = ''; -$editor{textEdition} = ''; -$editor{textAuthor} = ''; +$editor{textTitle} = ''; +$editor{textEdition} = ''; +$editor{textAuthor} = ''; ################################################################################ # Enter key behavior @@ -171,12 +172,7 @@ $pg{options}{showMeAnotherMaxReps} = 3; # changes the problem $pg{options}{showMeAnotherGeneratesDifferentProblem} = 5; # showMeAnother options -$pg{options}{showMeAnother}=[ -"SMAcheckAnswers", -"SMAshowSolutions", -"SMAshowCorrect", -"SMAshowHints", -]; +$pg{options}{showMeAnother} = [ "SMAcheckAnswers", "SMAshowSolutions", "SMAshowCorrect", "SMAshowHints", ]; ################################################################################ # showHintsAfter @@ -262,95 +258,93 @@ $studentDateDisplayFormat = 'datetime_format_long'; ################################################################################ # The root directory, set by webwork_root variable in Apache configuration. -$webworkDirs{root} = "$webwork_dir"; +$webworkDirs{root} = "$webwork_dir"; # Location of system-wide data files. -$webworkDirs{DATA} = "$webworkDirs{root}/DATA"; +$webworkDirs{DATA} = "$webworkDirs{root}/DATA"; # Used for temporary storage of uploaded files. -$webworkDirs{uploadCache} = "$webworkDirs{DATA}/uploads"; +$webworkDirs{uploadCache} = "$webworkDirs{DATA}/uploads"; # Location of utility programs. -$webworkDirs{bin} = "$webworkDirs{root}/bin"; +$webworkDirs{bin} = "$webworkDirs{root}/bin"; # Location of configuration files. -$webworkDirs{conf} = "$webworkDirs{root}/conf"; +$webworkDirs{conf} = "$webworkDirs{root}/conf"; + +# Location of add-on configuration files. +$webworkDirs{addOnConf} = "$webworkDirs{conf}/addon"; # Location of assets (tex, pg, themes) -$webworkDirs{assets} = "$webworkDirs{root}/assets"; +$webworkDirs{assets} = "$webworkDirs{root}/assets"; # Location of the distribution hardcopy themes. $webworkDirs{hardcopyThemes} = "$webworkDirs{assets}/hardcopyThemes"; # Location of course directories. -$webworkDirs{courses} = "$webwork_courses_dir" || "$webworkDirs{root}/courses"; +$webworkDirs{courses} = "$webwork_courses_dir" || "$webworkDirs{root}/courses"; # Contains log files. -$webworkDirs{logs} = "$webworkDirs{root}/logs"; +$webworkDirs{logs} = "$webworkDirs{root}/logs"; # Contains non-web-accessible temporary files, such as TeX working directories. -$webworkDirs{tmp} = "$webworkDirs{root}/tmp"; +$webworkDirs{tmp} = "$webworkDirs{root}/tmp"; # The (absolute) destinations of symbolic links that are OK for the FileManager to follow. # (any subdirectory of these is a valid target for a symbolic link.) # For example: # $webworkDirs{valid_symlinks} = ["$webworkDirs{courses}/modelCourse/templates","/ww2/common/sets"]; -$webworkDirs{valid_symlinks} = []; +$webworkDirs{valid_symlinks} = []; # Location of the webwork2.sty and its dependencies used for hardcopy generation. -$webworkDirs{assetsTex} = "$webworkDirs{assets}/tex"; +$webworkDirs{assetsTex} = "$webworkDirs{assets}/tex"; ################################################################################ ##### The following locations are web-accessible. ################################################################################ # The root URL (usually /webwork2), set by in Apache configuration. -$webworkURLs{root} = "$webwork_url"; +$webworkURLs{root} = "$webwork_url"; # Location of system-wide web-accessible files, such as equation images, and # help files. -$webworkDirs{htdocs} = "$webwork_htdocs_dir" || "$webworkDirs{root}/htdocs"; -$webworkURLs{htdocs} = "$webwork_htdocs_url"; +$webworkDirs{htdocs} = "$webwork_htdocs_dir" || "$webworkDirs{root}/htdocs"; +$webworkURLs{htdocs} = "$webwork_htdocs_url"; # Location of web-accessible temporary files, such as equation images. # These two should be set in localOverrides.conf -- not here since this can be overwritten by new versions. -$webworkDirs{htdocs_temp} = "$webworkDirs{htdocs}/tmp"; -$webworkURLs{htdocs_temp} = "$webworkURLs{htdocs}/tmp"; +$webworkDirs{htdocs_temp} = "$webworkDirs{htdocs}/tmp"; +$webworkURLs{htdocs_temp} = "$webworkURLs{htdocs}/tmp"; # Location of cached equation images. $webworkDirs{equationCache} = "$webworkDirs{htdocs_temp}/equations"; $webworkURLs{equationCache} = "$webworkURLs{htdocs_temp}/equations"; # Location of theme templates. -$webworkDirs{themes} = "$webworkDirs{htdocs}/themes"; +$webworkDirs{themes} = "$webworkDirs{htdocs}/themes"; # Location of localization directory. $webworkDirs{localize} = "$webworkDirs{root}/lib/WeBWorK/Localize"; -# URL of general WeBWorK documentation. -$webworkURLs{docs} = "https://webwork.maa.org"; - # URLs for new issues in Github. $webworkURLs{webwork2BugReporter} = "https://github.com/openwebwork/webwork2/issues/new"; $webworkURLs{OPLBugReporter} = "https://github.com/openwebwork/webwork-open-problem-library/issues/new"; # URL of WeBWorK on GitHub -$webworkURLs{GitHub} = "https://github.com/openwebwork"; +$webworkURLs{GitHub} = "https://github.com/openwebwork"; # Registration form URL, security signup mail address -$webworkURLs{serverRegForm} = "https://forms.gle/vrqpKiRHritnQNf37"; +$webworkURLs{serverRegForm} = "https://forms.gle/vrqpKiRHritnQNf37"; $webworkURLs{wwSecurityAnnounce} = "https://groups.google.com/g/ww-security-announce"; -$webworkSecListManagers = 'ww-security-announce+managers@googlegroups.com'; +$webworkSecListManagers = 'ww-security-announce+managers@googlegroups.com'; # URLs in the Wiki -$webworkURLs{WikiMain} = "https://webwork.maa.org/wiki/"; -$webworkURLs{SiteMap} = "https://webwork.maa.org/wiki/WeBWorK_Sites"; +$webworkURLs{WikiMain} = "https://wiki.openwebwork.org/wiki"; +$webworkURLs{SiteMap} = "https://wiki.openwebwork.org/wiki/WeBWorK_Sites"; # URL for help buttons on the PGProblemEditor pages: -$webworkURLs{MathObjectsHelpURL} ='https://webwork.maa.org/wiki/Category:MathObjects'; -$webworkURLs{PGLabHelpURL} ='https://demo.webwork.rochester.edu/webwork2/wikiExamples/MathObjectsLabs2/2?login_practice_user=true'; -$webworkURLs{PGMLHelpURL} ='https://demo.webwork.rochester.edu/webwork2/cervone_course/PGML/1?login_practice_user=true'; -$webworkURLs{AuthorHelpURL} ='https://webwork.maa.org/wiki/Category:Authors'; +$webworkURLs{MathObjectsHelpURL} = 'https://wiki.openwebwork.org/wiki/Category:MathObjects'; +$webworkURLs{AuthorHelpURL} = 'https://wiki.openwebwork.org/wiki/Category:Authors'; # Location of CSS # $webworkURLs{stylesheet} = "$webworkURLs{htdocs}/css/${defaultTheme}.css"; @@ -366,24 +360,24 @@ $webworkURLs{AuthorHelpURL} ='https://webwork.maa.org/wiki/Category:Au # The problemLibrary configuration data should now be set in localOverrides.conf # For configuration instructions, see: -# https://webwork.maa.org/wiki/Open_Problem_Library +# https://wiki.openwebwork.org/wiki/Open_Problem_Library # The directory containing the open problem library files. # Set the root to "" if no problem #RE-CONFIGURE problemLibrary values in localOverrides.conf # if these defaults are not correct. ################################################# -$problemLibrary{root} = "/opt/webwork/libraries/webwork-open-problem-library/OpenProblemLibrary"; -$contribLibrary{root} = "/opt/webwork/libraries/webwork-open-problem-library/Contrib"; -$problemLibrary{version} = "2.5"; +$problemLibrary{root} = "/opt/webwork/libraries/webwork-open-problem-library/OpenProblemLibrary"; +$contribLibrary{root} = "/opt/webwork/libraries/webwork-open-problem-library/Contrib"; +$problemLibrary{version} = "2.5"; ########################################################### # Problem Library SQL database connection information $problemLibrary_db = { - dbsource => $database_dsn, - user => $database_username, - passwd => $database_password, - storage_engine => 'MYISAM', + dbsource => $database_dsn, + user => $database_username, + passwd => $database_password, + storage_engine => 'MYISAM', }; $problemLibrary{tree} = 'library-directory-tree.json'; @@ -401,31 +395,31 @@ $problemLibrary{showLibraryGlobalStats} = 1; # The root directory of the current course. (The ID of the current course is # available in $courseName.) -$courseDirs{root} = "$webworkDirs{courses}/$courseName"; +$courseDirs{root} = "$webworkDirs{courses}/$courseName"; # Location of course-specific data files. -$courseDirs{DATA} = "$courseDirs{root}/DATA"; +$courseDirs{DATA} = "$courseDirs{root}/DATA"; # Location of course HTML files, passed to PG. -$courseDirs{html} = "$courseDirs{root}/html"; -$courseURLs{html} = "$webwork_courses_url/$courseName"; +$courseDirs{html} = "$courseDirs{root}/html"; +$courseURLs{html} = "$webwork_courses_url/$courseName"; # Location of course image files, passed to PG. $courseDirs{html_images} = "$courseDirs{html}/images"; # Location of web-accessible, course-specific temporary files, like static and # dynamically-generated PG graphics. -$courseDirs{html_temp} = "$webworkDirs{htdocs_temp}/$courseName"; -$courseURLs{html_temp} = "$webworkURLs{htdocs_temp}/$courseName"; +$courseDirs{html_temp} = "$webworkDirs{htdocs_temp}/$courseName"; +$courseURLs{html_temp} = "$webworkURLs{htdocs_temp}/$courseName"; # Location of course-specific logs, like the transaction log. -$courseDirs{logs} = "$courseDirs{root}/logs"; +$courseDirs{logs} = "$courseDirs{root}/logs"; # Location of scoring files. -$courseDirs{scoring} = "$courseDirs{root}/scoring"; +$courseDirs{scoring} = "$courseDirs{root}/scoring"; # Location of PG templates and set definition files. -$courseDirs{templates} = "$courseDirs{root}/templates"; +$courseDirs{templates} = "$courseDirs{root}/templates"; # Location of hardcopy theme files. $courseDirs{hardcopyThemes} = "$courseDirs{templates}/hardcopyThemes"; @@ -433,40 +427,40 @@ $courseDirs{hardcopyThemes} = "$courseDirs{templates}/hardcopyThemes"; # Location of course achievement files. $courseDirs{achievements} = "$courseDirs{templates}/achievements"; $courseDirs{achievement_notifications} = "$courseDirs{achievements}/notifications"; -$courseDirs{achievements_html} = "$courseDirs{html}/achievements"; #contains badge icons +$courseDirs{achievements_html} = "$courseDirs{html}/achievements"; #contains badge icons $courseURLs{achievements} = "$courseURLs{html}/achievements"; # Location of course-specific macro files. -$courseDirs{macros} = "$courseDirs{templates}/macros"; +$courseDirs{macros} = "$courseDirs{templates}/macros"; # Location of mail-merge templates. -$courseDirs{email} = "$courseDirs{templates}/email"; +$courseDirs{email} = "$courseDirs{templates}/email"; # Location of temporary editing files. -$courseDirs{tmpEditFileDir} = "$courseDirs{templates}/tmpEdit"; +$courseDirs{tmpEditFileDir} = "$courseDirs{templates}/tmpEdit"; # mail merge status directory -$courseDirs{mailmerge} = "$courseDirs{DATA}/mailmerge"; +$courseDirs{mailmerge} = "$courseDirs{DATA}/mailmerge"; # course links that are regulated by webwork2 -$courseLinks{Library} = [ $problemLibrary{root}, "$courseDirs{templates}/Library" ]; -$courseLinks{Contrib} = [ $contribLibrary{root}, "$courseDirs{templates}/Contrib" ]; -$courseLinks{capaLibrary} = [ "$contribLibrary{root}/CAPA", "$courseDirs{templates}/capaLibrary" ]; -$courseLinks{Student_Orientation} = [ "$webworkDirs{assets}/pg/Student_Orientation", "$courseDirs{templates}/Student_Orientation" ]; +$courseLinks{Library} = [ $problemLibrary{root}, "$courseDirs{templates}/Library" ]; +$courseLinks{Contrib} = [ $contribLibrary{root}, "$courseDirs{templates}/Contrib" ]; +$courseLinks{Student_Orientation} = + [ "$webworkDirs{assets}/pg/Student_Orientation", "$courseDirs{templates}/Student_Orientation" ]; ################################################################################ # System-wide files ################################################################################ # Location of this file. -$webworkFiles{environment} = "$webworkDirs{conf}/defaults.conf"; +$webworkFiles{environment} = "$webworkDirs{conf}/defaults.conf"; # Flat-file database used to protect against MD5 hash collisions. TeX equations # are hashed to determine the name of the image file. There is a tiny chance of # a collision between two TeX strings. This file allows for that. However, this # is slow, so most people chose not to worry about it. Set this to "" if you # don't want to use the equation cache file. -$webworkFiles{equationCacheDB} = ""; # "$webworkDirs{DATA}/equationcache"; +$webworkFiles{equationCacheDB} = ""; # "$webworkDirs{DATA}/equationcache"; ################################################################################ # Hardcopy Theme @@ -500,7 +494,7 @@ $hardcopyThemes = [ # Default hardcopy themes (should either be an enabled site theme or a theme in # the course hardcopyThemes folder -$hardcopyTheme = 'twoColumn.xml'; +$hardcopyTheme = 'twoColumn.xml'; $hardcopyThemePGEditor = 'empty.xml'; ################################################################################ @@ -510,7 +504,7 @@ $hardcopyThemePGEditor = 'empty.xml'; # The setHeader precedes each set in hardcopy output. It is a PG file. # This is the default file which is used if a specific files is not selected -$webworkFiles{hardcopySnippets}{setHeader} = "$webworkDirs{assets}/pg/defaultSetHeader.pg"; +$webworkFiles{hardcopySnippets}{setHeader} = "$webworkDirs{assets}/pg/defaultSetHeader.pg"; ################################################################################ ##### Screen snippets are used when displaying problem sets on the screen. @@ -518,13 +512,13 @@ $webworkFiles{hardcopySnippets}{setHeader} = "$webworkDirs{assets}/pg/defaul # The set header is displayed on the problem set page. It is a PG file. # This is the default file which is used if a specific files is not selected -$webworkFiles{screenSnippets}{setHeader} = "$webworkDirs{assets}/pg/defaultSetHeader.pg"; +$webworkFiles{screenSnippets}{setHeader} = "$webworkDirs{assets}/pg/defaultSetHeader.pg"; # A PG template for creation of new problems. -$webworkFiles{screenSnippets}{blankProblem} = "$webworkDirs{assets}/pg/newProblem.pg"; +$webworkFiles{screenSnippets}{blankProblem} = "$webworkDirs{assets}/pg/newProblem.pg"; # A site info "message of the day" file -$webworkFiles{site_info} = "$webworkDirs{htdocs}/site_info.txt"; +$webworkFiles{site_info} = "$webworkDirs{htdocs}/site_info.txt"; ################################################################################ # Course-specific files @@ -542,14 +536,11 @@ $courseFiles{course_info} = "course_info.txt"; # File contents are displayed on the login page. Path given here is relative to # the templates directory. -$courseFiles{login_info} = "login_info.txt"; +$courseFiles{login_info} = "login_info.txt"; # These course specific files cannot be edited from the File Manager for safety reasons except # by an administrator. These are paths relative to the course directory. -$uneditableCourseFiles = [ - 'simple.conf', - 'course.conf', -]; +$uneditableCourseFiles = [ 'simple.conf', 'course.conf', ]; # Additional library buttons can be added to the Library Browser (SetMaker.pm) # by adding the libraries you want to the following line. For each key=>value @@ -567,12 +558,10 @@ $uneditableCourseFiles = [ # activated below gives access to all the directories in the National # Problem Library. # -$courseFiles{problibs} = { - Library => "OPL Directory", - Contrib => "Contrib", # remember to create link from Contrib to Contrib - # library directory - capaLibrary => "CAPA", # remember to create link from capaLibrary to CAPA - # in contrib +$courseFiles{problibs} = { + Library => "OPL Directory", + Contrib => "Contrib", # remember to create link from Contrib to Contrib + # library directory }; ################################################################################ @@ -598,23 +587,24 @@ $default_status = "Enrolled"; %statuses = ( Enrolled => { - abbrevs => [qw/ C c current enrolled /], - behaviors => [qw/ allow_course_access include_in_assignment include_in_stats include_in_email include_in_scoring /], + abbrevs => [qw/ C c current enrolled /], + behaviors => + [qw/ allow_course_access include_in_assignment include_in_stats include_in_email include_in_scoring /], }, Audit => { - abbrevs => [qw/ A a audit /], + abbrevs => [qw/ A a audit /], behaviors => [qw/ allow_course_access include_in_assignment include_in_stats include_in_email /], }, Observer => { - abbrevs => [qw/ O o observer /], + abbrevs => [qw/ O o observer /], behaviors => [qw/ allow_course_access include_in_assignment /], }, Drop => { - abbrevs => [qw/ D d drop withdraw /], + abbrevs => [qw/ D d drop withdraw /], behaviors => [qw/ /], }, Proctor => { - abbrevs => [qw/ P p proctor /], + abbrevs => [qw/ P p proctor /], behaviors => [qw/ /], }, ); @@ -635,31 +625,30 @@ $maxCourseIdLength = 40; # Logs ################################################################################ - # Logs data about how long it takes to process problems. (Do not confuse this # with the /other/ timing log which can be set by WeBWorK::Timing and is used # for benchmarking system performance in general. At some point, this timing # mechanism will be deprecated in favor of the WeBWorK::Timing mechanism.) -$webworkFiles{logs}{timing} = "$webworkDirs{logs}/timing.log"; +$webworkFiles{logs}{timing} = "$webworkDirs{logs}/timing.log"; # Logs data about how long it takes to process problems. (Do not confuse this # with the /other/ timing log which can be set by WeBWorK::Timing and is used # for benchmarking system performance in general. At some point, this timing # mechanism will be deprecated in favor of the WeBWorK::Timing mechanism.) -$webworkFiles{logs}{render_timing} = "$webworkDirs{logs}/render_timing.log"; +$webworkFiles{logs}{render_timing} = "$webworkDirs{logs}/render_timing.log"; # Logs courses created via the web-based Course Administration module. $webworkFiles{logs}{hosted_courses} = "$webworkDirs{logs}/hosted_courses.log"; # The transaction log contains data from each recorded answer submission. This # is useful if the database becomes corrupted. -$webworkFiles{logs}{transaction} = "$webworkDirs{logs}/${courseName}_transaction.log"; +$webworkFiles{logs}{transaction} = "$webworkDirs{logs}/${courseName}_transaction.log"; # The answer log stores a history of all users' submitted answers. -$courseFiles{logs}{answer_log} = "$courseDirs{logs}/answer.log"; +$courseFiles{logs}{answer_log} = "$courseDirs{logs}/answer.log"; # Log logins. -$courseFiles{logs}{login_log} = "$courseDirs{logs}/login.log"; +$courseFiles{logs}{login_log} = "$courseDirs{logs}/login.log"; # Log for almost every click. By default it is the empty string, which # turns this log off. If you want it turned on, we suggest @@ -674,15 +663,15 @@ $courseFiles{logs}{activity_log} = ''; # The default_copy_from_course is used by default when creating a new course. # Its templates folder, html folder, course.conf file, and simple.conf file # might be copied into a new course. This course might not be a true course; -# it might only have a directory structure and no presense in the database. +# it might only have a directory structure and no presence in the database. # If it is a real course, then also its title, institution, non-student users, # achievements, and sets can be copied. -$siteDefaults{default_copy_from_course} ="modelCourse"; +$siteDefaults{default_copy_from_course} = "modelCourse"; # Provide a list of model courses which are not real courses, but from which # the templates for a new course can be copied. This list helps exclude such -# non-real courses when that is appopriate. -$modelCoursesForCopy = [ "modelCourse" ]; +# non-real courses when that is appropriate. +$modelCoursesForCopy = ["modelCourse"]; ################################################################################ # Authentication system @@ -718,13 +707,13 @@ $authen{admin_module} = ['WeBWorK::Authen::Basic_TheLastOption']; # %userRoles = ( guest => -5, - student => 0, - login_proctor => 2, - grade_proctor => 3, - ta => 5, - professor => 10, - admin => 20, - nobody => 99999999, # insure that nobody comes at the end + student => 0, + login_proctor => 2, + grade_proctor => 3, + ta => 5, + professor => 10, + admin => 20, + nobody => 99999999, # insure that nobody comes at the end ); # this hash maps operations to the roles that are allowed to perform those @@ -736,35 +725,35 @@ $authen{admin_module} = ['WeBWorK::Authen::Basic_TheLastOption']; # roles are allowed to reeceive feedback emails. # %permissionLevels = ( - login => "guest", - navigation_allowed => "guest", - use_two_factor_auth => "student", - report_bugs => "ta", - submit_feedback => "student", - change_name => "student", - change_password => "student", - change_email_address => "student", - change_pg_display_settings => "student", - - proctor_quiz_login => "login_proctor", - proctor_quiz_grade => "grade_proctor", - view_proctored_tests => "student", - view_hidden_work => "ta", - - view_multiple_sets => "ta", - view_unopened_sets => "ta", - view_hidden_sets => "ta", - view_answers => "ta", - view_ip_restricted_sets => "ta", - view_leaderboard => "professor", - view_leaderboard_usernames => "professor", - - become_student => "professor", - access_instructor_tools => "ta", - score_sets => "professor", - problem_grader => "professor", - send_mail => "professor", - receive_feedback => ['ta', 'professor', 'admin'], + login => "guest", + navigation_allowed => "guest", + use_two_factor_auth => "student", + report_bugs => "ta", + submit_feedback => "student", + change_name => "student", + change_password => "student", + change_email_address => "student", + change_pg_display_settings => "student", + + proctor_quiz_login => "login_proctor", + proctor_quiz_grade => "grade_proctor", + view_proctored_tests => "student", + view_hidden_work => "ta", + + view_multiple_sets => "ta", + view_unopened_sets => "ta", + view_hidden_sets => "ta", + view_answers => "ta", + view_ip_restricted_sets => "ta", + view_leaderboard => "professor", + view_leaderboard_usernames => "professor", + + become_student => "professor", + access_instructor_tools => "ta", + score_sets => "professor", + problem_grader => "professor", + send_mail => "professor", + receive_feedback => [ 'ta', 'professor', 'admin' ], create_and_delete_problem_sets => "professor", assign_problem_sets => "professor", @@ -780,29 +769,36 @@ $authen{admin_module} = ['WeBWorK::Authen::Basic_TheLastOption']; modify_tags => "admin", edit_restricted_files => "admin", + # Permission to render problems using the WebworkWebservice. + # Users with only webservice_render_problem can render problems with a provided filename. + # Users with both permissions can also render problems with providing the problem source. + # Note the Problem Editor requires having both permissions. + webservice_render_problem => "login_proctor", + webservice_render_source => "login_proctor", + ##### Behavior of the interactive problem processor ##### - show_correct_answers_before_answer_date => "ta", - show_solutions_before_answer_date => "ta", - avoid_recording_answers => "nobody", # record the grade/status/state of everyone's entries. - # Setting this to "ta" would record grade/status/state - # for students but not TA's or professors; - # TA's and above could avoid having their answers recorded. + show_correct_answers_before_answer_date => "ta", + show_solutions_before_answer_date => "ta", + avoid_recording_answers => "nobody", # record the grade/status/state of everyone's entries. + # Setting this to "ta" would record grade/status/state + # for students but not TA's or professors; + # TA's and above could avoid having their answers recorded. # controls if old answers can be shown - can_show_old_answers => "student", - check_answers_before_open_date => "ta", - check_answers_after_open_date_with_attempts => "guest", - check_answers_after_open_date_without_attempts => "guest", - check_answers_after_due_date => "guest", - check_answers_after_answer_date => "guest", - can_check_and_submit_answers => "ta", - can_use_show_me_another_early => "ta", - create_new_set_version_when_acting_as_student => undef, - print_path_to_problem => "professor", # see "Special" PG environment variables - always_show_hint => "professor", - always_show_solution => "professor", + can_show_old_answers => "student", + check_answers_before_open_date => "ta", + check_answers_after_open_date_with_attempts => "guest", + check_answers_after_open_date_without_attempts => "guest", + check_answers_after_due_date => "guest", + check_answers_after_answer_date => "guest", + can_check_and_submit_answers => "ta", + can_use_show_me_another_early => "ta", + create_new_set_version_when_acting_as_student => undef, + print_path_to_problem => "professor", + always_show_hint => "professor", + always_show_solution => "professor", record_set_version_answers_when_acting_as_student => undef, - record_answers_when_acting_as_student => undef, + record_answers_when_acting_as_student => undef, # "record_answers_when_acting_as_student" takes precedence # over the following for professors acting as students: record_answers_before_open_date => undef, @@ -811,29 +807,29 @@ $authen{admin_module} = ['WeBWorK::Authen::Basic_TheLastOption']; record_answers_after_due_date => undef, record_answers_after_answer_date => undef, dont_log_past_answers => undef, - # controls logging of the responses to a question - # in the past answer data base - # and in the myCourse/logs/answer_log file. - # Activities of users with this permission enabled are not entered - # in these logs. This might be used when collecting student data - # to avoid contaminating the data with TA and instructor activities. - # The professor setting means that professor's answers are not logged or - # saved in the past answer database. + # controls logging of the responses to a question + # in the past answer data base + # and in the myCourse/logs/answer_log file. + # Activities of users with this permission enabled are not entered + # in these logs. This might be used when collecting student data + # to avoid contaminating the data with TA and instructor activities. + # The professor setting means that professor's answers are not logged or + # saved in the past answer database. # PG debugging - show_resource_info => "admin", - view_problem_debugging_info => "ta", - show_pg_info => "admin", - show_answer_hash_info => "admin", - show_answer_group_info => "admin", + show_resource_info => "admin", + view_problem_debugging_info => "ta", + show_pg_info => "admin", + show_answer_hash_info => "admin", + show_answer_group_info => "admin", ##### Behavior of the Hardcopy Processor ##### - download_hardcopy_multiuser => "ta", - download_hardcopy_multiset => "ta", - download_hardcopy_view_errors =>"professor", - download_hardcopy_format_pdf => "guest", - download_hardcopy_format_tex => "ta", - download_hardcopy_change_theme=> "ta", + download_hardcopy_multiuser => "ta", + download_hardcopy_multiset => "ta", + download_hardcopy_view_errors => "professor", + download_hardcopy_format_pdf => "guest", + download_hardcopy_format_tex => "ta", + download_hardcopy_change_theme => "ta", ##### Permission to edit a specific setting on the course configuration page ##### # Each permission of this type must have the form change_config_[var]. Note @@ -884,13 +880,13 @@ $fallback_password_source = ''; ################################################################################ # $sessionTimeout defines seconds of inactivity before a user's session expires. -$sessionTimeout = 60*30; +$sessionTimeout = 60 * 30; # $sessionKeyLength defines the length (in characters) of the session key $sessionKeyLength = 32; # @sessionKeyChars lists the legal session key characters -@sessionKeyChars = ('A'..'Z', 'a'..'z', '0'..'9'); +@sessionKeyChars = ('A' .. 'Z', 'a' .. 'z', '0' .. '9'); # Practice users are users who's names start with $practiceUser # (you can comment this out to remove practice user support) @@ -917,7 +913,7 @@ $gatewayGracePeriod = 120; # database which is compared to the key stored in the session cookie. The # lifetime of the cookie is determined by the $sessionTimeout setting above. -# Note that the key database method is less secure as the key must be embeded in +# Note that the key database method is less secure as the key must be embedded in # the page and added as a url parameter in order to maintain the session. These # things can be accessed by malicious javascript. The session cookies are http # only cookies which can not be accessed via javascript. @@ -1029,16 +1025,17 @@ $caliper{enabled} = 0; # in the homework sets editor. $pg{displayModes} = [ "MathJax", # render TeX math expressions on the client side using - # MathJax; we strongly recommend people install and use - # MathJax, and it is required if you want to use MathView + # MathJax; we strongly recommend people install and use + # MathJax, and it is required if you want to use MathView "images", # display math expressions as images generated by dvipng -# "plainText", # display raw TeX for math expressions + + #"plainText", # display raw TeX for math expressions ]; # List of additional display modes for the PG editor only. $pg{additionalPGEditorDisplayModes} = [ - "tex", # display tex code for a rendered problem - "PTX", # display static PreTeXt XML for a rendered problem + "tex", # display tex code for a rendered problem + "PTX", # display static PreTeXt XML for a rendered problem ]; ########################################################################################## @@ -1072,29 +1069,29 @@ $options{PGCodeMirror} = 1; ########################################################################################### # Default display mode. Should be listed above (uncomment only one). -$pg{options}{displayMode} = "MathJax"; +$pg{options}{displayMode} = "MathJax"; # The default grader to use, if a problem doesn't specify. -$pg{options}{grader} = "avg_problem_grader"; +$pg{options}{grader} = "avg_problem_grader"; # Fill in answer blanks with the student's last answer by default? -$pg{options}{showOldAnswers} = 1; +$pg{options}{showOldAnswers} = 1; # Note for the useMathQuill and useMathView options, the one that is actually used is ultimately # determined by the entryAssist PG special environment variable. Furthermore the user may disable the chosen method and # fall back to a basic html input in the user settings if the user has the change_pg_display_settings permission. # Default for showing the MathView preview system. -$pg{options}{useMathView} = 1; +$pg{options}{useMathView} = 1; # This is the operations file to use for mathview, each contains a different locale. -$pg{options}{mathViewLocale} = "mv_locale_us.js"; +$pg{options}{mathViewLocale} = "mv_locale_us.js"; # Default for showing the MathQuill preview system. -$pg{options}{useMathQuill} = 1; +$pg{options}{useMathQuill} = 1; -$pg{options}{showAnsGroupInfo} = 0; -$pg{options}{showAnsHashInfo} = 0; -$pg{options}{showPGInfo} = 0; +$pg{options}{showAnsGroupInfo} = 0; +$pg{options}{showAnsHashInfo} = 0; +$pg{options}{showPGInfo} = 0; # By default hints and solutions are ALWAYS shown for professors (and above) so that they # can check hints and solutions easily and make corrections. @@ -1106,11 +1103,11 @@ $pg{options}{showPGInfo} = 0; # Display the "Entered" column which automatically shows the evaluated student answer, e.g. 1 if student input is sin(pi/2). # If this is set to 0, e.g. to save space in the response area, the student can still see their evaluated answer by hovering # the mouse pointer over the typeset version of their answer -$pg{options}{showEvaluatedAnswers} = 1; +$pg{options}{showEvaluatedAnswers} = 1; # Catch translation warnings internally. This must be done since the translator is now run in a subprocess and do not -# propogate to the main process. So this really should never be set to 0. -$pg{options}{catchWarnings} = 1; +# propagate to the main process. So this really should never be set to 0. +$pg{options}{catchWarnings} = 1; ##### Settings for various display modes @@ -1143,47 +1140,31 @@ $pg{directories}{assetsTex} = "$pg{directories}{assets}/tex"; # (in this order) by loadMacros() when it looks for a .pl file. # $pg{directories}{macrosPath} = [ - ".", # search the problem file's directory - $courseDirs{macros}, - $pg{directories}{macros}, - "$pg{directories}{macros}/answers", - "$pg{directories}{macros}/capa", - "$pg{directories}{macros}/contexts", - "$pg{directories}{macros}/core", - "$pg{directories}{macros}/graph", - "$pg{directories}{macros}/math", - "$pg{directories}{macros}/misc", - "$pg{directories}{macros}/parsers", - "$pg{directories}{macros}/ui", - "$pg{directories}{macros}/deprecated", + ".", # search the problem file's directory + $courseDirs{macros}, + $pg{directories}{macros}, + "$pg{directories}{macros}/answers", + "$pg{directories}{macros}/contexts", + "$pg{directories}{macros}/core", + "$pg{directories}{macros}/graph", + "$pg{directories}{macros}/math", + "$pg{directories}{macros}/misc", + "$pg{directories}{macros}/parsers", + "$pg{directories}{macros}/ui", + "$pg{directories}{macros}/deprecated", ]; # Directories to search for auxiliary html files. -$pg{directories}{htmlPath} = [ - ".", - $courseDirs{html}, - $webworkDirs{htdocs}, -]; +$pg{directories}{htmlPath} = [ ".", $courseDirs{html}, $webworkDirs{htdocs}, ]; # Directories to search for image files. -$pg{directories}{imagesPath} = [ - ".", - "$courseDirs{html}/images", - "$webworkDirs{htdocs}/images", -]; +$pg{directories}{imagesPath} = [ ".", "$courseDirs{html}/images", "$webworkDirs{htdocs}/images", ]; # Contains context-sensitive pg help files. $pg{URLs}{localHelpURL} = "$pg_htdocs_url/helpFiles"; ##### "Special" PG environment variables. (Stuff that doesn't fit in anywhere else.) -# Users for whom to print the file name of the PG file being processed. -$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = [ "professor", ]; - -# File names are also printed for anyone with this permission or higher -$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL} = - $userRoles{ $permissionLevels{print_path_to_problem} }; - # whether to use javascript for rendering Live3D graphs $pg{specialPGEnvironmentVars}{use_javascript_for_live3d} = 1; @@ -1195,33 +1176,14 @@ $pg{specialPGEnvironmentVars}{latexImageSVGMethod} = "dvisvgm"; # See https://imagemagick.org/script/convert.php for a full list of options. # convert will be called as: # convert file.ext1 file.ext2 -$pg{specialPGEnvironmentVars}{latexImageConvertOptions} = {input => {density => 300}, output => {quality => 100}}; - - # set the flags immediately above in the $pg{options} section above -- not here. - -# Locations of CAPA resources. (Only necessary if you need to use converted CAPA -# problems.) -################################################################################ -# "Special" PG environment variables. (Stuff that doesn't fit in anywhere else.) -################################################################################ +$pg{specialPGEnvironmentVars}{latexImageConvertOptions} = { input => { density => 300 }, output => { quality => 100 } }; - $pg{specialPGEnvironmentVars}{CAPA_Tools} = "$courseDirs{templates}/Contrib/CAPA/macros/CAPA_Tools/", - $pg{specialPGEnvironmentVars}{CAPA_MCTools} = "$courseDirs{templates}/Contrib/CAPA/macros/CAPA_MCTools/", - $pg{specialPGEnvironmentVars}{CAPA_GraphicsDirectory} = "$courseDirs{templates}/Contrib/CAPA/CAPA_Graphics/", - $pg{specialPGEnvironmentVars}{CAPA_Graphics_URL} = "$webworkURLs{htdocs}/CAPA_Graphics/", - - push @{$pg{directories}{macrosPath}}, - "$courseDirs{templates}/Contrib/CAPA/macros/CAPA_Tools", - "$courseDirs{templates}/Contrib/CAPA/macros/CAPA_MCTools"; - - # The link Contrib in the course templates directory should point to ../webwork-open-problem-library/Contrib - # The link webwork2/htdocs/CAPA_Graphics should point to ../webwork-open-problem-library/Contrib/CAPA/macros/CAPA_graphics # Size in pixels of dynamically-generated images, i.e. graphs. -$pg{specialPGEnvironmentVars}{onTheFlyImageSize} = 400, +$pg{specialPGEnvironmentVars}{onTheFlyImageSize} = 400, -# To disable the Parser-based versions of num_cmp and fun_cmp, and use the -# original versions instead, set this value to 1. -$pg{specialPGEnvironmentVars}{useOldAnswerMacros} = 0; + # To disable the Parser-based versions of num_cmp and fun_cmp, and use the + # original versions instead, set this value to 1. + $pg{specialPGEnvironmentVars}{useOldAnswerMacros} = 0; # Determines whether or not MathObjects contexts will parse the alternative tokens # listed in the "alternatives" property (mostly for unicode alternatives for parse tokens). @@ -1231,45 +1193,15 @@ $pg{specialPGEnvironmentVars}{parseAlternatives} = 0; # (U+FF01 to U+FF5E) to their corresponding ASCII characters (U+0021 to U+007E) automatically. $pg{specialPGEnvironmentVars}{convertFullWidthCharacters} = 0; - # Strings to insert at the start and end of the body of a problem # (at beginproblem() and ENDDOCUMENT) in various modes. More display modes # can be added if different behaviours are desired (e.g., HTML_dpng, # HTML_asciimath, etc.). These parts are not used in the Library browser. -$pg{specialPGEnvironmentVars}{problemPreamble} = { TeX => '', HTML=> '' }; -$pg{specialPGEnvironmentVars}{problemPostamble} = { TeX => '', HTML=>'' }; - -# this snippet checks to see if Moodle has already called MathJax -# $pg{specialPGEnvironmentVars}{problemPreamble} = { TeX => '', HTML=> < -# if (MathJax.Hub.Startup.params.config && MathJax.Hub.config.config.length) { -# MathJax.Hub.Config({ -# config: [], -# skipStartupTypeset: false -# }); -# } -# -# END_PREAMBLE - -# -# $pg{specialPGEnvironmentVars}{problemPostamble} = { TeX => '', HTML=> <\n!; -#$pg{specialPGEnvironmentVars}{problemPostamble}{HTML}= qq!\n!; +$pg{specialPGEnvironmentVars}{problemPreamble} = { TeX => '', HTML => '' }; +$pg{specialPGEnvironmentVars}{problemPostamble} = { TeX => '', HTML => '' }; -# To have the problem body indented and boxed, uncomment: -# $pg{specialPGEnvironmentVars}{problemPreamble}{HTML} = '
-#
'; -# $pg{specialPGEnvironmentVars}{problemPostamble}{HTML} = '
-#
'; +# Note: problemPreamble and problemPostamble are depreciated, so don't use them. ##### PG modules to load @@ -1308,7 +1240,7 @@ ${pg}{modules} = [ [qw(Matrix)], [qw(Multiple)], [qw(PGrandom)], - [qw(Plots::Plot Plots::Axes Plots::Data Plots::Tikz Plots::JSXGraph Plots::GD)], + [qw(Plots::Plot Plots::Axes Plots::Data Plots::Tikz Plots::JSXGraph)], [qw(Regression)], [qw(Select)], [qw(Units)], @@ -1387,16 +1319,14 @@ $pg{ansEvalDefaults} = { numZeroLevelDefault => 1E-14, numZeroLevelTolDefault => 1E-12, useBaseTenLog => 0, - defaultDisplayMatrixStyle => "[s]", # left delimiter, middle line delimiters, right delimiter + defaultDisplayMatrixStyle => "[s]", # left delimiter, middle line delimiters, right delimiter enableReducedScoring => 0, - reducedScoringPeriod => 0, # Default length of Reduced Scoring Period in minutes - reducedScoringValue => .75, # Percent of score students receive in Reduced Scoring Period - assignOpenPriorToDue => 14400, # a number of minutes (default is 10 days) - answersOpenAfterDueDate => 2880 # number of minutes (default is 2 days) + reducedScoringPeriod => 0, # Default length of Reduced Scoring Period in minutes + reducedScoringValue => .75, # Percent of score students receive in Reduced Scoring Period + assignOpenPriorToDue => 14400, # a number of minutes (default is 10 days) + answersOpenAfterDueDate => 2880 # number of minutes (default is 2 days) }; - - ################################################################################ # Compatibility ################################################################################ @@ -1406,8 +1336,6 @@ $webworkRoot = $webworkDirs{root}; $webworkURLRoot = $webworkURLs{root}; $pgRoot = $pg{directories}{root}; - - ################################################################################ # Webservices ################################################################################ @@ -1461,4 +1389,4 @@ $pg{options}{enableProgressBar} = 1; ################################################################################ include("conf/localOverrides.conf"); -1; #final line of the file to reassure perl that it was read properly. +1; #final line of the file to reassure perl that it was read properly. diff --git a/conf/localOverrides.conf.dist b/conf/localOverrides.conf.dist index 78ea012bba..5a90bb90d3 100644 --- a/conf/localOverrides.conf.dist +++ b/conf/localOverrides.conf.dist @@ -64,7 +64,7 @@ $mail{feedbackRecipients} = [ # Should the studentID be included in the feedback email when feedbackVerbosity > 0: # The default is yes. Uncomment the line below to block it from being included. # Blocking it from being included is recommended if the studentID is "personal" -# informations whose privacy should be maintained (ex. a government issued ID number). +# information whose privacy should be maintained (ex. a government issued ID number). # The setting can also be made in the course.conf file for specific courses. #$blockStudentIDinFeedback = 1; @@ -149,7 +149,7 @@ $mail{feedbackRecipients} = [ # For configuration instructions, see: -# http://webwork.maa.org/wiki/Open_Problem_Library +# https://wiki.openwebwork.org/wiki/Open_Problem_Library # The directory containing the open problem library files. Set to "" if no problem # library is installed. # NationalProblemLibrary (NPL) has been renamed to OpenProblemLibrary (OPL) @@ -183,9 +183,8 @@ $mail{feedbackRecipients} = [ # Problem Library. #$courseFiles{problibs} = { - #Library => "OPL Directory", - #capaLibrary => "CAPA", - #Contrib => "Contrib", + #Library => "OPL Directory", + #Contrib => "Contrib", # the following are not really needed but you can # create links to your own private libraries this way. #rochesterLibrary => "Rochester", @@ -348,7 +347,7 @@ $mail{feedbackRecipients} = [ # also not present, it will just activate the "Preview My Answers" button. # A third option is "conservative". In this case, the enter key behaves like "preview" # when the "Submit" button is available and there are only finitely many -# attempts allowed. Otherise the enter key behaves like "submit". +# attempts allowed. Otherwise the enter key behaves like "submit". #$pg{options}{enterKey} = 'conservative'; ################################################################################ @@ -402,7 +401,7 @@ $mail{feedbackRecipients} = [ # Alternate locations -- this allows you to place temporary files in a location # that is not backed up and is the recommended set up for most installations. -# See http://webwork.maa.org/wiki/Store_WeBWorK%27s_temporary_files_in_a_separate_directory_or_partition +# See https://wiki.openwebwork.org/wiki/Store_WeBWorK's_temporary_files_in_a_separate_directory_or_partition # for more information. Note that the wwtmp directory (or partition) should be # created under Apache's main server document root which is usually # /var/www/html. If this is in a different location on your system, edit the @@ -428,32 +427,13 @@ $mail{feedbackRecipients} = [ # To enable Rserve (the R statistical server) in WeBWorK, uncomment the # following line. The R server needs to be installed and running in order for -# this to work. See http://webwork.maa.org/wiki/R_in_WeBWorK for more info. +# this to work. See https://wiki.openwebwork.org/wiki/R_in_WeBWorK for more info. #$pg{specialPGEnvironmentVars}{Rserve} = {host => "localhost"}; # use this setting when running Rserve in a docker container. #$pg{specialPGEnvironmentVars}{Rserve} = {host => "r"}; - -################################################################################ -# Serving Opaque client questions to moodle -################################################################################ - - -# this snippet checks to see if Moodle has already called MathJax -# $pg{specialPGEnvironmentVars}{problemPreamble} = { TeX => '', HTML=> < -# if (MathJax.Hub.Startup.params.config && MathJax.Hub.config.config.length) { -# MathJax.Hub.Config({ -# config: [], -# skipStartupTypeset: false -# }); -# } -# -# END_PREAMBLE - ################################################################################ # Authentication ################################################################################ @@ -558,7 +538,7 @@ $mail{feedbackRecipients} = [ # database which is compared to the key stored in the session cookie. The # lifetime of the cookie is determined by the $sessionTimeout setting below. -# Note that the key database method is less secure as the key must be embeded in +# Note that the key database method is less secure as the key must be embedded in # the page and added as a url parameter in order to maintain the session. These # things can be accessed by malicious javascript. The session cookies are http # only cookies which can not be accessed via javascript. diff --git a/conf/site.conf.dist b/conf/site.conf.dist index 9c6b7ddfae..e42553ddb4 100644 --- a/conf/site.conf.dist +++ b/conf/site.conf.dist @@ -178,7 +178,7 @@ if ( $database_host eq "localhost" ) { $database_dsn="DBI:$database_driver:database=$database_name;host=$database_host;port=$database_port"; } -# The default storange engine to use is set here: +# The default storage engine to use is set here: $database_storage_engine = 'myisam'; ######################### @@ -290,7 +290,7 @@ $mail{tls_allowed} = 0; # Set maxAttachmentSize to the maximum number of megabytes to allow for the size of # files attached to feedback emails. Note that this should be set to match the # limitations of the email server chosen above, and should be set to a value greater -# than zero or no attatchments will work. This is not intended to be a configuration +# than zero or no attachments will work. This is not intended to be a configuration # option to disable attachments. $mail{maxAttachmentSize} = 10; @@ -301,7 +301,7 @@ $mail{maxAttachmentSize} = 10; # This is the Minion backend that will be used by the job queue. # The corresponding perl package for this backend must be installed. -# Some availabled backends are: +# Some available backends are: # Minion::Backend::Pg (use 'Pg' below) # Minion::Backend::mysql (use 'mysql' below) # Minion::Backend::SQLite (use 'SQLite' below) @@ -322,7 +322,7 @@ $job_queue{database_dsn} = "sqlite:$webwork_dir/DATA/webwork2_job_queue.db"; # The problemLibrary configuration data should now be set in localOverrides.conf # For configuration instructions, see: -# http://webwork.maa.org/wiki/National_Problem_Library +# https://wiki.openwebwork.org/wiki/Open_Problem_Library # The directory containing the Open Problem Library files. # Set the root to "" if no problem # library is installed. Use version 2.0 for the NPL and use the version 2.5 for the OPL. diff --git a/conf/webwork2.mojolicious.dist.yml b/conf/webwork2.mojolicious.dist.yml index 637f733820..8281187895 100644 --- a/conf/webwork2.mojolicious.dist.yml +++ b/conf/webwork2.mojolicious.dist.yml @@ -15,7 +15,7 @@ pg_dir: /opt/webwork/pg # Setting MIN_HTML_ERRORS to 1 will minimize the data provided on HTML error # pages, which some security reviews request, as in particular the older output -# provided backtrace information which could help idenfify the code and version +# provided backtrace information which could help identify the code and version # of the code being used on the server. The useful information will be in the # Mojolicious webwork2.log file, with a UID displayed also in the HTML error # page to help match up records. @@ -72,6 +72,16 @@ JSON_ERROR_LOG: 0 # /pg_files: # Access-Control-Allow-Origin: '*' +# The extra_ssl_headers option is much like the extra_headers option above, +# except that these headers are only added to responses to secure SSL requests. +# The example below adds the Strict-Transport-Security header to responses to +# all SSL requests. Note that like the extra_headers option above, headers can +# be added to only specific paths as well (but only if the request is secure). + +#extra_ssl_headers: +# '.*': +# Strict-Transport-Security: 'max-age=31536000; includeSubDomains; preload' + # The user and group to run the server as. These are only used when the # webwork2 app is in production mode and run as the root user. This means that # these settings are not used when proxying via another web server like apache2 @@ -241,8 +251,21 @@ hardcopy: preserve_temp_files: 0 # Set this to 1 to allow the html2xml and render_rpc endpoints to disable -# cookies and thus skip two factor authentication. This should never be enabled -# for a typical webwork server. This should only be enabled if you want to -# allow serving content via these endpoints to links in external websites with -# usernames and passwords embedded in them such as for PreTeXt textbooks. +# cookies and thus skip two factor authentication for all courses. To disable +# cookies for a single course, set this to a hash whose keys are the course +# IDs with a value of 1. Further to only disable cookies for specific users +# in a course, set the course ID to a hash whose keys are user IDs with a +# value of 1. For example: +# allow_unsecured_rpc: +# # Disable cookies for full PreTeXt course. +# PreTeXt: 1 +# # Disable cookies for specific users in a course. +# courseID: +# user1ID: 1 +# user2ID: 1 +# +# This should never be enabled for a typical webwork server. This should only be +# enabled if you want to allow serving content via these endpoints to links in +# external websites with usernames and passwords embedded in them such as for +# PreTeXt textbooks. allow_unsecured_rpc: 0 diff --git a/courses.dist/modelCourse/course.conf b/courses.dist/modelCourse/course.conf index 54391c557f..eaf40f5ea4 100644 --- a/courses.dist/modelCourse/course.conf +++ b/courses.dist/modelCourse/course.conf @@ -2,12 +2,6 @@ # This file is used to override the global WeBWorK course environment for this course. -# Users for whom to label problems with the PG file name (global value typically "professor") -# For users in this list, PG will display the source file name when rendering a problem. -# defaults.config values: -# $pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = ['professor']; -$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = ['admin']; - # The following hashes control which users are allowed to see students from which # sections. This is typically used for large multi-section classes with many students, ta's and # professors. When set users will only be allowed to see students from the appropriate section in the following: diff --git a/courses.dist/modelCourse/html/achievements/persistance.png b/courses.dist/modelCourse/html/achievements/persistence.png similarity index 100% rename from courses.dist/modelCourse/html/achievements/persistance.png rename to courses.dist/modelCourse/html/achievements/persistence.png diff --git a/courses.dist/modelCourse/html/achievements/super_persistance.png b/courses.dist/modelCourse/html/achievements/super_persistence.png similarity index 100% rename from courses.dist/modelCourse/html/achievements/super_persistance.png rename to courses.dist/modelCourse/html/achievements/super_persistence.png diff --git a/courses.dist/modelCourse/templates/achievements/achievement_readme.txt b/courses.dist/modelCourse/templates/achievements/achievement_readme.txt index 6d9a6513dd..302168d49f 100644 --- a/courses.dist/modelCourse/templates/achievements/achievement_readme.txt +++ b/courses.dist/modelCourse/templates/achievements/achievement_readme.txt @@ -1,89 +1,112 @@ - This folder contains achievement evaluators. Their job is to test - whether or not an achievement has been earned. The code is run every time a - student submits an answer to a homework question as long as the achievement - is unearned. - - -The code should be written in perl and should return 1 if the achievement - was earned and 0 if it was not earned. - - -Any perl code in preamble.at will be run before the content of any - achievement evaluator. - - You have access to a variety of variables: - - $problem : the problem data (changes to this variable will not be saved!) - This variable contains the problem data. It is a hash pointer with the - following values (not all values shown) - - $problem->status : the score of the current problem - - $problem->problem_id : the id of the current problem - - $problem->set_id : the id of the set containing the problem - - $problem->num_correct : the number of correct attempts - - $problem->num_incorrect : the number of incorrect attempts - - $problem->max_attempts : the maximum number of allowed attempts - - - $set : the set data (changes to this variable will not be saved!) - This variable contains the set data. it is a hash pointer with the - following values. (not all values shown) - - $set->open_date : when the set was open - - $set->due_date : when the set is due - - - @setProblems : the problem data for all the problems from this set. - (changes to this variable will not be saved!) - This is an array of problem hashes. Each element of the array has the - save hash keys as the $problem variable above - - - $counter : the users counter associated to this achievement - (changes to this variable *will* be saved!) - If this achievement has a counter associated to it - (i.e. solve 20 problems) then this is where you store - the students counter for this achievement. - This variable will initally start as '' - - - $maxCounter : the goal for the $counter variable for this achievement - (changes to this variable will not be saved!) - If this achievement has a counter associated to it then this variable - contains the goal for the counter. Your achievement should return 1 - when $counter >= $maxCounter. These two variables are used to show a - progress bar for the achievement. - - - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject - DBchapter and DBsection Note: These values are not super stable and are likely to change - from problem to problem and year to year - - - $userAchievements: this hash stores all assigned achievements for - the current user. The keys are the achievement_id and the values - are 0 or 1 for if the achievement has been earned. Changes to this - variable will be accessible by achievements down the line in the - current evaluation loop, but will not be saved across evaluations. - Note: This variable is updated if an achievement is earned, - but only achievements further down the evaluation chain will - see the update. So when depending on other achievements place - make sure they are run first. - - - $localData : this is a hash which stores data for this user and - achievement (changes to this variable *will* be saved!) - This hash will persist from evaluation to evaluation. You can - store whatever you like in here and it can be accessed next time - this evaluator is run. Two things to keep in mind. First, The data - in this hash will *not* be accessible by other achievements. Second, - the first time a variable is accessed it will have the value ''. - - - $globalData : this is a hash which stores data for all achievements - (changes to this variable *will* be saved!) - This hash will persist from evaluation to evaluation and, like - $localData, you can store whatever you like in here. This data - will be accessable from *every* achievement and is unique to the - user. There are three variables stored in this hash that are - maintained by the system. - - $globalData->completeSets : This is the number of sets which - the student has earned 100% on - - $globalData->complete Problems : This is the number of problems - which the student has earned 100% on - - $globalData->prev_level_points : This is the number of points - to reach current level which is used with level progress bar. - Warning: The achievements are always evaluated in the order they - are listed the Instructors achievement editor page. To make matters - more complicated, achievements which have already been earned are - not evaluated at all. The up-shot of this is that when modifying - variables in $globalData you need to either write your code so it - doesnt matter which order the evaluators are run, or you need to - pay very close attention to which evaluators are run and when. +This folder contains achievement evaluators. Their job is to test +whether or not an achievement has been earned. The code is run every +time a student submits an answer to a homework question as long as the +achievement is assigned and unearned. Since this is run after every +submit, keep the computations simple and quick. + +The code should be written in perl and should return 1 if the achievement +was earned and 0 if it was not earned. + +Any perl code in preamble.at will be run before the content of any +achievement evaluator. + +You have access to a variety of variables: + +$problem: + The problem data (changes to this variable will not be saved). + This variable contains the problem data. It is a hash pointer + with the following values (not all values shown): + - $problem->status: The score of the current problem between 0 and 1. + - $problem->problem_id: The id of the current problem. + - $problem->set_id: The id of the set containing the problem. + - $problem->num_correct: The number of correct attempts. + - $problem->num_incorrect: The number of incorrect attempts. + - $problem->max_attempts: The maximum number of allowed attempts. + +$set: + The set data (changes to this variable will not be saved). This + variable contains the set data. It is a hash pointer with the + following values (not all values shown): + - $set->open_date: When the set was open. + - $set->due_date: When the set is due. + +@setProblems: + The problem data for all the problems from this set (changes to + this variable will not be saved). This is an array of problem + hashes. Each element of the array has the save hash keys as the + $problem variable above. + +$counter: + The users current counter associated to this achievement (changes + to this variable *will* be saved). If this achievement has a counter + associated to it (i.e. solve 20 problems) then this is where you + store the students counter for this achievement. This variable will + initially start as the empty string ''. + +$maxCounter: + The goal for the $counter variable for this achievement (changes to + this variable will not be saved). If this achievement has a counter + associated to it then this variable contains the goal for the counter. + Your achievement should return 1 when $counter >= $maxCounter. These + two variables are used to show a progress bar for the achievement, and + the $maxConunter can be configured in the achievement manager. + +$tags: + This contains the metadata for the problem stored in a hash. This + includes DBsubject, DBchapter, and DBsection. Note: These values + are not super stable and are likely to change from problem to problem + and year to year. + +$userAchievements: + This hash stores all assigned achievements for the current user. The + keys are the achievement_id and the values are 0 or 1 for if the + achievement has been earned. Changes to this variable will be accessible + by achievements down the line in the current evaluation loop, but will + not be saved across evaluations. Note: This variable is updated if an + achievement is earned, but only achievements further down the evaluation + chain will see the update. So when depending on other achievements + place make sure they are run first. + +$localData: + This is a hash which stores data for this user and achievement + (changes to this variable *will* be saved). This hash will persist + from evaluation to evaluation. You can store whatever you like in here + and it can be accessed next time this evaluator is run. Two things to + keep in mind. First, The data in this hash will *not* be accessible by + other achievements. Second, the first time a variable is accessed it + will have the value ''. + +$globalData: + This is a hash which stores data for all achievements (changes to this + variable *will* be saved). This hash will persist from evaluation to + evaluation and, like $localData, you can store whatever you like in here. + This data will be accessible from *every* achievement and is unique to + the user. There are three variables stored in this hash that are + maintained by the system and should not be modified. + - $globalData->{completeSets}: + This is the number of sets which the student has earned 100% on. + - $globalData->{completedSetIds}: + This is a hash of all set ids which the student has earned 100% on. + - $globalData->{completeProblems}: + This is the number of problems which the student has earned 100% on. + - $globalData->{prev_level_points}: + This is the number of points to reach current level which is used + with level progress bar. + + The $globalData hash also contains information about the number of + achievement items a student currently has. To award an achievement + item, increase the count of the particular item in the $globalData hash. + + Warning!! The achievements are always evaluated in the order they are + listed in the Instructors achievement editor page. To make matters + more complicated, achievements which have already been earned are not + evaluated at all. The up-shot of this is that when modifying variables + in $globalData you need to either write your code so it doesn't matter + which order the evaluators are run, or you need to pay very close + attention to which evaluators are run and when. + +@courseDateTime: + An array of time information in the course timezone. The array lists + the current time as (sec, min, hour, day, month, year, day_of_week) + as produced by https://metacpan.org/pod/DateTime + diff --git a/courses.dist/modelCourse/templates/achievements/add_anything.at b/courses.dist/modelCourse/templates/achievements/add_anything.at deleted file mode 100644 index f67a5042f2..0000000000 --- a/courses.dist/modelCourse/templates/achievements/add_anything.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/back_for_more.at b/courses.dist/modelCourse/templates/achievements/back_for_more.at index 9029d5c866..0b4f247007 100644 --- a/courses.dist/modelCourse/templates/achievements/back_for_more.at +++ b/courses.dist/modelCourse/templates/achievements/back_for_more.at @@ -1,88 +1,26 @@ -#This checks to see if the student has worked on one problem after -# an eight hour break - -# initialize the time thing +# This achievement is awarded if a student has worked on one problem after +# an eight hour break. Uses $localData to save last attempt time. +# +# See [templates]/achievements/achievement_readme.txt for details. -$localData->{lastattempttime} = time() unless $localData->{lastattempttime}; +# Initialize saved $localData for this achievement. +$localData->{lastattempttime} //= time; +$localData->{lastset} //= ''; +$localData->{lastproblem} //= ''; -# check to see if problem was already previously finished, or if they started -# a different problem -# or if the time interval isn't long enough. -if ($problem->num_correct > 1 || - $problem->set_id ne $localData->{lastset} || - $problem->problem_id ne $localData->{lastproblem} || - abs($localData->{lastattempttime} - time()) < 28800 ){ - $localData->{lastattempttime} = time(); - $localData->{lastset} = $problem->set_id; - $localData->{lastproblem} = $problem->problem_id; +# Checks to see if problem was already previously finished, if they started +# a different problem, or if the time interval isn't long enough. +# Eight hours = 8 * 60 * 60 = 28800 seconds. +if ($problem->num_correct > 1 + || $problem->set_id ne $localData->{lastset} + || $problem->problem_id ne $localData->{lastproblem} + || abs($localData->{lastattempttime} - time) < 28800) +{ + $localData->{lastattempttime} = time; + $localData->{lastset} = $problem->set_id; + $localData->{lastproblem} = $problem->problem_id; return 0; -} else { - return 1; } -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +# Check failed so they are back after eight hours, award achievement. +return 1; diff --git a/courses.dist/modelCourse/templates/achievements/blankachievement.at b/courses.dist/modelCourse/templates/achievements/blankachievement.at deleted file mode 100644 index 6a75408bf6..0000000000 --- a/courses.dist/modelCourse/templates/achievements/blankachievement.at +++ /dev/null @@ -1,78 +0,0 @@ -# This is an "Achievement Evaluator". Its basic job is to test, or evaluate, -# whether or not an achievement has been earned. The code is run every time a -# student submits an answer to a homework question as long as the achievement -# is unearned. -# -# -The code should be written in perl and should return 1 if the achievement -# was earned and 0 if it was not earned. -# -# You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it -# (i.e. solve 20 problems) then this is where you store -# the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and -# achievement (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can -# store whatever you like in here and it can be accessed next time -# this evaluator is run. Two things to keep in mind. First, The data -# in this hash will *not* be accessible by other achievements. Second, -# the first time a variable is accessed it will have the value ''. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like -# $localData, you can store whatever you like in here. This data -# will be accessable from *every* achievement and is unique to the -# user. There are two variables stored in this hash that are -# maintained by the system. -# - $globalData->completeSets : This is the number of sets which -# the student has earned 100% on -# - $globalData->complete Problems : This is the number of problems -# which the student has earned 100% on -# Warning: The achievements are always evaluated in the order they -# are listed the Instructors achievement editor page. To make matters -# more complicated, achievements which have already been earned are -# not evaluated at all. The up-shot of this is that when modifying -# variables in $globalData you need to either write your code so it -# doesnt matter which order the evaluators are run, or you need to -# pay very close attention to which evaluators are run and when. - - -#the blank achievement can never be earned -return 0; diff --git a/courses.dist/modelCourse/templates/achievements/by_definition.at b/courses.dist/modelCourse/templates/achievements/by_definition.at deleted file mode 100644 index f67a5042f2..0000000000 --- a/courses.dist/modelCourse/templates/achievements/by_definition.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/challenge_eight.at b/courses.dist/modelCourse/templates/achievements/challenge_eight.at index e7219912f6..9cd92ee6c0 100644 --- a/courses.dist/modelCourse/templates/achievements/challenge_eight.at +++ b/courses.dist/modelCourse/templates/achievements/challenge_eight.at @@ -1,88 +1,23 @@ -#This evaluator checks to see if a particular problem of a particular set has -# been solved - -#constants -my %validproblems = ( - 'Challenge' => { - '8' => 1, } - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update challenger counter - $globalData->{challengerCounter}++; - return 1; - } +# This achievement checks to see if a particular challenge problem of a +# particular set has been solved. It updates $globalData->{challengerCounter} +# to be used with the challenger.at achievement. +# +# See [templates]/achievements/achievement_readme.txt for details. - return 0; +# Create a hash of all valid set id and problem numbers. +# Set names (ids) are keys, and each is a hash of valid +# problem numbers. Use "_" for spaces in set ids. +my %validproblems = ('Challenge' => { '8' => 1 }); +# Checks to see if a valid problem was solved. +if ($validproblems{ $problem->set_id } + && $validproblems{ $problem->set_id }{ $problem->problem_id } + && $problem->status == 1 + && $problem->num_correct == 1) +{ + # Update challenger counter. + ++$globalData->{challengerCounter}; + return 1; +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/challenge_five.at b/courses.dist/modelCourse/templates/achievements/challenge_five.at index 146e91dbc7..c851aa0557 100644 --- a/courses.dist/modelCourse/templates/achievements/challenge_five.at +++ b/courses.dist/modelCourse/templates/achievements/challenge_five.at @@ -1,88 +1,23 @@ -#This evaluator checks to see if a particular problem of a particular set has -# been solved - -#constants -my %validproblems = ( - 'Challenge' => { - '5' => 1, } - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update challenger counter - $globalData->{challengerCounter}++; - return 1; - } +# This achievement checks to see if a particular challenge problem of a +# particular set has been solved. It updates $globalData->{challengerCounter} +# to be used with the challenger.at achievement. +# +# See [templates]/achievements/achievement_readme.txt for details. - return 0; +# Create a hash of all valid set id and problem numbers. +# Set names (ids) are keys, and each is a hash of valid +# problem numbers. Use "_" for spaces in set ids. +my %validproblems = ('Challenge' => { '5' => 1 }); +# Checks to see if a valid problem was solved. +if ($validproblems{ $problem->set_id } + && $validproblems{ $problem->set_id }{ $problem->problem_id } + && $problem->status == 1 + && $problem->num_correct == 1) +{ + # Update challenger counter. + ++$globalData->{challengerCounter}; + return 1; +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/challenge_four.at b/courses.dist/modelCourse/templates/achievements/challenge_four.at index ccc1156652..1aec62f824 100644 --- a/courses.dist/modelCourse/templates/achievements/challenge_four.at +++ b/courses.dist/modelCourse/templates/achievements/challenge_four.at @@ -1,88 +1,23 @@ -#This evaluator checks to see if a particular problem of a particular set has -# been solved - -#constants -my %validproblems = ( - 'Challenge' => { - '4' => 1, } - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update challenger counter - $globalData->{challengerCounter}++; - return 1; - } +# This achievement checks to see if a particular challenge problem of a +# particular set has been solved. It updates $globalData->{challengerCounter} +# to be used with the challenger.at achievement. +# +# See [templates]/achievements/achievement_readme.txt for details. - return 0; +# Create a hash of all valid set id and problem numbers. +# Set names (ids) are keys, and each is a hash of valid +# problem numbers. Use "_" for spaces in set ids. +my %validproblems = ('Challenge' => { '4' => 1 }); +# Checks to see if a valid problem was solved. +if ($validproblems{ $problem->set_id } + && $validproblems{ $problem->set_id }{ $problem->problem_id } + && $problem->status == 1 + && $problem->num_correct == 1) +{ + # Update challenger counter. + ++$globalData->{challengerCounter}; + return 1; +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/challenge_nine.at b/courses.dist/modelCourse/templates/achievements/challenge_nine.at index 83cb7a84ae..9373d0f911 100644 --- a/courses.dist/modelCourse/templates/achievements/challenge_nine.at +++ b/courses.dist/modelCourse/templates/achievements/challenge_nine.at @@ -1,88 +1,23 @@ -#This evaluator checks to see if a particular problem of a particular set has -# been solved - -#constants -my %validproblems = ( - 'Challenge' => { - '9' => 1, } - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update challenger counter - $globalData->{challengerCounter}++; - return 1; - } +# This achievement checks to see if a particular challenge problem of a +# particular set has been solved. It updates $globalData->{challengerCounter} +# to be used with the challenger.at achievement. +# +# See [templates]/achievements/achievement_readme.txt for details. - return 0; +# Create a hash of all valid set id and problem numbers. +# Set names (ids) are keys, and each is a hash of valid +# problem numbers. Use "_" for spaces in set ids. +my %validproblems = ('Challenge' => { '9' => 1 }); +# Checks to see if a valid problem was solved. +if ($validproblems{ $problem->set_id } + && $validproblems{ $problem->set_id }{ $problem->problem_id } + && $problem->status == 1 + && $problem->num_correct == 1) +{ + # Update challenger counter. + ++$globalData->{challengerCounter}; + return 1; +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/challenge_one.at b/courses.dist/modelCourse/templates/achievements/challenge_one.at index 321e231fb2..71985b4144 100644 --- a/courses.dist/modelCourse/templates/achievements/challenge_one.at +++ b/courses.dist/modelCourse/templates/achievements/challenge_one.at @@ -1,88 +1,23 @@ -#This problem checks to see if a particular problem of a particular set has -# been solved - -#constants -my %validproblems = ( - 'Challenge' => { - '1' => 1, } - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update challenger counter - $globalData->{challengerCounter}++; - return 1; - } +# This achievement checks to see if a particular challenge problem of a +# particular set has been solved. It updates $globalData->{challengerCounter} +# to be used with the challenger.at achievement. +# +# See [templates]/achievements/achievement_readme.txt for details. - return 0; +# Create a hash of all valid set id and problem numbers. +# Set names (ids) are keys, and each is a hash of valid +# problem numbers. Use "_" for spaces in set ids. +my %validproblems = ('Challenge' => { '1' => 1 }); +# Checks to see if a valid problem was solved. +if ($validproblems{ $problem->set_id } + && $validproblems{ $problem->set_id }{ $problem->problem_id } + && $problem->status == 1 + && $problem->num_correct == 1) +{ + # Update challenger counter. + ++$globalData->{challengerCounter}; + return 1; +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/challenge_seven.at b/courses.dist/modelCourse/templates/achievements/challenge_seven.at index edf923ec6d..b40ebac567 100644 --- a/courses.dist/modelCourse/templates/achievements/challenge_seven.at +++ b/courses.dist/modelCourse/templates/achievements/challenge_seven.at @@ -1,88 +1,23 @@ -#This evaluator checks to see if a particular problem of a particular set has -# been solved - -#constants -my %validproblems = ( - 'Challenge' => { - '7' => 1, } - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update challenger counter - $globalData->{challengerCounter}++; - return 1; - } +# This achievement checks to see if a particular challenge problem of a +# particular set has been solved. It updates $globalData->{challengerCounter} +# to be used with the challenger.at achievement. +# +# See [templates]/achievements/achievement_readme.txt for details. - return 0; +# Create a hash of all valid set id and problem numbers. +# Set names (ids) are keys, and each is a hash of valid +# problem numbers. Use "_" for spaces in set ids. +my %validproblems = ('Challenge' => { '7' => 1 }); +# Checks to see if a valid problem was solved. +if ($validproblems{ $problem->set_id } + && $validproblems{ $problem->set_id }{ $problem->problem_id } + && $problem->status == 1 + && $problem->num_correct == 1) +{ + # Update challenger counter. + ++$globalData->{challengerCounter}; + return 1; +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/challenge_six.at b/courses.dist/modelCourse/templates/achievements/challenge_six.at index de50931fcc..de6984c2ac 100644 --- a/courses.dist/modelCourse/templates/achievements/challenge_six.at +++ b/courses.dist/modelCourse/templates/achievements/challenge_six.at @@ -1,88 +1,23 @@ -#This evaluator checks to see if a particular problem of a particular set has -# been solved - -#constants -my %validproblems = ( - 'Challenge' => { - '6' => 1, } - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update challenger counter - $globalData->{challengerCounter}++; - return 1; - } +# This achievement checks to see if a particular challenge problem of a +# particular set has been solved. It updates $globalData->{challengerCounter} +# to be used with the challenger.at achievement. +# +# See [templates]/achievements/achievement_readme.txt for details. - return 0; +# Create a hash of all valid set id and problem numbers. +# Set names (ids) are keys, and each is a hash of valid +# problem numbers. Use "_" for spaces in set ids. +my %validproblems = ('Challenge' => { '6' => 1 }); +# Checks to see if a valid problem was solved. +if ($validproblems{ $problem->set_id } + && $validproblems{ $problem->set_id }{ $problem->problem_id } + && $problem->status == 1 + && $problem->num_correct == 1) +{ + # Update challenger counter. + ++$globalData->{challengerCounter}; + return 1; +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/challenge_ten.at b/courses.dist/modelCourse/templates/achievements/challenge_ten.at index 7f023fd35d..c0dea6aab2 100644 --- a/courses.dist/modelCourse/templates/achievements/challenge_ten.at +++ b/courses.dist/modelCourse/templates/achievements/challenge_ten.at @@ -1,88 +1,23 @@ -#This evaluator checks to see if a particular problem of a particular set has -# been solved - -#constants -my %validproblems = ( - 'Challenge' => { - '10' => 1, } - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update challenger counter - $globalData->{challengerCounter}++; - return 1; - } +# This achievement checks to see if a particular challenge problem of a +# particular set has been solved. It updates $globalData->{challengerCounter} +# to be used with the challenger.at achievement. +# +# See [templates]/achievements/achievement_readme.txt for details. - return 0; +# Create a hash of all valid set id and problem numbers. +# Set names (ids) are keys, and each is a hash of valid +# problem numbers. Use "_" for spaces in set ids. +my %validproblems = ('Challenge' => { '10' => 1 }); +# Checks to see if a valid problem was solved. +if ($validproblems{ $problem->set_id } + && $validproblems{ $problem->set_id }{ $problem->problem_id } + && $problem->status == 1 + && $problem->num_correct == 1) +{ + # Update challenger counter. + ++$globalData->{challengerCounter}; + return 1; +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/challenge_three.at b/courses.dist/modelCourse/templates/achievements/challenge_three.at index ce01758b98..5d8e711025 100644 --- a/courses.dist/modelCourse/templates/achievements/challenge_three.at +++ b/courses.dist/modelCourse/templates/achievements/challenge_three.at @@ -1,88 +1,23 @@ -#This evaluator checks to see if a particular problem of a particular set has -# been solved - -#constants -my %validproblems = ( - 'Challenge' => { - '3' => 1, } - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update challenger counter - $globalData->{challengerCounter}++; - return 1; - } +# This achievement checks to see if a particular challenge problem of a +# particular set has been solved. It updates $globalData->{challengerCounter} +# to be used with the challenger.at achievement. +# +# See [templates]/achievements/achievement_readme.txt for details. - return 0; +# Create a hash of all valid set id and problem numbers. +# Set names (ids) are keys, and each is a hash of valid +# problem numbers. Use "_" for spaces in set ids. +my %validproblems = ('Challenge' => { '3' => 1 }); +# Checks to see if a valid problem was solved. +if ($validproblems{ $problem->set_id } + && $validproblems{ $problem->set_id }{ $problem->problem_id } + && $problem->status == 1 + && $problem->num_correct == 1) +{ + # Update challenger counter. + ++$globalData->{challengerCounter}; + return 1; +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/challenge_two.at b/courses.dist/modelCourse/templates/achievements/challenge_two.at index ae5fb71028..3214a2e7d8 100644 --- a/courses.dist/modelCourse/templates/achievements/challenge_two.at +++ b/courses.dist/modelCourse/templates/achievements/challenge_two.at @@ -1,88 +1,23 @@ -#This evaluator checks to see if a particular problem of a particular set has -# been solved - -#constants -my %validproblems = ( - 'Challenge' => { - '2' => 1, } - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update challenger counter - $globalData->{challengerCounter}++; - return 1; - } +# This achievement checks to see if a particular challenge problem of a +# particular set has been solved. It updates $globalData->{challengerCounter} +# to be used with the challenger.at achievement. +# +# See [templates]/achievements/achievement_readme.txt for details. - return 0; +# Create a hash of all valid set id and problem numbers. +# Set names (ids) are keys, and each is a hash of valid +# problem numbers. Use "_" for spaces in set ids. +my %validproblems = ('Challenge' => { '2' => 1 }); +# Checks to see if a valid problem was solved. +if ($validproblems{ $problem->set_id } + && $validproblems{ $problem->set_id }{ $problem->problem_id } + && $problem->status == 1 + && $problem->num_correct == 1) +{ + # Update challenger counter. + ++$globalData->{challengerCounter}; + return 1; +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/challenger.at b/courses.dist/modelCourse/templates/achievements/challenger.at index 8e7d761136..4417afbe1a 100644 --- a/courses.dist/modelCourse/templates/achievements/challenger.at +++ b/courses.dist/modelCourse/templates/achievements/challenger.at @@ -1,78 +1,9 @@ -# This is a "solved n problems achievement. Notice how we update $counter -# (even though the appropriate variable is already given to use in -# ($globalData) so that the achievement progress bar works correctly. - -# Update counter from globalData -$counter = $globalData->{'challengerCounter'}; - -if ($counter >= $maxCounter) { - return 1 -} else { - return 0; -} - -# Variable Descriptions: -# - $problem : the problem data (changes tao this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' +# This is a "solved n challenge problems" achievement. Notice how we update +# $counter (even though the appropriate variable is already given to use in +# $globalData) so that the achievement progress bar works correctly. # -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +# See [templates]/achievements/achievement_readme.txt for details. + +# Update counter from $globalData. +$counter = $globalData->{challengerCounter}; +return $counter >= $maxCounter ? 1 : 0; diff --git a/courses.dist/modelCourse/templates/achievements/change_of_variables.at b/courses.dist/modelCourse/templates/achievements/change_of_variables.at deleted file mode 100644 index f67a5042f2..0000000000 --- a/courses.dist/modelCourse/templates/achievements/change_of_variables.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/chipping_away.at b/courses.dist/modelCourse/templates/achievements/chipping_away.at index be2563cbb0..ecaf769f92 100644 --- a/courses.dist/modelCourse/templates/achievements/chipping_away.at +++ b/courses.dist/modelCourse/templates/achievements/chipping_away.at @@ -1,84 +1,16 @@ -#This checks to see if the student has worked on the set in -# greater than 48 hours from time to first input to time to last answer. +# This achievement is awarded if a student has worked on the set in +# greater than 48 hours without working on a different set. +# +# See [templates]/achievements/achievement_readme.txt for details. # If the set id doest equal the id of the last set then set -# *this* set as the last set, and set the start time - +# *this* set as the last set, and set the start time. if ($problem->set_id ne $localData->{last_set}) { - $localData->{last_set} = $problem->set_id; - $localData->{start_time} = time(); - return 0; + $localData->{last_set} = $problem->set_id; + $localData->{start_time} = time; + return 0; } -# of we spent more than 48 hours then done! -if ((time() - $localData->{start_time}) > 172800) { - return 1; -} else { - return 0; -} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +# Check if more than 48 hours = 2 * 24 * 60 * 60 = 172800 seconds +# has elapsed since they "started" the set. +return time - $localData->{start_time} > 172800 ? 1 : 0; diff --git a/courses.dist/modelCourse/templates/achievements/complete_100_problems.at b/courses.dist/modelCourse/templates/achievements/complete_100_problems.at deleted file mode 100644 index f82c29a658..0000000000 --- a/courses.dist/modelCourse/templates/achievements/complete_100_problems.at +++ /dev/null @@ -1,78 +0,0 @@ -# This is a "solved n problems achievement. Notice how we update $counter -# (even though the appropriate variable is already given to use in -# ($globalData) so that the achievement progress bar works correctly. - -# Update counter from globalData -$counter = $globalData->{'completeProblems'}; - -if ($counter >= $maxCounter) { - return 1 -} else { - return 0; -} - -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/complete_10_problems.at b/courses.dist/modelCourse/templates/achievements/complete_10_problems.at deleted file mode 100644 index f82c29a658..0000000000 --- a/courses.dist/modelCourse/templates/achievements/complete_10_problems.at +++ /dev/null @@ -1,78 +0,0 @@ -# This is a "solved n problems achievement. Notice how we update $counter -# (even though the appropriate variable is already given to use in -# ($globalData) so that the achievement progress bar works correctly. - -# Update counter from globalData -$counter = $globalData->{'completeProblems'}; - -if ($counter >= $maxCounter) { - return 1 -} else { - return 0; -} - -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/complete_150_problems.at b/courses.dist/modelCourse/templates/achievements/complete_150_problems.at deleted file mode 100644 index f82c29a658..0000000000 --- a/courses.dist/modelCourse/templates/achievements/complete_150_problems.at +++ /dev/null @@ -1,78 +0,0 @@ -# This is a "solved n problems achievement. Notice how we update $counter -# (even though the appropriate variable is already given to use in -# ($globalData) so that the achievement progress bar works correctly. - -# Update counter from globalData -$counter = $globalData->{'completeProblems'}; - -if ($counter >= $maxCounter) { - return 1 -} else { - return 0; -} - -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/complete_25_problems.at b/courses.dist/modelCourse/templates/achievements/complete_25_problems.at deleted file mode 100644 index f82c29a658..0000000000 --- a/courses.dist/modelCourse/templates/achievements/complete_25_problems.at +++ /dev/null @@ -1,78 +0,0 @@ -# This is a "solved n problems achievement. Notice how we update $counter -# (even though the appropriate variable is already given to use in -# ($globalData) so that the achievement progress bar works correctly. - -# Update counter from globalData -$counter = $globalData->{'completeProblems'}; - -if ($counter >= $maxCounter) { - return 1 -} else { - return 0; -} - -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/complete_50_problems.at b/courses.dist/modelCourse/templates/achievements/complete_50_problems.at deleted file mode 100644 index 47eb5ee13b..0000000000 --- a/courses.dist/modelCourse/templates/achievements/complete_50_problems.at +++ /dev/null @@ -1,78 +0,0 @@ -# This is a "solved n problems achievement. Notice how we update $counter -# (even though the appropriate variable is already given to use in -# ($globalData) so that the achievement progress bar works correctly. - -# Update counter from globalData -$counter = $globalData->{'completeProblems'}; - -if ($counter >= $maxCounter) { - return 1 -} else { - return 0; -} - -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/complete_all_sets.at b/courses.dist/modelCourse/templates/achievements/complete_all_sets.at deleted file mode 100644 index b54b1b308a..0000000000 --- a/courses.dist/modelCourse/templates/achievements/complete_all_sets.at +++ /dev/null @@ -1,78 +0,0 @@ -# This is a "solved n problems achievement. Notice how we update $counter -# (even though the appropriate variable is already given to use in -# ($globalData) so that the achievement progress bar works correctly. - -# Update counter from globalData -$counter = $globalData->{'completeSets'}; - -if ($counter >= $maxCounter) { - return 1 -} else { - return 0; -} - -# Variable Descriptions: -# - $problem : the problem data (changes tao this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/complete_five_sets.at b/courses.dist/modelCourse/templates/achievements/complete_five_sets.at deleted file mode 100644 index 9ab10dd0a3..0000000000 --- a/courses.dist/modelCourse/templates/achievements/complete_five_sets.at +++ /dev/null @@ -1,78 +0,0 @@ -# This is a "solved n sets" achievement. Notice how we update $counter -# (even though the appropriate variable is already given to use in -# ($globalData) so that the achievement progress bar works correctly. - -# Update counter from globalData -$counter = $globalData->{'completeSets'}; - -if ($counter >= $maxCounter) { - return 1 -} else { - return 0; -} - -# Variable Descriptions: -# - $problem : the problem data (changes tao this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/complete_n_problems.at b/courses.dist/modelCourse/templates/achievements/complete_n_problems.at new file mode 100644 index 0000000000..81e5b7e1eb --- /dev/null +++ b/courses.dist/modelCourse/templates/achievements/complete_n_problems.at @@ -0,0 +1,11 @@ +# This is a "solved n problems" achievement. This evaluator can be assigned +# to multiple different achievements since it uses $maxCounter to determine +# if the desired number of problems to be completed. Notice how we update +# $counter (even though the appropriate variable is already given to use in +# $globalData) so that the achievement progress bar works correctly. +# +# See [templates]/achievements/achievement_readme.txt for details. + +# Update counter from $globalData. +$counter = $globalData->{completeProblems}; +return $counter >= $maxCounter ? 1 : 0; diff --git a/courses.dist/modelCourse/templates/achievements/complete_n_sets.at b/courses.dist/modelCourse/templates/achievements/complete_n_sets.at new file mode 100644 index 0000000000..8d4e83bc3d --- /dev/null +++ b/courses.dist/modelCourse/templates/achievements/complete_n_sets.at @@ -0,0 +1,11 @@ +# This is a "complete n sets" achievement. This evaluator can be assigned +# to multiple different achievements since it uses $maxCounter to determine +# if the desired number of problems to be completed. Notice how we update +# $counter (even though the appropriate variable is already given to use in +# $globalData) so that the achievement progress bar works correctly. +# +# See [templates]/achievements/achievement_readme.txt for details. + +# Update counter from $globalData. +$counter = $globalData->{completeSets}; +return $counter >= $maxCounter ? 1 : 0; diff --git a/courses.dist/modelCourse/templates/achievements/complete_one_problem.at b/courses.dist/modelCourse/templates/achievements/complete_one_problem.at deleted file mode 100644 index c2d2bdcace..0000000000 --- a/courses.dist/modelCourse/templates/achievements/complete_one_problem.at +++ /dev/null @@ -1,76 +0,0 @@ -# This is a "solved n problems achievement. Normally we would have to deal -# with the counter variable, but since n = 1 we dont have to - -# Achievement earned if they did the problem correctly -if ($problem->status == 1) { - return 1 -} else { - return 0; -} - -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->completeSets : This is the number of sets which the student -# has earned 100% on -# - $globalData->complete Problems : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/complete_one_set.at b/courses.dist/modelCourse/templates/achievements/complete_one_set.at deleted file mode 100644 index 2d73f85ba9..0000000000 --- a/courses.dist/modelCourse/templates/achievements/complete_one_set.at +++ /dev/null @@ -1,74 +0,0 @@ -# This is a "solved n sets" achievement. However, since n=1 we just check to -# see if the student has solved a set - -if ($globalData->{'completeSets'} >= 1) { - return 1 -} else { - return 0; -} - -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/complete_ten_sets.at b/courses.dist/modelCourse/templates/achievements/complete_ten_sets.at deleted file mode 100644 index b54b1b308a..0000000000 --- a/courses.dist/modelCourse/templates/achievements/complete_ten_sets.at +++ /dev/null @@ -1,78 +0,0 @@ -# This is a "solved n problems achievement. Notice how we update $counter -# (even though the appropriate variable is already given to use in -# ($globalData) so that the achievement progress bar works correctly. - -# Update counter from globalData -$counter = $globalData->{'completeSets'}; - -if ($counter >= $maxCounter) { - return 1 -} else { - return 0; -} - -# Variable Descriptions: -# - $problem : the problem data (changes tao this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/complete_thirty_sets.at b/courses.dist/modelCourse/templates/achievements/complete_thirty_sets.at deleted file mode 100644 index b54b1b308a..0000000000 --- a/courses.dist/modelCourse/templates/achievements/complete_thirty_sets.at +++ /dev/null @@ -1,78 +0,0 @@ -# This is a "solved n problems achievement. Notice how we update $counter -# (even though the appropriate variable is already given to use in -# ($globalData) so that the achievement progress bar works correctly. - -# Update counter from globalData -$counter = $globalData->{'completeSets'}; - -if ($counter >= $maxCounter) { - return 1 -} else { - return 0; -} - -# Variable Descriptions: -# - $problem : the problem data (changes tao this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/complete_twenty_sets.at b/courses.dist/modelCourse/templates/achievements/complete_twenty_sets.at deleted file mode 100644 index b54b1b308a..0000000000 --- a/courses.dist/modelCourse/templates/achievements/complete_twenty_sets.at +++ /dev/null @@ -1,78 +0,0 @@ -# This is a "solved n problems achievement. Notice how we update $counter -# (even though the appropriate variable is already given to use in -# ($globalData) so that the achievement progress bar works correctly. - -# Update counter from globalData -$counter = $globalData->{'completeSets'}; - -if ($counter >= $maxCounter) { - return 1 -} else { - return 0; -} - -# Variable Descriptions: -# - $problem : the problem data (changes tao this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/crack_o_dawn.at b/courses.dist/modelCourse/templates/achievements/crack_o_dawn.at index 47759496af..29f5970aeb 100644 --- a/courses.dist/modelCourse/templates/achievements/crack_o_dawn.at +++ b/courses.dist/modelCourse/templates/achievements/crack_o_dawn.at @@ -1,95 +1,14 @@ -# checks to see if a student finished a set between 5AM and 7AM +# This achievement is awarded for completing a set between 5AM and 7AM. +# +# See [templates]/achievements/achievement_readme.txt for details. -# Check that this is not a repeated submission of problem which has -# been solved before. # Do not consider this achievement if this is a repeated submission # of previously solved problem. +return 0 unless $problem->status == 1 && $problem->num_correct == 1; -return 0 unless ($problem->status == 1 && $problem->num_correct == 1); - -# now check the time - - if ($courseDateTime[2] < 5 || $courseDateTime[2] > 6) { - return 0; - } +# Now check if this set has been completed. +return 0 unless $globalData->{completedSetIds}{ $set->set_id }; - #if it is check to see if we have finished the set - - foreach my $problemRecord (@setProblems) { - if ($problemRecord->status != 1) { - return 0; - } - } - - return 1; - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. -# -# - @courseDateTime - array of time information in course timezone -# (sec,min,hour,day,month,year,day_of_week) as produced by -# https://metacpan.org/pod/DateTime +# Finally check the time. $courseDateTime[2] is the hour in the +# course's timezone. +return $courseDateTime[2] < 5 || $courseDateTime[2] > 6 ? 0 : 1; diff --git a/courses.dist/modelCourse/templates/achievements/curvature.at b/courses.dist/modelCourse/templates/achievements/curvature.at deleted file mode 100644 index c3ef573b7e..0000000000 --- a/courses.dist/modelCourse/templates/achievements/curvature.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '3' => 1, }, #now add more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/curvy_geometry.at b/courses.dist/modelCourse/templates/achievements/curvy_geometry.at deleted file mode 100644 index 63e3b1078e..0000000000 --- a/courses.dist/modelCourse/templates/achievements/curvy_geometry.at +++ /dev/null @@ -1,89 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/default_achievements.axp b/courses.dist/modelCourse/templates/achievements/default_achievements.axp index 08ac002f62..a7481149a4 100644 --- a/courses.dist/modelCourse/templates/achievements/default_achievements.axp +++ b/courses.dist/modelCourse/templates/achievements/default_achievements.axp @@ -6,7 +6,7 @@ still_not_right,"It's Still Not Right",105,secret,"default,jitar","Input the exa persistence,"Persistence is not Futile",106,secret,"default,jitar","Solve a problem after 20 incorrect submissions.",10,,persistence.at,persistence.png super_persistence,"Green Never Looked So Good",107,secret,"default,jitar","Solve a problem after 100 incorrect submissions.",10,,super_persistence.at,super_persistence.png super_speed_math,"Careful Planning and Quick Fingers",108,secret,default,"Spend less than 10 minutes entering answers to a homework set.",20,,super_speed_math.at,super_speed_math.png -hows_your_finger,"Hows Your Finger?",109,secret,"default,jitar","Have more than 250 submissions on a homework problem. ",10,,hows_your_finger.at,hows_your_finger.png +hows_your_finger,"Hows Your Finger?",109,secret,"default,jitar","Have more than 250 submissions on a homework problem.",10,,hows_your_finger.at,hows_your_finger.png third_time,"Third Times the Charm",110,secret,"default,jitar","Solve a problem on the third submission",10,,third_time.at,third_time.png one_click,"One Click Is All I Need",201,one_timer,"default,jitar","Earn 100% on a problem in one attempt.",10,,one_click.at,one_click.png on_one_hand,"On One Hand",202,one_timer,default,"Finish a homework set with less than 5 incorrect submissions.",10,,on_one_hand.at,on_one_hand.png @@ -16,20 +16,20 @@ really_early_bird,"The Really Early Bird",205,one_timer,default,"Finish a homewo back_for_more,"Back For More",206,one_timer,"default,jitar","Retry a problem after a 8 hour break.",10,,back_for_more.at,back_for_more.png chipping_away,"Just Keep Chipping Away",207,one_timer,"default,jitar","Work on a single homework set over the course of 48 hours.",10,,chipping_away.at,chipping_away.png speed_mather,"Go Speed Math-er",208,one_timer,default,"Spend less than 1 hour working on a homework set.",10,,speed_mather.at,speed_mather.png -three_in_a_row,"Three in a Row",209,one_timer,"default,jitar","Complete 3 problems in a row with no incorrect answers.",10,3,three_in_a_row.at,three_in_a_row.png -on_fire,"You're on Fire!",210,one_timer,"default,jitar","Complete 10 problems in a row with no incorrect answers.",20,10,on_fire.at,on_fire.png -complete_one_set,"One Set Wonder",401,complete_sets,default,"Get 100% on one homework set.",10,,complete_one_set.at,complete_one_set.png -complete_five_sets,"High Five",402,complete_sets,default,"Get 100% on five homework sets.",10,5,complete_five_sets.at,complete_five_sets.png -complete_ten_sets,"One For Each Finger",403,complete_sets,default,"Get 100% on ten homework sets.",10,10,complete_ten_sets.at,complete_ten_sets.png -complete_twenty_sets,"Mathbox Twenty",404,complete_sets,default,"Get 100% on twenty homework sets.",20,20,complete_twenty_sets.at,complete_twenty_sets.png -complete_thirty_sets,"The Long Road",405,complete_sets,default,"Get 100% on thirty homework sets.",20,30,complete_thirty_sets.at,complete_thirty_sets.png -complete_all_sets,Perfection,406,complete_sets,default,"Get 100% on all homework sets.",30,35,complete_all_sets.at,complete_all_sets.png -complete_one_problem,"The First Step",501,complete_problems,"default,jitar","Earn 100% on a homework problem.",10,,complete_one_problem.at,complete_one_problem.png -complete_10_problems,"Perfect 10",502,complete_problems,"default,jitar","Earn 100% on 10 homework problems.",10,10,complete_10_problems.at,complete_10_problems.png -complete_25_problems,"Twenty-Five Questions",503,complete_problems,"default,jitar","Earn 100% on 25 homework problems.",10,25,complete_25_problems.at,complete_25_problems.png -complete_50_problems,"50 Ways to Solve a Math Problem",504,complete_problems,"default,jitar","Earn 100% on 50 homework problems.",10,50,complete_50_problems.at,complete_50_problems.png -complete_100_problems,"Seeing Benjamins",505,complete_problems,"default,jitar","Earn 100% on 100 homework problems.",20,100,complete_100_problems.at,complete_100_problems.png -complete_150_problems,Sesqui-Centeni-Problems,506,complete_problems,"default,jitar","Earn 100% on 150 homework problems.",20,150,complete_150_problems.at,complete_150_problems.png +three_in_a_row,"Three in a Row",209,one_timer,"default,jitar","Complete 3 problems in a row with no incorrect answers.",10,3,n_correct_in_a_row.at,three_in_a_row.png +on_fire,"You're on Fire!",210,one_timer,"default,jitar","Complete 10 problems in a row with no incorrect answers.",20,10,n_correct_in_a_row.at,on_fire.png +complete_one_set,"One Set Wonder",401,complete_sets,default,"Get 100% on one homework set.",10,1,complete_n_sets.at,complete_one_set.png +complete_five_sets,"High Five",402,complete_sets,default,"Get 100% on five homework sets.",10,5,complete_n_sets.at,complete_five_sets.png +complete_ten_sets,"One For Each Finger",403,complete_sets,default,"Get 100% on ten homework sets.",10,10,complete_n_sets.at,complete_ten_sets.png +complete_twenty_sets,"Mathbox Twenty",404,complete_sets,default,"Get 100% on twenty homework sets.",20,20,complete_n_sets.at,complete_twenty_sets.png +complete_thirty_sets,"The Long Road",405,complete_sets,default,"Get 100% on thirty homework sets.",20,30,complete_n_sets.at,complete_thirty_sets.png +complete_all_sets,Perfection,406,complete_sets,default,"Get 100% on all homework sets.",30,35,complete_n_sets.at,complete_all_sets.png +complete_one_problem,"The First Step",501,complete_problems,"default,jitar","Earn 100% on a homework problem.",10,1,complete_n_problems.at,complete_one_problem.png +complete_10_problems,"Perfect 10",502,complete_problems,"default,jitar","Earn 100% on 10 homework problems.",10,10,complete_n_problems.at,complete_10_problems.png +complete_25_problems,"Twenty-Five Questions",503,complete_problems,"default,jitar","Earn 100% on 25 homework problems.",10,25,complete_n_problems.at,complete_25_problems.png +complete_50_problems,"50 Ways to Solve a Math Problem",504,complete_problems,"default,jitar","Earn 100% on 50 homework problems.",10,50,complete_n_problems.at,complete_50_problems.png +complete_100_problems,"Seeing Benjamins",505,complete_problems,"default,jitar","Earn 100% on 100 homework problems.",20,100,complete_n_problems.at,complete_100_problems.png +complete_150_problems,Sesqui-Centeni-Problems,506,complete_problems,"default,jitar","Earn 100% on 150 homework problems.",20,150,complete_n_problems.at,complete_150_problems.png challenge_one,"Challenge One Complete",601,challenge,default,"Finish the first challenge problem.",10,,challenge_one.at,challenge_one.png challenge_two,"Challenge Two Complete",602,challenge,default,"Finish the second challenge problem.",10,,challenge_two.at,challenge_two.png challenge_three,"Challenge Three Complete",603,challenge,default,"Finish the third challenge problem.",10,,challenge_three.at,challenge_three.png @@ -40,7 +40,7 @@ challenge_seven,"Challenge Seven Complete",607,challenge,default,"Finish the sev challenge_eight,"Challenge Eight Complete",608,challenge,default,"Finish the eighth challenge problem.",10,,challenge_eight.at,challenge_eight.png challenge_nine,"Challenge Nine Complete",609,challenge,default,"Finish the ninth challenge problem.",10,,challenge_nine.at,challenge_nine.png challenge_ten,"Challenge Ten Complete",610,challenge,default,"Finish the tenth challenge problem.",10,,challenge_ten.at,challenge_ten.png -challenger,Challenger,611,challenge,default,"Finish all of the challenge problems.",10,20,challenger.at,challenger.png +challenger,Challenger,611,challenge,default,"Finish all of the challenge problems.",20,10,challenger.at,challenger.png earn_10_achievements,"Huzzah!!",9501,achievements,"default,gateway,jitar","Earn ten achievements.",10,10,earn_n_achievements.at,earn_10_achievements.png earn_20_achievements,"Achiever",9502,achievements,"default,gateway,jitar","Earn twenty achievements.",10,20,earn_n_achievements.at,earn_20_achievements.png earn_30_achievements,"The Collector",9503,achievements,"default,gateway,jitar","Earn thirty achievements.",10,30,earn_n_achievements.at,earn_30_achievements.png diff --git a/courses.dist/modelCourse/templates/achievements/derivative_master.at b/courses.dist/modelCourse/templates/achievements/derivative_master.at deleted file mode 100644 index a351b86d4c..0000000000 --- a/courses.dist/modelCourse/templates/achievements/derivative_master.at +++ /dev/null @@ -1,92 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. If it has then it updates the counter -#(You would edit this file to say which sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update counter; - $counter++; - } - -if ($counter >= $maxCounter) { - return 1; -} else { - return 0; -} - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/doing_it_backwards.at b/courses.dist/modelCourse/templates/achievements/doing_it_backwards.at deleted file mode 100644 index 6660de54ab..0000000000 --- a/courses.dist/modelCourse/templates/achievements/doing_it_backwards.at +++ /dev/null @@ -1,93 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. If it has then it updates the counter -#(You would edit this file to say which sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update counter; - $counter++; - } - -if ($counter >= $maxCounter) { - return 1; -} else { - return 0; -} - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/double_integral.at b/courses.dist/modelCourse/templates/achievements/double_integral.at deleted file mode 100644 index a351b86d4c..0000000000 --- a/courses.dist/modelCourse/templates/achievements/double_integral.at +++ /dev/null @@ -1,92 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. If it has then it updates the counter -#(You would edit this file to say which sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update counter; - $counter++; - } - -if ($counter >= $maxCounter) { - return 1; -} else { - return 0; -} - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/early_bird.at b/courses.dist/modelCourse/templates/achievements/early_bird.at index f0bb5c25cf..18b4964251 100644 --- a/courses.dist/modelCourse/templates/achievements/early_bird.at +++ b/courses.dist/modelCourse/templates/achievements/early_bird.at @@ -1,82 +1,10 @@ -#This checks to see if the student has finished the set within a certain time - - #test to see if it is before 1 day after the open date - if ((time()-$set->open_date) > 86400) { - return 0; - } +# This achievement is awarded for completing a set within 1 day +# or 24 * 60 * 60 = 86400 seconds of it opening. +# +# See [templates]/achievements/achievement_readme.txt for details. - #if it is check to see if we have finished the set - foreach my $problemRecord (@setProblems) { - if ($problemRecord->status != 1) { - return 0; - } - } - - return 1; +# Check if this set has been completed. +return 0 unless $globalData->{completedSetIds}{ $set->set_id }; -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +# Now test if it is before 1 day after the open date. +return time - $set->open_date > 86400 ? 0 : 1; diff --git a/courses.dist/modelCourse/templates/achievements/earn_n_achievements.at b/courses.dist/modelCourse/templates/achievements/earn_n_achievements.at index 4c20344a09..c14635ce63 100644 --- a/courses.dist/modelCourse/templates/achievements/earn_n_achievements.at +++ b/courses.dist/modelCourse/templates/achievements/earn_n_achievements.at @@ -1,95 +1,15 @@ -# This is a "earn n achievements. Notice how we update $counter -# (even though the appropriate data is already given to use in -# $userAchievements) so that the achievement progress bar works correctly. +# This is a "earn n achievements" achievement. This evaluator can be assigned +# to multiple different achievements since it uses $maxCounter to determine +# if the desired number of problems to be completed. Notice how we update +# $counter (even though the appropriate variable is already given to use in +# $userAchievements) so that the achievement progress bar works correctly. +# +# See [templates]/achievements/achievement_readme.txt for details. # Update counter from $userAchievements. Ignore level achievements. $counter = 0; -foreach my $key (keys %{ $userAchievements }) { - if ($userAchievements->{$key} && $key !~ /^level/) { - $counter++; - } -} - -if ($counter >= $maxCounter) { - return 1 -} else { - return 0; +for my $key (keys %{$userAchievements}) { + ++$counter if $userAchievements->{$key} && $key !~ /^level/; } - -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it -# (i.e. solve 20 problems) then this is where you store -# the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $userAchievements: this hash stores all assigned achievements for -# the current user. The keys are the achievement_id and the values -# are 0 or 1 for if the achievement has been earned. Changes to this -# variable will be accessible by achievements down the line in the -# current evaluation loop, but will not be saved across evaluations. -# Note: This variable is updated if an achievement is earned, -# but only achievements further down the evaluation chain will -# see the update. So when depending on other achievements place -# make sure they are run first. -# -# - $localData : this is a hash which stores data for this user and -# achievement (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can -# store whatever you like in here and it can be accessed next time -# this evaluator is run. Two things to keep in mind. First, The data -# in this hash will *not* be accessible by other achievements. Second, -# the first time a variable is accessed it will have the value ''. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like -# $localData, you can store whatever you like in here. This data -# will be accessable from *every* achievement and is unique to the -# user. There are two variables stored in this hash that are -# maintained by the system. -# - $globalData->completeSets : This is the number of sets which -# the student has earned 100% on -# - $globalData->complete Problems : This is the number of problems -# which the student has earned 100% on -# Warning: The achievements are always evaluated in the order they -# are listed the Instructors achievement editor page. To make matters -# more complicated, achievements which have already been earned are -# not evaluated at all. The up-shot of this is that when modifying -# variables in $globalData you need to either write your code so it -# doesnt matter which order the evaluators are run, or you need to -# pay very close attention to which evaluators are run and when. +return $counter >= $maxCounter ? 1 : 0; diff --git a/courses.dist/modelCourse/templates/achievements/example_complete_n_specific_problems.at b/courses.dist/modelCourse/templates/achievements/example_complete_n_specific_problems.at new file mode 100644 index 0000000000..7d5e2bccc3 --- /dev/null +++ b/courses.dist/modelCourse/templates/achievements/example_complete_n_specific_problems.at @@ -0,0 +1,35 @@ +# This is an example achievement evaluator that awards credit if n specific +# problems are completed. This is done by creating a list of valid problems +# and checking if a problem from that list was answered correctly. If a problem +# from that list is answered correctly, the $counter is increased. Credit +# is given when $maxCounter problems from the list have been answered, which +# is configured in the achievement manager. +# +# See [templates]/achievements/achievement_readme.txt for details. + +# Create a hash of all valid set ids and problem numbers. +# Set names (ids) are keys, and each is a hash of valid +# problem numbers. Use "_" for spaces in set ids. +my %validproblems = ( + 'SetName1' => { + '3' => 1, + '5' => 1, + }, + 'SetName2' => { + '2' => 1, + '4' => 1, + '6' => 1, + }, +); + +# Checks to see if a valid problem was solved, +# then updates the counter if so. +if ($validproblems{ $problem->set_id } + && $validproblems{ $problem->set_id }{ $problem->problem_id } + && $problem->status == 1 + && $problem->num_correct == 1) +{ + ++$counter; +} + +return $counter >= $maxCounter ? 1 : 0; diff --git a/courses.dist/modelCourse/templates/achievements/example_complete_n_specific_sets.at b/courses.dist/modelCourse/templates/achievements/example_complete_n_specific_sets.at new file mode 100644 index 0000000000..38690b4827 --- /dev/null +++ b/courses.dist/modelCourse/templates/achievements/example_complete_n_specific_sets.at @@ -0,0 +1,15 @@ +# This is an example achievement evaluator that awards credit if n specific +# sets are completed. This is done by counting how many set IDs from a list +# are present in the $globalData->{completedSetIds} hash. The $counter variable +# is updated so that the achievement progress bar works correctly. Credit is +# given when $maxCounter sets have been completed, which is configured in +# the achievement manager. +# +# See [templates]/achievements/achievement_readme.txt for details. + +$counter = 0; +for my $setID ('SetName1', 'SetName2') { + ++$counter if $globalData->{completedSetIds}{$setID}; +} + +return $counter >= $maxCounter ? 1 : 0; diff --git a/courses.dist/modelCourse/templates/achievements/example_complete_specific_problem.at b/courses.dist/modelCourse/templates/achievements/example_complete_specific_problem.at new file mode 100644 index 0000000000..4dff722c77 --- /dev/null +++ b/courses.dist/modelCourse/templates/achievements/example_complete_specific_problem.at @@ -0,0 +1,26 @@ +# This is an example achievement evaluator that awards credit if a specific +# problem is completed. This is done by creating a list of valid problems +# and checking if a problem from that list was answered correctly. +# +# See [templates]/achievements/achievement_readme.txt for details. + +# Create a hash of all valid set ids and problem numbers. +# Set names (ids) are keys, and each is a hash of valid +# problem numbers. Use "_" for spaces in set ids. +my %validproblems = ( + 'SetName' => { + '3' => 1, + '5' => 1, + }, +); + +# Checks to see if a valid problem was solved. +if ($validproblems{ $problem->set_id } + && $validproblems{ $problem->set_id }{ $problem->problem_id } + && $problem->status == 1 + && $problem->num_correct == 1) +{ + return 1; +} + +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/example_complete_specific_set.at b/courses.dist/modelCourse/templates/achievements/example_complete_specific_set.at new file mode 100644 index 0000000000..e93980d4b2 --- /dev/null +++ b/courses.dist/modelCourse/templates/achievements/example_complete_specific_set.at @@ -0,0 +1,11 @@ +# This is an example achievement evaluator that awards credit if a specific +# set is completed. This is done by checking if a list of set IDs is is +# present in the $globalData->{completedSetIds} hash. +# +# See [templates]/achievements/achievement_readme.txt for details. + +for my $setID ('SetName1', 'SetName2') { + return 1 if $globalData->{completedSetIds}{$setID}; +} + +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/extensions.at b/courses.dist/modelCourse/templates/achievements/extensions.at index 5be5cf1373..542f497834 100644 --- a/courses.dist/modelCourse/templates/achievements/extensions.at +++ b/courses.dist/modelCourse/templates/achievements/extensions.at @@ -1,9 +1,10 @@ -# This achievement executes unconditionally, and awards the user a certain number -# of ExtendDueDate, SuperExtendDueDate, and ResurrectHW reward items. How many of -# each is specified below. +# This achievement executes unconditionally, and awards the user a certain number +# of ExtendDueDate, SuperExtendDueDate, and ResurrectHW reward items. How many of +# each is specified below. This could also give other extension type reward items +# such as AddNewTestGW, ExtendDueDateGW, ExtendReducedDate, NoReducedCred, ReducedCred, +# RessurectGW, and SuperExtendReducedDate. -$globalData->{ExtendDueDate} += 10; -$globalData->{SuperExtendDueDate} += 5; -$globalData->{ResurrectHW} += 3; +$globalData->{ExtendDueDate} += 10; +$globalData->{SuperExtendDueDate} += 5; +$globalData->{ResurrectHW} += 3; return 1; - diff --git a/courses.dist/modelCourse/templates/achievements/heart_area.at b/courses.dist/modelCourse/templates/achievements/heart_area.at deleted file mode 100644 index 491560c4dd..0000000000 --- a/courses.dist/modelCourse/templates/achievements/heart_area.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/hows_your_finger.at b/courses.dist/modelCourse/templates/achievements/hows_your_finger.at index 47f5b9fc48..30913cdf1e 100644 --- a/courses.dist/modelCourse/templates/achievements/hows_your_finger.at +++ b/courses.dist/modelCourse/templates/achievements/hows_your_finger.at @@ -1,75 +1,6 @@ -#This checks to see if the student has above a certain number of attempts - - if ($problem->num_correct + $problem->num_incorrect >= 250) { - return 1; - } else { - return 0; - } - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' +# This achievement is awarded if a student submits a problem more +# 250 times, either correctly or incorrectly. # -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +# See [templates]/achievements/achievement_readme.txt for details. + +return $problem->num_correct + $problem->num_incorrect < 250 ? 0 : 1; diff --git a/courses.dist/modelCourse/templates/achievements/integral_master.at b/courses.dist/modelCourse/templates/achievements/integral_master.at deleted file mode 100644 index 2bf1adc049..0000000000 --- a/courses.dist/modelCourse/templates/achievements/integral_master.at +++ /dev/null @@ -1,92 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. If it has then it updates the counter -#(You would edit this file to say which sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update counter; - $counter++; - } - -if ($counter >= $maxCounter) { - return 1; -} else { - return 0; -} - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file diff --git a/courses.dist/modelCourse/templates/achievements/its_all_relative.at b/courses.dist/modelCourse/templates/achievements/its_all_relative.at deleted file mode 100644 index 462164620a..0000000000 --- a/courses.dist/modelCourse/templates/achievements/its_all_relative.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '1' => 1, - '2' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/la_revolucion.at b/courses.dist/modelCourse/templates/achievements/la_revolucion.at deleted file mode 100644 index ddf33ec21a..0000000000 --- a/courses.dist/modelCourse/templates/achievements/la_revolucion.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file diff --git a/courses.dist/modelCourse/templates/achievements/lagrange_multipliers.at b/courses.dist/modelCourse/templates/achievements/lagrange_multipliers.at deleted file mode 100644 index 491560c4dd..0000000000 --- a/courses.dist/modelCourse/templates/achievements/lagrange_multipliers.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/last_minute.at b/courses.dist/modelCourse/templates/achievements/last_minute.at index 7e4932ae92..30736c541f 100644 --- a/courses.dist/modelCourse/templates/achievements/last_minute.at +++ b/courses.dist/modelCourse/templates/achievements/last_minute.at @@ -1,88 +1,14 @@ -# checks to see if a student finished a set close to the due date +# Achievement is awarded if the set is completed within thirty +# minutes of the due date. +# +# See [templates]/achievements/achievement_readme.txt for details. + +# Check if this set has been completed. +return 0 unless $globalData->{completedSetIds}{ $set->set_id }; -# Check that this is not a repeated submission of problem which has -# been solved before. # Do not consider this achievement if this is a repeated submission # of previously solved problem. +return 0 unless $problem->num_correct == 1; -return 0 unless ($problem->status == 1 && $problem->num_correct == 1); - - #test to see if it is within 30 min of the due date - if (($set->due_date - time()) > 1800) { - return 0; - } - - foreach my $problemRecord (@setProblems) { - if ($problemRecord->status != 1) { - return 0; - } - } - - return 1; - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +# Thirty minutes = 30 * 60 = 1800 seconds. +return $set->due_date - time > 1800 ? 0 : 1; diff --git a/courses.dist/modelCourse/templates/achievements/level_eight.at b/courses.dist/modelCourse/templates/achievements/level_eight.at index 6de08487d3..8dd529a5e8 100644 --- a/courses.dist/modelCourse/templates/achievements/level_eight.at +++ b/courses.dist/modelCourse/templates/achievements/level_eight.at @@ -1,91 +1,22 @@ # This is a "level" achievement and they behave slightly differently. When -# a level achievement is earned the system uses the icon and title of the +# a level achievement is earned the system uses the icon and title of the # level achievement as the icon and title of that students level. There -# are two additional variables available to level achievements -# - $achievementPoints : the number of achievement points the current +# are two additional variables available to level achievements: +# - $achievementPoints: the number of achievement points the current # user has. (Changes to this variable will *not* be saved.) -# - $nextLevelPoints : the number of points needed to earn a level. -# (Changes to this variable will be saved if a new level is earned.) -# These variables are used to construct the users level progress bar +# - $nextLevelPoints: the number of points needed to earn a level. +# (Changes to this variable will be saved if a new level is earned.) +# These variables are used to construct the users level progress bar. +# +# This evaluator updates next level threshold and awards achievement items. -#Constants: -#Threshold for level 9 +# Threshold for level 9 my $newLevelThreshold = 1200; -#Code - if ($achievementPoints >= $nextLevelPoints) { - #set new threshold and return 1 - $globalData->{DoubleSet}++; - $nextLevelPoints = $newLevelThreshold; - return 1; -} else { - return 0; + $nextLevelPoints = $newLevelThreshold; + ++$globalData->{DoubleSet}; + return 1; } -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->completeSets : This is the number of sets which the student -# has earned 100% on -# - $globalData->complete Problems : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/level_five.at b/courses.dist/modelCourse/templates/achievements/level_five.at index ab70832489..a22c38276e 100644 --- a/courses.dist/modelCourse/templates/achievements/level_five.at +++ b/courses.dist/modelCourse/templates/achievements/level_five.at @@ -1,91 +1,22 @@ # This is a "level" achievement and they behave slightly differently. When -# a level achievement is earned the system uses the icon and title of the +# a level achievement is earned the system uses the icon and title of the # level achievement as the icon and title of that students level. There -# are two additional variables available to level achievements -# - $achievementPoints : the number of achievement points the current +# are two additional variables available to level achievements: +# - $achievementPoints: the number of achievement points the current # user has. (Changes to this variable will *not* be saved.) -# - $nextLevelPoints : the number of points needed to earn a level. -# (Changes to this variable will be saved if a new level is earned.) -# These variables are used to construct the users level progress bar +# - $nextLevelPoints: the number of points needed to earn a level. +# (Changes to this variable will be saved if a new level is earned.) +# These variables are used to construct the users level progress bar. +# +# This evaluator updates next level threshold and awards achievement items. -#Constants: -#Threshold for level 6 +# Threshold for level 6 my $newLevelThreshold = 750; -#Code - if ($achievementPoints >= $nextLevelPoints) { - #set new threshold and return 1 - $globalData->{DuplicateProb}++; - $nextLevelPoints = $newLevelThreshold; - return 1; -} else { - return 0; + $nextLevelPoints = $newLevelThreshold; + ++$globalData->{DuplicateProb}; + return 1; } -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->completeSets : This is the number of sets which the student -# has earned 100% on -# - $globalData->complete Problems : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/level_four.at b/courses.dist/modelCourse/templates/achievements/level_four.at index b7bbe3e4f0..695b77a1a7 100644 --- a/courses.dist/modelCourse/templates/achievements/level_four.at +++ b/courses.dist/modelCourse/templates/achievements/level_four.at @@ -1,91 +1,22 @@ # This is a "level" achievement and they behave slightly differently. When -# a level achievement is earned the system uses the icon and title of the +# a level achievement is earned the system uses the icon and title of the # level achievement as the icon and title of that students level. There -# are two additional variables available to level achievements -# - $achievementPoints : the number of achievement points the current +# are two additional variables available to level achievements: +# - $achievementPoints: the number of achievement points the current # user has. (Changes to this variable will *not* be saved.) -# - $nextLevelPoints : the number of points needed to earn a level. -# (Changes to this variable will be saved if a new level is earned.) -# These variables are used to construct the users level progress bar +# - $nextLevelPoints: the number of points needed to earn a level. +# (Changes to this variable will be saved if a new level is earned.) +# These variables are used to construct the users level progress bar. +# +# This evaluator updates next level threshold and awards achievement items. -#Constants: -#Threshold for level 5 +# Threshold for level 5 my $newLevelThreshold = 600; -#Code - if ($achievementPoints >= $nextLevelPoints) { - #set new threshold and return 1 - $globalData->{DoubleProb}++; - $nextLevelPoints = $newLevelThreshold; - return 1; -} else { - return 0; + $nextLevelPoints = $newLevelThreshold; + ++$globalData->{DoubleProb}; + return 1; } -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->completeSets : This is the number of sets which the student -# has earned 100% on -# - $globalData->complete Problems : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/level_nine.at b/courses.dist/modelCourse/templates/achievements/level_nine.at index de4874a15e..611014bfe3 100644 --- a/courses.dist/modelCourse/templates/achievements/level_nine.at +++ b/courses.dist/modelCourse/templates/achievements/level_nine.at @@ -1,91 +1,22 @@ # This is a "level" achievement and they behave slightly differently. When -# a level achievement is earned the system uses the icon and title of the +# a level achievement is earned the system uses the icon and title of the # level achievement as the icon and title of that students level. There -# are two additional variables available to level achievements -# - $achievementPoints : the number of achievement points the current +# are two additional variables available to level achievements: +# - $achievementPoints: the number of achievement points the current # user has. (Changes to this variable will *not* be saved.) -# - $nextLevelPoints : the number of points needed to earn a level. -# (Changes to this variable will be saved if a new level is earned.) -# These variables are used to construct the users level progress bar +# - $nextLevelPoints: the number of points needed to earn a level. +# (Changes to this variable will be saved if a new level is earned.) +# These variables are used to construct the users level progress bar. +# +# This evaluator updates next level threshold and awards achievement items. -#Constants: -#Level 10 threshold +# Threshold for level 10 my $newLevelThreshold = 1350; -#Code - if ($achievementPoints >= $nextLevelPoints) { - #set new threshold and return 1 - $globalData->{ResurrectHW}++; - $nextLevelPoints = $newLevelThreshold; - return 1; -} else { - return 0; + $nextLevelPoints = $newLevelThreshold; + ++$globalData->{ResurrectHW}; + return 1; } -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->completeSets : This is the number of sets which the student -# has earned 100% on -# - $globalData->complete Problems : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/level_one.at b/courses.dist/modelCourse/templates/achievements/level_one.at index 7fac596d0e..358e63968f 100644 --- a/courses.dist/modelCourse/templates/achievements/level_one.at +++ b/courses.dist/modelCourse/templates/achievements/level_one.at @@ -1,89 +1,20 @@ # This is a "level" achievement and they behave slightly differently. When -# a level achievement is earned the system uses the icon and title of the +# a level achievement is earned the system uses the icon and title of the # level achievement as the icon and title of that students level. There -# are two additional variables available to level achievements -# - $achievementPoints : the number of achievement points the current +# are two additional variables available to level achievements: +# - $achievementPoints: the number of achievement points the current # user has. (Changes to this variable will *not* be saved.) -# - $nextLevelPoints : the number of points needed to earn a level. -# (Changes to this variable will be saved if a new level is earned.) -# These variables are used to construct the users level progress bar - -#Constants: -#Threshold for level 2 -my $newLevelThreshold = 150; +# - $nextLevelPoints: the number of points needed to earn a level. +# (Changes to this variable will be saved if a new level is earned.) +# These variables are used to construct the users level progress bar. +# +# Level 1 is earned immediately and configures how many achievement +# points are needed for level 2. -$globalData->{HalfCreditProb}++; +# Threshold for level 2. +$nextLevelPoints = 150; -#Code +# Award achievement item. +++$globalData->{HalfCreditProb}; -#level 1 is earned immediately -$nextLevelPoints = $newLevelThreshold; return 1; - - -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->completeSets : This is the number of sets which the student -# has earned 100% on -# - $globalData->complete Problems : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file diff --git a/courses.dist/modelCourse/templates/achievements/level_seven.at b/courses.dist/modelCourse/templates/achievements/level_seven.at index 9c2095363c..2238564d34 100644 --- a/courses.dist/modelCourse/templates/achievements/level_seven.at +++ b/courses.dist/modelCourse/templates/achievements/level_seven.at @@ -1,91 +1,22 @@ # This is a "level" achievement and they behave slightly differently. When -# a level achievement is earned the system uses the icon and title of the +# a level achievement is earned the system uses the icon and title of the # level achievement as the icon and title of that students level. There -# are two additional variables available to level achievements -# - $achievementPoints : the number of achievement points the current +# are two additional variables available to level achievements: +# - $achievementPoints: the number of achievement points the current # user has. (Changes to this variable will *not* be saved.) -# - $nextLevelPoints : the number of points needed to earn a level. -# (Changes to this variable will be saved if a new level is earned.) -# These variables are used to construct the users level progress bar +# - $nextLevelPoints: the number of points needed to earn a level. +# (Changes to this variable will be saved if a new level is earned.) +# These variables are used to construct the users level progress bar. +# +# This evaluator updates next level threshold and awards achievement items. -#Constants: -#Threshold for level 8 +# Threshold for level 8 my $newLevelThreshold = 1050; -#Code - if ($achievementPoints >= $nextLevelPoints) { - #set new threshold and return 1 - $globalData->{SuperExtendDueDate}++; - $nextLevelPoints = $newLevelThreshold; - return 1; -} else { - return 0; + $nextLevelPoints = $newLevelThreshold; + ++$globalData->{SuperExtendDueDate}; + return 1; } -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->completeSets : This is the number of sets which the student -# has earned 100% on -# - $globalData->complete Problems : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/level_six.at b/courses.dist/modelCourse/templates/achievements/level_six.at index 89bee15a3d..c019a9b4ce 100644 --- a/courses.dist/modelCourse/templates/achievements/level_six.at +++ b/courses.dist/modelCourse/templates/achievements/level_six.at @@ -1,91 +1,22 @@ # This is a "level" achievement and they behave slightly differently. When -# a level achievement is earned the system uses the icon and title of the +# a level achievement is earned the system uses the icon and title of the # level achievement as the icon and title of that students level. There -# are two additional variables available to level achievements -# - $achievementPoints : the number of achievement points the current +# are two additional variables available to level achievements: +# - $achievementPoints: the number of achievement points the current # user has. (Changes to this variable will *not* be saved.) -# - $nextLevelPoints : the number of points needed to earn a level. -# (Changes to this variable will be saved if a new level is earned.) -# These variables are used to construct the users level progress bar +# - $nextLevelPoints: the number of points needed to earn a level. +# (Changes to this variable will be saved if a new level is earned.) +# These variables are used to construct the users level progress bar. +# +# This evaluator updates next level threshold and awards achievement items. -#Constants: -#Threshold for level 7 +# Threshold for level 7 my $newLevelThreshold = 900; -#Code - if ($achievementPoints >= $nextLevelPoints) { - #set new threshold and return 1 - $globalData->{FullCreditProb}++; - $nextLevelPoints = $newLevelThreshold; - return 1; -} else { - return 0; + $nextLevelPoints = $newLevelThreshold; + ++$globalData->{FullCreditProb}; + return 1; } -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->completeSets : This is the number of sets which the student -# has earned 100% on -# - $globalData->complete Problems : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/level_ten.at b/courses.dist/modelCourse/templates/achievements/level_ten.at index f114a106fe..48d15521bb 100644 --- a/courses.dist/modelCourse/templates/achievements/level_ten.at +++ b/courses.dist/modelCourse/templates/achievements/level_ten.at @@ -1,91 +1,22 @@ # This is a "level" achievement and they behave slightly differently. When -# a level achievement is earned the system uses the icon and title of the +# a level achievement is earned the system uses the icon and title of the # level achievement as the icon and title of that students level. There -# are two additional variables available to level achievements -# - $achievementPoints : the number of achievement points the current +# are two additional variables available to level achievements: +# - $achievementPoints: the number of achievement points the current # user has. (Changes to this variable will *not* be saved.) -# - $nextLevelPoints : the number of points needed to earn a level. -# (Changes to this variable will be saved if a new level is earned.) -# These variables are used to construct the users level progress bar +# - $nextLevelPoints: the number of points needed to earn a level. +# (Changes to this variable will be saved if a new level is earned.) +# These variables are used to construct the users level progress bar. +# +# This evaluator updates next level threshold and awards achievement items. -#Constants: -#Level 10 is the last level so dont set a threshhold to remove the progress bar +# Level 10 is the last level, so set to '' to remove the progress bar. my $newLevelThreshold = ''; -#Code - if ($achievementPoints >= $nextLevelPoints) { - #set new threshold and return 1 - $globalData->{FullCreditSet}++; - $nextLevelPoints = $newLevelThreshold; - return 1; -} else { - return 0; + $nextLevelPoints = $newLevelThreshold; + ++$globalData->{FullCreditSet}; + return 1; } -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->completeSets : This is the number of sets which the student -# has earned 100% on -# - $globalData->complete Problems : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/level_three.at b/courses.dist/modelCourse/templates/achievements/level_three.at index b7964cee4c..aa826f5fe7 100644 --- a/courses.dist/modelCourse/templates/achievements/level_three.at +++ b/courses.dist/modelCourse/templates/achievements/level_three.at @@ -1,91 +1,22 @@ # This is a "level" achievement and they behave slightly differently. When -# a level achievement is earned the system uses the icon and title of the +# a level achievement is earned the system uses the icon and title of the # level achievement as the icon and title of that students level. There -# are two additional variables available to level achievements -# - $achievementPoints : the number of achievement points the current +# are two additional variables available to level achievements: +# - $achievementPoints: the number of achievement points the current # user has. (Changes to this variable will *not* be saved.) -# - $nextLevelPoints : the number of points needed to earn a level. -# (Changes to this variable will be saved if a new level is earned.) -# These variables are used to construct the users level progress bar +# - $nextLevelPoints: the number of points needed to earn a level. +# (Changes to this variable will be saved if a new level is earned.) +# These variables are used to construct the users level progress bar. +# +# This evaluator updates next level threshold and awards achievement items. -#Constants: -#Threshold for level 4 +# Threshold for level 4 my $newLevelThreshold = 450; -#Code - if ($achievementPoints >= $nextLevelPoints) { - #set new threshold and return 1 - $globalData->{ExtendDueDate}++; - $nextLevelPoints = $newLevelThreshold; - return 1; -} else { - return 0; + $nextLevelPoints = $newLevelThreshold; + ++$globalData->{ExtendDueDate}; + return 1; } -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->completeSets : This is the number of sets which the student -# has earned 100% on -# - $globalData->complete Problems : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/level_two.at b/courses.dist/modelCourse/templates/achievements/level_two.at index 92528d9ef4..e4955ed38d 100644 --- a/courses.dist/modelCourse/templates/achievements/level_two.at +++ b/courses.dist/modelCourse/templates/achievements/level_two.at @@ -1,91 +1,22 @@ # This is a "level" achievement and they behave slightly differently. When -# a level achievement is earned the system uses the icon and title of the +# a level achievement is earned the system uses the icon and title of the # level achievement as the icon and title of that students level. There -# are two additional variables available to level achievements -# - $achievementPoints : the number of achievement points the current +# are two additional variables available to level achievements: +# - $achievementPoints: the number of achievement points the current # user has. (Changes to this variable will *not* be saved.) -# - $nextLevelPoints : the number of points needed to earn a level. -# (Changes to this variable will be saved if a new level is earned.) -# These variables are used to construct the users level progress bar +# - $nextLevelPoints: the number of points needed to earn a level. +# (Changes to this variable will be saved if a new level is earned.) +# These variables are used to construct the users level progress bar. +# +# This evaluator updates next level threshold and awards achievement items. -#Constants: -#Threshold for level 3 +# Threshold for level 3 my $newLevelThreshold = 300; -#Code - if ($achievementPoints >= $nextLevelPoints) { - #set new threshold and return 1 - $nextLevelPoints = $newLevelThreshold; - $globalData->{ResetIncorrectAttempts}++; - return 1; -} else { - return 0; + $nextLevelPoints = $newLevelThreshold; + ++$globalData->{ResetIncorrectAttempts}; + return 1; } -# Variable Descriptions: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->completeSets : This is the number of sets which the student -# has earned 100% on -# - $globalData->complete Problems : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/line_integrals.at b/courses.dist/modelCourse/templates/achievements/line_integrals.at deleted file mode 100644 index 6a77dd6d1f..0000000000 --- a/courses.dist/modelCourse/templates/achievements/line_integrals.at +++ /dev/null @@ -1,91 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. If it has then it updates the counter -#(You would edit this file to say which sets and problems count.) - -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file diff --git a/courses.dist/modelCourse/templates/achievements/lines_and_planes.at b/courses.dist/modelCourse/templates/achievements/lines_and_planes.at deleted file mode 100644 index 8d03977cea..0000000000 --- a/courses.dist/modelCourse/templates/achievements/lines_and_planes.at +++ /dev/null @@ -1,96 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. If it has then it updates the counter -#(You would edit this file to say which sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '1' => 1, - '2' => 1, - '3' => 1, - '4' => 1, - '5' => 1, - '6' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update counter; - $counter++; - } - -if ($counter >= $maxCounter) { - return 1; -} else { - return 0; -} - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/many_fractions.at b/courses.dist/modelCourse/templates/achievements/many_fractions.at deleted file mode 100644 index 491560c4dd..0000000000 --- a/courses.dist/modelCourse/templates/achievements/many_fractions.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/n_correct_in_a_row.at b/courses.dist/modelCourse/templates/achievements/n_correct_in_a_row.at new file mode 100644 index 0000000000..55a8ad495b --- /dev/null +++ b/courses.dist/modelCourse/templates/achievements/n_correct_in_a_row.at @@ -0,0 +1,18 @@ +# This achievement is awarded for answering n problems in a row without +# any incorrect answers. This is done by resetting the $counter for any +# incorrect submit. This can be used by multiple achievements, so just +# set the $maxCounter to determine how many in the row are needed. +# +# See [templates]/achievements/achievement_readme.txt for details. + +# Reset counter if they got something wrong. +if ($problem->status < 1) { + $counter = 0; + return 0; +} + +# Only increase the counter if this is the first time they got +# got the problem correct. +++$counter if $problem->num_correct == 1 && $problem->num_incorrect == 0; + +return $counter >= $maxCounter ? 1 : 0; diff --git a/courses.dist/modelCourse/templates/achievements/night_owl.at b/courses.dist/modelCourse/templates/achievements/night_owl.at index 3507e88528..8a0913508c 100644 --- a/courses.dist/modelCourse/templates/achievements/night_owl.at +++ b/courses.dist/modelCourse/templates/achievements/night_owl.at @@ -1,94 +1,14 @@ -# checks to see if a student finished a set between 12AM and 2AM +# This achievement is awarded for completing a set between 12AM and 2AM. +# +# See [templates]/achievements/achievement_readme.txt for details. -# Check that this is not a repeated submission of problem which has -# been solved before. # Do not consider this achievement if this is a repeated submission # of previously solved problem. +return 0 unless $problem->status == 1 && $problem->num_correct == 1; -return 0 unless ($problem->status == 1 && $problem->num_correct == 1); - - #test to see if it is between midnight and 2am - if ($courseDateTime[2] > 1) { - return 0; - } - - #if it is check to see if we have finished the set - - foreach my $problemRecord (@setProblems) { - if ($problemRecord->status != 1) { - return 0; - } - } - - return 1; +# Now check if this set has been completed. +return 0 unless $globalData->{completedSetIds}{ $set->set_id }; -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. -# -# - @courseDateTime - array of time information in course timezone -# (sec,min,hour,day,month,year,day_of_week) as produced by -# https://metacpan.org/pod/DateTime +# Finally check the time. $courseDateTime[2] is the hour in the +# course's timezone. +return $courseDateTime[2] > 1 ? 0 : 1; diff --git a/courses.dist/modelCourse/templates/achievements/on_fire.at b/courses.dist/modelCourse/templates/achievements/on_fire.at deleted file mode 100644 index baddd04e8f..0000000000 --- a/courses.dist/modelCourse/templates/achievements/on_fire.at +++ /dev/null @@ -1,86 +0,0 @@ -#This checks to see if the student has solved 10 problems without having any -# incorrect answers - -# reset counter if they got something wrong -if ($problem->status < 1) { - $counter = 0; - return 0; -# if they are right update the counter -} elsif ($problem->status == 1 && - $problem->num_correct == 1 && - $problem->num_incorrect == 0 ) { - $counter++; -} - -if ($counter >= $maxCounter) { - return 1; -} else { - return 0; -} - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/on_one_hand.at b/courses.dist/modelCourse/templates/achievements/on_one_hand.at index 26ec33c507..22153be0f0 100644 --- a/courses.dist/modelCourse/templates/achievements/on_one_hand.at +++ b/courses.dist/modelCourse/templates/achievements/on_one_hand.at @@ -1,82 +1,16 @@ -#This checks to see if the student has finished the set -# with fewer than a certain number of incorrect submissions - - my $numfails = 0; +# This achievement is awarded for finishing a set with fewer than +# 5 incorrect submissions. +# +# See [templates]/achievements/achievement_readme.txt for details. - #cycle through and leave if we have too many incorrects or a wrong problem - foreach my $problemRecord (@setProblems) { - $numfails += $problemRecord->num_incorrect; - if ($problemRecord->status != 1 || $numfails >5) { - return 0; - } - } - - return 1; +# Check if set is complete. +return 0 unless $globalData->{completedSetIds}{ $set->set_id }; +# Count up the number of incorrect submissions. +my $numIncorrect = 0; +for my $problemRecord (@setProblems) { + $numIncorrect += $problemRecord->num_incorrect; + return 0 if $numIncorrect > 5; +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +return 1; diff --git a/courses.dist/modelCourse/templates/achievements/on_the_hour.at b/courses.dist/modelCourse/templates/achievements/on_the_hour.at index be89f3f4ba..a9620ac641 100644 --- a/courses.dist/modelCourse/templates/achievements/on_the_hour.at +++ b/courses.dist/modelCourse/templates/achievements/on_the_hour.at @@ -1,81 +1,10 @@ -# checks to see if a studen finished a problem at the top of an hour - my @timeData = localtime(time); - - #test to see if it is near the top of an hour - if ($timeData[1] > 0) { - return 0; - } +# This achievement is awarded if a problem is completed at the +# top of an hour. +# +# See [templates]/achievements/achievement_readme.txt for details. - #test to see if the problem is correct and this is the first run - if ($problem-> status != 1 || $problem->num_correct != 1) { - return 0; - } - - return 1; +# Check to see if is the top of an hour. +return 0 unless $courseDateTime[1] == 0; -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +# Check to see if the problem is completed and this is the first time. +return $problem->status == 1 && $problem->num_correct == 1 ? 1 : 0; diff --git a/courses.dist/modelCourse/templates/achievements/one_click.at b/courses.dist/modelCourse/templates/achievements/one_click.at index 837eaf26e9..95b2c2ff0f 100644 --- a/courses.dist/modelCourse/templates/achievements/one_click.at +++ b/courses.dist/modelCourse/templates/achievements/one_click.at @@ -1,76 +1,6 @@ -#This checks to see if the student has finished the problem with no -# incorrect submissions - - if ($problem->status == 1 && $problem->num_incorrect == 0) { - return 1; - } else { - return 0; - } - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' +# This achievement is awarded for completing a problem with no +# incorrect submissions. # -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +# See [templates]/achievements/achievement_readme.txt for details. + +return $problem->status == 1 && $problem->num_incorrect == 0 ? 1 : 0; diff --git a/courses.dist/modelCourse/templates/achievements/optimizer_prime.at b/courses.dist/modelCourse/templates/achievements/optimizer_prime.at deleted file mode 100644 index 491560c4dd..0000000000 --- a/courses.dist/modelCourse/templates/achievements/optimizer_prime.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/partial_derivatives.at b/courses.dist/modelCourse/templates/achievements/partial_derivatives.at deleted file mode 100644 index 692a1fe2f8..0000000000 --- a/courses.dist/modelCourse/templates/achievements/partial_derivatives.at +++ /dev/null @@ -1,94 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. If it has then it updates the counter -#(You would edit this file to say which sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '1' => 1, - '2' => 1, - '3' => 1, - '5' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update counter; - $counter++; - } - -if ($counter >= $maxCounter) { - return 1; -} else { - return 0; -} - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/pattern_recognition.at b/courses.dist/modelCourse/templates/achievements/pattern_recognition.at deleted file mode 100644 index 491560c4dd..0000000000 --- a/courses.dist/modelCourse/templates/achievements/pattern_recognition.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/persistence.at b/courses.dist/modelCourse/templates/achievements/persistence.at index 33d18f7d8e..c2e7416b54 100644 --- a/courses.dist/modelCourse/templates/achievements/persistence.at +++ b/courses.dist/modelCourse/templates/achievements/persistence.at @@ -1,76 +1,13 @@ -#This checks to see if the student has solved the problem after a certain -# number of incorrect attempts - - if ($problem->status == 1 && $problem->num_correct == 1 && $problem->num_incorrect >= 20) { - return 1 - } else { - return 0; - } +# Award this achievement if a student solves a problem after +# answering it incorrectly more than 20 times. +# +# See [templates]/achievements/achievement_readme.txt for details. +if ($problem->status == 1 + && $problem->num_correct == 1 + && $problem->num_incorrect >= 20) +{ + return 1; +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/preamble.at b/courses.dist/modelCourse/templates/achievements/preamble.at index e69de29bb2..a32ec95b93 100644 --- a/courses.dist/modelCourse/templates/achievements/preamble.at +++ b/courses.dist/modelCourse/templates/achievements/preamble.at @@ -0,0 +1,4 @@ +# This is prepended to the start of every achievement evaluator. Any code +# here will be processed before the actual evaluator code is, and if this +# returns 0 or 1, the actual evaluator will not be processed. + diff --git a/courses.dist/modelCourse/templates/achievements/put_me_in_coach.at b/courses.dist/modelCourse/templates/achievements/put_me_in_coach.at deleted file mode 100644 index 2bf1adc049..0000000000 --- a/courses.dist/modelCourse/templates/achievements/put_me_in_coach.at +++ /dev/null @@ -1,92 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. If it has then it updates the counter -#(You would edit this file to say which sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update counter; - $counter++; - } - -if ($counter >= $maxCounter) { - return 1; -} else { - return 0; -} - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file diff --git a/courses.dist/modelCourse/templates/achievements/reaching_a_limit.at b/courses.dist/modelCourse/templates/achievements/reaching_a_limit.at deleted file mode 100644 index f49550a862..0000000000 --- a/courses.dist/modelCourse/templates/achievements/reaching_a_limit.at +++ /dev/null @@ -1,93 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. If it has then it updates the counter -#(You would edit this file to say which sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update counter; - $counter++; - } - -if ($counter >= $maxCounter) { - return 1; -} else { - return 0; -} - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/really_early_bird.at b/courses.dist/modelCourse/templates/achievements/really_early_bird.at index 840a07debb..77438d3840 100644 --- a/courses.dist/modelCourse/templates/achievements/really_early_bird.at +++ b/courses.dist/modelCourse/templates/achievements/really_early_bird.at @@ -1,82 +1,10 @@ -#This checks to see if the student has finished the set within a certain time - - #test to see if it is before 2 hours after the open date - if ((time()-$set->open_date) > 7200) { - return 0; - } +# This achievement is awarded for completing a set within 2 hours +# or 2 * 60 * 60 = 7200 seconds of it opening. +# +# See [templates]/achievements/achievement_readme.txt for details. - #if it is check to see if we have finished the set - foreach my $problemRecord (@setProblems) { - if ($problemRecord->status != 1) { - return 0; - } - } - - return 1; +# Check if this set has been completed. +return 0 unless $globalData->{completedSetIds}{ $set->set_id }; -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +# Now test if it is before 2 hours after the open date. +return time - $set->open_date > 7200 ? 0 : 1; diff --git a/courses.dist/modelCourse/templates/achievements/revolucion_redux.at b/courses.dist/modelCourse/templates/achievements/revolucion_redux.at deleted file mode 100644 index 491560c4dd..0000000000 --- a/courses.dist/modelCourse/templates/achievements/revolucion_redux.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/seeing_green.at b/courses.dist/modelCourse/templates/achievements/seeing_green.at index 1c311cb5dc..da49c2c1f5 100644 --- a/courses.dist/modelCourse/templates/achievements/seeing_green.at +++ b/courses.dist/modelCourse/templates/achievements/seeing_green.at @@ -1,84 +1,15 @@ -#This checks to see if the student has finished the set -# with fewer than a certain number of incorrect submissions +# This achievement is rewarded for completing a set with no incorrect +# submissions. +# +# See [templates]/achievements/achievement_readme.txt for details. - my $allcorrect = 1; - - foreach my $problemRecord (@setProblems) { - if ($problemRecord->status != 1 || $problemRecord->num_incorrect != 0) { - $allcorrect = 0; - last; - } - } - - if ($allcorrect) { - return 1; - } else { - return 0; - } +# Check if this set has been completed. +return 0 unless $globalData->{completedSetIds}{ $set->set_id }; -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +# Check if any problem has an incorrect submission. +for my $problemRecord (@setProblems) { + return 0 unless $problemRecord->num_incorrect == 0; +} + +# No incorrect submissions found. Award achievement. +return 1; diff --git a/courses.dist/modelCourse/templates/achievements/speed_mather.at b/courses.dist/modelCourse/templates/achievements/speed_mather.at index 036a2e4b3e..939072008c 100644 --- a/courses.dist/modelCourse/templates/achievements/speed_mather.at +++ b/courses.dist/modelCourse/templates/achievements/speed_mather.at @@ -1,93 +1,13 @@ -#This checks to see if the student has finished the whole set in -# less than 10 minutes from time to first input to time to last answer. - -# If the set id doest equal the id of the last set then set -# *this* set as the last set, and set the start time +# This achievement is awarded for completing a set in less than +# 1 hour from the first submit to last answer. +# +# See [templates]/achievements/achievement_readme.txt for details. -if ($problem->set_id ne $localData->{last_set}) { - $localData->{last_set} = $problem->set_id; - $localData->{start_time} = time(); - return 0; -} +# Store the start times of every attempted set. +$localData->{start_times}{ $set->set_id } //= time; -# of we spent more than 10 minutes on the set then leave -if ((time() - $localData->{start_time}) > 3600) { - return 0; -} else { #if it is check to see if we have finished the set - - foreach my $problemRecord (@setProblems) { - if ($problemRecord->status != 1) { - return 0; - } - } - - #the set is done so we are finished - return 1; -} +# Return unless set is complete. +return 0 unless $globalData->{completedSetIds}{ $set->set_id }; -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +# Check if more than 1 hour = 60 * 60 = 3600 seconds have passed. +return time - $localData->{start_times}{ $set->set_id } > 3600 ? 0 : 1; diff --git a/courses.dist/modelCourse/templates/achievements/still_not_right.at b/courses.dist/modelCourse/templates/achievements/still_not_right.at index e0d51da580..80b968f712 100644 --- a/courses.dist/modelCourse/templates/achievements/still_not_right.at +++ b/courses.dist/modelCourse/templates/achievements/still_not_right.at @@ -1,89 +1,33 @@ -# checks to see if the student has inputted the same answer many times in a -# row. Because the $problem-last_answer field is updated *after* the -# achievements are evaluated, this acheivement will pop up late. +# This achievement is awarded if the student has inputted the same answer +# many times in a row. Because the $problem->last_answer field is updated +# *after* the achievements are evaluated, this achievement will pop up late. +# +# See [templates]/achievements/achievement_readme.txt for details. - $localData->{incorrect_streak} = 0 unless $localData->{incorrect_streak}; +# Initialize $localData. +$localData->{incorrect_streak} //= 0; - if ($problem->status == 1) { - return 0; - } elsif ($problem->set_id ne $localData->{set_id} || - $problem->problem_id ne $localData->{problem_id} || - $problem->last_answer ne $localData->{last_answer}) { - $localData->{set_id} = $problem->set_id; - $localData->{problem_id} = $problem->problem_id; - $localData->{last_answer} = $problem->last_answer; - $localData->{incorrect_streak} = 1; +# If the problem is correct, reset counter and move on. +if ($problem->status == 1) { + $localData->{incorrect_streak} = 0; return 0; - } elsif ($localData->{incorrect_streak} == 9) { - return 1; - } else { - $localData->{incorrect_streak}++; +} + +# Check if the student is working on the same problem, with +# the same last answer. If not update data. +if ($problem->set_id ne $localData->{set_id} + || $problem->problem_id ne $localData->{problem_id} + || $problem->last_answer ne $localData->{last_answer}) +{ + $localData->{set_id} = $problem->set_id; + $localData->{problem_id} = $problem->problem_id; + $localData->{last_answer} = $problem->last_answer; + $localData->{incorrect_streak} = 1; return 0; - } +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +# Award achievement or increment streak. +return 1 if $localData->{incorrect_streak} == 9; + +++$localData->{incorrect_streak}; +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/super_persistence.at b/courses.dist/modelCourse/templates/achievements/super_persistence.at index 2a1e8a2127..676b2480b2 100644 --- a/courses.dist/modelCourse/templates/achievements/super_persistence.at +++ b/courses.dist/modelCourse/templates/achievements/super_persistence.at @@ -1,76 +1,13 @@ -#This checks to see if the student has solved the problem after a certain -# number of incorrect attempts - - if ($problem->status == 1 && $problem->num_correct == 1 && $problem->num_incorrect >= 100) { - return 1 - } else { - return 0; - } +# Award this achievement if a student solves a problem after +# answering it incorrectly more than 100 times. +# +# See [templates]/achievements/achievement_readme.txt for details. +if ($problem->status == 1 + && $problem->num_correct == 1 + && $problem->num_incorrect >= 100) +{ + return 1; +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/super_speed_math.at b/courses.dist/modelCourse/templates/achievements/super_speed_math.at index 32b6474fda..666d6ee5bb 100644 --- a/courses.dist/modelCourse/templates/achievements/super_speed_math.at +++ b/courses.dist/modelCourse/templates/achievements/super_speed_math.at @@ -1,93 +1,13 @@ -#This checks to see if the student has finished the whole set in -# less than 10 minutes from time to first input to time to last answer. - -# If the set id doest equal the id of the last set then set -# *this* set as the last set, and set the start time +# This achievement is awarded for completing a set in less than +# 10 minutes from the first submit to last answer. +# +# See [templates]/achievements/achievement_readme.txt for details. -if ($problem->set_id ne $localData->{last_set}) { - $localData->{last_set} = $problem->set_id; - $localData->{start_time} = time(); - return 0; -} +# Store the start times of every attempted set. +$localData->{start_times}{ $set->set_id } //= time; -# of we spent more than 10 minutes on the set then leave -if ((time() - $localData->{start_time}) > 600) { - return 0; -} else { #if it is check to see if we have finished the set - - foreach my $problemRecord (@setProblems) { - if ($problemRecord->status != 1) { - return 0; - } - } - - #the set is done so we are finished - return 1; -} +# Return unless set is complete. +return 0 unless $globalData->{completedSetIds}{ $set->set_id }; -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +# Check if more than 10 minutes = 10 * 60 = 600 seconds have passed. +return time - $localData->{start_times}{ $set->set_id } > 600 ? 0 : 1; diff --git a/courses.dist/modelCourse/templates/achievements/tangent_plane.at b/courses.dist/modelCourse/templates/achievements/tangent_plane.at deleted file mode 100644 index 878b48c1ad..0000000000 --- a/courses.dist/modelCourse/templates/achievements/tangent_plane.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '1' => 1, - '3' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/taylor_hero.at b/courses.dist/modelCourse/templates/achievements/taylor_hero.at deleted file mode 100644 index 491560c4dd..0000000000 --- a/courses.dist/modelCourse/templates/achievements/taylor_hero.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/the_fundamentals.at b/courses.dist/modelCourse/templates/achievements/the_fundamentals.at deleted file mode 100644 index 491560c4dd..0000000000 --- a/courses.dist/modelCourse/templates/achievements/the_fundamentals.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/the_lhopital.at b/courses.dist/modelCourse/templates/achievements/the_lhopital.at deleted file mode 100644 index 491560c4dd..0000000000 --- a/courses.dist/modelCourse/templates/achievements/the_lhopital.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/third_time.at b/courses.dist/modelCourse/templates/achievements/third_time.at index 3d76898e3d..cd1ccf9993 100644 --- a/courses.dist/modelCourse/templates/achievements/third_time.at +++ b/courses.dist/modelCourse/templates/achievements/third_time.at @@ -1,75 +1,13 @@ -#This checks to see if the student has a certain number of attempts +# This achievement is awarded for completing a problem correctly on the +# third submit. +# +# See [templates]/achievements/achievement_readme.txt for details. - if ($problem->num_correct == 1 and $problem->num_incorrect == 2 and $problem->status == 1) { +if ($problem->num_correct == 1 + && $problem->num_incorrect == 2 + && $problem->status == 1) +{ return 1; - } else { - return 0; - } - +} -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file +return 0; diff --git a/courses.dist/modelCourse/templates/achievements/three_in_a_row.at b/courses.dist/modelCourse/templates/achievements/three_in_a_row.at deleted file mode 100644 index baddd04e8f..0000000000 --- a/courses.dist/modelCourse/templates/achievements/three_in_a_row.at +++ /dev/null @@ -1,86 +0,0 @@ -#This checks to see if the student has solved 10 problems without having any -# incorrect answers - -# reset counter if they got something wrong -if ($problem->status < 1) { - $counter = 0; - return 0; -# if they are right update the counter -} elsif ($problem->status == 1 && - $problem->num_correct == 1 && - $problem->num_incorrect == 0 ) { - $counter++; -} - -if ($counter >= $maxCounter) { - return 1; -} else { - return 0; -} - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/to_infinity.at b/courses.dist/modelCourse/templates/achievements/to_infinity.at deleted file mode 100644 index 491560c4dd..0000000000 --- a/courses.dist/modelCourse/templates/achievements/to_infinity.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/trig_ninja.at b/courses.dist/modelCourse/templates/achievements/trig_ninja.at deleted file mode 100644 index 491560c4dd..0000000000 --- a/courses.dist/modelCourse/templates/achievements/trig_ninja.at +++ /dev/null @@ -1,88 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - return 1; - } - - return 0; - - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/triple_integral.at b/courses.dist/modelCourse/templates/achievements/triple_integral.at deleted file mode 100644 index a351b86d4c..0000000000 --- a/courses.dist/modelCourse/templates/achievements/triple_integral.at +++ /dev/null @@ -1,92 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. If it has then it updates the counter -#(You would edit this file to say which sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update counter; - $counter++; - } - -if ($counter >= $maxCounter) { - return 1; -} else { - return 0; -} - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. diff --git a/courses.dist/modelCourse/templates/achievements/vector_fields.at b/courses.dist/modelCourse/templates/achievements/vector_fields.at deleted file mode 100644 index 25d6b90be5..0000000000 --- a/courses.dist/modelCourse/templates/achievements/vector_fields.at +++ /dev/null @@ -1,92 +0,0 @@ -#This problem checks to see if a particular problem from a list of valid -# sets and problems has been solved. (You would edit this file to say which -# sets and problems count.) - -#constants -my %validproblems = ( - 'SetNameHere' => { #now you show which problems are valid like: - '2' => 1, - '1' => 1, }, #and put more sets here - ); - -#check and see if this problem was solved -if ($validproblems{$problem->set_id} && - $validproblems{$problem->set_id}{$problem->problem_id} && - $problem->status == 1 && - $problem->num_correct == 1) { - #update counter; - $counter++; - } - -if ($counter >= $maxCounter) { - return 1; -} else { - return 0; -} - -# -You have access to a variety of variables: -# - $problem : the problem data (changes to this variable will not be saved!) -# This variable contains the problem data. It is a hash pointer with the -# following values (not all values shown) -# - $problem->status : the score of the current problem -# - $problem->problem_id : the id of the current problem -# - $problem->set_id : the id of the set containing the problem -# - $problem->num_correct : the number of correct attempts -# - $problem->num_incorrect : the number of incorrect attempts -# - $problem->last_answer : the last answer submitted -# - $problem->max_attempts : the maximum number of allowed attempts -# -# - $set : the set data (changes to this variable will not be saved!) -# This variable contains the set data. it is a hash pointer with the -# following values. (not all values shown) -# - $set->open_date : when the set was open -# - $set->due_date : when the set is due -# -# - @setProblems : the problem data for all the problems from this set. -# (changes to this variable will not be saved!) -# This is an array of problem hashes. Each element of the array has the -# save hash keys as the $problem variable above -# -# - $counter : the users counter associated to this achievement -# (changes to this variable *will* be saved!) -# If this achievement has a counter associated to it (i.e. solve 20 problems) -# then this is where you store the students counter for this achievement. -# This variable will initally start as '' -# -# - $maxCounter : the goal for the $counter variable for this achievement -# (changes to this variable will not be saved!) -# If this achievement has a counter associated to it then this variable -# contains the goal for the counter. Your achievement should return 1 -# when $counter >= $maxCounter. These two variables are used to show a -# progress bar for the achievement. -# -# - $tags : this contains the metadata for the problem stored in a hash. This includes DBsubject -# DBchapter and DBsection Note: These values are not super stable and are likely to change -# from problem to problem and year to year -# -# - $localData : this is a hash which stores data for this user and achievement -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation. You can store whatever -# you like in here and it can be accessed next time this evaluator is run. -# Two things to keep in mind. The data in this hash will *not* be accessable -# by other achievements. If you plan to store something in this hash you have -# to write code to initialize the data. -# -# - $globalData : this is a hash which stores data for all achievements -# (changes to this variable *will* be saved!) -# This hash will persist from evaluation to evaluation and, like $localData, -# you can store whatever you like in here. This data will be accessable from -# *every* achievement and is unique to the user. Like $localData, you need to -# initialize any variable you plan on using in this hash. There are two -# variables stored in this hash that are maintained by the system. -# - $globalData->{completeSets} : This is the number of sets which the student -# has earned 100% on -# - $globalData->{completeProblems} : This is the number of problems which the -# student has earned 100% on -# Warning: The achievements are always evaluated in the order they are listed -# on the Instructors achievement editor page. To make matters more -# complicated, achievements which have already been earned are not evaluated -# at all. The up-shot of this is that when modifying variables in -# $globalData you need to either write your code so it doesnt matter which -# order the evaluators are run in, or you need to pay very close attention -# to which evaluators are run and when. \ No newline at end of file diff --git a/courses.dist/modelCourse/templates/capaLibrary b/courses.dist/modelCourse/templates/capaLibrary deleted file mode 120000 index 4678d8df5c..0000000000 --- a/courses.dist/modelCourse/templates/capaLibrary +++ /dev/null @@ -1 +0,0 @@ -../../../libraries/webwork-open-problem-library/Contrib/CAPA \ No newline at end of file diff --git a/courses.dist/modelCourse/templates/setDemo.def b/courses.dist/modelCourse/templates/setDemo.def deleted file mode 100644 index 48afedf1c9..0000000000 --- a/courses.dist/modelCourse/templates/setDemo.def +++ /dev/null @@ -1,86 +0,0 @@ -assignmentType = default -openDate = 01/10/1998 at 06:00am EST -reducedScoringDate = 01/01/2006 at 02:00am EST -dueDate = 01/01/2006 at 02:00am EST -answerDate = 01/01/2006 at 02:00am EST -enableReducedScoring = N -paperHeaderFile = setDemo/paperHeaderFile1.pg -screenHeaderFile = setDemo/screenHeaderFile1.pg -description = -restrictProbProgression = 0 -emailInstructor = 0 - -problemListV2 -problem_start -problem_id = 1 -source_file = setDemo/srw1_9_4.pg -value = 1 -max_attempts = -1 -showMeAnother = -1 -counts_parent_grade = 0 -att_to_open_children = 1 -problem_end -problem_start -problem_id = 2 -source_file = setDemo/limits.pg -value = 1 -max_attempts = -1 -showMeAnother = -1 -counts_parent_grade = 0 -att_to_open_children = 1 -problem_end -problem_start -problem_id = 3 -source_file = setDemo/s2_2_1.pg -value = 1 -max_attempts = -1 -showMeAnother = -1 -counts_parent_grade = 0 -att_to_open_children = 1 -problem_end -problem_start -problem_id = 4 -source_file = setDemo/c4s5p2.pg -value = 1 -max_attempts = -1 -showMeAnother = -1 -counts_parent_grade = 0 -att_to_open_children = 1 -problem_end -problem_start -problem_id = 5 -source_file = setDemo/sample_units_ans.pg -value = 1 -max_attempts = -1 -showMeAnother = -1 -counts_parent_grade = 0 -att_to_open_children = 1 -problem_end -problem_start -problem_id = 6 -source_file = setDemo/nsc2s10p2.pg -value = 1 -max_attempts = -1 -showMeAnother = -1 -counts_parent_grade = 0 -att_to_open_children = 1 -problem_end -problem_start -problem_id = 7 -source_file = setDemo/prob5.pg -value = 1 -max_attempts = -1 -showMeAnother = -1 -counts_parent_grade = 0 -att_to_open_children = 1 -problem_end -problem_start -problem_id = 8 -source_file = setDemo/sample_myown_ans.pg -value = 1 -max_attempts = -1 -showMeAnother = -1 -counts_parent_grade = 0 -att_to_open_children = 1 -problem_end - diff --git a/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg b/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg deleted file mode 100644 index 6eb9981877..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/c4s5p2.pg +++ /dev/null @@ -1,49 +0,0 @@ -#DESCRIPTION -#KEYOWRDS('integrals', 'substitution') -# Integrals - \int_0^{$x1} x(x^2 ?{$a})^5 dx -# Substitution -#ENDDESCRIPTION - -DOCUMENT(); # This should be the first executable line in the problem. - -loadMacros("PGbasicmacros.pl", - "PGchoicemacros.pl", - "PGanswermacros.pl", - "PGauxiliaryFunctions.pl" -); - -$showPartialCorrectAnswers = 1; - -$n = random(3,6,1); -$n1 = $n-1; - -BEGIN_TEXT -Find \[ F(x) = \int x^{$n1}\cos(x^{$n}) \; dx \] -Give a specific function for \( F(x) \). $BR $BR - -F(x) = \{ans_rule(45)\} -END_TEXT - -$ans = "sin(x^$n)/$n"; -ANS(function_cmp_up_to_constant($ans )); - -#$ans = "sin(x^$n)/$n + c"; # c is the constant of integration which - # is a free parameter. It can be adjusted - # to match the student's answer. -#ANS( fun_cmp($ans, params => ['c'] ) ); -$a1= random(-9,-1,1); -$b1= random(0,9,1); - -BEGIN_TEXT -$BR $BR -Evaluate \[ F(x) = \int_{$a1}^{$b1} x^{$n1}\cos(x^{$n}) \; dx \] -$BR -\{ans_rule(50)\} -END_TEXT - -$ans = (sin($b1**$n) - sin($a1**$n))/$n; - -&ANS(num_cmp($ans )); - - -ENDDOCUMENT(); # This should be the last executable line in the problem. diff --git a/courses.dist/modelCourse/templates/setDemo/calc.html b/courses.dist/modelCourse/templates/setDemo/calc.html deleted file mode 100644 index 1056894e8f..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/calc.html +++ /dev/null @@ -1,57 +0,0 @@ - - -The JavaScript Source: Calculators: Basic - - - - - - -

- - -I took this calculator straight from the web at javascriptsource.com -

- -This is a very simple calculator, -all done with javascript. -Just click the numbers and -the operators and use the "=" button to calculate! - -

-
- - - - - - - -
- -
-
- - - - -
- - - - -
- - - - -
- - - - -
-
-
-
- diff --git a/courses.dist/modelCourse/templates/setDemo/josephus.pg b/courses.dist/modelCourse/templates/setDemo/josephus.pg deleted file mode 100644 index 605dca6f76..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/josephus.pg +++ /dev/null @@ -1,204 +0,0 @@ -&DOCUMENT(); -loadMacros("PGbasicmacros.pl", - "PGchoicemacros.pl", - "PGanswermacros.pl", -); -# define function to be evaluated - -HEADER_TEXT(< - -function joeGame(n, k, m){ -this.people = n -this.skip = k -this.keep = m -this.list = new Array(n) -for (var i=0; i n) { - x = Math.floor(( k*(x-n) - 1.0 )/ (k-1.0) ) - } -return(x) -} - -function playGame() { - -var newN = parseInt(document.gameForm.peopleNumField.value) -var newK = parseInt(document.gameForm.skipNumField.value) - -var suff = new String("th") - -var s -var n = newN -var k = newK -var numRows = Math.floor(n/20) -var numLeft = n - 20*numRows - -if (!newN || !newK) { - alert ("Enter some data.") - document.gameForm.peopleNumField.focus() - } -else - { - -currentGame = new joeGame(n, k, 1) - -for (var s=1; s<=currentGame.people; s++){ - currentGame.list[s-1] = joeth(n, k, s) - } - -if ((newK % 10) == 1) { - if ((newK == 1) || (newK > 20)) { - suff = "st" - } - else { - suff="th" - } -} -else { - if ((newK % 10) == 2){ - if ((newK == 2) || (newK > 20)) { - suff = "nd" - } - else { - suff="th" - } - } - else { - if ((newK % 10) == 3){ - if ((newK == 3) || (newK > 20)) { - suff = "rd" } - else { - suff="th" - } - } - } -} - -parent.gameStatus.document.clear() -parent.gameStatus.document.write("

The Josephus Game

") -parent.gameStatus.document.write(" Playing the Josephus Game with " + - document.gameForm.peopleNumField.value + " people, ") -parent.gameStatus.document.write(" eliminating every " + - document.gameForm.skipNumField.value + "" + suff + " person, leaves ") -parent.gameStatus.document.write(" person " + currentGame.list[n-1] + " as the last survivor. ") -parent.gameStatus.document.write("

The entire elimination order is

") - -for (var d=0; d \n Order Eliminated ") - for (var k=1; k<=20; k++) { - parent.gameStatus.document.write(" " + (20*d + k) + " ") - } - parent.gameStatus.document.write(" \n Person Eliminated ") - - for (k=0; k<20; k++) { - parent.gameStatus.document.write(" " + currentGame.list[20*d+k] + " ") - } - parent.gameStatus.document.write(" \n
") - } -if (numLeft > 0) { - parent.gameStatus.document.write(" \n ") - for (var k=1; k<=numLeft; k++) { - parent.gameStatus.document.write(" ") - } - parent.gameStatus.document.write(" \n ") - - for (k=0; k " + currentGame.list[20*d+k] + " ") - } - parent.gameStatus.document.write(" \n
Order Eliminated " + (20*d + k) + "
Person Eliminated

") - } - } - parent.gameStatus.document.close() -} - - -function clearStuff(){ -parent.gameStatus.document.open() -parent.gameStatus.document.clear() -parent.gameStatus.document.location = "gamestart.html" -parent.gameStatus.document.close() -document.gameForm.peopleNumField.focus() -currentGame.people = 10 -currentGame.skip = 0 -currentGame.keep = 0 -for (var i=0; i++; i - - -EOF - -TEXT(MODES( -TeX => '', -Latex2HTML => "\begin{rawhtml} \end{rawhtml}", -HTML => "" -)); - -BEGIN_TEXT -$PAR -This problem illustrates how you can embed JavaScript code in a WeBWorK example -to create an interactive homework problem that could never be provided by a text book. -Stolen from Doug Ensley and mathDL. -http://www.mathdl.org/offsite.html?page=http://www.ship.edu/~deensl/mathdl/Joseph.html&content_id=41520 -END_TEXT - -BEGIN_TEXT - -END_TEXT -TEXT(< - - - - - - -
- - - - - - - - - - - - -
n = 
k = 
-		Set the parameters and press Start -to see the elimination order when you start with n people -and eliminate every kth one.
- -

-EOF -$ans =3; - -ANS(num_cmp($ans,reltol=>1,format =>"%0.14g") ); #We are allowing 1 percent error for the answer. - - -ENDDOCUMENT(); diff --git a/courses.dist/modelCourse/templates/setDemo/limits.pg b/courses.dist/modelCourse/templates/setDemo/limits.pg deleted file mode 100644 index 4bb29e5280..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/limits.pg +++ /dev/null @@ -1,89 +0,0 @@ -DOCUMENT(); # This should be the first executable line in the problem. - -loadMacros( - "PGbasicmacros.pl", - "PGchoicemacros.pl", - "PGanswermacros.pl", - "PGgraphmacros.pl", - "PGauxiliaryFunctions.pl" -); - -$showPartialCorrectAnswers = 1; - -$a=random(-3,3,1); -$b=random(-2,3,1); -$c=random(-3,2,1); -$m1=random(-1,1,0.5); -$m2=($b - $a)/2; -$m3=($c - $b - 1)/2; -$m4=random(-1,1,0.5); -@slice = NchooseK(3,3); - -@colors = ("blue", "red", "green"); -@sc = @colors[@slice]; #scrambled colors -@sa = ('A','B','C')[@slice]; - -$f1 = FEQ("${m1}(x+1) + $a for x in [-2,-1) using color:$sc[0] and weight:2"); -$f2 = FEQ("${m2}(x-1) + $b for x in (-1,1) using color=$sc[0] and weight:2"); -$f3 = FEQ("${m3}(x-3) + $c for x in [1,3) using color=$sc[0] and weight=2"); -$f4 = FEQ("1+$a for x in [-1,-1] using color=$sc[0] and weight=2"); -$f5 = FEQ("${m4}(x-3) + $c for x in (3,4] using color=$sc[0] and weight=2"); - -$graph = init_graph(-3,-6,5,6,'axes'=>[0,0],'grid'=>[8,12]); - -($f1Ref,$f2Ref,$f3Ref,$f4Ref,$f5Ref) = plot_functions($graph,$f1,$f2,$f3,$f4,$f5); - -BEGIN_TEXT -Let F be the function below.$PAR -If you are having a hard time seeing the picture clearly, click on the picture. It will expand to a larger picture on its own page so that you can inspect it more clearly.$PAR -END_TEXT - -TEXT(image( insertGraph($graph), height=>200, width=>200 )); - -BEGIN_TEXT -$BR -$BR -Evaluate each of the following expressions. $PAR -Note: Enter 'DNE' if the limit does not exist or is not defined. $PAR - -a) \( \lim_{x \to -1^-} F(x) \) = \{ans_rule(4)\} -$PAR - -b) \( \lim_{x \to -1^+} F(x) \) = \{ans_rule(4)\} -$PAR - -c) \( \lim_{x \to -1} F(x) \) = \{ans_rule(4)\} -$PAR - -d) \( F(-1) \) = \{ans_rule(4)\} -$PAR - -e) \( \lim_{x \to 1^-} F(x) \) = \{ans_rule(4)\} -$PAR - -f) \( \lim_{x \to 1^+} F(x) \) = \{ans_rule(4)\} -$PAR - -g) \( \lim_{x \to 1} F(x) \) = \{ans_rule(4)\} -$PAR - -h) \( \lim_{x \to 3} F(x) \) = \{ans_rule(4)\} -$PAR - -i) \( F(3) \) = \{ans_rule(4)\} -$PAR - -END_TEXT - -$ap1 = 1 + $a; -$bp1 = 1 + $b; - -# limits at -1 -ANS(num_cmp( [ $a, $a, $a, $ap1] , strings => ['DNE'] )) ; -# limits at 1 -ANS(num_cmp( [ $b, $bp1,'DNE'] , strings => ['DNE'] )) ; -# limits at 3 -ANS(num_cmp( [ $c, 'DNE' ] , strings => ['DNE'] )) ; - - -ENDDOCUMENT(); # This should be the last executable line in the problem. diff --git a/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg b/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg deleted file mode 100644 index a00e0178be..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/liteApplet1.pg +++ /dev/null @@ -1,67 +0,0 @@ -DOCUMENT(); - -loadMacros("PGbasicmacros.pl", - "PGchoicemacros.pl", - "PGanswermacros.pl", -); - -$showPartialCorrectAnswers = 1; - -# The link to the java applet is hard wired to use the java applet -# served from the University of Rochester WeBWorK machine. -# It is possible to set this up so that the java applet is served -# from any machine -# For details use the Feedback button to contact the authors of WeBWorK - -BEGIN_TEXT -This is a lite applet designed by Frank Wattenberg. -$BR -\{htmlLink( '/webwork2_course_files/demoCourse/live_map_instructions.html ', -'Instructions for using the map',' target="intro" ' )\} -$HR -END_TEXT -$appletText = -appletLink( -q! archive="/courses/system_html/applets/Image_and_Cursor_All/Image_and_Cursor.jar" -code="Image_and_Cursor" width = 500 height = 458 -!, -q!Your browser does not support Java, so nothing is displayed. - - - - - - - -! -); -sub dist { - my $ra_pt1 = shift; - my $ra_pt2 =shift; - my $conversion = 300 /(145 - 72); # number of km per pixel - return $conversion* sqrt( ($ra_pt1->[0] - $ra_pt2->[0])**2 + ($ra_pt1->[1] - $ra_pt2->[1])**2); -} - -$kandahar = [132,101]; -$kabul = [209,185]; -$mazur_e_sharif = [170, 243]; -$shindand = [46, 155]; - -$questions = EV3( -"$PAR How far is it from Kandahar to Kabul? " , ans_rule(30), -" $PAR How far is it from Kabul to Mazar-e-Sharif? ", ans_rule(30), -" $PAR How far is it from Kandahar to Shindand? " , ans_rule(30), -); -#TEXT( -#begintable(2), -#row( $appletText, $questions), -#endtable() -#); -TEXT($appletText, $questions); -ANS(num_cmp(dist($kandahar,$kabul), reltol => 3, units=>'km')); -ANS(num_cmp(dist($kabul, $mazur_e_sharif), reltol => 3, units=>'km')); -ANS(num_cmp(dist($kandahar,$shindand), reltol => 3, units=>'km')); - - - -ENDDOCUMENT(); diff --git a/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg b/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg deleted file mode 100644 index 00b754242d..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/liteApplet2.pg +++ /dev/null @@ -1,72 +0,0 @@ -DOCUMENT(); - -loadMacros("PGbasicmacros.pl", - "PGchoicemacros.pl", - "PGanswermacros.pl", -); - -$showPartialCorrectAnswers = 1; - -BEGIN_TEXT -This is a lite applet designed by Frank Wattenberg. -$BR -\{htmlLink( '/webwork2_course_files/demoCourse/live_map_instructions.html ', -'Instructions for using the map',' target="intro" ' )\} -$HR -END_TEXT -TEXT( -appletLink( -q! archive="/courses/system_html/applets/Image_and_Cursor_All/Image_and_Cursor.jar" -code="Image_and_Cursor" width = 500 height = 458 -!, -q!Your browser does not support Java, so nothing is displayed. - - - - - - - -! -), -); -sub dist { - my $ra_pt1 = shift; - my $ra_pt2 =shift; - $conversion = 300 /(145 - 72); # number of km per pixel - return $conversion * sqrt( ($ra_pt1->[0] - $ra_pt2->[0])**2 + ($ra_pt1->[1] - $ra_pt2->[1])**2); -} -@cities = ( - { name => 'Kandahar', location => [132,101] }, - { name => 'Kabul', location => [209,185] }, - { name => 'Mazur e Sharif', location => [170, 243] }, - { name => 'Shindand', location => [46, 155] }, - { name => 'Zaranj', location => [39, 93] } -); -@index = NchooseK(scalar(@cities), 3 ); -sub cityName { - my $index = shift ; - $cities[$index -1]->{name}; -} -sub cityLoc { - my $index = shift; - $cities[$index-1]->{location}; -} - -$conversion = 300 /(145 - 72); # number of km per pixel -BEGIN_TEXT -$PAR -How far is it from \{cityName($index[1])\} to \{cityName($index[2])\}? \{ans_rule(30)\} -$PAR -How far is it from \{cityName($index[1])\} to \{cityName($index[3])\}? \{ans_rule(30)\} -$PAR -How far is it from \{cityName($index[2])\} to \{cityName($index[3])\}? \{ans_rule(30)\} -END_TEXT - -ANS(num_cmp(dist(cityLoc($index[1]),cityLoc($index[2])), reltol=>3, units=>'km')); -ANS(num_cmp(dist(cityLoc($index[2]), cityLoc($index[2])), reltol=>3, units=>'km')); -ANS(num_cmp(dist(cityLoc($index[2]),cityLoc($index[2])), reltol=>3, units=>'km')); - - - -ENDDOCUMENT(); diff --git a/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg b/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg deleted file mode 100644 index 632cad14d7..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/nsc2s10p2.pg +++ /dev/null @@ -1,66 +0,0 @@ -#DESCRIPTION -# Identify the graphs of the function and the derivative -#ENDDESCRIPTION - -#KEYWORDS('derivatives', 'graphs') -DOCUMENT(); # This should be the first executable line in the problem. - -loadMacros( - "PGbasicmacros.pl", - "PGchoicemacros.pl", - "PGanswermacros.pl", - "PGauxiliaryFunctions.pl", - "PGgraphmacros.pl" -); - -$showPartialCorrectAnswers = 0; - -$a=random(0, 6.3, .1); -$b=random(1.1, 1.5, .1); - -$dom = 4; -@slice = NchooseK(3,3); - -@colors = ("blue", "red", "black"); -@sc = @colors[@slice]; #scrambled colors -@sa = ('A','B','C')[@slice]; - - -$f = "sin($a+$b*cos(x)) for x in <-$dom,$dom> using color:$sc[0] and weight:2"; -$fp = "cos($a+$b*cos(x))*(-$b)*sin(x) for x in <-$dom,$dom> using color=$sc[1] and weight:2"; -$fpp = " -sin($a+$b*cos(x))*$b*$b*sin(x)*sin(x) + cos($a+$b*cos(x))*(-$b)*cos(x) for x in <-$dom,$dom> using color=$sc[2] and weight=2"; - -$graph = init_graph(-4,-4,4,4,'axes'=>[0,0],'grid'=>[8,8]); - -($fRef,$fpRef,$fppRef) = plot_functions( $graph, - $f,$fp,$fpp - ); - -# create labels - -$label_point=-0.75; -$label_f = new Label ( $label_point,&{$fRef->rule}($label_point),$sa[0],"$sc[0]",'left') ; - # NOTE: $fRef->rule is a reference to the subroutine which calculates the - # function. It was defined in the output of plot_functions. It is used here - # to calculate the y value of the label corresponding to the function, - # and below to find the y values for the labels corresponding to the - # first and second derivatives. - -$label_fp = new Label ( $label_point,&{$fpRef->rule}($label_point),$sa[1],"$sc[1]",'left') ; -$label_fpp = new Label ( $label_point,&{$fppRef->rule}($label_point),$sa[2],"$sc[2]",'left'); - -# insert the labels into the graph - -$graph->lb($label_f,$label_fp,$label_fpp); - -BEGIN_TEXT -\{ image(insertGraph($graph))\}$BR -Identify the graphs A (blue), B( red) and C (green) as the graphs of a function and its -derivatives:$PAR -\{ans_rule(4)\} is the graph of the function $PAR -\{ans_rule(4)\} is the graph of the function's first derivative $PAR -\{ans_rule(4)\} is the graph of the function's second derivative $PAR -END_TEXT -ANS(std_str_cmp_list( @sa ) ); - -ENDDOCUMENT(); # This should be the last executable line in the problem. diff --git a/courses.dist/modelCourse/templates/setDemo/paperHeaderFile1.pg b/courses.dist/modelCourse/templates/setDemo/paperHeaderFile1.pg deleted file mode 100644 index 1b9210ae6e..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/paperHeaderFile1.pg +++ /dev/null @@ -1,27 +0,0 @@ -##Problem set header for set 0, Spring 1999 - -&DOCUMENT; - -loadMacros( -"PG.pl", -"PGbasicmacros.pl", -"PGchoicemacros.pl", -"PGanswermacros.pl" -); - -TEXT(EV2(<' ) \} -END_OF_TEXT - -## - -TEXT("$BR$BR",ans_rule(30),"$BR"); -ANS( CAPA_ans( $v0 , 'format' => "%0.2e" , 'sig' => '3 PLUS 13', 'reltol' => 1 , 'wgt' => $prob_val , 'tries' => $prob_try , 'unit' => 'm/s' ) ); -ENDDOCUMENT(); -##################### - -###Error: $smallg not defined in this file -###Error: $degrad not defined in this file -###Error: $degrad not defined in this file -###Error: $degrad not defined in this file -###Error: $deg_u not defined in this file -###Error: $m_u not defined in this file -###Error: $m_u not defined in this file -###Error: $prob_val not defined in this file -###Error: $prob_try not defined in this file - -##################### - - -################################################# -## Processing time = 0 secs ( 0.56 usr 0.00 sys = 0.56 cpu) -################################################# diff --git a/courses.dist/modelCourse/templates/setDemo/prob5.pg b/courses.dist/modelCourse/templates/setDemo/prob5.pg deleted file mode 100644 index 670194a3fe..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/prob5.pg +++ /dev/null @@ -1,136 +0,0 @@ -&DOCUMENT(); -loadMacros("PGbasicmacros.pl", - "PGchoicemacros.pl", - "PGanswermacros.pl", -); -######################################################### -# allow the student to change the seed for this problem. - -$newProblemSeed = ( defined( ${$inputs_ref}{'newProblemSeed'} ) )? ${$inputs_ref}{'newProblemSeed'} : $problemSeed; -$PG_random_generator->srand($newProblemSeed); -BEGIN_TEXT -To see a different version of the problem change -the problem seed and press the 'Submit Answer' button below.$PAR Problem Seed: -\{ MODES( -TeX => qq! Change the problem seed to change the problem:$problemSeed!, -Latex2HTML => qq! Change the problem seed to change the problem: - \begin{rawhtml} - - \end{rawhtml}!, -HTML => qq! ! -) -\} -END_TEXT -######################################################### -# define function to be evaluated -$a= random(1,3,1); -$b= random(-4,4,.1); -$c = random(-4,4,1); -$x0=random(-2,2,1); -$function = FEQ(" ${a}x^2+${b}x +$c "); -sub fp { # define a subroutine to calculate the derivative - my $x = shift; - 2*$a*$x+$b; -} -$ans = fp($x0); -HEADER_TEXT(< - - - - - - -EOF - -TEXT(MODES( -TeX => '', -Latex2HTML => "\begin{rawhtml} \end{rawhtml}", -HTML => "" -)); - -BEGIN_TEXT -$PAR -This problem illustrates how you can embed JavaScript code in a WeBWorK example -to create an interactive homework problem that could never be provided by a text book. -$PAR -WeBWorK can use existing $BBOLD JavaScript$EBOLD and $BBOLD Java $EBOLD code to augment its capabilities. -$HR -$PAR -By typing any value x into the left hand window and pressing the --f--\(>\) button -you can determine the value of f(x). -$PAR -Using this 'oracle' function, calculate the derivative of \( f \) at x=$x0. -$PAR -\(f'($x0) =\) \{ans_rule(20) \} You can use a -\{htmlLink(alias('calc.html'), "calculator" ,q!TARGET = "calculator"!) \} - -$PAR -END_TEXT - -$javaScript =< - - - - - - - - - - - - - - - - -
- - - - - -
- - - - - -
- - - - - -
- - -ENDOFSCRIPT - -TEXT(M3( - " \fbox{ The java Script calculator was displayed here - }", - "\begin{rawhtml} $javaScript \end{rawhtml}", - $javaScript - )); - - - -ANS(std_num_cmp($ans,1,"%0.14g") ); #We are allowing 1 percent error for the answer. - - -&ENDDOCUMENT; - diff --git a/courses.dist/modelCourse/templates/setDemo/prob6b.pg b/courses.dist/modelCourse/templates/setDemo/prob6b.pg deleted file mode 100644 index 60cc2f3e5f..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/prob6b.pg +++ /dev/null @@ -1,86 +0,0 @@ -DOCUMENT(); - -loadMacros("PGbasicmacros.pl", - "PGchoicemacros.pl", - "PGanswermacros.pl", -); -#<<<######################################################### -# allow the student to change the seed for this problem. - -$newProblemSeed = ( defined( ${$inputs_ref}{'newProblemSeed'} ) )? -${$inputs_ref}{'newProblemSeed'} : $problemSeed; -$PG_random_generator->srand($newProblemSeed); -BEGIN_TEXT -To see a different version of the problem change -the problem seed and press the 'Submit Answer' button below.$PAR Problem Seed: -\{ MODES( -TeX => qq! Change the problem seed to change the problem:$problemSeed!, -Latex2HTML => qq! Change the problem seed to change the problem: - \begin{rawhtml} - - \end{rawhtml}!, -HTML => qq! ! -) -\} -END_TEXT -#########################################################>>> -$p = random(2,9,1); # multiplier -$p2 = ( $p % 2 == 0) ? 2*$p : $p; - -# The link to the java applet is hard wired to use the java applet -# served from the University of Rochester WeBWorK machine. -# It is possible to set this up so that the java applet is served -# from any machine -# For details use the Feedback button to contact the authors of WeBWorK - -BEGIN_TEXT -This problem requires a browser capable of running Java. - -$PAR -This problem illustrates how you can Java applets in a WeBWorK example. -$PAR -This polar coordinate grapher was constructed at the Mathematics Department -of The Johns Hopkins University and the applet is being served from their computer. -$PAR -WeBWorK can use existing $BBOLD JavaScript$EBOLD and $BBOLD Java $EBOLD code to -augment its capabilities. -$HR -END_TEXT -TEXT(MODES( -TeX => "\fbox{The Johns Hopkins University Mathematics Department's - polar graph plotting applet goes here}", -HTML => qq{ - - - - - - -}, -Latex2HTML => qq!\begin{rawhtml} - - - - - - \end{rawhtml} -! -)); - -BEGIN_TEXT -$PAR -For what value of \( k \) does the graph of \( r = \cos(kt) \) look -like a rose with $p2 petals? -$BR -\(k = \) \{ ans_rule(20) \} ; - -$PAR - -END_TEXT - -ANS(num_cmp($p) ); - -ENDDOCUMENT(); - diff --git a/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg b/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg deleted file mode 100644 index b01f44e3e6..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/s2_2_1.pg +++ /dev/null @@ -1,53 +0,0 @@ -##DESCRIPTION -##KEYWORDS('derivatives') -## Find a derivative of a polynomial, evaluate it at a point -##ENDDESCRIPTION - -DOCUMENT(); # This should be the first executable line in the problem. -loadMacros( - "PGbasicmacros.pl", - "PGchoicemacros.pl", - "PGanswermacros.pl", - "PGauxiliaryFunctions.pl" -); - -$showPartialCorrectAnswers = 1; - -$a1 = random(2,7,1); -$b1 = random(2,12,1); -$c1 = random(1,40,1); -$x1 = random(1,5,1); -$deriv1 = 2*$a1*$x1-$b1; -$funct1 = "2*$a1*x-$b1"; - -BEGIN_TEXT -If \( f(x) = $a1 x^2 - $b1 x -$c1 \), find \( f'( x ) \). -$BR $BR \{ans_rule(48) \} -$BR $BR -END_TEXT - -$ans = $funct1; -&ANS(fun_cmp($ans)); - -$a1_2 = 2*$a1; - -BEGIN_TEXT -Find \( f'( $x1 ) \). -$BR $BR \{ans_rule(48) \} -$BR $BR -END_TEXT - -$ans = $deriv1; -&ANS(num_cmp($ans)); - -&SOLUTION(EV3(<<'EOT')); -$SOL $BR -In general the derivative of \( x^n \) is \( nx^{n-1} \). Using this (and the -basic sum and constant multiple rules) we find the derivative of $BR -\(${a1}x^2 - ${b1}x -$c1 \quad \) is $BR \( ${a1_2}x - $b1 \).$BR $BR - -To find the derivative at \($x1\) we just have to evaluate \( f'( x ) \) at -\( x = $x1) \), i.e. \( ${a1_2}\cdot$x1 - $b1 \) or $ans. -EOT - -ENDDOCUMENT(); # This should be the last executable line in the problem. diff --git a/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg b/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg deleted file mode 100644 index 3b7da75f8f..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/sample_myown_ans.pg +++ /dev/null @@ -1,85 +0,0 @@ -DOCUMENT(); - -loadMacros( - "PGbasicmacros.pl", - "PGchoicemacros.pl", - "PGanswermacros.pl" -); - -$showPartialCorrectAnswers = 1; - -BEGIN_TEXT - This problem demonstrates how you can write your own procedure to check answers. - The procedure is embedded right in the problem. If you wanted to use it for several - problems, you could put it in a file similar to "PGanswermacros.pl" and load it into - the problem. - - This problem asks you to enter a palindrome, a word, number, or phrase that is the same - when read backwards or forward. For example, madam or Hannah. For us a standard - palindrome will ignore spaces and case, but a strict palindrome will not. So e.g. Hannah - is a standard but not a strict palindrome. We will write a test for both types. $BR $BR - Enter a standard palindrome such as "Hannah", "1234321", or "Mom". $BR - This uses std${US}palindrome${US}test $BR - \{ans_rule(60) \} -END_TEXT - - -$std_palindrome_test = sub { - my $in = shift @_; - my $normalizedCorrectAnswer = "There are many correct answers, e.g. Hannah"; - $in =~ s|~~s+||g; # remove all spaces - ## use ~~ inplace of perl's backslash in problems - $in = uc $in; # Make letters uppercase - ## use ~~ inplace of perl's backslash in problems - my $reverse = reverse $in; - my $correctQ = ($in eq $reverse) ? 1: 0; - my $ansMsg = ''; - unless ($in =~ m|~~S|) { - $correctQ = 0; - $ansMsg = 'An empty string is not accepted as a palindrome'; - } - my $rh_answer = new AnswerHash( score => $correctQ, - correct_ans => $normalizedCorrectAnswer, - student_ans => $in, - ans_message => $ansMsg, - type => 'custom' - ); - $rh_answer; - -}; - -ANS($std_palindrome_test); - - -BEGIN_TEXT; -$PAR -Now enter a strict palindrome such as "1234321", or "mom". $BR -This uses strict${US}palindrome${US}test $BR -\{ans_rule(60) \} -END_TEXT - -$strict_palindrome_test = sub { - my $in = shift @_; - my $normalizedCorrectAnswer = "There are many correct answers, e.g. HannaH"; - $in =~ s/~~s*$//; # remove trailing whitespace ## use ~~ inplace of perl's backslash in problems - $in =~ s/^~~s*//; # remove initial spaces ## use ~~ inplace of perl's backslash in problems - my $reverse = reverse $in; - my $correctQ = ($in eq $reverse) ? 1: 0; - my $ansMsg = ''; - unless ($in =~ m|~~S|) { - $correctQ = 0; - $ansMsg = 'An empty string is not accepted as a palindrome'; - } - - my $rh_answer = {score => $correctQ, - correct_ans => $normalizedCorrectAnswer, - student_ans => $in, - ans_message => $ansMsg, - type => 'custom' - }; - $rh_answer; -}; - -ANS($strict_palindrome_test); - -ENDDOCUMENT(); diff --git a/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg b/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg deleted file mode 100644 index a72a70a5a9..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/sample_units_ans.pg +++ /dev/null @@ -1,38 +0,0 @@ -DOCUMENT(); -loadMacros( "PGbasicmacros.pl", - "PGauxiliaryFunctions.pl", - "PGchoicemacros.pl", - "PGanswermacros.pl", -); - -$showPartialCorrectAnswers = 1; -$showHint =0; - -$fx = random( 2.1, 6.0 , 0.1) ; -$fy = random( 3.1, 8.0 , 0.1) ; -$ansxy = sqrt($fx * $fx + $fy * $fy); -$anscm = $ansxy*100; - -BEGIN_TEXT -This problem demonstrates how WeBWorK handles -numerical answers involving units. WeBWorK can handle all units that -are used in elementary physics courses. -See \{ htmlLink("http://webwork.maa.org/wiki/Units","answers with units") \} -for more details. $PAR - -Two perpendicular sides of a triangle are $fx m and -$fy m long respectively. -What is the length of the third side of the triangle? $BR$BR -You can answer this in terms of m's, cm's, km's, in's, ft, etc. but you must enter the units. $BR$BR -Click "Hint" below if you don't remember the Pythagorean theorem. -$BR$BR -\{ans_rule(40) \} -END_TEXT - -HINT(EV3(<<'EOT')); -Remembering the Pythagorean theorem \( A^2 +B^2 = C^2 \), you can enter -sqrt(${fx}${CARET}2 + ${fy}${CARET}2) m or \{spf($ansxy, "%0.2f" )\} m or \{spf($anscm, "%0.2f" )\} cm or ... -EOT - -ANS(num_cmp("$ansxy", units => 'm')); -ENDDOCUMENT() diff --git a/courses.dist/modelCourse/templates/setDemo/screenHeaderFile1.pg b/courses.dist/modelCourse/templates/setDemo/screenHeaderFile1.pg deleted file mode 100644 index ea6c0bef30..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/screenHeaderFile1.pg +++ /dev/null @@ -1,77 +0,0 @@ -##Screen set header for set 0, Fall 1998 - -&DOCUMENT; - -loadMacros( -"PG.pl", -"PGbasicmacros.pl", -"PGchoicemacros.pl", -"PGanswermacros.pl" -); - - - -BEGIN_TEXT -This is a demonstration set designed to illustrate the range of types of questions which can be asked using WeBWorK rather than to illustrate a typical calculus problem set. - -$PAR -$BBOLD 1. Simple numerical problem. $EBOLD A simple problem requiring a numerical answer. It illustrates how one can allow WeBWorK to calculate answers from formulas (e.g. an answer such as sqrt(3^2 +4^2) can be entered instead of the answer 5.). It also shows -an example of feedback on the correctness of each answer, rather than grading the entire problem. -$PAR -$BBOLD 2. Graphs and limits. $EBOLD The graph in this example is constructed on the fly. From the graph a student is supposed to determine the values and limits of the function at various points. The immediate feedback on this problem is particularly useful, since students often make unconcious mistakes. -$PAR -$BBOLD 3. Derivatives. $EBOLD An example of checking answers which are formulas, rather than numbers. -$PAR -$BBOLD 4. Anti-derivatives. $EBOLD This example will accept any anti-derivative, adjusting for the fact that the answer is only defined up to a constant. -$PAR -$BBOLD 5. Answers with units. $EBOLD Try entering the answer to this question in meters (m) and also centimeters (cm). -$PAR -$BBOLD 6. A physics example. $EBOLD Includes a static picture. -$PAR -$BBOLD 7. More graphics. $EBOLD An example of on-the-fly graphics. Select the graph of f, it's derivative and it's second derivatives. -$PAR -$BBOLD 8. JavaScript example. $EBOLD I'm particularly fond of this example. The computer provides an "oracle" function: give it a number \(x\) and it will provide you with the value \(f(x)\) of the function at \(x\). Using this, calculate the value of the derivative of \(f\) at 2. (i.e. \(f'(2)\) ). Students are forced to use the Newton quotient, since there are no formulas to work with. I don't think this problem could be asked as written homework. -$PAR -$BBOLD 9. Java example. $EBOLD This gives an example of incorporating a java applet which can be used experimentally to determine answers for WeBWorK questions. This example is of historical interest since it comes from the first site after Rochester, Johns Hopkins University, to use WeBWorK. It currently gives an example of what happens when a WeBWorK problem called an applet residing on a server that no longer exists. -$PAR -$BBOLD 10. Palindrome. $EBOLD To answer this problem enter any palindrome. This problem illustrates the power of the "answer-evaluator" model. For each problem the problem designer writes a function which accepts a student's answer and produces a 0 or 1 (for incorrect or correct). Usually this is done by comparing with an answer given by the problem designer, but in this case the function checks if the answer is the same forward and backward. -$PAR -END_TEXT - - - -BEGIN_TEXT -$HR - -Use this box to give information about this problem -set. Typical information might include some of these facts: -$PAR -WeBWorK assignment number $setNumber closes on : $formattedDueDate. - - -$PAR -The primary purpose of WeBWorK is to let you know if you are getting the right answer or to alert -you if you get the wrong answer. Usually you can attempt a problem as many times as you want before -the close date. However, if you are having trouble figuring out your error, you should -consult the book, or ask a fellow student, one of the TA's or -your professor for help. Don't spend a lot of time guessing -- it's not very efficient or effective. -$PAR - -You can use the Feedback button on each problem -page to send email to the professors. -$PAR -Give 4 or 5 significant digits for (floating point) numerical answers. -For most problems when entering numerical answers, you can if you wish -enter elementary expressions such as 2^3 instead of 8, sin(3*pi/2) instead -of -1, e^(ln(2)) instead of 2, -(2+tan(3))*(4-sin(5))^6-7/8 instead of 27620.3413, etc. -$PAR - Here's the -\{ htmlLink(qq!http://webwork.maa.org/wiki/Available_Functions!,"list of the functions") \} - which WeBWorK understands. - -Along with the \{htmlLink(qq!http://webwork.maa.org/wiki/Units!, "list of units")\} which WeBWorK understands. This can be useful in -physics problems. -END_TEXT - -ENDDOCUMENT(); diff --git a/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg b/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg deleted file mode 100644 index c4c663dcda..0000000000 --- a/courses.dist/modelCourse/templates/setDemo/srw1_9_4.pg +++ /dev/null @@ -1,110 +0,0 @@ -##DESCRIPTION -## find distance between two points, find coordinates of the midpoint of -## a line segment connecting them -##ENDDESCRIPTION - -##KEYWORDS('algebra', 'coordinate geometry', 'distance', 'midpoint') - -DOCUMENT(); # This should be the first executable line in the problem. - -loadMacros( -"PG.pl", -"PGbasicmacros.pl", -"PGchoicemacros.pl", -"PGanswermacros.pl", -"PGauxiliaryFunctions.pl" -); - -$showPartialCorrectAnswers = 1; - -#install_problem_grader(~~&std_problem_grader); ##uncomment to use std grader -#install_problem_grader(~~&custom_problem_grader); ##uncomment to use custom grader - - -$x1 = random(1,5,1); -$y1 = random(-5,-1,1); -$x2 = random(-10,-3,1); -$y2 = random(-9,-2,1); -$len1 = sqrt(($x1-$x2)**2 + ($y1-$y2)**2); -$midx = ($x1+$x2)/2; -$midy = ($y1+$y2)/2; - -BEGIN_TEXT -Consider the two points \( ($x1 ,$y1 )\) and \( ($x2 ,$y2 )\). -The distance between them is:$BR -\{ans_rule(30) \} -$BR -END_TEXT - -$ans = $len1; -&ANS(std_num_cmp($ans)); - -BEGIN_TEXT -The x co-ordinate of the midpoint of the line -segment that joins them is:\{ans_rule(20) \} -$BR -END_TEXT -$ans = $midx; -&ANS(std_num_cmp($ans)); - -BEGIN_TEXT -The y co-ordinate of the midpoint of the line segment that joins them is: -\{ans_rule(20) \} -$BR -END_TEXT -$ans = $midy; -&ANS(std_num_cmp($ans)); - - -sub custom_problem_grader { - my $rh_evaluated_answers = shift; - my $rh_problem_state = shift; - my %form_options = @_; - my %evaluated_answers = %{$rh_evaluated_answers}; - # The hash $rh_evaluated_answers typically contains: - # 'answer1' => 34, 'answer2'=> 'Mozart', etc. - - # By default the old problem state is simply passed back out again. - my %problem_state = %$rh_problem_state; - - - # %form_options might include - # The user login name - # The permission level of the user - # The studentLogin name for this psvn. - # Whether the form is asking for a refresh or is submitting a new answer. - - # initial setup of the answer - my $total=0; - my %problem_result = ( score => 0, - errors => '', - type => 'custom_problem_grader', - msg => 'Part 1 is worth 50% and parts 2 and 3 are worth 25% each.', - ); - - # Return unless answers have been submitted - unless ($form_options{answers_submitted} == 1) { - return(~~%problem_result,~~%problem_state); - } - # Answers have been submitted -- process them. - - $total += .5*($evaluated_answers{'AnSwEr1'}->{score}); - $total += .25*($evaluated_answers{'AnSwEr2'}->{score}); - $total += .25*($evaluated_answers{'AnSwEr3'}->{score}); - - - $problem_result{score} = $total; - # increase recorded score if the current score is greater. - $problem_state{recorded_score} = $problem_result{score} if $problem_result{score} > $problem_state{recorded_score}; - - - $problem_state{num_of_correct_ans}++ if $total == 1; - $problem_state{num_of_incorrect_ans}++ if $total < 1 ; - (~~%problem_result, ~~%problem_state); - -} - - -ENDDOCUMENT(); # This should be the last executable line in the problem. - - diff --git a/docker-config/docker-compose.dist.yml b/docker-config/docker-compose.dist.yml index fa6a02b003..5ef4bb91b8 100644 --- a/docker-config/docker-compose.dist.yml +++ b/docker-config/docker-compose.dist.yml @@ -96,7 +96,7 @@ services: # If you would like a 1 stage build process comment out the next line, and just run "docker-compose build". dockerfile: DockerfileStage2 # For the 2 stage build process run - # docker build --tag webwork-base:forWW220 -f DockerfileStage1 . + # docker build --tag webwork-base:forWW221 -f DockerfileStage1 . # and then # docker-compose build # When rebuilding to get updated images add the "--no-cache" option to both commands. diff --git a/docker-config/idp/README.md b/docker-config/idp/README.md index 586b9d9953..90da62cd62 100644 --- a/docker-config/idp/README.md +++ b/docker-config/idp/README.md @@ -27,7 +27,7 @@ the port as needed. A docker service that implements a SAML2 identity provider is provided in the `docker-compose.yml.dist` file. To start this identity provider along with the rest of webwork2, add the `--profile saml2dev` argument to docker compose as in -the following exmaple. +the following example. ```bash docker compose --profile saml2dev up @@ -165,7 +165,7 @@ identity provider is accessible to webwork2. The user was verified by the identity provider but did not have a corresponding user account in the Webwork course. The Webwork user account needs to be created -separately as the Saml2 autentication module does not do user provisioning. +separately as the Saml2 authentication module does not do user provisioning. ### The WeBWorK service provider does not appear in the service provider Federation tab diff --git a/htdocs/CAPA_Graphics b/htdocs/CAPA_Graphics deleted file mode 120000 index 3d6d987b4a..0000000000 --- a/htdocs/CAPA_Graphics +++ /dev/null @@ -1 +0,0 @@ -../../libraries/webwork-open-problem-library/Contrib/CAPA/CAPA_Graphics \ No newline at end of file diff --git a/htdocs/crossdomain.xml b/htdocs/crossdomain.xml deleted file mode 100644 index a45fa2ff23..0000000000 --- a/htdocs/crossdomain.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/htdocs/generate-assets.js b/htdocs/generate-assets.js index 81ee6c7b10..aaeff2df9e 100755 --- a/htdocs/generate-assets.js +++ b/htdocs/generate-assets.js @@ -2,7 +2,8 @@ /* eslint-env node */ -const yargs = require('yargs'); +const yargs = require('yargs/yargs'); +const { hideBin } = require('yargs/helpers'); const chokidar = require('chokidar'); const path = require('path'); const { minify } = require('terser'); @@ -14,7 +15,7 @@ const postcss = require('postcss'); const rtlcss = require('rtlcss'); const cssMinify = require('cssnano'); -const argv = yargs +const argv = yargs(hideBin(process.argv)) .usage('$0 Options') .version(false) .alias('help', 'h') @@ -110,7 +111,11 @@ const processFile = async (file, _details) => { // This works for both sass/scss files and css files. let result; try { - result = sass.compile(filePath, { sourceMap: argv.enableSourcemaps }); + result = sass.compile(filePath, { + sourceMap: argv.enableSourcemaps, + // Silence warnings about bootstrap usage of deprecated sass methods. + silenceDeprecations: ['import', 'global-builtin', 'color-functions', 'if-function'] + }); } catch (e) { console.log(`\x1b[31mIn ${file}:`); console.log(`${e.message}\x1b[0m`); diff --git a/htdocs/js/ActionTabs/actiontabs.js b/htdocs/js/ActionTabs/actiontabs.js index 50c43da164..0662a455c7 100644 --- a/htdocs/js/ActionTabs/actiontabs.js +++ b/htdocs/js/ActionTabs/actiontabs.js @@ -6,6 +6,7 @@ actionLink.addEventListener('show.bs.tab', () => { if (takeAction) takeAction.value = actionLink.textContent; if (currentAction) currentAction.value = actionLink.dataset.action; + takeAction.formNoValidate = actionLink.dataset.noValidate ? true : false; }); }); diff --git a/htdocs/js/CourseAdmin/restrict_select.js b/htdocs/js/CourseAdmin/restrict_select.js new file mode 100644 index 0000000000..984ff1ce17 --- /dev/null +++ b/htdocs/js/CourseAdmin/restrict_select.js @@ -0,0 +1,36 @@ +(() => { + const addOnConfSelect = document.getElementById('add_on_conf'); + if (!addOnConfSelect) return; + + const addOnConfOptgroups = addOnConfSelect.querySelectorAll('optgroup'); + + // Track previously selected options to identify the newly clicked option + let previousSelection = []; + + addOnConfSelect.addEventListener('change', () => { + // Find the option the user just clicked/selected + const newlySelected = Array.from(addOnConfSelect.selectedOptions).find( + (option) => !previousSelection.includes(option) + ); + + if (newlySelected) { + // Find the parent optgroup + const parent = newlySelected.closest('optgroup'); + + // Loop through all options in the other groups and unselect them as appropriate + for (const group of addOnConfOptgroups) { + for (const option of group.children) { + if ( + option !== newlySelected && + (parent.dataset.single || (!parent.dataset.single && group.dataset.single)) + ) { + option.selected = false; + } + } + } + } + + // Update tracking variable for the next change event + previousSelection = Array.from(addOnConfSelect.selectedOptions); + }); +})(); diff --git a/htdocs/js/DatePicker/datepicker.js b/htdocs/js/DatePicker/datepicker.js index 193ae9b6a1..2ae1002c15 100644 --- a/htdocs/js/DatePicker/datepicker.js +++ b/htdocs/js/DatePicker/datepicker.js @@ -119,13 +119,14 @@ ], onClick: (index, fp) => { if (index === 0) { - const today = new Date(); - // If there isn't a selected date, then use 12:00 am on the current date. - const selectedDate = fp.selectedDates[0] ?? new Date(new Date().toDateString()); - selectedDate.setFullYear(today.getFullYear()); - selectedDate.setMonth(today.getMonth()); - selectedDate.setDate(today.getDate()); - fp.setDate(selectedDate, true); + // The initial date represents 12:00 am on the current date. + const today = new Date(new Date().toDateString()); + if (fp.selectedDates[0]) { + today.setHours(fp.selectedDates[0].getHours()); + today.setMinutes(fp.selectedDates[0].getMinutes()); + today.setSeconds(fp.selectedDates[0].getSeconds()); + } + fp.setDate(today, true); } else if (index === 1) { fp.setDate(new Date(), true); } diff --git a/htdocs/js/GatewayQuiz/gateway.js b/htdocs/js/GatewayQuiz/gateway.js index e1241e0a94..ee4024bd7f 100644 --- a/htdocs/js/GatewayQuiz/gateway.js +++ b/htdocs/js/GatewayQuiz/gateway.js @@ -188,6 +188,41 @@ if (actuallySubmit) return; + const inputs = Array.from(document.querySelectorAll('input, select')); + + // All problem numbers are represented by a probstatus hidden input. Use those to determine the problem + // numbers of problems in the test. Note that problem numbering displayed on the page will not match these + // numbers in the cases that the test definition has non-consecutive numbering or that problem order is + // randomized. But the problem numbering will always match the quiz prefix numbering. + const problems = []; + for (const input of inputs.filter((i) => /^probstatus\d*/.test(i.name))) { + problems[parseInt(input.name.replace('probstatus', ''))] = {}; + } + + // Determine which questions have been answered. Note that there can be multiple inputs for a + // given question (for example for checkbox or radio answers). + for (const input of inputs.filter( + (i) => /Q\d{4}_/.test(i.name) && !/^MaThQuIlL_/.test(i.name) && !/^previous_/.test(i.name) + )) { + const answered = + input.type === 'radio' || input.type === 'checkbox' ? !!input.checked : /\S/.test(input.value); + const match = /Q(\d{4})_/.exec(input.name); + const problemNumber = parseInt(match?.[1] ?? '0'); + if (!(input.name in problems[problemNumber])) problems[problemNumber][input.name] = answered; + else if (answered) problems[problemNumber][input.name] = 1; + } + + // Determine if there are any unanswered questions in each problem. + let numProblemsWithUnanswered = 0; + for (const problem of problems) { + // Skip problem 0 and any problems that don't exist in the test + // due to non-consecutive numbering in the test definition. + if (!problem) continue; + + if (!Object.keys(problem).length || !Object.values(problem).every((answered) => answered)) + ++numProblemsWithUnanswered; + } + // Prevent the gwquiz form from being submitted until after confirmation. evt.preventDefault(); @@ -219,8 +254,25 @@ const modalBody = document.createElement('div'); modalBody.classList.add('modal-body'); - const modalBodyContent = document.createElement('div'); + if (numProblemsWithUnanswered) { + const modalSecondaryContent = document.createElement('div'); + modalSecondaryContent.classList.add('mb-3'); + modalSecondaryContent.textContent = + (numProblemsWithUnanswered > 1 + ? submitAnswers.dataset.unansweredQuestionsMessage + ? submitAnswers.dataset.unansweredQuestionsMessage.replace('%d', numProblemsWithUnanswered) + : `There are ${numProblemsWithUnanswered} problems with unanswered questions.` + : (submitAnswers.dataset.unansweredQuestionMessage ?? + 'There is a problem with unanswered questions.')) + + ' ' + + (submitAnswers.dataset.returnToTestMessage ?? + 'Are you sure you want to grade the test? ' + + 'Select "No" if you would like to return to the test to enter more answers.'); + modalBody.append(modalSecondaryContent); + } + + const modalBodyContent = document.createElement('div'); modalBodyContent.textContent = submitAnswers.dataset.confirmDialogMessage; modalBody.append(modalBodyContent); diff --git a/htdocs/js/GatewayQuiz/gateway.scss b/htdocs/js/GatewayQuiz/gateway.scss index f7d450dff6..bb294426eb 100644 --- a/htdocs/js/GatewayQuiz/gateway.scss +++ b/htdocs/js/GatewayQuiz/gateway.scss @@ -1,13 +1,5 @@ /* gateway styles */ -div.gwMessage { - background-color: #ffeeaa; - box-shadow: 3px 3px 3px darkgray; - margin: 0 0 1rem 0; - padding: 0.25rem; - border-radius: 3px; -} - #gwTimer { position: sticky; width: 15em; @@ -60,7 +52,12 @@ table.attemptResults { border: 1px solid #ddd; border-radius: 3px; - h2 { + [data-bs-theme='dark'] & { + border-color: #555; + background-color: var(--bs-primary-bg-subtle, 'black'); + } + + h2.gw-problem-number { display: inline-block; font-size: 16px; margin-right: 5px; @@ -85,12 +82,17 @@ table.attemptResults { } colgroup.page { - border-left: solid 1pt black; - border-right: solid 1pt black; + border-left: solid 1pt var(--bs-emphasis-color, black); + border-right: solid 1pt var(--bs-emphasis-color, black); } .page.active { background-color: #ffeeaa; + + [data-bs-theme='dark'] & { + color: white; + background-color: #80690a; + } } } @@ -98,8 +100,9 @@ div.gwDivider { margin: 0px 0px 10px 0px; } -/* Override the pg style so that the problem-content is not offset in gateway quizzes. */ +/* Override the pg style so that the problem-content is not offset in gateway quizzes and force a light color scheme. */ .problem-content { + color-scheme: light; padding: unset; background-color: unset; border: unset; diff --git a/htdocs/js/Grades/grades.js b/htdocs/js/Grades/grades.js new file mode 100644 index 0000000000..e2fae8c61c --- /dev/null +++ b/htdocs/js/Grades/grades.js @@ -0,0 +1,30 @@ +(() => { + const toggleWeightsButton = document.getElementById('toggle-weights'); + const toggleAttemptsButton = document.getElementById('toggle-attempts'); + const courseID = document.getElementsByName('hidden_course_id')[0]?.value ?? 'unknownCourse'; + const showHideRows = (button) => { + if (button.dataset.hidden === '1') { + document.querySelectorAll('.' + button.dataset.rowClass).forEach((e) => { + e.classList.remove('d-none'); + }); + button.dataset.hidden = '0'; + button.textContent = button.dataset.hideText; + localStorage.setItem(`WW.${courseID}.grades.show-${button.dataset.rowClass}`, true); + } else { + document.querySelectorAll('.' + button.dataset.rowClass).forEach((e) => { + e.classList.add('d-none'); + }); + button.dataset.hidden = '1'; + button.textContent = button.dataset.showText; + localStorage.removeItem(`WW.${courseID}.grades.show-${button.dataset.rowClass}`); + } + }; + + toggleWeightsButton?.addEventListener('click', () => showHideRows(toggleWeightsButton)); + toggleAttemptsButton?.addEventListener('click', () => showHideRows(toggleAttemptsButton)); + + for (const button of [toggleWeightsButton, toggleAttemptsButton]) { + if (button && localStorage.getItem(`WW.${courseID}.grades.show-${button.dataset.rowClass}`)) + showHideRows(button); + } +})(); diff --git a/htdocs/js/Grades/grades.scss b/htdocs/js/Grades/grades.scss new file mode 100644 index 0000000000..1859e66a14 --- /dev/null +++ b/htdocs/js/Grades/grades.scss @@ -0,0 +1,51 @@ +.display-grade { + width: 3.5rem; + border: var(--bs-border-color) solid 2px; + border-radius: 15px; + text-align: center; + padding: 0.75rem 0.25rem; + font-size: 1rem; + font-weight: 800; +} + +.grade-item { + display: grid; + width: 100%; + align-items: center; + grid-template-columns: 5rem 1fr; +} + +.grade-item-percent { + grid-row: 1 / 3; + grid-column: 1 / 2; +} + +.grade-item-title { + grid-row: 1 / 2; + grid-column: 2 / 3; +} + +.grade-item-scores { + grid-row: 2 / 3; + grid-column: 2 / 3; +} + +.grade-total { + border: var(--bs-border-color) solid var(--bs-border-width); + padding: 0.5rem 1rem; + border-radius: var(--bs-border-radius); +} + +.grade-total-info { + grid-row: 1 / 3; + grid-column: 2 / 3; +} + +.problem-table { + th { + min-width: 2rem; + } + caption { + width: max-content; + } +} diff --git a/htdocs/js/MathJaxConfig/bs-color-scheme.js b/htdocs/js/MathJaxConfig/bs-color-scheme.js new file mode 100644 index 0000000000..f0c22c703e --- /dev/null +++ b/htdocs/js/MathJaxConfig/bs-color-scheme.js @@ -0,0 +1,87 @@ +if (MathJax.loader) MathJax.loader.checkVersion('[bs-color-scheme]', '4.1.2', 'extension'); + +const switchToBSStyle = (obj, key = '@media (prefers-color-scheme: dark)') => { + obj["[data-bs-theme='dark']"] = obj[key]; + delete obj[key]; + obj["[data-bs-theme='light']"] = structuredClone(obj); +}; + +for (const [immediate, extension, ready] of [ + [ + MathJax._.ui?.dialog, + 'core', + () => { + const { DraggableDialog } = MathJax._.ui.dialog.DraggableDialog; + switchToBSStyle(DraggableDialog.styles); + } + ], + [ + MathJax._.a11y?.explorer, + 'a11y/explorer', + () => { + const Region = MathJax._.a11y.explorer.Region; + for (const region of ['LiveRegion', 'HoverRegion', 'ToolTip']) { + if (':root' in Region[region].style.styles) { + Region[region].style.styles["[data-bs-theme='light']"] = Region[region].style.styles[':root']; + + // The variable --mjx-bg1-color is defined to be 'rgba(var(--mjx-bg-blue), var(--mjx-bg-alpha))'. + // I suspect this is a typo as the variable -mjx-bg-alpha is not defined anywhere. In any case this + // change is needed to get the correct background color on the focused element in the explorer. + Region[region].style.styles["[data-bs-theme='light']"]['--mjx-bg1-color'] = + 'rgba(var(--mjx-bg-blue), var(--mjx-bg1-alpha))'; + } + Region[region].style.styles["[data-bs-theme='dark']"] = + Region[region].style.styles['@media (prefers-color-scheme: dark)']; + if (':root' in Region[region].style.styles["[data-bs-theme='dark']"]) { + Object.assign( + Region[region].style.styles["[data-bs-theme='dark']"], + Region[region].style.styles["[data-bs-theme='dark']"][':root'] + ); + delete Region[region].style.styles["[data-bs-theme='dark']"][':root']; + } + Region[region].style.styles['@media (prefers-color-scheme: dark)'] = {}; + } + Region.LiveRegion.style.styles['@media (prefers-color-scheme: dark)']['mjx-ignore'] = { ignore: 1 }; + MathJax.startup.extendHandler((handler) => { + switchToBSStyle( + handler.documentClass.speechStyles, + '@media (prefers-color-scheme: dark) /* explorer */' + ); + return handler; + }); + } + ], + [ + MathJax._.output?.chtml, + 'output/chtml', + () => { + const { CHTML } = MathJax._.output.chtml_ts; + switchToBSStyle(CHTML.commonStyles); + const { ChtmlMaction } = MathJax._.output.chtml.Wrappers.maction; + switchToBSStyle(ChtmlMaction.styles, '@media (prefers-color-scheme: dark) /* chtml maction */'); + } + ], + [ + MathJax._.output?.svg, + 'output/svg', + () => { + const { SVG } = MathJax._.output.svg_ts; + switchToBSStyle(SVG.commonStyles); + const { SvgMaction } = MathJax._.output.svg.Wrappers.maction; + switchToBSStyle(SvgMaction.styles, '@media (prefers-color-scheme: dark) /* svg maction */'); + } + ] +]) { + if (immediate) { + ready(); + } else { + const config = MathJax.config.loader; + config[extension] ??= {}; + config[extension].extraLoads ??= []; + const check = config[extension].checkReady; + config[extension].checkReady = async () => { + if (check) await check(); + return ready(); + }; + } +} diff --git a/htdocs/js/MathJaxConfig/mathjax-config.js b/htdocs/js/MathJaxConfig/mathjax-config.js index 937f33393f..20fbace262 100644 --- a/htdocs/js/MathJaxConfig/mathjax-config.js +++ b/htdocs/js/MathJaxConfig/mathjax-config.js @@ -1,7 +1,10 @@ if (!window.MathJax) { window.MathJax = { - tex: { packages: { '[+]': ['noerrors'] } }, - loader: { load: ['input/asciimath', '[tex]/noerrors'] }, + tex: { packages: { '[+]': webworkConfig?.showMathJaxErrors ? [] : ['noerrors'] } }, + loader: { + load: ['input/asciimath', '[tex]/noerrors', '[bs-color-scheme]'], + paths: { 'bs-color-scheme': webworkConfig?.mathJaxBSColorSchemeUrl ?? './bs-color-scheme.js' } + }, startup: { ready() { const AM = MathJax.InputJax.AsciiMath.AM; @@ -98,25 +101,8 @@ if (!window.MathJax) { AM.symbols.splice(i, 0, { input: trigger, ...newTriggers[trigger].symbols }); } - // The following is a workaround for a bug in MathJax when the math renderer is changed. - // Note that this should be removed when we have upgraded to MathJax 4. - const { STATE } = MathJax._.core.MathItem; - const { Menu } = MathJax._.ui.menu.Menu; - const { mathjax } = MathJax._.mathjax; - Menu.prototype.rerender = function (start = STATE.TYPESET) { - this.rerenderStart = Math.min(start, this.rerenderStart); - if (!Menu.loading) { - if (this.rerenderStart <= STATE.COMPILED) this.document.reset({ inputJax: [] }); - MathJax.startup.promise.then(() => { - mathjax.handleRetriesFor(() => { - this.document.rerender(this.rerenderStart); - this.rerenderStart = STATE.LAST; - }); - }); - } - }; - - return MathJax.startup.defaultReady(); + MathJax.startup.defaultReady(); + MathJax.startup.document.constructor.ProcessBits.allocate('findScripts'); } }, options: { @@ -124,18 +110,23 @@ if (!window.MathJax) { findScript: [ 10, (doc) => { - for (const node of document.querySelectorAll('script[type^="math/tex"]')) { - const math = new doc.options.MathItem( - node.textContent, - doc.inputJax[0], - !!node.type.match(/; *mode=display/) - ); - const text = document.createTextNode(''); - node.parentNode.replaceChild(text, node); - math.start = { node: text, delim: '', n: 0 }; - math.end = { node: text, delim: '', n: 0 }; - doc.math.push(math); + if (doc.processed.isSet('findScripts')) return; + const containers = doc.adaptor.getElements(doc.options.elements || [doc.document.body], doc); + for (const container of containers) { + for (const node of container.querySelectorAll('script[type^="math/tex"]')) { + const math = new doc.options.MathItem( + node.textContent, + doc.inputJax[0], + !!node.type.match(/; *mode=display/) + ); + const text = document.createTextNode(''); + node.parentNode.replaceChild(text, node); + math.start = { node: text, delim: '', n: 0 }; + math.end = { node: text, delim: '', n: 0 }; + doc.math.push(math); + } } + doc.processed.set('findScripts'); }, '' ] diff --git a/htdocs/js/PGCodeMirror/pgeditor.scss b/htdocs/js/PGCodeMirror/pgeditor.scss index 3f1cd895c1..384adc6d17 100644 --- a/htdocs/js/PGCodeMirror/pgeditor.scss +++ b/htdocs/js/PGCodeMirror/pgeditor.scss @@ -1,5 +1,5 @@ .code-mirror-editor { - border: 1px solid #ddd; + border: 1px solid var(--ww-layout-border-color, #ddd); min-height: 400px; overflow: auto; resize: vertical; @@ -25,7 +25,7 @@ // This style is used if the CodeMirror editor is disabled in localOverrides.conf. .text-area-editor { - border: 1px solid #ddd; + border: 1px solid var(--ww-layout-border-color, #ddd); padding: 2px; height: 550px; min-height: 400px; diff --git a/htdocs/js/PGProblemEditor/pgproblemeditor.js b/htdocs/js/PGProblemEditor/pgproblemeditor.js index 286840cc16..70c6be34f6 100644 --- a/htdocs/js/PGProblemEditor/pgproblemeditor.js +++ b/htdocs/js/PGProblemEditor/pgproblemeditor.js @@ -1,5 +1,43 @@ (() => { + const renderURL = `${webworkConfig?.webwork_url ?? '/webwork2'}/render_rpc`; + + for (const pgmlLabButton of document.querySelectorAll('.pgml-lab')) { + pgmlLabButton.addEventListener('click', (e) => { + e.preventDefault(); + const form = document.createElement('form'); + form.style.display = 'none'; + form.target = 'PGML'; + form.action = renderURL; + form.method = 'post'; + + const inputs = [ + ['courseID', document.getElementsByName('courseID')[0]?.value], + ['displayMode', document.getElementById('action_view_displayMode_id')?.value ?? 'MathJax'], + ['fileName', 'PGMLLab/PGML-lab.pg'], + ['uriEncodedProblemSource', pgmlLabButton.dataset.source] + ]; + + const user = document.getElementsByName('user')[0]; + if (user) inputs.push(['user', user.value]); + const sessionKey = document.getElementsByName('key')[0]; + if (sessionKey) inputs.push(['key', sessionKey.value]); + + for (const [name, value] of inputs) { + const input = document.createElement('input'); + input.name = name; + input.value = value; + input.type = 'hidden'; + form.append(input); + } + + document.body.append(form); + form.submit(); + form.remove(); + }); + } + const fileChooserForm = document.forms['pg-editor-file-chooser']; + if (fileChooserForm) { const newProblemRadio = document.getElementById('new_problem'); @@ -161,6 +199,15 @@ ?.addEventListener('change', () => (deleteBackupCheck.checked = true)); } + const renderArea = document.getElementById('pgedit-render-area'); + + const scrollToRenderArea = () => { + // Scroll to the top of the render window if the current scroll position is below that. + const renderAreaRect = renderArea.getBoundingClientRect(); + const topBarHeight = document.querySelector('.webwork-logo')?.getBoundingClientRect().height ?? 0; + if (renderAreaRect.top < topBarHeight) window.scrollBy(0, renderAreaRect.top - topBarHeight); + }; + // Send a request to the server to perltidy the current PG code in the CodeMirror editor. const tidyPGCode = () => { const request_object = { courseID: document.getElementsByName('courseID')[0]?.value }; @@ -195,11 +242,13 @@ } if (request_object.pgCode === data.result_data.tidiedPGCode) { showMessage('There were no changes to the code.', true); + if (!(renderArea.firstChild instanceof HTMLIFrameElement)) render(); } else { if (webworkConfig?.pgCodeMirror) webworkConfig.pgCodeMirror.source = data.result_data.tidiedPGCode; else document.getElementById('problemContents').value = data.result_data.tidiedPGCode; saveTempFile(); - showMessage('Successfuly perltidied code.', true); + showMessage('Successfully perltidied code.', true); + if (!(renderArea.firstChild instanceof HTMLIFrameElement)) render(); } }) .catch((err) => showMessage(`Error: ${err?.message ?? err}`)); @@ -235,15 +284,43 @@ .catch((err) => showMessage(`Error: ${err?.message ?? err}`)); }; + // Send a request to the server to run the PG critic in the CodeMirror editor. + const runPGCritic = () => { + const request_object = { courseID: document.getElementsByName('courseID')[0]?.value }; + + const user = document.getElementsByName('user')[0]; + if (user) request_object.user = user.value; + const sessionKey = document.getElementsByName('key')[0]; + if (sessionKey) request_object.key = sessionKey.value; + + request_object.rpc_command = 'runPGCritic'; + request_object.pgCode = + webworkConfig?.pgCodeMirror?.source ?? document.getElementById('problemContents')?.value ?? ''; + + fetch(webserviceURL, { method: 'post', mode: 'same-origin', body: new URLSearchParams(request_object) }) + .then((response) => response.json()) + .then((data) => { + if (data.error) throw new Error(data.error); + if (!data.result_data) throw new Error('An invalid response was received.'); + renderArea.innerHTML = data.result_data.html; + scrollToRenderArea(); + }) + .catch((err) => showMessage(`Error: ${err?.message ?? err}`)); + }; + document.getElementById('take_action')?.addEventListener('click', async (e) => { - if (document.getElementById('current_action')?.value === 'format_code') { + if (document.getElementById('current_action')?.value === 'code_maintenance') { e.preventDefault(); - if (document.querySelector('input[name="action.format_code"]:checked').value == 'tidyPGCode') { + if (document.querySelector('input[name="action.code_maintenance"]:checked').value === 'tidyPGCode') { tidyPGCode(); } else if ( - document.querySelector('input[name="action.format_code"]:checked').value == 'convertCodeToPGML' + document.querySelector('input[name="action.code_maintenance"]:checked').value === 'convertCodeToPGML' ) { convertCodeToPGML(); + } else if ( + document.querySelector('input[name="action.code_maintenance"]:checked').value === 'runPGCritic' + ) { + runPGCritic(); } return; } @@ -305,8 +382,58 @@ } }); - const renderURL = `${webworkConfig?.webwork_url ?? '/webwork2'}/render_rpc`; - const renderArea = document.getElementById('pgedit-render-area'); + const removeValidationErrors = (input) => { + input?.classList.remove('is-invalid'); + input.setCustomValidity(''); + }; + + const validateInput = (e, input, isInvalid, defaultMessage, report) => { + if (isInvalid) { + e.preventDefault(); + input.classList.add('is-invalid'); + input.setCustomValidity(input.dataset.errorMessage ?? defaultMessage); + if (report) input.reportValidity(); + return false; + } + removeValidationErrors(input); + return true; + }; + + // Validation of the target file for the save as tab. + const saveAsTargetFile = document.getElementsByName('action.save_as.target_file')?.[0]; + saveAsTargetFile?.addEventListener('keyup', () => { + if (saveAsTargetFile.value) removeValidationErrors(saveAsTargetFile); + }); + + // Validation of the target set for the save as tab. + const saveAsSaveModeRadios = document.getElementsByName('action.save_as.saveMode'); + const saveToTargetSetRadio = Array.from(saveAsSaveModeRadios).find( + (r) => r.id === 'action_save_as_saveMode_new_problem_id' || r.id === 'action_save_as_saveMode_set_header_id' + ); + const targetSetSelect = document.getElementsByName('action.save_as.targetSet')?.[0]; + const actionSaveAs = document.getElementById('save_as'); + for (const radio of saveAsSaveModeRadios) { + radio.addEventListener('change', () => removeValidationErrors(targetSetSelect)); + } + const saveToTargetSetSelected = () => { + saveToTargetSetRadio.checked = true; + if (targetSetSelect?.value) removeValidationErrors(targetSetSelect); + }; + targetSetSelect?.addEventListener('change', saveToTargetSetSelected); + targetSetSelect?.addEventListener('focusin', saveToTargetSetSelected); + + document.forms.editor?.addEventListener('submit', (e) => { + if (actionSaveAs && actionSaveAs.classList.contains('active')) { + let report = true; + for (const validationData of [ + [saveAsTargetFile, saveAsTargetFile?.value === '', 'Please enter a filename.'], + [targetSetSelect, saveToTargetSetRadio?.checked && !targetSetSelect?.value, 'Please select a set.'] + ]) { + if (!validateInput(e, ...validationData, report)) report = false; + } + } + }); + const fileType = document.getElementsByName('file_type')[0]?.value; // This is either the div containing the CodeMirror editor or the problemContents textarea in the case that @@ -322,27 +449,124 @@ } }); - // Synchronize the heights of the render area and the editor area for wide windows. - if (editorArea && renderArea) { - const codeMirrorResizeObserver = new ResizeObserver((entries) => { - if (document.body.clientWidth < 992) return; - - for (const entry of entries) { - if (entry.borderBoxSize) { - // Note that the blockSize is the height (since width is not resizable). - const height = Array.isArray(entry.borderBoxSize) - ? entry.borderBoxSize[0].blockSize - : entry.borderBoxSize.blockSize; - if (window.getComputedStyle(renderArea).getPropertyValue('height') !== `${height}px`) - renderArea.style.height = `${height}px`; - if (window.getComputedStyle(editorArea).getPropertyValue('height') !== `${height}px`) { - editorArea.style.height = `${height}px`; - } - } + const pgEditContainer = document.getElementById('pgedit-container'); + const codePanel = pgEditContainer?.querySelector('.pgedit-panel.code'); + const renderPanel = pgEditContainer?.querySelector('.pgedit-panel.render'); + + if (pgEditContainer && codePanel && renderPanel) { + if (document.body.clientWidth < 992) { + const initialCodePanelHeight = localStorage.getItem('WW.pgedit.codePanelHeight'); + if (initialCodePanelHeight) codePanel.style.height = initialCodePanelHeight; + } else { + const initialResizeContainerHeight = localStorage.getItem('WW.pgedit.containerHeight'); + if (initialResizeContainerHeight) pgEditContainer.style.height = initialResizeContainerHeight; + const initialCodePanelWidth = localStorage.getItem('WW.pgedit.codePanelWidth'); + if (initialCodePanelWidth) codePanel.style.width = initialCodePanelWidth; + } + + const verticalResizer = pgEditContainer.querySelector('.vertical-resizer'); + + verticalResizer?.addEventListener('pointerdown', (e) => { + verticalResizer.setPointerCapture(e.pointerId); + + const startY = e.clientY; + const startHeight = + document.body.clientWidth < 992 + ? codePanel.getBoundingClientRect().height + : pgEditContainer.getBoundingClientRect().height; + + const onPointerMove = + document.body.clientWidth < 992 + ? (moveEvent) => { + codePanel.style.height = `${startHeight + (moveEvent.clientY - startY)}px`; + localStorage.setItem('WW.pgedit.codePanelHeight', codePanel.style.height); + } + : (moveEvent) => { + pgEditContainer.style.height = `${startHeight + (moveEvent.clientY - startY)}px`; + localStorage.setItem('WW.pgedit.containerHeight', pgEditContainer.style.height); + }; + const onPointerUp = () => { + verticalResizer.releasePointerCapture(e.pointerId); + document.removeEventListener('pointermove', onPointerMove); + document.removeEventListener('pointerup', onPointerUp); + }; + + document.addEventListener('pointermove', onPointerMove); + document.addEventListener('pointerup', onPointerUp); + }); + + const updateHeight = (delta) => { + if (document.body.clientWidth < 992) { + codePanel.style.height = `${codePanel.getBoundingClientRect().height + delta}px`; + localStorage.setItem('WW.pgedit.codePanelHeight', codePanel.style.height); + } else { + pgEditContainer.style.height = `${pgEditContainer.getBoundingClientRect().height + delta}px`; + localStorage.setItem('WW.pgedit.containerHeight', pgEditContainer.style.height); + } + }; + + verticalResizer?.addEventListener('keydown', (e) => { + const step = e.ctrlKey ? 1 : e.altKey ? 50 : 20; + if (e.key === 'ArrowUp') { + updateHeight(-step); + e.preventDefault(); + } else if (e.key === 'ArrowDown') { + updateHeight(step); + e.preventDefault(); + } + }); + + const horizontalResizer = pgEditContainer.querySelector('.horizontal-resizer'); + + horizontalResizer?.addEventListener('pointerdown', (e) => { + horizontalResizer.setPointerCapture(e.pointerId); + + const startX = e.clientX; + const startWidth = codePanel.getBoundingClientRect().width; + + const onPointerMove = (moveEvent) => { + codePanel.style.width = `${startWidth + (moveEvent.clientX - startX)}px`; + localStorage.setItem('WW.pgedit.codePanelWidth', codePanel.style.width); + }; + + const onPointerUp = () => { + horizontalResizer.releasePointerCapture(e.pointerId); + document.removeEventListener('pointermove', onPointerMove); + document.removeEventListener('pointerup', onPointerUp); + }; + + document.addEventListener('pointermove', onPointerMove); + document.addEventListener('pointerup', onPointerUp); + }); + + horizontalResizer?.addEventListener('dblclick', () => { + codePanel.style.width = 'calc(50% - 0.5rem + 1px)'; + localStorage.setItem('WW.pgedit.codePanelWidth', codePanel.style.width); + }); + + horizontalResizer?.addEventListener('keydown', (e) => { + if (e.key === 'Enter' || e.key === ' ') { + codePanel.style.width = 'calc(50% - 0.5rem + 1px)'; + localStorage.setItem('WW.pgedit.codePanelWidth', codePanel.style.width); + e.preventDefault(); + } + }); + + const updateWidth = (delta) => { + codePanel.style.width = `${codePanel.getBoundingClientRect().width + delta}px`; + localStorage.setItem('WW.pgedit.codePanelWidth', codePanel.style.width); + }; + + horizontalResizer?.addEventListener('keydown', (e) => { + const step = e.ctrlKey ? 1 : e.altKey ? 50 : 20; + if (e.key === 'ArrowLeft') { + updateWidth(-step); + e.preventDefault(); + } else if (e.key === 'ArrowRight') { + updateWidth(step); + e.preventDefault(); } }); - codeMirrorResizeObserver.observe(editorArea); - codeMirrorResizeObserver.observe(renderArea); } // Save the initial placeholder content of the render area so that it can be put back when a problem is reloaded. @@ -350,13 +574,31 @@ const iframe = document.createElement('iframe'); iframe.title = 'Rendered content'; iframe.id = 'pgedit-render-iframe'; + iframe.style.colorScheme = 'light'; - // Adjust the height of the iframe when the window is resized and when the iframe loads. + // Adjust editor dimensions when the window is resized and when the iframe loads. const adjustIFrameHeight = () => { if (document.body.clientWidth < 992) { - if (iframe.contentDocument) - renderArea.style.height = `${iframe.contentDocument.documentElement.offsetHeight + 2}px`; - } else renderArea.style.height = `${editorArea.offsetHeight}px`; + if (iframe.contentDocument) { + pgEditContainer.style.height = ''; + codePanel.style.width = '100%'; + codePanel.style.height = localStorage.getItem('WW.pgedit.codePanelHeight') ?? ''; + renderArea.style.height = `${ + iframe.contentDocument.documentElement.offsetHeight + + 2 + + (document.getElementById('author-comment')?.offsetHeight ?? 0) + }px`; + renderPanel.style.width = '100%'; + renderPanel.style.height = renderArea.style.height; + } + } else { + pgEditContainer.style.height = localStorage.getItem('WW.pgedit.containerHeight') ?? ''; + codePanel.style.width = localStorage.getItem('WW.pgedit.codePanelWidth') ?? ''; + renderPanel.style.width = ''; + codePanel.style.height = '100%'; + renderPanel.style.height = '100%'; + renderArea.style.height = '100%'; + } }; window.addEventListener('resize', adjustIFrameHeight); @@ -382,6 +624,7 @@ requestData.set('send_pg_flags', 1); requestData.set(button.name, button.value); requestData.set('set_id', document.getElementsByName('hidden_set_id')[0]?.value ?? 'Unknown Set'); + requestData.set('showMathJaxErrors', 1); await renderProblem(requestData); @@ -390,11 +633,7 @@ } adjustIFrameHeight(); - - // Scroll to the top of the render window if the current scroll position is below that. - const renderAreaRect = renderArea.getBoundingClientRect(); - const topBarHeight = document.querySelector('.webwork-logo')?.getBoundingClientRect().height ?? 0; - if (renderAreaRect.top < topBarHeight) window.scrollBy(0, renderAreaRect.top - topBarHeight); + scrollToRenderArea(); }); const render = () => @@ -428,7 +667,8 @@ if (fileType === 'hardcopy_theme') { const contents = webworkConfig?.pgCodeMirror?.source; if (contents) { - renderArea.innerHTML = '

' + contents.replace(/&/g, '&').replace(/';
+					renderArea.innerHTML =
+						'
' + contents.replace(/&/g, '&').replace(/';
 				} else
 					renderArea.innerHTML =
 						'
The file has no content.
';
@@ -473,7 +713,8 @@
 					displayMode: document.getElementById('action_view_displayMode_id')?.value ?? 'MathJax',
 					language: document.querySelector('input[name="hidden_language"]')?.value ?? 'en',
 					send_pg_flags: 1,
-					view_problem_debugging_info: 1
+					view_problem_debugging_info: 1,
+					showMathJaxErrors: 1
 				})
 			).then(() => resolve());
 		});
@@ -512,7 +753,8 @@
 					if (data.pg_flags && data.pg_flags.comment) {
 						// The problem has a comment, so show it.
 						const container = document.createElement('div');
-						container.classList.add('px-2', 'mb-2');
+						container.id = 'author-comment';
+						container.classList.add('p-2');
 						container.innerHTML = data.pg_flags.comment;
 						iframe.after(container);
 					}
@@ -616,37 +858,4 @@
 			rendering = false;
 		}
 	};
-
-	const pgmlLabButton = document.getElementById('pgml-lab');
-	pgmlLabButton?.addEventListener('click', () => {
-		const form = document.createElement('form');
-		form.style.display = 'none';
-		form.target = 'PGML';
-		form.action = renderURL;
-		form.method = 'post';
-
-		const inputs = [
-			['courseID', document.getElementsByName('courseID')[0]?.value],
-			['displayMode', document.getElementById('action_view_displayMode_id')?.value ?? 'MathJax'],
-			['fileName', 'PGMLLab/PGML-lab.pg'],
-			['uriEncodedProblemSource', pgmlLabButton.dataset.source]
-		];
-
-		const user = document.getElementsByName('user')[0];
-		if (user) inputs.push(['user', user.value]);
-		const sessionKey = document.getElementsByName('key')[0];
-		if (sessionKey) inputs.push(['key', sessionKey.value]);
-
-		for (const [name, value] of inputs) {
-			const input = document.createElement('input');
-			input.name = name;
-			input.value = value;
-			input.type = 'hidden';
-			form.append(input);
-		}
-
-		document.body.append(form);
-		form.submit();
-		form.remove();
-	});
 })();
diff --git a/htdocs/js/PGProblemEditor/pgproblemeditor.scss b/htdocs/js/PGProblemEditor/pgproblemeditor.scss
new file mode 100644
index 0000000000..fec708827f
--- /dev/null
+++ b/htdocs/js/PGProblemEditor/pgproblemeditor.scss
@@ -0,0 +1,174 @@
+#pgedit-container {
+	display: flex;
+	flex-direction: column;
+	width: 100%;
+	height: 600px;
+	min-height: 400px;
+
+	.pgedit-inner-container {
+		display: flex;
+		flex: 1;
+		width: 100%;
+		height: calc(100% - 1rem - 2px);
+
+		.pgedit-panel {
+			overflow: auto;
+		}
+
+		.code {
+			width: calc(50% - 0.5rem);
+			height: 100%;
+			min-width: 400px;
+
+			.code-mirror-editor {
+				min-height: unset;
+				overflow: unset;
+				height: 100%;
+			}
+
+			.text-area-editor {
+				min-height: unset;
+				overflow: unset;
+				height: 100%;
+				resize: unset;
+			}
+		}
+
+		.render {
+			flex: 1;
+			min-width: 300px;
+			height: 100%;
+
+			#pgedit-render-area {
+				border: 1px solid var(--ww-layout-border-color, #ddd);
+				height: 100%;
+				display: flex;
+				flex-direction: column;
+
+				#pgedit-render-iframe {
+					flex-grow: 1;
+					border: none;
+					width: 100%;
+				}
+			}
+
+			#author-comment {
+				border-top: 1px solid var(--ww-layout-border-color, #ddd);
+			}
+		}
+	}
+
+	.pgedit-resizer {
+		background-color: #fff;
+		transition:
+			background 0.2s,
+			box-shadow 0.2s ease-in-out;
+		position: relative;
+		border: 1px solid var(--ww-layout-border-color, #ddd);
+		user-select: none;
+		touch-action: none;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: black;
+
+		&:focus {
+			z-index: 19;
+			box-shadow: 0 0 0.2rem 0.25rem #aaa;
+			outline: none;
+		}
+
+		&:hover {
+			z-index: 19;
+			background-color: #888;
+			color: white;
+			box-shadow: 0 0 0.2rem 0.25rem #888;
+		}
+
+		&::after {
+			content: '';
+			position: absolute;
+			background: transparent;
+		}
+	}
+
+	.vertical-resizer {
+		height: 1rem;
+		width: 100%;
+		cursor: row-resize;
+
+		i {
+			transform: scale(4, 1);
+		}
+
+		&::after {
+			top: -4px;
+			left: 0;
+			right: 0;
+			bottom: -4px;
+		}
+	}
+
+	.horizontal-resizer {
+		height: 100%;
+		width: 1rem;
+		cursor: col-resize;
+
+		i {
+			transform: scale(1, 4);
+		}
+
+		&::after {
+			top: 0;
+			left: -4px;
+			right: -4px;
+			bottom: 0;
+		}
+	}
+
+	@media (prefers-color-scheme: dark) {
+		.pgedit-resizer {
+			background-color: #000;
+			color: white;
+
+			&:focus {
+				box-shadow: 0 0 0.2rem 0.25rem #777;
+			}
+
+			&:hover {
+				background-color: #bbb;
+				color: black;
+				box-shadow: 0 0 0.2rem 0.25rem #999;
+			}
+		}
+	}
+
+	@media (max-width: 991px) {
+		height: unset;
+		min-height: unset;
+
+		.pgedit-inner-container {
+			flex-direction: column;
+			row-gap: 1rem;
+
+			.code {
+				width: 100%;
+				height: 400px;
+				min-height: 200px;
+				min-width: unset;
+			}
+
+			.render {
+				flex: unset;
+				height: 400px;
+				min-height: 200px;
+				width: 100%;
+				min-width: unset;
+			}
+
+			.horizontal-resizer {
+				display: none;
+			}
+		}
+	}
+}
diff --git a/htdocs/js/PODViewer/podviewer.css b/htdocs/js/PODViewer/podviewer.css
deleted file mode 100644
index e4f17811d2..0000000000
--- a/htdocs/js/PODViewer/podviewer.css
+++ /dev/null
@@ -1,66 +0,0 @@
-.main-index-header,
-.pod-header {
-	height: 65px;
-	top: 0;
-	left: 0;
-	right: 0;
-	z-index: 2;
-}
-
-#sidebar {
-	--bs-offcanvas-width: 300px;
-	overflow-y: auto;
-}
-
-#sidebar ul.nav ul.nav li {
-	border-left: 1px solid #e1e4e8;
-	padding-left: 10px;
-}
-
-#sidebar ul.nav ul.nav li:hover {
-	border-left: 6px solid #e1e4e8;
-	padding-left: 5px;
-}
-
-.main-index-container,
-.pod-page-container {
-	margin-top: 65px;
-}
-
-@media only screen and (min-width: 768px) {
-	#sidebar {
-		height: calc(100vh - 65px);
-		width: 300px;
-	}
-
-	.pod-page-container {
-		margin-left: 300px;
-	}
-}
-
-#_podtop_ pre {
-	border: 1px solid #ccc;
-	border-radius: 5px;
-	background: #f6f6f6;
-	padding: 0.75rem;
-}
-
-#_podtop_,
-#_podtop_ *[id] {
-	scroll-margin-top: calc(65px + 1rem);
-}
-
-@media only screen and (max-width: 768px) {
-	.pod-header {
-		height: 100px;
-	}
-
-	.pod-page-container {
-		margin-top: 100px;
-	}
-
-	#_podtop_,
-	#_podtop_ *[id] {
-		scroll-margin-top: calc(100px + 1rem);
-	}
-}
diff --git a/htdocs/js/PODViewer/podviewer.js b/htdocs/js/PODViewer/podviewer.js
deleted file mode 100644
index 795093205a..0000000000
--- a/htdocs/js/PODViewer/podviewer.js
+++ /dev/null
@@ -1,8 +0,0 @@
-(() => {
-	const offcanvas = bootstrap.Offcanvas.getOrCreateInstance(document.getElementById('sidebar'));
-	for (const link of document.querySelectorAll('#sidebar .nav-link')) {
-		// The timeout is to workaround an issue in Chrome. If the offcanvas hides before the window scrolls to the
-		// fragment in the page, scrolling stops before it gets there.
-		link.addEventListener('click', () => setTimeout(() => offcanvas.hide(), 500));
-	}
-})();
diff --git a/htdocs/js/ProblemGrader/problemgrader.js b/htdocs/js/ProblemGrader/problemgrader.js
index 1e33408bbf..ada3727ecc 100644
--- a/htdocs/js/ProblemGrader/problemgrader.js
+++ b/htdocs/js/ProblemGrader/problemgrader.js
@@ -1,6 +1,45 @@
 'use strict';
 
 (() => {
+	const setPointInputValue = (pointInput, score) =>
+		(pointInput.value = parseFloat(
+			(Math.round((score * pointInput.max) / 100 / pointInput.step) * pointInput.step).toFixed(2)
+		));
+
+	// Update problem score if point value changes and is a valid value.
+	for (const pointInput of document.querySelectorAll('.problem-points')) {
+		pointInput.addEventListener('input', () => {
+			const userId = pointInput.id.replace(/\.points$/, '');
+			if (pointInput.checkValidity()) {
+				const scoreInput = document.getElementById(`${userId}.score`);
+				if (scoreInput) {
+					scoreInput.classList.remove('is-invalid');
+					scoreInput.value = Math.round((100 * pointInput.value) / pointInput.max);
+				}
+				pointInput.classList.remove('is-invalid');
+			} else {
+				pointInput.classList.add('is-invalid');
+			}
+		});
+	}
+
+	// Update problem points if score changes and is a valid value.
+	for (const scoreInput of document.querySelectorAll('.problem-score')) {
+		scoreInput.addEventListener('input', () => {
+			const userId = scoreInput.id.replace(/\.score$/, '');
+			if (scoreInput.checkValidity()) {
+				const pointInput = document.getElementById(`${userId}.points`);
+				if (pointInput) {
+					pointInput.classList.remove('is-invalid');
+					pointInput.value = setPointInputValue(pointInput, scoreInput.value);
+				}
+				scoreInput.classList.remove('is-invalid');
+			} else {
+				scoreInput.classList.add('is-invalid');
+			}
+		});
+	}
+
 	const userSelect = document.getElementById('student_selector');
 	if (!userSelect) return;
 
@@ -15,7 +54,8 @@
 			problemSeed: selectedUser.dataset.problemSeed,
 			set_id: document.getElementsByName('hidden_set_id')[0]?.value,
 			probNum: document.getElementsByName('hidden_problem_id')[0]?.value,
-			processAnswers: 1
+			processAnswers: 1,
+			WWcorrectAns: 1
 		};
 
 		if (selectedUser.dataset.versionId) ro.version_id = selectedUser.dataset.versionId;
diff --git a/htdocs/js/ProblemGrader/singleproblemgrader.js b/htdocs/js/ProblemGrader/singleproblemgrader.js
index 002c5b7f0d..9c9f16fbe9 100644
--- a/htdocs/js/ProblemGrader/singleproblemgrader.js
+++ b/htdocs/js/ProblemGrader/singleproblemgrader.js
@@ -125,6 +125,7 @@
 						version_id: saveData.versionId,
 						problem_id: saveData.problemId,
 						status: parseInt(scoreInput.value) / 100,
+						...(saveData.saveSubStatus === '1' ? { sub_status: parseInt(scoreInput.value) / 100 } : {}),
 						mark_graded: true
 					}),
 					signal: controller.signal
@@ -216,4 +217,141 @@
 			}
 		});
 	}
+
+	const settingStoreID = `WW.${document.getElementsByName('courseID')[0]?.value ?? 'unknownCourse'}.${
+		document.getElementsByName('user')[0]?.value ?? 'unknownUser'
+	}.problem_grader`;
+	let gradersOpen = localStorage.getItem(`${settingStoreID}.open`) === 'true';
+
+	const graderCollapses = [];
+
+	for (const grader of document.querySelectorAll('.problem-grader')) {
+		const problemId = grader.id.replace('problem-grader-');
+
+		grader.classList.add('accordion');
+
+		const accordionItem = document.createElement('div');
+		accordionItem.classList.add('accordion-item');
+
+		const accordionHeader = document.createElement('h2');
+		accordionHeader.classList.add('accordion-header');
+
+		const accordionButton = document.createElement('button');
+		accordionButton.classList.add('accordion-button');
+		accordionButton.type = 'button';
+		accordionButton.textContent = grader.dataset.graderTitle ?? 'Problem Grader';
+		accordionButton.dataset.bsToggle = 'collapse';
+		accordionButton.dataset.bsTarget = `#problem-grader-collapse-${problemId}`;
+		accordionButton.setAttribute('aria-controls', `#problem-grader-collapse-${problemId}`);
+		accordionButton.setAttribute('aria-expanded', gradersOpen);
+		if (!gradersOpen) accordionButton.classList.add('collapsed');
+
+		accordionHeader.append(accordionButton);
+
+		const accordionCollapse = document.createElement('div');
+		accordionCollapse.classList.add('accordion-collapse', 'collapse');
+		accordionCollapse.id = `problem-grader-collapse-${problemId}`;
+		accordionCollapse.dataset.bsParent = `problem-grader-${problemId}`;
+		if (gradersOpen) accordionCollapse.classList.add('show');
+
+		const accordionBody = grader.querySelector('.problem-grader-table');
+		accordionBody.classList.add('accordion-body');
+		accordionCollapse.append(accordionBody);
+
+		accordionItem.append(accordionHeader, accordionCollapse);
+		grader.append(accordionItem);
+
+		const graderCollapse = new bootstrap.Collapse(accordionCollapse, { toggle: false });
+		graderCollapses.push(graderCollapse);
+
+		grader.classList.remove('d-none');
+
+		// Expand or collapse all problem graders on the page when any one of them is expanded or collapsed.
+		let transitioning = false;
+		accordionCollapse.addEventListener('show.bs.collapse', () => {
+			if (transitioning) return;
+			transitioning = true;
+			for (const grader of graderCollapses) {
+				if (grader !== graderCollapse) grader.show();
+			}
+			transitioning = false;
+		});
+		accordionCollapse.addEventListener('hide.bs.collapse', () => {
+			if (transitioning) return;
+			transitioning = true;
+			for (const grader of graderCollapses) {
+				if (grader !== graderCollapse) grader.hide();
+			}
+			transitioning = false;
+		});
+
+		// Make sure that the "Reveal" button in feedback is not shown if a feedback button is used while the problem
+		// grader is open.  However, also make sure that the "Reveal" button is shown for any feedback button that is
+		// not used while the problem grader is open.
+
+		const unrevealedFeedbackBtns = [];
+
+		for (const feedbackBtn of document.querySelectorAll('.ww-feedback-btn')) {
+			const container = document.createElement('div');
+			container.innerHTML = feedbackBtn.dataset.bsContent;
+			const button = container.querySelector('.reveal-correct-btn');
+			if (!button) continue;
+
+			button.nextElementSibling?.classList.remove('d-none');
+			button.remove();
+
+			const fragment = new DocumentFragment();
+			fragment.append(container);
+
+			unrevealedFeedbackBtns.push([feedbackBtn, fragment.firstElementChild.innerHTML]);
+
+			const handler = () => {
+				const index = unrevealedFeedbackBtns.findIndex((data) => data[0] === feedbackBtn);
+				if (index !== -1) {
+					if (gradersOpen) {
+						unrevealedFeedbackBtns.splice(index, 1);
+						feedbackBtn.removeEventListener('shown.bs.popover', handler);
+					} else {
+						bootstrap.Popover.getInstance(feedbackBtn)
+							?.tip?.querySelector('.reveal-correct-btn')
+							?.addEventListener(
+								'click',
+								() => {
+									unrevealedFeedbackBtns.splice(index, 1);
+									feedbackBtn.removeEventListener('shown.bs.popover', handler);
+								},
+								{ once: true }
+							);
+					}
+				}
+			};
+
+			feedbackBtn.addEventListener('shown.bs.popover', handler);
+		}
+
+		const removeRevealButtons = () => {
+			for (const data of unrevealedFeedbackBtns) {
+				const feedbackPopover = bootstrap.Popover.getInstance(data[0]);
+				feedbackPopover?.setContent({ '.popover-body': data[1] });
+			}
+		};
+
+		if (gradersOpen) removeRevealButtons();
+
+		// In addition to removing and putting back the feedback "Reveal" buttons as needed,
+		// preserve the collapsed/expanded status of the problem graders in local storage.
+		accordionCollapse.addEventListener('shown.bs.collapse', () => {
+			localStorage.setItem(`${settingStoreID}.open`, 'true');
+			gradersOpen = true;
+			removeRevealButtons();
+		});
+		accordionCollapse.addEventListener('hidden.bs.collapse', () => {
+			gradersOpen = false;
+			localStorage.setItem(`${settingStoreID}.open`, 'false');
+			for (const data of unrevealedFeedbackBtns) {
+				const feedbackPopover = bootstrap.Popover.getInstance(data[0]);
+				feedbackPopover?.setContent({ '.popover-body': data[0].dataset.bsContent });
+			}
+		});
+	}
 })();
diff --git a/htdocs/js/ProblemSetDetail/problemsetdetail.js b/htdocs/js/ProblemSetDetail/problemsetdetail.js
index 93661d6739..1b9be297ee 100644
--- a/htdocs/js/ProblemSetDetail/problemsetdetail.js
+++ b/htdocs/js/ProblemSetDetail/problemsetdetail.js
@@ -467,4 +467,26 @@
 		const input = document.getElementById(btn.dataset.seedInput);
 		if (input) btn.addEventListener('click', () => (input.value = Math.floor(Math.random() * 10000)));
 	}
+
+	// Handle mixed select/number input fields.
+	for (const numericSelect of document.querySelectorAll('.mixed-numeric-select')) {
+		const select = numericSelect.querySelector('select');
+		const numberInput = numericSelect.querySelector('input');
+		let currentNumberValue = numberInput.value !== '' ? numberInput.value : numberInput.min;
+
+		const setNumericState = () => {
+			if (select.value === 'numeric') {
+				numberInput.value = currentNumberValue;
+				numberInput.disabled = false;
+				numberInput.required = true;
+			} else {
+				if (numberInput.value !== '') currentNumberValue = numberInput.value;
+				numberInput.value = '';
+				numberInput.disabled = true;
+				numberInput.required = false;
+			}
+		};
+		select.addEventListener('change', setNumericState);
+		setNumericState();
+	}
 })();
diff --git a/htdocs/js/ProblemSetList/problemsetlist.js b/htdocs/js/ProblemSetList/problemsetlist.js
index ca9f334853..b86bdebbc7 100644
--- a/htdocs/js/ProblemSetList/problemsetlist.js
+++ b/htdocs/js/ProblemSetList/problemsetlist.js
@@ -7,12 +7,12 @@
 		for (const id of ids) elements.push(document.getElementById(id));
 		for (const element of elements) {
 			if (element?.id.endsWith('_err_msg')) {
-				element?.classList.remove('d-none');
-			} else {
-				element?.classList.add('is-invalid');
+				element.classList.remove('d-none');
+			} else if (element) {
+				element.classList.add('is-invalid');
 				if (!(element.id in event_listeners)) {
 					event_listeners[element.id] = hide_errors([], elements);
-					element?.addEventListener('change', event_listeners[element.id]);
+					element.addEventListener('change', event_listeners[element.id]);
 				}
 			}
 		}
@@ -23,17 +23,17 @@
 			for (const id of ids) elements.push(document.getElementById(id));
 			for (const element of elements) {
 				if (element?.id.endsWith('_err_msg')) {
-					element?.classList.add('d-none');
+					element.classList.add('d-none');
 					if (element.id === 'select_set_err_msg' && 'set_table_id' in event_listeners) {
 						document
 							.getElementById('set_table_id')
 							?.removeEventListener('change', event_listeners.set_table_id);
 						delete event_listeners.set_table_id;
 					}
-				} else {
-					element?.classList.remove('is-invalid');
+				} else if (element) {
+					element.classList.remove('is-invalid');
 					if (element.id in event_listeners) {
-						element?.removeEventListener('change', event_listeners[element.id]);
+						element.removeEventListener('change', event_listeners[element.id]);
 						delete event_listeners[element.id];
 					}
 				}
@@ -139,16 +139,32 @@
 	filter_select?.addEventListener('change', filterElementToggle);
 
 	// This will make the popup menu alternate between a single selection and a multiple selection menu.
-	const importAmtSelect = document.getElementById('import_amt_select');
-	if (importAmtSelect) {
-		importAmtSelect.addEventListener('change', () => {
-			const numSelect = document.problemsetlist['action.import.number'];
-			const number = parseInt(numSelect.options[numSelect.selectedIndex].value);
-			document.problemsetlist['action.import.source'].size = number;
-			document.problemsetlist['action.import.source'].multiple = number > 1 ? true : false;
-			document.problemsetlist['action.import.name'].value = number > 1 ? '(taken from filenames)' : '';
-			document.problemsetlist['action.import.name'].readOnly = number > 1 ? true : false;
-			document.problemsetlist['action.import.name'].disabled = number > 1 ? true : false;
+	const numSelect = document.problemsetlist['action.import.number'];
+	if (numSelect) {
+		numSelect.addEventListener('change', () => {
+			const number = parseInt(numSelect.options[numSelect.selectedIndex]?.value ?? '1');
+			const importSourceSelect = document.problemsetlist['action.import.source'];
+			if (importSourceSelect) {
+				importSourceSelect.size = number;
+				if (number === 1) {
+					if (!importSourceSelect.value) importSourceSelect.options[0].selected = true;
+					importSourceSelect.options[0].textContent =
+						importSourceSelect.dataset.selectSingleText ?? 'Select filename below';
+					importSourceSelect.multiple = false;
+				} else {
+					importSourceSelect.options[0].textContent =
+						importSourceSelect.dataset.selectMultipleText ?? 'Select filename below';
+					importSourceSelect.multiple = true;
+					importSourceSelect.options[0].selected = false;
+				}
+			}
+			const importNameInput = document.problemsetlist['action.import.name'];
+			if (importNameInput) {
+				importNameInput.value =
+					number > 1 ? (importNameInput.dataset.multipleFilesText ?? '(taken from filenames)') : '';
+				importNameInput.readOnly = number > 1 ? true : false;
+				importNameInput.disabled = number > 1 ? true : false;
+			}
 		});
 	}
 
@@ -174,10 +190,15 @@
 		'zh-HK': 'yyyy/L/d ah:mm'
 	};
 
-	// Initialize the date/time picker for the import form.
+	// Initialize the date/time picker for the import form and common date editor.
+	const dateInputs = [];
 	const importDateShift = document.getElementById('import_date_shift');
-	if (importDateShift) {
-		luxon.Settings.defaultLocale = importDateShift.dataset.locale ?? 'en';
+	if (importDateShift) dateInputs.push(importDateShift);
+	const commonDateInput = document.getElementById('common-date');
+	if (commonDateInput) dateInputs.push(commonDateInput);
+
+	for (const dateInput of dateInputs) {
+		luxon.Settings.defaultLocale = dateInput.dataset.locale ?? 'en';
 
 		// Compute the time difference between a time in the browser timezone and the same time in the course timezone.
 		// flatpickr gives the time in the browser's timezone, and this is used to adjust to the course timezone.
@@ -189,17 +210,17 @@
 				new Date(dateTime.toLocaleString('en-US')).getTime() -
 				new Date(
 					dateTime.toLocaleString('en-US', {
-						timeZone: importDateShift.dataset.timezone ?? 'America/New_York'
+						timeZone: dateInput.dataset.timezone ?? 'America/New_York'
 					})
 				).getTime()
 			);
 		};
 
-		let fallbackDate = importDateShift.value
-			? new Date(parseInt(importDateShift.value) * 1000 - timezoneAdjustment(parseInt(importDateShift.value)))
+		let fallbackDate = dateInput.value
+			? new Date(parseInt(dateInput.value) * 1000 - timezoneAdjustment(parseInt(dateInput.value)))
 			: new Date();
 
-		const fp = flatpickr(importDateShift.parentNode, {
+		const fp = flatpickr(dateInput.parentNode, {
 			allowInput: true,
 			enableTime: true,
 			minuteIncrement: 1,
@@ -216,27 +237,28 @@
 			disableMobile: true,
 			wrap: true,
 			plugins: [
-				new confirmDatePlugin({ confirmText: importDateShift.dataset.doneText, showAlways: true }),
+				new confirmDatePlugin({ confirmText: dateInput.dataset.doneText, showAlways: true }),
 				new ShortcutButtonsPlugin({
 					button: [
 						{
-							label: importDateShift.dataset.todayText ?? 'Today',
+							label: dateInput.dataset.todayText ?? 'Today',
 							attributes: { class: 'btn btn-sm btn-secondary ms-auto me-1 mb-1' }
 						},
 						{
-							label: importDateShift.dataset.nowText ?? 'Now',
+							label: dateInput.dataset.nowText ?? 'Now',
 							attributes: { class: 'btn btn-sm btn-secondary mx-auto mb-1' }
 						}
 					],
 					onClick: (index, fp) => {
 						if (index === 0) {
-							const today = new Date();
-							// If there isn't a selected date, then use 12:00 am on the current date.
-							const selectedDate = fp.selectedDates[0] ?? new Date(new Date().toDateString());
-							selectedDate.setFullYear(today.getFullYear());
-							selectedDate.setMonth(today.getMonth());
-							selectedDate.setDate(today.getDate());
-							fp.setDate(selectedDate);
+							// The initial date represents 12:00 am on the current date.
+							const today = new Date(new Date().toDateString());
+							if (fp.selectedDates[0]) {
+								today.setHours(fp.selectedDates[0].getHours());
+								today.setMinutes(fp.selectedDates[0].getMinutes());
+								today.setSeconds(fp.selectedDates[0].getSeconds());
+							}
+							fp.setDate(today, true);
 						} else if (index === 1) {
 							fp.setDate(new Date());
 						}
@@ -251,6 +273,10 @@
 
 				// Make the alternate input left-to-right even for right-to-left languages.
 				this.altInput.dir = 'ltr';
+
+				// Move the id of the now hidden input onto the added input so the labels still work.
+				this.altInput.id = this.input.id;
+				this.input.removeAttribute('id');
 			},
 			parseDate(datestr, format) {
 				// Deal with the case of a unix timestamp.  The timezone needs to be adjusted back as this is for
@@ -278,11 +304,46 @@
 			}
 		});
 
-		importDateShift.nextElementSibling.addEventListener('keydown', (e) => {
+		dateInput.nextElementSibling.addEventListener('keydown', (e) => {
 			if (e.key === ' ' || e.key === 'Enter') {
 				e.preventDefault();
 				fp.open();
 			}
 		});
 	}
+
+	if (commonDateInput) {
+		document.getElementById('apply-common-date')?.addEventListener('click', () => {
+			const dateTypeInput = document.getElementById('set-date-choice');
+			if (!dateTypeInput?.value) {
+				show_errors(['choose_date_type_err_msg'], [dateTypeInput]);
+				return;
+			}
+
+			if (!commonDateInput.value) {
+				show_errors(
+					['choose_common_date_err_msg'],
+					[commonDateInput.parentNode?._flatpickr?.input, commonDateInput.parentNode?._flatpickr?.altInput]
+				);
+				return;
+			}
+
+			const selectedSets = Array.from(document.getElementsByName('apply_date_sets')).filter((c) => c.checked);
+			if (!selectedSets.length) {
+				show_errors(['select_set_err_msg'], []);
+				event_listeners.set_table_id = hide_errors(
+					['set_table_id'],
+					[document.getElementById('select_set_err_msg')]
+				);
+				document.getElementById('set_table_id')?.addEventListener('change', event_listeners.set_table_id);
+			}
+
+			for (const set of selectedSets) {
+				const inputPicker = document.getElementsByName(`set.${set.value}.${dateTypeInput.value}`)[0]?.parentNode
+					?._flatpickr;
+				inputPicker?.setDate(commonDateInput.value, true);
+				inputPicker?.close(); // The picker isn't actually open, but this triggers the onClose handler.
+			}
+		});
+	}
 })();
diff --git a/htdocs/js/RenderProblem/renderproblem.js b/htdocs/js/RenderProblem/renderproblem.js
index ec4503a64a..f3bb2bbebb 100644
--- a/htdocs/js/RenderProblem/renderproblem.js
+++ b/htdocs/js/RenderProblem/renderproblem.js
@@ -69,6 +69,7 @@
 						iframe = document.createElement('iframe');
 						iframe.id = `${renderArea.id}_iframe`;
 						iframe.style.border = 'none';
+						iframe.style.colorScheme = 'light';
 						while (renderArea.firstChild) renderArea.firstChild.remove();
 						renderArea.append(iframe);
 
diff --git a/htdocs/js/SampleProblemViewer/documentation-search.js b/htdocs/js/SampleProblemViewer/documentation-search.js
deleted file mode 100644
index 5e61bc64ec..0000000000
--- a/htdocs/js/SampleProblemViewer/documentation-search.js
+++ /dev/null
@@ -1,76 +0,0 @@
-(async () => {
-	const searchBox = document.getElementById('search-box');
-	const resultList = document.getElementById('result-list');
-	if (!resultList || !searchBox) return;
-
-	const webwork2URL = webworkConfig?.webwork_url ?? '/webwork2';
-
-	let searchData;
-	try {
-		const result = await fetch(`${webwork2URL}/sampleproblems/search_data`);
-		searchData = await result.json();
-	} catch (e) {
-		console.log(e);
-		return;
-	}
-
-	const miniSearch = new MiniSearch({
-		fields: ['filename', 'name', 'description', 'terms', 'macros', 'subjects'],
-		storeFields: ['type', 'filename', 'dir', 'description']
-	});
-	miniSearch.addAll(searchData);
-
-	const searchMacrosCheck = document.getElementById('search-macros');
-	const searchSampleProblemsCheck = document.getElementById('search-sample-problems');
-
-	document.getElementById('clear-search-button')?.addEventListener('click', () => {
-		searchBox.value = '';
-		while (resultList.firstChild) resultList.firstChild.remove();
-	});
-
-	const searchDocumentation = () => {
-		const searchMacros = searchMacrosCheck?.checked;
-		const searchSampleProblems = searchSampleProblemsCheck?.checked;
-
-		while (resultList.firstChild) resultList.firstChild.remove();
-
-		if (!searchBox.value) return;
-
-		for (const result of miniSearch.search(searchBox.value, { prefix: true })) {
-			if (
-				(searchSampleProblems && result.type === 'sample problem') ||
-				(searchMacros && result.type === 'macro')
-			) {
-				const link = document.createElement('a');
-				link.classList.add('list-group-item', 'list-group-item-action');
-				link.href = `${webwork2URL}/${
-					result.type === 'sample problem' ? 'sampleproblems' : result.type === 'macro' ? 'pod' : ''
-				}/${result.dir}/${result.filename.replace('.pg', '')}`;
-
-				const linkText = document.createElement('span');
-				linkText.classList.add('h4');
-				linkText.textContent = `${result.filename} (${result.type})`;
-				link.append(linkText);
-
-				if (result.description) {
-					const summary = document.createElement('div');
-					summary.textContent = result.description;
-					link.append(summary);
-				}
-
-				resultList.append(link);
-			}
-		}
-
-		if (resultList.children.length == 0) {
-			const item = document.createElement('div');
-			item.classList.add('alert', 'alert-info');
-			item.innerHTML = 'No results found';
-			resultList.append(item);
-		}
-	};
-
-	searchBox.addEventListener('keyup', searchDocumentation);
-	searchMacrosCheck?.addEventListener('change', searchDocumentation);
-	searchSampleProblemsCheck?.addEventListener('change', searchDocumentation);
-})();
diff --git a/htdocs/js/SetMaker/setmaker.js b/htdocs/js/SetMaker/setmaker.js
index 581c165371..566774c053 100644
--- a/htdocs/js/SetMaker/setmaker.js
+++ b/htdocs/js/SetMaker/setmaker.js
@@ -79,6 +79,17 @@
 
 	const countLine = document.getElementById('library_count_line');
 
+	const settingStoreID = `WW.${document.getElementsByName('hidden_course_id')[0]?.value ?? 'unknownCourse'}.${
+		document.getElementsByName('user')[0]?.value ?? 'unknownUser'
+	}.setmaker`;
+	const includeOPLInitialStatus = includeOPL?.checked;
+	const includeContribInitialStatus = includeContrib?.checked;
+	if (includeOPL)
+		includeOPL.checked = localStorage.getItem(`${settingStoreID}.includeOPLChecked`) !== 'false' ? true : false;
+	if (includeContrib)
+		includeContrib.checked =
+			localStorage.getItem(`${settingStoreID}.includeContribChecked`) !== 'false' ? true : false;
+
 	const lib_update = async (who, what) => {
 		const child = { subject: 'chapter', chapter: 'section', section: 'count' };
 
@@ -200,11 +211,22 @@
 	libraryChapter?.addEventListener('change', () => lib_update('section', 'get'));
 	librarySubject?.addEventListener('change', () => lib_update('chapter', 'get'));
 	librarySection?.addEventListener('change', () => lib_update('count', 'clear'));
-	includeOPL?.addEventListener('change', () => lib_update('count', 'clear'));
-	includeContrib?.addEventListener('change', () => lib_update('count', 'clear'));
+	includeOPL?.addEventListener('change', () => {
+		localStorage.setItem(`${settingStoreID}.includeOPLChecked`, includeOPL.checked);
+		lib_update('count', 'clear');
+	});
+	includeContrib?.addEventListener('change', () => {
+		localStorage.setItem(`${settingStoreID}.includeContribChecked`, includeContrib.checked);
+		lib_update('count', 'clear');
+	});
 	levels.forEach((level) => level.addEventListener('change', () => lib_update('count', 'clear')));
 	libraryKeywords?.addEventListener('change', () => lib_update('count', 'clear'));
 
+	// If the local storage status of the checks are different than what they
+	// were when the page loaded, then the count needs to be updated.
+	if (includeOPL?.checked !== includeOPLInitialStatus || includeContrib?.checked !== includeContribInitialStatus)
+		lib_update('count', 'clear');
+
 	// Set up the advanced view selects to submit the form when changed.
 	const libraryBrowserForm = document.forms['library_browser_form'];
 	if (libraryBrowserForm) {
diff --git a/htdocs/js/System/color-scheme.js b/htdocs/js/System/color-scheme.js
new file mode 100644
index 0000000000..cf0164193a
--- /dev/null
+++ b/htdocs/js/System/color-scheme.js
@@ -0,0 +1,75 @@
+'use strict';
+
+(() => {
+	const getPreferredTheme = () => {
+		const storedTheme = localStorage.getItem('WW.color-scheme');
+		if (storedTheme) return storedTheme;
+		return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+	};
+
+	let flatpickrDarkTheme;
+
+	const setTheme = (theme) => {
+		const themeValue =
+			theme === 'auto' ? (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light') : theme;
+		document.documentElement.setAttribute('data-bs-theme', themeValue);
+
+		if (!flatpickrDarkTheme) flatpickrDarkTheme = document.getElementById('flatpickr-dark-theme');
+		if (flatpickrDarkTheme) {
+			if (themeValue === 'dark') document.head.append(flatpickrDarkTheme);
+			else flatpickrDarkTheme.remove();
+		}
+	};
+
+	setTheme(getPreferredTheme());
+
+	const showActiveTheme = (theme, focus = false) => {
+		const themeSwitcher = document.getElementById('color-scheme-chooser');
+		if (!themeSwitcher) return;
+
+		const activeThemeIcon = themeSwitcher.querySelector('.theme-icon-active');
+		const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`);
+
+		for (const element of document.querySelectorAll('[data-bs-theme-value]')) {
+			element.classList.remove('active');
+			element.setAttribute('aria-pressed', 'false');
+		}
+
+		btnToActive.classList.add('active');
+		btnToActive.setAttribute('aria-pressed', 'true');
+		activeThemeIcon.classList.remove('fa-sun', 'fa-moon', 'fa-circle-half-stroke');
+		activeThemeIcon.classList.add(
+			theme === 'light' ? 'fa-sun' : theme === 'dark' ? 'fa-moon' : 'fa-circle-half-stroke'
+		);
+		themeSwitcher.setAttribute(
+			'aria-label',
+			`${themeSwitcher.title} (${
+				themeSwitcher.dataset[`${btnToActive.dataset.bsThemeValue}Text`] ?? btnToActive.dataset.bsThemeValue
+			})`
+		);
+
+		if (focus) themeSwitcher.focus();
+	};
+
+	window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
+		const storedTheme = localStorage.getItem('WW.color-scheme');
+		if (storedTheme !== 'light' && storedTheme !== 'dark') {
+			const preferredTheme = getPreferredTheme();
+			setTheme(preferredTheme);
+			showActiveTheme(preferredTheme);
+		}
+	});
+
+	window.addEventListener('DOMContentLoaded', () => {
+		showActiveTheme(getPreferredTheme());
+
+		for (const toggle of document.querySelectorAll('[data-bs-theme-value]')) {
+			toggle.addEventListener('click', () => {
+				const theme = toggle.getAttribute('data-bs-theme-value');
+				localStorage.setItem('WW.color-scheme', theme);
+				setTheme(theme);
+				showActiveTheme(theme, true);
+			});
+		}
+	});
+})();
diff --git a/htdocs/js/System/system.js b/htdocs/js/System/system.js
index 634f07a87c..d86801703a 100644
--- a/htdocs/js/System/system.js
+++ b/htdocs/js/System/system.js
@@ -11,7 +11,7 @@
 			navigation_element.classList.remove('invisible');
 			content.classList.toggle('toggle-width');
 
-			if (currentWidth < threshold) {
+			if (currentWidth <= threshold) {
 				const overlay = document.createElement('div');
 				overlay.classList.add('sidebar-backdrop');
 				document.body.append(overlay);
@@ -27,28 +27,28 @@
 
 		document.getElementById('toggle-sidebar')?.addEventListener('click', toggleSidebar);
 
-		if (currentWidth < threshold) navigation_element.classList.add('invisible');
+		if (currentWidth <= threshold) navigation_element.classList.add('invisible');
 
 		navigation_element.addEventListener('transitionend', () => {
 			if (
-				(window.innerWidth >= threshold && navigation_element.classList.contains('toggle-width')) ||
-				(window.innerWidth < threshold && !navigation_element.classList.contains('toggle-width'))
+				(window.innerWidth > threshold && navigation_element.classList.contains('toggle-width')) ||
+				(window.innerWidth <= threshold && !navigation_element.classList.contains('toggle-width'))
 			)
 				navigation_element.classList.add('invisible');
 		});
 
 		// If the window width changes open or close the sidebar appropriately.
 		window.addEventListener('resize', () => {
-			if (!navigation_element.classList.contains('toggle-width') && window.innerWidth >= threshold)
+			if (!navigation_element.classList.contains('toggle-width') && window.innerWidth > threshold)
 				navigation_element.classList.remove('invisible');
 
 			if (
 				(navigation_element.classList.contains('toggle-width') &&
-					window.innerWidth < threshold &&
-					currentWidth >= threshold) ||
+					window.innerWidth <= threshold &&
+					currentWidth > threshold) ||
 				(navigation_element.classList.contains('toggle-width') &&
-					window.innerWidth >= threshold &&
-					currentWidth < threshold)
+					window.innerWidth > threshold &&
+					currentWidth <= threshold)
 			) {
 				currentWidth = window.innerWidth;
 				toggleSidebar();
@@ -74,7 +74,8 @@
 	// FIXME: These are really general purpose tooltips and not just in the homework sets editor.  So the class name
 	// should be chosen to better reflect this.
 	document.querySelectorAll('.set-id-tooltip').forEach((el) => {
-		if (el.dataset.bsTitle) new bootstrap.Tooltip(el, { fallbackPlacements: [] });
+		if (el.dataset.bsTitle)
+			new bootstrap.Tooltip(el, { fallbackPlacements: el.dataset.fallbackPlacements?.split(' ') || [] });
 	});
 
 	// Hardcopy tooltips shown on the Problem Sets page.
diff --git a/htdocs/js/System/system.scss b/htdocs/js/System/system.scss
index c6a9468d58..1e9f81d9b2 100644
--- a/htdocs/js/System/system.scss
+++ b/htdocs/js/System/system.scss
@@ -3,7 +3,7 @@
 table caption {
 	font-weight: bold;
 	font-size: larger;
-	color: black;
+	color: var(--bs-emphasis-color, black);
 }
 
 .help-popup {
@@ -20,6 +20,10 @@ table caption {
 
 .required-field {
 	color: #dc3545;
+
+	[data-bs-theme='dark'] & {
+		color: #f85149;
+	}
 }
 
 .visually-hidden-focusable:active,
@@ -28,7 +32,6 @@ table caption {
 }
 
 $masthead-height: 70px !default;
-$layout-divider-color: #aaa !default;
 $site-nav-width: 250px !default;
 
 /* Banner */
@@ -40,7 +43,7 @@ $site-nav-width: 250px !default;
 	display: flex;
 	height: $masthead-height;
 	background-color: var(--bs-primary, #038);
-	border-bottom: 1px solid $layout-divider-color;
+	border-bottom: 1px solid var(--ww-layout-divider-color, #aaa);
 	margin: 0;
 	padding: 0;
 	z-index: 20;
@@ -63,7 +66,8 @@ $site-nav-width: 250px !default;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 5px 0;
+		padding: 5px 0.5rem;
+		gap: 0.25rem;
 		background-color: var(--ww-logo-background-color, #104aad);
 		z-index: 20;
 		width: $site-nav-width;
@@ -83,18 +87,18 @@ $site-nav-width: 250px !default;
 			}
 		}
 
-		a,
-		span {
+		a {
 			display: inline-block;
-			margin-right: 0.5rem;
 		}
 	}
 
 	.institution-logo {
 		display: flex;
 		flex-grow: 1;
+		gap: 2rem;
 		align-items: center;
-		padding: 8px 0;
+		justify-content: space-between;
+		padding: 0;
 		max-height: $masthead-height - 1px;
 
 		@media only screen and (max-width: 768px) {
@@ -108,8 +112,14 @@ $site-nav-width: 250px !default;
 
 		a {
 			display: block;
-			margin-left: 0.5rem;
-			margin-right: 0.5rem;
+		}
+
+		#color-scheme-chooser {
+			--bs-btn-color: var(--ww-primary-foreground-color, white) !important;
+			--bs-btn-hover-color: var(--ww-color-chooser-hover-color, #ccc);
+			--bs-btn-active-color: var(--ww-color-chooser-hover-color, #ccc);
+			--bs-btn-focus-shadow-rgb: var(--ww-color-chooser-focus-outline-color-rgb, 255, 255, 255);
+			text-decoration: none;
 		}
 	}
 
@@ -118,16 +128,11 @@ $site-nav-width: 250px !default;
 		height: $masthead-height - 1px;
 		padding: 4px 10px 4px 0;
 		color: var(--ww-primary-foreground-color, white);
-		text-align: right;
 		font-size: 0.85em;
 		font-weight: normal;
 
 		a {
 			color: black;
-
-			&:first-child {
-				margin-bottom: 5px;
-			}
 		}
 	}
 }
@@ -144,11 +149,11 @@ $site-nav-width: 250px !default;
 	overflow-y: auto;
 	transition-property: left, border-right-width;
 	transition-duration: 0.3s;
-	border-right: 1px solid $layout-divider-color;
+	border-right: 1px solid var(--ww-layout-divider-color, #aaa);
 	padding: 2px;
 
 	&.toggle-width {
-		left: -20%;
+		left: -250px;
 		border-right-width: 0px;
 	}
 
@@ -176,7 +181,7 @@ $site-nav-width: 250px !default;
 	.info-box {
 		border-radius: 0;
 		border: none;
-		border-top: 1px solid $layout-divider-color;
+		border-top: 1px solid var(--ww-layout-divider-color, #aaa);
 	}
 
 	.nav {
@@ -208,7 +213,7 @@ $site-nav-width: 250px !default;
 		padding-right: 0;
 
 		li a:hover {
-			background: #e1e1e1;
+			background: var(--ww-site-nav-link-hover-background-color, #e1e1e1);
 		}
 
 		ul.nav {
@@ -268,22 +273,15 @@ $site-nav-width: 250px !default;
 }
 
 #toggle-sidebar {
-	#toggle-sidebar-icon i {
-		padding: 0.25rem;
-		border-radius: 5px;
-		color: rgba(255, 255, 255, 0.85);
-		transition:
-			color 0.15s ease-in-out,
-			background-color 0.15s ease-in-out,
-			border-color 0.15s ease-in-out;
+	--bs-navbar-color: rgba(var(--ww-toggle-sidebar-icon-color-rgb, 255, 255, 255), 0.85);
+	--bs-navbar-toggler-border-radius: 0.375rem;
+	--bs-navbar-toggler-focus-width: 0.25rem;
+	--bs-navbar-toggler-padding-x: 0.25rem;
+	--bs-navbar-toggler-padding-y: 0.25rem;
+	--bs-navbar-toggler-transition: box-shadow 0.15s ease-in-out;
 
-		&:hover {
-			color: #fff;
-		}
-	}
-
-	&:focus #toggle-sidebar-icon i {
-		outline: 1px solid var(--bs-link-hover-color);
+	&:hover {
+		--bs-navbar-color: var(--ww-toggle-sidebar-icon-hover-color, #fff);
 	}
 }
 
@@ -297,6 +295,12 @@ $site-nav-width: 250px !default;
 	margin-bottom: 10px;
 	align-items: center;
 
+	[data-bs-theme='dark'] & {
+		box-shadow:
+			inset 0 0 3px 2px #000,
+			0 0 2px 1px #fff;
+	}
+
 	.progress-bar {
 		box-shadow: inset 0 0 3px 2px #000;
 		height: 100%;
@@ -329,6 +333,7 @@ $site-nav-width: 250px !default;
 
 /* Show me another */
 div.showMeAnotherBox {
+	color: #212529;
 	background-color: #ede275;
 	border-radius: 5px;
 	border: 2px solid #fdd017;
@@ -344,7 +349,7 @@ div.showMeAnotherBox {
 		padding-left: 0.5rem;
 		min-height: 38px;
 		align-items: center;
-		border: 1px solid #e6e6e6;
+		border: 1px solid var(--ww-layout-border-color, #e6e6e6);
 		border-radius: 4px;
 	}
 }
@@ -362,10 +367,6 @@ h1.page-title {
 	}
 }
 
-h2.page-title {
-	border-bottom: 1px solid #ccc;
-}
-
 .problem-sub-header {
 	margin-top: 0.25rem;
 	font-weight: bold;
@@ -373,13 +374,6 @@ h2.page-title {
 	line-height: 1.4;
 }
 
-.Warnings {
-	code {
-		white-space: normal;
-		color: inherit;
-	}
-}
-
 .error-output {
 	word-wrap: break-word;
 	color: #d63384;
@@ -387,6 +381,10 @@ h2.page-title {
 	direction: ltr;
 	font-family: monospace;
 	font-size: 9pt;
+
+	[data-bs-theme='dark'] & {
+		color: var(--bs-danger-text-emphasis);
+	}
 }
 
 /* Question nav section */
@@ -396,10 +394,10 @@ h2.page-title {
 	gap: 0.5rem;
 	align-content: space-between;
 	justify-content: space-between;
-	z-index: 20;
+	z-index: 19;
 	position: sticky;
 	top: $masthead-height;
-	background-color: white;
+	background-color: var(--bs-body-bg, white);
 	margin-bottom: 1rem;
 	padding: 0.25rem;
 	margin-left: 0;
@@ -449,6 +447,10 @@ h2.page-title {
 	width: 60%;
 	padding: 10px;
 	text-align: left;
+
+	[data-bs-theme='dark'] & {
+		background-color: #292900;
+	}
 }
 
 /* Home Page */
@@ -457,7 +459,7 @@ ul.courses-list {
 	margin: 0;
 
 	a {
-		border: 1px solid #e6e6e6;
+		border: 1px solid var(--ww-layout-border-color, #e6e6e6);
 		display: block;
 		padding: 0.5em;
 		margin-bottom: 0.5em;
@@ -465,6 +467,11 @@ ul.courses-list {
 		width: 95%;
 		font-weight: bold;
 
+		[data-bs-theme='dark'] & {
+			background: var(--bs-primary-bg-subtle, black);
+			color: var(--bs-primary-text-emphasis, white);
+		}
+
 		&:hover {
 			text-decoration: none;
 			background: var(--bs-primary, #038);
@@ -493,11 +500,28 @@ ul.courses-list {
 	td {
 		white-space: nowrap;
 		min-width: 20px;
+
+		&.correct {
+			color: #060;
+		}
+
+		&.incorrect {
+			color: #600;
+		}
+
+		[data-bs-theme='dark'] & {
+			&.correct {
+				color: #0b0;
+			}
+
+			&.incorrect {
+				color: #f66;
+			}
+		}
 	}
 
 	.table-rule {
-		border-top: 3px solid #d5d5d5;
-		padding-top: 5px;
+		border-top: 3px solid var(--ww-layout-divider-color);
 	}
 
 	.essay,
@@ -583,7 +607,7 @@ ul.courses-list {
 .info-box {
 	padding: 0.5em;
 	border-radius: 8px;
-	border: 1px solid #e6e6e6;
+	border: 1px solid var(--ww-layout-border-color, #e6e6e6);
 
 	h2,
 	h3,
@@ -660,6 +684,10 @@ ul.courses-list {
 	background-color: #f5f5f5;
 	margin-top: 10px;
 	margin-bottom: 0;
+
+	[data-bs-theme='dark'] & {
+		background-color: var(--bs-primary-bg-subtle, 'black');
+	}
 }
 
 .lb-mlt-group {
@@ -710,6 +738,14 @@ div.AuthorComment {
 	a {
 		color: #555;
 	}
+
+	[data-bs-theme='dark'] & {
+		color: #c6c6c6;
+
+		a {
+			color: #999;
+		}
+	}
 }
 
 input.changed[type='text'] {
@@ -740,6 +776,11 @@ input.changed[type='text'] {
 	border-spacing: 2px;
 	border-color: gray;
 	border-radius: 0.25rem;
+
+	[data-bs-theme='dark'] & {
+		background-color: #4a4a4a;
+		border-color: #939393;
+	}
 }
 
 .submit-buttons-container {
@@ -760,55 +801,46 @@ input.changed[type='text'] {
 	font-style: italic;
 	color: #ca5000;
 	background-color: inherit;
+
+	[data-bs-theme='dark'] & {
+		color: #ca8253;
+	}
 }
 
 /* Text colors for Auditing, Current, and Dropped students */
 .Audit {
 	font-style: normal;
 	color: purple;
-	background-color: inherit;
 }
 .Enrolled {
 	font-weight: normal;
-	color: black;
-	background-color: inherit;
 }
 .Drop {
 	font-style: italic;
 	color: #555;
-	background-color: inherit;
 }
 .Observer {
 	font-style: normal;
 	color: green;
-	background-color: inherit;
 }
 
-/* Styles for the PGProblemEditor Page */
-
-#editor {
-	.tab-content {
-		min-height: 140px;
+[data-bs-theme='dark'] {
+	.Audit {
+		color: #f400f4;
+	}
+	.Drop {
+		color: #958888;
+	}
+	.Observer {
+		color: #04a404;
 	}
 }
 
-#pgedit-render-area {
-	border: 1px solid #ddd;
-	min-height: 400px;
-	height: 600px;
-	resize: vertical;
-	display: flex;
-	flex-direction: column;
-
-	@media only screen and (max-width: 992px) {
-		min-height: 200px;
-		height: 300px;
-	}
+/* Common styles for pages containing an editor. */
 
-	#pgedit-render-iframe {
-		flex-grow: 1;
-		border: none;
-		width: 100%;
+#editor {
+	.tab-content {
+		min-height: 140px;
 	}
 }
 
@@ -854,6 +886,14 @@ input.changed[type='text'] {
 	.table {
 		--bs-table-bg: #f5f5f5;
 	}
+
+	[data-bs-theme='dark'] & {
+		background-color: var(--bs-primary-bg-subtle, 'black');
+
+		.table {
+			--bs-table-bg: var(--bs-primary-bg-subtle, 'black');
+		}
+	}
 }
 
 .pdr_placeholder {
@@ -882,10 +922,6 @@ input.changed[type='text'] {
 	}
 }
 
-.sortable-ghost {
-	opacity: 0.5;
-}
-
 #psd_list {
 	padding-left: 0;
 	padding-bottom: 0.25rem;
@@ -893,6 +929,10 @@ input.changed[type='text'] {
 
 	.psd_list_item {
 		list-style-type: none;
+
+		&.sortable-ghost {
+			opacity: 0.5;
+		}
 	}
 
 	&:not(.disable_renumber) .pdr_handle {
@@ -908,6 +948,10 @@ input.changed[type='text'] {
 
 .rpc_render_area_container {
 	background-color: #f5f5f5;
+
+	[data-bs-theme='dark'] & {
+		background-color: var(--bs-primary-bg-subtle, 'black');
+	}
 }
 
 .rpc_render_area iframe {
@@ -943,6 +987,21 @@ input.changed[type='text'] {
 			color: inherit;
 			background-color: #88ecff;
 		}
+
+		[data-bs-theme='dark'] & {
+			&.correct {
+				color: black;
+			}
+
+			&.incorrect {
+				color: white;
+				background-color: #bf5454;
+			}
+
+			&.unattempted {
+				color: black;
+			}
+		}
 	}
 }
 
@@ -953,6 +1012,10 @@ input.changed[type='text'] {
 			font-weight: bold;
 			color: inherit;
 			border-radius: 0;
+
+			&:focus-visible {
+				box-shadow: 0 0 0 0.25rem var(--ww-course-config-tab-link-focus-outline-color, #00338840);
+			}
 		}
 
 		&:not(.active) {
@@ -964,12 +1027,30 @@ input.changed[type='text'] {
 			color: inherit;
 		}
 
+		[data-bs-theme='dark'] & {
+			&:not(.active) {
+				background-color: #565656;
+			}
+
+			&:not(.active):hover {
+				background-color: #414141;
+			}
+		}
+
 		&:focus {
 			z-index: 2;
 		}
 	}
 }
 
+/* Stats */
+
+[data-bs-theme='dark'] .stats-image {
+	text {
+		fill: white;
+	}
+}
+
 /* File manager */
 .file-manager-btn {
 	margin-bottom: 0.25rem;
@@ -988,25 +1069,55 @@ input.changed[type='text'] {
 
 /* Problem graders */
 
-span.needs-grading,
-td.needs-grading {
-	background-color: #fff3cd;
+#problem-grader-form {
+	.needs-grading {
+		background-color: #fff3cd;
 
-	div {
-		font-weight: bold;
+		[data-bs-theme='dark'] & {
+			background-color: #261d00;
+		}
+
+		div {
+			font-weight: bold;
+		}
 	}
-}
 
-span.alt-source,
-td.alt-source {
-	background-color: #e6e7e9;
-}
+	.alt-source {
+		background-color: #e6e7e9;
 
-#problem-grader-form {
-	.past-answer:not(:last-child) {
-		border-bottom: 1px solid #d5d5d5;
-		margin-bottom: 2px;
-		padding-bottom: 5px;
+		[data-bs-theme='dark'] & {
+			background-color: #555;
+		}
+	}
+
+	.problem-grader-legend-key span {
+		border: 1px solid var(--ww-layout-border-color);
+	}
+
+	.past-answer {
+		&:not(:last-child) {
+			border-bottom: 1px solid var(--bs-table-border-color);
+			margin-bottom: 2px;
+			padding-bottom: 5px;
+		}
+
+		&.correct {
+			color: #060;
+		}
+
+		&.incorrect {
+			color: #600;
+		}
+
+		[data-bs-theme='dark'] & {
+			&.correct {
+				color: #0b0;
+			}
+
+			&.incorrect {
+				color: #f66;
+			}
+		}
 	}
 
 	.restricted-width-col {
@@ -1018,6 +1129,17 @@ td.alt-source {
 	}
 }
 
+.problem-grader.accordion {
+	.accordion-header {
+		.accordion-button {
+			--bs-accordion-btn-padding-x: 0.75rem;
+			--bs-accordion-btn-padding-y: 0.375rem;
+			--bs-accordion-btn-bg: var(--bs-primary, #038);
+			--bs-accordion-btn-color: var(--ww-primary-foreground-color, white);
+		}
+	}
+}
+
 .problem-grader-table {
 	.col-fixed {
 		width: 11rem;
@@ -1054,3 +1176,13 @@ td.alt-source {
 		width: 100%;
 	}
 }
+
+mjx-help-background {
+	z-index: 1055;
+}
+
+[data-bs-theme='dark'] .flatpickr-confirm {
+	svg {
+		fill: white;
+	}
+}
diff --git a/htdocs/js/TagWidget/tagwidget.js b/htdocs/js/TagWidget/tagwidget.js
index 7961a17ca7..3ac04cd62b 100644
--- a/htdocs/js/TagWidget/tagwidget.js
+++ b/htdocs/js/TagWidget/tagwidget.js
@@ -48,7 +48,7 @@
 
 	// Load the library taxonomy from the JSON file.
 	const response = await fetch(tagWidgetScript.dataset.taxonomy).catch(
-		(err) => `Could not load the OPL taxonomy from the server: ${err.messsage ?? err}`
+		(err) => `Could not load the OPL taxonomy from the server: ${err.message ?? err}`
 	);
 	if (typeof response === 'string') return showMessage(response);
 	if (!response.ok) return showMessage('Could not load the OPL taxonomy from the server.');
diff --git a/htdocs/js/UserList/userlist.js b/htdocs/js/UserList/userlist.js
index 617594371f..483dbc1e19 100644
--- a/htdocs/js/UserList/userlist.js
+++ b/htdocs/js/UserList/userlist.js
@@ -58,7 +58,7 @@
 					}
 				} else {
 					element?.classList.remove('is-invalid');
-					if (element.id in event_listeners) {
+					if (element && element.id in event_listeners) {
 						element?.removeEventListener('change', event_listeners[element.id]);
 						delete event_listeners[element.id];
 					}
diff --git a/htdocs/package-lock.json b/htdocs/package-lock.json
index 426c624553..77a3953eb7 100644
--- a/htdocs/package-lock.json
+++ b/htdocs/package-lock.json
@@ -1,41 +1,41 @@
 {
 	"name": "webwork.javascript_package_manager",
-	"lockfileVersion": 2,
+	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "webwork.javascript_package_manager",
 			"license": "GPL-2.0+",
 			"dependencies": {
-				"@fortawesome/fontawesome-free": "^6.5.2",
-				"@openwebwork/pg-codemirror-editor": "^0.0.5",
-				"bootstrap": "~5.3.3",
+				"@fortawesome/fontawesome-free": "^7.2.0",
+				"@openwebwork/pg-codemirror-editor": "^0.0.10",
+				"bootstrap": "^5.3.8",
 				"flatpickr": "^4.6.13",
-				"iframe-resizer": "^4.3.11",
-				"jquery": "^3.7.1",
-				"jquery-ui-dist": "^1.13.2",
-				"luxon": "^3.4.4",
-				"mathjax": "^3.2.2",
-				"minisearch": "^7.1.2",
+				"iframe-resizer": "^4.4.2",
+				"jquery": "^4.0.0",
+				"jquery-ui-dist": "^1.13.3",
+				"luxon": "^3.7.2",
+				"mathjax": "^4.1.2",
+				"minisearch": "^7.2.0",
 				"shortcut-buttons-flatpickr": "^0.4.0",
-				"sortablejs": "^1.15.2"
+				"sortablejs": "^1.15.7"
 			},
 			"devDependencies": {
-				"autoprefixer": "^10.4.19",
-				"chokidar": "^3.6.0",
-				"cssnano": "^6.1.2",
-				"postcss": "^8.5.10",
-				"prettier": "^3.2.5",
-				"rtlcss": "^4.1.1",
-				"sass": "^1.75.0",
-				"terser": "^5.30.4",
-				"yargs": "^17.7.2"
+				"autoprefixer": "^10.5.0",
+				"chokidar": "^5.0.0",
+				"cssnano": "^8.0.1",
+				"postcss": "^8.5.15",
+				"prettier": "^3.8.3",
+				"rtlcss": "^4.3.0",
+				"sass": "^1.100.0",
+				"terser": "^5.48.0",
+				"yargs": "^18.0.0"
 			}
 		},
 		"node_modules/@codemirror/autocomplete": {
-			"version": "6.18.6",
-			"resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.6.tgz",
-			"integrity": "sha512-PHHBXFomUs5DF+9tCOM/UoW6XQ4R44lLNNhRaW9PKPTU0D7lIjRg3ElxaJnTwsl/oHiR93WSXDBrekhoUGCPtg==",
+			"version": "6.20.2",
+			"resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.20.2.tgz",
+			"integrity": "sha512-G5FPkgIiLjOgZMjqVjvuKQ1rGPtHogLldJr33eFJdVLtmwY+giGrlv/ewljLz6b9BSQLkjxuwBc6g6omDM+YxQ==",
 			"license": "MIT",
 			"dependencies": {
 				"@codemirror/language": "^6.0.0",
@@ -45,13 +45,13 @@
 			}
 		},
 		"node_modules/@codemirror/commands": {
-			"version": "6.8.1",
-			"resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.8.1.tgz",
-			"integrity": "sha512-KlGVYufHMQzxbdQONiLyGQDUW0itrLZwq3CcY7xpv9ZLRHqzkBSoteocBHtMCoY7/Ci4xhzSrToIeLg7FxHuaw==",
+			"version": "6.10.3",
+			"resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.10.3.tgz",
+			"integrity": "sha512-JFRiqhKu+bvSkDLI+rUhJwSxQxYb759W5GBezE8Uc8mHLqC9aV/9aTC7yJSqCtB3F00pylrLCwnyS91Ap5ej4Q==",
 			"license": "MIT",
 			"dependencies": {
 				"@codemirror/language": "^6.0.0",
-				"@codemirror/state": "^6.4.0",
+				"@codemirror/state": "^6.6.0",
 				"@codemirror/view": "^6.27.0",
 				"@lezer/common": "^1.1.0"
 			}
@@ -70,9 +70,9 @@
 			}
 		},
 		"node_modules/@codemirror/lang-html": {
-			"version": "6.4.9",
-			"resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.9.tgz",
-			"integrity": "sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q==",
+			"version": "6.4.11",
+			"resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.11.tgz",
+			"integrity": "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw==",
 			"license": "MIT",
 			"dependencies": {
 				"@codemirror/autocomplete": "^6.0.0",
@@ -83,13 +83,13 @@
 				"@codemirror/view": "^6.17.0",
 				"@lezer/common": "^1.0.0",
 				"@lezer/css": "^1.1.0",
-				"@lezer/html": "^1.3.0"
+				"@lezer/html": "^1.3.12"
 			}
 		},
 		"node_modules/@codemirror/lang-javascript": {
-			"version": "6.2.4",
-			"resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.4.tgz",
-			"integrity": "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA==",
+			"version": "6.2.5",
+			"resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.5.tgz",
+			"integrity": "sha512-zD4e5mS+50htS7F+TYjBPsiIFGanfVqg4HyUz6WNFikgOPf2BgKlx+TQedI1w6n/IqRBVBbBWmGFdLB/7uxO4A==",
 			"license": "MIT",
 			"dependencies": {
 				"@codemirror/autocomplete": "^6.0.0",
@@ -116,45 +116,45 @@
 			}
 		},
 		"node_modules/@codemirror/language": {
-			"version": "6.11.1",
-			"resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.11.1.tgz",
-			"integrity": "sha512-5kS1U7emOGV84vxC+ruBty5sUgcD0te6dyupyRVG2zaSjhTDM73LhVKUtVwiqSe6QwmEoA4SCiU8AKPFyumAWQ==",
+			"version": "6.12.3",
+			"resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.12.3.tgz",
+			"integrity": "sha512-QwCZW6Tt1siP37Jet9Tb02Zs81TQt6qQrZR2H+eGMcFsL1zMrk2/b9CLC7/9ieP1fjIUMgviLWMmgiHoJrj+ZA==",
 			"license": "MIT",
 			"dependencies": {
 				"@codemirror/state": "^6.0.0",
 				"@codemirror/view": "^6.23.0",
-				"@lezer/common": "^1.1.0",
+				"@lezer/common": "^1.5.0",
 				"@lezer/highlight": "^1.0.0",
 				"@lezer/lr": "^1.0.0",
 				"style-mod": "^4.0.0"
 			}
 		},
 		"node_modules/@codemirror/lint": {
-			"version": "6.8.5",
-			"resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.5.tgz",
-			"integrity": "sha512-s3n3KisH7dx3vsoeGMxsbRAgKe4O1vbrnKBClm99PU0fWxmxsx5rR2PfqQgIt+2MMJBHbiJ5rfIdLYfB9NNvsA==",
+			"version": "6.9.6",
+			"resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.9.6.tgz",
+			"integrity": "sha512-6Kp7r6XfCi/D/5sdXieMfg9pJU1bUEx96WITuLU6ESaKizCz0QHFMjY/TaFSbigDdEAIgi93itLBIUETP4oK+A==",
 			"license": "MIT",
 			"dependencies": {
 				"@codemirror/state": "^6.0.0",
-				"@codemirror/view": "^6.35.0",
+				"@codemirror/view": "^6.42.0",
 				"crelt": "^1.0.5"
 			}
 		},
 		"node_modules/@codemirror/search": {
-			"version": "6.5.11",
-			"resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.11.tgz",
-			"integrity": "sha512-KmWepDE6jUdL6n8cAAqIpRmLPBZ5ZKnicE8oGU/s3QrAVID+0VhLFrzUucVKHG5035/BSykhExDL/Xm7dHthiA==",
+			"version": "6.7.0",
+			"resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.7.0.tgz",
+			"integrity": "sha512-ZvGm99wc/s2cITtMT15LFdn8aH/aS+V+DqyGq/N5ZlV5vWtH+nILvC2nw0zX7ByNoHHDZ2IxxdW38O0tc5nVHg==",
 			"license": "MIT",
 			"dependencies": {
 				"@codemirror/state": "^6.0.0",
-				"@codemirror/view": "^6.0.0",
+				"@codemirror/view": "^6.37.0",
 				"crelt": "^1.0.5"
 			}
 		},
 		"node_modules/@codemirror/state": {
-			"version": "6.5.2",
-			"resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
-			"integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
+			"version": "6.6.0",
+			"resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.6.0.tgz",
+			"integrity": "sha512-4nbvra5R5EtiCzr9BTHiTLc+MLXK2QGiAVYMyi8PkQd3SR+6ixar/Q/01Fa21TBIDOZXgeWV4WppsQolSreAPQ==",
 			"license": "MIT",
 			"dependencies": {
 				"@marijn/find-cluster-break": "^1.0.0"
@@ -173,38 +173,42 @@
 			}
 		},
 		"node_modules/@codemirror/view": {
-			"version": "6.37.2",
-			"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.37.2.tgz",
-			"integrity": "sha512-XD3LdgQpxQs5jhOOZ2HRVT+Rj59O4Suc7g2ULvZ+Yi8eCkickrkZ5JFuoDhs2ST1mNI5zSsNYgR3NGa4OUrbnw==",
+			"version": "6.43.0",
+			"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.43.0.tgz",
+			"integrity": "sha512-V7ZCLQO3Jus9hzh2jVCCPW3mO4IBMr43O37PqSUYautJSnnJF41YlgLw21x0fLJTYvJ+Vkm6Gp+qKGH9pltgXA==",
 			"license": "MIT",
 			"dependencies": {
-				"@codemirror/state": "^6.5.0",
+				"@codemirror/state": "^6.6.0",
 				"crelt": "^1.0.6",
 				"style-mod": "^4.1.0",
 				"w3c-keyname": "^2.2.4"
 			}
 		},
+		"node_modules/@colordx/core": {
+			"version": "5.4.3",
+			"resolved": "https://registry.npmjs.org/@colordx/core/-/core-5.4.3.tgz",
+			"integrity": "sha512-kIxYSfA5T8HXjav55UaaH/o/cKivF6jCCGIb8eqtcsfI46wsvlSiT8jMDyrl779qLec3c2c2oHBZo4oAhvbjrQ==",
+			"dev": true,
+			"license": "MIT"
+		},
 		"node_modules/@fortawesome/fontawesome-free": {
-			"version": "6.5.2",
-			"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz",
-			"integrity": "sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==",
-			"hasInstallScript": true,
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.2.0.tgz",
+			"integrity": "sha512-3DguDv/oUE+7vjMeTSOjCSG+KeawgVQOHrKRnvUuqYh1mfArrh7s+s8hXW3e4RerBA1+Wh+hBqf8sJNpqNrBWg==",
+			"license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/@jridgewell/gen-mapping": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-			"integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+			"version": "0.3.13",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+			"integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"@jridgewell/set-array": "^1.2.1",
-				"@jridgewell/sourcemap-codec": "^1.4.10",
+				"@jridgewell/sourcemap-codec": "^1.5.0",
 				"@jridgewell/trace-mapping": "^0.3.24"
-			},
-			"engines": {
-				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/resolve-uri": {
@@ -212,55 +216,50 @@
 			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
 			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
 			"dev": true,
-			"engines": {
-				"node": ">=6.0.0"
-			}
-		},
-		"node_modules/@jridgewell/set-array": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/source-map": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-			"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+			"version": "0.3.11",
+			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
+			"integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@jridgewell/gen-mapping": "^0.3.5",
 				"@jridgewell/trace-mapping": "^0.3.25"
 			}
 		},
 		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.4.15",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-			"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-			"dev": true
+			"version": "1.5.5",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+			"integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.25",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+			"version": "0.3.31",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+			"integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@jridgewell/resolve-uri": "^3.1.0",
 				"@jridgewell/sourcemap-codec": "^1.4.14"
 			}
 		},
 		"node_modules/@lezer/common": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
-			"integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==",
+			"version": "1.5.2",
+			"resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.2.tgz",
+			"integrity": "sha512-sxQE460fPZyU3sdc8lafxiPwJHBzZRy/udNFynGQky1SePYBdhkBl1kOagA9uT3pxR8K09bOrmTUqA9wb/PjSQ==",
 			"license": "MIT"
 		},
 		"node_modules/@lezer/css": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.2.1.tgz",
-			"integrity": "sha512-2F5tOqzKEKbCUNraIXc0f6HKeyKlmMWJnBB0i4XW6dJgssrZO/YlZ2pY5xgyqDleqqhiNJ3dQhbrV2aClZQMvg==",
+			"version": "1.3.3",
+			"resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.3.tgz",
+			"integrity": "sha512-RzBo8r+/6QJeow7aPHIpGVIH59xTcJXp399820gZoMo9noQDRVpJLheIBUicYwKcsbOYoBRoLZlf2720dG/4Tg==",
 			"license": "MIT",
 			"dependencies": {
 				"@lezer/common": "^1.2.0",
@@ -269,18 +268,18 @@
 			}
 		},
 		"node_modules/@lezer/highlight": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz",
-			"integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==",
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.3.tgz",
+			"integrity": "sha512-qXdH7UqTvGfdVBINrgKhDsVTJTxactNNxLk7+UMwZhU13lMHaOBlJe9Vqp907ya56Y3+ed2tlqzys7jDkTmW0g==",
 			"license": "MIT",
 			"dependencies": {
-				"@lezer/common": "^1.0.0"
+				"@lezer/common": "^1.3.0"
 			}
 		},
 		"node_modules/@lezer/html": {
-			"version": "1.3.10",
-			"resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.10.tgz",
-			"integrity": "sha512-dqpT8nISx/p9Do3AchvYGV3qYc4/rKr3IBZxlHmpIKam56P47RSHkSF5f13Vu9hebS1jM0HmtJIwLbWz1VIY6w==",
+			"version": "1.3.13",
+			"resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.13.tgz",
+			"integrity": "sha512-oI7n6NJml729m7pjm9lvLvmXbdoMoi2f+1pwSDJkl9d68zGr7a9Btz8NdHTGQZtW2DA25ybeuv/SyDb9D5tseg==",
 			"license": "MIT",
 			"dependencies": {
 				"@lezer/common": "^1.2.0",
@@ -289,9 +288,9 @@
 			}
 		},
 		"node_modules/@lezer/javascript": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.5.1.tgz",
-			"integrity": "sha512-ATOImjeVJuvgm3JQ/bpo2Tmv55HSScE2MTPnKRMRIPx2cLhHGyX2VnqpHhtIV1tVzIjZDbcWQm+NCTF40ggZVw==",
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.5.4.tgz",
+			"integrity": "sha512-vvYx3MhWqeZtGPwDStM2dwgljd5smolYD2lR2UyFcHfxbBQebqx8yjmFmxtJ/E6nN6u1D9srOiVWm3Rb4tmcUA==",
 			"license": "MIT",
 			"dependencies": {
 				"@lezer/common": "^1.2.0",
@@ -300,9 +299,9 @@
 			}
 		},
 		"node_modules/@lezer/lr": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
-			"integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
+			"version": "1.4.10",
+			"resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.10.tgz",
+			"integrity": "sha512-rnCpTIBafOx4mRp43xOxDJbFipJm/c0cia/V5TiGlhmMa+wsSdoGmUN3w5Bqrks/09Q/D4tNAmWaT8p6NRi77A==",
 			"license": "MIT",
 			"dependencies": {
 				"@lezer/common": "^1.0.0"
@@ -325,27 +324,33 @@
 			"integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
 			"license": "MIT"
 		},
+		"node_modules/@mathjax/mathjax-newcm-font": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/@mathjax/mathjax-newcm-font/-/mathjax-newcm-font-4.1.2.tgz",
+			"integrity": "sha512-lZHMjNP2XbABHA3kVn40rbse5ERUeMEmrGH03qLkCwxq4/5Z/eNLr0akw1MmQcqTwCbvkx1BFcmJ7RCfbRlw3Q==",
+			"license": "Apache-2.0"
+		},
 		"node_modules/@openwebwork/codemirror-lang-pg": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/@openwebwork/codemirror-lang-pg/-/codemirror-lang-pg-0.0.3.tgz",
-			"integrity": "sha512-ZKtb2r0Ck6tVz44wwMKY7w/82P470whIzM5C8pi2GiBlnFWmkQcadmOaCBz31FELY1SrKE3AO2TmMrwUt2EKPA==",
+			"version": "0.0.5",
+			"resolved": "https://registry.npmjs.org/@openwebwork/codemirror-lang-pg/-/codemirror-lang-pg-0.0.5.tgz",
+			"integrity": "sha512-3zNm9aFc6/IHBG4lJq8QOc2bF2rIFkSPX2hwCexgEcmchVBOsYPSfB0+bRsftfQQ4YdPFP64uDlSZBKu1yRcZQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@codemirror/language": "^6.11.0",
-				"@lezer/highlight": "^1.2.1",
-				"@lezer/lr": "^1.4.2"
+				"@codemirror/language": "^6.12.3",
+				"@lezer/highlight": "^1.2.3",
+				"@lezer/lr": "^1.4.8"
 			}
 		},
 		"node_modules/@openwebwork/pg-codemirror-editor": {
-			"version": "0.0.5",
-			"resolved": "https://registry.npmjs.org/@openwebwork/pg-codemirror-editor/-/pg-codemirror-editor-0.0.5.tgz",
-			"integrity": "sha512-ue4aciJzF7PPdQwWvYQkSf7h3pqOSM21fXyQ1vXRNndiQ7TCNX6FBI5JalMWDzi7CttGR+Mj+PgffmADwmKIMg==",
+			"version": "0.0.10",
+			"resolved": "https://registry.npmjs.org/@openwebwork/pg-codemirror-editor/-/pg-codemirror-editor-0.0.10.tgz",
+			"integrity": "sha512-kX7aJaWl2UagEX6kVToxuMUpYyh8zlSbg2chUv71e9nIw4jcwpvis8WkCSsYGRJw45hQTN1N42MPJOYqV+8fzQ==",
 			"license": "MIT",
 			"dependencies": {
-				"@codemirror/lang-html": "^6.4.9",
+				"@codemirror/lang-html": "^6.4.11",
 				"@codemirror/lang-xml": "^6.1.0",
-				"@codemirror/theme-one-dark": "^6.1.2",
-				"@openwebwork/codemirror-lang-pg": "^0.0.3",
+				"@codemirror/theme-one-dark": "^6.1.3",
+				"@openwebwork/codemirror-lang-pg": "^0.0.5",
 				"@replit/codemirror-emacs": "^6.1.0",
 				"@replit/codemirror-vim": "^6.3.0",
 				"cm6-theme-basic-dark": "^0.2.0",
@@ -356,17 +361,346 @@
 				"cm6-theme-nord": "^0.2.0",
 				"cm6-theme-solarized-dark": "^0.2.0",
 				"cm6-theme-solarized-light": "^0.2.0",
-				"codemirror": "^6.0.1",
-				"codemirror-lang-mt": "^0.0.3",
-				"codemirror-lang-perl": "^0.1.6",
-				"style-mod": "^4.1.2",
+				"codemirror": "^6.0.2",
+				"codemirror-lang-mt": "^0.0.5",
+				"codemirror-lang-perl": "^0.1.8",
+				"style-mod": "^4.1.3",
 				"thememirror": "^2.0.1"
 			}
 		},
+		"node_modules/@parcel/watcher": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
+			"integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
+			"dev": true,
+			"hasInstallScript": true,
+			"license": "MIT",
+			"optional": true,
+			"dependencies": {
+				"detect-libc": "^2.0.3",
+				"is-glob": "^4.0.3",
+				"node-addon-api": "^7.0.0",
+				"picomatch": "^4.0.3"
+			},
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			},
+			"optionalDependencies": {
+				"@parcel/watcher-android-arm64": "2.5.6",
+				"@parcel/watcher-darwin-arm64": "2.5.6",
+				"@parcel/watcher-darwin-x64": "2.5.6",
+				"@parcel/watcher-freebsd-x64": "2.5.6",
+				"@parcel/watcher-linux-arm-glibc": "2.5.6",
+				"@parcel/watcher-linux-arm-musl": "2.5.6",
+				"@parcel/watcher-linux-arm64-glibc": "2.5.6",
+				"@parcel/watcher-linux-arm64-musl": "2.5.6",
+				"@parcel/watcher-linux-x64-glibc": "2.5.6",
+				"@parcel/watcher-linux-x64-musl": "2.5.6",
+				"@parcel/watcher-win32-arm64": "2.5.6",
+				"@parcel/watcher-win32-ia32": "2.5.6",
+				"@parcel/watcher-win32-x64": "2.5.6"
+			}
+		},
+		"node_modules/@parcel/watcher-android-arm64": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz",
+			"integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-darwin-arm64": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz",
+			"integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-darwin-x64": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz",
+			"integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-freebsd-x64": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz",
+			"integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm-glibc": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz",
+			"integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"libc": [
+				"glibc"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm-musl": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz",
+			"integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"libc": [
+				"musl"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm64-glibc": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz",
+			"integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"libc": [
+				"glibc"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm64-musl": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz",
+			"integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"libc": [
+				"musl"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-x64-glibc": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz",
+			"integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"libc": [
+				"glibc"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-x64-musl": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz",
+			"integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"libc": [
+				"musl"
+			],
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-win32-arm64": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz",
+			"integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-win32-ia32": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz",
+			"integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-win32-x64": {
+			"version": "2.5.6",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz",
+			"integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"license": "MIT",
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
 		"node_modules/@popperjs/core": {
 			"version": "2.11.8",
 			"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
 			"integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+			"license": "MIT",
 			"peer": true,
 			"funding": {
 				"type": "opencollective",
@@ -400,10 +734,11 @@
 			}
 		},
 		"node_modules/acorn": {
-			"version": "8.11.3",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-			"integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+			"version": "8.16.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+			"integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
 			"dev": true,
+			"license": "MIT",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -412,46 +747,35 @@
 			}
 		},
 		"node_modules/ansi-regex": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"version": "6.2.2",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+			"integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=8"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-regex?sponsor=1"
 			}
 		},
 		"node_modules/ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"version": "6.2.3",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+			"integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
 			"dev": true,
-			"dependencies": {
-				"color-convert": "^2.0.1"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">=8"
+				"node": ">=12"
 			},
 			"funding": {
 				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"node_modules/anymatch": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-			"dev": true,
-			"dependencies": {
-				"normalize-path": "^3.0.0",
-				"picomatch": "^2.0.4"
-			},
-			"engines": {
-				"node": ">= 8"
-			}
-		},
 		"node_modules/autoprefixer": {
-			"version": "10.4.19",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
-			"integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
+			"version": "10.5.0",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.0.tgz",
+			"integrity": "sha512-FMhOoZV4+qR6aTUALKX2rEqGG+oyATvwBt9IIzVR5rMa2HRWPkxf+P+PAJLD1I/H5/II+HuZcBJYEFBpq39ong==",
 			"dev": true,
 			"funding": [
 				{
@@ -467,12 +791,12 @@
 					"url": "https://github.com/sponsors/ai"
 				}
 			],
+			"license": "MIT",
 			"dependencies": {
-				"browserslist": "^4.23.0",
-				"caniuse-lite": "^1.0.30001599",
-				"fraction.js": "^4.3.7",
-				"normalize-range": "^0.1.2",
-				"picocolors": "^1.0.0",
+				"browserslist": "^4.28.2",
+				"caniuse-lite": "^1.0.30001787",
+				"fraction.js": "^5.3.4",
+				"picocolors": "^1.1.1",
 				"postcss-value-parser": "^4.2.0"
 			},
 			"bin": {
@@ -485,25 +809,30 @@
 				"postcss": "^8.1.0"
 			}
 		},
-		"node_modules/binary-extensions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+		"node_modules/baseline-browser-mapping": {
+			"version": "2.10.32",
+			"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.32.tgz",
+			"integrity": "sha512-wbPvpyjJPC0zdfdKXxqEL3Ea+bOMD/87X4lftiJkkaBiuG6ALQy1SLmEd7BSmVCuwCQsBrCamgBoLyfFDD1EPg==",
 			"dev": true,
+			"license": "Apache-2.0",
+			"bin": {
+				"baseline-browser-mapping": "dist/cli.cjs"
+			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/boolbase": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
 			"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-			"dev": true
+			"dev": true,
+			"license": "ISC"
 		},
 		"node_modules/bootstrap": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
-			"integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
+			"version": "5.3.8",
+			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz",
+			"integrity": "sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==",
 			"funding": [
 				{
 					"type": "github",
@@ -514,26 +843,15 @@
 					"url": "https://opencollective.com/bootstrap"
 				}
 			],
+			"license": "MIT",
 			"peerDependencies": {
 				"@popperjs/core": "^2.11.8"
 			}
 		},
-		"node_modules/braces": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-			"dev": true,
-			"dependencies": {
-				"fill-range": "^7.1.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/browserslist": {
-			"version": "4.23.0",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-			"integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+			"version": "4.28.2",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz",
+			"integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==",
 			"dev": true,
 			"funding": [
 				{
@@ -549,11 +867,13 @@
 					"url": "https://github.com/sponsors/ai"
 				}
 			],
+			"license": "MIT",
 			"dependencies": {
-				"caniuse-lite": "^1.0.30001587",
-				"electron-to-chromium": "^1.4.668",
-				"node-releases": "^2.0.14",
-				"update-browserslist-db": "^1.0.13"
+				"baseline-browser-mapping": "^2.10.12",
+				"caniuse-lite": "^1.0.30001782",
+				"electron-to-chromium": "^1.5.328",
+				"node-releases": "^2.0.36",
+				"update-browserslist-db": "^1.2.3"
 			},
 			"bin": {
 				"browserslist": "cli.js"
@@ -566,13 +886,15 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
 			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/caniuse-api": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
 			"integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"browserslist": "^4.0.0",
 				"caniuse-lite": "^1.0.0",
@@ -581,9 +903,9 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001723",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001723.tgz",
-			"integrity": "sha512-1R/elMjtehrFejxwmexeXAtae5UO9iSyFn6G/I806CYC/BLyyBk1EPhrKBkWhy6wM6Xnm47dSJQec+tLJ39WHw==",
+			"version": "1.0.30001793",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz",
+			"integrity": "sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==",
 			"dev": true,
 			"funding": [
 				{
@@ -602,41 +924,34 @@
 			"license": "CC-BY-4.0"
 		},
 		"node_modules/chokidar": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-			"integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz",
+			"integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"anymatch": "~3.1.2",
-				"braces": "~3.0.2",
-				"glob-parent": "~5.1.2",
-				"is-binary-path": "~2.1.0",
-				"is-glob": "~4.0.1",
-				"normalize-path": "~3.0.0",
-				"readdirp": "~3.6.0"
+				"readdirp": "^5.0.0"
 			},
 			"engines": {
-				"node": ">= 8.10.0"
+				"node": ">= 20.19.0"
 			},
 			"funding": {
 				"url": "https://paulmillr.com/funding/"
-			},
-			"optionalDependencies": {
-				"fsevents": "~2.3.2"
 			}
 		},
 		"node_modules/cliui": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+			"version": "9.0.1",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz",
+			"integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==",
 			"dev": true,
+			"license": "ISC",
 			"dependencies": {
-				"string-width": "^4.2.0",
-				"strip-ansi": "^6.0.1",
-				"wrap-ansi": "^7.0.0"
+				"string-width": "^7.2.0",
+				"strip-ansi": "^7.1.0",
+				"wrap-ansi": "^9.0.0"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=20"
 			}
 		},
 		"node_modules/cm6-theme-basic-dark": {
@@ -751,61 +1066,38 @@
 			}
 		},
 		"node_modules/codemirror-lang-mt": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/codemirror-lang-mt/-/codemirror-lang-mt-0.0.3.tgz",
-			"integrity": "sha512-OC2qG6GQI96BTgKzD4XVJd8fLOTyeB0pb7gy41BHjqot2gES6Bi/3esIgTygYUxw/SspMNSZnQZdWHPmD7/YYA==",
+			"version": "0.0.5",
+			"resolved": "https://registry.npmjs.org/codemirror-lang-mt/-/codemirror-lang-mt-0.0.5.tgz",
+			"integrity": "sha512-Gb7Di+IDN5zruiKhcbqCA95b+DzGagC1YJas4o9gQvGSHt3u3iaktLG19TO2F4miKLYhrV+3UOMGsOb+4iKZLQ==",
 			"license": "MIT",
 			"dependencies": {
 				"@codemirror/lang-css": "^6.3.1",
-				"@codemirror/lang-html": "^6.4.9",
-				"@codemirror/lang-javascript": "^6.2.3",
-				"@codemirror/language": "^6.11.0",
-				"@lezer/highlight": "^1.2.1",
-				"@lezer/lr": "^1.4.2"
+				"@codemirror/lang-html": "^6.4.11",
+				"@codemirror/lang-javascript": "^6.2.5",
+				"@codemirror/language": "^6.12.3",
+				"@lezer/highlight": "^1.2.3",
+				"@lezer/lr": "^1.4.8"
 			}
 		},
 		"node_modules/codemirror-lang-perl": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/codemirror-lang-perl/-/codemirror-lang-perl-0.1.6.tgz",
-			"integrity": "sha512-cYBmCQa7/itIRNx1AHfn9OQkInJQpL0sqCoikJXhQZwYNOHFSMd0L16pofEOU/1/f+s7CPA+XucUrNr/f1qigQ==",
+			"version": "0.1.8",
+			"resolved": "https://registry.npmjs.org/codemirror-lang-perl/-/codemirror-lang-perl-0.1.8.tgz",
+			"integrity": "sha512-l3z73XLzFjrkd1LN/9KwR3tsO9oegmCBTgQC4Bg9vJhmv4js0RtnEAN3mUMWtib1Qecb/dQc5mpNqClYGhHuYA==",
 			"license": "MIT",
 			"dependencies": {
-				"@codemirror/language": "^6.11.0",
-				"@lezer/highlight": "^1.2.1",
-				"@lezer/lr": "^1.4.2"
+				"@codemirror/language": "^6.12.3",
+				"@lezer/highlight": "^1.2.3",
+				"@lezer/lr": "^1.4.8"
 			}
 		},
-		"node_modules/color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"dependencies": {
-				"color-name": "~1.1.4"
-			},
-			"engines": {
-				"node": ">=7.0.0"
-			}
-		},
-		"node_modules/color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
-		},
-		"node_modules/colord": {
-			"version": "2.9.3",
-			"resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-			"integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
-			"dev": true
-		},
-		"node_modules/commander": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+		"node_modules/commander": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
+			"integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">= 10"
+				"node": ">=16"
 			}
 		},
 		"node_modules/crelt": {
@@ -814,23 +1106,12 @@
 			"integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
 			"license": "MIT"
 		},
-		"node_modules/css-declaration-sorter": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz",
-			"integrity": "sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==",
-			"dev": true,
-			"engines": {
-				"node": "^14 || ^16 || >=18"
-			},
-			"peerDependencies": {
-				"postcss": "^8.0.9"
-			}
-		},
 		"node_modules/css-select": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-			"integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz",
+			"integrity": "sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"boolbase": "^1.0.0",
 				"css-what": "^6.1.0",
@@ -843,23 +1124,25 @@
 			}
 		},
 		"node_modules/css-tree": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
-			"integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.2.1.tgz",
+			"integrity": "sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"mdn-data": "2.0.30",
-				"source-map-js": "^1.0.1"
+				"mdn-data": "2.27.1",
+				"source-map-js": "^1.2.1"
 			},
 			"engines": {
 				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
 			}
 		},
 		"node_modules/css-what": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-			"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+			"version": "6.2.2",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz",
+			"integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"engines": {
 				"node": ">= 6"
 			},
@@ -872,6 +1155,7 @@
 			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
 			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
 			"dev": true,
+			"license": "MIT",
 			"bin": {
 				"cssesc": "bin/cssesc"
 			},
@@ -880,79 +1164,81 @@
 			}
 		},
 		"node_modules/cssnano": {
-			"version": "6.1.2",
-			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.1.2.tgz",
-			"integrity": "sha512-rYk5UeX7VAM/u0lNqewCdasdtPK81CgX8wJFLEIXHbV2oldWRgJAsZrdhRXkV1NJzA2g850KiFm9mMU2HxNxMA==",
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-8.0.1.tgz",
+			"integrity": "sha512-oSiOnPQNNYjusTUlYJiE6xvFQG4don3N0QavaoV1BxIsC1zjvxOwikXlR7lG1EVmZNDDaJkHbQx1VRB8kaoMHA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"cssnano-preset-default": "^6.1.2",
-				"lilconfig": "^3.1.1"
+				"cssnano-preset-default": "^8.0.1",
+				"lilconfig": "^3.1.3"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/cssnano"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/cssnano-preset-default": {
-			"version": "6.1.2",
-			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.1.2.tgz",
-			"integrity": "sha512-1C0C+eNaeN8OcHQa193aRgYexyJtU8XwbdieEjClw+J9d94E41LwT6ivKH0WT+fYwYWB0Zp3I3IZ7tI/BbUbrg==",
-			"dev": true,
-			"dependencies": {
-				"browserslist": "^4.23.0",
-				"css-declaration-sorter": "^7.2.0",
-				"cssnano-utils": "^4.0.2",
-				"postcss-calc": "^9.0.1",
-				"postcss-colormin": "^6.1.0",
-				"postcss-convert-values": "^6.1.0",
-				"postcss-discard-comments": "^6.0.2",
-				"postcss-discard-duplicates": "^6.0.3",
-				"postcss-discard-empty": "^6.0.3",
-				"postcss-discard-overridden": "^6.0.2",
-				"postcss-merge-longhand": "^6.0.5",
-				"postcss-merge-rules": "^6.1.1",
-				"postcss-minify-font-values": "^6.1.0",
-				"postcss-minify-gradients": "^6.0.3",
-				"postcss-minify-params": "^6.1.0",
-				"postcss-minify-selectors": "^6.0.4",
-				"postcss-normalize-charset": "^6.0.2",
-				"postcss-normalize-display-values": "^6.0.2",
-				"postcss-normalize-positions": "^6.0.2",
-				"postcss-normalize-repeat-style": "^6.0.2",
-				"postcss-normalize-string": "^6.0.2",
-				"postcss-normalize-timing-functions": "^6.0.2",
-				"postcss-normalize-unicode": "^6.1.0",
-				"postcss-normalize-url": "^6.0.2",
-				"postcss-normalize-whitespace": "^6.0.2",
-				"postcss-ordered-values": "^6.0.2",
-				"postcss-reduce-initial": "^6.1.0",
-				"postcss-reduce-transforms": "^6.0.2",
-				"postcss-svgo": "^6.0.3",
-				"postcss-unique-selectors": "^6.0.4"
-			},
-			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-8.0.1.tgz",
+			"integrity": "sha512-OTdKeYMlvQ8KBgyej5ysktnWJoeyo7rGrVnm+bdpIHGvxhbTGPsOkB+7T1EdTuX00dGlQQb2UEbSPB1OpMXULw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"browserslist": "^4.28.2",
+				"cssnano-utils": "^6.0.0",
+				"postcss-calc": "^10.1.1",
+				"postcss-colormin": "^8.0.0",
+				"postcss-convert-values": "^8.0.0",
+				"postcss-discard-comments": "^8.0.0",
+				"postcss-discard-duplicates": "^8.0.0",
+				"postcss-discard-empty": "^8.0.0",
+				"postcss-discard-overridden": "^8.0.0",
+				"postcss-merge-longhand": "^8.0.0",
+				"postcss-merge-rules": "^8.0.0",
+				"postcss-minify-font-values": "^8.0.0",
+				"postcss-minify-gradients": "^8.0.0",
+				"postcss-minify-params": "^8.0.0",
+				"postcss-minify-selectors": "^8.0.1",
+				"postcss-normalize-charset": "^8.0.0",
+				"postcss-normalize-display-values": "^8.0.0",
+				"postcss-normalize-positions": "^8.0.0",
+				"postcss-normalize-repeat-style": "^8.0.0",
+				"postcss-normalize-string": "^8.0.0",
+				"postcss-normalize-timing-functions": "^8.0.0",
+				"postcss-normalize-unicode": "^8.0.0",
+				"postcss-normalize-url": "^8.0.0",
+				"postcss-normalize-whitespace": "^8.0.0",
+				"postcss-ordered-values": "^8.0.0",
+				"postcss-reduce-initial": "^8.0.0",
+				"postcss-reduce-transforms": "^8.0.0",
+				"postcss-svgo": "^8.0.0",
+				"postcss-unique-selectors": "^8.0.0"
+			},
+			"engines": {
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/cssnano-utils": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.2.tgz",
-			"integrity": "sha512-ZR1jHg+wZ8o4c3zqf1SIUSTIvm/9mU343FMR6Obe/unskbvpGhZOo1J6d/r8D1pzkRQYuwbcH3hToOuoA2G7oQ==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-6.0.0.tgz",
+			"integrity": "sha512-ztS9W/+uaDn+bkYmDhs+GdMveHJ3CL8IPNHpRqDUQXv5GJOTQAJjV1XUOInr9esLXSabQV1pLRZlJpyUwEqDyQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/csso": {
@@ -960,6 +1246,7 @@
 			"resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
 			"integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"css-tree": "~2.2.0"
 			},
@@ -973,6 +1260,7 @@
 			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
 			"integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"mdn-data": "2.0.28",
 				"source-map-js": "^1.0.1"
@@ -986,13 +1274,26 @@
 			"version": "2.0.28",
 			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
 			"integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
-			"dev": true
+			"dev": true,
+			"license": "CC0-1.0"
+		},
+		"node_modules/detect-libc": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+			"integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"optional": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
 		"node_modules/dom-serializer": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
 			"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"domelementtype": "^2.3.0",
 				"domhandler": "^5.0.2",
@@ -1012,13 +1313,15 @@
 					"type": "github",
 					"url": "https://github.com/sponsors/fb55"
 				}
-			]
+			],
+			"license": "BSD-2-Clause"
 		},
 		"node_modules/domhandler": {
 			"version": "5.0.3",
 			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
 			"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"domelementtype": "^2.3.0"
 			},
@@ -1030,10 +1333,11 @@
 			}
 		},
 		"node_modules/domutils": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-			"integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+			"version": "3.2.2",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
+			"integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"dom-serializer": "^2.0.0",
 				"domelementtype": "^2.3.0",
@@ -1044,22 +1348,25 @@
 			}
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.4.747",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.747.tgz",
-			"integrity": "sha512-+FnSWZIAvFHbsNVmUxhEqWiaOiPMcfum1GQzlWCg/wLigVtshOsjXHyEFfmt6cFK6+HkS3QOJBv6/3OPumbBfw==",
-			"dev": true
+			"version": "1.5.361",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.361.tgz",
+			"integrity": "sha512-Q6Hts7N9FnJc5LeGRINFvLhCI9xZmNtTDe5ZbcVezQz7cU4a8Aua3GH1b8J2XY8Al9PF+OCwYqhgsOOheMdvkA==",
+			"dev": true,
+			"license": "ISC"
 		},
 		"node_modules/emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
+			"version": "10.6.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
+			"integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/entities": {
 			"version": "4.5.0",
 			"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
 			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"engines": {
 				"node": ">=0.12"
 			},
@@ -1068,132 +1375,97 @@
 			}
 		},
 		"node_modules/escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+			"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
 		},
-		"node_modules/fill-range": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-			"dev": true,
-			"dependencies": {
-				"to-regex-range": "^5.0.1"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/flatpickr": {
 			"version": "4.6.13",
 			"resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.13.tgz",
-			"integrity": "sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw=="
+			"integrity": "sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw==",
+			"license": "MIT"
 		},
 		"node_modules/fraction.js": {
-			"version": "4.3.7",
-			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
-			"integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+			"version": "5.3.4",
+			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz",
+			"integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": "*"
 			},
 			"funding": {
-				"type": "patreon",
+				"type": "github",
 				"url": "https://github.com/sponsors/rawify"
 			}
 		},
-		"node_modules/fsevents": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-			"dev": true,
-			"hasInstallScript": true,
-			"optional": true,
-			"os": [
-				"darwin"
-			],
-			"engines": {
-				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-			}
-		},
 		"node_modules/get-caller-file": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
 			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
 				"node": "6.* || 8.* || >= 10.*"
 			}
 		},
-		"node_modules/glob-parent": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+		"node_modules/get-east-asian-width": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz",
+			"integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==",
 			"dev": true,
-			"dependencies": {
-				"is-glob": "^4.0.1"
-			},
+			"license": "MIT",
 			"engines": {
-				"node": ">= 6"
+				"node": ">=18"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/iframe-resizer": {
-			"version": "4.3.11",
-			"resolved": "https://registry.npmjs.org/iframe-resizer/-/iframe-resizer-4.3.11.tgz",
-			"integrity": "sha512-5QtnsmfH11GDsuC7Gxd/eNzojudX3346Gb0E+Ku8ln8AtfSq+cWCZtnhCrthrtE7f1CI2/kwHkZ9G4sFYzHP7A==",
+			"version": "4.4.2",
+			"resolved": "https://registry.npmjs.org/iframe-resizer/-/iframe-resizer-4.4.2.tgz",
+			"integrity": "sha512-2SupFCq9V9osWac4q+PodF0E9QdWY5A9VdCpKrrE7HlDrcIsaTp7D6k14mkGXWoWMS9jCavYusik25wTc0YB2Q==",
+			"hasInstallScript": true,
+			"license": "GPL-3.0",
 			"engines": {
 				"node": ">=0.8.0"
 			},
 			"funding": {
 				"type": "individual",
-				"url": "https://github.com/davidjbradshaw/iframe-resizer/blob/master/FUNDING.md"
+				"url": "https://iframe-resizer.com//pricing"
 			}
 		},
 		"node_modules/immutable": {
-			"version": "4.3.8",
-			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.8.tgz",
-			"integrity": "sha512-d/Ld9aLbKpNwyl0KiM2CT1WYvkitQ1TSvmRtkcV8FKStiDoA7Slzgjmb/1G2yhKM1p0XeNOieaTbFZmU1d3Xuw==",
-			"dev": true
-		},
-		"node_modules/is-binary-path": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+			"version": "5.1.5",
+			"resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz",
+			"integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==",
 			"dev": true,
-			"dependencies": {
-				"binary-extensions": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
+			"license": "MIT"
 		},
 		"node_modules/is-extglob": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
 			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
 			"dev": true,
+			"license": "MIT",
+			"optional": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true,
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/is-glob": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
 			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
 			"dev": true,
+			"license": "MIT",
+			"optional": true,
 			"dependencies": {
 				"is-extglob": "^2.1.1"
 			},
@@ -1201,33 +1473,33 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/is-number": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-			"dev": true,
-			"engines": {
-				"node": ">=0.12.0"
-			}
-		},
 		"node_modules/jquery": {
-			"version": "3.7.1",
-			"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
-			"integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jquery/-/jquery-4.0.0.tgz",
+			"integrity": "sha512-TXCHVR3Lb6TZdtw1l3RTLf8RBWVGexdxL6AC8/e0xZKEpBflBsjh9/8LXw+dkNFuOyW9B7iB3O1sP7hS0Kiacg==",
+			"license": "MIT"
 		},
 		"node_modules/jquery-ui-dist": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz",
-			"integrity": "sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==",
+			"version": "1.13.3",
+			"resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.3.tgz",
+			"integrity": "sha512-qeTR3SOSQ0jgxaNXSFU6+JtxdzNUSJKgp8LCzVrVKntM25+2YBJW1Ea8B2AwjmmSHfPLy2dSlZxJQN06OfVFhg==",
+			"license": "MIT",
 			"dependencies": {
 				"jquery": ">=1.8.0 <4.0.0"
 			}
 		},
+		"node_modules/jquery-ui-dist/node_modules/jquery": {
+			"version": "3.7.1",
+			"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
+			"integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
+			"license": "MIT"
+		},
 		"node_modules/lilconfig": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz",
-			"integrity": "sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==",
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+			"integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=14"
 			},
@@ -1239,43 +1511,51 @@
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
 			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/lodash.uniq": {
 			"version": "4.5.0",
 			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
 			"integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/luxon": {
-			"version": "3.4.4",
-			"resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
-			"integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==",
+			"version": "3.7.2",
+			"resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.2.tgz",
+			"integrity": "sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==",
+			"license": "MIT",
 			"engines": {
 				"node": ">=12"
 			}
 		},
 		"node_modules/mathjax": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/mathjax/-/mathjax-3.2.2.tgz",
-			"integrity": "sha512-Bt+SSVU8eBG27zChVewOicYs7Xsdt40qm4+UpHyX7k0/O9NliPc+x77k1/FEsPsjKPZGJvtRZM1vO+geW0OhGw=="
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/mathjax/-/mathjax-4.1.2.tgz",
+			"integrity": "sha512-EQDS8xBpVg179BXoLeZ9JlwUFftOC5qylw20UlAMDhrTuooENigOocY79aNkkFSyvj/AST/89ZAo12+r5bPI4w==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@mathjax/mathjax-newcm-font": "^4.1.2"
+			}
 		},
 		"node_modules/mdn-data": {
-			"version": "2.0.30",
-			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-			"integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
-			"dev": true
+			"version": "2.27.1",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz",
+			"integrity": "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==",
+			"dev": true,
+			"license": "CC0-1.0"
 		},
 		"node_modules/minisearch": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/minisearch/-/minisearch-7.1.2.tgz",
-			"integrity": "sha512-R1Pd9eF+MD5JYDDSPAp/q1ougKglm14uEkPMvQ/05RGmx6G9wvmLTrTI/Q5iPNJLYqNdsDQ7qTGIcNWR+FrHmA==",
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/minisearch/-/minisearch-7.2.0.tgz",
+			"integrity": "sha512-dqT2XBYUOZOiC5t2HRnwADjhNS2cecp9u+TJRiJ1Qp/f5qjkeT5APcGPjHw+bz89Ms8Jp+cG4AlE+QZ/QnDglg==",
 			"license": "MIT"
 		},
 		"node_modules/nanoid": {
-			"version": "3.3.11",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-			"integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
+			"version": "3.3.12",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz",
+			"integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==",
 			"dev": true,
 			"funding": [
 				{
@@ -1283,6 +1563,7 @@
 					"url": "https://github.com/sponsors/ai"
 				}
 			],
+			"license": "MIT",
 			"bin": {
 				"nanoid": "bin/nanoid.cjs"
 			},
@@ -1290,28 +1571,22 @@
 				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
 			}
 		},
-		"node_modules/node-releases": {
-			"version": "2.0.14",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-			"integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-			"dev": true
-		},
-		"node_modules/normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+		"node_modules/node-addon-api": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+			"integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
 			"dev": true,
-			"engines": {
-				"node": ">=0.10.0"
-			}
+			"license": "MIT",
+			"optional": true
 		},
-		"node_modules/normalize-range": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-			"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+		"node_modules/node-releases": {
+			"version": "2.0.46",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.46.tgz",
+			"integrity": "sha512-GYVXHE2KnrzAfsAjl4uP++evGFCrAU1jta4ubEjIG7YWt/64Gqv66a30yKwWczVjA6j3bM4nBwH7Pk1JmDHaxQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">=18"
 			}
 		},
 		"node_modules/nth-check": {
@@ -1319,6 +1594,7 @@
 			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
 			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"boolbase": "^1.0.0"
 			},
@@ -1330,24 +1606,27 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
 			"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-			"dev": true
+			"dev": true,
+			"license": "ISC"
 		},
 		"node_modules/picomatch": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
-			"integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+			"integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
 			"dev": true,
+			"license": "MIT",
+			"optional": true,
 			"engines": {
-				"node": ">=8.6"
+				"node": ">=12"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/jonschlinkert"
 			}
 		},
 		"node_modules/postcss": {
-			"version": "8.5.10",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.10.tgz",
-			"integrity": "sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==",
+			"version": "8.5.15",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz",
+			"integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
 			"dev": true,
 			"funding": [
 				{
@@ -1363,8 +1642,9 @@
 					"url": "https://github.com/sponsors/ai"
 				}
 			],
+			"license": "MIT",
 			"dependencies": {
-				"nanoid": "^3.3.11",
+				"nanoid": "^3.3.12",
 				"picocolors": "^1.1.1",
 				"source-map-js": "^1.2.1"
 			},
@@ -1373,386 +1653,418 @@
 			}
 		},
 		"node_modules/postcss-calc": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
-			"integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
+			"version": "10.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-10.1.1.tgz",
+			"integrity": "sha512-NYEsLHh8DgG/PRH2+G9BTuUdtf9ViS+vdoQ0YA5OQdGsfN4ztiwtDWNtBl9EKeqNMFnIu8IKZ0cLxEQ5r5KVMw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"postcss-selector-parser": "^6.0.11",
+				"postcss-selector-parser": "^7.0.0",
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^18.12 || ^20.9 || >=22.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.2.2"
+				"postcss": "^8.4.38"
 			}
 		},
 		"node_modules/postcss-colormin": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.1.0.tgz",
-			"integrity": "sha512-x9yX7DOxeMAR+BgGVnNSAxmAj98NX/YxEMNFP+SDCEeNLb2r3i6Hh1ksMsnW8Ub5SLCpbescQqn9YEbE9554Sw==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-8.0.0.tgz",
+			"integrity": "sha512-KKwMmsSgsmdYXqrjQeqL3tnuIFtctiR1GEMHdjNpDpz/TCRkkkok2mMcreK2zVV3l7POWOmAkR2xYHUpRUK1DA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"browserslist": "^4.23.0",
+				"@colordx/core": "^5.4.3",
+				"browserslist": "^4.28.2",
 				"caniuse-api": "^3.0.0",
-				"colord": "^2.9.3",
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-convert-values": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz",
-			"integrity": "sha512-zx8IwP/ts9WvUM6NkVSkiU902QZL1bwPhaVaLynPtCsOTqp+ZKbNi+s6XJg3rfqpKGA/oc7Oxk5t8pOQJcwl/w==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-8.0.0.tgz",
+			"integrity": "sha512-Ohtj3rNZWawTRePv5NCHTy8VJSdJ/G/uKuxcxJreOMichuqcT6uEl2TAnopVeJCJ/c13jaSqg7m63yFLM5zBsA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"browserslist": "^4.23.0",
+				"browserslist": "^4.28.2",
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-discard-comments": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.2.tgz",
-			"integrity": "sha512-65w/uIqhSBBfQmYnG92FO1mWZjJ4GL5b8atm5Yw2UgrwD7HiNiSSNwJor1eCFGzUgYnN/iIknhNRVqjrrpuglw==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-8.0.0.tgz",
+			"integrity": "sha512-zGpvVLj2sbagEp+BTVETvAfkZdGVA6rALNujDK/WTIjdf1/rQOxOG8BBzkI8UQgnw8SkL6xffAfbtGMHFypadw==",
 			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"postcss-selector-parser": "^7.1.1"
+			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-discard-duplicates": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.3.tgz",
-			"integrity": "sha512-+JA0DCvc5XvFAxwx6f/e68gQu/7Z9ud584VLmcgto28eB8FqSFZwtrLwB5Kcp70eIoWP/HXqz4wpo8rD8gpsTw==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-8.0.0.tgz",
+			"integrity": "sha512-zjRyYmNGI3PTipKBBtCgExlmZXQn49KvKoaiNnR2g+iXxeNk7GY5Js2ULtZXPrCYeqjPagrzKIBNcBocvXCR7g==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-discard-empty": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.3.tgz",
-			"integrity": "sha512-znyno9cHKQsK6PtxL5D19Fj9uwSzC2mB74cpT66fhgOadEUPyXFkbgwm5tvc3bt3NAy8ltE5MrghxovZRVnOjQ==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-8.0.0.tgz",
+			"integrity": "sha512-kxPJg6EqahbBvm+l7hpYYCtpsv8dlz7Tv6wJXUXZaeuY0WGS61DxfGdZR4uVB/Cx+yi3iOHQVSqpSHKMFaBg6Q==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-discard-overridden": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.2.tgz",
-			"integrity": "sha512-j87xzI4LUggC5zND7KdjsI25APtyMuynXZSujByMaav2roV6OZX+8AaCUcZSWqckZpjAjRyFDdpqybgjFO0HJQ==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-8.0.0.tgz",
+			"integrity": "sha512-sW2OWH3l9p0FmBSVr228uztFseqroZxwgD7SGF0Ks0dRPDttSo3P8FK5ZBLtWBH2A5+chpB0J2fB/T8heKHLBw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-merge-longhand": {
-			"version": "6.0.5",
-			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.5.tgz",
-			"integrity": "sha512-5LOiordeTfi64QhICp07nzzuTDjNSO8g5Ksdibt44d+uvIIAE1oZdRn8y/W5ZtYgRH/lnLDlvi9F8btZcVzu3w==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-8.0.0.tgz",
+			"integrity": "sha512-YDmAmQ8H+ljfomVpSXvr9NA0GP01fraQJqjWBYoMVGg6rOT+PJLwPyeVo2ekn4WB4ZVSH5ddtK3DTRxbz6CFzg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0",
-				"stylehacks": "^6.1.1"
+				"stylehacks": "^8.0.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-merge-rules": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.1.1.tgz",
-			"integrity": "sha512-KOdWF0gju31AQPZiD+2Ar9Qjowz1LTChSjFFbS+e2sFgc4uHOp3ZvVX4sNeTlk0w2O31ecFGgrFzhO0RSWbWwQ==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-8.0.0.tgz",
+			"integrity": "sha512-bgstL5mpi41dDpnYGDUcI3M814NWkCMcIWpwDqEHXkHg3BT7b4XRAfNEuwJncZOVn/67kVKvWzhfv/7xyrp2uQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"browserslist": "^4.23.0",
+				"browserslist": "^4.28.2",
 				"caniuse-api": "^3.0.0",
-				"cssnano-utils": "^4.0.2",
-				"postcss-selector-parser": "^6.0.16"
+				"cssnano-utils": "^6.0.0",
+				"postcss-selector-parser": "^7.1.1"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-minify-font-values": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.1.0.tgz",
-			"integrity": "sha512-gklfI/n+9rTh8nYaSJXlCo3nOKqMNkxuGpTn/Qm0gstL3ywTr9/WRKznE+oy6fvfolH6dF+QM4nCo8yPLdvGJg==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-8.0.0.tgz",
+			"integrity": "sha512-EnOHQEnSt6oH5NrL1DMFAQuwB2IOimFXTCzc9bKfUeH1jREbqIF5MAK4gQJQOC4mPUwJt4sWifAmNZ1qLu6j3Q==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-minify-gradients": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.3.tgz",
-			"integrity": "sha512-4KXAHrYlzF0Rr7uc4VrfwDJ2ajrtNEpNEuLxFgwkhFZ56/7gaE4Nr49nLsQDZyUe+ds+kEhf+YAUolJiYXF8+Q==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-8.0.0.tgz",
+			"integrity": "sha512-43iAnYIGk0ZjNx5X/rkIcHi6dhmu/vEjY0kqfUfxPuJRO+V7jx8uKIdcnL0dpfNoC5J9TSh3EtzLWbq0gpqnWA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"colord": "^2.9.3",
-				"cssnano-utils": "^4.0.2",
+				"@colordx/core": "^5.4.3",
+				"cssnano-utils": "^6.0.0",
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-minify-params": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.1.0.tgz",
-			"integrity": "sha512-bmSKnDtyyE8ujHQK0RQJDIKhQ20Jq1LYiez54WiaOoBtcSuflfK3Nm596LvbtlFcpipMjgClQGyGr7GAs+H1uA==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-8.0.0.tgz",
+			"integrity": "sha512-z7w4QO7G55l4vMUK1Lmx03GW7iyRLgf2V5Dz/7ioSPLnXRjeD+b7m0XfAXUGrbBYYrJ6bXPk+3LoX5u4JfAcSg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"browserslist": "^4.23.0",
-				"cssnano-utils": "^4.0.2",
+				"browserslist": "^4.28.2",
+				"cssnano-utils": "^6.0.0",
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-minify-selectors": {
-			"version": "6.0.4",
-			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.4.tgz",
-			"integrity": "sha512-L8dZSwNLgK7pjTto9PzWRoMbnLq5vsZSTu8+j1P/2GB8qdtGQfn+K1uSvFgYvgh83cbyxT5m43ZZhUMTJDSClQ==",
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-8.0.1.tgz",
+			"integrity": "sha512-c31D46811kTkQDxV1KTTow79axX6gj/01AY5G7cGZg3s31KvAwP13jEFXGAzQbJ7NvOFV1pRqEia6nrAdHU7qg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"postcss-selector-parser": "^6.0.16"
+				"browserslist": "^4.28.1",
+				"caniuse-api": "^3.0.0",
+				"cssesc": "^3.0.0",
+				"postcss-selector-parser": "^7.1.1"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-normalize-charset": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.2.tgz",
-			"integrity": "sha512-a8N9czmdnrjPHa3DeFlwqst5eaL5W8jYu3EBbTTkI5FHkfMhFZh1EGbku6jhHhIzTA6tquI2P42NtZ59M/H/kQ==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-8.0.0.tgz",
+			"integrity": "sha512-s88FUNDSUD8m0wBYvTQQcubVts6zhXwBU8zCD4vkRKiecd0v8cOjHVIF9r/i+5xzS/WG3f98qq4XsOM0JqvfLA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-normalize-display-values": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.2.tgz",
-			"integrity": "sha512-8H04Mxsb82ON/aAkPeq8kcBbAtI5Q2a64X/mnRRfPXBq7XeogoQvReqxEfc0B4WPq1KimjezNC8flUtC3Qz6jg==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-8.0.0.tgz",
+			"integrity": "sha512-gG2nBxD27fiw6Luinb1QYKdM/Co5GornRJgSD+JTwNH4PGKxImP0qyruDDav49aHUPLY3qrL3qN3LvybO7IzxQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-normalize-positions": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.2.tgz",
-			"integrity": "sha512-/JFzI441OAB9O7VnLA+RtSNZvQ0NCFZDOtp6QPFo1iIyawyXg0YI3CYM9HBy1WvwCRHnPep/BvI1+dGPKoXx/Q==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-8.0.0.tgz",
+			"integrity": "sha512-t/wGqpehS20Ke7kc4QAsWpH+AJjUdMK/V5qV2RhrXkj8hO/fT1t1MJ8NL7sedWYk7ZqC7eISEJQonW5j0tU1MQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-normalize-repeat-style": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.2.tgz",
-			"integrity": "sha512-YdCgsfHkJ2jEXwR4RR3Tm/iOxSfdRt7jplS6XRh9Js9PyCR/aka/FCb6TuHT2U8gQubbm/mPmF6L7FY9d79VwQ==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-8.0.0.tgz",
+			"integrity": "sha512-3ebOmGdCYKrBYyGKc1xhj0unEnW7beZpVU7JohVeGl7mTxR+7T6egpaawTWAVsB0pEIhcsbJVOjPKCJSoRO6Zg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-normalize-string": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.2.tgz",
-			"integrity": "sha512-vQZIivlxlfqqMp4L9PZsFE4YUkWniziKjQWUtsxUiVsSSPelQydwS8Wwcuw0+83ZjPWNTl02oxlIvXsmmG+CiQ==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-8.0.0.tgz",
+			"integrity": "sha512-TvWCGZ/e04Tv31uJvOUtbexkfgUnqmQ3M2P5DkAaVzvOj+BvTkG2QjpA5Y71SL1SPxJcj4M23fNh+RDVCmG8kA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-normalize-timing-functions": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.2.tgz",
-			"integrity": "sha512-a+YrtMox4TBtId/AEwbA03VcJgtyW4dGBizPl7e88cTFULYsprgHWTbfyjSLyHeBcK/Q9JhXkt2ZXiwaVHoMzA==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-8.0.0.tgz",
+			"integrity": "sha512-uEfaXst5Xgqxv7geYUuz6vs9mn88K2NPY2RoIzM3BMmSjsdTSeppV9x2qIgrxsisdbSqF6IVhzI2occcte3hTA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-normalize-unicode": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.1.0.tgz",
-			"integrity": "sha512-QVC5TQHsVj33otj8/JD869Ndr5Xcc/+fwRh4HAsFsAeygQQXm+0PySrKbr/8tkDKzW+EVT3QkqZMfFrGiossDg==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-8.0.0.tgz",
+			"integrity": "sha512-+WYngZaChEeTHZmWhmKtnJ4gTzWdINEaFcgWBnu6WdVu8Ftim8OBTcw768DuCC/3Aax9bZ9WkwrLGHym2Lzf+A==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"browserslist": "^4.23.0",
+				"browserslist": "^4.28.2",
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-normalize-url": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.2.tgz",
-			"integrity": "sha512-kVNcWhCeKAzZ8B4pv/DnrU1wNh458zBNp8dh4y5hhxih5RZQ12QWMuQrDgPRw3LRl8mN9vOVfHl7uhvHYMoXsQ==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-8.0.0.tgz",
+			"integrity": "sha512-4Mz9hZHn/QIB+YtFqTXrDmE2193GYxGb3F8uMfLvMicaEXCCUlDIJ658gFFJbqEGl9FYzwPtRiuNgbwlO9kkBg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-normalize-whitespace": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.2.tgz",
-			"integrity": "sha512-sXZ2Nj1icbJOKmdjXVT9pnyHQKiSAyuNQHSgRCUgThn2388Y9cGVDR+E9J9iAYbSbLHI+UUwLVl1Wzco/zgv0Q==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-8.0.0.tgz",
+			"integrity": "sha512-V1f8tYnwIP5tscOXQFTKK8Y5EJ+R2GMpFJ6FjzwoKoQnhbqQy3IeSrDjJJb8JjVos8ut6Osi80Zybpayv/XjIQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-ordered-values": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.2.tgz",
-			"integrity": "sha512-VRZSOB+JU32RsEAQrO94QPkClGPKJEL/Z9PCBImXMhIeK5KAYo6slP/hBYlLgrCjFxyqvn5VC81tycFEDBLG1Q==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-8.0.0.tgz",
+			"integrity": "sha512-Dg9+itb6lmD0bxqhQyHCtXAwYRh0wUrx6Mp4/BNXgkLoJmdYMmWi+V+Pypw79Q6iQhxA8KFMHqLBITQJV2gKMA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"cssnano-utils": "^4.0.2",
+				"cssnano-utils": "^6.0.0",
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-reduce-initial": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.1.0.tgz",
-			"integrity": "sha512-RarLgBK/CrL1qZags04oKbVbrrVK2wcxhvta3GCxrZO4zveibqbRPmm2VI8sSgCXwoUHEliRSbOfpR0b/VIoiw==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-8.0.0.tgz",
+			"integrity": "sha512-DChcE9d528AKrlpCTHjhsAiOsWCk4H9ApHPS1QqRT3praObWTiWyn6W1UddGpc46K9LQnHwUu4YwaPUukGtXVA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"browserslist": "^4.23.0",
+				"browserslist": "^4.28.2",
 				"caniuse-api": "^3.0.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-reduce-transforms": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.2.tgz",
-			"integrity": "sha512-sB+Ya++3Xj1WaT9+5LOOdirAxP7dJZms3GRcYheSPi1PiTMigsxHAdkrbItHxwYHr4kt1zL7mmcHstgMYT+aiA==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-8.0.0.tgz",
+			"integrity": "sha512-cLZT0som7vvumQT9XQCnSKOSnRinNQZd1Hm+J723Ney13E8CIydDhw6JwzsjPtgnYThTqn9Q45906gz6wxaAsw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-selector-parser": {
-			"version": "6.0.16",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
-			"integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
+			"integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"cssesc": "^3.0.0",
 				"util-deprecate": "^1.0.2"
@@ -1762,47 +2074,51 @@
 			}
 		},
 		"node_modules/postcss-svgo": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.3.tgz",
-			"integrity": "sha512-dlrahRmxP22bX6iKEjOM+c8/1p+81asjKT+V5lrgOH944ryx/OHpclnIbGsKVd3uWOXFLYJwCVf0eEkJGvO96g==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-8.0.0.tgz",
+			"integrity": "sha512-Q2fMSYEiNE1ioDc/3sxvI24NdgA/MJno2XLNpOxgv8aCcJbym8mZY10/lDY5+AWCIc3Aiqzy2Wcp9/zaIXBZgQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"postcss-value-parser": "^4.2.0",
-				"svgo": "^3.2.0"
+				"svgo": "^4.0.1"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >= 18"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-unique-selectors": {
-			"version": "6.0.4",
-			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.4.tgz",
-			"integrity": "sha512-K38OCaIrO8+PzpArzkLKB42dSARtC2tmG6PvD4b1o1Q2E9Os8jzfWFfSy/rixsHwohtsDdFtAWGjFVFUdwYaMg==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-8.0.0.tgz",
+			"integrity": "sha512-iObuolUX+ITJfMU2QQFQdh31JgSjNLPNjVs6YGAqBHvOvAWXMMNget6donQl83aQaeS32i5XeKZURUW/WBxIUw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"postcss-selector-parser": "^6.0.16"
+				"postcss-selector-parser": "^7.1.1"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/postcss-value-parser": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
 			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/prettier": {
-			"version": "3.2.5",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-			"integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+			"version": "3.8.3",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz",
+			"integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==",
 			"dev": true,
+			"license": "MIT",
 			"bin": {
 				"prettier": "bin/prettier.cjs"
 			},
@@ -1814,31 +2130,25 @@
 			}
 		},
 		"node_modules/readdirp": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-			"dev": true,
-			"dependencies": {
-				"picomatch": "^2.2.1"
-			},
-			"engines": {
-				"node": ">=8.10.0"
-			}
-		},
-		"node_modules/require-directory": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz",
+			"integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
-				"node": ">=0.10.0"
+				"node": ">= 20.19.0"
+			},
+			"funding": {
+				"type": "individual",
+				"url": "https://paulmillr.com/funding/"
 			}
 		},
 		"node_modules/rtlcss": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.1.1.tgz",
-			"integrity": "sha512-/oVHgBtnPNcggP2aVXQjSy6N1mMAfHg4GSag0QtZBlD5bdDgAHwr4pydqJGd+SUCu9260+Pjqbjwtvu7EMH1KQ==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.3.0.tgz",
+			"integrity": "sha512-FI+pHEn7Wc4NqKXMXFM+VAYKEj/mRIcW4h24YVwVtyjI+EqGrLc2Hx/Ny0lrZ21cBWU2goLy36eqMcNj3AQJig==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"escalade": "^3.1.1",
 				"picocolors": "^1.0.0",
@@ -1853,27 +2163,32 @@
 			}
 		},
 		"node_modules/sass": {
-			"version": "1.75.0",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.75.0.tgz",
-			"integrity": "sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw==",
+			"version": "1.100.0",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.100.0.tgz",
+			"integrity": "sha512-B5j0rYMlinhhOo9tjQebMVVn0TfyXAF+wB3b2ggZUuJ/is/Y+7+JGjirAMxHZ9Z3hIP98NPfamlAkBHa1lAaXQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"chokidar": ">=3.0.0 <4.0.0",
-				"immutable": "^4.0.0",
+				"chokidar": "^5.0.0",
+				"immutable": "^5.1.5",
 				"source-map-js": ">=0.6.2 <2.0.0"
 			},
 			"bin": {
 				"sass": "sass.js"
 			},
 			"engines": {
-				"node": ">=14.0.0"
+				"node": ">=20.19.0"
+			},
+			"optionalDependencies": {
+				"@parcel/watcher": "^2.4.1"
 			}
 		},
 		"node_modules/sax": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/sax/-/sax-1.5.0.tgz",
-			"integrity": "sha512-21IYA3Q5cQf089Z6tgaUTr7lDAyzoTPx5HRtbhsME8Udispad8dC/+sziTNugOEx54ilvatQ9YCzl4KQLPcRHA==",
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz",
+			"integrity": "sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==",
 			"dev": true,
+			"license": "BlueOak-1.0.0",
 			"engines": {
 				"node": ">=11.0.0"
 			}
@@ -1881,18 +2196,21 @@
 		"node_modules/shortcut-buttons-flatpickr": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/shortcut-buttons-flatpickr/-/shortcut-buttons-flatpickr-0.4.0.tgz",
-			"integrity": "sha512-JKmT4my3Hm1e18OvG4Q6RcFhN4WRqqpTMkHrvZ7fup/dp6aTIWGVCHdRYtASkp/FCzDlJh6iCLQ/VcwwNpAMoQ=="
+			"integrity": "sha512-JKmT4my3Hm1e18OvG4Q6RcFhN4WRqqpTMkHrvZ7fup/dp6aTIWGVCHdRYtASkp/FCzDlJh6iCLQ/VcwwNpAMoQ==",
+			"license": "MIT"
 		},
 		"node_modules/sortablejs": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.2.tgz",
-			"integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA=="
+			"version": "1.15.7",
+			"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.7.tgz",
+			"integrity": "sha512-Kk8wLQPlS+yi1ZEf48a4+fzHa4yxjC30M/Sr2AnQu+f/MPwvvX9XjZ6OWejiz8crBsLwSq8GHqaxaET7u6ux0A==",
+			"license": "MIT"
 		},
 		"node_modules/source-map": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
 			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -1902,6 +2220,7 @@
 			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
 			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -1911,35 +2230,44 @@
 			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
 			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"buffer-from": "^1.0.0",
 				"source-map": "^0.6.0"
 			}
 		},
 		"node_modules/string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+			"integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
+				"emoji-regex": "^10.3.0",
+				"get-east-asian-width": "^1.0.0",
+				"strip-ansi": "^7.1.0"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=18"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/strip-ansi": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+			"integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ansi-regex": "^5.0.1"
+				"ansi-regex": "^6.2.2"
 			},
 			"engines": {
-				"node": ">=8"
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/strip-ansi?sponsor=1"
 			}
 		},
 		"node_modules/strip-json-comments": {
@@ -1947,6 +2275,7 @@
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			},
@@ -1955,46 +2284,48 @@
 			}
 		},
 		"node_modules/style-mod": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
-			"integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
+			"integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==",
 			"license": "MIT"
 		},
 		"node_modules/stylehacks": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.1.1.tgz",
-			"integrity": "sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-8.0.0.tgz",
+			"integrity": "sha512-sWyjaJvBqHoVKYPbQ8JRvrGSPaYWtWrJsU+fGVtwKB1GE1rRPu3rC7T6UCuXLoL00Dwb+tsHe2T904r8Vnsx8w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"browserslist": "^4.23.0",
-				"postcss-selector-parser": "^6.0.16"
+				"browserslist": "^4.28.2",
+				"postcss-selector-parser": "^7.1.1"
 			},
 			"engines": {
-				"node": "^14 || ^16 || >=18.0"
+				"node": "^22.11.0 || ^24.11.0 || >=26.0"
 			},
 			"peerDependencies": {
-				"postcss": "^8.4.31"
+				"postcss": "^8.5.14"
 			}
 		},
 		"node_modules/svgo": {
-			"version": "3.3.3",
-			"resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.3.tgz",
-			"integrity": "sha512-+wn7I4p7YgJhHs38k2TNjy1vCfPIfLIJWR5MnCStsN8WuuTcBnRKcMHQLMM2ijxGZmDoZwNv8ipl5aTTen62ng==",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/svgo/-/svgo-4.0.1.tgz",
+			"integrity": "sha512-XDpWUOPC6FEibaLzjfe0ucaV0YrOjYotGJO1WpF0Zd+n6ZGEQUsSugaoLq9QkEZtAfQIxT42UChcssDVPP3+/w==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"commander": "^7.2.0",
+				"commander": "^11.1.0",
 				"css-select": "^5.1.0",
-				"css-tree": "^2.3.1",
+				"css-tree": "^3.0.1",
 				"css-what": "^6.1.0",
 				"csso": "^5.0.5",
-				"picocolors": "^1.0.0",
+				"picocolors": "^1.1.1",
 				"sax": "^1.5.0"
 			},
 			"bin": {
-				"svgo": "bin/svgo"
+				"svgo": "bin/svgo.js"
 			},
 			"engines": {
-				"node": ">=14.0.0"
+				"node": ">=16"
 			},
 			"funding": {
 				"type": "opencollective",
@@ -2002,13 +2333,14 @@
 			}
 		},
 		"node_modules/terser": {
-			"version": "5.30.4",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.30.4.tgz",
-			"integrity": "sha512-xRdd0v64a8mFK9bnsKVdoNP9GQIKUAaJPTaqEQDL4w/J8WaW4sWXXoMZ+6SimPkfT5bElreXf8m9HnmPc3E1BQ==",
+			"version": "5.48.0",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.48.0.tgz",
+			"integrity": "sha512-J/9An6vs9Us6wKRriSFXBWdRZapREHqFzdNUKk0pmu804EMR6dr6winwo7e5JDxN4xahxQsuysyYFwlwj4XN/Q==",
 			"dev": true,
+			"license": "BSD-2-Clause",
 			"dependencies": {
 				"@jridgewell/source-map": "^0.3.3",
-				"acorn": "^8.8.2",
+				"acorn": "^8.15.0",
 				"commander": "^2.20.0",
 				"source-map-support": "~0.5.20"
 			},
@@ -2023,7 +2355,8 @@
 			"version": "2.20.3",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
 			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/thememirror": {
 			"version": "2.0.1",
@@ -2036,22 +2369,10 @@
 				"@codemirror/view": "^6.0.0"
 			}
 		},
-		"node_modules/to-regex-range": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-			"dev": true,
-			"dependencies": {
-				"is-number": "^7.0.0"
-			},
-			"engines": {
-				"node": ">=8.0"
-			}
-		},
 		"node_modules/update-browserslist-db": {
-			"version": "1.0.13",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-			"integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
+			"integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
 			"dev": true,
 			"funding": [
 				{
@@ -2067,9 +2388,10 @@
 					"url": "https://github.com/sponsors/ai"
 				}
 			],
+			"license": "MIT",
 			"dependencies": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0"
+				"escalade": "^3.2.0",
+				"picocolors": "^1.1.1"
 			},
 			"bin": {
 				"update-browserslist-db": "cli.js"
@@ -2082,7 +2404,8 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/w3c-keyname": {
 			"version": "2.2.8",
@@ -2091,17 +2414,18 @@
 			"license": "MIT"
 		},
 		"node_modules/wrap-ansi": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+			"version": "9.0.2",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
+			"integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
+				"ansi-styles": "^6.2.1",
+				"string-width": "^7.0.0",
+				"strip-ansi": "^7.1.0"
 			},
 			"engines": {
-				"node": ">=10"
+				"node": ">=18"
 			},
 			"funding": {
 				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
@@ -2112,1484 +2436,38 @@
 			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
 			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
 				"node": ">=10"
 			}
 		},
 		"node_modules/yargs": {
-			"version": "17.7.2",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+			"version": "18.0.0",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz",
+			"integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"cliui": "^8.0.1",
+				"cliui": "^9.0.1",
 				"escalade": "^3.1.1",
 				"get-caller-file": "^2.0.5",
-				"require-directory": "^2.1.1",
-				"string-width": "^4.2.3",
+				"string-width": "^7.2.0",
 				"y18n": "^5.0.5",
-				"yargs-parser": "^21.1.1"
+				"yargs-parser": "^22.0.0"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": "^20.19.0 || ^22.12.0 || >=23"
 			}
 		},
 		"node_modules/yargs-parser": {
-			"version": "21.1.1",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+			"version": "22.0.0",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz",
+			"integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==",
 			"dev": true,
+			"license": "ISC",
 			"engines": {
-				"node": ">=12"
-			}
-		}
-	},
-	"dependencies": {
-		"@codemirror/autocomplete": {
-			"version": "6.18.6",
-			"resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.6.tgz",
-			"integrity": "sha512-PHHBXFomUs5DF+9tCOM/UoW6XQ4R44lLNNhRaW9PKPTU0D7lIjRg3ElxaJnTwsl/oHiR93WSXDBrekhoUGCPtg==",
-			"requires": {
-				"@codemirror/language": "^6.0.0",
-				"@codemirror/state": "^6.0.0",
-				"@codemirror/view": "^6.17.0",
-				"@lezer/common": "^1.0.0"
-			}
-		},
-		"@codemirror/commands": {
-			"version": "6.8.1",
-			"resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.8.1.tgz",
-			"integrity": "sha512-KlGVYufHMQzxbdQONiLyGQDUW0itrLZwq3CcY7xpv9ZLRHqzkBSoteocBHtMCoY7/Ci4xhzSrToIeLg7FxHuaw==",
-			"requires": {
-				"@codemirror/language": "^6.0.0",
-				"@codemirror/state": "^6.4.0",
-				"@codemirror/view": "^6.27.0",
-				"@lezer/common": "^1.1.0"
-			}
-		},
-		"@codemirror/lang-css": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.1.tgz",
-			"integrity": "sha512-kr5fwBGiGtmz6l0LSJIbno9QrifNMUusivHbnA1H6Dmqy4HZFte3UAICix1VuKo0lMPKQr2rqB+0BkKi/S3Ejg==",
-			"requires": {
-				"@codemirror/autocomplete": "^6.0.0",
-				"@codemirror/language": "^6.0.0",
-				"@codemirror/state": "^6.0.0",
-				"@lezer/common": "^1.0.2",
-				"@lezer/css": "^1.1.7"
-			}
-		},
-		"@codemirror/lang-html": {
-			"version": "6.4.9",
-			"resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.9.tgz",
-			"integrity": "sha512-aQv37pIMSlueybId/2PVSP6NPnmurFDVmZwzc7jszd2KAF8qd4VBbvNYPXWQq90WIARjsdVkPbw29pszmHws3Q==",
-			"requires": {
-				"@codemirror/autocomplete": "^6.0.0",
-				"@codemirror/lang-css": "^6.0.0",
-				"@codemirror/lang-javascript": "^6.0.0",
-				"@codemirror/language": "^6.4.0",
-				"@codemirror/state": "^6.0.0",
-				"@codemirror/view": "^6.17.0",
-				"@lezer/common": "^1.0.0",
-				"@lezer/css": "^1.1.0",
-				"@lezer/html": "^1.3.0"
-			}
-		},
-		"@codemirror/lang-javascript": {
-			"version": "6.2.4",
-			"resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.4.tgz",
-			"integrity": "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA==",
-			"requires": {
-				"@codemirror/autocomplete": "^6.0.0",
-				"@codemirror/language": "^6.6.0",
-				"@codemirror/lint": "^6.0.0",
-				"@codemirror/state": "^6.0.0",
-				"@codemirror/view": "^6.17.0",
-				"@lezer/common": "^1.0.0",
-				"@lezer/javascript": "^1.0.0"
-			}
-		},
-		"@codemirror/lang-xml": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.1.0.tgz",
-			"integrity": "sha512-3z0blhicHLfwi2UgkZYRPioSgVTo9PV5GP5ducFH6FaHy0IAJRg+ixj5gTR1gnT/glAIC8xv4w2VL1LoZfs+Jg==",
-			"requires": {
-				"@codemirror/autocomplete": "^6.0.0",
-				"@codemirror/language": "^6.4.0",
-				"@codemirror/state": "^6.0.0",
-				"@codemirror/view": "^6.0.0",
-				"@lezer/common": "^1.0.0",
-				"@lezer/xml": "^1.0.0"
-			}
-		},
-		"@codemirror/language": {
-			"version": "6.11.1",
-			"resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.11.1.tgz",
-			"integrity": "sha512-5kS1U7emOGV84vxC+ruBty5sUgcD0te6dyupyRVG2zaSjhTDM73LhVKUtVwiqSe6QwmEoA4SCiU8AKPFyumAWQ==",
-			"requires": {
-				"@codemirror/state": "^6.0.0",
-				"@codemirror/view": "^6.23.0",
-				"@lezer/common": "^1.1.0",
-				"@lezer/highlight": "^1.0.0",
-				"@lezer/lr": "^1.0.0",
-				"style-mod": "^4.0.0"
-			}
-		},
-		"@codemirror/lint": {
-			"version": "6.8.5",
-			"resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.5.tgz",
-			"integrity": "sha512-s3n3KisH7dx3vsoeGMxsbRAgKe4O1vbrnKBClm99PU0fWxmxsx5rR2PfqQgIt+2MMJBHbiJ5rfIdLYfB9NNvsA==",
-			"requires": {
-				"@codemirror/state": "^6.0.0",
-				"@codemirror/view": "^6.35.0",
-				"crelt": "^1.0.5"
-			}
-		},
-		"@codemirror/search": {
-			"version": "6.5.11",
-			"resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.11.tgz",
-			"integrity": "sha512-KmWepDE6jUdL6n8cAAqIpRmLPBZ5ZKnicE8oGU/s3QrAVID+0VhLFrzUucVKHG5035/BSykhExDL/Xm7dHthiA==",
-			"requires": {
-				"@codemirror/state": "^6.0.0",
-				"@codemirror/view": "^6.0.0",
-				"crelt": "^1.0.5"
-			}
-		},
-		"@codemirror/state": {
-			"version": "6.5.2",
-			"resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
-			"integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
-			"requires": {
-				"@marijn/find-cluster-break": "^1.0.0"
-			}
-		},
-		"@codemirror/theme-one-dark": {
-			"version": "6.1.3",
-			"resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.3.tgz",
-			"integrity": "sha512-NzBdIvEJmx6fjeremiGp3t/okrLPYT0d9orIc7AFun8oZcRk58aejkqhv6spnz4MLAevrKNPMQYXEWMg4s+sKA==",
-			"requires": {
-				"@codemirror/language": "^6.0.0",
-				"@codemirror/state": "^6.0.0",
-				"@codemirror/view": "^6.0.0",
-				"@lezer/highlight": "^1.0.0"
-			}
-		},
-		"@codemirror/view": {
-			"version": "6.37.2",
-			"resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.37.2.tgz",
-			"integrity": "sha512-XD3LdgQpxQs5jhOOZ2HRVT+Rj59O4Suc7g2ULvZ+Yi8eCkickrkZ5JFuoDhs2ST1mNI5zSsNYgR3NGa4OUrbnw==",
-			"requires": {
-				"@codemirror/state": "^6.5.0",
-				"crelt": "^1.0.6",
-				"style-mod": "^4.1.0",
-				"w3c-keyname": "^2.2.4"
-			}
-		},
-		"@fortawesome/fontawesome-free": {
-			"version": "6.5.2",
-			"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz",
-			"integrity": "sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q=="
-		},
-		"@jridgewell/gen-mapping": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-			"integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
-			"dev": true,
-			"requires": {
-				"@jridgewell/set-array": "^1.2.1",
-				"@jridgewell/sourcemap-codec": "^1.4.10",
-				"@jridgewell/trace-mapping": "^0.3.24"
-			}
-		},
-		"@jridgewell/resolve-uri": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-			"dev": true
-		},
-		"@jridgewell/set-array": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-			"dev": true
-		},
-		"@jridgewell/source-map": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-			"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
-			"dev": true,
-			"requires": {
-				"@jridgewell/gen-mapping": "^0.3.5",
-				"@jridgewell/trace-mapping": "^0.3.25"
-			}
-		},
-		"@jridgewell/sourcemap-codec": {
-			"version": "1.4.15",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-			"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-			"dev": true
-		},
-		"@jridgewell/trace-mapping": {
-			"version": "0.3.25",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-			"dev": true,
-			"requires": {
-				"@jridgewell/resolve-uri": "^3.1.0",
-				"@jridgewell/sourcemap-codec": "^1.4.14"
-			}
-		},
-		"@lezer/common": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
-			"integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA=="
-		},
-		"@lezer/css": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.2.1.tgz",
-			"integrity": "sha512-2F5tOqzKEKbCUNraIXc0f6HKeyKlmMWJnBB0i4XW6dJgssrZO/YlZ2pY5xgyqDleqqhiNJ3dQhbrV2aClZQMvg==",
-			"requires": {
-				"@lezer/common": "^1.2.0",
-				"@lezer/highlight": "^1.0.0",
-				"@lezer/lr": "^1.3.0"
-			}
-		},
-		"@lezer/highlight": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz",
-			"integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==",
-			"requires": {
-				"@lezer/common": "^1.0.0"
-			}
-		},
-		"@lezer/html": {
-			"version": "1.3.10",
-			"resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.10.tgz",
-			"integrity": "sha512-dqpT8nISx/p9Do3AchvYGV3qYc4/rKr3IBZxlHmpIKam56P47RSHkSF5f13Vu9hebS1jM0HmtJIwLbWz1VIY6w==",
-			"requires": {
-				"@lezer/common": "^1.2.0",
-				"@lezer/highlight": "^1.0.0",
-				"@lezer/lr": "^1.0.0"
-			}
-		},
-		"@lezer/javascript": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.5.1.tgz",
-			"integrity": "sha512-ATOImjeVJuvgm3JQ/bpo2Tmv55HSScE2MTPnKRMRIPx2cLhHGyX2VnqpHhtIV1tVzIjZDbcWQm+NCTF40ggZVw==",
-			"requires": {
-				"@lezer/common": "^1.2.0",
-				"@lezer/highlight": "^1.1.3",
-				"@lezer/lr": "^1.3.0"
-			}
-		},
-		"@lezer/lr": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
-			"integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
-			"requires": {
-				"@lezer/common": "^1.0.0"
-			}
-		},
-		"@lezer/xml": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.6.tgz",
-			"integrity": "sha512-CdDwirL0OEaStFue/66ZmFSeppuL6Dwjlk8qk153mSQwiSH/Dlri4GNymrNWnUmPl2Um7QfV1FO9KFUyX3Twww==",
-			"requires": {
-				"@lezer/common": "^1.2.0",
-				"@lezer/highlight": "^1.0.0",
-				"@lezer/lr": "^1.0.0"
-			}
-		},
-		"@marijn/find-cluster-break": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
-			"integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g=="
-		},
-		"@openwebwork/codemirror-lang-pg": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/@openwebwork/codemirror-lang-pg/-/codemirror-lang-pg-0.0.3.tgz",
-			"integrity": "sha512-ZKtb2r0Ck6tVz44wwMKY7w/82P470whIzM5C8pi2GiBlnFWmkQcadmOaCBz31FELY1SrKE3AO2TmMrwUt2EKPA==",
-			"requires": {
-				"@codemirror/language": "^6.11.0",
-				"@lezer/highlight": "^1.2.1",
-				"@lezer/lr": "^1.4.2"
-			}
-		},
-		"@openwebwork/pg-codemirror-editor": {
-			"version": "0.0.5",
-			"resolved": "https://registry.npmjs.org/@openwebwork/pg-codemirror-editor/-/pg-codemirror-editor-0.0.5.tgz",
-			"integrity": "sha512-ue4aciJzF7PPdQwWvYQkSf7h3pqOSM21fXyQ1vXRNndiQ7TCNX6FBI5JalMWDzi7CttGR+Mj+PgffmADwmKIMg==",
-			"requires": {
-				"@codemirror/lang-html": "^6.4.9",
-				"@codemirror/lang-xml": "^6.1.0",
-				"@codemirror/theme-one-dark": "^6.1.2",
-				"@openwebwork/codemirror-lang-pg": "^0.0.3",
-				"@replit/codemirror-emacs": "^6.1.0",
-				"@replit/codemirror-vim": "^6.3.0",
-				"cm6-theme-basic-dark": "^0.2.0",
-				"cm6-theme-basic-light": "^0.2.0",
-				"cm6-theme-gruvbox-dark": "^0.2.0",
-				"cm6-theme-gruvbox-light": "^0.2.0",
-				"cm6-theme-material-dark": "^0.2.0",
-				"cm6-theme-nord": "^0.2.0",
-				"cm6-theme-solarized-dark": "^0.2.0",
-				"cm6-theme-solarized-light": "^0.2.0",
-				"codemirror": "^6.0.1",
-				"codemirror-lang-mt": "^0.0.3",
-				"codemirror-lang-perl": "^0.1.6",
-				"style-mod": "^4.1.2",
-				"thememirror": "^2.0.1"
-			}
-		},
-		"@popperjs/core": {
-			"version": "2.11.8",
-			"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
-			"integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
-			"peer": true
-		},
-		"@replit/codemirror-emacs": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/@replit/codemirror-emacs/-/codemirror-emacs-6.1.0.tgz",
-			"integrity": "sha512-74DITnht6Cs6sHg02PQ169IKb1XgtyhI9sLD0JeOFco6Ds18PT+dkD8+DgXBDokne9UIFKsBbKPnpFRAz60/Lw==",
-			"requires": {}
-		},
-		"@replit/codemirror-vim": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/@replit/codemirror-vim/-/codemirror-vim-6.3.0.tgz",
-			"integrity": "sha512-aTx931ULAMuJx6xLf7KQDOL7CxD+Sa05FktTDrtLaSy53uj01ll3Zf17JdKsriER248oS55GBzg0CfCTjEneAQ==",
-			"requires": {}
-		},
-		"acorn": {
-			"version": "8.11.3",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-			"integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
-			"dev": true
-		},
-		"ansi-regex": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-			"dev": true
-		},
-		"ansi-styles": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
-			"requires": {
-				"color-convert": "^2.0.1"
-			}
-		},
-		"anymatch": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-			"integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-			"dev": true,
-			"requires": {
-				"normalize-path": "^3.0.0",
-				"picomatch": "^2.0.4"
-			}
-		},
-		"autoprefixer": {
-			"version": "10.4.19",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
-			"integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.23.0",
-				"caniuse-lite": "^1.0.30001599",
-				"fraction.js": "^4.3.7",
-				"normalize-range": "^0.1.2",
-				"picocolors": "^1.0.0",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"binary-extensions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-			"dev": true
-		},
-		"boolbase": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-			"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-			"dev": true
-		},
-		"bootstrap": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
-			"integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
-			"requires": {}
-		},
-		"braces": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-			"dev": true,
-			"requires": {
-				"fill-range": "^7.1.1"
-			}
-		},
-		"browserslist": {
-			"version": "4.23.0",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-			"integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
-			"dev": true,
-			"requires": {
-				"caniuse-lite": "^1.0.30001587",
-				"electron-to-chromium": "^1.4.668",
-				"node-releases": "^2.0.14",
-				"update-browserslist-db": "^1.0.13"
-			}
-		},
-		"buffer-from": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-			"dev": true
-		},
-		"caniuse-api": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-			"integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"caniuse-lite": "^1.0.0",
-				"lodash.memoize": "^4.1.2",
-				"lodash.uniq": "^4.5.0"
-			}
-		},
-		"caniuse-lite": {
-			"version": "1.0.30001723",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001723.tgz",
-			"integrity": "sha512-1R/elMjtehrFejxwmexeXAtae5UO9iSyFn6G/I806CYC/BLyyBk1EPhrKBkWhy6wM6Xnm47dSJQec+tLJ39WHw==",
-			"dev": true
-		},
-		"chokidar": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-			"integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-			"dev": true,
-			"requires": {
-				"anymatch": "~3.1.2",
-				"braces": "~3.0.2",
-				"fsevents": "~2.3.2",
-				"glob-parent": "~5.1.2",
-				"is-binary-path": "~2.1.0",
-				"is-glob": "~4.0.1",
-				"normalize-path": "~3.0.0",
-				"readdirp": "~3.6.0"
-			}
-		},
-		"cliui": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-			"dev": true,
-			"requires": {
-				"string-width": "^4.2.0",
-				"strip-ansi": "^6.0.1",
-				"wrap-ansi": "^7.0.0"
+				"node": "^20.19.0 || ^22.12.0 || >=23"
 			}
-		},
-		"cm6-theme-basic-dark": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/cm6-theme-basic-dark/-/cm6-theme-basic-dark-0.2.0.tgz",
-			"integrity": "sha512-+mNNJecRtxS/KkloMDCQF0oTrT6aFGRZTjnBcdT5UG1pcDO4Brq8l1+0KR/8dZ7hub2gOGOzoi3rGFD8GzlH7Q==",
-			"requires": {}
-		},
-		"cm6-theme-basic-light": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/cm6-theme-basic-light/-/cm6-theme-basic-light-0.2.0.tgz",
-			"integrity": "sha512-1prg2gv44sYfpHscP26uLT/ePrh0mlmVwMSoSd3zYKQ92Ab3jPRLzyCnpyOCQLJbK+YdNs4HvMRqMNYdy4pMhA==",
-			"requires": {}
-		},
-		"cm6-theme-gruvbox-dark": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/cm6-theme-gruvbox-dark/-/cm6-theme-gruvbox-dark-0.2.0.tgz",
-			"integrity": "sha512-xyqsG19qV+nb7ZHTMocSNWwZHMExfQxDm0FlbNMqEGKeQR96WryssXJH/IZZQudwrPpWU2dCoyOgMFhti2UTYA==",
-			"requires": {}
-		},
-		"cm6-theme-gruvbox-light": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/cm6-theme-gruvbox-light/-/cm6-theme-gruvbox-light-0.2.0.tgz",
-			"integrity": "sha512-sc4dEMLU5y4F3QGLjwMQs1H3Q0a0ooXA1EvyWnknxLEGQVXwJrxkkV67gs1TqWASl2i63iomt4zyz5pkbfO1yg==",
-			"requires": {}
-		},
-		"cm6-theme-material-dark": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/cm6-theme-material-dark/-/cm6-theme-material-dark-0.2.0.tgz",
-			"integrity": "sha512-H09JZihzg4w0mTtOqo5bQdxItkQWw+ergKlk7BSfwYjaR2nOi+wIN0R+ByAo7bON8GbFODvjTxH3EIqdhovFeA==",
-			"requires": {}
-		},
-		"cm6-theme-nord": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/cm6-theme-nord/-/cm6-theme-nord-0.2.0.tgz",
-			"integrity": "sha512-jTh+5nvl+N/5CtTK7UVcrxDCj2AOStvbNM8uP6tx6amq4QaaLDlapjMw+MNzEkvxcPnHY+YM91tbklS2KNlR2w==",
-			"requires": {}
-		},
-		"cm6-theme-solarized-dark": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/cm6-theme-solarized-dark/-/cm6-theme-solarized-dark-0.2.0.tgz",
-			"integrity": "sha512-FWtYHcX8NLzNSs21yGbkLF+q/5m2u80ug0JytKoI9nMZWPP5dcnsFYp1iZBEegLehiZnpv1qcmTsLTUG2KD39w==",
-			"requires": {}
-		},
-		"cm6-theme-solarized-light": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/cm6-theme-solarized-light/-/cm6-theme-solarized-light-0.2.0.tgz",
-			"integrity": "sha512-Iw7Xv+9A6NlT7sRGlM2pOwD3ZBETkAqpb7c6O0LPj5kjwcK6C3k+mvjzaQt1gzfBErMmhL1HHuK07zICeXkE+w==",
-			"requires": {}
-		},
-		"codemirror": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.2.tgz",
-			"integrity": "sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw==",
-			"requires": {
-				"@codemirror/autocomplete": "^6.0.0",
-				"@codemirror/commands": "^6.0.0",
-				"@codemirror/language": "^6.0.0",
-				"@codemirror/lint": "^6.0.0",
-				"@codemirror/search": "^6.0.0",
-				"@codemirror/state": "^6.0.0",
-				"@codemirror/view": "^6.0.0"
-			}
-		},
-		"codemirror-lang-mt": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/codemirror-lang-mt/-/codemirror-lang-mt-0.0.3.tgz",
-			"integrity": "sha512-OC2qG6GQI96BTgKzD4XVJd8fLOTyeB0pb7gy41BHjqot2gES6Bi/3esIgTygYUxw/SspMNSZnQZdWHPmD7/YYA==",
-			"requires": {
-				"@codemirror/lang-css": "^6.3.1",
-				"@codemirror/lang-html": "^6.4.9",
-				"@codemirror/lang-javascript": "^6.2.3",
-				"@codemirror/language": "^6.11.0",
-				"@lezer/highlight": "^1.2.1",
-				"@lezer/lr": "^1.4.2"
-			}
-		},
-		"codemirror-lang-perl": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/codemirror-lang-perl/-/codemirror-lang-perl-0.1.6.tgz",
-			"integrity": "sha512-cYBmCQa7/itIRNx1AHfn9OQkInJQpL0sqCoikJXhQZwYNOHFSMd0L16pofEOU/1/f+s7CPA+XucUrNr/f1qigQ==",
-			"requires": {
-				"@codemirror/language": "^6.11.0",
-				"@lezer/highlight": "^1.2.1",
-				"@lezer/lr": "^1.4.2"
-			}
-		},
-		"color-convert": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
-			"requires": {
-				"color-name": "~1.1.4"
-			}
-		},
-		"color-name": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
-		},
-		"colord": {
-			"version": "2.9.3",
-			"resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-			"integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
-			"dev": true
-		},
-		"commander": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-			"dev": true
-		},
-		"crelt": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
-			"integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="
-		},
-		"css-declaration-sorter": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz",
-			"integrity": "sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==",
-			"dev": true,
-			"requires": {}
-		},
-		"css-select": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-			"integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-			"dev": true,
-			"requires": {
-				"boolbase": "^1.0.0",
-				"css-what": "^6.1.0",
-				"domhandler": "^5.0.2",
-				"domutils": "^3.0.1",
-				"nth-check": "^2.0.1"
-			}
-		},
-		"css-tree": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
-			"integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
-			"dev": true,
-			"requires": {
-				"mdn-data": "2.0.30",
-				"source-map-js": "^1.0.1"
-			}
-		},
-		"css-what": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-			"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-			"dev": true
-		},
-		"cssesc": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-			"dev": true
-		},
-		"cssnano": {
-			"version": "6.1.2",
-			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.1.2.tgz",
-			"integrity": "sha512-rYk5UeX7VAM/u0lNqewCdasdtPK81CgX8wJFLEIXHbV2oldWRgJAsZrdhRXkV1NJzA2g850KiFm9mMU2HxNxMA==",
-			"dev": true,
-			"requires": {
-				"cssnano-preset-default": "^6.1.2",
-				"lilconfig": "^3.1.1"
-			}
-		},
-		"cssnano-preset-default": {
-			"version": "6.1.2",
-			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.1.2.tgz",
-			"integrity": "sha512-1C0C+eNaeN8OcHQa193aRgYexyJtU8XwbdieEjClw+J9d94E41LwT6ivKH0WT+fYwYWB0Zp3I3IZ7tI/BbUbrg==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.23.0",
-				"css-declaration-sorter": "^7.2.0",
-				"cssnano-utils": "^4.0.2",
-				"postcss-calc": "^9.0.1",
-				"postcss-colormin": "^6.1.0",
-				"postcss-convert-values": "^6.1.0",
-				"postcss-discard-comments": "^6.0.2",
-				"postcss-discard-duplicates": "^6.0.3",
-				"postcss-discard-empty": "^6.0.3",
-				"postcss-discard-overridden": "^6.0.2",
-				"postcss-merge-longhand": "^6.0.5",
-				"postcss-merge-rules": "^6.1.1",
-				"postcss-minify-font-values": "^6.1.0",
-				"postcss-minify-gradients": "^6.0.3",
-				"postcss-minify-params": "^6.1.0",
-				"postcss-minify-selectors": "^6.0.4",
-				"postcss-normalize-charset": "^6.0.2",
-				"postcss-normalize-display-values": "^6.0.2",
-				"postcss-normalize-positions": "^6.0.2",
-				"postcss-normalize-repeat-style": "^6.0.2",
-				"postcss-normalize-string": "^6.0.2",
-				"postcss-normalize-timing-functions": "^6.0.2",
-				"postcss-normalize-unicode": "^6.1.0",
-				"postcss-normalize-url": "^6.0.2",
-				"postcss-normalize-whitespace": "^6.0.2",
-				"postcss-ordered-values": "^6.0.2",
-				"postcss-reduce-initial": "^6.1.0",
-				"postcss-reduce-transforms": "^6.0.2",
-				"postcss-svgo": "^6.0.3",
-				"postcss-unique-selectors": "^6.0.4"
-			}
-		},
-		"cssnano-utils": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.2.tgz",
-			"integrity": "sha512-ZR1jHg+wZ8o4c3zqf1SIUSTIvm/9mU343FMR6Obe/unskbvpGhZOo1J6d/r8D1pzkRQYuwbcH3hToOuoA2G7oQ==",
-			"dev": true,
-			"requires": {}
-		},
-		"csso": {
-			"version": "5.0.5",
-			"resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
-			"integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
-			"dev": true,
-			"requires": {
-				"css-tree": "~2.2.0"
-			},
-			"dependencies": {
-				"css-tree": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
-					"integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
-					"dev": true,
-					"requires": {
-						"mdn-data": "2.0.28",
-						"source-map-js": "^1.0.1"
-					}
-				},
-				"mdn-data": {
-					"version": "2.0.28",
-					"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
-					"integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
-					"dev": true
-				}
-			}
-		},
-		"dom-serializer": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-			"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-			"dev": true,
-			"requires": {
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.2",
-				"entities": "^4.2.0"
-			}
-		},
-		"domelementtype": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-			"dev": true
-		},
-		"domhandler": {
-			"version": "5.0.3",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-			"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-			"dev": true,
-			"requires": {
-				"domelementtype": "^2.3.0"
-			}
-		},
-		"domutils": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-			"integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
-			"dev": true,
-			"requires": {
-				"dom-serializer": "^2.0.0",
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.3"
-			}
-		},
-		"electron-to-chromium": {
-			"version": "1.4.747",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.747.tgz",
-			"integrity": "sha512-+FnSWZIAvFHbsNVmUxhEqWiaOiPMcfum1GQzlWCg/wLigVtshOsjXHyEFfmt6cFK6+HkS3QOJBv6/3OPumbBfw==",
-			"dev": true
-		},
-		"emoji-regex": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-			"dev": true
-		},
-		"entities": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-			"dev": true
-		},
-		"escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-			"dev": true
-		},
-		"fill-range": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-			"dev": true,
-			"requires": {
-				"to-regex-range": "^5.0.1"
-			}
-		},
-		"flatpickr": {
-			"version": "4.6.13",
-			"resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.13.tgz",
-			"integrity": "sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw=="
-		},
-		"fraction.js": {
-			"version": "4.3.7",
-			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
-			"integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
-			"dev": true
-		},
-		"fsevents": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-			"dev": true,
-			"optional": true
-		},
-		"get-caller-file": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-			"dev": true
-		},
-		"glob-parent": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-			"dev": true,
-			"requires": {
-				"is-glob": "^4.0.1"
-			}
-		},
-		"iframe-resizer": {
-			"version": "4.3.11",
-			"resolved": "https://registry.npmjs.org/iframe-resizer/-/iframe-resizer-4.3.11.tgz",
-			"integrity": "sha512-5QtnsmfH11GDsuC7Gxd/eNzojudX3346Gb0E+Ku8ln8AtfSq+cWCZtnhCrthrtE7f1CI2/kwHkZ9G4sFYzHP7A=="
-		},
-		"immutable": {
-			"version": "4.3.8",
-			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.8.tgz",
-			"integrity": "sha512-d/Ld9aLbKpNwyl0KiM2CT1WYvkitQ1TSvmRtkcV8FKStiDoA7Slzgjmb/1G2yhKM1p0XeNOieaTbFZmU1d3Xuw==",
-			"dev": true
-		},
-		"is-binary-path": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-			"dev": true,
-			"requires": {
-				"binary-extensions": "^2.0.0"
-			}
-		},
-		"is-extglob": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-			"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-			"dev": true
-		},
-		"is-fullwidth-code-point": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-			"dev": true
-		},
-		"is-glob": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-			"dev": true,
-			"requires": {
-				"is-extglob": "^2.1.1"
-			}
-		},
-		"is-number": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-			"dev": true
-		},
-		"jquery": {
-			"version": "3.7.1",
-			"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
-			"integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
-		},
-		"jquery-ui-dist": {
-			"version": "1.13.2",
-			"resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz",
-			"integrity": "sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==",
-			"requires": {
-				"jquery": ">=1.8.0 <4.0.0"
-			}
-		},
-		"lilconfig": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz",
-			"integrity": "sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==",
-			"dev": true
-		},
-		"lodash.memoize": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-			"dev": true
-		},
-		"lodash.uniq": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-			"integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
-			"dev": true
-		},
-		"luxon": {
-			"version": "3.4.4",
-			"resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
-			"integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA=="
-		},
-		"mathjax": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/mathjax/-/mathjax-3.2.2.tgz",
-			"integrity": "sha512-Bt+SSVU8eBG27zChVewOicYs7Xsdt40qm4+UpHyX7k0/O9NliPc+x77k1/FEsPsjKPZGJvtRZM1vO+geW0OhGw=="
-		},
-		"mdn-data": {
-			"version": "2.0.30",
-			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-			"integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
-			"dev": true
-		},
-		"minisearch": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/minisearch/-/minisearch-7.1.2.tgz",
-			"integrity": "sha512-R1Pd9eF+MD5JYDDSPAp/q1ougKglm14uEkPMvQ/05RGmx6G9wvmLTrTI/Q5iPNJLYqNdsDQ7qTGIcNWR+FrHmA=="
-		},
-		"nanoid": {
-			"version": "3.3.11",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-			"integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-			"dev": true
-		},
-		"node-releases": {
-			"version": "2.0.14",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-			"integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-			"dev": true
-		},
-		"normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-			"dev": true
-		},
-		"normalize-range": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-			"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-			"dev": true
-		},
-		"nth-check": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-			"dev": true,
-			"requires": {
-				"boolbase": "^1.0.0"
-			}
-		},
-		"picocolors": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-			"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-			"dev": true
-		},
-		"picomatch": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
-			"integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
-			"dev": true
-		},
-		"postcss": {
-			"version": "8.5.10",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.10.tgz",
-			"integrity": "sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==",
-			"dev": true,
-			"requires": {
-				"nanoid": "^3.3.11",
-				"picocolors": "^1.1.1",
-				"source-map-js": "^1.2.1"
-			}
-		},
-		"postcss-calc": {
-			"version": "9.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
-			"integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
-			"dev": true,
-			"requires": {
-				"postcss-selector-parser": "^6.0.11",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-colormin": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.1.0.tgz",
-			"integrity": "sha512-x9yX7DOxeMAR+BgGVnNSAxmAj98NX/YxEMNFP+SDCEeNLb2r3i6Hh1ksMsnW8Ub5SLCpbescQqn9YEbE9554Sw==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.23.0",
-				"caniuse-api": "^3.0.0",
-				"colord": "^2.9.3",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-convert-values": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.1.0.tgz",
-			"integrity": "sha512-zx8IwP/ts9WvUM6NkVSkiU902QZL1bwPhaVaLynPtCsOTqp+ZKbNi+s6XJg3rfqpKGA/oc7Oxk5t8pOQJcwl/w==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.23.0",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-discard-comments": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.2.tgz",
-			"integrity": "sha512-65w/uIqhSBBfQmYnG92FO1mWZjJ4GL5b8atm5Yw2UgrwD7HiNiSSNwJor1eCFGzUgYnN/iIknhNRVqjrrpuglw==",
-			"dev": true,
-			"requires": {}
-		},
-		"postcss-discard-duplicates": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.3.tgz",
-			"integrity": "sha512-+JA0DCvc5XvFAxwx6f/e68gQu/7Z9ud584VLmcgto28eB8FqSFZwtrLwB5Kcp70eIoWP/HXqz4wpo8rD8gpsTw==",
-			"dev": true,
-			"requires": {}
-		},
-		"postcss-discard-empty": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.3.tgz",
-			"integrity": "sha512-znyno9cHKQsK6PtxL5D19Fj9uwSzC2mB74cpT66fhgOadEUPyXFkbgwm5tvc3bt3NAy8ltE5MrghxovZRVnOjQ==",
-			"dev": true,
-			"requires": {}
-		},
-		"postcss-discard-overridden": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.2.tgz",
-			"integrity": "sha512-j87xzI4LUggC5zND7KdjsI25APtyMuynXZSujByMaav2roV6OZX+8AaCUcZSWqckZpjAjRyFDdpqybgjFO0HJQ==",
-			"dev": true,
-			"requires": {}
-		},
-		"postcss-merge-longhand": {
-			"version": "6.0.5",
-			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.5.tgz",
-			"integrity": "sha512-5LOiordeTfi64QhICp07nzzuTDjNSO8g5Ksdibt44d+uvIIAE1oZdRn8y/W5ZtYgRH/lnLDlvi9F8btZcVzu3w==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0",
-				"stylehacks": "^6.1.1"
-			}
-		},
-		"postcss-merge-rules": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.1.1.tgz",
-			"integrity": "sha512-KOdWF0gju31AQPZiD+2Ar9Qjowz1LTChSjFFbS+e2sFgc4uHOp3ZvVX4sNeTlk0w2O31ecFGgrFzhO0RSWbWwQ==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.23.0",
-				"caniuse-api": "^3.0.0",
-				"cssnano-utils": "^4.0.2",
-				"postcss-selector-parser": "^6.0.16"
-			}
-		},
-		"postcss-minify-font-values": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.1.0.tgz",
-			"integrity": "sha512-gklfI/n+9rTh8nYaSJXlCo3nOKqMNkxuGpTn/Qm0gstL3ywTr9/WRKznE+oy6fvfolH6dF+QM4nCo8yPLdvGJg==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-minify-gradients": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.3.tgz",
-			"integrity": "sha512-4KXAHrYlzF0Rr7uc4VrfwDJ2ajrtNEpNEuLxFgwkhFZ56/7gaE4Nr49nLsQDZyUe+ds+kEhf+YAUolJiYXF8+Q==",
-			"dev": true,
-			"requires": {
-				"colord": "^2.9.3",
-				"cssnano-utils": "^4.0.2",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-minify-params": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.1.0.tgz",
-			"integrity": "sha512-bmSKnDtyyE8ujHQK0RQJDIKhQ20Jq1LYiez54WiaOoBtcSuflfK3Nm596LvbtlFcpipMjgClQGyGr7GAs+H1uA==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.23.0",
-				"cssnano-utils": "^4.0.2",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-minify-selectors": {
-			"version": "6.0.4",
-			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.4.tgz",
-			"integrity": "sha512-L8dZSwNLgK7pjTto9PzWRoMbnLq5vsZSTu8+j1P/2GB8qdtGQfn+K1uSvFgYvgh83cbyxT5m43ZZhUMTJDSClQ==",
-			"dev": true,
-			"requires": {
-				"postcss-selector-parser": "^6.0.16"
-			}
-		},
-		"postcss-normalize-charset": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.2.tgz",
-			"integrity": "sha512-a8N9czmdnrjPHa3DeFlwqst5eaL5W8jYu3EBbTTkI5FHkfMhFZh1EGbku6jhHhIzTA6tquI2P42NtZ59M/H/kQ==",
-			"dev": true,
-			"requires": {}
-		},
-		"postcss-normalize-display-values": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.2.tgz",
-			"integrity": "sha512-8H04Mxsb82ON/aAkPeq8kcBbAtI5Q2a64X/mnRRfPXBq7XeogoQvReqxEfc0B4WPq1KimjezNC8flUtC3Qz6jg==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-positions": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.2.tgz",
-			"integrity": "sha512-/JFzI441OAB9O7VnLA+RtSNZvQ0NCFZDOtp6QPFo1iIyawyXg0YI3CYM9HBy1WvwCRHnPep/BvI1+dGPKoXx/Q==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-repeat-style": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.2.tgz",
-			"integrity": "sha512-YdCgsfHkJ2jEXwR4RR3Tm/iOxSfdRt7jplS6XRh9Js9PyCR/aka/FCb6TuHT2U8gQubbm/mPmF6L7FY9d79VwQ==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-string": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.2.tgz",
-			"integrity": "sha512-vQZIivlxlfqqMp4L9PZsFE4YUkWniziKjQWUtsxUiVsSSPelQydwS8Wwcuw0+83ZjPWNTl02oxlIvXsmmG+CiQ==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-timing-functions": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.2.tgz",
-			"integrity": "sha512-a+YrtMox4TBtId/AEwbA03VcJgtyW4dGBizPl7e88cTFULYsprgHWTbfyjSLyHeBcK/Q9JhXkt2ZXiwaVHoMzA==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-unicode": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.1.0.tgz",
-			"integrity": "sha512-QVC5TQHsVj33otj8/JD869Ndr5Xcc/+fwRh4HAsFsAeygQQXm+0PySrKbr/8tkDKzW+EVT3QkqZMfFrGiossDg==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.23.0",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-url": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.2.tgz",
-			"integrity": "sha512-kVNcWhCeKAzZ8B4pv/DnrU1wNh458zBNp8dh4y5hhxih5RZQ12QWMuQrDgPRw3LRl8mN9vOVfHl7uhvHYMoXsQ==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-normalize-whitespace": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.2.tgz",
-			"integrity": "sha512-sXZ2Nj1icbJOKmdjXVT9pnyHQKiSAyuNQHSgRCUgThn2388Y9cGVDR+E9J9iAYbSbLHI+UUwLVl1Wzco/zgv0Q==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-ordered-values": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.2.tgz",
-			"integrity": "sha512-VRZSOB+JU32RsEAQrO94QPkClGPKJEL/Z9PCBImXMhIeK5KAYo6slP/hBYlLgrCjFxyqvn5VC81tycFEDBLG1Q==",
-			"dev": true,
-			"requires": {
-				"cssnano-utils": "^4.0.2",
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-reduce-initial": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.1.0.tgz",
-			"integrity": "sha512-RarLgBK/CrL1qZags04oKbVbrrVK2wcxhvta3GCxrZO4zveibqbRPmm2VI8sSgCXwoUHEliRSbOfpR0b/VIoiw==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.23.0",
-				"caniuse-api": "^3.0.0"
-			}
-		},
-		"postcss-reduce-transforms": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.2.tgz",
-			"integrity": "sha512-sB+Ya++3Xj1WaT9+5LOOdirAxP7dJZms3GRcYheSPi1PiTMigsxHAdkrbItHxwYHr4kt1zL7mmcHstgMYT+aiA==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			}
-		},
-		"postcss-selector-parser": {
-			"version": "6.0.16",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
-			"integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
-			"dev": true,
-			"requires": {
-				"cssesc": "^3.0.0",
-				"util-deprecate": "^1.0.2"
-			}
-		},
-		"postcss-svgo": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.3.tgz",
-			"integrity": "sha512-dlrahRmxP22bX6iKEjOM+c8/1p+81asjKT+V5lrgOH944ryx/OHpclnIbGsKVd3uWOXFLYJwCVf0eEkJGvO96g==",
-			"dev": true,
-			"requires": {
-				"postcss-value-parser": "^4.2.0",
-				"svgo": "^3.2.0"
-			}
-		},
-		"postcss-unique-selectors": {
-			"version": "6.0.4",
-			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.4.tgz",
-			"integrity": "sha512-K38OCaIrO8+PzpArzkLKB42dSARtC2tmG6PvD4b1o1Q2E9Os8jzfWFfSy/rixsHwohtsDdFtAWGjFVFUdwYaMg==",
-			"dev": true,
-			"requires": {
-				"postcss-selector-parser": "^6.0.16"
-			}
-		},
-		"postcss-value-parser": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-			"dev": true
-		},
-		"prettier": {
-			"version": "3.2.5",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-			"integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
-			"dev": true
-		},
-		"readdirp": {
-			"version": "3.6.0",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-			"dev": true,
-			"requires": {
-				"picomatch": "^2.2.1"
-			}
-		},
-		"require-directory": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-			"dev": true
-		},
-		"rtlcss": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.1.1.tgz",
-			"integrity": "sha512-/oVHgBtnPNcggP2aVXQjSy6N1mMAfHg4GSag0QtZBlD5bdDgAHwr4pydqJGd+SUCu9260+Pjqbjwtvu7EMH1KQ==",
-			"dev": true,
-			"requires": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0",
-				"postcss": "^8.4.21",
-				"strip-json-comments": "^3.1.1"
-			}
-		},
-		"sass": {
-			"version": "1.75.0",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.75.0.tgz",
-			"integrity": "sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw==",
-			"dev": true,
-			"requires": {
-				"chokidar": ">=3.0.0 <4.0.0",
-				"immutable": "^4.0.0",
-				"source-map-js": ">=0.6.2 <2.0.0"
-			}
-		},
-		"sax": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/sax/-/sax-1.5.0.tgz",
-			"integrity": "sha512-21IYA3Q5cQf089Z6tgaUTr7lDAyzoTPx5HRtbhsME8Udispad8dC/+sziTNugOEx54ilvatQ9YCzl4KQLPcRHA==",
-			"dev": true
-		},
-		"shortcut-buttons-flatpickr": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/shortcut-buttons-flatpickr/-/shortcut-buttons-flatpickr-0.4.0.tgz",
-			"integrity": "sha512-JKmT4my3Hm1e18OvG4Q6RcFhN4WRqqpTMkHrvZ7fup/dp6aTIWGVCHdRYtASkp/FCzDlJh6iCLQ/VcwwNpAMoQ=="
-		},
-		"sortablejs": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.2.tgz",
-			"integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA=="
-		},
-		"source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-			"dev": true
-		},
-		"source-map-js": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-			"dev": true
-		},
-		"source-map-support": {
-			"version": "0.5.21",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-			"dev": true,
-			"requires": {
-				"buffer-from": "^1.0.0",
-				"source-map": "^0.6.0"
-			}
-		},
-		"string-width": {
-			"version": "4.2.3",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-			"dev": true,
-			"requires": {
-				"emoji-regex": "^8.0.0",
-				"is-fullwidth-code-point": "^3.0.0",
-				"strip-ansi": "^6.0.1"
-			}
-		},
-		"strip-ansi": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-			"dev": true,
-			"requires": {
-				"ansi-regex": "^5.0.1"
-			}
-		},
-		"strip-json-comments": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true
-		},
-		"style-mod": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
-			"integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw=="
-		},
-		"stylehacks": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.1.1.tgz",
-			"integrity": "sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.23.0",
-				"postcss-selector-parser": "^6.0.16"
-			}
-		},
-		"svgo": {
-			"version": "3.3.3",
-			"resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.3.tgz",
-			"integrity": "sha512-+wn7I4p7YgJhHs38k2TNjy1vCfPIfLIJWR5MnCStsN8WuuTcBnRKcMHQLMM2ijxGZmDoZwNv8ipl5aTTen62ng==",
-			"dev": true,
-			"requires": {
-				"commander": "^7.2.0",
-				"css-select": "^5.1.0",
-				"css-tree": "^2.3.1",
-				"css-what": "^6.1.0",
-				"csso": "^5.0.5",
-				"picocolors": "^1.0.0",
-				"sax": "^1.5.0"
-			}
-		},
-		"terser": {
-			"version": "5.30.4",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.30.4.tgz",
-			"integrity": "sha512-xRdd0v64a8mFK9bnsKVdoNP9GQIKUAaJPTaqEQDL4w/J8WaW4sWXXoMZ+6SimPkfT5bElreXf8m9HnmPc3E1BQ==",
-			"dev": true,
-			"requires": {
-				"@jridgewell/source-map": "^0.3.3",
-				"acorn": "^8.8.2",
-				"commander": "^2.20.0",
-				"source-map-support": "~0.5.20"
-			},
-			"dependencies": {
-				"commander": {
-					"version": "2.20.3",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-					"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-					"dev": true
-				}
-			}
-		},
-		"thememirror": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/thememirror/-/thememirror-2.0.1.tgz",
-			"integrity": "sha512-d5i6FVvWWPkwrm4cHLI3t9AT1OrkAt7Ig8dtdYSofgF7C/eiyNuq6zQzSTusWTde3jpW9WLvA9J/fzNKMUsd0w==",
-			"requires": {}
-		},
-		"to-regex-range": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-			"dev": true,
-			"requires": {
-				"is-number": "^7.0.0"
-			}
-		},
-		"update-browserslist-db": {
-			"version": "1.0.13",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-			"integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
-			"dev": true,
-			"requires": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0"
-			}
-		},
-		"util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-			"dev": true
-		},
-		"w3c-keyname": {
-			"version": "2.2.8",
-			"resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz",
-			"integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ=="
-		},
-		"wrap-ansi": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-			"dev": true,
-			"requires": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
-			}
-		},
-		"y18n": {
-			"version": "5.0.8",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-			"dev": true
-		},
-		"yargs": {
-			"version": "17.7.2",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-			"dev": true,
-			"requires": {
-				"cliui": "^8.0.1",
-				"escalade": "^3.1.1",
-				"get-caller-file": "^2.0.5",
-				"require-directory": "^2.1.1",
-				"string-width": "^4.2.3",
-				"y18n": "^5.0.5",
-				"yargs-parser": "^21.1.1"
-			}
-		},
-		"yargs-parser": {
-			"version": "21.1.1",
-			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-			"dev": true
 		}
 	}
 }
diff --git a/htdocs/package.json b/htdocs/package.json
index 6bfce3e11a..afb61ca09a 100644
--- a/htdocs/package.json
+++ b/htdocs/package.json
@@ -13,29 +13,29 @@
 		"url": "https://github.com/openwebwork/webwork2"
 	},
 	"dependencies": {
-		"@fortawesome/fontawesome-free": "^6.5.2",
-		"@openwebwork/pg-codemirror-editor": "^0.0.5",
-		"bootstrap": "~5.3.3",
+		"@fortawesome/fontawesome-free": "^7.2.0",
+		"@openwebwork/pg-codemirror-editor": "^0.0.10",
+		"bootstrap": "^5.3.8",
 		"flatpickr": "^4.6.13",
-		"iframe-resizer": "^4.3.11",
-		"jquery": "^3.7.1",
-		"jquery-ui-dist": "^1.13.2",
-		"luxon": "^3.4.4",
-		"mathjax": "^3.2.2",
-		"minisearch": "^7.1.2",
+		"iframe-resizer": "^4.4.2",
+		"jquery": "^4.0.0",
+		"jquery-ui-dist": "^1.13.3",
+		"luxon": "^3.7.2",
+		"mathjax": "^4.1.2",
+		"minisearch": "^7.2.0",
 		"shortcut-buttons-flatpickr": "^0.4.0",
-		"sortablejs": "^1.15.2"
+		"sortablejs": "^1.15.7"
 	},
 	"devDependencies": {
-		"autoprefixer": "^10.4.19",
-		"chokidar": "^3.6.0",
-		"cssnano": "^6.1.2",
-		"postcss": "^8.5.10",
-		"prettier": "^3.2.5",
-		"rtlcss": "^4.1.1",
-		"sass": "^1.75.0",
-		"terser": "^5.30.4",
-		"yargs": "^17.7.2"
+		"autoprefixer": "^10.5.0",
+		"chokidar": "^5.0.0",
+		"cssnano": "^8.0.1",
+		"postcss": "^8.5.15",
+		"prettier": "^3.8.3",
+		"rtlcss": "^4.3.0",
+		"sass": "^1.100.0",
+		"terser": "^5.48.0",
+		"yargs": "^18.0.0"
 	},
 	"browserslist": [
 		"last 10 Chrome versions",
diff --git a/htdocs/show-source.cgi b/htdocs/show-source.cgi
index 8cf298e894..af3181a2ad 100755
--- a/htdocs/show-source.cgi
+++ b/htdocs/show-source.cgi
@@ -14,10 +14,12 @@ my $filedir = $file =~ s!/[^/]+$!!r;
 $file =~ s!.*/!!;
 
 my @PGdirs = (
-	"../templates$filedir",  '../templates/macros',      "$root/pg/macros",      "$root/pg/macros/answers",
-	"$root/pg/macros/capa",  "$root/pg/macros/contexts", "$root/pg/macros/core", "$root/pg/macros/deprecated",
-	"$root/pg/macros/graph", "$root/pg/macros/math",     "$root/pg/macros/misc", "$root/pg/macros/parsers",
-	"$root/pg/macros/ui",
+	"../templates$filedir",       '../templates/macros',
+	"$root/pg/macros",            "$root/pg/macros/answers",
+	"$root/pg/macros/contexts",   "$root/pg/macros/core",
+	"$root/pg/macros/deprecated", "$root/pg/macros/graph",
+	"$root/pg/macros/math",       "$root/pg/macros/misc",
+	"$root/pg/macros/parsers",    "$root/pg/macros/ui",
 );
 
 for my $dir (@PGdirs) { ShowSource("$dir/$file") if (-e "$dir/$file") }
diff --git a/htdocs/themes/README.md b/htdocs/themes/README.md
new file mode 100644
index 0000000000..048ca09644
--- /dev/null
+++ b/htdocs/themes/README.md
@@ -0,0 +1,78 @@
+# Theming WeBWorK 2
+
+This folder contains the themes for webwork2. If you would like to create a custom theme, then copy one of the existing
+theme directories, and modify it as desired. It is recommended that you use either the `math4-green`, `math4-red`, or
+`math4-yellow` theme as the basis for a new custom theme, but for more advanced theming you can copy the `math4`
+directory itself. Generally only the `_theme-colors.scss` and `_theme-overrides.scss` files need to be modified. The
+important things to change are the colors in the `_theme-colors.scss` file. Overrides for special cases can be done in
+the `_theme-overrides.scss` file. The `math4-yellow` theme uses a light primary color, and so it is a good example to
+follow if you also need a light primary color. It also shows how the `_theme-overrides.scss` file can be used to handle
+certain special cases.
+
+The `math4-overrides.css` and `math4-overrides.js` files can also be created in the theme directory and customizations
+can also be added to those files. However, usage of these files is deprecated and support for them will eventually be
+dropped. There are `.dist` files in the `math4` directory you can copy, but the `.dist` files do not have anything of
+value in them.
+
+Note that any changes made to the files in the `math4`, `math4-green`, `math4-red`, and `math4-yellow` files will cause
+problems when you upgrade webwork2, (other than copies of the `math4-overrides.css.dist` and `math4-overrides.css.js`
+files).
+
+To make the custom theme available for webwork2 to use, run `npm ci` from the `htdocs` directory. Then either set the
+theme as the `$defaultTheme` in `conf/localOverrides.conf` or choose the theme in the `Course Configuration` of a course
+to use it. Note that for any changes in the theme files to take effect, you must run `npm ci` again. You can also
+execute `./generate-assets.js` from the `htdocs` directory to update the theme (this is actually part of what `npm ci`
+does). See more details on theme creation on [the WeBWork Wiki](https://wiki.openwebwork.org/wiki/Customizing_WeBWorK).
+
+The theming system uses Sass which is an extension of CSS, and is compiled into CSS (by the `generate-assets.js`
+script). Sass variables can be set in the `_theme-colors.scss` file that control many display aspects of the user
+interface. Bootstrap has many Sass variables that can be customized. In addition there are CSS variables that can be
+set. Many of these are set initially from the Sass variables, but they can also be changed in the
+`_theme-overrides.scss` file. See the [Bootstrap documentation](https://getbootstrap.com/docs/5.3) for available Sass
+and CSS variables. There are also Sass and CSS variables specifically for webwork2 that can be used. These are
+documented below. In addition Bootstrap functions can be used to manipulate colors in the `_theme-colors.scss` file.
+See the [Boottrap Sass function documentation](https://getbootstrap.com/docs/5.3/customize/sass/#functions).
+
+## WeBWorK 2 Sass Variables
+
+These must be set in the `_theme-colors.scss` file.
+
+- `$ww-logo-background-color`: WeBWorK logo background color in the banner.
+- `$ww-achievement-level-color`: Color of the level progress bar on the achievements page.
+
+## WeBWorK 2 CSS Variables
+
+All of these are set to a default value in the `bootstrap.scss` file, but can be overridden in the
+`_theme-overrides.scss` file. Note that values can even be set for a specific CSS selector to only apply to the elements
+that match the selector and descendants of those elements.
+
+- `--ww-primary-foreground-color`: The color of text that is displayed before a primary colored background in the page
+  header, site navigation menu, and the course list on the webwork2 home page. This defaults to the result of
+  `#{color-contrast($primary)}` and rarely needs to be changed.
+- `--ww-layout-divider-color`: This is the color of the border that separates the page header, site navigation menu, and
+  main content area. It is also used for the color of the border separates the primary part of the site navigation menu
+  from page specific sub menus (such as the list of problems when viewing a problem in a homework set). This defaults to
+  `#aaa` in light mode and `#666` in dark mode.
+- `--ww-layout-border-color`: This is the border color for other regions such as the breadcrumb navigation at the top of
+  every page and the info box shown (the course information or set header box). This defaults to `#e6e6e6` in light mode
+  and `#495057` in dark mode.
+- `--ww-toggle-sidebar-icon-color-rgb`: The color of the site navigation menu toggle button in RGB color components.
+  This defaults to `255, 255, 255`.
+- `--ww-toggle-sidebar-icon-hover-color`: The color of the site navigation menu toggle button when it is hovered over
+  with the mouse cursor or has keyboard focus. This defaults to `#fff`.
+- `--ww-site-nav-link-active-background-color`: The background color of the links in the site navigation menu when they
+  have keyboard focus. This defaults to `#{$primary}`.
+- `--ww-site-nav-link-hover-background-color`: The background color of the links in the site navigation menu when the
+  mouse cursor hovers over them. This defaults to `#e1e1e1` in light mode and `#{shade-color($primary, 40%)}` in dark
+  mode.
+- `--ww-course-config-tab-link-focus-outline-color`: The outline color of the tab selection buttons on the course
+  configuration page when they have keyboard focus. This defaults to `#{rgba($primary, $focus-ring-opacity)}` in light
+  mode and `#{rgba(color-contrast($body-bg-dark), $focus-ring-opacity)}` in dark mode.
+- `--ww-logo-background-color`: The background color for the top left region of the page header that contains the
+  WeBWorK logo. This is set to the value of the `#{$ww-logo-background-color}` Sass variable, and there is no need to
+  ever modify this. Just set the Sass variable directly to what this should be. This is really only needed to get the
+  theme color to the other CSS files used by webwork2.
+- `--ww-achievement-level-color`: The color of the level progress bar on the achievements page. This defaults to the
+  value of the `#{$ww-achievement-level-color}` Sass variable, and there is no need to ever modify this. Just set the
+  Sass variable directly to what this should be. This is really only needed to get the theme color to the other CSS
+  files used by webwork2.
diff --git a/htdocs/themes/math4-green/README b/htdocs/themes/math4-green/README
deleted file mode 100644
index e607958755..0000000000
--- a/htdocs/themes/math4-green/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This is an "alternative" colorization to math4.  If you want to provide
-multiple themes to your users you should follow this as an example.
-
-Everything except for the math4-overrides.js, math4-overrides.css,
-_theme-colors.scss, and _theme-overrides.scss files should be links pointing
-back to the corresponding files in math4.  This will make it so that all your
-themes will automatically get updates.  All of your changes should be in the
-listed override files.
diff --git a/htdocs/themes/math4-green/_theme-colors.scss b/htdocs/themes/math4-green/_theme-colors.scss
index 89fa61322f..4a0d5d4e6e 100644
--- a/htdocs/themes/math4-green/_theme-colors.scss
+++ b/htdocs/themes/math4-green/_theme-colors.scss
@@ -7,7 +7,6 @@ $info: #618265;
 
 // Link colors
 $link-color: #283f2b;
-$link-hover-color: #618265;
 
 // Webwork logo background color in the banner
 $ww-logo-background-color: darken($info, 8%);
diff --git a/htdocs/themes/math4-red/README b/htdocs/themes/math4-red/README
deleted file mode 100644
index e607958755..0000000000
--- a/htdocs/themes/math4-red/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This is an "alternative" colorization to math4.  If you want to provide
-multiple themes to your users you should follow this as an example.
-
-Everything except for the math4-overrides.js, math4-overrides.css,
-_theme-colors.scss, and _theme-overrides.scss files should be links pointing
-back to the corresponding files in math4.  This will make it so that all your
-themes will automatically get updates.  All of your changes should be in the
-listed override files.
diff --git a/htdocs/themes/math4-red/_theme-colors.scss b/htdocs/themes/math4-red/_theme-colors.scss
index b34e6f2682..26de64dda7 100644
--- a/htdocs/themes/math4-red/_theme-colors.scss
+++ b/htdocs/themes/math4-red/_theme-colors.scss
@@ -8,6 +8,7 @@ $info: #c30;
 // Link colors
 $link-color: $primary;
 $link-hover-color: #c00;
+$link-color-dark: tint-color($primary, 50%);
 
 // Webwork logo background color in the banner
 $ww-logo-background-color: darken($info, 8%);
diff --git a/htdocs/themes/math4-red/_theme-overrides.scss b/htdocs/themes/math4-red/_theme-overrides.scss
index 20b5856367..e69de29bb2 100644
--- a/htdocs/themes/math4-red/_theme-overrides.scss
+++ b/htdocs/themes/math4-red/_theme-overrides.scss
@@ -1,3 +0,0 @@
-a:not(.btn):focus {
-	outline-color: #{lighten($link-hover-color, 26%)};
-}
diff --git a/htdocs/themes/math4-yellow/README b/htdocs/themes/math4-yellow/README
deleted file mode 100644
index e607958755..0000000000
--- a/htdocs/themes/math4-yellow/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This is an "alternative" colorization to math4.  If you want to provide
-multiple themes to your users you should follow this as an example.
-
-Everything except for the math4-overrides.js, math4-overrides.css,
-_theme-colors.scss, and _theme-overrides.scss files should be links pointing
-back to the corresponding files in math4.  This will make it so that all your
-themes will automatically get updates.  All of your changes should be in the
-listed override files.
diff --git a/htdocs/themes/math4-yellow/_theme-colors.scss b/htdocs/themes/math4-yellow/_theme-colors.scss
index cbc8f078bb..527681abff 100644
--- a/htdocs/themes/math4-yellow/_theme-colors.scss
+++ b/htdocs/themes/math4-yellow/_theme-colors.scss
@@ -5,13 +5,15 @@
 $primary: #ffc700;
 $info: black;
 
+$primary-bg-subtle-dark: shade-color($primary, 90%);
+$info-text-emphasis-dark: tint-color($info, 50%);
+
 // Override the default white for the foreground color of active components.
 // White has poor color contrast with the yellow primary color.
 $component-active-color: black;
 
 // Link colors
-$link-color: darken(#bf5454, 30%);
-$link-hover-color: lighten($link-color, 30%);
+$link-color: shade-color($primary, 60%);
 
 // Webwork logo background color in the banner
 $ww-logo-background-color: $info;
@@ -19,9 +21,6 @@ $ww-logo-background-color: $info;
 // Achievment level bar
 $ww-achievement-level-color: darken($primary, 15%);
 
-// Make accordion buttons darker.
-$accordion-button-active-color: shade-color($primary, 50%);
-
 // Make the navbar colors dark.
 $navbar-dark-color: rgba(#000, 0.55);
 $navbar-dark-hover-color: rgba(#000, 0.75);
diff --git a/htdocs/themes/math4-yellow/_theme-overrides.scss b/htdocs/themes/math4-yellow/_theme-overrides.scss
index 0cf795757f..1046436e60 100644
--- a/htdocs/themes/math4-yellow/_theme-overrides.scss
+++ b/htdocs/themes/math4-yellow/_theme-overrides.scss
@@ -38,10 +38,30 @@
 	color: $link-color !important;
 }
 
-a:not(.btn):focus {
-	outline-color: #{darken($link-hover-color, 1%)};
-}
-
 :root {
 	--ww-site-nav-link-active-background-color: #{$primary};
+	--ww-color-chooser-hover-color: #555;
+	--ww-color-chooser-focus-outline-color-rgb: 0, 0, 0;
+	--ww-course-config-tab-link-focus-outline-color: #{rgba(shade-color($primary, 40%), $focus-ring-opacity)};
+}
+
+@include color-mode(dark) {
+	--ww-site-nav-link-hover-background-color: #{shade-color($primary, 60%)};
+	--ww-course-config-tab-link-focus-outline-color: #{rgba(color-contrast($body-bg-dark), $focus-ring-opacity)};
+
+	.btn-outline-primary {
+		--#{$prefix}btn-color: #{tint_color($primary, 40%)};
+	}
+}
+
+.masthead {
+	.institution-logo {
+		a:not(.btn):focus {
+			outline-color: #{shade-color($link-hover-color-dark, 70%)};
+		}
+	}
+
+	.login-status .btn.btn-light {
+		--bs-btn-focus-shadow-rgb: 100, 100, 100;
+	}
 }
diff --git a/htdocs/themes/math4/README b/htdocs/themes/math4/README
deleted file mode 100644
index 0b92a6b6d6..0000000000
--- a/htdocs/themes/math4/README
+++ /dev/null
@@ -1,18 +0,0 @@
-This folder contains the files necessary for the math4 theme.  These files are
-tracked by git and any changes made to them will be overwritten when you
-upgrade.  The two exceptions are math4-overrides.css and math4-overrides.js.
-
-These files do not need to be present, but if they are they will be included in
-system.conf and can be used for general overrides.  They can created by copying
-math4-overrides.css.dist and math4-overrides.js.dist.  This is similar to how
-localOverrides.conf interacts with defaults.conf and localOverrides.conf.dist.
-In particular if you upgrade your server math4-overrides.js and
-math4-overrides.css  will not change, but their .dist versions and the other
-math4 theme files may change. This might cause problems until you merge the
-changes.
-
-If you want to customize math4 you should only change math4-overrides.css and
-math4-overrides.js.  Note: Because you can include arbitrary JavaScript in
-math4-overrides.js you can actually change pretty much anything, including
-adding new html or changing existing html.
-
diff --git a/htdocs/themes/math4/_theme-colors.scss b/htdocs/themes/math4/_theme-colors.scss
index bd57046fb7..b40d760909 100644
--- a/htdocs/themes/math4/_theme-colors.scss
+++ b/htdocs/themes/math4/_theme-colors.scss
@@ -7,7 +7,7 @@ $info: #1a67ea;
 
 // Link colors
 $link-color: $primary;
-$link-hover-color: $info;
+$link-color-dark: tint-color($primary, 50%);
 
 // Webwork logo background color in the banner
 $ww-logo-background-color: darken($info, 14%);
diff --git a/htdocs/themes/math4/bootstrap.scss b/htdocs/themes/math4/bootstrap.scss
index 72cbc9cbd0..3114fe8445 100644
--- a/htdocs/themes/math4/bootstrap.scss
+++ b/htdocs/themes/math4/bootstrap.scss
@@ -17,10 +17,6 @@ $headings-font-weight: 600;
 $link-decoration: none;
 $link-hover-decoration: underline;
 
-// Make breadcrumb dividers and active items a bit darker.
-$breadcrumb-divider-color: #495057;
-$breadcrumb-active-color: #495057;
-
 @import './theme-colors';
 
 // Include the remainder of bootstrap's scss configuration
@@ -75,14 +71,55 @@ $breadcrumb-active-color: #495057;
 	--ww-primary-foreground-color: #{color-contrast($primary)};
 	--ww-achievement-level-color: #{$ww-achievement-level-color};
 	--ww-site-nav-link-active-background-color: #{$primary};
+	--ww-site-nav-link-hover-background-color: #e1e1e1;
+	--ww-layout-divider-color: #aaa;
+	--ww-layout-border-color: #e6e6e6;
+	--ww-course-config-tab-link-focus-outline-color: #{rgba($primary, $focus-ring-opacity)};
 }
 
 // Overrides
+
 a:not(.btn):focus {
-	color: $link-hover-color;
 	outline-style: solid;
-	outline-color: #{lighten($link-hover-color, 8%)};
 	outline-width: 1px;
+	outline-color: #{$link_hover_color};
+	box-shadow: none;
+}
+
+@include color-mode(dark) {
+	--ww-site-nav-link-hover-background-color: #{shade-color($primary, 40%)};
+	--ww-layout-divider-color: #666;
+	--ww-layout-border-color: #495057;
+	--ww-course-config-tab-link-focus-outline-color: #{rgba(color-contrast($body-bg-dark), $focus-ring-opacity)};
+
+	.bg-light {
+		color: var(--bs-body-color) !important;
+		background-color: var(--bs-primary-bg-subtle) !important;
+	}
+
+	.btn-outline-primary {
+		--#{$prefix}btn-color: #{tint_color($primary, 60%)};
+		--#{$prefix}btn-border-color: #{tint_color($primary, 20%)};
+	}
+
+	.text-danger {
+		color: var(--bs-danger-text-emphasis) !important;
+	}
+
+	.text-success {
+		color: var(--bs-success-text-emphasis) !important;
+	}
+
+	a:not(.btn):focus {
+		outline-color: #{$link_hover_color-dark};
+	}
+}
+
+.masthead {
+	a:not(.btn):focus {
+		outline-color: #{$link_hover_color_dark};
+		outline-width: 2px;
+	}
 }
 
 @import 'theme-overrides';
diff --git a/lib/FormatRenderedProblem.pm b/lib/FormatRenderedProblem.pm
index 1c7f0194f3..029de024af 100644
--- a/lib/FormatRenderedProblem.pm
+++ b/lib/FormatRenderedProblem.pm
@@ -63,7 +63,7 @@ sub formatRenderedProblem {
 
 	# Add CSS files requested by problems via ADD_CSS_FILE() in the PG file
 	# or via a setting of $ce->{pg}{specialPGEnvironmentVars}{extra_css_files}
-	# which can be set in course.conf (the value should be an anonomous array).
+	# which can be set in course.conf (the value should be an anonymous array).
 	my @cssFiles;
 	if (ref($ce->{pg}{specialPGEnvironmentVars}{extra_css_files}) eq 'ARRAY') {
 		push(@cssFiles, { file => $_, external => 0 }) for @{ $ce->{pg}{specialPGEnvironmentVars}{extra_css_files} };
@@ -90,12 +90,12 @@ sub formatRenderedProblem {
 		[ 'node_modules/jquery/dist/jquery.min.js',                            0, {} ],
 		[ 'node_modules/jquery-ui-dist/jquery-ui.min.js',                      0, {} ],
 		[ 'node_modules/iframe-resizer/js/iframeResizer.contentWindow.min.js', 0, {} ],
-		[ 'js/MathJaxConfig/mathjax-config.js',                     0, { defer => undef } ],
-		[ 'node_modules/mathjax/es5/tex-svg.js',                    0, { defer => undef, id => 'MathJax-script' } ],
-		[ 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js', 0, { defer => undef } ],
-		[ 'js/Problem/problem.js',                                  0, { defer => undef } ],
-		[ 'js/System/system.js',                                    0, { defer => undef } ],
-		[ 'math4-overrides.js',                                     1, { defer => undef } ]
+		[ 'js/MathJaxConfig/mathjax-config.js',                                0, { defer => undef } ],
+		[ 'node_modules/mathjax/tex-svg.js',                                   0, { defer => undef } ],
+		[ 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js',            0, { defer => undef } ],
+		[ 'js/Problem/problem.js',                                             0, { defer => undef } ],
+		[ 'js/System/system.js',                                               0, { defer => undef } ],
+		[ 'math4-overrides.js',                                                1, { defer => undef } ]
 	);
 
 	# Get the requested format.
@@ -196,11 +196,12 @@ sub formatRenderedProblem {
 		$output->{input}      = $ws->{input};
 
 		# The following could be constructed from the above, but this is a convenience
-		$output->{resultSummary}   = $resultSummary->to_string if $resultSummary;
-		$output->{lang}            = $PROBLEM_LANG_AND_DIR{lang};
-		$output->{dir}             = $PROBLEM_LANG_AND_DIR{dir};
-		$output->{extra_css_files} = \@extra_css_files;
-		$output->{extra_js_files}  = \@extra_js_files;
+		$output->{resultSummary}     = $resultSummary->to_string if $resultSummary;
+		$output->{lang}              = $PROBLEM_LANG_AND_DIR{lang};
+		$output->{dir}               = $PROBLEM_LANG_AND_DIR{dir};
+		$output->{extra_css_files}   = \@extra_css_files;
+		$output->{extra_js_files}    = \@extra_js_files;
+		$output->{webwork_js_config} = $ws->c->webwork_js_config($ws->{inputs_ref}{showMathJaxErrors} // 0);
 
 		# Include third party css and javascript files.  Only jquery, jquery-ui, mathjax, and bootstrap are needed for
 		# PG.  See the comments before the subroutine definitions for load_css and load_js in pg/macros/PG.pl.
@@ -267,6 +268,7 @@ sub formatRenderedProblem {
 		showCorrectAnswersOnlyButton => $ws->{inputs_ref}{showCorrectAnswersOnlyButton} // 0,
 		showFooter                   => $ws->{inputs_ref}{showFooter}                   // '',
 		problem_data                 => encode_json($rh_result->{PERSISTENCE_HASH}),
+		showMathJaxErrors            => $ws->{inputs_ref}{showMathJaxErrors} // 0,
 		pretty_print                 => \&pretty_print
 	);
 
@@ -368,7 +370,7 @@ EOS
 				$LTIGradeMessage = $ws->c->tag('p', "Unable to update LMS grade. Error: $message")->to_string;
 				push(@{ $rh_result->{debug_messages} }, xml_escape($response->content));
 			} else {
-				$LTIGradeMessage = $ws->c->tag('p', 'Grade sucessfully saved.')->to_string;
+				$LTIGradeMessage = $ws->c->tag('p', 'Grade successfully saved.')->to_string;
 			}
 		} else {
 			$LTIGradeMessage = $ws->c->tag('p', 'Unable to update LMS grade. Error: ' . $response->message)->to_string;
diff --git a/lib/HardcopyRenderedProblem.pm b/lib/HardcopyRenderedProblem.pm
index 8786cd033d..4f1fcb654b 100644
--- a/lib/HardcopyRenderedProblem.pm
+++ b/lib/HardcopyRenderedProblem.pm
@@ -2,7 +2,7 @@
 =head1 NAME
 
 HardcopyRenderedProblem.pm -- Generate a pdf file or zip file containing a tex
-file and the neccessary files to generate the pdf file from the result of the
+file and the necessary files to generate the pdf file from the result of the
 renderProblem method.
 
 =cut
@@ -120,7 +120,7 @@ sub generate_hardcopy_tex {
 			if $@;
 	}
 	my $pgAssetsTex_dir = path($ce->{pg}{directories}{assetsTex});
-	for (qw{pg.sty PGML.tex CAPA.tex}) {
+	for (qw{pg.sty PGML.tex}) {
 		eval { $pgAssetsTex_dir->child($_)->copy_to($working_dir) };
 		push(@$errors, qq{Failed to copy "$ce->{pg}{directories}{assetsTex}/$_" into directory "$working_dir": $@})
 			if $@;
diff --git a/lib/Mojolicious/WeBWorK.pm b/lib/Mojolicious/WeBWorK.pm
index c9315547c4..9310cb3f28 100644
--- a/lib/Mojolicious/WeBWorK.pm
+++ b/lib/Mojolicious/WeBWorK.pm
@@ -100,13 +100,24 @@ sub startup ($app) {
 	);
 
 	# Add a hook to add extra headers if set in the config file.
-	if (ref $config->{extra_headers} eq 'HASH') {
+	if (ref $config->{extra_headers} eq 'HASH' || ref $config->{extra_ssl_headers} eq 'HASH') {
+		my $extraHeaders    = ref $config->{extra_headers} eq 'HASH'     ? $config->{extra_headers}     : {};
+		my $extraSSLHeaders = ref $config->{extra_ssl_headers} eq 'HASH' ? $config->{extra_ssl_headers} : {};
 		$app->hook(
 			before_dispatch => sub ($c) {
-				for my $path (keys %{ $config->{extra_headers} }) {
+				for my $path (keys %$extraHeaders) {
 					if ($c->req->url->path =~ /^$path/) {
-						for (keys %{ $config->{extra_headers}{$path} }) {
-							$c->res->headers->header($_ => $config->{extra_headers}{$path}{$_});
+						for (keys %{ $extraHeaders->{$path} }) {
+							$c->res->headers->header($_ => $extraHeaders->{$path}{$_});
+						}
+					}
+				}
+				if ($c->req->is_secure) {
+					for my $path (keys %$extraSSLHeaders) {
+						if ($c->req->url->path =~ /^$path/) {
+							for (keys %{ $extraSSLHeaders->{$path} }) {
+								$c->res->headers->header($_ => $extraSSLHeaders->{$path}{$_});
+							}
 						}
 					}
 				}
@@ -251,7 +262,8 @@ sub startup ($app) {
 	$cg_r->get('/')->to('Home#go')->name('root');
 
 	# The course admin route is set up here because of its special stash value.
-	$cg_r->any("/$ce->{admin_course_id}")->to('CourseAdmin#go', courseID => $ce->{admin_course_id})
+	$cg_r->any("/$ce->{admin_course_id}")
+		->to('CourseAdmin#go', courseID => $ce->{admin_course_id})
 		->name('course_admin');
 
 	setup_content_generator_routes($cg_r);
diff --git a/lib/Mojolicious/WeBWorK/Tasks/AchievementNotification.pm b/lib/Mojolicious/WeBWorK/Tasks/AchievementNotification.pm
index 00640afa51..c2d45f6618 100644
--- a/lib/Mojolicious/WeBWorK/Tasks/AchievementNotification.pm
+++ b/lib/Mojolicious/WeBWorK/Tasks/AchievementNotification.pm
@@ -85,7 +85,10 @@ sub send_achievement_notification ($job, $ce, $db, $mail_data) {
 	die $@ if $@;
 
 	my $email =
-		Email::Stuffer->to($user_record->email_address)->from($from)->subject($mail_data->{subject})->text_body($body)
+		Email::Stuffer->to($user_record->email_address)
+		->from($from)
+		->subject($mail_data->{subject})
+		->text_body($body)
 		->header('X-Remote-Host' => $mail_data->{remote_host});
 
 	$email->send_or_die({
diff --git a/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm b/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm
index 388d2338ff..2e3be2d303 100644
--- a/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm
+++ b/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm
@@ -64,7 +64,10 @@ sub mail_message_to_recipients ($job, $ce, $db, $mail_data) {
 			$mail_data->{merge_data}
 		);
 
-		my $email = Email::Stuffer->to($user_record->email_address)->subject($mail_data->{subject})->text_body($msg)
+		my $email =
+			Email::Stuffer->to($user_record->email_address)
+			->subject($mail_data->{subject})
+			->text_body($msg)
 			->header('X-Remote-Host' => $mail_data->{remote_host});
 		if ($ce->{instructor_sender_email}) {
 			$email->from($mail_data->{from_name} . ' <' . $ce->{instructor_sender_email} . '>')
diff --git a/lib/WeBWorK.pm b/lib/WeBWorK.pm
index a80dd817ce..85333bd79f 100644
--- a/lib/WeBWorK.pm
+++ b/lib/WeBWorK.pm
@@ -140,10 +140,11 @@ async sub dispatch ($c) {
 		# This route could have the courseID set, but does not need authentication.
 		return 1 if $c->current_route eq 'saml2_metadata';
 
-		return (0, 'This course does not exist.')
+		return (0, "The course $routeCaptures{courseID} does not exist.")
 			unless (-e $ce->{courseDirs}{root}
 				|| -e "$ce->{webwork_courses_dir}/$ce->{admin_course_id}/archives/$routeCaptures{courseID}.tar.gz");
-		return (0, 'This course has been archived and closed.') unless -e $ce->{courseDirs}{root};
+		return (0, "The course $routeCaptures{courseID} has been archived and closed.")
+			unless -e $ce->{courseDirs}{root};
 
 		my $db = WeBWorK::DB->new($ce);
 		debug("(here's the DB handle: $db)\n");
diff --git a/lib/WeBWorK/AchievementEvaluator.pm b/lib/WeBWorK/AchievementEvaluator.pm
index 249d34ea22..bf4d0cf9de 100644
--- a/lib/WeBWorK/AchievementEvaluator.pm
+++ b/lib/WeBWorK/AchievementEvaluator.pm
@@ -16,24 +16,24 @@ use WeBWorK::WWSafe;
 
 our @EXPORT_OK = qw(checkForAchievements);
 
-sub checkForAchievements ($problem_in, $pg, $c, %options) {
+sub checkForAchievements ($problem_in, $c, %options) {
 	my $db = $c->db;
 	my $ce = $c->ce;
 
 	# Make a copy of the problem so that local modifications do not persist.
 	our $problem = $db->newUserProblem($problem_in);
 
-	# Date and time for course timezone (may differ from the server timezone)
-	# Saved into separate array
+	# Date and time for course timezone (may differ from the server timezone).
+	# Saved into separate array:
 	# https://metacpan.org/pod/DateTime
 	my $dtCourseTime = DateTime->from_epoch(epoch => time(), time_zone => $ce->{siteDefaults}{timezone} || 'local');
 
-	# Set up variables and get achievements
+	# Set up variables and get achievements.
 	my $cheevoMessage = $c->c;
 	my $user_id       = $problem->user_id;
 	my $set_id        = $problem->set_id;
 
-	# exit early if the set is to be ignored by achievements
+	# Exit early if the set is to be ignored by achievements.
 	foreach my $excludedSet (@{ $ce->{achievementExcludeSet} }) {
 		return '' if $set_id eq $excludedSet;
 	}
@@ -45,12 +45,12 @@ sub checkForAchievements ($problem_in, $pg, $c, %options) {
 	my $isGatewaySet = ($set->assignment_type =~ /gateway/) ? 1 : 0;
 	my $isJitarSet   = ($set->assignment_type eq 'jitar')   ? 1 : 0;
 
-	# If its a gateway set get the current version
+	# If its a gateway set get the current version.
 	if ($isGatewaySet) {
 		$set = $db->getSetVersion($user_id, $set_id, $options{setVersion});
 	}
 
-	# If no global data then initialize
+	# If no global data then initialize.
 	if (not $globalUserAchievement) {
 		$globalUserAchievement = $db->newGlobalUserAchievement();
 		$globalUserAchievement->user_id($user_id);
@@ -58,7 +58,7 @@ sub checkForAchievements ($problem_in, $pg, $c, %options) {
 		$db->addGlobalUserAchievement($globalUserAchievement);
 	}
 
-	#These need to be "our" so that they can share to the safe container
+	# These need to be "our" so that they can share to the safe container.
 	our $counter;
 	our $maxCounter;
 	our $achievementPoints = $globalUserAchievement->achievement_points;
@@ -75,21 +75,21 @@ sub checkForAchievements ($problem_in, $pg, $c, %options) {
 
 	my $compartment = WeBWorK::WWSafe->new;
 
-	#initialize things that are ""
+	# Initialize things that are "".
 	if (not $achievementPoints) {
 		$achievementPoints = 0;
 		$globalUserAchievement->achievement_points(0);
 	}
 
-	#Methods alowed in the safe container
+	# Methods allowed in the safe container.
 	$compartment->permit(qw(time localtime));
 
-	#Thaw_Base64 globalData hash
+	# Thaw_Base64 globalData hash.
 	if ($globalUserAchievement->frozen_hash) {
 		$globalData = thaw_base64($globalUserAchievement->frozen_hash);
 	}
 
-	#Generate hash of user achievements:
+	# Generate hash of user achievements:
 	foreach my $achievement (@achievements) {
 		next unless $achievement->enabled;
 		my $userAchievement = $db->getUserAchievement($user_id, $achievement->achievement_id);
@@ -132,10 +132,15 @@ sub checkForAchievements ($problem_in, $pg, $c, %options) {
 		}
 	}
 
-	$globalData->{completeSets}++ if ($allcorrect);
+	# Store the setID of all completed sets so they can be used in achievements and not double counted.
+	$globalData->{completedSetIds} //= {};
+	if ($allcorrect) {
+		++$globalData->{completeSets} unless $globalData->{completedSetIds}{$set_id};
+		$globalData->{completedSetIds}{$set_id} = 1;
+	}
 
-	# get the problem tags if its not a gatway
-	# if it is a gateway get rid of $problem since it doensn't make sense
+	# Get the problem tags if its not a gateway.
+	# If it is a gateway get rid of $problem since it doesn't make sense.
 	if ($isGatewaySet) {
 		$problem = undef;
 	} else {
@@ -143,8 +148,8 @@ sub checkForAchievements ($problem_in, $pg, $c, %options) {
 		$tags = WeBWorK::Utils::Tags->new($templateDir . '/' . $problem->source_file());
 	}
 
-	#These variables are shared with the safe compartment.  The achievement evaulators
-	# have access too
+	# These variables are shared with the safe compartment.
+	# The achievement evaluators have access too:
 	# $problem - the problem data;
 	# @setProblems - the problem data for everything from this set;
 	# $localData - the hash that is used only for this achievement
@@ -161,7 +166,7 @@ sub checkForAchievements ($problem_in, $pg, $c, %options) {
 	$compartment->share(qw( $problem @setProblems $localData $maxCounter $userAchievements
 		$globalData $counter $nextLevelPoints $set $achievementPoints $tags @courseDateTime));
 
-	#load any preamble code
+	# Load any preamble code.
 	my $preamble = '';
 	my $source;
 	if (-e "$ce->{courseDirs}{achievements}/$ce->{achievementPreambleFile}") {
@@ -170,27 +175,27 @@ sub checkForAchievements ($problem_in, $pg, $c, %options) {
 		$preamble = <$PREAMB>;
 		close($PREAMB);
 	}
-	#loop through the various achievements, see if they have been obtained,
+	# Loop through the various achievements, see if they have been obtained.
 	foreach my $achievement (@achievements) {
-		#skip achievements not assigned, not enabled, and that are already earned, or if it doesn't match the set type
+		# Skip achievements not assigned, not enabled, and that are already earned, or if it doesn't match the set type.
 		next unless $achievement->enabled;
 		my $achievement_id = $achievement->achievement_id;
-		next unless ($db->existsUserAchievement($user_id, $achievement_id));
+		next unless $db->existsUserAchievement($user_id, $achievement_id);
 		my $userAchievement = $db->getUserAchievement($user_id, $achievement_id);
-		next if ($userAchievement->earned);
+		next if $userAchievement->earned;
 		my $setType = $set->assignment_type;
 		next unless $achievement->assignment_type =~ /$setType/;
 
-		#thaw_base64 localData hash
+		# Thaw_base64 localData hash.
 		if ($userAchievement->frozen_hash) {
 			$localData = thaw_base64($userAchievement->frozen_hash);
 		}
 
-		#recover counter information (for progress bar achievements)
+		# Recover counter information (for progress bar achievements).
 		$counter    = $userAchievement->counter;
 		$maxCounter = $achievement->max_counter;
 
-		#check the achievement using Safe
+		# Check the achievement using Safe.
 		my $sourceFilePath = $ce->{courseDirs}{achievements} . '/' . $achievement->test;
 		if (-e $sourceFilePath) {
 			local $/ = undef;
@@ -205,11 +210,11 @@ sub checkForAchievements ($problem_in, $pg, $c, %options) {
 		my $earned = $compartment->reval($preamble . "\n" . $source);
 		warn "There were errors in achievement $achievement_id\n" . $@ if $@;
 
-		#if we have a new achievement then update achievement points
+		# If we have a new achievement then update achievement points.
 		if ($earned) {
 			$userAchievement->earned(1);
 
-			# update userAchievements hash with earned status.
+			# Update userAchievements hash with earned status.
 			$userAchievements->{$achievement_id} = $earned;
 
 			if ($achievement->category eq 'level') {
@@ -223,14 +228,14 @@ sub checkForAchievements ($problem_in, $pg, $c, %options) {
 			push(@$cheevoMessage, $c->include('AchievementEvaluator/cheevoMessage', achievement => $achievement));
 
 			my $points = $achievement->points;
-			#just in case points is an uninitialized variable
+			# Just in case points is an uninitialized variable.
 			$points = 0 unless $points;
 
 			$globalUserAchievement->achievement_points($globalUserAchievement->achievement_points + $points);
-			#this variable is shared and should be considered iffy
+			# This variable is shared and should be considered iffy.
 			$achievementPoints += $points;
 
-			# if email_template is defined, send an email to the user
+			# If email_template is defined, send an email to the user.
 			$c->minion->enqueue(
 				send_achievement_email => [ {
 					recipient       => $user_id,
@@ -245,14 +250,14 @@ sub checkForAchievements ($problem_in, $pg, $c, %options) {
 			) if ($ce->{mail}{achievementEmailFrom} && $achievement->email_template);
 		}
 
-		#update counter, nfreeze_base64 localData and store
+		# Update counter, nfreeze_base64 localData and store.
 		$userAchievement->counter($counter);
 		$userAchievement->frozen_hash(nfreeze_base64($localData));
 		$db->putUserAchievement($userAchievement);
 
-	}    #end for loop
+	}    # End for loop.
 
-	#nfreeze_base64 globalData and store
+	# nfreeze_base64 globalData and store.
 	$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
 	$db->putGlobalUserAchievement($globalUserAchievement);
 
diff --git a/lib/WeBWorK/AchievementItems.pm b/lib/WeBWorK/AchievementItems.pm
index f54d407e67..b2f1443918 100644
--- a/lib/WeBWorK/AchievementItems.pm
+++ b/lib/WeBWorK/AchievementItems.pm
@@ -59,9 +59,6 @@ sub UserItems ($c, $userName, $set, $records) {
 	# Return unless achievement items are enabled.
 	return unless $ce->{achievementsEnabled} && $ce->{achievementItemsEnabled};
 
-	# When acting as another user, achievement items can be listed but not used.
-	return if $set && $userName ne $c->param('user');
-
 	# Return unless the user has global achievement data.
 	my $globalUserAchievement = $c->{globalData} // $db->getGlobalUserAchievement($userName);
 	return unless $globalUserAchievement && $globalUserAchievement->frozen_hash;
@@ -70,9 +67,12 @@ sub UserItems ($c, $userName, $set, $records) {
 	my $use_item_id = $c->param('use_achievement_item_id') // '';
 	my @items;
 
+	# When acting as another user, achievement items can be listed but not used.
+	$use_item_id = '' if $userName ne $c->param('user');
+
 	for my $item (@{ +ITEMS }) {
 		next unless $globalData->{$item};
-		my $achievementItem = "WeBWorK::AchievementItems::$item"->new;
+		my $achievementItem = "WeBWorK::AchievementItems::$item"->new($c);
 		$achievementItem->{count} = $globalData->{$item};
 
 		# Return list of achievements items if $set is not defined.
@@ -80,7 +80,7 @@ sub UserItems ($c, $userName, $set, $records) {
 			push(@items, $achievementItem);
 			next;
 		}
-		next unless $achievementItem->can_use($set, $records);
+		next unless $achievementItem->can_use($set, $records, $c);
 
 		# Use the achievement item.
 		if ($use_item_id eq $item) {
@@ -90,7 +90,7 @@ sub UserItems ($c, $userName, $set, $records) {
 				$achievementItem->{count}--;
 				$globalUserAchievement->frozen_hash(nfreeze_base64($globalData));
 				$db->putGlobalUserAchievement($globalUserAchievement);
-				$c->addgoodmessage($c->maketext('[_1] successfuly used. [_2]', $achievementItem->name, $message));
+				$c->addgoodmessage($c->maketext('[_1] successfully used. [_2]', $achievementItem->name, $message));
 			}
 		}
 
@@ -104,7 +104,7 @@ sub UserItems ($c, $userName, $set, $records) {
 		my @new_items;
 		for (@items) {
 			my $item = $_->[0];
-			next unless $item->{count} && $item->can_use($set, $records);
+			next unless $item->{count} && $item->can_use($set, $records, $c);
 			push(@new_items, [ $item, $item->print_form($set, $records, $c) ]);
 		}
 		return \@new_items;
diff --git a/lib/WeBWorK/AchievementItems/AddNewTestGW.pm b/lib/WeBWorK/AchievementItems/AddNewTestGW.pm
index 9eadafbe69..308e20a4df 100644
--- a/lib/WeBWorK/AchievementItems/AddNewTestGW.pm
+++ b/lib/WeBWorK/AchievementItems/AddNewTestGW.pm
@@ -6,18 +6,20 @@ use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 use WeBWorK::Utils           qw(x);
 use WeBWorK::Utils::DateTime qw(between);
 
-sub new ($class) {
+sub new ($class, $c) {
 	return bless {
 		id          => 'AddNewTestGW',
 		name        => x('Oil of Cleansing'),
-		description => x(
-			'Unlock an additional version of a test.  If used before the close date of '
-				. 'the test this will allow you to generate a new version of the test.'
-		)
+		description => [
+			x(
+				'Unlock an additional version of a test.  If used before the close date of '
+					. 'the test this will allow you to generate a new version of the test.'
+			)
+		]
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return
 		$set->assignment_type =~ /gateway/
 		&& $set->set_id !~ /,v\d+$/
diff --git a/lib/WeBWorK/AchievementItems/DoubleProb.pm b/lib/WeBWorK/AchievementItems/DoubleProb.pm
index 15ca7dc072..dc44112312 100644
--- a/lib/WeBWorK/AchievementItems/DoubleProb.pm
+++ b/lib/WeBWorK/AchievementItems/DoubleProb.pm
@@ -6,15 +6,15 @@ use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 use WeBWorK::Utils           qw(x);
 use WeBWorK::Utils::DateTime qw(after);
 
-sub new ($class) {
+sub new ($class, $c) {
 	return bless {
 		id          => 'DoubleProb',
 		name        => x('Cupcake of Enlargement'),
-		description => x('Causes a single homework problem to be worth twice as much.')
+		description => [ x('Causes a single homework problem to be worth twice as much.') ]
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return $set->assignment_type eq 'default' && after($set->open_date);
 }
 
diff --git a/lib/WeBWorK/AchievementItems/DoubleSet.pm b/lib/WeBWorK/AchievementItems/DoubleSet.pm
index b91629f717..ace5324250 100644
--- a/lib/WeBWorK/AchievementItems/DoubleSet.pm
+++ b/lib/WeBWorK/AchievementItems/DoubleSet.pm
@@ -6,15 +6,16 @@ use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 use WeBWorK::Utils           qw(x);
 use WeBWorK::Utils::DateTime qw(after);
 
-sub new ($class) {
+sub new ($class, $c) {
 	return bless {
 		id          => 'DoubleSet',
 		name        => x('Cake of Enlargement'),
-		description => x('Cause the selected homework set to count for twice as many points as it normally would.')
+		description =>
+			[ x('Cause the selected homework set to count for twice as many points as it normally would.') ]
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return $set->assignment_type eq 'default' && after($set->open_date);
 }
 
diff --git a/lib/WeBWorK/AchievementItems/DuplicateProb.pm b/lib/WeBWorK/AchievementItems/DuplicateProb.pm
index 20c90d726d..1147e3406c 100644
--- a/lib/WeBWorK/AchievementItems/DuplicateProb.pm
+++ b/lib/WeBWorK/AchievementItems/DuplicateProb.pm
@@ -6,15 +6,15 @@ use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 use WeBWorK::Utils           qw(x);
 use WeBWorK::Utils::DateTime qw(between);
 
-sub new ($class) {
+sub new ($class, $c) {
 	return bless {
 		id          => 'DuplicateProb',
 		name        => x('Box of Transmogrification'),
-		description => x('Causes a homework problem to become a clone of another problem from the same set.')
+		description => [ x('Causes a homework problem to become a clone of another problem from the same set.') ]
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return $set->assignment_type eq 'default' && between($set->open_date, $set->due_date);
 }
 
diff --git a/lib/WeBWorK/AchievementItems/ExtendDueDate.pm b/lib/WeBWorK/AchievementItems/ExtendDueDate.pm
index 2391ab916d..02c1424bfb 100644
--- a/lib/WeBWorK/AchievementItems/ExtendDueDate.pm
+++ b/lib/WeBWorK/AchievementItems/ExtendDueDate.pm
@@ -1,38 +1,101 @@
 package WeBWorK::AchievementItems::ExtendDueDate;
 use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 
-# Item to extend a close date by 24 hours.
+# Item to extend a close date by 24 * $achievementExtensionFactor hours.
 
 use WeBWorK::Utils           qw(x);
-use WeBWorK::Utils::DateTime qw(after between);
+use WeBWorK::Utils::DateTime qw(before after between getExtensionTime);
 
-use constant ONE_DAY => 86400;
+sub new ($class, $c) {
+	my ($time, $timeText) = getExtensionTime($c, 1);
 
-sub new ($class) {
 	return bless {
 		id          => 'ExtendDueDate',
 		name        => x('Tunic of Extension'),
-		description => x(
-			'Adds 24 hours to the close date of a homework. '
-				. 'This will randomize problem details if used after the original close date.'
-		)
+		description => [
+			x(
+				'Adds [_1] to the close date of a homework. '
+					. 'This will randomize problem details if used after the original close date.',
+				$timeText
+			)
+		],
+		time     => $time,
+		timeText => $timeText
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
-	return $set->assignment_type eq 'default' && between($set->open_date, $set->due_date + ONE_DAY);
+sub can_use ($self, $set, $records, $c) {
+	return $set->assignment_type eq 'default' && between($set->open_date, $set->due_date + $self->{time});
 }
 
 sub print_form ($self, $set, $records, $c) {
 	my $randomization_statement = after($set->due_date) ? $c->maketext('All problems will be rerandomized.') : '';
-	return $c->tag(
-		'p',
-		$c->maketext(
-			'Extend the close date of this assignment to [_1] (an additional 24 hours). [_2]',
-			$c->formatDateTime($set->due_date + ONE_DAY, $c->ce->{studentDateDisplayFormat}),
-			$randomization_statement
-		)
-	);
+	if ($set->enable_reduced_scoring) {
+		if (before($set->reduced_scoring_date + $self->{time})) {
+			return $c->c(
+				$c->tag(
+					'p',
+					$c->maketext('Extend the deadline by [_1]. [_2]', $self->{timeText}, $randomization_statement)
+				),
+				$c->tag(
+					'ul',
+					$c->c(
+						$c->tag(
+							'li',
+							$c->maketext(
+								'You will be able to receive full credit until [_1].',
+								$c->formatDateTime(
+									$set->reduced_scoring_date + $self->{time},
+									$c->ce->{studentDateDisplayFormat}
+								)
+							)
+						),
+						$c->tag(
+							'li',
+							$c->maketext(
+								'You will be able to receive reduced credit until [_1].',
+								$c->formatDateTime(
+									$set->due_date + $self->{time},
+									$c->ce->{studentDateDisplayFormat}
+								)
+							)
+						)
+					)->join('')
+				),
+			)->join('');
+		} else {
+			return $c->c(
+				$c->tag(
+					'p',
+					$c->maketext(
+						'Extend the reduced credit deadline of this assignment to [_1] (an additional [_2]). [_3]',
+						$c->formatDateTime($set->due_date + $self->{time}, $c->ce->{studentDateDisplayFormat}),
+						$self->{timeText},
+						$randomization_statement
+					)
+				),
+				$c->tag(
+					'p',
+					$c->maketext(
+						'Because the deadline has already passed you will only '
+							. 'receive reduced credit during this extension.'
+					)
+				)
+			)->join('');
+		}
+
+	} else {
+		return $c->tag(
+			'p',
+			$c->maketext(
+				'Extend the close date of this assignment to [_1] (an additional [_2]). [_3]',
+				$c->formatDateTime($set->due_date + $self->{time}, $c->ce->{studentDateDisplayFormat}),
+				$self->{timeText},
+				$randomization_statement
+			)
+		);
+	}
+
 }
 
 sub use_item ($self, $set, $records, $c) {
@@ -54,11 +117,11 @@ sub use_item ($self, $set, $records, $c) {
 
 	# Add time to the reduced scoring date if it was defined in the first place
 	if ($set->reduced_scoring_date) {
-		$set->reduced_scoring_date($set->reduced_scoring_date + ONE_DAY);
+		$set->reduced_scoring_date($set->reduced_scoring_date + $self->{time});
 		$userSet->reduced_scoring_date($set->reduced_scoring_date);
 	}
 	# Add time to the close date
-	$set->due_date($set->due_date + ONE_DAY);
+	$set->due_date($set->due_date + $self->{time});
 	$userSet->due_date($set->due_date);
 	# This may require also extending the answer date.
 	if ($set->due_date > $set->answer_date) {
@@ -67,10 +130,8 @@ sub use_item ($self, $set, $records, $c) {
 	}
 	$db->putUserSet($userSet);
 
-	return $c->maketext(
-		'Close date of this assignment extended by 24 hours to [_1].',
-		$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
-	);
+	return $c->maketext('Close date of this assignment extended by [_1] to [_2].',
+		$self->{timeText}, $c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat}));
 }
 
 1;
diff --git a/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm b/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm
index 6900d1f828..a098abced8 100644
--- a/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm
+++ b/lib/WeBWorK/AchievementItems/ExtendDueDateGW.pm
@@ -4,34 +4,88 @@ use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 # Item to extend the close date on a test
 
 use WeBWorK::Utils           qw(x);
-use WeBWorK::Utils::DateTime qw(between);
+use WeBWorK::Utils::DateTime qw(before between getExtensionTime);
 
-use constant ONE_DAY => 86400;
+sub new ($class, $c) {
+	my ($time, $timeText) = getExtensionTime($c, 1);
 
-sub new ($class) {
 	return bless {
 		id          => 'ExtendDueDateGW',
 		name        => x('Amulet of Extension'),
-		description =>
-			x('Extends the close date of a test by 24 hours. Note: The test must still be open for this to work.')
+		description => [ x('Extends the close date of a test by [_1].', $timeText) ],
+		time        => $time,
+		timeText    => $timeText,
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return
 		$set->assignment_type =~ /gateway/
 		&& $set->set_id !~ /,v\d+$/
-		&& between($set->open_date, $set->due_date + ONE_DAY);
+		&& between($set->open_date, $set->due_date + $self->{time});
 }
 
 sub print_form ($self, $set, $records, $c) {
-	return $c->tag(
-		'p',
-		$c->maketext(
-			'Extend the close date of this test to [_1] (an additional 24 hours).',
-			$c->formatDateTime($set->due_date + ONE_DAY, $c->ce->{studentDateDisplayFormat})
-		)
-	);
+	if ($set->enable_reduced_scoring) {
+		if (before($set->reduced_scoring_date + $self->{time})) {
+			return $c->c(
+				$c->tag('p', $c->maketext('Extend the deadline by [_1].', $self->{timeText})),
+				$c->tag(
+					'ul',
+					$c->c(
+						$c->tag(
+							'li',
+							$c->maketext(
+								'You will be able to receive full credit until [_1].',
+								$c->formatDateTime(
+									$set->reduced_scoring_date + $self->{time},
+									$c->ce->{studentDateDisplayFormat}
+								)
+							)
+						),
+						$c->tag(
+							'li',
+							$c->maketext(
+								'You will be able to receive reduced credit until [_1].',
+								$c->formatDateTime(
+									$set->due_date + $self->{time},
+									$c->ce->{studentDateDisplayFormat}
+								)
+							)
+						)
+					)->join('')
+				),
+			)->join('');
+		} else {
+			return $c->c(
+				$c->tag(
+					'p',
+					$c->maketext(
+						'Extend the reduced credit deadline of this assignment to [_1] (an additional [_2]).',
+						$c->formatDateTime($set->due_date + $self->{time}, $c->ce->{studentDateDisplayFormat}),
+						$self->{timeText}
+					)
+				),
+				$c->tag(
+					'p',
+					$c->maketext(
+						'Because the deadline has already passed you will only '
+							. 'receive reduced credit during this extension.'
+					)
+				)
+			)->join('');
+		}
+
+	} else {
+		return $c->tag(
+			'p',
+			$c->maketext(
+				'Extend the close date of this assignment to [_1] (an additional [_2]).',
+				$c->formatDateTime($set->due_date + $self->{time}, $c->ce->{studentDateDisplayFormat}),
+				$self->{timeText}
+			)
+		);
+	}
 }
 
 sub use_item ($self, $set, $records, $c) {
@@ -40,12 +94,12 @@ sub use_item ($self, $set, $records, $c) {
 
 	# Add time to the reduced scoring date, due date, and answer date.
 	if ($set->reduced_scoring_date) {
-		$set->reduced_scoring_date($set->reduced_scoring_date + ONE_DAY);
+		$set->reduced_scoring_date($set->reduced_scoring_date + $self->{time});
 		$userSet->reduced_scoring_date($set->reduced_scoring_date);
 	}
-	$set->due_date($set->due_date + ONE_DAY);
+	$set->due_date($set->due_date + $self->{time});
 	$userSet->due_date($set->due_date);
-	$set->answer_date($set->answer_date + ONE_DAY);
+	$set->answer_date($set->answer_date + $self->{time});
 	$userSet->answer_date($set->answer_date);
 	$db->putUserSet($userSet);
 
@@ -55,15 +109,15 @@ sub use_item ($self, $set, $records, $c) {
 	#my @versions = $db->listSetVersions($userName, $setID);
 	#for my $version (@versions) {
 	#	$set = $db->getSetVersion($userName, $setID, $version);
-	#	$set->reduced_scoring_date($set->reduced_scoring_date() + ONE_DAY)
+	#	$set->reduced_scoring_date($set->reduced_scoring_date() + $self->{time})
 	#		if defined($set->reduced_scoring_date()) && $set->reduced_scoring_date();
-	#	$set->due_date($set->due_date() + ONE_DAY);
-	#	$set->answer_date($set->answer_date() + ONE_DAY);
+	#	$set->due_date($set->due_date() + $self->{time});
+	#	$set->answer_date($set->answer_date() + $self->{time});
 	#	$db->putSetVersion($set);
 	#}
 
-	return $c->maketext('Close date of this test extended by 24 hours to [_1].',
-		$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat}));
+	return $c->maketext('Close date of this test extended by [_1] to [_2].',
+		$self->{timeText}, $c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat}));
 }
 
 1;
diff --git a/lib/WeBWorK/AchievementItems/ExtendReducedDate.pm b/lib/WeBWorK/AchievementItems/ExtendReducedDate.pm
index f6e24bb3b3..25703d5ffc 100644
--- a/lib/WeBWorK/AchievementItems/ExtendReducedDate.pm
+++ b/lib/WeBWorK/AchievementItems/ExtendReducedDate.pm
@@ -1,33 +1,39 @@
 package WeBWorK::AchievementItems::ExtendReducedDate;
 use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 
-# Item to extend a close date by 24 hours.
+# Item to extend a close date by 24 * $achievementExtensionFactor hours.
 
 use WeBWorK::Utils           qw(x);
-use WeBWorK::Utils::DateTime qw(between);
+use WeBWorK::Utils::DateTime qw(between getExtensionTime);
 
-use constant ONE_DAY => 86400;
+sub new ($class, $c) {
+	my ($time, $timeText) = getExtensionTime($c, 1);
 
-sub new ($class) {
 	return bless {
 		id          => 'ExtendReducedDate',
 		name        => x('Scroll of Extension'),
-		description => x(
-			'Adds 24 hours to the reduced scoring date of an assignment.  You will have to resubmit '
-				. 'any problems that have already been penalized to earn full credit.  You cannot '
-				. 'extend the reduced scoring date beyond the due date of an assignment.'
-		)
+		description => [
+			x(
+				'Adds [_1] to the reduced scoring date of an assignment.  You will have to resubmit '
+					. 'any problems that have already been penalized to earn full credit.  You cannot '
+					. 'extend the reduced scoring date beyond the due date of an assignment.',
+				$timeText
+			)
+		],
+		time     => $time,
+		timeText => $timeText
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return 0
 		unless $set->assignment_type eq 'default'
+		&& $c->ce->{pg}{ansEvalDefaults}{enableReducedScoring}
 		&& $set->enable_reduced_scoring
 		&& $set->reduced_scoring_date
 		&& $set->reduced_scoring_date < $set->due_date;
 
-	$self->{new_date} = $set->reduced_scoring_date + ONE_DAY;
+	$self->{new_date} = $set->reduced_scoring_date + $self->{time};
 	$self->{new_date} = $set->due_date if $set->due_date < $self->{new_date};
 	return between($set->open_date, $self->{new_date});
 }
@@ -37,15 +43,16 @@ sub print_form ($self, $set, $records, $c) {
 		'p',
 		$c->maketext(
 			q{This item won't work unless your instructor enables the reduced scoring feature.  }
-				. 'Let your instructor know that you recieved this message.'
+				. 'Let your instructor know that you received this message.'
 		)
 	) unless $c->{ce}->{pg}{ansEvalDefaults}{enableReducedScoring};
 
 	return $c->tag(
 		'p',
 		$c->maketext(
-			'Extend the reduced scoring date to [_1] (an additional 24 hours).',
-			$c->formatDateTime($self->{new_date}, $c->ce->{studentDateDisplayFormat})
+			'Extend the reduced scoring date to [_1] (an additional [_2]).',
+			$c->formatDateTime($self->{new_date}, $c->ce->{studentDateDisplayFormat}),
+			$self->{timeText}
 		)
 	);
 }
@@ -60,10 +67,8 @@ sub use_item ($self, $set, $records, $c) {
 	$userSet->reduced_scoring_date($set->reduced_scoring_date);
 	$db->putUserSet($userSet);
 
-	return $c->maketext(
-		'Reduced scoring date of this assignment extended by 24 hours to [_1].',
-		$c->formatDateTime($self->{new_date}, $c->ce->{studentDateDisplayFormat})
-	);
+	return $c->maketext('Reduced scoring date of this assignment extended by [_1] to [_2].',
+		$self->{timeText}, $c->formatDateTime($self->{new_date}, $c->ce->{studentDateDisplayFormat}));
 }
 
 1;
diff --git a/lib/WeBWorK/AchievementItems/FullCreditProb.pm b/lib/WeBWorK/AchievementItems/FullCreditProb.pm
index 50e15639b5..fa1d26f22b 100644
--- a/lib/WeBWorK/AchievementItems/FullCreditProb.pm
+++ b/lib/WeBWorK/AchievementItems/FullCreditProb.pm
@@ -6,15 +6,15 @@ use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 use WeBWorK::Utils           qw(x wwRound);
 use WeBWorK::Utils::DateTime qw(after);
 
-sub new ($class) {
+sub new ($class, $c) {
 	return bless {
 		id          => 'FullCreditProb',
 		name        => x('Greater Rod of Revelation'),
-		description => x('Gives full credit on a single homework problem.')
+		description => [ x('Gives full credit on a single homework problem.') ]
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return 0
 		unless $set->assignment_type eq 'default'
 		&& after($set->open_date);
diff --git a/lib/WeBWorK/AchievementItems/FullCreditSet.pm b/lib/WeBWorK/AchievementItems/FullCreditSet.pm
index 6c9065fa48..ec3f5bd223 100644
--- a/lib/WeBWorK/AchievementItems/FullCreditSet.pm
+++ b/lib/WeBWorK/AchievementItems/FullCreditSet.pm
@@ -6,15 +6,15 @@ use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 use WeBWorK::Utils           qw(x wwRound);
 use WeBWorK::Utils::DateTime qw(after);
 
-sub new ($class) {
+sub new ($class, $c) {
 	return bless {
 		id          => 'FullCreditSet',
 		name        => x('Greater Tome of Enlightenment'),
-		description => x('Gives full credit on every problem in a set.')
+		description => [ x('Gives full credit on every problem in a set.') ]
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return 0
 		unless $set->assignment_type eq 'default'
 		&& after($set->open_date);
@@ -25,6 +25,8 @@ sub can_use ($self, $set, $records) {
 		$grade += $problem->status * $problem->value;
 		$total += $problem->value;
 	}
+	return 0 unless $total;
+
 	$self->{old_grade} = 100 * wwRound(2, $grade / $total);
 	return $self->{old_grade} == 100 ? 0 : 1;
 }
diff --git a/lib/WeBWorK/AchievementItems/HalfCreditProb.pm b/lib/WeBWorK/AchievementItems/HalfCreditProb.pm
index 307e3d32af..817184c59c 100644
--- a/lib/WeBWorK/AchievementItems/HalfCreditProb.pm
+++ b/lib/WeBWorK/AchievementItems/HalfCreditProb.pm
@@ -6,15 +6,15 @@ use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 use WeBWorK::Utils           qw(x wwRound);
 use WeBWorK::Utils::DateTime qw(after);
 
-sub new ($class) {
+sub new ($class, $c) {
 	return bless {
 		id          => 'HalfCreditProb',
 		name        => x('Lesser Rod of Revelation'),
-		description => x('Increases the grade of a single problem by 50%, to a maximum of 100%.')
+		description => [ x('Increases the grade of a single problem by 50%, to a maximum of 100%.') ]
 	}, $class;
 }
 
-sub can_use($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return 0
 		unless $set->assignment_type eq 'default'
 		&& after($set->open_date);
diff --git a/lib/WeBWorK/AchievementItems/HalfCreditSet.pm b/lib/WeBWorK/AchievementItems/HalfCreditSet.pm
index 37496e9bdd..0b8e8396b8 100644
--- a/lib/WeBWorK/AchievementItems/HalfCreditSet.pm
+++ b/lib/WeBWorK/AchievementItems/HalfCreditSet.pm
@@ -6,15 +6,15 @@ use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 use WeBWorK::Utils           qw(x wwRound);
 use WeBWorK::Utils::DateTime qw(after);
 
-sub new ($class) {
+sub new ($class, $c) {
 	return bless {
 		id          => 'HalfCreditSet',
 		name        => x('Lesser Tome of Enlightenment'),
-		description => x('Increases the score of every problem in an assignment by 50%, to a maximum of 100%.')
+		description => [ x('Increases the score of every problem in an assignment by 50%, to a maximum of 100%.') ]
 	}, $class;
 }
 
-sub can_use($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return 0
 		unless $set->assignment_type eq 'default'
 		&& after($set->open_date);
@@ -27,6 +27,8 @@ sub can_use($self, $set, $records) {
 		$new_grade += ($problem->status > 0.5 ? 1 : $problem->status + 0.5) * $problem->value;
 		$total     += $problem->value;
 	}
+	return 0 unless $total;
+
 	$self->{old_grade} = 100 * wwRound(2, $old_grade / $total);
 	$self->{new_grade} = 100 * wwRound(2, $new_grade / $total);
 	return $self->{old_grade} == 100 ? 0 : 1;
diff --git a/lib/WeBWorK/AchievementItems/NoReducedCred.pm b/lib/WeBWorK/AchievementItems/NoReducedCred.pm
index 8863196463..92bc0a1178 100644
--- a/lib/WeBWorK/AchievementItems/NoReducedCred.pm
+++ b/lib/WeBWorK/AchievementItems/NoReducedCred.pm
@@ -7,20 +7,23 @@ use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 use WeBWorK::Utils           qw(x);
 use WeBWorK::Utils::DateTime qw(between);
 
-sub new ($class) {
+sub new ($class, $c) {
 	return bless {
 		id          => 'NoReducedCred',
 		name        => x('Potion of Power'),
-		description => x(
-			'Remove reduced scoring penalties from an open assignemnt.  You will have to resubmit '
-				. 'any problems that have already been penalized to earn full credit on them.'
-		)
+		description => [
+			x(
+				'Remove reduced scoring penalties from an open assignment.  You will have to resubmit '
+					. 'any problems that have already been penalized to earn full credit on them.'
+			)
+		]
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return
 		$set->assignment_type eq 'default'
+		&& $c->ce->{pg}{ansEvalDefaults}{enableReducedScoring}
 		&& $set->enable_reduced_scoring
 		&& $set->reduced_scoring_date
 		&& $set->reduced_scoring_date < $set->due_date
@@ -32,7 +35,7 @@ sub print_form ($self, $set, $records, $c) {
 		'p',
 		$c->maketext(
 			q{This item won't work unless your instructor enables the reduced scoring feature.  }
-				. 'Let your instructor know that you recieved this message.'
+				. 'Let your instructor know that you received this message.'
 		)
 	) unless $c->{ce}->{pg}{ansEvalDefaults}{enableReducedScoring};
 
diff --git a/lib/WeBWorK/AchievementItems/ReducedCred.pm b/lib/WeBWorK/AchievementItems/ReducedCred.pm
index 340d960815..a473e76227 100644
--- a/lib/WeBWorK/AchievementItems/ReducedCred.pm
+++ b/lib/WeBWorK/AchievementItems/ReducedCred.pm
@@ -1,28 +1,33 @@
 package WeBWorK::AchievementItems::ReducedCred;
 use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 
-# Item to extend a close date by 24 hours for reduced credit
+# Item to extend a close date by 24 * $achievementExtensionFactor hours for reduced credit
 # Reduced scoring needs to be enabled for this item to work.
 
 use WeBWorK::Utils           qw(x);
-use WeBWorK::Utils::DateTime qw(after between);
+use WeBWorK::Utils::DateTime qw(after between getExtensionTime);
 
-use constant ONE_DAY => 86400;
+sub new ($class, $c) {
+	my ($time, $timeText) = getExtensionTime($c, 1);
 
-sub new ($class) {
 	return bless {
 		id          => 'ReducedCred',
 		name        => x('Ring of Reduction'),
-		description => x(
-			'Enable reduced scoring for a homework set.  This will allow you to submit answers '
-				. 'for partial credit for 24 hours after the close date. '
-				. 'This will randomize problem details if used after the original close date.'
-		)
+		description => [
+			x(
+				'Enable reduced scoring for a homework set.  This will allow you to submit answers '
+					. 'for partial credit for [_1] after the close date. '
+					. 'This will randomize problem details if used after the original close date.',
+				$timeText
+			)
+		],
+		time     => $time,
+		timeText => $timeText
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
-	return $set->assignment_type eq 'default' && between($set->open_date, $set->due_date + ONE_DAY);
+sub can_use ($self, $set, $records, $c) {
+	return $set->assignment_type eq 'default' && between($set->open_date, $set->due_date + $self->{time});
 }
 
 sub print_form ($self, $set, $records, $c) {
@@ -40,9 +45,10 @@ sub print_form ($self, $set, $records, $c) {
 	return $c->tag(
 		'p',
 		$c->maketext(
-			'Extend the close date of this assignment to [_1] (an additional 24 hours).  Any submissions during '
-				. 'this additional time will be reduced and are worth [_2]% of their full value. [_3]',
-			$c->formatDateTime($set->due_date + ONE_DAY, $ce->{studentDateDisplayFormat}),
+			'Extend the close date of this assignment to [_1] (an additional [_2]).  Any submissions during '
+				. 'this additional time will be reduced and are worth [_3]% of their full value. [_4]',
+			$c->formatDateTime($set->due_date + $self->{time}, $ce->{studentDateDisplayFormat}),
+			$self->{timeText},
 			100 * $ce->{pg}{ansEvalDefaults}{reducedScoringValue},
 			$randomization_statement
 		)
@@ -79,7 +85,7 @@ sub use_item ($self, $set, $records, $c) {
 	$set->enable_reduced_scoring(1);
 	$userSet->enable_reduced_scoring(1);
 	# Add time to the close date
-	$set->due_date($set->due_date + ONE_DAY);
+	$set->due_date($set->due_date + $self->{time});
 	$userSet->due_date($set->due_date);
 	# This may require also extending the answer date.
 	if ($set->due_date > $set->answer_date) {
@@ -88,10 +94,8 @@ sub use_item ($self, $set, $records, $c) {
 	}
 	$db->putUserSet($userSet);
 
-	return $c->maketext(
-		'Close date of this assignment extended by 24 hours to [_1].',
-		$c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat})
-	);
+	return $c->maketext('Close date of this assignment extended by [_1] to [_2].',
+		$self->{timeText}, $c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat}));
 }
 
 1;
diff --git a/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm b/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm
index cd0ef5a330..ef40f88706 100644
--- a/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm
+++ b/lib/WeBWorK/AchievementItems/ResetIncorrectAttempts.pm
@@ -6,15 +6,15 @@ use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 use WeBWorK::Utils           qw(x);
 use WeBWorK::Utils::DateTime qw(between);
 
-sub new ($class) {
+sub new ($class, $c) {
 	return bless {
 		id          => 'ResetIncorrectAttempts',
 		name        => x('Potion of Forgetfulness'),
-		description => x('Resets the number of incorrect attempts on a single homework problem.')
+		description => [ x('Resets the number of incorrect attempts on a single homework problem.') ]
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return 0
 		unless $set->assignment_type eq 'default'
 		&& between($set->open_date, $set->due_date);
diff --git a/lib/WeBWorK/AchievementItems/ResurrectGW.pm b/lib/WeBWorK/AchievementItems/ResurrectGW.pm
index 00b99ca4ce..e841efd1fb 100644
--- a/lib/WeBWorK/AchievementItems/ResurrectGW.pm
+++ b/lib/WeBWorK/AchievementItems/ResurrectGW.pm
@@ -4,35 +4,91 @@ use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 # Item to extend the due date on a gateway
 
 use WeBWorK::Utils           qw(x);
-use WeBWorK::Utils::DateTime qw(after);
+use WeBWorK::Utils::DateTime qw(after getExtensionTime);
 
-use constant ONE_DAY => 86400;
+sub new ($class, $c) {
+	my ($time, $timeText) = getExtensionTime($c, 1);
 
-sub new ($class) {
 	return bless {
 		id          => 'ResurrectGW',
 		name        => x('Necromancers Charm'),
-		description => x(
-			'Reopens any test for an additional 24 hours. This allows you to take a test even if the '
-				. 'close date has past. This item does not allow you to take additional versions of the test.'
-		)
+		description => [
+			x(
+				'Reopens any test for an additional [_1]. If you are allowed to start new versions of the test, '
+					. 'then this allows you to start a new test even if the close date has past. '
+					. 'If you were not allowed to start a new version of the test, '
+					. 'then this item will not allow you to take additional versions of the test. '
+					. 'This item will not extend the time limit for any tests that you have already started.',
+				$timeText
+			)
+		],
+		time     => $time,
+		timeText => $timeText
 	}, $class;
 }
 
-sub can_use($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return $set->assignment_type =~ /gateway/
-		&& (after($set->due_date) || ($set->reduced_scoring_date && after($set->reduced_scoring_date)));
+		&& (
+			after($set->due_date)
+			|| ($c->ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+				&& $set->enable_reduced_scoring
+				&& after($set->reduced_scoring_date))
+		);
 	# TODO: Check if a new version can be created, and only allow using this reward in that case.
 }
 
 sub print_form ($self, $set, $records, $c) {
-	return $c->tag(
-		'p',
-		$c->maketext(
-			'Reopen this test for the next 24 hours. This item does not allow you to take any additional '
-				. 'versions of the test.'
-		)
-	);
+	if (after($set->due_date)) {
+		return $c->tag(
+			'p',
+			$c->maketext(
+				'Reopen this test for the next [_1]. If you were allowed to start new versions of the test, '
+					. 'then this will allow you to start a new test. '
+					. 'If you have already started all of the versions of the test that you are allowed to start, '
+					. 'then you should not use this item. '
+					. 'This item will not extend the time limit for any tests that you have already started.',
+				$self->{timeText}
+			)
+		);
+	} else {
+		if (after($set->due_date - $self->{time})) {
+			return $c->tag(
+				'p',
+				$c->maketext(
+					'Reopen this test for full credit for the next [_1]. If you are allowed to start new versions '
+						. 'of the test, then this will allow you to start a new test. '
+						. 'If you have already started all of the versions of the test that you are allowed to start, '
+						. 'then you should not use this item. '
+						. 'This item will not extend the time limit for any tests that you have already started.',
+					$self->{timeText}
+				)
+			);
+		} else {
+			return $c->c(
+				$c->tag(
+					'p',
+					$c->maketext(
+						'Reopen this test for full credit for the next [_1].  After [_1] any tests will revert '
+							. 'to counting for [_2]% of their value until [_3].',
+						$c->{timeText},
+						$c->ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100,
+						$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
+					)
+				),
+				$c->tag(
+					'p',
+					$c->maketext(
+						' If you are allowed to start new versions of the test, '
+							. 'then this will allow you to start a new test. '
+							. 'If you have already started all of the versions of the test that you are allowed to start, '
+							. 'then you should not use this item. '
+							. 'This item will not extend the time limit for any tests that you have already started.'
+					)
+				)
+			)->join('');
+		}
+	}
 }
 
 sub use_item ($self, $set, $records, $c) {
@@ -41,21 +97,36 @@ sub use_item ($self, $set, $records, $c) {
 
 	# Add time to the reduced scoring date, due date, and answer date.
 	if ($set->reduced_scoring_date) {
-		$set->reduced_scoring_date(time + ONE_DAY);
+		$set->reduced_scoring_date(time + $self->{time});
 		$userSet->reduced_scoring_date($set->reduced_scoring_date);
 	}
-	$set->due_date(time + ONE_DAY);
-	$userSet->due_date($set->due_date);
-	if ($set->due_date > $set->answer_date) {
-		$set->answer_date(time + ONE_DAY);
-		$userSet->answer_date($set->answer_date);
+	if (after($set->due_date - $self->{time})) {
+		$set->due_date(time + $self->{time});
+		$userSet->due_date($set->due_date);
+		if ($set->due_date > $set->answer_date) {
+			$set->answer_date($set->due_date);
+			$userSet->answer_date($set->answer_date);
+		}
 	}
 	$db->putUserSet($userSet);
 
-	return $c->maketext(
-		'This assignment has been reopened and will now close on [_1].',
-		$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
-	);
+	if ($c->ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+		&& $set->enable_reduced_scoring
+		&& ($set->reduced_scoring_date != $set->due_date))
+	{
+		return $c->maketext(
+			'This assignment has been reopened and is due on [_1].  After that date any work '
+				. 'completed will count for [_2]% of its value until [_3].',
+			$c->formatDateTime($set->reduced_scoring_date, $c->ce->{studentDateDisplayFormat}),
+			$c->ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100,
+			$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
+		);
+	} else {
+		return $c->maketext(
+			'This assignment has been reopened and will now close on [_1].',
+			$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
+		);
+	}
 }
 
 1;
diff --git a/lib/WeBWorK/AchievementItems/ResurrectHW.pm b/lib/WeBWorK/AchievementItems/ResurrectHW.pm
index da8364822f..2d9daf2a2c 100644
--- a/lib/WeBWorK/AchievementItems/ResurrectHW.pm
+++ b/lib/WeBWorK/AchievementItems/ResurrectHW.pm
@@ -1,63 +1,119 @@
 package WeBWorK::AchievementItems::ResurrectHW;
 use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 
-# Item to resurrect a homework for 24 hours
+# Item to resurrect a homework for 24 * $achievementExtensionFactor hours
 
 use WeBWorK::Utils           qw(x);
-use WeBWorK::Utils::DateTime qw(after);
+use WeBWorK::Utils::DateTime qw(after getExtensionTime);
 
-use constant ONE_DAY => 86400;
+sub new ($class, $c) {
+	my ($time, $timeText) = getExtensionTime($c, 1);
 
-sub new ($class) {
 	return bless {
 		id          => 'ResurrectHW',
 		name        => x('Scroll of Resurrection'),
-		description => x("Reopens one closed homework set for 24 hours and rerandomizes all problems."),
+		description => [ x('Reopens one closed homework set for [_1] and rerandomizes all problems.', $timeText) ],
+		time        => $time,
+		timeText    => $timeText
 	}, $class;
 }
 
-sub can_use($self, $set, $records) {
+sub can_use ($self, $set, $records, $c) {
 	return $set->assignment_type eq 'default'
-		&& (after($set->due_date) || ($set->reduced_scoring_date && after($set->reduced_scoring_date)));
+		&& (
+			after($set->due_date)
+			|| ($c->ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+				&& $set->enable_reduced_scoring
+				&& after($set->reduced_scoring_date))
+		);
 }
 
 sub print_form ($self, $set, $records, $c) {
-	return $c->tag('p',
-		$c->maketext('Reopen this homework assignment for the next 24 hours. All problems will be rerandomized.'));
+	if (after($set->due_date)) {
+		return $c->tag(
+			'p',
+			$c->maketext(
+				'Reopen this homework assignment for the next [_1]. All problems will be rerandomized.',
+				$self->{timeText}
+			)
+		);
+	} else {
+		if (after($set->due_date - $self->{time})) {
+			return $c->tag(
+				'p',
+				$c->maketext(
+					'Reopen this homework assignment for full credit for the next [_1]. ',
+					$self->{timeText}
+				)
+			);
+		} else {
+			return $c->tag(
+				'p',
+				$c->maketext(
+					'Reopen this homework assignment for full credit for the next [_1]. After [_1] '
+						. 'any progress will revert to counting for [_2]% of the value until [_3].',
+					$self->{timeText},
+					$c->ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100,
+					$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
+				)
+			);
+		}
+	}
 }
 
 sub use_item ($self, $set, $records, $c) {
-	my $db      = $c->db;
-	my $userSet = $db->getUserSet($set->user_id, $set->set_id);
-
-	# Change the seed for all of the problems since the set is currently closed.
-	my %userProblems =
-		map { $_->problem_id => $_ } $db->getUserProblemsWhere({ user_id => $set->user_id, set_id => $set->set_id });
-	for my $problem (@$records) {
-		my $userProblem = $userProblems{ $problem->problem_id };
-		$userProblem->problem_seed($userProblem->problem_seed % 2**31 + 1);
-		$problem->problem_seed($userProblem->problem_seed);
-		$db->putUserProblem($userProblem);
+	my $db                 = $c->db;
+	my $userSet            = $db->getUserSet($set->user_id, $set->set_id);
+	my $rerandomizeMessage = '';
+
+	# Change the seed for all of the problems if the set is currently closed.
+	if (after($set->due_date)) {
+		my %userProblems =
+			map { $_->problem_id => $_ }
+			$db->getUserProblemsWhere({ user_id => $set->user_id, set_id => $set->set_id });
+		for my $problem (@$records) {
+			my $userProblem = $userProblems{ $problem->problem_id };
+			$userProblem->problem_seed($userProblem->problem_seed % 2**31 + 1);
+			$problem->problem_seed($userProblem->problem_seed);
+			$db->putUserProblem($userProblem);
+		}
+		$rerandomizeMessage = $c->maketext('Problems have been rerandomized.');
 	}
 
 	# Add time to the reduced scoring date if it was defined in the first place
 	if ($set->reduced_scoring_date) {
-		$set->reduced_scoring_date(time + ONE_DAY);
+		$set->reduced_scoring_date(time + $self->{time});
 		$userSet->reduced_scoring_date($set->reduced_scoring_date);
 	}
-	# Add time to the close date
-	$set->due_date(time + ONE_DAY);
-	$userSet->due_date($set->due_date);
-	# This may require also extending the answer date.
-	if ($set->due_date > $set->answer_date) {
-		$set->answer_date($set->due_date);
-		$userSet->answer_date($set->answer_date);
+	# Add time to the close date if necessary
+	if (after($set->due_date - $self->{time})) {
+		$set->due_date(time + $self->{time});
+		$userSet->due_date($set->due_date);
+		# This may require also extending the answer date.
+		if ($set->due_date > $set->answer_date) {
+			$set->answer_date($set->due_date);
+			$userSet->answer_date($set->answer_date);
+		}
 	}
 	$db->putUserSet($userSet);
 
-	return $c->maketext(
-		'This assignment has been reopened and will now close on [_1]. Problems have been rerandomized.',
-		$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat}));
+	if ($c->ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+		&& $set->enable_reduced_scoring
+		&& ($set->reduced_scoring_date != $set->due_date))
+	{
+		return $c->maketext(
+			'This assignment has been reopened and is due on [_1].  After that date any work '
+				. 'completed will count for [_2]% of its value until [_3].',
+			$c->formatDateTime($set->reduced_scoring_date, $c->ce->{studentDateDisplayFormat}),
+			$c->ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100,
+			$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
+		) . ($rerandomizeMessage ? " $rerandomizeMessage" : '');
+	} else {
+		return $c->maketext(
+			'This assignment has been reopened and will now close on [_1].',
+			$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
+		) . ($rerandomizeMessage ? " $rerandomizeMessage" : '');
+	}
 }
 
 1;
diff --git a/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm b/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm
index 7932e6de20..42da5b5162 100644
--- a/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm
+++ b/lib/WeBWorK/AchievementItems/SuperExtendDueDate.pm
@@ -1,76 +1,27 @@
 package WeBWorK::AchievementItems::SuperExtendDueDate;
-use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+use Mojo::Base 'WeBWorK::AchievementItems::ExtendDueDate', -signatures;
 
-# Item to extend a close date by 48 hours.
+# Item to extend a close date by 48 * $achievementExtensionFactor hours.
 
 use WeBWorK::Utils           qw(x);
-use WeBWorK::Utils::DateTime qw(after between);
+use WeBWorK::Utils::DateTime qw(getExtensionTime);
 
-use constant TWO_DAYS => 172800;
+sub new ($class, $c) {
+	my ($time, $timeText) = getExtensionTime($c, 2);
 
-sub new ($class) {
 	return bless {
 		id          => 'SuperExtendDueDate',
 		name        => x('Robe of Longevity'),
-		description => x(
-			'Adds 48 hours to the close date of a homework. '
-				. 'This will randomize problem details if used after the original close date.'
-		)
+		description => [
+			x(
+				'Adds [_1] to the close date of a homework. '
+					. 'This will randomize problem details if used after the original close date.',
+				$timeText
+			)
+		],
+		time     => $time,
+		timeText => $timeText
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
-	return $set->assignment_type eq 'default' && between($set->open_date, $set->due_date + TWO_DAYS);
-}
-
-sub print_form ($self, $set, $records, $c) {
-	my $randomization_statement = after($set->due_date) ? $c->maketext('All problems will be rerandomized.') : '';
-	return $c->tag(
-		'p',
-		$c->maketext(
-			'Extend the close date of this assignment to [_1] (an additional 48 hours). [_2]',
-			$c->formatDateTime($set->due_date + TWO_DAYS, $c->ce->{studentDateDisplayFormat}),
-			$randomization_statement
-		)
-	);
-}
-
-sub use_item ($self, $set, $records, $c) {
-	my $db      = $c->db;
-	my $userSet = $db->getUserSet($set->user_id, $set->set_id);
-
-	# Change the seed for all of the problems if the set is currently closed.
-	if (after($set->due_date)) {
-		my %userProblems =
-			map { $_->problem_id => $_ }
-			$db->getUserProblemsWhere({ user_id => $set->user_id, set_id => $set->set_id });
-		for my $problem (@$records) {
-			my $userProblem = $userProblems{ $problem->problem_id };
-			$userProblem->problem_seed($userProblem->problem_seed % 2**31 + 1);
-			$problem->problem_seed($userProblem->problem_seed);
-			$db->putUserProblem($userProblem);
-		}
-	}
-
-	# Add time to the reduced scoring date if it was defined in the first place
-	if ($set->reduced_scoring_date) {
-		$set->reduced_scoring_date($set->reduced_scoring_date + TWO_DAYS);
-		$userSet->reduced_scoring_date($set->reduced_scoring_date);
-	}
-	# Add time to the close date
-	$set->due_date($set->due_date + TWO_DAYS);
-	$userSet->due_date($set->due_date);
-	# This may require also extending the answer date.
-	if ($set->due_date > $set->answer_date) {
-		$set->answer_date($set->due_date);
-		$userSet->answer_date($set->answer_date);
-	}
-	$db->putUserSet($userSet);
-
-	return $c->maketext(
-		'Close date of this assignment extended by 48 hours to [_1].',
-		$c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
-	);
-}
-
 1;
diff --git a/lib/WeBWorK/AchievementItems/SuperExtendReducedDate.pm b/lib/WeBWorK/AchievementItems/SuperExtendReducedDate.pm
index 3f2361b835..c214897b68 100644
--- a/lib/WeBWorK/AchievementItems/SuperExtendReducedDate.pm
+++ b/lib/WeBWorK/AchievementItems/SuperExtendReducedDate.pm
@@ -1,69 +1,28 @@
 package WeBWorK::AchievementItems::SuperExtendReducedDate;
-use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
+use Mojo::Base 'WeBWorK::AchievementItems::ExtendReducedDate', -signatures;
 
-# Item to extend a close date by 48 hours.
+# Item to extend a close date by 48 * $achievementExtensionFactor hours.
 
 use WeBWorK::Utils           qw(x);
-use WeBWorK::Utils::DateTime qw(between);
+use WeBWorK::Utils::DateTime qw(getExtensionTime);
 
-use constant TWO_DAYS => 172800;
+sub new ($class, $c) {
+	my ($time, $timeText) = getExtensionTime($c, 2);
 
-sub new ($class) {
 	return bless {
 		id          => 'SuperExtendReducedDate',
 		name        => x('Scroll of Longevity'),
-		description => x(
-			'Adds 48 hours to the reduced scoring date of an assignment.  You will have to resubmit '
-				. 'any problems that have already been penalized to earn full credit.  You cannot '
-				. 'extend the reduced scoring date beyond the due date of an assignment.'
-		)
+		description => [
+			x(
+				'Adds [_1] to the reduced scoring date of an assignment.  You will have to resubmit '
+					. 'any problems that have already been penalized to earn full credit.  You cannot '
+					. 'extend the reduced scoring date beyond the due date of an assignment.',
+				$timeText
+			)
+		],
+		time     => $time,
+		timeText => $timeText
 	}, $class;
 }
 
-sub can_use ($self, $set, $records) {
-	return 0
-		unless $set->assignment_type eq 'default'
-		&& $set->enable_reduced_scoring
-		&& $set->reduced_scoring_date
-		&& $set->reduced_scoring_date < $set->due_date;
-
-	$self->{new_date} = $set->reduced_scoring_date + TWO_DAYS;
-	$self->{new_date} = $set->due_date if $set->due_date < $self->{new_date};
-	return between($set->open_date, $self->{new_date});
-}
-
-sub print_form ($self, $set, $records, $c) {
-	return $c->tag(
-		'p',
-		$c->maketext(
-			q{This item won't work unless your instructor enables the reduced scoring feature.  }
-				. 'Let your instructor know that you recieved this message.'
-		)
-	) unless $c->{ce}->{pg}{ansEvalDefaults}{enableReducedScoring};
-
-	return $c->tag(
-		'p',
-		$c->maketext(
-			'Extend the reduced scoring date to [_1] (an additional 48 hours).',
-			$c->formatDateTime($self->{new_date}, $c->ce->{studentDateDisplayFormat})
-		)
-	);
-}
-
-sub use_item ($self, $set, $records, $c) {
-	return '' unless $c->{ce}->{pg}{ansEvalDefaults}{enableReducedScoring};
-
-	my $db      = $c->db;
-	my $userSet = $db->getUserSet($set->user_id, $set->set_id);
-
-	$set->reduced_scoring_date($self->{new_date});
-	$userSet->reduced_scoring_date($set->reduced_scoring_date);
-	$db->putUserSet($userSet);
-
-	return $c->maketext(
-		'Reduced scoring date of this assignment extended by 48 hours to [_1].',
-		$c->formatDateTime($self->{new_date}, $c->ce->{studentDateDisplayFormat})
-	);
-}
-
 1;
diff --git a/lib/WeBWorK/AchievementItems/Surprise.pm b/lib/WeBWorK/AchievementItems/Surprise.pm
index b598b75352..f5140cbb79 100644
--- a/lib/WeBWorK/AchievementItems/Surprise.pm
+++ b/lib/WeBWorK/AchievementItems/Surprise.pm
@@ -5,11 +5,11 @@ use Mojo::Base 'WeBWorK::AchievementItems', -signatures;
 
 use WeBWorK::Utils qw(x);
 
-sub new ($class) {
+sub new ($class, $c) {
 	return bless {
 		id          => 'Surprise',
 		name        => x('Mysterious Package (with Ribbons)'),
-		description => x('What could be inside?')
+		description => [ x('What could be inside?') ]
 	}, $class;
 }
 
@@ -18,7 +18,7 @@ sub remaining_title ($self, $c) {
 	return $c->maketext($self->name);
 }
 
-sub can_use ($self, $set, $records) { return 1; }
+sub can_use ($self, $set, $records, $c) { return 1; }
 
 sub print_form ($self, $set, $records, $c) {
 	$self->{hideUseButton} = 1;
@@ -26,7 +26,7 @@ sub print_form ($self, $set, $records, $c) {
 	# The form opens the file "surprise_message.txt" in the achievements
 	# folder and prints the contents of the file.
 	open my $MESSAGE, '<', "$c->{ce}{courseDirs}{achievements}/surprise_message.txt"
-		or return $c->tag('p', $c->maketext(q{I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!}));
+		or return $c->tag('p', $c->maketext(q{I couldn't find the file ~[ACHIEVEMENT_DIR~]/surprise_message.txt!}));
 	local $/ = undef;
 	my $message = <$MESSAGE>;
 	close $MESSAGE;
diff --git a/lib/WeBWorK/Authen.pm b/lib/WeBWorK/Authen.pm
index db565f21f0..ccc02f2cad 100644
--- a/lib/WeBWorK/Authen.pm
+++ b/lib/WeBWorK/Authen.pm
@@ -327,7 +327,7 @@ sub get_credentials {
 			$self->{login_type}        = "normal";
 			$self->{credential_source} = "params_and_cookie";
 			debug(
-				'credential soure: "cookie (password from params)", user: "',
+				'credential source: "cookie (password from params)", user: "',
 				$self->{user_id}, '", key: "', $self->{session_key},
 				'", timestamp = "',
 				$self->{cookie_timestamp}, '"'
@@ -377,9 +377,9 @@ sub check_user {
 		return 0;
 	}
 
-	my $User = $db->getUser($user_id);
+	$self->{user} = $db->getUser($user_id);
 
-	unless ($User) {
+	unless ($self->{user}) {
 		$self->{log_error} = "user unknown";
 		$self->{error}     = $c->maketext(GENERIC_ERROR_MESSAGE);
 		return 0;
@@ -388,6 +388,29 @@ sub check_user {
 	return 1;
 }
 
+sub validate_user {
+	my $self = shift;
+	my $c    = $self->{c};
+
+	# Deny access for certain roles (dropped students, proctor roles).
+	unless ($self->{login_type} =~ /^proctor/
+		|| $c->ce->status_abbrev_has_behavior($self->{user}->status, 'allow_course_access'))
+	{
+		$self->{log_error} = 'user not allowed course access';
+		$self->{error}     = $c->maketext('This user is not allowed to log in to this course');
+		return 0;
+	}
+
+	# Deny access for permission levels below 'login' permission level.
+	unless ($c->authz->hasPermissions($self->{user_id}, 'login')) {
+		$self->{log_error} = 'user not permitted to login';
+		$self->{error}     = $c->maketext('This user is not allowed to log in to this course');
+		return 0;
+	}
+
+	return 1;
+}
+
 sub verify_practice_user {
 	my $self = shift;
 	my $c    = $self->{c};
@@ -485,6 +508,7 @@ sub verify_normal_user {
 				$c->stash(authen_error => $c->maketext('The security code is required.'));
 			}
 		}
+		return 0 unless $self->validate_user;
 		return 1;
 	} else {
 		my $auth_result = $self->authenticate;
@@ -494,20 +518,7 @@ sub verify_normal_user {
 		delete $self->session->{two_factor_verification_needed};
 
 		if ($auth_result > 0) {
-			# Deny certain roles (dropped students, proctor roles).
-			unless ($self->{login_type} =~ /^proctor/
-				|| $c->ce->status_abbrev_has_behavior($c->db->getUser($user_id)->status, "allow_course_access"))
-			{
-				$self->{log_error} = "user not allowed course access";
-				$self->{error}     = $c->maketext('This user is not allowed to log in to this course');
-				return 0;
-			}
-			# Deny permission levels below "login" permission level.
-			unless ($c->authz->hasPermissions($user_id, "login")) {
-				$self->{log_error} = "user not permitted to login";
-				$self->{error}     = $c->maketext('This user is not allowed to log in to this course');
-				return 0;
-			}
+			return 0 unless $self->validate_user;
 			$self->{session_key}   = $self->create_session($user_id);
 			$self->{initial_login} = 1;
 			return 1;
@@ -844,7 +855,7 @@ sub store_session {
 		}
 	}
 
-	# The session parameters need to be set again, because another request may have occured during this
+	# The session parameters need to be set again, because another request may have occurred during this
 	# request in which case the session parameters for the app will now be set for that request.
 	$self->{c}->setSessionParams;
 
diff --git a/lib/WeBWorK/Authen/Cosign.pm b/lib/WeBWorK/Authen/Cosign.pm
deleted file mode 100644
index 3bdae8976c..0000000000
--- a/lib/WeBWorK/Authen/Cosign.pm
+++ /dev/null
@@ -1,90 +0,0 @@
-package WeBWorK::Authen::Cosign;
-use base qw/WeBWorK::Authen/;
-
-=head1 NAME
-
-WeBWorK::Authen::Cosign - Authentication plug in for cosign
-
-to use: include in localOverrides.conf or course.conf
-  $authen{user_module} = "WeBWorK::Authen::Cosign";
-and add /webwork2 or /webwork2/courseName as a CosignProtected
-Location
-
-if $c->ce->{cosignoff} is set for a course, authentication reverts
-to standard WeBWorK authentication.
-
-=cut
-
-use strict;
-use warnings;
-use WeBWorK::Debug;
-
-# this is similar to the method in the base class, except that cosign
-# ensures that we don't get to the address without a login.  this means
-# that we can't allow guest logins, but don't have to do any password
-# checking or cookie management.
-
-sub get_credentials {
-	my ($self) = @_;
-	my $c      = $self->{c};
-	my $ce     = $c->ce;
-	my $db     = $c->db;
-
-	if ($ce->{cosignoff}) {
-		return $self->SUPER::get_credentials();
-	} else {
-		$c->stash(disable_cookies => 1);
-
-		if (defined($ENV{'REMOTE_USER'})) {
-			$self->{'user_id'} = $ENV{'REMOTE_USER'};
-			$self->{c}->param("user", $ENV{'REMOTE_USER'});
-		} else {
-			return 0;
-		}
-		# set external auth parameter so that Login.pm knows
-		#    not to rely on internal logins if there's a check_user
-		#    failure.
-		$self->{external_auth} = 1;
-
-		# the session key isn't used (cosign is managing this
-		#    for us), and we want to force checking against the
-		#    site_checkPassword
-		$self->{'session_key'}       = undef;
-		$self->{'password'}          = 1;
-		$self->{'credential_source'} = "params";
-		$self->{login_type}          = "cosign";
-
-		return 1;
-	}
-}
-
-sub site_checkPassword {
-	my ($self, $userID, $clearTextPassword) = @_;
-
-	if ($self->{c}->ce->{cosignoff}) {
-		return 0;
-	} else {
-		# this is easy; if we're here at all, we've authenticated
-		# through cosign
-		return 1;
-	}
-}
-
-# this is a bit of a cheat, because it does the redirect away from the
-#   logout script or what have you, but I don't see a way around that.
-sub forget_verification {
-	my ($self, @args) = @_;
-	my $c = $self->{c};
-
-	if ($c->ce->{cosignoff}) {
-		return $self->SUPER::forget_verification(@args);
-	} else {
-		$self->{was_verified} = 0;
-		#		$c->headers_out->{"Location"} = $c->ce->{cosign_logout_script};
-		#		$c->send_http_header;
-		#		return;
-		$self->{redirect} = $c->ce->{cosign_logout_script};
-	}
-}
-
-1;
diff --git a/lib/WeBWorK/Authen/LTIAdvanced.pm b/lib/WeBWorK/Authen/LTIAdvanced.pm
index 0bd4706b3a..0df122c8f7 100644
--- a/lib/WeBWorK/Authen/LTIAdvanced.pm
+++ b/lib/WeBWorK/Authen/LTIAdvanced.pm
@@ -71,7 +71,7 @@ sub request_has_data_for_this_verification_module {
 		|| !(defined $c->param("oauth_nonce"))
 		|| !(defined $c->param("oauth_timestamp")))
 	{
-		debug("LTIAdvanced returning that it has insufficent data");
+		debug("LTIAdvanced returning that it has insufficient data");
 		return (0);
 	} else {
 		debug("LTIAdvanced returning that it has sufficient data");
@@ -117,10 +117,9 @@ sub get_credentials {
 	# Determine the WW user_id to use, if possible
 
 	if (!$ce->{LTI}{v1p1}{preferred_source_of_username}) {
-		warn
-			"LTI is not properly configured (no preferred_source_of_username). Please contact your instructor or system administrator.";
-		$self->{error} = $c->maketext(
-			"There was an error during the login process.  Please speak to your instructor or system administrator.");
+		$self->{error} = $c->maketext("There was an error during the login process.  "
+				. "Please speak to your instructor or system administrator.");
+		warn "LTI is not properly configured (no preferred_source_of_username).\n" if $ce->{debug_lti_parameters};
 		debug("No preferred_source_of_username in "
 				. $c->ce->{'courseName'}
 				. " so LTIAdvanced::get_credentials is returning a 0\n");
@@ -228,8 +227,8 @@ sub get_credentials {
 			warn "================================\n";
 		}
 		if (!defined($self->{user_id})) {
-			croak
-				"LTIAdvanced was unable to create a username from the data provided with the current settings. Set \$debug_lti_parameters=1 in authen_LTI.conf to debug";
+			croak "LTIAdvanced was unable to create a username from the data provided with the current settings. "
+				. "Set \$debug_lti_parameters=1 in authen_LTI.conf to debug";
 		}
 
 		$self->{login_type}        = "normal";
@@ -237,8 +236,9 @@ sub get_credentials {
 		debug("LTIAdvanced::get_credentials is returning a 1\n");
 		return 1;
 	}
-	warn
-		"LTI is not properly configured (failed to set user_id from preferred_source_of_username or fallback_source_of_username). Please contact your instructor or system administrator.";
+	warn "LTI is not properly configured (failed to set user_id from preferred_source_of_username or "
+		. "fallback_source_of_username).\n"
+		if $ce->{debug_lti_parameters};
 	$self->{error} = $c->maketext(
 		"There was an error during the login process.  Please speak to your instructor or system administrator.");
 	debug("LTIAdvanced::get_credentials is returning a 0\n");
@@ -262,9 +262,9 @@ sub check_user {
 		return 0;
 	}
 
-	my $User = $db->getUser($user_id);
+	$self->{user} = $db->getUser($user_id);
 
-	if (!$User) {
+	if (!$self->{user}) {
 		my %options;
 		$options{ $ce->{LTI}{v1p1}{preferred_source_of_username} } = 1
 			if ($ce->{LTI}{v1p1}{preferred_source_of_username});
@@ -285,9 +285,8 @@ sub check_user {
 
 		foreach my $key (keys(%options), ($use_lis_person_sourcedid_options ? @lis_person_sourcedid_options : ())) {
 			if (defined($c->param($key))) {
-				debug(
-					"User |$user_id| is unknown but may be an new user from an LSM via LTI. Saw a value for $key About to return a 1"
-				);
+				debug("User |$user_id| is unknown but may be a new user from an LMS via LTI. "
+						. "Saw a value for $key About to return a 1");
 				return 1;    #This may be a new user coming in from a LMS via LTI.
 			}
 		}
@@ -298,14 +297,14 @@ sub check_user {
 		return 0;
 	}
 
-	unless ($ce->status_abbrev_has_behavior($User->status, "allow_course_access")) {
-		$self->{log_error} .= "LOGIN FAILED $user_id - course access denied";
+	unless ($ce->status_abbrev_has_behavior($self->{user}->status, "allow_course_access")) {
+		$self->{log_error} .= "$user_id - course access denied";
 		$self->{error} = $c->maketext("Authentication failed.  Please speak to your instructor.");
 		return 0;
 	}
 
 	unless ($authz->hasPermissions($user_id, "login")) {
-		$self->{log_error} .= "LOGIN FAILED $user_id - no permission to login";
+		$self->{log_error} .= "$user_id - no permission to login";
 		$self->{error} = $c->maketext("Authentication failed.  Please speak to your instructor.");
 		return 0;
 	}
@@ -353,19 +352,15 @@ sub authenticate {
 	debug("LTIAdvanced::authenticate called for user |$user|");
 	debug "ref(c) = |" . ref($c) . "|";
 
-	my $ce         = $c->ce;
-	my $db         = $c->db;
-	my $courseName = $c->ce->{'courseName'};
+	my $ce = $c->ce;
 
 	# Check nonce to see whether request is legitimate
 	debug("Nonce = |" . $self->{oauth_nonce} . "|");
 	my $nonce = WeBWorK::Authen::LTIAdvanced::Nonce->new($c, $self->{oauth_nonce}, $self->{oauth_timestamp});
-	if (!($nonce->ok)) {
-		$self->{error} .= $c->maketext(
-			"There was an error during the login process.  Please speak to your instructor or system administrator if this recurs."
-		);
+	if (!$nonce->ok) {
 		debug("Failed to verify nonce");
-		return 0;
+		return $c->maketext("There was an error during the login process.  "
+				. "Please speak to your instructor or system administrator if this recurs.");
 	}
 
 	debug("c->param(oauth_signature) = |" . $c->param("oauth_signature") . "|");
@@ -418,24 +413,21 @@ sub authenticate {
 		debug("construction of Net::OAuth object failed: $@");
 		debug("eval failed: ", $@, "

");
 
-		$self->{error} .= $c->maketext(
-			"There was an error during the login process.  Please speak to your instructor or system administrator.");
 		$self->{log_error} .= "Construction of OAuth request record failed";
-		return 0;
+		return $c->maketext(
+			"There was an error during the login process.  Please speak to your instructor or system administrator.");
 	}
 
 	if (!$request->verify && !$altrequest->verify) {
-		debug("LTIAdvanced::authenticate request-> verify failed");
-		debug("OAuth verification Failed ");
+		debug("LTIAdvanced::authenticate request->verify failed");
+		debug("OAuth verification Failed");
 
-		$self->{error} .= $c->maketext(
-			"There was an error during the login process.  Please speak to your instructor or system administrator.");
-		$self->{log_error} .=
-			"OAuth verification failed.  Check the Consumer Secret and that the URL in the LMS exactly matches the WeBWorK URL.";
+		$self->{log_error} .= "OAuth verification failed.  "
+			. "Check the Consumer Secret and that the URL in the LMS exactly matches the WeBWorK URL.";
 		if ($ce->{debug_lti_parameters}) {
-			warn(
-				"OAuth verification failed.  Check the Consumer Secret and that the URL in the LMS exactly matches the WeBWorK URL as defined in site.conf. E.G. Check that if you have https in the LMS url then you have https in \$server_root_url in site.conf"
-			);
+			warn("OAuth verification failed.  Check the Consumer Secret and that the URL in the LMS exactly "
+					. "matches the WeBWorK URL as defined in site.conf. E.G. Check that if you have https in the "
+					. "LMS url then you have https in \$server_root_url in site.conf");
 		}
 		return 0;
 	} else {
@@ -443,44 +435,34 @@ sub authenticate {
 
 		my $userID = $self->{user_id};
 
-		# Indentation of the internal blocks below was modified to follow
-		# the WW coding standard; however, the leading indentation of the
-		# if/elsif/closing '}' was kept as in the original code for now.
-		# Thus the apparenly overlarge indentation below.
-		if (!$db->existsUser($userID)) {    # New User. Create User record
+		if (!$self->{user}) {    # New User. Create User record
 			if ($ce->{block_lti_create_user}) {
-# We don't yet have the next string in the PO/POT files - so the next line is disabled.
-# $c->maketext("Account creation is currently disabled in this course.  Please speak to your instructor or system administrator.");
 				$self->{log_error} .=
 					"Account creation blocked by block_lti_create_user setting. Did not create user $userID.";
-				if ($ce->{debug_lti_parameters}) {
-					warn(
-						"Account creation is currently disabled in this course.  Please speak to your instructor or system administrator."
-					);
-				}
-				return 0;
+				warn "Account creation is currently disabled in this course.  "
+					. "Please speak to your instructor or system administrator."
+					if $ce->{debug_lti_parameters};
+				return $c->maketext("Account creation is currently disabled in this course.  "
+						. "Please speak to your instructor or system administrator.");
 			} else {
 				# Attempt to create the user, and warn if that fails.
-				unless ($self->create_user()) {
-					$c->maketext(
-						"There was an error during the login process.  Please speak to your instructor or system administrator."
-					);
+				unless ($self->create_user) {
 					$self->{log_error} .= "Failed to create user $userID.";
-					if ($ce->{debug_lti_parameters}) {
-						warn("Failed to create user $userID.");
-					}
+					warn "Failed to create user $userID.\n" if $ce->{debug_lti_parameters};
+					return $c->maketext('Unable to create a WeBWorK user. '
+							. 'Please speak to your instructor or system administrator.');
 				}
 			}
 		} elsif ($ce->{LMSManageUserData}) {
-			$self->{initial_login} = 1
-				; # Set here so login gets logged, even for accounts which maybe_update_user() would not modify or when it fails to update
-				  # Existing user. Possibly modify demographic information and permission level.
+			# Set here so login gets logged, even for accounts which maybe_update_user()
+			# would not modify or when it fails to update.
+			$self->{initial_login} = 1;
+
+			# Existing user. Possibly modify demographic information and permission level.
 			unless ($self->maybe_update_user()) {
- # Do not fail the login if data update failed
- # FIXME - In the future we would like the message below (and other warn messages in this file) to be sent via maketext.
-				warn(
-					"The system failed to update some of your account information. Please speak to your instructor or system administrator."
-				);
+				# Do not fail the login if data update failed
+				warn("The system failed to update some of your account information. "
+						. "Please speak to your instructor or system administrator.");
 			}
 		} else {
 			# Set here so login gets logged when $ce->{LMSManageUserData} is false
@@ -501,9 +483,8 @@ sub authenticate {
 	}
 
 	debug("LTIAdvanced is returning a failed authentication");
-	$self->{error} = $c->maketext(
+	return $c->maketext(
 		"There was an error during the login process.  Please speak to your instructor or system administrator.");
-	return (0);
 }
 
 # create a new user trying to log in
@@ -515,32 +496,35 @@ sub create_user {
 	my $db         = $c->db;
 	my $courseName = $c->ce->{'courseName'};
 
-	############################################################
 	# Determine the roles defined for this user by the LTI request
 	# and assign a permission level on that basis.
-	############################################################
+
 	my $LTIrolesString = $c->param("roles");
 	my @LTIroles       = split /,/, $LTIrolesString;
 
-	#remove the urn string if its present
+	# Remove the urn string if its present.
 	s/^urn:lti:.*:ims\/lis\/// for @LTIroles;
 
 	if ($ce->{debug_lti_parameters}) {
 		warn "The adjusted LTI roles defined for this user are: \n--",
-			join("\n--", @LTIroles), "\n",
+			join("\n-- ", @LTIroles), "\n",
 			"Any initial ^urn:lti:.*:ims/lis/ segments have been stripped off.\n",
 			"The user will be assigned the highest role defined for them\n",
 			"========================\n";
 	}
 
-	my $nr = scalar(@LTIroles);
-	if (!defined($ce->{userRoles}->{ $ce->{LTI}{v1p1}{LMSrolesToWeBWorKroles}->{ $LTIroles[0] } })) {
-		croak("Cannot find a WeBWorK role that corresponds to the LMS role of " . $LTIroles[0] . ".");
+	if (!defined $ce->{LTI}{v1p1}{LMSrolesToWeBWorKroles}{ $LTIroles[0] }
+		|| !defined $ce->{userRoles}{ $ce->{LTI}{v1p1}{LMSrolesToWeBWorKroles}{ $LTIroles[0] } })
+	{
+		$self->{log_error} = "Cannot find a WeBWorK role that corresponds to the LMS role of $LTIroles[0].";
+		warn "Cannot find a WeBWorK role that corresponds to the LMS role of $LTIroles[0].\n"
+			if $ce->{debug_lti_parameters};
+		return 0;
 	}
 
-	my $LTI_webwork_permissionLevel = $ce->{userRoles}->{ $ce->{LTI}{v1p1}{LMSrolesToWeBWorKroles}->{ $LTIroles[0] } };
-	if ($nr > 1) {
-		for (my $j = 1; $j < $nr; $j++) {
+	my $LTI_webwork_permissionLevel = $ce->{userRoles}{ $ce->{LTI}{v1p1}{LMSrolesToWeBWorKroles}{ $LTIroles[0] } };
+	if (@LTIroles > 1) {
+		for (my $j = 1; $j < @LTIroles; $j++) {
 			my $wwRole = $ce->{LTI}{v1p1}{LMSrolesToWeBWorKroles}->{ $LTIroles[$j] };
 			next unless defined $wwRole;
 			if ($LTI_webwork_permissionLevel < $ce->{userRoles}->{$wwRole}) {
@@ -549,20 +533,26 @@ sub create_user {
 		}
 	}
 
-	####### End defining roles and $LTI_webwork_permissionLevel#######
+	# End defining roles and $LTI_webwork_permissionLevel
 
 	warn "New user: $userID -- requested permission level is $LTI_webwork_permissionLevel."
-		if ($ce->{debug_lti_parameters});
+		if $ce->{debug_lti_parameters};
+
+	# Don't create a user that does not have permission to login.
+	if ($LTI_webwork_permissionLevel < $ce->{userRoles}{ $ce->{permissionLevels}{login} }) {
+		$self->{log_error} .= "$userID - no permission to login";
+		return 0;
+	}
 
-	# We dont create users with too high of a permission level
-	# for security reasons.
+	# We dont create users with too high of a permission level for security reasons.
 	if ($LTI_webwork_permissionLevel > $ce->{userRoles}->{ $ce->{LTIAccountCreationCutoff} }) {
 		$self->{log_error} .=
-			"userID: $userID -- Unknown instructor attempting to log in via LTI.  Instructor accounts must be created manually";
-		croak $c->maketext(
-			"The instructor account with user id [_1] does not exist.  Please create the account manually via WeBWorK.",
-			$userID
-		);
+			"The instructor account with user id $userID does not exist.  "
+			. 'Instructor accounts must be created manually.';
+		warn "The instructor account with user id $userID does not exist.  "
+			. "Instructor accounts must be created manually.\n"
+			if $ce->{debug_lti_parameters};
+		return 0;
 	}
 
 	my $newUser = $db->newUser();
@@ -584,6 +574,7 @@ sub create_user {
 	}
 
 	$db->addUser($newUser);
+	$self->{user} = $newUser;
 	$self->write_log_entry("New user $userID added via LTIAdvanced login");
 
 	# Assign permssion level
@@ -649,7 +640,6 @@ sub maybe_update_user {
 	my $db         = $c->db;
 	my $courseName = $c->ce->{'courseName'};
 
-	my $user            = $db->getUser($userID);
 	my $permissionLevel = $db->getPermissionLevel($userID);
 	# We don't alter records of users with too high a permission
 	if (defined($permissionLevel->permission)
@@ -684,10 +674,10 @@ sub maybe_update_user {
 		my $change_made = 0;
 
 		for my $element (@elements) {
-			if ($user->$element ne $tempUser->$element) {
+			if ($self->{user}->$element ne $tempUser->$element) {
 				$change_made = 1;
 				warn "WeBWorK User has $element: "
-					. $user->$element
+					. $self->{user}->$element
 					. " but LMS user has $element "
 					. $tempUser->$element . "\n"
 					if ($ce->{debug_lti_parameters});
diff --git a/lib/WeBWorK/Authen/LTIAdvanced/SubmitGrade.pm b/lib/WeBWorK/Authen/LTIAdvanced/SubmitGrade.pm
index 26aa71071d..5b175d0c74 100644
--- a/lib/WeBWorK/Authen/LTIAdvanced/SubmitGrade.pm
+++ b/lib/WeBWorK/Authen/LTIAdvanced/SubmitGrade.pm
@@ -298,7 +298,7 @@ EOS
 				}
 
 				# Blackboard seems to return this when there is no prior grade.
-				# See: https://webwork.maa.org/moodle/mod/forum/discuss.php?d=5002
+				# See: https://forums.openwebwork.org/mod/forum/discuss.php?d=5002
 				$priorScore = '' if $priorScore eq 'success';
 
 				# Do not update the score if there is no significant change. Note that the cases where the webwork score
diff --git a/lib/WeBWorK/Authen/LTIAdvantage.pm b/lib/WeBWorK/Authen/LTIAdvantage.pm
index c2a7351481..8be03a7c7a 100644
--- a/lib/WeBWorK/Authen/LTIAdvantage.pm
+++ b/lib/WeBWorK/Authen/LTIAdvantage.pm
@@ -34,7 +34,7 @@ sub request_has_data_for_this_verification_module ($self) {
 		return 1;
 	}
 
-	debug('LTIAdvantage returning that it has insufficent data');
+	debug('LTIAdvantage returning that it has insufficient data');
 	return 0;
 }
 
@@ -141,7 +141,8 @@ sub get_credentials ($self) {
 		}
 
 		# Fallback if necessary
-		if (!defined $self->{user_id}
+		if ($ce->{LTI}{v1p3}{fallback_source_of_username}
+			&& !defined $self->{user_id}
 			&& (my $user_id = $extract_claim->($ce->{LTI}{v1p3}{fallback_source_of_username})))
 		{
 			$user_id_source  = $ce->{LTI}{v1p3}{fallback_source_of_username};
@@ -235,21 +236,21 @@ sub check_user ($self) {
 		return 0;
 	}
 
-	my $User = $db->getUser($user_id);
+	$self->{user} = $db->getUser($user_id);
 
-	if (!$User) {
-		debug("User |$user_id| is unknown but may be an new user from an LMS via LTI.");
+	if (!$self->{user}) {
+		debug("User |$user_id| is unknown but may be a new user from an LMS via LTI.");
 		return 1;
 	}
 
-	unless ($ce->status_abbrev_has_behavior($User->status, 'allow_course_access')) {
-		$self->{log_error} .= "LOGIN FAILED $user_id - course access denied";
+	unless ($ce->status_abbrev_has_behavior($self->{user}->status, 'allow_course_access')) {
+		$self->{log_error} .= "$user_id - course access denied";
 		$self->{error} = $c->maketext('Authentication failed.  Please speak to your instructor.');
 		return 0;
 	}
 
 	unless ($authz->hasPermissions($user_id, 'login')) {
-		$self->{log_error} .= "LOGIN FAILED $user_id - no permission to login";
+		$self->{log_error} .= "$user_id - no permission to login";
 		$self->{error} = $c->maketext('Authentication failed.  Please speak to your instructor.');
 		return 0;
 	}
@@ -290,11 +291,9 @@ sub authenticate ($self) {
 
 	# The actual authentication for this module has already been done.  This just creates and updates users if needed.
 
-	my $ce         = $c->ce;
-	my $db         = $c->db;
-	my $courseName = $c->ce->{courseName};
+	my $ce = $c->ce;
 
-	if (!$db->existsUser($self->{user_id})) {
+	if (!$self->{user}) {
 		# New User. Create User record.
 		if ($ce->{block_lti_create_user}) {
 			$self->{log_error} .=
@@ -303,12 +302,15 @@ sub authenticate ($self) {
 				warn $c->maketext('Account creation is currently disabled in this course.  '
 						. 'Please speak to your instructor or system administrator.') . "\n";
 			}
-			return 0;
+			return $c->maketext("Account creation is currently disabled in this course.  "
+					. "Please speak to your instructor or system administrator.");
 		} else {
 			# Attempt to create the user, and warn if that fails.
 			unless ($self->create_user) {
 				$self->{log_error} .= "Failed to create user $self->{user_id}.";
-				warn "Failed to create user $self->{user_id}.\n" if ($ce->{debug_lti_parameters});
+				warn "Failed to create user $self->{user_id}.\n" if $ce->{debug_lti_parameters};
+				return $c->maketext('Unable to create a WeBWorK user. '
+						. 'Please speak to your instructor or system administrator.');
 			}
 		}
 	} elsif ($ce->{LMSManageUserData}) {
@@ -360,7 +362,10 @@ sub create_user ($self) {
 	}
 
 	if (!defined($ce->{userRoles}{ $ce->{LTI}{v1p3}{LMSrolesToWeBWorKroles}{ $LTIroles[0] } })) {
-		die "Cannot find a WeBWorK role that corresponds to the LMS role of $LTIroles[0].\n";
+		$self->{log_error} = "Cannot find a WeBWorK role that corresponds to the LMS role of $LTIroles[0].\n";
+		warn "Cannot find a WeBWorK role that corresponds to the LMS role of $LTIroles[0].\n"
+			if $ce->{debug_lti_parameters};
+		return 0;
 	}
 
 	my $LTI_webwork_permissionLevel = $ce->{userRoles}{ $ce->{LTI}{v1p3}{LMSrolesToWeBWorKroles}{ $LTIroles[0] } };
@@ -378,11 +383,19 @@ sub create_user ($self) {
 
 	# We dont create users with too high of a permission level for security reasons.
 	if ($LTI_webwork_permissionLevel > $ce->{userRoles}{ $ce->{LTIAccountCreationCutoff} }) {
-		die $c->maketext(
-			'The instructor account with user id [_1] does not exist.  '
-				. 'Instructor accounts must be created manually.',
-			$userID
-		) . "\n";
+		$self->{log_error} =
+			"The instructor account with user id $userID does not exist.  "
+			. 'Instructor accounts must be created manually.';
+		warn "The instructor account with user id $userID does not exist.  "
+			. "Instructor accounts must be created manually.\n"
+			if $ce->{debug_lti_parameters};
+		return 0;
+	}
+
+	# Don't create a user that does not have permission to login.
+	if ($LTI_webwork_permissionLevel < $ce->{userRoles}{ $ce->{permissionLevels}{login} }) {
+		$self->{log_error} .= "$userID - no permission to login";
+		return 0;
 	}
 
 	my $newUser = $db->newUser;
@@ -401,6 +414,7 @@ sub create_user ($self) {
 	$ce->{LTI}{v1p3}{modify_user}($self, $newUser) if ref($ce->{LTI}{v1p3}{modify_user}) eq 'CODE';
 
 	$db->addUser($newUser);
+	$self->{user} = $newUser;
 	$self->write_log_entry("New user $userID added via LTIAdvantange login");
 
 	# Set permission level.
@@ -466,7 +480,6 @@ sub maybe_update_user ($self) {
 	my $userID     = $self->{user_id};
 	my $courseName = $ce->{courseName};
 
-	my $user            = $db->getUser($userID);
 	my $permissionLevel = $db->getPermissionLevel($userID);
 
 	# We don't alter records of users with too high a permission.
@@ -492,10 +505,10 @@ sub maybe_update_user ($self) {
 
 		my $change_made = 0;
 		for my $element (qw(last_name first_name email_address status section recitation student_id)) {
-			if ($user->$element ne $tempUser->$element) {
+			if ($self->{user}->$element ne $tempUser->$element) {
 				$change_made = 1;
 				warn "WeBWorK User has $element: "
-					. $user->$element
+					. $self->{user}->$element
 					. " but LMS user has $element "
 					. $tempUser->$element . "\n"
 					if ($ce->{debug_lti_parameters});
diff --git a/lib/WeBWorK/Authen/Moodle.pm b/lib/WeBWorK/Authen/Moodle.pm
deleted file mode 100644
index 58eccc42cd..0000000000
--- a/lib/WeBWorK/Authen/Moodle.pm
+++ /dev/null
@@ -1,253 +0,0 @@
-package WeBWorK::Authen::Moodle;
-use base qw/WeBWorK::Authen/;
-
-=head1 NAME
-
-WeBWorK::Authen::Moodle - Allow moodle cookies to be used for WeBWorK authentication.
-
-=cut
-
-=for comment
-
-TODO
-
-* Modules that modify data that's being taken from moodle should check for "alternative URLs" in the
-CE that can point back to the moodle installation. operations include: change password, change user
-data, change permission level, add user, delete user. Run this for a rough estimate:
-	pcregrep -r '\$db->(add|put)(User|Password|PermissionLevel)\b' lib
-
-=cut
-
-use strict;
-use warnings;
-use Digest::MD5 qw/md5_hex/;
-use WeBWorK::Debug;
-use Date::Parse;    # for moodle 1.7 date parsing
-
-sub new {
-	my $self = shift->SUPER::new(@_);
-
-	$self->init_mdl_session;
-
-	return $self;
-}
-
-# call superclass get_credentials. if no credentials were found, look for a moodle cooke.
-# if a moodle cookie is found, a new webwork session is created and the session key is used.
-# (this is similar to what happens when a guest user is selected.)
-sub get_credentials {
-	my $self = shift;
-	my $c    = $self->{c};
-
-	my $super_result = $self->SUPER::get_credentials;
-	if ($super_result) {
-		debug("Superclass's get_credentials found credentials. Using them.\n");
-		return $super_result;
-	}
-
-	my ($moodle_user_id, $moodle_expiration_time) = $self->fetch_moodle_session;
-#debug("fetch_moodle_session returned: moodle_user_id='$moodle_user_id' moodle_expiration_time='$moodle_expiration_time'.\n"); # causes errors when undefined
-
-	if (defined $moodle_user_id and defined $moodle_expiration_time and time <= $moodle_expiration_time) {
-		my $newKey = $self->create_session($moodle_user_id);
-		debug("Unexpired moodle session found. Created new WeBWorK session with newKey='$newKey'.\n");
-
-		$self->{user_id}           = $moodle_user_id;
-		$self->{session_key}       = $newKey;
-		$self->{login_type}        = "normal";
-		$self->{credential_source} = "moodle";
-		return 1;
-	} else {
-		debug("No moodle session found or moodle session expired. No credentials to be had.\n");
-		warn(
-			"No moodle session found or moodle sessioin expired.  If this happens repeatedly and you are constantly being asked
-		      to log back in ask your moodle admin to check that the Moodle item:
-		      Server -> Session Handling -> dbsessions (Use database for session information) has been checked."
-		);
-	}
-
-	return 0;
-}
-
-# extend the moodle session if authentication succeeded
-sub site_fixup {
-	my $self = shift;
-
-	if ($self->was_verified) {
-		debug("User was verified, updating moodle session.\n");
-		$self->update_moodle_session;
-	}
-}
-
-# we assume that the database is set up to use the moodle password table, which uses MD5 passwords.
-# this is overridden to accommodate this.
-sub checkPassword {
-	my ($self, $userID, $possibleClearPassword) = @_;
-	my $db = $self->{c}->db;
-
-	debug("Moodle module is doing the password checking.\n");
-
-	my $Password = $db->getPassword($userID);    # checked
-	if (defined $Password) {
-		# check against Moodle password database
-		my $possibleMD5Password = md5_hex($possibleClearPassword);
-		debug("Hashed password from supplied cleartext: '$possibleMD5Password'.\n");
-		debug("Hashed password from Password record: '", $Password->password, "'.\n");
-		if ($possibleMD5Password eq $Password->password) {
-			$self->write_log_entry("AUTH MDL: password accepted");
-			return 1;
-		} else {
-			if ($self->can("site_checkPassword")) {
-				$self->write_log_entry("AUTH MDL: password rejected, deferring to site_checkPassword");
-				return $self->site_checkPassword($userID, $possibleClearPassword);
-			} else {
-				$self->write_log_entry("AUTH MDL: password rejected");
-				return 0;
-			}
-		}
-
-	}
-}
-
-sub check_session {
-	my ($self, $user_id, $session_key, $update_timestamp) = @_;
-
-	my ($sessionExists, $keyMatches, $timestampValid) =
-		$self->SUPER::check_session($user_id, $session_key, $update_timestamp);
-	debug(
-		"SUPER::check_session returned: sessionExists='",
-		$sessionExists,  "' keyMatches='",
-		$keyMatches,     "' timestampValid='",
-		$timestampValid, "'"
-	);
-
-	if ($update_timestamp and $sessionExists and $keyMatches and not $timestampValid) {
-		debug("special case: webwork key matches an expired session (check for a unexpired moodle session)");
-		my ($moodle_user_id, $moodle_expiration_time) = $self->fetch_moodle_session;
-		debug(
-			"fetch_moodle_session returned: moodle_user_id='$moodle_user_id' moodle_expiration_time='$moodle_expiration_time'.\n"
-		);
-		if (defined $moodle_user_id
-			and $moodle_user_id eq $user_id
-			and defined $moodle_expiration_time
-			and time <= $moodle_expiration_time)
-		{
-			$self->{session_key} = $self->create_session($moodle_user_id);
-			$timestampValid = 1;
-		}
-	}
-
-	return $sessionExists, $keyMatches, $timestampValid;
-}
-
-################################################################################
-
-use DBI;
-use PHP::Serialization qw/unserialize/;
-
-use constant DEFAULT_EXPIRY => 7200;
-
-sub init_mdl_session {
-	my $self = shift;
-
-	# version-specific stuff
-	$self->{moodle17}          = $self->{c}->ce->{authen}{moodle_options}{moodle17};
-	$self->{sql_session_table} = $self->{moodle17} ? "sessions2" : "sessions";
-	$self->{sql_data_field}    = $self->{moodle17} ? "sessdata"  : "data";
-
-	$self->{mdl_dbh} = DBI->connect_cached(
-		$self->{c}->ce->{authen}{moodle_options}{dsn},
-		$self->{c}->ce->{authen}{moodle_options}{username},
-		$self->{c}->ce->{authen}{moodle_options}{password},
-		{
-			PrintError => 0,
-			RaiseError => 1,
-		},
-	);
-	die $DBI::errstr unless defined $self->{mdl_dbh};
-}
-
-sub fetch_moodle_session {
-	# fetches the basic information from the moodle session.
-	# returns the user name and expiration time of the moodle session
-	# Note that we don't worry about the user being in this course at this point.
-	# That is taken care of in Schema::Moodle::User.
-	my ($self) = @_;
-	my $c      = $self->{c};
-	my $db     = $c->db;
-
-	my $cookie = $c->req->cookie('MoodleSession');
-	return unless $cookie;
-
-	my $session_table = $self->prefix_table($self->{sql_session_table});
-	my $data_field    = $self->{sql_data_field};
-	my $stmt          = "SELECT `expiry`,`$data_field` FROM `$session_table` WHERE `sesskey`=?";
-	my @bind_vals     = $cookie->value;
-
-	my $sth = $self->{mdl_dbh}->prepare_cached($stmt, undef, 3);    # 3: see DBI docs
-	$sth->execute(@bind_vals);
-	my $row = $sth->fetchrow_arrayref;
-	$sth->finish;
-	return unless defined $row;
-
-	my ($expires, $data_string) = @$row;
-
-	# Moodle 1.7 stores expiry as a DATETIME, but WeBWorK wants a UNIX timestamp.
-	$expires = str2time($expires) if $self->{moodle17};
-
-	my $data     = unserialize_session($data_string);
-	my $username = $data->{"USER"}{"username"};
-
-	return $username, $expires;
-}
-
-sub update_moodle_session {
-	# extend the timeout of the current moodle session, if one exists.
-	my ($self) = @_;
-	my $c      = $self->{c};
-	my $db     = $c->db;
-
-	my $cookie = $c->req->cookie('MoodleSession');
-	return unless $cookie;
-
-	my $config_table = $self->prefix_table("config");
-	my $value        = "IFNULL((SELECT `value` FROM `$config_table` WHERE `name`=?),?)+?";
-
-	# Moodle 1.7 stores expiry as a DATETIME, but WeBWorK supplies a UNIX timestamp.
-	$value = "FROM_UNIXTIME($value)" if $self->{moodle17};
-
-	my $session_table = $self->prefix_table($self->{sql_session_table});
-	my $stmt          = "UPDATE `$session_table` SET `expiry`=$value WHERE `sesskey`=?";
-	my @bind_vals     = ("sessiontimeout", DEFAULT_EXPIRY, time, $cookie->value);
-
-	my $sth    = $self->{mdl_dbh}->prepare_cached($stmt, undef, 3);    # 3: see DBI docs
-	my $result = $sth->execute(@bind_vals);
-	$sth->finish;
-
-	return defined $result;
-}
-
-sub prefix_table {
-	my ($self, $base) = @_;
-	if (defined $self->{c}->ce->{authen}{moodle_options}{table_prefix}) {
-		return $self->{c}->ce->{authen}{moodle_options}{table_prefix} . $base;
-	} else {
-		return $base;
-	}
-}
-
-sub unserialize_session {
-	my $serialData = shift;
-	# first, url decode:
-	$serialData =~ s/\%([A-Fa-f0-9]{2})/pack('C', hex($1))/seg;
-	# then, split it up by |, it's some ADODB sillyness
-	my @serialArray = split(/(\w+)\|/, $serialData);
-	my %variables;
-	# finally, actually deserialize it:
-	for (my $i = 1; $i < $#serialArray; $i += 2) {
-		$variables{ $serialArray[$i] } = unserialize($serialArray[ $i + 1 ]);
-	}
-	return \%variables;
-}
-
-1;
diff --git a/lib/WeBWorK/Authen/Shibboleth.pm b/lib/WeBWorK/Authen/Shibboleth.pm
index 498220f598..61e6d7f027 100644
--- a/lib/WeBWorK/Authen/Shibboleth.pm
+++ b/lib/WeBWorK/Authen/Shibboleth.pm
@@ -11,7 +11,7 @@ To use this module copy C to
 C, and uncomment the line in C
 that reads C.
 
-Refer to the L
+Refer to the L
 documentation on the WeBWorK wiki and the instructions in the comments of the
 C file.
 
diff --git a/lib/WeBWorK/Authz.pm b/lib/WeBWorK/Authz.pm
index a238f3fb67..784d97c8fb 100644
--- a/lib/WeBWorK/Authz.pm
+++ b/lib/WeBWorK/Authz.pm
@@ -46,7 +46,7 @@ use warnings;
 use Carp qw/croak/;
 
 use WeBWorK::Utils::DateTime qw(before);
-use WeBWorK::Utils::Sets     qw(is_restricted);
+use WeBWorK::Utils::Sets     qw(restricted_set_message);
 use WeBWorK::Authen::Proctor;
 use Net::IP;
 use Scalar::Util qw(weaken);
@@ -414,34 +414,35 @@ sub checkSet {
 	# Cache the set for future use as needed.  This should probably be more sophisticated than this.
 	$self->{merged_set} = $set;
 
+	# Save restricted set messages to show to instructors if they exist.
+	my $canViewUnopened = $self->hasPermissions($userName, "view_unopened_sets");
+	my @restrictedSetMessages;
+
 	# Now we know that the set is assigned to the appropriate user.
-	# Check to see if the user is trying to access a set that is not open.
-	if (
-		before($set->open_date)
-		&& !$self->hasPermissions($userName, "view_unopened_sets")
-		&& !(
-			defined $set->assignment_type
-			&& $set->assignment_type =~ /gateway/
-			&& $node_name eq 'problem_list'
-			&& $db->countSetVersions($effectiveUserName, $set->set_id)
-		)
-		)
-	{
-		return $c->maketext("Requested set '[_1]' is not yet open.", $setName);
-	}
+	# $c->{viewSetCheck} is used to configure what is shown on ProblemSet page.
 
 	# Check to make sure that the set is visible, and that the user is allowed to view hidden sets.
 	my $visible = $set && $set->visible ne '0' && $set->visible ne '1' ? 1 : $set->visible;
 	if (!$visible && !$self->hasPermissions($userName, "view_hidden_sets")) {
+		$c->{viewSetCheck} = 'hidden';
+		return $c->maketext("Requested set '[_1]' is not available.", $setName);
+	}
+
+	# Check to see if the user is trying to access a set that is not open.
+	if (before($set->open_date) && !$canViewUnopened) {
+		$c->{viewSetCheck} = 'not-open';
 		return $c->maketext("Requested set '[_1]' is not available yet.", $setName);
 	}
 
 	# Check to see if conditional release conditions have been met.
-	if ($ce->{options}{enableConditionalRelease}
-		&& is_restricted($db, $set, $effectiveUserName)
-		&& !$self->hasPermissions($userName, "view_unopened_sets"))
-	{
-		return $c->maketext("The prerequisite conditions have not been met for set '[_1]'.", $setName);
+	my $conditional_msg = restricted_set_message($c, $set, 'conditional');
+	if ($conditional_msg) {
+		if ($canViewUnopened) {
+			push(@restrictedSetMessages, $conditional_msg);
+		} else {
+			$c->{viewSetCheck} = 'restricted';
+			return $conditional_msg;
+		}
 	}
 
 	# Check to be sure that gateways are being sent to the correct content generator.
@@ -474,25 +475,27 @@ sub checkSet {
 
 	# Check for ip restrictions.
 	my $badIP = $self->invalidIPAddress($set);
-	return $badIP if $badIP;
-
-	# If LTI grade passback is enabled and set to 'homework' mode then we need to make sure that there is a sourcedid
-	# for this set before students access it.
-	my $LTIGradeMode = $ce->{LTIGradeMode} // '';
-
-	if ($LTIGradeMode eq 'homework' && !$self->hasPermissions($userName, "view_unopened_sets")) {
-		my $LMS =
-			$ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
-			? $c->link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
-			: $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name};
-		return $c->b($c->maketext(
-			'You must use your Learning Management System ([_1]) to access this set.  '
-				. 'Try logging in to the Learning Management System and visiting the set from there.',
-			$LMS
-		))
-			unless $set->lis_source_did || ($ce->{LTIVersion} eq 'v1p3' && $ce->{LTI}{v1p3}{ignoreMissingSourcedID});
+	if ($badIP) {
+		if ($self->hasPermissions($userName, 'view_ip_restricted_sets')) {
+			push(@restrictedSetMessages, $badIP);
+		} else {
+			$c->{viewSetCheck} = 'restricted';
+			return $badIP;
+		}
+	}
+
+	# Check for lis_source_did if LTI grade passback is 'homework'.
+	my $lti_msg = restricted_set_message($c, $set, 'lti');
+	if ($lti_msg) {
+		if ($canViewUnopened) {
+			push(@restrictedSetMessages, $lti_msg);
+		} else {
+			$c->{viewSetCheck} = 'restricted';
+			return $lti_msg;
+		}
 	}
 
+	$c->{restrictedSetMessages} = \@restrictedSetMessages if @restrictedSetMessages;
 	return 0;
 }
 
@@ -514,8 +517,7 @@ sub invalidIPAddress {
 	return 0
 		if (!defined($set->restrict_ip)
 			|| $set->restrict_ip eq ''
-			|| $set->restrict_ip eq 'No'
-			|| $self->hasPermissions($userName, 'view_ip_restricted_sets'));
+			|| $set->restrict_ip eq 'No');
 
 	my $clientIP = new Net::IP($c->tx->remote_address);
 
@@ -530,7 +532,9 @@ sub invalidIPAddress {
 	# if there are no addresses in the locations, return an error that
 	#    says this
 	return $c->maketext(
-		"Client ip address [_1] is not allowed to work this assignment, because the assignment has ip address restrictions and there are no allowed locations associated with the restriction.  Contact your professor to have this problem resolved.",
+		'Client ip address [_1] is not allowed to work this assignment, because the assignment has ip address '
+			. 'restrictions and there are no allowed locations associated with the restriction.  Contact your '
+			. 'professor to have this problem resolved.',
 		$clientIP->ip()
 	) if (!@restrictAddresses);
 
@@ -552,17 +556,13 @@ sub invalidIPAddress {
 	# this is slightly complicated by having to check relax_restrict_ip
 	my $badIP = '';
 	if ($restrictType eq 'RestrictTo' && !$inRestrict) {
-		$badIP =
-			"Client ip address "
-			. $clientIP->ip()
-			. " is not in the list of addresses from "
-			. "which this assignment may be worked.";
+		$badIP = $c->maketext(
+			'Client ip address [_1] is not in the list of addresses from which this assignment may be worked.',
+			$clientIP->ip());
 	} elsif ($restrictType eq 'DenyFrom' && $inRestrict) {
-		$badIP =
-			"Client ip address "
-			. $clientIP->ip()
-			. " is in the list of addresses from "
-			. "which this assignment may not be worked.";
+		$badIP = $c->maketext(
+			'Client ip address [_1] is in the list of addresses from which this assignment may not be worked.',
+			$clientIP->ip());
 	} else {
 		return 0;
 	}
diff --git a/lib/WeBWorK/ConfigValues.pm b/lib/WeBWorK/ConfigValues.pm
index 411be4426c..2a6f75ea5d 100644
--- a/lib/WeBWorK/ConfigValues.pm
+++ b/lib/WeBWorK/ConfigValues.pm
@@ -213,7 +213,7 @@ sub getConfigValues ($ce) {
 			{
 				var     => 'hardcopyThemePGEditor',
 				doc     => x('Hardcopy Theme for Problem Editor'),
-				doc2    => x('Choose a layout/styling theme for PDF hardcopy production from the Prooblem Editor.'),
+				doc2    => x('Choose a layout/styling theme for PDF hardcopy production from the Problem Editor.'),
 				values  => [qw(empty.xml)],
 				type    => 'popuplist',
 				hashVar => '{hardcopyThemePGEditor}'
@@ -278,8 +278,8 @@ sub getConfigValues ($ce) {
 					"Achievements are a way to gamify WeBWorK. In parallel to a student's regular scores on "
 						. 'assignments, they earn "achievement points" for (a) answering an exercise correctly, and '
 						. '(b) earning badges. Badges can be for tasks like earning 100% on three assignments, '
-						. 'answering five questions correclty on the first attempt, etc. As students earn achivement '
-						. 'points, they can "level up" as well. An instructor can manage Achievents using the '
+						. 'answering five questions correctly on the first attempt, etc. As students earn achievement '
+						. 'points, they can "level up" as well. An instructor can manage Achievements using the '
 						. 'Achievements Manager tool.'
 				),
 				type => 'boolean'
@@ -321,6 +321,21 @@ sub getConfigValues ($ce) {
 				),
 				type => 'boolean'
 			},
+			{
+				var  => 'achievementExtensionFactor',
+				doc  => x('Multiplicative time factor for extension achievement items'),
+				doc2 => x(
+					'This sets the time factor which affects the extension time for the extension achievement items. '
+						. 'This factor is multiplied by the base extension time of 24 hours to determine the '
+						. 'extension time. In effect, this is the number of days of the extension. If this factor is '
+						. 'not a whole number, then the resulting time is rounded to the nearest full hour, and '
+						. 'cannot be less than 1 hour. This affects the extension achievement items "ExtendDueDate", '
+						. '"ExtendDueDateGW", "ExtendReducedDate", "ReducedCred", "ResurrectGW", and "ResurrectHW". '
+						. 'The two super extensions, "SuperExtendDueDate" and "SuperExtendedReducedDate", will have '
+						. 'double the time.'
+				),
+				type => 'number'
+			},
 			{
 				var  => 'achievementExcludeSet',
 				doc  => x('List of sets excluded from achievements'),
@@ -545,8 +560,8 @@ sub getConfigValues ($ce) {
 				var  => 'permissionLevels{report_bugs}',
 				doc  => x('Can report bugs'),
 				doc2 => x(
-					'Users with at least this permission level get a link in the left panel for reporting bugs to the '
-						. 'bug tracking system at bugs.webwork.maa.org.'
+					'Users with at least this permission level get a link in the left panel for reporting issues at '
+						. 'github.com/openwebwork/webwork2.'
 				),
 				type => 'permission'
 			},
@@ -776,12 +791,12 @@ sub getConfigValues ($ce) {
 			},
 			{
 				var  => 'problemGraderScore',
-				doc  => x('Method to enter problem scores in the single problem manual grader'),
+				doc  => x('Method to enter problem scores in the manual problem graders'),
 				doc2 => x(
-					'This configures if the single problem manual grader has inputs to enter problem scores as '
-						. 'a percent, a point value, or both. Note, the problem score is always saved as a '
-						. 'percent, so when using a point value, the problem score will be rounded to the '
-						. 'nearest whole percent.'
+					'This configures if the manual problem grader or single problem grader has inputs to enter '
+						. 'problem scores as a percent, a point value, or both. Note, the problem score is always '
+						. 'saved as a percent, so when using a point value, the problem score will be rounded to '
+						. 'the nearest whole percent.'
 				),
 				values => [qw(Percent Point Both)],
 				type   => 'popuplist'
@@ -796,7 +811,7 @@ sub getConfigValues ($ce) {
 						. 'the "Check Answers" button. Or if that button is also not present, it will activate '
 						. 'the "Preview My Answers" button. A third option is "conservative". In this case, the '
 						. 'enter key behaves like "preview" when the "Submit" button is available and there are '
-						. 'only finitely many attempts allowed. Otherise the enter key behaves like "submit". '
+						. 'only finitely many attempts allowed. Otherwise the enter key behaves like "submit". '
 						. 'Note that this is only affects homework problem pages, not test/quiz pages, and not '
 						. 'instructor pages like the PG Editor and the Library Browser.'
 				),
@@ -820,7 +835,8 @@ sub getConfigValues ($ce) {
 				doc2 => x(
 					'A "Reveal" button must be clicked to make a correct answer visible any time that correct '
 						. 'answers for a problem are shown. Note that this is always the case for instructors '
-						. 'before answers are available to students, and in "Show Me Another" problems.'
+						. 'before answers are available to students (except when the problem grader is open), and '
+						. 'in "Show Me Another" problems.'
 				),
 				type => 'boolean'
 			}
@@ -829,13 +845,15 @@ sub getConfigValues ($ce) {
 			x('E-Mail'),
 			{
 				var  => 'mail{feedbackSubjectFormat}',
-				doc  => x('Format for the subject line in feedback emails'),
+				doc  => x('Format for the subject of feedback emails'),
 				doc2 => x(
-					'When students click the Email Instructor button to send feedback, WeBWorK fills in the '
-						. 'subject line. Here you can set the subject line. In it, you can have various bits of '
-						. 'information filled in with the following escape sequences.
  • %c = course ID
    • '
+					'
    When students click the Email Instructor button to send feedback, WeBWorK fills in '
+						. 'the subject line. Here you can set the subject line. In it, you can have various bits of '
+						. 'information filled in with the following escape sequences.
    • %c = course ID
      • '
 						. '
    • %u = user ID
    • %s = set ID
    • %p = problem ID
    • %x = section
      • '
-						. '
    • %r = recitation
    • %% = literal percent sign
    '
+						. '
  • %r = recitation
  • %% = literal percent sign
If content is between '
+						. "a brace pair, like '{ rec:%r}', then it will only be included in the subject line if all "
+						. 'substitutions within the double brace pair are defined and nonempty.'
 				),
 				width => 45,
 				type  => 'text'
@@ -1152,13 +1170,15 @@ sub getConfigValues ($ce) {
 	};
 
 	# Get the list of theme folders in the theme directory.
-	my $themes = eval { path($ce->{webworkDirs}{themes})->list({ dir => 1 })->map('basename')->sort; };
+	my $themes = eval {
+		path($ce->{webworkDirs}{themes})->list({ dir => 1 })->grep(sub {-d})->map('basename')->sort;
+	};
 	die "can't opendir $ce->{webworkDirs}{themes}: $@" if $@;
 
 	# Get the list of all site hardcopy theme files.
 	my $hardcopyThemesSite =
 		eval { path($ce->{webworkDirs}{hardcopyThemes})->list->grep(qr/\.xml$/)->map('basename')->sort };
-	die "Unabled to list files in  $ce->{webworkDirs}{hardcopyThemes}: $@" if $@;
+	die "Unable to list files in  $ce->{webworkDirs}{hardcopyThemes}: $@" if $@;
 
 	my $hardcopyThemesCourse = eval {
 		path($ce->{courseDirs}{hardcopyThemes})->list->grep(sub {
@@ -1190,7 +1210,8 @@ sub getConfigValues ($ce) {
 	# Get list of localization dictionaries.
 	my $languages = eval {
 		my %seen;
-		path($ce->{webworkDirs}{localize})->list->grep(qr/\.mo$|\.po$/)->map(sub { $_->basename =~ s/\.[pm]o$//r })
+		path($ce->{webworkDirs}{localize})->list->grep(qr/\.mo$|\.po$/)
+			->map(sub { $_->basename =~ s/\.[pm]o$//r })
 			->grep(sub { !$seen{$_}++ });
 	};
 	die "Unable to list files in $ce->{webworkDirs}{localize}: $@" if $@;
diff --git a/lib/WeBWorK/ContentGenerator.pm b/lib/WeBWorK/ContentGenerator.pm
index 3e069f2a03..2bd7756686 100644
--- a/lib/WeBWorK/ContentGenerator.pm
+++ b/lib/WeBWorK/ContentGenerator.pm
@@ -32,6 +32,7 @@ use MIME::Base64;
 use Scalar::Util qw(weaken);
 use HTML::Entities;
 use Encode;
+use Mojo::JSON qw(encode_json true);
 
 use WeBWorK::File::Scoring qw(parse_scoring_file);
 use WeBWorK::Localize;
@@ -94,7 +95,7 @@ The method content() is called to send the page content to client.
 async sub go ($c) {
 	my $ce = $c->ce;
 
-	# If grades are being passed back to the lti, then peroidically update all of the
+	# If grades are being passed back to the lti, then periodically update all of the
 	# grades because things can get out of sync if instructors add or modify sets.
 	massUpdate($c) if $c->stash('courseID') && ref($c->db) && $ce->{LTIGradeMode};
 
@@ -109,8 +110,6 @@ async sub go ($c) {
 
 	my $tx = $c->render_later->tx;
 
-	$c->stash->{footerWidthClass} = $c->can('info') ? 'col-md-8' : 'col-12';
-
 	if ($c->can('pre_header_initialize')) {
 		my $pre_header_initialize = $c->pre_header_initialize;
 		await $pre_header_initialize
@@ -132,6 +131,8 @@ async sub go ($c) {
 		await $initialize if ref $initialize eq 'Future' || ref $initialize eq 'Mojo::Promise';
 	}
 
+	$c->stash->{footerWidthClass} //= $c->can('info') ? 'col-md-8' : 'col-12';
+
 	$c->content;
 
 	# All content generator modules must have rendered at this point unless there was an error in which case an error
@@ -646,7 +647,7 @@ sub timestamp ($c) {
 Defined in this package.
 
 Print any messages (error or non-error) resulting from the last form submission.
-This could be used to give Sucess and Failure messages after an action is performed by a module.
+This could be used to give Success and Failure messages after an action is performed by a module.
 
 The implementation in this package outputs the value of the field
 $c->{status_message}, if it is present.
@@ -682,20 +683,19 @@ sub page_title ($c) {
 	return route_title($c, $c->current_route, 1);
 }
 
-=item webwork_url
-
-Defined in this package.
-
-Outputs the $webwork_url defined in site.conf, unless $webwork_url is equal to
-"/", in which case this outputs the empty string.
+=item webwork_js_config
 
-This is used to set a value in a global webworkConfig javascript variable,
-that can be accessed in javascript files.
+Outputs the webwork2 JavaScript configuration.  This configuration can be
+accessed by JavaScript files to obtain various webwork2 settings.
 
 =cut
 
-sub webwork_url ($c) {
-	return $c->location;
+sub webwork_js_config ($c, $showMathJaxErrors = 0) {
+	return encode_json({
+		webwork_url             => $c->location,
+		mathJaxBSColorSchemeUrl => getAssetURL($c->ce, 'js/MathJaxConfig/bs-color-scheme.js'),
+		$showMathJaxErrors ? (showMathJaxErrors => true) : ()
+	});
 }
 
 =item warnings()
@@ -813,7 +813,7 @@ there are pg errors.
 =cut
 
 sub have_warnings ($c) {
-	return $c->stash('warnings') || $c->{pgerrors};
+	return $c->stash('warnings');
 }
 
 =item exists_theme_file
@@ -1122,7 +1122,7 @@ object from which the base path will be taken. %options can consist of:
 
 Can be either a reference to an array or a reference to a hash.
 
-If it is a reference to a hash, it maps parmaeter names to values. These
+If it is a reference to a hash, it maps parameter names to values. These
 parameters will be included in the generated link. If a value is an arrayref,
 the values of the array referenced will be used. If a value is undefined, the
 value from the current request will be used.
@@ -1220,8 +1220,8 @@ Used to display a generic warning message at the top of the page
 =cut
 
 sub warningMessage ($c) {
-	return $c->maketext('Warning: There may be something wrong with this question. '
-			. 'Please inform your instructor including the warning messages below.');
+	return $c->maketext('Warning: WeBWorK has encountered warnings while processing your request. '
+			. 'See the warning messages below for details.');
 }
 
 =item $string = formatDateTime($date_time, $format_string, $timezone, $locale)
@@ -1238,7 +1238,7 @@ If C<$locale> is provided, the string returned will be in the format of that
 locale. If C<$locale> is not provided, Perl defaults to using C.
 
 Note that the defaults for C<$timezone> and C<$locale> should almost never be
-overriden when this method is used.
+overridden when this method is used.
 
 =cut
 
diff --git a/lib/WeBWorK/ContentGenerator/CourseAdmin.pm b/lib/WeBWorK/ContentGenerator/CourseAdmin.pm
index 02f1467544..9f611899c9 100644
--- a/lib/WeBWorK/ContentGenerator/CourseAdmin.pm
+++ b/lib/WeBWorK/ContentGenerator/CourseAdmin.pm
@@ -226,7 +226,7 @@ sub pre_header_initialize ($c) {
 				$method_to_call = 'do_registration';
 			}
 		} else {
-			@errors = "Unrecognized sub-display @{[ $c->tag('b', $subDisplay) ]}.";
+			@errors = "Unrecognized sub-display $subDisplay.";
 		}
 	}
 
@@ -294,8 +294,6 @@ sub do_add_course ($c) {
 
 	my $ce2 = WeBWorK::CourseEnvironment->new({ courseName => $add_courseID });
 
-	my %courseOptions;
-
 	my @users;
 
 	# copy users from current (admin) course if desired
@@ -376,15 +374,15 @@ sub do_add_course ($c) {
 		}
 	}
 
-	push @{ $courseOptions{PRINT_FILE_NAMES_FOR} },
-		map { $_->[0]->user_id } grep { $_->[2]->permission >= $ce->{userRoles}{professor} } @users;
-
 	# Include any optional arguments, including a template course and the course title and course institution.
 	my %optional_arguments;
 	if ($copy_from_course ne '') {
-		%optional_arguments             = map { $_ => 1 } $c->param('copy_component');
-		$optional_arguments{copyFrom}   = $copy_from_course;
-		$optional_arguments{copyConfig} = $c->param('copy_config_file');
+		%optional_arguments = map { $_ => 1 } $c->param('copy_component');
+		$optional_arguments{copyFrom} = $copy_from_course;
+		$optional_arguments{copyConfig} =
+			$c->param('copy_config_file') || ($c->param('add_on_conf') && $c->param('add_on_conf') eq '*');
+		$optional_arguments{addOnConf} =
+			$c->param('add_on_conf') && $c->param('add_on_conf') ne '*' ? [ $c->param('add_on_conf') ] : [];
 	}
 	if ($add_courseTitle ne '') {
 		$optional_arguments{courseTitle} = $add_courseTitle;
@@ -395,15 +393,7 @@ sub do_add_course ($c) {
 
 	my $output = $c->c;
 
-	eval {
-		addCourse(
-			courseID      => $add_courseID,
-			ce            => $ce2,
-			courseOptions => \%courseOptions,
-			users         => \@users,
-			%optional_arguments,
-		);
-	};
+	eval { addCourse(courseID => $add_courseID, ce => $ce2, users => \@users, %optional_arguments,); };
 	if ($@) {
 		my $error = $@;
 		push(
@@ -707,9 +697,10 @@ sub do_rename_course ($c) {
 
 	eval {
 		renameCourse(
-			courseID    => $rename_oldCourseID,
-			ce          => WeBWorK::CourseEnvironment->new({ courseName => $rename_oldCourseID }),
-			newCourseID => $rename_newCourseID,
+			courseID           => $rename_oldCourseID,
+			ce                 => WeBWorK::CourseEnvironment->new({ courseName => $rename_oldCourseID }),
+			newCourseID        => $rename_newCourseID,
+			updateLTICourseMap => 1,
 			%optional_arguments
 		);
 	};
diff --git a/lib/WeBWorK/ContentGenerator/Feedback.pm b/lib/WeBWorK/ContentGenerator/Feedback.pm
index 336e5fc127..419665fd60 100644
--- a/lib/WeBWorK/ContentGenerator/Feedback.pm
+++ b/lib/WeBWorK/ContentGenerator/Feedback.pm
@@ -12,7 +12,7 @@ use Email::Stuffer;
 use Try::Tiny;
 
 use WeBWorK::Upload;
-use WeBWorK::Utils qw(createEmailSenderTransportSMTP fetchEmailRecipients);
+use WeBWorK::Utils qw(createEmailSenderTransportSMTP fetchEmailRecipients formatEmailSubject);
 
 # request paramaters used
 #
@@ -108,18 +108,15 @@ sub initialize ($c) {
 			}
 		}
 
-		my %subject_map = (
-			'c' => $courseID,
-			'u' => $user    ? $user->user_id       : undef,
-			's' => $set     ? $set->set_id         : undef,
-			'p' => $problem ? $problem->problem_id : undef,
-			'x' => $user    ? $user->section       : undef,
-			'r' => $user    ? $user->recitation    : undef,
-			'%' => '%',
+		my $subject = formatEmailSubject(
+			$ce->{mail}{feedbackSubjectFormat},
+			$courseID,
+			$user    ? $user->user_id       : '',
+			$set     ? $set->set_id         : '',
+			$problem ? $problem->problem_id : '',
+			$user    ? $user->section       : '',
+			$user    ? $user->recitation    : ''
 		);
-		my $chars   = join('', keys %subject_map);
-		my $subject = $ce->{mail}{feedbackSubjectFormat} || 'WeBWorK question from %c: %u set %s/prob %p';
-		$subject =~ s/%([$chars])/defined $subject_map{$1} ? $subject_map{$1} : ''/eg;
 
 		my %data = (
 			user         => $user,
@@ -133,7 +130,8 @@ sub initialize ($c) {
 		);
 
 		my $email =
-			Email::Stuffer->to(join(',', @recipients))->subject($subject)
+			Email::Stuffer->to(join(',', @recipients))
+			->subject($subject)
 			->text_body($c->render_to_string('ContentGenerator/Feedback/feedback_email', format => 'txt', %data))
 			->html_body($c->render_to_string('ContentGenerator/Feedback/feedback_email', %data))
 			->header('X-Remote-Host' => $data{remote_host});
diff --git a/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm b/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
index 7cec7a5b6d..a939a494f6 100644
--- a/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
+++ b/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
@@ -282,14 +282,15 @@ sub get_instructor_comment ($c, $problem) {
 
 async sub pre_header_initialize ($c) {
 	# Make sure these are defined for the templates.
-	$c->stash->{problems}        = [];
-	$c->stash->{pg_results}      = [];
-	$c->stash->{startProb}       = 0;
-	$c->stash->{endProb}         = 0;
-	$c->stash->{numPages}        = 0;
-	$c->stash->{pageNumber}      = 0;
-	$c->stash->{problem_numbers} = [];
-	$c->stash->{probOrder}       = [];
+	$c->stash->{problems}            = [];
+	$c->stash->{pg_results}          = [];
+	$c->stash->{startProb}           = 0;
+	$c->stash->{endProb}             = 0;
+	$c->stash->{numPages}            = 0;
+	$c->stash->{pageNumber}          = 0;
+	$c->stash->{problem_numbers}     = [];
+	$c->stash->{probOrder}           = [];
+	$c->stash->{haveProblemWarnings} = 0;
 
 	# If authz->checkSet has failed, then this set is invalid.  No need to proceeded.
 	return if $c->{invalidSet};
@@ -510,7 +511,6 @@ async sub pre_header_initialize ($c) {
 	my $maxAttemptsPerVersion = $tmplSet->attempts_per_version  || 0;
 	my $timeInterval          = $tmplSet->time_interval         || 0;
 	my $versionsPerInterval   = $tmplSet->versions_per_interval || 0;
-	my $timeLimit             = $tmplSet->version_time_limit    || 0;
 
 	# What happens if someone didn't set one of these?  Perhaps this can happen if we're handed a malformed set, where
 	# the values in the database are null.
@@ -596,7 +596,8 @@ async sub pre_header_initialize ($c) {
 					$set = $db->getMergedSetVersion($effectiveUserID, $setID, $setVersionNumber);
 					$set->visible(1);
 
-				# If there is a cap on problems per page, make sure that is respected in case something higher snuck in.
+					# If there is a cap on problems per page, make sure that is respected
+					# in case something higher snuck in.
 					if (
 						$ce->{test}{maxProblemsPerPage}
 						&& ($tmplSet->problems_per_page == 0
@@ -611,6 +612,8 @@ async sub pre_header_initialize ($c) {
 					# Convert the floating point value from Time::HiRes to an integer for use below. Truncate toward 0.
 					my $timeNowInt = int($c->submitTime);
 
+					my $timeLimit = ($tmplSet->version_time_limit || 0) * $effectiveUser->accommodation_time_factor;
+
 					# Set up creation time, and open and due dates.
 					my $ansOffset = $set->answer_date - $set->due_date;
 					$set->version_creation_time($timeNowInt);
@@ -633,7 +636,7 @@ async sub pre_header_initialize ($c) {
 					$cleanSet->due_date($set->due_date);
 					$cleanSet->answer_date($set->answer_date);
 					$cleanSet->version_last_attempt_time($set->version_last_attempt_time);
-					$cleanSet->version_time_limit($set->version_time_limit);
+					$cleanSet->version_time_limit($set->version_time_limit * $effectiveUser->accommodation_time_factor);
 					$cleanSet->attempts_per_version($set->attempts_per_version);
 					$cleanSet->assignment_type($set->assignment_type);
 					$db->putSetVersion($cleanSet);
@@ -788,14 +791,11 @@ async sub pre_header_initialize ($c) {
 		return;
 	}
 
-	# Unset the showProblemGrader parameter if the "Hide Problem Grader" button was clicked.
-	$c->param(showProblemGrader => undef) if $c->param('hideProblemGrader');
-
 	# What does the user want to do?
 	my %want = (
 		showOldAnswers     => $user->showOldAnswers ne '' ? $user->showOldAnswers : $ce->{pg}{options}{showOldAnswers},
 		showCorrectAnswers => 1,
-		showProblemGrader  => $c->param('showProblemGrader') || 0,
+		showProblemGrader  => $userID ne $effectiveUserID,
 		showHints          => 0,    # Hints are not yet implemented in gateway quzzes.
 		showSolutions      => 1,
 		recordAnswers      => $c->{submitAnswers} && !$authz->hasPermissions($userID, 'avoid_recording_answers'),
@@ -895,9 +895,6 @@ async sub pre_header_initialize ($c) {
 	my @problems;
 	my @pg_results;
 
-	# pg errors are stored here.
-	$c->{errors} = [];
-
 	# Process the problems as needed.
 	my @mergedProblems;
 	if ($setID eq 'Undefined_Set') {
@@ -1321,7 +1318,8 @@ async sub pre_header_initialize ($c) {
 	} elsif ($endTime > $set->due_date) {
 		$c->{exceededAllowedTime} = 1;
 	}
-	$c->{elapsedTime} = int(($endTime - $set->open_date) / 0.6 + 0.5) / 100;
+	$c->{elapsedTime}   = int(($endTime - $set->open_date) / 0.6 + 0.5) / 100;
+	$c->{completedTime} = $c->formatDateTime($endTime, $ce->{studentDateDisplayFormat});
 
 	# Get the number of attempts and number of remaining attempts.
 	$c->{attemptNumber} =
@@ -1354,7 +1352,7 @@ sub path ($c, $args) {
 		$courseName => $navigation_allowed ? $c->url_for('set_list') : '',
 		$setID eq 'Undefined_Set'
 			|| $c->{invalidSet} || $c->{actingCreationError} || $c->stash->{actingConfirmation}
-		? ($setID => '')
+		? ($setID =~ /^(.+),(v\d+)$/ ? ($1 => $c->url_for('problem_list', setID => $1), $2 => '') : ($setID => ''))
 		: (
 			$c->{set}->set_id           => $c->url_for('problem_list', setID => $c->{set}->set_id),
 			'v' . $c->{set}->version_id => ''
@@ -1370,7 +1368,7 @@ sub nav ($c, $args) {
 	return '' if $c->{invalidSet} || $c->{actingCreationError} || $c->stash->{actingConfirmation};
 
 	# Set up and display a student navigation for those that have permission to act as a student.
-	if ($c->authz->hasPermissions($userID, 'become_student') && $effectiveUserID ne $userID) {
+	if ($c->authz->hasPermissions($userID, 'become_student')) {
 		my $setID = $c->{set}->set_id;
 
 		return '' if $setID eq 'Undefined_Set';
@@ -1378,82 +1376,90 @@ sub nav ($c, $args) {
 		my $setVersion = $c->{set}->version_id;
 
 		# Find all versions of this set that have been taken (excluding those taken by the current user).
-		my @users =
-			$db->listSetVersionsWhere({ user_id => { not_like => $userID }, set_id => { like => "$setID,v\%" } });
-		my @allUserRecords = $db->getUsers(map { $_->[0] } @users);
-
-		my $filter = $c->param('studentNavFilter');
-
-		# Format the student names for display, and associate the users with the test versions.
-		my %filters;
-		my @userRecords;
-		for (0 .. $#allUserRecords) {
-			# Add to the sections and recitations if defined.  Also store the first user found in that section or
-			# recitation.  This user will be switched to when the filter is selected.
-			my $section = $allUserRecords[$_]->section;
-			$filters{"section:$section"} =
-				[ $c->maketext('Filter by section [_1]', $section), $allUserRecords[$_]->user_id, $users[$_][2] ]
-				if $section && !$filters{"section:$section"};
-			my $recitation = $allUserRecords[$_]->recitation;
-			$filters{"recitation:$recitation"} =
-				[ $c->maketext('Filter by recitation [_1]', $recitation), $allUserRecords[$_]->user_id, $users[$_][2] ]
-				if $recitation && !$filters{"recitation:$recitation"};
-
-			# Only keep this user if it satisfies the selected filter if a filter was selected.
-			next
-				unless !$filter
-				|| ($filter =~ /^section:(.*)$/    && $allUserRecords[$_]->section eq $1)
-				|| ($filter =~ /^recitation:(.*)$/ && $allUserRecords[$_]->recitation eq $1);
-
-			my $addRecord = $allUserRecords[$_];
-			push @userRecords, $addRecord;
-
-			$addRecord->{displayName} =
-				($addRecord->last_name || $addRecord->first_name
-					? $addRecord->last_name . ', ' . $addRecord->first_name
-					: $addRecord->user_id);
-			$addRecord->{setVersion} = $users[$_][2];
-		}
+		my @userVersions =
+			$db->listSetVersionsWhere({ user_id => { '!=' => $userID }, set_id => { like => "$setID,v\%" } });
+		my %users = map { $_->[0] => 1 } @userVersions;
+		my @allUserRecords =
+			grep { $users{ $_->{user_id} } }
+			$c->db->getUsersWhere({ -and => { user_id => { not_like => 'set_id:%' } }, user_id => { '!=' => $userID } },
+				[qw/last_name first_name user_id/]);
+
+		if (@allUserRecords) {
+			my $filter = $c->param('studentNavFilter');
+
+			# Format the student names for display, and associate the users with the test versions.
+			my %filters;
+			my @userRecords;
+			for (0 .. $#allUserRecords) {
+				# Add to the sections and recitations if defined.  Also store the first user found in that section or
+				# recitation.  This user will be switched to when the filter is selected.
+				my $section = $allUserRecords[$_]->section;
+				$filters{"section:$section"} = [
+					$c->maketext('Filter by section [_1]', $section), $allUserRecords[$_]->user_id,
+					$userVersions[$_][2]
+					]
+					if $section && !$filters{"section:$section"};
+				my $recitation = $allUserRecords[$_]->recitation;
+				$filters{"recitation:$recitation"} = [
+					$c->maketext('Filter by recitation [_1]', $recitation), $allUserRecords[$_]->user_id,
+					$userVersions[$_][2]
+					]
+					if $recitation && !$filters{"recitation:$recitation"};
+
+				# Only keep this user if it satisfies the selected filter if a filter was selected.
+				next
+					unless !$filter
+					|| ($filter =~ /^section:(.*)$/    && $allUserRecords[$_]->section eq $1)
+					|| ($filter =~ /^recitation:(.*)$/ && $allUserRecords[$_]->recitation eq $1);
+
+				my $addRecord = $allUserRecords[$_];
+				push @userRecords, $addRecord;
+
+				$addRecord->{displayName} =
+					($addRecord->last_name || $addRecord->first_name
+						? $addRecord->last_name . ', ' . $addRecord->first_name
+						: $addRecord->user_id);
+				$addRecord->{setVersion} = $userVersions[$_][2];
+			}
 
-		# Sort by last name, then first name, then user_id, then set version.
-		@userRecords = sort {
-			lc($a->last_name) cmp lc($b->last_name)
-				|| lc($a->first_name) cmp lc($b->first_name)
-				|| lc($a->user_id) cmp lc($b->user_id)
-				|| lc($a->{setVersion}) <=> lc($b->{setVersion})
-		} @userRecords;
-
-		# Find the previous, current, and next test.
-		my $currentTestIndex = 0;
-		for (0 .. $#userRecords) {
-			if ($userRecords[$_]->user_id eq $effectiveUserID && $userRecords[$_]->{setVersion} == $setVersion) {
-				$currentTestIndex = $_;
-				last;
+			# Sort by last name, then first name, then user_id, then set version.
+			@userRecords = sort {
+				lc($a->last_name) cmp lc($b->last_name)
+					|| lc($a->first_name) cmp lc($b->first_name)
+					|| lc($a->user_id) cmp lc($b->user_id)
+					|| lc($a->{setVersion}) <=> lc($b->{setVersion})
+			} @userRecords;
+
+			# Find the previous, current, and next test.
+			my $currentTestIndex = 0;
+			for (0 .. $#userRecords) {
+				if ($userRecords[$_]->user_id eq $effectiveUserID && $userRecords[$_]->{setVersion} == $setVersion) {
+					$currentTestIndex = $_;
+					last;
+				}
 			}
+			my $prevTest = $currentTestIndex > 0             ? $userRecords[ $currentTestIndex - 1 ] : 0;
+			my $nextTest = $currentTestIndex < $#userRecords ? $userRecords[ $currentTestIndex + 1 ] : 0;
+
+			# Mark the current test.
+			$userRecords[$currentTestIndex]{currentTest} = 1;
+
+			# Show the student nav.
+			return $c->include(
+				'ContentGenerator/GatewayQuiz/nav',
+				userID           => $userID,
+				eUserID          => $effectiveUserID,
+				userRecords      => \@userRecords,
+				setVersion       => $setVersion,
+				prevTest         => $prevTest,
+				nextTest         => $nextTest,
+				currentTestIndex => $currentTestIndex,
+				filters          => \%filters,
+				filter           => $filter
+			);
 		}
-		my $prevTest = $currentTestIndex > 0             ? $userRecords[ $currentTestIndex - 1 ] : 0;
-		my $nextTest = $currentTestIndex < $#userRecords ? $userRecords[ $currentTestIndex + 1 ] : 0;
-
-		# Mark the current test.
-		$userRecords[$currentTestIndex]{currentTest} = 1;
-
-		# Show the student nav.
-		return $c->include(
-			'ContentGenerator/GatewayQuiz/nav',
-			userRecords      => \@userRecords,
-			setVersion       => $setVersion,
-			prevTest         => $prevTest,
-			nextTest         => $nextTest,
-			currentTestIndex => $currentTestIndex,
-			filters          => \%filters,
-			filter           => $filter
-		);
 	}
-}
-
-sub warningMessage ($c) {
-	return $c->maketext('Warning: There may be something wrong with a question in this test. '
-			. 'Please inform your instructor including the warning messages below.');
+	return '';
 }
 
 # Evaluation utility
@@ -1502,10 +1508,9 @@ async sub getProblemHTML ($c, $effectiveUser, $set, $formFields, $mergedProblem)
 					&& $c->can_showCorrectAnswersForAll($set, $c->{problem}, $c->{tmplSet})),
 			showMessages       => !$showOnlyCorrectAnswers,
 			showCorrectAnswers => (
-				$c->{will}{showProblemGrader} ? 2
-				: !$c->{previewAnswers} && $c->can_showCorrectAnswersForAll($set, $c->{problem}, $c->{tmplSet})
+				!$c->{previewAnswers} && $c->can_showCorrectAnswersForAll($set, $c->{problem}, $c->{tmplSet})
 				? ($c->ce->{pg}{options}{correctRevealBtnAlways} ? 1 : 2)
-				: !$c->{previewAnswers} && $c->{will}{showCorrectAnswers} ? 1
+				: $c->{will}{showProblemGrader} || (!$c->{previewAnswers} && $c->{will}{showCorrectAnswers}) ? 1
 				: 0
 			),
 			debuggingOptions => getTranslatorDebuggingOptions($c->authz, $c->{userID}),
@@ -1515,27 +1520,14 @@ async sub getProblemHTML ($c, $effectiveUser, $set, $formFields, $mergedProblem)
 		},
 	);
 
-	# Warnings in the renderPG subprocess will not be caught by the global warning handler of this process.
-	# So rewarn them and let the global warning handler take care of it.
-	warn $pg->{warnings} if $pg->{warnings};
-
-	if ($pg->{flags}{error_flag}) {
-		push @{ $c->{errors} },
-			{
-				set     => $set->set_id . ',v' . $set->version_id,
-				problem => $mergedProblem->problem_id,
-				message => $pg->{errors},
-				context => $pg->{body_text},
-			};
-		$pg->{body_text} = undef;
-	}
-
 	# If the user can check answers and either this is not an answer submission or the problem_data form
 	# parameter was previously set, then set or update the problem_data form parameter.
 	$c->param('problem_data_' . $mergedProblem->problem_id => encode_json($pg->{PERSISTENCE_HASH} || '{}'))
 		if $c->{can}{checkAnswers}
 		&& (!$c->{submitAnswers} || defined $c->param('problem_data_' . $mergedProblem->problem_id));
 
+	$c->stash->{haveProblemWarnings} = 1 if $pg->{warnings} || @{ $pg->{warning_messages} // [] };
+
 	return $pg;
 }
 
diff --git a/lib/WeBWorK/ContentGenerator/Grades.pm b/lib/WeBWorK/ContentGenerator/Grades.pm
index 567dd25f08..4114f9c9bb 100644
--- a/lib/WeBWorK/ContentGenerator/Grades.pm
+++ b/lib/WeBWorK/ContentGenerator/Grades.pm
@@ -8,10 +8,11 @@ WeBWorK::ContentGenerator::Grades - Display statistics by user.
 =cut
 
 use WeBWorK::Utils                    qw(wwRound);
-use WeBWorK::Utils::DateTime          qw(after);
+use WeBWorK::Utils::DateTime          qw(before);
 use WeBWorK::Utils::JITAR             qw(jitar_id_to_seq);
-use WeBWorK::Utils::Sets              qw(grade_set format_set_name_display);
+use WeBWorK::Utils::Sets              qw(grade_set format_set_name_display restricted_set_message);
 use WeBWorK::Utils::ProblemProcessing qw(compute_unreduced_score);
+use WeBWorK::HTML::StudentNav         qw(studentNav);
 use WeBWorK::Localize;
 
 sub initialize ($c) {
@@ -19,6 +20,18 @@ sub initialize ($c) {
 	return;
 }
 
+sub nav ($c, $args) {
+	return '' unless $c->authz->hasPermissions($c->param('user'), 'become_student');
+
+	return $c->tag(
+		'div',
+		class        => 'row sticky-nav',
+		role         => 'navigation',
+		'aria-label' => 'student grades navigation',
+		studentNav($c, undef)
+	);
+}
+
 sub scoring_info ($c) {
 	my $db = $c->db;
 	my $ce = $c->ce;
@@ -122,16 +135,21 @@ sub scoring_info ($c) {
 	return $output->join('');
 }
 
-sub displayStudentStats ($c, $studentID) {
+# Note, this is meant to be a student view. Instructors will see the same information
+# as the student they are acting as. For an instructor to see hidden grades, they
+# can use the student progress report in instructor tools.
+sub displayStudentGrades ($c) {
 	my $db    = $c->db;
 	my $ce    = $c->ce;
 	my $authz = $c->authz;
 
+	my $studentID     = $c->{studentID};
 	my $studentRecord = $db->getUser($studentID);
 	unless ($studentRecord) {
 		$c->addbadmessage($c->maketext('Record for user [_1] not found.', $studentID));
 		return '';
 	}
+	my $effectiveUser = $studentRecord->user_id;
 
 	my $courseName = $ce->{courseName};
 
@@ -144,10 +162,10 @@ sub displayStudentStats ($c, $studentID) {
 	my %setVersionsCount;
 	my @allSetIDs;
 	for my $set (@sets) {
-		# Don't show hidden sets unless user has appropriate permissions.
-		next unless ($set->visible || $authz->hasPermissions($c->param('user'), 'view_hidden_sets'));
+		# Don't show hidden sets.
+		next unless $set->visible;
 
-		my $setID = $set->set_id();
+		my $setID = $set->set_id;
 
 		# FIXME: Here, as in many other locations, we assume that there is a one-to-one matching between versioned sets
 		# and gateways.  We really should have two flags, $set->assignment_type and $set->versioned.  I'm not adding
@@ -167,287 +185,220 @@ sub displayStudentStats ($c, $studentID) {
 			# Save the set names for display.
 			push(@allSetIDs, $setID);
 			push(@allSetIDs, map { $_->set_id . ',v' . $_->version_id } @setVersions);
-
 		} else {
 			push(@allSetIDs, $setID);
 		}
 	}
 
-	my $fullName      = join(' ', $studentRecord->first_name, $studentRecord->last_name);
-	my $effectiveUser = $studentRecord->user_id();
-
-	my $max_problems     = 0;
-	my $courseTotal      = 0;
-	my $courseTotalRight = 0;
+	# Set groups.
+	my (@notOpen, @open, @reduced, @closed, %allItems);
 
 	for my $setID (@allSetIDs) {
-		my $set = $db->getGlobalSet($setID);
-		my $num_of_problems;
-		# For jitar sets we only display grades for top level problems, so we need to count how many there are.
-		if ($set && $set->assignment_type() eq 'jitar') {
-			my @problemIDs = $db->listGlobalProblems($setID);
-			for my $problemID (@problemIDs) {
-				my @seq = jitar_id_to_seq($problemID);
-				$num_of_problems++ if ($#seq == 0);
+		my $set = $setsByID{$setID};
+
+		# Determine if set is a test and if it is a test template or version.
+		my $setIsTest      = defined $set->assignment_type && $set->assignment_type =~ /gateway/;
+		my $setIsVersioned = $setIsTest                    && !defined $setVersionsCount{$setID};
+		my $setTemplateID  = $setID =~ s/,v\d+$//r;
+
+		# Initialize set item. Define link here. It will be adjusted for versioned tests later.
+		my $item = {
+			name              => format_set_name_display($setTemplateID),
+			grade             => 0,
+			grade_total       => 0,
+			grade_total_right => 0,
+			is_test           => $setIsTest,
+			record            => $set,
+			link              => $c->systemLink(
+				$c->url_for('problem_list', setID => $setID),
+				params => { effectiveUser => $effectiveUser }
+			)
+		};
+		$allItems{$setID} = $item;
+
+		# Determine which group to put set in. Test versions are added to test template.
+		unless ($setIsVersioned) {
+			my $enable_reduced_scoring =
+				$ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+				&& $set->enable_reduced_scoring
+				&& $set->reduced_scoring_date;
+			if (before($set->open_date)) {
+				push(@notOpen, $item);
+				$item->{message} = $c->maketext('Will open on [_1].',
+					$c->formatDateTime($set->open_date, $ce->{studentDateDisplayFormat}));
+				next;
+			} elsif (($enable_reduced_scoring && before($set->reduced_scoring_date)) || before($set->due_date)) {
+				push(@open, $item);
+			} elsif ($enable_reduced_scoring && before($set->due_date)) {
+				push(@reduced, $item);
+			} else {
+				push(@closed, $item);
 			}
-		} else {
-			# For other sets we just count the number of problems.
-			$num_of_problems = $db->countGlobalProblems($setID);
 		}
-		$max_problems =
-			$set && after($set->open_date) && $max_problems < $num_of_problems ? $num_of_problems : $max_problems;
-	}
-
-	# Variables to help compute gateway scores.
-	my $numGatewayVersions = 0;
-	my $bestGatewayScore   = 0;
 
-	my $rows = $c->c;
-	for my $setID (@allSetIDs) {
-		my $act_as_student_set_url =
-			$c->systemLink($c->url_for('problem_list', setID => $setID), params => { effectiveUser => $effectiveUser });
-		my $set = $setsByID{$setID};
-
-		# Determine if set is a test and create the test url.
-		my $setIsVersioned          = 0;
-		my $act_as_student_test_url = '';
-		if (defined $set->assignment_type && $set->assignment_type =~ /gateway/) {
-			$setIsVersioned = 1;
+		# Tests need their link updated. Along with template sets need to add a version list.
+		# Also determines if grade and test problems should be shown.
+		if ($setIsTest) {
+			my $act_as_student_test_url = '';
 			if ($set->assignment_type eq 'proctored_gateway') {
-				$act_as_student_test_url = $act_as_student_set_url =~ s/($courseName)\//$1\/proctored_test_mode\//r;
+				$act_as_student_test_url = $item->{link} =~ s/($courseName)\//$1\/proctored_test_mode\//r;
 			} else {
-				$act_as_student_test_url = $act_as_student_set_url =~ s/($courseName)\//$1\/test_mode\//r;
+				$act_as_student_test_url = $item->{link} =~ s/($courseName)\//$1\/test_mode\//r;
 			}
-			# Remove version from set url
-			$act_as_student_set_url =~ s/,v\d+//;
-		}
 
-		# Format set name based on set visibility.
-		my $setName = $c->tag(
-			'span',
-			class => $set->visible ? 'font-visible' : 'font-hidden',
-			format_set_name_display($setID =~ s/,v\d+$//r)
-		);
-
-		# If the set is a template gateway set and there are no versions, we acknowledge that the set exists and the
-		# student hasn't attempted it. Otherwise, we skip it and let the versions speak for themselves.
-		if (defined $setVersionsCount{$setID}) {
-			next if $setVersionsCount{$setID};
-			push @$rows,
-				$c->tag(
-					'tr',
-					$c->c(
-						$c->tag(
-							'th',
-							dir => 'ltr',
-							(after($set->open_date) || $authz->hasPermissions($c->param('user'), 'view_unopened_sets'))
-							? $c->link_to($setName => $act_as_student_set_url)
-							: $setName
-						),
-						$c->tag(
-							'td',
-							colspan => $max_problems + 3,
-							$c->tag(
-								'em',
-								after($set->open_date) ? $c->maketext('No versions of this test have been taken.')
-								: $c->maketext(
-									'Will open on [_1].',
-									$c->formatDateTime($set->open_date, $ce->{studentDateDisplayFormat})
-								)
-							)
-						)
-				)->join('')
-				);
-			next;
-		}
+			# If this is a template gateway set, determine if there are any versions, then move on.
+			unless ($setIsVersioned) {
+				# Remove version from set url
+				$item->{link} =~ s/,v\d+//;
+				$item->{version_count} = $setVersionsCount{$setID};
+				if ($item->{version_count}) {
+					# Hide score initially unless there is a version the score can be seen.
+					$item->{hide_score} = 1;
+					$item->{message}    = $c->maketext('Display of scores for this test is not allowed.');
+				} else {
+					$item->{message} = $c->maketext('No versions of this test have been taken.');
+				}
+				next;
+			}
 
-		# If the set has hide_score set, then we need to skip printing the score as well.
-		if (
-			defined $set->assignment_type
-			&& $set->assignment_type =~ /gateway/
-			&& defined $set->hide_score
-			&& (
-				!$authz->hasPermissions($c->param('user'), 'view_hidden_work')
-				&& ($set->hide_score eq 'Y' || ($set->hide_score eq 'BeforeAnswerDate' && time < $set->answer_date))
-			)
-			)
-		{
-			# Add a link to the test version if the problems can be seen.
-			my $thisSetName =
-				$c->link_to($setName => $act_as_student_set_url) . ' ('
-				. (
-					(
-						$set->hide_work eq 'N'
-						|| ($set->hide_work eq 'BeforeAnswerDate' && time >= $set->answer_date)
-						|| $authz->hasPermissions($c->param('user'), 'view_unopened_sets')
-					)
-					? $c->link_to($c->maketext('version [_1]', $set->version_id) => $act_as_student_test_url)
-					: $c->maketext('version [_1]', $set->version_id)
-				) . ')';
-			push(
-				@$rows,
-				$c->tag(
-					'tr',
-					$c->c(
-						$c->tag(
-							'th',
-							dir => 'ltr',
-							sub {$thisSetName}
-						),
-						$c->tag(
-							'td',
-							colspan => $max_problems + 3,
-							$c->tag('em', $c->maketext('Display of scores for this test is not allowed.'))
-						)
-					)->join('')
-				)
-			);
-			next;
+			# Only add link if the problems can be seen.
+			if ($set->hide_work eq 'N'
+				|| ($set->hide_work eq 'BeforeAnswerDate' && time >= $set->answer_date))
+			{
+				if ($set->assignment_type eq 'proctored_gateway') {
+					$item->{link} =~ s/($courseName)\//$1\/proctored_test_mode\//;
+				} else {
+					$item->{link} =~ s/($courseName)\//$1\/test_mode\//;
+				}
+			} else {
+				$item->{link} = '';
+			}
+
+			# If the set has hide_score set, then nothing left to do.
+			if (defined $set->hide_score && $set->hide_score eq 'Y'
+				|| ($set->hide_score eq 'BeforeAnswerDate' && time < $set->answer_date))
+			{
+				next;
+			}
+			# This is a test version, and the scores can be shown, so also show score of template set.
+			$allItems{$setTemplateID}{message}    = '' if $allItems{$setTemplateID}{hide_score};
+			$allItems{$setTemplateID}{hide_score} = 0;
 		}
 
-		my ($totalRight, $total, $problem_scores, $problem_incorrect_attempts, $problem_records) =
+		my ($total_right, $total, $problem_scores, $problem_incorrect_attempts, $problem_records) =
 			grade_set($db, $set, $studentID, $setIsVersioned, 1);
-		$totalRight = wwRound(2, $totalRight);
+		$total_right = wwRound(2, $total_right);
 
-		my @html_prob_scores;
+		# Save set grades.
+		$item->{grade_total}       = $total;
+		$item->{grade_total_right} = $total_right;
+		$item->{grade}             = 100 * wwRound(2, $total ? $total_right / $total : 0);
+		$item->{problems}          = [];
 
-		my $show_problem_scores = 1;
-
-		if (defined $set->hide_score_by_problem
-			&& !$authz->hasPermissions($c->param('user'), 'view_hidden_work')
-			&& $set->hide_score_by_problem eq 'Y')
-		{
-			$show_problem_scores = 0;
-		}
+		# Only show problem scores if allowed.
+		if ($setIsTest && defined $set->hide_score_by_problem && $set->hide_score_by_problem eq 'Y') {
+			$item->{message} = $c->maketext('Display of problem scores for this test is not allowed.');
+		} else {
+			# Create a direct link to the problems unless the set is a test, or there is a set
+			# restriction preventing the student from accessing the set problems.
+			my $noProblemLink =
+				$setIsTest
+				|| restricted_set_message($c, $set, 'lti')
+				|| restricted_set_message($c, $set, 'conditional')
+				|| $authz->invalidIPAddress($set);
+
+			for my $i (0 .. $#$problem_scores) {
+				my $addProblem = 1;
+				my $problem_id = $setIsVersioned ? $i + 1 : $problem_records->[$i]{problem_id};
+				if ($set->assignment_type eq 'jitar') {
+					# For jitar sets we only display grades for top level problems.
+					my @seq = jitar_id_to_seq($problem_id);
+					if ($#seq == 0) {
+						$problem_id = $seq[0];
+					} else {
+						$addProblem = 0;
+					}
+				}
 
-		for my $i (0 .. $max_problems - 1) {
-			my $score      = defined $problem_scores->[$i] && $show_problem_scores ? $problem_scores->[$i] : '';
-			my $is_correct = $score =~ /^\d+$/ && compute_unreduced_score($ce, $problem_records->[$i], $set) == 1;
-			push(
-				@html_prob_scores,
-				$c->tag(
-					'td',
-					class => 'problem-data',
-					$c->c(
-						$c->tag(
-							'span',
-							class => $is_correct ? 'correct' : $score eq ' . ' ? 'unattempted' : '',
-							$c->b($score)
+				push(
+					@{ $item->{problems} },
+					{
+						id    => $problem_id,
+						score => $problem_scores->[$i] =~ /^\d+$/ ? $problem_scores->[$i] : 0,
+						value => $problem_records->[$i]{value},
+						link  => $noProblemLink ? '' : $c->systemLink(
+							$c->url_for('problem_detail', setID => $setID, problemID => $problem_id),
+							params => { effectiveUser => $effectiveUser }
 						),
-						$c->tag('br'),
-						(defined $problem_incorrect_attempts->[$i] && $show_problem_scores)
-						? $problem_incorrect_attempts->[$i]
-						: $c->b(' ')
-					)->join('')
-				)
-			);
-		}
-
-		# Get percentage correct.
-		my $totalRightPercent = 100 * wwRound(2, $total ? $totalRight / $total : 0);
-		my $class             = '';
-		if ($totalRightPercent == 0) {
-			$class = 'unattempted';
-		} elsif ($totalRightPercent == 100) {
-			$class = 'correct';
+						attempts => $setIsTest
+						? 0
+						: $problem_incorrect_attempts->[$i] + $problem_records->[$i]->num_correct
+					}
+				) if $addProblem;
+			}
 		}
 
-		# If its a gateway set, then in order to mimic the scoring done in Scoring Tools we need to use the best score a
-		# student had.  Otherwise we just add the set to the running course total.
+		# If this is a test version, update template set to the best grade a student hand.
 		if ($setIsVersioned) {
-			$setID =~ /(.+),v(\d+)$/;
-			my $gatewayName    = $1;
-			my $currentVersion = $2;
-
-			# If we are just starting a new gateway then set variables to look for the max.
-			if ($currentVersion == 1) {
-				$numGatewayVersions = $db->countSetVersions($studentID, $gatewayName);
-			}
-
-			if ($totalRight > $bestGatewayScore) {
-				$bestGatewayScore = $totalRight;
-			}
-
-			# If its the last version then add the max to the course totals and reset variables;
-			if ($currentVersion == $numGatewayVersions) {
-				if (after($set->open_date())) {
-					$courseTotal      += $total;
-					$courseTotalRight += $bestGatewayScore;
+			# Compare the score to the template set and update as needed.
+			my $templateItem = $allItems{$setTemplateID};
+			if ($templateItem->{grade} == 0 || $item->{grade} > $templateItem->{grade}) {
+				$templateItem->{version_id}   = $set->version_id;
+				$templateItem->{version_link} = $item->{link};
+				for ('grade', 'grade_total', 'grade_total_right', 'problems', 'message') {
+					$templateItem->{$_} = $item->{$_};
 				}
-				$bestGatewayScore = 0;
-			}
-		} else {
-			if (after($set->open_date())) {
-				$courseTotal      += $total;
-				$courseTotalRight += $totalRight;
 			}
 		}
+	}
 
-		# Only show scores for open sets, and don't link to non open sets.
-		if (after($set->open_date) || $authz->hasPermissions($c->param('user'), 'view_unopened_sets')) {
-			# Set the set name and link. If a test, don't link to the version unless the problems can be seen.
-			my $thisSetName = $setIsVersioned
-				? $c->link_to($setName => $act_as_student_set_url) . ' ('
-				. (
-					(
-						$set->hide_work eq 'N'
-						|| ($set->hide_work eq 'BeforeAnswerDate' && time >= $set->answer_date)
-						|| $authz->hasPermissions($c->param('user'), 'view_unopened_sets')
-					)
-					? $c->link_to($c->maketext('version [_1]', $set->version_id) => $act_as_student_test_url)
-					: $c->maketext('version [_1]', $set->version_id)
-				)
-				. ')'
-				: $c->link_to($setName => $act_as_student_set_url);
-			push @$rows, $c->tag(
-				'tr',
-				$c->c(
-					$c->tag(
-						'th',
-						scope => 'row',
-						dir   => 'ltr',
-						sub {$thisSetName}
-					),
-					$c->tag('td', $c->tag('span', class => $class, $totalRightPercent . '%')),
-					$c->tag('td', sprintf('%0.2f', $totalRight)),                                # score
-					$c->tag('td', $total),                                                       # out of
-					@html_prob_scores                                                            # problems
-				)->join('')
-			);
-		} else {
-			push @$rows,
-				$c->tag(
-					'tr',
-					$c->c(
-						$c->tag(
-							'th',
-							dir => 'ltr',
-							$setName
-						),
-						$c->tag(
-							'td',
-							colspan => $max_problems + 3,
-							$c->tag(
-								'em',
-								$c->maketext(
-									'Will open on [_1].',
-									$c->formatDateTime($set->open_date, $ce->{studentDateDisplayFormat})
-								)
-							)
-						)
-				)->join('')
-				);
+	# Compute total course grade if requested.
+	my $courseTotal = 0;
+	my $totalRight  = 0;
+	if ($ce->{showCourseHomeworkTotals}) {
+		for (@open, @reduced, @closed) {
+			$courseTotal += $_->{grade_total};
+			$totalRight  += $_->{grade_total_right};
 		}
 	}
 
+	@notOpen = sort byUrgency @notOpen;
+	@open    = sort byUrgency @open;
+	@reduced = sort byUrgency @reduced;
+	@closed  = sort byUrgency @closed;
+
 	return $c->include(
-		'ContentGenerator/Grades/student_stats',
-		fullName         => $fullName,
-		max_problems     => $max_problems,
-		rows             => $rows->join(''),
-		courseTotal      => $courseTotal,
-		courseTotalRight => $courseTotalRight
+		'ContentGenerator/Grades/student_grades',
+		effectiveUser => $effectiveUser,
+		fullName      => join(' ', $studentRecord->first_name, $studentRecord->last_name),
+		notOpen       => \@notOpen,
+		open          => \@open,
+		reduced       => \@reduced,
+		closed        => \@closed,
+		courseTotal   => $courseTotal,
+		totalRight    => $totalRight
 	);
 }
 
+# Taken from ProblemSets.pm, and adjusted for location of set record.
+sub byUrgency ($type) {
+	my $mytime = time;
+	my $A      = $a->{record};
+	my $B      = $b->{record};
+	my @a_parts =
+		$mytime >= $A->answer_date ? (3, $A->answer_date, $A->due_date)
+		: $mytime >= $A->due_date  ? (2, $A->answer_date, $A->due_date)
+		: $mytime < $A->open_date  ? (1, $A->open_date, $A->due_date)
+		:                            (0, $A->due_date, $A->open_date);
+	my @b_parts =
+		$mytime >= $B->answer_date ? (3, $B->answer_date, $B->due_date)
+		: $mytime >= $B->due_date  ? (2, $B->answer_date, $B->due_date)
+		: $mytime < $B->open_date  ? (1, $B->open_date, $B->due_date)
+		:                            (0, $B->due_date, $B->open_date);
+	while (@a_parts) {
+		if (my $returnIt = (shift @a_parts) <=> (shift @b_parts)) { return $returnIt; }
+	}
+	return $A->set_id cmp $B->set_id;
+}
+
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Hardcopy.pm b/lib/WeBWorK/ContentGenerator/Hardcopy.pm
index fdd35ed8ca..8182737946 100644
--- a/lib/WeBWorK/ContentGenerator/Hardcopy.pm
+++ b/lib/WeBWorK/ContentGenerator/Hardcopy.pm
@@ -10,6 +10,7 @@ problem sets.
 
 use File::Temp qw/tempdir/;
 use Mojo::File;
+use Mojo::Util qw(xml_escape);
 use String::ShellQuote;
 use Archive::Zip qw(:ERROR_CODES);
 use XML::LibXML;
@@ -117,10 +118,7 @@ async sub pre_header_initialize ($c) {
 	die 'Parameter "user" not defined -- this should never happen' unless defined $userID;
 
 	# Check to see if the user is authorized to view source file paths.
-	$c->{can_show_source_file} =
-		($db->getPermissionLevel($userID)->permission >=
-			$ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL})
-		|| (grep { $_ eq $userID } @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} });
+	$c->{can_show_source_file} = $authz->hasPermissions($userID, 'print_path_to_problem');
 
 	if ($generate_hardcopy) {
 		my $validation_failed = 0;
@@ -130,14 +128,16 @@ async sub pre_header_initialize ($c) {
 
 		# Make sure the format is valid.
 		unless (grep { $_ eq $hardcopy_format } keys %HC_FORMATS) {
-			$c->addbadmessage(qq{"$hardcopy_format" is not a valid hardcopy format.});
+			$c->addbadmessage($c->maketext('"[_1]" is not a valid hardcopy format.', xml_escape($hardcopy_format)));
 			$validation_failed = 1;
 		}
 
 		# Make sure we are allowed to generate hardcopy in this format.
 		unless ($authz->hasPermissions($userID, "download_hardcopy_format_$hardcopy_format")) {
-			$c->addbadmessage(
-				$c->maketext('You do not have permission to generate hardcopy in [_1] format.', $hardcopy_format));
+			$c->addbadmessage($c->maketext(
+				'You do not have permission to generate hardcopy in [_1] format.',
+				xml_escape($hardcopy_format)
+			));
 			$validation_failed = 1;
 		}
 
@@ -284,13 +284,14 @@ async sub pre_header_initialize ($c) {
 		my $fullFilePath = "$ce->{webworkDirs}{tmp}/$courseID/hardcopy/$userID/$tempFile";
 
 		unless (-e $fullFilePath) {
-			$c->addbadmessage($c->maketext('The requested file "[_1]" does not exist on the server.', $tempFile));
+			$c->addbadmessage(
+				$c->maketext('The requested file "[_1]" does not exist on the server.', xml_escape($tempFile)));
 			return;
 		}
 
 		unless ($baseName =~ /\.$userID\./ || $authz->hasPermissions($userID, 'download_hardcopy_multiuser')) {
 			$c->addbadmessage($c->maketext('You do not have permission to access the requested file "[_1]".'),
-				$tempFile);
+				xml_escape($tempFile));
 			return;
 		}
 
@@ -670,7 +671,7 @@ sub generate_hardcopy_tex ($c, $temp_dir_path, $final_file_basename) {
 			);
 		}
 	}
-	for (qw{pg.sty PGML.tex CAPA.tex}) {
+	for (qw{pg.sty PGML.tex}) {
 		eval { Mojo::File->new("$ce->{pg}{directories}{assetsTex}/$_")->copy_to($bundle_path) };
 		if ($@) {
 			$c->add_error(
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/AchievementNotificationEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/AchievementNotificationEditor.pm
index 906845efa4..353e3f06ea 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/AchievementNotificationEditor.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/AchievementNotificationEditor.pm
@@ -212,7 +212,7 @@ sub save_as_handler ($c) {
 		));
 	} else {
 		$c->addbadmessage($c->maketext(
-			'Unable to change the achievement notification template for achivement [_1]. Unknown error.',
+			'Unable to change the achievement notification template for achievement [_1]. Unknown error.',
 			$achievementName
 		));
 	}
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Config.pm b/lib/WeBWorK/ContentGenerator/Instructor/Config.pm
index 918c38ae26..f7fdb88cf0 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/Config.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Config.pm
@@ -57,7 +57,7 @@ sub pre_header_initialize ($c) {
 			web_config_filename => 'noSuchFilePlease'
 		});
 
-		my $fileoutput = <<~ 'END_SIMPLE_CONF_HEADER';
+		my $fileoutput = <<~'END_SIMPLE_CONF_HEADER';
 			#!perl
 			# This file is automatically generated by WeBWorK's web-based
 			# configuration module.  Do not make changes directly to this
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm b/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm
index 97d99f1e32..a1145ec72b 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm
@@ -7,7 +7,7 @@ WeBWorK::ContentGenerator::Instructor::FileManager.pm -- simple directory manage
 
 =cut
 
-use Mojo::File;
+use Mojo::File qw(tempdir);
 use File::Path;
 use File::Copy;
 use File::Spec;
@@ -46,19 +46,28 @@ sub pre_header_initialize ($c) {
 		my $ce       = $c->ce;
 		my $courseID = $c->stash('courseID');
 
-		my $message = eval {
-			WeBWorK::Utils::CourseManagement::archiveCourse(
-				courseID     => $courseID,
-				archive_path => "$ce->{webworkDirs}{courses}/$courseID/templates/$courseID.tar.gz",
-				ce           => $ce
-			);
-		};
+		# Note that it is important that the tempDir is a property on the controller so that it stays in scope as long
+		# as the controller does, i.e., until the request is rendered.  Otherwise the temporary directory will be
+		# automatically removed before the archive file is rendered, and an empty file will be offered for download.
+		$c->{tempDir} = eval { tempdir('archive.XXXX', DIR => "$ce->{webworkDirs}{courses}/$courseID") };
 		if ($@) {
-			$c->addbadmessage($c->maketext('Failed to generate course archive: [_1]', $@));
+			$c->addbadmessage($c->maketext('Unable to created temporary directory for course archive: [_1]', $@));
 		} else {
-			$c->addgoodmessage($c->maketext('Archived course as [_1].tar.gz.', $courseID));
+			my $archiveFile = $c->{tempDir}->child("$courseID.tar.gz");
+			eval {
+				WeBWorK::Utils::CourseManagement::archiveCourse(
+					courseID     => $courseID,
+					archive_path => $archiveFile,
+					ce           => $ce
+				);
+			};
+			if ($@) {
+				$c->addbadmessage($c->maketext('Failed to generate course archive: [_1]', $@));
+			} else {
+				$c->reply_with_file('application/gzip', $archiveFile, $archiveFile->basename, 0);
+				return;
+			}
 		}
-		$c->addbadmessage($message) if ($message);
 	}
 
 	$c->{pwd}        = $c->checkPWD($c->param('pwd') || HOME);
@@ -602,7 +611,7 @@ sub unpack_archive ($c, $archive) {
 									$c->maketext('[quant,_1,more file,more files] not shown', @outside_files - 30))
 								: ()
 							)
-					)->join('')
+						)->join('')
 					)
 				)
 		);
@@ -645,7 +654,7 @@ sub unpack_archive ($c, $archive) {
 									$c->maketext('[quant,_1,more file,more files] not shown', @existing_files - 30))
 								: ()
 							)
-					)->join('')
+						)->join('')
 					)
 				)
 		);
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Index.pm b/lib/WeBWorK/ContentGenerator/Instructor/Index.pm
index 2ac5e5e94e..ac0f00f2be 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/Index.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Index.pm
@@ -80,13 +80,6 @@ sub pre_header_initialize ($c) {
 		} else {
 			push @error, E_ONE_SET;
 		}
-	} elsif (defined $c->param('user_stats')) {
-		if ($nusers == 1) {
-			$route = 'instructor_user_statistics';
-			$args{userID} = $firstUserID;
-		} else {
-			push @error, E_ONE_USER;
-		}
 	} elsif (defined $c->param('set_stats')) {
 		if ($nsets == 1) {
 			$route = 'instructor_set_statistics';
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/JobManager.pm b/lib/WeBWorK/ContentGenerator/Instructor/JobManager.pm
index 57145907a0..e8e38bf8aa 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/JobManager.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/JobManager.pm
@@ -106,7 +106,7 @@ sub initialize ($c) {
 	# first three sorts do not determine a proper order.
 	$c->stash->{sortedJobs} = [
 		map  { $_->{id} }
-		sort { &$primarySortSub || &$secondarySortSub || &$ternarySortSub || byJobID }
+		sort { $primarySortSub->() || $secondarySortSub->() || $ternarySortSub->() || byJobID() }
 		grep { $c->stash->{visibleJobs}{ $_->{id} } } (values %{ $c->stash->{jobs} })
 	];
 
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
index c7736812de..40ffe5b045 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm
@@ -90,7 +90,7 @@ the submit button pressed (the action).
     Requested actions and aliases
         View/Reload                action = view
         Generate Hardcopy:         action = hardcopy
-        Format Code:               action = format_code
+        Code Maintenance:          action = code_maintenance
         Save:                      action = save
         Save as:                   action = save_as
         Append:                    action = add_problem
@@ -108,29 +108,27 @@ not exist.  The path to the actual file being edited is stored in inputFilePath.
 use Mojo::File;
 use XML::LibXML;
 
-use WeBWorK::Utils             qw(not_blank x max);
-use WeBWorK::Utils::Files      qw(surePathToFile readFile path_is_subdir);
-use WeBWorK::Utils::Instructor qw(assignProblemToAllSetUsers addProblemToSet);
-use WeBWorK::Utils::JITAR      qw(seq_to_jitar_id jitar_id_to_seq);
-use WeBWorK::Utils::Sets       qw(format_set_name_display);
-use SampleProblemParser        qw(getSampleProblemCode generateMetadata);
+use WeBWorK::Utils                   qw(not_blank x max);
+use WeBWorK::Utils::Files            qw(surePathToFile readFile path_is_subdir);
+use WeBWorK::Utils::Instructor       qw(assignProblemToAllSetUsers addProblemToSet);
+use WeBWorK::Utils::JITAR            qw(seq_to_jitar_id jitar_id_to_seq);
+use WeBWorK::Utils::Sets             qw(format_set_name_display);
+use WeBWorK::PG::SampleProblemParser qw(getSampleProblemCode generateMetadata);
 
 use constant DEFAULT_SEED => 123456;
 
 # Editor tabs
-use constant ACTION_FORMS => [qw(view hardcopy format_code save save_as add_problem revert)];
+use constant ACTION_FORMS => [qw(view hardcopy code_maintenance save save_as add_problem revert)];
 use constant ACTION_FORM_TITLES => {
-	view        => x('View/Reload'),
-	hardcopy    => x('Generate Hardcopy'),
-	format_code => x('Format Code'),
-	save        => x('Save'),
-	save_as     => x('Save As'),
-	add_problem => x('Append'),
-	revert      => x('Revert'),
+	view             => x('View/Reload'),
+	hardcopy         => x('Generate Hardcopy'),
+	code_maintenance => x('Code Maintenance'),
+	save             => x('Save'),
+	save_as          => x('Save As'),
+	add_problem      => x('Append'),
+	revert           => x('Revert'),
 };
 
-my $BLANKPROBLEM = 'newProblem.pg';
-
 sub pre_header_initialize ($c) {
 	my $ce    = $c->ce;
 	my $authz = $c->authz;
@@ -145,26 +143,12 @@ sub pre_header_initialize ($c) {
 	$c->{setID}     = $c->stash('setID');
 	$c->{problemID} = $c->stash('problemID');
 
-	# Parse setID which may come in with version data
-	$c->{fullSetID} = $c->{setID};
-	if (defined $c->{fullSetID} && $c->{fullSetID} =~ /^([^,]*),v(\d+)$/) {
-		$c->{setID}     = $1;
-		$c->{versionID} = $2;
-	}
-
 	# Determine displayMode and problemSeed that are needed for viewing the problem.
 	# They are also two of the parameters which can be set by the editor.
 	# Note that the problem seed may be overridden by the value obtained from the problem record later.
 	$c->{displayMode} = $c->param('displayMode') // $ce->{pg}{options}{displayMode};
 	$c->{problemSeed} = (($c->param('problemSeed') // '') =~ s/^\s*|\s*$//gr) || DEFAULT_SEED();
 
-	# Save file to permanent or temporary file, then redirect for viewing if it was requested to view in a new window.
-	# Any problem file "saved as" should be assigned to "Undefined_Set" and redirected to be viewed again in the editor.
-	# Problems "saved" or 'refreshed' are to be redirected to the Problem.pm module
-	# Set headers which are "saved" are to be redirected to the ProblemSet.pm page
-	# Hardcopy headers which are "saved" are also to be redirected to the ProblemSet.pm page
-	# Course info files are redirected to the ProblemSets.pm page
-
 	# Insure that file_type is defined
 	$c->{file_type} = ($c->param('file_type') // '') =~ s/^\s*|\s*$//gr;
 
@@ -239,7 +223,7 @@ sub initialize ($c) {
 	}
 
 	# Tell the templates if we are working on a PG file
-	$c->{is_pg} = !$c->{file_type} || ($c->{file_type} ne 'course_info' && $c->{file_type} ne 'hardcopy_theme');
+	$c->{is_pg} = $c->{file_type} =~ /problem/ || $c->{file_type} =~ /header/;
 
 	# Check permissions
 	return
@@ -261,14 +245,11 @@ sub initialize ($c) {
 		));
 	}
 
-	if ($c->{file_type} eq 'blank_problem' || $c->{file_type} eq 'sample_problem') {
-		$c->addbadmessage($c->maketext('This file is a template. You may use "Save As" to create a new file.'));
-	} elsif ($c->{inputFilePath} =~ /$BLANKPROBLEM$/) {
-		$c->addbadmessage($c->maketext(
-			'The file "[_1]" is a template. You may use "Save As" to create a new file.',
-			$c->shortPath($c->{inputFilePath})
-		));
-	}
+	$c->addbadmessage($c->maketext(
+		'The file "[_1]" is a template. You may use "Save As" to create a new file.',
+		$c->shortPath($c->{inputFilePath})
+	))
+		if !path_is_subdir($c->{editFilePath}, $ce->{courseDirs}{templates});
 
 	# Find the text for the editor, either in the temporary file if it exists, in the original file in the template
 	# directory, or in the problem contents gathered in the initialization phase.
@@ -341,6 +322,8 @@ sub initialize ($c) {
 	$c->{prettyProblemNumber} = join('.', jitar_id_to_seq($c->{prettyProblemNumber}))
 		if $c->{set} && $c->{set}->assignment_type eq 'jitar';
 
+	$c->{globalSets} = [ map { $_->[0] } $db->listGlobalSetsWhere({}, 'set_id') ] if $c->{is_pg};
+
 	return;
 }
 
@@ -523,36 +506,28 @@ sub getFilePaths ($c) {
 	} elsif ($c->{file_type} eq 'set_header' || $c->{file_type} eq 'hardcopy_header') {
 		my $set_record = $db->getGlobalSet($c->{setID});
 
-		if (defined $set_record) {
-			my $header_file = $set_record->{ $c->{file_type} };
-			if ($header_file && $header_file ne 'defaultHeader') {
-				if ($header_file =~ m|^/|) {
-					# Absolute address
-					$editFilePath = $header_file;
-				} else {
-					$editFilePath = "$ce->{courseDirs}{templates}/$header_file";
-				}
+		my $header_file = defined $set_record ? $set_record->{ $c->{file_type} } : '';
+		if ($header_file && $header_file ne 'defaultHeader') {
+			if ($header_file =~ m|^/|) {
+				# Absolute address
+				$editFilePath = $header_file;
 			} else {
-				# If the set record doesn't specify the filename for a header or it specifies the defaultHeader,
-				# then the set uses the default from assets/pg.
-				$editFilePath = $ce->{webworkFiles}{screenSnippets}{setHeader}
-					if $c->{file_type} eq 'set_header';
-				$editFilePath = $ce->{webworkFiles}{hardcopySnippets}{setHeader}
-					if $c->{file_type} eq 'hardcopy_header';
+				$editFilePath = "$ce->{courseDirs}{templates}/$header_file";
 			}
 		} else {
-			$c->addbadmessage("Cannot find a set record for set $c->{setID}");
-			return;
+			# If the set record does not exist, or the set record doesn't specify the filename for a header or it
+			# specifies the defaultHeader, then the set uses the default from assets/pg.
+			$editFilePath = $ce->{webworkFiles}{screenSnippets}{setHeader}
+				if $c->{file_type} eq 'set_header';
+			$editFilePath = $ce->{webworkFiles}{hardcopySnippets}{setHeader}
+				if $c->{file_type} eq 'hardcopy_header';
 		}
 	} elsif ($c->{file_type} eq 'problem') {
-		# First try getting the merged problem for the effective user.
-		my $effectiveUserName = $c->param('effectiveUser');
-		my $problem_record =
-			$c->{versionID}
-			? $db->getMergedProblemVersion($effectiveUserName, $c->{setID}, $c->{versionID}, $c->{problemID})
-			: $db->getMergedProblem($effectiveUserName, $c->{setID}, $c->{problemID});
-
-		# If that doesn't work, then the problem is not yet assigned. So get the global record.
+		# First try getting the merged problem for the current user.
+		my $problem_record = $db->getMergedProblem($c->param('user'), $c->{setID}, $c->{problemID});
+
+		# If that doesn't work, then the problem is not assigned to this user (or this problem belongs to a gateway
+		# test, since the problem editor can not deal with problems from versioned sets). So get the global record.
 		$problem_record = $db->getGlobalProblem($c->{setID}, $c->{problemID}) unless defined $problem_record;
 
 		if (defined $problem_record) {
@@ -704,14 +679,15 @@ sub saveFileChanges ($c, $outputFilePath, $backup = 0) {
 	}
 
 	# If the file is being saved as a new file in a new location, and the file is accompanied by auxiliary files
-	# transfer them as well.  If the file is a pg file, then assume there are auxiliary files.  Copy all files not
-	# ending in .pg from the original directory to the new one.
-	if ($c->{action} eq 'save_as' && $outputFilePath =~ /\.pg/) {
+	# transfer them as well.  If the option 'copyAuxFiles' is set and the file is a pg file, then assume there are
+	# auxiliary files.  Copy all files not ending in .pg from the original directory to the new one.
+	if ($c->{action} eq 'save_as' && $c->param('copyAuxFiles') && $outputFilePath =~ /\.pg/) {
 		my $sourceDirectory = Mojo::File->new(($c->{sourceFilePath} || '') =~ s|/[^/]+\.pg$||r);
 		my $outputDirectory = Mojo::File->new($outputFilePath              =~ s|/[^/]+\.pg$||r);
 
 		# Only perform the copy if the output directory is an actual new location.
 		if ($sourceDirectory ne $outputDirectory && -d $sourceDirectory) {
+			my $filesCopied = 0;
 			for my $file (@{ $sourceDirectory->list }) {
 				# The .pg file being edited has already been transferred. Ignore any others in the directory.
 				next if $file =~ /\.pg$/;
@@ -719,13 +695,18 @@ sub saveFileChanges ($c, $outputFilePath, $backup = 0) {
 				# Only copy regular files that are readable and that have not already been copied.
 				if (-f $file && -r $file && !-e $toPath) {
 					eval { $file->copy_to($toPath) };
-					$c->addbadmessage($c->maketext('Error copying [_1] to [_2].', $file, $toPath)) if $@;
+					if ($@) {
+						$c->addbadmessage($c->maketext('Error copying [_1] to [_2].', $file, $toPath));
+					} else {
+						$filesCopied = 1;
+					}
 				}
 			}
 			$c->addgoodmessage($c->maketext(
 				'Copied auxiliary files from [_1] to new location at [_2].',
 				$sourceDirectory, $outputDirectory
-			));
+			))
+				if $filesCopied;
 		}
 	}
 
@@ -847,9 +828,9 @@ sub view_handler ($c) {
 	return;
 }
 
-# The format_code action is handled by javascript.  This is provided just in case
+# The code_maintenance action is handled by javascript.  This is provided just in case
 # something goes wrong and the handler is called.
-sub format_code_handler { }
+sub code_maintenance_handler { }
 
 sub hardcopy_handler ($c) {
 	# Redirect to problem editor page.
@@ -860,6 +841,7 @@ sub hardcopy_handler ($c) {
 			hardcopy_theme => $c->param('action.hardcopy.theme')
 		}
 	));
+	return;
 }
 
 sub add_problem_handler ($c) {
@@ -1125,9 +1107,6 @@ sub save_as_handler ($c) {
 			'File "[_1]" exists. File not saved. No changes have been made.',
 			$c->shortPath($outputFilePath)
 		));
-		$c->addbadmessage(
-			$c->maketext('You can change the file path for this problem manually from the "Sets Manager" page'))
-			if defined $c->{setID};
 	}
 
 	if ($do_not_save) {
@@ -1135,9 +1114,13 @@ sub save_as_handler ($c) {
 			'The text box now contains the source of the original problem. '
 				. 'You can recover lost edits by using the Back button on your browser.'
 		));
-	}
 
-	unless ($do_not_save) {
+		# If the save mode is 'add_to_set_as_new_problem', but this problem is not in a set (for example for a sample
+		# problem), then the redirect for this save mode will fail since there is no set or problem id. So switch to the
+		# 'new_independent_file' save mode. That will work since it fills in the 'Undefined_Set' for the set id and 1
+		# for the problem id.
+		$saveMode = 'new_independent_file' if $saveMode eq 'add_to_set_as_new_problem' && !defined $c->{setID};
+	} else {
 		$c->{editFilePath} = $outputFilePath;
 		# saveFileChanges will update the tempFilePath and inputFilePath as needed.  Don't do that here.
 
@@ -1149,91 +1132,108 @@ sub save_as_handler ($c) {
 			# presented in the form.  So set that here so that the correct redirect is chosen below.
 			$saveMode = "new_$file_type";
 		} elsif ($saveMode eq 'rename' && -r $outputFilePath) {
-			# Modify source file path in problem.
-			if ($file_type eq 'set_header') {
-				my $setRecord = $db->getGlobalSet($c->{setID});
-				$setRecord->set_header($new_file_name);
-				if ($db->putGlobalSet($setRecord)) {
-					$c->addgoodmessage($c->maketext(
-						'The set header for set [_1] has been renamed to "[_2]".', $c->{setID},
-						$c->shortPath($outputFilePath)
-					));
-				} else {
-					$c->addbadmessage($c->maketext(
-						'Unable to change the set header for set [_1]. Unknown error.', $c->{setID}));
-				}
-			} elsif ($file_type eq 'hardcopy_header') {
-				my $setRecord = $db->getGlobalSet($c->{setID});
-				$setRecord->hardcopy_header($new_file_name);
-				if ($db->putGlobalSet($setRecord)) {
-					$c->addgoodmessage($c->maketext(
-						'The hardcopy header for set [_1] has been renamed to "[_2]".', $c->{setID},
-						$c->shortPath($outputFilePath)
-					));
-				} else {
-					$c->addbadmessage($c->maketext(
-						'Unable to change the hardcopy header for set [_1]. Unknown error.',
-						$c->{setID}
-					));
-				}
+			my $problemRecord = $db->getGlobalProblem($c->{setID}, $c->{problemID});
+			$problemRecord->source_file($new_file_name);
+			if ($db->putGlobalProblem($problemRecord)) {
+				$c->addgoodmessage($c->maketext(
+					'The source file for "set [_1] / problem [_2]" has been changed from "[_3]" to "[_4]".',
+					$c->{setID},
+					$c->{prettyProblemNumber},
+					$c->shortPath($c->{sourceFilePath}),
+					$c->shortPath($outputFilePath)
+				));
 			} else {
-				my $problemRecord;
-				if ($c->{versionID}) {
-					$problemRecord =
-						$db->getMergedProblemVersion($c->param('effectiveUser'), $c->{setID}, $1, $c->{problemID});
-				} else {
-					$problemRecord = $db->getGlobalProblem($c->{setID}, $c->{problemID});
-				}
-				$problemRecord->source_file($new_file_name);
-				my $result =
-					$c->{versionID} ? $db->putProblemVersion($problemRecord) : $db->putGlobalProblem($problemRecord);
-
-				if ($result) {
-					$c->addgoodmessage($c->maketext(
-						'The source file for "set [_1] / problem [_2]" has been changed from "[_3]" to "[_4]".',
-						$c->{fullSetID},
-						$c->{prettyProblemNumber},
-						$c->shortPath($c->{sourceFilePath}),
-						$c->shortPath($outputFilePath)
-					));
-				} else {
-					$c->addbadmessage($c->maketext(
-						'Unable to change the source file path for set [_1], problem [_2]. Unknown error.',
-						$c->{fullSetID}, $c->{prettyProblemNumber}
-					));
+				$c->addbadmessage($c->maketext(
+					'Unable to change the source file path for set [_1], problem [_2]. Unknown error.',
+					$c->{setID}, $c->{prettyProblemNumber}
+				));
+			}
+		} elsif ($saveMode eq 'set_as_heaader_for_set' && -r $outputFilePath) {
+			my $setID = $c->param('action.save_as.targetSet');
+			if (defined $setID && $setID =~ /\S/) {
+				$c->{setID} = $setID;
+				if ($file_type eq 'set_header') {
+					my $setRecord = $db->getGlobalSet($c->{setID});
+					$setRecord->set_header($new_file_name);
+					if ($db->putGlobalSet($setRecord)) {
+						$c->addgoodmessage($c->maketext(
+							'The set header for set [_1] has been set to "[_2]".', $c->{setID},
+							$c->shortPath($outputFilePath)
+						));
+					} else {
+						$c->addbadmessage($c->maketext(
+							'Unable to change the set header for set [_1]. Unknown error.',
+							$c->{setID}
+						));
+					}
+				} elsif ($file_type eq 'hardcopy_header') {
+					my $setRecord = $db->getGlobalSet($c->{setID});
+					$setRecord->hardcopy_header($new_file_name);
+					if ($db->putGlobalSet($setRecord)) {
+						$c->addgoodmessage($c->maketext(
+							'The hardcopy header for set [_1] has been set to "[_2]".', $c->{setID},
+							$c->shortPath($outputFilePath)
+						));
+					} else {
+						$c->addbadmessage($c->maketext(
+							'Unable to change the hardcopy header for set [_1]. Unknown error.',
+							$c->{setID}
+						));
+					}
 				}
+			} else {
+				my $headerType =
+					$file_type eq 'set_header' ? $c->maketext('set header') : $c->maketext('hardcopy header');
+				$c->addbadmessage($c->maketext(
+					'A new file has been created at "[_1]" with the contents below. However, '
+						. 'the file has not been set as the [_2] for a set, since no target set was specified.',
+					$c->shortPath($outputFilePath),
+					$headerType
+				));
+				$saveMode = 'new_independent_file';
 			}
 		} elsif ($saveMode eq 'add_to_set_as_new_problem') {
-			my $set = $db->getGlobalSet($c->{setID});
+			my $setID = $c->param('action.save_as.targetSet');
+			if (defined $setID && $setID =~ /\S/) {
+				$c->{setID} = $c->param('action.save_as.targetSet');
+				my $set = $db->getGlobalSet($c->{setID});
+
+				# For jitar sets new problems are put as top level problems at the end.
+				if ($set->assignment_type eq 'jitar') {
+					my @problemIDs = $db->listGlobalProblems($c->{setID});
+					@problemIDs = sort { $a <=> $b } @problemIDs;
+					my @seq = jitar_id_to_seq($problemIDs[-1]);
+					$targetProblemNumber = seq_to_jitar_id($seq[0] + 1);
+				} else {
+					$targetProblemNumber = 1 + max($db->listGlobalProblems($c->{setID}));
+				}
 
-			# For jitar sets new problems are put as top level problems at the end.
-			if ($set->assignment_type eq 'jitar') {
-				my @problemIDs = $db->listGlobalProblems($c->{setID});
-				@problemIDs = sort { $a <=> $b } @problemIDs;
-				my @seq = jitar_id_to_seq($problemIDs[-1]);
-				$targetProblemNumber = seq_to_jitar_id($seq[0] + 1);
+				my $problemRecord = addProblemToSet(
+					$db, $c->ce->{problemDefaults},
+					setName    => $c->{setID},
+					sourceFile => $new_file_name,
+					problemID  => $targetProblemNumber,
+				);
+				assignProblemToAllSetUsers($db, $problemRecord);
+				$c->addgoodmessage($c->maketext(
+					'Added [_1] to [_2] as problem [_3].',
+					$new_file_name,
+					$c->{setID},
+					(
+						$set->assignment_type eq 'jitar'
+						? join('.', jitar_id_to_seq($targetProblemNumber))
+						: $targetProblemNumber
+					)
+				));
 			} else {
-				$targetProblemNumber = 1 + max($db->listGlobalProblems($c->{setID}));
+				$c->addbadmessage($c->maketext(
+					'A new file has been created at "[_1]" with the contents below. '
+						. 'However, the problem has not been added to a set, since no target set was specified.',
+					$c->shortPath($outputFilePath)
+				));
+				$saveMode = 'new_independent_file';
 			}
-
-			my $problemRecord = addProblemToSet(
-				$db, $c->ce->{problemDefaults},
-				setName    => $c->{setID},
-				sourceFile => $new_file_name,
-				problemID  => $targetProblemNumber,    # Added to end of set
-			);
-			assignProblemToAllSetUsers($db, $problemRecord);
-			$c->addgoodmessage($c->maketext(
-				'Added [_1] to [_2] as problem [_3].',
-				$new_file_name,
-				$c->{setID},
-				(
-					$set->assignment_type eq 'jitar'
-					? join('.', jitar_id_to_seq($targetProblemNumber))
-					: $targetProblemNumber
-				)
-			));
-		} elsif ($saveMode eq 'new_independent_problem') {
+		} elsif ($saveMode eq 'new_independent_file') {
 			$c->addgoodmessage($c->maketext(
 				'A new file has been created at "[_1]" with the contents below.',
 				$c->shortPath($outputFilePath)
@@ -1254,15 +1254,15 @@ sub save_as_handler ($c) {
 	if ($saveMode eq 'new_course_info') {
 		$problemPage   = $c->url_for('instructor_problem_editor');
 		$new_file_type = 'course_info';
-	} elsif ($saveMode eq 'new_independent_problem') {
+	} elsif ($saveMode eq 'new_independent_file') {
 		$problemPage =
 			$c->url_for('instructor_problem_editor_withset_withproblem', setID => 'Undefined_Set', problemID => 1);
-		$new_file_type = 'source_path_for_problem_file';
+		$new_file_type = $file_type =~ /header/ ? $file_type : 'source_path_for_problem_file';
 	} elsif ($saveMode eq 'new_hardcopy_theme') {
 		$problemPage                  = $c->url_for('instructor_problem_editor');
 		$new_file_type                = 'hardcopy_theme';
 		$extra_params{hardcopy_theme} = $new_file_name =~ s|^.*\/([^/]*\.xml)|$1|r;
-	} elsif ($saveMode eq 'rename') {
+	} elsif ($saveMode eq 'rename' || $saveMode eq 'set_as_heaader_for_set') {
 		$problemPage = $c->url_for(
 			'instructor_problem_editor_withset_withproblem',
 			setID     => $c->{setID},
@@ -1275,10 +1275,10 @@ sub save_as_handler ($c) {
 			setID     => $c->{setID},
 			problemID => $do_not_save ? $c->{problemID} : max($db->listGlobalProblems($c->{setID}))
 		);
-		$new_file_type = $file_type;
+		$new_file_type = 'problem';
 	} else {
 		$c->addbadmessage($c->maketext(
-			'Please use radio buttons to choose the method for saving this file. Uknown saveMode: [_1].', $saveMode
+			'Please use radio buttons to choose the method for saving this file. Unknown saveMode: [_1].', $saveMode
 		));
 		return;
 	}
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm
index 7bf2c9ed78..dae595e356 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm
@@ -13,6 +13,7 @@ use HTML::Entities;
 use WeBWorK::Utils::JITAR     qw(jitar_id_to_seq);
 use WeBWorK::Utils::Rendering qw(renderPG);
 use WeBWorK::Utils::Sets      qw(get_test_problem_position format_set_name_display);
+use WeBWorK::Utils::DateTime  qw(before);
 
 async sub initialize ($c) {
 	my $authz      = $c->authz;
@@ -96,6 +97,17 @@ async sub initialize ($c) {
 	if ($c->param('assignGrades')) {
 		$c->addgoodmessage($c->maketext('Grades have been saved for all current users.'));
 
+		# Get all of the merged user sets for this set.  These are needed to determine if the problem sub_status also
+		# needs to be set.  The sub_status must be set if reduced scoring is not enabled for the course or set or if it
+		# is before the reduced scoring date.
+		my %mergedSets;
+		if ($c->stash->{set}->assignment_type =~ /gateway/) {
+			$mergedSets{ $_->user_id }{ $_->version_id } = $_
+				for $db->getMergedSetVersionsWhere({ set_id => { like => "$setID,v\%" } });
+		} else {
+			%mergedSets = map { $_->user_id => { 0 => $_ } } $db->getMergedSetsWhere({ set_id => $setID });
+		}
+
 		for my $user (@{ $c->stash->{users} }) {
 			my $userID = $user->user_id;
 			for (@{ $user->{data} }) {
@@ -115,9 +127,16 @@ async sub initialize ($c) {
 				$_->{problem}{flags} =~ s/:needs_grading$//;
 				if ($c->param("$userID.$versionID.mark_correct")) {
 					$_->{problem}->status(1);
+					$_->{problem}->sub_status(1);
 				} elsif (defined $c->param("$userID.$versionID.score")) {
 					my $newscore = $c->param("$userID.$versionID.score") / 100;
-					if ($newscore != $_->{problem}->status) { $_->{problem}->status($newscore); }
+					if ($newscore != $_->{problem}->status) {
+						$_->{problem}->status($newscore);
+						$_->{problem}->sub_status($newscore)
+							if !$ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+							|| !$mergedSets{$userID}{$versionID}->enable_reduced_scoring
+							|| before($mergedSets{$userID}{$versionID}->reduced_scoring_date);
+					}
 				}
 
 				if   ($versionID) { $db->putProblemVersion($_->{problem}); }
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm
index eba2d2aa82..3edfc46755 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm
@@ -29,20 +29,15 @@ use constant SET_FIELDS => [
 ];
 use constant PROBLEM_FIELDS =>
 	[qw(source_file value max_attempts showMeAnother showHintsAfter prPeriod att_to_open_children counts_parent_grade)];
-use constant USER_PROBLEM_FIELDS => [qw(problem_seed status num_correct num_incorrect)];
+use constant USER_PROBLEM_FIELDS => [qw(problem_seed status)];
 
 # These constants determine what order those fields should be displayed in.
-use constant HEADER_ORDER => [qw(set_header hardcopy_header)];
-use constant PROBLEM_FIELD_ORDER => [
-	qw(problem_seed status value max_attempts showMeAnother showHintsAfter prPeriod attempted last_answer num_correct
-		num_incorrect)
-];
-# For gateway sets, don't allow changing max_attempts on a per problem basis.
-use constant GATEWAY_PROBLEM_FIELD_ORDER =>
-	[qw(problem_seed status value attempted last_answer num_correct num_incorrect)];
+use constant HEADER_ORDER        => [qw(set_header hardcopy_header)];
+use constant PROBLEM_FIELD_ORDER => [qw(problem_seed status value max_attempts showMeAnother showHintsAfter prPeriod)];
+use constant GATEWAY_PROBLEM_FIELD_ORDER => [qw(problem_seed status value)];
 use constant JITAR_PROBLEM_FIELD_ORDER => [
 	qw(problem_seed status value max_attempts showMeAnother showHintsAfter prPeriod att_to_open_children
-		counts_parent_grade attempted last_answer num_correct num_incorrect)
+		counts_parent_grade)
 ];
 
 # Exclude the gateway set fields from the set field order, because they are only displayed for sets that are gateways.
@@ -70,14 +65,28 @@ use constant JITAR_SET_FIELD_ORDER => [qw(restrict_prob_progression email_instru
 #                                     [min, max, step] will introduce validation, so should not be used on just any
 #                                     input where we expect numbers
 #     size      => "50",            # size of the edit box (if any)
-#     override  => "none",          # none, one, any, all - defines for whom this data can/must be overidden
+#     override  => "all",           # none, one, any, all - defines for whom this data can be overidden
 #     module    => "problem_list",  # WeBWorK module
 #     default   => 0                # if a field cannot default to undefined/empty what should it default to
-#     labels    => {                # special values can be hashed to display labels
-#       1 => x('Yes'),
-#       0 => x('No'),
+#     labels    => {                # Display labels for type "choose" or type "[min, max, step]".
+#       1 => x('Yes'),              # This is required for type "choose", is optional for type "[min, max, step]",
+#       0 => x('No'),               # and should never be used for any other type.
 #     },
+#     choices   => [ qw(0 1) ]      # Order of the labels above. This must be given if labels is.
 #     convertby => 60,              # divide incoming database field values by this, and multiply when saving
+#
+# Note that if "type" is "[min, max, step]" and "labels" is defined, then a select will be shown before the numeric
+# input with the labels as options.  The label values must not overlap with the numeric values (i.e., min must be
+# greater than all defined label values), and must be numeric. The labels must also include a "numeric" label.  This
+# label will be shown when the number input value is used. It is impomrtant that the choices should not include the
+# special "numeric" value, and that all other choices have numeric values.
+
+# FIXME: The override "none" case needs to be revisited if it is ever used again.  It is definitely not implemented
+# correctly, or it is pointless. If override "none" is to mean it can't be changed at all, then why have it? But then
+# again, with the current implementation fields set to override "none" are not shown when editing for more than one
+# user, but are shown when editing for one user (although they still can't be edited).  That doesn't make sense.  The
+# previous fields that used it were also of type "hidden", and it turns out that type "hidden" and override "none"
+# really means don't use at all, and so listing them was pointless.
 
 use constant BLANKPROBLEM => 'newProblem.pg';
 
@@ -281,7 +290,9 @@ use constant FIELD_PROPERTIES => {
 			'This sets a number of minutes for each version of a test, once it is started.  Use "0" to indicate no '
 				. 'time limit.  If there is a time limit, then there will be an indication that this is a timed '
 				. 'test on the main "Assignments" page.  Additionally the student will be sent to a confirmation '
-				. 'page beefore they can begin.'
+				. 'page before they can begin. Note that the actual time a student will have to complete a timed test '
+				. 'is the product of this time limit and the accommodation time factor set for the student in the '
+				. 'accounts manager.'
 		)
 	},
 	time_limit_cap => {
@@ -479,65 +490,57 @@ use constant FIELD_PROPERTIES => {
 		)
 	},
 	max_attempts => {
-		name     => x('Max Attempts'),
-		type     => 'edit',
-		size     => 6,
-		override => 'any',
-		default  => '-1',
-		labels   => {
-			'-1' => x('Unlimited'),
-		},
+		name      => x('Max Attempts'),
+		type      => [ 0, undef, 1 ],
+		size      => 6,
+		override  => 'any',
+		default   => '-1',
+		choices   => [qw(-1)],
+		labels    => { '-1' => x('Unlimited'), numeric => x('Limit to') },
 		help_text => x(
-			'You may cap the number of attempts a student can use for the problem. Use -1 to indicate unlimited attempts.'
+			'You may cap the number of attempts a student can use for the problem. '
+				. 'Select "Unlimited" to allow an unlimited number of attempts.'
 		)
 	},
 	showMeAnother => {
-		name     => x('Show Me Another'),
-		type     => 'edit',
-		size     => '6',
-		override => 'any',
-		default  => '-2',
-		labels   => {
-			'-1' => x('Never'),
-			'-2' => x('Course Default'),
-		},
+		name      => x('Show Me Another'),
+		type      => [ 0, undef, 1 ],
+		size      => '6',
+		override  => 'any',
+		default   => '-2',
+		choices   => [qw(-2 -1)],
+		labels    => { '-2' => x('Course Default'), '-1' => x('Never'), numeric => x('After number of attempts is') },
 		help_text => x(
 			'When a student has more attempts than is specified here they will be able to view another '
-				. 'version of this problem.  If set to -1 the feature is disabled and if set to -2 '
-				. 'the course default is used.'
+				. 'version of this problem.  The "Show Me Another" feature is is disabled if "Never" is selected.'
 		)
 	},
 	showHintsAfter => {
-		name     => x('Show Hints After'),
-		type     => 'edit',
-		size     => '6',
-		override => 'any',
-		default  => '-2',
-		labels   => {
-			'-2' => x('Course Default'),
-			'-1' => x('Never'),
-		},
+		name      => x('Show Hints'),
+		type      => [ 0, undef, 1 ],
+		size      => '6',
+		override  => 'any',
+		default   => '-2',
+		choices   => [qw(-2 -1)],
+		labels    => { '-2' => x('Course Default'), '-1' => x('Never'), numeric => x('After number of attempts is') },
 		help_text => x(
 			'This specifies the number of attempts before hints are shown to students. '
-				. 'The value of -2 uses the default from course configuration. '
-				. 'The value of -1 disables hints. '
+				. 'If "Never" is selected, then hints are disabled. '
 				. 'Note that this will only have an effect if the problem has a hint.'
 		),
 	},
 	prPeriod => {
-		name     => x('Rerandomize After'),
-		type     => 'edit',
-		size     => '6',
-		override => 'any',
-		default  => '-1',
-		labels   => {
-			'-1' => x('Course Default'),
-			'0'  => x('Never'),
-		},
+		name      => x('Rerandomize'),
+		type      => [ 1, undef, 1 ],
+		size      => '6',
+		override  => 'any',
+		default   => '-1',
+		choices   => [qw(-1 0)],
+		labels    => { '-1' => x('Course Default'), '0' => x('Never'), numeric => x('After number of attempts is') },
 		help_text => x(
 			'This specifies the rerandomization period: the number of attempts before a new version of '
-				. 'the problem is generated by changing the Seed value. The value of -1 uses the '
-				. 'default from course configuration. The value of 0 disables rerandomization.'
+				. 'the problem is generated by changing the Seed value. '
+				. 'Randomization is disabled if "Never" is selected.'
 		),
 	},
 	problem_seed => {
@@ -561,34 +564,6 @@ use constant FIELD_PROPERTIES => {
 				. 'to 1 to manually award full credit on this problem.'
 		)
 	},
-	attempted => {
-		name     => x('Attempted'),
-		type     => 'hidden',
-		override => 'none',
-		choices  => [qw(0 1)],
-		labels   => {
-			1 => x('Yes'),
-			0 => x('No'),
-		},
-		default => '0',
-	},
-	last_answer => {
-		name     => x('Last Answer'),
-		type     => 'hidden',
-		override => 'none',
-	},
-	num_correct => {
-		name     => x('Correct'),
-		type     => 'hidden',
-		override => 'none',
-		default  => '0',
-	},
-	num_incorrect => {
-		name     => x('Incorrect'),
-		type     => 'hidden',
-		override => 'none',
-		default  => '0',
-	},
 	hide_hint => {
 		name     => x('Hide Hints from Students'),
 		type     => 'choose',
@@ -605,19 +580,18 @@ use constant FIELD_PROPERTIES => {
 		)
 	},
 	att_to_open_children => {
-		name     => x('Attempt Threshold for Children'),
-		type     => 'edit',
-		size     => 6,
-		override => 'any',
-		default  => '0',
-		labels   => {
-			'-1' => x('max'),
-		},
+		name      => x('Attempt Threshold for Children'),
+		type      => [ 0, undef, 1 ],
+		size      => 6,
+		override  => 'any',
+		default   => '0',
+		choices   => [qw(-1)],
+		labels    => { '-1' => x('No Attempts Remaining'), numeric => x('Number incorrect is') },
 		help_text => x(
 			'The child problems for this problem will become visible to the student when they either have more '
 				. 'incorrect attempts than is specified here, or when they run out of attempts, whichever comes '
-				. 'first.  Use -1 to indicate that child problems should only be available after a student '
-				. 'runs out of attempts.'
+				. 'first.  Select "No Attempts Remaining" to indicate that child problems should only be available '
+				. 'after a student runs out of attempts.'
 		),
 	},
 	counts_parent_grade => {
@@ -638,13 +612,6 @@ use constant FIELD_PROPERTIES => {
 	},
 };
 
-use constant FIELD_PROPERTIES_GWQUIZ => {
-	max_attempts => {
-		type     => 'hidden',
-		override => 'any',
-	}
-};
-
 # Create a table of fields for the given parameters, one row for each db field.
 # If only the setID is included, it creates a table of set information.
 # If the problemID is included, it creates a table of problem information.
@@ -724,13 +691,7 @@ sub fieldTable ($c, $userID, $setID, $problemID, $globalRecord, $userRecord = un
 	}
 
 	for my $field (@fieldOrder) {
-		my %properties;
-
-		if ($isGWset && defined(FIELD_PROPERTIES_GWQUIZ->{$field})) {
-			%properties = %{ FIELD_PROPERTIES_GWQUIZ->{$field} };
-		} else {
-			%properties = %{ FIELD_PROPERTIES()->{$field} };
-		}
+		my %properties = %{ FIELD_PROPERTIES()->{$field} };
 
 		# Don't show fields if that option isn't enabled.
 		if (!$ce->{options}{enableConditionalRelease}
@@ -822,9 +783,8 @@ sub fieldHTML ($c, $userID, $setID, $problemID, $globalRecord, $userRecord, $fie
 
 	my %properties = %{ FIELD_PROPERTIES()->{$field} };
 	if ($field eq 'problems_per_page') {
-		if ($c->ce->{test}{maxProblemsPerPage} == 1) {
-			$properties{override} = 'none';
-		} elsif ($c->ce->{test}{maxProblemsPerPage} > 1) {
+		return '' if $c->ce->{test}{maxProblemsPerPage} == 1;
+		if ($c->ce->{test}{maxProblemsPerPage} > 1) {
 			my $max = $c->ce->{test}{maxProblemsPerPage};
 			$properties{type} = [ 1, $max, 1 ];
 			$properties{help_text} =
@@ -841,10 +801,6 @@ sub fieldHTML ($c, $userID, $setID, $problemID, $globalRecord, $userRecord, $fie
 	return '' if $properties{override} eq 'none' && !$forOneUser;
 	return '' if $properties{override} eq 'all'  && $forUsers;
 
-	my $edit   = $properties{type} eq 'edit'       && $properties{override} ne 'none';
-	my $number = ref($properties{type}) eq 'ARRAY' && $properties{override} ne 'none';
-	my $choose = $properties{type} eq 'choose'     && $properties{override} ne 'none';
-
 	my ($globalValue, $userValue, $blankField) = (undef, undef, '');
 	if ($field =~ /:/) {
 		# This allows one "select" to set multiple database fields.
@@ -882,106 +838,141 @@ sub fieldHTML ($c, $userID, $setID, $problemID, $globalRecord, $userRecord, $fie
 	# Determine if this is a set record or problem record.
 	my ($recordType, $recordID) = defined $problemID ? ('problem', $problemID) : ('set', $setID);
 
-	my %labels = (map { $_ => $c->maketext($properties{labels}{$_}) } keys %{ $properties{labels} });
+	my %labels = map { $_ => $c->maketext($properties{labels}{$_}) } keys %{ $properties{labels} // {} };
 
 	# This contains either a text input or a select for changing a given database field.
 	my $input = '';
 
-	if ($edit || $number) {
-		if ($field =~ /_date/) {
-			$input = $c->tag(
-				'div',
-				class => 'input-group input-group-sm flatpickr',
-				$c->c(
-					$c->text_field(
-						"$recordType.$recordID.$field",
-						$forUsers ? $userValue : $globalValue,
-						id    => "$recordType.$recordID.${field}_id",
-						class => 'form-control form-control-sm'
-							. ($field eq 'open_date' ? ' datepicker-group' : ''),
-						placeholder => (
-							$forUsers && $canOverride ? $c->maketext('Set Default') : $c->maketext('None Specified')
-						),
-						data => {
-							input      => undef,
-							done_text  => $c->maketext('Done'),
-							today_text => $c->maketext('Today'),
-							now_text   => $c->maketext('Now'),
-							locale     => $c->ce->{language},
-							timezone   => $c->ce->{siteDefaults}{timezone}
-						}
-					),
-					$c->tag(
-						'a',
-						class        => 'btn btn-secondary btn-sm',
-						data         => { toggle => undef },
-						role         => 'button',
-						tabindex     => 0,
-						'aria-label' => $c->maketext('Pick date and time'),
-						$c->tag('i', class => 'fas fa-calendar-alt', 'aria-hidden' => 'true', '')
-					)
-				)->join('')
-			);
-		} else {
-			my $value = $forUsers ? ($labels{$userValue} || $userValue) : ($labels{$globalValue} || $globalValue);
-			$value = $c->ce->{test}{maxProblemsPerPage}
-				if ($field eq 'problems_per_page'
-					&& $c->ce->{test}{maxProblemsPerPage}
-					&& ($value == 0 || $value > $c->ce->{test}{maxProblemsPerPage}));
-			$value = format_set_name_display($value =~ s/\s*,\s*/,/gr) if $field eq 'restricted_release';
-
-			my @field_args = (
-				"$recordType.$recordID.$field", $value,
-				id    => "$recordType.$recordID.${field}_id",
-				class => 'form-control form-control-sm',
-				$field eq 'restricted_release' || $field eq 'source_file' ? (dir => 'ltr') : ()
-			);
-			if ($field eq 'problem_seed') {
-				# Insert a randomization button
+	if ($properties{override} ne 'none') {
+		if ($properties{type} eq 'edit' || ref($properties{type}) eq 'ARRAY') {
+			if ($field =~ /_date/) {
 				$input = $c->tag(
 					'div',
-					class => 'input-group input-group-sm',
-					style => 'min-width: 7rem',
+					class => 'input-group input-group-sm flatpickr',
 					$c->c(
-						$c->number_field(@field_args, min => 0),
+						$c->text_field(
+							"$recordType.$recordID.$field",
+							$forUsers ? $userValue : $globalValue,
+							id    => "$recordType.$recordID.${field}_id",
+							class => 'form-control form-control-sm'
+								. ($field eq 'open_date' ? ' datepicker-group' : ''),
+							placeholder => (
+								$forUsers
+									&& $canOverride ? $c->maketext('Set Default') : $c->maketext('None Specified')
+							),
+							data => {
+								input      => undef,
+								done_text  => $c->maketext('Done'),
+								today_text => $c->maketext('Today'),
+								now_text   => $c->maketext('Now'),
+								locale     => $c->ce->{language},
+								timezone   => $c->ce->{siteDefaults}{timezone}
+							}
+						),
 						$c->tag(
-							'button',
-							type  => 'button',
-							class => 'randomize-seed-btn btn btn-sm btn-secondary',
-							title => 'randomize',
-							data  => {
-								seed_input   => "$recordType.$recordID.problem_seed_id",
-								status_input => "$recordType.$recordID.status_id"
-							},
-							$c->tag('i', class => 'fa-solid fa-shuffle')
+							'a',
+							class        => 'btn btn-secondary btn-sm',
+							data         => { toggle => undef },
+							role         => 'button',
+							tabindex     => 0,
+							'aria-label' => $c->maketext('Pick date and time'),
+							$c->tag('i', class => 'fas fa-calendar-alt', 'aria-hidden' => 'true', '')
 						)
 					)->join('')
 				);
-			} elsif ($number) {
-				$input = $c->number_field(
-					@field_args,
-					min  => ($properties{type}[0] || 0),
-					max  => ($properties{type}[1] || undef),
-					step => ($properties{type}[2] || 1),
-					$forUsers && $canOverride ? (placeholder => $c->maketext('Set Default')) : ()
-				);
 			} else {
-				$input = $c->text_field(@field_args,
-					$forUsers && $canOverride ? (placeholder => $c->maketext('Set Default')) : ());
+				my $value = $forUsers ? $userValue : $globalValue;
+				$value = $c->ce->{test}{maxProblemsPerPage}
+					if ($field eq 'problems_per_page'
+						&& $c->ce->{test}{maxProblemsPerPage}
+						&& ($value == 0 || $value > $c->ce->{test}{maxProblemsPerPage}));
+				$value = format_set_name_display($value =~ s/\s*,\s*/,/gr) if $field eq 'restricted_release';
+
+				my @field_args = (
+					id    => "$recordType.$recordID.${field}_id",
+					class => 'form-control form-control-sm',
+					$field eq 'restricted_release' || $field eq 'source_file' ? (dir => 'ltr') : ()
+				);
+				if ($field eq 'problem_seed') {
+					# Insert a randomization button
+					$input = $c->tag(
+						'div',
+						class => 'input-group input-group-sm',
+						style => 'min-width: 7rem',
+						$c->c(
+							$c->number_field("$recordType.$recordID.$field", $value, @field_args, min => 0),
+							$c->tag(
+								'button',
+								type  => 'button',
+								class => 'randomize-seed-btn btn btn-sm btn-secondary',
+								title => 'randomize',
+								data  => {
+									seed_input   => "$recordType.$recordID.problem_seed_id",
+									status_input => "$recordType.$recordID.status_id"
+								},
+								$c->tag('i', class => 'fa-solid fa-shuffle')
+							)
+						)->join('')
+					);
+				} elsif (ref($properties{type}) eq 'ARRAY') {
+					if (ref $properties{labels} eq 'HASH') {
+						$input = $c->tag(
+							'div',
+							class => 'input-group input-group-sm mixed-numeric-select',
+							style => 'min-width: 7rem',
+							$c->c(
+								$c->select_field(
+									"$recordType.$recordID.$field",
+									[
+										$forUsers && $canOverride ? [ $c->maketext('Set Default') => '' ] : (),
+										[
+											$labels{numeric} => 'numeric',
+											$value ne '' && !defined $labels{$value} ? (selected => undef) : ()
+										],
+										map { [ $labels{$_} => $_, $_ eq $value ? (selected => undef) : () ] }
+											@{ $properties{choices} }
+									],
+									class => 'form-select form-select-sm'
+								),
+								$c->number_field(
+									"$recordType.$recordID.$field", defined $labels{$value} ? '' : $value,
+									@field_args,
+									min => $properties{type}[0],
+									$properties{type}[1] ? (max => $properties{type}[1]) : (),
+									step  => $properties{type}[2] || 1,
+									style => 'max-width: 4rem'
+								)
+							)->join('')
+						);
+					} else {
+						$input = $c->number_field(
+							"$recordType.$recordID.$field", $value,
+							@field_args,
+							min => $properties{type}[0],
+							$properties{type}[1] ? (max => $properties{type}[1]) : (),
+							step => $properties{type}[2] || 1,
+							$forUsers && $canOverride ? (placeholder => $c->maketext('Set Default')) : (),
+						);
+					}
+				} else {
+					$input = $c->text_field("$recordType.$recordID.$field",
+						$value, @field_args,
+						$forUsers && $canOverride ? (placeholder => $c->maketext('Set Default')) : ());
+				}
 			}
+		} elsif ($properties{type} eq 'choose') {
+			my $value = $forUsers ? $userValue : $globalValue;
+
+			$input = $c->select_field(
+				"$recordType.$recordID.$field",
+				[
+					$forUsers && $userRecord ? [ $c->maketext('Set Default') => '' ] : (),
+					map { [ $labels{$_} => $_, $_ eq $value ? (selected => undef) : () ] } @{ $properties{choices} }
+				],
+				id    => "$recordType.$recordID.${field}_id",
+				class => 'form-select form-select-sm'
+			);
 		}
-	} elsif ($choose) {
-		my $value = $forUsers ? $userValue : $globalValue;
-
-		$input = $c->select_field(
-			"$recordType.$recordID.$field",
-			[
-				$forUsers && $userRecord ? [ $c->maketext('Set Default') => '' ] : (),
-				map { [ $labels{$_} => $_, $_ eq $value ? (selected => undef) : () ] } @{ $properties{choices} }
-			],
-			id    => "$recordType.$recordID.${field}_id",
-			class => 'form-select form-select-sm'
-		);
 	}
 
 	my $globalDisplayValue =
@@ -1015,7 +1006,7 @@ sub fieldHTML ($c, $userID, $setID, $problemID, $globalRecord, $userRecord, $fie
 			$c->c(
 				$c->tag('i',    class => 'icon fas fa-question-circle', 'aria-hidden' => 'true'),
 				$c->tag('span', class => 'visually-hidden',             $c->maketext('[_1] Help', $properties{name}))
-		)->join('')
+			)->join('')
 		)
 		: '';
 
@@ -1307,7 +1298,6 @@ sub initialize ($c) {
 	my $setID = $c->stash('setID');
 
 	# Make sure these are defined for the templates.
-	$c->stash->{fullSetID}           = $setID;
 	$c->stash->{headers}             = HEADER_ORDER();
 	$c->stash->{field_properties}    = FIELD_PROPERTIES();
 	$c->stash->{display_modes}       = WeBWorK::PG::DISPLAY_MODES();
@@ -1342,18 +1332,11 @@ sub initialize ($c) {
 	my $forOneUser = $forUsers == 1;
 	$c->stash->{forOneUser} = $forOneUser;
 
-	# If editing a versioned set, it only makes sense edit it for one user.
+	# If editing a versioned set, it only makes sense to edit it for one user.
 	return if ($editingSetVersion && !$forOneUser);
 
 	my %properties = %{ FIELD_PROPERTIES() };
 
-	# Invert the labels hashes.
-	my %undoLabels;
-	for my $key (keys %properties) {
-		%{ $undoLabels{$key} } =
-			map { $c->maketext($properties{$key}{labels}{$_}) => $_ } keys %{ $properties{$key}{labels} };
-	}
-
 	my $error = 0;
 	if ($c->param('submit_changes')) {
 		my @names = ('open_date', 'due_date', 'answer_date', 'reduced_scoring_date');
@@ -1405,7 +1388,6 @@ sub initialize ($c) {
 	$c->addbadmessage($c->maketext('No changes were saved!')) if $error;
 
 	if ($c->param('submit_changes') && !$error) {
-
 		my $oldAssignmentType = $setRecord->assignment_type();
 
 		# Save general set information (including headers)
@@ -1428,9 +1410,9 @@ sub initialize ($c) {
 				for my $field (@{ SET_FIELDS() }) {
 					next unless canChange($forUsers, $field);
 
-					my $param = $c->param("set.$setID.$field");
+					my @paramValues = $c->param("set.$setID.$field");
+					my $param = @paramValues > 1 && $paramValues[0] eq 'numeric' ? $paramValues[1] : $paramValues[0];
 					if ($param && $param ne '') {
-						$param = $undoLabels{$field}{$param}               if defined $undoLabels{$field}{$param};
 						$param = $param * $properties{$field}->{convertby} if $properties{$field}{convertby};
 
 						# Special case: Does field fill in multiple values?
@@ -1502,11 +1484,10 @@ sub initialize ($c) {
 			foreach my $field (@{ SET_FIELDS() }) {
 				next unless canChange($forUsers, $field);
 
-				my $param = $c->param("set.$setID.$field");
-				$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : ""
-					unless defined $param && $param ne "";
-				my $unlabel = $undoLabels{$field}->{$param};
-				$param = $unlabel if defined $unlabel;
+				my @paramValues = $c->param("set.$setID.$field");
+				my $param       = @paramValues > 1 && $paramValues[0] eq 'numeric' ? $paramValues[1] : $paramValues[0];
+				$param = defined $properties{$field}{default} ? $properties{$field}{default} : ''
+					unless defined $param && $param ne '';
 				if ($field =~ /restricted_release/ && $param) {
 					$param = format_set_name_internal($param =~ s/\s*,\s*/,/gr);
 					$c->check_sets($db, $param);
@@ -1655,10 +1636,10 @@ sub initialize ($c) {
 					for my $field (@{ PROBLEM_FIELDS() }) {
 						next unless canChange($forUsers, $field);
 
-						my $param = $c->param("problem.$problemID.$field");
+						my @paramValues = $c->param("problem.$problemID.$field");
+						my $param =
+							@paramValues > 1 && $paramValues[0] eq 'numeric' ? $paramValues[1] : $paramValues[0];
 						if (defined $param && $param ne '') {
-							$param = $undoLabels{$field}{$param} if defined $undoLabels{$field}{$param};
-
 							# Protect exploits with source_file
 							if ($field eq 'source_file') {
 								if ($param =~ /\.\./ || $param =~ /^\//) {
@@ -1682,11 +1663,12 @@ sub initialize ($c) {
 					for my $field (@{ USER_PROBLEM_FIELDS() }) {
 						next unless canChange($forUsers, $field);
 
-						my $param = $c->param("problem.$problemID.$field");
-						$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : ""
-							unless defined $param && $param ne "";
-						my $unlabel = $undoLabels{$field}->{$param};
-						$param = $unlabel if defined $unlabel;
+						my @paramValues = $c->param("problem.$problemID.$field");
+						my $param =
+							@paramValues > 1 && $paramValues[0] eq 'numeric' ? $paramValues[1] : $paramValues[0];
+						$param = defined $properties{$field}{default} ? $properties{$field}{default} : ''
+							unless defined $param && $param ne '';
+
 						# Protect exploits with source_file
 						if ($field eq 'source_file') {
 							if ($param =~ /\.\./ || $param =~ /^\//) {
@@ -1719,11 +1701,10 @@ sub initialize ($c) {
 				foreach my $field (@{ PROBLEM_FIELDS() }) {
 					next unless canChange($forUsers, $field);
 
-					my $param = $c->param("problem.$problemID.$field");
-					$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : ""
-						unless defined $param && $param ne "";
-					my $unlabel = $undoLabels{$field}->{$param};
-					$param = $unlabel if defined $unlabel;
+					my @paramValues = $c->param("problem.$problemID.$field");
+					my $param = @paramValues > 1 && $paramValues[0] eq 'numeric' ? $paramValues[1] : $paramValues[0];
+					$param = defined $properties{$field}{default} ? $properties{$field}{default} : ''
+						unless defined $param && $param ne '';
 
 					# Protect exploits with source_file
 					if ($field eq 'source_file') {
@@ -1759,11 +1740,11 @@ sub initialize ($c) {
 						foreach my $field (keys %useful) {
 							next unless canChange($forUsers, $field);
 
-							my $param = $c->param("problem.$problemID.$field");
-							$param = defined $properties{$field}->{default} ? $properties{$field}->{default} : ""
-								unless defined $param && $param ne "";
-							my $unlabel = $undoLabels{$field}->{$param};
-							$param = $unlabel if defined $unlabel;
+							my @paramValues = $c->param("problem.$problemID.$field");
+							my $param =
+								@paramValues > 1 && $paramValues[0] eq 'numeric' ? $paramValues[1] : $paramValues[0];
+							$param = defined $properties{$field}{default} ? $properties{$field}{default} : ''
+								unless defined $param && $param ne '';
 							$changed ||= changed($record->$field, $param);
 							$record->$field($param);
 						}
@@ -2048,13 +2029,11 @@ sub initialize ($c) {
 }
 
 # Helper method for checking if two values are different.
-# The return values will usually be thrown away, but they could be useful for debugging.
 sub changed ($first, $second) {
-	return "def/undef" if defined $first  && !defined $second;
-	return "undef/def" if !defined $first && defined $second;
-	return ""          if !defined $first && !defined $second;
-	return "ne"        if $first ne $second;
-	return "";
+	return 0 if !defined $first && !defined $second;
+	return 1 if !defined $first || !defined $second;
+	return 1 if $first ne $second;
+	return 0;
 }
 
 # Helper method that determines for how many users at a time a field can be changed.
@@ -2071,7 +2050,7 @@ sub canChange ($forUsers, $field) {
 	return 1 if $howManyCan eq "any";
 	return 1 if $howManyCan eq "one" && $forOneUser;
 	return 1 if $howManyCan eq "all" && !$forUsers;
-	return 0;    # FIXME: maybe it should default to 1?
+	return 0;
 }
 
 # Helper method that determines if a file is valid and returns a pretty error message.
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
index 6a65b99ce0..5e33ee8369 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
@@ -643,17 +643,6 @@ sub save_edit_handler ($c) {
 			}
 		}
 
-		# make sure the dates are not more than 10 years in the future
-		my $curr_time        = time;
-		my $seconds_per_year = 31_556_926;
-		my $cutoff           = $curr_time + $seconds_per_year * 10;
-		return (0, $c->maketext('Error: Open date cannot be more than 10 years from now in set [_1].', $setID))
-			if $Set->open_date > $cutoff;
-		return (0, $c->maketext('Error: Close date cannot be more than 10 years from now in set [_1].', $setID))
-			if $Set->due_date > $cutoff;
-		return (0, $c->maketext('Error: Answer date cannot be more than 10 years from now in set [_1].', $setID))
-			if $Set->answer_date > $cutoff;
-
 		# Check that the open, due and answer dates are in increasing order.
 		# Bail if this is not correct.
 		if ($Set->open_date > $Set->due_date) {
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm b/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
index 63ef67a7bb..33b86fb40b 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm
@@ -22,30 +22,7 @@ sub initialize ($c) {
 	# Check permissions
 	return unless $c->authz->hasPermissions($user, 'access_instructor_tools');
 
-	# Cache a list of all users except set level proctors and practice users, and restrict to the sections or
-	# recitations that are allowed for the user if such restrictions are defined.  This list is sorted by last_name,
-	# then first_name, then user_id.  This is used in multiple places in this module, and is guaranteed to be used at
-	# least once.  So it is done here to prevent extra database access.
-	$c->{student_records} = [
-		$db->getUsersWhere(
-			{
-				user_id => [ -and => { not_like => 'set_id:%' }, { not_like => "$ce->{practiceUserPrefix}\%" } ],
-				$ce->{viewable_sections}{$user} || $ce->{viewable_recitations}{$user}
-				? (
-					-or => [
-						$ce->{viewable_sections}{$user}    ? (section    => $ce->{viewable_sections}{$user})    : (),
-						$ce->{viewable_recitations}{$user} ? (recitation => $ce->{viewable_recitations}{$user}) : ()
-					]
-					)
-				: ()
-			},
-			[qw/last_name first_name user_id/]
-		)
-	];
-
-	if ($c->current_route eq 'instructor_user_statistics') {
-		$c->{studentID} = $c->stash('userID');
-	} elsif ($c->current_route =~ /^instructor_(set|problem)_statistics$/) {
+	if ($c->current_route =~ /^instructor_(set|problem)_statistics$/) {
 		my $setRecord = $db->getGlobalSet($c->stash('setID'));
 		return unless $setRecord;
 		$c->{setRecord} = $setRecord;
@@ -57,6 +34,30 @@ sub initialize ($c) {
 			return unless $problemRecord;
 			$c->{problemRecord} = $problemRecord;
 		}
+
+		# Cache a list of all users except set level proctors and practice users, and restrict to the sections
+		# or recitations that are allowed for the user if such restrictions are defined.  This list is sorted by
+		# last_name, then first_name, then user_id.  This is used in multiple places in this module, and is used
+		# on every page except the main page, so it is done here to prevent extra database access.
+		$c->{student_records} = [
+			$db->getUsersWhere(
+				{
+					user_id =>
+						[ -and => { not_like => 'set_id:%' }, { not_like => "$ce->{practiceUserPrefix}\%" } ],
+					$ce->{viewable_sections}{$user} || $ce->{viewable_recitations}{$user}
+					? (
+						-or => [
+							$ce->{viewable_sections}{$user} ? (section => $ce->{viewable_sections}{$user}) : (),
+							$ce->{viewable_recitations}{$user}
+							? (recitation => $ce->{viewable_recitations}{$user})
+							: ()
+						]
+						)
+					: ()
+				},
+				[qw/last_name first_name user_id/]
+			)
+		];
 	}
 
 	return;
@@ -67,9 +68,7 @@ sub page_title ($c) {
 
 	my $setID = $c->stash('setID') || '';
 
-	if ($c->current_route eq 'instructor_user_statistics') {
-		return $c->maketext('Statistics for student [_1]', $c->{studentID});
-	} elsif ($c->current_route eq 'instructor_set_statistics') {
+	if ($c->current_route eq 'instructor_set_statistics') {
 		return $c->maketext('Statistics for [_1]', $c->tag('span', dir => 'ltr', format_set_name_display($setID)));
 	} elsif ($c->current_route eq 'instructor_problem_statistics') {
 		return $c->maketext(
@@ -79,12 +78,11 @@ sub page_title ($c) {
 		);
 	}
 
-	return $c->maketext('Statistics');
+	return $c->maketext('Set Statistics');
 }
 
 sub siblings ($c) {
-	# Stats and StudentProgress share this template.
-	return $c->include('ContentGenerator/Instructor/Stats/siblings', header => $c->maketext('Statistics'));
+	return $c->include('ContentGenerator/Instructor/Stats/siblings');
 }
 
 # Apply the currently selected filter to the student records, and return a reference to the
@@ -567,6 +565,7 @@ sub build_bar_chart ($c, $data, %options) {
 		viewbox           => '-2 -2 ' . ($imageWidth + 3) . ' ' . ($imageHeight + 3),
 		'aria-labelledby' => "bar_graph_title_$id",
 		role              => 'img',
+		class             => 'stats-image',
 		-nocredits        => 1
 	);
 
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm b/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
index 6acc9cc579..8727d3d824 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm
@@ -7,10 +7,12 @@ WeBWorK::ContentGenerator::Instructor::StudentProgress - Display Student Progres
 
 =cut
 
-use WeBWorK::Utils                qw(wwRound);
-use WeBWorK::Utils::FilterRecords qw(getFiltersForClass filterRecords);
-use WeBWorK::Utils::JITAR         qw(jitar_id_to_seq);
-use WeBWorK::Utils::Sets          qw(grade_set list_set_versions format_set_name_display);
+use WeBWorK::Utils                    qw(wwRound);
+use WeBWorK::Utils::DateTime          qw(after);
+use WeBWorK::Utils::FilterRecords     qw(getFiltersForClass filterRecords);
+use WeBWorK::Utils::JITAR             qw(jitar_id_to_seq);
+use WeBWorK::Utils::Sets              qw(grade_set list_set_versions format_set_name_display);
+use WeBWorK::Utils::ProblemProcessing qw(compute_unreduced_score);
 
 sub initialize ($c) {
 	my $db   = $c->db;
@@ -68,8 +70,7 @@ sub page_title ($c) {
 }
 
 sub siblings ($c) {
-	# Stats and StudentProgress share this template.
-	return $c->include('ContentGenerator/Instructor/Stats/siblings', header => $c->maketext('Student Progress'));
+	return $c->include('ContentGenerator/Instructor/StudentProgress/siblings');
 }
 
 # Display student progress table
@@ -279,4 +280,333 @@ sub displaySets ($c) {
 	);
 }
 
+sub displayStudentStats ($c) {
+	my $db    = $c->db;
+	my $ce    = $c->ce;
+	my $authz = $c->authz;
+
+	my $studentID     = $c->{studentID};
+	my $studentRecord = $db->getUser($studentID);
+	unless ($studentRecord) {
+		$c->addbadmessage($c->maketext('Record for user [_1] not found.', $studentID));
+		return '';
+	}
+
+	my $courseName = $ce->{courseName};
+
+	# First get all merged sets for this user ordered by set_id.
+	my @sets = $db->getMergedSetsWhere({ user_id => $studentID }, 'set_id');
+	# To be able to find the set objects later, make a handy hash of set ids to set objects.
+	my %setsByID = (map { $_->set_id => $_ } @sets);
+
+	# Before going through the table generating loop, find all the set versions for the sets in our list.
+	my %setVersionsCount;
+	my @allSetIDs;
+	for my $set (@sets) {
+		# Don't show hidden sets unless user has appropriate permissions.
+		next unless ($set->visible || $authz->hasPermissions($c->param('user'), 'view_hidden_sets'));
+
+		my $setID = $set->set_id();
+
+		# FIXME: Here, as in many other locations, we assume that there is a one-to-one matching between versioned sets
+		# and gateways.  We really should have two flags, $set->assignment_type and $set->versioned.  I'm not adding
+		# that yet, however, so this will continue to use assignment_type.
+		if (defined $set->assignment_type && $set->assignment_type =~ /gateway/) {
+			# We have to have the merged set versions to know what each of their assignment types are
+			# (because proctoring can change this).
+			my @setVersions =
+				$db->getMergedSetVersionsWhere({ user_id => $studentID, set_id => { like => "$setID,v\%" } });
+
+			# Add the set versions to our list of sets.
+			$setsByID{ $_->set_id . ',v' . $_->version_id } = $_ for (@setVersions);
+
+			# Flag the existence of set versions for this set.
+			$setVersionsCount{$setID} = scalar @setVersions;
+
+			# Save the set names for display.
+			push(@allSetIDs, $setID);
+			push(@allSetIDs, map { $_->set_id . ',v' . $_->version_id } @setVersions);
+
+		} else {
+			push(@allSetIDs, $setID);
+		}
+	}
+
+	my $fullName      = join(' ', $studentRecord->first_name, $studentRecord->last_name);
+	my $effectiveUser = $studentRecord->user_id();
+
+	my $max_problems     = 0;
+	my $courseTotal      = 0;
+	my $courseTotalRight = 0;
+
+	for my $setID (@allSetIDs) {
+		my $set = $db->getGlobalSet($setID);
+		my $num_of_problems;
+		# For jitar sets we only display grades for top level problems, so we need to count how many there are.
+		if ($set && $set->assignment_type() eq 'jitar') {
+			my @problemIDs = $db->listGlobalProblems($setID);
+			for my $problemID (@problemIDs) {
+				my @seq = jitar_id_to_seq($problemID);
+				$num_of_problems++ if ($#seq == 0);
+			}
+		} else {
+			# For other sets we just count the number of problems.
+			$num_of_problems = $db->countGlobalProblems($setID);
+		}
+		$max_problems =
+			$set && after($set->open_date) && $max_problems < $num_of_problems ? $num_of_problems : $max_problems;
+	}
+
+	# Variables to help compute gateway scores.
+	my $numGatewayVersions = 0;
+	my $bestGatewayScore   = 0;
+
+	my $rows = $c->c;
+	for my $setID (@allSetIDs) {
+		my $act_as_student_set_url =
+			$c->systemLink($c->url_for('problem_list', setID => $setID), params => { effectiveUser => $effectiveUser });
+		my $set = $setsByID{$setID};
+
+		# Determine if set is a test and create the test url.
+		my $setIsVersioned          = 0;
+		my $act_as_student_test_url = '';
+		if (defined $set->assignment_type && $set->assignment_type =~ /gateway/) {
+			$setIsVersioned = 1;
+			if ($set->assignment_type eq 'proctored_gateway') {
+				$act_as_student_test_url = $act_as_student_set_url =~ s/($courseName)\//$1\/proctored_test_mode\//r;
+			} else {
+				$act_as_student_test_url = $act_as_student_set_url =~ s/($courseName)\//$1\/test_mode\//r;
+			}
+			# Remove version from set url
+			$act_as_student_set_url =~ s/,v\d+//;
+		}
+
+		# Format set name based on set visibility.
+		my $setName = $c->tag(
+			'span',
+			class => $set->visible ? 'font-visible' : 'font-hidden',
+			format_set_name_display($setID =~ s/,v\d+$//r)
+		);
+
+		# If the set is a template gateway set and there are no versions, we acknowledge that the set exists and the
+		# student hasn't attempted it. Otherwise, we skip it and let the versions speak for themselves.
+		if (defined $setVersionsCount{$setID}) {
+			next if $setVersionsCount{$setID};
+			push @$rows,
+				$c->tag(
+					'tr',
+					$c->c(
+						$c->tag(
+							'th',
+							dir => 'ltr',
+							(after($set->open_date) || $authz->hasPermissions($c->param('user'), 'view_unopened_sets'))
+							? $c->link_to($setName => $act_as_student_set_url)
+							: $setName
+						),
+						$c->tag(
+							'td',
+							colspan => $max_problems + 3,
+							$c->tag(
+								'em',
+								after($set->open_date) ? $c->maketext('No versions of this test have been taken.')
+								: $c->maketext(
+									'Will open on [_1].',
+									$c->formatDateTime($set->open_date, $ce->{studentDateDisplayFormat})
+								)
+							)
+						)
+					)->join('')
+				);
+			next;
+		}
+
+		# If the set has hide_score set, then we need to skip printing the score as well.
+		if (
+			defined $set->assignment_type
+			&& $set->assignment_type =~ /gateway/
+			&& defined $set->hide_score
+			&& (
+				!$authz->hasPermissions($c->param('user'), 'view_hidden_work')
+				&& ($set->hide_score eq 'Y' || ($set->hide_score eq 'BeforeAnswerDate' && time < $set->answer_date))
+			)
+			)
+		{
+			# Add a link to the test version if the problems can be seen.
+			my $thisSetName =
+				$c->link_to($setName => $act_as_student_set_url) . ' ('
+				. (
+					(
+						$set->hide_work eq 'N'
+						|| ($set->hide_work eq 'BeforeAnswerDate' && time >= $set->answer_date)
+						|| $authz->hasPermissions($c->param('user'), 'view_unopened_sets')
+					)
+					? $c->link_to($c->maketext('version [_1]', $set->version_id) => $act_as_student_test_url)
+					: $c->maketext('version [_1]', $set->version_id)
+				) . ')';
+			push(
+				@$rows,
+				$c->tag(
+					'tr',
+					$c->c(
+						$c->tag(
+							'th',
+							dir => 'ltr',
+							sub {$thisSetName}
+						),
+						$c->tag(
+							'td',
+							colspan => $max_problems + 3,
+							$c->tag('em', $c->maketext('Display of scores for this test is not allowed.'))
+						)
+					)->join('')
+				)
+			);
+			next;
+		}
+
+		my ($totalRight, $total, $problem_scores, $problem_incorrect_attempts, $problem_records) =
+			grade_set($db, $set, $studentID, $setIsVersioned, 1);
+		$totalRight = wwRound(2, $totalRight);
+
+		my @html_prob_scores;
+
+		my $show_problem_scores = 1;
+
+		if (defined $set->hide_score_by_problem
+			&& !$authz->hasPermissions($c->param('user'), 'view_hidden_work')
+			&& $set->hide_score_by_problem eq 'Y')
+		{
+			$show_problem_scores = 0;
+		}
+
+		for my $i (0 .. $max_problems - 1) {
+			my $score      = defined $problem_scores->[$i] && $show_problem_scores ? $problem_scores->[$i] : '';
+			my $is_correct = $score =~ /^\d+$/ && compute_unreduced_score($ce, $problem_records->[$i], $set) == 1;
+			push(
+				@html_prob_scores,
+				$c->tag(
+					'td',
+					class => 'problem-data',
+					$c->c(
+						$c->tag(
+							'span',
+							class => $is_correct ? 'correct' : $score eq ' . ' ? 'unattempted' : '',
+							$c->b($score)
+						),
+						$c->tag('br'),
+						(defined $problem_incorrect_attempts->[$i] && $show_problem_scores)
+						? $problem_incorrect_attempts->[$i]
+						: $c->b(' ')
+					)->join('')
+				)
+			);
+		}
+
+		# Get percentage correct.
+		my $totalRightPercent = 100 * wwRound(2, $total ? $totalRight / $total : 0);
+		my $class             = '';
+		if ($totalRightPercent == 0) {
+			$class = 'unattempted';
+		} elsif ($totalRightPercent == 100) {
+			$class = 'correct';
+		}
+
+		# If its a gateway set, then in order to mimic the scoring done in Scoring Tools we need to use the best score a
+		# student had.  Otherwise we just add the set to the running course total.
+		if ($setIsVersioned) {
+			$setID =~ /(.+),v(\d+)$/;
+			my $gatewayName    = $1;
+			my $currentVersion = $2;
+
+			# If we are just starting a new gateway then set variables to look for the max.
+			if ($currentVersion == 1) {
+				$numGatewayVersions = $db->countSetVersions($studentID, $gatewayName);
+			}
+
+			if ($totalRight > $bestGatewayScore) {
+				$bestGatewayScore = $totalRight;
+			}
+
+			# If its the last version then add the max to the course totals and reset variables;
+			if ($currentVersion == $numGatewayVersions) {
+				if (after($set->open_date())) {
+					$courseTotal      += $total;
+					$courseTotalRight += $bestGatewayScore;
+				}
+				$bestGatewayScore = 0;
+			}
+		} else {
+			if (after($set->open_date())) {
+				$courseTotal      += $total;
+				$courseTotalRight += $totalRight;
+			}
+		}
+
+		# Only show scores for open sets, and don't link to non open sets.
+		if (after($set->open_date) || $authz->hasPermissions($c->param('user'), 'view_unopened_sets')) {
+			# Set the set name and link. If a test, don't link to the version unless the problems can be seen.
+			my $thisSetName = $setIsVersioned
+				? $c->link_to($setName => $act_as_student_set_url) . ' ('
+				. (
+					(
+						$set->hide_work eq 'N'
+						|| ($set->hide_work eq 'BeforeAnswerDate' && time >= $set->answer_date)
+						|| $authz->hasPermissions($c->param('user'), 'view_unopened_sets')
+					)
+					? $c->link_to($c->maketext('version [_1]', $set->version_id) => $act_as_student_test_url)
+					: $c->maketext('version [_1]', $set->version_id)
+				)
+				. ')'
+				: $c->link_to($setName => $act_as_student_set_url);
+			push @$rows, $c->tag(
+				'tr',
+				$c->c(
+					$c->tag(
+						'th',
+						scope => 'row',
+						dir   => 'ltr',
+						sub {$thisSetName}
+					),
+					$c->tag('td', $c->tag('span', class => $class, $totalRightPercent . '%')),
+					$c->tag('td', sprintf('%0.2f', $totalRight)),                                # score
+					$c->tag('td', $total),                                                       # out of
+					@html_prob_scores                                                            # problems
+				)->join('')
+			);
+		} else {
+			push @$rows,
+				$c->tag(
+					'tr',
+					$c->c(
+						$c->tag(
+							'th',
+							dir => 'ltr',
+							$setName
+						),
+						$c->tag(
+							'td',
+							colspan => $max_problems + 3,
+							$c->tag(
+								'em',
+								$c->maketext(
+									'Will open on [_1].',
+									$c->formatDateTime($set->open_date, $ce->{studentDateDisplayFormat})
+								)
+							)
+						)
+					)->join('')
+				);
+		}
+	}
+
+	return $c->include(
+		'ContentGenerator/Instructor/StudentProgress/student_stats',
+		fullName         => $fullName,
+		max_problems     => $max_problems,
+		rows             => $rows->join(''),
+		courseTotal      => $courseTotal,
+		courseTotalRight => $courseTotalRight
+	);
+}
+
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm b/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
index a3eff9d7b6..b554d4eef6 100644
--- a/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
+++ b/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
@@ -70,13 +70,13 @@ use constant FORM_TITLES => {
 
 # permissions needed to perform a given action
 use constant FORM_PERMS => {
-	save_edit  => 'modify_student_data',
-	edit       => 'modify_student_data',
-	reset2_2fa => 'change_password',
-	import     => 'modify_student_data',
-	export     => 'modify_classlist_files',
-	add        => 'modify_student_data',
-	delete     => 'modify_student_data',
+	save_edit => 'modify_student_data',
+	edit      => 'modify_student_data',
+	reset_2fa => 'change_password',
+	import    => 'modify_student_data',
+	export    => 'modify_classlist_files',
+	add       => 'modify_student_data',
+	delete    => 'modify_student_data',
 };
 
 use constant SORT_SUBS => {
@@ -93,24 +93,47 @@ use constant SORT_SUBS => {
 };
 
 use constant FIELDS => [
-	'user_id', 'first_name', 'last_name', 'email_address', 'student_id', 'status',
-	'section', 'recitation', 'comment',   'permission',    'password'
+	'user_id',    'first_name', 'last_name',                 'email_address',
+	'student_id', 'status',     'accommodation_time_factor', 'section',
+	'recitation', 'comment',    'permission',                'password'
 ];
 
-# Note that only the editable fields need a type (i.e. all but user_id),
-# and only the text fields need a size.
+# Note that only the editable fields need a type (i.e. all but user_id).
+# The fields of type text or number may also include optional attributes for the HTML input.
+# Any field may also contain a perlValidate method that will be called to validate user input. If provided, it should be
+# a subroutine that takes the parameter value as its only argument, and returns a translatable error string if the
+# parameter value is not valid for the field, and 0 otherwise.
 use constant FIELD_PROPERTIES => {
-	user_id       => { name => x('Login Name') },
-	first_name    => { name => x('First Name'),        type => 'text', size => 10 },
-	last_name     => { name => x('Last Name'),         type => 'text', size => 10 },
-	email_address => { name => x('Email Address'),     type => 'text', size => 20 },
-	student_id    => { name => x('Student ID'),        type => 'text', size => 11 },
-	status        => { name => x('Enrollment Status'), type => 'status' },
-	section       => { name => x('Section'),           type => 'text', size => 3 },
-	recitation    => { name => x('Recitation'),        type => 'text', size => 3 },
-	comment       => { name => x('Comment'),           type => 'text', size => 20 },
-	permission    => { name => x('Permission Level'),  type => 'permission' },
-	password      => { name => x('Password'),          type => 'password' },
+	user_id                   => { name => x('Login Name') },
+	first_name                => { name => x('First Name'),        type => 'text', attributes => { size => 10 } },
+	last_name                 => { name => x('Last Name'),         type => 'text', attributes => { size => 10 } },
+	email_address             => { name => x('Email Address'),     type => 'text', attributes => { size => 20 } },
+	student_id                => { name => x('Student ID'),        type => 'text', attributes => { size => 11 } },
+	status                    => { name => x('Enrollment Status'), type => 'status' },
+	accommodation_time_factor => {
+		name       => x('Accommodation Time Factor'),
+		type       => 'number',
+		attributes => {
+			size  => 5,
+			min   => 1,
+			step  => 'any',
+			title => 'Enter a decimal number that is greater than or equal to 1.'
+		},
+		perlValidate => sub {
+			my $value = shift;
+			return $value !~ /^(\d+(\.\d*)?|\.\d+)$/ || $value <= 0
+				? (x(
+					'Accomodation time factor for [_1] unchanged. '
+					. 'A value was given that is not a decimal number or is not greater than or equal to 1.'
+				))[0]
+				: 0;
+		}
+	},
+	section    => { name => x('Section'),          type => 'text', attributes => { size => 3 } },
+	recitation => { name => x('Recitation'),       type => 'text', attributes => { size => 3 } },
+	comment    => { name => x('Comment'),          type => 'text', attributes => { size => 20 } },
+	permission => { name => x('Permission Level'), type => 'permission' },
+	password   => { name => x('Password'),         type => 'password' },
 };
 
 sub pre_header_initialize ($c) {
@@ -481,10 +504,11 @@ sub reset_2fa_handler ($c) {
 			push @resultText, $c->maketext('You are not allowed to reset two factor authenticatio for [_1].', $userID);
 			next;
 		}
-		my $password = $db->getPassword($userID);
-		$password->otp_secret('');
-		$db->putPassword($password);
-		$num++;
+		if (my $password = $db->getPassword($userID)) {
+			$password->otp_secret('');
+			$db->putPassword($password);
+		}
+		++$num;
 	}
 
 	unshift @resultText, $c->maketext('Reset two factor authentication for [quant,_1,user].', $num);
@@ -517,7 +541,14 @@ sub save_edit_handler ($c) {
 
 		for my $field ($User->NONKEYFIELDS()) {
 			my $newValue = $c->param("user.$userID.$field");
-			$User->$field($newValue) if defined $newValue;
+			next unless defined $newValue;
+			if (ref(FIELD_PROPERTIES()->{$field}{perlValidate}) eq 'CODE'
+				&& (my $error = FIELD_PROPERTIES()->{$field}{perlValidate}->($newValue)))
+			{
+				$c->addbadmessage($c->maketext($error, $userID));
+				next;
+			}
+			$User->$field($newValue);
 		}
 		$db->putUser($User);
 
diff --git a/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm b/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm
index 78139db160..f9b954695c 100644
--- a/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm
+++ b/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm
@@ -1,11 +1,13 @@
 package WeBWorK::ContentGenerator::LTIAdvantage;
-use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
+use Mojo::Base 'WeBWorK::ContentGenerator', -signatures, -async_await;
 
 use Mojo::UserAgent;
+use Mojo::URL;
 use Mojo::JSON           qw(decode_json);
 use Crypt::JWT           qw(decode_jwt encode_jwt);
 use Math::Random::Secure qw(irand);
 use Digest::SHA          qw(sha256_hex);
+use Mojo::File           qw(tempfile);
 
 use WeBWorK::Debug qw(debug);
 use WeBWorK::Authen::LTIAdvantage::SubmitGrade;
@@ -175,9 +177,11 @@ sub launch ($c) {
 
 	return $c->redirect_to($c->systemLink(
 		$c->url_for($c->stash->{LTILaunchRedirect}),
-		$c->stash->{isContentSelection}
-		? (
-			params => {
+		params => {
+			%{ Mojo::URL->new($c->stash->{LTILaunchRedirect})->query->to_hash },
+			$c->stash->{isContentSelection}
+			? (
+
 				courseID        => $c->stash->{courseID},
 				initial_request => 1,
 				accept_multiple =>
@@ -191,9 +195,9 @@ sub launch ($c) {
 				? (data => $c->stash->{lti_jwt_claims}
 						{'https://purl.imsglobal.org/spec/lti-dl/claim/deep_linking_settings'}{data})
 				: ()
-			}
-			)
-		: ()
+				)
+			: ()
+		}
 	));
 }
 
@@ -425,4 +429,120 @@ sub purge_expired_lti_data ($c, $ce, $db) {
 	return;
 }
 
+async sub registration ($c) {
+	return $c->render(json => { error => 'invalid configuration request' }, status => 400)
+		unless defined $c->req->param('openid_configuration') && defined $c->req->param('registration_token');
+
+	# If we want to allow options in the configuration such as whether grade passback is enabled or to allow the LMS
+	# administrator to choose a tool name, then this should render a form that the LMS will be presented in an iframe
+	# allowing the LMS administrator to select the options. When that form is submitted, then the code below should be
+	# executed taking those options into consideration.  However, at this point this is a simplistic approach that will
+	# work in most cases.
+
+	$c->render_later;
+
+	my $configurationResult = (await Mojo::UserAgent->new->get_p($c->req->param('openid_configuration')))->result;
+	return $c->render(json => { error => 'unabled to obtain openid configuration' }, status => 400)
+		unless $configurationResult->is_success;
+	my $lmsConfiguration = $configurationResult->json;
+
+	return $c->render(json => { error => 'invalid openid configuration received' }, status => 400)
+		unless defined $lmsConfiguration->{registration_endpoint}
+		&& defined $lmsConfiguration->{issuer}
+		&& defined $lmsConfiguration->{jwks_uri}
+		&& defined $lmsConfiguration->{token_endpoint}
+		&& defined $lmsConfiguration->{authorization_endpoint}
+		&& defined $lmsConfiguration->{'https://purl.imsglobal.org/spec/lti-platform-configuration'}
+		{product_family_code};
+
+	# FIXME: This should also probably check that the token_endpoint_auth_method is private_key_jwt, the
+	# id_token_signing_alg_values_supported is RS256, and that the scopes_supported is an array and contains all of the
+	# scopes listed below. There are perhaps some other configuration values that should be checked as well.  However,
+	# most of the time these are all going to be fine.
+
+	my $rootURL = $c->url_for('root')->to_abs;
+
+	my $registrationResult = (await Mojo::UserAgent->new->post_p(
+		$lmsConfiguration->{registration_endpoint},
+		{
+			Authorization  => 'Bearer ' . $c->req->param('registration_token'),
+			'Content-Type' => 'application/json'
+		},
+		json => {
+			application_type           => 'web',
+			response_types             => ['id_token'],
+			grant_types                => [ 'implicit', 'client_credentials' ],
+			client_name                => 'WeBWorK at ' . $rootURL->host_port,
+			client_uri                 => $rootURL->to_string,
+			initiate_login_uri         => $c->url_for('ltiadvantage_login')->to_abs->to_string,
+			redirect_uris              => [ $c->url_for('ltiadvantage_launch')->to_abs->to_string ],
+			jwks_uri                   => $c->url_for('ltiadvantage_keys')->to_abs->to_string,
+			token_endpoint_auth_method => 'private_key_jwt',
+			scope                      => join(' ',
+				'https://purl.imsglobal.org/spec/lti-ags/scope/lineitem',
+				'https://purl.imsglobal.org/spec/lti-ags/scope/lineitem.readonly',
+				'https://purl.imsglobal.org/spec/lti-ags/scope/result.readonly',
+				'https://purl.imsglobal.org/spec/lti-ags/scope/score'),
+			'https://purl.imsglobal.org/spec/lti-tool-configuration' => {
+				domain          => $rootURL->host_port,
+				target_link_uri => $rootURL->to_string,
+				claims          => [ 'iss', 'sub', 'name', 'given_name', 'family_name', 'email' ],
+				messages        => [ {
+					type            => 'LtiDeepLinkingRequest',
+					target_link_uri => $c->url_for('ltiadvantage_content_selection')->to_abs->to_string,
+					# Placements are specific to the LMS.  The following placements are needed for Canvas, and Moodle
+					# completely ignores this parameter. Does D2L need any? What about Blackboard?
+					placements => [ 'assignment_selection', 'course_assignments_menu' ]
+				} ]
+			}
+		}
+	))->result;
+	unless ($registrationResult->is_success) {
+		$c->log->error('Invalid regististration response: ' . $registrationResult->message);
+		return $c->render(json => { error => 'invalid registration response' }, status => 400);
+	}
+	return $c->render(json => { error => 'invalid registration received' }, status => 400)
+		unless defined $registrationResult->json->{client_id};
+
+	my $configuration = <<~"END_CONFIG";
+	\$LTI{v1p3}{PlatformID}      = '$lmsConfiguration->{issuer}';
+	\$LTI{v1p3}{ClientID}        = '${\($registrationResult->json->{client_id})}';
+	\$LTI{v1p3}{DeploymentID}    = '${
+		\($registrationResult->json->{'https://purl.imsglobal.org/spec/lti-tool-configuration'}{deployment_id}
+		// 'obtain from LMS administrator')
+	}';
+	\$LTI{v1p3}{PublicKeysetURL} = '$lmsConfiguration->{jwks_uri}';
+	\$LTI{v1p3}{AccessTokenURL}  = '$lmsConfiguration->{token_endpoint}';
+	\$LTI{v1p3}{AccessTokenAUD}  = '${
+		\($lmsConfiguration->{authorization_server}
+		// $lmsConfiguration->{token_endpoint})
+	}';
+	\$LTI{v1p3}{AuthReqURL}      = '$lmsConfiguration->{authorization_endpoint}';
+	END_CONFIG
+
+	my $registrationDir = Mojo::File->new($c->ce->{webworkDirs}{DATA})->child('LTIRegistrationRequests');
+	if (!-d $registrationDir) {
+		eval { $registrationDir->make_path };
+		if ($@) {
+			$c->log->error("Failed to create directory for saving LTI registrations: $@");
+			return $c->render(json => { error => 'internal server error' }, status => 400);
+		}
+	}
+
+	my $registrationFile = tempfile(
+		TEMPLATE =>
+			$lmsConfiguration->{'https://purl.imsglobal.org/spec/lti-platform-configuration'}{product_family_code}
+			. '-XXXX',
+		DIR    => $registrationDir,
+		SUFFIX => '.conf',
+		UNLINK => 0
+	);
+	$registrationFile->spew($configuration, 'UTF-8');
+
+	# This tells the LMS that registration is complete and it can close its dialog.
+	return $c->render(data => '');
+}
+
 1;
diff --git a/lib/WeBWorK/ContentGenerator/Logout.pm b/lib/WeBWorK/ContentGenerator/Logout.pm
index d38c955d55..e2b28d0e4f 100644
--- a/lib/WeBWorK/ContentGenerator/Logout.pm
+++ b/lib/WeBWorK/ContentGenerator/Logout.pm
@@ -8,7 +8,6 @@ WeBWorK::ContentGenerator::Logout - invalidate key and display logout message.
 =cut
 
 use WeBWorK::Localize;
-use WeBWorK::Authen qw(write_log_entry);
 
 sub pre_header_initialize ($c) {
 	my $ce     = $c->ce;
@@ -20,7 +19,7 @@ sub pre_header_initialize ($c) {
 	$authen->logout_user if $authen->can('logout_user');
 
 	$authen->killSession;
-	$authen->WeBWorK::Authen::write_log_entry('LOGGED OUT');
+	$authen->write_log_entry('LOGGED OUT');
 
 	# Check to see if there is a proctor key associated with this login.  If there is a proctor user, then there must be
 	# a proctored test.  So try and delete the key.
diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm
index e2ef7bd20a..c970964fac 100644
--- a/lib/WeBWorK/ContentGenerator/Problem.pm
+++ b/lib/WeBWorK/ContentGenerator/Problem.pm
@@ -7,7 +7,6 @@ WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem.
 
 =cut
 
-use WeBWorK::HTML::SingleProblemGrader;
 use WeBWorK::Debug;
 use WeBWorK::Utils           qw(decodeAnswers wwRound);
 use WeBWorK::Utils::DateTime qw(before between after);
@@ -23,6 +22,8 @@ use WeBWorK::AchievementEvaluator qw(checkForAchievements);
 use WeBWorK::DB::Utils            qw(global2user fake_set fake_problem);
 use WeBWorK::Localize;
 use WeBWorK::AchievementEvaluator;
+use WeBWorK::HTML::SingleProblemGrader;
+use WeBWorK::HTML::StudentNav qw(studentNav);
 
 # GET/POST Parameters for this module
 #
@@ -431,20 +432,17 @@ async sub pre_header_initialize ($c) {
 		Count       => $problem->{showMeAnotherCount},
 	};
 
-	# Unset the showProblemGrader parameter if the "Hide Problem Grader" button was clicked.
-	$c->param(showProblemGrader => undef) if $c->param('hideProblemGrader');
-
 	# Permissions
 
 	# What does the user want to do?
 	my %want = (
 		showOldAnswers     => $user->showOldAnswers ne '' ? $user->showOldAnswers : $ce->{pg}{options}{showOldAnswers},
 		showCorrectAnswers => 1,
-		showProblemGrader  => $c->param('showProblemGrader') || 0,
-		showAnsGroupInfo   => $c->param('showAnsGroupInfo')  || $ce->{pg}{options}{showAnsGroupInfo},
-		showAnsHashInfo    => $c->param('showAnsHashInfo')   || $ce->{pg}{options}{showAnsHashInfo},
-		showPGInfo         => $c->param('showPGInfo')        || $ce->{pg}{options}{showPGInfo},
-		showResourceInfo   => $c->param('showResourceInfo')  || $ce->{pg}{options}{showResourceInfo},
+		showProblemGrader  => $userID ne $effectiveUserID,
+		showAnsGroupInfo   => $c->param('showAnsGroupInfo') || $ce->{pg}{options}{showAnsGroupInfo},
+		showAnsHashInfo    => $c->param('showAnsHashInfo')  || $ce->{pg}{options}{showAnsHashInfo},
+		showPGInfo         => $c->param('showPGInfo')       || $ce->{pg}{options}{showPGInfo},
+		showResourceInfo   => $c->param('showResourceInfo') || $ce->{pg}{options}{showResourceInfo},
 		showHints          => 1,
 		showSolutions      => 1,
 		useMathView        => $user->useMathView ne ''  ? $user->useMathView  : $ce->{pg}{options}{useMathView},
@@ -531,18 +529,16 @@ async sub pre_header_initialize ($c) {
 	# requiring another answer submission.
 	my $showReturningFeedback = 0;
 
-	# Sticky answers
-	if (!($c->{submitAnswers} || $previewAnswers || $checkAnswers) && $will{showOldAnswers}) {
+	# Reinsert sticky answers. Do this only if new answers are NOT being submitted,
+	# and a new problem version is NOT being opened.
+	if (!($prEnabled && !$problem->{prCount})
+		&& !($c->{submitAnswers} || $previewAnswers || $checkAnswers)
+		&& $will{showOldAnswers})
+	{
 		my %oldAnswers = decodeAnswers($problem->last_answer);
-		# Do this only if new answers are NOT being submitted
-		if ($prEnabled && !$problem->{prCount}) {
-			# Clear answers if this is a new problem version
-			delete $formFields->{$_} for keys %oldAnswers;
-		} else {
-			$formFields->{$_} = $oldAnswers{$_} for (keys %oldAnswers);
-			$showReturningFeedback = 1
-				if $ce->{pg}{options}{automaticAnswerFeedback} && $problem->num_correct + $problem->num_incorrect > 0;
-		}
+		$formFields->{$_} = $oldAnswers{$_} for (keys %oldAnswers);
+		$showReturningFeedback = 1
+			if $ce->{pg}{options}{automaticAnswerFeedback} && $problem->num_correct + $problem->num_incorrect > 0;
 	}
 
 	my $showOnlyCorrectAnswers = $c->param('showCorrectAnswers') && $will{showCorrectAnswers};
@@ -555,7 +551,9 @@ async sub pre_header_initialize ($c) {
 		$c->{set},
 		$problem,
 		$c->{set}->psvn,
-		$formFields,
+		$prEnabled
+			&& !$problem->{prCount}
+			&& !($c->{submitAnswers} || $previewAnswers || $checkAnswers || $showOnlyCorrectAnswers) ? {} : $formFields,
 		{
 			displayMode              => $displayMode,
 			showHints                => $will{showHints},
@@ -581,22 +579,21 @@ async sub pre_header_initialize ($c) {
 					&& after($c->{set}->answer_date, $c->submitTime)),
 			showMessages       => !$showOnlyCorrectAnswers,
 			showCorrectAnswers => (
-				$will{showProblemGrader} || ($c->{submitAnswers} && $c->{showCorrectOnRandomize}) ? 2
+				$c->{submitAnswers} && $c->{showCorrectOnRandomize} ? 2
 				: !$c->{previewAnswers} && after($c->{set}->answer_date, $c->submitTime)
 				? ($ce->{pg}{options}{correctRevealBtnAlways} ? 1 : 2)
-				: !$c->{previewAnswers} && $will{showCorrectAnswers} ? 1
+				: $will{showProblemGrader} || (!$c->{previewAnswers} && $will{showCorrectAnswers}) ? 1
 				: 0
 			),
 			debuggingOptions => getTranslatorDebuggingOptions($authz, $userID),
-			$can{checkAnswers}
-				&& defined $formFields->{problem_data} ? (problemData => $formFields->{problem_data}) : ()
+			$prEnabled && !$problem->{prCount}
+			? (problemData => '{}')
+			: ($can{checkAnswers} && defined $formFields->{problem_data})
+			? (problemData => $formFields->{problem_data})
+			: ()
 		}
 	);
 
-	# Warnings in the renderPG subprocess will not be caught by the global warning handler of this process.
-	# So rewarn them and let the global warning handler take care of it.
-	warn $pg->{warnings} if $pg->{warnings};
-
 	debug('end pg processing');
 
 	$pg->{body_text} .= $c->hidden_field(
@@ -608,20 +605,6 @@ async sub pre_header_initialize ($c) {
 	$can{showHints}     &&= $pg->{flags}{hintExists};
 	$can{showSolutions} &&= $pg->{flags}{solutionExists};
 
-	# Record errors
-	$c->{pgdebug}          = $pg->{debug_messages}          if ref $pg->{debug_messages} eq 'ARRAY';
-	$c->{pgwarning}        = $pg->{warning_messages}        if ref $pg->{warning_messages} eq 'ARRAY';
-	$c->{pginternalerrors} = $pg->{internal_debug_messages} if ref $pg->{internal_debug_messages} eq 'ARRAY';
-	# $c->{pgerrors} is defined if any of the above are defined, and is nonzero if any are non-empty.
-	$c->{pgerrors} = @{ $c->{pgdebug} // [] } || @{ $c->{pgwarning} // [] } || @{ $c->{pginternalerrors} // [] }
-		if defined $c->{pgdebug} || defined $c->{pgwarning} || defined $c->{pginternalerrors};
-
-	# If $c->{pgerrors} is not defined, then the PG messages arrays were not defined,
-	# which means $pg->{pgcore} was not defined and the translator died.
-	warn 'Processing of this PG problem was not completed.  Probably because of a syntax error. '
-		. 'The translator died prematurely and no PG warning messages were transmitted.'
-		unless defined $c->{pgerrors};
-
 	# Store fields
 	$c->{want} = \%want;
 	$c->{can}  = \%can;
@@ -634,53 +617,6 @@ async sub pre_header_initialize ($c) {
 	return;
 }
 
-sub warnings ($c) {
-	my $output = $c->c;
-
-	# Display warning messages
-	if (!defined $c->{pgerrors}) {
-		push(
-			@$output,
-			$c->tag(
-				'div',
-				$c->c(
-					$c->tag('h3', style => 'color:red;', $c->maketext('PG question failed to render')),
-					$c->tag('p',  $c->maketext('Unable to obtain error messages from within the PG question.'))
-				)->join('')
-			)
-		);
-	} elsif ($c->{pgerrors} > 0) {
-		my @pgdebug          = @{ $c->{pgdebug}          // [] };
-		my @pgwarning        = @{ $c->{pgwarning}        // [] };
-		my @pginternalerrors = @{ $c->{pginternalerrors} // [] };
-		push(
-			@$output,
-			$c->tag(
-				'div',
-				$c->c(
-					$c->tag('h2', $c->maketext('PG question processing error messages')),
-					@pgdebug ? $c->c(
-						$c->tag('h3', $c->maketext('PG debug messages')),
-						$c->tag('p',  $c->c(@pgdebug)->join($c->tag('br')))
-					)->join('') : '',
-					@pgwarning ? $c->c(
-						$c->tag('h3', $c->maketext('PG warning messages')),
-						$c->tag('p',  $c->c(@pgwarning)->join($c->tag('br')))
-					)->join('') : '',
-					@pginternalerrors ? $c->c(
-						$c->tag('h3', $c->maketext('PG internal errors')),
-						$c->tag('p',  $c->c(@pginternalerrors)->join($c->tag('br')))
-					)->join('') : ''
-				)->join('')
-			)
-		);
-	}
-
-	push(@$output, $c->SUPER::warnings());
-
-	return $output->join('');
-}
-
 sub head ($c) {
 	return ''                  if ($c->{invalidSet});
 	return $c->{pg}{head_text} if $c->{pg}{head_text};
@@ -722,9 +658,6 @@ sub siblings ($c) {
 
 	my @items;
 
-	# Keep the grader open when linking to problems if it is already open.
-	my %problemGraderLink = $c->{will}{showProblemGrader} ? (params => { showProblemGrader => 1 }) : ();
-
 	for my $problemID (@problemIDs) {
 		if ($isJitarSet
 			&& !$authz->hasPermissions($eUserID, 'view_unopened_sets')
@@ -795,7 +728,7 @@ sub siblings ($c) {
 					@items,
 					$c->tag(
 						'a',
-						$active ? () : (href => $c->systemLink($problemPage, %problemGraderLink)),
+						$active ? () : (href => $c->systemLink($problemPage)),
 						class => $class,
 						$c->b($c->maketext('Problem [_1]', join('.', @seq)) . $status_symbol)
 					)
@@ -806,7 +739,7 @@ sub siblings ($c) {
 				@items,
 				$c->tag(
 					'a',
-					$active ? () : (href => $c->systemLink($problemPage, %problemGraderLink)),
+					$active ? () : (href => $c->systemLink($problemPage)),
 					class => 'nav-link' . ($active ? ' active' : ''),
 					$c->b($c->maketext('Problem [_1]', $problemID) . $status_symbol)
 				)
@@ -842,74 +775,6 @@ sub nav ($c, $args) {
 	my $mergedSet = $db->getMergedSet($eUserID, $setID);
 	return '' if !$mergedSet;
 
-	# Set up a student navigation for those that have permission to act as a student.
-	my $userNav = '';
-	if ($authz->hasPermissions($userID, 'become_student') && $eUserID ne $userID) {
-		# Find all users for this set (except the current user) sorted by last_name, then first_name, then user_id.
-		my @allUserRecords = $db->getUsersWhere(
-			{
-				user_id => [
-					map { $_->[0] } $db->listUserSetsWhere({ set_id => $setID, user_id => { not_like => $userID } })
-				]
-			},
-			[qw/last_name first_name user_id/]
-		);
-
-		my $filter = $c->param('studentNavFilter');
-
-		# Find the previous, current, and next users, and format the student names for display.
-		# Also create a hash of sections and recitations if there are any for the course.
-		my @userRecords;
-		my $currentUserIndex = 0;
-		my %filters;
-		for (@allUserRecords) {
-			# Add to the sections and recitations if defined.  Also store the first user found in that section or
-			# recitation.  This user will be switched to when the filter is selected.
-			my $section = $_->section;
-			$filters{"section:$section"} = [ $c->maketext('Filter by section [_1]', $section), $_->user_id ]
-				if $section && !$filters{"section:$section"};
-			my $recitation = $_->recitation;
-			$filters{"recitation:$recitation"} = [ $c->maketext('Filter by recitation [_1]', $recitation), $_->user_id ]
-				if $recitation && !$filters{"recitation:$recitation"};
-
-			# Only keep this user if it satisfies the selected filter if a filter was selected.
-			next
-				unless !$filter
-				|| ($filter =~ /^section:(.*)$/    && $_->section eq $1)
-				|| ($filter =~ /^recitation:(.*)$/ && $_->recitation eq $1);
-
-			my $addRecord = $_;
-			$currentUserIndex = @userRecords if $addRecord->user_id eq $eUserID;
-			push @userRecords, $addRecord;
-
-			# Construct a display name.
-			$addRecord->{displayName} =
-				($addRecord->last_name || $addRecord->first_name
-					? $addRecord->last_name . ', ' . $addRecord->first_name
-					: $addRecord->user_id);
-		}
-		my $prevUser = $currentUserIndex > 0             ? $userRecords[ $currentUserIndex - 1 ] : 0;
-		my $nextUser = $currentUserIndex < $#userRecords ? $userRecords[ $currentUserIndex + 1 ] : 0;
-
-		# Mark the current user.
-		$userRecords[$currentUserIndex]{currentUser} = 1;
-
-		my $problemPage = $c->url_for('problem_detail', setID => $setID, problemID => $problemID);
-
-		# Set up the student nav.
-		$userNav = $c->include(
-			'ContentGenerator/Problem/student_nav',
-			eUserID          => $eUserID,
-			problemPage      => $problemPage,
-			userRecords      => \@userRecords,
-			currentUserIndex => $currentUserIndex,
-			prevUser         => $prevUser,
-			nextUser         => $nextUser,
-			filter           => $filter,
-			filters          => \%filters
-		);
-	}
-
 	my $isJitarSet = $mergedSet->assignment_type eq 'jitar';
 
 	my ($prevID, $nextID);
@@ -970,10 +835,9 @@ sub nav ($c, $args) {
 	}
 
 	my %tail;
-	$tail{displayMode}       = $c->{displayMode}             if defined $c->{displayMode};
-	$tail{showOldAnswers}    = 1                             if $c->{will}{showOldAnswers};
-	$tail{showProblemGrader} = 1                             if $c->{will}{showProblemGrader};
-	$tail{studentNavFilter}  = $c->param('studentNavFilter') if $c->param('studentNavFilter');
+	$tail{displayMode}      = $c->{displayMode}             if defined $c->{displayMode};
+	$tail{showOldAnswers}   = 1                             if $c->{will}{showOldAnswers};
+	$tail{studentNavFilter} = $c->param('studentNavFilter') if $c->param('studentNavFilter');
 
 	return $c->tag(
 		'div',
@@ -981,7 +845,7 @@ sub nav ($c, $args) {
 		role         => 'navigation',
 		'aria-label' => 'problem navigation',
 		$c->c($c->tag('div', class => 'd-flex submit-buttons-container', $c->navMacro($args, \%tail, @links)),
-			$userNav)->join('')
+			studentNav($c, $setID))->join('')
 	);
 }
 
@@ -1042,10 +906,7 @@ sub page_title ($c) {
 
 	# This uses the permission level and user id of the user assigned to the problem.
 	my $problemUser = $problem->user_id;
-	my $inList      = grep { $_ eq $problemUser } @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} };
-	if ($db->getPermissionLevel($problemUser)->permission >=
-		$ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL} || $inList)
-	{
+	if ($c->authz->hasPermissions($problemUser, 'print_path_to_problem')) {
 		$subheader .= ' ' . $problem->source_file;
 	}
 
@@ -1113,7 +974,7 @@ sub output_problem_body ($c) {
 		} else {
 			# For students render the body text of the problem with a message about error details.
 			return $c->c(
-				$c->tag('div', id => 'output_problem_body', $c->b($c->{pg}{body_text})),
+				$c->tag('div', $c->b($c->{pg}{body_text})),
 				$c->include(
 					'ContentGenerator/Base/error_output',
 					error   => $c->{pg}{errors},
@@ -1123,7 +984,14 @@ sub output_problem_body ($c) {
 		}
 	}
 
-	return $c->tag('div', id => 'output_problem_body', $c->b($c->{pg}{body_text}));
+	return $c->tag(
+		'div',
+		id    => 'output_problem_body',
+		class => 'text-dark',
+		style => 'color-scheme: light',
+		data  => { bs_theme => 'light' },
+		$c->b($c->{pg}{body_text})
+	);
 }
 
 # Output messages about the problem
@@ -1133,10 +1001,8 @@ sub output_message ($c) {
 
 # Output the problem grader if the user has permissions to grade problems
 sub output_grader ($c) {
-	if ($c->{will}{showProblemGrader}) {
-		return WeBWorK::HTML::SingleProblemGrader->new($c, $c->{pg}, $c->{problem})->insertGrader;
-	}
-
+	return WeBWorK::HTML::SingleProblemGrader->new($c, $c->{pg}, $c->{problem}, $c->{set})->insertGrader
+		if $c->{will}{showProblemGrader};
 	return '';
 }
 
@@ -1382,19 +1248,14 @@ sub output_misc ($c) {
 		$c->hidden_field(showOldAnswers => $c->{will}{showOldAnswers}),
 		$c->hidden_field(displayMode    => $c->{displayMode}));
 
-	push(@$output, $c->hidden_field(editMode => $c->{editMode}))
-		if defined $c->{editMode} && $c->{editMode} eq 'temporaryFile';
-
-	my $permissionLevel          = $c->db->getPermissionLevel($c->param('user'))->permission;
-	my $professorPermissionLevel = $c->ce->{userRoles}{professor};
-
-	# Only allow this for professors
-	push(@$output, $c->hidden_field(sourceFilePath => $c->{problem}{source_file}))
-		if defined $c->{problem}{source_file} && $permissionLevel >= $professorPermissionLevel;
-
-	# Only allow this for professors
-	push(@$output, $c->hidden_field(problemSeed => $c->param('problemSeed')))
-		if defined $c->param('problemSeed') && $permissionLevel >= $professorPermissionLevel;
+	# Only allow file editing for users that have the permission to modify problem sets.
+	if ($c->authz->hasPermissions($c->param('user'), 'modify_problem_sets')) {
+		push(@$output, $c->hidden_field(editMode => $c->{editMode}))
+			if defined $c->{editMode} && $c->{editMode} eq 'temporaryFile';
+		push(@$output, $c->hidden_field(sourceFilePath => $c->{problem}{source_file}))
+			if defined $c->{problem}{source_file};
+		push(@$output, $c->hidden_field(problemSeed => $c->param('problemSeed'))) if defined $c->param('problemSeed');
+	}
 
 	# Make sure the student nav filter setting is preserved when the problem form is submitted.
 	push(@$output, $c->hidden_field(studentNavFilter => $c->param('studentNavFilter')))
@@ -1444,7 +1305,7 @@ sub output_summary ($c) {
 	# Attempt summary
 	if ($c->{submitAnswers}) {
 		push(@$output, $c->attemptResults($pg));
-	} elsif ($will{checkAnswers} || $c->{will}{showProblemGrader}) {
+	} elsif ($will{checkAnswers}) {
 		push(
 			@$output,
 			$c->tag(
@@ -1480,7 +1341,7 @@ sub output_summary ($c) {
 			'div',
 			class => 'alert alert-danger d-inline-block mb-2 p-1',
 			$c->maketext(
-				'ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version if neccessary).')
+				'ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version if necessary).')
 		)
 	) if $c->{resubmitDetected};
 
@@ -1549,7 +1410,7 @@ sub output_achievement_message ($c) {
 		&& $c->{submitAnswers}
 		&& $c->{problem}->set_id ne 'Undefined_Set')
 	{
-		return checkForAchievements($c->{problem}, $c->{pg}, $c);
+		return checkForAchievements($c->{problem}, $c);
 	}
 
 	return '';
@@ -1573,13 +1434,13 @@ sub output_custom_edit_message ($c) {
 
 # Output the "Show Past Answers" button
 sub output_past_answer_button ($c) {
-	my $problemID = $c->{problem}->problem_id;
-	my $setRecord = $c->db->getGlobalSet($c->{problem}->set_id);
-	if (defined $setRecord && $setRecord->assignment_type eq 'jitar') {
-		$problemID = join('.', jitar_id_to_seq($problemID));
-	}
-
 	if ($c->authz->hasPermissions($c->param('user'), 'view_answers')) {
+		my $problemID = $c->{problem}->problem_id;
+		my $setRecord = $c->db->getGlobalSet($c->{problem}->set_id);
+		if (defined $setRecord && $setRecord->assignment_type eq 'jitar') {
+			$problemID = join('.', jitar_id_to_seq($problemID));
+		}
+
 		my $hiddenFields = $c->hidden_authen_fields;
 		$hiddenFields =~ s/\"hidden_/\"pastans-hidden_/g;
 		return $c->form_for(
@@ -1593,7 +1454,8 @@ sub output_past_answer_button ($c) {
 				$c->hidden_field(selected_sets     => $c->{problem}->set_id),
 				$c->hidden_field(selected_users    => $c->{problem}->user_id),
 				$c->tag(
-					'p',
+					'div',
+					class => 'mb-3',
 					$c->submit_button(
 						$c->maketext('Show Past Answers'),
 						name  => 'action',
diff --git a/lib/WeBWorK/ContentGenerator/ProblemSet.pm b/lib/WeBWorK/ContentGenerator/ProblemSet.pm
index ba77939ec5..d20438d94d 100644
--- a/lib/WeBWorK/ContentGenerator/ProblemSet.pm
+++ b/lib/WeBWorK/ContentGenerator/ProblemSet.pm
@@ -17,19 +17,25 @@ use WeBWorK::Utils::Sets      qw(is_restricted grade_set format_set_name_display
 use WeBWorK::DB::Utils        qw(grok_versionID_from_vsetID_sql);
 use WeBWorK::Localize;
 use WeBWorK::AchievementItems;
+use WeBWorK::HTML::StudentNav qw(studentNav);
+
+sub can ($c, $arg) {
+	if ($arg eq 'info') {
+		return $c->{pg} ? 1 : 0;
+	}
+	return $c->SUPER::can($arg);
+}
 
 async sub initialize ($c) {
 	my $db    = $c->db;
 	my $ce    = $c->ce;
 	my $authz = $c->authz;
 
-	# $c->{invalidSet} is set in checkSet which is called by ContentGenerator.pm
-	return
-		if $c->{invalidSet}
-		&& ($c->{invalidSet} !~ /^Client ip address .* is not in the list of addresses/
-			|| $authz->{merged_set}->assignment_type !~ /gateway/);
+	# $c->{invalidSet} is set in checkSet which is called by ContentGenerator.pm.
+	# If $c->{viewSetCheck} is also set, we want to view some information unless the set is hidden.
+	return if $c->{invalidSet} && (!$c->{viewSetCheck} || $c->{viewSetCheck} eq 'hidden');
 
-	# This will all be valid if checkSet did not set $c->{invalidSet}.
+	# This will all be valid if the above check passes.
 	my $userID  = $c->param('user');
 	my $eUserID = $c->param('effectiveUser');
 
@@ -105,6 +111,7 @@ async sub initialize ($c) {
 
 	$c->{pg} =
 		await renderPG($c, $effectiveUser, $c->{set}, $problem, $c->{set}->psvn, {}, { displayMode => $displayMode });
+	$c->{pg} = '' unless $c->{pg}{body_text} =~ /\S/;
 
 	return;
 }
@@ -113,17 +120,24 @@ sub nav ($c, $args) {
 	# Don't show the nav if the user does not have unrestricted navigation permissions.
 	return '' unless $c->authz->hasPermissions($c->param('user'), 'navigation_allowed');
 
-	my @links = (
-		$c->maketext('Assignments'),
-		$c->url_for($c->app->routes->lookup($c->current_route)->parent->name),
-		$c->maketext('Assignments')
-	);
 	return $c->tag(
 		'div',
 		class        => 'row sticky-nav',
 		role         => 'navigation',
-		'aria-label' => 'problem navigation',
-		$c->tag('div', $c->navMacro($args, {}, @links))
+		'aria-label' => 'set navigation',
+		$c->c(
+			$c->tag(
+				'div',
+				class => 'd-flex submit-buttons-container',
+				$c->navMacro(
+					$args, {},
+					$c->maketext('Assignments'),
+					$c->url_for($c->app->routes->lookup($c->current_route)->parent->name),
+					$c->maketext('Assignments')
+				)
+			),
+			$c->{set} ? studentNav($c, $c->{set}->set_id) : ''
+		)->join('')
 	);
 }
 
@@ -161,10 +175,8 @@ sub siblings ($c) {
 	return $c->include('ContentGenerator/ProblemSet/siblings', setIDs => \@setIDs);
 }
 
-sub info {
-	my ($c) = @_;
-	return '' unless $c->{pg};
-	return $c->include('ContentGenerator/ProblemSet/info');
+sub info ($c) {
+	return $c->{pg} ? $c->include('ContentGenerator/ProblemSet/info') : '';
 }
 
 # This is called by the ContentGenerator/ProblemSet/body template for a regular homework set.
@@ -180,12 +192,14 @@ sub gateway_body ($c) {
 	my $ce    = $c->ce;
 	my $db    = $c->db;
 
-	my $set           = $c->{set};
-	my $effectiveUser = $c->param('effectiveUser');
-	my $user          = $c->param('user');
+	my $set             = $c->{set};
+	my $effectiveUserID = $c->param('effectiveUser');
+	my $userID          = $c->param('user');
+
+	my $effectiveUser = $db->getUser($effectiveUserID);
 
 	my $timeNow   = time;
-	my $timeLimit = $set->version_time_limit || 0;
+	my $timeLimit = ($set->version_time_limit || 0) * $effectiveUser->accommodation_time_factor;
 
 	# Compute how many versions have been launched within timeInterval to determine if a new version can be created,
 	# if a version can be continued, and the date a next version can be started.  If there is an open version that
@@ -206,8 +220,9 @@ sub gateway_body ($c) {
 		}
 
 		# Get a problem to determine how many submits have been made.
-		my @ProblemNums = $db->listUserProblems($effectiveUser, $set->set_id);
-		my $Problem = $db->getMergedProblemVersion($effectiveUser, $set->set_id, $verSet->version_id, $ProblemNums[0]);
+		my @ProblemNums = $db->listUserProblems($effectiveUserID, $set->set_id);
+		my $Problem =
+			$db->getMergedProblemVersion($effectiveUserID, $set->set_id, $verSet->version_id, $ProblemNums[0]);
 		my $verSubmits = defined $Problem ? $Problem->num_correct + $Problem->num_incorrect : 0;
 		my $maxSubmits = $verSet->attempts_per_version || 0;
 
@@ -292,11 +307,11 @@ sub gateway_body ($c) {
 
 		$data->{score} = '';
 		# Only show score if user has permission and assignment has at least one submit.
-		if ($authz->hasPermissions($user, 'view_hidden_work')
+		if ($authz->hasPermissions($userID, 'view_hidden_work')
 			|| ($verSet->hide_score eq 'N'                && $verSubmits >= 1)
 			|| ($verSet->hide_score eq 'BeforeAnswerDate' && $timeNow > $set->answer_date))
 		{
-			my ($total, $possible) = grade_set($db, $verSet, $effectiveUser, 1);
+			my ($total, $possible) = grade_set($db, $verSet, $effectiveUserID, 1);
 			$total = wwRound(2, $total);
 			$data->{score} = "$total/$possible";
 		}
diff --git a/lib/WeBWorK/ContentGenerator/ProblemSets.pm b/lib/WeBWorK/ContentGenerator/ProblemSets.pm
index 3eeb4fb4c3..2c02a51ceb 100644
--- a/lib/WeBWorK/ContentGenerator/ProblemSets.pm
+++ b/lib/WeBWorK/ContentGenerator/ProblemSets.pm
@@ -11,7 +11,7 @@ use WeBWorK::Debug;
 use WeBWorK::Utils           qw(sortByName);
 use WeBWorK::Utils::DateTime qw(after);
 use WeBWorK::Utils::Files    qw(readFile path_is_subdir);
-use WeBWorK::Utils::Sets     qw(is_restricted format_set_name_display);
+use WeBWorK::Utils::Sets     qw(restricted_set_message);
 use WeBWorK::Localize;
 
 # The "default" data in the course_info.txt file.
@@ -114,15 +114,11 @@ sub info ($c) {
 }
 
 sub getSetStatus ($c, $set) {
-	my $ce              = $c->ce;
-	my $db              = $c->db;
-	my $authz           = $c->authz;
-	my $effectiveUser   = $c->param('effectiveUser') || $c->param('user');
-	my $canViewUnopened = $authz->hasPermissions($c->param('user'), 'view_unopened_sets');
-
-	my @restricted = $ce->{options}{enableConditionalRelease} ? is_restricted($db, $set, $effectiveUser) : ();
-
-	my $link_is_active = 1;
+	my $ce             = $c->ce;
+	my $db             = $c->db;
+	my $authz          = $c->authz;
+	my $effectiveUser  = $c->param('effectiveUser')                      || $c->param('user');
+	my $restricted_msg = restricted_set_message($c, $set, 'conditional') || restricted_set_message($c, $set, 'lti');
 
 	# Determine set status.
 	my $status_msg;
@@ -132,11 +128,7 @@ sub getSetStatus ($c, $set) {
 		$status = 'not-open';
 		$status_msg =
 			$c->maketext('Will open on [_1].', $c->formatDateTime($set->open_date, $ce->{studentDateDisplayFormat}));
-		push(@$other_messages, $c->restricted_progression_msg(1, $set->restricted_status * 100, @restricted))
-			if @restricted;
-		$link_is_active = 0
-			unless $canViewUnopened
-			|| ($set->assignment_type =~ /gateway/ && $db->countSetVersions($effectiveUser, $set->set_id));
+		push(@$other_messages, $restricted_msg) if $restricted_msg;
 	} elsif ($c->submitTime < $set->due_date) {
 		$status = 'open';
 
@@ -172,31 +164,8 @@ sub getSetStatus ($c, $set) {
 				$c->maketext('Open. Due [_1].', $c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat}));
 		}
 
-		if (@restricted) {
-			$link_is_active = 0 unless $canViewUnopened;
-			push(@$other_messages, $c->restricted_progression_msg(0, $set->restricted_status * 100, @restricted));
-		} elsif (!$canViewUnopened
-			&& $ce->{LTIVersion}
-			&& ($ce->{LTIVersion} ne 'v1p3' || !$ce->{LTI}{v1p3}{ignoreMissingSourcedID})
-			&& defined $ce->{LTIGradeMode}
-			&& $ce->{LTIGradeMode} eq 'homework'
-			&& !$set->lis_source_did)
-		{
-			# The set shouldn't be shown if LTI grade mode is set to homework and a
-			# sourced_id is not available to use to send back grades
-			# (unless we are using LTI 1.3 and $LTI{v1p3}{ignoreMissingSourcedID} is set)
-			push(
-				@$other_messages,
-				$c->maketext(
-					'You must log into this set via your Learning Management System ([_1]).',
-					$ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
-					? $c->link_to(
-						$ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
-						)
-					: $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name}
-				)
-			);
-			$link_is_active = 0;
+		if ($restricted_msg) {
+			push(@$other_messages, $restricted_msg);
 		}
 	} elsif ($c->submitTime < $set->answer_date) {
 		$status_msg = $c->maketext('Answers available for review on [_1].',
@@ -209,8 +178,7 @@ sub getSetStatus ($c, $set) {
 		status         => $status,
 		status_msg     => $status_msg,
 		other_messages => $other_messages,
-		link_is_active => $link_is_active,
-		is_restricted  => scalar(@restricted)
+		is_restricted  => $restricted_msg ? 1 : 0
 	);
 }
 
@@ -232,20 +200,4 @@ sub byUrgency {
 	return $a->set_id cmp $b->set_id;
 }
 
-sub restricted_progression_msg ($c, $open, $restriction, @restricted) {
-	if (@restricted == 1) {
-		return $c->maketext(
-			'To access this set you must score at least [_1]% on set [_2].',
-			sprintf('%.0f', $restriction),
-			$c->tag('span', dir => 'ltr', format_set_name_display($restricted[0]))
-		);
-	} else {
-		return $c->maketext(
-			'To access this set you must score at least [_1]% on the following sets: [_2].',
-			sprintf('%.0f', $restriction),
-			join(', ', map { $c->tag('span', dir => 'ltr', format_set_name_display($_)) } @restricted)
-		);
-	}
-}
-
 1;
diff --git a/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm b/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm
index 09e719d91b..f5d95d9e6e 100644
--- a/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm
+++ b/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm
@@ -21,14 +21,34 @@ use WebworkWebservice;
 
 sub initializeRoute ($c, $routeCaptures) {
 	$c->{rpc} = 1;
+	my $allow_unsecured_rpc = $c->config('allow_unsecured_rpc');
+	my $disable_cookies     = 0;
+
+	if ($allow_unsecured_rpc) {
+		if (ref($allow_unsecured_rpc) eq 'HASH') {
+			my $courseID = $c->param('courseID');
+			if ($courseID && $allow_unsecured_rpc->{$courseID}) {
+				if (ref($allow_unsecured_rpc->{$courseID}) eq 'HASH') {
+					my $userID = $c->param('user');
+					if ($userID && $allow_unsecured_rpc->{$courseID}{$userID}) {
+						$disable_cookies = 1;
+					}
+				} else {
+					$disable_cookies = 1;
+				}
+			}
+		} else {
+			$disable_cookies = 1;
+		}
+	}
 
 	$c->stash(disable_cookies => 1)
-		if $c->current_route eq 'render_rpc' && $c->param('disableCookies') && $c->config('allow_unsecured_rpc');
+		if $c->current_route eq 'render_rpc' && $c->param('disableCookies') && $disable_cookies;
 
 	# This provides compatibility for legacy html2xml parameters.
 	# This should be deleted when the html2xml endpoint is removed.
 	if ($c->current_route eq 'html2xml') {
-		$c->stash(disable_cookies => 1) if $c->config('allow_unsecured_rpc');
+		$c->stash(disable_cookies => 1) if $disable_cookies;
 		for ([ 'userID', 'user' ], [ 'course_password', 'passwd' ], [ 'session_key', 'key' ]) {
 			$c->param($_->[1], $c->param($_->[0])) if defined $c->param($_->[0]) && !defined $c->param($_->[1]);
 		}
diff --git a/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm b/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm
index 3ee248c2b0..d4d4ef44a0 100644
--- a/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm
+++ b/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm
@@ -2,14 +2,10 @@ package WeBWorK::ContentGenerator::SampleProblemViewer;
 use Mojo::Base 'WeBWorK::ContentGenerator', -signatures;
 
 use File::Basename qw(basename);
-use Mojo::File;
-use Mojo::JSON qw(decode_json encode_json);
-use File::Find;
 use Pod::Simple::Search;
-use Pod::Simple::SimpleTree;
 
-use WeBWorK::Utils::Files qw(path_is_subdir);
-use SampleProblemParser   qw(parseSampleProblem generateMetadata getSampleProblemCode);
+use WeBWorK::Utils::Files            qw(path_is_subdir);
+use WeBWorK::PG::SampleProblemParser qw(parseSampleProblem generateMetadata getSampleProblemCode getSearchData);
 
 =head1 NAME
 
@@ -92,10 +88,10 @@ sub renderSampleProblem ($c) {
 			%{
 				parseSampleProblem(
 					$problemFile,
-					metadata        => $metadata,
-					pod_root        => $c->url_for('pod_viewer', filePath => 'macros'),
-					pg_doc_home     => $c->url_for('sample_problem_index'),
-					macro_locations => \%macro_locations,
+					metadata                => $metadata,
+					pod_base_url            => $c->url_for('pod_viewer', filePath => 'macros'),
+					sample_problem_base_url => $c->url_for('sample_problem_index'),
+					macro_locations         => \%macro_locations,
 				)
 			},
 			metadata        => $metadata,
@@ -106,195 +102,7 @@ sub renderSampleProblem ($c) {
 }
 
 sub searchData ($c) {
-	my $sampleProblemDir = $c->ce->{pg_dir} . '/tutorial/sample-problems';
-
-	my $searchDataFile = Mojo::File->new($c->ce->{webworkDirs}{DATA})->child('sample-problem-search-data.json');
-	my %files = map { $_->{filename} => $_ } @{ (eval { decode_json($searchDataFile->slurp('UTF-8')) } // []) };
-	my @updatedFiles;
-
-	# Process the sample problems in the sample problem directory.
-	find(
-		{
-			wanted => sub {
-				return unless $_ =~ /\.pg$/;
-
-				my $file         = Mojo::File->new($File::Find::name);
-				my $lastModified = $file->stat->mtime;
-
-				if ($files{$_}) {
-					push(@updatedFiles, $files{$_});
-					return if $files{$_}{lastModified} >= $lastModified;
-				}
-
-				my @fileContents = eval { split("\n", $file->slurp('UTF-8')) };
-				return if $@;
-
-				if (!$files{$_}) {
-					$files{$_} = {
-						type     => 'sample problem',
-						filename => $_,
-						dir      => $file->dirname->basename
-					};
-					push(@updatedFiles, $files{$_});
-				}
-				$files{$_}{lastModified} = $lastModified;
-
-				my (%words, @kw, @macros, @subjects, $description);
-
-				while (@fileContents) {
-					my $line = shift @fileContents;
-					if ($line =~ /^#:%\s*(\w+)\s*=\s*(.*)\s*$/) {
-						# Store the name and subjects.
-						$files{$_}{name} = $2 if $1 eq 'name';
-						if ($1 eq 'subject') {
-							@subjects = split(',\s*', $2 =~ s/\[(.*)\]/$1/r);
-						}
-					} elsif ($line =~ /^#:\s*(.*)?/) {
-						my @newWords = $c->processLine($1);
-						@words{@newWords} = (1) x @newWords if @newWords;
-					} elsif ($line =~ /loadMacros\(/) {
-						my $macros = $line;
-						while ($line && $line !~ /\);\s*$/) {
-							$line = shift @fileContents;
-							$macros .= $line;
-						}
-						my @usedMacros =
-							map {s/['"\s]//gr} split(/\s*,\s*/, $macros =~ s/loadMacros\((.*)\)\;$/$1/r);
-
-						# Get the macros other than PGML.pl, PGstandard.pl, and PGcourse.pl.
-						for my $m (@usedMacros) {
-							push(@macros, $m) unless $m =~ /^(PGML|PGstandard|PGcourse)\.pl$/;
-						}
-					} elsif ($line =~ /##\s*KEYWORDS\((.*)\)/) {
-						@kw = map {s/^'(.*)'$/$1/r} split(/,\s*/, $1);
-					} elsif ($line =~ /^##\s*DESCRIPTION/) {
-						$line = shift(@fileContents);
-						while ($line && $line !~ /^##\s*ENDDESCRIPTION/) {
-							$description .= ($line =~ s/^##\s+//r) . ' ';
-							$line = shift(@fileContents);
-						}
-						$description =~ s/\s+$//;
-					}
-				}
-
-				$files{$_}{description} = $description;
-				$files{$_}{subjects}    = \@subjects;
-				$files{$_}{terms}       = [ keys %words ];
-				$files{$_}{keywords}    = \@kw;
-				$files{$_}{macros}      = \@macros;
-
-				return;
-			}
-		},
-		$sampleProblemDir
-	);
-
-	# Process the POD in macros in the macros dir.
-	(undef, my $macro_files) = Pod::Simple::Search->new->inc(0)->survey($c->ce->{pg_dir} . "/macros");
-	for my $macroFile (sort keys %$macro_files) {
-		next if $macroFile =~ /deprecated/;
-
-		my $file         = Mojo::File->new($macroFile);
-		my $fileName     = $file->basename;
-		my $lastModified = $file->stat->mtime;
-
-		if ($files{$fileName}) {
-			push(@updatedFiles, $files{$fileName});
-			next if $files{$fileName}{lastModified} >= $lastModified;
-		}
-
-		if (!$files{$fileName}) {
-			$files{$fileName} = {
-				type     => 'macro',
-				id       => scalar(keys %files) + 1,
-				filename => $fileName,
-				dir      => $file->dirname->to_rel($c->ce->{pg_dir})->to_string
-			};
-			push(@updatedFiles, $files{$fileName});
-		}
-		$files{$fileName}{lastModified} = $lastModified;
-
-		my $root = Pod::Simple::SimpleTree->new->parse_file($file->to_string)->root;
-
-		$files{$fileName}{terms} = $c->extractHeaders($root);
-
-		if (my $nameDescription = extractHeadText($root, 'NAME')) {
-			(undef, my $description) = split(/\s*-\s*/, $nameDescription, 2);
-			$files{$fileName}{description} = $description if $description;
-		}
-	}
-
-	# Redindex in case files were added or removed.
-	my $count = 0;
-	$_->{id} = ++$count for @updatedFiles;
-
-	$searchDataFile->spew(encode_json(\@updatedFiles), 'UTF-8');
-
-	return $c->render(json => \@updatedFiles);
-}
-
-# Get the stop words.  The stop words file is loaded the first time this method is called,
-# and is stashed and returned in later calls.
-sub stopWords ($c) {
-	return $c->stash->{stopWords} if $c->stash->{stopWords};
-	$c->stash->{stopWords} = {};
-
-	my $contents = eval { $c->app->home->child('assets', 'stop-words-en.txt')->slurp('UTF-8') };
-	return $c->stash->{stopWords} if $@;
-
-	for my $line (split("\n", $contents)) {
-		chomp $line;
-		next if $line =~ /^#/ || !$line;
-		$c->stash->{stopWords}{$line} = 1;
-	}
-
-	return $c->stash->{stopWords};
-}
-
-sub processLine ($c, $line) {
-	my %words;
-
-	# Extract linked macros and problems.
-	my @linkedFiles = $line =~ /(?:PODLINK|PROBLINK)\('([\w.]+)'\)/g;
-	$words{$_} = 1 for @linkedFiles;
-
-	# Replace any non-word characters with spaces.
-	$line =~ s/\W/ /g;
-
-	for my $word (split(/\s+/, $line)) {
-		next if $word =~ /^\d*$/;
-		$word = lc($word);
-		$words{$word} = 1 if !$c->stopWords->{$word};
-	}
-	return keys %words;
-}
-
-# Extract the text for a section from the given POD with a section header title.
-sub extractHeadText ($root, $title) {
-	my @index = grep { ref($root->[$_]) eq 'ARRAY' && $root->[$_][2] eq $title } 0 .. $#$root;
-	return unless @index == 1;
-
-	my $node = $root->[ $index[0] + 1 ];
-	my $str  = '';
-	for (2 .. $#$node) {
-		$str .= ref($node->[$_]) eq 'ARRAY' ? $node->[$_][2] : $node->[$_];
-	}
-	return $str;
-}
-
-# Extract terms form POD headers.
-sub extractHeaders ($c, $root) {
-	my %terms =
-		map  { $_ => 1 }
-		grep { $_ && !$c->stopWords->{$_} }
-		map  { split(/\s+/, $_) }
-		map  { lc($_) =~ s/\W/ /gr }
-		map {
-			grep { !ref($_) }
-			@$_[ 2 .. $#$_ ]
-		}
-		grep { ref($_) eq 'ARRAY' && $_->[0] =~ /^head\d+$/ } @$root;
-	return [ keys %terms ];
+	return $c->render(json => getSearchData($c->ce->{webworkDirs}{DATA} . '/sample-problem-search-data.json'));
 }
 
 1;
diff --git a/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm b/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm
index 39b164d4ab..6878ae8369 100644
--- a/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm
+++ b/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm
@@ -78,6 +78,7 @@ async sub pre_header_initialize ($c) {
 			effectivePermissionLevel => $db->getPermissionLevel($c->{effectiveUserID})->permission,
 			useMathQuill             => $c->{will}{useMathQuill},
 			useMathView              => $c->{will}{useMathView},
+			problemData              => '{}'
 		},
 	);
 
@@ -116,6 +117,7 @@ async sub pre_header_initialize ($c) {
 					effectivePermissionLevel => $db->getPermissionLevel($c->{effectiveUserID})->permission,
 					useMathQuill             => $c->{will}{useMathQuill},
 					useMathView              => $c->{will}{useMathView},
+					problemData              => '{}'
 				},
 			);
 
@@ -155,10 +157,9 @@ async sub pre_header_initialize ($c) {
 	}
 
 	# Disable options that are not applicable for showMeAnother.
-	$c->{can}{recordAnswers}     = 0;
-	$c->{can}{checkAnswers}      = 0;    # This is turned on if the showMeAnother conditions are met below.
-	$c->{can}{getSubmitButton}   = 0;
-	$c->{can}{showProblemGrader} = 0;
+	$c->{can}{recordAnswers}   = 0;
+	$c->{can}{checkAnswers}    = 0;    # This is turned on if the showMeAnother conditions are met below.
+	$c->{can}{getSubmitButton} = 0;
 
 	if ($c->stash->{isPossible}) {
 		$c->{can}{showCorrectAnswers} =
@@ -206,34 +207,17 @@ async sub pre_header_initialize ($c) {
 			showMessages             => !$showOnlyCorrectAnswers,
 			showCorrectAnswers       => $showOnlyCorrectAnswers
 				|| ($c->{will}{checkAnswers} && $c->{will}{showCorrectAnswers}) ? 1 : 0,
-			debuggingOptions => getTranslatorDebuggingOptions($c->authz, $c->{userID})
+			debuggingOptions => getTranslatorDebuggingOptions($c->authz, $c->{userID}),
+			problemData      => $c->{formFields}{problem_data} || '{}'
 		}
 	);
 
-	# Warnings in the renderPG subprocess will not be caught by the global warning handler of this process.
-	# So rewarn them and let the global warning handler take care of it.
-	warn $pg->{warnings} if $pg->{warnings};
-
 	debug('end pg processing');
 
 	# Update and fix hint/solution options after PG processing
 	$c->{can}{showHints}     &&= $pg->{flags}{hintExists};
 	$c->{can}{showSolutions} &&= $pg->{flags}{solutionExists};
 
-	# Record errors
-	$c->{pgdebug}          = $pg->{debug_messages}          if ref $pg->{debug_messages} eq 'ARRAY';
-	$c->{pgwarning}        = $pg->{warning_messages}        if ref $pg->{warning_messages} eq 'ARRAY';
-	$c->{pginternalerrors} = $pg->{internal_debug_messages} if ref $pg->{internal_debug_messages} eq 'ARRAY';
-	# $c->{pgerrors} is defined if any of the above are defined, and is nonzero if any are non-empty.
-	$c->{pgerrors} = @{ $c->{pgdebug} // [] } || @{ $c->{pgwarning} // [] } || @{ $c->{pginternalerrors} // [] }
-		if defined $c->{pgdebug} || defined $c->{pgwarning} || defined $c->{pginternalerrors};
-
-	# If $c->{pgerrors} is not defined, then the PG messages arrays were not defined,
-	# which means $pg->{pgcore} was not defined and the translator died.
-	warn 'Processing of this PG problem was not completed.  Probably because of a syntax error. '
-		. 'The translator died prematurely and no PG warning messages were transmitted.'
-		unless defined $c->{pgerrors};
-
 	$c->{pg} = $pg;
 
 	return;
@@ -268,10 +252,7 @@ sub page_title ($c) {
 
 	# This uses the permission level and user id of the user assigned to the problem.
 	my $problemUser = $problem->user_id;
-	if ($c->db->getPermissionLevel($problemUser)->permission >=
-		$ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL}
-		|| grep { $_ eq $problemUser } @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} })
-	{
+	if ($c->authz->hasPermissions($problemUser, 'print_path_to_problem')) {
 		$subheader .= ' ' . $problem->source_file;
 	}
 
diff --git a/lib/WeBWorK/ContentGenerator/TwoFactorAuthentication.pm b/lib/WeBWorK/ContentGenerator/TwoFactorAuthentication.pm
index ccd4196ecb..6360154e0d 100644
--- a/lib/WeBWorK/ContentGenerator/TwoFactorAuthentication.pm
+++ b/lib/WeBWorK/ContentGenerator/TwoFactorAuthentication.pm
@@ -56,8 +56,10 @@ sub pre_header_initialize ($c) {
 			# gmail (and probably other email providers as well) strips any links with hrefs that don't start with
 			# http[s]://.  The otpauth:// protocol of course does not.
 			my $mail =
-				Email::Stuffer->to($recipient)->from($ce->{twoFA}{email_sender})
-				->subject($c->maketext('Setup One-Time Password Authentication'))->html_body(
+				Email::Stuffer->to($recipient)
+				->from($ce->{twoFA}{email_sender})
+				->subject($c->maketext('Setup One-Time Password Authentication'))
+				->html_body(
 					'output_course_lang_and_dir
 					. '>'
@@ -90,7 +92,8 @@ sub pre_header_initialize ($c) {
 						)
 					)->join('')->to_string
 					. ''
-			)->attach($img_data, filename => 'QRCode.png')
+				)
+				->attach($img_data, filename => 'QRCode.png')
 				->header('X-Remote-Host' => $c->tx->remote_address || 'UNKNOWN')
 				->transport(createEmailSenderTransportSMTP($ce));
 
diff --git a/lib/WeBWorK/CourseEnvironment.pm b/lib/WeBWorK/CourseEnvironment.pm
index 184052d41e..677d3f0bea 100644
--- a/lib/WeBWorK/CourseEnvironment.pm
+++ b/lib/WeBWorK/CourseEnvironment.pm
@@ -240,7 +240,7 @@ sub new {
 		map {
 			my $name = $_;
 			map { $_ => $name } @{ $self->{statuses}{$name}{abbrevs} }
-		}
+			}
 			keys %{ $self->{statuses} }
 	};
 
diff --git a/lib/WeBWorK/DB.pm b/lib/WeBWorK/DB.pm
index 5ccf5e0eba..fc4e1b214a 100644
--- a/lib/WeBWorK/DB.pm
+++ b/lib/WeBWorK/DB.pm
@@ -436,13 +436,19 @@ sub abort_transaction {
 
 BEGIN {
 	*User            = gen_schema_accessor("user");
-	*newUser         = gen_new("user");
 	*countUsersWhere = gen_count_where("user");
 	*existsUserWhere = gen_exists_where("user");
 	*listUsersWhere  = gen_list_where("user");
 	*getUsersWhere   = gen_get_records_where("user");
 }
 
+sub newUser {
+	my ($self, @data) = @_;
+	my $user = $self->{user}{record}->new(@data);
+	$user->accommodation_time_factor(1) unless defined $user->accommodation_time_factor;
+	return $user;
+}
+
 sub countUsers { return scalar shift->listUsers(@_) }
 
 # Note: This returns a list of user_ids for all users except set level proctors.
@@ -2227,11 +2233,8 @@ sub checkArgs {
 
 		if (defined $table) {
 			my $class = $self->{$table}{record};
-			#print "arg=$arg class=$class\n";
 			croak "argument $pos must be of type $class"
-				unless defined $arg
-				and ref $arg
-				and $arg->isa($class);
+				unless blessed $arg && $arg->isa($class);
 			eval { checkKeyfields($arg, $versioned) };
 			croak "argument $pos contains $@" if $@;
 		} else {
diff --git a/lib/WeBWorK/DB/Record/User.pm b/lib/WeBWorK/DB/Record/User.pm
index b712f3473d..5eeea5780e 100644
--- a/lib/WeBWorK/DB/Record/User.pm
+++ b/lib/WeBWorK/DB/Record/User.pm
@@ -12,20 +12,21 @@ use warnings;
 
 BEGIN {
 	__PACKAGE__->_fields(
-		user_id        => { type => "VARCHAR(100) NOT NULL", key => 1 },
-		first_name     => { type => "TEXT" },
-		last_name      => { type => "TEXT" },
-		email_address  => { type => "TEXT" },
-		student_id     => { type => "TEXT" },
-		status         => { type => "TEXT" },
-		section        => { type => "TEXT" },
-		recitation     => { type => "TEXT" },
-		comment        => { type => "TEXT" },
-		displayMode    => { type => "TEXT" },
-		showOldAnswers => { type => "INT" },
-		useMathView    => { type => "INT" },
-		useMathQuill   => { type => "INT" },
-		lis_source_did => { type => "TEXT" },
+		user_id                   => { type => "VARCHAR(100) NOT NULL", key => 1 },
+		first_name                => { type => "TEXT" },
+		last_name                 => { type => "TEXT" },
+		email_address             => { type => "TEXT" },
+		student_id                => { type => "TEXT" },
+		status                    => { type => "TEXT" },
+		accommodation_time_factor => { type => "FLOAT NOT NULL DEFAULT 1" },
+		section                   => { type => "TEXT" },
+		recitation                => { type => "TEXT" },
+		comment                   => { type => "TEXT" },
+		displayMode               => { type => "TEXT" },
+		showOldAnswers            => { type => "INT" },
+		useMathView               => { type => "INT" },
+		useMathQuill              => { type => "INT" },
+		lis_source_did            => { type => "TEXT" },
 	);
 }
 
diff --git a/lib/WeBWorK/File/SetDef.pm b/lib/WeBWorK/File/SetDef.pm
index e137ddf544..1599b25848 100644
--- a/lib/WeBWorK/File/SetDef.pm
+++ b/lib/WeBWorK/File/SetDef.pm
@@ -197,8 +197,8 @@ sub importSetsFromDef ($ce, $db, $setDefFiles, $existingSets = undef, $assign =
 				showMeAnother     => $rh_problem->{showMeAnother},
 				showHintsAfter    => $rh_problem->{showHintsAfter},
 				prPeriod          => $rh_problem->{prPeriod},
-				attToOpenChildren => $rh_problem->{attToOpenChildren},
-				countsParentGrade => $rh_problem->{countsParentGrade}
+				attToOpenChildren => $rh_problem->{att_to_open_children},
+				countsParentGrade => $rh_problem->{counts_parent_grade}
 			);
 		}
 
diff --git a/lib/WeBWorK/HTML/SingleProblemGrader.pm b/lib/WeBWorK/HTML/SingleProblemGrader.pm
index d10de75633..fa7bd24304 100644
--- a/lib/WeBWorK/HTML/SingleProblemGrader.pm
+++ b/lib/WeBWorK/HTML/SingleProblemGrader.pm
@@ -11,8 +11,9 @@ as a student.
 
 use WeBWorK::Localize;
 use WeBWorK::Utils 'wwRound';
+use WeBWorK::Utils::DateTime qw(before);
 
-sub new ($class, $c, $pg, $userProblem) {
+sub new ($class, $c, $pg, $userProblem, $mergedSet) {
 	$class = ref($class) || $class;
 
 	my $db           = $c->db;
@@ -43,7 +44,12 @@ sub new ($class, $c, $pg, $userProblem) {
 		recorded_score => $recordedScore,
 		past_answer_id => $userPastAnswerID // 0,
 		comment_string => $comment,
-		c              => $c
+		c              => $c,
+		# The grader needs to also save the sub_status if reduced scoring is not enabled,
+		# or if it is but it is before the reduced scoring date.
+		save_sub_status => !$c->ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+			|| !$mergedSet->enable_reduced_scoring
+			|| before($mergedSet->reduced_scoring_date)
 	};
 	bless $self, $class;
 
diff --git a/lib/WeBWorK/HTML/StudentNav.pm b/lib/WeBWorK/HTML/StudentNav.pm
new file mode 100644
index 0000000000..2387af9d17
--- /dev/null
+++ b/lib/WeBWorK/HTML/StudentNav.pm
@@ -0,0 +1,82 @@
+package WeBWorK::HTML::StudentNav;
+use Mojo::Base 'Exporter', -signatures;
+
+=head1 NAME
+
+WeBWorK::HTML::StudentNav - student navigation for all users assigned to a set.
+
+=cut
+
+our @EXPORT_OK = qw(studentNav);
+
+sub studentNav ($c, $setID) {
+	my $userID = $c->param('user');
+
+	return '' unless $c->authz->hasPermissions($userID, 'become_student');
+
+	# Find all users (except the current user) sorted by last_name, then first_name, then user_id.
+	my @allUserRecords =
+		$c->db->getUsersWhere({ -and => { user_id => { not_like => 'set_id:%' } }, user_id => { '!=' => $userID } },
+			[qw/last_name first_name user_id/]);
+
+	# If $setID is provided, only show users assigned to given set.
+	if ($setID) {
+		my %users =
+			map { $_->[0] => 1 } $c->db->listUserSetsWhere({ set_id => $setID, user_id => { '!=' => $userID } });
+		@allUserRecords = grep { $users{ $_->{user_id} } } @allUserRecords;
+	}
+
+	return '' unless @allUserRecords;
+
+	my $eUserID = $c->param('effectiveUser');
+
+	my $filter = $c->param('studentNavFilter');
+
+	# Find the previous, current, and next users, and format the student names for display.
+	# Also create a hash of sections and recitations if there are any for the course.
+	my @userRecords;
+	my $currentUserIndex = 0;
+	my %filters;
+	for (@allUserRecords) {
+		# Add to the sections and recitations if defined.  Also store the first user found in that section or
+		# recitation.  This user will be switched to when the filter is selected.
+		my $section = $_->section;
+		$filters{"section:$section"} = [ $c->maketext('Filter by section [_1]', $section), $_->user_id ]
+			if $section && !$filters{"section:$section"};
+		my $recitation = $_->recitation;
+		$filters{"recitation:$recitation"} = [ $c->maketext('Filter by recitation [_1]', $recitation), $_->user_id ]
+			if $recitation && !$filters{"recitation:$recitation"};
+
+		# Only keep this user if it satisfies the selected filter if a filter was selected.
+		next
+			unless !$filter
+			|| ($filter =~ /^section:(.*)$/    && $_->section eq $1)
+			|| ($filter =~ /^recitation:(.*)$/ && $_->recitation eq $1);
+
+		$currentUserIndex = @userRecords if $_->user_id eq $eUserID;
+		push @userRecords, $_;
+
+		# Construct a display name.
+		$_->{displayName} = ($_->last_name || $_->first_name ? $_->last_name . ', ' . $_->first_name : $_->user_id);
+	}
+	my $prevUser = $currentUserIndex > 0             ? $userRecords[ $currentUserIndex - 1 ] : 0;
+	my $nextUser = $currentUserIndex < $#userRecords ? $userRecords[ $currentUserIndex + 1 ] : 0;
+
+	# Mark the current user.
+	$userRecords[$currentUserIndex]{currentUser} = 1;
+
+	# Set up the student nav.
+	return $c->include(
+		'HTML/StudentNav/student_nav',
+		userID           => $userID,
+		eUserID          => $eUserID,
+		userRecords      => \@userRecords,
+		currentUserIndex => $currentUserIndex,
+		prevUser         => $prevUser,
+		nextUser         => $nextUser,
+		filter           => $filter,
+		filters          => \%filters
+	);
+}
+
+1;
diff --git a/lib/WeBWorK/Localize/webwork2.pot b/lib/WeBWorK/Localize/webwork2.pot
index 0d3860417c..79054b475e 100644
--- a/lib/WeBWorK/Localize/webwork2.pot
+++ b/lib/WeBWorK/Localize/webwork2.pot
@@ -19,7 +19,7 @@ msgstr ""
 msgid " (version %1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:263 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:282
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:278 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:297
 msgid " Answers Available."
 msgstr ""
 
@@ -38,6 +38,11 @@ msgstr ""
 msgid "\"%1\" contains invalid characters."
 msgstr ""
 
+#. (xml_escape($hardcopy_format)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:134
+msgid "\"%1\" is not a valid hardcopy format."
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:127
 msgid "\"Act as\" a student"
 msgstr ""
@@ -74,7 +79,7 @@ msgstr ""
 msgid "% Score with Review"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:501
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:506
 msgid "% Score:"
 msgstr ""
 
@@ -83,13 +88,28 @@ msgstr ""
 msgid "%1 (%2 remaining)"
 msgstr ""
 
+#. ($user->full_name, $user->user_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:21
+msgid "%1 (%2) wrote:"
+msgstr ""
+
+#. ($user->status)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:165 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:97
+msgid "%1 (unknown status abbreviation)"
+msgstr ""
+
 #. ($c->maketext($self->name)
 #: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:121
 msgid "%1 (unlimited reusability)"
 msgstr ""
 
+#. ($_->{displayName}, $_->{setVersion})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:50
+msgid "%1 (version %2)"
+msgstr ""
+
 #. ($properties{name})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1018
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1008
 msgid "%1 Help"
 msgstr ""
 
@@ -100,12 +120,12 @@ msgid "%1 Icon"
 msgstr ""
 
 #. ($total)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2552
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2553
 msgid "%1 OTP secrets copied."
 msgstr ""
 
 #. ($total)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2527
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2528
 msgid "%1 OTP secrets reset."
 msgstr ""
 
@@ -120,22 +140,22 @@ msgid "%1 Problems:"
 msgstr ""
 
 #. ('templates', 'html')
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:180
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:181
 msgid "%1 and %2 folders"
 msgstr ""
 
 #. ($achievementID =~ s/_/ /gr)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:333
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:309
 msgid "%1 evaluator"
 msgstr ""
 
 #. ($achievementID =~ s/_/ /gr)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:340
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:316
 msgid "%1 notifications"
 msgstr ""
 
 #. ($count)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2141
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2120
 msgid "%1 sets"
 msgstr ""
 
@@ -145,13 +165,13 @@ msgid "%1 setting"
 msgstr ""
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2127
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2106
 msgid "%1 students out of %2"
 msgstr ""
 
 #. ($achievementItem->name, $message)
 #: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems.pm:93
-msgid "%1 successfuly used. %2"
+msgid "%1 successfully used. %2"
 msgstr ""
 
 #. ($rename_oldCourseID,          $rename_oldCourseTitle, $rename_newCourseTitle,					$rename_oldCourseInstitution, $rename_newCourseInstitution)
@@ -160,17 +180,17 @@ msgid "%1 title and institution changed from %2 to %3 and from %4 to %5"
 msgstr ""
 
 #. ($achievementID =~ s/_/ /gr)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:347
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:323
 msgid "%1 users"
 msgstr ""
 
 #. (scalar @userIDsToExport, "$dir/$fileName")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:458
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
 msgid "%1 users exported to file %2"
 msgstr ""
 
 #. ($numReplaced, $numAdded, $numSkipped, join(', ', @$skipped)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:432
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:455
 msgid "%1 users replaced, %2 users added, %3 users skipped. Skipped users: (%4)"
 msgstr ""
 
@@ -219,12 +239,12 @@ msgstr ""
 
 #. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
 #. ($c->tag('span', dir => 'ltr', $prettySetID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:27 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1028 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:162
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Login.pm:27 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:957 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:162
 msgid "%1: Problem %2"
 msgstr ""
 
 #. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash('setID')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:252
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:254
 msgid "%1: Problem %2 Show Me Another"
 msgstr ""
 
@@ -251,7 +271,7 @@ msgstr ""
 #. (sprintf('%3.1f', $testTime)
 #. ($timeLeft)
 #. ($minutes)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:93 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:146 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:164
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/LTIUpdate.pm:93 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:145 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:163
 msgid "%quant(%1,minute)"
 msgstr ""
 
@@ -291,43 +311,43 @@ msgid "(%quant(%1,item))"
 msgstr ""
 
 #. ($problemValue)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1040
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:969
 msgid "(%quant(%1,point))"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:713
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:714
 msgid "(Any unsaved changes will be lost.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementNotificationEditor.html.ep:11 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementNotificationEditor.html.ep:11 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:123
 msgid "(If an action cannot be executed it will not appear.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1221
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1162
 msgid "(This problem will not count toward your grade.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/set_list_row.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/set_list_row.html.ep:33
 msgid "(This set is hidden from students.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:359
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:342
 msgid "(This test is overtime because it was not submitted in the allowed time.)"
 msgstr ""
 
 # $testNoun is either "test" or "submission"
 #. ($testNoun, $c->formatDateTime($c->{set}->answer_date, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:170
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:151
 msgid "(Your score on this %1 is not available until %2.)"
 msgstr ""
 
 # $testNoun is either "test" or "submission"
 #. ($testNoun)
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:172
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:153
 msgid "(Your score on this %1 is not available.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1276 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1286
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1280 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1290
 msgid "(correct)"
 msgstr ""
 
@@ -335,24 +355,28 @@ msgstr ""
 msgid "(in target set)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1278 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1282 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1292
 msgid "(incorrect)"
 msgstr ""
 
 #. ($pgScore)
 #. ($recScore)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1280 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1290
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1284 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1294
 msgid "(score %1)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:37
+msgid "(taken from filenames)"
+msgstr ""
+
 #. ($versionID)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:160
 msgid "(version %1)"
 msgstr ""
 
 #. ($display_sort_method_name{$secondary_sort_method})
 #. ($display_sort_method_name{$ternary_sort_method})
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:141 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:144
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:142 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:145
 msgid ", then by %1"
 msgstr ""
 
@@ -364,11 +388,11 @@ msgstr ""
 msgid "0 seconds"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2116
 msgid "1 set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2123
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2102
 msgid "1 student"
 msgstr ""
 
@@ -402,11 +426,11 @@ msgstr ""
 msgid "
Some servers handle courses taking place in different timezones. If this course is not showing the correct timezone, enter the correct value here. The format consists of unix times, such as \"America/New_York\", \"America/Chicago\", \"America/Denver\", \"America/Phoenix\" or \"America/Los_Angeles\".
Complete list: TimeZoneFiles"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:982
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:985
 msgid "
This can be set to one of the dates associated with assignments, or \"Never\". For each assignment, if this setting is \"After the ... \" then if it is after the indicated date, WeBWorK will send scores. If this setting is \"Never\" then there is no date that will force WeBWorK to send scores and only the $LTISendGradesEarlyThreshold can cause scores to be sent. If scores are sent:
 
  • For 'course' grade passback mode, the assignment will be included in the overall course score calculation.
  • For 'homework' grade passback mode, the assignment's score itself will be sent.
If $LTISendScoresAfterDate is set to \"After the reduced scoring date\" and an assignment has no reduced scoring date or reduced scoring is disabled, the fallback is to use the close date.
For a given assignment, WeBWorK will still send a score to the LMS if the $LTISendGradesEarlyThreshold has been met, regardless of how $LTISendScoresAfterDate is set.
"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1008
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1011
 msgid "
This can either be set to a score or set to Attempted. When something triggers a potential grade passback, if it is earlier than $LTISendScoresAfterDate, the condition described by this variable must be met or else no score will be sent.
If this variable is a score, then the set will need to have a score that reaches or exceeds this score for its score to be sent to the LMS (or included in the 'course' score calculation). If this variable is set to Attempted, then the set needs to have been attempted for its score to be sent to the LMS (or included in the 'course' score calculation).
For a regular or jitar set, 'attempted' means that at least one exercise was attempted. For a test, 'attempted' means that either multiple versions exist or there is one version with a graded submission.
"
 msgstr ""
 
@@ -414,7 +438,11 @@ msgstr ""
 msgid "
This sets whether the Reduced Scoring system will be enabled. If enabled you will need to set the default length of the reduced scoring period and the value of work done in the reduced scoring period below.
To use this, you also have to enable Reduced Scoring for individual assignments and set their Reduced Scoring Dates by editing the set data.
This works with the avg_problem_grader (which is the default grader) and the std_problem_grader (the all or nothing grader). It will work with custom graders if they are written appropriately.
"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:948
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:835
+msgid "
When students click the Email Instructor button to send feedback, WeBWorK fills in the subject line. Here you can set the subject line. In it, you can have various bits of information filled in with the following escape sequences.
  • %c = course ID
  • %u = user ID
  • %s = set ID
  • %p = problem ID
  • %x = section
  • %r = recitation
  • %% = literal percent sign
If content is between a brace pair, like '{ rec:%r}', then it will only be included in the subject line if all substitutions within the double brace pair are defined and nonempty."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:951
 msgid "
When this is true, any time WeBWorK is about to send a score to the LMS, it will first request from the LMS what that score currently is. Then if there is no significant difference between the LMS score and the WeBWorK score, WeBWorK will not follow through with updating the LMS score. This is to avoid frequent insignificant updates to a student score in the LMS. With some LMSs, students may receive notifications each time a score is updated, and setting this variable will prevent too many notifications for them. This does create a two-step process, first querying the current score from the LMS and then actually updating the score (if there is a significant difference). Additional details:
  • If the LMS score is not 100%, but the WeBWorK score is, then even if the LMS score is only insignificantly less than 100%, it will be updated anyway.
  • If the LMS score is not set and the WeBWorK score is 0, this is considered a significant difference and the LMS score will updated to 0. However, the constraints of the $LTISendScoresAfterDate and the $LTISendGradesEarlyThreshold variables (described below) might apply, and the score may still not be updated in this case.
  • \"Significant\" means an absolute difference of 0.001, or 0.1%. At this time this is not configurable.
"
 msgstr ""
 
@@ -422,7 +450,7 @@ msgstr ""
 msgid "
When viewing a problem, users may choose different methods of rendering formulas via an options box in the left panel. Here, you can adjust what display modes are listed.
The display modes are
  • plainText: shows the raw LaTeX strings for formulas.
  • images: produces images using the external programs LaTeX and dvipng.
  • MathJax: uses javascript to render mathematics.
You must use at least one display mode. If you select only one, then the options box will not give a choice of modes (since there will only be one active).
"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1447
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1451
 msgid "Warning: There may be something wrong with a question in this test. Please inform your instructor including the warning messages below."
 msgstr ""
 
@@ -451,7 +479,7 @@ msgid "
  • SMAcheckAnswers: Enables the \"Check Answers\" button f
 msgstr ""
 
 #: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:821
-msgid "A \"Reveal\" button must be clicked to make a correct answer visible any time that correct answers for a problem are shown. Note that this is always the case for instructors before answers are available to students, and in \"Show Me Another\" problems."
+msgid "A \"Reveal\" button must be clicked to make a correct answer visible any time that correct answers for a problem are shown. Note that this is always the case for instructors before answers are available to students (except when the problem grader is open), and in \"Show Me Another\" problems."
 msgstr ""
 
 #. ($add_courseID)
@@ -461,7 +489,7 @@ msgid "A course with ID %1 already exists."
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1172
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1173
 msgid "A directory already exists with the name %1. You must first delete this existing course before you can unarchive."
 msgstr ""
 
@@ -501,20 +529,20 @@ msgstr ""
 msgid "A hash reference which saves global data for this user. This hash is persistent between evaluations and changes to this variable will be saved in the database."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:78
 msgid "A list of sample problems by category."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:88
 msgid "A list of sample problems by problem technique."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:76
+#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:83
 msgid "A list of sample problems by subject area."
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1806
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1807
 msgid "A location with the name %1 already exists in the database.  Did you mean to edit that location instead?"
 msgstr ""
 
@@ -533,7 +561,7 @@ msgstr ""
 msgid "A new file has been created at \"%1\" with the contents below."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:205
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:194
 msgid "A new problem whose path ends in newProblem.pg should be given a new name, for example, \"myNewProblem.pg\"."
 msgstr ""
 
@@ -541,7 +569,7 @@ msgstr ""
 msgid "A solution should be provided here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:297
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
 msgid "A student might start a timed test close to the close date.  This setting allows to either cut them off at the close date or allow them the full time limit."
 msgstr ""
 
@@ -558,11 +586,11 @@ msgstr ""
 msgid "A switch to govern the use of a Progress Bar for the student; this also enables/disables the highlighting of the current problem in the side bar, and whether it is correct (✓), in progress (…), incorrect (✗), or unattempted (no symbol)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:360
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:371
 msgid "A test is broken up into pages with this many problems on each page.  Students can move from page to page without clicking to grade the test, and their temporary answers will be saved.  Use \"0\" to indicate \"all problems on one page\".  For tests with many problems, either extreme (1 per page or \"all on one page\") has drawbacks.  With 1 per page, the student has many pages and may be frustrated trying to go back and find a particular problem.  With \"all on one page\", the student may spend a lot of time on that one page without clicking anything that lets WeBWorK know they are still active, and their session might expire for inactivity before they get around to clicking the grade button. This situation can lead to their typed answers being lost and unrecoverable.  Additionally, having many problems load at the same time on one page can put a strain on the server.  This is especially worth considering if the test has many dynamically generated images, which can slow things down significantly."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:308
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:319
 msgid "A test may be configured to allow students one or more versions.  For each version, this is the number of times you will allow them to click to have that version graded.  Depending on other settings, they may or may not be able to see scores and feedback following each grading. Use \"0\" to indicate there is no cap on the number of graded submissions."
 msgstr ""
 
@@ -576,16 +604,16 @@ msgid "ADJ STATUS"
 msgstr ""
 
 #. ($c->{scoreRecordedMessage}[ $probOrder->[$i] ])
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:525
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:531
 msgid "ANSWERS NOT RECORDED -- %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1453 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:535
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1394 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:541
 msgid "ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1483
-msgid "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version if neccessary)."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1424
+msgid "ATTEMPT NOT ACCEPTED -- Please submit answers again (or request new version if necessary)."
 msgstr ""
 
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/cancel_edit_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/cancel_edit_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/cancel_edit_form.html.ep:1
@@ -596,7 +624,15 @@ msgstr ""
 msgid "Abandon export"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:301 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:13
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:114 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:55
+msgid "Accommodation Time Factor"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:126
+msgid "Accomodation time factor for %1 unchanged. A value was given that is not a decimal number or is not greater than or equal to 1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:308 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:13
 msgid "Account Settings"
 msgstr ""
 
@@ -604,7 +640,7 @@ msgstr ""
 msgid "Account Settings Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:453 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:303
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:445 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:302 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:305
 msgid "Account creation is currently disabled in this course.  Please speak to your instructor or system administrator."
 msgstr ""
 
@@ -613,7 +649,7 @@ msgstr ""
 msgid "Account settings for %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:395 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:22
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:402 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:40 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:22
 msgid "Accounts Manager"
 msgstr ""
 
@@ -661,7 +697,7 @@ msgstr ""
 msgid "Achievement Notification Editor Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:540
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:542
 msgid "Achievement Notification for %5"
 msgstr ""
 
@@ -673,7 +709,7 @@ msgstr ""
 msgid "Achievement Points Per Problem in Reduced Scoring Period"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:27
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:46
 msgid "Achievement Rewards"
 msgstr ""
 
@@ -681,7 +717,7 @@ msgstr ""
 msgid "Achievement User Editor Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:535
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:537
 msgid "Achievement Users for %5"
 msgstr ""
 
@@ -714,7 +750,7 @@ msgstr ""
 msgid "Achievement scores saved to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:312
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:319
 msgid "Achievements"
 msgstr ""
 
@@ -722,7 +758,7 @@ msgstr ""
 msgid "Achievements Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:319
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:326
 msgid "Achievements Leaderboard"
 msgstr ""
 
@@ -730,7 +766,7 @@ msgstr ""
 msgid "Achievements Leaderboard Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:523 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:48
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:525 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
 msgid "Achievements Manager"
 msgstr ""
 
@@ -739,7 +775,7 @@ msgid "Achievements Manager Help"
 msgstr ""
 
 #: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:278
-msgid "Achievements are a way to gamify WeBWorK. In parallel to a student's regular scores on assignments, they earn \"achievement points\" for (a) answering an exercise correctly, and (b) earning badges. Badges can be for tasks like earning 100% on three assignments, answering five questions correclty on the first attempt, etc. As students earn achivement points, they can \"level up\" as well. An instructor can manage Achievents using the Achievements Manager tool."
+msgid "Achievements are a way to gamify WeBWorK. In parallel to a student's regular scores on assignments, they earn \"achievement points\" for (a) answering an exercise correctly, and (b) earning badges. Badges can be for tasks like earning 100% on three assignments, answering five questions correctly on the first attempt, etc. As students earn achievement points, they can \"level up\" as well. An instructor can manage Achievements using the Achievements Manager tool."
 msgstr ""
 
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:11
@@ -754,25 +790,25 @@ msgstr ""
 msgid "Act"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/student_progress.html.ep:23
 msgid "Act as:"
 msgstr ""
 
 #. ($effectiveUserName)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:28
 msgid "Acting as %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:69
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:55
 msgid "Action"
 msgstr ""
 
 #. ($actionID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/JobManager.pm:96 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:221 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:204
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/JobManager.pm:96 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:221 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:227
 msgid "Action %1 not found"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementNotificationEditor.html.ep:10 /opt/webwork/webwork2/templates/HelpFiles/InstructorJobManager.html.ep:47 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:136
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementNotificationEditor.html.ep:10 /opt/webwork/webwork2/templates/HelpFiles/InstructorJobManager.html.ep:47 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:122
 msgid "Actions:"
 msgstr ""
 
@@ -793,11 +829,11 @@ msgstr ""
 msgid "Active Students Problem %1 Grades"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:66 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:249 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:703 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:66 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:163 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:249 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:704 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:166
 msgid "Add"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:146
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:147
 msgid "Add Additional User"
 msgstr ""
 
@@ -805,7 +841,7 @@ msgstr ""
 msgid "Add All"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:242 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:243 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:17
 msgid "Add Course"
 msgstr ""
 
@@ -813,7 +849,7 @@ msgstr ""
 msgid "Add Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:428 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:168
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:435 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:168
 msgid "Add Users"
 msgstr ""
 
@@ -853,7 +889,7 @@ msgstr ""
 msgid "Add problems to"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:212
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:201
 msgid "Add this problem as the last problem of an existing set, either as a problem or as the set header (the text that appears on the home page of a homework set). You can rearrange the order of the problems later using the \"Sets Manager\"."
 msgstr ""
 
@@ -882,7 +918,7 @@ msgstr ""
 
 #. ($new_file_path, $setID, $targetProblemNumber)
 #. ($sourceFilePath,			$targetSetName,			(				$set->assignment_type eq 'jitar'				? join('.', jitar_id_to_seq($targetProblemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:905 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1977
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:905 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1958
 msgid "Added %1 to %2 as problem %3"
 msgstr ""
 
@@ -892,12 +928,12 @@ msgid "Added %1 to %2 as problem %3."
 msgstr ""
 
 #. (join(', ', @toAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2085
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2086
 msgid "Added addresses %1 to location %2."
 msgstr ""
 
 #. ($user->user_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:150
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:173
 msgid "Added missing permission level for user %1."
 msgstr ""
 
@@ -915,36 +951,36 @@ msgstr ""
 msgid "Additional (external) grades can be shown on this page by placing them in the CSV file %1.  The first six columns must be (in order): Student ID, Username, Last Name, First Name, Section, Recitation.  The remaining columns can list any external grades.  To display the grades, the CSV file is merged with the \"Email\" message %2, which will be rendered and displayed below the grade table.  The message can be created on the \"Email\" page and the CSV file can be created/uploaded using the \"File Manager\".  External grades can only be displayed here and are not included in any totals or statistics."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:872
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:875
 msgid "Additional addresses for receiving feedback email"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:233
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:248
 msgid "Additional submissions available."
 msgstr ""
 
 #. ($badLocAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1819
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1820
 msgid "Address(es) %1 already exist in the database.  THIS SHOULD NOT HAPPEN!  Please double check the integrity of the WeBWorK database before continuing."
 msgstr ""
 
 #. (join(', ', @noAdd)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2097
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2098
 msgid "Address(es) %1 in the add list is(are) already in the location %2, and so were skipped."
 msgstr ""
 
 #. (join(', ', @noDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2119
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2120
 msgid "Address(es) %1 in the delete list is(are) not in the location %2, and so were skipped."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1794
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1795
 msgid "Address(es) %1 is(are) not in a recognized form.  Please check your data entry and resubmit."
 msgstr ""
 
 #. ($badAddr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2109
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2110
 msgid "Address(es) %1 is(are) not in a recognized form.  Please check your data entry and try again."
 msgstr ""
 
@@ -988,7 +1024,7 @@ msgstr ""
 msgid "Adjusted Status Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:45
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:46
 msgid "Adobe PDF"
 msgstr ""
 
@@ -1000,27 +1036,31 @@ msgstr ""
 msgid "Advice on changing test dates"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:238
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:247
 msgid "After Answer Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:248
 msgid "After Test Version Answer Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:414
 msgid "After a test version either has no more allowed graded submissions or has its time limit expired, you may configure whether or not to allow students to see the questions and the responses they gave."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:387
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:398
 msgid "After a test version either has no more allowed graded submissions or has its time limit expired, you may configure whether or not to allow students to see their scores on that version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:999
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:512 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:525 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:539
+msgid "After number of attempts is"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1002
 msgid "After the answer date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:998
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1001
 msgid "After the close date"
 msgstr ""
 
@@ -1029,16 +1069,16 @@ msgstr ""
 msgid "After the due date this set enters a reduced scoring period until it closes on %1.  All work completed during the reduced scoring period counts for %2% of its value."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:996
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:999
 msgid "After the open date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:997
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1000
 msgid "After the reduced scoring date"
 msgstr ""
 
 #. ($c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:157
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:149
 msgid "Afterward reduced credit can be earned until %1."
 msgstr ""
 
@@ -1062,7 +1102,7 @@ msgstr ""
 msgid "All Textbooks"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:56
 msgid "All Users"
 msgstr ""
 
@@ -1086,11 +1126,11 @@ msgstr ""
 msgid "All problems will be rerandomized."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2257
 msgid "All selected courses are already hidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2325
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2326
 msgid "All selected courses are already unhidden."
 msgstr ""
 
@@ -1114,7 +1154,7 @@ msgstr ""
 msgid "All sets made visible for all students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:99 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:112
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:97 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:111
 msgid "All students"
 msgstr ""
 
@@ -1126,7 +1166,7 @@ msgstr ""
 msgid "Allow Unicode alternatives in student answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1060
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1063
 msgid "Allow the LMS to update user account data"
 msgstr ""
 
@@ -1190,12 +1230,12 @@ msgstr ""
 msgid "Allowed to view usernames on the achievements leaderboard"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:67
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:69
 msgid "Allows configuration of certain parameters, such as permission levels, default display mode for equations, and email feedback behavior, on a course by course basis."
 msgstr ""
 
 #. ($ce->{admin_course_id})
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:140
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:141
 msgid "Also add this user to the %1 course."
 msgstr ""
 
@@ -1204,12 +1244,12 @@ msgid "Amulet of Extension"
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2426
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2427
 msgid "An LMS context id is requested to be assigned to %1 which is set to use LTI 1.3, but that course is missing LTI 1.3 authentication parameters."
 msgstr ""
 
 #. ($courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2406
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2407
 msgid "An LMS context id is requested to be assigned to %1, but that course is not configured to use LTI."
 msgstr ""
 
@@ -1229,7 +1269,7 @@ msgstr ""
 msgid "An achievement evaluator is a perl script that is run after each problem is submitted which returns a truth value of 0 (didn't earn) or 1 (earn). The evaluator is given access to different variables which contain data about the problem and set that is used to determine if the achievement is earned or not."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:908
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:911
 msgid "An address that can be used to log in to the LMS. This is used in messages to users that direct them to go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
@@ -1238,7 +1278,7 @@ msgid "An array which lists the hash reference of all the problems in the curren
 msgstr ""
 
 #. ($_, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2490
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2491
 msgid "An error occurred deleting mapping for %1: %2"
 msgstr ""
 
@@ -1248,7 +1288,7 @@ msgid "An error occurred deletinglms_context_id: %1"
 msgstr ""
 
 #. ($_, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2487
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2488
 msgid "An error occurred saving mapping for %1: %2"
 msgstr ""
 
@@ -1258,7 +1298,7 @@ msgid "An error occurred saving the lms_context_id: %1"
 msgstr ""
 
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1039
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1040
 msgid "An error occurred while archiving the course %1:"
 msgstr ""
 
@@ -1269,12 +1309,12 @@ msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1071 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:854
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1072 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:855
 msgid "An error occurred while deleting the course %1:"
 msgstr ""
 
 #. ($rename_oldCourseID,						$rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:727
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:728
 msgid "An error occurred while renaming the course %1 to %2:"
 msgstr ""
 
@@ -1288,7 +1328,7 @@ msgid "An error occurred while trying to send email: %1"
 msgstr ""
 
 #. ($unarchive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1226
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1227
 msgid "An error occurred while unarchiving the course %1:"
 msgstr ""
 
@@ -1296,6 +1336,10 @@ msgstr ""
 msgid "An internal server error occured. Please contact the system administrator for assistance."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep:37
+msgid "Analyze code with PG Critic"
+msgstr ""
+
 #. ($part + 1)
 #: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:37
 msgid "Answer %1 Score (%):"
@@ -1305,7 +1349,7 @@ msgstr ""
 msgid "Answer Availability Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:345 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:51 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:77
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:345 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:24 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:51 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:77
 msgid "Answer Date"
 msgstr ""
 
@@ -1317,7 +1361,7 @@ msgstr ""
 msgid "Answer Hash Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:377
 msgid "Answer Log"
 msgstr ""
 
@@ -1333,11 +1377,19 @@ msgstr ""
 msgid "Answer availability for tests depends on multiple settings.  This only indicates the template answer date has passed.  See Set Detail page for actual availability."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:96
+msgid "Answer date"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:60
+msgid "Answer date:"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:810
 msgid "Answer feedback will be available in problems when returning to a previously worked problem and after answers are available. Students will not need to click \"Submit Answers\" to make this feedback appear. Furthermore, the $showPartialCorrectAnswers variable set in some problems that prevents showing which of the answers are correct is ignored after the answer date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1299
 msgid "Answer(s) submitted:"
 msgstr ""
 
@@ -1353,16 +1405,16 @@ msgstr ""
 msgid "Answers Available"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:137
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:146
 msgid "Answers Available Date"
 msgstr ""
 
 #. ($c->formatDateTime($set->answer_date, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:203
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
 msgid "Answers available for review on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:205
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:174
 msgid "Answers available for review."
 msgstr ""
 
@@ -1371,7 +1423,7 @@ msgstr ""
 msgid "Answers cannot be made available until on or after the close date for set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1400
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1383
 msgid "Answers cannot be made available until on or after the close date."
 msgstr ""
 
@@ -1379,15 +1431,15 @@ msgstr ""
 msgid "Any changes made below will be reflected in the achievement for ALL students."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:177 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:73
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:178 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:74
 msgid "Any changes made below will be reflected in the set for ALL students."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:175
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:176
 msgid "Any changes made below will be reflected in the set for ONLY the student(s) listed above."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:210
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:128 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:199
 msgid "Append"
 msgstr ""
 
@@ -1396,6 +1448,10 @@ msgstr ""
 msgid "Append to end of %1 set"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:46
+msgid "Apply to Selected Sets"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/HelpFiles/Levels.html.ep:36
 msgid "Applying definitions theoretically and proof writing"
 msgstr ""
@@ -1434,7 +1490,7 @@ msgstr ""
 msgid "Archive Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1110
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1111
 msgid "Archive next course"
 msgstr ""
 
@@ -1465,6 +1521,10 @@ msgstr ""
 msgid "Are you sure you want to delete the course %1? All course files and data will be destroyed. There is no undo available."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:731
+msgid "Are you sure you want to grade the test? Select \"No\" if you would like to return to the test to enter more answers."
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorScoring.html.ep:49
 msgid "As the checkbox says, this includes a percentage grade column for each set."
 msgstr ""
@@ -1477,7 +1537,7 @@ msgstr ""
 msgid "Assign"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:62
 msgid "Assign All Sets to Current User"
 msgstr ""
 
@@ -1485,7 +1545,7 @@ msgstr ""
 msgid "Assign achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:28
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:34
 msgid "Assign and unassign selected exercise sets to selected users."
 msgstr ""
 
@@ -1493,7 +1553,7 @@ msgstr ""
 msgid "Assign selected sets to selected users"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:151
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:161
 msgid "Assign sets to many students"
 msgstr ""
 
@@ -1505,7 +1565,7 @@ msgstr ""
 msgid "Assign this achievement to which users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:60
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:64
 msgid "Assign this set to which users?"
 msgstr ""
 
@@ -1517,7 +1577,7 @@ msgstr ""
 msgid "Assign which achievements?"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:91 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:35
 msgid "Assigned"
 msgstr ""
 
@@ -1534,11 +1594,11 @@ msgid "Assigned achievements to users."
 msgstr ""
 
 #. (link_to(						$c->setCountMessage($db->countUserSets($user->user_id)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:100
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:101
 msgid "Assigned to %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:433 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:27
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:440 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:33
 msgid "Assigner Tool"
 msgstr ""
 
@@ -1546,7 +1606,7 @@ msgstr ""
 msgid "Assigner Tool Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:89
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:90
 msgid "Assignment"
 msgstr ""
 
@@ -1558,11 +1618,23 @@ msgstr ""
 msgid "Assignment Default"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:250
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/set_list_row.html.ep:27
+msgid "Assignment Description"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:259
 msgid "Assignment Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:117 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:119 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:98
+msgid "Assignment type"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:62
+msgid "Assignment type:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:134 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:136 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:15
 msgid "Assignments"
 msgstr ""
 
@@ -1586,7 +1658,7 @@ msgstr ""
 msgid "Attachment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:608
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:583
 msgid "Attempt Threshold for Children"
 msgstr ""
 
@@ -1594,27 +1666,39 @@ msgstr ""
 msgid "Attempt to upgrade directories and links"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1022 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:565
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1025 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:46
 msgid "Attempted"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:36
+msgid "Attempted:"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep:2 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:133 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:73 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:13
 msgid "Attempts"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:102
+msgid "Attempts per version"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:64
+msgid "Attempts per version:"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Localize.pm:70
 msgid "Audit"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:303 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:309 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:247 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:253
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:302 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:308 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:248 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:254
 msgid "Authentication failed.  Please speak to your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:40 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:49 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:50
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/InstructorRPCHandler.pm:40 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:69 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/RenderViaRPC.pm:70
 msgid "Authentication failed. Log in again to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:133 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:130 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:40
 msgid "Author Info"
 msgstr ""
 
@@ -1630,7 +1714,7 @@ msgstr ""
 msgid "Automatically render all problems in the set on this page when \"Save Changes\" or \"Reset Form\" is clicked."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:683
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:684
 msgid "Automatically render problems on page load"
 msgstr ""
 
@@ -1693,7 +1777,7 @@ msgstr ""
 msgid "Binary"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:413
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:424
 msgid "Both Start and Grade"
 msgstr ""
 
@@ -1709,11 +1793,11 @@ msgstr ""
 msgid "Browse from:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:883
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:886
 msgid "By default, feedback is always sent to all users specified to receive feedback. This variable sets the system to only email feedback to users who have the same section as the user initiating the feedback. I.e., feedback will only be sent to section leaders."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:874
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:877
 msgid "By default, feedback is sent to all users above who have permission to receive feedback. Feedback is also sent to any addresses specified here. Separate email address entries with commas."
 msgstr ""
 
@@ -1729,7 +1813,7 @@ msgstr ""
 msgid "CLOSE TIME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1463 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:531
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1404 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:537
 msgid "CORRECT ANSWERS SHOWN ONLY -- ANSWERS NOT RECORDED"
 msgstr ""
 
@@ -1788,7 +1872,7 @@ msgid "Can't delete archive \"%1\": %2"
 msgstr ""
 
 #. ($setID, $TargetUser->user_id,)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:937
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:941
 msgid "Can't generate hardcopy for set \"%1\" for user \"%2\". The set is not visible to students."
 msgstr ""
 
@@ -1818,7 +1902,7 @@ msgstr ""
 
 #. ($fullPath)
 #. ($!)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:236 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1959
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm:236 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1940
 msgid "Can't write to file %1"
 msgstr ""
 
@@ -1867,11 +1951,11 @@ msgstr ""
 msgid "Cannot open %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:288
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:299
 msgid "Cap Test Time at Close Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/PODViewer.pm:47 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm:51
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/PODViewer.pm:47 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm:47
 msgid "Categories"
 msgstr ""
 
@@ -1916,7 +2000,7 @@ msgstr ""
 msgid "Change course institution from %1 to %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:157
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:167
 msgid "Change dates for a set for the whole class."
 msgstr ""
 
@@ -1932,11 +2016,11 @@ msgstr ""
 msgid "Change the grades on an assignment for one student."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:160
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:170
 msgid "Change the grading on a set for an entire class."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:167
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:177
 msgid "Change the number of atttempts allowed on a problem."
 msgstr ""
 
@@ -1946,11 +2030,11 @@ msgid "Change title from %1 to %2"
 msgstr ""
 
 #. ($fieldInfo{$key}[1],											$fieldInfo{$key}[2])
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2879
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2880
 msgid "Change type of field from %1 to %2 when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:558 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:613 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:502
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:558 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:613 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:525
 msgid "Changes abandoned."
 msgstr ""
 
@@ -1958,7 +2042,7 @@ msgstr ""
 msgid "Changes in this file have not yet been permanently saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:593 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:88 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:702 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:593 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Config.pm:88 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:691 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:594
 msgid "Changes saved."
 msgstr ""
 
@@ -1974,24 +2058,28 @@ msgstr ""
 msgid "Chapter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:25 /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:117 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:25 /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:34 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:121 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:37
 msgid "Check Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:677
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:693
 msgid "Check Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:946
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:949
 msgid "Check a score in the LMS actually needs updating before updating it"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:44
+#: /opt/webwork/webwork2/templates/layouts/system.html.ep:73 /opt/webwork/webwork2/templates/layouts/system.html.ep:78
+msgid "Choose Color Scheme"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:45
 msgid "Choose Sample Problem"
 msgstr ""
 
 #: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:216
-msgid "Choose a layout/styling theme for PDF hardcopy production from the Prooblem Editor."
+msgid "Choose a layout/styling theme for PDF hardcopy production from the Problem Editor."
 msgstr ""
 
 #: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:208
@@ -2030,6 +2118,10 @@ msgstr ""
 msgid "Choose problems from a library and add them to a set."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:18
+msgid "Choose set date type"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:14
 msgid "Choose visibility of the sets to be affected"
 msgstr ""
@@ -2054,7 +2146,7 @@ msgstr ""
 msgid "Clean course after unarchiving (remove student users, scoring files, log files, temporary edited files)"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:46
 msgid "Clear"
 msgstr ""
 
@@ -2062,15 +2154,15 @@ msgstr ""
 msgid "Clear Problem Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:123
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:124
 msgid "Click a student's name to see the student's homework set. Click a heading to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:115
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:116
 msgid "Click a student's name to see the student's test summary page. Click a test's version number to see the corresponding test version. Click a heading to sort the table."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:147
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:157
 msgid "Click first in the \"Assigned Sets\" column in the student's row. This will take you to a new page where you will click on the link to the assignment where the grade change is to be made."
 msgstr ""
 
@@ -2082,6 +2174,10 @@ msgstr ""
 msgid "Click on each of the tabs to view the configuration items. The question mark icon provides access to information about the behavior of the configuration settings."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:147
+msgid "Click on the \"Select\" checkbox next to the names of the students that additional time is to be assigned, click on the radio button for editing selected users, and then click the \"Edit\" button. Set the \"Accommodation Time Factor\" to the desired multiplier for each student selected (this must be a decimal number that is greater than or equal to 1). The time that a student will have to complete a timed test will be the product of the \"Test Time Limit\" for the test set in the \"Sets Manager\" and the \"Accommodation Time Factor\" set here."
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:122
 msgid "Click on the column \"Assigned Sets\" in the student's row. This will take you to a page where you can assign and unassign sets and change the due dates for homework on an individual basis."
 msgstr ""
@@ -2090,7 +2186,7 @@ msgstr ""
 msgid "Click on the homework set links to edit the grades for this individual student on the homework set. (The grade of each problem is called the \"status\".) You can also change the number of allowed attempts and further modify the individual student's homework set.) You will also be able to change a student's seed which determines the individual values used in the individual version of the student's problem and the weight (how much a problem counts toward the grade.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:94
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:99
 msgid "Click on the login name to edit individual problem set data, (e.g. due dates) for these students."
 msgstr ""
 
@@ -2108,7 +2204,7 @@ msgid "Click the \"Use score from last check\" button to set the problem score t
 msgstr ""
 
 #. ('')
-#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:5 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:73
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:5 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:75
 msgid "Click the %1 icon for page and item specific help."
 msgstr ""
 
@@ -2117,7 +2213,7 @@ msgstr ""
 msgid "Click the icon %1 for page and item specific help."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:192
 msgid "Clicking on any active link at the top of the column sorts the page by that column. You can do lexigraphic sorts: click on \"First name\" then \"Last name\" to sort by last name, sorting those with the same last name by their first name."
 msgstr ""
 
@@ -2125,7 +2221,7 @@ msgstr ""
 msgid "Clicking on the login name link in a student's row allows you to view the student's version of the homework (rather than your own) so that you can more easily answer student questions about homework problems. (A \"acting as xxx\" alert will appear in the upper right corner of each window while you are acting as a student.) You can submit the answers (which will NOT be recorded) to check that the computer is grading the problem correctly. You will also be able to view past answers submitted by the student for each problem. To stop acting in the student's role click the \"Stop acting\" link in the upper right corner of the window."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:196
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:206
 msgid "Clicking the email address link will bring up your standard email application so that you can send email to the student. This works even if the student has been dropped from the course. To send email to an entire class or to merge grades with the email message use the \"Email\" page link in the left margin."
 msgstr ""
 
@@ -2134,18 +2230,32 @@ msgid "Client ID"
 msgstr ""
 
 #. ($clientIP->ip()
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:565
+msgid "Client ip address %1 is in the list of addresses from which this assignment may not be worked."
+msgstr ""
+
+#. ($clientIP->ip()
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:536
 msgid "Client ip address %1 is not allowed to work this assignment, because the assignment has ip address restrictions and there are no allowed locations associated with the restriction.  Contact your professor to have this problem resolved."
 msgstr ""
 
+#. ($clientIP->ip()
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:561
+msgid "Client ip address %1 is not in the list of addresses from which this assignment may be worked."
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:40 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/JobManager.html.ep:202
 msgid "Close"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:124 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:344 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:50 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:73 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:133 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:344 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:23 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:50 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:73 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:39
 msgid "Close Date"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:95
+msgid "Close date"
+msgstr ""
+
 #. ($c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat})
 #. ($c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
 #: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendDueDate.pm:72 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:93
@@ -2170,12 +2280,12 @@ msgstr ""
 msgid "Closed"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:280
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:295
 msgid "Closed."
 msgstr ""
 
 #. ($c->formatDateTime($verSet->due_date, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:225
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:240
 msgid "Closes on %1"
 msgstr ""
 
@@ -2183,19 +2293,23 @@ msgstr ""
 msgid "Closes:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:371 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:54
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:150
+msgid "Code Maintenance"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:372 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:54
 msgid "Collapse All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:381 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:382 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:68
 msgid "Collapse All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:440
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:441
 msgid "Collapse Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:586 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:589
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:587 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:590
 msgid "Collapse Problem Details"
 msgstr ""
 
@@ -2207,11 +2321,11 @@ msgstr ""
 msgid "Comma separated list of set names that are excluded from all achievements. No achievement points and badges can be earned for submitting problems in these sets. Note that underscores (_) must be used for spaces in set names."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:202 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:111 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:91 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:65 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:71
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:202 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:134 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:170 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:91 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:126 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:68 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:72
 msgid "Comment"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25 /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:249
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:101 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:25 /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:249
 msgid "Comment:"
 msgstr ""
 
@@ -2228,15 +2342,15 @@ msgid "Complete Code"
 msgstr ""
 
 #. ($c->formatDateTime($c->{set}->answer_date, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:398
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:381
 msgid "Completed results for this assignment are not available until %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:401
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:384
 msgid "Completed results for this assignment are not available."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:262 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:278
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:277 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:293
 msgid "Completed."
 msgstr ""
 
@@ -2244,7 +2358,7 @@ msgstr ""
 msgid "Compose Email Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1006
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1009
 msgid "Condition under which scores will be sent early to an LMS"
 msgstr ""
 
@@ -2298,6 +2412,10 @@ msgstr ""
 msgid "Confirm which sets to export."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep:8
+msgid "Congratulations! No PG critic violations found."
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/AchievementEvaluator/cheevoMessage.html.ep:15
 msgid "Congratulations, you earned a new level!"
 msgstr ""
@@ -2310,15 +2428,15 @@ msgstr ""
 msgid "Contact the site administrator to ensure that the permissions are set so that the web server can write to this file."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:188 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:215
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:189 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:216
 msgid "Content Selection"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:60 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:160
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:60 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:162
 msgid "Context ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:59 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:59 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:158
 msgid "Context Title"
 msgstr ""
 
@@ -2326,11 +2444,11 @@ msgstr ""
 msgid "Contexts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2742 /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72 /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:91 /opt/webwork/webwork2/templates/ContentGenerator/TwoFactorAuthentication.html.ep:56
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2743 /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:72 /opt/webwork/webwork2/templates/ContentGenerator/LoginProctor.html.ep:91 /opt/webwork/webwork2/templates/ContentGenerator/TwoFactorAuthentication.html.ep:56
 msgid "Continue"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:86
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:83
 msgid "Continue Open Test"
 msgstr ""
 
@@ -2338,7 +2456,7 @@ msgstr ""
 msgid "Controls if an achievement is evaluated or not."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/format_code_form.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep:21
 msgid "Convert the code to PGML"
 msgstr ""
 
@@ -2351,7 +2469,7 @@ msgstr ""
 msgid "Copy"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:157
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:158
 msgid "Copy Components From:"
 msgstr ""
 
@@ -2371,7 +2489,7 @@ msgstr ""
 msgid "Copy Single Secret"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:169
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:170
 msgid "Copy These Components:"
 msgstr ""
 
@@ -2387,7 +2505,7 @@ msgstr ""
 msgid "Copy to (Course ID / User ID)"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:224
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:225
 msgid "Copying the course configuration file may copy configuration settings that are specific to the original course instructor. If this is a new course for a new instructor, use the fields above to add the new instructor and do not copy the course configuration file. Then if there is something in the course configuration file that should be carried into the new course, the administrator can copy that manually. Alternatively, do copy the course configuration file, but then the administrator should inspect the new course configuration file and make adjustments for the new instructor."
 msgstr ""
 
@@ -2395,19 +2513,19 @@ msgstr ""
 msgid "Core"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:581 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:320
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:301
 msgid "Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:647
 msgid "Correct Adjusted Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:247 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1339
+#: /opt/webwork/webwork2/lib/HardcopyRenderedProblem.pm:247 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1343
 msgid "Correct Answers:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:663
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:662
 msgid "Correct Status"
 msgstr ""
 
@@ -2415,13 +2533,17 @@ msgstr ""
 msgid "Correct answers"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:47
+msgid "Correct attempts"
+msgstr ""
+
 #. ($total_correct, $num_of_problems)
 #: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:17
 msgid "Correct: %1/%2"
 msgstr ""
 
 #. ($newBlankProblems, $MAX_NEW_PROBLEMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1983
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1964
 msgid "Could not add %1 problems to this set.  The number must be between 1 and %2"
 msgstr ""
 
@@ -2447,15 +2569,15 @@ msgstr ""
 msgid "Counter:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:624 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:598 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:36
 msgid "Counts for Parent"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:941
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:944
 msgid "Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:163 /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:10
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:164 /opt/webwork/webwork2/templates/ContentGenerator/Home.html.ep:10
 msgid "Course Administration"
 msgstr ""
 
@@ -2463,7 +2585,7 @@ msgstr ""
 msgid "Course Administration Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:448 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:65
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:455 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:67
 msgid "Course Configuration"
 msgstr ""
 
@@ -2471,7 +2593,7 @@ msgstr ""
 msgid "Course Configuration Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:502 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:517 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:534
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:512 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:525 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:539
 msgid "Course Default"
 msgstr ""
 
@@ -2484,7 +2606,7 @@ msgid "Course ID"
 msgstr ""
 
 #. ($ce->{maxCourseIdLength})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1175 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:264 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:570
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1176 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:264 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:570
 msgid "Course ID cannot exceed %1 characters."
 msgstr ""
 
@@ -2493,7 +2615,7 @@ msgstr ""
 msgid "Course ID may contain only letters, numbers, hyphens, and underscores, and may have at most %1 characters."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1179 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:258 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:573
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1180 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:258 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:573
 msgid "Course ID may only contain letters, numbers, hyphens, and underscores."
 msgstr ""
 
@@ -2558,7 +2680,7 @@ msgstr ""
 msgid "Create Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:657
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:659
 msgid "Create New Test Version"
 msgstr ""
 
@@ -2630,7 +2752,43 @@ msgstr ""
 msgid "Currently defined locations are listed below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2895
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:87
+msgid "Data about the assignment"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:53
+msgid "Data about the assignment:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:186 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:106
+msgid "Data about the environment"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:35
+msgid "Data about the problem"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:126
+msgid "Data about the problem processor"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:75
+msgid "Data about the problem processor:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:28
+msgid "Data about the problem:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:152
+msgid "Data about the user"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:85
+msgid "Data about the user:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2896
 msgid "Database tables are ok"
 msgstr ""
 
@@ -2642,19 +2800,19 @@ msgstr ""
 msgid "Database tables ok."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1555
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1371 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1556
 msgid "Database:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:182
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:183
 msgid "Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:980
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:983
 msgid "Date after which scores will be sent to the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:92
 msgid "Dates"
 msgstr ""
 
@@ -2662,7 +2820,7 @@ msgstr ""
 msgid "Dates for problem sets can be edited by clicking the pencil icon in the \"Set Name\" column next to the set name. To change dates for several sets at once, click the check box in the \"Select\" column and choose \"Edit selected\" from the tasks above."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:855
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:858
 msgid "Debug"
 msgstr ""
 
@@ -2735,11 +2893,11 @@ msgstr ""
 msgid "Delete course:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2850
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2851
 msgid "Delete field when upgrading"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:601
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:602
 msgid "Delete it?"
 msgstr ""
 
@@ -2767,7 +2925,7 @@ msgstr ""
 msgid "Delete selected users?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2815
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2816
 msgid "Delete table when upgrading"
 msgstr ""
 
@@ -2786,7 +2944,7 @@ msgid "Deleted %1 sets."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:357 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:381
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:380 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:404
 msgid "Deleted %1 users."
 msgstr ""
 
@@ -2802,12 +2960,12 @@ msgid "Deleted %quant(%1,job)."
 msgstr ""
 
 #. (join(', ', @delLocations)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1921
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1922
 msgid "Deleted Location(s): %1"
 msgstr ""
 
 #. (join(', ', @toDel)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2077
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2078
 msgid "Deleted addresses %1 from location."
 msgstr ""
 
@@ -2839,7 +2997,7 @@ msgstr ""
 msgid "Deletion destroys all achievement-related data and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:230
 msgid "Deny From"
 msgstr ""
 
@@ -2855,7 +3013,7 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:104 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:113 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:116 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:27
 msgid "Description"
 msgstr ""
 
@@ -2863,7 +3021,7 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:241
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:238
 msgid "Deselect All Test Versions"
 msgstr ""
 
@@ -2879,19 +3037,19 @@ msgstr ""
 msgid "Destination User ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2586
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2587
 msgid "Destination course ID missing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2605
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2606
 msgid "Destination course must be different than source course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2587 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2687
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2588 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2688
 msgid "Destination user ID missing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2601
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2602
 msgid "Destination user must be different than source user when copying from same course"
 msgstr ""
 
@@ -2921,11 +3079,11 @@ msgstr ""
 msgid "Directory permission errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1463 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1647 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:74 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1464 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1648 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:74 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:74
 msgid "Directory structure is missing directories or the webserver lacks sufficient privileges."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1458 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1642 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:71 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:71
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1459 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1643 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:71 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:71
 msgid "Directory structure is ok"
 msgstr ""
 
@@ -2933,7 +3091,7 @@ msgstr ""
 msgid "Directory structure or permissions need to be repaired."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1438 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1612
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1439 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1613
 msgid "Directory structure:"
 msgstr ""
 
@@ -2954,19 +3112,19 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:267 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:268 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:294
 msgid "Dismiss"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/layouts/system.html.ep:154
+#: /opt/webwork/webwork2/templates/layouts/system.html.ep:198
 msgid "Dismiss All Messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:132 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:75
 msgid "Display Mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:386 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:121
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:77 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:90 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:387 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:121
 msgid "Display Mode:"
 msgstr ""
 
@@ -2982,10 +3140,14 @@ msgstr ""
 msgid "Display all possible records"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:33
 msgid "Display choice"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:5
+msgid "Display full set or problem statistics.  The main page lists all sets to view. When viewing set statistics, the drop down menus can be used to show stats for individual sections, recitations, or problems.  The overall results include all students who are assigned to the set, while the individual problem results only include active (have attempted the problem) students."
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:37
 msgid "Display mode for equations"
 msgstr ""
@@ -2994,7 +3156,7 @@ msgstr ""
 msgid "Display of scores for this test is not allowed."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:42
 msgid "Display options: Show"
 msgstr ""
 
@@ -3015,7 +3177,7 @@ msgstr ""
 msgid "Do not unassign students unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:66
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
 msgid "Do not uncheck a set unless you know what you are doing."
 msgstr ""
 
@@ -3023,7 +3185,7 @@ msgstr ""
 msgid "Do not uncheck students, unless you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:689
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:705
 msgid "Do you want to grade this test?"
 msgstr ""
 
@@ -3031,7 +3193,7 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:118
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:117
 msgid "Documentation from source code for PG modules and macro files."
 msgstr ""
 
@@ -3068,7 +3230,7 @@ msgstr ""
 msgid "Don't use in an achievement"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1706 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:907 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:45 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:67
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1707 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:865 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:49 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:33 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:67
 msgid "Done"
 msgstr ""
 
@@ -3078,15 +3240,15 @@ msgstr ""
 
 #. (tag('span', dir => 'ltr', $display_name)
 #. ($ver->{id} =~ s/_/ /gr)
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:213 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:215 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/set_list_row.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:210 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:212 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/set_list_row.html.ep:47
 msgid "Download %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:74
+#: /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy.html.ep:23 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:98
 msgid "Download Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:245
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:242
 msgid "Download Hardcopy for Selected Tests"
 msgstr ""
 
@@ -3121,19 +3283,23 @@ msgid "Drop student from the course"
 msgstr ""
 
 #. ($beginReducedScoringPeriod)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:162
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:154
 msgid "Due date %1 has passed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:829
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:59
+msgid "Due date:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:830
 msgid "E-Mail"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:231
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:228
 msgid "E-mail Instructor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:845
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:848
 msgid "E-mail verbosity level"
 msgstr ""
 
@@ -3145,7 +3311,7 @@ msgstr ""
 msgid "Earned"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1200 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1217 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:48 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:85 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:63 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1060 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:53 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:117 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:126 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:136 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:206 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:240 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:260 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:501 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:225 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:41
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1204 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1221 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:48 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:85 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:63 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:989 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:53 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:30 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:46 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/view.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:117 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:126 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:136 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:206 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:240 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:261 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:502 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:225 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets/info.html.ep:6 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:41
 msgid "Edit"
 msgstr ""
 
@@ -3155,12 +3321,12 @@ msgid "Edit %1"
 msgstr ""
 
 #. ($link, $userName, $userID, scalar(keys %{ $c->{userSetRecords} })
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:54
 msgid "Edit %1 for %2 (%3) who has been assigned %4 sets."
 msgstr ""
 
 #. ($link, tag('span', dir => 'ltr', format_set_name_display($setID)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:167
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:168
 msgid "Edit %1 for set %2."
 msgstr ""
 
@@ -3176,7 +3342,7 @@ msgstr ""
 msgid "Edit Evaluator"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:255
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:256
 msgid "Edit Header"
 msgstr ""
 
@@ -3184,7 +3350,7 @@ msgstr ""
 msgid "Edit Location:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:497 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:128
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:498 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:128
 msgid "Edit Problem"
 msgstr ""
 
@@ -3192,11 +3358,11 @@ msgstr ""
 msgid "Edit Selected Theme"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep:47 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep:48 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep:52
 msgid "Edit Set Data"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1088 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1017 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:171
 msgid "Edit Tags"
 msgstr ""
 
@@ -3212,7 +3378,7 @@ msgstr ""
 msgid "Edit achievement information"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
 msgid "Edit achivements for the course. This link is only present if achievements are enabled for the course."
 msgstr ""
 
@@ -3234,16 +3400,16 @@ msgid "Edit it"
 msgstr ""
 
 #. (tag('strong', dir => 'ltr', format_set_name_display($setID)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:140
 msgid "Edit set %1 for ALL students assigned to this set."
 msgstr ""
 
 #. (link_to(						$setID => $c->systemLink(							$setDetailPage, params => { editForUser => $user->user_id })
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:110
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:111
 msgid "Edit set %1 for this user."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:31
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
 msgid "Edit sets for the entire class. Change set due dates, create new sets from a set definition file, create new sets, make sets visible/invisible, score assignments. Assign sets to the class."
 msgstr ""
 
@@ -3321,7 +3487,7 @@ msgstr ""
 msgid "Editing all sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:371
 msgid "Editing all users."
 msgstr ""
 
@@ -3339,7 +3505,7 @@ msgid "Editing location %1"
 msgstr ""
 
 #. (tag(						'strong',						dir => 'ltr',						format_set_name_display($setID . ($editingSetVersion ? ",v$editingSetVersion" : '')
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:127
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:128
 msgid "Editing problem set %1 for these students: %2"
 msgstr ""
 
@@ -3351,7 +3517,7 @@ msgstr ""
 msgid "Editing selected sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:348
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:371
 msgid "Editing selected users."
 msgstr ""
 
@@ -3359,11 +3525,11 @@ msgstr ""
 msgid "Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:480 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:154 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:172 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:13 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:53
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:487 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:158 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:154 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:173 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:14 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:44 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:58
 msgid "Email"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:106 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:133 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:86 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:96 /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:110 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:134 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:86 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:96 /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:25
 msgid "Email Address"
 msgstr ""
 
@@ -3375,7 +3541,7 @@ msgstr ""
 msgid "Email Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:440
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:451
 msgid "Email Instructor On Failed Attempt"
 msgstr ""
 
@@ -3404,7 +3570,7 @@ msgstr ""
 msgid "Email is being sent to %quant(%1,recipient). This job may take several minutes to complete if the class is large. Go to the \"Job Manager\" to see the status of this job."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:89 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:13
 msgid "Email:"
 msgstr ""
 
@@ -3444,11 +3610,11 @@ msgstr ""
 msgid "Enable Show Me Another button"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:122
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:108
 msgid "Enable Spell Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:77
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:63
 msgid "Enable or disable tab-focus mode. When tab-focus mode is off, pressing Tab inside the editor window indents the current line. When tab-focus mode is on Tab and Shift-Tab move focus out of the editor window."
 msgstr ""
 
@@ -3484,7 +3650,7 @@ msgstr ""
 msgid "Enables use of the Show Me Another button, which offers the student a newly-seeded version of the current problem, complete with solution (if it exists for that problem)."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:170
 msgid "End"
 msgstr ""
 
@@ -3496,7 +3662,7 @@ msgstr ""
 msgid "Enrolled, Drop, etc."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:108 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:112 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:88
 msgid "Enrollment Status"
 msgstr ""
 
@@ -3531,11 +3697,11 @@ msgid "Enter one of the allowed display mode types above. See 'display modes ent
 msgstr ""
 
 #. ($display_sort_method_name{$primary_sort_method})
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:140
 msgid "Entries are sorted by %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:325
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:332
 msgid "Equation Display"
 msgstr ""
 
@@ -3548,7 +3714,7 @@ msgid "Error adding IP restriction location \"%1\" for set %2: %3"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1604
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1585
 msgid "Error adding set-level proctor: %1"
 msgstr ""
 
@@ -3561,12 +3727,12 @@ msgstr ""
 msgid "Error creating set %1: %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:16
 msgid "Error details"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:281
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:287
 msgid "Error encoding JWT: %1"
 msgstr ""
 
@@ -3576,12 +3742,12 @@ msgid "Error generating POD for file %1: %2"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1580
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1561
 msgid "Error getting old set-proctor password from the database: %1.  No update to the password was done."
 msgstr ""
 
 #. ($err)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:221
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:227
 msgid "Error loading or generating site keys: %1"
 msgstr ""
 
@@ -3589,7 +3755,7 @@ msgstr ""
 msgid "Error message:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:12
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:14
 msgid "Error messages"
 msgstr ""
 
@@ -3598,33 +3764,18 @@ msgstr ""
 msgid "Error sending email to %1: %2"
 msgstr ""
 
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:654
-msgid "Error: Answer date cannot be more than 10 years from now in set %1."
-msgstr ""
-
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:663
-msgid "Error: Answer date must come after close date in set %1."
-msgstr ""
-
 #. ($setID)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:652
-msgid "Error: Close date cannot be more than 10 years from now in set %1."
+msgid "Error: Answer date must come after close date in set %1."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:660
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:649
 msgid "Error: Close date must come after open date in set %1."
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:650
-msgid "Error: Open date cannot be more than 10 years from now in set %1."
-msgstr ""
-
-#. ($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:674
 msgid "Error: Reduced scoring date must come between the open date and close date in set %1."
 msgstr ""
 
@@ -3638,7 +3789,7 @@ msgid "Error: no file data was submitted!"
 msgstr ""
 
 #. ($problem_desc, $problem_name, $c->tag('br')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1224
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1228
 msgid "Errors encountered while processing %1. This %2 has been omitted from the hardcopy. Error text: %3"
 msgstr ""
 
@@ -3647,12 +3798,12 @@ msgid "Errors occurred while generating hardcopy:"
 msgstr ""
 
 #. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2239
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2240
 msgid "Errors occurred while hiding the courses listed below when attempting to create the file hide_directory in the course's directory. Check the ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
 #. ("$ce->{webworkDirs}{courses}/$failed_courses[0]/")
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2308
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2309
 msgid "Errors occurred while unhiding the courses listed below when attempting delete the file hide_directory in the course's directory. Check the ownership and permissions of the course's directory, e.g \"%1\"."
 msgstr ""
 
@@ -3672,11 +3823,11 @@ msgstr ""
 msgid "Evaluator Variables"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2254
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2255
 msgid "Except for the errors listed above, all selected courses are already hidden."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2323
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2324
 msgid "Except for the errors listed above, all selected courses are already unhidden."
 msgstr ""
 
@@ -3688,19 +3839,19 @@ msgstr ""
 msgid "Existing file %1 could not be backed up."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:368 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:369 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:48
 msgid "Expand All Details"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:378 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:61
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:379 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:61
 msgid "Expand All Nesting"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:439
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:440
 msgid "Expand Nested Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:588
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:589
 msgid "Expand Problem Details"
 msgstr ""
 
@@ -3773,7 +3924,7 @@ msgstr ""
 msgid "Extend the close date of this test to %1 (an additional 24 hours)."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:145
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:155
 msgid "Extend the number of attempts allowed a student on a given problem."
 msgstr ""
 
@@ -3855,17 +4006,17 @@ msgid "Failed to open %1."
 msgstr ""
 
 #. ($file, $@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1244
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1245
 msgid "Failed to remove file %1: %2"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1249
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1250
 msgid "Failed to remove scoring files: %1"
 msgstr ""
 
 #. ($@)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1254
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1255
 msgid "Failed to remove temporary edited files: %1"
 msgstr ""
 
@@ -3875,7 +4026,7 @@ msgid "Failed to save: %1"
 msgstr ""
 
 #. (ref($_)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:223
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:220
 msgid "Failed to send message: %1"
 msgstr ""
 
@@ -3891,23 +4042,32 @@ msgstr ""
 msgid "Features:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:337
 msgid "Feedback"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:881
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:884
 msgid "Feedback by Section."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2776
+#. (format_set_name_display($set->set_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:8
+msgid "Feedback sent from %1:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:12
+msgid "Feedback sent from:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2777
 msgid "Field is ok"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2778
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2779
 msgid "Field missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2780
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2781
 msgid "Field missing in schema"
 msgstr ""
 
@@ -3937,7 +4097,7 @@ msgid "File \"%1\" uploaded successfully"
 msgstr ""
 
 #. ($ce->{courseDirs}{templates}, $fileName)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:619
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:649
 msgid "File %1/%2 either does not exist or is not readable."
 msgstr ""
 
@@ -3951,7 +4111,7 @@ msgstr ""
 msgid "File %1 is protected and cannot be overwritten. Rename it as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:443 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:55
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:450 /opt/webwork/webwork2/templates/HelpFiles/admin_links.html.ep:46 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:62
 msgid "File Manager"
 msgstr ""
 
@@ -3959,7 +4119,7 @@ msgstr ""
 msgid "File Manager Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm:39
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm:35
 msgid "File not found."
 msgstr ""
 
@@ -3989,7 +4149,7 @@ msgstr ""
 msgid "File successfully renamed"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:20
 msgid "File:"
 msgstr ""
 
@@ -4019,12 +4179,12 @@ msgid "Filter achievements"
 msgstr ""
 
 #. ($recitation)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1391 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:872
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1389 /opt/webwork/webwork2/lib/WeBWorK/HTML/StudentNav.pm:44
 msgid "Filter by recitation %1"
 msgstr ""
 
 #. ($section)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1387 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:869
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1385 /opt/webwork/webwork2/lib/WeBWorK/HTML/StudentNav.pm:41
 msgid "Filter by section %1"
 msgstr ""
 
@@ -4044,11 +4204,11 @@ msgstr ""
 msgid "Finished"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:167
 msgid "First"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:104 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:119 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:65 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:84 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:108 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:120 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:65 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:84 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:28
 msgid "First Name"
 msgstr ""
 
@@ -4056,31 +4216,31 @@ msgstr ""
 msgid "First name"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:94
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:80
 msgid "Fold all regions."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:85
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:71
 msgid "Fold the region that begins on the current line. Triangles in the gutter next to line numbers indicate which regions can be folded."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:86
-msgid "For many macros, this lists all sample problems used by the macro."
+#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:94
+msgid "For many macros, this lists all sample problems that use the macro."
 msgstr ""
 
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:160
 msgid "For security reasons, you cannot specify a message file from a directory higher than the email directory (you can't use ../blah/blah for example). Please specify a different file or move the needed file to the email directory."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:127
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
 msgid "Force RTL"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:690 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:84
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:691 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:84
 msgid "Force problems to be numbered consecutively from one"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:129
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
 msgid "Force the editor to display text from right-to-left. (Note that this does not persist when reloading the page.)"
 msgstr ""
 
@@ -4092,12 +4252,8 @@ msgstr ""
 msgid "Format"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:125 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:164
-msgid "Format Code"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:832
-msgid "Format for the subject line in feedback emails"
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:833
+msgid "Format for the subject of feedback emails"
 msgstr ""
 
 #: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:110
@@ -4117,14 +4273,14 @@ msgid "From field must contain a single valid email address."
 msgstr ""
 
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:5
-msgid "From this page you can add new students, edit user data (name, email address, recitation, section, permission level, enrollment status, and password), and export (save) class lists for back-up or use in another course. You can also delete students from the class roster, but this cannot be undone."
+msgid "From this page you can add new students, edit user data (name, email address, student ID, enrollment status, accommodation time factor, section, recitation, comment, permission level, and password), and export (save) class lists for back-up or use in another course. You can also delete students from the class roster, but this cannot be undone."
 msgstr ""
 
 #: /opt/webwork/webwork2/templates/ContentGenerator/Feedback.html.ep:39 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:34
 msgid "From:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:37
 msgid "Future Assignments"
 msgstr ""
 
@@ -4144,7 +4300,7 @@ msgstr ""
 msgid "General Page Information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:702 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:720
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:669 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:687
 msgid "General Parameters"
 msgstr ""
 
@@ -4152,11 +4308,11 @@ msgstr ""
 msgid "Generate"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124 /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:183 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:176 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:177 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:124 /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:183 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:173 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:174 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:134
 msgid "Generate Hardcopy"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:151
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:137
 msgid "Generate a hardcopy of the problem being edited. This does not change the permanent file on the disk. You can generate a hardcopy for different versions of the same problem by changing the seed. You can also change the format to \"PDF\" or \"TeX Source\". If \"PDF\" is selected, then a PDF file will be generated for download, unless there are errors. If errors occur or \"TeX Source\" is selected, then a zip file will be generated for download that contains the TeX source file and resources needed for generating the PDF file using LaTeX."
 msgstr ""
 
@@ -4168,6 +4324,10 @@ msgstr ""
 msgid "Generate hardcopy for selected sets and selected users"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:145
+msgid "Give one student or several students additional time for all timed tests."
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/FullCreditProb.pm:13
 msgid "Gives full credit on a single homework problem."
 msgstr ""
@@ -4193,21 +4353,21 @@ msgid "Global data on problem usage is contributed by many institutions using We
 msgstr ""
 
 #. ($problemID, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1633
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1614
 msgid "Global problem %1 for set %2 not found."
 msgstr ""
 
 #. ($c->{prettyID}, $c->stash('setID')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:344
 msgid "Global problem %1 not found for set %2."
 msgstr ""
 
 #. ($c->stash('setID')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:110 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:340
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:108 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:338
 msgid "Global set %1 not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:82
 msgid "Global set data will be shown instead of user specific data"
 msgstr ""
 
@@ -4215,20 +4375,20 @@ msgstr ""
 msgid "Go"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:568
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:569
 msgid "Grade"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:564 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:80
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:565 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:80
 msgid "Grade Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:684
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:700
 msgid "Grade Test"
 msgstr ""
 
 #. ($effectiveUserID)
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:684
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:700
 msgid "Grade Test for %1"
 msgstr ""
 
@@ -4236,11 +4396,11 @@ msgstr ""
 msgid "Grade of Active Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:926
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:929
 msgid "Grade passback mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:302
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:313
 msgid "Graded Submissions per Version"
 msgstr ""
 
@@ -4248,7 +4408,7 @@ msgstr ""
 msgid "Grader"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:307
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:314
 msgid "Grades"
 msgstr ""
 
@@ -4256,7 +4416,7 @@ msgstr ""
 msgid "Grades Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:98
 msgid "Grades have been saved for all current users."
 msgstr ""
 
@@ -4292,7 +4452,7 @@ msgstr ""
 msgid "Guest:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:36
 msgid "HTTP Headers"
 msgstr ""
 
@@ -4308,11 +4468,11 @@ msgstr ""
 msgid "Hardcopy Format:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:357 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:363
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:364 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:370
 msgid "Hardcopy Generator"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:96
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:105
 msgid "Hardcopy Header"
 msgstr ""
 
@@ -4337,11 +4497,19 @@ msgstr ""
 msgid "Hardcopy Theme:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:231 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:16
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:93
+msgid "Hardcopy header file"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:57
+msgid "Hardcopy header file:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:232 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:16
 msgid "Headers"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:54 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:372 /opt/webwork/webwork2/templates/layouts/help_macro.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:54 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:348 /opt/webwork/webwork2/templates/layouts/help_macro.html.ep:6
 msgid "Help"
 msgstr ""
 
@@ -4349,7 +4517,7 @@ msgstr ""
 msgid "Here is a list of the variables the evaluator has access to. Unless indicated, changes to the variables will not be saved.  Evaluators are run in the same order they are listed on the achievement editor page and are only run if the achievement has not been earned. Keep this in mind when using persistent global data."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:421
 msgid "Here is a new version of your problem."
 msgstr ""
 
@@ -4357,7 +4525,7 @@ msgstr ""
 msgid "Hidden"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:350 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:45
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:351 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:45
 msgid "Hide All"
 msgstr ""
 
@@ -4369,18 +4537,10 @@ msgstr ""
 msgid "Hide Courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:593
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:568
 msgid "Hide Hints from Students"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/instructor_buttons.html.ep:10
-msgid "Hide Problem Grader"
-msgstr ""
-
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:726
-msgid "Hide Problem Graders"
-msgstr ""
-
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:46
 msgid "Hide all rendered problems on the page."
 msgstr ""
@@ -4408,7 +4568,7 @@ msgstr ""
 msgid "Histogram showing the percent grade of active students for problem %1 and the adjusted percent grade with review. The number of students in each percent range is: %2. The number of students in each percent range after review is: %3."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:941 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:255
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:944 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:264
 msgid "Homework"
 msgstr ""
 
@@ -4424,6 +4584,14 @@ msgstr ""
 msgid "I couldn't find the file [ACHIEVEMENT_DIR]/surprise_message.txt!"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:171
+msgid "IP Address"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:102
+msgid "IP Address:"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/File/SetDef.pm:163
 msgid "IP restriction location \"%1\" for set %2 already exists."
 msgstr ""
@@ -4484,7 +4652,7 @@ msgstr ""
 msgid "If selected, this adds spaces between the fields to align the commas, which makes the columns easy to read when in text form but it can confuse some spreadsheet applications since the extra spaces violate the csv standard (although Excel handles them with no problem). This will give a visual form of the CSV file that is easy to read on the page. If you want a reliable .csv file for use in any spreadsheet application unclick the \"Pad Fields\" option. You can download the .csv file immediately by clicking on the link with the filename chosen above, or you can download it using the \"File Manager\" from the scoring directory."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:199
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:188
 msgid "If the original problem cannot be edited than the path name must be changed in order to be allowed to save the problem. Adding \"local/\" to the beginning of the original path is the default solution. All locally created and edited files will then appear in a subdirectory named \"local\"."
 msgstr ""
 
@@ -4492,15 +4660,15 @@ msgstr ""
 msgid "If the test was timed, granting the user an additional version may be preferred to changing its dates."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:634
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:608
 msgid "If this flag is set then this problem will count toward the grade of its parent problem.  In general the adjusted status on a problem is the larger of the problem's status and the weighted average of the status of its child problems which have this flag enabled."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:450
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:461
 msgid "If this is enabled then instructors with the ability to receive feedback emails will be notified whenever a student runs out of attempts on a problem and its children without receiving an adjusted status of 100%."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:435
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:446
 msgid "If this is enabled then students will be unable to attempt a problem until they have completed all of the previous problems and their child problems if necessary."
 msgstr ""
 
@@ -4509,18 +4677,18 @@ msgid "If this is selected, a success index is listed in each csv file. The succ
 msgstr ""
 
 #: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:793
-msgid "If this is set to \"preview\", hitting the enter key on a homework problem page activates the \"Preview My Answers\" button. If this is set to \"submit\", then the enter key activates the \"Submit Answers\" button instead. Or if that button is not present, it will activate the \"Check Answers\" button. Or if that button is also not present, it will activate the \"Preview My Answers\" button. A third option is \"conservative\". In this case, the enter key behaves like \"preview\" when the \"Submit\" button is available and there are only finitely many attempts allowed. Otherise the enter key behaves like \"submit\". Note that this is only affects homework problem pages, not test/quiz pages, and not instructor pages like the PG Editor and the Library Browser."
+msgid "If this is set to \"preview\", hitting the enter key on a homework problem page activates the \"Preview My Answers\" button. If this is set to \"submit\", then the enter key activates the \"Submit Answers\" button instead. Or if that button is not present, it will activate the \"Check Answers\" button. Or if that button is also not present, it will activate the \"Preview My Answers\" button. A third option is \"conservative\". In this case, the enter key behaves like \"preview\" when the \"Submit\" button is available and there are only finitely many attempts allowed. Otherwise the enter key behaves like \"submit\". Note that this is only affects homework problem pages, not test/quiz pages, and not instructor pages like the PG Editor and the Library Browser."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:970
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:973
 msgid "If this is set to true, then  each time a user submits an answer or grades a test, that will trigger WeBWorK possibly reporting a score to the LMS. However, several other configuration settings might still prevent WeBWorK from actually submitting a score to the LMS. If this is set to false, then grades will only be sent to the LMS with mass updates (either triggered by the instructor using the LTI Grade Update tool, or at mass update intervals)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1062
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1065
 msgid "If this is set to true, then when a user enters WeBWorK using LTI from an LMS, their user account data in WeBWorK will be updated to match the data from the LMS.  This applies to first name, last name, section, recitation, and email address.  If a user's information changes in the LMS then it will change in WeBWorK the next time the user enters WeBWorK from the LMS.  Any changes to the user data that are made in WeBWorK will be overwritten.  So if this is set to true, you may want to review the settings in the Permissions tab for who is allowed to change their own name and email address."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:918
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:921
 msgid "If this is set, all users (including the instructor) must enter the WeBWorK course through the LMS. If a user reaches the regular WeBWorK login screen, they receive a message directing them back to the LMS."
 msgstr ""
 
@@ -4546,7 +4714,7 @@ msgstr ""
 msgid "If you upload your file on the web with the name: %1 and also create an email message with the name %2 with the approriate %3 variables then not only can you email the message with the embedded grades to the students, but files with those exact names are automatically appended to the \"Grades\" page seen by the students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:617
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:647
 msgid "Illegal '/' character in input."
 msgstr ""
 
@@ -4575,7 +4743,7 @@ msgstr ""
 msgid "Import how many sets?"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:33
 msgid "Import sets with names"
 msgstr ""
 
@@ -4637,10 +4805,14 @@ msgstr ""
 msgid "Include success index columns"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:587 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:321
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:302
 msgid "Incorrect"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:48
+msgid "Incorrect attempts"
+msgstr ""
+
 #. ($total_incorrect, $num_of_problems)
 #: /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:42
 msgid "Incorrect: %1/%2"
@@ -4680,11 +4852,11 @@ msgstr ""
 msgid "Institution"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:578
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:584
 msgid "Instructor Comment:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1328
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1332
 msgid "Instructor Feedback:"
 msgstr ""
 
@@ -4692,7 +4864,7 @@ msgstr ""
 msgid "Instructor Links Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:376 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:14
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:383 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:14
 msgid "Instructor Tools"
 msgstr ""
 
@@ -4714,7 +4886,7 @@ msgid "Invalid %1 in file: %2"
 msgstr ""
 
 #. ($action)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2579
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2580
 msgid "Invalid action %1."
 msgstr ""
 
@@ -4729,7 +4901,7 @@ msgid "Invalid file name \"%1\". All email file names must end with the \".msg\"
 msgstr ""
 
 #. ($headerType)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2091
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2070
 msgid "Invalid headerType %1"
 msgstr ""
 
@@ -4737,7 +4909,7 @@ msgstr ""
 msgid "Invalid line in file \"%1\": ||%2||"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:505
 msgid "Invalid security code."
 msgstr ""
 
@@ -4757,7 +4929,7 @@ msgstr ""
 msgid "JITAR Set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:550
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:552 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
 msgid "Job Manager"
 msgstr ""
 
@@ -4774,23 +4946,23 @@ msgstr ""
 msgid "Jobs sorted by %1 in %plural(%2,ascending,descending) order, then by %3 in %plural(%4,ascending,descending) order,and then by %5 in %plural(%6,ascending,descending) order."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:483 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:494
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:470 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:499
 msgid "Jump to Problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:258
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:267
 msgid "Just in Time Assessment and Review"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1105
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1095
 msgid "Just-In-Time Parameters"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:67
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:53
 msgid "Key Binding"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:115
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:101
 msgid "Key Map"
 msgstr ""
 
@@ -4802,67 +4974,67 @@ msgstr ""
 msgid "LAST NAME"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1143 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep:12
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1146 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep:12
 msgid "LMS Context ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1119
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1122
 msgid "LMS access token AUD for LTI 1.3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1120
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1123
 msgid "LMS access token AUD used to validate logins from an LMS using LTI 1.3."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1112
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1115
 msgid "LMS access token URL for LTI 1.3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1113
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1116
 msgid "LMS access token URL used to validate logins from an LMS using LTI 1.3."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1126
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1129
 msgid "LMS authorization request URL for LTI 1.3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1127
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1130
 msgid "LMS authorization request URL used to validate logins from an LMS using LTI 1.3."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1091
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1094
 msgid "LMS client ID for LTI 1.3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1092
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1095
 msgid "LMS client ID used to validate logins from an LMS using LTI 1.3."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1098
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1101
 msgid "LMS deployment ID for LTI 1.3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1099
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1102
 msgid "LMS deployment ID used to validate logins from an LMS using LTI 1.3."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1084
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1087
 msgid "LMS platform ID for LTI 1.3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1085
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1088
 msgid "LMS platform ID used to validate logins from an LMS using LTI 1.3."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1105
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1108
 msgid "LMS public keyset URL for LTI 1.3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1106
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1109
 msgid "LMS public keyset URL used to validate logins from an LMS using LTI 1.3."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1074
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1077
 msgid "LMS shared secret for LTI 1.1 authentication"
 msgstr ""
 
@@ -4870,10 +5042,14 @@ msgstr ""
 msgid "LOCAL Usage"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1231
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1236
 msgid "LTI"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:222
+msgid "LTI 1.3 Registration"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep:36
 msgid "LTI Configuration"
 msgstr ""
@@ -4891,7 +5067,7 @@ msgstr ""
 msgid "LTI Grade Mode"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:545 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:60
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:547 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:48
 msgid "LTI Grade Update"
 msgstr ""
 
@@ -4903,7 +5079,7 @@ msgstr ""
 msgid "LTI Mass Update"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:58 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:154 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep:13
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:58 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:156 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep:13
 msgid "LTI Version"
 msgstr ""
 
@@ -4943,19 +5119,15 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:169
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:170
 msgid "Last"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:576
-msgid "Last Answer"
-msgstr ""
-
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:32
 msgid "Last Full Update"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:105 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:126 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:66 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:85 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:109 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:127 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:66 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:85 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:35
 msgid "Last Name"
 msgstr ""
 
@@ -4967,7 +5139,11 @@ msgstr ""
 msgid "Last name"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:59 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:41 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:48
+msgid "Last submission:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:118 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:241
 msgid "Latest Answers"
 msgstr ""
 
@@ -5007,19 +5183,23 @@ msgstr ""
 msgid "Library Broswer Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:438 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:445 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:37
 msgid "Library Browser"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1490 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:93 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:499
+msgid "Limit to"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1491 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:93 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:93
 msgid "Link structure is missing links, or links point to the wrong place."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1685
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1686
 msgid "Link structure is missing links, or the webserver lacks sufficient privileges, or links point to the wrong place."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1487 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1681 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:90 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:90
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1488 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1682 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep:90 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep:90
 msgid "Link structure is ok"
 msgstr ""
 
@@ -5027,7 +5207,7 @@ msgstr ""
 msgid "Link structure needs to be repaired."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1468 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1469 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1653
 msgid "Link structure:"
 msgstr ""
 
@@ -5055,7 +5235,7 @@ msgstr ""
 msgid "Live equation rendering"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:173
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:170
 msgid "Loading..."
 msgstr ""
 
@@ -5084,16 +5264,16 @@ msgid "Location"
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1965 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2001
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1966 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2002
 msgid "Location %1 does not exist in the WeBWorK database.  Please check your input (perhaps you need to reload the location management page?)."
 msgstr ""
 
 #. ($locationID, join(', ', @addresses)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1853
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1854
 msgid "Location %1 has been created, with addresses %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1909
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1910
 msgid "Location deletion requires confirmation."
 msgstr ""
 
@@ -5121,27 +5301,27 @@ msgstr ""
 msgid "Log In Again"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:11
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:12
 msgid "Log Out"
 msgstr ""
 
 #. ($add_courseID)
 #. ($rename_oldCourseID)
 #. ($rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:680 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:756
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:448 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:680 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:757
 msgid "Log into %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1284
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1285
 msgid "Log into Course"
 msgstr ""
 
 #. ($userName)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:10
 msgid "Logged in as %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:197 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:203 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:223 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:198 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:204 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:230 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:108
 msgid "Login"
 msgstr ""
 
@@ -5149,7 +5329,7 @@ msgstr ""
 msgid "Login Info"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:103 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:30 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:64 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:83 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:218 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:107 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:30 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:64 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:83 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:219 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:36
 msgid "Login Name"
 msgstr ""
 
@@ -5161,11 +5341,11 @@ msgstr ""
 msgid "Login:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:296
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:303
 msgid "Logout"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:68
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:54
 msgid "Mac alternate"
 msgstr ""
 
@@ -5203,7 +5383,7 @@ msgstr ""
 msgid "Makes a new copy of the file you are editing at the location relative to the course's achievement notifications ([ACHEVNOTIFYDIR]) directory, and sets the new file to be the email notification template for this achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:188
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:177
 msgid "Makes a new copy of the file you are editing at the location relative to the course's templates ([TMPL]) directory. You may choose to replace the current problem in the current set, append to the end to then end of the current set as a new problem, or create a problem that is not attached to a problem set."
 msgstr ""
 
@@ -5239,7 +5419,7 @@ msgstr ""
 msgid "Manage users. Note, only admin users have access to the course administration tools."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:423 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:213
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:430 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:213
 msgid "Manual Grader"
 msgstr ""
 
@@ -5248,15 +5428,15 @@ msgid "Manual Grader Help"
 msgstr ""
 
 #. ($c->tag('span', dir => 'ltr', format_set_name_display($c->stash->{set}->set_id)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:186
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm:205
 msgid "Manual Grader for %1: Problem %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:62
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:50
 msgid "Manually initiate an LTI grade passback for selected sets or users. This link is only visible if LTI grade passback is enabled for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:172
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:182
 msgid "Many of these editing activities can also be done more quickly from the \"Instructor Tools\" page where students and sets can be selected simultaneously. The \"Instructor Tools\" page is useful for quick editing of one or two students. The initial setup of the class can be done best from this page. Importing and exporting class lists can only be done from this page. Deleting students can only be done from this page."
 msgstr ""
 
@@ -5264,7 +5444,7 @@ msgstr ""
 msgid "Mark Correct"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:611
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:612
 msgid "Mark Correct?"
 msgstr ""
 
@@ -5280,14 +5460,18 @@ msgstr ""
 msgid "Math"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:110 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:109 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:20
 msgid "Math Objects"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:493
 msgid "Max Attempts"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:42 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:33
+msgid "Max attempts"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:23
 msgid "Max. Shown:"
 msgstr ""
@@ -5304,10 +5488,24 @@ msgstr ""
 msgid "Merge file:"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:18 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:17
+msgid "Message delivered to multiple recipients. Consider using reply-all."
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:13
 msgid "Message file:"
 msgstr ""
 
+#. ($user->full_name, $user->user_id, $ce->{institutionName},				$problem ? link_to(format_set_name_display($set->set_id)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:12
+msgid "Message from %1 (%2) via WeBWorK at %3 (sent from %4)."
+msgstr ""
+
+#. ($user->full_name, $user->user_id, $ce->{institutionName})
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:5
+msgid "Message from %1 (%2) via WeBWorK at %3."
+msgstr ""
+
 #. ("$emailDirectory/$output_file")
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SendMail.pm:274
 msgid "Message saved to file %1."
@@ -5327,7 +5525,7 @@ msgstr ""
 msgid "Messages can be saved to a message file (which must end in the \".msg\" extension).  Use the \"Message file\" drop down menu to select which message file to load, or \"None\" to use a blank message. To save a new message, use the \"Save as\" button after entering in a valid filename.  The \"Save as\" button will not overwrite currently saved messages.  To edit a currently saved message first select it using the drop down menu, then click the \"Save\" button to save any changes.  Use the \"File Manager\" to delete messages, located in the \"[TMPL]/email\" directory."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:25 /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:28 /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:22
 msgid "Method"
 msgstr ""
 
@@ -5339,7 +5537,7 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1779
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1780
 msgid "Missing required input data. Please check that you have filled in all of the create location fields and resubmit."
 msgstr ""
 
@@ -5347,15 +5545,15 @@ msgstr ""
 msgid "Mode in which the LANG and DIR settings for a single problem are determined."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:465
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:466
 msgid "Move"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:479
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:466
 msgid "Move to Page:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:474
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:461
 msgid "Move to Problem:"
 msgstr ""
 
@@ -5384,7 +5582,7 @@ msgstr ""
 msgid "NO OF FIELDS"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/AchievementsLeaderboard.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:25 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:231 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:164 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:22 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12 /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/AchievementsLeaderboard.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:157 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:25 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:113 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:235 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:165 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:22 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:12 /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:10
 msgid "Name"
 msgstr ""
 
@@ -5404,7 +5602,7 @@ msgstr ""
 msgid "Name the new set"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:88 /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:30
 msgid "Name:"
 msgstr ""
 
@@ -5412,7 +5610,7 @@ msgstr ""
 msgid "Necromancers Charm"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1000 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:237 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:501 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:518 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:535 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:36
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1003 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:246 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:512 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:525 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:539 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:36
 msgid "Never"
 msgstr ""
 
@@ -5448,7 +5646,7 @@ msgstr ""
 msgid "New folder name:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:10
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:11
 msgid "New problem template"
 msgstr ""
 
@@ -5456,7 +5654,11 @@ msgstr ""
 msgid "New set name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:965 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:967 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:969
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:484
+msgid "Next Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:895 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:897 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:899 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:484
 msgid "Next Problem"
 msgstr ""
 
@@ -5469,27 +5671,31 @@ msgid "Next page"
 msgstr ""
 
 #. (% $c->formatDateTime($nextTime, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:152
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:149
 msgid "Next test will be available by %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:155 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:167 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:219 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:293 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:345 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:380 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:398 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:432 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:447 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:571 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:599 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:631 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:78 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:691 /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:141 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:57 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/reset_2fa_form.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:154 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:176 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:198 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:73
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:164 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:176 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:228 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:304 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:356 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:391 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:409 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:443 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:458 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:574 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:605 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:73 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:707 /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:141 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:57 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/reset_2fa_form.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:154 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:176 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:198 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:73
 msgid "No"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:589
+msgid "No Attempts Remaining"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:162
 msgid "No Course"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:218
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:219
 msgid "No Description"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2554
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2555
 msgid "No OTP secrets copied."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2529
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2530
 msgid "No OTP secrets reset."
 msgstr ""
 
@@ -5501,7 +5707,7 @@ msgstr ""
 msgid "No Target Set Selected"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:54 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:168
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:54 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:172
 msgid "No WeBWorK course was found associated to this LMS course. If this is an error, please contact the WeBWorK system administrator."
 msgstr ""
 
@@ -5509,7 +5715,7 @@ msgstr ""
 msgid "No achievement badges have been assigned yet."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:89
 msgid "No achievement rewards are available for this assignment."
 msgstr ""
 
@@ -5551,15 +5757,15 @@ msgstr ""
 msgid "No changes specified.  You must mark the checkbox of the item(s) to be changed and enter the change data."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1406
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1389
 msgid "No changes were saved!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:418
 msgid "No class list file provided."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:155 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:155 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:278
 msgid "No content was selected."
 msgstr ""
 
@@ -5588,7 +5794,7 @@ msgid "No courses found"
 msgstr ""
 
 #. ($setID, $problemID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:819
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:780
 msgid "No data exists for set %1 and problem %2"
 msgstr ""
 
@@ -5612,12 +5818,12 @@ msgstr ""
 msgid "No jobs in queue."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1988
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1989
 msgid "No location specified to edit. Please check your input data."
 msgstr ""
 
 #. ($badID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1899
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1900
 msgid "No location with name %1 exists in the database"
 msgstr ""
 
@@ -5641,7 +5847,7 @@ msgstr ""
 msgid "No merge file selected."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:145
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:142
 msgid "No more tests available."
 msgstr ""
 
@@ -5649,11 +5855,11 @@ msgstr ""
 msgid "No new Achievement ID specified.  No new achievement created.  File not saved."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:669
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:671
 msgid "No new versions of this test are available, because the test is not open or its time limit has expired."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:640
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:642
 msgid "No new versions of this test are available, because you have already taken the maximum number allowed."
 msgstr ""
 
@@ -5661,7 +5867,7 @@ msgstr ""
 msgid "No password"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:79
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:82
 msgid "No problems matched the given parameters."
 msgstr ""
 
@@ -5674,7 +5880,7 @@ msgid "No recipients selected. Please select one or more recipients from the lis
 msgstr ""
 
 #. ($setID)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:53
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:54
 msgid "No record for global set %1."
 msgstr ""
 
@@ -5690,32 +5896,32 @@ msgstr ""
 msgid "No sets selected for scoring."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:109
 msgid "No sets shown.  Choose one of the options above to list the sets in the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2082
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2061
 msgid "No source filePath specified"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:120
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:121
 msgid "No students shown. Choose one of the options above to list the students in the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:244
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:259
 msgid "No submissions. Over time."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:306
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:307
 msgid "No tests taken."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:820
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:781
 msgid "No user specific data exists for user %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:396
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:419
 msgid "No users added."
 msgstr ""
 
@@ -5728,24 +5934,24 @@ msgid "No valid OTP secrets to reset. Skipping all."
 msgstr ""
 
 #. ($locationID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2143
 msgid "No valid changes submitted for location %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:252 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:253
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:252 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:250
 msgid "No versions of this test have been taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:941 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:248 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:63 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:16
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:944 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:247 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:63 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep:16
 msgid "None"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:903 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:861 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:8
 msgid "None Specified"
 msgstr ""
 
 #. (tag('b', join(', ', @$unassignedUsers)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:77
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:78
 msgid "None of the selected users are assigned to this set: %1"
 msgstr ""
 
@@ -5757,7 +5963,7 @@ msgstr ""
 msgid "Not Visible"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:33
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:36
 msgid "Not logged in."
 msgstr ""
 
@@ -5766,7 +5972,7 @@ msgstr ""
 msgid "Not saving dates for %1!"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:595 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:613 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:54 /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31 /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:611 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:629 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:43 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:54 /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:31 /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/ShowMeAnother/messages.html.ep:43
 msgid "Note"
 msgstr ""
 
@@ -5788,15 +5994,15 @@ msgstr ""
 
 #. (tag('i', $text)
 #. (tag('i', $pg->{result}{msg})
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:233 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:590
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:214 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:606
 msgid "Note: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:716
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:741
 msgid "Note: grading the test grades all problems, not just those on this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:234
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:235
 msgid "Notes regarding copying the course configuration file"
 msgstr ""
 
@@ -5804,7 +6010,7 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:909 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:47 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:69
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:867 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:51 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:35 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:69
 msgid "Now"
 msgstr ""
 
@@ -5812,15 +6018,27 @@ msgstr ""
 msgid "Number"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:589
+msgid "Number incorrect is"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep:22 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:58 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:94
 msgid "Number of Students"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:37
+msgid "Number of correct attempts:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:38
+msgid "Number of incorrect attempts:"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementList.html.ep:39
 msgid "Number:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1133 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:876
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1134 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:877
 msgid "OK"
 msgstr ""
 
@@ -5828,15 +6046,15 @@ msgstr ""
 msgid "OPL Problem Levels Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2706
 msgid "OTP Secret is empty - Skipping"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2659
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2660
 msgid "OTP Secret is not empty - Overwritting"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2622
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2623
 msgid "OTP secret is empty - Skipping"
 msgstr ""
 
@@ -5869,7 +6087,7 @@ msgstr ""
 msgid "One additional test version added to this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:907
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:903
 msgid "One or more of the problems in this test have not been assigned to you."
 msgstr ""
 
@@ -5885,11 +6103,11 @@ msgstr ""
 msgid "One-time password setup QR code"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:414
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:425
 msgid "Only Start"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:381 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:399
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:392 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:410
 msgid "Only after set answer date"
 msgstr ""
 
@@ -5905,15 +6123,15 @@ msgstr ""
 msgid "Only this permission level and higher get buttons for sending email to the instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:53 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:54 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:39
 msgid "Open"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:35
 msgid "Open Assignments"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:110 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:342 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:45 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:61
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:119 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:342 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:7 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:45 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:61
 msgid "Open Date"
 msgstr ""
 
@@ -5921,7 +6139,15 @@ msgstr ""
 msgid "Open Problem Library"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:274 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:547
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:94
+msgid "Open date"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:58
+msgid "Open date:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:275 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:548
 msgid "Open in New Window"
 msgstr ""
 
@@ -5929,17 +6155,17 @@ msgstr ""
 msgid "Open in new window"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:268
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:283
 msgid "Open."
 msgstr ""
 
 #. ($beginReducedScoringPeriod)
 #. ($c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:152 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:172
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:144 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:164
 msgid "Open. Due %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:281
 msgid "Open. Submitted."
 msgstr ""
 
@@ -5951,11 +6177,11 @@ msgstr ""
 msgid "Optional Modules"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:340
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:351
 msgid "Order Problems Randomly"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:349
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:360
 msgid "Order problems randomly or not.  If you will be manually reviewing student answers, you might not want to order problems randomly to facilitate assembly line grading."
 msgstr ""
 
@@ -5968,7 +6194,7 @@ msgid "Other Options"
 msgstr ""
 
 # Context is "7 Out Of 10" 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:179
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:180
 msgid "Out Of"
 msgstr ""
 
@@ -6004,6 +6230,14 @@ msgstr ""
 msgid "PDF hardcopy for selected users, for selected sets"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep:44
+msgid "PG Critic Help"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep:4
+msgid "PG Critic Violations"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Problem/checkboxes.html.ep:37
 msgid "PG Info"
 msgstr ""
@@ -6020,15 +6254,15 @@ msgstr ""
 msgid "PG Sample Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:663
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:664
 msgid "PG debug messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:671
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:672
 msgid "PG internal errors"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:125
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:124
 msgid "PG markdown syntax used to format WeBWorK questions. This interactive lab can help you to learn the techniques."
 msgstr ""
 
@@ -6036,37 +6270,32 @@ msgstr ""
 msgid "PG problem file"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:647
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:648
 msgid "PG question failed to render"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:661
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:662
 msgid "PG question processing error messages"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:667 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:668 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:153
 msgid "PG warning messages"
 msgstr ""
 
-# Doesn't need to be translated
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:32 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:43
-msgid "PGML"
-msgstr ""
-
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/format_code_form.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep:30
 msgid "PGML Conversion Help"
 msgstr ""
 
 # Doesn't need to be translated
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:116 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:115 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:24
 msgid "POD"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:249
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:256
 msgid "POD Index"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:257
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:264
 msgid "POD Viewer"
 msgstr ""
 
@@ -6074,11 +6303,7 @@ msgstr ""
 msgid "POD for Macro Files"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:106
-msgid "POD for macros and sample problem code and snippets"
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1472 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:541
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1413 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:547
 msgid "PREVIEW ONLY -- ANSWERS NOT RECORDED"
 msgstr ""
 
@@ -6113,7 +6338,7 @@ msgstr ""
 msgid "Parsers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:113 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:104 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:93 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:60 /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:18
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:136 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:105 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:93 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Login.html.ep:64 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:60 /opt/webwork/webwork2/templates/HelpFiles/Options.html.ep:18
 msgid "Password"
 msgstr ""
 
@@ -6122,7 +6347,7 @@ msgstr ""
 msgid "Past Answers for %1, set %2, problem %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:34
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:38
 msgid "Past Due Assignments"
 msgstr ""
 
@@ -6138,7 +6363,7 @@ msgstr ""
 msgid "Percent Score"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:503
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:501
 msgid "Percent of Students"
 msgstr ""
 
@@ -6154,15 +6379,15 @@ msgstr ""
 msgid "Perfect"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/format_code_form.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep:14
 msgid "Perltidy Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/format_code_form.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep:9
 msgid "Perltidy is a reformatting function that attempts to format code in a standard way.  It does not change the functionality of the code and in general is desired to have a common problem layout."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:112 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:110 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:92 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:78
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:135 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:111 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:92 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:79
 msgid "Permission Level"
 msgstr ""
 
@@ -6171,7 +6396,7 @@ msgstr ""
 msgid "Permission Level: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:863
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:866
 msgid "Permission levels for receiving feedback email"
 msgstr ""
 
@@ -6183,11 +6408,11 @@ msgstr ""
 msgid "Pick a target set above to add this problem to."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:920 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:52 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:74
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:878 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:56 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:40 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:74
 msgid "Pick date and time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2215
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2216
 msgid "Place a file named \"hide_directory\" in a course or other directory and it will not show up in the courses list on the WeBWorK home page. It will still appear in the Course Administration listing."
 msgstr ""
 
@@ -6195,6 +6420,10 @@ msgstr ""
 msgid "Platform ID"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:51
+msgid "Please choose a set date type."
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:18
 msgid "Please confirm it is okay to delete selected achievements permanently."
 msgstr ""
@@ -6244,19 +6473,23 @@ msgstr ""
 msgid "Please input a file name to export to that does not contain forward slashes."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1889
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1890
 msgid "Please provide a location name to delete."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:54
+msgid "Please select a date."
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:27
 msgid "Please select a file to import from."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:49
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:50
 msgid "Please select a problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:76
 msgid "Please select a set definition file to import."
 msgstr ""
 
@@ -6264,19 +6497,19 @@ msgstr ""
 msgid "Please select at least one achievement."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:163
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:166
 msgid "Please select at least one set and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:14
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:58
 msgid "Please select at least one set."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:154
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:157
 msgid "Please select at least one user and try again."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:18 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:93
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:18 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:94
 msgid "Please select at least one user."
 msgstr ""
 
@@ -6310,10 +6543,10 @@ msgstr ""
 
 #. ($saveMode)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1282
-msgid "Please use radio buttons to choose the method for saving this file. Uknown saveMode: %1."
+msgid "Please use radio buttons to choose the method for saving this file. Unknown saveMode: %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:28
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:29
 msgid "Plese enter a file with path relative to the course templates directory."
 msgstr ""
 
@@ -6350,11 +6583,11 @@ msgstr ""
 msgid "Prepare which sets for export?"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:266 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:247 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:268
 msgid "Press \"Grade Test\" now!"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:261
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:242
 msgid "Press \"Grade Test\" soon!"
 msgstr ""
 
@@ -6362,11 +6595,11 @@ msgstr ""
 msgid "Preview Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:30 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:112 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
+#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:13 /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:30 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:116 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:35
 msgid "Preview My Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:674
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:690
 msgid "Preview Test"
 msgstr ""
 
@@ -6374,7 +6607,11 @@ msgstr ""
 msgid "Preview the message before sending using the \"Preview Message\" button.  The preview shows the email that would be sent to the first selected student or the instructor if no students were selected.  The preview will also list all of the students that would receive their own personalized message.  If a merge file was selected, the preview will also indicate which (if any) recipient's merge file data could not be found."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:950 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:952 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:954
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:477
+msgid "Previous Page"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:880 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:882 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:884 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:477
 msgid "Previous Problem"
 msgstr ""
 
@@ -6386,12 +6623,12 @@ msgstr ""
 msgid "Primary Actions"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:374
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:357
 msgid "Print Test"
 msgstr ""
 
 # Short for Problem
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:306
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:287
 msgid "Prob"
 msgstr ""
 
@@ -6405,7 +6642,7 @@ msgstr ""
 #. ($c->{setRecord}->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
 #. ($set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)
 #. ($problemNumber)
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:29 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:36 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:382 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:790 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:800 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:811 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:263 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:58 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:62 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:232 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:43 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:41 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:45
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:29 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/DuplicateProb.pm:36 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:382 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:788 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:798 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:809 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:240 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:58 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:62 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:232 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:24 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:41 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:45
 msgid "Problem %1"
 msgstr ""
 
@@ -6440,7 +6677,7 @@ msgid "Problem %1 weight increased from %2 to %3."
 msgstr ""
 
 #. ($i + 1)
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:549
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:555
 msgid "Problem %1."
 msgstr ""
 
@@ -6456,11 +6693,23 @@ msgstr ""
 msgid "Problem Display/Answer Checking"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:453 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:35
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:460 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:35
 msgid "Problem Editor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:958 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:959 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:961
+#: /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:11
+msgid "Problem Grader"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:39
+msgid "Problem ID"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:30
+msgid "Problem ID:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:888 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:889 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:891
 msgid "Problem List"
 msgstr ""
 
@@ -6476,11 +6725,11 @@ msgstr ""
 msgid "Problem Score (%):"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:20 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:200 /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:223
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:20 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:201 /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:223
 msgid "Problem Score Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm:54 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:80 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep:33 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep:45 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:15
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm:50 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:87 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep:33 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep:45
 msgid "Problem Techniques"
 msgstr ""
 
@@ -6489,15 +6738,15 @@ msgstr ""
 msgid "Problem creating set \"%1\": %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:577
 msgid "Problem files may have hints included in their code.  Use this option to suppress showing students these hints. Note that even if hints are not suppressed, there is a threshold number of attempts that a student must make before they have the option to view a hint."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:239
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243
 msgid "Problem has a different source file than the currently rendered problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:233
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:237
 msgid "Problem has an essay answer that needs to be graded."
 msgstr ""
 
@@ -6535,7 +6784,15 @@ msgstr ""
 msgid "Problem number to reset incorrect attempts"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2083
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:107
+msgid "Problem randorder"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:69
+msgid "Problem randorder:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2062
 msgid "Problem source is drawn from a grouping set"
 msgstr ""
 
@@ -6543,7 +6800,7 @@ msgstr ""
 msgid "Problem source is drawn from a grouping set and cannot be directly rendered or edited."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:339 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:192 /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:12 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:340 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:3 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep:30 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:193 /opt/webwork/webwork2/templates/ContentGenerator/Problem/siblings.html.ep:2 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:9 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:17
 msgid "Problems"
 msgstr ""
 
@@ -6551,7 +6808,7 @@ msgstr ""
 msgid "Problems Added"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm:53 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep:35 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep:57
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm:49 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep:35 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep:57
 msgid "Problems by Macro"
 msgstr ""
 
@@ -6567,7 +6824,7 @@ msgstr ""
 msgid "Problems have been assigned to all current users."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:365
 msgid "Problems per Page"
 msgstr ""
 
@@ -6579,7 +6836,7 @@ msgstr ""
 msgid "Proctor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:419
 msgid "Proctor Authorization Type"
 msgstr ""
 
@@ -6607,23 +6864,23 @@ msgstr ""
 msgid "Proctor:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:257
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:266
 msgid "Proctored Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:343
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:350
 msgid "Proctored Test %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:350
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:357
 msgid "Proctored Test %2 Proctor Login"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:418
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:429
 msgid "Proctored tests always require authorization to start the test. \"Both Start and Grade\" will require either login proctor authorization or a password specific to this set to start the test, and grade proctor authorization to grade the test. \"Only Start\" requires either grade proctor authorization or a password specific to this set to start and no authorization to grade."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1127
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1117
 msgid "Proctoring Parameters"
 msgstr ""
 
@@ -6643,6 +6900,14 @@ msgstr ""
 msgid "RECITATION"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:44
+msgid "Random seed"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:34
+msgid "Random seed:"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:199
 msgid "Randomize"
 msgstr ""
@@ -6651,7 +6916,7 @@ msgstr ""
 msgid "Randomize Seed"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:356
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:357
 msgid "Randomize Seeds"
 msgstr ""
 
@@ -6667,11 +6932,11 @@ msgstr ""
 msgid "Really delete the items listed above?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:110 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:90 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:105 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:22 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:212 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:64
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:133 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:169 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:90 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:105 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:213 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/student_progress.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:65
 msgid "Recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:100 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:21
 msgid "Recitation:"
 msgstr ""
 
@@ -6687,7 +6952,7 @@ msgstr ""
 #. ($recipient)
 #. ($studentID)
 #. ($c->{studentID})
-#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:53 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:132 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:8
+#: /opt/webwork/webwork2/lib/Mojolicious/WeBWorK/Tasks/SendInstructorEmail.pm:53 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:132 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/student_progress.html.ep:5
 msgid "Record for user %1 not found."
 msgstr ""
 
@@ -6699,15 +6964,15 @@ msgstr ""
 msgid "Reduced Scoring"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:32
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
 msgid "Reduced Scoring Assignments"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:172 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:343 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:12 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:47 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:181 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:343 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:12 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep:47 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:66
 msgid "Reduced Scoring Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:170
 msgid "Reduced Scoring Enabled"
 msgstr ""
 
@@ -6716,7 +6981,7 @@ msgid "Reduced Scoring Period"
 msgstr ""
 
 #. ($c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:167
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:159
 msgid "Reduced credit can still be earned until %1."
 msgstr ""
 
@@ -6739,11 +7004,7 @@ msgstr ""
 msgid "Reduced:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:166
-msgid "Reformat the code using perltidy or a conversion to PGML. Using perltidy will change the code in the editor window, and save changes to the temporary file. In some cases (if the code contains backslashes or double tildes) this can result in odd spacing in the code. The convert to PGML feature changes the code in text blocks in the code to use PGML features. Generally the conversion of many of the formatting and LaTeX is performed correctly, however answer blanks need attention. In either case, make sure to inspect the formatted code, and edit further or revert if needed."
-msgstr ""
-
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/format_code_form.html.ep:7
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep:7
 msgid "Reformat the code using perltidy."
 msgstr ""
 
@@ -6763,11 +7024,16 @@ msgstr ""
 msgid "Regular Assignment"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:43
 msgid "Regular Assignments"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:232
+#. (scalar(@{ $_->explanation->{sampleProblems} })
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep:30
+msgid "Related sample %plural(%1,problem):"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:241
 msgid "Relax Location Restrictions"
 msgstr ""
 
@@ -6781,7 +7047,7 @@ msgid "Remaining"
 msgstr ""
 
 #. ('00:00:00')
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:271
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:252
 msgid "Remaining time: %1"
 msgstr ""
 
@@ -6789,12 +7055,12 @@ msgstr ""
 msgid "Remember Me"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:432
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:434
 msgid "Remember to return to your original problem when you're finished here!"
 msgstr ""
 
 #: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/NoReducedCred.pm:15
-msgid "Remove reduced scoring penalties from an open assignemnt.  You will have to resubmit any problems that have already been penalized to earn full credit on them."
+msgid "Remove reduced scoring penalties from an open assignment.  You will have to resubmit any problems that have already been penalized to earn full credit on them."
 msgstr ""
 
 #. ($c->formatDateTime($set->due_date, $c->ce->{studentDateDisplayFormat})
@@ -6823,15 +7089,15 @@ msgstr ""
 msgid "Rename file as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:486
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:487
 msgid "Render"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:347 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:348 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:42
 msgid "Render All"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:483
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:484
 msgid "Render Problem"
 msgstr ""
 
@@ -6839,7 +7105,7 @@ msgstr ""
 msgid "Render all problems on the page. This does not reload the page or save or reset changes."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:141
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:127
 msgid "Render or re-render the problem, course info file, or set header being edited. This does not change the permanent file on the disk. You can view different versions of the same problem by changing the seed. You can also change the manner in which the mathematics is typeset. If \"Open in new window\" is checked, then the problem will open in a new tab or window showing the problem as it will be rendered for students in the set."
 msgstr ""
 
@@ -6847,7 +7113,7 @@ msgstr ""
 msgid "Rendering Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:344 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:345 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:36
 msgid "Renumber Problems"
 msgstr ""
 
@@ -6892,20 +7158,20 @@ msgstr ""
 msgid "Replaces the second problem with a copy of the first."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:143
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:140
 msgid "Report Bugs in this Problem"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:58 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:378
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/admin_links.html.ep:58 /opt/webwork/webwork2/templates/ContentGenerator/Base/links.html.ep:354
 msgid "Report bugs"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:148
 msgid "Report bugs in a WeBWorK question/problem using this link. The very first time you do this you will need to register with an email address so that information on the bug fix can be reported back to you."
 msgstr ""
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1369 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1602
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1370 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1603
 msgid "Report for course %1:"
 msgstr ""
 
@@ -6919,16 +7185,16 @@ msgstr ""
 msgid "Request New Version"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:18 /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:19
 msgid "Request information"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1179
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1120
 msgid "Request new version now."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:472
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:473
 msgid "Requested set \"%1\" is a proctored test, but no valid proctor authorization has been obtained."
 msgstr ""
 
@@ -6938,12 +7204,12 @@ msgid "Requested set '%1' could not be found in the database for user %2."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:458
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:459
 msgid "Requested set '%1' is a homework assignment but the test content generator %2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
 #. ($setName, $node_name)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:452
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:453
 msgid "Requested set '%1' is a test but the regular homework assignment content generator %2 was called.  Try re-entering the set from the problem sets listing page."
 msgstr ""
 
@@ -6953,13 +7219,13 @@ msgid "Requested set '%1' is not assigned to user %2."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:436
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:434
 msgid "Requested set '%1' is not available yet."
 msgstr ""
 
 #. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:430
-msgid "Requested set '%1' is not yet open."
+#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:428
+msgid "Requested set '%1' is not available."
 msgstr ""
 
 #. ($verNum,				$setName)
@@ -6972,7 +7238,7 @@ msgstr ""
 msgid "Requested version (%1) of set '%2' is not assigned to user %3."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:916
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:919
 msgid "Require users to log in through the LMS"
 msgstr ""
 
@@ -6980,15 +7246,15 @@ msgstr ""
 msgid "Required"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:528
-msgid "Rerandomize After"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:533
+msgid "Rerandomize"
 msgstr ""
 
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:104
 msgid "Reset"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:197 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:712 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:198 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:713 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:30
 msgid "Reset Form"
 msgstr ""
 
@@ -7014,12 +7280,12 @@ msgid "Reset the number of attempts on problem %1."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:468
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:491
 msgid "Reset two factor authentication for %1 users."
 msgstr ""
 
 #. ($num)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:490
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:513
 msgid "Reset two factor authentication for %quant(%1,user)."
 msgstr ""
 
@@ -7053,7 +7319,7 @@ msgstr ""
 msgid "Restored backup from %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:214
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:223
 msgid "Restrict Access by Location"
 msgstr ""
 
@@ -7061,15 +7327,15 @@ msgstr ""
 msgid "Restrict Locations"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:425
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:436
 msgid "Restrict Problem Progression"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:194
 msgid "Restrict Release by Set(s)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:229
 msgid "Restrict To"
 msgstr ""
 
@@ -7077,7 +7343,7 @@ msgstr ""
 msgid "Restrict or sort the students displayed"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:310
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:291
 msgid "Result"
 msgstr ""
 
@@ -7086,7 +7352,7 @@ msgstr ""
 msgid "Result for job %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:153 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:237
+#: /opt/webwork/webwork2/lib/FormatRenderedProblem.pm:153 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:238
 msgid "Results for this submission"
 msgstr ""
 
@@ -7102,7 +7368,7 @@ msgstr ""
 msgid "Return to your work"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:217
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:129 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:38 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:20 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:206
 msgid "Revert"
 msgstr ""
 
@@ -7116,11 +7382,11 @@ msgstr ""
 msgid "Reverted to original file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:219
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:208
 msgid "Reverts to the copy of the file saved on the disk or to a backup file. All unsaved editing changes will be lost. This option is only active when a temporary file or a backup file exists. You may also delete backups that have been made with this tab."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:179
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:189
 msgid "Review of column functions:"
 msgstr ""
 
@@ -7160,27 +7426,27 @@ msgstr ""
 msgid "Sample Problem Home"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:264
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:271
 msgid "Sample Problem Index"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:279
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:286
 msgid "Sample Problem Viewer"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:104 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep:32 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:104 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep:32 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep:39 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:14
 msgid "Sample Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:77
 msgid "Sample Problems by Category"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:85
+#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:92
 msgid "Sample Problems by Macro"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:75
+#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:82
 msgid "Sample Problems by Subject Area"
 msgstr ""
 
@@ -7194,15 +7460,19 @@ msgstr ""
 msgid "Sample Problems for Techniques: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:106 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:17
+msgid "Sample problem code with documentation."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm:78
 msgid "Sample problem not found."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:38
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep:39
 msgid "Sample problem:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:18 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementNotificationEditor.pm:15 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:126 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep:108 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:73 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:23 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:243 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:175 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:84 /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:275 /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementNotificationEditor.html.ep:13 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:174
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:18 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementNotificationEditor.pm:15 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:126 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep:108 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:73 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:40 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:23 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:247 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:175 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:84 /opt/webwork/webwork2/templates/HTML/SingleProblemGrader/grader.html.ep:276 /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementNotificationEditor.html.ep:13 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:163
 msgid "Save"
 msgstr ""
 
@@ -7215,11 +7485,11 @@ msgstr ""
 msgid "Save Account Settings"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:19 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementNotificationEditor.pm:16 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:127 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:27 /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementNotificationEditor.html.ep:16 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:185
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementEditor.pm:19 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementNotificationEditor.pm:16 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:127 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:39 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep:27 /opt/webwork/webwork2/templates/HelpFiles/InstructorAchievementNotificationEditor.html.ep:16 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:174
 msgid "Save As"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:83 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:196 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:711 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Config.html.ep:83 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:197 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:712 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetDetail.html.ep:22
 msgid "Save Changes"
 msgstr ""
 
@@ -7239,7 +7509,7 @@ msgstr ""
 msgid "Save as:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:114 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:82 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/save_edit_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/save_edit_form.html.ep:1 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:115 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:83 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/save_edit_form.html.ep:1
 msgid "Save changes"
 msgstr ""
 
@@ -7247,7 +7517,7 @@ msgstr ""
 msgid "Save file to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:176
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:165
 msgid "Save the contents of the editor window to the file on disk and re-render the problem. If \"Open in new window\" is checked, then the problem will open in a new tab or window showing the problem as it will be rendered for students in the set. If \"Create backup\" is checked then a backup of the current file on disk will be created before overwriting it with the contents of the editor window. If a backup already exists, then a \"Delete oldest backup\" check box will be present. If that is checked, then the oldest backup will be deleted when \"Save\" is clicked. These backups can be reverted to and managed on the \"Revert\" tab."
 msgstr ""
 
@@ -7264,7 +7534,7 @@ msgstr ""
 msgid "Saved answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2494
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2495
 msgid "Saved course map."
 msgstr ""
 
@@ -7274,15 +7544,15 @@ msgstr ""
 msgid "Saved to file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2784
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2785
 msgid "Schema and database field definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2771
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2772
 msgid "Schema and database table definitions do not agree"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:52 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:89 /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:276 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:176 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:171 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:66
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementList.pm:52 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:89 /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:9 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:276 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:177 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:168 /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemSetList.html.ep:66
 msgid "Score"
 msgstr ""
 
@@ -7290,7 +7560,7 @@ msgstr ""
 msgid "Score (%)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:195
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:204
 msgid "Score Required for Release"
 msgstr ""
 
@@ -7302,7 +7572,7 @@ msgstr ""
 msgid "Score selected set(s) and save to:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:303
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
 msgid "Score summary for last submission:"
 msgstr ""
 
@@ -7337,7 +7607,7 @@ msgstr ""
 msgid "Scoring (\".csv\") files"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:475
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:482
 msgid "Scoring Download"
 msgstr ""
 
@@ -7345,7 +7615,7 @@ msgstr ""
 msgid "Scoring Message"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:470 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:477 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:43
 msgid "Scoring Tools"
 msgstr ""
 
@@ -7353,7 +7623,7 @@ msgstr ""
 msgid "Scoring Tools Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:330
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:331
 msgid "Screen and Hardcopy set header information cannot be overridden for individual students."
 msgstr ""
 
@@ -7369,23 +7639,23 @@ msgstr ""
 msgid "Scroll of Resurrection"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:54
 msgid "Search macros"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:55
+#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:62
 msgid "Search sample problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:36 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:43 /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer.html.ep:44
 msgid "Search the documentation"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:109 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:89 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:104 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep:18 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:206 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:57 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:132 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:168 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep:32 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:89 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:110 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:104 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:207 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/student_progress.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:58 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:38
 msgid "Section"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:99 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep:33 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep:30
 msgid "Section:"
 msgstr ""
 
@@ -7394,28 +7664,33 @@ msgstr ""
 msgid "Section: %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:169
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:178
 msgid "See \"Reduced Scoring Date\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:211
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:220
 msgid "See \"Restrict Release by Set(s)\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:337
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:348
 msgid "See \"Time Interval for New Versions\"."
 msgstr ""
 
+#. (link_to(								($_->policy =~ s/^Perl::Critic::Policy:://r)
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep:21
+msgid "See %1."
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/sample_problem.html.ep:71
 msgid "See Also"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:544
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:547
 msgid "Seed"
 msgstr ""
 
 #. (defined $record{seed} && $record{seed} ne ''												?  $record{seed} : maketext('unknown')
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:36
 msgid "Seed: %1"
 msgstr ""
 
@@ -7423,7 +7698,7 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:83
 msgid "Select All Sets"
 msgstr ""
 
@@ -7435,6 +7710,10 @@ msgstr ""
 msgid "Select Course IDs"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HTML/StudentNav/student_nav.html.ep:29
+msgid "Select Student to Act As"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_otp_secrets_form.html.ep:52 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_otp_secrets_form.html.ep:84
 msgid "Select User ID"
 msgstr ""
@@ -7459,6 +7738,10 @@ msgstr ""
 msgid "Select a Set from this Course"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:40
+msgid "Select a Test to Review"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/HelpFiles/AdminArchiveCourse.html.ep:5
 msgid "Select a course to create a .tar.gz archive of, which contains a dump of the database and all course files (templates, configuration files, etc).  Each course can only have a single archive.  Creating an archive of a previously archived course will delete the old archive."
 msgstr ""
@@ -7503,7 +7786,7 @@ msgstr ""
 msgid "Select all jobs"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:34 /opt/webwork/webwork2/templates/ContentGenerator/LTI/content_item_selection.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:72 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:77 /opt/webwork/webwork2/templates/ContentGenerator/LTI/content_item_selection.html.ep:37
 msgid "Select all sets"
 msgstr ""
 
@@ -7527,7 +7810,11 @@ msgstr ""
 msgid "Select course(s) to hide or unhide."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:18 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:25
+msgid "Select filename below"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:24
 msgid "Select filenames below"
 msgstr ""
 
@@ -7629,7 +7916,7 @@ msgstr ""
 msgid "Select which users in the %1 course to copy over to the newly created course. The WeBWorK administrators need to be added to the course in order for them to access the course. Unselecting them will make it so WeBWorK administrators cannot directly login to the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:114
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:100
 msgid "Select your favorite theme for the large text window."
 msgstr ""
 
@@ -7669,7 +7956,7 @@ msgstr ""
 msgid "Send Instructor Email"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:54
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:59
 msgid "Send email to students."
 msgstr ""
 
@@ -7717,7 +8004,7 @@ msgstr ""
 msgid "Set Actions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:903 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:967 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:971 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:980 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:861 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:927 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:954 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:960 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:969 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep:11
 msgid "Set Default"
 msgstr ""
 
@@ -7725,7 +8012,7 @@ msgstr ""
 msgid "Set Definition Files"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:216 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:220
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:217 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:221
 msgid "Set Description"
 msgstr ""
 
@@ -7733,11 +8020,11 @@ msgstr ""
 msgid "Set Detail Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:412
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:419
 msgid "Set Detail for set %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:88
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:97
 msgid "Set Header"
 msgstr ""
 
@@ -7746,10 +8033,14 @@ msgstr ""
 msgid "Set Header for set %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:197
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:197 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:91
 msgid "Set ID"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:55
+msgid "Set ID:"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LoginProctor.pm:102 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/info.html.ep:3
 msgid "Set Info"
 msgstr ""
@@ -7758,7 +8049,7 @@ msgstr ""
 msgid "Set LMS context ids for courses to map LMS courses to WeBWorK courses for content item selection."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:20
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:64
 msgid "Set List"
 msgstr ""
 
@@ -7766,15 +8057,19 @@ msgstr ""
 msgid "Set Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:203
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:204
 msgid "Set Parameters"
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:81
+msgid "Set Statistics"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:23
 msgid "Set Status Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:672
 msgid "Set Values"
 msgstr ""
 
@@ -7791,6 +8086,14 @@ msgstr ""
 msgid "Set definition (\".def\") files"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:92
+msgid "Set header file"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:56
+msgid "Set header file:"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Base/set_status.html.ep:23
 msgid "Set is closed."
 msgstr ""
@@ -7825,7 +8128,7 @@ msgstr ""
 msgid "Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:406 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:29
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:413 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:27
 msgid "Sets Manager"
 msgstr ""
 
@@ -7833,12 +8136,12 @@ msgstr ""
 msgid "Sets Manager Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:401
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:408
 msgid "Sets assigned to %1"
 msgstr ""
 
 #. ($userName, $userID)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:87
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:88
 msgid "Sets assigned to %1 (%2)"
 msgstr ""
 
@@ -7846,7 +8149,7 @@ msgstr ""
 msgid "Sets assigned to student Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:928
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:931
 msgid "Sets how grades will be passed back from WeBWorK to the LMS.
    course
    Sends a single grade back to the LMS. This grade is calculated out of the total question set that has been assigned to a user and made open. Therefore it can appear low, since it counts problem sets with future due dates as zero.
     
    homework
    Sends back a score for each problem set (including for each quiz). To use this, the external links from the LMS must be problem set specific. For example, webwork.myschool.edu/webwork2/course-name/problem_set_name. If the problem set name has space characters, they should be underscores in these addresses. Also, to initialize the communication between WeBWorK and the LMS, the user must follow each of these external learning tools at least one time. Since there must be a separate external tool link for each problem set, this option requires more maintenance of the LMS course.
    "
 msgstr ""
 
@@ -7856,7 +8159,7 @@ msgid "Sets sorted by %1 in %plural(%2,ascending,descending) order, and then by
 msgstr ""
 
 #. ($c->maketext(FIELD_PROPERTIES()
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:330
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:353
 msgid "Sets sorted by %1 in %plural(%2,ascending,descending) order, then by %3 in %plural(%4,ascending,descending) order,and then by %5 in %plural(%6,ascending,descending) order."
 msgstr ""
 
@@ -7864,7 +8167,7 @@ msgstr ""
 msgid "Sets the order in which achievements are listed and evaluated. Achievements in the \"level\" category are always listed and evaluated after all other achievements."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1054
 msgid "Sets the time in seconds to periodically update the LMS scores. WeBWorK will update all scores on the LMS if it has been longer than this time since the completion of the last update. This is only an approximate time. Mass updates of this nature may put significant strain on the server, and should not be set to happen too frequently. -1 disables these periodic updates."
 msgstr ""
 
@@ -7885,7 +8188,7 @@ msgstr ""
 msgid "Setup One-Time Password Authentication"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:41
 msgid "Shift dates so that the earliest is"
 msgstr ""
 
@@ -7898,31 +8201,39 @@ msgstr ""
 msgid "Show %1 more like this"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:36
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:40
 msgid "Show By Date"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:42
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:46
 msgid "Show By Type"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:722 /opt/webwork/webwork2/templates/ContentGenerator/Problem/instructor_buttons.html.ep:5 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:121 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:127 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:134 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:746 /opt/webwork/webwork2/templates/ContentGenerator/Problem/instructor_buttons.html.ep:5 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:125 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:131 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:39
 msgid "Show Correct Answers"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:79
+msgid "Show Correct Answers:"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:24
 msgid "Show Date & Size"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:511
-msgid "Show Hints After"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:519 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:135
+msgid "Show Hints"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:80
+msgid "Show Hints:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1133
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1136
 msgid "Show LTI parameters (for debugging)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:495 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:570 /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:55 /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:91
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:506 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:572 /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:55 /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:91
 msgid "Show Me Another"
 msgstr ""
 
@@ -7930,16 +8241,16 @@ msgstr ""
 msgid "Show Me Another Exhausted"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1598 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:759
-msgid "Show Past Answers"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:133
+msgid "Show Old Answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/instructor_buttons.html.ep:14
-msgid "Show Problem Grader"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:78
+msgid "Show Old Answers:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:730
-msgid "Show Problem Graders"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1539 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:774
+msgid "Show Past Answers"
 msgstr ""
 
 #: /opt/webwork/webwork2/templates/HelpFiles/Hardcopy.html.ep:29
@@ -7950,23 +8261,31 @@ msgstr ""
 msgid "Show Problem Source File:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:392
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:403
 msgid "Show Problems on Finished Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:374
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:385
 msgid "Show Scores on Finished Versions"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:136
+msgid "Show Solutions"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:81
+msgid "Show Solutions:"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:223
 msgid "Show Total Homework Grade on Grades Page"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:77
+#: /opt/webwork/webwork2/templates/HTML/StudentNav/student_nav.html.ep:76
 msgid "Show all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:91
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:100
 msgid "Show all tests"
 msgstr ""
 
@@ -7974,7 +8293,7 @@ msgstr ""
 msgid "Show automatic answer feedback"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:105
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:91
 msgid "Show available autocompletions at the current cursor location."
 msgstr ""
 
@@ -8028,12 +8347,12 @@ msgid "Showing %1 out of %2 achievements."
 msgstr ""
 
 #. (scalar @{ $c->{visibleSetIDs} },			scalar @{ $c->{allSetIDs} })
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:120
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:121
 msgid "Showing %1 out of %2 sets."
 msgstr ""
 
 #. (scalar(keys %{ $c->{visibleUserIDs} })
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:88
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:93
 msgid "Showing %1 out of %2 users"
 msgstr ""
 
@@ -8054,15 +8373,15 @@ msgstr ""
 msgid "Showing all sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Problem/student_nav.html.ep:70
+#: /opt/webwork/webwork2/templates/HTML/StudentNav/student_nav.html.ep:69
 msgid "Showing all students"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz/nav.html.ep:90
 msgid "Showing all tests"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:266
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:289
 msgid "Showing all users."
 msgstr ""
 
@@ -8096,7 +8415,7 @@ msgstr ""
 msgid "Showing matching sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:272
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:295
 msgid "Showing matching users."
 msgstr ""
 
@@ -8104,7 +8423,7 @@ msgstr ""
 msgid "Showing problem for:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:26
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:27
 msgid "Showing progress for:"
 msgstr ""
 
@@ -8120,7 +8439,7 @@ msgstr ""
 msgid "Showing selected sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:269
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:292
 msgid "Showing selected users."
 msgstr ""
 
@@ -8132,7 +8451,7 @@ msgstr ""
 msgid "Shows how many instructors and students have been assigned this problem set, out of the total number in the class. Clicking on this link allows you to assign the set to users, unassign this set from users, and to individually edit the assignment for specific users. For changing dates for individual users there are also shortcuts from the \"Instructor Tools\" link."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:853
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:856
 msgid "Simple"
 msgstr ""
 
@@ -8200,7 +8519,7 @@ msgstr ""
 msgid "Source Course ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:464
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:475
 msgid "Source File"
 msgstr ""
 
@@ -8212,23 +8531,31 @@ msgstr ""
 msgid "Source User IDs"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2584 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2686
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2585 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2687
 msgid "Source course ID missing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1667 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1695 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1733
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:40
+msgid "Source file"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1648 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1677 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1714
 msgid "Source file paths cannot include .. or start with /: your source file path was modified."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2585
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:31
+msgid "Source file:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2586
 msgid "Source user ID missing."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:124
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:110
 msgid "Spell check the text of the file that your are editing. Note that there will be many spelling errors in the code parts of your file."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:854
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:857
 msgid "Standard"
 msgstr ""
 
@@ -8236,7 +8563,7 @@ msgstr ""
 msgid "Standard Deviation"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:172
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:169
 msgid "Start"
 msgstr ""
 
@@ -8244,7 +8571,7 @@ msgstr ""
 msgid "Start LTI Grade Update"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:136 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:139
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:133 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:136
 msgid "Start New Test"
 msgstr ""
 
@@ -8256,7 +8583,7 @@ msgstr ""
 msgid "State"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:82 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:87 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:485 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:492 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/siblings.html.ep:9 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:39
 msgid "Statistics"
 msgstr ""
 
@@ -8265,25 +8592,24 @@ msgid "Statistics Help"
 msgstr ""
 
 #. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:73
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:72
 msgid "Statistics for %1"
 msgstr ""
 
 #. ($c->tag('span', dir => 'ltr', format_set_name_display($setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:77
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:76
 msgid "Statistics for %1 problem %2"
 msgstr ""
 
-#. ($c->{studentID})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:71
-msgid "Statistics for student %1"
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:557 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:167 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:45 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:289 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:167
+msgid "Status"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:554 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:308 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:151 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep:91 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:50 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:170
-msgid "Status"
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:35 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:98
+msgid "Status:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/login_status.html.ep:31
 msgid "Stop Acting"
 msgstr ""
 
@@ -8291,15 +8617,15 @@ msgstr ""
 msgid "Stop Archiving"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1105
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1106
 msgid "Stop archiving courses"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:107 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:67 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:87 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:101 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:43
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:111 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:67 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:87 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:101 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:43
 msgid "Student ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:91 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers/student_entry_report.html.ep:9
 msgid "Student ID:"
 msgstr ""
 
@@ -8307,7 +8633,7 @@ msgstr ""
 msgid "Student Name"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:67 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:72 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:507 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:41
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:67 /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:509 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/siblings.html.ep:8 /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:41
 msgid "Student Progress"
 msgstr ""
 
@@ -8349,7 +8675,7 @@ msgstr ""
 msgid "Subject Area Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm:52
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/SampleProblemViewer.pm:48
 msgid "Subject Areas"
 msgstr ""
 
@@ -8391,7 +8717,7 @@ msgid "Success index is the square of the score divided by the number of attempt
 msgstr ""
 
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1051
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1052
 msgid "Successfully archived the course %1."
 msgstr ""
 
@@ -8417,17 +8743,17 @@ msgstr ""
 
 #. ($delete_courseID)
 #. ($archive_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1083 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:864
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1084 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:865
 msgid "Successfully deleted the course %1."
 msgstr ""
 
 #. ($rename_oldCourseID,							$rename_newCourseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:748
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:749
 msgid "Successfully renamed the course %1 to %2"
 msgstr ""
 
 #. ($unarchive_courseID, $new_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1262
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1263
 msgid "Successfully unarchived %1 to the course %2"
 msgstr ""
 
@@ -8439,15 +8765,15 @@ msgstr ""
 msgid "TA:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2766
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2767
 msgid "Table defined in database but missing in schema"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2761
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2762
 msgid "Table defined in schema but missing in database"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2757
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2758
 msgid "Table is ok"
 msgstr ""
 
@@ -8463,12 +8789,12 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:44 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:45 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep:42
 msgid "TeX Source"
 msgstr ""
 
 #. ($problems->[ $probOrder->[$i] ]->problem_id)
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:553
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:559
 msgid "Template ID: %1"
 msgstr ""
 
@@ -8476,11 +8802,11 @@ msgstr ""
 msgid "Template Substitutions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:256
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:265
 msgid "Test"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:336
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:343
 msgid "Test %2"
 msgstr ""
 
@@ -8488,27 +8814,32 @@ msgstr ""
 msgid "Test Default"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1078
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1068
 msgid "Test Parameters"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:185
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:186
 msgid "Test Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:274
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:283
 msgid "Test Time Limit"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:255
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:236
 msgid "Test Time Notification"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:163
 msgid "Test Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:242
+#. ($c->{completedTime})
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:338
+msgid "Test completed on %1."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:257
 msgid "Test not yet submitted."
 msgstr ""
 
@@ -8516,7 +8847,7 @@ msgstr ""
 msgid "Test/Quiz"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:40
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:44
 msgid "Tests/Quizzes"
 msgstr ""
 
@@ -8524,11 +8855,11 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:110
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:96
 msgid "Text Editor Options"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:60
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:46
 msgid "Text Editor Window"
 msgstr ""
 
@@ -8552,7 +8883,7 @@ msgstr ""
 msgid "The \"Score\" tab will export achievement data to a CSV file that can be downloaded.  The export contains the global data including number of achievement points and current level of each student.  In addition for each selected achievement, a column for if the achievement was earned (1) or not earned (0) will be added to the CSV."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:191
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:201
 msgid "The Assigned sets column (x/y) indicates that x sets out of y sets avaiable have been assigned to this student. Click this link to assign or unassign sets to this student, to adjust due dates, or to adjust the grades on an assignment for a student."
 msgstr ""
 
@@ -8560,11 +8891,11 @@ msgstr ""
 msgid "The Set Detail page can be viewed in one of two distinct modes:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:186
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:196
 msgid "The login name column links allow you to \"act as\" a student."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:188
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:198
 msgid "The pencil in the login column allows you to edit that student's data."
 msgstr ""
 
@@ -8635,15 +8966,15 @@ msgid "The archive filename may not contain a path component"
 msgstr ""
 
 #. ($filename, $ce->{mail}{maxAttachmentSize})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:187
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:184
 msgid "The attached file \"%1\" exceeds the allowed attachment size of %quant(%2,megabyte)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:617
-msgid "The child problems for this problem will become visible to the student when they either have more incorrect attempts than is specified here, or when they run out of attempts, whichever comes first.  Use -1 to indicate that child problems should only be available after a student runs out of attempts."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:591
+msgid "The child problems for this problem will become visible to the student when they either have more incorrect attempts than is specified here, or when they run out of attempts, whichever comes first.  Select \"No Attempts Remaining\" to indicate that child problems should only be available after a student runs out of attempts."
 msgstr ""
 
-#. ('href="http://webwork.maa.org/wiki/Classlist_Files#Format_of_classlist_files" target="Webworkdocs"',			'demoCourse.lst', '.csv', '.lst')
+#. ('href="https://wiki.openwebwork.org/wiki/Classlist_Files#Format_of_classlist_files" target="Webworkdocs"',			'demoCourse.lst', '.csv', '.lst')
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:43
 msgid "The classlist files are stored in the templates directory and provide a convenient way to enter a large number of students into your class. To view the format for ClassList files see the ClassList specification or download the %2 file and use it as a model. ClassList files can be prepared using a spreadsheet and then saved as %3 (comma separated values) text files. However, to access as a classlist file, the file suffix needs to be changed to %4, which can be done with the \"Rename\" button."
 msgstr ""
@@ -8653,17 +8984,17 @@ msgstr ""
 msgid "The close date must be on or after the open date for set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1378
 msgid "The close date must be on or after the open date."
 msgstr ""
 
 #. ($courseID,							$_)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2448
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2449
 msgid "The context id for %1 is requested to be set to be the same as that of %2, and both courses are configured to use LTI 1.1, but the consumer keys for the two courses are either not both set or are the same."
 msgstr ""
 
 #. ($courseID,							$_,)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2466
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2467
 msgid "The context id for %1 is requested to be set to be the same as that of %2, but the two courses are configured to use LTI 1.3 with the same LTI 1.3 authentication parameters."
 msgstr ""
 
@@ -8671,7 +9002,7 @@ msgstr ""
 msgid "The correct answers shown in feedback are instructor previews and will only be shown to students after the answer date."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:615
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:631
 msgid "The correct answers shown in feedback are instructor previews and will only be shown to students when answers are available."
 msgstr ""
 
@@ -8746,7 +9077,7 @@ msgstr ""
 msgid "The directory you specified doesn't exist"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:847
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:850
 msgid "The email verbosity level controls how much information is automatically added to feedback emails. Levels are
    1.  Simple: send only the feedback comment and context link
    2.  Standard: as in Simple, plus user, set, problem, and PG data
    3.  Debug: as in Standard, plus the problem environment (debugging data)
    "
 msgstr ""
 
@@ -8841,7 +9172,7 @@ msgid "The file you are trying to download doesn't exist"
 msgstr ""
 
 #. ($filename)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Feedback.pm:175
 msgid "The filetype of the attached file \"%1\" is not allowed."
 msgstr ""
 
@@ -8864,11 +9195,15 @@ msgstr ""
 msgid "The following %plural(%1,file) found in the archive %plural(%1,is,are) protected and were not extracted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2260
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep:11
+msgid "The following PG issues should be fixed:"
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2261
 msgid "The following courses were successfully hidden:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2329
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2330
 msgid "The following courses were successfully unhidden:"
 msgstr ""
 
@@ -8880,8 +9215,12 @@ msgstr ""
 msgid "The following files have been selected for archiving.  Select the type of archive and any subset of the requested files."
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep:44
+msgid "The following general Perl issues should be fixed:"
+msgstr ""
+
 #. (tag('b', join(', ', @$unassignedUsers)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:71
 msgid "The following users are NOT assigned to this set and will be ignored: %1"
 msgstr ""
 
@@ -8899,12 +9238,12 @@ msgid "The goal value of the achievement counter."
 msgstr ""
 
 #. (join('.', @{ $problemSeqs[ $children_counts_indexs[0] ] })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1293
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1234
 msgid "The grade for this problem is the larger of the score for this problem, or the score of problem %1."
 msgstr ""
 
 #. (join(', ', map({ join('.', @{ $problemSeqs[$_] })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1303
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1244
 msgid "The grade for this problem is the larger of the score for this problem, or the weighted average of the problems: %1."
 msgstr ""
 
@@ -8948,21 +9287,11 @@ msgstr ""
 msgid "The institution associated with the course %1 is now %2"
 msgstr ""
 
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:386
-msgid "The instructor account with user id %1 does not exist.  Instructor accounts must be created manually."
-msgstr ""
-
-#. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:565
-msgid "The instructor account with user id %1 does not exist.  Please create the account manually via WeBWorK."
-msgstr ""
-
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorJobManager.html.ep:13
 msgid "The job id is an automatically incremented integer.  It is used internally to uniquely identify jobs.  It is also used to reference jobs in messages on this page."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:117
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:103
 msgid "The key maps that are available are \"default\", \"emacs\", \"sublime\", and \"vim\". The \"default\" key map has the standard behavior of a browser text area. You can use Ctrl-C to copy, Ctrl-V to paste, Ctrl-F to search, etc. If you are more comfortable with the \"emacs\"  or \"vim\" text editors then you may choose to use one of those key maps instead."
 msgstr ""
 
@@ -8978,11 +9307,7 @@ msgstr ""
 msgid "The login name cannot be changed. (It is the primary key for the student's data.) If you make a mistake in the login name at the beginning of the course (before any work has been done) then it is best to simply add a new student with the correct entry and drop the student with the bad login name. (See drop and delete students below.) If the login name must be changed after a user has started working assignments, then contact your system administrator, who can use the webwork2 \"bin/change_user_id\" script to change the user id."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:5
-msgid "The main page allows access to set and student statistics.  When selecting a student, their grades page is shown, which lists set totals and per problem grades for each set assigned to the student.  When selecting a set, various statistics and histograms are shown for the overall grades of students who are currently enrolled or auditing the course."
-msgstr ""
-
-#. ('href="http://webwork.maa.org/wiki" target="ww_wiki"',	'href="http://webwork.maa.org/wiki/Instructors" target="ww_wiki"')
+#. ('href="https://wiki.openwebwork.org/wiki" target="ww_wiki"',	'href="https://wiki.openwebwork.org/wiki/Instructors" target="ww_wiki"')
 #: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:9
 msgid "The main page for WeBWorK documentation is the webwork wiki while specific help for instructors setting up a course are in the instructors' section."
 msgstr ""
@@ -8996,11 +9321,11 @@ msgstr ""
 msgid "The name of course information file (located in the templates directory). Its contents are displayed in the right panel next to the list of homework sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:897
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:900
 msgid "The name of the LMS"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:899
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:902
 msgid "The name of the LMS. This is used in messages to users that direct them to go back to the LMS to access something in the WeBWorK course."
 msgstr ""
 
@@ -9065,11 +9390,6 @@ msgstr ""
 msgid "The permission level to view usernames on the achievements leaderboard. Consider that achievement points can be closely tied to student grades before showing user names to students."
 msgstr ""
 
-#. ($setName)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:444
-msgid "The prerequisite conditions have not been met for set '%1'."
-msgstr ""
-
 #. (q(down menu to change which student's seed and answers are shown.  Use the "Mark Correct" checkbox to set)
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorProblemGrader.html.ep:11
 msgid "The problem is shown at the top with the seed and answers of the selected student.  Use the drop "
@@ -9088,7 +9408,7 @@ msgstr ""
 msgid "The reduced scoring date must be between the open date and the close date for set %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1390
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1373
 msgid "The reduced scoring date should be between the open date and close date."
 msgstr ""
 
@@ -9101,13 +9421,13 @@ msgstr ""
 msgid "The requested LMS Context ID is the same as that of another course that is also configured to use LTI 1.3, but this course and that course have the same LTI 1.3 authentication parameters. This is not allowed, and so this setting was not saved."
 msgstr ""
 
-#. ($tempFile)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:287
+#. (xml_escape($tempFile)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:291
 msgid "The requested file \"%1\" does not exist on the server."
 msgstr ""
 
 #. (join('.', @seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1346
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1287
 msgid "The score for this problem can count toward score of problem %1."
 msgstr ""
 
@@ -9120,12 +9440,12 @@ msgstr ""
 msgid "The second row of the problem collection area is for browsing directories. The OPL will be there as well as any other directories that you may set up (for example Contrib). If this is selected, all subdirectories containing problems will be listed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:485
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:508
 msgid "The security code is required."
 msgstr ""
 
 #. (stash('setID')
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:13
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet.html.ep:18
 msgid "The selected problem set (%1) is not a valid set for %2."
 msgstr ""
 
@@ -9174,7 +9494,7 @@ msgstr ""
 msgid "The solution shown is an instructor preview and will only be shown to students after the answer date."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:597
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:613
 msgid "The solution shown is an instructor preview and will only be shown to students when answers are available."
 msgstr ""
 
@@ -9199,7 +9519,7 @@ msgid "The temporary file %1 is not in the course templates directory and cannot
 msgstr ""
 
 #. ($setVersionID)
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:368
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:351
 msgid "The test (which is version %1) may no longer be submitted for a grade."
 msgstr ""
 
@@ -9238,7 +9558,7 @@ msgstr ""
 msgid "The title of the course %1 is now %2"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:196
+#: /opt/webwork/webwork2/templates/ContentGenerator/Grades/student_stats.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:197
 msgid "The top number is the percent score on the problem.  A period (.) indicates a problem has not been attempted. The bottom number is the number of incorrect attempts."
 msgstr ""
 
@@ -9279,7 +9599,7 @@ msgstr ""
 msgid "The webwork server must be able to write to these directories. Please correct the permssion errors."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:90 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:113
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:90 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:99
 msgid "Theme"
 msgstr ""
 
@@ -9298,11 +9618,16 @@ msgstr ""
 msgid "There are %1 matching WeBWorK problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1587
+#. ('%d')
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:728
+msgid "There are %1 problems with unanswered questions."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1588
 msgid "There are database fields that do not have the same type as the field defined in the schema for at least one table."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1426
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1427
 msgid "There are database fields that do not have the same type as the field defined in the schema for at least one table. Check the checkbox by the field to change its type when upgrading the course. Warning: This can fail which may corrupt the table. If you have not archived this course, then do that now before upgrading if you want to change the type of any of these fields."
 msgstr ""
 
@@ -9315,11 +9640,11 @@ msgid "There are database fields that do not have the same type as the field def
 msgstr ""
 
 #. (map { $_ ? $c->formatDateTime($_, 'datetime_format_short')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1374
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1357
 msgid "There are errors in the dates. Open Date: %1 , Close Date: %2, Answer Date: %3"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1411
 msgid "There are extra database fields which are not defined in the schema and were part of the key for at least one table. These fields must be deleted and the table indexes rebuilt. Warning: This will destroy all data contained in the field and is not undoable!"
 msgstr ""
 
@@ -9327,7 +9652,7 @@ msgstr ""
 msgid "There are extra database fields which are not defined in the schema and were part of the key for at least one table. These fields need to be deleted and the table indexes need to be rebuilt. This will be done when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1575
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1576
 msgid "There are extra database fields which are not defined in the schema for at least one table."
 msgstr ""
 
@@ -9335,15 +9660,15 @@ msgstr ""
 msgid "There are extra database fields which are not defined in the schema for at least one table.  They can be removed when upgrading the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1395
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1396
 msgid "There are extra database fields which are not defined in the schema for at least one table. Check the checkbox by the field to delete it when upgrading the course. Warning: Deletion destroys all data contained in the field and is not undoable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1564
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1565
 msgid "There are extra database tables which are not defined in the schema."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1380
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1381
 msgid "There are extra database tables which are not defined in the schema. "
 msgstr ""
 
@@ -9355,7 +9680,7 @@ msgstr ""
 msgid "There are many options available at the bottom:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:56
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:60
 msgid "There are no assignments available to you at this time."
 msgstr ""
 
@@ -9381,11 +9706,11 @@ msgstr ""
 msgid "There is NO undo for this function.  Do not use it unless you know what you are doing!  When you unassign a student using this button, or by unchecking their name, you destroy all of the data for assignment %1 for this student."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:68
 msgid "There is NO undo for unassigning a set."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:120
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:121
 msgid "There is NO undo for unassigning sets. Do not do so unless you know what you are doing!  When you unassign sets by unchecking set names and clicking save, you destroy all of the data for those sets for this student."
 msgstr ""
 
@@ -9393,7 +9718,11 @@ msgstr ""
 msgid "There is NO undo for unassigning students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:402
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:729
+msgid "There is a problem with unanswered questions."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:404
 msgid "There is a solution available."
 msgstr ""
 
@@ -9402,12 +9731,12 @@ msgstr ""
 msgid "There is no additional grade information.  A message about additional grades can go in [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These files can be edited using the \"Email\" link and the \"File Manager\" link in the left margin."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:410
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:412
 msgid "There is no solution available for this problem."
 msgstr ""
 
 #. ($continueTimeLeft)
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:25
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:22
 msgid "There is no time remaining on the currently open test. Click continue below and then click \"Grade Test\" within %1 seconds to submit the test for a grade."
 msgstr ""
 
@@ -9415,7 +9744,7 @@ msgstr ""
 msgid "There is no undo for deleting files or directories!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:407
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:409
 msgid "There is no written solution available for this problem, but you can still view the correct answers."
 msgstr ""
 
@@ -9423,15 +9752,15 @@ msgstr ""
 msgid "There is one main theme to choose from: math4. It has three variants: math4-green, math4-red, and math4-yellow. The theme specifies a unified look and feel for the WeBWorK course web pages."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:362
 msgid "There was an error during the login process.  Please speak to your instructor or system administrator if this recurs."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:123 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:243 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:261 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:297 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:422 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:432 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:466 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:505 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:109 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:213 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:234 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:84 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:97
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:120 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:243 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:261 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:296 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:418 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:487 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:109 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:214 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:235 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:84 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:97
 msgid "There was an error during the login process.  Please speak to your instructor or system administrator."
 msgstr ""
 
-#. ('href="https://webwork.maa.org/wiki/Set_Definition_Files" target="Webworkdocs"')
+#. ('href="https://wiki.openwebwork.org/wiki/Set_Definition_Files" target="Webworkdocs"')
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorFileManager.html.ep:32
 msgid "These are stored in the templates directory. The format of Set Definition files is described in the Set Definition specification. Set definition files are mainly useful for transferring set assignments from one course to another and are created when exporting a problem set from the \"Sets Manager\". Each set definition file contains a list of problems used and the dates and times. These definitions can be imported into the current course."
 msgstr ""
@@ -9511,7 +9840,7 @@ msgstr ""
 msgid "This course uses an external authentication system. You've authenticated through that system, but aren't allowed to log in to this course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:177
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:186
 msgid "This date should be on or after the open date, and earlier or equal to the close date. Answers submitted between the reduced scoring date and the close date are scaled down by a factor that you can set in the Course Config page.  If reduced scoring is being used, note that students will consider the reduced scoring date to be the \"due date\", since that is the date when they can no longer earn 100% for problems."
 msgstr ""
 
@@ -9559,29 +9888,29 @@ msgstr ""
 msgid "This homework set contains no problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1131
 msgid "This homework set is closed."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1188
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1129
 msgid "This homework set is not yet open."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:560
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:563
 msgid "This is a number between 0 and 1 indicating the student's score for the problem.  Change this to 1 to manually award full credit on this problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:477
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:488
 msgid "This is a relative weight to be attached to the problem, either in the context of scoring the set, or in the context of calculating a score for a collection of sets."
 msgstr ""
 
 #. ($hours,					$minutes)
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:109
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:106
 msgid "This is a timed test. You will have %quant(%1,hour) and %quant(%2,minute) to complete the test."
 msgstr ""
 
 #. ($hours,					$minutes)
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:119
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:116
 msgid "This is a timed test. You will have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) to complete the test."
 msgstr ""
 
@@ -9589,32 +9918,32 @@ msgstr ""
 msgid "This is done by first entering the user as a student and then changing the permission level of the user. First edit the user by clicking on the pencil next to their name (or using the technique above for several users), then change their permssion level -- an entry blank at the far right of the screen, you may have to scroll to see it. The permission levels are"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:153
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:163
 msgid "This is done from the \"Sets Manager\" or from the \"Instructor Tools\" page if you wish to assign a set to all students or a large group of students (e.g. a section)."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:158
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:168
 msgid "This is done from the \"Sets Manager\" or from the \"Instructor Tools\" page."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:168
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:178
 msgid "This is done from the \"Sets Manager\" page or the \"Instructor tools\" page."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:115
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:124
 msgid "This is generally the date when students can begin visiting the set and submitting answers. Prior to this date, if the set is assigned to a user and it is flagged \"visible\", they can see that it exists and when it will open, but cannot view the problems. If using \"course\" grade passback to an LMS, only those sets that are past their open date are factored in to the overall course grade that is passed back.  Note that certain permissions can be changed so that the details explained here are no longer true."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:142
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:151
 msgid "This is generally the date when students can click a checkbox to see the expected correct answers to problems in the set.  If a problem has a coded solution, this is also when thy can click to see that solution.  Note that certain permissions can be changed so that the details explained here are no longer true.  This date must come on or after the close date."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:129
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:138
 msgid "This is generally the date when students can no longer use the \"Submit\" button to submit an answer and have it assessed for credit.  However students can still visit the set, type or select answers, and use the \"Check Answers\" button to be assessed without credit.  Note that certain permissions can be changed so that the details explained here are no longer true. This date must come on or after the open date."
 msgstr ""
 
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:63
-msgid "This is most easily done by importing a class list. The class list can be uploaded from your workstation to the server using the File Manager page. The class list must be a file ending in .lst and must have a specific format. Once the file has been uploaded to the server the file will appear in the import action pop-up list (5th action). demoCourse.lst is available for most courses and adds the \"practice users\" which activate guest logins to the class list."
+msgid "This is most easily done by importing a class list. The class list can be uploaded from your workstation to the server using the File Manager page. The class list must be a file ending in .lst and must have a specific format. Once the file has been uploaded to the server the file will appear in the import action pop-up list (5th action). demoCourse.lst is available for most courses and adds the \"practice users\" which activate guest logins to the class list."
 msgstr ""
 
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:39
@@ -9673,44 +10002,35 @@ msgstr ""
 msgid "This is where email messages and templates are saved. You can upload or download files in this directory if you wish to save the files for later."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:62
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:48
 msgid "This is where you edit the code of the problem. Type Ctrl-Enter while this window has focus to re-render the problem. In addition, the following keyboard shortcuts are available."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:702
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:718
 msgid "This is your last submission.  If you say yes, then your answers will be final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:706
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:722
 msgid "This is your only submission.  If you say yes, then your answers will be final, and you will not be able to continue to work this test version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:34
+#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendReducedDate.pm:39 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/NoReducedCred.pm:34 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ReducedCred.pm:34 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendReducedDate.pm:39
 msgid "This item won't work unless your instructor enables the reduced scoring feature.  Let your instructor know that you received this message."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/ExtendReducedDate.pm:39 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/NoReducedCred.pm:34 /opt/webwork/webwork2/lib/WeBWorK/AchievementItems/SuperExtendReducedDate.pm:39
-msgid "This item won't work unless your instructor enables the reduced scoring feature.  Let your instructor know that you recieved this message."
-msgstr ""
-
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:27
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:26
 msgid "This link gives details for many macros. It links to documentation embedded in the macro files themselves."
 msgstr ""
 
-#. ('PGMLLab/PGML-lab.pg')
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:48
-msgid "This links to a WeBWorK \"problem\" which allows you to try out fragments of PGML code. This link will not be available if the file %1 is not located in the templates directory of the course."
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:35
+msgid "This links to a WeBWorK \"problem\" which allows you to try out fragments of PGML code."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:18
-msgid "This links to a list of problem authoring techniques."
-msgstr ""
-
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:24
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:23
 msgid "This links to a page describing Math Object usage."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:43
 msgid "This links to problem authoring information on the WeBWorK wiki."
 msgstr ""
 
@@ -9718,15 +10038,19 @@ msgstr ""
 msgid "This may be Mathjax, images, or plainText. Only the options that are enabled for the course will be available to select. This option is only visible if there is more than one display mode enabled for the course."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1145
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1148
 msgid "This must be set in order to utilize LTI content selection. The WeBWorK content item URL must be set for the external tool in the LMS first. Then if content selection from the LMS is attempted, you will be shown the LMS context ID. Enter the context ID shown here, and then you will be able to select assignments from this course, and import them into the LMS."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:549
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:552
 msgid "This number is used to control how the random elements of the problem will be generated. Change this number to rerandomize a student's version."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/format_code_form.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep:39
+msgid "This option analyzes the code with PG Critic which gives suggestions on using modern PG constructs and ensures that the code conforms to current best-practices."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep:23
 msgid "This option converts the text blocks in the problem code to PGML and updates the loadMacros to include PGML and drop others. This can be used as a first pass of the conversion, however the author will still need to ensure the problem functions.  One area of attention should be the answer blanks, which may not be converted correctly."
 msgstr ""
 
@@ -9807,7 +10131,7 @@ msgstr ""
 msgid "This permission level and higher can use the problem grader (both the grader that is available on a problem page and the set-wide probelem grader)."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1282 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1532
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1223 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1473
 msgid "This problem has open subproblems.  You can visit them by using the links to the left or visiting the set page."
 msgstr ""
 
@@ -9816,11 +10140,11 @@ msgid "This problem is not valid."
 msgstr ""
 
 #. ($prettyID)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:420
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:421
 msgid "This problem uses the same source file as number %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:373
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:374
 msgid "This problem will not count toward your grade."
 msgstr ""
 
@@ -9843,7 +10167,7 @@ msgid "This sample mail would be sent to %1"
 msgstr ""
 
 #. (join('.', @seq)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1355
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1296
 msgid "This score for this problem does not count for the score of problem %1 or for the set."
 msgstr ""
 
@@ -9852,16 +10176,16 @@ msgstr ""
 msgid "This scoring message is generated from [TMPL]/email/%1. It is merged with the file [Scoring]/%2. These files can be edited using the \"Email\" link and the \"File Manager\" link in the left margin."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1076
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1079
 msgid "This secret word is used to validate logins from an LMS using LTI 1.1. This secret word must match the word configured in the LMS."
 msgstr ""
 
 #. (tag('strong', dir => 'ltr', format_set_name_display($setID)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:159
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:160
 msgid "This set %1 is assigned to %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:694
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:695
 msgid "This set doesn't contain any problems yet."
 msgstr ""
 
@@ -9874,7 +10198,7 @@ msgstr ""
 msgid "This set has a set-level proctor password to authorize logins. Enter the password below."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:366 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:70
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:367 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:76
 msgid "This set is hidden from students."
 msgstr ""
 
@@ -9887,7 +10211,7 @@ msgstr ""
 msgid "This set is not assigned to any students."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:365 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:366 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:74
 msgid "This set is visible to students."
 msgstr ""
 
@@ -9895,84 +10219,96 @@ msgstr ""
 msgid "This set or problem is not valid."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:190
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:199
 msgid "This set will be unavailable to students until they have earned the \"Score Required for Release\" on the sets specified in this field.  The sets should be written as a comma separated list."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:281
-msgid "This sets a number of minutes for each version of a test, once it is started.  Use \"0\" to indicate no time limit.  If there is a time limit, then there will be an indication that this is a timed test on the main \"Assignments\" page.  Additionally the student will be sent to a confirmation page beefore they can begin."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:290
+msgid "This sets a number of minutes for each version of a test, once it is started.  Use \"0\" to indicate no time limit.  If there is a time limit, then there will be an indication that this is a timed test on the main \"Assignments\" page.  Additionally the student will be sent to a confirmation page before they can begin. Note that the actual time a student will have to complete a timed test is the product of this time limit and the accommodation time factor set for the student in the accounts manager."
 msgstr ""
 
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:100
 msgid "This should be done cautiously. Once a student is deleted from a course their data is lost forever and cannot be recovered. They can be added to the course as a new student, but all of their assignment data has been permanently deleted."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2102
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2081
 msgid "This source file does not exist!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2101
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2080
 msgid "This source file is a directory!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2103
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2082
 msgid "This source file is not a plain file!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2100
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2079
 msgid "This source file is not readable!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:521
-msgid "This specifies the number of attempts before hints are shown to students. The value of -2 uses the default from course configuration. The value of -1 disables hints. Note that this will only have an effect if the problem has a hint."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:527
+msgid "This specifies the number of attempts before hints are shown to students. If \"Never\" is selected, then hints are disabled. Note that this will only have an effect if the problem has a hint."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:538
-msgid "This specifies the rerandomization period: the number of attempts before a new version of the problem is generated by changing the Seed value. The value of -1 uses the default from course configuration. The value of 0 disables rerandomization."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:541
+msgid "This specifies the rerandomization period: the number of attempts before a new version of the problem is generated by changing the Seed value. Randomization is disabled if \"Never\" is selected."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:715
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:717
 msgid "This test is closed.  No new test versions may be taken."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:779
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:781
 msgid "This test is not yet open."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:81
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:78
 msgid "This test requires a proctor password to continue."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:126
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:123
 msgid "This test requires a proctor password to start."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:829
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:828
 msgid "This test version is past due, but has not been graded. You can still grade the test for this user."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:502 /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:508
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:400 /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:407
 msgid "This user is not allowed to log in to this course"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:152
+msgid "Three code maintenance tools can be utilized. First, the code can be reformatted using perltidy. Using perltidy will change the code in the editor window, and save changes to the temporary file. In some cases (if the code contains backslashes or double tildes) this can result in odd spacing in the code. Second the code can be converted to PGML. This changes the code in text blocks to use PGML features. Generally the conversion of much of the formatting and LaTeX is performed correctly. However, answer blanks need attention. In any case, make sure to inspect the formatted code, and edit further or revert if needed. Third, the code can be analyzed by the \"PG Critic.\" This checks that the code does not use old or deprecated features of PG and conforms to current best-practices in problem authoring, and offers suggestions on how to fix issues that are found."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:24 /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:21
 msgid "Time"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:315
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:326
 msgid "Time Interval for New Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:188
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:189
 msgid "Time Remaining"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1049
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1052
 msgid "Time in seconds to periodically update LMS grades (-1 to disable)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:103
+msgid "Time interval"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:65
+msgid "Time interval:"
+msgstr ""
+
 #. ($c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date - $c->{set}->open_date)
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:355
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
 msgid "Time taken on test: %1 min (%2 min allowed)."
 msgstr ""
 
@@ -9988,13 +10324,13 @@ msgstr ""
 msgid "Title for course displayed on the Assignments page"
 msgstr ""
 
-#. (sprintf('%.0f', $restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:239
+#. (sprintf('%.0f', $set->restricted_status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Sets.pm:272
 msgid "To access this set you must score at least %1% on set %2."
 msgstr ""
 
-#. (sprintf('%.0f', $restriction)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:245
+#. (sprintf('%.0f', $set->restricted_status * 100)
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Sets.pm:278
 msgid "To access this set you must score at least %1% on the following sets: %2."
 msgstr ""
 
@@ -10002,11 +10338,11 @@ msgstr ""
 msgid "To assign one or more sets to an individual student click in the column \"Assigned Sets\" in the student's row. This will take you to a page where you can assign and unassign sets and change the due dates for homework on an individual basis."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:78
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:79
 msgid "To change status (scores or grades) for this student for one set, click on the individual set link."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:150
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:151
 msgid "To copy components from an existing course, select the course and check which components to copy."
 msgstr ""
 
@@ -10014,7 +10350,7 @@ msgstr ""
 msgid "To drop a student or students, select them for editing as described above and then set the pop-up list to enrolled, drop, or audit. Dropped students cannot log in to the course, are not assigned new sets and are not sent email. They can be re-enrolled simply by changing their status back to enrolled. No data is lost, any assignments assigned before they were dropped are restored unchanged."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:148
 msgid "To edit a specific student version of this set, edit (all of) her/his assigned sets."
 msgstr ""
 
@@ -10034,7 +10370,7 @@ msgstr ""
 msgid "To use the Email merge feature, upload a CSV with calculated grades to the scoring directory using the \"File Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:908 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:46 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:68
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:866 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:50 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:34 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:68
 msgid "Today"
 msgstr ""
 
@@ -10042,11 +10378,11 @@ msgstr ""
 msgid "Toggle Sidebar"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:100
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:86
 msgid "Toggle block comment. (Only has effect inside PGML blocks.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:96
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:82
 msgid "Toggle comment."
 msgstr ""
 
@@ -10054,11 +10390,11 @@ msgstr ""
 msgid "Toggle each of the options to include or not include in the output."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:490
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Stats.pm:488
 msgid "Top Score"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:132
 msgid "Top level of author information on the wiki."
 msgstr ""
 
@@ -10070,11 +10406,11 @@ msgstr ""
 msgid "Total Points:"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:382
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:393
 msgid "Totals only (not problem scores)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:383
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:394
 msgid "Totals only, only after answer date"
 msgstr ""
 
@@ -10102,17 +10438,17 @@ msgstr ""
 msgid "Type:"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:32 /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:23
 msgid "URI"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:906
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:909
 msgid "URL for the LMS"
 msgstr ""
 
 #. ($achievementName)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AchievementNotificationEditor.pm:217
-msgid "Unable to change the achievement notification template for achivement %1. Unknown error."
+msgid "Unable to change the achievement notification template for achievement %1. Unknown error."
 msgstr ""
 
 #. ($achievementName)
@@ -10140,6 +10476,10 @@ msgstr ""
 msgid "Unable to change the source file path for set %1, problem %2. Unknown error."
 msgstr ""
 
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvanced.pm:452 /opt/webwork/webwork2/lib/WeBWorK/Authen/LTIAdvantage.pm:312
+msgid "Unable to create a WeBWorK user. Please speak to your instructor or system administrator."
+msgstr ""
+
 #. ($c->shortPath($delFilePath)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:1345
 msgid "Unable to delete backup file \"%1\"."
@@ -10160,7 +10500,7 @@ msgstr ""
 msgid "Unable to disable the achievement notification template for achievement %1. Unknown error."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:574
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:573
 msgid "Unable to generate a valid test version. This is usually caused by invalid usage of grouping sets or a database error. Please speak to your instructor to fix the error. A system administrator can obtain more details on this error from the logs."
 msgstr ""
 
@@ -10173,7 +10513,7 @@ msgstr ""
 msgid "Unable to make \"%1\" the set header for %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:648
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:649
 msgid "Unable to obtain error messages from within the PG question."
 msgstr ""
 
@@ -10222,7 +10562,7 @@ msgstr ""
 msgid "Unarchive Course Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1295
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1296
 msgid "Unarchive More"
 msgstr ""
 
@@ -10247,11 +10587,11 @@ msgstr ""
 msgid "Unclassified Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:95
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:81
 msgid "Unfold all regions."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:92
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:78
 msgid "Unfold the region that begins on the current line."
 msgstr ""
 
@@ -10264,7 +10604,7 @@ msgid "Union"
 msgstr ""
 
 #. ($value)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:56
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:57
 msgid "Unknown: %1"
 msgstr ""
 
@@ -10273,7 +10613,7 @@ msgstr ""
 msgid "Unkown saveMode: %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:488
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:499
 msgid "Unlimited"
 msgstr ""
 
@@ -10302,11 +10642,11 @@ msgstr ""
 msgid "Unsupported archive type in file \"%1\""
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:104
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:105
 msgid "Update Display"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:88
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:89
 msgid "Update Grades"
 msgstr ""
 
@@ -10314,7 +10654,7 @@ msgstr ""
 msgid "Update Interval"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:968
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:971
 msgid "Update LMS grade with each submission"
 msgstr ""
 
@@ -10331,7 +10671,7 @@ msgstr ""
 msgid "Update aborted. No sets selected."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:69
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:70
 msgid "Update selected sets:"
 msgstr ""
 
@@ -10339,7 +10679,7 @@ msgstr ""
 msgid "Update the checked courses?"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:51
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/LTIUpdate.html.ep:52
 msgid "Update user:"
 msgstr ""
 
@@ -10381,7 +10721,7 @@ msgstr ""
 msgid "Updated grades via LTI of all sets assigned to user %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2019
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2020
 msgid "Updated location description."
 msgstr ""
 
@@ -10390,11 +10730,11 @@ msgid "Upgrade"
 msgstr ""
 
 #. ($upgrade_courseID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1364
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1365
 msgid "Upgrade %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1277
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1278
 msgid "Upgrade Course"
 msgstr ""
 
@@ -10414,7 +10754,7 @@ msgstr ""
 msgid "Upgrade courses from a previous version of WeBWorK."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1694
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1695
 msgid "Upgrade process completed"
 msgstr ""
 
@@ -10422,20 +10762,20 @@ msgstr ""
 msgid "Upload"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:57
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:64
 msgid "Upload, download and delete text files, including scoring spread sheets, set definition files, class list spread sheets, and \"PG\" problems."
 msgstr ""
 
 #. ($item->remaining_title($c)
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:43
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:63 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:73
 msgid "Use %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:17 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:60 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:67
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:36 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:91
 msgid "Use Achievement Reward"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:295
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:296
 msgid "Use Default Header File"
 msgstr ""
 
@@ -10542,7 +10882,7 @@ msgstr ""
 msgid "Use this page to send emails to active (enrolled or auditing) students.  Emails can be sent to all active students or selected students.  Use the \"Students\" form to sort, filter, or format how the user name is displayed. If multiple filters are selected and the \"Intersection\" radio button is used, the filters will  be applied in sequence, narrowing the results list.  If the \"Union\" button is used, the updated list will be the union of all results lists from the multiple filters.  Click \"Refresh List\" to apply any changes.  Use control-click or shift-click to select multiple students to email."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:167
 msgid "Use this to hide the existence of this set from students, even when it is assigned to them."
 msgstr ""
 
@@ -10587,7 +10927,7 @@ msgid "User %1 is not authorized to proctor test logins in this course."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:37
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:38
 msgid "User %1 not found."
 msgstr ""
 
@@ -10595,28 +10935,32 @@ msgstr ""
 msgid "User Actions"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:196 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:97 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/reset_otp_secrets_confirm.html.ep:8
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm:196 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:98 /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/reset_otp_secrets_confirm.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:156
 msgid "User ID"
 msgstr ""
 
 #: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:94
-msgid "User ID may contain only numbers, letters, hyphens, periods, and underscores."
+msgid "User ID may contain only numbers, letters, hyphens, periods, commas, at symbols, and underscores."
 msgstr ""
 
 #. ($_)
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:275
-msgid "User ID number %1 may only contain letters, numbers, hyphens, periods, commas, and underscores."
+msgid "User ID number %1 may only contain letters, numbers, hyphens, periods, commas, at symbols, and underscores."
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:87
+msgid "User ID:"
 msgstr ""
 
 #: /opt/webwork/webwork2/templates/ContentGenerator/PODViewer.html.ep:18
 msgid "User Interface"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:704 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:26
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:671 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep:26
 msgid "User Overrides"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2654
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2655
 msgid "User does not exist - Skipping"
 msgstr ""
 
@@ -10641,7 +10985,7 @@ msgid "User-Set Actions"
 msgstr ""
 
 #. ($user, $setID, $j)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1253
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1243
 msgid "UserProblem missing for user=%1 set=%2 problem=%3. This may indicate database corruption."
 msgstr ""
 
@@ -10653,7 +10997,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:418
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Routes.pm:425
 msgid "Users Assigned to Set %2"
 msgstr ""
 
@@ -10661,7 +11005,7 @@ msgstr ""
 msgid "Users Assigned to Set Help"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list.html.ep:99
 msgid "Users List"
 msgstr ""
 
@@ -10682,10 +11026,10 @@ msgid "Users at this level and higher are allowed to change their password. Norm
 msgstr ""
 
 #: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:548
-msgid "Users with at least this permission level get a link in the left panel for reporting bugs to the bug tracking system at bugs.webwork.maa.org."
+msgid "Users with at least this permission level get a link in the left panel for reporting issues at github.com/openwebwork/webwork2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:865
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:868
 msgid "Users with these permission levels will be sent feedback emails from students when they use the feedback button."
 msgstr ""
 
@@ -10713,7 +11057,7 @@ msgstr ""
 msgid "Usually means students must demonstrate understanding of facts. This is more than regurgitating the fact. We use this category for simple and direct applications of algorithms the student has studied. There should be no judgement involved in choosing the method. This would include a simple application of a rule for differentiation (e.g., can combine rules for sums and constant multiples with one more advanced rule) or for integrals."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:98
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:41 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:98
 msgid "Value"
 msgstr ""
 
@@ -10721,6 +11065,10 @@ msgstr ""
 msgid "Value of work done in Reduced Scoring Period"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:32
+msgid "Value:"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/ConfigObject.pm:67
 msgid "Variable Documentation"
 msgstr ""
@@ -10735,23 +11083,55 @@ msgid "Version"
 msgstr ""
 
 #. ($ver->{version})
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:183
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:180
 msgid "Version %1"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:169
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:106
+msgid "Version creation time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:68
+msgid "Version creation time:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:108
+msgid "Version last attempt time"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:70
+msgid "Version last attempt time:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:105
+msgid "Version time limit"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:67
+msgid "Version time limit:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:166
 msgid "Versions"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:47
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:48
 msgid "Versions of a set can only be edited for one user at a time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:331
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:342
 msgid "Versions per Interval"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:45 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:145 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:216 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:258 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:267 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:278 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:551
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:104
+msgid "Versions per interval"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:66
+msgid "Versions per interval:"
+msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager.html.ep:29 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep:45 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:145 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:216 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:258 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:267 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:279 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:552
 msgid "View"
 msgstr ""
 
@@ -10759,10 +11139,14 @@ msgstr ""
 msgid "View Problems"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:708
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:710
 msgid "View Test Version"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:61
+msgid "View and manage jobs in the job queue."
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:42
 msgid "View details of student perofrmance either by individual or by set."
 msgstr ""
@@ -10771,27 +11155,19 @@ msgstr ""
 msgid "View equations as"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:18
-msgid "View statistics by set"
-msgstr ""
-
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:19
-msgid "View statistics by student"
-msgstr ""
-
 #: /opt/webwork/webwork2/templates/HelpFiles/instructor_links.html.ep:40
 msgid "View statistics of students' performance on homework either by individual or by set."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:14
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/index.html.ep:9
 msgid "View student progress by set"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:15
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/index.html.ep:24
 msgid "View student progress by student"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/PGProblemEditor.pm:123 /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:125
 msgid "View/Reload"
 msgstr ""
 
@@ -10806,7 +11182,7 @@ msgstr ""
 #. ($course_info_path)
 #. ($c->{problem}->source_file)
 #. ($screenSetHeader)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1567 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:92 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:99
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1508 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSet.pm:98 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:99
 msgid "Viewing temporary file: %1"
 msgstr ""
 
@@ -10814,7 +11190,7 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Utils/FilterRecords.pm:142 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/FilterRecords.pm:142 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:97 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep:5
 msgid "Visible"
 msgstr ""
 
@@ -10822,15 +11198,19 @@ msgstr ""
 msgid "Visible Sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:149
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:158
 msgid "Visible to Students"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:61
+msgid "Visible:"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/FileManager/delete.html.ep:9
 msgid "Warning"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:138
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/warning_output.html.ep:13 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:142
 msgid "Warning messages"
 msgstr ""
 
@@ -10855,7 +11235,7 @@ msgid "Warning: This will make users need to setup two factor authentication aga
 msgstr ""
 
 #. ($problem_desc,				$c->tag('br')
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1208
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:1212
 msgid "Warnings encountered while processing %1. Error text: %2"
 msgstr ""
 
@@ -10868,11 +11248,11 @@ msgstr ""
 msgid "WeBWorK © %1 | theme: %2 | ww_version: %3 | pg_version %4"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:117 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:253
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:117 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:259
 msgid "WeBWorK Assignments"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:3
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:4
 msgid "WeBWorK Error"
 msgstr ""
 
@@ -10892,7 +11272,7 @@ msgstr ""
 msgid "WeBWorK expects many files to be in certain locations. The following describe this. Note that by default the File Manager shows the \"templates\" directory. Other directories mentioned below are at the same level and need to be accessed by going up a directory by clicking the \"^\" button above the file list."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:6
+#: /opt/webwork/webwork2/templates/ContentGenerator/Base/error_output.html.ep:8
 msgid "WeBWorK has encountered a software error while attempting to process this problem. It is likely that there is an error in the problem itself. If you are a student, report this error message to your professor to have it corrected. If you are a professor, please consult the error output below for more information."
 msgstr ""
 
@@ -10900,7 +11280,7 @@ msgstr ""
 msgid "WeBWorK has encountered warnings while processing your request. If this occurred when viewing a problem, it was likely caused by an error or ambiguity in that problem. Otherwise, it may indicate a problem with the WeBWorK system itself. If you are a student, report these warnings to your professor to have them corrected. If you are a professor, please consult the warning output below for more information."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:366
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:368
 msgid "WeBWorK was unable to generate a different version of this problem. Close this tab, and return to the original problem."
 msgstr ""
 
@@ -10908,7 +11288,7 @@ msgstr ""
 msgid "WeBWorK was unable to generate a paper copy of this homework set.  Please inform your instructor."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:471
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:482
 msgid "Weight"
 msgstr ""
 
@@ -10932,8 +11312,8 @@ msgstr ""
 msgid "What field should filtered users match on?"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:505
-msgid "When a student has more attempts than is specified here they will be able to view another version of this problem.  If set to -1 the feature is disabled and if set to -2 the course default is used."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:514
+msgid "When a student has more attempts than is specified here they will be able to view another version of this problem.  The \"Show Me Another\" feature is is disabled if \"Never\" is selected."
 msgstr ""
 
 #. (q/between pages, which will overwrite the student's saved answers./)
@@ -10945,7 +11325,7 @@ msgstr ""
 msgid "When editing users a column for editing passwords will be shown.  The text input in this column will show \"password set\" for users that have a password, and \"no password set\" for users that do not have a password. To set or change the password for a user enter the new password in the column for that user.  To delete the password for a user check the checkbox to the right. This means that the user will not be able to sign into the course using a password."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:243
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:252
 msgid "When location restrictions are applied (see \"Restrict Access by Location\") you may choose to relax those restrictions after the answer date.  In the case of a test, the set's answer date and the date of an individual version may differ, and you can choose which answer date to use.  For a set that is not a test, both options are interpreted as the regular set answer date."
 msgstr ""
 
@@ -10953,10 +11333,6 @@ msgstr ""
 msgid "When numerical answers are checked, most test if the student's answer is close enough to the programmed answer be computing the error as a percentage of the correct answer. This value controls the default for how close the student answer has to be in order to be marked correct.
    A value such as 0.1 means 0.1 percent error is allowed.
    "
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:834
-msgid "When students click the Email Instructor button to send feedback, WeBWorK fills in the subject line. Here you can set the subject line. In it, you can have various bits of information filled in with the following escape sequences.
    • %c = course ID
    • %u = user ID
    • %s = set ID
    • %p = problem ID
    • %x = section
    • %r = recitation
    • %% = literal percent sign
    "
-msgstr ""
-
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:20
 msgid "When the class is very large not all students will be displayed. Using the first action on this page you can show only the students from a given recitation or from a given section, or only students whose login or last name fits a pattern match. The second action will sort the students currently being displayed. You can also sort the displayed students by clicking on the active links at the top of each column."
 msgstr ""
@@ -10969,7 +11345,7 @@ msgstr ""
 msgid "When this is on students will see a line on the Grades page which has their total cumulative homework score. This score includes all sets assigned to the student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1135
+#: /opt/webwork/webwork2/lib/WeBWorK/ConfigValues.pm:1138
 msgid "When this is true, then when a user enters WeBWorK from an external tool link in the LMS, the bottom of the screen will display the data that the LMS passed to WeBWorK. This may be useful to debug LTI, especially because different LMS systems have different parameters."
 msgstr ""
 
@@ -10981,10 +11357,6 @@ msgstr ""
 msgid "When viewing progress for a single student, their grades page is shown which lists set totals and per problem grades for each set assigned to the student.  This shows the same information as the statistics page for the student."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorStats.html.ep:11
-msgid "When viewing set statistics, the drop down menus can be used to show stats for individual sections, recitations, or problems.  The overall results include all students who are assigned to the set, while the individual problem results only include active (have attempted the problem) students."
-msgstr ""
-
 #: /opt/webwork/webwork2/templates/HelpFiles/InstructorStudentProgress.html.ep:9
 msgid "When viewing student progress for a set, the score for the set and the status for problems in the set are listed for all students.  The table can be sorted by clicking the links in the table header.  Click the student's name to access the student's set.  When viewing progress for a test, additional columns can be shown/hidden by updating the display at the top"
 msgstr ""
@@ -11003,20 +11375,20 @@ msgstr ""
 msgid "When you unassign by unchecking a student's name, you destroy all of the data for assignment %1 for this student. You will then need to reassign the set to these students and they will receive new versions of the problems. Make sure this is what you want to do before unchecking students."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:71
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:72
 msgid "When you uncheck a homework set (and save the changes), you destroy all of the data for that set for this student.   If you reassign the set, the student will receive a new version of each problem. Make sure this is what you want to do before unchecking sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:112
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:111
 msgid "Wiki summary page for MathObjects"
 msgstr ""
 
 #. ($c->formatDateTime($set->open_date, $ce->{studentDateDisplayFormat})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:255 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:434 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:134
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:255 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Grades.pm:434 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:130
 msgid "Will open on %1."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:261
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:270
 msgid "With \"Homework\", students visit each problem one at a time.  They submit answers for one problem at a time and immediately receive feedback.  With \"Test\", students will submit all answers for all problems at once.  They may or may not receive feedback right away depending upon other settings.  Also a \"Test\" can have a time limit, where the student needs to start between the open date and the close date, but once started has only so much time.  Also a \"Test\" can be configured to allow taking new, re-randomized versions.  A \"Proctored Test\" is the same as a \"Test\", but in order to begin, either a classwide password specific to this set is needed, or a higher level user must enter their username and password on the student's screen. A \"Just in Time Assessment and Review\" set is like a \"Homework\" set, but can be configured to introduce more exercises when a student answers a given exercise incorrectly so many times."
 msgstr ""
 
@@ -11060,11 +11432,11 @@ msgstr ""
 msgid "Write permissions have not been enabled in the templates directory. No changes can be made."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:154 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:166 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:294 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:346 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:379 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:397 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:431 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:446 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:570 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:598 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:630 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:77 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:690 /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:136 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:57 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/reset_2fa_form.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:154 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:176 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:198 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:72
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:163 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:175 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:305 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:357 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:390 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:408 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:442 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:457 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:573 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:604 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:72 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:706 /opt/webwork/webwork2/templates/ContentGenerator/Hardcopy/form.html.ep:136 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep:57 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep:39 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/reset_2fa_form.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:154 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:176 /opt/webwork/webwork2/templates/ContentGenerator/Options.html.ep:198 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep:72
 msgid "Yes"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:131
 msgid "You are acting as another user and do not have permission to start a new test for other users."
 msgstr ""
 
@@ -11074,15 +11446,15 @@ msgid "You are acting as user %1 and do not have the permission to create a new
 msgstr ""
 
 #. ($effectiveUserID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:652
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:654
 msgid "You are acting as user %1.  If you continue, you will create a new version of this test for that user, which will count against their allowed maximum number of versions for the current time interval.  In general, this is not what you want to do.  Please be sure that you want to do this before clicking the \"Create New Test Version\" button below.  Alternatively, click \"Cancel\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:378
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:380
 msgid "You are currently checking answers to a different version of your problem.  These answers will not be recorded, and you should remember to return to your original problem once you are done here."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:391
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:393
 msgid "You are currently previewing answers to a different version of your problem - these will not be recorded, and you should remember to return to your original problem once you are done here."
 msgstr ""
 
@@ -11093,38 +11465,38 @@ msgstr ""
 
 #. (% $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
 #. ($ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100)
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:232 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:213 /opt/webwork/webwork2/templates/ContentGenerator/Problem/messages.html.ep:18
 msgid "You are in the Reduced Scoring Period.  All work counts for %1% of the original."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:151
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:144
 msgid "You are not allowed to act as a student."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:156
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:149
 msgid "You are not allowed to assign homework sets."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:370
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:393
 msgid "You are not allowed to delete %1."
 msgstr ""
 
 #. ($userSet->set_id, $c->tx->remote_address)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:250
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:253
 msgid "You are not allowed to generate a hardcopy for %1 from your IP address, %2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:153
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:146
 msgid "You are not allowed to modify homework sets."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:159
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Index.pm:152
 msgid "You are not allowed to modify student data."
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:481
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:504
 msgid "You are not allowed to reset two factor authenticatio for %1."
 msgstr ""
 
@@ -11132,15 +11504,15 @@ msgstr ""
 msgid "You are not allowed to send email."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:329
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:331
 msgid "You are not allowed to use Show Me Another for this problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail.html.ep:8 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Stats.html.ep:5 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress.html.ep:2
 msgid "You are not authorized to access instructor tools"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:65 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:200 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:6 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/JobManager.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:34 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:30 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:6 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:65 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:206 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AddUsers.html.ep:6 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Assigner.html.ep:4 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Index.html.ep:11 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/JobManager.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:16 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemGrader.html.ep:31 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:35 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:31 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/Scoring.html.ep:6 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SetMaker.html.ep:15 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList.html.ep:14 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep:4
 msgid "You are not authorized to access instructor tools."
 msgstr ""
 
@@ -11156,7 +11528,7 @@ msgstr ""
 msgid "You are not authorized to edit achievements."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:31
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:32
 msgid "You are not authorized to edit user specific information."
 msgstr ""
 
@@ -11168,15 +11540,15 @@ msgstr ""
 msgid "You are not authorized to manage course files"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:39
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep:21 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:40
 msgid "You are not authorized to modify problems."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:41
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:42
 msgid "You are not authorized to modify set definition files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:69 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:204 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:35
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvanced.pm:69 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/LTIAdvantage.pm:210 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList.html.ep:36
 msgid "You are not authorized to modify sets."
 msgstr ""
 
@@ -11192,7 +11564,7 @@ msgstr ""
 msgid "You are not authorized to modify the course configuration."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:233 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:211
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm:233 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:234
 msgid "You are not authorized to perform this action."
 msgstr ""
 
@@ -11212,29 +11584,29 @@ msgstr ""
 msgid "You are not authorized to view past answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:240
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:243
 msgid "You are not permitted to generate a hardcopy for a set with hidden work."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:225
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:228
 msgid "You are not permitted to generate a hardcopy for an unopened set."
 msgstr ""
 
 #. ($c->{showMeAnother}{MaxReps},)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:341
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:343
 msgid "You are only allowed to click on Show Me Another %quant(%1,time,times) per problem. Close this tab, and return to the original problem."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:263 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:284
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:244 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:265
 msgid "You are out of time!"
 msgstr ""
 
 #. (q/student's answers as you move between test pages, preview, or check answers.  /								. 'If you are planing to submit answers for this student, click "View Test Version" '								. 'below to continue.  If you only want to view the test version, click "Cancel" '								. 'below, then disable the permission to record answers when acting as a student '								. 'before viewing open test versions.',							$effectiveUserID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:705
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:707
 msgid "You are trying to view an open test version for %1 and have the permission to submit answers for that user.  This is dangerous, as your answers can overwrite the "
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:159
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:145
 msgid "You can also click \"Edit Selected Theme\" to edit a hardcopy theme.  The new theme will be saved to the templates/hardcopyThemes folder."
 msgstr ""
 
@@ -11324,23 +11696,23 @@ msgstr ""
 msgid "You can't view files of that type"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:949
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:950
 msgid "You cannot archive the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:826
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:827
 msgid "You cannot delete the course you are currently using."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:365
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:388
 msgid "You cannot delete yourself!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2537 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2646
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2538 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2647
 msgid "You cannot overwrite your OTP secret with one from another course or user!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:476
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:499
 msgid "You cannot reset two factor authentication for yourself!"
 msgstr ""
 
@@ -11348,7 +11720,7 @@ msgstr ""
 msgid "You cannot specify an absolute path"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:70
 msgid "You cannot use achievement rewards when acting as another user."
 msgstr ""
 
@@ -11356,11 +11728,11 @@ msgstr ""
 msgid "You didn't enter any message."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:292
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:296
 msgid "You do not have permission to access the requested file \"%1\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:148
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:151
 msgid "You do not have permission to change the hardcopy theme."
 msgstr ""
 
@@ -11368,12 +11740,16 @@ msgstr ""
 msgid "You do not have permission to edit this file."
 msgstr ""
 
-#. ($hardcopy_format)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:140
+#. (xml_escape($hardcopy_format)
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Hardcopy.pm:142
 msgid "You do not have permission to generate hardcopy in %1 format."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1120
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:14
+msgid "You do not have permission to list assignments in this course."
+msgstr ""
+
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1056
 msgid "You do not have permission to view the details of this error."
 msgstr ""
 
@@ -11389,56 +11765,56 @@ msgstr ""
 msgid "You don't have any rewards!"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:344
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:325
 msgid "You exceeded the allowed time."
 msgstr ""
 
 #. ($c->{numAttemptsLeft})
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:296
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:277
 msgid "You have %1 attempt(s) remaining on this test."
 msgstr ""
 
 #. ($c->{numAttemptsLeft},								$c->{numAttemptsLeft} - 1)
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:697
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:713
 msgid "You have %1 submissions remaining for this test.  If you say yes, then you will have %quant(%2,submission) remaining. Once all submissions have been used, your answers will be final and you will not be able to continue to work this test version."
 msgstr ""
 
 #. ($problem->max_attempts - $attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1229
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1170
 msgid "You have %negquant(%1,unlimited attempts,attempt,attempts) remaining."
 msgstr ""
 
 #. ($attempts_before_rr)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1176
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1117
 msgid "You have %quant(%1,attempt,attempts) left before new version will be requested."
 msgstr ""
 
 #. ($hours,						$minutes)
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:44
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:41
 msgid "You have %quant(%1,hour) and %quant(%2,minute) remaining to complete the currently open test."
 msgstr ""
 
 #. ($hours,						$minutes)
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:51
 msgid "You have %quant(%1,hour,hours,)%quant(%2,minute,minutes,) remaining to complete the currently open test."
 msgstr ""
 
 #. ($minutes,							$seconds)
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:61
 msgid "You have %quant(%1,minute) and %quant(%2,second) remaining to complete the currently open test."
 msgstr ""
 
 #. ($seconds)
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:72
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/version_list.html.ep:69
 msgid "You have %quant(%1,second) remaining to complete the currently open test."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:677
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:679
 msgid "You have already taken all available versions of this test in the current time interval. You may take the test again after the time interval has expired."
 msgstr ""
 
 #. ($attempts)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1202
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1143
 msgid "You have attempted this problem %quant(%1,time,times)."
 msgstr ""
 
@@ -11450,15 +11826,15 @@ msgstr ""
 msgid "You have been sent an email with instructions on how to set up an authenticator app to generate one-time passwords. Follow the instructions in that email, and then enter the security code shown below."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:278
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:259
 msgid "You have less than 1 minute to complete this test."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:258
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:239
 msgid "You have less than 45 seconds left!"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:257
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:238
 msgid "You have less than 90 seconds left to complete this assignment. You should finish it soon!"
 msgstr ""
 
@@ -11482,15 +11858,15 @@ msgstr ""
 msgid "You have specified an illegal working directory!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:491
-msgid "You may cap the number of attempts a student can use for the problem. Use -1 to indicate unlimited attempts."
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:501
+msgid "You may cap the number of attempts a student can use for the problem. Select \"Unlimited\" to allow an unlimited number of attempts."
 msgstr ""
 
 #: /opt/webwork/webwork2/templates/HelpFiles/AdminUnarchiveCourse.html.ep:15
 msgid "You may check the box to \"clean\" the unarchived course. This will remove student users and their associated data from the database after the course is unarchived. It will also remove the log files, any files in the scoring folder, and any temporary edited files."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:423
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:425
 msgid "You may check your answers to this problem without affecting the maximum number of tries to your original problem."
 msgstr ""
 
@@ -11498,7 +11874,7 @@ msgstr ""
 msgid "You may choose a course to copy components from. Select the course and which components to copy.  If the course is not a true course (like the modelCourse) then only the templates and html folders, and the simple and course config files can be copied. The \"simple config\" file contains the settings made in the \"Course Config\" page. The \"course config\" file should only be copied if you know what you are doing."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:225
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:234
 msgid "You may choose to restrict student access to this set to specified locations.  Alternatively, you may choose to block access from specified locations.  Locations are defined by the WeBWorK administrator by IP address or address range.  The list of defined locations will appear after saving this option with \"Restrict To\" or \"Deny From\"."
 msgstr ""
 
@@ -11507,11 +11883,11 @@ msgstr ""
 msgid "You may choose to show any of the following data. Correct answers, hints, and solutions are only available %1 after the answer date of the assignment."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:68
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:69
 msgid "You may not change this user's password!"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:63
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep:64
 msgid "You may not change your own password here!"
 msgstr ""
 
@@ -11519,15 +11895,15 @@ msgstr ""
 msgid "You may not follow symbolic links"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2516 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2702
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2517 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2703
 msgid "You may not reset your own OTP secret!"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:322
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:333
 msgid "You may set a time interval in minutes.  Within this time interval, students may start new randomized versions of the test.  However they may only start as many new versions as you set for \"Versions per Interval\".  When the time interval ends, the cap is reset.  This feature is intended to allow students an immediate retake, but require them to take a break (and perhaps study more) after too many low scoring attempts in close succession.  Use \"0\" to indicate an infinite time interval, which is what you want for an absolute cap on the number of new versions overall."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:369
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:352
 msgid "You may still check your answers."
 msgstr ""
 
@@ -11539,35 +11915,35 @@ msgstr ""
 msgid "You may trigger a grade update for all users or just one user."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:194
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorPGProblemEditor.html.ep:183
 msgid "You may want to create an unattached problem if you are using the current problem as a model for a new problem. You can add the new file to a homework set from the Library Browser or via the set detail page of the \"Sets Manager\"."
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:162
+#: /opt/webwork/webwork2/templates/HelpFiles/InstructorUserList.html.ep:172
 msgid "You might want to do this if you want to give full credit to everyone on a particular problem that was not worded correctly, or wasn't working properly. This is done from the \"Sets Manager\" page or the \"Instructor Tools\" page."
 msgstr ""
 
-#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}					? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
-#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:10
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}						? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/templates/ContentGenerator/ProblemSets.html.ep:11
 msgid "You must access assignments from your Course Management System (%1)."
 msgstr ""
 
+#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}				? $c->link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+#: /opt/webwork/webwork2/lib/WeBWorK/Utils/Sets.pm:298
+msgid "You must access this assignment from %1 before you can start."
+msgstr ""
+
 #. ($c->{showMeAnother}{TriesNeeded} - $c->{problem}->num_correct - $c->{problem}->num_incorrect)
 #: /opt/webwork/webwork2/templates/ContentGenerator/Problem/submit_buttons.html.ep:86
 msgid "You must attempt this problem %quant(%1,more time) before this feature is available"
 msgstr ""
 
 #. ($c->{showMeAnother}{TriesNeeded})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:354
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:356
 msgid "You must attempt this problem %quant(%1,time,times) before Show Me Another is available."
 msgstr ""
 
-#. ($ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}					? $c->link_to(						$ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ProblemSets.pm:195
-msgid "You must log into this set via your Learning Management System (%1)."
-msgstr ""
-
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:943
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:944
 msgid "You must select a course to archive"
 msgstr ""
 
@@ -11596,7 +11972,7 @@ msgstr ""
 msgid "You must specify a course ID."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1165 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1207 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1316 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2197 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2271 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:824 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:947
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1166 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1208 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:1317 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2198 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2272 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:825 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:948
 msgid "You must specify a course name."
 msgstr ""
 
@@ -11632,11 +12008,6 @@ msgstr ""
 msgid "You must specify an file name in order to save a new file."
 msgstr ""
 
-#. ($LMS)
-#: /opt/webwork/webwork2/lib/WeBWorK/Authz.pm:491
-msgid "You must use your Learning Management System (%1) to access this set.  Try logging in to the Learning Management System and visiting the set from there."
-msgstr ""
-
 #: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/SetMaker.pm:412
 msgid "You need to select a \"Target Set\" before you can edit it."
 msgstr ""
@@ -11661,17 +12032,17 @@ msgstr ""
 #. (wwRound(0,						compute_reduced_score($ce, $problem, $set, $pg->{result}{score}, $c->submitTime)
 #. (% wwRound(0, $rh_result->{problem_result}{score} * 100)
 #. (wwRound(0, $rh_result->{problem_result}{score} * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1210 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:53 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1151 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:54 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:29
 msgid "You received a score of %1 for this attempt."
 msgstr ""
 
 #. (join('.', @{ $problemSeqs[$next_id] })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1322
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1263
 msgid "You will not be able to proceed to problem %1 until you have completed, or run out of attempts, for this problem and its graded subproblems."
 msgstr ""
 
 #. (join('.', @{ $problemSeqs[$next_id] })
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1334
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1275
 msgid "You will not be able to proceed to problem %1 until you have completed, or run out of attempts, for this problem."
 msgstr ""
 
@@ -11735,44 +12106,44 @@ msgid "Your message was sent successfully."
 msgstr ""
 
 #. (wwRound(0, $problem->status * 100)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1220
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm:1161
 msgid "Your overall recorded score is %1.  %2"
 msgstr ""
 
 #. ('' . wwRound(2, $c->{recordedScore})
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:194 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:212
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:175 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:193
 msgid "Your recorded score for this version is %1/%2 (%3%)."
 msgstr ""
 
 #. ($setVersionID,						'' . wwRound(2, $c->{recordedScore})
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:336
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:317
 msgid "Your recorded score on this test (version %1) is %2/%3 (%4%)."
 msgstr ""
 
 # $testNounNum is either "test (#)" or "submission (#)"
 #. ($testNounNum)
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:159
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:140
 msgid "Your score on this %1 WAS recorded."
 msgstr ""
 
 # $testNoun is either "test" or "submission"
 #. ($testNoun, $c->{attemptScore}, $c->{totalPossible})
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:165
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:146
 msgid "Your score on this %1 is %2/%3."
 msgstr ""
 
 # $testNounNum is either "test (#)" or "submission (#)
 #. ($testNounNum)
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:155
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:136
 msgid "Your score on this %1 was NOT recorded."
 msgstr ""
 
 #. ($c->{attemptScore}, $c->{totalPossible})
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:207
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:188
 msgid "Your score on this (checked, not recorded) submission is %1/%2."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1039 /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:134
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1035 /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:134
 msgid "Your score was not recorded because there was a failure in storing the problem record to the database."
 msgstr ""
 
@@ -11784,20 +12155,20 @@ msgstr ""
 msgid "Your score was not recorded because this problem has not been assigned to you."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1061
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1057
 msgid "Your score was not recorded because this problem set version is not open."
 msgstr ""
 
 #. ($elapsed,						# Assume the allowed time is an even number of minutes.						($set->due_date - $set->open_date)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1075
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1071
 msgid "Your score was not recorded because you have exceeded the time limit for this test. (Time taken: %1 min; allowed: %2 min.)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1064
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1060
 msgid "Your score was not recorded because you have no attempts remaining on this set version."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1079 /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:225 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:58 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm:1075 /opt/webwork/webwork2/lib/WeBWorK/Utils/ProblemProcessing.pm:225 /opt/webwork/webwork2/templates/RPCRenderFormats/default.html.ep:59 /opt/webwork/webwork2/templates/RPCRenderFormats/default.json.ep:31
 msgid "Your score was not recorded."
 msgstr ""
 
@@ -11820,7 +12191,7 @@ msgstr ""
 msgid "Your score will be sent to %1 at a later time."
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:522
+#: /opt/webwork/webwork2/lib/WeBWorK/Authen.pm:533
 msgid "Your session has timed out due to inactivity. Please log in again."
 msgstr ""
 
@@ -11854,7 +12225,7 @@ msgstr ""
 msgid "account settings for one user"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:204
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:205
 msgid "achievements"
 msgstr ""
 
@@ -11879,7 +12250,7 @@ msgstr ""
 msgid "all course users"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep:19 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:68
 msgid "all current users"
 msgstr ""
 
@@ -11887,11 +12258,11 @@ msgstr ""
 msgid "all jobs"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2135
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2114
 msgid "all sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2121
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2100
 msgid "all students"
 msgstr ""
 
@@ -11900,12 +12271,12 @@ msgid "alphabetically"
 msgstr ""
 
 #. ($count, $numSets)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2139
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2118
 msgid "an impossible number of sets: %1 out of %2"
 msgstr ""
 
 #. ($count, $numUsers)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2125
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2104
 msgid "an impossible number of users: %1 out of %2"
 msgstr ""
 
@@ -11933,16 +12304,20 @@ msgstr ""
 msgid "assignments and dates for one user"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:198
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:199
 msgid "assignments/sets"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/layouts/system.html.ep:75
+msgid "auto"
+msgstr ""
+
 #: /opt/webwork/webwork2/lib/WeBWorK/Utils/FilterRecords.pm:69
 msgid "blank"
 msgstr ""
 
 # Context is "Append ____ blank problem template(s) to end of homework set"
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:705
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:706
 msgid "blank problem template(s) to end of homework set"
 msgstr ""
 
@@ -11950,30 +12325,38 @@ msgstr ""
 msgid "by last login date"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:48
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserDetail.html.ep:49
 msgid "class list data"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep:47 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:29
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep:47 /opt/webwork/webwork2/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep:48
 msgid "close"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/layouts/system.html.ep:62
+msgid "close sidebar"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/SampleProblemViewer/sample_problem.html.ep:91
 msgid "copy to clipboard"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:222
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:223
 msgid "course configuration file"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:216
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:217
 msgid "course institution (will override \"Institution\" input above)"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:210
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:211
 msgid "course title (will override \"Course Title\" input above)"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/layouts/system.html.ep:74
+msgid "dark"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/JobManager/sort_button.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/JobManager/sort_button.html.ep:22 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/JobManager/sort_button.html.ep:34 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_button.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/sort_button.html.ep:22 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_button.html.ep:10 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_button.html.ep:22 /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/sort_button.html.ep:34
 msgid "descending"
 msgstr ""
@@ -11982,11 +12365,11 @@ msgstr ""
 msgid "disabled achievements"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:131
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:132
 msgid "email address"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:54
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep:57
 msgid "empty"
 msgstr ""
 
@@ -12014,7 +12397,7 @@ msgstr ""
 msgid "finished"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:130
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:131
 msgid "first name"
 msgstr ""
 
@@ -12023,7 +12406,7 @@ msgid "for"
 msgstr ""
 
 #. ($j, $setID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1248
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1238
 msgid "global %1 for set %2 not found."
 msgstr ""
 
@@ -12035,7 +12418,7 @@ msgstr ""
 msgid "guest"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2171 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:794 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:913
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2172 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:795 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:914
 msgid "hidden"
 msgstr ""
 
@@ -12043,11 +12426,11 @@ msgstr ""
 msgid "html directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:361
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:362
 msgid "if status less than 1"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:719
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:749
 msgid "illegal character in input: '/'"
 msgstr ""
 
@@ -12059,12 +12442,12 @@ msgstr ""
 msgid "index"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:164
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep:165
 msgid "individual user settings"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:516
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:539
 msgid "insufficient permission to edit %1"
 msgstr ""
 
@@ -12072,15 +12455,19 @@ msgstr ""
 msgid "jobs that match on selected field"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:129
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:130
 msgid "last name"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/layouts/system.html.ep:74
+msgid "light"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep:87
 msgid "locations selected below"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:88
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:89
 msgid "login"
 msgstr ""
 
@@ -12088,7 +12475,7 @@ msgstr ""
 msgid "login ID"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:136
 msgid "login name"
 msgstr ""
 
@@ -12096,10 +12483,6 @@ msgstr ""
 msgid "login_proctor"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:614
-msgid "max"
-msgstr ""
-
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:8
 msgid "multiple sets"
 msgstr ""
@@ -12112,6 +12495,10 @@ msgstr ""
 msgid "new user accounts"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:5
+msgid "no"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/JobManager/delete_form.html.ep:7
 msgid "no jobs"
 msgstr ""
@@ -12120,11 +12507,11 @@ msgstr ""
 msgid "no location"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2133
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2112
 msgid "no sets"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2119
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:2098
 msgid "no students"
 msgstr ""
 
@@ -12136,10 +12523,14 @@ msgstr ""
 msgid "nobody"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:192
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:193
 msgid "non-student users"
 msgstr ""
 
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:77 /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.txt.ep:48
+msgid "none"
+msgstr ""
+
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep:109
 msgid "nth column of merge file"
 msgstr ""
@@ -12149,11 +12540,11 @@ msgid "of"
 msgstr ""
 
 # Context is Assign this set to which users?  "only ____"
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:65
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep:69
 msgid "only"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:46
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:47
 msgid "only best scores"
 msgstr ""
 
@@ -12170,15 +12561,15 @@ msgid "overwrite"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:513
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:536
 msgid "permissions for %1 not defined"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:265 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:557
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:267 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:563
 msgid "point"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:265 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:557
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/ShowMeAnother.pm:267 /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:563
 msgid "points"
 msgstr ""
 
@@ -12186,11 +12577,11 @@ msgstr ""
 msgid "preserve"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:622
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:638
 msgid "preview answers"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:70
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:71
 msgid "problems"
 msgstr ""
 
@@ -12210,37 +12601,37 @@ msgstr ""
 msgid "progress for one user"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:134
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:135
 msgid "recitation"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:82
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:83
 msgid "recitation #"
 msgstr ""
 
 #. ($userID)
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:511
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm:534
 msgid "record for visible user %1 not found"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1374 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:178
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetDetail.pm:1357 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm:178
 msgid "required"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:132
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:133
 msgid "score"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:133
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:134
 msgid "section"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:76
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:77
 msgid "section #"
 msgstr ""
 
 #. ('templates', 'html')
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:174
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:175
 msgid "select all"
 msgstr ""
 
@@ -12284,7 +12675,7 @@ msgstr ""
 msgid "shown"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:186
+#: /opt/webwork/webwork2/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep:187
 msgid "simple configuration file"
 msgstr ""
 
@@ -12292,7 +12683,7 @@ msgstr ""
 msgid "statistics for one set"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:158
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:157
 msgid "still open"
 msgstr ""
 
@@ -12300,12 +12691,12 @@ msgstr ""
 msgid "student"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:128
 msgid "submission"
 msgstr ""
 
 #. ($setVersionID)
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:150
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:131
 msgid "submission (version %1)"
 msgstr ""
 
@@ -12325,15 +12716,15 @@ msgstr ""
 msgid "templates/macros directory"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:147
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:128
 msgid "test"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:52
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:53
 msgid "test date"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:58
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:59
 msgid "test time"
 msgstr ""
 
@@ -12341,11 +12732,11 @@ msgstr ""
 msgid "then delete them"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:161
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/Instructor/StudentProgress.pm:160
 msgid "time limit exceeded"
 msgstr ""
 
-#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:64
+#: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep:65
 msgid "time remaining"
 msgstr ""
 
@@ -12355,11 +12746,11 @@ msgid "to"
 msgstr ""
 
 #. ($ce->{institutionName})
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:419
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:420
 msgid "to %1 main web site"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:403
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator.pm:404
 msgid "to courses page"
 msgstr ""
 
@@ -12392,14 +12783,18 @@ msgid "version %1"
 msgstr ""
 
 #. ($setVersionID)
-#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:151
+#: /opt/webwork/webwork2/templates/ContentGenerator/GatewayQuiz.html.ep:132
 msgid "version (%1)"
 msgstr ""
 
-#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2173 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:796 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:915
+#: /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:2174 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:797 /opt/webwork/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm:916
 msgid "visible"
 msgstr ""
 
 #: /opt/webwork/webwork2/templates/ContentGenerator/Instructor/UserList/import_form.html.ep:16
 msgid "visible users"
 msgstr ""
+
+#: /opt/webwork/webwork2/templates/ContentGenerator/Feedback/feedback_email.html.ep:4
+msgid "yes"
+msgstr ""
diff --git a/lib/WeBWorK/Utils.pm b/lib/WeBWorK/Utils.pm
index 86a2e91a90..2048c66b56 100644
--- a/lib/WeBWorK/Utils.pm
+++ b/lib/WeBWorK/Utils.pm
@@ -30,7 +30,10 @@ our @EXPORT_OK = qw(
 	processEmailMessage
 	createEmailSenderTransportSMTP
 	generateURLs
+	formatEmailSubject
 	getAssetURL
+	points_stepsize
+	round_nearest_stepsize
 	x
 );
 
@@ -356,7 +359,6 @@ sub generateURLs ($c, %params) {
 				for my $name ('displayMode', 'showCorrectAnswers', 'showHints', 'showOldAnswers', 'showSolutions') {
 					$args{$name} = [ $c->param($name) ] if defined $c->param($name) && $c->param($name) ne '';
 				}
-				$args{showProblemGrader} = 1;
 			} else {
 				$routePath = $c->url_for('problem_list', setID => $params{set_id});
 			}
@@ -382,6 +384,33 @@ sub generateURLs ($c, %params) {
 	}
 }
 
+sub formatEmailSubject ($formatString, $courseID, $userID, $setID, $problemID, $section, $recitation) {
+	my %subject_map = (
+		c   => $courseID,
+		u   => $userID,
+		s   => $setID,
+		p   => $problemID,
+		x   => $section,
+		r   => $recitation,
+		'%' => '%',
+	);
+	my $chars   = join('', keys %subject_map);
+	my $subject = $formatString;
+	# extract the brace pairs
+	my @braces = $formatString =~ /(\{(?:[^{}]*|(?0))*\})/xg;
+	if (@braces) {
+		# for each brace pair, do substitutions, but leave %c etc when variable is empty
+		my %braces = map { $_ => $_ =~ s/%([$chars])/$subject_map{$1} ne '' ? $subject_map{$1} : "%$1"/egr } @braces;
+		# If there is an instance of %c, etc, nullify the whole thing. Remove outer braces.
+		%braces = map { $_ => $braces{$_} =~ /%[$chars]/ ? '' : substr($braces{$_}, 1, -1) } keys %braces;
+		my $regex = join('|', map {"\Q$_\E"} keys %braces);
+		$regex = qr/$regex/;
+		$subject =~ s/($regex)/$braces{$1}/g;
+	}
+	$subject =~ s/%([$chars])/$subject_map{$1} ne '' ? $subject_map{$1} : ''/eg;
+	return $subject;
+}
+
 my $staticWWAssets;
 my $staticPGAssets;
 my $thirdPartyWWDependencies;
@@ -506,6 +535,28 @@ sub getAssetURL ($ce, $file, $isThemeFile = 0) {
 	return "$ce->{webworkURLs}{htdocs}/$file";
 }
 
+sub points_stepsize ($points) {
+	my $stepsize;
+	if ($points == 1) {
+		$stepsize = 0.01;
+	} elsif ($points <= 5) {
+		$stepsize = 0.05;
+	} elsif ($points <= 10) {
+		$stepsize = 0.1;
+	} elsif ($points <= 25) {
+		$stepsize = 0.25;
+	} elsif ($points <= 50) {
+		$stepsize = 0.5;
+	} else {
+		$stepsize = int(($points - 1) / 100) + 1;
+	}
+	return $stepsize;
+}
+
+sub round_nearest_stepsize ($score, $stepsize) {
+	return wwRound(2, wwRound(0, $score / $stepsize) * $stepsize);
+}
+
 sub x (@args) { return @args }
 
 1;
@@ -736,6 +787,22 @@ Returns the URL for the asset specified in C<$file>.  If C<$isThemeFile> is
 true, then the asset will be assumed to be located in a theme directory.  The
 parameter C<$ce> must be a valid C object.
 
+=head2 points_stepsize
+
+Usage: C
+
+Returns a reasonable stepsize that best converts between a whole percent and
+a point value. The stepsize is the point value that is close to but greater
+than or equal to 1% per step. This is done by first using preset values of
+0.01, 0.05, 0.1, 0.25, or 0.5, then using only whole point values, such that
+the stepsize is greater than or equal to 1% of total points.
+
+=head2 round_nearest_stepsize
+
+Usage: C
+
+Returns the value of the score rounded to the nearest stepsize.
+
 =head2 x
 
 Usage: C
diff --git a/lib/WeBWorK/Utils/CourseManagement.pm b/lib/WeBWorK/Utils/CourseManagement.pm
index cafe7f5d9a..097b837d89 100644
--- a/lib/WeBWorK/Utils/CourseManagement.pm
+++ b/lib/WeBWorK/Utils/CourseManagement.pm
@@ -126,10 +126,9 @@ sub listArchivedCourses {
 
 %options must contain:
 
- courseID      => course ID for the new course,
- ce            => a course environment for the new course,
- courseOptions => hash ref explained below
- users         => array ref explained below
+ courseID => course ID for the new course,
+ ce       => a course environment for the new course,
+ users    => array ref explained below
 
 %options may contain:
 
@@ -150,12 +149,6 @@ Create a new course with ID $courseID.
 $ce is a WeBWorK::CourseEnvironment object that describes the new course's
 environment.
 
-$courseOptions is a reference to a hash containing the following options:
-
-    PRINT_FILE_NAMES_FOR => $pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR}
-
-C is a reference to an array.
-
 $users is a list of arrayrefs, each containing a User, Password, and
 PermissionLevel record for a single user:
 
@@ -187,11 +180,10 @@ sub addCourse {
 		debug("$key  : $value");
 	}
 
-	my $courseID      = $options{courseID};
-	my $sourceCourse  = $options{copyFrom} // '';
-	my $ce            = $options{ce};
-	my %courseOptions = %{ $options{courseOptions} // {} };
-	my @users         = exists $options{users} ? @{ $options{users} } : ();
+	my $courseID     = $options{courseID};
+	my $sourceCourse = $options{copyFrom} // '';
+	my $ce           = $options{ce};
+	my @users        = exists $options{users} ? @{ $options{users} } : ();
 
 	debug \@users;
 
@@ -432,7 +424,12 @@ sub addCourse {
 		my $courseEnvFile = $ce->{courseFiles}{environment};
 		open my $fh, ">:utf8", $courseEnvFile
 			or die "failed to open $courseEnvFile for writing.\n";
-		writeCourseConf($fh, $ce, %courseOptions);
+		my $addOnConf     = $options{addOnConf} // [];
+		my $relConfFolder = File::Spec->abs2rel($ce->{webworkDirs}{addOnConf}, $ce->{webworkDirs}{root});
+		for (@$addOnConf) {
+			$_ = File::Spec->catfile($relConfFolder, $_);
+		}
+		writeCourseConf($fh, $addOnConf);
 		close $fh;
 	}
 
@@ -498,9 +495,9 @@ sub addCourse {
 %options may also contain:
 
  skipDBRename => $skipDBRename,
- courseTitle => $courseTitle
- courseInstitution => $courseInstitution
-
+ courseTitle => $courseTitle,
+ courseInstitution => $courseInstitution,
+ updateLTICourseMap => $updateLTICourseMap
 
 Rename the course named $courseID to $newCourseID.
 
@@ -509,16 +506,16 @@ environment.
 
 The name of the course's directory is changed to $newCourseID.
 
-If the course's database layout is C or C, new tables
-are created in the current database, course data is copied from the old tables
-to the new tables, and the old tables are deleted.
-
-If the course's database layout is something else, no database changes are made.
+New tables are created in the current database, course data is copied from the
+old tables to the new tables, and the old tables are deleted.
 
 If $skipDBRename is true, no database changes are made. This is useful if a
 course is being unarchived and no database was found, or for renaming the
 modelCourse.
 
+If $updateLTICourseMap is true, then the LTI course map is updated to associate
+the LMS context id to the new course name.
+
 Any errors encountered while renaming the course are returned.
 
 =cut
@@ -635,6 +632,16 @@ sub renameCourse {
 			}
 		};
 		warn "Problems from resetting course title and institution = $@" if $@;
+
+		# Remap the LTI course mapping for the renamed course to the new course if that is requested.
+		if ($options{updateLTICourseMap}) {
+			my @ltiCourseMaps = $newDB->getLTICourseMapsWhere({ course_id => $oldCE->{courseName} });
+			$newDB->deleteLTICourseMapWhere({ course_id => $oldCE->{courseName} });
+			for (@ltiCourseMaps) {
+				$newDB->setLTICourseMap($newCE->{courseName}, $_->lms_context_id);
+				last;
+			}
+		}
 	}
 }
 
@@ -1170,45 +1177,34 @@ sub protectQString {
 	return $string;
 }
 
-=item writeCourseConf($fh, $ce, %options)
+=item writeCourseConf($fh, $addOnConf)
 
-Writes a course.conf file to $fh, a file handle, using defaults from the course
-environment object $ce and overrides from %options. %options can contain any of
-the pairs accepted in %courseOptions by addCourse(), above.
+Writes the course.conf file to C<$fh>, a file handle. System administrators can
+use this file to override global settings for a course.  If C<$addOnConf> is
+provided, then it should be a reference to an array of config files to be
+included at the end of the course.conf file.
 
 =back
 
 =cut
 
 sub writeCourseConf {
-	my ($fh, $ce, %options) = @_;
+	my ($fh, $addOnConf) = @_;
 
-	print $fh <<'EOF';
+	my $content = <<'EOF';
 #!perl
 
 # This file is used to override the global WeBWorK course environment for this course.
 
 EOF
 
-	print $fh <<'EOF';
-# Users for whom to label problems with the PG file name (global value typically "professor")
-# For users in this list, PG will display the source file name when rendering a problem.
-# defaults.config values:
-EOF
-
-	if (defined $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR}) {
-		print $fh "# \t", '$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = [',
-			join(", ",
-			map { "'" . protectQString($_) . "'" } @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} }),
-			'];', "\n";
-	} else {
-		print $fh "# \t", '$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = [ ];', "\n";
+	if (ref $addOnConf eq 'ARRAY') {
+		for my $conf (@$addOnConf) {
+			$content .= "\ninclude('$conf');";
+		}
 	}
 
-	if (defined $options{PRINT_FILE_NAMES_FOR}) {
-		print $fh '$pg{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} = [',
-			join(", ", map { "'" . protectQString($_) . "'" } @{ $options{PRINT_FILE_NAMES_FOR} }), '];', "\n";
-	}
+	print $fh $content;
 }
 
 sub get_SeedCE
diff --git a/lib/WeBWorK/Utils/DateTime.pm b/lib/WeBWorK/Utils/DateTime.pm
index daf02f3c87..b3a164f338 100644
--- a/lib/WeBWorK/Utils/DateTime.pm
+++ b/lib/WeBWorK/Utils/DateTime.pm
@@ -3,7 +3,8 @@ use Mojo::Base 'Exporter', -signatures;
 
 use DateTime;
 use DateTime::TimeZone;
-use Time::Zone qw(tz_offset);
+use Time::Zone     qw(tz_offset);
+use WeBWorK::Utils qw(max);
 
 our @EXPORT_OK = qw(
 	before
@@ -13,6 +14,7 @@ our @EXPORT_OK = qw(
 	getDefaultSetDueDate
 	parseDateTime
 	timeToSec
+	getExtensionTime
 );
 
 sub before ($time, $now = time) { return $now < $time }
@@ -226,6 +228,26 @@ sub verify_timezone ($display_tz) {
 	return 'America/New_York';
 }
 
+sub getExtensionTime ($c, $base) {
+	my $hours    = $base * max(int($c->ce->{achievementExtensionFactor} * 24 + 0.5), 1);
+	my $time     = 3600 * $hours;
+	my $days     = int($hours / 24);
+	my $timeText = '';
+
+	if ($days > 2) {
+		$hours -= 24 * $days;
+		if ($hours) {
+			$timeText = $c->maketext('[_1] days and [quant,_2,hour,hours]', $days, $hours);
+		} else {
+			$timeText = $c->maketext('[_1] days', $days);
+		}
+	} else {
+		$timeText = $c->maketext('[quant,_1,hour,hours]', $hours);
+	}
+
+	return ($time, $timeText);
+}
+
 1;
 
 =head1 NAME
@@ -311,4 +333,18 @@ and issue warning.
 Note that this method is not exported, and can only be used internally by this
 package.
 
+=head2 getExtensionTime
+
+Usage: C
+
+Determines the length of an extension based on the course environment extension
+time factor setting and C<$base> time. The C<$base> time is the number of days
+for the base extension. The extension time is rounded to the nearest full hour
+and cannot be less than C<$base> hours.
+
+Returns an array consisting of the extension time in seconds and a translated
+string stating the length of the extension. The translated string will state
+the number of days and hours if greater than or equal to 3 days, otherwise
+state only the number of hours.
+
 =cut
diff --git a/lib/WeBWorK/Utils/FilterRecords.pm b/lib/WeBWorK/Utils/FilterRecords.pm
index 5c65bfc314..ea796a04db 100644
--- a/lib/WeBWorK/Utils/FilterRecords.pm
+++ b/lib/WeBWorK/Utils/FilterRecords.pm
@@ -182,7 +182,7 @@ sub filterRecords {
 	my @filteredRecords = $intersect ? @records : ();
 	if ($intersect) {
 		for my $filter (@filtersToUse) {
-			my ($name, $value) = split(/:/, $filter);
+			my ($name, $value) = split(/:/, $filter, 2);
 			# permission level is handled differently
 			if ($name eq 'permission') {
 				@filteredRecords =
@@ -194,7 +194,7 @@ sub filterRecords {
 	} else {
 		for my $record (@records) {
 			for my $filter (@filtersToUse) {
-				my ($name, $value) = split(/:/, $filter);
+				my ($name, $value) = split(/:/, $filter, 2);
 				# permission level is handled differently
 				if ($name eq 'permission' && $permissionName{ $permissionLevels{ $record->user_id } } eq $value) {
 					push @filteredRecords, $record;
diff --git a/lib/WeBWorK/Utils/Instructor.pm b/lib/WeBWorK/Utils/Instructor.pm
index 62aa3eb942..8e4716673e 100644
--- a/lib/WeBWorK/Utils/Instructor.pm
+++ b/lib/WeBWorK/Utils/Instructor.pm
@@ -554,10 +554,7 @@ sub getDefList {
 	find(
 		{
 			wanted => sub {
-				if ($File::Find::dir =~ /^$topdir\/Library/
-					|| $File::Find::dir =~ /^$topdir\/Contrib/
-					|| $File::Find::dir =~ /^$topdir\/capaLibrary/)
-				{
+				if ($File::Find::dir =~ /^$topdir\/Library/ || $File::Find::dir =~ /^$topdir\/Contrib/) {
 					$File::Find::prune = 1;
 					return;
 				}
diff --git a/lib/WeBWorK/Utils/ListingDB.pm b/lib/WeBWorK/Utils/ListingDB.pm
index 589da814c8..528ac038a6 100644
--- a/lib/WeBWorK/Utils/ListingDB.pm
+++ b/lib/WeBWorK/Utils/ListingDB.pm
@@ -286,7 +286,7 @@ sub getDBListings ($c, $amcounter = 0) {
 	if ($amcounter) {
 		$selectwhat = "COUNT(DISTINCT $selectwhat)";
 	} else {
-		$selectwhat .= 'as filepath, pgf.morelt_id, pgf.pgfile_id, pgf.static, pgf.MO';
+		$selectwhat .= 'as filepath, MAX(pgf.morelt_id), MAX(pgf.pgfile_id), MAX(pgf.static), MAX(pgf.MO)';
 		$group_by = 'GROUP BY filepath';
 	}
 
@@ -308,7 +308,7 @@ sub getDBListings ($c, $amcounter = 0) {
 				ts.chapter_id = tc.chapter_id AND
 				prob.section_id = ts.section_id AND
 				p.path_id = pgf.path_id
-				$extrawhere $textextrawhere $kw_where $group_by";
+				$extrawhere $textextrawhere $kw_where $group_by ORDER BY FIELD('pgf.libraryroot', 'Library')";
 
 		$pg_file_ref =
 			$dbh->selectall_arrayref($query, {}, @select_parameters, @textInfo_parameters, @keyword_parameters);
@@ -319,7 +319,7 @@ sub getDBListings ($c, $amcounter = 0) {
 				dbc.DBchapter_id = dbsc.DBchapter_id AND
 				dbsc.DBsection_id = pgf.DBsection_id AND
 				p.path_id = pgf.path_id
-				$extrawhere $kw_where $group_by";
+				$extrawhere $kw_where $group_by ORDER BY FIELD('pgf.libraryroot', 'Library')";
 
 		$pg_file_ref = $dbh->selectall_arrayref($query, {}, @select_parameters, @keyword_parameters);
 	}
diff --git a/lib/WeBWorK/Utils/PODParser.pm b/lib/WeBWorK/Utils/PODParser.pm
deleted file mode 100644
index e11b5899a3..0000000000
--- a/lib/WeBWorK/Utils/PODParser.pm
+++ /dev/null
@@ -1,66 +0,0 @@
-package WeBWorK::Utils::PODParser;
-use parent qw(Pod::Simple::XHTML);
-
-use strict;
-use warnings;
-
-use Pod::Simple::XHTML;
-use File::Basename qw(basename);
-
-# $podFiles must be provided in order for pod links to local files to work.  It should be the
-# first return value of the POD::Simple::Search survey method.
-sub new {
-	my ($invocant, $podFiles) = @_;
-	my $class = ref $invocant || $invocant;
-	my $self  = $class->SUPER::new(@_);
-	$self->perldoc_url_prefix("https://metacpan.org/pod/");
-	$self->index(1);
-	$self->backlink(1);
-	$self->html_charset('UTF-8');
-	$self->{podFiles} = $podFiles // {};
-	return bless $self, $class;
-}
-
-# Attempt to resolve links to local files.  If a local file is not found, then
-# let Pod::Simple::XHTML resolve to a cpan link.
-sub resolve_pod_page_link {
-	my ($self, $target, $section) = @_;
-
-	unless (defined $target) {
-		print "Using internal page link.\n" if $self->{verbose} > 2;
-		return $self->SUPER::resolve_pod_page_link($target, $section);
-	}
-
-	my $podFound;
-	for (keys %{ $self->{podFiles} }) {
-		if ($target eq $_ =~ s/lib:://r || $target eq basename($self->{podFiles}{$_}) =~ s/\.pod$//r) {
-			$podFound =
-				$self->{assert_html_ext} ? ($self->{podFiles}{$_} =~ s/\.(pm|pl|pod)$/.html/r) : $self->{podFiles}{$_};
-			last;
-		}
-	}
-
-	if ($podFound) {
-		my $pod_url = $self->encode_entities($podFound =~ s/^$self->{source_root}/$self->{base_url}/r)
-			. ($section ? '#' . $self->idify($self->encode_entities($section), 1) : '');
-		print "Resolved local pod link for $target" . ($section ? "/$section" : '') . " to $pod_url\n"
-			if $self->{verbose} > 2;
-		return $pod_url;
-	}
-
-	print "Using cpan pod link for $target" . ($section ? "/$section" : '') . "\n" if $self->{verbose} > 2;
-	return $self->SUPER::resolve_pod_page_link($target, $section);
-}
-
-# Trim spaces from the beginning of each line in code blocks.  This attempts to
-# trim spaces from all lines in the code block in the same amount as there are
-# spaces at the beginning of the first line. Note that Pod::Simple::XHTML has
-# already converted tab characters into 8 spaces.
-sub handle_code {
-	my ($self, $code) = @_;
-	my $start_spaces = length(($code =~ /^( *)/)[0]) || '';
-	$self->SUPER::handle_code($code =~ s/^( {1,$start_spaces})//gmr);
-	return;
-}
-
-1;
diff --git a/lib/WeBWorK/Utils/ProblemProcessing.pm b/lib/WeBWorK/Utils/ProblemProcessing.pm
index 02d8ba18a8..cfe9ba8903 100644
--- a/lib/WeBWorK/Utils/ProblemProcessing.pm
+++ b/lib/WeBWorK/Utils/ProblemProcessing.pm
@@ -13,7 +13,7 @@ use Try::Tiny;
 use Mojo::JSON qw(encode_json decode_json);
 
 use WeBWorK::Debug;
-use WeBWorK::Utils                      qw(encodeAnswers createEmailSenderTransportSMTP);
+use WeBWorK::Utils                      qw(encodeAnswers createEmailSenderTransportSMTP formatEmailSubject);
 use WeBWorK::Utils::DateTime            qw(before after);
 use WeBWorK::Utils::JITAR               qw(jitar_id_to_seq jitar_problem_adjusted_status);
 use WeBWorK::Utils::Logs                qw(writeLog writeCourseLog);
@@ -298,7 +298,7 @@ sub create_ans_str_from_responses ($formFields, $pg, $needed_grading = 0) {
 	my @past_answers_order;
 	my @last_answer_order;
 
-	my %pg_answers_hash = %{ $pg->{PG_ANSWERS_HASH} };
+	my %pg_answers_hash = %{ $pg->{PG_ANSWERS_HASH} // {} };
 	for my $ans_id (@{ $pg->{flags}{ANSWER_ENTRY_ORDER} // [] }) {
 		$scores_string .= ($pg_answers_hash{$ans_id}{rh_ans}{score} // 0) >= 1 ? '1' : '0';
 		push @answerTypes, $pg_answers_hash{$ans_id}{rh_ans}{type} // '';
@@ -326,7 +326,7 @@ sub create_ans_str_from_responses ($formFields, $pg, $needed_grading = 0) {
 	# KEPT_EXTRA_ANSWERS needs to be stored in last_answer in order to preserve persistence items.
 	# The persistence items do not need to be stored in past_answers_string.
 	# Don't add _ext_data items.  Those are stored elsewhere.
-	for my $entry_id (@{ $pg->{flags}{KEPT_EXTRA_ANSWERS} }) {
+	for my $entry_id (@{ $pg->{flags}{KEPT_EXTRA_ANSWERS} // [] }) {
 		next if exists($answers_to_store{$entry_id}) || $entry_id =~ /^_ext_data/;
 		$answers_to_store{$entry_id} = $formFields->{$entry_id};
 		push @last_answer_order, $entry_id;
@@ -383,19 +383,12 @@ sub jitar_send_warning_email ($c, $userProblem) {
 
 	$problemID = join('.', jitar_id_to_seq($problemID));
 
-	my %subject_map = (
-		'c' => $courseID,
-		'u' => $userID,
-		's' => $setID,
-		'p' => $problemID,
-		'x' => $user->section,
-		'r' => $user->recitation,
-		'%' => '%',
+	my $subject = formatEmailSubject(
+		$ce->{mail}{feedbackSubjectFormat},
+		$courseID, $userID, $setID, $problemID,
+		$user ? $user->section    : '',
+		$user ? $user->recitation : ''
 	);
-	my $chars   = join('', keys %subject_map);
-	my $subject = $ce->{mail}{feedbackSubjectFormat}
-		|| 'WeBWorK question from %c: %u set %s/prob %p';    # default if not entered
-	$subject =~ s/%([$chars])/defined $subject_map{$1} ? $subject_map{$1} : ""/eg;
 
 	my $full_name     = $user->full_name;
 	my $email_address = $user->email_address;
diff --git a/lib/WeBWorK/Utils/Rendering.pm b/lib/WeBWorK/Utils/Rendering.pm
index c87be8a842..bdad7c6164 100644
--- a/lib/WeBWorK/Utils/Rendering.pm
+++ b/lib/WeBWorK/Utils/Rendering.pm
@@ -172,7 +172,6 @@ sub constructPGOptions ($ce, $user, $set, $problem, $psvn, $formFields, $transla
 	$options{templateDirectory} = "$ce->{courseDirs}{templates}/";
 	$options{tempDirectory}     = "$ce->{courseDirs}{html_temp}/";
 	$options{tempURL}           = "$ce->{courseURLs}{html_temp}/";
-	$options{webworkDocsURL}    = "$ce->{webworkURLs}{docs}/";
 	$options{localHelpURL}      = "$ce->{pg}{URLs}{localHelpURL}/";
 	$options{MathJaxURL}        = $ce->{webworkURLs}{MathJax};
 	$options{server_root_url}   = $ce->{server_root_url} || '';
@@ -192,7 +191,6 @@ sub constructPGOptions ($ce, $user, $set, $problem, $psvn, $formFields, $transla
 		tmpl => $ce->{courseDirs}{templates},    # ditto
 	};
 
-	# Variables for interpreting capa problems and other things to be seen in a pg file.
 	$options{specialPGEnvironmentVars} = $ce->{pg}{specialPGEnvironmentVars};
 
 	return %options;
@@ -254,16 +252,15 @@ sub renderPG ($c, $effectiveUser, $set, $problem, $psvn, $formFields, $translati
 		};
 
 		if (ref($pg->{pgcore}) eq 'PGcore') {
-			$ret->{internal_debug_messages} = $pg->{pgcore}->get_internal_debug_messages;
-			$ret->{warning_messages}        = $pg->{pgcore}->get_warning_messages();
-			$ret->{debug_messages}          = $pg->{pgcore}->get_debug_messages();
-			$ret->{PG_ANSWERS_HASH}         = {
+			$ret->{warning_messages} = $pg->{pgcore}->get_warning_messages();
+			$ret->{debug_messages}   = $pg->{pgcore}->get_debug_messages();
+			$ret->{PG_ANSWERS_HASH}  = {
 				map {
 					$_ => {
 						response_obj => unbless($pg->{pgcore}{PG_ANSWERS_HASH}{$_}->response_obj),
 						rh_ans       => $pg->{pgcore}{PG_ANSWERS_HASH}{$_}{ans_eval}{rh_ans}
 					}
-				}
+					}
 					keys %{ $pg->{pgcore}{PG_ANSWERS_HASH} }
 			};
 			$ret->{resource_list} = {
@@ -271,6 +268,8 @@ sub renderPG ($c, $effectiveUser, $set, $problem, $psvn, $formFields, $translati
 					keys %{ $pg->{pgcore}{PG_alias}{resource_list} }
 			};
 			$ret->{PERSISTENCE_HASH} = $pg->{pgcore}{PERSISTENCE_HASH};
+		} else {
+			$ret->{render_fail} = 1;
 		}
 
 		# Save the problem source. This is used by Caliper::Entity. Why?
@@ -279,7 +278,7 @@ sub renderPG ($c, $effectiveUser, $set, $problem, $psvn, $formFields, $translati
 		$pg->free;
 		return $ret;
 	})->catch(sub ($err) {
-		return { body_text => '', answers => {}, flags => { error_flag => 1 }, errors => $err };
+		return { body_text => '', answers => {}, render_fail => 1, flags => { error_flag => 1 }, errors => $err };
 	});
 }
 
diff --git a/lib/WeBWorK/Utils/Routes.pm b/lib/WeBWorK/Utils/Routes.pm
index bb5101069c..93070f9ba0 100644
--- a/lib/WeBWorK/Utils/Routes.pm
+++ b/lib/WeBWorK/Utils/Routes.pm
@@ -23,6 +23,7 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE ROUTES BELOW!!!
  ltiadvantage_launch                 /ltiadvantage/launch
  ltiadvantage_keys                   /ltiadvantage/keys
  ltiadvantage_content_selection      /ltiadvantage/content_selection
+ ltiadvantage_registration           /ltiadvantage/registration
 
  saml2_acs                           /saml2/acs
  saml2_metadata                      /saml2/metadata
@@ -86,7 +87,6 @@ PLEASE FOR THE LOVE OF GOD UPDATE THIS IF YOU CHANGE THE ROUTES BELOW!!!
  instructor_statistics               /$courseID/instructor/stats
  instructor_set_statistics           /$courseID/instructor/stats/set/$setID
  instructor_problem_statistics       /$courseID/instructor/stats/set/$setID/$problemID
- instructor_user_statistics          /$courseID/instructor/stats/student/$userID
 
  instructor_progress                 /$courseID/instructor/progress
  instructor_set_progress             /$courseID/instructor/progress/set/$setID
@@ -147,6 +147,7 @@ my %routeParameters = (
 			ltiadvantage_launch
 			ltiadvantage_keys
 			ltiadvantage_content_selection
+			ltiadvantage_registration
 			saml2_acs
 			saml2_metadata
 			saml2_error
@@ -217,6 +218,12 @@ my %routeParameters = (
 		path   => '/ltiadvantage/content_selection',
 		action => 'content_selection'
 	},
+	ltiadvantage_registration => {
+		title  => x('LTI 1.3 Registration'),
+		module => 'LTIAdvantage',
+		path   => '/ltiadvantage/registration',
+		action => 'registration'
+	},
 
 	# This route also ends up at the login screen on failure, and the title is not used anywhere else.
 	saml2_acs => {
@@ -483,7 +490,7 @@ my %routeParameters = (
 	},
 	instructor_statistics => {
 		title    => x('Statistics'),
-		children => [qw(instructor_set_statistics instructor_user_statistics)],
+		children => [qw(instructor_set_statistics)],
 		module   => 'Instructor::Stats',
 		path     => '/stats'
 	},
@@ -498,11 +505,6 @@ my %routeParameters = (
 		module => 'Instructor::Stats',
 		path   => '/'
 	},
-	instructor_user_statistics => {
-		title  => '[_1]',
-		module => 'Instructor::Stats',
-		path   => '/student/#userID'
-	},
 	instructor_progress => {
 		title    => x('Student Progress'),
 		children => [qw(instructor_set_progress instructor_user_progress)],
@@ -614,7 +616,8 @@ sub setup_content_generator_routes_recursive {
 			ref($routeParameters{$child}{path}) eq 'HASH'
 			? %{ $routeParameters{$child}{path} }
 			: $routeParameters{$child}{path})->name($child);
-		$child_route->any($routeParameters{$child}{methods} // (), '/')->to("$routeParameters{$child}{module}#$action")
+		$child_route->any($routeParameters{$child}{methods} // (), '/')
+			->to("$routeParameters{$child}{module}#$action")
 			->name($child);
 		for (@{ $routeParameters{$child}{children} }) {
 			setup_content_generator_routes_recursive($child_route, $_);
diff --git a/lib/WeBWorK/Utils/Sets.pm b/lib/WeBWorK/Utils/Sets.pm
index e522adc711..aa54003337 100644
--- a/lib/WeBWorK/Utils/Sets.pm
+++ b/lib/WeBWorK/Utils/Sets.pm
@@ -17,6 +17,7 @@ our @EXPORT_OK = qw(
 	is_restricted
 	get_test_problem_position
 	list_set_versions
+	restricted_set_message
 );
 
 sub format_set_name_internal ($set_name) {
@@ -107,7 +108,7 @@ sub grade_set ($db, $set, $studentName, $setIsVersioned = 0, $wantProblemDetails
 }
 
 sub grade_gateway ($db, $setName, $studentName) {
-	my $bestSetData = [ 0, 0 ];
+	my $bestSetData = [ 0, 0, [] ];
 
 	my @setVersions = $db->getSetVersionsWhere({ user_id => $studentName, set_id => { like => "$setName,v\%" } });
 	for (@setVersions) {
@@ -255,6 +256,53 @@ sub list_set_versions ($db, $studentName, $setName, $setIsVersioned = 0) {
 	return (\@allSetNames, $notAssignedSet);
 }
 
+sub restricted_set_message($c, $set, $status) {
+	my $ce    = $c->ce;
+	my $db    = $c->db;
+	my $authz = $c->authz;
+
+	if ($status eq 'conditional') {
+		my $user       = $c->param('effectiveUser') || $c->param('user');
+		my @restricted = $ce->{options}{enableConditionalRelease} ? is_restricted($db, $set, $user) : ();
+		return '' unless @restricted;
+
+		if (@restricted == 1) {
+			return $c->maketext(
+				'To access this set you must score at least [_1]% on set [_2].',
+				sprintf('%.0f', $set->restricted_status * 100),
+				$c->tag('span', dir => 'ltr', format_set_name_display($restricted[0]))
+			);
+		} else {
+			return $c->maketext(
+				'To access this set you must score at least [_1]% on the following sets: [_2].',
+				sprintf('%.0f', $set->restricted_status * 100),
+				join(', ', map { $c->tag('span', dir => 'ltr', format_set_name_display($_)) } @restricted)
+			);
+		}
+	}
+
+	if ($status eq 'lti') {
+		# Only show this message if unable to view unopened sets or acting as another user.
+		return ''
+			if $authz->hasPermissions($c->param('user'), 'view_unopened_sets')
+			&& (!$c->param('effectiveUser') || $c->param('effectiveUser') eq $c->param('user'));
+
+		if ($ce->{LTIVersion}
+			&& ($ce->{LTIVersion} ne 'v1p3' || !$ce->{LTI}{v1p3}{ignoreMissingSourcedID})
+			&& $ce->{LTIGradeMode} eq 'homework'
+			&& !$set->lis_source_did)
+		{
+			return $c->maketext(
+				'You must access this assignment from [_1] before you can start.',
+				$ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+				? $c->link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
+				: $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name}
+			);
+		}
+		return '';
+	}
+}
+
 1;
 
 =head1 NAME
@@ -354,4 +402,12 @@ assigned to the set.  The list of names will be a list of set versions if the
 set is versioned (i.e., if C is true), and a list containing
 only the original set id otherwise.
 
+=head2 restricted_set_message
+
+Usage: C
+
+Checks for and returns any restricted messages for the given set and status.
+C<$status> can be either 'conditional' for conditional release, or 'lti' to
+check for lis_source_did when using homework grade passback.
+
 =cut
diff --git a/lib/WebworkWebservice.pm b/lib/WebworkWebservice.pm
index d8f9a28a5e..ef4f03f29d 100644
--- a/lib/WebworkWebservice.pm
+++ b/lib/WebworkWebservice.pm
@@ -4,7 +4,7 @@ package WebworkWebservice;
 
 WebworkWebservice
 
-=head1 SYNPOSIS
+=head1 SYNOPSIS
 
     my $rpc_service = WebworkWebservice->new($c);
     await $rpc_service->rpc_execute('command_to_execute');
@@ -248,16 +248,17 @@ sub command_permission {
 
 		# WebworkWebservice::ProblemActions
 		getUserProblem => 'access_instructor_tools',
-		# Note: The modify_student_data permission is checked in the following three methods and only the status and
-		# comment_string can actually be modified by users with the problem_grader permission only.
+		# Note: The modify_student_data permission is checked in the following three methods and only the status,
+		# sub_status, and comment_string can actually be modified by users with the problem_grader permission only.
 		putUserProblem    => 'problem_grader',
 		putProblemVersion => 'problem_grader',
 		putPastAnswer     => 'problem_grader',
 		tidyPGCode        => 'access_instructor_tools',
 		convertCodeToPGML => 'access_instructor_tools',
+		runPGCritic       => 'access_instructor_tools',
 
 		# WebworkWebservice::RenderProblem
-		renderProblem => 'proctor_quiz_login',
+		renderProblem => 'webservice_render_problem',
 
 		# WebworkWebservice::SetActions
 		listGlobalSets        => 'access_instructor_tools',
diff --git a/lib/WebworkWebservice/ProblemActions.pm b/lib/WebworkWebservice/ProblemActions.pm
index 3252bcdaa8..a93babdf56 100644
--- a/lib/WebworkWebservice/ProblemActions.pm
+++ b/lib/WebworkWebservice/ProblemActions.pm
@@ -8,6 +8,7 @@ use Data::Structure::Util qw(unbless);
 
 use WeBWorK::PG::Tidy          qw(pgtidy);
 use WeBWorK::PG::ConvertToPGML qw(convertToPGML);
+use WeBWorK::PG::Critic        qw(critiquePGCode);
 
 sub getUserProblem {
 	my ($invocant, $self, $params) = @_;
@@ -37,16 +38,17 @@ sub putUserProblem {
 			'source_file',          'value',               'max_attempts', 'showMeAnother',
 			'showMeAnotherCount',   'prPeriod',            'prCount',      'problem_seed',
 			'attempted',            'last_answer',         'num_correct',  'num_incorrect',
-			'att_to_open_children', 'counts_parent_grade', 'sub_status',   'flags'
+			'att_to_open_children', 'counts_parent_grade', 'flags'
 			)
 		{
 			$userProblem->{$_} = $params->{$_} if defined $params->{$_};
 		}
 	}
 
-	# The status is the only thing that users with the problem_grader permission can change.
+	# The status and sub_status are the only things that users with the problem_grader permission can change.
 	# This method cannot be called without the problem_grader permission.
-	$userProblem->{status} = $params->{status} if defined $params->{status};
+	$userProblem->{status}     = $params->{status}     if defined $params->{status};
+	$userProblem->{sub_status} = $params->{sub_status} if defined $params->{sub_status};
 
 	# Remove the needs_grading flag if the mark_graded parameter is set.
 	$userProblem->{flags} =~ s/:needs_grading$// if $params->{mark_graded};
@@ -76,16 +78,17 @@ sub putProblemVersion {
 			'source_file',          'value',               'max_attempts', 'showMeAnother',
 			'showMeAnotherCount',   'prPeriod',            'prCount',      'problem_seed',
 			'attempted',            'last_answer',         'num_correct',  'num_incorrect',
-			'att_to_open_children', 'counts_parent_grade', 'sub_status',   'flags'
+			'att_to_open_children', 'counts_parent_grade', 'flags'
 			)
 		{
 			$problemVersion->{$_} = $params->{$_} if defined($params->{$_});
 		}
 	}
 
-	# The status is the only thing that users with the problem_grader permission can change.
+	# The status and sub_status are the only things that users with the problem_grader permission can change.
 	# This method cannot be called without the problem_grader permission.
-	$problemVersion->{status} = $params->{status} if defined $params->{status};
+	$problemVersion->{status}     = $params->{status}     if defined $params->{status};
+	$problemVersion->{sub_status} = $params->{sub_status} if defined $params->{sub_status};
 
 	# Remove the needs_grading flag if the mark_graded parameter is set.
 	$problemVersion->{flags} =~ s/:needs_grading$// if $params->{mark_graded};
@@ -165,4 +168,18 @@ sub convertCodeToPGML {
 
 }
 
+sub runPGCritic {
+	my ($invocant, $self, $params) = @_;
+
+	return {
+		ra_out => {
+			html => $self->c->render_to_string(
+				template   => 'ContentGenerator/Instructor/PGProblemEditor/pg_critic',
+				violations => [ critiquePGCode($params->{pgCode}) ]
+			)
+		},
+		text => 'The script pg-critic has been run successfully.'
+	};
+}
+
 1;
diff --git a/lib/WebworkWebservice/RenderProblem.pm b/lib/WebworkWebservice/RenderProblem.pm
index 00217577f3..08d8ec4c91 100644
--- a/lib/WebworkWebservice/RenderProblem.pm
+++ b/lib/WebworkWebservice/RenderProblem.pm
@@ -26,6 +26,14 @@ async sub renderProblem {
 	# is enabled.  That is an expensive method to always call here.
 	debug(pretty_print_rh($rh)) if $WeBWorK::Debug::Enabled;
 
+	# If the problem source is provided, check user is allow to render problem source.
+	if (!$ws->authz->hasPermissions($rh->{user}, 'webservice_render_source')
+		&& ($rh->{problemSource} || $rh->{rawProblemSource} || $rh->{uriEncodedProblemSource}))
+	{
+		$ws->error_string(__PACKAGE__ . ": User $rh->{user} does not have permission to render problem source.");
+		return {};
+	}
+
 	my $problemSeed = $rh->{problemSeed} // '1234';
 
 	my $beginTime = Benchmark->new;
@@ -250,26 +258,23 @@ async sub renderProblem {
 
 	# New version of output:
 	return {
-		text                    => $pg->{body_text},
-		header_text             => $pg->{head_text},
-		post_header_text        => $pg->{post_header_text},
-		answers                 => $pg->{answers},
-		errors                  => $pg->{errors},
-		pg_warnings             => $pg->{warnings},
-		PG_ANSWERS_HASH         => $pg->{PG_ANSWERS_HASH},
-		PERSISTENCE_HASH        => $pg->{PERSISTENCE_HASH},
-		problem_result          => $pg->{result},
-		problem_state           => $pg->{state},
-		flags                   => $pg->{flags},
-		psvn                    => $psvn,
-		problem_seed            => $problemSeed,
-		resource_list           => $pg->{resource_list},
-		warning_messages        => ref $pg->{warning_messages} eq 'ARRAY' ? $pg->{warning_messages} : [],
-		debug_messages          => ref $pg->{debug_messages} eq 'ARRAY'   ? $pg->{debug_messages}   : [],
-		internal_debug_messages => ref $pg->{internal_debug_messages} eq 'ARRAY'
-		? $pg->{internal_debug_messages}
-		: [],
-		compute_time => logTimingInfo($beginTime, Benchmark->new),
+		text             => $pg->{body_text},
+		header_text      => $pg->{head_text},
+		post_header_text => $pg->{post_header_text},
+		answers          => $pg->{answers},
+		errors           => $pg->{errors},
+		pg_warnings      => $pg->{warnings},
+		PG_ANSWERS_HASH  => $pg->{PG_ANSWERS_HASH},
+		PERSISTENCE_HASH => $pg->{PERSISTENCE_HASH},
+		problem_result   => $pg->{result},
+		problem_state    => $pg->{state},
+		flags            => $pg->{flags},
+		psvn             => $psvn,
+		problem_seed     => $problemSeed,
+		resource_list    => $pg->{resource_list},
+		warning_messages => ref $pg->{warning_messages} eq 'ARRAY' ? $pg->{warning_messages} : [],
+		debug_messages   => ref $pg->{debug_messages} eq 'ARRAY'   ? $pg->{debug_messages}   : [],
+		compute_time     => logTimingInfo($beginTime, Benchmark->new),
 	};
 }
 
diff --git a/templates/ContentGenerator/Achievements/achievement_items.html.ep b/templates/ContentGenerator/Achievements/achievement_items.html.ep
index 53e3fc1b25..98c8d230e3 100644
--- a/templates/ContentGenerator/Achievements/achievement_items.html.ep
+++ b/templates/ContentGenerator/Achievements/achievement_items.html.ep
@@ -15,7 +15,7 @@
 		
    
 			<%= $item->remaining_title($c) %>
 		
    
-		
    <%= maketext($item->description) %>
    
+		
    <%= maketext(@{ $item->description }) %>
    
 	% }
 	
 % } else {
diff --git a/templates/ContentGenerator/Base/error_output.html.ep b/templates/ContentGenerator/Base/error_output.html.ep
index b6960ba065..5533a7f94d 100644
--- a/templates/ContentGenerator/Base/error_output.html.ep
+++ b/templates/ContentGenerator/Base/error_output.html.ep
@@ -1,11 +1,12 @@
 % use Date::Format;
 %
-
    <%= maketext('WeBWorK Error') %>
    
+% unless (stash->{briefErrorOutput}) {
+	
    <%= maketext('WeBWorK Error') %>
    
+% }
 
    
 	<%= maketext(
-		'WeBWorK has encountered a software error while attempting to process this problem. It is likely that '
-		. 'there is an error in the problem itself. If you are a student, report this error message to your '
-		. 'professor to have it corrected. If you are a professor, please consult the error output below for '
+		'WeBWorK has encountered a software error. If you are a student, report this error message to your '
+		. 'instructor to have it corrected. If you are a instructor, please consult the error output below for '
 		. 'more information.'
 		) %>
 
    
@@ -15,6 +16,7 @@
 
    
 	<%== ref $details =~ /SCALAR/i ? $$details : ref $details =~ /ARRAY/i ? join('', @$details) : $details %>
 
    
+% last if stash->{briefErrorOutput};
 
    <%= maketext('Request information') %>
    
 
diff --git a/templates/ContentGenerator/Base/footer.html.ep b/templates/ContentGenerator/Base/footer.html.ep
index 35638afa6b..d8a778e669 100644
--- a/templates/ContentGenerator/Base/footer.html.ep
+++ b/templates/ContentGenerator/Base/footer.html.ep
@@ -1,4 +1,4 @@
-
+
diff --git a/templates/ContentGenerator/Base/links.html.ep b/templates/ContentGenerator/Base/links.html.ep
index f45f2f9b2e..171206b58b 100644
--- a/templates/ContentGenerator/Base/links.html.ep
+++ b/templates/ContentGenerator/Base/links.html.ep
@@ -221,31 +221,8 @@
 			% # Statistics
 			
  • 
 				<%= $makelink->('instructor_statistics') %>
-				% if ($userID ne $eUserID || defined $setID || defined $urlUserID) {
-				
      
-					% if (defined $urlUserID) {
-						
    • 
-							<%= $makelink->(
-								'instructor_user_statistics',
-								text     => $urlUserID,
-								captures => { userID => $urlUserID },
-								link_attrs => { dir => 'ltr' }
-							) %>
-						
      • 
-					% }
-					% if ($userID ne $eUserID && (!defined $urlUserID || $urlUserID ne $eUserID)) {
-						
    • 
-							<%=	$makelink->(
-								'instructor_user_statistics',
-								text     => $eUserID,
-								captures => { userID => $eUserID },
-								active   => current_route eq 'instructor_user_statistics'
-									&& !defined $urlUserID,
-								link_attrs => { dir => 'ltr' }
-							) %>
-						
      • 
-					% }
-					% if (defined $setID) {
+				% if (defined $setID) {
+					
        
 						
      • 
 							<%= $makelink->(
 								'instructor_set_statistics',
@@ -270,8 +247,7 @@
 								
      
 							
 						% }
-					% }
-				
    
+					
 				% }
 			
    • 
 			% # Student Progress
diff --git a/templates/ContentGenerator/Base/login_status.html.ep b/templates/ContentGenerator/Base/login_status.html.ep
index 1e835b84ff..aca49ad3ca 100644
--- a/templates/ContentGenerator/Base/login_status.html.ep
+++ b/templates/ContentGenerator/Base/login_status.html.ep
@@ -6,10 +6,12 @@
 	% my $effectiveUserID = param('effectiveUser');
 	% my $userName        = $user->full_name || $user->user_id;
 	%
-	<%= maketext('Logged in as [_1].', $userName) %>
-	<%= link_to $c->systemLink(url_for 'logout'), class => 'btn btn-light btn-sm ms-2', begin %>
-	<%= maketext('Log Out') %> 
-	<% end %>
+	
    
+		<%= maketext('Logged in as [_1].', $userName) %>
+		<%= link_to $c->systemLink(url_for 'logout'), class => 'btn btn-light btn-sm ms-2', begin %>
+		<%= maketext('Log Out') %> 
+		<% end %>
+	
    
 	%
 	% if ($effectiveUserID ne $userID) {
 		% my $effectiveUser = $db->getUser($effectiveUserID);
@@ -22,13 +24,14 @@
 			% ? join(' ', $effectiveUser->full_name, '(' . $effectiveUser->user_id . ')')
 			% : $effectiveUser->user_id;
 		%
-		
    
-		<%= maketext('Acting as [_1].', $effectiveUserName) %>
-		<%= link_to $c->systemLink(url_for, params => { effectiveUser => $userID }),
-			class => 'btn btn-light btn-sm ms-2', begin %>
-		<%= maketext('Stop Acting') %> 
-		<% end %>
+		
    
+			<%= maketext('Acting as [_1].', $effectiveUserName) %>
+			<%= link_to $c->systemLink(url_for, params => { effectiveUser => $userID }),
+				class => 'btn btn-light btn-sm ms-2', begin %>
+			<%= maketext('Stop Acting') %> 
+			<% end %>
+		
    
 	% }
 % } else {
-	<%= maketext('Not logged in.') =%>
+	
    <%= maketext('Not logged in.') %>
    
 % }
diff --git a/templates/ContentGenerator/Base/problem_warning_and_debug_output.html.ep b/templates/ContentGenerator/Base/problem_warning_and_debug_output.html.ep
new file mode 100644
index 0000000000..9faf5184c0
--- /dev/null
+++ b/templates/ContentGenerator/Base/problem_warning_and_debug_output.html.ep
@@ -0,0 +1,34 @@
+% if ($warnings) {
+	
    
+		
    
+			
    <%= maketext('PG warning messages') %>
    
+			
      
+				% for (split m/\n+/, $warnings) {
+					
    • <%== $_ %>
      • 
+				% }
+			
    
+		
    
+	
    
+% }
+% if (@$warning_messages) {
+	
    
+		
    
+			
    <%= maketext('PG processing warning messages') %>
    
+			
      
+				% for (@$warning_messages) {
+					
    • <%== $_ %>
      • 
+				% }
+			
    
+		
    
+	
    
+% }
+% if (@$debug_messages) {
+	
    
+		
    
+			
    <%= maketext('PG debug messages') %>
    
+			% for (@$debug_messages) {
+				
    <%== $_ %>
    
+			% }
+		
    
+	
    
+% }
diff --git a/templates/ContentGenerator/Base/warning_output.html.ep b/templates/ContentGenerator/Base/warning_output.html.ep
index ace4b696a5..f51c5935da 100644
--- a/templates/ContentGenerator/Base/warning_output.html.ep
+++ b/templates/ContentGenerator/Base/warning_output.html.ep
@@ -3,17 +3,15 @@
 
    <%= maketext('WeBWorK Warnings') %>
    
 	<%= maketext(
-		'WeBWorK has encountered warnings while processing your request. If this occurred when viewing '
-			. 'a problem, it was likely caused by an error or ambiguity in that problem. Otherwise, it may indicate '
-			. 'a problem with the WeBWorK system itself. If you are a student, report these warnings to your '
-			. 'professor to have them corrected. If you are a professor, please consult the warning output below '
-			. 'for more information.'
+		'WeBWorK has encountered warnings while processing your request. This indicates a problem with the WeBWorK '
+			. 'system. If you are a student, report these warnings to your instructor to have them corrected. If you '
+			. 'are a instructor, please consult the warning output below for more information.'
 	) %>
 
    <%= maketext('Warning messages') %>
      
 	% for (@$warnings) {
-		
    • <%= $_ %>
      • 
+		
    • <%= $_ %>
      • 
 	% }
 
    <%= maketext('Request information') %>
    
diff --git a/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep
index d6e1ee1413..694071b8e6 100644
--- a/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep
@@ -1,5 +1,9 @@
 % use WeBWorK::Utils::CourseManagement qw(listCourses);
 %
+% content_for js => begin
+    <%= javascript getAssetURL($ce, 'js/CourseAdmin/restrict_select.js'), defer => undef =%>
+% end
+%
 % # Create an array of permission values for the permission selects.
 % my $permissionLevels = [];
 % for my $role (sort { $ce->{userRoles}{$a} <=> $ce->{userRoles}{$b} } keys %{ $ce->{userRoles} }) {
@@ -217,26 +221,63 @@
 				<%= maketext('course institution (will override "Institution" input above)') =%>
 			
-		
    
-			
-		
    
+		% my @addOnConfFiles;
+		% if (-d $ce->{webworkDirs}{addOnConf}) {
+			% @addOnConfFiles = glob "$ce->{webworkDirs}{addOnConf}/*.conf";
+			% for (0 .. $#addOnConfFiles){
+				% $addOnConfFiles[$_] =~ s/^.*\/|\.conf$//g;
+			% }
+		% }
+		% if (@addOnConfFiles) {
+			
    
+				<%= label_for add_on_conf => maketext('Configuration File:'),
+					class => 'col-auto col-form-label fw-bold' =%>
+				
    
+					<%= select_field add_on_conf => [
+							c(
+								maketext('Default')
+									=> [ [ maketext('Use distribution default config file') => '', selected => undef ] ],
+								'data-single' => 'true',
+							),
+							c(
+								maketext('Source Course')
+									=> [ [ maketext("Use source course's config file") => '*' ] ],
+								'data-single' => 'true'
+							),
+							c(
+								maketext('Append to distribution default')
+									=> [ map { [ $_ => "$_.conf" ] } @addOnConfFiles ]
+							)
+						],
+						id       => 'add_on_conf',
+						multiple => undef,
+						size     => 8,
+						class    => 'form-select' =%>
+				
    
+			
    
+		% } else {
+			
    
+				
+			
    
+		% }
 	
 	<%= hidden_field last_page_was_add_course => 1 =%>
 	<%= $c->hidden_fields('number_of_additional_users') =%>
diff --git a/templates/ContentGenerator/Feedback/feedback_email.html.ep b/templates/ContentGenerator/Feedback/feedback_email.html.ep
index 901e899a28..667e2fb5df 100644
--- a/templates/ContentGenerator/Feedback/feedback_email.html.ep
+++ b/templates/ContentGenerator/Feedback/feedback_email.html.ep
@@ -1,22 +1,22 @@
 % use WeBWorK::Utils qw(decodeAnswers);
 % use WeBWorK::Utils::Sets qw(format_set_name_display);
 %
+% my $yes = maketext('yes');
+% my $no  = maketext('no');
+%
 
    
-			% if ($problem) {
-				Message from <%= $user->full_name %> (<%= $user->user_id %>) via WeBWorK at
-				<%= $ce->{institutionName} %> (sent from
-				<%= link_to format_set_name_display($set->set_id) . ', #' . $problem->problem_id => $emailableURL %>).
-			% } elsif ($set) {
-				Message from <%= $user->full_name %> (<%= $user->user_id %>) via WeBWorK at
-				<%= $ce->{institutionName} %>
-			   	(sent from <%= link_to format_set_name_display($set->set_id) => $emailableURL %>)
-			% } else {
-				Message from <%= $user->full_name %> (<%= $user->user_id %>) via WeBWorK at
-				<%= $ce->{institutionName} %> (sent from <%= link_to 'this page' => $emailableURL %>).
-			% }
+			<%== maketext('Message from [_1] ([_2]) via WeBWorK at [_3] (sent from [_4]).',
+				$user->full_name, $user->user_id, $ce->{institutionName},
+				$problem ? link_to(format_set_name_display($set->set_id) . ', #' . $problem->problem_id, $emailableURL)
+				: $set   ? link_to(format_set_name_display($set->set_id), $emailableURL)
+				:          link_to('this page', $emailableURL)
+			) =%>
 		
    
+		% if ($numRecipients > 1) {
+			
    <%= maketext('Message delivered to multiple recipients. Consider using reply-all.') =%>
    
+		% }
 		% if ($feedback) {
 			
    
 				% for (split /\n\r?/, $feedback) {
@@ -32,19 +32,20 @@
 			
    
 	
    
 
 
 
 
 		
 	
 		
    
+						background-color: lightgray" colspan="2"><%= maketext('Data about the problem') %>
 					% my @rows = (
-						% [ 'Problem ID',         $problem->problem_id ],
-						% [ 'Source file',        $problem->source_file ],
-						% [ 'Value',              $problem->value ],
-						% [ 'Max attempts',       $problem->max_attempts == -1 ? 'unlimited' : $problem->max_attempts ],
-						% [ 'Random seed',        $problem->problem_seed ],
-						% [ 'Status',             $problem->status ],
-						% [ 'Attempted',          $problem->attempted ? 'yes' : 'no' ],
-						% [ 'Correct attempts',   $problem->num_correct ],
-						% [ 'Incorrect attempts', $problem->num_incorrect ]
+						% [ maketext('Problem ID'),         $problem->problem_id ],
+						% [ maketext('Source file'),        $problem->source_file ],
+						% [ maketext('Value'),              $problem->value ],
+						% [ maketext('Max attempts'),
+							% $problem->max_attempts == -1 ? 'unlimited' : $problem->max_attempts ],
+						% [ maketext('Random seed'),        $problem->problem_seed ],
+						% [ maketext('Status'),             $problem->status ],
+						% [ maketext('Attempted'),          $problem->attempted ? $yes : $no ],
+						% [ maketext('Correct attempts'),   $problem->num_correct ],
+						% [ maketext('Incorrect attempts'), $problem->num_incorrect ]
 					% );
 					% for (@rows) {
 						
@@ -54,20 +55,26 @@
 					% }
 					% my %last_answer = decodeAnswers($problem->last_answer);
 					
-						
+						
 						% if (%last_answer) {
-							
+							
 						% } else {
-							
+							
 						% }
 					
@@ -77,28 +84,28 @@
 			
    
 				
 					
    Data about the problem
    
 				    
 				
    Last submission:
+							<%= maketext('Last submission:') =%>
+						
-							% for my $key (sort keys %last_answer) {
-								% if ($last_answer{$key}) {
-									
-										
-										
-									
-								% }
-							% }
-							
    <%= $key %>:<%= $last_answer{$key} %>
    		
+								
+									% for my $key (sort keys %last_answer) {
+										% if ($last_answer{$key}) {
+											
+												
+												
+											
+										% }
+									% }
+								
    <%= $key %>:
+													<%= $last_answer{$key} %>
+												
    
+							    		none<%= maketext('none') %>
    
 				
    
+						background-color: lightgray" colspan="2"><%= maketext('Data about the assignment') %>
 					% my @rows = (
-						% [ 'Set ID',               $set->set_id ],
-						% [ 'Set header file',      $set->set_header ],
-						% [ 'Hardcopy header file', $set->hardcopy_header ],
-						% [ 'Open date',            $c->formatDateTime($set->open_date) ],
-						% [ 'Close date',           $c->formatDateTime($set->due_date) ],
-						% [ 'Answer date',          $c->formatDateTime($set->answer_date) ],
-						% [ 'Visible',              $set->visible ? 'yes' : 'no' ],
-						% [ 'Assignment type',      $set->assignment_type ]
+						% [ maketext('Set ID'),               $set->set_id ],
+						% [ maketext('Set header file'),      $set->set_header ],
+						% [ maketext('Hardcopy header file'), $set->hardcopy_header ],
+						% [ maketext('Open date'),            $c->formatDateTime($set->open_date) ],
+						% [ maketext('Close date'),           $c->formatDateTime($set->due_date) ],
+						% [ maketext('Answer date'),          $c->formatDateTime($set->answer_date) ],
+						% [ maketext('Visible'),              $set->visible ? $yes : $no ],
+						% [ maketext('Assignment type'),      $set->assignment_type ]
 					% );
 					% if ($set->assignment_type =~ /gateway/) {
 						% push @rows, (
-							% [ 'Attempts per version',      $set->attempts_per_version ],
-							% [ 'Time interval',             $set->time_interval ],
-							% [ 'Versions per interval',     $set->versions_per_interval ],
-							% [ 'Version time limit',        $set->version_time_limit ],
-							% [ 'Version creation time',     $c->formatDateTime($set->version_creation_time) ],
-							% [ 'Problem randorder',         $set->problem_randorder ],
-							% [ 'Version last attempt time', $set->version_last_attempt_time ]
+							% [ maketext('Attempts per version'),      $set->attempts_per_version ],
+							% [ maketext('Time interval'),             $set->time_interval ],
+							% [ maketext('Versions per interval'),     $set->versions_per_interval ],
+							% [ maketext('Version time limit'),        $set->version_time_limit ],
+							% [ maketext('Version creation time'),     $c->formatDateTime($set->version_creation_time) ],
+							% [ maketext('Problem randorder'),         $set->problem_randorder ],
+							% [ maketext('Version last attempt time'), $set->version_last_attempt_time ]
 						% );
 					% }
 					% for (@rows) {
@@ -113,16 +120,20 @@
 		% if ($problem && $verbosity >= 1) {
 			
    
 				
 					
    Data about the assignment
    
 				    
 				
    
-					
+					
+						
+					
 					% my @rows = (
-						% [ 'Display Mode',         param('displayMode') ],
-						% [ 'Show Old Answers',     param('showOldAnswers') ? 'yes' : 'no' ],
-						% [ 'Show Correct Answers', param('showCorrectAnswers') ? 'yes' : 'no' ],
-						% [ 'Show Hints',           param('showHints') ? 'yes' : 'no' ],
-						% [ 'Show Solutions',       param('showSolutions') ? 'yes' : 'no' ]
+						% [ maketext('Display Mode'),         param('displayMode') ],
+						% [ maketext('Show Old Answers'),     param('showOldAnswers') ? $yes : $no ],
+						% [ maketext('Show Correct Answers'), param('showCorrectAnswers') ? $yes : $no ],
+						% [ maketext('Show Hints'),           param('showHints') ? $yes : $no ],
+						% [ maketext('Show Solutions'),       param('showSolutions') ? $yes : $no ]
 					% );
 					% for (@rows) {
 						
@@ -138,26 +149,26 @@
 			
    
 				
    Data about the problem processor
    
+							<%= maketext('Data about the problem processor') =%>
+						
    
 				    
 				
    
+						background-color: lightgray" colspan="2"><%= maketext('Data about the user') %>
 					% my @rows = (
-						% [ 'User ID', $user->user_id ],
-						% [ 'Name',    $user->full_name ],
-						% [ 'Email',   $user->email_address ]
+						% [ maketext('User ID'), $user->user_id ],
+						% [ maketext('Name'),    $user->full_name ],
+						% [ maketext('Email'),   $user->email_address ]
 					% );
 					% unless ($ce->{blockStudentIDinFeedback}) { push @rows, ['Student ID', $user->student_id]; }
 					% my $status_name = $ce->status_abbrev_to_name($user->status);
 					% my $status_string =
 						% defined $status_name
 						% ? "$status_name ('" . $user->status . q{')}
-						% : $user->status . ' (unknown status abbreviation)';
+						% : maketext('[_1] (unknown status abbreviation)', $user->status);
 					% push @rows, (
-						% [ 'Status',     $status_string ],
-						% [ 'Section',    $user->section ],
-						% [ 'Recitation', $user->recitation ],
-						% [ 'Comment',    $user->comment ],
-						% [ 'IP Address', $remote_host ]
+						% [ maketext('Status'),     $status_string ],
+						% [ maketext('Section'),    $user->section ],
+						% [ maketext('Recitation'), $user->recitation ],
+						% [ maketext('Comment'),    $user->comment ],
+						% [ maketext('IP Address'), $remote_host ]
 					%);
 					% for (@rows) {
 						
@@ -172,7 +183,7 @@
 			
    
 				
 					
    Data about the user
    
 				    
 				
    
+						background-color: lightgray" colspan="2"><%= maketext('Data about the environment') %>
diff --git a/templates/ContentGenerator/Feedback/feedback_email.txt.ep b/templates/ContentGenerator/Feedback/feedback_email.txt.ep
index 3771d933b1..5de552e159 100644
--- a/templates/ContentGenerator/Feedback/feedback_email.txt.ep
+++ b/templates/ContentGenerator/Feedback/feedback_email.txt.ep
@@ -1,104 +1,109 @@
 % use WeBWorK::Utils qw(decodeAnswers);
 % use WeBWorK::Utils::Sets qw(format_set_name_display);
 %
-Message from <%= $user->full_name %> (<%= $user->user_id %>) via WeBWorK at <%= $ce->{institutionName} %>.
+<%= maketext('Message from [_1] ([_2]) via WeBWorK at [_3].',
+	$user->full_name, $user->user_id, $ce->{institutionName}) %>
 
 % if ($problem) {
-Feedback sent from <%= format_set_name_display($set->set_id) . ', #' . $problem->problem_id %>:
+<%= maketext('Feedback sent from [_1]:', format_set_name_display($set->set_id) . ', #' . $problem->problem_id) %>
 % } elsif ($set) {
-Feedback sent from <%= format_set_name_display($set->set_id) %>:
+<%= maketext('Feedback sent from [_1]:', format_set_name_display($set->set_id)) %>
 % } else {
-Feedback sent from:
+<%= maketext('Feedback sent from:') %>
 % }
 <%== $emailableURL %>
+% if ($numRecipients > 1) {
+
+<%= maketext('Message delivered to multiple recipients. Consider using reply-all.') %>
+% }
 
 % if ($feedback) {
-<%== $user->full_name %> (<%== $user->user_id %>) wrote:
+<%= maketext('[_1] ([_2]) wrote:', $user->full_name, $user->user_id) %>
 
 <%== $feedback %>
 
 % }
 % if ($problem && $verbosity >= 1) {
 
-***** Data about the problem: *****
+***** <%= maketext('Data about the problem:') %> *****
 
-Problem ID:                   <%== $problem->problem_id %>
-Source file:                  <%== $problem->source_file %>
-Value:                        <%== $problem->value %>
-Max attempts                  <%== $problem->max_attempts == -1 ? 'unlimited' : $problem->max_attempts %>
-Random seed:                  <%== $problem->problem_seed %>
-Status:                       <%== $problem->status %>
-Attempted:                    <%== $problem->attempted ? 'yes' : 'no' %>
-Number of correct attempts:   <%== $problem->num_correct %>
-Number of incorrect attempts: <%== $problem->num_incorrect %>
+<%= maketext('Problem ID:') %>                   <%== $problem->problem_id %>
+<%= maketext('Source file:') %>                  <%== $problem->source_file %>
+<%= maketext('Value:') %>                        <%== $problem->value %>
+<%= maketext('Max attempts') %>                  <%== $problem->max_attempts == -1 ? 'unlimited' : $problem->max_attempts %>
+<%= maketext('Random seed:') %>                  <%== $problem->problem_seed %>
+<%= maketext('Status:') %>                       <%== $problem->status %>
+<%= maketext('Attempted:') %>                    <%== $problem->attempted ? 'yes' : 'no' %>
+<%= maketext('Number of correct attempts:') %>   <%== $problem->num_correct %>
+<%= maketext('Number of incorrect attempts:') %> <%== $problem->num_incorrect %>
 	% my %last_answer = decodeAnswers($problem->last_answer);
 	% if (%last_answer) {
-Last submission:
-	% for my $key (sort keys %last_answer) {
-		% if ($last_answer{$key}) {
+<%= maketext('Last submission:') %>
+		% for my $key (sort keys %last_answer) {
+			% if ($last_answer{$key}) {
 	<%== $key %>: <%== $last_answer{$key} %>
+			% }
 		% }
-	% }
 	% } else {
-Last submission:              none
+<%= maketext('Last submission:') =%>              <%= maketext('none') %>
 	% }
 % }
 % if ($set && $verbosity >= 1) {
 
-***** Data about the assignment: *****
+***** <%= maketext('Data about the assignment:') %> *****
 
-Set ID:                    <%== $set->set_id %>
-Set header file:           <%== $set->set_header %>
-Hardcopy header file:      <%== $set->hardcopy_header %>
-Open date:                 <%== $c->formatDateTime($set->open_date) %>
-Due date:                  <%== $c->formatDateTime($set->due_date) %>
-Answer date:               <%== $c->formatDateTime($set->answer_date) %>
-Visible:                   <%== $set->visible ? 'yes' : 'no' %>
-Assignment type:           <%== $set->assignment_type %>
+<%= maketext('Set ID:') %>                    <%== $set->set_id %>
+<%= maketext('Set header file:') %>           <%== $set->set_header %>
+<%= maketext('Hardcopy header file:') %>      <%== $set->hardcopy_header %>
+<%= maketext('Open date:') %>                 <%== $c->formatDateTime($set->open_date) %>
+<%= maketext('Due date:') %>                  <%== $c->formatDateTime($set->due_date) %>
+<%= maketext('Answer date:') %>               <%== $c->formatDateTime($set->answer_date) %>
+<%= maketext('Visible:') %>                   <%== $set->visible ? 'yes' : 'no' %>
+<%= maketext('Assignment type:') %>           <%== $set->assignment_type %>
 	% if ($set->assignment_type =~ /gateway/) {
-Attempts per version:      <%== $set->attempts_per_version %>
-Time interval:             <%== $set->time_interval %>
-Versions per interval:     <%== $set->versions_per_interval %>
-Version time limit:        <%== $set->version_time_limit %>
-Version creation time:     <%== $c->formatDateTime($set->version_creation_time) %>
-Problem randorder:         <%== $set->problem_randorder %>
-Version last attempt time: <%== $set->version_last_attempt_time %>
+<%= maketext('Attempts per version:') %>      <%== $set->attempts_per_version %>
+<%= maketext('Time interval:') %>             <%== $set->time_interval %>
+<%= maketext('Versions per interval:') %>     <%== $set->versions_per_interval %>
+<%= maketext('Version time limit:') %>        <%== $set->version_time_limit %>
+<%= maketext('Version creation time:') %>     <%== $c->formatDateTime($set->version_creation_time) %>
+<%= maketext('Problem randorder:') %>         <%== $set->problem_randorder %>
+<%= maketext('Version last attempt time:') %> <%== $set->version_last_attempt_time %>
 	% }
 % }
 % if ($problem && $verbosity >= 1) {
 
-***** Data about the problem processor: *****
+***** <%= maketext('Data about the problem processor:') %> *****
 
-Display Mode:         <%== param('displayMode') %>
-Show Old Answers:     <%== param('showOldAnswers') ? 'yes' : 'no' %>
-Show Correct Answers: <%== param('showCorrectAnswers') ? 'yes' : 'no' %>
-Show Hints:           <%== param('showHints') ? 'yes' : 'no' %>
-Show Solutions:       <%== param('showSolutions') ? 'yes' : 'no' %>
+<%= maketext('Display Mode:') %>         <%== param('displayMode') %>
+<%= maketext('Show Old Answers:') %>     <%== param('showOldAnswers') ? 'yes' : 'no' %>
+<%= maketext('Show Correct Answers:') %> <%== param('showCorrectAnswers') ? 'yes' : 'no' %>
+<%= maketext('Show Hints:') %>           <%== param('showHints') ? 'yes' : 'no' %>
+<%= maketext('Show Solutions:') %>       <%== param('showSolutions') ? 'yes' : 'no' %>
 % }
 % if ($user && $verbosity >= 1) {
 
-***** Data about the user: *****
+***** <%= maketext('Data about the user:') %> *****
 
-User ID:    <%== $user->user_id %>
-Name:       <%== $user->full_name %>
-Email:      <%== $user->email_address %>
+<%= maketext('User ID:') %>    <%== $user->user_id %>
+<%= maketext('Name:') %>       <%== $user->full_name %>
+<%= maketext('Email:') %>      <%== $user->email_address %>
 	% unless ($ce->{blockStudentIDinFeedback}) {
-Student ID: <%== $user->student_id %>
+<%= maketext('Student ID:') %> <%== $user->student_id %>
 	% }
 % my $status_name = $ce->status_abbrev_to_name($user->status);
 	%my $status_string =
 		% defined $status_name
 			% ? "$status_name ('" . $user->status . q{')}
-			% : $user->status . ' (unknown status abbreviation)';
-Status:     <%== $status_string %>
-Section:    <%== $user->section %>
-Recitation: <%== $user->recitation %>
-Comment:    <%== $user->comment %>
-IP Address: <%== $remote_host %>:<%== $c->tx->remote_port || 'UNKNOWN' %>
+			% : maketext('[_1] (unknown status abbreviation)', $user->status);
+<%= maketext('Status:') %>     <%== $status_string %>
+<%= maketext('Section:') %>    <%== $user->section %>
+<%= maketext('Recitation:') %> <%== $user->recitation %>
+<%= maketext('Comment:') %>    <%== $user->comment %>
+<%= maketext('IP Address:') %> <%== $remote_host %>:<%== $c->tx->remote_port || 'UNKNOWN' %>
 % }
 % if ($verbosity >= 2) {
 
-Data about the environment
+<%= maketext('Data about the environment') %>
 
 <%== dumper($ce) %>
 % }
diff --git a/templates/ContentGenerator/GatewayQuiz.html.ep b/templates/ContentGenerator/GatewayQuiz.html.ep
index 49f951a04a..78c9becc2b 100644
--- a/templates/ContentGenerator/GatewayQuiz.html.ep
+++ b/templates/ContentGenerator/GatewayQuiz.html.ep
@@ -108,25 +108,6 @@
 	% last;
 % }
 %
-% # If there were translation errors, then show those and exit.
-% if (@{ $c->{errors} }) {
-	% my $errorNum = 1;
-	% my ($message, $context) = (c, c);
-	% for (@{ $c->{errors} }) {
-		% push(@$message, "$errorNum. ") if (@{ $c->{errors} } > 1);
-		% push(@$message, $_->{message}, tag('br'));
-		%
-		% my $line = begin
-			
    <%= (@{ $c->{errors} } > 1 ? "$errorNum." : '') %><%== $_->{context} %>
    
-			
    
-		% end
-		% push @$context, $line->();
-	% }
-	<%= include 'ContentGenerator/Base/error_output', error => $message->join(''), details => $context->join('') =%>
-	%
-	% last;
-% }
-%
 % my $setID          = $c->{set}->set_id;
 % my $setVersionID   = $c->{set}->version_id;
 % my $numProbPerPage = $c->{set}->problems_per_page;
@@ -188,7 +169,7 @@
 		% && $c->{can}{showScore}
 	% )
 	% {
-		
    
+		
    
 			<%== maketext(
 				'Your recorded score for this version is [_1]/[_2] ([_3]%).',
 				'' . wwRound(2, $c->{recordedScore}) . '',
@@ -201,7 +182,7 @@
 	% }
 % } elsif ($c->{will}{checkAnswers}) {
 	% if ($c->{can}{showScore}) {
-		
    
+		
    
 			
 				<%= maketext('Your score on this (checked, not recorded) submission is [_1]/[_2].',
 					$c->{attemptScore}, $c->{totalPossible}) =%>
@@ -226,7 +207,7 @@
 	% && before($c->{set}->due_date, $submitTime)
 	% && ($c->{can}{recordAnswersNextTime} || $c->{submitAnswers}))
 % {
-	
    
+	
    
 		
 			% my $text = maketext('You are in the Reduced Scoring Period.  All work counts for [_1]% of the original.',
 				% $ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100);
@@ -328,7 +309,7 @@
 	% }
 % } else {
 	% if (!$c->{checkAnswers} && !$c->{submitAnswers} && $c->{can}{showScore}) {
-		
    
+		
    
 			
 				<%== maketext(
 						'Your recorded score on this test (version [_1]) is [_2]/[_3] ([_4]%).',
@@ -350,12 +331,14 @@
 	% }
 	%
 	% if ($c->{set}->version_last_attempt_time) {
-		
    
+		
    
 			<%= maketext('Time taken on test: [_1] min ([_2] min allowed).',
 				$c->{elapsedTime}, sprintf('%.0f', 10 * ($c->{set}->due_date - $c->{set}->open_date) / 6) / 100) %>
+			
    
+			<%= maketext('Test completed on [_1].', $c->{completedTime}) %>
 		
    
 	% } elsif ($c->{exceededAllowedTime} && $c->{recordedScore} != 0) {
-		
    
+		
    
 			<%= maketext('(This test is overtime because it was not submitted in the allowed time.)') %>
 		
    
 	% }
@@ -405,8 +388,18 @@
 	% # Problems can be shown, so output the main form and the problems.
 	% my $startTime = param('startTime') || time;
 	%
-	<%= form_for $action, name => 'gwquiz', method => 'POST', class => 'problem-main-form', begin =%>
+	% if ($haveProblemWarnings) {
+		
    
+			
    
+				<%== maketext('Warning: There may be something wrong with a problem in this test. '
+					. 'Please inform your instructor including the warning messages below the problem.') =%>
+			
    
+		
    
+	% }
+	%
+	<%= form_for $action, name => 'gwquiz', method => 'POST', class => 'problem-main-form mt-0', begin =%>
 		<%= $c->hidden_authen_fields =%>
+		<%= hidden_field courseID => $ce->{courseName} =%>
 		%
 		% # Hacks to use a javascript link to trigger previews and jump to subsequent pages of a multipage test.
 		<%= hidden_field pageChangeHack => '' =%>
@@ -448,9 +441,10 @@
 		% end
 		% if ($numProbPerPage && $numPages > 1) {
 			% content_for 'gw-navigation-cols' => begin
-				% for (1 .. $numPages) {
+				% for my $pageNum (1 .. $numPages) {
 					
    % for (1 .. $numProbPerPage) {
+							% last if $_ * $pageNum > @$problem_numbers;
 							% }
 					
@@ -458,7 +452,9 @@
 			% end
 			% for my $i (1 .. $numPages) {
 				% content_for 'gw-navigation-pages' => begin
-					
 				% }
 			% end
+			% content_for 'gw-previous-next-buttons' => begin
+				
    
+					% my $prevText = $numProbPerPage == 1 ? maketext('Previous Problem') : maketext('Previous Page');
+					% if ($pageNumber > 1) {
+						<%= link_to $prevText => '#',
+							class => 'btn btn-primary page-change-link', data => { page_number => $pageNumber - 1 } =%>
+					% } else {
+						<%= $prevText =%>
+					% }
+					% my $nextText = $numProbPerPage == 1 ? maketext('Next Problem') : maketext('Next Page');
+					% if ($pageNumber < $numPages) {
+						<%= link_to $nextText => '#',
+							class => 'btn btn-primary page-change-link', data => { page_number => $pageNumber + 1 } =%>
+					% } else {
+						<%= $nextText =%>
+					% }
+				
    
+			% end
 		% } else {
 			% content_for 'gw-navigation-cols' => begin
 				    <% for (0 .. $#$pg_results) { =%><% } =%>
@@ -508,6 +522,7 @@
 					<%= content 'gw-navigation-table-rows' =%>
 				
    
 				
 					
    Data about the environment
    
 				    
 				
 					
    <%= dumper($ce) %>
    
 						
 						
    
 						% if ($i == $pageNumber) {
 							<%= $i =%>
@@ -485,6 +481,24 @@
 					
    
 			
+			<%= content 'gw-previous-next-buttons' =%>
 		% end
 		<%= $jumpLinks->() =%>
 		%
@@ -530,7 +545,7 @@
 					% $recordMessage = tag('div', class => 'alert alert-danger d-inline-block mb-2 p-1',
 						% maketext('CORRECT ANSWERS SHOWN ONLY -- ANSWERS NOT RECORDED')
 					% );
-				% } elsif ($c->{will}{checkAnswers} || $c->{will}{showProblemGrader}) {
+				% } elsif ($c->{will}{checkAnswers}) {
 					% $recordMessage = tag('div', class => 'alert alert-danger d-inline-block mb-2 p-1',
 						% maketext('ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED')
 					% );
@@ -546,7 +561,7 @@
 					% # Show the jump to anchor.
 					
    " tabindex="-1"><%= $recordMessage %>
    
 					% # Output the problem header.
-					
    <%= maketext('Problem [_1].', $i + 1) %>
    
+					
    <%= maketext('Problem [_1].', $i + 1) %>
    
 					
 						% if ($c->{can}{showTemplateIds}) {
 							<%= '('
@@ -559,14 +574,7 @@
 						% }
 						%
 						% # This uses the permission level and user id of the user assigned to the set.
-						% if (
-							% $db->getPermissionLevel($effectiveUserID)->permission >=
-								% $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_PERMISSION_LEVEL}
-							% || (
-								% grep { $_ eq $effectiveUserID }
-									% @{ $ce->{pg}{specialPGEnvironmentVars}{PRINT_FILE_NAMES_FOR} }
-							% )
-						% )
+						% if ( $authz->hasPermissions($effectiveUserID, 'print_path_to_problem') )
 						% {
 							<%= $problems->[ $probOrder->[$i] ]->source_file %>
 						% }
@@ -581,11 +589,21 @@
 						
 					% }
 					%
-					
    {flags}, $ce->{perProblemLangAndDirSettingMode}, $ce->{language}
-						) %>>
-						<%== $pg->{body_text} =%>
-					
    
+					% # If there were translation errors, then show those instead of the problem.
+					% if ($pg->{flags}{error_flag}) {
+						% stash->{briefErrorOutput} = 1;
+						<%= include 'ContentGenerator/Base/error_output',
+							error => $pg->{errors},
+							details => $pg->{body_text} =%>
+						%
+						% delete stash->{briefErrorOutput};
+					% } else {
+						
    {flags}, $ce->{perProblemLangAndDirSettingMode}, $ce->{language}
+							) %>  data-bs-theme="light">
+							<%== $pg->{body_text} =%>
+						
    
+					% }
 					% if ($pg->{result}{msg}) {
 						
    <%== maketext('Note: [_1]', tag('i', $pg->{result}{msg})) %>
    
 					% }
@@ -621,7 +639,7 @@
 					
    
 						<%= link_to maketext('preview answers') => '#',
 							class => 'gateway-preview-btn btn btn-secondary',
-							($numProbPerPage && $numPages > 1) ? (data_page_number => $pageNumber) : () =%>
+							($numProbPerPage && $numPages > 1) ? (data => { page_number => $pageNumber }) : () =%>
 					
    
 					%
 					% if ($resultsTable) {
@@ -629,10 +647,15 @@
 					% }
 					%
 					% # Initialize the problem graders for the problem.
-					% if ($c->{will}{showProblemGrader}) {
-						<%= WeBWorK::HTML::SingleProblemGrader->new($c, $pg, $problems->[ $probOrder->[$i] ])
+					% if ($c->{will}{showProblemGrader} && !$pg->{flags}{error_flag}) {
+						<%= WeBWorK::HTML::SingleProblemGrader->new($c, $pg, $problems->[ $probOrder->[$i] ], $c->{set})
 							->insertGrader =%>
 					% }
+					% # Show warnings for the problem if there are any.
+					<%= include 'ContentGenerator/Base/problem_warning_and_debug_output',
+						warnings         => $pg->{warnings},
+						warning_messages => ref $pg->{warning_messages} eq 'ARRAY' ? $pg->{warning_messages} : [],
+						debug_messages   => ref $pg->{debug_messages} eq 'ARRAY'   ? $pg->{debug_messages}   : [] =%>
 				
 				% # Store the problem status for continued attempts recording.
 				<%= hidden_field 'probstatus' . $problems->[ $probOrder->[$i] ]{problem_id}
@@ -705,6 +728,15 @@
 							: maketext(
 							'This is your only submission.  If you say yes, then your answers will be final, '
 								. 'and you will not be able to continue to work this test version.'
+							),
+							# This is always a plural form. JavaScript replaces %d with the
+							# number of unanswered questions which will be greater than one.
+							unanswered_questions_message =>
+								maketext('There are [_1] problems with unanswered questions.', '%d'),
+							unanswered_question_message => maketext('There is a problem with unanswered questions.'),
+							return_to_test_message => maketext(
+								'Are you sure you want to grade the test? '
+								. 'Select "No" if you would like to return to the test to enter more answers.'
 							)
 						}
 						)
@@ -716,20 +748,10 @@
 			
    <%= maketext('Note: grading the test grades all problems, not just those on this page.') %>
    
 		% }
 		%
-		% if ($c->{can}{showProblemGrader}) {
+		% if ($c->{can}{showCorrectAnswers}) {
 			
    
-				% if ($c->{can}{showCorrectAnswers}) {
-					<%= submit_button maketext('Show Correct Answers'), name => 'showCorrectAnswers',
-						class => 'btn btn-primary mb-1' =%>
-				% }
-				% if ($c->{will}{showProblemGrader}) {
-					<%= submit_button maketext('Hide Problem Graders'), name => 'hideProblemGrader',
-						class => 'btn btn-primary mb-1' =%>
-					<%= hidden_field showProblemGrader => 1 =%>
-				% } else {
-					<%= submit_button maketext('Show Problem Graders'), name => 'showProblemGrader',
-						class => 'btn btn-primary mb-1' =%>
-				% }
+				<%= submit_button maketext('Show Correct Answers'), name => 'showCorrectAnswers',
+					class => 'btn btn-primary mb-1' =%>
 			
    
 		% }
 		%
@@ -763,5 +785,5 @@
 % # If achievements enabled, check to see if there are new ones and output them.  Use the first
 % # problem to seed the data. However, all of the problems will be provided to the achievement evaluator.
 % if ($ce->{achievementsEnabled} && $c->{will}{recordAnswers} && $c->{submitAnswers} && $setID ne 'Undefined_Set') {
-	<%= checkForAchievements($problems->[0], $pg_results->[0], $c, setVersion => $setVersionID) =%>
+	<%= checkForAchievements($problems->[0], $c, setVersion => $setVersionID) =%>
 % }
diff --git a/templates/ContentGenerator/GatewayQuiz/nav.html.ep b/templates/ContentGenerator/GatewayQuiz/nav.html.ep
index f4b83b096c..1f87ca7896 100644
--- a/templates/ContentGenerator/GatewayQuiz/nav.html.ep
+++ b/templates/ContentGenerator/GatewayQuiz/nav.html.ep
@@ -9,28 +9,36 @@
 
  • 
 							<%= link_to maketext('Show all tests') => $c->systemLink(
 									url_for('gateway_quiz', setID => "$setID,v$setVersion"),
-									params => {
-										effectiveUser     => param('effectiveUser'),
-										currentPage       => $pageNumber,
-										showProblemGrader => $c->{will}{showProblemGrader}
-									}
+									params => { effectiveUser => param('effectiveUser'), currentPage => $pageNumber }
 								),
 								class => 'dropdown-item' =%>
 						
    • 
@@ -104,14 +110,12 @@
 							<%= link_to $filters->{$_}[0] => $c->systemLink(
 									url_for('gateway_quiz', setID => "$setID,v$filters->{$_}[2]"),
 									params => {
-										effectiveUser     => $filters->{$_}[1],
-										currentPage       => $pageNumber,
-										showProblemGrader => $c->{will}{showProblemGrader},
-										studentNavFilter  => $_
+										effectiveUser    => $filters->{$_}[1],
+										currentPage      => $pageNumber,
+										studentNavFilter => $_
 									}
 								),
-								class => 'dropdown-item',
-								style => ($filter || '') eq $_ ? 'background-color: #8F8' : '' =%>
+								class => join(' ', 'dropdown-item', ($filter || '') eq $_ ? 'active' : '') =%>
 						
 					% }
 				

diff --git a/templates/ContentGenerator/Grades.html.ep b/templates/ContentGenerator/Grades.html.ep
index 4983bacbf0..9affb4211d 100644
--- a/templates/ContentGenerator/Grades.html.ep
+++ b/templates/ContentGenerator/Grades.html.ep
@@ -1,2 +1,16 @@
-<%= $c->displayStudentStats($c->{studentID}) =%>
-<%= $c->scoring_info =%>
+% use WeBWorK::Utils qw(getAssetURL);
+%
+% content_for css => begin
+	<%= stylesheet getAssetURL($ce, 'js/Grades/grades.css') =%>
+% end
+% content_for js => begin
+	<%= javascript getAssetURL($ce, 'js/Grades/grades.js'), defer => undef =%>
+% end
+%
+<%= $c->displayStudentGrades =%>
+%
+% my $scoring_info = $c->scoring_info;
+% if ($scoring_info) {
+	
<%= maketext('Additional Grade Information') %>

+	<%= $scoring_info =%>
+% }
diff --git a/templates/ContentGenerator/Grades/grade_items.html.ep b/templates/ContentGenerator/Grades/grade_items.html.ep
new file mode 100644
index 0000000000..a99804944f
--- /dev/null
+++ b/templates/ContentGenerator/Grades/grade_items.html.ep
@@ -0,0 +1,33 @@
+
    
+	% my $n = 0;
+	% for my $item (@$items) {
+		% ++$n;
+		
  • 
+			
    
+				
    
+					
    
+						% if ($item->{link}) {
+							<%= link_to $item->{name} => $item->{link} %>
+						% } else {
+							<%= $item->{name} %>
+						% }
+					
    
+				
    
+				
    
+					% unless ($item->{hide_score}) {
+						
    <%= $item->{grade} %>%
    
+					% }
+				
    
+				
    
+					% if ($item->{message}) {
+						
    <%= $item->{message} %>
    
+					% }
+					% if (defined $item->{problems}) {
+						<%= include 'ContentGenerator/Grades/problem_table', item => $item %>
+					% }
+				
    
+			
    
+		
    • 
+	% }
+

+
diff --git a/templates/ContentGenerator/Grades/problem_table.html.ep b/templates/ContentGenerator/Grades/problem_table.html.ep
new file mode 100644
index 0000000000..721adf0234
--- /dev/null
+++ b/templates/ContentGenerator/Grades/problem_table.html.ep
@@ -0,0 +1,63 @@
+% my @problems = @{ $item->{problems} };
+%
+% unless (@problems) {
+	% # If this is a test and no problems are available, this means the problems are hidden
+	% # in which case a message was already displayed.
+	% unless ($item->{version_id}) {
+		<%= maketext('This assignment has zero problems.') %>
+	% }
+	% last;
+% }
+%
+
+	
+	
+		
+			
+			% for my $problem (@problems) {
+				
+		
+			
+			% for my $problem (@problems) {
+				
+			% }
+		
+		% unless ($item->{version_count}) {
+			
+				
+				% for my $problem (@problems) {
+					
+				% }
+			
+		% }
+		
+			
+			% for my $problem (@problems) {
+				
+			% }
+		
+	
+

+		<%= maketext('Score: [_1] out of [_2]', $item->{grade_total_right}, $item->{grade_total}) %>
+		% if ($item->{version_id}) {
+			% my $versionName = maketext('version [_1]', $item->{version_id});
+			% $versionName = begin
+				<%= $versionName %>
+			% end->() if $item->{version_link};
+			% if ($item->{version_count} > 1) {
+				<%== maketext('for [_1] ([_2] versions taken)', $versionName, $item->{version_count}) %>
+			% } else {
+				<%== maketext('for [_1]', $versionName) %>
+			% }
+		% }
+	
<%= maketext('Problem') %>
+					% if ($problem->{link}) {
+						<%= link_to $problem->{id} => $problem->{link},
+							class        => "fw-bold",
+							'aria-label' => maketext('[_1] problem [_2]', $item->{set_name}, $problem->{id}) %>
+					% } else {
+						<%= $problem->{id} %>
+					% }
+				
+			% }
+		
<%= maketext('Weights') %><%= $problem->{value} %>
<%= maketext('Attempts') %><%= $problem->{attempts} %>
<%= maketext('Status (%)') %><%= $problem->{score} %>

diff --git a/templates/ContentGenerator/Grades/student_grades.html.ep b/templates/ContentGenerator/Grades/student_grades.html.ep
new file mode 100644
index 0000000000..8396489fde
--- /dev/null
+++ b/templates/ContentGenerator/Grades/student_grades.html.ep
@@ -0,0 +1,65 @@
+% use WeBWorK::Utils qw(wwRound);
+%
+% if ($ce->{showCourseHomeworkTotals}) {
+	
<%= maketext('Total Grade') %>

+	

+		

+			

+				% my $course_grade = 100 * wwRound(2, $courseTotal ? $totalRight / $courseTotal : 0);
+				% if ($course_grade == 100) {
+					💯
+				% } else {
+					<%= $course_grade %>%
+				% }
+			

+		

+		

+			<%= maketext('[_1] out of [_2] total points.', $totalRight, $courseTotal) %>
+		

+	

+% }
+%
+% if (@$open || @$reduced || @$closed) {
+	

+		<%= hidden_field hidden_course_id => $courseID =%>
+		
+		
+	

+% }
+% if (@$open) {
+	
<%= maketext('Open Assignments') %>

+	<%= include('ContentGenerator/Grades/grade_items', items => $open) %>
+% }
+% if (@$reduced) {
+	
<%= maketext('Reduced Scoring Assignments') %>

+	<%= include('ContentGenerator/Grades/grade_items', items => $reduced) %>
+% }
+% if (@$closed) {
+	
<%= maketext('Closed Assignments') %>

+	<%= include('ContentGenerator/Grades/grade_items', items => $closed) %>
+% }
+% if (@$notOpen) {
+	
<%= maketext('Future Assignments') %>

+	
    
+		% for my $item (@$notOpen) {
+			
  • 
+				
    
+					% if ($item->{link}) {
+						<%= link_to $item->{name} => $item->{link}, class => "fw-bold" %>
+					% } else {
+						<%= $item->{name} %>
+					% }
+				
    
+				% if ($item->{message}) {
+					
    <%= $item->{message} %>
    
+				% }
+			
    • 
+		% }
+	

+% }
diff --git a/templates/ContentGenerator/Instructor/LTIUpdate.html.ep b/templates/ContentGenerator/Instructor/LTIUpdate.html.ep
index 40fd1f3da5..ed37539383 100644
--- a/templates/ContentGenerator/Instructor/LTIUpdate.html.ep
+++ b/templates/ContentGenerator/Instructor/LTIUpdate.html.ep
@@ -47,6 +47,7 @@
 %
 
<%= maketext('Start LTI Grade Update') %>

 <%= form_for current_route, method => 'POST', id => 'updateLTIForm', name => 'updateLTIForm', begin =%>
+	<%= $c->hidden_authen_fields =%>
 	

 		<%= label_for updateUserID => maketext('Update user:'), class => 'col-auto col-form-label fw-bold' =%>
 		

diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep
index e666e53937..5d7f86dbe6 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep
@@ -12,6 +12,10 @@
 	<%= javascript getAssetURL($ce, 'js/PGProblemEditor/pgproblemeditor.js'), defer => undef =%>
 % end
 %
+% content_for css => begin
+	<%= stylesheet getAssetURL($ce, 'js/PGProblemEditor/pgproblemeditor.css') =%>
+% end
+%
 % unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
 	
<%= maketext('You are not authorized to access instructor tools.') %>

 	% last;
@@ -43,8 +47,7 @@
 	% source_path_for_problem_file => x('Editing unassigned problem file "[_1]".')
 % );
 %
-% my $setName     = stash('setID')  // '';
-% my $fullSetName = $c->{fullSetID} // $setName;
+% my $setName = stash('setID') // '';
 %
 % my $fileInfo = begin
 	

@@ -55,7 +58,7 @@
 					? maketext(
 						'Editing problem [_1] of set [_2] in file "[_3]".',
 						$c->{prettyProblemNumber},
-						tag('span', dir => 'ltr', format_set_name_display($fullSetName)),
+						tag('span', dir => 'ltr', format_set_name_display($setName)),
 						tag('span', dir => 'ltr', class => 'current-file',
 							data => { tmp_file => $c->shortPath($c->{tempFilePath}) },
 							$c->shortPath($c->{inputFilePath}))
@@ -73,11 +76,11 @@
 <%= $fileInfo->() %>
 %
 <%= form_for current_route, method => 'POST', id => 'editor', name => 'editor',
-	enctype => 'application/x-www-form-urlencoded', class => 'col-12', begin =%>
+	enctype => 'application/x-www-form-urlencoded', class => 'col-12', novalidate => undef, begin =%>
 	<%= $c->hidden_authen_fields =%>
 	<%= hidden_field file_type => $c->{file_type} =%>
 	<%= hidden_field courseID => $c->{courseID} =%>
-	% if (defined $setName) {
+	% if ($setName ne '') {
 		<%= hidden_field hidden_set_id => $setName =%>
 	% }
 	% if (not_blank($c->{sourceFilePath})) {
@@ -103,10 +106,9 @@
 		

 			<%= link_to maketext('Sample Problems') => url_for('sample_problem_index'),
 				target => 'techniques_window',
-				title  => maketext('POD for macros and sample problem code and snippets'),
+				title  => maketext('Sample problem code with documentation.'),
 				class  => 'reference-link btn btn-sm btn-info',
 				data   => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
-			% # http://webwork.maa.org/wiki/Category:MathObjects
 			<%= link_to maketext('Math Objects') => $ce->{webworkURLs}{MathObjectsHelpURL},
 				target => 'math_objects',
 				title  => maketext('Wiki summary page for MathObjects'),
@@ -125,11 +127,9 @@
 					'PG markdown syntax used to format WeBWorK questions. '
 					. 'This interactive lab can help you to learn the techniques.'
 				),
-				id => 'pgml-lab',
-				class  => 'reference-link btn btn-sm btn-info',
-				data   => { source => url_escape($pgml_lab_source), bs_toggle => 'tooltip', bs_placement => 'top' },
+				class => 'reference-link pgml-lab btn btn-sm btn-info',
+				data  => { source => url_escape($pgml_lab_source), bs_toggle => 'tooltip', bs_placement => 'top' },
 				'PGML' =%>
-			% # http://webwork.maa.org/wiki/Category:Authors
 			<%= link_to maketext('Author Info') => $ce->{webworkURLs}{AuthorHelpURL},
 				target => 'author_info',
 				title  => maketext('Top level of author information on the wiki.'),
@@ -157,24 +157,43 @@
 			% }
 		

 	% }
-	

-		

-			<%= generate_codemirror_html(
-				$c,
-				'problemContents',
-				$problemContents,
-				{ course_info => 'html', hardcopy_theme => 'xml' }->{ $c->{file_type} } // 'pg'
-			) =%>
-		

-		

-			

-				

-					
<%= maketext('Loading...') %>

-					
+	

+		

+			

+				<%= generate_codemirror_html(
+					$c,
+					'problemContents',
+					$problemContents,
+					{ course_info => 'html', hardcopy_theme => 'xml' }->{ $c->{file_type} } // 'pg'
+				) =%>
+			

+            
+			

+				

+					

+						
<%= maketext('Loading...') %>

+						
+					

 				

 			

 		

+        
 	

 	<%= $fileInfo->() %>
 	%
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep
index 5e6c4efbb3..04a008d9f5 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep
@@ -2,17 +2,15 @@
 %
 % last unless $c->{is_pg} && $c->{file_type} ne 'blank_problem' && $c->{file_type} ne 'sample_problem';
 %
-% my $allSetNames = [ map { $_->[0] =~ s/^set|\.def$//gr } $db->listGlobalSetsWhere({}, 'set_id') ];
-%
 

 	

 		<%= label_for action_add_problem_target_set_id => maketext('Add to what set?'),
 			class => 'col-form-label col-auto' =%>
 		

 			<%= select_field 'action.add_problem.target_set' => [
-					map { [
-						format_set_name_display($_) => $_, $_ eq ($c->{setID} // '') ? (selected => undef) : ()
-					] } @$allSetNames
+					map {
+						[ format_set_name_display($_) => $_, $_ eq ($c->{setID} // '') ? (selected => undef) : () ]
+					} @{ $c->{globalSets} }
 				],
 				id => 'action_add_problem_target_set_id', class => 'form-select form-select-sm d-inline w-auto',
 				dir => 'ltr' =%>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep
new file mode 100644
index 0000000000..f606f8aee4
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep
@@ -0,0 +1,49 @@
+% last unless $c->{is_pg};
+

+	

+		<%= radio_button 'action.code_maintenance' => 'tidyPGCode',
+			id => 'action_code_maintenance_perltidy', class => 'form-check-input', checked => undef  =%>
+		<%= label_for 'action_code_maintenance_perltidy', class => 'form-check-label', begin =%>
+			<%== maketext('Reformat the code using perltidy.') =%>
+		<% end =%>
+		
+			
+			
+		
+	

+	% if ($c->{file_type} !~ /header/) {
+		

+			<%= radio_button 'action.code_maintenance' => 'convertCodeToPGML',
+				id => 'action_code_maintenance_convert_PGML', class => 'form-check-input'=%>
+			<%= label_for 'action_code_maintenance_convert_PGML', class => 'form-check-label', begin =%>
+				<%== maketext('Convert the code to PGML') =%>
+			<% end =%>
+			
+				
+				
+			
+		

+		

+			<%= radio_button 'action.code_maintenance' => 'runPGCritic',
+				id => 'action_code_maintenance_run_pgcritic', class => 'form-check-input'=%>
+			<%= label_for 'action_code_maintenance_run_pgcritic', class => 'form-check-label', begin =%>
+				<%== maketext('Analyze code with PG Critic') =%>
+			<% end =%>
+			
+				
+				
+			
+		

+	% }
+

diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep
index 10e361a65f..1ba942eb24 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep
@@ -2,6 +2,7 @@
 %
 <%= form_for current_route, method => 'POST', name => 'pg-editor-file-chooser',
 	class => 'needs-validation', novalidate => undef, begin =%>
+	<%= hidden_field courseID => $c->{courseID} =%>
 	

 		

 			

diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/format_code_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/format_code_form.html.ep
deleted file mode 100644
index 69da3d5a95..0000000000
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/format_code_form.html.ep
+++ /dev/null
@@ -1,33 +0,0 @@
-% last unless $c->{is_pg};
-

-	

-		<%= radio_button 'action.format_code' => 'tidyPGCode',
-			id => 'action_format_code_perltidy', class => 'form-check-input', checked => undef  =%>
-		<%= label_for 'action_format_code_perltidy', class => 'form-check-label', begin =%>
-			<%== maketext('Reformat the code using perltidy.') =%>
-		<% end =%>
-		
-			
-			
-		
-	

-	

-		<%= radio_button 'action.format_code' => 'convertCodeToPGML',
-			id => 'action_format_code_convert_PGML', class => 'form-check-input'=%>
-		<%= label_for 'action_format_code_convert_PGML', class => 'form-check-label', begin =%>
-			<%== maketext('Convert the code to PGML') =%>
-		<% end =%>
-		
-			
-			
-		
-	

-

diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep
index 79b1d08e7b..c3796749cc 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep
@@ -1,19 +1,21 @@
 % last unless $c->{is_pg};
 %
 

-	

-		<%= label_for action_hardcopy_seed_id => maketext('Using what seed?'),
-			class => 'col-form-label col-auto mb-2' =%>
-		

-			<%= text_field 'action.hardcopy.seed' => value => $c->{problemSeed},
-				id => 'action_hardcopy_seed_id', class => 'form-control form-control-sm' =%>
+	% if ($c->{file_type} !~ /header/) {
+		

+			<%= label_for action_hardcopy_seed_id => maketext('Using what seed?'),
+				class => 'col-form-label col-auto mb-2' =%>
+			

+				<%= text_field 'action.hardcopy.seed' => value => $c->{problemSeed},
+					id => 'action_hardcopy_seed_id', class => 'form-control form-control-sm' =%>
+			

+			

+				
+			

 		

-		

-			
-		

-	

+	% }
 	

 		<%= label_for 'action_hardcopy_format_id' , class => 'col-form-label col-auto', begin =%>
 			<%= maketext('Using which hardcopy format?') =%>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep
new file mode 100644
index 0000000000..b5fcf46f9d
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep
@@ -0,0 +1,59 @@
+% Perl::Critic::Violation::set_format('%m at line %l, column %c.');
+%
+

+	
<%= maketext('PG Critic Violations') %>

+	% my @pgCriticViolations   = grep { $_->policy =~ /^Perl::Critic::Policy::PG::/ } @$violations;
+	% my @perlCriticViolations = grep { $_->policy !~ /^Perl::Critic::Policy::PG::/ } @$violations;
+	% unless (@pgCriticViolations || @perlCriticViolations) {
+		
<%= maketext('Congratulations! No PG critic violations found.') %>

+	% }
+	% if (@pgCriticViolations) {
+		
<%= maketext('The following PG issues should be fixed:') %>

+		
    
+			% for (@pgCriticViolations) {
+				
  • 
+					
    <%= $_->to_string %>
    
+					
    
+						<%= $_->explanation->{explanation} %>
+						<%== maketext(
+							'See [_1].',
+							link_to(
+								($_->policy =~ s/^Perl::Critic::Policy:://r)
+									=> pod_viewer => { filePath => 'lib/' . ($_->policy =~ s/::/\//gr) . '.pm' },
+								target => '_blank'
+							)
+						) =%>
+					
    
+					% if (ref($_->explanation->{sampleProblems}) eq 'ARRAY' && @{ $_->explanation->{sampleProblems} }) {
+						
    
+							<%== maketext('Related sample [plural,_1,problem]:',
+								scalar(@{ $_->explanation->{sampleProblems} })) %>
+							<%= c(map {
+								link_to(
+									$_->[0] => sample_problem_viewer => { filePath => $_->[1] },
+									target => '_blank'
+								)
+							} @{ $_->explanation->{sampleProblems} })->join(', ') =%>
+						
    
+					% }
+				
    • 
+			% }
+		

+	% }
+	% if (@perlCriticViolations) {
+		
<%= maketext('The following general Perl issues should be fixed:') %>

+		
    
+			% for (@perlCriticViolations) {
+				
  • 
+					
    <%= $_->to_string %>
    
+					
    
+						See <%= link_to(
+							($_->policy =~ s/^Perl::Critic::Policy:://r) => 'https://metacpan.org/pod/' . $_->policy,
+							target => '_blank'
+						) %>.
+					
    
+				
    • 
+			% }
+		

+	% }
+

diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep
index 558b367d3d..5a3c4144b4 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep
@@ -1,38 +1,28 @@
-% use File::Basename qw(dirname);
+% use File::Basename qw(dirname basename);
 %
-% use WeBWorK::Utils qw(not_blank);
 % use WeBWorK::Utils::JITAR qw(jitar_id_to_seq);
 % use WeBWorK::Utils::Sets qw(format_set_name_display);
 %
 % # Don't show the save as form when editing an existing course info file.
 % last if $c->{file_type} eq 'course_info' && -e $c->{editFilePath};
 %
-% my $isBlank         = $c->{file_type} eq 'blank_problem' || $c->{file_type} eq 'sample_problem';
+% my $isTemplate      = $c->{file_type} eq 'blank_problem' || $c->{file_type} eq 'sample_problem';
 % my $isHardcopyTheme = $c->{file_type} eq 'hardcopy_theme';
-% my $templatesDir    = $ce->{courseDirs}{templates};
 % my $shortFilePath   =
-	% $isBlank           ? 'newProblem.pg'
+	% $c->{file_type} eq 'blank_problem' ? 'newProblem.pg'
+	% : $c->{file_type} eq 'sample_problem' ? basename($c->{editFilePath})
 	% : $isHardcopyTheme ? 'hardcopyThemes/' . ($c->{editFilePath} =~ s|^.*\/||r)
-	                   % : $c->{editFilePath} =~ s|^$templatesDir/||r;
+		% : ($c->{editFilePath} =~ s|^$ce->{courseDirs}{templates}/||r) =~ s|^$ce->{webworkDirs}{assets}/pg/||r;
 %
 % # Suggest that modifications be saved to the "local" subdirectory if its not in a writeable directory
-% $shortFilePath = "local/$shortFilePath" unless $isBlank || $isHardcopyTheme || -w dirname($c->{editFilePath});
+% $shortFilePath = "local/$shortFilePath" unless $isTemplate || $isHardcopyTheme || -w dirname($c->{editFilePath});
 %
 % # If it is an absolute path make it relative.
 % $shortFilePath =~ s|^/*|| if $shortFilePath =~ m|^/|;
 %
-% my $probNum = $c->{file_type} eq 'problem' ? $c->{problemID} : 'header';
-%
-% # Don't add or replace problems to sets if the set is the Undefined_Set or
+% # Don't add to or replace problems in sets or replace set/hardcopy headers if the set is the Undefined_Set or
 % # if the problem is the blank_problem or a sample problem.
-% my $can_add_problem_to_set = not_blank($c->{setID}) && $c->{setID} ne 'Undefined_Set' && !$isBlank;
-%
-% my $prettyProbNum = $probNum;
-% if ($c->{setID}) {
-	% my $set = $db->getGlobalSet($c->{setID});
-	% $prettyProbNum = join('.', jitar_id_to_seq($probNum))
-		% if ($c->{file_type} eq 'problem' && $set && $set->assignment_type eq 'jitar');
-% }
+% my $fileIsAsociatedWithSet = $c->{setID} && $c->{setID} ne 'Undefined_Set' && !$isTemplate;
 %
 

 	

@@ -44,6 +34,7 @@
 				<%= text_field 'action.save_as.target_file' => $shortFilePath,
 					id => 'action_save_as_target_file_id', class => 'form-control form-control-sm',
 					size => 60, dir  => 'ltr',
+					data => { error_message => maketext('Please enter a filename.') },
 					# Don't allow changing the file name for course info files.
 					# The filename needs to be what is set in the course environment.
 					$c->{file_type} eq 'course_info' ? (readonly => undef) : () =%>
@@ -52,40 +43,80 @@
 		<%= hidden_field 'action.save_as.source_file' => $c->{editFilePath} =%>
 		<%= hidden_field 'action.save_as.file_type' => $c->{file_type} =%>
 	

-	% if ($can_add_problem_to_set) {
+	% if ($c->{file_type} =~ /problem/) {
 		

-			<%= radio_button 'action.save_as.saveMode' => 'rename', id => 'action_save_as_saveMode_rename_id',
-				checked => undef, class   => 'form-check-input' =%>
-			<%= label_for 'action_save_as_saveMode_rename_id', class => 'form-check-label', begin =%>
-				<%== maketext('Replace current problem: [_1]',
-					tag(
-						'strong',
-						c(
-							tag('span', dir => 'ltr', format_set_name_display($c->{fullSetID})),
-							"/$prettyProbNum"
-						)->join('')
-					)
-				) =%>
-			<% end =%>
+			% param('copyAuxFiles', 1) unless defined param('copyAuxFiles');
+			<%= check_box copyAuxFiles => 1, id => 'copyAuxFiles', class => 'form-check-input' =%>
+			<%= hidden_field copyAuxFiles => 0 =%>
+			<%= label_for copyAuxFiles => maketext('Copy auxiliary files.'), class => 'form-check-label' =%>
 		

+		% if ($fileIsAsociatedWithSet) {
+			

+				<%= radio_button 'action.save_as.saveMode' => 'rename', id => 'action_save_as_saveMode_rename_id',
+					checked => undef, class => 'form-check-input' =%>
+				<%= label_for 'action_save_as_saveMode_rename_id', class => 'form-check-label', begin =%>
+					<%== maketext('Replace current problem [_1] of set [_2]',
+						tag('strong',
+							$c->{set} && $c->{set}->assignment_type eq 'jitar'
+							? join('.', jitar_id_to_seq($c->{problemID}))
+							: $c->{problemID}),
+						tag('strong', tag('span', dir => 'ltr', format_set_name_display($c->{setID})))
+					) =%>
+				<% end =%>
+			

+		% }
 		

 			<%= radio_button 'action.save_as.saveMode' => 'add_to_set_as_new_problem',
 				id => 'action_save_as_saveMode_new_problem_id', class => 'form-check-input' =%>
-			<%= label_for 'action_save_as_saveMode_new_problem_id', class => 'form-check-label', begin =%>
-				<%== maketext(
-					'Append to end of [_1] set',
-					tag('strong', dir => 'ltr', format_set_name_display($c->{fullSetID}))
-				) =%>
-			<% end =%>
+			<%= label_for action_save_as_saveMode_new_problem_id => maketext('Append to end of'),
+				class => 'form-check-label' %>
+			<%= label_for action_save_as_target_set_id => maketext('set:'), class => 'form-check-label' =%>
+			

+				<%= select_field 'action.save_as.targetSet' => [
+						[ maketext('Select a Set') => '', disabled => undef, selected => undef ],
+						map {
+							[ format_set_name_display($_) => $_, $_ eq ($c->{setID} // '') ? (selected => undef) : () ]
+						} @{ $c->{globalSets} }
+					],
+					id   => 'action_save_as_target_set_id', class => 'form-select form-select-sm d-inline w-auto',
+					data => { error_message => maketext('Please select a set.') },
+					dir  => 'ltr' =%>
+			

 		

-	% }
-	% if ($c->{is_pg}) {
 		

-			<%= radio_button 'action.save_as.saveMode' => 'new_independent_problem',
+			<%= radio_button 'action.save_as.saveMode' => 'new_independent_file',
 				id => 'action_save_as_saveMode_independent_problem_id', class => 'form-check-input',
-				$can_add_problem_to_set ? () : (checked => undef) =%>
+				$fileIsAsociatedWithSet ? () : (checked => undef) =%>
 			<%= label_for action_save_as_saveMode_independent_problem_id => maketext('Create unattached problem'),
 				class => 'form-check-label' =%>
 		

+	% } elsif ($c->{file_type} =~ /header/) {
+		% my $headerLabel = $c->{file_type} eq 'hardcopy_header' ? maketext('hardcopy header') : maketext('set header');
+		

+			<%= radio_button 'action.save_as.saveMode' => 'set_as_heaader_for_set',
+				id => 'action_save_as_saveMode_set_header_id', class => 'form-check-input',
+				$fileIsAsociatedWithSet ? (checked => undef) : () =%>
+			<%= label_for action_save_as_saveMode_set_header_id => maketext('Set as [_1] for', $headerLabel),
+				class => 'form-check-label' %>
+			<%= label_for action_save_as_target_set_id => maketext('set:'), class => 'form-check-label' =%>
+			

+				<%= select_field 'action.save_as.targetSet' => [
+						[ maketext('Select a Set') => '', disabled => undef, selected => undef ],
+						map {
+							[ format_set_name_display($_) => $_, $_ eq ($c->{setID} // '') ? (selected => undef) : () ]
+						} @{ $c->{globalSets} }
+					],
+					id   => 'action_save_as_target_set_id', class => 'form-select form-select-sm d-inline w-auto',
+					data => { error_message => maketext('Please select a set.') },
+					dir  => 'ltr' =%>
+			

+		

+		

+			<%= radio_button 'action.save_as.saveMode' => 'new_independent_file',
+				id => 'action_save_as_saveMode_independent_problem_id', class => 'form-check-input',
+				$fileIsAsociatedWithSet ? () : (checked => undef) =%>
+			<%= label_for action_save_as_saveMode_independent_problem_id => maketext('Create unattached header file'),
+				class => 'form-check-label' =%>
+		

 	% }
 

diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep
index 02e08b7529..5fc90e6ea5 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep
@@ -1,8 +1,6 @@
-% # Can't save blank problems without changing names, and can't save if lacking write permissions.
-% last if $c->{file_type} eq 'blank_problem'
-	% || $c->{file_type} eq 'sample_problem'
-	% || $c->{editFilePath} =~ /newProblem\.pg$/
-	% || !-w $c->{editFilePath};
+% use WeBWorK::Utils::Files qw(path_is_subdir);
+% # Can't save files outside of the course templates directory, and can't save if lacking write permissions.
+% last if !path_is_subdir($c->{editFilePath}, $ce->{courseDirs}{templates}, 1) || !-w $c->{editFilePath};
 %
 

 	

diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep
index 3af03f728c..af826cb70e 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep
@@ -3,18 +3,21 @@
 %
 

 	% if ($c->{is_pg}) {
-		

-			<%= label_for action_view_seed_id => maketext('Using what seed?'), class => 'col-form-label col-auto mb-2' =%>
-			

-				<%= text_field 'action.view.seed' => $c->{problemSeed},
-					id => 'action_view_seed_id', class => 'form-control form-control-sm' =%>
+		% if ($c->{file_type} !~ /header/) {
+			

+				<%= label_for action_view_seed_id => maketext('Using what seed?'),
+					class => 'col-form-label col-auto mb-2' =%>
+				

+					<%= text_field 'action.view.seed' => $c->{problemSeed},
+						id => 'action_view_seed_id', class => 'form-control form-control-sm' =%>
+				

+				

+					
+				

 			

-			

-				
-			

-		

+		% }
 		

 			<%= label_for action_view_displayMode_id => maketext('Using what display mode?'),
 				class => 'col-form-label col-auto' =%>
diff --git a/templates/ContentGenerator/Instructor/ProblemGrader.html.ep b/templates/ContentGenerator/Instructor/ProblemGrader.html.ep
index 60a6d260bf..30b857c915 100644
--- a/templates/ContentGenerator/Instructor/ProblemGrader.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemGrader.html.ep
@@ -1,4 +1,4 @@
-% use WeBWorK::Utils qw(wwRound getAssetURL);
+% use WeBWorK::Utils qw(wwRound getAssetURL points_stepsize round_nearest_stepsize);
 % require WeBWorK::PG;
 %
 % content_for js => begin
@@ -8,7 +8,7 @@
 	<%= javascript getAssetURL($ce, 'node_modules/iframe-resizer/js/iframeResizer.min.js') =%>
 	<%= javascript getAssetURL($ce, 'js/Essay/essay.js'), defer => undef =%>
 	% if ($ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathQuill') {
-		<%= javascript getAssetURL($ce, 'node_modules/mathquill/dist/mathquill.js'), defer => undef =%>
+		<%= javascript getAssetURL($ce, 'node_modules/@openwebwork/mathquill/dist/mathquill.js'), defer => undef =%>
 		<%= javascript getAssetURL($ce, 'js/MathQuill/mqeditor.js'), defer => undef =%>
 	% } elsif ($ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathView') {
 		<%= javascript getAssetURL($ce, "js/MathView/$ce->{pg}{options}{mathViewLocale}"), defer => undef =%>
@@ -19,7 +19,7 @@
 % content_for css => begin
 	<%= stylesheet getAssetURL($ce, 'js/Problem/problem.css') =%>
 	% if ($ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathQuill') {
-		<%= stylesheet getAssetURL($ce, 'node_modules/mathquill/dist/mathquill.css') =%>
+		<%= stylesheet getAssetURL($ce, 'node_modules/@openwebwork/mathquill/dist/mathquill.css') =%>
 		<%= stylesheet getAssetURL($ce, 'js/MathQuill/mqeditor.css') =%>
 	% } elsif ($ce->{pg}{specialPGEnvironmentVars}{entryAssist} eq 'MathView') {
 		<%= stylesheet getAssetURL($ce, 'js/MathView/mathview.css') =%>
@@ -77,7 +77,7 @@
 								ref($_->{problem}) =~ /::ProblemVersion/
 									? (
 										version_id    => $_->{problem}->version_id,
-										answer_prefix => sprintf('Q%04d_', $_->{problemNumber} + 1)
+										answer_prefix => sprintf('Q%04d_', $_->{problem}->problem_id)
 									)
 									: (),
 							}
@@ -122,11 +122,17 @@
 						<%= check_box 'select-all' => 'on', id => 'select-all', class => 'select-all form-check-input',
 							data => { select_group => 'mark_correct' } =%>
 					
-					<%= maketext('Score (%)') %>
+					% unless ($ce->{problemGraderScore} eq 'Point') {
+						<%= maketext('Score (%)') %>
+					% }
+					% unless ($ce->{problemGraderScore} eq 'Percent') {
+						<%= maketext('Points (0 - [_1])', $problem->value) %>
+					% }
 					<%= maketext('Comment') %>
 				
 			
 			
+				% my $stepSize = points_stepsize($problem->value);
 				% for my $user (@$users) {
 					% my $userID = $user->user_id;
 					%
@@ -138,16 +144,12 @@
 						% if ($versionID) {
 							% $problemLink = $c->systemLink(
 								% url_for('gateway_quiz', setID => "$setID,v$versionID"),
-								% params => {
-									% effectiveUser     => $userID,
-									% currentPage       => $_->{pageNumber},
-									% showProblemGrader => 1
-								% }
+								% params => { effectiveUser => $userID, currentPage => $_->{pageNumber} }
 							% )->fragment("prob$_->{problemNumber}");
 						% } else {
 							% $problemLink = $c->systemLink(
 								% url_for('problem_detail'),
-								% params => { effectiveUser => $userID, showProblemGrader => 1 }
+								% params => { effectiveUser => $userID }
 							% )->fragment('problem_body');
 						% }
 						
@@ -172,23 +174,31 @@
 									% my @answers = split(/\t/, $_->{past_answer}->answer_string);
 									%
 									% for (my $i = 0; $i <= $#answers; $i++) {
-										% # Color the answer if it is not an essay answer.
-										

+										

 											% if ($answerTypes[$i] && $answerTypes[$i] eq 'essay') {
 												% # If the answer is an essay answer then display it line by line.
-												

-													<%= c(split /\n/, $answers[$i])->join('
') =%>
-												

+												% my @lines = split /\n/, $answers[$i];
+												% for (0 .. $#lines - 1) {
+													<%= $lines[$_] =%>

+												% }
+												<%= $lines[-1] =%>
 											% } elsif ($answerTypes[$i] && $answerTypes[$i] eq 'Value (Formula)') {
 												% # If its a formula then mark it as tex for MathJax.
 												`<%= $answers[$i] %>`
-												

 											% } else {
 												% # If it isn't an essay or a formula then show it as text.
-												<%= $answers[$i] %>
+												% my @parts = split("⍮", $answers[$i]);
+												% for (0 .. $#parts - 1) {
+													<%= $parts[$_] =%>⍮\
+												% }
+												<%= $parts[-1] =%>
 											% }
 										

 									% }
@@ -202,14 +212,46 @@
 									class             => 'mark_correct form-check-input',
 									'aria-labelledby' => 'mark-all-correct-header' =%>
 							
-							
-								% param("$userID.$versionID.score", undef);
-								<%= number_field "$userID.$versionID.score" =>
-										wwRound(0, $_->{problem}->status * 100),
-									class => 'score-selector form-control form-control-sm restricted-width-col',
-									style => 'width:6.5rem;', min => 0, max => 100, autocomplete => 'off',
-									'aria-labelledby' => 'score-header' =%>
-							
+							% unless ($ce->{problemGraderScore} eq 'Point') {
+								
+									% param("$userID.$versionID.score", undef);
+									<%= number_field "$userID.$versionID.score" => wwRound(0, $_->{problem}->status * 100),
+										id    => "$userID.$versionID.score",
+										class => 'problem-score form-control form-control-sm restricted-width-col',
+										style => 'width:6.5rem;', min => 0, max => 100, step => 1,
+										autocomplete => 'off', 'aria-labelledby' => 'score-header' =%>
+								
+							% }
+							% unless ($ce->{problemGraderScore} eq 'Percent') {
+								% my $problemValue = ($_->{problem}->value ne '' ? $_->{problem} : $problem)->value;
+								% my $useUserValue = $problemValue != $problem->value;
+								% my $thisStepSize = $useUserValue ? points_stepsize($problemValue) : $stepSize;
+								
+									% if ($ce->{problemGraderScore} eq 'Point') {
+										% param("$userID.$versionID.score", wwRound(0, $_->{problem}->status * 100));
+										<%= hidden_field "$userID.$versionID.score" => 0,
+											id => "$userID.$versionID.score" %>
+									% }
+									% param("$userID.$versionID.points", undef);
+									<%= number_field "$userID.$versionID.points" => round_nearest_stepsize(
+											$_->{problem}->status * $problemValue, $thisStepSize),
+										id    => "$userID.$versionID.points",
+										class => 'problem-points form-control form-control-sm restricted-width-col',
+										style => 'width:6.5rem;',
+										min   => 0,
+										max   => $problemValue,
+										step  => $thisStepSize,
+										autocomplete      => 'off',
+										'aria-labelledby' => $useUserValue
+											? "point-label-$userID.$versionID"
+											: 'point-header' =%>
+									% if ($useUserValue) {
+										
" class="fw-bold">
+											<%= maketext('Points (0 - [_1])', $problemValue) =%>
+										

+									% }
+								
+							% }
 							
 								% if (defined $_->{past_answer}) {
 									<%= text_area "$userID.$versionID.comment" => $_->{past_answer}->comment_string,
@@ -227,13 +269,13 @@
 			
 		
 		% if ($problemNeedsGrading) {
-			

+			

 				<%= maketext('Name') %>
 				\( = \)
 				<%= maketext('Problem has an essay answer that needs to be graded.') =%>
 			

 		% }
-		

+		

 			<%= maketext('Latest Answers') %>
 			\( = \)
 			<%= maketext('Problem has a different source file than the currently rendered problem.') =%>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep b/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep
index ae7c2c39c2..c291ffbe12 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep
@@ -5,6 +5,7 @@
 %
 % content_for css => begin
 	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.css') =%>
+	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/themes/dark.css'), id => 'flatpickr-dark-theme' =%>
 	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.css') =%>
 % end
 %
@@ -116,7 +117,7 @@
 	% }
 	% @$userLinks = sort @$userLinks;
 	%
-	

+	

 		

 			

 				<%== maketext(
@@ -151,7 +152,7 @@
 		

 	

 % } else {
-	

+	

 		

 			

 				<%== maketext(
@@ -198,7 +199,7 @@
 	

 	%
 	% # General set information
-	

+	

 		

 			
<%= maketext('Set Parameters') %>

 			

@@ -226,7 +227,7 @@
 	%
 	% # Display header information
 	% if (!@editForUser) {
-		

+		

 			

 				
<%= maketext("Headers") %>

 				% for my $headerType (@$headers) {
@@ -487,7 +488,7 @@
 									
 									<%= link_to $c->systemLink(url_for(
 											'instructor_problem_editor_withset_withproblem',
-											setID => $fullSetID, problemID => $problemID
+											setID => $setID, problemID => $problemID
 										)),
 										class  => 'psd_edit btn btn-secondary btn-sm',
 										target => 'WW_Editor',
@@ -621,7 +622,7 @@
 								% }
 							

 							

-								

+								

 									<%= $c->fieldTable(
 										$userToShow, $setID, $problemID,
 										$globalProblems->{$problemID},
@@ -629,7 +630,7 @@
 										$setRecord->assignment_type
 									) =%>
 								

-								

+								

 									% if ($repeatFile) {
 										
<%= $repeatFile %>

 									% }
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList.html.ep
index 8f0a71aee9..46a55b57af 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList.html.ep
@@ -2,6 +2,7 @@
 %
 % content_for css => begin
 	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.css') =%>
+	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/themes/dark.css'), id => 'flatpickr-dark-theme' =%>
 	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.css') =%>
 % end
 %
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep
index bd7ea75f91..60bff0fd19 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep
@@ -15,11 +15,15 @@
 			class => 'col-form-label col-form-label-sm col-md-auto' =%>
 		

 			<%= select_field 'action.import.source' => [
-					[ maketext('Select filenames below') => '', selected => undef, disabled => undef ],
+					[ maketext('Select filename below') => '', selected => undef, disabled => undef ],
 					@$setDefList
 				],
 				id => 'import_source_select', class => 'form-select form-select-sm', dir => 'ltr',
 				size => param('action.import.number') || 1,
+				data => {
+					select_multiple_text => maketext('Select filenames below'),
+					select_single_text => maketext('Select filename below')
+				},
 				defined param('action.import.number') && param('action.import.number') ne '1'
 				? (multiple => undef)
 				: () =%>
@@ -30,7 +34,7 @@
 			class => 'col-form-label col-form-label-sm col-md-auto' =%>
 		

 			<%= text_field 'action.import.name' => '', id => 'import_text', class => 'form-control form-control-sm',
-				dir => 'ltr' =%>
+				dir => 'ltr', data => { multiple_files_text => maketext('(taken from filenames)') } =%>
 		

 	

 	

diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep
index 1054859cb3..30bedc5b6e 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep
@@ -16,6 +16,7 @@
 
 %
 % if ($c->{editMode}) {
+	<%= check_box apply_date_sets => $set_id, class => 'form-check-input' =%>
 	
 		% if ($iconClass) {
 			
@@ -71,9 +72,9 @@
 % for my $field (@$fieldNames) {
 	% next unless defined $fieldTypes->{$field};
 	
-		
+		

 			<%= include 'ContentGenerator/Instructor/ProblemSetList/set_list_field',
 				name => "set.$set_id.$field", value => $set->$field, type => $fieldTypes->{$field} =%>
-		
+		

 	
 % }
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep
index 6717411106..bb220e0a2c 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep
@@ -10,6 +10,50 @@
 	% answer_date            => maketext('Answer Date')
 % );
 %
+% if ($c->{editMode}) {
+	

+		
+		

+			
+		

+		
+		

+			<%= text_field 'common-date' => '',
+				id => 'common-date', class => 'form-control',
+				data => {
+					input => undef,
+					done_text  => maketext('Done'),
+					today_text => maketext('Today'),
+					now_text   => maketext('Now'),
+					locale     => $ce->{language},
+					timezone   => $ce->{siteDefaults}{timezone}
+				} =%>
+			
+				
+			
+		

+		

+			
+		

+	

+	

+		<%= maketext('Please choose a set date type.') %>
+	

+	

+		<%= maketext('Please select a date.') %>
+	

+% }
 

 	<%= maketext('Please select at least one set.') %>
 

@@ -21,22 +65,20 @@
 		%
 		
 			
-				% if (!$c->{editMode}) {
-					
-						<%= label_for 'select-all', begin =%>
-							<%= check_box 'select-all' => '', id => 'select-all',
-								class => 'select-all form-check-input set-id-tooltip',
-								'aria-label' => maketext('Select all sets'),
-								data => {
-									select_group => 'selected_sets',
-									bs_toggle => 'tooltip',
-									bs_placement => 'right',
-									bs_title => maketext('Select all sets')
-								} =%>
-								
-							<% end =%>
-					
-				% }
+				
+					<%= label_for 'select-all', begin =%>
+						<%= check_box 'select-all' => '', id => 'select-all',
+							class => 'select-all form-check-input set-id-tooltip',
+							'aria-label' => maketext('Select all sets'),
+							data => {
+								select_group => $c->{editMode} ? 'apply_date_sets' : 'selected_sets',
+								bs_toggle => 'tooltip',
+								bs_placement => 'right',
+								bs_title => maketext('Select all sets')
+							} =%>
+							
+						<% end =%>
+				
 				% for (@$fieldNames) {
 					
 						% if (!$c->{editMode} && $sortableFields->{$_}) {
diff --git a/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep b/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep
index 87cfaf1353..c1af9c734e 100644
--- a/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep
+++ b/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep
@@ -46,7 +46,7 @@
 	% if ($stats->{students_attempted}) {
 		% content_for "global-problem-stats-$cnt" => begin
 			

-				 begin
 			

-				>
+						 $ce->{sessionTimeout} ? 'class="table-rule"' : '' %>>
 							% # Show the problem seed for instructors.
 							% if ($isInstructor) {
 								
@@ -47,9 +46,13 @@
 								%
 								% # Color the answer if the user is an instructor, there is an answer,
 								% # there is a score, and it is not an essay question.
-								 class="px-3 <%== $answerType eq 'essay' ? 'essay' : '' %>">
+								
 									% if ($answer eq '') {
 										<%= maketext('empty') %>
 									% } else {
diff --git a/templates/ContentGenerator/Instructor/Stats.html.ep b/templates/ContentGenerator/Instructor/Stats.html.ep
index 19c234d292..f1ee404562 100644
--- a/templates/ContentGenerator/Instructor/Stats.html.ep
+++ b/templates/ContentGenerator/Instructor/Stats.html.ep
@@ -1,20 +1,22 @@
 % use WeBWorK::Utils qw(getAssetURL);
+% use WeBWorK::Utils::Sets qw(format_set_name_display);
 %
 % unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
 	
<%= maketext('You are not authorized to access instructor tools') %>

 	% last;
 % }
 %
-% if (current_route eq 'instructor_user_statistics') {
-	% # Stats and StudentProgress share this template.
-	<%= include 'ContentGenerator/Instructor/Stats/student_stats' =%>
-% } elsif (current_route eq 'instructor_set_statistics') {
+% if (current_route eq 'instructor_set_statistics') {
 	<%= $c->set_stats =%>
 % } elsif (current_route eq 'instructor_problem_statistics') {
 	<%= $c->problem_stats =%>
 % } else {
-	% # Stats and StudentProgress share this template also.
-	<%= include 'ContentGenerator/Instructor/Stats/index',
-		set_header     => maketext('View statistics by set'),
-		student_header => maketext('View statistics by student') =%>
+	
    
+		% for ($db->listGlobalSetsWhere({}, 'set_id')) {
+			
  • 
+				<%= link_to format_set_name_display($_->[0]) =>
+					$c->systemLink(url_for("instructor_set_statistics", setID => $_->[0])) =%>
+			
    • 
+		% }
+	

 % }
diff --git a/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep b/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep
index a0aea45c9f..4b8c7c792c 100644
--- a/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep
+++ b/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep
@@ -10,7 +10,7 @@
 					url_for('instructor_set_statistics'),
 					params => param('filter') ? { filter => param('filter') } : {}
 				),
-				class => 'dropdown-item', $c->{prettyID} ? () : (style => 'background-color: #8F8') =%>
+				class => join(' ', 'dropdown-item', $c->{prettyID} ? () : 'active') =%>
 		
 		% for (@$problems) {
 			% my $probID =
@@ -22,8 +22,7 @@
 						url_for('instructor_problem_statistics', problemID => $_->problem_id),
 						params => param('filter') ? { filter => param('filter') } : {}
 					),
-					class => 'dropdown-item',
-					$probID eq ($c->{prettyID} // '') ? (style => 'background-color: #8F8') : () =%>
+					class => join(' ', 'dropdown-item', $probID eq ($c->{prettyID} // '') ? 'active' : ()) =%>
 			
 		% }
 	
diff --git a/templates/ContentGenerator/Instructor/Stats/siblings.html.ep b/templates/ContentGenerator/Instructor/Stats/siblings.html.ep
index 68827f455e..41bd165a6a 100644
--- a/templates/ContentGenerator/Instructor/Stats/siblings.html.ep
+++ b/templates/ContentGenerator/Instructor/Stats/siblings.html.ep
@@ -1,6 +1,3 @@
-% # Note that this template is used by both WeBWorK::ContentGenerator::Instructor::Stats and
-% # WeBWorK::ContentGenerator::Instructor::StudentProgress.
-%
 % use WeBWorK::Utils::JITAR qw(jitar_id_to_seq);
 % use WeBWorK::Utils::Sets qw(format_set_name_display);
 %
@@ -9,24 +6,8 @@
 % }
 %
 

-	
<%= $header %>

-	% if (current_route =~ /^instructor_user_/) {
-		
    
-			% for (@{ $c->{student_records} }) {
-				
  • 
-					<%= tag 'a',
-						$_->user_id eq $c->{studentID}
-						? (class => 'nav-link active')
-						: (
-							href => $c->systemLink(url_for(current_route, userID => $_->user_id)),
-							class => 'nav-link'
-						), begin =%>
-						<%= $_->last_name =%>, <%= $_->first_name %> (<%= $_->user_id %>)
-					<% end =%>
-				
    • 
-			% }
-		

-	% } elsif (current_route eq 'instructor_problem_statistics') {
+	
<%= maketext('Statistics') %>

+	% if (current_route eq 'instructor_problem_statistics') {
 		
    
 			% for (map { $_->[1] } $db->listGlobalProblemsWhere({ set_id => stash->{setID} }, 'problem_id')) {
 				
  • 
@@ -46,22 +27,8 @@
 			% }
 		

 	% } else {
-		
    
-			% for (map { $_->[0] } $db->listGlobalSetsWhere({}, 'set_id')) {
-				
  • 
-					<%= tag 'a',
-						defined stash('setID') && $_ eq stash('setID') ? (class => 'nav-link active')
-						: (
-							href => $c->systemLink(
-								url_for(current_route =~ s/instructor_(progress|statistics)/instructor_set_$1/r,
-									setID => $_),
-								params => param('filter') ? { filter => param('filter') } : {}
-							),
-							class => 'nav-link'
-						),
-						format_set_name_display($_) =%>
-				
    • 
-			% }
-		

+		% # Shared with StudentProgress siblings.
+		<%= include 'ContentGenerator/Instructor/Stats/siblings_set_list',
+			set_link_route => 'instructor_set_statistics' =%>
 	% }
 

diff --git a/templates/ContentGenerator/Instructor/Stats/siblings_set_list.html.ep b/templates/ContentGenerator/Instructor/Stats/siblings_set_list.html.ep
new file mode 100644
index 0000000000..e69605b056
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/Stats/siblings_set_list.html.ep
@@ -0,0 +1,18 @@
+% # This is shared between Stats and StudentProgress siblings page to list all sets.
+%
+
    
+	% for (map { $_->[0] } $db->listGlobalSetsWhere({}, 'set_id')) {
+		
  • 
+			<%= tag 'a',
+				defined stash('setID') && $_ eq stash('setID') ? (class => 'nav-link active')
+				: (
+					href => $c->systemLink(
+						url_for($set_link_route, setID => $_),
+						params => param('filter') ? { filter => param('filter') } : {}
+					),
+					class => 'nav-link'
+				),
+				format_set_name_display($_) =%>
+		
    • 
+	% }
+

diff --git a/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep b/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep
index 98ba7f083e..12308273d6 100644
--- a/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep
+++ b/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep
@@ -13,7 +13,7 @@
 		% for (@$filters) {
 			
  • 
 				<%= link_to $_->[0] => $c->systemLink(url_for, params => { %$params, filter => $_->[1] }),
-					$_->[1] eq $filter ? (style => 'background-color: #8F8') : (), class => 'dropdown-item' =%>
+					class => join(' ', 'dropdown-item', $_->[1] eq $filter ? 'active' : ()) =%>
 			
    • 
 		% }
 	
diff --git a/templates/ContentGenerator/Instructor/StudentProgress.html.ep b/templates/ContentGenerator/Instructor/StudentProgress.html.ep
index d135d8e5c5..4b02941e92 100644
--- a/templates/ContentGenerator/Instructor/StudentProgress.html.ep
+++ b/templates/ContentGenerator/Instructor/StudentProgress.html.ep
@@ -4,13 +4,9 @@
 % }
 %
 % if (current_route eq 'instructor_user_progress') {
-	% # Stats and StudentProgress share this template.
-	<%= include 'ContentGenerator/Instructor/Stats/student_stats' =%>
+	<%= include 'ContentGenerator/Instructor/StudentProgress/student_progress' =%>
 % } elsif (current_route eq 'instructor_set_progress') {
 	<%= $c->displaySets =%>
 % } else {
-	% # Stats and StudentProgress share this template also.
-	<%= include 'ContentGenerator/Instructor/Stats/index',
-		set_header     => maketext('View student progress by set'),
-		student_header => maketext('View student progress by student') =%>
+	<%= include 'ContentGenerator/Instructor/StudentProgress/index' =%>
 % }
diff --git a/templates/ContentGenerator/Instructor/Stats/index.html.ep b/templates/ContentGenerator/Instructor/StudentProgress/index.html.ep
similarity index 59%
rename from templates/ContentGenerator/Instructor/Stats/index.html.ep
rename to templates/ContentGenerator/Instructor/StudentProgress/index.html.ep
index 96016b1bfa..142abaa394 100644
--- a/templates/ContentGenerator/Instructor/Stats/index.html.ep
+++ b/templates/ContentGenerator/Instructor/StudentProgress/index.html.ep
@@ -1,22 +1,17 @@
-% # Note that this template is used by both WeBWorK::ContentGenerator::Instructor::Stats and
-% # WeBWorK::ContentGenerator::Instructor::StudentProgress.
-%
 % use WeBWorK::Utils::Sets qw(format_set_name_display);
 %
-% my $type = current_route =~ s/instructor_//r;
-%
 % stash->{footerWidthClass} = 'col-lg-10 col-sm-12';
 %
 
    
 	
    
 		
    
 			
    
-				
    <%= $set_header %>
    
+				
    <%= maketext('View student progress by set') %>
    
 				
      
 					% for ($db->listGlobalSetsWhere({}, 'set_id')) {
 						
    • 
 							<%= link_to format_set_name_display($_->[0]) =>
-								$c->systemLink(url_for("instructor_set_$type", setID => $_->[0])) =%>
+								$c->systemLink(url_for("instructor_set_progress", setID => $_->[0])) =%>
 						
      • 
 					% }
 				
    
@@ -26,12 +21,12 @@
 	
    
 		
    
 			
    
-				
    <%= $student_header %>
    
+				
    <%= maketext('View student progress by student') %>
    
 				
      
 					% for (@{ $c->{student_records} }) {
 						
    • 
 							<%= link_to $_->last_name . ', ' . $_->first_name . ' (' . $_->user_id . ')' =>
-								$c->systemLink(url_for("instructor_user_$type", userID   => $_->user_id)) =%>
+								$c->systemLink(url_for("instructor_user_progress", userID   => $_->user_id)) =%>
 						
      • 
 					% }
 				
    
diff --git a/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep b/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep
index e1eb38b734..e155421871 100644
--- a/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep
+++ b/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep
@@ -16,6 +16,7 @@
 		% show_section    => $showColumns->{section},
 		% show_recitation => $showColumns->{recit},
 		% show_login      => $showColumns->{login},
+		% returning       => 1
 		% )
 	% : ()
 % );
diff --git a/templates/ContentGenerator/Instructor/StudentProgress/siblings.html.ep b/templates/ContentGenerator/Instructor/StudentProgress/siblings.html.ep
new file mode 100644
index 0000000000..8d77a079f9
--- /dev/null
+++ b/templates/ContentGenerator/Instructor/StudentProgress/siblings.html.ep
@@ -0,0 +1,30 @@
+% use WeBWorK::Utils::Sets qw(format_set_name_display);
+%
+% unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+	% last;
+% }
+%
+
    
+	
    <%= maketext('Student Progress') %>
    
+	% if (current_route eq 'instructor_user_progress') {
+		
      
+			% for (@{ $c->{student_records} }) {
+				
    • 
+					<%= tag 'a',
+						$_->user_id eq $c->{studentID}
+						? (class => 'nav-link active')
+						: (
+							href => $c->systemLink(url_for(current_route, userID => $_->user_id)),
+							class => 'nav-link'
+						), begin =%>
+						<%= $_->last_name =%>, <%= $_->first_name %> (<%= $_->user_id %>)
+					<% end =%>
+				
      • 
+			% }
+		
    
+	% } else {
+		% # Shared with Stats siblings.
+		<%= include 'ContentGenerator/Instructor/Stats/siblings_set_list',
+			set_link_route => 'instructor_set_progress' =%>
+	% }
+
    
diff --git a/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep b/templates/ContentGenerator/Instructor/StudentProgress/student_progress.html.ep
similarity index 77%
rename from templates/ContentGenerator/Instructor/Stats/student_stats.html.ep
rename to templates/ContentGenerator/Instructor/StudentProgress/student_progress.html.ep
index 6f50080c39..2eb40ddba1 100644
--- a/templates/ContentGenerator/Instructor/Stats/student_stats.html.ep
+++ b/templates/ContentGenerator/Instructor/StudentProgress/student_progress.html.ep
@@ -1,6 +1,3 @@
-% # Note that this template is used by both WeBWorK::ContentGenerator::Instructor::Stats and
-% # WeBWorK::ContentGenerator::Instructor::StudentProgress.
-%
 % use WeBWorK::ContentGenerator::Grades;
 %
 % my $studentRecord = $db->getUser($c->{studentID});
@@ -27,4 +24,4 @@
 	<%= link_to $studentRecord->user_id =>
 		$c->systemLink(url_for('set_list'), params => { effectiveUser => $c->{studentID} }) =%>
 % }
-<%= WeBWorK::ContentGenerator::Grades::displayStudentStats($c, $c->{studentID}) =%>
+<%= $c->displayStudentStats =%>
diff --git a/templates/ContentGenerator/Grades/student_stats.html.ep b/templates/ContentGenerator/Instructor/StudentProgress/student_stats.html.ep
similarity index 100%
rename from templates/ContentGenerator/Grades/student_stats.html.ep
rename to templates/ContentGenerator/Instructor/StudentProgress/student_stats.html.ep
diff --git a/templates/ContentGenerator/Instructor/UserDetail.html.ep b/templates/ContentGenerator/Instructor/UserDetail.html.ep
index 1ef3720df6..4e4c0447fd 100644
--- a/templates/ContentGenerator/Instructor/UserDetail.html.ep
+++ b/templates/ContentGenerator/Instructor/UserDetail.html.ep
@@ -2,6 +2,7 @@
 %
 % content_for css => begin
 	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.css') =%>
+	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/themes/dark.css'), id => 'flatpickr-dark-theme' =%>
 	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.css') =%>
 % end
 %
diff --git a/templates/ContentGenerator/Instructor/UserList.html.ep b/templates/ContentGenerator/Instructor/UserList.html.ep
index 1f441230e2..424b0c2d9b 100644
--- a/templates/ContentGenerator/Instructor/UserList.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList.html.ep
@@ -59,10 +59,15 @@
 				<%= link_to maketext($formTitles->{$actionID}) => "#$actionID",
 					class            => "nav-link action-link$active$disabled",
 					id               => "$actionID-tab",
-					data             => { action => $actionID, bs_toggle => 'tab', bs_target => "#$actionID" },
+					data             => {
+						action    => $actionID,
+						bs_toggle => 'tab',
+						bs_target => "#$actionID",
+						$actionID eq 'cancel_edit' ? (no_validate => 1) : ()
+					},
 					role             => 'tab',
 					'aria-controls'  => $actionID,
-					'aria-selected'  => $active ? 'true' : 'false' =%>
+					'aria-selected'  => $active ? 'true' : 'false', =%>
 			
 		% end
 		% content_for 'tab-content' => begin
diff --git a/templates/ContentGenerator/Instructor/UserList/user_list.html.ep b/templates/ContentGenerator/Instructor/UserList/user_list.html.ep
index 3abe3e2bc6..4e99bb6e7a 100644
--- a/templates/ContentGenerator/Instructor/UserList/user_list.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/user_list.html.ep
@@ -52,6 +52,7 @@
 				<%= include 'ContentGenerator/Instructor/UserList/sort_button', field => 'status' =%>
 			
    
 		
+		<%= maketext('Accommodation Time Factor') %>
 		
 			
    
 				<%= link_to maketext('Section') => '#', class => 'sort-header',
diff --git a/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep b/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep
index c0a842ee0a..e7e3831480 100644
--- a/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep
@@ -1,12 +1,13 @@
 % my $fieldName = 'user.' . $user->user_id . '.' . $field;
 % my $properties = $fieldProperties->{$field};
 %
-% if ($properties->{type} eq 'text') {
+% if ($properties->{type} eq 'text' || $properties->{type} eq 'number') {
 	% my $value = $user->$field;
 	% if ($c->{editMode}) {
-		<%= text_field $fieldName => $value, id => $fieldName . '_id', size => $properties->{size},
+		% my $field_method = "$properties->{type}_field";
+		<%= $c->$field_method($fieldName => $value, id => $fieldName . '_id', %{$properties->{attributes} // {}},
 			class => 'form-control form-control-sm d-inline w-auto',
-			'aria-labelledby' => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header' =%>
+			'aria-labelledby' => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header') =%>
 	% } else {
 		% if ($field eq 'email_address') {
 			% if ($value =~ /\S/) {
diff --git a/templates/ContentGenerator/LoginProctor.html.ep b/templates/ContentGenerator/LoginProctor.html.ep
index 02635f8309..fb3e8545fe 100644
--- a/templates/ContentGenerator/LoginProctor.html.ep
+++ b/templates/ContentGenerator/LoginProctor.html.ep
@@ -16,14 +16,14 @@
 % # Print a message about submission times if we're submitting an answer.
 % if (param('submitAnswers')) {
 	% my $dueTime = $userSet->due_date;
-	% my ($color, $msg) = ('#ddddff', '');
+	% my ($alertClass, $msg) = ('alert-primary', '');
 	% if ($dueTime + $ce->{gatewayGracePeriod} < $submitTime) {
-		% $color = '#ffffaa';
+		% $alertClass = ' alert-warning';
 		% $msg = maketext('The time limit on this assignment was exceeded. The assignment may be checked, '
 			% . 'but the result will not be counted.');
 	% }
 	%
-	
    
+