--- loncom/interface/statistics/lonstudentassessment.pm 2006/06/30 04:15:07 1.141 +++ loncom/interface/statistics/lonstudentassessment.pm 2009/05/14 19:01:28 1.150.2.1 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstudentassessment.pm,v 1.141 2006/06/30 04:15:07 albertel Exp $ +# $Id: lonstudentassessment.pm,v 1.150.2.1 2009/05/14 19:01:28 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -330,7 +330,7 @@ sub CreateInterface { $Str .= '<td align="center"><b>'.&mt('Student Data</b>'). &Apache::loncommon::help_open_topic("Chart_Student_Data"). '</td>'; - $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b>'. + $Str .= '<td align="center"><b>'.&mt('Access Status').'</b>'. &Apache::loncommon::help_open_topic("Chart_Enrollment_Status"). '</td>'; $Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b>'. @@ -372,7 +372,7 @@ sub CreateInterface { $Str .= ' 'x5; $Str .= &mt('Status [_1]', - '<input type="text" name="stats_status" size="60" value="" />'); + '<input type="text" name="stats_status" size="60" value="" readonly="readonly" />'); $Str .= '<br />'; return $Str; } @@ -671,10 +671,11 @@ 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_CHECKBOX); <script type="text/javascript">new_window = true;</script> -<p><label>Show links in new window: -<input type="checkbox" checked="1" onclick="new_window=this.checked" /> +<p><label>$labeltext +<input type="checkbox" checked="checked" onclick="new_window=this.checked" /> </label></p> NEW_WINDOW_CHECKBOX } @@ -684,7 +685,7 @@ NEW_WINDOW_CHECKBOX " ".localtime(time)."</h3>"); # if ($chosen_output->{'base'} !~ /^final table/) { - $r->print("<h3>".$chosen_output->{'shortdesc'}."</h3>"); + $r->print("<h3>".&mt($chosen_output->{'shortdesc'})."</h3>"); } my $Str = "<pre>\n"; # First, the @StudentData fields need to be listed @@ -750,7 +751,7 @@ NEW_WINDOW_CHECKBOX $r->rflush(); $r->print(<<JS); -<script> +<script type="text/javascript"> // get the left offset of a given widget as an absolute position function getLeftOffset (element) { return collect(element, "offsetLeft"); @@ -771,23 +772,20 @@ function collect(element, att) { } var currentDiv; -var oldBorder; var currentElement; function popup_score(element, score) { popdown_score(); var left = getLeftOffset(element); var top = getTopOffset(element); var div = document.createElement("div"); - div.style.border = "1px solid #8888FF"; - div.style.backgroundColor = "#CCCCFF"; + div.className = "LC_chrt_popup"; div.appendChild(document.createTextNode(score)); div.style.position = "absolute"; div.style.top = (top - 25) + "px"; div.style.left = (left - 10) + "px"; currentDiv = div; document.body.insertBefore(div, document.body.childNodes[0]); - oldBorder = element.style.border; - element.style.border = "1px solid yellow"; + element.className = "LC_chrt_popup_up"; currentElement = element; } @@ -796,7 +794,7 @@ function popdown_score() { document.body.removeChild(currentDiv); } if (currentElement) { - currentElement.style.border = oldBorder; + currentElement.className = 'LC_chrt_popup_exists'; } currentDiv = undefined; } @@ -846,12 +844,20 @@ 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 .= '<span class="LC_warning">' + .&mt('No Course Data') + .'</span>'."\n"; + } else { + $Str .= '<span class="LC_error">' + .&mt('Error getting student data ([_1])',$error) + .'</span>'."\n"; + } $nodata_count++; - $Str .= '<font color="blue">No Course Data</font>'."\n"; $r->print($Str); $r->rflush(); return; @@ -956,12 +962,12 @@ sub html_finish { sub StudentAverageTotal { my $Str = '<h3>'.&mt('Summary Tables').'</h3>'.$/; - $Str .= '<table border=2 cellspacing="1">'."\n"; - $Str .= '<tr>'. + $Str .= &Apache::loncommon::start_data_table(); + $Str .= &Apache::loncommon::start_data_table_header_row(). '<th>'.&mt('Title').'</th>'. '<th>'.&mt('Average').'</th>'. '<th>'.&mt('Maximum').'</th>'. - '</tr>'.$/; + &Apache::loncommon::end_data_table_header_row().$/; foreach my $seq (@sequences) { my $symb = $seq->symb; my $ave; @@ -975,11 +981,13 @@ sub StudentAverageTotal { } my $max = $Statistics->{$symb}->{'max'}; $ave = sprintf("%.2f",$ave); - $Str .= '<tr><td>'.$seq->compTitle.'</td>'. + $Str .= &Apache::loncommon::start_data_table_row(). + '<td>'.$seq->compTitle.'</td>'. '<td align="right">'.$ave.' </td>'. - '<td align="right">'.$max.' '.'</td></tr>'."\n"; + '<td align="right">'.$max.' '.'</td>'. + &Apache::loncommon::end_data_table_row()."\n"; } - $Str .= "</table>\n"; + $Str .= &Apache::loncommon::end_data_table()."\n"; return $Str; } @@ -990,31 +998,36 @@ sub SingleStudentTotal { $student->{'fullname'}, $student->{'username'},$student->{'domain'}).'</h3>'; $Str .= $/; - $Str .= '<table border=2 cellspacing="1">'."\n"; + $Str .= &Apache::loncommon::start_data_table()."\n"; $Str .= - '<tr>'. + &Apache::loncommon::start_data_table_header_row(). '<th>'.&mt('Sequence or Folder').'</th>'; if ($chosen_output->{'base'} eq 'tries') { $Str .= '<th>'.&mt('Parts Correct').'</th>'; } else { $Str .= '<th>'.&mt('Score').'</th>'; } - $Str .= '<th>'.&mt('Maximum').'</th>'."</tr>\n"; + $Str .= '<th>'.&mt('Maximum').'</th>'. + &Apache::loncommon::end_data_table_header_row()."\n"; my $total = 0; my $total_max = 0; foreach my $seq (@sequences) { my $value = $Statistics->{$seq->symb}->{'score'}; my $max = $Statistics->{$seq->symb}->{'max'}; - $Str .= '<tr><td>'.&HTML::Entities::encode($seq->compTitle).'</td>'. + $Str .= &Apache::loncommon::start_data_table_row(). + '<td>'.&HTML::Entities::encode($seq->compTitle).'</td>'. '<td align="right">'.$value.'</td>'. - '<td align="right">'.$max.'</td></tr>'."\n"; + '<td align="right">'.$max.'</td>'. + &Apache::loncommon::end_data_table_row()."\n"; $total += $value; $total_max +=$max; } - $Str .= '<tr><td><b>'.&mt('Total').'</b></td>'. + $Str .= &Apache::loncommon::start_data_table_row(). + '<td><b>'.&mt('Total').'</b></td>'. '<td align="right">'.$total.'</td>'. - '<td align="right">'.$total_max."</td></tr>\n"; - $Str .= "</table>\n"; + '<td align="right">'.$total_max.'</td>'. + &Apache::loncommon::end_data_table_row()."\n"; + $Str .= &Apache::loncommon::end_data_table()."\n"; return $Str; } @@ -1823,7 +1836,7 @@ sub csv_finish { # # Tell the user where to get their csv file $r->print('<br />'. - '<a href="'.$filename.'">'.&mt('Your csv file.').'</a>'."\n"); + '<a href="'.$filename.'">'.&mt('Your CSV file.').'</a>'."\n"); $r->rflush(); &csv_cleanup(); return; @@ -1841,7 +1854,7 @@ sub show_star { # Escape the popup for JS. $popup =~ s/([^-a-zA-Z0-9:;,._ ()|!\/?=&*])/'\\' . sprintf("%lo", ord($1))/ge; - return "<span onmouseover='popup_score(this, \"$popup\");return false;' onmouseout='popdown_score();return false;' style='border: 1px solid #339933; margin: -1px;'>$symbol</span>"; + return "<span class=\"LC_chrt_popup_exists\" onmouseover='popup_score(this, \"$popup\");return false;' onmouseout='popdown_score();return false;'>$symbol</span>"; } ####################################################### @@ -1954,11 +1967,8 @@ 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). + '?symb='.&escape($resource->shown_symb). '&student='.$student->{'username'}. '&userdom='.$student->{'domain'}. '&command=submission'; @@ -2113,7 +2123,7 @@ sub student_performance_on_sequence { # if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { my $link = '/adm/grades' . - '?symb='.&escape($symb). + '?symb='.&escape($resource->shown_symb). '&student='.$student->{'username'}. '&userdom='.$student->{'domain'}. '&command=submission';