--- loncom/interface/statistics/lonstudentassessment.pm 2006/08/18 15:15:38 1.143 +++ loncom/interface/statistics/lonstudentassessment.pm 2008/09/12 14:35:45 1.147 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.143 2006/08/18 15:15:38 raeburn Exp $ +# $Id: lonstudentassessment.pm,v 1.147 2008/09/12 14:35:45 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -372,7 +372,7 @@ sub CreateInterface { $Str .= ' 'x5; $Str .= &mt('Status [_1]', - ''); + ''); $Str .= ''; return $Str; } @@ -671,9 +671,10 @@ sub html_initialize { # If we're showing links, show a checkbox to open in new # windows. if ($show_links ne 'no') { + my $labeltext = &mt('Show links in new window:'); $r->print(<new_window = true; -Show links in new window: +$labeltext NEW_WINDOW_CHECKBOX @@ -684,7 +685,7 @@ NEW_WINDOW_CHECKBOX " ".localtime(time).""); # if ($chosen_output->{'base'} !~ /^final table/) { - $r->print("".$chosen_output->{'shortdesc'}.""); + $r->print("".&mt($chosen_output->{'shortdesc'}).""); } my $Str = "\n"; # First, the @StudentData fields need to be listed @@ -843,12 +844,17 @@ sub html_outputstudent { my @tmp = &Apache::loncoursedata::get_current_state ($student->{'username'},$student->{'domain'},undef, $env{'request.course.id'}); - if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) { + if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:(.*)/)) { %StudentsData = @tmp; - } - if (scalar(@tmp) < 1) { + } else { + my $error = $1; + if (scalar(@tmp) < 1) { + $Str .= 'No Course Data'."\n"; + } else { + $Str .= 'Error getting student data ('. + $error.') '."\n"; + } $nodata_count++; - $Str .= 'No Course Data'."\n"; $r->print($Str); $r->rflush(); return; @@ -1820,7 +1826,7 @@ sub csv_finish { # # Tell the user where to get their csv file $r->print(''. - ''.&mt('Your csv file.').''."\n"); + ''.&mt('Your CSV file.').''."\n"); $r->rflush(); &csv_cleanup(); return; @@ -1951,9 +1957,6 @@ sub student_tries_on_sequence { # if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { - if (length($symbol) > 1) { - &Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1'); - } my $link = '/adm/grades'. '?symb='.&escape($resource->symb). '&student='.$student->{'username'}.
Show links in new window: +$labeltext NEW_WINDOW_CHECKBOX @@ -684,7 +685,7 @@ NEW_WINDOW_CHECKBOX " ".localtime(time).""); # if ($chosen_output->{'base'} !~ /^final table/) { - $r->print("".$chosen_output->{'shortdesc'}.""); + $r->print("".&mt($chosen_output->{'shortdesc'}).""); } my $Str = "\n"; # First, the @StudentData fields need to be listed @@ -843,12 +844,17 @@ sub html_outputstudent { my @tmp = &Apache::loncoursedata::get_current_state ($student->{'username'},$student->{'domain'},undef, $env{'request.course.id'}); - if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) { + if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:(.*)/)) { %StudentsData = @tmp; - } - if (scalar(@tmp) < 1) { + } else { + my $error = $1; + if (scalar(@tmp) < 1) { + $Str .= 'No Course Data'."\n"; + } else { + $Str .= 'Error getting student data ('. + $error.') '."\n"; + } $nodata_count++; - $Str .= 'No Course Data'."\n"; $r->print($Str); $r->rflush(); return; @@ -1820,7 +1826,7 @@ sub csv_finish { # # Tell the user where to get their csv file $r->print(''. - ''.&mt('Your csv file.').''."\n"); + ''.&mt('Your CSV file.').''."\n"); $r->rflush(); &csv_cleanup(); return; @@ -1951,9 +1957,6 @@ sub student_tries_on_sequence { # if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { - if (length($symbol) > 1) { - &Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1'); - } my $link = '/adm/grades'. '?symb='.&escape($resource->symb). '&student='.$student->{'username'}.
$labeltext
\n"; # First, the @StudentData fields need to be listed @@ -843,12 +844,17 @@ sub html_outputstudent { my @tmp = &Apache::loncoursedata::get_current_state ($student->{'username'},$student->{'domain'},undef, $env{'request.course.id'}); - if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) { + if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:(.*)/)) { %StudentsData = @tmp; - } - if (scalar(@tmp) < 1) { + } else { + my $error = $1; + if (scalar(@tmp) < 1) { + $Str .= 'No Course Data'."\n"; + } else { + $Str .= 'Error getting student data ('. + $error.') '."\n"; + } $nodata_count++; - $Str .= 'No Course Data'."\n"; $r->print($Str); $r->rflush(); return; @@ -1820,7 +1826,7 @@ sub csv_finish { # # Tell the user where to get their csv file $r->print(''. - ''.&mt('Your csv file.').''."\n"); + ''.&mt('Your CSV file.').''."\n"); $r->rflush(); &csv_cleanup(); return; @@ -1951,9 +1957,6 @@ sub student_tries_on_sequence { # if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { - if (length($symbol) > 1) { - &Apache::lonnet::logthis('length of symbol "'.$symbol.'" > 1'); - } my $link = '/adm/grades'. '?symb='.&escape($resource->symb). '&student='.$student->{'username'}.