Diff for /loncom/interface/lonquickgrades.pm between versions 1.43.2.1 and 1.65

version 1.43.2.1, 2008/12/12 18:44:32 version 1.65, 2011/01/30 01:21:29
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # Created Nov. 14, 2002 by Jeremy Bowers  
   
 package Apache::lonquickgrades;  package Apache::lonquickgrades;
   
Line 62  sub real_handler { Line 61  sub real_handler {
     &Apache::loncommon::no_cache($r);      &Apache::loncommon::no_cache($r);
     $r->send_http_header;      $r->send_http_header;
   
     my $showPoints =       my $showPoints =
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';          $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
     my $notshowSPRSlink =       my $notshowSPRSlink =
         $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external';          (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
         || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'));
       my $notshowTotals=
           $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
       my $showCategories=
           $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
   
   
       my $title = "Grading and Statistics";#$showPoints ? "Points Display" : "Completed Problems Display";
       my $brcrum = [{href=>"/adm/quickgrades",text => "Points Display"}];
       $r->print(&Apache::loncommon::start_page($title,undef,
                                               {'bread_crumbs' => $brcrum})
                );
   
     # Create the nav map      &startGradeScreen($r,'quick');
     my $navmap = Apache::lonnavmaps::navmap->new();  
       $r->rflush();
   
   #    my $uname='korte';
   #    my $udom='gerd';
   
       my $uname;
       my $udom;
   
     if (!defined($navmap)) {      my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=
         my $requrl = $r->uri;         &getData($showPoints,$uname,$udom);
         $env{'user.error.msg'} = "$requrl:bre:0:0:Navamp initialization failed.";  
         return HTTP_NOT_ACCEPTABLE;      if ($showCategories) {
          &outputCategories($r,$showPoints,$notshowTotals,
                    $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
       } else {
          &outputTable($r,$showPoints,$notshowTotals,
                    $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
     }      }
       &endGradeScreen($r);
       return OK;
   
     # Keep this hash in sync with %statusIconMap in lonnavmaps; they  }
     # should match color/icon  
     my $res = $navmap->firstResource(); # temp resource to access constants  sub startGradeScreen {
        my ($r,$mode)=@_;
     # Header  
     my $title = $showPoints ? "Points Display" : "Completed Problems Display";      my $showPoints =
     $r->print(&Apache::loncommon::start_page($title));          $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard';
       my $notshowSPRSlink =
     if (!$showPoints && !$notshowSPRSlink ) {          (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external')
         $r->print('<p>'        || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals')
                  .&mt('This screen shows how many problems (or problem parts) you have completed'        || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories'));
                      .', and how many you have not yet done.'      my $notshowTotals=
                      .' You can also look at [_1]a detailed score sheet[_2].'          $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals';
                      ,'<a href="/adm/studentcalc">','</a>')      my $showCategories=
                  .'</p>');          $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories';
   
       my $allowed_to_view =  &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
       my $allowed_to_edit =  &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
   
       if ($allowed_to_view) {
          my @notes;
          push(@notes,&mt('Students do not see total points.')) if ($notshowTotals);
          push(@notes,&mt('Students do not see link to spreadsheet.')) if ($notshowSPRSlink);
          push(@notes,&mt('Students will see points based on problem weights.')) if ($showPoints);
          push(@notes,&mt('Students will see points based on categories.')) if ($showCategories);
          push(@notes, &Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading'));
          $r->print(&Apache::loncommon::head_subbox(join('&nbsp;&nbsp;',@notes)));
     }      }
   
     $r->print('<p class="LC_info">'.&mt('This may take a few moments to display.').'</p>');  
   
     $r->rflush();      $r->print("\n".'<ul class="LC_TabContentBigger" id="main">');
       $r->print("\n".'<li'.($mode eq 'quick'?' class="active"':'').'><a href="/adm/quickgrades"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.
                                             ($showPoints?&mt('Individual Points Overview'):($showCategories?&mt('Grades Overview'):&mt('Completion Overview'))).
                                             '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
   
       if (!($showPoints || $notshowSPRSlink) || ($allowed_to_view)) {
          $r->print("\n".'<li'.($mode eq 'spreadsheet'?' class="active"':'').'><a href="/adm/'.($allowed_to_view?'classcalc':'studentcalc').'"><b>'.
                                                                    &mt('Spreadsheet (Detailed)').'</b></a></li>');
       }
       if ($allowed_to_view) {
          $r->print("\n".'<li'.($mode eq 'statistics'?' class="active"':'').'><a href="/adm/statistics"><b>'.
                                                                    &mt('Statistics and Reports').'</b></a></li>');
   
     # End navmap using boilerplate         $r->print("\n".'<li'.($mode eq 'chart'?' class="active"':'').'><a href="/adm/statistics?reportSelected=student_assessment"><b>'.
                                                                    &mt('Assessment Overview Chart').'</b></a></li>');
   
       }
       if ($allowed_to_edit) {
          $r->print("\n".'<li'.($mode eq 'grading'?' class="active"':'').'><a href="/adm/grades"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.
                                                                    &mt('Problem Grading').'&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
       }
       $r->print("\n".'</ul>'."\n");
       $r->print('<div class="LC_Box" style="clear:both;margin:0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
   }
   
   sub endGradeScreen {
      my ($r)=@_;
      $r->print('</div></div></div>');
   }
   
   
   sub getData {
   
       my ($showPoints,$uname,$udom)=@_;
   
       &Apache::lonnet::logthis("About to call with $uname $udom");
   
       # Create the nav map
       my $navmap = Apache::lonnavmaps::navmap->new($uname,$udom);
   
       my $res = $navmap->firstResource(); # temp resource to access constants
   
     my $iterator = $navmap->getIterator(undef, undef, undef, 1);      my $iterator = $navmap->getIterator(undef, undef, undef, 1);
     my $depth = 1;      my $depth = 1;
Line 212  sub real_handler { Line 286  sub real_handler {
         }          }
         $curRes = $iterator->next();          $curRes = $iterator->next();
     }      }
       return ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted);
   }
   
     $iterator = $navmap->getIterator(undef, undef, undef, 1);  #
     $depth = 1;  # Outputting everything.
     $iterator->next(); # ignore first BEGIN_MAP  #
     $curRes = $iterator->next();  
   sub outputTable {
   
       my ($r,$showPoints,$notshowTotals,
              $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
   
     my @start = (255, 255, 192);      my @start = (255, 255, 192);
     my @end   = (0, 192, 0);      my @end   = (0, 192, 0);
Line 227  sub real_handler { Line 307  sub real_handler {
     $r->print(&Apache::loncommon::start_data_table()      $r->print(&Apache::loncommon::start_data_table()
              .&Apache::loncommon::start_data_table_header_row()               .&Apache::loncommon::start_data_table_header_row()
              .'<th>'.&mt('Folder').'</th>');               .'<th>'.&mt('Folder').'</th>');
     $title = &mt($showPoints ? "Points Scored" : "Done");      my $title = &mt($showPoints ? "Points Scored" : "Done");
     if ($totalAttempted) {      if ($totalAttempted) {
  $title .= " / " . &mt("Attempted");          $title .= " / " . &mt("Attempted");
     }      }
     $r->print("<th>$title / ".&mt('Total').'</td>'      $r->print("<th>$title".($notshowTotals?'':" / ".&mt('Total')).'</th>'
              .&Apache::loncommon::end_data_table_header_row());               .&Apache::loncommon::end_data_table_header_row());
   #
   # Output of folder scores
   #
   
       my $iterator = $navmap->getIterator(undef, undef, undef, 1);
       my $depth = 1;
       $iterator->next(); # ignore first BEGIN_MAP
       my $curRes = $iterator->next();
   
     while ($depth > 0) {      while ($depth > 0) {
         if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}          if ($curRes == $iterator->BEGIN_MAP()) {$depth++;}
         if ($curRes == $iterator->END_MAP()) { $depth--; }          if ($curRes == $iterator->END_MAP()) { $depth--; }
Line 247  sub real_handler { Line 336  sub real_handler {
             if ($total > 0) {              if ($total > 0) {
                 my $ratio;                  my $ratio;
                 $ratio = $correct / $total;                  $ratio = $correct / $total;
                 my $color = mixColors(\@start, \@end, $ratio);                  my $color = &mixColors(\@start, \@end, $ratio);
                 $r->print(&Apache::loncommon::start_data_table_row()                  $r->print(&Apache::loncommon::start_data_table_row()
                          .'<td style="background-color:'.$color.';">');                           .'<td style="background-color:'.$color.';">');
                                   
Line 255  sub real_handler { Line 344  sub real_handler {
                 for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }                  for (my $i = 1; $i < $depth; $i++) { $thisIndent .= $indentString; }
                                   
                 $r->print("$thisIndent$title</td>");                  $r->print("$thisIndent$title</td>");
                 if ($totalAttempted) {   if ($totalAttempted) {
                     $r->print('<td valign="top">'      $r->print('<td valign="top">'
                              .$thisIndent                               .$thisIndent
                              .'<span class="LC_nobreak">'                               .'<span class="LC_nobreak">'
                              .$correct.' / '.$attempted.' / '.$total                               .$correct.' / '.$attempted.($notshowTotals?'':' / '.$total)
                              .'</span></td>'                               .'</span></td>'
                              .&Apache::loncommon::end_data_table_row()                               .&Apache::loncommon::end_data_table_row()
                     );                      );
                 } else {   } else {
                     $r->print('<td valign="top">'      $r->print('<td valign="top">'
                              .$thisIndent                               .$thisIndent
                              .'<span class="LC_nobreak">'                               .'<span class="LC_nobreak">'
                              .$correct.' / '.$total                               .$correct.($notshowTotals?'':' / '.$total)
                              .'</span></td>'                               .'</span></td>'
                              .&Apache::loncommon::end_data_table_row());                               .&Apache::loncommon::end_data_table_row());
                 }   }
             }              }
         }          }
   
Line 288  sub real_handler { Line 377  sub real_handler {
                  .&Apache::loncommon::end_data_table_row());                   .&Apache::loncommon::end_data_table_row());
     }      }
   
   #
   # show totals (if applicable), close table
   #
     if ($showPoints) {      if ($showPoints) {
  my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");          my $maxHelpLink = Apache::loncommon::help_open_topic("Quick_Grades_Possibly_Correct");
   
  $title = $showPoints ? "Points" : "Parts Done";          $title = $showPoints ? "Points" : "Parts Done";
  my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");          my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done");
  $r->print(&Apache::loncommon::start_data_table_row()          $r->print(&Apache::loncommon::start_data_table_row()
                  .'<td colspan="2" align="right">'.$totaltitle.': <b>'.$totalRight.'</b><br>');                   .'<td colspan="2" align="right">'.$totaltitle.': <b>'.$totalRight.'</b><br />');
  $r->print(&mt("Max Possible To Date")." $maxHelpLink: <b>$totalPossible</b><br>");          $r->print(&mt('Max Possible To Date')." $maxHelpLink: <b>$totalPossible</b><br />");
  $title = $showPoints ? "Points" : "Parts";          $title = $showPoints ? "Points" : "Parts";
  $r->print(&mt("Total $title In Course").': <b>'.$totalParts.'</b></td>'          $r->print(&mt("Total $title In Course").': <b>'.$totalParts.'</b></td>'
                  .&Apache::loncommon::end_data_table_row());                   .&Apache::loncommon::end_data_table_row());
     }      }
   
     $r->print(&Apache::loncommon::end_data_table()      $r->print(&Apache::loncommon::end_data_table()
              .&Apache::loncommon::end_page());               .&Apache::loncommon::end_page());
   
     return OK;  
 }  }
   
   #
   # === Outputting category-based grades.
   #
   # $category{'order'}: output order of categories by id
   # $category{'all'}: complete list of all categories 
   # $category{$id.'_name'}: display-name of category
   #
   
   sub outputCategories {
   
       my ($r,$showPoints,$notshowTotals,
              $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)=@_;
   # Take care of storing and retrieving categories
   
       my $cangrade=&Apache::lonnet::allowed('mgr');
   
       my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
       my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
       my %categories=();
   # Loading old categories
       %categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum);
   # Storing
       if (($cangrade) && (($env{'form.storechanges'}) || ($env{'form.storemove'} ne ''))) {
   # Process the changes
           %categories=&process_category_edits($r,$cangrade,%categories);
   # Actually store
           &Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum);
       }
   # new categories loaded now
   # Form only generated if user can change the grading categories
       if ($cangrade) {
           $r->print('<form method="post">');
       }
   #
       &output_category_table($r,$cangrade,$navmap,%categories);
   #
       if ($cangrade) {
           $r->print('<input type="hidden" name="storemove" value="" />'.
                     '<input type="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" /></form>');
       }
   }
   
   #
   # Process editing commands, update category hash
   #
   
   sub process_category_edits {
       my ($r,$cangrade,%categories)=@_;
       unless ($cangrade) { return %categories; }
   #
   # Business logic here
   #
       return %categories;
   }
   
   #
   # Output the table
   #
   
   sub output_category_table {
       my ($r,$cangrade,$navmaps,%categories)=@_;
       my $sum=0;
       $r->print(&Apache::loncommon::start_data_table());
   #
       &output_category_table_header($r,$cangrade);
   #
       my @order=split(/\,/,$categories{'order'});
   #
   # FIXME: Debug only
       @order=('3131_4123_42124','4124_34231_3412');
   #
       my $maxpos=$#order;
       for (my $i=0;$i<=$maxpos;$i++) {
           my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,%categories);
       }
   #
       &bottom_line_category($r,$cangrade);
   #
       $r->print(&Apache::loncommon::end_data_table());
       return $sum;
   }
   
   sub output_category_table_header {
       my ($r,$cangrade)=@_;
       $r->print(&Apache::loncommon::start_data_table_header_row());
       if ($cangrade) {
           $r->print('<th colspan="2">'.&mt("Move").'</th><th>'.&mt('Action').'</th>');
       }
       $r->print('<th>'.&mt('Category').'</th>'.
                 '<th>'.&mt('Contents').'</th>'.
                 '<th>'.&mt('Calculation').'</th>'.
                 '<th>'.&mt('Weight').'</th>'.
                 '<th>'.&mt('Percent Overall').'</th>');
       $r->print(&Apache::loncommon::end_data_table_header_row());
   }
   
   
   #
   # Output one category to table
   #
   
   sub output_and_calc_category {
       my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,%categories)=@_;
       my $value=0;
       my $weight=0;
       my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
       my %lt=&Apache::lonlocal::texthash(
              'up' => 'Move Up',
              'dw' => 'Move Down');
       $r->print("\n".&Apache::loncommon::start_data_table_row());
   
       if ($cangrade) {
           $r->print(<<ENDMOVE);
   <td>
   <div class="LC_docs_entry_move">
     <a href='/adm/quickgrades?cmd=up_$id&storechanges=1'>
       <img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" />
     </a>
   </div>
   <div class="LC_docs_entry_move">
     <a href='/adm/quickgrades?cmd=down_$id&storechanges=1'>
       <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" />
     </a>
   </div>
   </td>
   ENDMOVE
           $r->print("\n<td>\n<select name='newpos_$id' onchange='this.form.storemove.value=\"$id\";this.form.submit()'>");
           for (my $i=0;$i<=$maxpos;$i++) {
               if ($i==$currentpos) {
                   $r->print('<option value="" selected="selected">('.$i.')</option>');
               } else {
                   $r->print('<option value="'.$i.'">'.$i.'</option>');
               }
           }
           $r->print("\n</select>\n</td>\n");
   
       }
       $r->print(&Apache::loncommon::end_data_table_row()."\n");
       return ($value,$weight);
   }
   
   #
   # Bottom line with grades
   #
   
   sub bottom_line_category {
       my ($r,$cangrade)=@_;
   }
   
   #
   # Make one new category
   #
   
   sub make_new_category {
       my ($r,$cangrade,$ordernum,%categories)=@_;
       unless ($cangrade) { return %categories; }
   # Generate new ID
       my $id=time.'_'.$$.'_'.rand(10000);
   # Add new ID to list of all IDs ever created in this course
       $categories{'all'}.=','.$id;
       $categories{'all'}=~s/^\,//;
   # Add new ID to ordered list of displayed and evaluated categories
       $categories{'order'}.=','.$id;
       $categories{'order'}=~s/^\,//;
   # Move it into desired space
       if (defined($ordernum)) {
           %categories=&move_category($id,$cangrade,$ordernum,%categories);
       }
       return %categories;
   }
   
   #
   # Move a category to a desired position n the display order
   #
   
   sub move_category {
       my ($id,$cangrade,$ordernum,%categories)=@_;
       unless ($cangrade) { return %categories; }
       my @order=split(/\,/,$categories{'order'});
   # Where is the index currently?
       my $currentpos=&current_pos_category($id,%categories);
       if (defined($currentpos)) {
           if ($currentpos<$ordernum) {
   # This is moving to a higher index
   # ....X1234....
   # ....1234X....
               for (my $i=$currentpos;$i<$ordernum;$i++) {
                   $order[$i]=$order[$i+1];
               }
               $order[$ordernum]=$id;
           }
           if ($currentpos>$ordernum) {
   # This is moving to a lower index
   # ....1234X....
   # ....X1234....
               for (my $i=$currentpos;$i>$ordernum;$i--) {
                   $order[$i]=$order[$i-1];
               }
               $order[$ordernum]=$id;
           }
       }
       $categories{'order'}=join(',',@order);
       return %categories;
   }
   
   #
   #  Find current postion of a category in the order
   #
   
   sub current_pos_category {
       my ($id,%categories)=@_;
       my @order=split(/\,/,$categories{'order'});
       for (my $i=0;$i<=$#order;$i++) {
           if ($order[$i] eq $id) { return $i; }
       }
   # not found
       return undef;
   }
   
   #
   # Set name of a category
   #
   sub set_category_name {
       my ($canedit,$id,$name,%categories)=@_;
       unless ($canedit) { return %categories; }
       $categories{$id.'_name'}=$name;
       return %categories;
   }
   
   #
   # === end category-related
   #
   #
 # Pass this two refs to arrays for the start and end color, and a number  # Pass this two refs to arrays for the start and end color, and a number
 # from 0 to 1 for how much of the latter you want to mix in. It will  # from 0 to 1 for how much of the latter you want to mix in. It will
 # return a string ready to show ("#FFC309");  # return a string ready to show ("#FFC309");
   
 sub mixColors {  sub mixColors {
     my $start = shift;      my $start = shift;
     my $end = shift;      my $end = shift;

Removed from v.1.43.2.1  
changed lines
  Added in v.1.65


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>