version 1.69, 2003/05/13 14:25:37
|
version 1.83, 2003/10/02 17:07:41
|
Line 83 use Apache::lonproblemstatistics();
|
Line 83 use Apache::lonproblemstatistics();
|
use Apache::lonstudentassessment(); |
use Apache::lonstudentassessment(); |
use Apache::lonpercentage; |
use Apache::lonpercentage; |
use Apache::lonmysql; |
use Apache::lonmysql; |
|
use Apache::lonlocal; |
use Time::HiRes; |
use Time::HiRes; |
|
|
####################################################### |
####################################################### |
Line 206 upon the calling context.
|
Line 207 upon the calling context.
|
####################################################### |
####################################################### |
####################################################### |
####################################################### |
sub PrepareClasslist { |
sub PrepareClasslist { |
my $r = shift; |
|
my %Sections; |
my %Sections; |
&clear_classlist_variables(); |
&clear_classlist_variables(); |
# |
# |
Line 231 sub PrepareClasslist {
|
Line 231 sub PrepareClasslist {
|
} |
} |
# |
# |
# Deal with instructors with restricted section access |
# Deal with instructors with restricted section access |
if ($ENV{'request.course.sec'} ne '') { |
if ($ENV{'request.course.sec'} !~ /^\s*$/) { |
@SelectedSections = ($ENV{'request.course.sec'}); |
@SelectedSections = ($ENV{'request.course.sec'}); |
} |
} |
# |
# |
Line 286 sub PrepareClasslist {
|
Line 286 sub PrepareClasslist {
|
} |
} |
# |
# |
# Put the consolidated section data in the right place |
# Put the consolidated section data in the right place |
if ($ENV{'request.course.sec'} ne '') { |
if ($ENV{'request.course.sec'} !~ /^\s*$/) { |
@Sections = ($ENV{'request.course.sec'}); |
@Sections = ($ENV{'request.course.sec'}); |
} else { |
} else { |
@Sections = sort {$a cmp $b} keys(%Sections); |
@Sections = sort {$a cmp $b} keys(%Sections); |
Line 301 sub PrepareClasslist {
|
Line 301 sub PrepareClasslist {
|
@Students = @TmpStudents; |
@Students = @TmpStudents; |
# |
# |
# Now deal with that current student thing.... |
# Now deal with that current student thing.... |
if (exists($ENV{'form.StudentAssessmentStudent'})) { |
$curr_student = undef; |
|
if (exists($ENV{'form.SelectedStudent'})) { |
my ($current_uname,$current_dom) = |
my ($current_uname,$current_dom) = |
split(':',$ENV{'form.StudentAssessmentStudent'}); |
split(':',$ENV{'form.SelectedStudent'}); |
my $i; |
my $i; |
for ($i = 0; $i<=$#Students; $i++) { |
for ($i = 0; $i<=$#Students; $i++) { |
next if (($Students[$i]->{'username'} ne $current_uname) || |
next if (($Students[$i]->{'username'} ne $current_uname) || |
Line 311 sub PrepareClasslist {
|
Line 312 sub PrepareClasslist {
|
$curr_student = $Students[$i]; |
$curr_student = $Students[$i]; |
last; # If we get here, we have our student. |
last; # If we get here, we have our student. |
} |
} |
if ($i == 0) { |
if (defined($curr_student)) { |
$prev_student = 'none'; |
if ($i == 0) { |
} else { |
$prev_student = undef; |
$prev_student = $Students[$i-1]; |
} else { |
} |
$prev_student = $Students[$i-1]; |
if ($i == $#Students) { |
} |
$next_student = 'none'; |
if ($i == $#Students) { |
} else { |
$next_student = undef; |
$next_student = $Students[$i+1]; |
} else { |
|
$next_student = $Students[$i+1]; |
|
} |
} |
} |
} |
} |
# |
# |
Line 330 sub PrepareClasslist {
|
Line 333 sub PrepareClasslist {
|
@SelectedStudentData = ($ENV{'form.StudentData'}); |
@SelectedStudentData = ($ENV{'form.StudentData'}); |
} |
} |
} else { |
} else { |
@SelectedStudentData = ('fullname'); |
@SelectedStudentData = ('username'); |
} |
} |
foreach (@SelectedStudentData) { |
foreach (@SelectedStudentData) { |
if ($_ eq 'all') { |
if ($_ eq 'all') { |
Line 342 sub PrepareClasslist {
|
Line 345 sub PrepareClasslist {
|
return; |
return; |
} |
} |
|
|
|
|
|
####################################################### |
|
####################################################### |
|
|
|
=pod |
|
|
|
=item get_students |
|
|
|
Returns a list of the selected students |
|
|
|
=cut |
|
|
|
####################################################### |
|
####################################################### |
|
sub get_students { |
|
if (! @Students) { |
|
&PrepareClasslist() |
|
} |
|
return @Students; |
|
} |
|
|
####################################################### |
####################################################### |
####################################################### |
####################################################### |
|
|
Line 357 selected student.
|
Line 381 selected student.
|
####################################################### |
####################################################### |
####################################################### |
####################################################### |
sub current_student { |
sub current_student { |
if (defined($curr_student)) { |
return $curr_student; |
return $curr_student; |
|
} else { |
|
return 'All Students'; |
|
} |
|
} |
} |
|
|
####################################################### |
####################################################### |
Line 379 in the list of students. Or something.
|
Line 399 in the list of students. Or something.
|
####################################################### |
####################################################### |
####################################################### |
####################################################### |
sub previous_student { |
sub previous_student { |
if (defined($prev_student)) { |
return $prev_student; |
return $prev_student; |
|
} else { |
|
return 'No Student Selected'; |
|
} |
|
} |
} |
|
|
####################################################### |
####################################################### |
Line 401 to be viewed.
|
Line 417 to be viewed.
|
####################################################### |
####################################################### |
####################################################### |
####################################################### |
sub next_student { |
sub next_student { |
if (defined($next_student)) { |
return $next_student; |
return $next_student; |
|
} else { |
|
return 'No Student Selected'; |
|
} |
|
} |
} |
|
|
####################################################### |
####################################################### |
Line 508 sub PrepareCourseData {
|
Line 520 sub PrepareCourseData {
|
my $name_length = length($seq->{'title'}); |
my $name_length = length($seq->{'title'}); |
my $num_parts = $seq->{'num_assess_parts'}; |
my $num_parts = $seq->{'num_assess_parts'}; |
# |
# |
# The number of columns needed for the summation text: |
# Use 3 digits for each the sum and total, which means 7 total... |
# " 1/5" = 1+3 columns, " 10/99" = 1+5 columns |
my $num_col = $num_parts+7; |
my $sum_length = 1+1+2*(length($num_parts)); |
|
my $num_col = $num_parts+$sum_length; |
|
if ($num_col < $name_length) { |
if ($num_col < $name_length) { |
$num_col = $name_length; |
$num_col = $name_length; |
} |
} |
Line 739 sub MapSelect {
|
Line 749 sub MapSelect {
|
Returns html for a selection box allowing the user to choose one (or more) |
Returns html for a selection box allowing the user to choose one (or more) |
of the sections in the course. |
of the sections in the course. |
|
|
|
Uses the package variables @Sections and @SelectedSections |
=over 4 |
=over 4 |
|
|
=item $elementname The name of the HTML form element |
=item $elementname The name of the HTML form element |
Line 747 of the sections in the course.
|
Line 758 of the sections in the course.
|
|
|
=item $numvisible The number of options to be visible |
=item $numvisible The number of options to be visible |
|
|
=item $selected Array ref to the names of the already selected sections. |
|
If undef, $ENV{'form.'.$elementname} is used. |
|
If $ENV{'form.'.$elementname} is also empty, none will be selected. |
|
|
|
=item $restriction Code reference to subroutine which returns true or |
|
false. The code must expect a reference to a sequence data structure. |
|
|
|
=back |
=back |
|
|
=cut |
=cut |
Line 766 sub SectionSelect {
|
Line 770 sub SectionSelect {
|
return; |
return; |
} |
} |
# |
# |
|
# Make sure we have the data we need to continue |
|
if (! @Sections) { |
|
&PrepareClasslist() |
|
} |
|
# |
# Build the form element |
# Build the form element |
my $Str = "\n"; |
my $Str = "\n"; |
$Str .= '<select name="'.$elementname.'" '; |
$Str .= '<select name="'.$elementname.'" '; |
Line 789 sub SectionSelect {
|
Line 798 sub SectionSelect {
|
return $Str; |
return $Str; |
} |
} |
|
|
|
####################################################### |
|
####################################################### |
|
|
|
=pod |
|
|
|
=item &CreateAndParseOutputSelector() |
|
|
|
Construct a selection list of options for output and parse output selections. |
|
|
|
=cut |
|
|
|
####################################################### |
|
####################################################### |
|
sub OutputDescriptions { |
|
my (@OutputOptions) = @_; |
|
my $Str = ''; |
|
$Str .= "<h2>Output Modes</h2>\n"; |
|
$Str .= "<dl>\n"; |
|
foreach my $outputmode (@OutputOptions) { |
|
$Str .=" <dt>".$outputmode->{'name'}."</dt>\n"; |
|
$Str .=" <dd>".$outputmode->{'description'}."</dd>\n"; |
|
} |
|
$Str .= "</dl>\n"; |
|
return $Str; |
|
} |
|
|
|
sub CreateAndParseOutputSelector { |
|
my ($elementname,$default,@OutputOptions) = @_; |
|
my $output_mode; |
|
my $show; |
|
my $Str = ''; |
|
# |
|
# Format for output options is 'mode, restrictions'; |
|
my $selected = $default; |
|
if (exists($ENV{'form.'.$elementname})) { |
|
if (ref($ENV{'form.'.$elementname} eq 'ARRAY')) { |
|
$selected = $ENV{'form.'.$elementname}->[0]; |
|
} else { |
|
$selected = $ENV{'form.'.$elementname}; |
|
} |
|
} |
|
# |
|
# Set package variables describing output mode |
|
$output_mode = 'html'; |
|
$show = 'all'; |
|
foreach my $option (@OutputOptions) { |
|
next if ($option->{'value'} ne $selected); |
|
$output_mode = $option->{'mode'}; |
|
$show = $option->{'show'}; |
|
} |
|
# |
|
# Build the form element |
|
$Str = qq/<select size="5" name="$elementname">/; |
|
foreach my $option (@OutputOptions) { |
|
if (exists($option->{'special'}) && |
|
$option->{'special'} =~ /do not show/) { |
|
next; |
|
} |
|
$Str .= "\n".' <option value="'.$option->{'value'}.'"'; |
|
$Str .= " selected " if ($option->{'value'} eq $selected); |
|
$Str .= ">".&mt($option->{'name'})."<\/option>"; |
|
} |
|
$Str .= "\n</select>"; |
|
return ($Str,$output_mode,$show); |
|
} |
|
|
|
############################################### |
|
############################################### |
|
|
|
=pod |
|
|
|
=item &Gather_Student_Data() |
|
|
|
Ensures all student data is up to date. |
|
|
|
=cut |
|
|
|
############################################### |
|
############################################### |
|
sub Gather_Student_Data { |
|
my ($r) = @_; |
|
my $c = $r->connection(); |
|
# |
|
&Apache::loncoursedata::clear_internal_caches(); |
|
# |
|
my @Sequences = &Apache::lonstatistics::Sequences_with_Assess(); |
|
# |
|
my @Students = @Apache::lonstatistics::Students; |
|
# |
|
# Open the progress window |
|
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin |
|
($r,'Statistics Compilation Status', |
|
'Statistics Compilation Progress', scalar(@Students)); |
|
# |
|
while (my $student = shift @Students) { |
|
return if ($c->aborted()); |
|
my ($status,undef) = &Apache::loncoursedata::ensure_current_data |
|
($student->{'username'},$student->{'domain'}, |
|
$ENV{'request.course.id'}); |
|
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
|
'last student'); |
|
} |
|
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
|
$r->rflush(); |
|
} |
|
|
|
############################################### |
|
############################################### |
|
|
|
=pod |
|
|
|
=item &Gather_Full_Student_Data() |
|
|
|
Ensures all student data is up to date. |
|
|
|
=cut |
|
|
|
############################################### |
|
############################################### |
|
sub Gather_Full_Student_Data { |
|
my ($r) = @_; |
|
my $c = $r->connection(); |
|
# |
|
my @Students = @Apache::lonstatistics::Students; |
|
# |
|
# Open the progress window |
|
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin |
|
($r,&mt('Student Data Compilation Status'), |
|
&mt('Student Data Compilation Progress'), scalar(@Students)); |
|
# |
|
while (my $student = shift @Students) { |
|
return if ($c->aborted()); |
|
my ($status,undef) = &Apache::loncoursedata::ensure_current_full_data |
|
($student->{'username'},$student->{'domain'}, |
|
$ENV{'request.course.id'}); |
|
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
|
&mt('last student')); |
|
} |
|
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
|
$r->rflush(); |
|
} |
|
|
################################################## |
################################################## |
################################################## |
################################################## |
sub DisplayClasslist { |
sub DisplayClasslist { |
Line 797 sub DisplayClasslist {
|
Line 948 sub DisplayClasslist {
|
my @Fields = ('fullname','username','domain','id','section'); |
my @Fields = ('fullname','username','domain','id','section'); |
# |
# |
my $Str=''; |
my $Str=''; |
|
if (! @Students) { |
|
if ($SelectedSections[0] eq 'all') { |
|
if (lc($ENV{'form.Status'}) eq 'any') { |
|
$Str .= '<h2>There are no students in the course.</h2>'; |
|
} elsif (lc($ENV{'form.Status'}) eq 'active') { |
|
$Str .= '<h2>There are no currently enrolled students in '. |
|
'the course.</h2>'; |
|
} elsif (lc($ENV{'form.Status'}) eq 'expired') { |
|
$Str .= '<h2>There are no previously enrolled '. |
|
'students in the course.</h2>'; |
|
} |
|
} else { |
|
my $sections; |
|
if (@SelectedSections == 1) { |
|
$sections = 'section '.$SelectedSections[0]; |
|
} elsif (@SelectedSections > 2) { |
|
$sections = 'sections '.join(', ',@SelectedSections); |
|
$sections =~ s/, ([^,])*$/, and $1/; |
|
} else { |
|
$sections = 'sections '.join(' and ',@SelectedSections); |
|
} |
|
if (lc($ENV{'form.Status'}) eq 'any') { |
|
$Str .= '<h2>There are no students in '.$sections.'.</h2>'; |
|
} elsif (lc($ENV{'form.Status'}) eq 'active') { |
|
$Str .= '<h2>There are no currently enrolled students '. |
|
'in '.$sections.'.</h2>'; |
|
} elsif (lc($ENV{'form.Status'}) eq 'expired') { |
|
$Str .= '<h2>There are no previously enrolled students '. |
|
'in '.$sections.'.</h2>'; |
|
} |
|
} |
|
$Str.= '<a href="/adm/statistics?reportSelected=student_assessment">'. |
|
'Return to the chart.</a>'; |
|
$r->print($Str); |
|
$r->rflush(); |
|
return; |
|
} |
|
|
|
# "Click" is asinine but it is probably not my place to change the world. |
|
$Str .= '<h2>Click on a students name or username to view their chart</h2>'; |
$Str .= '<table border="0"><tr><td bgcolor="#777777">'."\n"; |
$Str .= '<table border="0"><tr><td bgcolor="#777777">'."\n"; |
$Str .= '<table border="0" cellpadding="3"><tr bgcolor="#e6ffff">'."\n"; |
$Str .= '<table border="0" cellpadding="3"><tr bgcolor="#e6ffff">'."\n"; |
foreach my $field (@Fields) { |
foreach my $field (@Fields) { |
Line 817 sub DisplayClasslist {
|
Line 1008 sub DisplayClasslist {
|
# |
# |
foreach my $field (@Fields) { |
foreach my $field (@Fields) { |
$Str .= '<td>'; |
$Str .= '<td>'; |
if ($field eq 'fullname') { |
if ($field eq 'fullname' || $field eq 'username') { |
$Str .= '<a href="/adm/statistics?reportSelected='; |
$Str .= '<a href="/adm/statistics?reportSelected='; |
$Str .= &Apache::lonnet::escape('student_assessment'); |
$Str .= &Apache::lonnet::escape('student_assessment'); |
$Str .= '&StudentAssessmentStudent='; |
$Str .= '&sort='.&Apache::lonnet::escape($ENV{'form.sort'}); |
|
$Str .= '&SelectedStudent='; |
$Str .= &Apache::lonnet::escape($sname).'">'; |
$Str .= &Apache::lonnet::escape($sname).'">'; |
$Str .= $student->{$field}.' '; |
$Str .= $student->{$field}.' '; |
$Str .= '</a>'; |
$Str .= '</a>'; |
Line 846 sub CreateMainMenu {
|
Line 1038 sub CreateMainMenu {
|
# |
# |
my $Str = ''; |
my $Str = ''; |
# |
# |
$Str .= '<table border="0"><tbody><tr>'."\n"; |
$Str = '<input type="hidden" name="reportSelected" value="'.$current.'">'; |
$Str .= '<td></td>'."\n"; |
# $Str .= '<table border="0"><tbody><tr>'."\n"; |
$Str .= '<td></td>'."\n"; |
# $Str .= '<td align="center"><b>Report:</b></td>'."\n"; |
$Str .= '<td align="center"><b>Select a Report</b></td>'."\n"; |
# $Str .= '<td align="center">'; |
$Str .= '<tr>'."\n"; |
# $Str .= '<select name="reportSelected" '. |
# |
# 'onchange="document.Statistics.submit()">'."\n"; |
$Str .= '<td align="center">'. |
# foreach (sort(keys(%$reports))) { |
'<input type="submit" name="Refresh" value="Update Display" />'. |
# $Str .= '<option value="'.$_.'"'; |
"</td>\n"; |
# if($current eq $_) { |
$Str .= '<td align="center">'. |
# $Str .= ' selected'; |
'<input type="submit" name="ClearCache" value="Clear Caches" />'. |
# } |
"</td>\n"; |
# $Str .= '>'.$reports->{$_}.'</option>'."\n"; |
# |
# } |
$Str .= '<td align="center">'; |
# $Str .= '</select></td>'."\n"; |
$Str .= '<select name="reportSelected" >'."\n"; |
# # |
foreach (sort(keys(%$reports))) { |
# $Str .= '<td>'.(' 'x30).'</td>'; |
$Str .= '<option value="'.$_.'"'; |
# $Str .= '<td align="center">'. |
if($current eq $_) { |
# '<input type="submit" name="ClearCache" value="Clear Caches" />'. |
$Str .= ' selected'; |
# "</td>\n"; |
} |
# $Str .= '</tr></tbody></table>'."\n"; |
$Str .= '>'.$reports->{$_}.'</option>'."\n"; |
# $Str .= '<hr>'."\n"; |
} |
|
$Str .= '</select></td>'."\n"; |
|
# |
|
$Str .= '</tr></tbody></table>'."\n"; |
|
$Str .= '<hr>'."\n"; |
|
# |
# |
return $Str; |
return $Str; |
} |
} |
Line 921 sub handler {
|
Line 1108 sub handler {
|
# Extract form elements from query string |
# Extract form elements from query string |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['sort','reportSelected', |
['sort','reportSelected', |
'StudentAssessmentStudent']); |
'SelectedStudent']); |
if (! exists($ENV{'form.reportSelected'})) { |
if (! exists($ENV{'form.reportSelected'})) { |
$ENV{'form.reportSelected'} = 'student_assessment'; |
$ENV{'form.reportSelected'} = 'student_assessment'; |
} |
} |
Line 952 END
|
Line 1139 END
|
} |
} |
# |
# |
# Set up the statistics and chart environment |
# Set up the statistics and chart environment |
&PrepareClasslist($r); |
&PrepareClasslist(); |
&PrepareCourseData($r); |
&PrepareCourseData($r); |
# |
# |
# Begin form output |
# Begin form output |
Line 963 END
|
Line 1150 END
|
my %reports = ('classlist' => 'Class list', |
my %reports = ('classlist' => 'Class list', |
'problem_statistics' => 'Problem Statistics', |
'problem_statistics' => 'Problem Statistics', |
'student_assessment' => 'Problem Status Chart', |
'student_assessment' => 'Problem Status Chart', |
'percentage' => 'Correct-problems Plot', |
# 'percentage' => 'Correct-problems Plot', |
'option_response' => 'Option Response Analysis', |
# 'option_response' => 'Option Response Analysis', |
# 'activitylog' => 'Activity Log', |
# 'activitylog' => 'Activity Log', |
); |
); |
$r->print(&CreateMainMenu($ENV{'form.status'}, |
$r->print(&CreateMainMenu($ENV{'form.status'}, |
Line 976 END
|
Line 1163 END
|
# &Apache::lonproblemstatistics::Activity(); |
# &Apache::lonproblemstatistics::Activity(); |
} elsif($GoToPage eq 'problem_statistics') { |
} elsif($GoToPage eq 'problem_statistics') { |
&Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c); |
&Apache::lonproblemstatistics::BuildProblemStatisticsPage($r,$c); |
} elsif($GoToPage eq 'option_response') { |
} elsif($GoToPage eq 'problem_analysis') { |
# &Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c); |
&Apache::lonproblemanalysis::BuildProblemAnalysisPage($r,$c); |
} elsif($GoToPage eq 'student_assessment') { |
} elsif($GoToPage eq 'student_assessment') { |
&Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c); |
&Apache::lonstudentassessment::BuildStudentAssessmentPage($r,$c); |
} elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') { |
} elsif($GoToPage eq 'DoDiffGraph' || $GoToPage eq 'PercentWrongGraph') { |
# &Apache::lonproblemstatistics::BuildGraphicChart($r,$c); |
# &Apache::lonproblemstatistics::BuildGraphicChart($r,$c); |
} elsif($GoToPage eq 'classlist') { |
|
&DisplayClasslist($r); |
|
} elsif($GoToPage eq 'Correct-problems Plot') { |
} elsif($GoToPage eq 'Correct-problems Plot') { |
# &Apache::lonpercentage::BuildPercentageGraph($r,$c); |
# &Apache::lonpercentage::BuildPercentageGraph($r,$c); |
} |
} |