| '.&mt('Sections').''. @@ -361,20 +364,15 @@ sub CreateInterface { $Str .= &CreateAndParseOutputDataSelector(); $Str .= ' |
'. - &mt('Status:').' '. - ''. - '
'; $Str .= ''; $Str .= ' 'x5; $Str .= ''; - $Str .= ''. - ''. - '
'; - + $Str .= '' + .'' + .'
'; return $Str; } @@ -432,7 +430,7 @@ my @OutputOptions = sub OutputDescriptions { my $Str = ''; - $Str .= "'. - &mt('Unable to retrieve course information.'). - '
'); + $r->print('' + .&mt('Unable to retrieve course information.') + .'
'); } # 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:'); + my $labeltext = &mt('Show links in new window'); $r->print(<-The Summary Table (Scores) option is not available for non-HTML output. -
-END + $r->print( + '' + .&mt('The [_1]Summary Table (Scores)[_2] option' + .' is not available for non-HTML output.','','') + .'
' + ); $request_aborted = 1; } return if ($request_aborted); # # Initialize progress window my $studentcount = scalar(@Apache::lonstatistics::Students); - %prog_state=&Apache::lonhtmlcommon::Create_PrgWin - ($r,'CSV File Compilation Status', - 'CSV File Compilation Progress', $studentcount, - 'inline',undef,'Statistics','stats_status'); + %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$studentcount); # # Open a file ($outputfile,$filename) = &Apache::loncommon::create_text_file($r,'csv'); @@ -1674,7 +1676,7 @@ END # Datestamp my $description = $env{'course.'.$env{'request.course.id'}.'.description'}; print $outputfile '"'.&Apache::loncommon::csv_translate($description).'",'. - '"'.&Apache::loncommon::csv_translate(scalar(localtime(time))).'"'. + '"'.&Apache::loncommon::csv_translate(scalar(&Apache::lonlocal::locallocaltime(time))).'"'. "\n"; print $outputfile '"'. &Apache::loncommon::csv_translate @@ -1771,16 +1773,18 @@ sub csv_outputstudent { my $total = 0; my $maximum = 0; foreach my $seq (@sequences) { + my $randompick = $seq->randompick(); my ($performance,$performance_length,$score,$seq_max,$rawdata); if ($chosen_output->{'tries'}){ ($performance,$performance_length,$score,$seq_max,$rawdata) = &student_tries_on_sequence($student,\%StudentsData, - $navmap,$seq,'no'); + $navmap,$seq,'no',$randompick); } else { ($performance,$performance_length,$score,$seq_max,$rawdata) = &student_performance_on_sequence($student,\%StudentsData, $navmap,$seq,'no', - $chosen_output->{ignore_weight}); + $chosen_output->{ignore_weight}, + $randompick); } if ($chosen_output->{'every_problem'}) { if ($chosen_output->{'correct'}) { @@ -1881,7 +1885,7 @@ Inputs: ####################################################### ####################################################### sub student_tries_on_sequence { - my ($student,$studentdata,$navmap,$seq,$links) = @_; + my ($student,$studentdata,$navmap,$seq,$links,$randompick) = @_; $links = 'no' if (! defined($links)); my $Str = ''; my ($sum,$max) = (0,0); @@ -1967,17 +1971,17 @@ sub student_tries_on_sequence { ($links eq 'all')) { my $link = '/adm/grades'. '?symb='.&escape($resource->shown_symb). - '&student='.$student->{'username'}. - '&userdom='.$student->{'domain'}. - '&command=submission'; + '&student='.$student->{'username'}. + '&userdom='.$student->{'domain'}. + '&command=submission'; $symbol = &link($symbol, $link); } $value .= $symbol; } $Str .= $value; } - if ($seq->randompick()) { - $max = $seq->randompick(); + if ($randompick) { + $max = $randompick; } if (! $hasdata && $sum == 0) { $sum = ' '; @@ -2042,7 +2046,7 @@ Inputs: ####################################################### ####################################################### sub student_performance_on_sequence { - my ($student,$studentdata,$navmap,$seq,$links,$awarded_only) = @_; + my ($student,$studentdata,$navmap,$seq,$links,$awarded_only,$randompick) = @_; $links = 'no' if (! defined($links)); my $Str = ''; # final result string my ($score,$max) = (0,0); @@ -2051,9 +2055,11 @@ sub student_performance_on_sequence { my @ScoreData = (); my $partscore; my $hasdata = 0; # flag, 0 if there were no submissions on the sequence + my %ptsfreq; foreach my $resource (&get_resources($navmap,$seq)) { my $symb = $resource->symb; my $resource_data = $studentdata->{$symb}; + my $resmax = 0; foreach my $part (@{$resource->parts()}) { $partscore = undef; my $weight; @@ -2069,6 +2075,7 @@ sub student_performance_on_sequence { } # $max += $weight; # see the 'excused' branch below... + $resmax += $weight; $performance_length++; # one character per part $symbol = ' '; # default to space # @@ -2122,13 +2129,24 @@ sub student_performance_on_sequence { if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) { my $link = '/adm/grades' . '?symb='.&escape($resource->shown_symb). - '&student='.$student->{'username'}. - '&userdom='.$student->{'domain'}. - '&command=submission'; + '&student='.$student->{'username'}. + '&userdom='.$student->{'domain'}. + '&command=submission'; $symbol = &link($symbol, $link); } $Str .= $symbol; } + if ($ptsfreq{$resmax}) { + $ptsfreq{$resmax} ++; + } else { + $ptsfreq{$resmax} = 1; + } + } + if ($randompick) { + my @uniquetotals = keys(%ptsfreq); + if ((@uniquetotals = 1) && ($ptsfreq{$uniquetotals[0]} > 0)) { + $max = $max * $randompick/$ptsfreq{$uniquetotals[0]}; + } } if (! $hasdata && $score == 0) { $score = ' ';