--- loncom/interface/lonquickgrades.pm 2011/03/09 00:35:57 1.72 +++ loncom/interface/lonquickgrades.pm 2011/05/22 21:53:52 1.88 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Quick Student Grades Display # -# $Id: lonquickgrades.pm,v 1.72 2011/03/09 00:35:57 www Exp $ +# $Id: lonquickgrades.pm,v 1.88 2011/05/22 21:53:52 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -62,7 +62,8 @@ sub real_handler { $r->send_http_header; my $showPoints = - $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard'; + (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard') + || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories')); my $notshowSPRSlink = (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external') || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals')); @@ -80,13 +81,38 @@ sub real_handler { &startGradeScreen($r,'quick'); - $r->rflush(); - -# my $uname='korte'; -# my $udom='gerd'; - + my $cangrade=&Apache::lonnet::allowed('mgr'); +# +# Pick student +# my $uname; my $udom; + my $stdid; + if ($cangrade) { + if ($env{'form.uname'}) { $uname=$env{'form.uname'}; } + if ($env{'form.udom'}) { $udom=$env{'form.udom'}; } + if ($env{'form.id'}) { $stdid=$env{'form.id'}; } + if (($stdid) && ($udom)) { + $uname=(&Apache::lonnet::idget($udom,$stdid))[1]; + } + if (($stdid) && (!$uname)) { + $r->print('<p><span class="LC_warning">'.&mt("Unknown Student/Employee ID: [_1]",$stdid).'</span></p>'); + $stdid=''; + } + $r->print('<form method="post" name="quickform" action="/adm/quickgrades">'); + my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '. + &Apache::loncommon::selectstudent_link('quickform','uname','udom'); + $r->print("<p>\n".&Apache::loncommon::studentbrowser_javascript()."\n"); + $r->print(&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]' + ,'<input type="text" value="'.$uname.'" size="12" name="uname" />' + ,'<input type="text" value="'.$stdid.'" size="12" name="id" /> ' + ,$chooseopt).'<br />'. + '<input type="submit" name="display" value="'.&mt('Update Display').'" /></p>'); + if (($uname) && ($udom)) { + $r->print('<p>'.&mt('Full Name: [_1]',&Apache::loncommon::plainname($uname,$udom)).'</p>'); + } + } + $r->rflush(); my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)= &getData($showPoints,$uname,$udom); @@ -98,6 +124,7 @@ sub real_handler { &outputTable($r,$showPoints,$notshowTotals, $navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted); } + if ($cangrade) { $r->print("\n</form>\n"); } &endGradeScreen($r); return OK; @@ -240,8 +267,12 @@ sub getData { $totalRight += $score; $partsCount += $curRes->weight($part); + $curRes->{DATA}->{PROB_SCORE} += $score; + $curRes->{DATA}->{PROB_WEIGHT} += $curRes->weight($part); + if ($curRes->opendate($part) < $now) { $totalPossible += $curRes->weight($part); + $curRes->{DATA}->{PROB_POSSIBLE} += $curRes->weight($part); } $totalParts += $curRes->weight($part); } else { @@ -430,20 +461,53 @@ sub outputCategories { &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" name="quickform" action="/adm/quickgrades">'); - } -# &output_category_table($r,$cangrade,$navmap,%categories); # if ($cangrade) { - $r->print('<input type="hidden" name="storemove" value="" />'. + $r->print(&Apache::loncommon::resourcebrowser_javascript(). + '<input type="hidden" name="storemove" value="" />'. '<input type="hidden" name="cmd" value="" />'. + '<input type="hidden" name="resourcesymb" value="" />'. '<input type="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" />'. - '<script>function storecmd (cmd) { document.quickform.cmd.value=cmd; document.quickform.submit(); }</script>'. - '</form>'); + '<script>function storecmd (cmd) { document.quickform.cmd.value=cmd; document.quickform.submit(); }</script>'); } +# +# Debug +# +# my %data=&dumpdata($navmap); +# foreach (keys(%data)) { +# $r->print("\n<br />".$_.'='.$data{$_}); +# } +} + +# +# Get data for all symbs +# + +sub dumpdata { + my ($navmap)=@_; + my %returndata=(); + +# Run through the map and get all data + + my $iterator = $navmap->getIterator(undef, undef, undef, 1); + my $depth = 1; + $iterator->next(); # ignore first BEGIN_MAP + my $curRes = $iterator->next(); + + while ($depth > 0) { + if ($curRes == $iterator->BEGIN_MAP()) {$depth++;} + if ($curRes == $iterator->END_MAP()) { $depth--; } + if (ref($curRes)) { + if ($curRes->is_map()) { + $returndata{$curRes->symb()}='folder:'.$curRes->{DATA}->{CHILD_PARTS}.':'.$curRes->{DATA}->{CHILD_ATTEMPTED}.':'.$curRes->{DATA}->{CHILD_CORRECT}; + } else { + $returndata{$curRes->symb()}='res:'.$curRes->{DATA}->{PROB_WEIGHT}.':'.$curRes->{DATA}->{PROB_POSSIBLE}.':'.$curRes->{DATA}->{PROB_SCORE}; + } + } + $curRes = $iterator->next(); + } + return %returndata; } # @@ -455,10 +519,13 @@ sub process_category_edits { unless ($cangrade) { return %categories; } # First store everything foreach my $id (split(/\,/,$categories{'order'})) { +# Set names, types, and weight (there is only one of each per category) %categories=&set_category_name($cangrade,$id,$env{'form.name_'.$id},%categories); %categories=&set_category_total($cangrade,$id,$env{'form.totaltype_'.$id},$env{'form.total_'.$id},%categories); %categories=&set_category_weight($cangrade,$id,$env{'form.weight_'.$id},%categories); -# More changes here + %categories=&set_category_displayachieved($cangrade,$id,$env{'form.displayachieved_'.$id},%categories); +# Set values for category rules (before names may change) + %categories=&set_category_rules($cangrade,$id,%categories); } # Now deal with commands @@ -471,6 +538,19 @@ sub process_category_edits { %categories=&move_down_category($1,$cangrade,%categories); } elsif ($cmd=~/^delcat\_(.+)$/) { %categories=&del_category($1,$cangrade,%categories); + } elsif ($cmd=~/^addcont\_(.+)$/) { + %categories=&add_category_content($1,$cangrade,$env{'form.resourcesymb'},%categories); + } elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) { + %categories=&del_category_content($1,$cangrade,$2,%categories); + } elsif ($cmd=~/^newrule\_(.+)$/) { + %categories=&add_calculation_rule($1,$cangrade,':',%categories); + } elsif ($cmd=~/^delrule\_(.+)\_\_\_\_\_\_(.*)$/) { + %categories=&del_calculation_rule($1,$cangrade,$2,%categories); + } +# Move to a new position + my $moveid=$env{'form.storemove'}; + if ($moveid) { + %categories=&move_category($moveid,$cangrade,$env{'form.newpos_'.$moveid},%categories); } return %categories; } @@ -489,9 +569,10 @@ sub output_category_table { # my @order=split(/\,/,$categories{'order'}); # + my %performance=&dumpdata($navmaps); 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); + my ($value,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,%categories); $sum+=$value*$weight; $total+=$weight; } @@ -510,9 +591,10 @@ sub output_category_table_header { } $r->print('<th>'.&mt('Category').'</th>'. '<th>'.&mt('Contents').'</th>'. - '<th>'.&mt('Calculation').'</th>'. '<th>'.&mt('Total Points').'</th>'. - '<th>'.&mt('Relative Weight').'</th>'); + '<th>'.&mt('Calculation').'</th>'. + '<th>'.&mt('Relative Weight').'</th>'. + '<th>'.&mt('Achieved').'</th>'); $r->print(&Apache::loncommon::end_data_table_header_row()); } @@ -522,7 +604,7 @@ sub output_category_table_header { # sub output_and_calc_category { - my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,%categories)=@_; + my ($r,$cangrade,$navmaps,$id,$currentpos,$maxpos,$performance,%categories)=@_; my $value=0; my $weight=0; my $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/"); @@ -562,19 +644,21 @@ ENDMOVE $r->print('<td>'.$categories{$id.'_name'}.'</td>'); } # Content -# FIXME: just placeholders - if ($cangrade) { - $r->print("<td>Content Edit</td>"); - } else { - $r->print("<td>Content</td>"); + $r->print('<td><ul>'); + foreach my $contentid (split(/\,/,$categories{$id.'_content'})) { + $r->print('<li>'); + $r->print(&Apache::lonnet::gettitle($contentid).' '.$$performance{$contentid}); + if ($cangrade) { + $r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>'); + } + $r->print('</li>'); } -# Calculation -# FIXME: just placeholders + $r->print('</ul>'); if ($cangrade) { - $r->print("<td>Calculation Edit</td>"); - } else { - $r->print("<td>Calculation</td>"); + $r->print('<br />'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'<br />'); } + $r->print('</td>'); + # Total if ($cangrade) { $r->print('<td>'. @@ -587,6 +671,25 @@ ENDMOVE } else { $r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).'</td>'); } + + +# Calculation + $r->print('<td><ul>'); + foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) { + $r->print('<li>'); + my ($code,$value)=split(/\:/,$calcrule); + $r->print(&pretty_prt_rule($cangrade,$id,$code,$value)); + if ($cangrade) { + $r->print(' <a href="javascript:storecmd(\'delrule_'.$id.'______'.$code.'\');">'.&mt('Delete').'</a>'); + } + $r->print('</li>'); + } + $r->print('</ul>'); + if ($cangrade) { + $r->print('<br />'.&new_calc_rule_form($id)); + } + $r->print('</td>'); + # Weight if ($cangrade) { $r->print('<td>'. @@ -595,6 +698,21 @@ ENDMOVE } else { $r->print('<td>'.$categories{$id.'_weight'}.'</td>'); } +# Achieved + $r->print('<td>'); + if ($cangrade) { + $r->print('<select name="displayachieved_'.$id.'">'. + '<option value="percent"'.($categories{$id.'_displayachieved'} eq 'percent'?' selected="selected"':'').'>'.&mt('percent').'</option>'. + '<option value="points"'.($categories{$id.'_displayachieved'} eq 'points'?' selected="selected"':'').'>'.&mt('points').'</option>'. + '</select>'); + } else { + if ($categories{$id.'_displayachieved'} eq 'percent') { + $r->print(&mt('percent')); + } else { + $r->print(&mt('points')); + } + } + $r->print('</td>'); return ($value,$weight); } @@ -609,7 +727,7 @@ sub bottom_line_category { if ($cangrade) { $r->print('<td colspan="3"><a href="javascript:storecmd(\'createnewcat\');">'.&mt('Create New Category').'</a></td>'); } - $r->print('<td colspan="5">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>'); + $r->print('<td colspan="6">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>'); } # @@ -633,6 +751,123 @@ sub make_new_category { } $categories{$id.'_weight'}=0; $categories{$id.'_totaltype'}='default'; + $categories{$id.'_displayachieved'}='percent'; + return %categories; +} + + +# === Calculation Rule Editing + +sub category_rule_codes { + return &Apache::lonlocal::texthash( + 'droplow' => 'Drop N lowest grade assignments', + 'drophigh' => 'Drop N highest grade assignments', + 'capabove' => 'Cap percentage above N percent', + 'capbelow' => 'Cap percentage below N percent'); +} + +sub pretty_prt_rule { + my ($cangrade,$id,$code,$value)=@_; + my $cid=$id.'_'.$code; + my %lt=&category_rule_codes(); + my $ret='<span class="LC_nobreak">'; + if ($cangrade) { + $ret.='<select name="sel_'.$cid.'">'; + foreach my $calc (''=>'',sort(keys(%lt))) { + $ret.='<option value="'.$calc.'"'.($calc eq $code?' selected="selected"':'').' />'.$lt{$calc}.'</input>'; + } + $ret.='</select> N=<input type="text" size="5" name="val_'.$cid.'" value="'.$value.'" /></span>'; + } else { + $ret.=$lt{$code}.'; N='.$value; + } + $ret.='</span>'; + return $ret; +} + +sub new_calc_rule_form { + my ($id)=@_; + return '<a href="javascript:storecmd(\'newrule_'.$id.'\');">'.&mt('New Calculation Rule').'</a>'; +} + +# +# Add a calculation rule +# + +sub add_calculation_rule { + my ($id,$cangrade,$newcontent,%categories)=@_; + unless ($cangrade) { return %categories; } + my %newcontent=($newcontent => 1); + foreach my $current (split(/\,/,$categories{$id.'_calculations'})) { + $newcontent{$current}=1; + } + $categories{$id.'_calculations'}=join(',',sort(keys(%newcontent))); + return %categories; +} + +# +# Delete a calculation rule +# + +sub del_calculation_rule { + my ($id,$cangrade,$delcontent,%categories)=@_; + unless ($cangrade) { return %categories; } + my @newcontent=(); + foreach my $current (split(/\,/,$categories{$id.'_calculations'})) { + unless ($current=~/^\Q$delcontent\E\:/) { + push(@newcontent,$current); + } + } + $categories{$id.'_calculations'}=join(',',@newcontent); + return %categories; +} + +sub set_category_rules { + my ($cangrade,$id,%categories)=@_; + unless ($cangrade) { return %categories; } + my %lt=&category_rule_codes(); + my @newrules=(); + foreach my $code ('',(keys(%lt))) { + if ($env{'form.sel_'.$id.'_'.$code}) { + push(@newrules,$env{'form.sel_'.$id.'_'.$code}.':'.$env{'form.val_'.$id.'_'.$code}); + } + } + $categories{$id.'_calculations'}=join(',',sort(@newrules)); + return %categories; +} + + +# === Category Editing + +# +# Add to category content +# + +sub add_category_content { + my ($id,$cangrade,$newcontent,%categories)=@_; + unless ($cangrade) { return %categories; } + &Apache::lonnet::logthis("In here $newcontent"); + my %newcontent=($newcontent => 1); + foreach my $current (split(/\,/,$categories{$id.'_content'})) { + $newcontent{$current}=1; + } + $categories{$id.'_content'}=join(',',sort(keys(%newcontent))); + return %categories; +} + +# +# Delete from category content +# + +sub del_category_content { + my ($id,$cangrade,$delcontent,%categories)=@_; + unless ($cangrade) { return %categories; } + my @newcontent=(); + foreach my $current (split(/\,/,$categories{$id.'_content'})) { + unless ($current eq $delcontent) { + push(@newcontent,$current); + } + } + $categories{$id.'_content'}=join(',',@newcontent); return %categories; } @@ -641,15 +876,16 @@ sub make_new_category { # sub del_category { - my ($id,$cangrade,%categories)=@_; - my @neworder=(); - foreach my $currentid (split(/\,/,$categories{'order'})) { - unless ($currentid eq $id) { - push(@neworder,$currentid); - } - } - $categories{'order'}=join(',',@neworder); - return %categories; + my ($id,$cangrade,%categories)=@_; + unless ($cangrade) { return %categories; } + my @neworder=(); + foreach my $currentid (split(/\,/,$categories{'order'})) { + unless ($currentid eq $id) { + push(@neworder,$currentid); + } + } + $categories{'order'}=join(',',@neworder); + return %categories; } # @@ -762,6 +998,15 @@ sub set_category_weight { return %categories; } +sub set_category_displayachieved { + my ($cangrade,$id,$value,%categories)=@_; + unless ($cangrade) { return %categories; } + unless (($value eq 'percent') || ($value eq 'points')) { $value='percent'; } + $categories{$id.'_displayachieved'}=$value; + return %categories; +} + + # # === end category-related #