[LON-CAPA-cvs] cvs: loncom /interface loncoursedata.pm lonhtmlcommon.pm lonstatistics.pm /interface/statistics lonstudentassessment.pm
stredwic
lon-capa-cvs@mail.lon-capa.org
Thu, 25 Jul 2002 21:23:51 -0000
This is a MIME encoded message
--stredwic1027632231
Content-Type: text/plain
stredwic Thu Jul 25 17:23:51 2002 EDT
Modified files:
/loncom/interface loncoursedata.pm lonhtmlcommon.pm
lonstatistics.pm
/loncom/interface/statistics lonstudentassessment.pm
Log:
Updating lonstudentassessment to add in features of lonchart. Now the
data display is like lonchart with formatted columns of data. The next
step will be to add in the column removal check boxes and a multiselect
box for sections.
--stredwic1027632231
Content-Type: text/plain
Content-Disposition: attachment; filename="stredwic-20020725172351.txt"
Index: loncom/interface/loncoursedata.pm
diff -u loncom/interface/loncoursedata.pm:1.5 loncom/interface/loncoursedata.pm:1.6
--- loncom/interface/loncoursedata.pm:1.5 Thu Jul 25 15:31:32 2002
+++ loncom/interface/loncoursedata.pm Thu Jul 25 17:23:51 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: loncoursedata.pm,v 1.5 2002/07/25 19:31:32 minaeibi Exp $
+# $Id: loncoursedata.pm,v 1.6 2002/07/25 21:23:51 stredwic Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -515,6 +515,7 @@
$cache->{$name.':domain'}=$studentDomain;
if(!defined($cache->{$name.':lastDownloadTime'})) {
$cache->{$name.':lastDownloadTime'}='Not downloaded';
+ $cache->{$name.':updateTime'}=' Not updated';
}
my ($checkForError)=keys(%$studentInformation);
@@ -604,6 +605,12 @@
if($courseData->{'UpToDate'} eq 'true') {
$cache->{$name.':lastDownloadTime'}=$courseData->{'lastDownloadTime'};
+ if($courseData->{'lastDownloadTime'} eq 'Not downloaded') {
+ $cache->{$name.':updateTime'} = ' Not updated';
+ } else {
+ $cache->{$name.':updateTime'}=
+ localtime($courseData->{'lastDownloadTime'});
+ }
return;
}
@@ -617,6 +624,12 @@
}
$cache->{$name.':lastDownloadTime'}=$courseData->{'lastDownloadTime'};
+ if($courseData->{'lastDownloadTime'} eq 'Not downloaded') {
+ $cache->{$name.':updateTime'} = ' Not updated';
+ } else {
+ $cache->{$name.':updateTime'}=
+ localtime($courseData->{'lastDownloadTime'});
+ }
foreach (@courseKeys) {
$cache->{$name.':'.$_}=$courseData->{$_};
}
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.3 loncom/interface/lonhtmlcommon.pm:1.4
--- loncom/interface/lonhtmlcommon.pm:1.3 Wed Jul 24 10:52:32 2002
+++ loncom/interface/lonhtmlcommon.pm Thu Jul 25 17:23:51 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.3 2002/07/24 14:52:32 stredwic Exp $
+# $Id: lonhtmlcommon.pm,v 1.4 2002/07/25 21:23:51 stredwic Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -57,10 +57,14 @@
}
sub StudentOptions {
- my ($cache, $students, $selectedName, $page)=@_;
+ my ($cache, $students, $selectedName, $page, $formName)=@_;
my $Str = '';
- $Str = '<select name="'.(($page)?$page:'').'Student">'."\n";
+ $Str .= '<select name="'.(($page)?$page:'').'Student"';
+ if($formName) {
+ $Str .= ' onchange="document.'.$formName.'.submit()"';
+ }
+ $Str .= '>'."\n";
my $selected=0;
@@ -182,11 +186,11 @@
=over 4
-Inputs: $CacheData, $studentInformation, $headings, $spacePadding
+Inputs: $CacheData, $keyID, $headings, $spacePadding
$CacheData: pointer to a hash tied to the cached data database
-$studentInformation: a pointer to an array containing the names of the data
+$keyID: a pointer to an array containing the names of the data
held in a column and is used as part of a key into $CacheData
$headings: The names of the headings for the student information
@@ -201,19 +205,26 @@
=cut
-sub CreateStudentInformationHeadings {
- my ($data,$studentInformation,$headings,$displayString)=@_;
+sub CreateHeadings {
+ my ($data,$keyID,$headings,$displayString,$format)=@_;
my $Str='';
+ my $formatting = '';
for(my $index=0; $index<(scalar @$headings); $index++) {
-# if(!&ShouldShowColumn($data, 'ChartHeading'.$index)) {
-# next;
-# }
- my $data=$headings->[$index];
- my $linkdata=$studentInformation->[$index];
+ my $currentHeading=$headings->[$index];
+ if($format eq 'preformatted') {
+ my @dataLength=split(//,$currentHeading);
+ my $length=scalar @dataLength;
+ $formatting = (' 'x
+ ($data->{$keyID->[$index].':columnWidth'}-$length));
+ }
+ my $linkdata=$keyID->[$index];
+
my $tempString = $displayString;
$tempString =~ s/LINKDATA/$linkdata/;
- $tempString =~ s/DISPLAYDATA/$data/;
+ $tempString =~ s/DISPLAYDATA/$currentHeading/;
+ $tempString =~ s/FORMATTING/$formatting/;
+
$Str .= $tempString;
}
@@ -229,13 +240,13 @@
=over 4
-Input: $cache, $name, $studentInformation, $spacePadding
+Input: $cache, $name, $keyID, $spacePadding
$cache: This is a pointer to a hash that is tied to the cached data
$name: The name and domain of the current student in name:domain format
-$studentInformation: A pointer to an array holding the names used to
+$keyID: A pointer to an array holding the names used to
remove data from the hash. They represent the name of the data to be removed.
@@ -250,22 +261,24 @@
=cut
sub FormatStudentInformation {
- my ($cache,$name,$studentInformation,$spacePadding)=@_;
+ my ($data,$name,$keyID,$displayString,$format)=@_;
my $Str='';
- my $data;
+ my $currentColumn;
+
+ for(my $index=0; $index<(scalar @$keyID); $index++) {
+ $currentColumn=$data->{$name.':'.$keyID->[$index]};
- for(my $index=0; $index<(scalar @$studentInformation); $index++) {
- if(!&ShouldShowColumn($cache, 'ChartHeading'.$index)) {
- next;
+ if($format eq 'preformatted') {
+ my @dataLength=split(//,$currentColumn);
+ my $length=scalar @dataLength;
+ $currentColumn.= (' 'x
+ ($data->{$keyID->[$index].':columnWidth'}-$length));
}
- $data=$cache->{$name.':'.$studentInformation->[$index]};
- $Str .= $data;
- my @dataLength=split(//,$data);
- my $length=scalar @dataLength;
- $Str .= (' 'x($cache->{$studentInformation->[$index].'Length'}-
- $length));
- $Str .= $spacePadding;
+ my $tempString = $displayString;
+ $tempString =~ s/DISPLAYDATA/$currentColumn/;
+
+ $Str .= $tempString;
}
return $Str;
Index: loncom/interface/lonstatistics.pm
diff -u loncom/interface/lonstatistics.pm:1.31 loncom/interface/lonstatistics.pm:1.32
--- loncom/interface/lonstatistics.pm:1.31 Thu Jul 25 15:30:24 2002
+++ loncom/interface/lonstatistics.pm Thu Jul 25 17:23:51 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonstatistics.pm,v 1.31 2002/07/25 19:30:24 minaeibi Exp $
+# $Id: lonstatistics.pm,v 1.32 2002/07/25 21:23:51 stredwic Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -94,8 +94,6 @@
} else {
$cache->{'StudentAssessmentMove'} = 'selected';
}
- &CheckFormElement($cache, 'StudentAssessmentMap', 'StudentAssessmentMap',
- 'All Maps');
&CheckFormElement($cache, 'StudentAssessmentStudent',
'StudentAssessmentStudent', 'All Students');
$cache->{'StudentAssessmentStudent'} =
@@ -195,8 +193,57 @@
return \@order;
}
+=pod
+
+=item &SpaceColumns()
+
+Determines the width of all the columns in the chart. It is based on
+the max of the data for that column and its header.
+
+=over 4
+
+Input: $students, $studentInformation, $headings, $ChartDB
+
+$students: An array pointer to a list of students (username:domain)
+
+$studentInformatin: The type of data for the student information. It is
+used as part of the key in $CacheData.
+
+$headings: The name of the student information columns.
+
+$ChartDB: The name of the cache database which is opened for read/write.
+
+Output: None - All data stored in cache.
+
+=back
+
+=cut
+
+sub SpaceColumns {
+ my ($students,$studentInformation,$headings,$cache)=@_;
+
+ # Initialize Lengths
+ for(my $index=0; $index<(scalar @$headings); $index++) {
+ my @titleLength=split(//,$headings->[$index]);
+ $cache->{$studentInformation->[$index].':columnWidth'}=
+ scalar @titleLength;
+ }
+
+ foreach my $name (@$students) {
+ foreach (@$studentInformation) {
+ my @dataLength=split(//,$cache->{$name.':'.$_});
+ my $length=(scalar @dataLength);
+ if($length > $cache->{$_.':columnWidth'}) {
+ $cache->{$_.':columnWidth'}=$length;
+ }
+ }
+ }
+
+ return;
+}
+
sub PrepareData {
- my ($c, $cacheDB)=@_;
+ my ($c, $cacheDB, $studentInformation, $headings)=@_;
# Test for access to the cache data
my $courseID=$ENV{'request.course.id'};
@@ -255,6 +302,8 @@
&ProcessFormData(\%cache);
my $students = &SortStudents(\%cache);
+ &SpaceColumns($students, $studentInformation, $headings, \%cache);
+ $cache{'updateTime:columnWidth'}=24;
if($cache{'download'} ne 'false') {
my $who = $cache{'download'};
@@ -291,11 +340,6 @@
return 'aborted';
}
- if($c->aborted()) {
- untie(%cache);
- return 'aborted';
- }
-
untie(%cache);
return ('OK', $students);
@@ -359,7 +403,7 @@
}
sub BuildClasslist {
- my ($cacheDB,$students,$studentInformation,$headings,$spacePadding)=@_;
+ my ($cacheDB,$students,$studentInformation,$headings)=@_;
my %cache;
unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
@@ -372,51 +416,42 @@
my $displayString = '<td align="left"><a href="/adm/statistics?';
$displayString .= 'sort=LINKDATA">DISPLAYDATA </a></td>'."\n";
- $Str .= &Apache::lonhtmlcommon::CreateStudentInformationHeadings(\%cache,
- $studentInformation,
- $headings,
- $displayString);
- $Str .= '<td align="left">';
- $Str .= '<a href="/adm/statistics?sort=lastDownloadTime">';
- $Str .= 'Last Updated </a></td>'."\n";
+ $Str .= &Apache::lonhtmlcommon::CreateHeadings(\%cache, $studentInformation,
+ $headings, $displayString);
$Str .= '</tr>'."\n";
my $alternate=0;
foreach (@$students) {
my ($username, $domain) = split(':', $_);
if($alternate) {
- $Str .= '<tr bgcolor="#ffffe6"><td>';
+ $Str .= '<tr bgcolor="#ffffe6">';
} else {
- $Str .= '<tr bgcolor="#ffffc6"><td>';
+ $Str .= '<tr bgcolor="#ffffc6">';
}
$alternate = ($alternate + 1) % 2;
foreach my $data (@$studentInformation) {
+ $Str .= '<td>';
if($data eq 'fullname') {
$Str .= '<a href="/adm/statistics?reportSelected=';
$Str .= &Apache::lonnet::escape('Student Assessment');
$Str .= '&StudentAssessmentStudent=';
$Str .= &Apache::lonnet::escape($cache{$_.':'.$data}).'">';
- #$Str .= 'Student Assessment'.'">';
- }
-
- $Str .= $cache{$_.':'.$data}.' ';
-
- if($data eq 'fullname') {
+ $Str .= $cache{$_.':'.$data}.' ';
$Str .= '</a>';
+ } elsif($data eq 'updateTime') {
+ $Str .= '<a href="/adm/statistics?reportSelected=';
+ $Str .= &Apache::lonnet::escape('Class list');
+ $Str .= '&download='.$_.'">';
+ $Str .= $cache{$_.':'.$data}.' ';
+ $Str .= ' </a>';
+ } else {
+ $Str .= $cache{$_.':'.$data}.' ';
}
- $Str .= '</td><td>';
+ $Str .= '</td>'."\n";
}
-
- $Str .= '<a href="/adm/statistics?download='.$_.'">';
- my $downloadTime = $cache{$_.':lastDownloadTime'};
- if($downloadTime ne 'Not downloaded') {
- $downloadTime = localtime($downloadTime);
- }
- $Str .= $downloadTime;
-
- $Str .= ' </a></td></tr>'."\n";
}
+ $Str .= '</tr>'."\n";
$Str .= '</table></td></tr></table>'."\n";
untie(%cache);
@@ -428,9 +463,11 @@
my ($r)=@_;
my $c = $r->connection;
- my @studentInformation=('fullname','section','id','domain','username');
- my @headings=('Full Name', 'Section', 'PID', 'Domain', 'User Name');
- my $spacePadding = ' ';
+ my @studentInformation=('fullname','section','id','domain','username',
+ 'updateTime');
+ my @headings=('Full Name', 'Section', 'PID', 'Domain', 'User Name',
+ 'Last Updated');
+ my $spacing = ' ';
my %reports = ('classlist' => 'Class list',
'problem_statistics' => 'Problem Statistics',
'student_assessment' => 'Student Assessment',
@@ -442,7 +479,9 @@
"_$ENV{'user.domain'}_$courseID\_statistics.db";
my %color=&setbgcolor(0);
- my ($returnValue, $students) = &PrepareData($c, $cacheDB);
+ my ($returnValue, $students) = &PrepareData($c, $cacheDB,
+ \@studentInformation,
+ \@headings);
if($returnValue ne 'OK') {
$r->print('<html><body>'.$returnValue."\n".'</body></html>');
return OK;
@@ -487,9 +526,13 @@
} elsif($GoToPage eq 'Student Assessment') {
$r->print(
&Apache::lonstudentassessment::BuildStudentAssessmentPage($cacheDB,
- $students,
- $courseID,
- $c));
+ $students,
+ $courseID,
+ 'Statistics',
+ \@headings,
+ $spacing,
+ \@studentInformation,
+ $r, $c));
} elsif($GoToPage eq 'Analyze') {
$r->print(&Apache::lonproblemanalysis::BuildAnalyzePage($cacheDB,
$students,
@@ -500,7 +543,7 @@
&Apache::lonproblemstatistics::BuildWrongGraph($r);
} elsif($GoToPage eq 'Class list') {
$r->print(&BuildClasslist($cacheDB, $students, \@studentInformation,
- \@headings, $spacePadding));
+ \@headings));
}
$r->print('</form>'."\n");
Index: loncom/interface/statistics/lonstudentassessment.pm
diff -u loncom/interface/statistics/lonstudentassessment.pm:1.1 loncom/interface/statistics/lonstudentassessment.pm:1.2
--- loncom/interface/statistics/lonstudentassessment.pm:1.1 Wed Jul 24 10:52:32 2002
+++ loncom/interface/statistics/lonstudentassessment.pm Thu Jul 25 17:23:51 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonstudentassessment.pm,v 1.1 2002/07/24 14:52:32 stredwic Exp $
+# $Id: lonstudentassessment.pm,v 1.2 2002/07/25 21:23:51 stredwic Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -43,125 +43,190 @@
use GDBM_File;
sub BuildStudentAssessmentPage {
- my ($cacheDB, $students, $courseID, $c)=@_;
+ my ($cacheDB,$students,$courseID,$formName,$headings,$spacing,
+ $studentInformation,$r,$c)=@_;
my %cache;
-
- my $Ptr = '';
- $Ptr .= '<table border="0"><tbody>';
-
unless(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
- return '<html><body>Unable to tie database.</body></html>';
- }
-
- my $selectedName = $cache{'StudentAssessmentStudent'};
- for(my $index=0;
- ($selectedName ne 'All Students') && ($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];
- } else {
- $selectedName = $students->[$index+1];
- }
- } elsif($cache{'StudentAssessmentMove'} eq 'previous') {
- if($index == 0) {
- $selectedName = $students->[-1];
- } else {
- $selectedName = $students->[$index-1];
- }
- } else {
- $selectedName = $students->[$index];
- }
- last;
- }
+ $r->print('<html><body>Unable to tie database.</body></html>');
+ return;
}
+ my $selectedName = &FindSelectedStudent(\%cache,
+ $cache{'StudentAssessmentStudent'},
+ $students);
+ $r->print(&CreateInterface(\%cache, $selectedName, $students, $formName));
- $Ptr .= '<tr><td align="right"><b>Select Map</b></td>'."\n";
- $Ptr .= '<td align="left">';
- $Ptr .= &Apache::lonhtmlcommon::MapOptions(\%cache, 'StudentAssessment');
- $Ptr .= '</td></tr>'."\n";
- $Ptr .= '<tr><td align="right"><b>Select Student</b></td>'."\n";
- $Ptr .= '<td align="left">'."\n";
- $Ptr .= &Apache::lonhtmlcommon::StudentOptions(\%cache, $students,
- $selectedName,
- 'StudentAssessment');
- $Ptr .= '</td></tr>'."\n";
- untie(%cache);
-
- $Ptr .= '<tr><td></td><td align="left">';
- $Ptr .= '<input type="submit" name="CreateStudentAssessment" ';
- $Ptr .= 'value="Create Student Report" />';
- $Ptr .= '   ';
- $Ptr .= '<input type="submit" name="PreviousStudent" ';
- $Ptr .= 'value="Previous Student" />';
- $Ptr .= '   ';
- $Ptr .= '<input type="submit" name="NextStudent" ';
- $Ptr .= 'value="Next Student" />';
- $Ptr .= '   ';
- $Ptr .= '</td></tr></tbody></table>'."\n";
-
+ my $Ptr = '';
if($selectedName eq 'No Student Selected') {
$Ptr .= '<h3><font color=blue>WARNING: ';
$Ptr .= 'Please select a student</font></h3>';
- return $Ptr;
+ $r->print($Ptr);
+ return;
}
+ my ($infoHeadings, $infoKeys, $sequenceHeadings, $sequenceKeys) =
+ &ShouldShowColumns(\%cache, $headings, $studentInformation);
+
+ $r->print(&CreateTableHeadings(\%cache, $spacing, $infoKeys, $infoHeadings,
+ $sequenceKeys, $sequenceHeadings));
+ untie(%cache);
+
my $selected=0;
+ $r->print('<pre>'."\n");
foreach (@$students) {
next if ($_ ne $selectedName &&
$selectedName ne 'All Students');
$selected = 1;
- my $courseData =
- &Apache::loncoursedata::DownloadCourseInformation($_, $courseID);
+ my $courseData;
+ if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
+ if($cache{$_.':lastDownloadTime'} eq 'Not downloaded') {
+ untie(%cache);
+ $courseData =
+ &Apache::loncoursedata::DownloadCourseInformation($_,
+ $courseID);
+ if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT,0640)) {
+ &Apache::loncoursedata::ProcessStudentData(\%cache,
+ $courseData, $_);
+ untie(%cache);
+ } else {
+ last if($c->aborted());
+ next;
+ }
+ } else {
+ untie(%cache);
+ }
+ } else {
+ last if($c->aborted());
+ next;
+ }
+
last if ($c->aborted());
- if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_WRCREAT,0640)) {
- &Apache::loncoursedata::ProcessStudentData(\%cache,
- $courseData, $_);
- if(!$c->aborted()) { $Ptr .= &StudentReport(\%cache, $_); }
+
+ if(tie(%cache,'GDBM_File',$cacheDB,&GDBM_READER,0640)) {
+ my $displayString = 'DISPLAYDATA'.$spacing;
+ $r->print(&Apache::lonhtmlcommon::FormatStudentInformation(
+ \%cache, $_,
+ $infoKeys,
+ $displayString,
+ 'preformatted'));
+ $r->print(&StudentReport(\%cache, $_, $spacing, $sequenceKeys));
+ $r->print("\n");
untie(%cache);
}
}
+ $r->print('</pre>'."\n");
if($selected == 0) {
$Ptr .= '<h3><font color=blue>WARNING: ';
$Ptr .= 'Please select a student</font></h3>';
+ $r->print($Ptr);
}
- return $Ptr;
+ return;
}
#---- Student Assessment Web Page --------------------------------------------
-# ------ Create different Student Report
+sub CreateInterface {
+ my($cache,$selectedName,$students,$formName)=@_;
+ my $Ptr = '';
+ $Ptr .= &CreateLegend();
+ $Ptr .= '<table><tr><td>'."\n";
+ $Ptr .= '<input type="submit" name="PreviousStudent" ';
+ $Ptr .= 'value="Previous Student" />'."\n";
+ $Ptr .= '   '."\n";
+ $Ptr .= &Apache::lonhtmlcommon::StudentOptions($cache, $students,
+ $selectedName,
+ 'StudentAssessment',
+ $formName);
+ $Ptr .= "\n".'   '."\n";
+ $Ptr .= '<input type="submit" name="NextStudent" ';
+ $Ptr .= 'value="Next Student" />'."\n";
+ $Ptr .= '</td></tr></table>'."\n";
+
+ return $Ptr;
+}
+
+sub CreateTableHeadings {
+ my($cache,$spacing,$infoKeys,$infoHeadings,$sequenceKeys,
+ $sequenceHeadings)=@_;
+
+ my $Str = '';
+ $Str .= '<br><table border="0" cellpadding="0" cellspacing="0"><tr>'."\n";
+
+ my $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>DISPLAYDATA'.$spacing;
+ $displayString .= '</pre></td>'."\n";
+ $Str .= &Apache::lonhtmlcommon::CreateHeadings($cache,
+ $sequenceKeys,
+ $sequenceHeadings,
+ $displayString,
+ 'preformatted');
+
+ $Str .= '<td><pre>Total Solved/Total Problems</pre></td>';
+ $Str .= '</tr></table>'."\n";
+
+ return $Str;
+}
+
+=pod
+
+=item &FormatStudentData()
+
+First, FormatStudentInformation is called and prefixes the course information.
+This function produces a formatted string of the student's course information.
+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
+for that problem.
+
+=over 4
+
+Input: $name, $studentInformation, $ChartDB
+
+$name: The name and domain of the current student in name:domain format
+
+$studentInformation: A pointer to an array holding the names used to
+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
+database.
+
+Output: $Str
+
+$Str: Formatted string that is an entire row of the chart. It is a
+concatenation of student information and student course information.
+
+=back
+
+=cut
+
sub StudentReport {
- my ($cache, $name)=@_;
+ my ($cache,$name,$spacing,$showSequences)=@_;
+ my ($username,$domain)=split(':',$name);
my $Str = '';
if($cache->{$name.':error'} =~ /course/) {
- my ($username)=split(':',$name);
$Str .= '<b><font color="blue">No course data for student </font>';
$Str .= '<font color="red">'.$username.'.</font></b><br>';
return $Str;
}
- $Str .= "<table border=2><tr><th> \# </th><th> Set Title </th>";
- $Str .= '<th> Results </th><th> Tries </th></tr>'."\n";
-
- my $codes;
- my $attempts;
- foreach my $sequence (split(':', $cache->{'orderedSequences'})) {
- if($cache->{'StudentAssessmentMap'} ne 'All Maps' &&
- $cache->{'StudentAssessmentMap'} ne $cache->{$sequence.':title'}) {
- next;
- }
-
- $Str .= '<tr><td>'.$sequence.'</td>';
- $Str .= '<td>'.$cache->{$sequence.':title'}.'</td>';
-
- $codes = '';
- $attempts = '';
+ my $Version;
+ my $problemsCorrect = 0;
+ my $totalProblems = 0;
+ my $problemsSolved = 0;
+ my $numberOfParts = 0;
+# foreach my $sequence (split(':', $cache->{'orderedSequences'})) {
+ foreach my $sequence (@$showSequences) {
+ my $characterCount=0;
foreach my $problemID (split(':', $cache->{$sequence.':problems'})) {
my $problem = $cache->{$problemID.':problem'};
my $LatestVersion = $cache->{$name.':version:'.$problem};
@@ -172,8 +237,9 @@
foreach my $part (split(/\:/,$cache->{$sequence.':'.
$problemID.
':parts'})) {
- $codes .= "-,";
- $attempts .= "0,";
+ $Str .= ' ';
+ $totalProblems++;
+ $characterCount++;
}
next;
}
@@ -186,7 +252,7 @@
$problemID.
':parts'})) {
$partData{$part.':tries'}=0;
- $partData{$part.':code'}='-';
+ $partData{$part.':code'}=' ';
}
# Looping through all the versions of each part, starting with the
@@ -204,43 +270,317 @@
}
my $tries=0;
- my $code='U';
+ my $code=' ';
- $tries = $cache->{$name.":$Version:$problem".
- ":resource.$part.tries"};
+ $tries = $cache->{$name.':'.$Version.':'.$problem.
+ ':resource.'.$part.'.tries'};
$partData{$part.':tries'}=($tries) ? $tries : 0;
- my $val = $cache->{$name.":$Version:$problem".
- ":resource.$part.solved"};
- if ($val eq 'correct_by_student') {$code = 'Y';}
- elsif ($val eq 'correct_by_override') {$code = 'y';}
- elsif ($val eq 'incorrect_attempted') {$code = 'N';}
- elsif ($val eq 'incorrect_by_override'){$code = 'N';}
+ my $val = $cache->{$name.':'.$Version.':'.$problem.
+ ':resource.'.$part.'.solved'};
+ if ($val eq 'correct_by_student') {$code = '*';}
+ elsif ($val eq 'correct_by_override') {$code = '+';}
+ elsif ($val eq 'incorrect_attempted') {$code = '.';}
+ elsif ($val eq 'incorrect_by_override'){$code = '-';}
elsif ($val eq 'excused') {$code = 'x';}
+ elsif ($val eq 'ungraded_attempted') {$code = '#';}
+ else {$code = ' ';}
$partData{$part.':code'}=$code;
}
}
- # Loop through all the parts for the current problem in the
- # correct order and prepare the output
- foreach (split(/\:/,$cache->{$sequence.':'.$problemID.
- ':parts'})) {
- $codes .= $partData{$_.':code'}.',';
- $attempts .= $partData{$_.':tries'}.',';
- }
- }
- $codes =~ s/,$//;
- $attempts =~ s/,$//;
- $Str .= '<td>'.$codes.'</td>';
- $Str .= '<td>'.$attempts.'</td>';
- $Str .= '</tr>'."\n";
+ # 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
+ $Str .= '<a href="/adm/grades?symb=';
+ $Str .= &Apache::lonnet::escape($problem);
+ $Str .= '&student='.$username.'&domain='.$domain;
+ $Str .= '&command=submission">';
+ foreach(split(/\:/,$cache->{$sequence.':'.$problemID.
+ ':parts'})) {
+ if($partData{$_.':code'} eq '*') {
+ $problemsCorrect++;
+ if (($partData{$_.':tries'}<10) &&
+ ($partData{$_.':tries'} ne '')) {
+ $partData{$_.':code'}=$partData{$_.':tries'};
+ }
+ } elsif($partData{$_.':code'} eq '+') {
+ $problemsCorrect++;
+ }
+
+ $Str .= $partData{$_.':code'};
+ $characterCount++;
+
+ if($partData{$_.':code'} ne 'x') {
+ $totalProblems++;
+ }
+ }
+ $Str.='</a>';
+ }
+
+ # 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", $problemsCorrect );
+ $Str .= '<font color="#007700">'.$outputProblemsCorrect.'</font>';
+ $problemsSolved += $problemsCorrect;
+ $problemsCorrect=0;
+
+ $Str .= $spacing;
}
- $Str .= '</table>'."\n";
+ # 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", $problemsSolved );
+ my $outputTotalProblems = sprintf( "%4d", $totalProblems );
+ $Str .= '<font color="#000088">'.$outputProblemsSolved.
+ ' / '.$outputTotalProblems.'</font>';
return $Str;
}
+=pod
+
+=item &CreateLegend()
+
+This function returns a formatted string containing the legend for the
+chart. The legend describes the symbols used to represent grades for
+problems.
+
+=cut
+
+sub CreateLegend {
+ my $Str = "<p><pre>".
+ "1..9: correct by student in 1..9 tries\n".
+ " *: correct by student in more than 9 tries\n".
+ " +: correct by override\n".
+ " -: incorrect by override\n".
+ " .: incorrect attempted\n".
+ " #: ungraded attempted\n".
+ " : not attempted\n".
+ " x: excused".
+ "</pre><p>";
+ return $Str;
+}
+
+=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 ($CacheData,$headings)=@_;
+
+ my $missing=0;
+ my $notThere='<tr><td align="right"><b>Select column to view:</b>';
+ my $name;
+ $notThere .= '<td align="left">';
+ $notThere .= '<select name="ChartReselect" size="4" multiple="true">'."\n";
+
+ for(my $index=0; $index<(scalar @$headings); $index++) {
+ if(&ShouldShowColumn($CacheData, 'ChartHeading'.$index)) {
+ next;
+ }
+ $name = $headings->[$index];
+ $notThere .= '<option value="ChartHeading'.$index.'">';
+ $notThere .= $name.'</option>'."\n";
+ $missing++;
+ }
+
+ foreach my $sequence (split(/\:/,$CacheData->{'orderedSequences'})) {
+ if(&ShouldShowColumn($CacheData, 'ChartSequence'.$sequence)) {
+ next;
+ }
+ $name = $CacheData->{$sequence.':title'};
+ $notThere .= '<option value="ChartSequence'.$sequence.'">';
+ $notThere .= $name.'</option>'."\n";
+ $missing++;
+ }
+
+ if($missing) {
+ $notThere .= '</select>';
+ } else {
+ $notThere='<tr><td>';
+ }
+
+ return $notThere.'</td></tr>';
+}
+
+=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 ($headings)=@_;
+=pod
+ my $found=0;
+ my ($name, $length, $position);
+
+ my $present = '<tr>';
+ for(my $index=0; $index<(scalar @$headings); $index++) {
+ $present .= '<td align="left">';
+ $present .= '<input type="checkbox" checked="on" ';
+ $present .= 'name="ChartHeading'.$index.'" />';
+ $present .= '</td>';
+ $found++;
+ }
+
+ foreach my $sequence (split(/\:/,$CacheData->{'orderedSequences'})) {
+ if(!&ShouldShowColumn($CacheData, 'ChartSequence'.$sequence)) {
+ next;
+ }
+ $present .= '<td align="left">';
+ $present .= '<input type="checkbox" checked="on" ';
+ $present .= 'name="ChartSequence'.$sequence.'" />';
+ $present .= '</td>';
+ $found++;
+ }
+
+ if(!$found) {
+ $present = '';
+ }
+
+ return $present.'<td></td></tr></form>'."\n";;
+=cut
+}
+
#---- END Student Assessment Web Page ----------------------------------------
+
+#---- Student Assessment Worker Functions ------------------------------------
+
+sub FindSelectedStudent {
+ my($cache, $selectedName, $students)=@_;
+ for(my $index=0;
+ ($selectedName ne 'All Students') && ($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];
+ } else {
+ $selectedName = $students->[$index+1];
+ }
+ } elsif($cache->{'StudentAssessmentMove'} eq 'previous') {
+ if($index == 0) {
+ $selectedName = $students->[-1];
+ } else {
+ $selectedName = $students->[$index-1];
+ }
+ } else {
+ $selectedName = $students->[$index];
+ }
+ last;
+ }
+ }
+
+ return $selectedName;
+}
+
+=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)
+
+Output: 0 (false), 1 (true)
+
+=back
+
+=cut
+
+sub ShouldShowColumns {
+ my ($cache,$headings,$cacheKey)=@_;
+
+ my @infoKeys=();
+ my @infoHeadings=();
+
+ my @sequenceKeys=();
+ my @sequenceHeadings=();
+
+ my $index;
+ for($index=0; $index < scalar @$headings; $index++) {
+ push(@infoHeadings, $headings->[$index]);
+ push(@infoKeys, $cacheKey->[$index]);
+ }
+
+ foreach my $sequence (split(/\:/,$cache->{'orderedSequences'})) {
+ push(@sequenceHeadings, $cache->{$sequence.':title'});
+ push(@sequenceKeys, $sequence);
+ }
+
+# my $headings=$cache->{'form.ChartHeadings'};
+# my $sequences=$cache->{'form.ChartSequences'};
+# if($headings eq 'ALLHEADINGS' || $sequences eq 'ALLSEQUENCES' ||
+# $headings=~/$test/ || $sequences=~/$test/) {
+# return 1;
+# }
+
+ return (\@infoHeadings, \@infoKeys, \@sequenceHeadings,
+ \@sequenceKeys);
+}
+
+#---- END Student Assessment Worker Functions --------------------------------
+
1;
__END__
--stredwic1027632231--