version 1.67, 2011/02/20 20:57:46
|
version 1.75, 2011/03/12 02:58:44
|
Line 80 sub real_handler {
|
Line 80 sub real_handler {
|
|
|
&startGradeScreen($r,'quick'); |
&startGradeScreen($r,'quick'); |
|
|
$r->rflush(); |
my $cangrade=&Apache::lonnet::allowed('mgr'); |
|
# |
# my $uname='korte'; |
# Pick student |
# my $udom='gerd'; |
# |
|
|
my $uname; |
my $uname; |
my $udom; |
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)= |
my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)= |
&getData($showPoints,$uname,$udom); |
&getData($showPoints,$uname,$udom); |
Line 98 sub real_handler {
|
Line 123 sub real_handler {
|
&outputTable($r,$showPoints,$notshowTotals, |
&outputTable($r,$showPoints,$notshowTotals, |
$navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted); |
$navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted); |
} |
} |
|
if ($cangrade) { $r->print("\n</form>\n"); } |
&endGradeScreen($r); |
&endGradeScreen($r); |
return OK; |
return OK; |
|
|
Line 165 sub startGradeScreen {
|
Line 191 sub startGradeScreen {
|
|
|
sub endGradeScreen { |
sub endGradeScreen { |
my ($r)=@_; |
my ($r)=@_; |
$r->print('</div></div></div>'); |
$r->print('</div></div></div>'.&Apache::loncommon::end_page()); |
} |
} |
|
|
|
|
Line 374 sub outputTable {
|
Line 400 sub outputTable {
|
# If there were any problems at the top level, print an extra "catchall" |
# If there were any problems at the top level, print an extra "catchall" |
if ($topLevelParts > 0) { |
if ($topLevelParts > 0) { |
my $ratio = $topLevelRight / $topLevelParts; |
my $ratio = $topLevelRight / $topLevelParts; |
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.';">'); |
$r->print(&mt("Problems Not Contained In A Folder")."</td><td>"); |
$r->print(&mt("Problems Not Contained In A Folder")."</td><td>"); |
Line 386 sub outputTable {
|
Line 412 sub outputTable {
|
# show totals (if applicable), close table |
# 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"); |
Line 398 sub outputTable {
|
Line 424 sub outputTable {
|
.&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()); |
|
|
|
} |
} |
|
|
# |
# |
Line 425 sub outputCategories {
|
Line 449 sub outputCategories {
|
# Loading old categories |
# Loading old categories |
%categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum); |
%categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum); |
# Storing |
# Storing |
if (($cangrade) && (($env{'form.storechanges'}) || ($env{'form.storemove'} ne ''))) { |
if (($cangrade) && (($env{'form.storechanges'}) || ($env{'form.storemove'} ne '') || ($env{'form.cmd'} ne ''))) { |
# Process the changes |
# Process the changes |
%categories=&process_category_edits($r,$cangrade,%categories); |
%categories=&process_category_edits($r,$cangrade,%categories); |
# Actually store |
# Actually store |
# &Apache::lonnet::logthis("Storing ".$categories{'order'}); |
|
&Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum); |
&Apache::lonnet::put('grading_categories',\%categories,$cdom,$cnum); |
} |
} |
# new categories loaded now |
# 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); |
&output_category_table($r,$cangrade,$navmap,%categories); |
# |
# |
if ($cangrade) { |
if ($cangrade) { |
$r->print('<input type="hidden" name="storemove" value="" />'. |
$r->print('<input type="hidden" name="storemove" value="" />'. |
'<input type="submit" name="storechanges" value="'.&mt("Save changes to grading categories").'" /></form>'); |
'<input type="hidden" name="cmd" 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>'); |
} |
} |
} |
} |
|
|
Line 453 sub outputCategories {
|
Line 473 sub outputCategories {
|
sub process_category_edits { |
sub process_category_edits { |
my ($r,$cangrade,%categories)=@_; |
my ($r,$cangrade,%categories)=@_; |
unless ($cangrade) { return %categories; } |
unless ($cangrade) { return %categories; } |
|
# First store everything |
|
foreach my $id (split(/\,/,$categories{'order'})) { |
|
%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 |
|
} |
|
|
|
# Now deal with commands |
my $cmd=$env{'form.cmd'}; |
my $cmd=$env{'form.cmd'}; |
if ($cmd eq 'createnewcat') { |
if ($cmd eq 'createnewcat') { |
%categories=&make_new_category($r,$cangrade,undef,%categories); |
%categories=&make_new_category($r,$cangrade,undef,%categories); |
|
} elsif ($cmd=~/^up\_(.+)$/) { |
|
%categories=&move_up_category($1,$cangrade,%categories); |
|
} elsif ($cmd=~/^down\_(.+)$/) { |
|
%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.addcont_'.$1.'_symb'},%categories); |
|
} elsif ($cmd=~/^delcont\_(.+)\_\_\_\_\_\_(.+)$/) { |
|
%categories=&del_category_content($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); |
} |
} |
# |
|
# Business logic here |
|
# |
|
return %categories; |
return %categories; |
} |
} |
|
|
Line 499 sub output_category_table_header {
|
Line 540 sub output_category_table_header {
|
$r->print('<th>'.&mt('Category').'</th>'. |
$r->print('<th>'.&mt('Category').'</th>'. |
'<th>'.&mt('Contents').'</th>'. |
'<th>'.&mt('Contents').'</th>'. |
'<th>'.&mt('Calculation').'</th>'. |
'<th>'.&mt('Calculation').'</th>'. |
'<th>'.&mt('Weight').'</th>'. |
'<th>'.&mt('Total Points').'</th>'. |
'<th>'.&mt('Percent Overall').'</th>'); |
'<th>'.&mt('Relative Weight').'</th>'); |
$r->print(&Apache::loncommon::end_data_table_header_row()); |
$r->print(&Apache::loncommon::end_data_table_header_row()); |
} |
} |
|
|
Line 523 sub output_and_calc_category {
|
Line 564 sub output_and_calc_category {
|
$r->print(<<ENDMOVE); |
$r->print(<<ENDMOVE); |
<td> |
<td> |
<div class="LC_docs_entry_move"> |
<div class="LC_docs_entry_move"> |
<a href='/adm/quickgrades?cmd=up_$id&storechanges=1'> |
<a href='javascript:storecmd("up_$id");'> |
<img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /> |
<img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /> |
</a> |
</a> |
</div> |
</div> |
<div class="LC_docs_entry_move"> |
<div class="LC_docs_entry_move"> |
<a href='/adm/quickgrades?cmd=down_$id&storechanges=1'> |
<a href='javascript:storecmd("down_$id");'> |
<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /> |
<img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /> |
</a> |
</a> |
</div> |
</div> |
Line 543 ENDMOVE
|
Line 584 ENDMOVE
|
} |
} |
} |
} |
$r->print("\n</select>\n</td>\n"); |
$r->print("\n</select>\n</td>\n"); |
|
$r->print('<td><a href="javascript:storecmd(\'delcat_'.$id.'\');">'.&mt('Delete').'</a></td>'); |
|
$r->print('<td><input type="text" name="name_'.$id. |
|
'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_name'}).'" /></td>'); |
|
} else { |
|
$r->print('<td>'.$categories{$id.'_name'}.'</td>'); |
} |
} |
$r->print(&Apache::loncommon::end_data_table_row()."\n"); |
# Content |
|
$r->print('<td><ul>'); |
|
foreach my $contentid (split(/\,/,$categories{$id.'_content'})) { |
|
$r->print('<li>'); |
|
$r->print(&Apache::lonnet::gettitle($contentid)); |
|
if ($cangrade) { |
|
$r->print(' <a href="javascript:storecmd(\'delcont_'.$id.'______'.$contentid.'\');">'.&mt('Delete').'</a>'); |
|
} |
|
$r->print('</li>'); |
|
} |
|
$r->print('</ul>'); |
|
if ($cangrade) { |
|
$r->print('<br />'.&mt('Add Problem or Sequence').'<br />'. |
|
&Apache::lonstathelpers::problem_selector('.',undef,1,1,'addcont_'.$id.'_',1,'this.form.cmd.value="addcont_'.$id.'";this.form.submit();')); |
|
} |
|
$r->print('</td>'); |
|
# Calculation |
|
# FIXME: just placeholders |
|
if ($cangrade) { |
|
$r->print("<td>Calculation Edit</td>"); |
|
} else { |
|
$r->print("<td>Calculation</td>"); |
|
} |
|
# Total |
|
if ($cangrade) { |
|
$r->print('<td>'. |
|
'<select name="totaltype_'.$id.'">'. |
|
'<option value="default"'.($categories{$id.'_totaltype'} eq 'default'?' selected="selected"':'').'>'.&mt('default').'</option>'. |
|
'<option value="typein"'.($categories{$id.'_totaltype'} eq 'typein'?' selected="selected"':'').'>'.&mt('Type-in value').'</option>'. |
|
'</select>'. |
|
'<input type="text" size="4" name="total_'.$id. |
|
'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_total'}).'" /></td>'); |
|
} else { |
|
$r->print('<td>'.($categories{$id.'_totaltype'} eq 'default'?&mt('default'):$categories{$id.'_total'}).'</td>'); |
|
} |
|
# Weight |
|
if ($cangrade) { |
|
$r->print('<td>'. |
|
'<input type="text" size="4" name="weight_'.$id. |
|
'" value="'.&Apache::lonhtmlcommon::entity_encode($categories{$id.'_weight'}).'" /></td>'); |
|
} else { |
|
$r->print('<td>'.$categories{$id.'_weight'}.'</td>'); |
|
} |
|
|
return ($value,$weight); |
return ($value,$weight); |
} |
} |
|
|
Line 557 sub bottom_line_category {
|
Line 645 sub bottom_line_category {
|
my ($r,$cangrade,$sum,$total)=@_; |
my ($r,$cangrade,$sum,$total)=@_; |
$r->print(&Apache::loncommon::start_data_table_row()); |
$r->print(&Apache::loncommon::start_data_table_row()); |
if ($cangrade) { |
if ($cangrade) { |
$r->print('<td colspan="3"><a href="/adm/quickgrades?cmd=createnewcat&storechanges=1">'.&mt('Create New Category').'</a></td>'); |
$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="5">'.&mt('Current:').$sum.'<br />'.&mt('Total:').$total.'<br /></td>'); |
} |
} |
Line 581 sub make_new_category {
|
Line 669 sub make_new_category {
|
if (defined($ordernum)) { |
if (defined($ordernum)) { |
%categories=&move_category($id,$cangrade,$ordernum,%categories); |
%categories=&move_category($id,$cangrade,$ordernum,%categories); |
} |
} |
|
$categories{$id.'_weight'}=0; |
|
$categories{$id.'_totaltype'}='default'; |
|
return %categories; |
|
} |
|
|
|
# |
|
# Add to category content |
|
# |
|
|
|
sub add_category_content { |
|
my ($id,$cangrade,$newcontent,%categories)=@_; |
|
unless ($cangrade) { return %categories; } |
|
my %newcontent=($newcontent => 1); |
|
foreach my $current (split(/\,/,$categories{$id.'_content'})) { |
|
$newcontent{$current}=1; |
|
} |
|
$categories{$id.'_content'}=join(',',sort(keys(%newcontent))); |
return %categories; |
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; |
|
} |
|
|
|
# |
|
# Delete category |
|
# |
|
|
|
sub del_category { |
|
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; |
|
} |
|
|
|
# |
|
# Move category up |
|
# |
|
|
|
sub move_up_category { |
|
my ($id,$cangrade,%categories)=@_; |
|
my $currentpos=¤t_pos_category($id,%categories); |
|
if ($currentpos<1) { return %categories; } |
|
return &move_category($id,$cangrade,$currentpos-1,%categories); |
|
} |
|
|
|
# |
|
# Move category down |
|
# |
|
|
|
sub move_down_category { |
|
my ($id,$cangrade,%categories)=@_; |
|
my $currentpos=¤t_pos_category($id,%categories); |
|
my @order=split(/\,/,$categories{'order'}); |
|
if ($currentpos>=$#order) { return %categories; } |
|
return &move_category($id,$cangrade,$currentpos+1,%categories); |
|
} |
|
|
|
# |
# Move a category to a desired position n the display order |
# Move a category to a desired position n the display order |
# |
# |
|
|
Line 636 sub current_pos_category {
|
Line 798 sub current_pos_category {
|
# Set name of a category |
# Set name of a category |
# |
# |
sub set_category_name { |
sub set_category_name { |
my ($canedit,$id,$name,%categories)=@_; |
my ($cangrade,$id,$name,%categories)=@_; |
unless ($canedit) { return %categories; } |
unless ($cangrade) { return %categories; } |
$categories{$id.'_name'}=$name; |
$categories{$id.'_name'}=$name; |
return %categories; |
return %categories; |
} |
} |
|
|
|
# |
|
# Set total of a category |
|
# |
|
sub set_category_total { |
|
my ($cangrade,$id,$totaltype,$total,%categories)=@_; |
|
unless ($cangrade) { return %categories; } |
|
if (($categories{$id.'_total'} eq '') && ($total=~/\d/)) { |
|
$totaltype='typein'; |
|
} |
|
$categories{$id.'_totaltype'}=$totaltype; |
|
if ($totaltype eq 'default') { |
|
$categories{$id.'_total'}=''; |
|
} else { |
|
$total=~s/\D//gs; |
|
unless ($total) { $total=0; } |
|
$categories{$id.'_total'}=$total; |
|
} |
|
return %categories; |
|
} |
|
|
|
sub set_category_weight { |
|
my ($cangrade,$id,$weight,%categories)=@_; |
|
unless ($cangrade) { return %categories; } |
|
$weight=~s/\D//gs; |
|
unless ($weight) { $weight=0; } |
|
$categories{$id.'_weight'}=$weight; |
|
return %categories; |
|
} |
|
|
# |
# |
# === end category-related |
# === end category-related |
# |
# |