Adjust for removal of "positive violations".

Author: drgrice1

lib/WebworkWebservice/ProblemActions.pm

@@ -172,8 +172,8 @@ sub runPGCritic {
 	return {
 		ra_out => {
 			html => $self->c->render_to_string(
-				template => 'ContentGenerator/Instructor/PGProblemEditor/pg_critic',
-				results  => [ critiquePGCode($params->{pgCode}) ]
+				template   => 'ContentGenerator/Instructor/PGProblemEditor/pg_critic',
+				violations => [ critiquePGCode($params->{pgCode}) ]
 			)
 		},
 		text => 'The script pg-critic has been run successfully.'

templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep

@@ -34,11 +34,11 @@
 		<%= 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('Run the PG Critic Analyzer') =%>
+			<%== maketext('Analyze code with PG Critic') =%>
 		<% end =%>
-		<a class="help-popup" data-bs-content="<%== maketext('This option runs the PG Critic '
-			. 'code analyzer which gives suggestions on using modern PG constructs and  '
-			. 'ensures that you include important features.') =%>"
+		<a class="help-popup" data-bs-content="<%== maketext('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.') =%>"
 			data-bs-placement="top" data-bs-toggle="popover" role="button">
 			<i aria-hidden="true" class="fas fa-question-circle"></i>
 			<span class="visually-hidden"><%= maketext('PG Critic Help') %></span>

templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep

@@ -1,31 +1,12 @@
 % Perl::Critic::Violation::set_format('%m at line %l, column %c.');
 %
 <div class="m-3 overflow-auto">
-	<h2><%= maketext('PG Critic Results') %></h2>
-	% my @goodResults = grep { ref($_->explanation) eq 'HASH' && ($_->explanation->{score} // 0) > 0 } @$results;
-	% if (@goodResults) {
-		<h3 class="mt-2"><%= maketext('The following are good aspects of this problem:') %></h3>
+	<h2><%= maketext('PG Critic Violations') %></h2>
+	% my @pgCriticViolations = grep { $_->policy =~ /^Perl::Critic::Policy::PG::/ } @$violations;
+	% if (@pgCriticViolations) {
+		<h3 class="mt-2"><%= maketext('The following PG issues should be fixed:') %></h3>
 		<ul class="list-group">
-			% for (@goodResults) {
-				<li class="list-group-item">
-					<div><%= $_->to_string %></div>
-					<div>
-						<%= $_->explanation->{explanation} %>
-						See <%= link_to(
-							($_->policy =~ s/^Perl::Critic::Policy:://r)
-								=> pod_viewer => { filePath => 'lib/' . ($_->policy =~ s/::/\//gr) . '.pm' },
-							target => '_blank'
-						) %>.
-					</div>
-				</li>
-			% }
-		</ul>
-	%}
-	% my @badResults = grep { ref($_->explanation) eq 'HASH' && ($_->explanation->{score} // 0) < 0 } @$results;
-	% if (@badResults) {
-		<h3 class="mt-2"><%= maketext('The following are things that can be improved:') %></h3>
-		<ul class="list-group">
-			% for (@badResults) {
+			% for (@pgCriticViolations) {
 				<li class="list-group-item">
 					<div><%= $_->to_string %></div>
 					<div>
@@ -55,11 +36,11 @@
 			% }
 		</ul>
 	%}
-	% my @badPerlResults = grep { !ref($_->explanation) } @$results;
-	% if (@badPerlResults) {
-		<h3 class="mt-2"><%= maketext('The following are general Perl issues that can be improved:') %></h3>
+	% my @perlCriticViolations = grep { $_->policy !~ /^Perl::Critic::Policy::PG::/ } @$violations;
+	% if (@perlCriticViolations) {
+		<h3 class="mt-2"><%= maketext('The following general Perl issues should be fixed:') %></h3>
 		<ul class="list-group">
-			% for (@badPerlResults) {
+			% for (@perlCriticViolations) {
 				<li class="list-group-item">
 					<div><%= $_->to_string %></div>
 					<div>

templates/HelpFiles/InstructorPGProblemEditor.html.ep

@@ -169,9 +169,9 @@
 		. '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 Analyzer." This checks that the code uses '
-		. 'modern features of PG, that it does not use old or deprecated features of PG, and offers advice on how '
-		. 'to fix issues that are found.') =%>
+		. '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.') =%>
 	</dd>
 
 	<dt><%= maketext('Save') %></dt>