version 1.159, 2006/04/28 21:14:03
|
version 1.165, 2006/04/29 18:00:17
|
Line 902 sub clear_internal_caches {
|
Line 902 sub clear_internal_caches {
|
undef(%students_by_id); |
undef(%students_by_id); |
} |
} |
|
|
|
|
|
################################################ |
|
################################################ |
|
|
|
sub symb_is_for_task { |
|
my ($symb) = @_; |
|
return ($symb =~ /\.task$/); |
|
} |
|
|
################################################ |
################################################ |
################################################ |
################################################ |
|
|
Line 993 sub update_full_student_data {
|
Line 1002 sub update_full_student_data {
|
next; |
next; |
} elsif ($parameter eq 'version') { |
} elsif ($parameter eq 'version') { |
next; |
next; |
} elsif ($parameter =~ /^resource\.(.*)\.(tries| |
} elsif (&symb_is_for_task($symb)) { |
|
next if ($parameter !~ /^resource\.(.*)\.(award| |
|
awarded| |
|
solved| |
|
submission| |
|
portfiles| |
|
status| |
|
version| |
|
regrader)\s*$/x); |
|
my ($version_and_part_id, $field) = ($1,$2); |
|
|
|
next if ($version_and_part_id !~ /\./ |
|
&& $field ne 'regrader' && $field ne 'version'); |
|
|
|
my ($version, $part, $instance) = |
|
split(/\./,$version_and_part_id); |
|
|
|
#skip and instance dimension or criteria specific data |
|
next if (defined($instance) |
|
&& $instance ne $field |
|
&& $instance ne 'bridgetask'); |
|
|
|
if (!defined($part)) { |
|
$part = $version; |
|
} |
|
my $resp_id = &get_part_id('0'); |
|
my $part_id = &get_part_id($part); |
|
|
|
if ($field eq 'version') { |
|
# for tasks each version is an attempt at it thus |
|
# version -> tries |
|
$partdata->{$symb_id}{$part_id}{$transaction}{'tries'}= |
|
$value; |
|
# at new version time the record gets reset thus adding a |
|
# virtual response awarddetail of 'new_version' |
|
$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'response_specific'}='status'; |
|
$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'response_specific_value'}='new_version'; |
|
|
|
} elsif ($field eq 'award' || $field eq 'awarded' |
|
|| $field eq 'solved') { |
|
$partdata->{$symb_id}{$part_id}{$transaction}{$field}= |
|
$value; |
|
} elsif ($field eq 'portfiles') { |
|
# tasks only accepts portfolio submissions |
|
$value = $dbh->quote($value); |
|
$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'submission'}=$value; |
|
} elsif ($field eq 'status') { |
|
$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'response_specific'}=$field; |
|
$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'response_specific_value'}=$value; |
|
} elsif ($field eq 'regrader') { |
|
$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'response_specific_2'}=$field; |
|
$respdata->{$symb_id}{$part_id}{$resp_id}{$transaction}{'response_specific_value_2'}=$value; |
|
} |
|
} elsif ($parameter =~ /^resource\.(.*)\.(tries| |
award| |
award| |
awarded| |
awarded| |
previous| |
previous| |
Line 1091 sub update_full_student_data {
|
Line 1153 sub update_full_student_data {
|
$transaction, |
$transaction, |
$data->{'awarddetail'}, |
$data->{'awarddetail'}, |
$data->{'response_specific'}, |
$data->{'response_specific'}, |
$data->{'response_specific_value'}), |
$data->{'response_specific_value'}, |
$data->{'response_specific_2'}, |
$data->{'response_specific_2'}, |
$data->{'response_specific_value_2'}). |
$data->{'response_specific_value_2'}). |
"',".$submission."),"; |
"',".$submission."),"; |
Line 1272 sub store_student_data {
|
Line 1334 sub store_student_data {
|
my %stored; |
my %stored; |
while (my ($parameter,$value) = each(%$param_hash)) { |
while (my ($parameter,$value) = each(%$param_hash)) { |
next if ($parameter !~ /^resource\.(.*)\.(solved|awarded)$/); |
next if ($parameter !~ /^resource\.(.*)\.(solved|awarded)$/); |
my $part = $1; |
my $part = $1; |
|
my $which = $2; |
next if ($part =~ /\./); |
next if ($part =~ /\./); |
next if (exists($stored{$part})); |
next if (exists($stored{$part})); |
$stored{$part}++; |
$stored{$part}++; |
# |
# |
my $part_id = &get_part_id($part); |
my $part_id = &get_part_id($part); |
next if (!defined($part_id)); |
next if (!defined($part_id)); |
my $solved = $value; |
|
my $tries = $param_hash->{'resource.'.$part.'.tries'}; |
my ($solved,$awarded); |
my $awarded = $param_hash->{'resource.'.$part.'.awarded'}; |
if ($which eq 'solved') { |
|
$solved = $value; |
|
$awarded = $param_hash->{'resource.'.$part.'.awarded'}; |
|
} else { |
|
$solved = $param_hash->{'resource.'.$part.'.solved'}; |
|
$awarded = $value; |
|
} |
my $award = $param_hash->{'resource.'.$part.'.award'}; |
my $award = $param_hash->{'resource.'.$part.'.award'}; |
my $awarddetail = $param_hash->{'resource.'.$part.'.awarddetail'}; |
my $awarddetail = $param_hash->{'resource.'.$part.'.awarddetail'}; |
my $timestamp = $param_hash->{'timestamp'}; |
my $timestamp = $param_hash->{'timestamp'}; |
|
my $tries = $param_hash->{'resource.'.$part.'.tries'}; |
|
if (&symb_is_for_task($current_symb)) { |
|
$tries = $param_hash->{'resource.'.$part.'.version'}; |
|
} |
# |
# |
$solved = '' if (! defined($solved)); |
$solved = '' if (! defined($solved)); |
$tries = '' if (! defined($tries)); |
$tries = '' if (! defined($tries)); |
Line 2413 sub RDs_tries { return 0; }
|
Line 2486 sub RDs_tries { return 0; }
|
sub RDs_awarded { return 4; } |
sub RDs_awarded { return 4; } |
sub RDs_response_eval { return 5; } |
sub RDs_response_eval { return 5; } |
sub RDs_response_eval_2 { return 6; } |
sub RDs_response_eval_2 { return 6; } |
|
sub RDs_part_award { return 7; } |
|
|
sub get_response_data_by_student { |
sub get_response_data_by_student { |
my ($student,$symb,$response,$courseid) = @_; |
my ($student,$symb,$response,$courseid) = @_; |
Line 2431 sub get_response_data_by_student {
|
Line 2505 sub get_response_data_by_student {
|
return undef if (! defined($dbh)); |
return undef if (! defined($dbh)); |
my $request = 'SELECT '. |
my $request = 'SELECT '. |
'c.tries, b.timestamp, a.submission, a.awarddetail, c.awarded, '. |
'c.tries, b.timestamp, a.submission, a.awarddetail, c.awarded, '. |
'a.response_specific_value, a.response_specific_value_2, '. |
'a.response_specific_value, a.response_specific_value_2, c.award '. |
'FROM '.$fulldump_response_table.' AS a '. |
'FROM '.$fulldump_response_table.' AS a '. |
'LEFT JOIN '.$fulldump_timestamp_table.' AS b '. |
'LEFT JOIN '.$fulldump_timestamp_table.' AS b '. |
'ON a.symb_id=b.symb_id AND a.student_id=b.student_id AND '. |
'ON a.symb_id=b.symb_id AND a.student_id=b.student_id AND '. |