loncom/interface/statistics/lonstudentassessment.pm - diff

Return to lonstudentassessment.pm CVS log

Up to [LON-CAPA] / loncom / interface / statistics

Diff for /loncom/interface/statistics/lonstudentassessment.pm between versions 1.15 and 1.29

version 1.15, 2002/10/22 16:27:39	version 1.29, 2003/02/25 20:47:47
Line 1	Line 1
# The LearningOnline Network with CAPA	# The LearningOnline Network with CAPA
# (Publication Handler
#	#
# $Id$	# $Id$
#	#
Line 25	Line 24
# http://www.lon-capa.org/	# http://www.lon-capa.org/
#	#
# (Navigate problems for statistical reports	# (Navigate problems for statistical reports
# YEAR=2001
# 5/5,7/9,7/25/1,8/11,9/13,9/26,10/5,10/9,10/22,10/26 Behrouz Minaei
# 11/1,11/4,11/16,12/14,12/16,12/18,12/20,12/31 Behrouz Minaei
# YEAR=2002
# 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6 Behrouz Minaei
# 5/12,5/14,5/15,5/19,5/26,7/16 Behrouz Minaei
#	#
###	#######################################################
	#######################################################

package Apache::lonstudentassessment;	=pod

	=head1 NAME

	lonstudentassessment

	=head1 SYNOPSIS

	Presents assessment data about a student or a group of students.

	=head1 Subroutines

	=over 4

	=cut

	#######################################################
	#######################################################

	package Apache::lonstudentassessment;

use strict;	use strict;
	use Apache::lonstatistics;
use Apache::lonhtmlcommon;	use Apache::lonhtmlcommon;
use Apache::loncoursedata;	use Apache::loncoursedata;
	use Apache::lonnet; # for logging porpoises
use GDBM_File;	use GDBM_File;

#my $jr;	#######################################################
	#######################################################

	=pod

	=item &BuildStudentAssessmentPage()

	Inputs:

	=over 4

	=item $cacheDB The name of the cache file used to store student data

	=item $students Array ref containing the name(s) of the students
	selected for display

	=item $courseID The ID of the course

	=item $formName The name of the html form - 'Statistics'

	=item $headings Array ref of headings to show

	=item $spacing A string of spaces

	=item $studentInformation Array ref of possible headings for student info
	('fullname','section',...)

	=item $r Apache Request

	=item $c Apache Connection

	=back

	=cut

	#######################################################
	#######################################################
