--- loncom/interface/statistics/lonproblemanalysis.pm	2004/01/19 18:55:10	1.58
+++ loncom/interface/statistics/lonproblemanalysis.pm	2004/02/02 19:32:11	1.64
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.58 2004/01/19 18:55:10 matthew Exp $
+# $Id: lonproblemanalysis.pm,v 1.64 2004/02/02 19:32:11 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
 use Apache::lonstatistics;
 use Apache::lonlocal;
+use Apache::lonstathelpers;
 use HTML::Entities();
 use Time::Local();
 use Spreadsheet::WriteExcel();
@@ -58,22 +59,6 @@ my @SubmitButtons = ({ name => 'PrevProb
                      { name => 'ExcelOutput',
                        text => 'Produce Excel Output' });
 
-sub render_resource {
-    my ($resource) = @_;
-    ##
-    ## Render the problem
-    my $base;
-    ($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|);
-    $base = "http://".$ENV{'SERVER_NAME'}.$base;
-    my $rendered_problem = 
-        &Apache::lonnet::ssi_body($resource->{'src'});
-    $rendered_problem =~ s/<\s*form\s*/<nop /g;
-    $rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g;
-    return '<table bgcolor="ffffff"><tr><td>'.
-        '<base href="'.$base.'" />'.
-        $rendered_problem.
-        '</td></tr></table>';
-}
 
 sub BuildProblemAnalysisPage {
     my ($r,$c)=@_;
@@ -91,7 +76,7 @@ sub BuildProblemAnalysisPage {
     #
     &Apache::lonstatistics::PrepareClasslist();
     #
-    $r->print('<h2>'.&mt('Option Response Problem Analysis').'</h2>');
+    $r->print('<h2>'.&mt('Detailed Problem Analysis').'</h2>');
     $r->print(&CreateInterface());
     #
     my @Students = @Apache::lonstatistics::Students;
@@ -130,9 +115,14 @@ sub BuildProblemAnalysisPage {
         $r->rflush();
         #
         # Determine which problem we are to analyze
-        my $current_problem = &get_target_from_id($ENV{'form.problemchoice'});
+        my $current_problem = &Apache::lonstathelpers::get_target_from_id
+            ($ENV{'form.problemchoice'});
         #
-        my ($prev,$curr,$next) = &get_prev_curr_next($current_problem);
+        my ($prev,$curr,$next) = 
+            &Apache::lonstathelpers::get_prev_curr_next($current_problem,
+                                                     '(option|radiobutton)',
+                                                     'response',
+                                                        );
         if (exists($ENV{'form.PrevProblemAnalysis'}) && defined($prev)) {
             $current_problem = $prev;
         } elsif (exists($ENV{'form.NextProblemAnalysis'}) && defined($next)) {
@@ -142,7 +132,8 @@ sub BuildProblemAnalysisPage {
         }
         #
         # Store the current problem choice and send it out in the form
-        $ENV{'form.problemchoice'} = &make_target_id($current_problem);
+        $ENV{'form.problemchoice'} = 
+            &Apache::lonstathelpers::make_target_id($current_problem);
         $r->print('<input type="hidden" name="problemchoice" value="'.
                   $ENV{'form.problemchoice'}.'" />');
         #
@@ -152,7 +143,7 @@ sub BuildProblemAnalysisPage {
             my $resource = $current_problem->{'resource'};
             $r->print('<h1>'.$resource->{'title'}.'</h1>');
             $r->print('<h3>'.$resource->{'src'}.'</h3>');
-            $r->print(&render_resource($resource));
+            $r->print(&Apache::lonstathelpers::render_resource($resource));
             $r->rflush();
             my %Data = &get_problem_data($resource->{'src'});
             my $ProblemData = $Data{$current_problem->{'part'}.
@@ -176,7 +167,8 @@ sub BuildProblemAnalysisPage {
                   &mt('Analyze Problem').'" />');
         $r->print('&nbsp;'x5);
         $r->print('<h3>'.&mt('Please select a problem to analyze').'</h3>');
-        $r->print(&ProblemSelector());
+        $r->print(&Apache::lonstathelpers::ProblemSelector
+                  ('(option|radiobutton)'));
     }
 }
 
@@ -309,6 +301,7 @@ sub RR_Tries_Foil_Analysis {
                                                   'Percent Choosing',
                                                   100,
                                                   ['#33ff00','#ff3300'],
+                                                  undef,
                                                   \@PlotData_Correct,
                                                   \@PlotData_Incorrect);
     }
@@ -501,7 +494,7 @@ sub OR_Tries_Foil_Analysis {
         }
         my $correctgraph = &Apache::loncommon::DrawBarGraph
             ($title,'Foil Number','Percent Correct',
-             100,$plotcolors,$Datasets[0]);
+             100,$plotcolors,undef,$Datasets[0]);
         $analysis_html.= '<tr><td>'.$correctgraph.'</td>';
         ##
         ##
@@ -520,7 +513,7 @@ sub OR_Tries_Foil_Analysis {
         $title = 'Attempt '.$i.', '.$count;
         my $incorrectgraph = &Apache::loncommon::DrawBarGraph
             ($title,'Foil Number','% Option Chosen Incorrectly',
-             100,$plotcolors,@Datasets);
+             100,$plotcolors,undef,@Datasets);
         $analysis_html.= '<td>'.$incorrectgraph.'</td>';
         $analysis_html.= '<td>'.$foilkey."<td></tr>\n";
     }
@@ -587,7 +580,7 @@ sub OR_Tries_Concept_Analysis {
         $title = 'Attempt '.$i.', '.$count;
         my $graphlink = &Apache::loncommon::DrawBarGraph
             ($title,'Concept Number','Percent Correct',
-             100,$plotcolors,$PlotData[$i]->{'_correct'});
+             100,$plotcolors,undef,$PlotData[$i]->{'_correct'});
         $analysis_html.= '<tr><td>'.$graphlink."</td></tr>\n";
     }
     $analysis_html .= "</table>\n";
@@ -752,6 +745,7 @@ sub OR_Foil_Time_Analysis {
                                                        'Percent Correct',
                                                        100,
                                                        $plotcolors,
+                                                       undef,
                                                        $Plotdata[0]);
     for (my $j=0; $j< scalar(@{$Plotdata[0]});$j++) {
         $Plotdata[0]->[$j]=0;
@@ -769,6 +763,7 @@ sub OR_Foil_Time_Analysis {
                                                  'Incorrect Option Choice',
                                                  100,
                                                  $plotcolors,
+                                                 undef,
                                                  @Plotdata);        
     $analysis_html.='<tr>'.
         '<td>'.$correctplot.'</td>'.
@@ -833,6 +828,7 @@ sub OR_Concept_Time_Analysis {
                                                     'Percent Correct',
                                                     100,
                                                     $plotcolors,
+                                                    undef,
                                                     \@Plotdata);
     $analysis_html.='<tr>'.
         '<td>'.$correctplot.'</td>'.
@@ -898,16 +894,16 @@ sub OR_excel_sheet {
     }
     #
     my $result;
-    $result = &build_problem_data_worksheet($problem_data_sheet,$format,
+    $result = &OR_build_problem_data_worksheet($problem_data_sheet,$format,
                                             $Concepts,$ORdata);
     if ($result ne 'okay') {
         # Do something useful
     }
-    $result = &build_student_data_worksheet($student_data_sheet,$format);
+    $result = &OR_build_student_data_worksheet($student_data_sheet,$format);
     if ($result ne 'okay') {
         # Do something useful
     }
-    $result = &build_response_data_worksheet($response_data_sheet,$format,
+    $result = &OR_build_response_data_worksheet($response_data_sheet,$format,
                                              $PerformanceData,$Foils,
                                              $ORdata);
     if ($result ne 'okay') {
@@ -1321,18 +1317,18 @@ sub build_foil_index {
         if (@Concepts > 1) {
             $table .= '<tr>'.
                 '<td>'.$conceptindex.'</td>'.
-                '<td>'.$concept->{'name'}.'</td>'.
+                '<td>'.&HTML::Entities::encode($concept->{'name'}).'</td>'.
                 '<td>'.$foilindex++.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'text'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'</td>'.
                 "</tr>\n";
         } else {
             $table .= '<tr>'.
                 '<td>'.$foilindex++.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'name'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'text'}.'</td>'.
-                '<td>'.$Foildata{$firstfoil}->{'value'}.'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'name'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'text'}).'</td>'.
+                '<td>'.&HTML::Entities::encode($Foildata{$firstfoil}->{'value'}).'</td>'.
                 "</tr>\n";
         }
         foreach my $foilid (@FoilsInConcept) {
@@ -1341,16 +1337,16 @@ sub build_foil_index {
                     '<td></td>'.
                     '<td></td>'.
                     '<td>'.$foilindex.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'text'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'</td>'.
                     "</tr>\n";
             } else {
                 $table .= '<tr>'.
                     '<td>'.$foilindex.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'name'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'text'}.'</td>'.
-                    '<td>'.$Foildata{$foilid}->{'value'}.'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'name'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'text'}).'</td>'.
+                    '<td>'.&HTML::Entities::encode($Foildata{$foilid}->{'value'}).'</td>'.
                     "</tr>\n";
             }                
         } continue {
@@ -1375,7 +1371,7 @@ sub build_option_index {
               '<tr>'.
               '<td bgcolor="'.$plotcolors->[$optionindex++].'">'.
               ('&nbsp;'x4).'</td>'.
-              '<td>'.$option.'</td>'.
+              '<td>'.&HTML::Entities::encode($option).'</td>'.
               "</tr>\n");
     }
     shift(@Rows); # Throw away 'correct option chosen' color
@@ -1492,180 +1488,6 @@ sub CreateInterface {
     return $Str;
 }
 
-sub ProblemSelector {
-    my $Str;
-    $Str = "\n<table>\n";
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        next if ($seq->{'num_assess'}<1);
-        my $seq_str = '';
-        foreach my $res (@{$seq->{'contents'}}) {
-            next if ($res->{'type'} ne 'assessment');
-            foreach my $part (@{$res->{'parts'}}) {
-                my $partdata = $res->{'partdata'}->{$part};
-#                &Apache::lonnet::logthis('----------------');
-#                while (my ($k,$v)=each(%$partdata)) {
-#                    if (ref($v) eq 'ARRAY') {
-#                        &Apache::lonnet::logthis($k.' = '.join(',',@$v));
-#                    } else {
-#                        &Apache::lonnet::logthis($k.' = '.$v);
-#                    }
-#                }
-                if ((! exists($partdata->{'option'}) || 
-                     $partdata->{'option'} == 0      ) &&
-                    (! exists($partdata->{'radiobutton'}) ||
-                     $partdata->{'radiobutton'} == 0)) {
-                    next;
-                }
-                for (my $i=0;$i<scalar(@{$partdata->{'ResponseTypes'}});$i++){
-                    my $respid = $partdata->{'ResponseIds'}->[$i];
-                    my $resptype = $partdata->{'ResponseTypes'}->[$i];
-#                    if ($resptype eq 'option' ){
-                    if ($resptype eq 'option' || $resptype eq 'radiobutton') {
-                        my $value = &make_target_id({symb=>$res->{'symb'},
-                                                     part=>$part,
-                                                     respid=>$respid,
-                                                     resptype=>$resptype});
-                        my $checked = '';
-                        if ($ENV{'form.problemchoice'} eq $value) {
-                            $checked = 'checked ';
-                        }
-                        my $title = $res->{'title'};
-                        if (! defined($title) || $title eq '') {
-                            ($title) = ($res->{'src'} =~ m:/([^/]*)$:);
-                        }
-                        $seq_str .= '<tr><td>'.
-  '<input type="radio" name="problemchoice" value="'.$value.'" '.$checked.'/>'.
-  '</td><td>'.          
-  $resptype.'</td><td>'.
-  '<a href="'.$res->{'src'}.'">'.$title.'</a> ';
-#  '<a href="'.$res->{'src'}.'">'.$resptype.' '.$res->{'title'}.'</a> ';
-                        if ($partdata->{'option'} > 1) {
-                            $seq_str .= &mt('response').' '.$respid;
-                        }
-                        $seq_str .= "</td></tr>\n";
-                    }
-                }
-            }
-        }
-        if ($seq_str ne '') {
-            $Str .= '<tr><td>&nbsp</td><td colspan="2"><b>'.$seq->{'title'}.'</b></td>'.
-                "</tr>\n".$seq_str;
-        }
-    }
-    $Str .= "</table>\n";
-    return $Str;
-}
-
-#########################################################
-#########################################################
-##
-##              Misc functions
-##
-#########################################################
-#########################################################
-sub get_problem_symb {
-    my $problemstring = shift();
-    my ($symb,$partid,$respid,$resptype) = split(':',$problemstring);
-    return ({ symb   => $symb,
-              part   => $partid,
-              respid => $respid,
-              type   => $resptype } );
-}
-
-sub get_resource_from_symb {
-    my ($symb) = @_;
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        foreach my $res (@{$seq->{'contents'}}) {
-            if ($res->{'symb'} eq $symb) {
-                return $res;
-            }
-        }
-    }
-    return undef;
-}
-
-sub get_prev_curr_next {
-    my ($target) = @_;
-    #
-    # Build an array with the data we need to search through
-    my @Resource;
-    foreach my $seq (&Apache::lonstatistics::Sequences_with_Assess()) {
-        foreach my $res (@{$seq->{'contents'}}) {
-            next if ($res->{'type'} ne 'assessment');
-            foreach my $part (@{$res->{'parts'}}) {
-                my $partdata = $res->{'partdata'}->{$part};
-                for (my $i=0;$i<scalar(@{$partdata->{'ResponseTypes'}});$i++){
-                    my $respid = $partdata->{'ResponseIds'}->[$i];
-                    my $resptype = $partdata->{'ResponseTypes'}->[$i];
-                    next if ($resptype ne 'option' && 
-                             $resptype ne 'radiobutton');
-                    push (@Resource,
-                            { symb     => $res->{symb},
-                              part     => $part,
-                              respid   => $partdata->{'ResponseIds'}->[$i],
-                              resource => $res,
-                              resptype => $resptype
-                            } );
-                }
-            }
-        }
-    }
-    #
-    #
-    # Get the index of the current situation
-    my $curr_idx;
-    for ($curr_idx=0;$curr_idx<$#Resource;$curr_idx++) {
-        my $curr_item = $Resource[$curr_idx];
-        last if ($curr_item->{'symb'} eq $target->{'symb'} &&
-                 $curr_item->{'part'} eq $target->{'part'} &&
-                 $curr_item->{'respid'} eq $target->{'respid'} &&
-                 $curr_item->{'resptype'} eq $target->{'resptype'});
-    }
-    my $curr_item = $Resource[$curr_idx];
-    if ($curr_item->{'symb'}     ne $target->{'symb'} ||
-        $curr_item->{'part'}     ne $target->{'part'} ||
-        $curr_item->{'respid'}   ne $target->{'respid'} ||
-        $curr_item->{'resptype'} ne $target->{'resptype'}){
-        # bogus symb - return nothing
-        return (undef,undef,undef);
-    }
-    #
-    # Now just pick up the data we need
-    my ($prev,$curr,$next);
-    if ($curr_idx == 0) {
-        $prev = undef;
-        $curr = $Resource[$curr_idx  ];
-        $next = $Resource[$curr_idx+1];
-    } elsif ($curr_idx == $#Resource) {
-        $prev = $Resource[$curr_idx-1];
-        $curr = $Resource[$curr_idx  ];
-        $next = undef;
-    } else {
-        $prev = $Resource[$curr_idx-1];
-        $curr = $Resource[$curr_idx  ];
-        $next = $Resource[$curr_idx+1];
-    }
-    return ($prev,$curr,$next);
-}
-
-sub make_target_id {
-    my ($target) = @_;
-    my $id = &Apache::lonnet::escape($target->{'symb'}).':'.
-             &Apache::lonnet::escape($target->{'part'}).':'.
-             &Apache::lonnet::escape($target->{'respid'}).':'.
-             &Apache::lonnet::escape($target->{'resptype'});
-    return $id;
-}
-
-sub get_target_from_id {
-    my ($id) = @_;
-    my ($symb,$part,$respid,$resptype) = split(':',$id);
-    return ({ symb    =>&Apache::lonnet::unescape($symb),
-             part     =>&Apache::lonnet::unescape($part),
-             respid   =>&Apache::lonnet::unescape($respid),
-             resptype =>&Apache::lonnet::unescape($resptype)});
-}
-
 #########################################################
 #########################################################
 ##