version 1.62, 2003/03/26 16:25:06
|
version 1.63, 2003/03/27 19:29:36
|
Line 506 sub init_dbs {
|
Line 506 sub init_dbs {
|
type => 'TINYTEXT' }, |
type => 'TINYTEXT' }, |
{ name => 'timestamp', |
{ name => 'timestamp', |
type => 'INT UNSIGNED'}, |
type => 'INT UNSIGNED'}, |
{ name => 'weight', |
|
type => 'INT UNSIGNED'}, |
|
], |
], |
'PRIMARY KEY' => ['symb_id','student_id','part_id'], |
'PRIMARY KEY' => ['symb_id','student_id','part_id'], |
'KEY' => [{ columns=>['student_id'] }, |
'KEY' => [{ columns=>['student_id'] }, |
Line 859 sub update_student_data {
|
Line 857 sub update_student_data {
|
my $symb_id = &get_symb_id($current_symb); |
my $symb_id = &get_symb_id($current_symb); |
# |
# |
# Load data into the tables |
# Load data into the tables |
foreach my $parameter (keys(%$param_hash)) { |
while (my ($parameter,$value) = each(%$param_hash)) { |
my $value = $param_hash->{$parameter}; |
|
my $newstring; |
my $newstring; |
if ($parameter !~ /(timestamp|resource\.(.*)\.(solved|tries|awarded|award|awarddetail|previous|weight))/) { |
if ($parameter !~ /(timestamp|resource\.(.*)\.(solved|tries|awarded|award|awarddetail|previous))/) { |
$newstring = "('".join("','", |
$newstring = "('".join("','", |
$symb_id,$student_id, |
$symb_id,$student_id, |
$parameter,$value)."'),\n"; |
$parameter,$value)."'),\n"; |
Line 883 sub update_student_data {
|
Line 880 sub update_student_data {
|
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'}; |
# use EXT to get the weight |
|
my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight', |
|
$current_symb,$sdom,$sname); |
|
# Give the weight back to the user |
|
$param_hash->{'resource.'.$part.'.weight'}=$weight; |
|
# |
# |
$solved = '' if (! defined($awarded)); |
$solved = '' if (! defined($awarded)); |
$tries = '' if (! defined($tries)); |
$tries = '' if (! defined($tries)); |
Line 896 sub update_student_data {
|
Line 888 sub update_student_data {
|
$awarddetail = '' if (! defined($awarddetail)); |
$awarddetail = '' if (! defined($awarddetail)); |
$newstring = "('".join("','",$symb_id,$student_id,$part_id, |
$newstring = "('".join("','",$symb_id,$student_id,$part_id, |
$solved,$tries,$awarded,$award, |
$solved,$tries,$awarded,$award, |
$awarddetail,$timestamp,$weight)."'),\n"; |
$awarddetail,$timestamp)."'),\n"; |
$store_performance_command .= $newstring; |
$store_performance_command .= $newstring; |
$rows_stored++; |
$rows_stored++; |
} |
} |
Line 1039 sub get_student_data_from_performance_ca
|
Line 1031 sub get_student_data_from_performance_ca
|
my $dbh = &Apache::lonmysql::get_dbh(); |
my $dbh = &Apache::lonmysql::get_dbh(); |
my $request = "SELECT ". |
my $request = "SELECT ". |
"d.symb,c.part,a.solved,a.tries,a.awarded,a.award,a.awarddetail,". |
"d.symb,c.part,a.solved,a.tries,a.awarded,a.award,a.awarddetail,". |
"a.timestamp,a.weight "; |
"a.timestamp "; |
if (defined($student)) { |
if (defined($student)) { |
$request .= "FROM $student_table AS b ". |
$request .= "FROM $student_table AS b ". |
"LEFT JOIN $performance_table AS a ON b.student_id=a.student_id ". |
"LEFT JOIN $performance_table AS a ON b.student_id=a.student_id ". |
Line 1068 sub get_student_data_from_performance_ca
|
Line 1060 sub get_student_data_from_performance_ca
|
} |
} |
foreach my $row (@{$sth->fetchall_arrayref}) { |
foreach my $row (@{$sth->fetchall_arrayref}) { |
$rows_retrieved++; |
$rows_retrieved++; |
my ($symb,$part,$solved,$tries,$awarded,$award,$awarddetail,$time,$weight) = |
my ($symb,$part,$solved,$tries,$awarded,$award,$awarddetail,$time) = |
(@$row); |
(@$row); |
my $base = 'resource.'.$part; |
my $base = 'resource.'.$part; |
$studentdata->{$symb}->{$base.'.solved'} = $solved; |
$studentdata->{$symb}->{$base.'.solved'} = $solved; |
Line 1077 sub get_student_data_from_performance_ca
|
Line 1069 sub get_student_data_from_performance_ca
|
$studentdata->{$symb}->{$base.'.award'} = $award; |
$studentdata->{$symb}->{$base.'.award'} = $award; |
$studentdata->{$symb}->{$base.'.awarddetail'} = $awarddetail; |
$studentdata->{$symb}->{$base.'.awarddetail'} = $awarddetail; |
$studentdata->{$symb}->{'timestamp'} = $time if (defined($time) && $time ne ''); |
$studentdata->{$symb}->{'timestamp'} = $time if (defined($time) && $time ne ''); |
$studentdata->{$symb}->{'resource.'.$part.'.weight'}=$weight; |
|
} |
} |
return $studentdata; |
return $studentdata; |
} |
} |