sub BuildStudentAssessmentPage {	sub BuildStudentAssessmentPage {
my ($cacheDB,$students,$courseID,$formName,$headings,$spacing,	my ($cacheDB,$students,$courseID,$formName,$headings,$spacing,
$studentInformation,$r,$c)=@_;	$studentInformation,$r,$c)=@_;
# $jr = $r;
my %cache;	my %cache;
unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {	unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
$r->print('<html><body>Unable to tie database.</body></html>');	$r->print('<html><body>Unable to tie database.</body></html>');
Line 77 sub BuildStudentAssessmentPage {	Line 126 sub BuildStudentAssessmentPage {
}	}
}	}
my ($infoHeadings, $infoKeys, $sequenceHeadings, $sequenceKeys,	my ($infoHeadings, $infoKeys, $sequenceHeadings, $sequenceKeys,
$doNotShow) =	$doNotShow) =
&ShouldShowColumns(\%cache, $headings, $studentInformation);	&ShouldShowColumns(\%cache, $headings, $studentInformation);

my $selectedName = &FindSelectedStudent(\%cache,	my $selectedName = &FindSelectedStudent(\%cache,
$cache{'StudentAssessmentStudent'},	$cache{'StudentAssessmentStudent'},
$students);	$students);
$r->print(&CreateInterface(\%cache, $selectedName, $students, $formName,	$r->print(&CreateInterface(\%cache, $selectedName, $students, $formName,
Line 101 sub BuildStudentAssessmentPage {	Line 150 sub BuildStudentAssessmentPage {
if($c->aborted()) { return $Str; }	if($c->aborted()) { return $Str; }

my $selected=0;	my $selected=0;
	my $Count = 0;
$r->print('<pre>'."\n");	$r->print('<pre>'."\n");
foreach (@$students) {	foreach (@$students) {
if($c->aborted()) { return $Str; }	if($c->aborted()) { return $Str; }
next if ($_ ne $selectedName &&	next if ($_ ne $selectedName &&
$selectedName ne 'All Students');	$selectedName ne 'All Students');
$selected = 1;	$selected = 1;

my @who = ($_);	my @who = ($_);
next if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'true',	next if(&Apache::loncoursedata::DownloadStudentCourseData(\@who, 'true',
$cacheDB, 'true',	$cacheDB, 'true',
'false', $courseID,	'false', $courseID,
$r, $c) ne 'OK');	$r, $c) ne 'OK');
next if($c->aborted());	next if($c->aborted());
Line 132 sub BuildStudentAssessmentPage {	Line 182 sub BuildStudentAssessmentPage {
push(@before, $_);	push(@before, $_);
}	}
}	}
my $displayString = 'DISPLAYDATA'.$spacing;	$Count++;
$r->print(&Apache::lonhtmlcommon::FormatStudentInformation(	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, $_,	\%cache, $_,
\@before,	\@before,
$displayString,	$displayString,
Line 164 sub BuildStudentAssessmentPage {	Line 222 sub BuildStudentAssessmentPage {
untie(%cache);	untie(%cache);
}	}
}	}
$r->print('</pre>'."\n");	$r->print('</pre>'."\n");
if($selected == 0) {	if($selected == 0) {
$Str .= '<h3><font color=blue>WARNING: ';	$Str .= '<h3><font color=blue>WARNING: ';
$Str .= 'Please select a student</font></h3>';	$Str .= 'No Students enrolled OR Please select a student</font></h3>';
$r->print($Str);	$r->print($Str);
	} else {
	if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER(),0640)) {
	$r->print(&StudentAverageTotal(\%cache, $students, $sequenceKeys));
	untie(%cache);
	}
}	}

return;	return;
}	}
	#######################################################
	#######################################################

	=pod

	=item &CreateInterface()

	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'

#---- Student Assessment Web Page --------------------------------------------	=item $doNotShow Array ref containing the names of columns to not show

	=back

	Returns: A string containing the HTML for the headers and top table for
	the chart page.

	=cut

	#######################################################
	#######################################################
sub CreateInterface {	sub CreateInterface {
my($cache,$selectedName,$students,$formName,$doNotShow)=@_;	my($cache,$selectedName,$students,$formName,$doNotShow)=@_;

Line 185 sub CreateInterface {	Line 279 sub CreateInterface {
$Str .= '<input type="submit" name="PreviousStudent" ';	$Str .= '<input type="submit" name="PreviousStudent" ';
$Str .= 'value="Previous Student" />'."\n";	$Str .= 'value="Previous Student" />'."\n";
$Str .= '&nbsp&nbsp&nbsp'."\n";	$Str .= '&nbsp&nbsp&nbsp'."\n";
$Str .= &Apache::lonhtmlcommon::StudentOptions($cache, $students,	$Str .= &Apache::lonhtmlcommon::StudentOptions($cache, $students,
$selectedName,	$selectedName,
'StudentAssessment',	'StudentAssessment',
$formName);	$formName);
$Str .= "\n".'&nbsp&nbsp&nbsp'."\n";	$Str .= "\n".'&nbsp&nbsp&nbsp'."\n";
$Str .= '<input type="submit" name="NextStudent" ';	$Str .= '<input type="submit" name="NextStudent" ';
Line 202 sub CreateInterface {	Line 296 sub CreateInterface {
$Str .= '<tr><td align="center">'."\n";	$Str .= '<tr><td align="center">'."\n";
my @sections = split(':',$cache->{'sectionList'});	my @sections = split(':',$cache->{'sectionList'});
my @selectedSections = split(':',$cache->{'sectionsSelected'});	my @selectedSections = split(':',$cache->{'sectionsSelected'});
$Str .= &Apache::lonhtmlcommon::MultipleSectionSelect(\@sections,	$Str .= &Apache::lonstatistics::SectionSelect('Section','multiple',5);
\@selectedSections,
'Statistics');
$Str .= '</td><td align="center">';	$Str .= '</td><td align="center">';
$Str .= &CreateColumnSelectionBox($doNotShow);	$Str .= &CreateColumnSelectionBox($doNotShow);
$Str .= '</td><td>'."\n";	$Str .= '</td><td>'."\n";
$Str .= '<input type="submit" name="DefaultColumns" ';	$Str .= '<input type="submit" name="DefaultColumns" ';
$Str .= 'value="Default Column Display" />'."\n";	$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 .= '</td></tr></table>'."\n";

return $Str;	return $Str;
}	}
	#######################################################
	#######################################################

	=pod

	=item &CreateTableHeadings()

	Create HTML for the columns of student data to show.
	Called by &BuildStudentAssessmentPage(). Calls
	&Apache::lonhtmlcommon::CreateHeadings().

	Inputs:

	=over 4

	=item $cache The ubiquitous cache

	=item $spacing A string of spaces

	=item $infoKeys Array ref to names of keys to display from the cache
	which describe students

	=item $infoHeadings Array ref to headings of columns for student info

	=item $sequenceKeys Array ref of names of keys to use to retrieve sequence
	data from the cache

	=item $sequenceHeadings Array ref of names of sequences used for output.

	=back

	Returns: A string containing the HTML of the table headings.

	=cut

	#######################################################
	#######################################################
sub CreateTableHeadings {	sub CreateTableHeadings {
my($cache,$spacing,$infoKeys,$infoHeadings,$sequenceKeys,	my($cache,$spacing,$infoKeys,$infoHeadings,$sequenceKeys,
$sequenceHeadings)=@_;	$sequenceHeadings)=@_;

	# my $Str = '&nbsp&nbsp&nbsp&nbsp&nbsp';
my $Str = '';	my $Str = '';
$Str .= '<table border="0" cellpadding="0" cellspacing="0">'."\n";	$Str .= '<table border="0" cellpadding="0" cellspacing="0">'."\n";

$Str .= '<tr>'."\n";	$Str .= '<tr>'."\n";
	$Str .= '<td><pre> </pre></td>'."\n";
$Str .= &CreateColumnSelectors($infoHeadings, $sequenceHeadings,	$Str .= &CreateColumnSelectors($infoHeadings, $sequenceHeadings,
$sequenceKeys);	$sequenceKeys);
$Str .= '<td></td></tr>'."\n";	$Str .= '<td></td></tr>'."\n";

$Str .= '<tr>'."\n";	$Str .= '<tr>'."\n";
my $displayString = '<td align="left"><pre><a href="/adm/statistics?';	my $displayString = '';
	$displayString .= '<td><pre> </pre></td>'."\n";
	$displayString .= '<td align="left"><pre><a href="/adm/statistics?';
$displayString .= 'sort=LINKDATA">DISPLAYDATA</a>FORMATTING';	$displayString .= 'sort=LINKDATA">DISPLAYDATA</a>FORMATTING';
$displayString .= $spacing.'</pre></td>'."\n";	$displayString .= $spacing.'</pre></td>'."\n";
$Str .= &Apache::lonhtmlcommon::CreateHeadings($cache,	$Str .= &Apache::lonhtmlcommon::CreateHeadings($cache,
$infoKeys,	$infoKeys,
$infoHeadings,	$infoHeadings,
$displayString,	$displayString,
Line 251 sub CreateTableHeadings {	Line 393 sub CreateTableHeadings {
return $Str;	return $Str;
}	}

	#######################################################
	#######################################################

=pod	=pod

=item &FormatStudentData()	=item &StudentReport()

First, FormatStudentInformation is called and prefixes the course information.	This is the workhorse subroutine - it handles formatting and display of a
This function produces a formatted string of the student's course information.	students performance data. It processes one row of the chart.
Each column of data represents all the problems for a given sequence. For
valid grade data, a link is created for that problem to a submission record	Input:
for that problem.

=over 4	=over 4

Input: $name, $studentInformation, $ChartDB	=item $cache The ubiquitous cache

$name: The name and domain of the current student in name:domain format	=item $name The name and domain of the current student in name:domain format

$studentInformation: A pointer to an array holding the names used to	=item $spacing A string containing spaces.
remove data from the hash. They represent
the name of the data to be removed.

$ChartDB: The name of the cached data database which will be tied to that	=item $showSequences Array ref containing the sequences to display
database.
	=back

Output: $Str	Output: $Str

$Str: Formatted string that is an entire row of the chart. It is a	$Str: Formatted string that is an entire row of the chart. It is a
concatenation of student information and student course information.	concatenation of student information and student course information.

=back

=cut	=cut

	#######################################################
	#######################################################
sub StudentReport {	sub StudentReport {
my ($cache,$name,$spacing,$showSequences)=@_;	my ($cache,$name,$spacing,$showSequences)=@_;
my ($username,$domain)=split(':',$name);	my ($username,$domain)=split(':',$name);
Line 318 sub StudentReport {	Line 461 sub StudentReport {
}	}
$hasVersion = 'true';	$hasVersion = 'true';
$hasData = 'true';	$hasData = 'true';
$Str .= '<a href="/adm/grades?symb=';	if (lc($ENV{'form.displaymode'}) ne 'display without links') {
$Str .= &Apache::lonnet::escape($problem);	$Str .= '<a href="/adm/grades?symb=';
$Str .= '&student='.$username.'&domain='.$domain;	$Str .= &Apache::lonnet::escape($problem);
$Str .= '&command=submission">';	$Str .= '&student='.$username.'&domain='.$domain;
	$Str .= '&command=submission">';
	}
my $code = $cache->{$name.':'.$problemID.':'.$_.':code'};	my $code = $cache->{$name.':'.$problemID.':'.$_.':code'};
my $tries = $cache->{$name.':'.$problemID.':'.$_.':tries'};	my $tries = $cache->{$name.':'.$problemID.':'.$_.':tries'};
if($code eq '*' && $tries < 10 && $tries ne '') {	if($code eq '*' && $tries < 10 && $tries ne '') {
$code = $tries;	$code = $tries;
}	}
$Str .= $code;	$Str .= $code;
$Str .= '</a>';	if (lc($ENV{'form.displaymode'}) ne 'display without links') {
	$Str .= '</a>';
	}
$characterCount++;	$characterCount++;
}	}
}	}

# Output the number of correct answers for the current sequence.	# Output the number of correct answers for the current sequence.
# This part takes up 6 character slots, but is formated right	# This part takes up 6 character slots, but is formated right
# justified.	# justified.
my $spacesNeeded=$cache->{$sequence.':columnWidth'}-$characterCount;	my $spacesNeeded=$cache->{$sequence.':columnWidth'}-$characterCount;
$spacesNeeded -= 3;	$spacesNeeded -= 3;
Line 344 sub StudentReport {	Line 491 sub StudentReport {
# ':problemsCorrect'});	# ':problemsCorrect'});

my $outputProblemsCorrect = sprintf("%2d/%2d", $cache->{$name.':'.$sequence.	my $outputProblemsCorrect = sprintf("%2d/%2d", $cache->{$name.':'.$sequence.
':problemsCorrect'},	':problemsCorrect'},
$characterCount);	$characterCount);
if($hasData eq 'true') {	if($hasData eq 'true') {
$Str .= '<font color="#007700">'.$outputProblemsCorrect.'</font>';	$Str .= '<font color="#007700">'.$outputProblemsCorrect.'</font>';
Line 374 sub StudentReport {	Line 521 sub StudentReport {
return $Str;	return $Str;
}	}

	#######################################################
	#######################################################

	#######################################################
	#######################################################
	sub StudentAverageTotal {
	my ($cache, $students, $sequenceKeys)=@_;
	my $Str = "\n<b>Summary Tables:</b>\n";
	my %Correct = ();
	my $ProblemsSolved = 0;
	my $TotalProblems = 0;
	my $StudentCount = 0;

	foreach my $name (@$students) {
	$StudentCount++;
	foreach my $sequence (@$sequenceKeys) {
	$Correct{$sequence} +=
	$cache->{$name.':'.$sequence.':problemsCorrect'};
	}
	$ProblemsSolved += $cache->{$name.':problemsSolved'};
	$TotalProblems += $cache->{$name.':totalProblems'};
	}
	if ($StudentCount) {
	$ProblemsSolved = sprintf( "%.2f",
	$ProblemsSolved/$StudentCount);
	$TotalProblems /= $StudentCount;
	} else {
	$ProblemsSolved = 0;
	$TotalProblems = 0;
	}

	$Str .= '<table border=2 cellspacing="1">'."\n";
	$Str .= '<tr><td><b>Students Count</b></td><td><b>'.
	$StudentCount.'</b></td></tr>'."\n";
	$Str .= '<tr><td><b>Total Problems</b></td><td><b>'.
	$TotalProblems.'</b></td></tr>'."\n";
	$Str .= '<tr><td><b>Average Correct</b></td><td><b>'.
	$ProblemsSolved.'</b></td></tr>'."\n";
	$Str .= '</table>'."\n";

	$Str .= '<table border=2 cellspacing="1">'."\n";
	$Str .= '<tr><th>Title</th><th>Total Problems</th>'.
	'<th>Average Correct</th></tr>'."\n";
	foreach my $S(@$sequenceKeys) {
	my $title=$cache->{$S.':title'};
	#$Str .= $cache->{$S.':problems'};
	#my @problems=split(':', $cache->{$S.':problems'});
	#my $pCount=scalar @problems;
	my $pCount=MaxSeqPr($cache,@$students[0],$S);
	my $crr;
	if ($StudentCount) {
	$crr=sprintf( "%.2f", $Correct{$S}/$StudentCount );
	} else {
	$crr="0.00";
	}
	$Str .= '<tr><td>'.$title.
	'</td><td align=center>'.$pCount.
	'</td><td align=center>'.$crr.
	'</td></tr>'."\n";
	}

	$Str .= '</table>'."\n";

	return $Str;
	}

	#######################################################
	#######################################################

	#######################################################
	#######################################################
	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	=pod

=item &CreateLegend()	=item &CreateLegend()
Line 384 problems.	Line 623 problems.

=cut	=cut

	#######################################################
	#######################################################
sub CreateLegend {	sub CreateLegend {
my $Str = "<p><pre>".	my $Str = "<p><pre>".
" 1 correct by student in 1 try\n".	" 1 correct by student in 1 try\n".
" 7 correct by student in 7 tries\n".	" 7 correct by student in 7 tries\n".
" * correct by student in more than 9 tries\n".	" * correct by student in more than 9 tries\n".
" + correct by override\n".	" + correct by hand grading or override\n".
" - incorrect by override\n".	" - incorrect by override\n".
" . incorrect attempted\n".	" . incorrect attempted\n".
" # ungraded attempted\n".	" # ungraded attempted\n".
" not attempted (blank field)\n".	" not attempted (blank field)\n".
" x excused".	" x excused".
"</pre><p>";	"</pre><p>";
return $Str;	return $Str;
}	}

	#######################################################
	#######################################################

=pod	=pod

=item &CreateColumnSelectionBox()	=item &CreateColumnSelectionBox()

If there are columns not being displayed then this selection box is created	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	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	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	put back in the chart. If there is no columns to select, no row is added
to the interface table.	to the interface table.
Line 412 to the interface table.	Line 656 to the interface table.
=over 4	=over 4
Input: $CacheData, $headings	Input: $CacheData, $headings


$CacheData: A pointer to a hash tied to the cached data	$CacheData: A pointer to a hash tied to the cached data

$headings: An array of the names of the columns for the student information.	$headings: An array of the names of the columns for the student information.
They are used for displaying which columns are missing.	They are used for displaying which columns are missing.

Output: $notThere	Output: $notThere

$notThere: The string contains one row of a table. The first column has the	$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	name of the selection box. The second contains the selection box
which has a size of four.	which has a size of four.

=back	=back

=cut	=cut

	#######################################################
	#######################################################
sub CreateColumnSelectionBox {	sub CreateColumnSelectionBox {
my ($doNotShow)=@_;	my ($doNotShow)=@_;

Line 447 sub CreateColumnSelectionBox {	Line 692 sub CreateColumnSelectionBox {
return $notThere;	return $notThere;
}	}

	#######################################################
	#######################################################

=pod	=pod

=item &CreateColumnSelectors()	=item &CreateColumnSelectors()

This function generates the checkboxes above the column headings. The	This function generates the checkboxes above the column headings. The
column will be removed if the checkbox is unchecked.	column will be removed if the checkbox is unchecked.

=over 4	=over 4
Line 473 for consistency of location over the col	Line 721 for consistency of location over the col

=cut	=cut

	#######################################################
	#######################################################
sub CreateColumnSelectors {	sub CreateColumnSelectors {
my ($infoHeadings, $sequenceHeadings, $sequenceKeys)=@_;	my ($infoHeadings, $sequenceHeadings, $sequenceKeys)=@_;

Line 494 sub CreateColumnSelectors {	Line 744 sub CreateColumnSelectors {
return $present;	return $present;
}	}

#---- END Student Assessment Web Page ----------------------------------------	#######################################################
	#######################################################

	=pod

	=back

	=head1 HELPER FUNCTIONS

#---- Student Assessment Worker Functions ------------------------------------	=over 4

	=cut

	#######################################################
	#######################################################
sub FindSelectedStudent {	sub FindSelectedStudent {
my($cache, $selectedName, $students)=@_;	my($cache, $selectedName, $students)=@_;

if($selectedName eq 'All Students' \|\|	if($selectedName eq 'All Students' \|\|
$selectedName eq 'No Student Selected') {	$selectedName eq 'No Student Selected') {
return $selectedName;	return $selectedName;
}	}
Line 535 sub FindSelectedStudent {	Line 796 sub FindSelectedStudent {

return 'No Student Selected';	return 'No Student Selected';
}	}
	#######################################################
	#######################################################

=pod	=pod

Line 551 $cache: A pointer to the hash tied to th	Line 814 $cache: A pointer to the hash tied to th
$test: The form name of the column (heading.$headingIndex) or	$test: The form name of the column (heading.$headingIndex) or
(sequence.$sequenceIndex)	(sequence.$sequenceIndex)

Output: 0 (false), 1 (true)

=back	=back

=cut	=cut

	#######################################################
	#######################################################
sub ShouldShowColumns {	sub ShouldShowColumns {
my ($cache,$headings,$cacheKey)=@_;	my ($cache,$headings,$cacheKey)=@_;

Line 585 sub ShouldShowColumns {	Line 848 sub ShouldShowColumns {

foreach my $sequence (split(/\:/,$cache->{'orderedSequences'})) {	foreach my $sequence (split(/\:/,$cache->{'orderedSequences'})) {
$check = 'SequenceColumn'.$sequence;	$check = 'SequenceColumn'.$sequence;
if($cache->{'SequencesFound'} eq 'All Sequences' \|\|	if($cache->{'SequencesFound'} eq 'All Sequences' \|\|
$cache->{'SequencesFound'} =~ /$check/) {	$cache->{'SequencesFound'} =~ /$check/) {
push(@sequenceHeadings, $cache->{$sequence.':title'});	push(@sequenceHeadings, $cache->{$sequence.':title'});
push(@sequenceKeys, $sequence);	push(@sequenceKeys, $sequence);
Line 598 sub ShouldShowColumns {	Line 861 sub ShouldShowColumns {

$doNotShow{'count'} = $count;	$doNotShow{'count'} = $count;

return (\@infoHeadings, \@infoKeys, \@sequenceHeadings,	return (\@infoHeadings, \@infoKeys, \@sequenceHeadings,
\@sequenceKeys, \%doNotShow);	\@sequenceKeys, \%doNotShow);
}	}
	1;

#---- END Student Assessment Worker Functions --------------------------------	#######################################################
	#######################################################

	=pod

	=back

	=cut

	#######################################################
	#######################################################

1;
__END__	__END__

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.15
changed lines
	Added in v.1.29