version 1.120, 2004/02/18 20:48:21
|
version 1.121, 2004/03/07 20:53:40
|
Line 182 sub get_sequence_assessment_data {
|
Line 182 sub get_sequence_assessment_data {
|
next; |
next; |
} |
} |
next if (! ref($curRes)); |
next if (! ref($curRes)); |
next if (! $curRes->is_problem());# && !$curRes->randomout); |
next if (! $curRes->is_problem() && $curRes->src() !~ /\.survey$/); |
# Okay, from here on out we only deal with assessments |
# Okay, from here on out we only deal with assessments |
$title = $curRes->title(); |
$title = $curRes->title(); |
$title =~ s/\:/\&\#058;/g; |
$title =~ s/\:/\&\#058;/g; |
Line 2232 sub get_response_time_data {
|
Line 2232 sub get_response_time_data {
|
################################################ |
################################################ |
################################################ |
################################################ |
sub get_student_scores { |
sub get_student_scores { |
my ($Sections,$Symbs,$enrollment,$courseid) = @_; |
my ($Sections,$Symbs,$enrollment,$courseid,$starttime,$endtime) = @_; |
$courseid = $ENV{'request.course.id'} if (! defined($courseid)); |
$courseid = $ENV{'request.course.id'} if (! defined($courseid)); |
&setup_table_names($courseid); |
&setup_table_names($courseid); |
my $dbh = &Apache::lonmysql::get_dbh(); |
my $dbh = &Apache::lonmysql::get_dbh(); |
Line 2243 sub get_student_scores {
|
Line 2243 sub get_student_scores {
|
if (defined($Symbs) && @$Symbs) { |
if (defined($Symbs) && @$Symbs) { |
$symb_requirements = '('. |
$symb_requirements = '('. |
join(' OR ', map{ "(a.symb_id='".&get_symb_id($_->{'symb'}). |
join(' OR ', map{ "(a.symb_id='".&get_symb_id($_->{'symb'}). |
"' AND a.part_id='".&get_part_id($_->{'part'}). |
"' AND a.part_id='".&get_part_id($_->{'part'}). |
"')" |
"')" |
} @$Symbs).')'; |
} @$Symbs).')'; |
} |
} |
# |
# |
Line 2259 sub get_student_scores {
|
Line 2259 sub get_student_scores {
|
if (defined($enrollment) && $enrollment ne 'Any') { |
if (defined($enrollment) && $enrollment ne 'Any') { |
$enrollment_requirements = "b.status='".$enrollment."'"; |
$enrollment_requirements = "b.status='".$enrollment."'"; |
} |
} |
|
# |
|
my $time_requirements = undef; |
|
if (defined($starttime)) { |
|
$time_requirements .= "a.timestamp>='".$starttime."'"; |
|
if (defined($endtime)) { |
|
$time_requirements .= " AND a.timestamp<='".$endtime."'"; |
|
} |
|
} elsif (defined($endtime)) { |
|
$time_requirements .= "a.timestamp<='".$endtime."'"; |
|
} |
## |
## |
## |
## |
my $request = 'CREATE TEMPORARY TABLE IF NOT EXISTS '.$tmptable. |
my $request = 'CREATE TEMPORARY TABLE IF NOT EXISTS '.$tmptable. |
Line 2281 sub get_student_scores {
|
Line 2291 sub get_student_scores {
|
if (defined($enrollment_requirements)) { |
if (defined($enrollment_requirements)) { |
$request .= $enrollment_requirements.' AND '; |
$request .= $enrollment_requirements.' AND '; |
} |
} |
$request =~ s/ AND $//; |
if (defined($time_requirements)) { |
|
$request .= $time_requirements.' AND '; |
|
} |
|
$request =~ s/ AND $//; # Strip of the trailing ' AND '. |
$request .= ' GROUP BY a.student_id'; |
$request .= ' GROUP BY a.student_id'; |
# &Apache::lonnet::logthis("request = \n".$request); |
# &Apache::lonnet::logthis("request = \n".$request); |
my $sth = $dbh->prepare($request); |
my $sth = $dbh->prepare($request); |