[LON-CAPA-cvs] cvs: loncom /interface loncoursedata.pm /interface/statistics lonproblemstatistics.pm

matthew lon-capa-cvs@mail.lon-capa.org
Tue, 01 Mar 2005 00:07:21 -0000


This is a MIME encoded message

--matthew1109635641
Content-Type: text/plain

matthew		Mon Feb 28 19:07:21 2005 EDT

  Modified files:              
    /loncom/interface	loncoursedata.pm 
    /loncom/interface/statistics	lonproblemstatistics.pm 
  Log:
  loncoursedata.pm: changed &get_sum_of_scores to take symb instead of a 
  'resource' hash.
  lonproblemstatistics: navmapification is complete.  Required addition of
  package variables $navmap and @sequences.
  
  
--matthew1109635641
Content-Type: text/plain
Content-Disposition: attachment; filename="matthew-20050228190721.txt"

Index: loncom/interface/loncoursedata.pm
diff -u loncom/interface/loncoursedata.pm:1.142 loncom/interface/loncoursedata.pm:1.143
--- loncom/interface/loncoursedata.pm:1.142	Mon Feb 28 15:00:23 2005
+++ loncom/interface/loncoursedata.pm	Mon Feb 28 19:07:20 2005
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursedata.pm,v 1.142 2005/02/28 20:00:23 matthew Exp $
+# $Id: loncoursedata.pm,v 1.143 2005/03/01 00:07:20 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2218,7 +2218,7 @@
 ########################################################
 ########################################################
 sub get_sum_of_scores {
-    my ($resource,$part,$students,$courseid,$starttime,$endtime) = @_;
+    my ($symb,$part,$students,$courseid,$starttime,$endtime) = @_;
     if (! defined($courseid)) {
         $courseid = $ENV{'request.course.id'};
     }
@@ -2237,7 +2237,7 @@
     my $request = 'SELECT SUM(a.awarded*w.weight),SUM(w.weight) FROM '.
         $performance_table.' AS a '.
         'NATURAL LEFT JOIN '.$weight_table.' AS w ';
-    $request .= 'WHERE a.symb_id='.&get_symb_id($resource->{'symb'}).
+    $request .= 'WHERE a.symb_id='.&get_symb_id($symb).
         ' AND a.part_id='.&get_part_id($part);
     if (defined($time_limits)) {
         $request .= ' AND '.$time_limits;
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.96 loncom/interface/statistics/lonproblemstatistics.pm:1.97
--- loncom/interface/statistics/lonproblemstatistics.pm:1.96	Tue Jan 11 14:45:18 2005
+++ loncom/interface/statistics/lonproblemstatistics.pm	Mon Feb 28 19:07:21 2005
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemstatistics.pm,v 1.96 2005/01/11 19:45:18 matthew Exp $
+# $Id: lonproblemstatistics.pm,v 1.97 2005/03/01 00:07:21 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -625,16 +625,7 @@
     $Str .= &Apache::lonhtmlcommon::StatusOptions(undef,undef,5);
     $Str .= '</td><td align="center">';
     #
-    my $only_seq_with_assessments = sub { 
-        my $s=shift;
-        if ($s->{'num_assess'} < 1) { 
-            return 0;
-        } else { 
-            return 1;
-        }
-    };
-    $Str .= &Apache::lonstatistics::MapSelect('Maps','multiple,all',5,
-                                              $only_seq_with_assessments);
+    $Str .= &Apache::lonstatistics::map_select('Maps','multiple,all',5);
     $Str .= '</td><td>'.&field_selection_input();
     $Str .= '</td></tr>'."\n";
     $Str .= '</table>'."\n";
@@ -666,8 +657,13 @@
 
 ###############################################
 ###############################################
+my $navmap;
+my @sequences;
+
 sub BuildProblemStatisticsPage {
     my ($r,$c)=@_;
+    undef($navmap);
+    undef(@sequences);
     #
     my %Saveable_Parameters = ('Status' => 'scalar',
                                'statsoutputmode' => 'scalar',
@@ -723,8 +719,17 @@
                   &mt('Produce Excel Output').'" />'.'&nbsp;'x5);
         $r->rflush();
         my $count = 0;
-        foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-            $count += $seq->{'num_assess_parts'};
+        ($navmap,@sequences) = 
+            &Apache::lonstatistics::selected_sequences_with_assessments();
+        if (! ref($navmap)) {
+            $r->print('<h1>'.&mt('A course-wide error occured.').'</h1>'.
+                      '<h3>'.$navmap.'</h3>');
+            return;
+        }
+        foreach my $seq (@sequences) {
+            my @resources = 
+                &Apache::lonstathelpers::get_resources($navmap,$seq);
+            $count += scalar(@resources);
         }
         if ($count > 10) {
             $r->print('<h2>'.
@@ -766,9 +771,8 @@
               '<table border="0" cellpadding="3">'."\n".
               '<tr bgcolor="#FFFFE6">');
     $r->print(&sequence_html_header());
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+    foreach my $seq (@sequences) { 
         last if ($c->aborted);
-        next if ($seq->{'num_assess'} < 1);
         &compute_sequence_statistics($seq);
         $r->print(&sequence_html_output($seq));
     }
@@ -791,10 +795,9 @@
     my $c = $r->connection();
     $r->print(&html_preamble());
     #
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+    foreach my $seq (@sequences) {
         last if ($c->aborted);
-        next if ($seq->{'num_assess'} < 1);
-        $r->print("<h3>".$seq->{'title'}."</h3>".
+        $r->print("<h3>".$seq->compTitle."</h3>".
                   '<table border="0"><tr><td bgcolor="#777777">'."\n".
                   '<table border="0" cellpadding="3">'."\n".
                   '<tr bgcolor="#FFFFE6">'.
@@ -931,7 +934,7 @@
 
 sub sequence_html_output {
     my ($seq) = @_;
-    my $data = $SeqStat{$seq->{'symb'}};
+    my $data = $SeqStat{$seq->symb};
     my $row = '<tr>';
     foreach my $field (@SeqFields) {
         next if ($field->{'selected'} ne 'yes');
@@ -1343,9 +1346,8 @@
     ## 
     &write_headers($excel_sheet,$format,\$rows_output,\$cols_output,
                    \@SeqFields);
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        next if ($seq->{'num_assess'} < 1);
-        my $data = $SeqStat{$seq->{'symb'}};
+    foreach my $seq (@sequences) {
+        my $data = $SeqStat{$seq->symb};
         $cols_output=0;
         foreach my $field (@SeqFields) {
             next if ($field->{'selected'} ne 'yes');
@@ -1441,10 +1443,9 @@
 sub compute_statistics_on_sequence {
     my ($seq) = @_;
     my @Data;
-    foreach my $res (@{$seq->{'contents'}}) {
-        next if ($res->{'type'} ne 'assessment');
-        foreach my $part (@{$res->{'parts'}}) {
-            next if ($res->{'partdata'}->{$part}->{'Survey'});
+    foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) {
+        foreach my $part (@{$res->parts}) {
+            next if ($res->is_survey($part));
             #
             # This is where all the work happens
             my $data = &get_statistics($seq,$res,$part,scalar(@StatsArray)+1);
@@ -1462,9 +1463,8 @@
         return;
     }
     my $c = $r->connection;
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
+    foreach my $seq (@sequences) {
         last if ($c->aborted);
-        next if ($seq->{'num_assess'} < 1);
         &compute_sequence_statistics($seq);
         &compute_statistics_on_sequence($seq);
     }
@@ -1551,7 +1551,7 @@
     my ($sequence,$resource,$part,$problem_num) = @_;
     #
     my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
-    my $symb = $resource->{'symb'};
+    my $symb = $resource->symb;
     my $courseid = $ENV{'request.course.id'};
     #
     my $data = &Apache::loncoursedata::get_problem_statistics
@@ -1561,10 +1561,10 @@
     $data->{'symb'}        = $symb;
     $data->{'part'}        = $part;
     $data->{'problem_num'} = $problem_num;
-    $data->{'container'}   = $sequence->{'title'};
-    $data->{'title'}       = $resource->{'title'};
-    $data->{'title.link'}  = $resource->{'src'}.'?symb='.
-        &Apache::lonnet::escape($resource->{'symb'});
+    $data->{'container'}   = $sequence->compTitle;
+    $data->{'title'}       = $resource->compTitle;
+    $data->{'title.link'}  = $resource->src.'?symb='.
+        &Apache::lonnet::escape($resource->symb);
     #
     if ($SelectedFields{'deg_of_disc'}) {
         $data->{'deg_of_disc'} = 
@@ -1578,7 +1578,7 @@
         $sections =~ s/&+/_/g;  # Ensure no special characters
         $data->{'sections'}=$sections;
         $data->{'course'} = $ENV{'request.course.id'};
-        my $urlres=(&Apache::lonnet::decode_symb($resource->{'symb'}))[2];
+        my $urlres=(&Apache::lonnet::decode_symb($resource->symb))[2];
         $data->{'urlres'}=$urlres;
         my %storestats = 
             &LONCAPA::lonmetadata::dynamic_metadata_storage($data);
@@ -1620,11 +1620,12 @@
 ###############################################
 ###############################################
 sub compute_discrimination_factor {
-    my ($resource,$part,$sequence) = @_;
+    my ($resource,$part,$seq) = @_;
+    my $symb = $resource->symb;
     my @Resources;
-    foreach my $res (@{$sequence->{'contents'}}) {
-        next if ($res->{'symb'} eq $resource->{'symb'});
-        push (@Resources,$res->{'symb'});
+    foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)){
+        next if ($res->symb eq $symb);
+        push (@Resources,$res->symb);
     }
     #
     # rank
@@ -1650,10 +1651,10 @@
         return 'nan';
     }
     my ($bottom_sum,$bottom_max) = 
-        &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@BottomSet,
+        &Apache::loncoursedata::get_sum_of_scores($symb,$part,\@BottomSet,
                                                   undef,$starttime,$endtime);
     my ($top_sum,$top_max) = 
-        &Apache::loncoursedata::get_sum_of_scores($resource,$part,\@TopSet,
+        &Apache::loncoursedata::get_sum_of_scores($symb,$part,\@TopSet,
                                                   undef,$starttime,$endtime);
     my $deg_of_disc;
     if ($top_max == 0 || $bottom_max==0) {
@@ -1685,11 +1686,12 @@
 ###############################################
 sub compute_sequence_statistics {
     my ($seq) = @_;
-    my $symb = $seq->{'symb'};
+    my $symb = $seq->symb;
     my @Resources;
-    foreach my $res (@{$seq->{'contents'}}) {
-        next if ($res->{'type'} ne 'assessment');
-        push (@Resources,$res->{'symb'});
+    my $part_count;
+    foreach my $res (&Apache::lonstathelpers::get_resources($navmap,$seq)) {
+        push (@Resources,$res->symb);
+        $part_count += scalar(@{$res->parts});
     }
     my ($starttime,$endtime) = &Apache::lonstathelpers::get_time_limits();
     #
@@ -1699,7 +1701,7 @@
                     (\@Apache::lonstatistics::SelectedSections,
                      $Apache::lonstatistics::enrollment_status,
                      \@Resources,$starttime,$endtime,undef);
-    $SeqStat{$symb}->{'title'}  = $seq->{'title'};
+    $SeqStat{$symb}->{'title'}  = $seq->compTitle;
     $SeqStat{$symb}->{'scoremax'}  = $smax;
     $SeqStat{$symb}->{'scoremin'}  = $smin;
     $SeqStat{$symb}->{'scoremean'} = $sMean;
@@ -1714,7 +1716,7 @@
         (\@Apache::lonstatistics::SelectedSections,
          $Apache::lonstatistics::enrollment_status,
          \@Resources,$starttime,$endtime,undef);
-    my $K = $seq->{'num_assess_parts'};
+    my $K = $part_count;
     my $kr_21;
     if ($K > 1 && $cSTD > 0) {
         $kr_21 =  ($K/($K-1)) * (1 - $cMean*($K-$cMean)/($K*$cSTD**2));

--matthew1109635641--