[LON-CAPA-cvs] cvs: loncom /interface/statistics lonstudentassessment.pm
matthew
lon-capa-cvs@mail.lon-capa.org
Fri, 28 Feb 2003 21:19:00 -0000
This is a MIME encoded message
--matthew1046467140
Content-Type: text/plain
matthew Fri Feb 28 16:19:00 2003 EDT
Modified files:
/loncom/interface/statistics lonstudentassessment.pm
Log:
I did *NOT* rewrite the subroutines &CreateLegend and &StudentAverageTotal.
&StudentAverageTotal is not called at this time and will be rewritten.
Removed:
&ShouldShowColumns
&FindSelectedStudent
&CreateColumnSelectors
&CreateColumnSelectionBox
&MaxSeqPr
&StudentReport
Added:
&ChartOutputStudent
&StudentPerformanceOnSequence
Rewrote:
&CreateTableHeadings
&CreateInterface
&BuildStudentAssessmentPage
Now use &Apache::loncommon::get_current_state() to get the chart data (see
&ChartOutputStudent()). Note this uses the symb-less call since we are
most likely to process all the students data.
--matthew1046467140
Content-Type: text/plain
Content-Disposition: attachment; filename="matthew-20030228161900.txt"
Index: loncom/interface/statistics/lonstudentassessment.pm
diff -u loncom/interface/statistics/lonstudentassessment.pm:1.29 loncom/interface/statistics/lonstudentassessment.pm:1.30
--- loncom/interface/statistics/lonstudentassessment.pm:1.29 Tue Feb 25 15:47:47 2003
+++ loncom/interface/statistics/lonstudentassessment.pm Fri Feb 28 16:19:00 2003
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentassessment.pm,v 1.29 2003/02/25 20:47:47 matthew Exp $
+# $Id: lonstudentassessment.pm,v 1.30 2003/02/28 21:19:00 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -56,6 +56,8 @@
use Apache::lonnet; # for logging porpoises
use GDBM_File;
+my $Statistics;
+
#######################################################
#######################################################
@@ -94,147 +96,35 @@
#######################################################
#######################################################
sub BuildStudentAssessmentPage {
- my ($cacheDB,$students,$courseID,$formName,$headings,$spacing,
- $studentInformation,$r,$c)=@_;
- my %cache;
- unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
- $r->print('<html><body>Unable to tie database.</body></html>');
- return;
- }
-
- # Remove students who don't have the proper section.
- my @sectionsSelected = split(':',$cache{'sectionsSelected'});
- for(my $studentIndex=((scalar @$students)-1); $studentIndex>=0;
- $studentIndex--) {
- my $value = $cache{$students->[$studentIndex].':section'};
- my $found = 0;
- foreach (@sectionsSelected) {
- if($_ eq 'none') {
- if($value eq '' || !defined($value) || $value eq ' ') {
- $found = 1;
- last;
- }
- } else {
- if($value eq $_) {
- $found = 1;
- last;
- }
- }
- }
- if($found == 0) {
- splice(@$students, $studentIndex, 1);
- }
- }
- my ($infoHeadings, $infoKeys, $sequenceHeadings, $sequenceKeys,
- $doNotShow) =
- &ShouldShowColumns(\%cache, $headings, $studentInformation);
-
- my $selectedName = &FindSelectedStudent(\%cache,
- $cache{'StudentAssessmentStudent'},
- $students);
- $r->print(&CreateInterface(\%cache, $selectedName, $students, $formName,
- $doNotShow));
+ my ($r,$c)=@_;
+ undef($Statistics);
+
+ #
+ $r->print(&CreateInterface());
$r->rflush();
-
- my $Str = '';
- if($selectedName eq 'No Student Selected') {
- $Str .= '<h3><font color=blue>WARNING: ';
- $Str .= 'Please select a student</font></h3>';
- $r->print($Str);
- return;
- }
-
- $r->print(&CreateTableHeadings(\%cache, $spacing, $infoKeys, $infoHeadings,
- $sequenceKeys, $sequenceHeadings));
- untie(%cache);
- if($c->aborted()) { return $Str; }
-
- my $selected=0;
+ #
+ $r->print(&CreateTableHeadings());
+ if($c->aborted()) { return ; }
+
my $Count = 0;
$r->print('<pre>'."\n");
- foreach (@$students) {
- if($c->aborted()) { return $Str; }
- next if ($_ ne $selectedName &&
- $selectedName ne 'All Students');
- $selected = 1;
-
- my @who = ($_);
- next if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'true',
- $cacheDB, 'true',
- 'false', $courseID,
- $r, $c) ne 'OK');
- next if($c->aborted());
-
- if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
- my @before=();
- my @after=();
- my @updateColumn=();
- my $foundUpdate = 0;
- foreach(@$infoKeys) {
- if(/updateTime/) {
- $foundUpdate=1;
- push(@updateColumn, $_);
- next;
- }
- if($foundUpdate) {
- push(@after, $_);
- } else {
- push(@before, $_);
- }
- }
- $Count++;
- my $out = '';
- $out .= sprintf("%3d) ", $Count);
- if($Count % 2) {
- $out .= '<bgcolor="#FFFFFF">';
- } else {
- $out .= '<bgcolor="#505050">';
- }
- my $displayString = $out.'DISPLAYDATA'.$spacing;
- $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
- \%cache, $_,
- \@before,
- $displayString,
- 'preformatted'));
-
- if($foundUpdate) {
- $displayString = '';
- $displayString .= '<a href="/adm/statistics?reportSelected=';
- $displayString .= &Apache::lonnet::escape('Student Assessment');
- $displayString .= '&download='.$_.'">';
- $displayString .= 'DISPLAYDATA</a>'.$spacing;
- $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
- \%cache, $_,
- \@updateColumn,
- $displayString,
- 'preformatted'));
- }
+ foreach my $student (@Apache::lonstatistics::Students) {
+ if($c->aborted()) { return ; }
+ $r->print(&ChartOutputStudent($student));
+ # output it
- $displayString = 'DISPLAYDATA'.$spacing;
- $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
- \%cache, $_,
- \@after,
- $displayString,
- 'preformatted'));
- $r->print(&StudentReport(\%cache, $_, $spacing, $sequenceKeys));
- $r->print("\n");
- $r->rflush();
- untie(%cache);
+ $Count++;
+ if($Count % 5 == 0) {
+ $r->print("</pre>\n<pre>");
}
+
+ $r->rflush();
}
$r->print('</pre>'."\n");
- if($selected == 0) {
- $Str .= '<h3><font color=blue>WARNING: ';
- $Str .= 'No Students enrolled OR Please select a student</font></h3>';
- $r->print($Str);
- } else {
- if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
- $r->print(&StudentAverageTotal(\%cache, $students, $sequenceKeys));
- untie(%cache);
- }
- }
+ my $Str;
return;
}
+
#######################################################
#######################################################
@@ -245,23 +135,7 @@
Called by &BuildStudentAssessmentPage to create the top part of the
page which displays the chart.
-Inputs:
-
-=over 4
-
-=item $cache The ubiquitous cache
-
-=item $selectedName The name of the currently selected student, or
-'All Students' or 'No Student Selected'.
-
-=item $students Array ref containing the name(s) of the students selected
-for display.
-
-=item $formName The name of the HTML form to use, 'Statistics'
-
-=item $doNotShow Array ref containing the names of columns to not show
-
-=back
+Inputs: None
Returns: A string containing the HTML for the headers and top table for
the chart page.
@@ -271,52 +145,53 @@
#######################################################
#######################################################
sub CreateInterface {
- my($cache,$selectedName,$students,$formName,$doNotShow)=@_;
-
my $Str = '';
- $Str .= &CreateLegend();
- $Str .= '<table><tr><td>'."\n";
- $Str .= '<input type="submit" name="PreviousStudent" ';
- $Str .= 'value="Previous Student" />'."\n";
- $Str .= '   '."\n";
- $Str .= &Apache::lonhtmlcommon::StudentOptions($cache, $students,
- $selectedName,
- 'StudentAssessment',
- $formName);
- $Str .= "\n".'   '."\n";
- $Str .= '<input type="submit" name="NextStudent" ';
- $Str .= 'value="Next Student" />'."\n";
- $Str .= '</td></tr></table>'."\n";
- $Str .= '<table cellspacing="5"><tr>'."\n";
- $Str .= '<td align="center"><b>Select Sections</b>'."\n";
- $Str .= '</td>'."\n";
- $Str .= '<td align="center"><b>Select column to view:</b></td>'."\n";
- $Str .= '<td></td></tr>'."\n";
-
+# $Str .= &CreateLegend();
+ $Str .= '<table cellspacing="5">'."\n";
+ $Str .= '<tr>';
+ $Str .= '<td align="center"><b>Sections</b></td>';
+ $Str .= '<td align="center"><b>Student Data</b></td>';
+ $Str .= '<td align="center"><b>Sequences and Folders</b></td>';
+ $Str .= '</tr>'."\n";
+ #
$Str .= '<tr><td align="center">'."\n";
- my @sections = split(':',$cache->{'sectionList'});
- my @selectedSections = split(':',$cache->{'sectionsSelected'});
$Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
$Str .= '</td><td align="center">';
- $Str .= &CreateColumnSelectionBox($doNotShow);
+ my $only_seq_with_assessments = sub {
+ my $s=shift;
+ if ($s->{'num_assess'} < 1) {
+ return 0;
+ } else {
+ return 1;
+ }
+ };
+ $Str .= &Apache::lonstatistics::StudentDataSelect('StudentData','multiple',
+ 5,undef);
$Str .= '</td><td>'."\n";
- $Str .= '<input type="submit" name="DefaultColumns" ';
- $Str .= 'value="Default Column Display" />'."\n";
- $Str .= '</td><td>'."\n";
- $Str .= '<input type="submit" name="displaymode" ';
- if (! exists($ENV{'form.displaymode'}) ||
- lc($ENV{'form.displaymode'}) eq 'display with links') {
- $Str .= 'value="Display without links" />';
- # Set the current value, in case it is undefined
- $ENV{'form.displaymode'} = 'Display with links';
- } else {
- $Str .= 'value="Display with links" />';
- }
- $Str .= "\n";
- $Str .= '</td></tr></table>'."\n";
-
+ $Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
+ $only_seq_with_assessments);
+ $Str .= '</td></tr>'."\n";
+ $Str .= '</table>'."\n";
return $Str;
}
+
+
+#######################################################
+#######################################################
+
+=pod
+
+=item Table Output Routines
+
+=over 4
+
+=cut
+
+#######################################################
+#######################################################
+{
+ my $padding;
+
#######################################################
#######################################################
@@ -355,177 +230,226 @@
#######################################################
#######################################################
sub CreateTableHeadings {
- my($cache,$spacing,$infoKeys,$infoHeadings,$sequenceKeys,
- $sequenceHeadings)=@_;
+ #
+ $padding = ' 'x3;
+ #
+ my $Str = '<pre>';
+ # First, the @StudentData fields need to be listed
+ my @to_show = @Apache::lonstatistics::SelectedStudentData;
+ foreach (@to_show) {
+ if ($_ eq 'all') {
+ @to_show = @Apache::lonstatistics::StudentDataOrder;
+ last;
+ }
+ }
+ foreach my $field (@to_show) {
+ my $title=$Apache::lonstatistics::StudentData{$field}->{'title'};
+ my $base =$Apache::lonstatistics::StudentData{$field}->{'base_width'};
+ my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
+ $Str .= $title.' 'x($width-$base).$padding;
+ }
+ # Now the selected sequences need to be listed
+ foreach my $map_symb (@Apache::lonstatistics::SelectedMaps) {
+ foreach my $sequence (@Apache::lonstatistics::Sequences) {
+ next if ($sequence->{'symb'} ne $map_symb && $map_symb ne 'all');
+ next if ($sequence->{'num_assess'} < 1);
+ my $title = $sequence->{'title'};
+ my $base = $sequence->{'base_width'};
+ my $width = $sequence->{'width'};
+ $Str .= $title.' 'x($width-$base).$padding;
+ }
+ }
+ $Str .= 'total';
+ $Str .= "</pre>\n";
+ return $Str;
+}
-# my $Str = '     ';
- my $Str = '';
- $Str .= '<table border="0" cellpadding="0" cellspacing="0">'."\n";
- $Str .= '<tr>'."\n";
- $Str .= '<td><pre> </pre></td>'."\n";
- $Str .= &CreateColumnSelectors($infoHeadings, $sequenceHeadings,
- $sequenceKeys);
- $Str .= '<td></td></tr>'."\n";
-
- $Str .= '<tr>'."\n";
- my $displayString = '';
- $displayString .= '<td><pre> </pre></td>'."\n";
- $displayString .= '<td align="left"><pre><a href="/adm/statistics?';
- $displayString .= 'sort=LINKDATA">DISPLAYDATA</a>FORMATTING';
- $displayString .= $spacing.'</pre></td>'."\n";
- $Str .= &Apache::lonhtmlcommon::CreateHeadings($cache,
- $infoKeys,
- $infoHeadings,
- $displayString,
- 'preformatted');
-
- $displayString = '<td align="left"><pre>DISPLAYDATAFORMATTING'.$spacing;
- $displayString .= '</pre></td>'."\n";
- $Str .= &Apache::lonhtmlcommon::CreateHeadings($cache,
- $sequenceKeys,
- $sequenceHeadings,
- $displayString,
- 'preformatted');
+#######################################################
+#######################################################
+
+=pod
+
+=item &ChartOutputStudent($student)
- $Str .= '<td><pre>Total Solved/Total Problems</pre></td>';
- $Str .= '</tr></table>'."\n";
+Return a line of the chart for a student.
+=cut
+
+#######################################################
+#######################################################
+sub ChartOutputStudent {
+ my $student = shift;
+ my $Str = '';
+ # First, the @StudentData fields need to be listed
+ my @to_show = @Apache::lonstatistics::SelectedStudentData;
+ foreach (@to_show) {
+ if ($_ eq 'all') {
+ @to_show = @Apache::lonstatistics::StudentDataOrder;
+ last;
+ }
+ }
+ foreach my $field (@to_show) {
+ my $title=$student->{$field};
+ my $base =scalar(my @Tmp = split(//,$title));
+ my $width=$Apache::lonstatistics::StudentData{$field}->{'width'};
+ $Str .= $title.' 'x($width-$base).$padding;
+ }
+ # Get ALL the students data
+ my %StudentsData;
+ my @tmp = &Apache::loncoursedata::get_current_state
+ ($student->{'username'},$student->{'domain'},undef,
+ $ENV{'request.course.id'});
+ if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) {
+ %StudentsData = @tmp;
+ }
+ if (scalar(@tmp) < 1) {
+ $Str .= '<font color="blue">No Course Data</font>'."\n";
+ return $Str;
+ }
+ #
+ # By sequence build up the data
+ my $studentstats;
+ foreach my $map_symb (@Apache::lonstatistics::SelectedMaps) {
+ foreach my $seq (@Apache::lonstatistics::Sequences) {
+ next if ($map_symb ne $seq->{'symb'} && $map_symb ne 'all');
+ next if ($seq->{'num_assess'} < 1);
+ my ($performance,$score,$seq_max) =
+ &StudentPerformanceOnSequence($student,\%StudentsData,
+ $seq,'linkify');
+ $Str .= $performance.$padding;
+ $studentstats->{$seq->{'symb'}}->{'score'}= $score;
+ $studentstats->{$seq->{'symb'}}->{'max'} = $seq_max;
+ }
+ }
+ #
+ # Total it up and store the statistics info.
+ my ($score,$max) = (0,0);
+ while (my ($symb,$seq_stats) = each (%{$studentstats})) {
+ $Statistics->{$symb}->{'score'} += $seq_stats->{'score'};
+ $Statistics->{$symb}->{'max'} += $seq_stats->{'max'};
+ $score += $seq_stats->{'score'};
+ $max += $seq_stats->{'max'};
+ }
+ my $scorelength = scalar(my @tmp1 = split(//,$score));
+ my $maxlength = scalar(my @tmp2 = split(//,$max));
+ $Str .= ' '.' 'x($maxlength-$scorelength).$score.'/'.$max;
+ $Str .= " \n";
return $Str;
-}
+}
#######################################################
#######################################################
=pod
-=item &StudentReport()
+=back
-This is the workhorse subroutine - it handles formatting and display of a
-students performance data. It processes one row of the chart.
+=cut
-Input:
+#######################################################
+#######################################################
-=over 4
+}
-=item $cache The ubiquitous cache
+#######################################################
+#######################################################
+
+=pod
-=item $name The name and domain of the current student in name:domain format
+=item &StudentPerformanceOnSequence()
-=item $spacing A string containing spaces.
+Inputs:
+
+=over 4
-=item $showSequences Array ref containing the sequences to display
+=item $student
-=back
+=item $studentdata Hash ref to all student data
-Output: $Str
+=item $seq Hash ref, the sequence we are working on
-$Str: Formatted string that is an entire row of the chart. It is a
-concatenation of student information and student course information.
+=item $links if defined we will output links to each resource.
+
+=back
=cut
#######################################################
#######################################################
-sub StudentReport {
- my ($cache,$name,$spacing,$showSequences)=@_;
- my ($username,$domain)=split(':',$name);
-
+sub StudentPerformanceOnSequence {
+ my ($student,$studentdata,$seq,$links) = @_;
my $Str = '';
- if(defined($cache->{$name.':error'})) {
- return $Str;
- }
- if($cache->{$name.':error'} =~ /course/) {
- $Str .= '<b><font color="blue">No course data for student </font>';
- $Str .= '<font color="red">'.$username.'.</font></b><br>';
- return $Str;
- }
-
- my $hasVersion = 'false';
- my $hasFinalData = 'false';
- foreach my $sequence (@$showSequences) {
- my $hasData = 'false';
- my $characterCount=0;
- foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
- my $problem = $cache->{$problemID.':problem'};
- # All grades (except for versionless parts) are displayed as links
- # to their submission record. Loop through all the parts for the
- # current problem in the correct order and prepare the output links
- foreach(split(/\:/,$cache->{$sequence.':'.$problemID.
- ':parts'})) {
- if($cache->{$name.':'.$problemID.':NoVersion'} eq 'true' ||
- $cache->{$name.':'.$problemID.':'.$_.':code'} eq ' ' ||
- $cache->{$name.':'.$problemID.':'.$_.':code'} eq '') {
- $Str .= ' ';
- $characterCount++;
- next;
- }
- $hasVersion = 'true';
- $hasData = 'true';
- if (lc($ENV{'form.displaymode'}) ne 'display without links') {
- $Str .= '<a href="/adm/grades?symb=';
- $Str .= &Apache::lonnet::escape($problem);
- $Str .= '&student='.$username.'&domain='.$domain;
- $Str .= '&command=submission">';
- }
- my $code = $cache->{$name.':'.$problemID.':'.$_.':code'};
- my $tries = $cache->{$name.':'.$problemID.':'.$_.':tries'};
- if($code eq '*' && $tries < 10 && $tries ne '') {
- $code = $tries;
+ my $output_width = 0;
+ my ($sum,$max) = (0,0);
+ foreach my $resource (@{$seq->{'contents'}}) {
+ next if ($resource->{'type'} ne 'assessment');
+ my $resource_data = $studentdata->{$resource->{'symb'}};
+ my $value = '';
+ foreach my $partnum (@{$resource->{'parts'}}) {
+ $max++;
+ my $symbol = ' '; # default to space
+ #
+ if (exists($resource_data->{'resource.'.$partnum.'.solved'})) {
+ my $status = $resource_data->{'resource.'.$partnum.'.solved'};
+ if ($status eq 'correct_by_override') {
+ $symbol = '+';
+ $sum++;
+ } elsif ($status eq 'incorrect_by_override') {
+ $symbol = '-';
+ } elsif ($status eq 'ungraded_attempted') {
+ $symbol = '#';
+ } elsif ($status eq 'incorrect_attempted') {
+ $symbol = '.';
+ } elsif ($status eq 'excused') {
+ $symbol = 'x';
+ $max--;
+ } elsif ($status eq 'correct_by_student' &&
+ exists($resource_data->{'resource.'.$partnum.'.tries'})){
+ my $num = $resource_data->{'resource.'.$partnum.'.tries'};
+ if ($num > 9) {
+ $symbol = '*';
+ } elsif ($num > 0) {
+ $symbol = $num;
+ } else {
+ $symbol = ' ';
+ }
+ $sum++;
+ } else {
+ $symbol = ' ';
}
- $Str .= $code;
- if (lc($ENV{'form.displaymode'}) ne 'display without links') {
- $Str .= '</a>';
+ } else {
+ # Unsolved. Did they try?
+ if (exists($resource_data->{'resource.'.$partnum.'.tries'})){
+ $symbol = '.';
+ } else {
+ $symbol = ' ';
}
- $characterCount++;
}
+ #
+ $output_width++;
+ if (defined($links) && $symbol ne ' ') {
+ $symbol = '<a href="/adm/grades'.
+ '?symb='.&Apache::lonnet::escape($resource->{'symb'}).
+ '&student='.$student->{'username'}.
+ '&domain='.$student->{'domain'}.
+ '&command=submission">'.$symbol.'</a>';
+ }
+ $value .= $symbol;
}
-
- # Output the number of correct answers for the current sequence.
- # This part takes up 6 character slots, but is formated right
- # justified.
- my $spacesNeeded=$cache->{$sequence.':columnWidth'}-$characterCount;
- $spacesNeeded -= 3;
- $Str .= (' 'x$spacesNeeded);
-
-# my $outputProblemsCorrect = sprintf("%3d", $cache->{$name.':'.$sequence.
-# ':problemsCorrect'});
-
- my $outputProblemsCorrect = sprintf("%2d/%2d", $cache->{$name.':'.$sequence.
- ':problemsCorrect'},
- $characterCount);
- if($hasData eq 'true') {
- $Str .= '<font color="#007700">'.$outputProblemsCorrect.'</font>';
- $hasFinalData = 'true';
- } else {
- $Str .= '<font color="#007700"> </font>';
- }
- $Str .= $spacing;
- }
-
- # Output the total correct problems over the total number of problems.
- # I don't like this type of formatting, but it is a solution. Need
- # a way to dynamically determine the space requirements.
- my $outputProblemsSolved = sprintf("%4d", $cache->{$name.':problemsSolved'});
- my $outputTotalProblems = sprintf("%4d", $cache->{$name.':totalProblems'});
- if($hasFinalData eq 'true') {
- $Str .= '<font color="#000088">'.$outputProblemsSolved.
- ' / '.$outputTotalProblems.'</font>';
- } else {
- $Str .= '<font color="#000088"> </font>';
+ $Str .= $value;
}
-
- if($hasVersion eq 'false') {
- $Str = '<b><font color="blue">No course data.</font></b>';
- }
-
- return $Str;
+ # Put on the totals
+ my $ratio = $sum.'/'.$max;
+ my $ratio_length = scalar(my @tmp1 = split(//,$ratio));
+ # Pad with extra spaces
+ my $width = $seq->{'width'};
+ $Str .= ' 'x($width-$output_width-$ratio_length).$ratio;
+ #
+ return ($Str,$sum,$max);
}
#######################################################
#######################################################
-
-#######################################################
-#######################################################
sub StudentAverageTotal {
my ($cache, $students, $sequenceKeys)=@_;
my $Str = "\n<b>Summary Tables:</b>\n";
@@ -590,29 +514,6 @@
#######################################################
#######################################################
-#######################################################
-#######################################################
-sub MaxSeqPr {
- my ($cache, $name, $sequence)=@_;
- my $prCount=0;
- foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
- my $problem = $cache->{$problemID.':problem'};
- foreach(split(/\:/,$cache->{$sequence.':'.$problemID.':parts'})) {
- if($cache->{$name.':'.$problemID.':NoVersion'} eq 'true' ||
- $cache->{$name.':'.$problemID.':'.$_.':code'} eq ' ' ||
- $cache->{$name.':'.$problemID.':'.$_.':code'} eq '') {
- $prCount++;
- next;
- }
- $prCount++;
- }
- }
- return $prCount;
-}
-
-#######################################################
-#######################################################
-
=pod
=item &CreateLegend()
@@ -643,176 +544,7 @@
#######################################################
#######################################################
-=pod
-
-=item &CreateColumnSelectionBox()
-
-If there are columns not being displayed then this selection box is created
-with a list of those columns. When selections are made and the page
-refreshed, the columns will be removed from this box and the column is
-put back in the chart. If there is no columns to select, no row is added
-to the interface table.
-
-=over 4
-Input: $CacheData, $headings
-
-$CacheData: A pointer to a hash tied to the cached data
-
-$headings: An array of the names of the columns for the student information.
-They are used for displaying which columns are missing.
-
-Output: $notThere
-
-$notThere: The string contains one row of a table. The first column has the
-name of the selection box. The second contains the selection box
-which has a size of four.
-
-=back
-
-=cut
-
-#######################################################
-#######################################################
-sub CreateColumnSelectionBox {
- my ($doNotShow)=@_;
-
- my $notThere = '';
- $notThere .= '<select name="ReselectColumns" size="4" ';
- $notThere .= 'multiple="true">'."\n";
-
- for(my $index=0; $index<$doNotShow->{'count'}; $index++) {
- my $name = $doNotShow->{$index.':name'};
- $notThere .= '<option value="';
- $notThere .= $doNotShow->{$index.':id'}.'">';
- $notThere .= $name.'</option>'."\n";
- }
-
- $notThere .= '</select>';
-
- return $notThere;
-}
-
-#######################################################
-#######################################################
-
-=pod
-
-=item &CreateColumnSelectors()
-
-This function generates the checkboxes above the column headings. The
-column will be removed if the checkbox is unchecked.
-
-=over 4
-
-Input: $CacheData, $headings
-
-$CacheData: A pointer to a hash tied to the cached data
-
-$headings: An array of the names of the columns for the student
-information. They are used to know what are the student information columns
-
-Output: $present
-
-$present: The string contains the first row of a table. Each column contains
-a checkbox which is left justified. Currently left justification is used
-for consistency of location over the column in which it presides.
-
-=back
-
-=cut
-
-#######################################################
-#######################################################
-sub CreateColumnSelectors {
- my ($infoHeadings, $sequenceHeadings, $sequenceKeys)=@_;
-
- my $present = '';
- for(my $index=0; $index<(scalar @$infoHeadings); $index++) {
- $present .= '<td align="left">';
- $present .= '<input type="checkbox" checked="on" ';
- $present .= 'name="HeadingColumn'.$infoHeadings->[$index].'" />';
- $present .= '</td>'."\n";
- }
-
- for(my $index=0; $index<(scalar @$sequenceHeadings); $index++) {
- $present .= '<td align="left">';
- $present .= '<input type="checkbox" checked="on" ';
- $present .= 'name="SequenceColumn'.$sequenceKeys->[$index].'" />';
- $present .= '</td>'."\n";
- }
-
- return $present;
-}
-
-#######################################################
-#######################################################
-
-=pod
-
-=back
-
-=head1 HELPER FUNCTIONS
-
-=over 4
-
-=cut
-
-#######################################################
-#######################################################
-sub FindSelectedStudent {
- my($cache, $selectedName, $students)=@_;
-
- if($selectedName eq 'All Students' ||
- $selectedName eq 'No Student Selected') {
- return $selectedName;
- }
-
- for(my $index=0; $index<(scalar @$students); $index++) {
- my $fullname = $cache->{$students->[$index].':fullname'};
- if($fullname eq $selectedName) {
- if($cache->{'StudentAssessmentMove'} eq 'next') {
- if($index == ((scalar @$students) - 1)) {
- $selectedName = $students->[0];
- return $selectedName;
- } else {
- $selectedName = $students->[$index+1];
- return $selectedName;
- }
- } elsif($cache->{'StudentAssessmentMove'} eq 'previous') {
- if($index == 0) {
- $selectedName = $students->[-1];
- return $selectedName;
- } else {
- $selectedName = $students->[$index-1];
- return $selectedName;
- }
- } else {
- $selectedName = $students->[$index];
- return $selectedName;
- }
- last;
- }
- }
-
- return 'No Student Selected';
-}
-#######################################################
-#######################################################
-
-=pod
-
-=item &ShouldShowColumn()
-
-Determine if a specified column should be shown on the chart.
-
-=over 4
-
-Input: $cache, $test
-
-$cache: A pointer to the hash tied to the cached data
-
-$test: The form name of the column (heading.$headingIndex) or
-(sequence.$sequenceIndex)
+=pod
=back
@@ -820,62 +552,7 @@
#######################################################
#######################################################
-sub ShouldShowColumns {
- my ($cache,$headings,$cacheKey)=@_;
-
- my @infoKeys=();
- my @infoHeadings=();
-
- my @sequenceKeys=();
- my @sequenceHeadings=();
-
- my %doNotShow;
-
- my $index;
- my $count = 0;
- my $check = '';
- for($index=0; $index < scalar @$headings; $index++) {
- $check = 'HeadingColumn'.$headings->[$index];
- if($cache->{'HeadingsFound'} =~ /$check/) {
- push(@infoHeadings, $headings->[$index]);
- push(@infoKeys, $cacheKey->[$index]);
- } else {
- $doNotShow{$count.':name'} = $headings->[$index];
- $doNotShow{$count.':id'} = 'HeadingColumn'.$headings->[$index];
- $count++;
- }
- }
-
- foreach my $sequence (split(/\:/,$cache->{'orderedSequences'})) {
- $check = 'SequenceColumn'.$sequence;
- if($cache->{'SequencesFound'} eq 'All Sequences' ||
- $cache->{'SequencesFound'} =~ /$check/) {
- push(@sequenceHeadings, $cache->{$sequence.':title'});
- push(@sequenceKeys, $sequence);
- } else {
- $doNotShow{$count.':name'} = $cache->{$sequence.':title'};
- $doNotShow{$count.':id'} = 'SequenceColumn'.$sequence;
- $count++;
- }
- }
-
- $doNotShow{'count'} = $count;
- return (\@infoHeadings, \@infoKeys, \@sequenceHeadings,
- \@sequenceKeys, \%doNotShow);
-}
1;
-
-#######################################################
-#######################################################
-
-=pod
-
-=back
-
-=cut
-
-#######################################################
-#######################################################
__END__
--matthew1046467140--