Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop multi answer fix #767

Merged
merged 7 commits into from
Jun 16, 2017
Merged

Develop multi answer fix #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f8b26e1
Temporary commit — the past answer logs appear to work — but need sim…
mgage May 23, 2017
f08c38e
Comment out warning messages
mgage May 24, 2017
9ca5ced
Make sure all of the answers are printed.
mgage May 26, 2017
e5bd698
Refactor create_ans_str_from_responses()
mgage May 28, 2017
c832b2f
Update documentation
mgage May 28, 2017
09515e6
Refactor: Use WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::c…
mgage May 28, 2017
f826c8d
Insure that $studentAnswer and $answerScore are defined.
mgage Jun 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 69 additions & 34 deletions lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,12 +397,12 @@ sub attemptResults {

@row = ();
my $answerResult = $pg->{answers}->{$name};
my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
my $studentAnswer = $answerResult->{student_ans}//''; # original_student_ans
my $preview = ($showAttemptPreview
? $self->previewAnswer($answerResult, $imgGen)
: "");
my $correctAnswer = $answerResult->{correct_ans};
$answerScore = $answerResult->{score};
$answerScore = $answerResult->{score}//0;
my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
$numCorrect += $answerScore > 0;
$numEssay += ($answerResult->{type}//'') eq 'essay';
Expand Down Expand Up @@ -1476,48 +1476,71 @@ sub body {
}

}


# The following arrays cache results obtained in the two passes through
# the collection of problems in the quiz
# This might save some time.
# This refactoring hasn't taken place yet
# because I don't yet understand why the ordering
# for creating past answers was chosen as it is, different from creating sticky answers
# my @answerString = ();
# my @encoded_ans_string = ();
# my @scores = ();
# my @isEssay = ();

my @pureProblems = $db->getAllProblemVersions($effectiveUser,
$setName,
$versionNumber);
foreach my $i ( 0 .. $#problems ) { # process each problem
# this code is essentially that from Problem.pm
# begin problem loop for sticky answers
my $pureProblem = $pureProblems[$i];

# store answers in problem for sticky answers later
my %answersToStore;
# my %answersToStore;

# we have to be a little careful about getting the
# answers that we're saving, because we don't have
# a pg_results object for all problems if we're not
# submitting
my %answerHash = ();
my @answer_order = ();
my $encoded_ans_string;
if ( ref( $pg_results[$i] ) ) {
%answerHash = %{$pg_results[$i]->{answers}};
$answersToStore{$_} = $self->{formFields}->{$_}
foreach (keys %answerHash);
# check for extra answers that slipped
# by---e.g. for matrices, and get them
# from the original input form
my @extra_answer_names =
@{ $pg_results[$i]->{flags}->{KEPT_EXTRA_ANSWERS} };
$answersToStore{$_} =
$self->{formFields}->{$_} foreach (@extra_answer_names);
@answer_order =
( @{$pg_results[$i]->{flags}->{ANSWER_ENTRY_ORDER}},
@extra_answer_names );
# %answerHash = %{$pg_results[$i]->{answers}};
# $answersToStore{$_} = $self->{formFields}->{$_}
# foreach (keys %answerHash);
# # check for extra answers that slipped
# # by---e.g. for matrices, and get them
# # from the original input form
# my @extra_answer_names =
# @{ $pg_results[$i]->{flags}->{KEPT_EXTRA_ANSWERS} };
# $answersToStore{$_} =
# $self->{formFields}->{$_} foreach (@extra_answer_names);
# @answer_order =
# ( @{$pg_results[$i]->{flags}->{ANSWER_ENTRY_ORDER}},
# @extra_answer_names );
my ($answerString, $scores,$isEssay); #not used here
($answerString,$encoded_ans_string,$scores,$isEssay) =
WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::create_ans_str_from_responses(
$self, $pg_results[$i]
); # ref($self) eq WeBWorK::ContentGenerator::Problem
# ref($pg) eq "WeBWorK::PG::Local";
} else {
my $prefix = sprintf('Q%04d_',$i+1);
my @fields = sort grep {/^$prefix/} (keys %{$self->{formFields}});
%answersToStore = map {$_ => $self->{formFields}->{$_}} @fields;
@answer_order = @fields;
my %answersToStore = map {$_ => $self->{formFields}->{$_}} @fields;
my @answer_order = @fields;
$encoded_ans_string = encodeAnswers( %answersToStore,
@answer_order );

}
my $answerString = encodeAnswers( %answersToStore,
@answer_order );
# my $answerString = encodeAnswers( %answersToStore,
# @answer_order );
#
# and get the last answer
$problems[$i]->last_answer( $answerString );
$pureProblem->last_answer( $answerString );
$problems[$i]->last_answer( $encoded_ans_string );
$pureProblem->last_answer( $encoded_ans_string );

# next, store the state in the database if that makes
# sense
Expand Down Expand Up @@ -1584,7 +1607,7 @@ sub body {
$db->putProblemVersion( $pureProblem );
}
} # end loop through problems

# end loop through problems for sticky answer

#Try to update the student score on the LMS
# if that option is enabled.
Expand All @@ -1611,28 +1634,39 @@ sub body {
# this is carried over from Problem.pm
if ( defined( $answer_log ) ) {
foreach my $i ( 0 .. $#problems ) {
# begin problem loop for passed answers
my $answerString = '';
my $scores = '';
my $isEssay = 0;
# note that we store these answers in the
# order that they are presented, not the
# actual problem order
if ( ref( $pg_results[$probOrder[$i]] ) ) {
my %answerHash = %{ $pg_results[$probOrder[$i]]->{answers} };
foreach ( sortByName(undef, keys %answerHash) ) {
my $sAns = defined($answerHash{$_}->{original_student_ans}) ? $answerHash{$_}->{original_student_ans} : '';
$answerString .= $sAns . "\t";
$scores .= $answerHash{$_}->{score}>=1 ? "1" : "0" if ( $submitAnswers );
}
# foreach ( sortByName(undef, keys %answerHash) ) {
# my $sAns = defined($answerHash{$_}->{original_student_ans}) ? $answerHash{$_}->{original_student_ans} : '';
# $answerString .= $sAns . "\t";
# $scores .= $answerHash{$_}->{score}>=1 ? "1" : "0" if ( $submitAnswers );
# }
my ($encoded_ans_string, ); #not used here
($answerString,$encoded_ans_string,$scores,$isEssay) =
WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil::create_ans_str_from_responses(
$self, $pg_results[$probOrder[$i]]
); # ref($self) eq WeBWorK::ContentGenerator::Problem
# ref($pg) eq "WeBWorK::PG::Local";
$answerString =~ s/\t+$/\t/;
} else {
my $prefix = sprintf('Q%04d_', ($probOrder[$i]+1));
my @fields = sort grep {/^$prefix/} (keys %{$self->{formFields}});
foreach ( @fields ) {
$answerString .= $self->{formFields}->{$_} . "\t";
$scores .= $self->{formFields}->{"probstatus" . ($probOrder[$i]+1)} >= 1 ? "1" : "0" if ( $submitAnswers );
}
$answerString =~ s/\t+$/\t/;
}
$answerString =~ s/\t+$/\t/;



# Prefix answer string with submission type
my $answerPrefix;
if ( $submitAnswers ) {
$answerPrefix = "[submit] ";
Expand All @@ -1650,7 +1684,8 @@ sub body {
$answerString = "$answerPrefix" .
"$answerString";
}


#Write to courseLog
writeCourseLog( $self->{ce}, "answer_log",
join("", '|',
$problems[$i]->user_id,
Expand All @@ -1659,7 +1694,7 @@ sub body {
"\t$timeNow\t",
"$answerString"),
);
#add to PastAnswer db
#add to PastAnswer db
my $pastAnswer = $db->newPastAnswer();
$pastAnswer->course_id($courseID);
$pastAnswer->user_id($problems[$i]->user_id);
Expand All @@ -1676,7 +1711,7 @@ sub body {
}
}
debug("end answer processing");

# end problem loop
# additional set-level database manipulation: we want to save the time
# that a set was submitted, and for proctored tests we want to reset
# the assignment type after a set is submitted for the last time so
Expand Down
15 changes: 13 additions & 2 deletions lib/WeBWorK/ContentGenerator/Instructor/ShowAnswers.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,18 @@ sub body {
}

my $num_ans = $#scores;

my $num_ans_blanks=$#answers;
my $upper_limit = ($num_ans > $num_ans_blanks)? $num_ans: $num_ans_blanks;

#FIXME -- $num_ans is no longer the value needed -- $num_ans is the number of
# answer evaluators (or answer groups) each of which might have several
# answer blanks. On the other hand sometimes an answer blank has been left blank
# and there is no answer, but the score is zero.
# In other words sometimes number of scores is greater than the number of answers
# and sometimes it is less.

#warn "checking number of answers ", scalar(@answers), " vs number of scores ",scalar(@scores), " and limit is $upper_limit";
#warn "answers are ", join(" ", @answers);
if ($record{time} - $previousTime > $ce->{sessionKeyTimeout}) {
$rowOptions->{'class'} = 'table-rule';
} else {
Expand All @@ -489,7 +500,7 @@ sub body {
@row = (CGI::td({width=>10}),CGI::td({style=>"color:#808080"},CGI::small($time)));


for (my $i = 0; $i <= $num_ans; $i++) {
for (my $i = 0; $i <= $upper_limit; $i++) {
my $td;
my $answer = $answers[$i] // '';
my $answerType = defined($answerTypes[$i]) ? $answerTypes[$i] : '';
Expand Down
6 changes: 3 additions & 3 deletions lib/WeBWorK/ContentGenerator/Problem.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
################################################################################

package WeBWorK::ContentGenerator::Problem;
use base qw(WeBWorK);
#use base qw(WeBWorK::ContentGenerator);
use base qw(WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil); # not needed?
#use base qw(WeBWorK);
use base qw(WeBWorK::ContentGenerator);
use WeBWorK::ContentGenerator::ProblemUtil::ProblemUtil; # not needed?

=head1 NAME

Expand Down
Loading