');
+}
+
+sub endGradeScreen {
+ my ($r)=@_;
+ $r->print('
".&mt("Download Multiple")."
". + '| '.&mt('Sections').''. + &Apache::loncommon::help_open_topic("Chart_Sections"). + ' | '. + ''.&mt('Groups').''. + ' | '. + ''.&mt('Student Data').''. + &Apache::loncommon::help_open_topic("Chart_Student_Data"). + ' | '. + ''.&mt('Access Status').''. + &Apache::loncommon::help_open_topic("Chart_Enrollment_Status"). + ' | '. + ''.&mt('Output Format').''. + &Apache::loncommon::help_open_topic("Chart_Output_Formats"). + ' | |
| '."\n". + &Apache::lonstatistics::SectionSelect('Section','multiple',5). + ' | '. + &Apache::lonstatistics::GroupSelect('Group','multiple',5). + ' | '. + &Apache::lonstatistics::StudentDataSelect('StudentData','multiple',5,undef). + ' | '."\n". + &Apache::lonhtmlcommon::StatusOptions(undef,undef,5). + ' | '."\n". + &Apache::lonstudentassessment::CreateAndParseOutputSelector(). + ' | '. + ''. + ' |
".&mt("Display Individual")."
"); if ($env{'form.uname'}) { $uname=$env{'form.uname'}; } if ($env{'form.udom'}) { $udom=$env{'form.udom'}; } if ($env{'form.id'}) { $stdid=$env{'form.id'}; } @@ -181,21 +238,27 @@ ENDCLOSE if (($uname) && ($udom)) { $r->print(''.&mt('Full Name: [_1]',&Apache::loncommon::plainname($uname,$udom)).'
'); } - } else { - $r->print(''.&mt('This may take a few moments to display.').'
'); } $r->rflush(); my $notshowTotals= $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'; + my $showCategories= + $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories'; my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts, $topLevelRight,$topLevelAttempted) = &getData($showPoints,$uname,$udom); if (ref($navmap)) { - &outputTable($r,$showPoints,$notshowTotals,$navmap,$totalParts,$totalPossible, - $totalRight,$totalAttempted,$topLevelParts,$topLevelRight, - $topLevelAttempted); + 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); + } } else { if ($cangrade) { $r->print("\n\n"); } my $requrl = $r->uri; @@ -230,6 +293,180 @@ sub grades_blocked { return; } +sub getStudentCatGrade { + my ($uname,$udom,%categories)=@_; + my ($navmap,$totalParts,$totalPossible,$totalRight,$totalAttempted,$topLevelParts,$topLevelRight,$topLevelAttempted)= + &getData(1,$uname,$udom); + return &output_category_table(undef,0,$navmap,0,%categories); +} + +sub getAllStudentData { + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + + my %categories=&Apache::lonnet::dump('grading_categories',$cdom,$cnum); + + my $classlist = &Apache::loncoursedata::get_classlist(); + + my $statusidx = &Apache::loncoursedata::CL_STATUS(); + my $usernameidx = &Apache::loncoursedata::CL_SNAME(); + my $domainidx = &Apache::loncoursedata::CL_SDOM(); + my $fullnameidx = &Apache::loncoursedata::CL_FULLNAME(); + + foreach my $key (keys(%{$classlist})) { + my $student = $classlist->{$key}; + my $perc=&getStudentCatGrade($classlist->{$student}->[$usernameidx], + $classlist->{$student}->[$domainidx], + %categories); + } +} + +sub startpage { + my ($r,$showPoints) = @_; + 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}) + ); +} + +sub startGradeScreen { + my ($r,$mode)=@_; + + my $showPoints = + $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard'; + my $notshowSPRSlink = + (($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'external') + || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals') + || ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories')); + my $notshowTotals = + $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'externalnototals'; + my $showSPRSlink = + $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet'; + my $showCategories = + $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'categories'; + + my $allowed_to_view = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}); + if ((!$allowed_to_view) && ($env{'request.course.sec'} ne '')) { + $allowed_to_view = &Apache::lonnet::allowed('vgr', + "$env{'request.course.id'}/$env{'request.course.sec'}"); + } + + my $allowed_to_edit = &Apache::lonnet::allowed('mgr',$env{'request.course.id'}); + if ((!$allowed_to_edit) && ($env{'request.course.sec'} ne '')) { + $allowed_to_edit = &Apache::lonnet::allowed('mgr', + "$env{'request.course.id'}/$env{'request.course.sec'}"); + } + + 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,&mt('Students will see link to spreadsheet.')) if ($showSPRSlink); + push(@notes, &Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading')); + $r->print(&Apache::loncommon::head_subbox(join(' ',@notes))); + } + + + $r->print("\n".'- ');
+ $r->print("\n".'
'. + ''.&mt('Your Excel spreadsheet').''."\n"); + $r->rflush(); + &excel_cleanup(); + return; +} + + +# +# CSV data +# +# ----------- + # # Go through the complete course and collect data # @@ -274,7 +511,8 @@ sub getData { if ($curRes == $iterator->BEGIN_MAP()) {$depth++;} if ($curRes == $iterator->END_MAP()) { $depth--; } - if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) + if (ref($curRes) && $curRes->is_gradable() && !$curRes->randomout && + ($curRes->deeplink ne 'absent')) { # Get number of correct, incorrect parts my $parts = $curRes->parts(); @@ -310,8 +548,12 @@ sub getData { $totalRight += $score; $partsCount += $weight; + $curRes->{DATA}->{PROB_SCORE} += $score; + $curRes->{DATA}->{PROB_WEIGHT} += $weight; + if ($curRes->opendate($part) < $now) { $totalPossible += $weight; + $curRes->{DATA}->{PROB_POSSIBLE} += $weight; } $totalParts += $weight; } else { @@ -456,15 +698,15 @@ sub outputTable { # show totals (if applicable), close table # 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"; - my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done"); - $r->print(&Apache::loncommon::start_data_table_row() + $title = $showPoints ? "Points" : "Parts Done"; + my $totaltitle = $showPoints ? &mt("Awarded Total Points") : &mt("Total Parts Done"); + $r->print(&Apache::loncommon::start_data_table_row() .'
'); - $r->print(&mt('Max Possible To Date')." $maxHelpLink: $totalPossible
"); - $title = $showPoints ? "Points" : "Parts"; - $r->print(&mt("Total $title In Course").': '.$totalParts.'
"); + $title = $showPoints ? "Points" : "Parts"; + $r->print(&mt("Total $title In Course").': '.$totalParts.'' .&Apache::loncommon::end_data_table_row()); } @@ -472,69 +714,709 @@ sub outputTable { return; } -sub startpage { - my ($r,$showPoints) = @_; - 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}) - ); +# +# === 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 '') || ($env{'form.cmd'} 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 + &output_category_table($r,$cangrade,$navmap,1,%categories); +# + if ($cangrade) { + $r->print(&Apache::loncommon::resourcebrowser_javascript(). + ''. + ''. + ''. + ''. + ''); + } } -sub startGradeScreen { - my ($r)=@_; +# +# Get data for all symbs +# - my $showPoints = - $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'standard'; - my $notshowSPRSlink = - (($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 $showSPRSlink = - $env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet'; +sub dumpdata { + my ($navmap)=@_; + my %returndata=(); - my $allowed_to_view = &Apache::lonnet::allowed('vgr',$env{'request.course.id'}); - if ((!$allowed_to_view) && ($env{'request.course.sec'} ne '')) { - $allowed_to_view = &Apache::lonnet::allowed('vgr', - "$env{'request.course.id'}/$env{'request.course.sec'}"); +# 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; +} - my $allowed_to_edit = &Apache::lonnet::allowed('mgr',$env{'request.course.id'}); - if ((!$allowed_to_edit) && ($env{'request.course.sec'} ne '')) { - $allowed_to_edit = &Apache::lonnet::allowed('mgr', - "$env{'request.course.id'}/$env{'request.course.sec'}"); +# +# Process editing commands, update category hash +# + +sub process_category_edits { + my ($r,$cangrade,%categories)=@_; + 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); + %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); } - 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 link to spreadsheet.')) if ($showSPRSlink); - push(@notes,&Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),'grading')); - $r->print(&Apache::loncommon::head_subbox(join(' ',@notes))); - } elsif (!$allowed_to_edit) { - if (!$showPoints && !$notshowSPRSlink ) { - $r->print(&Apache::loncommon::head_subbox( - &mt('This screen shows how many problems (or problem parts) you have completed' - .', and how many you have not yet done.' - .' You can also look at [_1]a detailed score sheet[_2].' - ,'',''))); +# Now deal with commands + my $cmd=$env{'form.cmd'}; + if ($cmd eq 'createnewcat') { + %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.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; +} + +# +# Output the table +# + +sub output_category_table { + my ($r,$cangrade,$navmaps,$output,%categories)=@_; + + my $totalweight=0; + my $totalpoints=0; + + if ($output) { + $r->print(&Apache::loncommon::start_data_table()); +# + &output_category_table_header($r,$cangrade); + } +# + my @order=split(/\,/,$categories{'order'}); +# + my %performance=&dumpdata($navmaps); + my $maxpos=$#order; + for (my $i=0;$i<=$maxpos;$i++) { + my ($correct,$possible,$type,$weight)=&output_and_calc_category($r,$cangrade,$navmaps,$order[$i],$i,$maxpos,\%performance,$output,%categories); + unless ($possible) { next; } + $totalpoints+=$weight*$correct/$possible; + $totalweight+=$weight; + } +# + my $perc=0; + if ($totalweight) { $perc=100.*$totalpoints/$totalweight; } + + if ($output) { + &bottom_line_category($r,$cangrade,$perc); + $r->print(&Apache::loncommon::end_data_table()); + } + return $perc; +} + +sub output_category_table_header { + my ($r,$cangrade)=@_; + $r->print(&Apache::loncommon::start_data_table_header_row()); + if ($cangrade) { + $r->print('
+
+ 
+
+
+
+
+
+
+ 
+
+
+
+ENDMOVE
+ $r->print("\n
+
+- '); }
+ foreach my $contentid (split(/\,/,$categories{$id.'_content'})) {
+ my ($type,$possible,$attempted,$correct)=split(/\:/,$$performance{$contentid});
+ $totalpossible+=$possible;
+ $totalcorrect+=$correct;
+ if ($possible>0) { push(@individual,"$possible:$correct"); }
+ if ($output) {
+ $r->print('
- '); + $r->print(&Apache::lonnet::gettitle($contentid).' ('.&numberout($correct).'/'.&numberout($possible).')'); + if ($cangrade) { + $r->print(' '.&mt('Delete').''); + } + $r->print(' '); + } + } + if ($output) { + $r->print('
'.&Apache::loncommon::selectresource_link('quickform','addcont_'.$id,&mt('Add Problem or Folder')).'
'); + } + $r->print('
'.&mt('Total raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'
'); + $r->print(''.&mt('Adjusted raw points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'
'); + } + + +# Calculation + if ($output) { $r->print('- '); }
+ foreach my $calcrule (split(/\,/,$categories{$id.'_calculations'})) {
+ if ($output) { $r->print('
- '); } + my ($code,$value)=split(/\:/,$calcrule); + if ($output) { $r->print(&pretty_prt_rule($cangrade,$id,$code,$value)); } + if ($cangrade) { + if ($output) { $r->print(' '.&mt('Delete').''); } + } + if ($code eq 'capabove') { + if ($totalpossible>0) { + if ($totalcorrect/$totalpossible>$value/100.) { + $totalcorrect=$totalpossible*$value/100.; + } + } + } elsif ($code eq 'capbelow') { + if ($totalpossible>0) { + if ($totalcorrect/$totalpossible<$value/100.) { + $totalcorrect=$totalpossible*$value/100.; + } + } + } elsif ($code eq 'droplow') { + ($totalpossible,$totalcorrect,@individual)=&drop(0,0,$value,@individual); + } elsif ($code eq 'drophigh') { + ($totalpossible,$totalcorrect,@individual)=&drop(1,0,$value,@individual); + } elsif ($code eq 'droplowperc') { + ($totalpossible,$totalcorrect,@individual)=&drop(0,1,$value,@individual); + } elsif ($code eq 'drophighperc') { + ($totalpossible,$totalcorrect,@individual)=&drop(1,1,$value,@individual); + } + if ($output) { $r->print(' '); } + } +# Re-adjust total points if force total + if ($categories{$id.'_totaltype'} eq 'typein') { + $totalpossible=1.*$categories{$id.'_total'}; + } + + if ($output) { + $r->print('
'.&new_calc_rule_form($id)); } + $r->print('
'.&mt('Calculated points: [_1]/[_2]',&numberout($totalcorrect),&numberout($totalpossible)).'
'); + $r->print(''); + if ($type eq 'percent') { + my $perc='---'; + if ($totalpossible) { + $perc=100.*$totalcorrect/$totalpossible; + } + $r->print(&mt('[_1] percent',&numberout($perc))); + } else { + $r->print(&mt('[_1]/[_2] points',&numberout($totalcorrect),&numberout($totalpossible))); + } + $r->print('
'); + } + if ($output) { $r->print('