--- loncom/homework/bridgetask.pm 2006/10/31 21:29:38 1.188 +++ loncom/homework/bridgetask.pm 2007/01/13 06:19:00 1.220 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.188 2006/10/31 21:29:38 albertel Exp $ +# $Id: bridgetask.pm,v 1.220 2007/01/13 06:19:00 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -47,12 +47,12 @@ BEGIN { } my %dimension; +my $top = 'top'; + sub initialize_bridgetask { # id of current Dimension, 0 means that no dimension is current # (inside only) @Apache::bridgetask::dimension=(); - # list of all Dimension ids seen - %Apache::bridgetask::top_dimensionlist=(); # list of all current Instance ids %Apache::bridgetask::instance=(); # list of all Instance ids seen in this problem @@ -98,6 +98,7 @@ sub check_in { &check_in_sequence($user,$domain,$slot_name); } else { &create_new_version($type,$user,$domain,$slot_name); + &Apache::structuretags::finalize_storage(); } return 1; } @@ -234,36 +235,43 @@ sub add_grading_button { if (scalar(keys(%sections)) < 3) { $size=scalar(keys(%sections))+2; } - my $sec_select = ''."\n"; + $sec_select .= "\t\n"; foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) { - $sec_select .= "\n"; + $sec_select .= "\t\n"; } - $sec_select .= "\n"; + $sec_select .= "\t\n\n"; - my $result=' '; - $result.=''; + $result.="\n\t".''; if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); - $result.=''; - $result.=''; - $result.=''; + $result.="\n\t\t\t".''. + "\n\t\t\t".''; + $result.="\n\t\t\t".''."\n"; + $result.= "\n\t\t\t\t".&mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).''."\n\t\t".''."\n"; ($entries,$ready,$locks)=&get_queue_counts('reviewqueue'); - $result.=''."\n"; - $result.='
Specify a section: '.$sec_select.''.' '."\n\t\t".'
Specify a section: '.$sec_select."\n\t\t\t".''.' '; - $result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).'
'. - ' '. + "\n\t\t\t".''. + "\n\t\t\t\t".' '; $result.=&mt("[_1] entries, [_2] ready, [_3] being graded", - $entries,$ready,$locks).'
'."\n"; - $result.='

'."\n"; - $result.=''; + $entries,$ready,$locks).''."\n\t\t".''."\n"; + $result.="\n\t\t".''. + "\n\t\t\t".''. + "\n\t\t\t\t".' ' + ."\n\t\t".'' + ."\n\t".''."\n"; + $result.="\n\t".'

'. + "\n\t\t".''; + $result.= "\n\t\t".''; $result.=&Apache::loncommon::select_dom_form($env{'user.domain'}, 'gradingdomain'); $result.=' '. @@ -271,7 +279,7 @@ sub add_grading_button { 'gradinguser', 'gradingdomain'); $result.=&Apache::loncommon::studentbrowser_javascript(); - $result.= '

'; + $result.= '

'."\n"; } return $result; } @@ -295,18 +303,19 @@ sub add_request_another_attempt_button { my $description=&Apache::slotrequest::get_description($slot_name, $slot); $result.=(< Will be next available: $description

+

Will be next available: $description

STUFF } if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } $symb=&escape($symb); - $result.='
'. - ''. - ''. + $result.= + "\n\t".''."\n\t\t". + ''."\n\t\t". + ''."\n\t\t". ''. - '
'; + &mt($text).'" />'."\n\t". + ''."\n"; return $result; } @@ -326,9 +335,22 @@ sub style { my ($target) = @_; if ($target eq 'web' || $target eq 'webgrade') { - return (< STYLE + if ($env{'browser.type'} eq 'explorer' + && $env{'browser.os'} eq 'win' ) { + if ($env{'browser.version'} < 7) { + $style .= (< +STYLE + } else { + $style .= (< +STYLE + } + } + return $style; } return; } @@ -359,6 +381,13 @@ sub nest { } } +sub start_delay { + push(@delay,1); +} +sub end_delay { + pop(@delay); +} + sub nested_parse { my ($str,$env,$args) = @_; my @old_env = @Apache::scripttag::parser_env; @@ -562,7 +591,6 @@ sub start_Task { &Apache::structuretags::page_start($target,$token,$tagstack, $parstack,$parser,$safeeval, $name,&style($target)); - $result .= '
'."\n"; } if ($target eq 'web' && $env{'request.state'} ne 'construct') { @@ -571,7 +599,7 @@ sub start_Task { $result.='
'.&add_grading_button()."
"; + $result.=$uri.'">'.&add_grading_button()."\n"; my $symb=&Apache::lonnet::symbread(); if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { $result.='
'. @@ -611,6 +639,11 @@ sub start_Task { 'slot' => $slot_name}); ($version,$previous)=&get_version(); } + + my $status_id = + ($previous || $status eq 'SHOW_ANSWER') ? 'LC_task_feedback' + : 'LC_task_take'; + $result .= '
'."\n"; push(@Apache::inputtags::status,$status); $Apache::inputtags::slot_name=$slot_name; @@ -669,8 +702,8 @@ sub start_Task { } elsif ($target eq 'web') { $result.=&preserve_grade_info(); - $result.=&internal_location(); - $result.=$form_tag_start. + $result.=&internal_location(); + $result.=$form_tag_start."\t". ''; &Apache::lonxml::startredirection(); } @@ -678,17 +711,14 @@ sub start_Task { $target eq 'webgrade') { my $webgrade='yes'; if ($target eq 'webgrade') { + $result .= '
'."\n"; $result.= "\n".'
'."\n". ''; #$result.='
Review'.&show_queue('reviewqueue'); #$result.='
Grade'.&show_queue('gradingqueue'); } - # FIXME Blast! still need to reorg this, need to reshow the - # queue being reviewed once done with the grade pass... - # Hrrm, vaildation pass should perhaps say 'not_locked' - # perhaps do a search if there is a key that is mine and if - # there isn't reshow the queue.... + my ($todo,$status_code,$msg)=&get_key_todo($target); if ($todo) { @@ -773,6 +803,10 @@ sub start_Task { } if ($target eq 'webgrade') { $result.="\n".'
'; + &Apache::lonxml::startredirection(); + &start_delay(); + $dimension{$top}{'result'}=$result; + undef($result); } } elsif ($target eq 'edit') { $result.=$form_tag_start. @@ -999,7 +1033,12 @@ sub end_Task { if (!$previous && $status ne 'SHOW_ANSWER' && &show_task($status,$previous)) { $result.=&Apache::inputtags::gradestatus('0'); - $result.=''; + } + + $result.=''; + + if (!$previous && $status ne 'SHOW_ANSWER' && + &show_task($status,$previous)) { my $action = &Apache::lonenc::check_encrypt($env{'request.uri'}); $result.=< @@ -1027,38 +1066,43 @@ DONEBUTTON } $start_time=&Apache::lonlocal::locallocaltime($start_time); - my $status = "\n
\n"; + my $status = + "\n
\n\t"; + my $dim = $top; + my %counts = &get_counts($dim,undef,$parstack, + $safeeval); + my $question_status ="\n\t

". + &question_status_message(\%counts,-1). + "

\n"; + if ($bt_status eq 'pass') { $status.='

You passed the '.$title.' given on '. $start_time.'

'; + $status.=$question_status; } if ($bt_status eq 'fail') { $status.='

You did not pass the '.$title.' given on '. $start_time.'

'; + $status.=$question_status; if (!$previous) { $status.=&add_request_another_attempt_button(); } } - my $man_count=0; - my $opt_count=0; - my $opt_passed=0; - foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) { - if ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'} - eq 'N') { - $opt_count++; - if ($Apache::lonhomework::history{"resource.$version.0.$dim.status"} eq 'pass') { - $opt_passed++; - } - } else { - $man_count++; + + $status.="\n".'
'."\n"; + + foreach my $id (@{$dimension{$dim}{'criterias'}}) { + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + if ($type eq 'dimension') { + $result.=$dimension{$id}{'result'}; + next; } + my $criteria = + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_]); + $status .= &layout_web_Criteria($dim,$id,$criteria); } - - my $opt_req=&Apache::lonxml::get_param('OptionalRequired', - $parstack,$safeeval); - if ($opt_req !~ /\S/) { $opt_req='0'; } - $status.="\n

".&mt('You needed to pass all of the [_1] mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."

\n"; my $internal_location=&internal_location(); $result=~s/\Q$internal_location\E/$status/; @@ -1078,7 +1122,8 @@ DONEBUTTON } - if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { + if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous + && $status eq 'CAN_ANSWER') { my $award='SUBMITTED'; &Apache::essayresponse::file_submission("$version.0",'bridgetask', 'portfiles',\$award); @@ -1117,19 +1162,29 @@ DONEBUTTON my $ungraded=0; my $review=0; &Apache::lonhomework::showhash(%Apache::lonhomework::results); - foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) { + my $dim = $top; + foreach my $id (@{$dimension{$dim}{'criterias'}}) { + my $link=&link($id); + + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + + if ($type eq 'criteria') { + # dimensional 'criteria' don't get assigned grades + $Apache::lonhomework::results{"resource.$version.0.$id.status"}=$env{'form.HWVAL_'.$link}; + $Apache::lonhomework::results{"resource.$version.0.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; + } my $status= - $Apache::lonhomework::results{"resource.$version.0.$dim.status"}; - my $mandatory= - ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'} ne 'N'); + $Apache::lonhomework::results{"resource.$version.0.$id.status"}; + my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); + if ($status eq 'pass') { if (!$mandatory) { $optional_passed++; } } elsif ($status eq 'fail') { if ($mandatory) { $mandatory_failed++; } - } elsif ($status eq 'ungraded') { - $ungraded++; } elsif ($status eq 'review') { $review++; + } elsif ($status eq 'ungraded') { + $ungraded++; } else { $ungraded++; } @@ -1137,7 +1192,7 @@ DONEBUTTON if ($optional_passed < $optional_required) { $mandatory_failed++; } - &Apache::lonxml::debug("all dim ".join(':',keys(%Apache::bridgetask::top_dimensionlist))."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); + &Apache::lonxml::debug(" task results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); $Apache::lonhomework::results{'resource.0.regrader'}= $env{'user.name'}.':'.$env{'user.domain'}; if ($review) { @@ -1222,7 +1277,33 @@ DONEBUTTON &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { - $result.="
"; + if (&nest()) { + &Apache::lonxml::endredirection(); + &end_delay(); + $result.=$dimension{$top}{'result'}; + } else { + $result.=&Apache::lonxml::endredirection(); + } + my $dim = $top; + foreach my $id (@{$dimension{$dim}{'criterias'}} ) { + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + if ($type eq 'dimension') { + # dimensional 'criteria' don't get assigned grades + next; + } else { + my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_]); + $criteria = &layout_webgrade_Criteria($dim,$id,$criteria); + my $internal_location=&internal_location($id); + if ($result =~ m/\Q$internal_location\E/) { + $result=~s/\Q$internal_location\E/$criteria/; + } else { + $result.=$criteria; + } + + } + } + $result.="
"; #$result.=' '; #$result.='[_1]',$queue{"$key\0locked"}); - if ($me eq $queue{"$key\0locked"}) { + $status=&mt('Locked by [_1] [_2]',$locker,$time); + if ($me eq $locker) { ($action,$description)=('resume',&mt('Resume')); } else { ($action,$description)=('unlock',&mt('Unlock')); @@ -1615,7 +1703,7 @@ sub queue_key_locked { my ($key_locked,$value)= &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum); if ($key_locked eq "$key\0locked") { - return $value; + return &get_lock_info($value); } return undef; } @@ -1696,6 +1784,24 @@ sub pick_from_queue_data { return undef; } +sub get_lock_info { + my ($lock_info) = @_; + if (wantarray) { + if (ref($lock_info) eq 'ARRAY') { + return @{$lock_info}; + } else { + return ($lock_info); + } + } else { + if (ref($lock_info) eq 'ARRAY') { + return $lock_info->[0]; + } else { + return $lock_info; + } + } + return; +} + sub find_mid_grade { my ($queue,$symb,$cdom,$cnum)=@_; my $todo=&unescape($env{'form.gradingkey'}); @@ -1707,7 +1813,7 @@ sub find_mid_grade { my $regexp="^$symb\0.*\0locked\$"; my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); foreach my $key (keys(%locks)) { - my $who=$locks{$key}; + my $who= &get_lock_info($locks{$key}); if ($who eq $me) { $todo=$key; $todo=~s/\0locked$//; @@ -1723,7 +1829,7 @@ sub lock_key { my (undef,$cid)=&Apache::lonnet::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; - my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me}, + my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> [$me,time]}, $cdom,$cnum); &Apache::lonxml::debug("success $success $todo"); if ($success eq 'ok') { @@ -1979,7 +2085,11 @@ sub end_ClosingParagraph { } sub get_dim_id { - return $Apache::bridgetask::dimension[-1]; + if (@Apache::bridgetask::dimension) { + return $Apache::bridgetask::dimension[-1]; + } else { + return $top; + } } sub get_id { @@ -1995,7 +2105,7 @@ sub start_Setup { my $dim = &get_id($parstack,$safeeval); push(@Apache::bridgetask::dimension,$dim); &Apache::lonxml::startredirection(); - return &internal_location($dim); + return;# &internal_location($dim); } { @@ -2038,15 +2148,23 @@ sub start_Dimension { &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); push(@{$dimension{$previous_dim}{'criterias'}},$dim); $dimension{$dim}{'nested'}=$previous_dim; + $dimension{$dim}{'depth'} = 1 + $dimension{$previous_dim}{'depth'}; + &Apache::lonxml::debug("adding $dim as criteria to $previous_dim"); } else { - $Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'}= + $dimension{$top}{'depth'}=0; + $dimension{$top}{'criteria.'.$dim.'.type'}='dimension'; + $dimension{$top}{'criteria.'.$dim.'.mandatory'}= &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); + push(@{$dimension{$top}{'criterias'}},$dim); + $dimension{$dim}{'nested'}=$top; } push(@Apache::bridgetask::dimension,$dim); &Apache::lonxml::startredirection(); - &enable_dimension_parsing($dim); - return &internal_location($dim); + if (!&skip_dimension_parsing($dim)) { + &enable_dimension_parsing($dim); + } + return;# &internal_location($dim); } sub start_QuestionText { @@ -2107,8 +2225,8 @@ sub get_instance { sub get_criteria { my ($what,$version,$dim,$id) = @_; my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; - my $prefix = ($type eq 'criteria') ? "$dim.$id" - : "$id"; + my $prefix = ($type eq 'criteria' && $dim ne $top) ? "$dim.$id" + : "$id"; my $entry = "resource.$version.0.$prefix.$what"; if (exists($Apache::lonhomework::results{$entry})) { return $Apache::lonhomework::results{$entry}; @@ -2116,290 +2234,358 @@ sub get_criteria { return $Apache::lonhomework::history{$entry}; } -{ - my $last_link; - sub link { - my ($id) = @_; - $id =~ s/\./_/g; - return 'LC_GRADING_criteria_'.$id; +sub link { + my ($id) = @_; + $id =~ s/\./_/g; + return 'LC_GRADING_criteria_'.$id; +} +sub end_Question { return &end_Dimension(@_); } +sub end_Dimension { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=&Apache::lonxml::endredirection(); + my $dim=&get_id($parstack,$safeeval); + if (&skip_dimension_parsing($dim)) { + &disable_dimension_parsing($dim); + pop(@Apache::bridgetask::dimension); + return; } - sub end_Question { return &end_Dimension(@_); } - sub end_Dimension { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result=&Apache::lonxml::endredirection(); - my $dim=&get_id($parstack,$safeeval); - if (&skip_dimension_parsing($dim)) { - &disable_dimension_parsing($dim); - pop(@Apache::bridgetask::dimension); - return; + my $instance=&get_instance($dim); + my $version=&get_version(); + if ($target eq 'web') { + $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); + my @instances = $instance; + if (&Apache::response::showallfoils()) { + @instances = @{$dimension{$dim}{'instances'}}; } - my $instance=&get_instance($dim); - my $version=&get_version(); - if ($target eq 'web') { - $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); - my @instances = $instance; - if (&Apache::response::showallfoils()) { - @instances = @{$dimension{$dim}{'instances'}}; - } - my $shown_question_text; - foreach my $instance (@instances) { - $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'}, - [@_]); - $result .= &nested_parse(\$dimension{$dim}{'questiontext'}, - [@_],{'set_dim_id' => undef}); - my $task_status = - $Apache::lonhomework::history{"resource.$version.0.status"}; - if ($task_status ne 'pass' && $task_status ne 'fail') { - - foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, - @{$dimension{$dim}{'criterias'}}) { - my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; - &Apache::lonxml::debug("$id is $type"); - if ($type eq 'dimension') { - $result.= - &nested_parse(\$dimension{$dim}{'criteria.'.$id}, - [@_],{'set_dim_id' => $id}); - } - } - } else { - my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"}; - my $mandatory='Mandatory'; - if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') { - $mandatory='Optional'; - } - my $dim_info="
\n"; - if ($dim_status eq 'pass') { - $dim_info.='

Question : you passed this '.$mandatory.' question

'; - } - if ($dim_status eq 'fail') { - $dim_info.='

Question : you did not pass this '.$mandatory.' question

'; - } - my $man_count=0; - my $man_passed=0; - my $opt_count=0; - my $opt_passed=0; - foreach my $id ( @{$dimension{$dim}{$instance.'.criterias'}}, - @{$dimension{$dim}{'criterias'}} ) { - my $status = &get_criteria('status',$version,$dim,$id); - if ($dimension{$dim}{'criteria.'.$id.'.mandatory'} - eq 'N') { - $opt_count++; - if ($status eq 'pass') { $opt_passed++; } - } else { - $man_count++; - if ($status eq 'pass') { $man_passed++; } - } - } - if ($man_passed eq $man_count) { $man_passed='all'; } - - my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; - if ($opt_req !~ /\S/) { - $opt_req= - &Apache::lonxml::get_param('OptionalRequired', - $parstack,$safeeval); - if ($opt_req !~ /\S/) { $opt_req = 0; } + my $shown_question_text; + foreach my $instance (@instances) { + $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'}, + [@_]); + $result .= &nested_parse(\$dimension{$dim}{'questiontext'}, + [@_],{'set_dim_id' => undef}); + my $task_status = + $Apache::lonhomework::history{"resource.$version.0.status"}; + if ($task_status ne 'pass' && $task_status ne 'fail') { + + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}}) { + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + &Apache::lonxml::debug("$id is $type"); + if ($type eq 'dimension') { + $result.= + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_],{'set_dim_id' => $id}); } - $dim_info.="\n

".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."

\n
"; - - my $internal_location=&internal_location($dim); - $result=~s/\Q$internal_location\E/$dim_info/; - - foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, - @{$dimension{$dim}{'criterias'}}) { - my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; - if ($type eq 'dimension') { + } + } else { + my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"}; + my $mandatory='Mandatory'; + if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') { + $mandatory='Optional'; + } + my $dim_info= + "\n
\n\t"; + my $ucquestion = + my $question = + ('sub' x $dimension{$dim}{'depth'}).'question'; + $ucquestion =~ s/^(.)/uc($1)/e; + if ($dim_status eq 'pass') { + $dim_info.='

'.$ucquestion.' : you passed the above '.$mandatory.' '.$question.'

'; + } + if ($dim_status eq 'fail') { + $dim_info.='

'.$ucquestion.' : you did not pass the above '.$mandatory.' '.$question.'

'; + } + my %counts = &get_counts($dim,$instance,$parstack, + $safeeval); + + $dim_info.="\n\t

" + .&question_status_message(\%counts, + $dimension{$dim}{'depth'}) + ."

\n
\n"; + + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}}) { + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + if ($type eq 'dimension') { + if (defined($dimension{$id}{'result'})) { $result.=$dimension{$id}{'result'}; next; - } - my $status= &get_criteria('status', $version,$dim,$id); - my $comment=&get_criteria('comment',$version,$dim,$id); - my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); - if ($mandatory) { - $mandatory='Mandatory'; - } else { - $mandatory='Optional'; - } - if ($status eq 'fail') { - } elsif ($status eq 'pass') { } else { - &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status"); + $dim_info .= + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_],{'set_dim_id' => $id}); } - my $status_display=$status; - $status_display=~s/^([a-z])/uc($1)/e; - $result.= - '

' - .$mandatory.' Criteria

'; - $result.= + } else { + my $criteria = &nested_parse(\$dimension{$dim}{'criteria.'.$id}, - [@_],{'set_dim_id' => $id}); - $result.='

'.$status_display.'

'; - if ($comment) { - $result.='

'. - &mt('Comment: [_1]',$comment).'

'; - } - $result.='
'; + [@_]); + $dim_info .= &layout_web_Criteria($dim,$id,$criteria); } } - } - } elsif ($target eq 'webgrade') { - # in case of any side effects that we need - &nested_parse(\$dimension{$dim}{'intro'},[@_]); - &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]); - $result.= - &nested_parse(\$dimension{$dim}{'questiontext'},[@_], - {'set_dim_id' => undef, - 'delayed_dim_results' => 1}); - foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, - @{$dimension{$dim}{'criterias'}} ) { - my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; - if ($type eq 'dimension') { - # dimensional 'criteria' don't get assigned grades - $result.= - &nested_parse(\$dimension{$dim}{'criteria.'.$id}, - [@_],{'set_dim_id' => $id}); - next; - } + # puts the results at the end of the dimension + $result .= $dim_info; - my $link=&link($id); - my $status= &get_criteria('status',$version,$dim,$id); - $result.='
'."\n". - '
'."\n"; - $result.= - &nested_parse(\$dimension{$dim}{'criteria.'.$id},[@_]); - - $result.='
'."\n". - '
'."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - '
'."\n". - ''."\n". - '
    '."\n". - '
  • Prev
    • '."\n". - '
  • Next
    • '."\n". - '
'."\n". - '
'."\n"; - $result.=&grading_history($version,$dim,$id); - $last_link=$link; - } - if (&nest()) { - &Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'}); - $dimension{$dimension{$dim}{'nested'}}{'result'}.=$result; - undef($result); + # puts the results at the beginning of the dimension + # my $internal_location=&internal_location($dim); + # $result=~s/\Q$internal_location\E/$dim_info/; + } + } + if ($result !~ /^\s*$/s) { + # FIXME? this maybe unneccssary in the future, (CSE101 BT + # from Fall 2006 geenrate a div that attempts to hide some + # of the output in an odd way, this is a workaround so + # those old ones will continue to work. # It puts the + # LC_question div to come after any starting closie div + # that the dimension produces + if ($result =~ m{^\s*
}) { + $result =~ s{^(\s*
)} + {$1\n
}; + } else { + $result = "\n".'
'. + "\n".$result; } - } elsif ($target eq 'grade' && $env{'form.webgrade'}) { - my $optional_passed=0; - my $mandatory_failed=0; - my $ungraded=0; - my $review=0; - - $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); - $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'}, - [@_]); - $result .= &nested_parse(\$dimension{$dim}{'questiontext'}, - [@_],{'set_dim_id' => undef}); - - foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, - @{$dimension{$dim}{'criterias'}}) { - my $link=&link($id); - - my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; - if ($type eq 'criteria') { - # dimensional 'criteria' don't get assigned grades - $Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link}; - $Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; - } else { - $result .= - &nested_parse(\$dimension{$dim}{'criteria.'.$id}, - [@_],{'set_dim_id' => $id}); - } - my $status= &get_criteria('status',$version,$dim,$id); - - my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); - if ($status eq 'pass') { - if (!$mandatory) { $optional_passed++; } - } elsif ($status eq 'fail') { - if ($mandatory) { $mandatory_failed++; } - } elsif ($status eq 'review') { - $review++; - } elsif ($status eq 'ungraded') { - $ungraded++; + $result .= "\n
\n"; + } + } elsif ($target eq 'webgrade') { + # in case of any side effects that we need + &nested_parse(\$dimension{$dim}{'intro'},[@_]); + &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]); + $result.= + &nested_parse(\$dimension{$dim}{'questiontext'},[@_], + {'set_dim_id' => undef, + 'delayed_dim_results' => 1}); + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}} ) { + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + if ($type eq 'dimension') { + # dimensional 'criteria' don't get assigned grades + $result.= + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_],{'set_dim_id' => $id}); + next; + } else { + my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_]); + $criteria = &layout_webgrade_Criteria($dim,$id,$criteria); + my $internal_location=&internal_location($id); + if ($result =~ m/\Q$internal_location\E/) { + $result =~ s/\Q$internal_location\E/$criteria/; } else { - $ungraded++; + $result.=$criteria ; } } - # FIXME optional required can apply to only right now... - my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; - if ($opt_req !~ /\S/) { - $opt_req= - &Apache::lonxml::get_param('OptionalRequired', - $parstack,$safeeval); - if ($opt_req !~ /\S/) { $opt_req = 0; } - } - if ($optional_passed < $opt_req) { - $mandatory_failed++; + } + if (&nest()) { + &Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'}); + $dimension{$dimension{$dim}{'nested'}}{'result'}.=$result; + undef($result); + } + } elsif ($target eq 'grade' && $env{'form.webgrade'}) { + my $optional_passed=0; + my $mandatory_failed=0; + my $ungraded=0; + my $review=0; + + $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); + $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'}, + [@_]); + $result .= &nested_parse(\$dimension{$dim}{'questiontext'}, + [@_],{'set_dim_id' => undef}); + + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}}) { + my $link=&link($id); + + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + if ($type eq 'criteria') { + # dimensional 'criteria' don't get assigned grades + $Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link}; + $Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; + } else { + $result .= + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_],{'set_dim_id' => $id}); } - &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$dim}{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); - if ($review) { - $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= - 'review'; - } elsif ($ungraded) { - $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= - 'ungraded'; - } elsif ($mandatory_failed) { - $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= - 'fail'; + my $status= &get_criteria('status',$version,$dim,$id); + + my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); + if ($status eq 'pass') { + if (!$mandatory) { $optional_passed++; } + } elsif ($status eq 'fail') { + if ($mandatory) { $mandatory_failed++; } + } elsif ($status eq 'review') { + $review++; + } elsif ($status eq 'ungraded') { + $ungraded++; } else { - $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= - 'pass'; + $ungraded++; } + } + + my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; + if ($opt_req !~ /\S/) { + $opt_req= + &Apache::lonxml::get_param('OptionalRequired', + $parstack,$safeeval); + if ($opt_req !~ /\S/) { $opt_req = 0; } + } + if ($optional_passed < $opt_req) { + $mandatory_failed++; + } + &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$dim}{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); + if ($review) { + $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= + 'review'; + } elsif ($ungraded) { + $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= + 'ungraded'; + } elsif ($mandatory_failed) { + $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= + 'fail'; } else { - # any other targets no output - undef($result); + $Apache::lonhomework::results{"resource.$version.0.$dim.status"}= + 'pass'; } - &disable_dimension_parsing(); - pop(@Apache::bridgetask::dimension); - return $result; + } else { + # any other targets no output + undef($result); } + &disable_dimension_parsing(); + pop(@Apache::bridgetask::dimension); + return $result; +} - sub end_Setup { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result=&Apache::lonxml::endredirection(); - my $dim=&get_id($parstack,$safeeval); - my $instance=&get_instance($dim); - my $version=&get_version(); - if ($target eq 'web') { - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); - my @instances = $instance; - if (&Apache::response::showallfoils()) { - @instances = @{$dimension{$dim}{'instances'}}; - } - foreach my $instance (@instances) { - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); - } - } elsif ($target eq 'webgrade' - || $target eq 'grade' && $env{'form.webgrade'}) { - # in case of any side effects that we need - @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); +sub question_status_message { + my ($counts,$depth) = @_; + my %req = ('man' => 'mandatory', + 'opt' => 'optional',); + my %type = ('cri' => 'criteria', + 'dim' => ('sub'x($depth+1)).'questions',); + my @sections; + foreach my $req ('man','opt') { + foreach my $type ('cri','dim') { + if ($counts->{$req.'_'.$type}) { + push(@sections, + $counts->{$req.'_'.$type.'_passed'}.' of the '. + $counts->{$req.'_'.$type}.' '. + $req{$req}.' '.$type{$type}); + } + } + } + + my $status = 'You passed '; + if (@sections == -1) { + } elsif (@sections == 1) { + $status .= $sections[0]; + } elsif (@sections == 2) { + $status .= $sections[0].' and '.$sections[1]; + } else { + my $last = pop(@sections); + $status .= join(', ',@sections).', and '.$last; + } + $status .= '.'; + if ($counts->{'opt'}) { + $status .= ' You were required to pass '.$counts->{'opt_req'}. + ' optional '; + if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) { + $status .= + ($counts->{'opt_req'} == 1?'criterion':'criteria'); + } else { + $status .= + 'component'.($counts->{'opt_req'} == 1?'':'s'); + } + $status .= '.'; + } + return $status; +} + +sub get_counts { + my ($dim,$instance,$parstack,$safeeval) = @_; + my %counts; + my @possible = ('man_cri','man_dim', + 'opt_cri','opt_dim', + 'man_cri_passed', 'man_dim_passed', + 'opt_cri_passed', 'opt_dim_passed', + 'man_passed', + 'opt_passed', + 'opt_req'); + foreach my $which (@possible) { $counts{$which} = 0; } + + my $version = &get_version(); + + foreach my $id ( @{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}} ) { + my $status = &get_criteria('status',$version,$dim,$id); + my $which; + if ($dimension{$dim}{'criteria.'.$id.'.mandatory'} + eq 'N') { + $which = 'opt'; + } else { + $which = 'man'; + } + $counts{$which}++; + if ($status eq 'pass') { $counts{$which.'_passed'}++; } + if ($dimension{$dim}{'criteria.'.$id.'.type'} + eq 'dimension') { + $which .= '_dim'; + } else { + $which .= '_cri'; + } + $counts{$which}++; + if ($status eq 'pass') { $counts{$which.'_passed'}++; } + + + } + if ($counts{'man_dim_passed'} eq $counts{'man_dim'}) { + $counts{'man_dim_passed'}='all'; + } + if ($counts{'man_cri_passed'} eq $counts{'man_cri'}) { + $counts{'man_cri_passed'}='all'; + } + + $counts{'opt_req'}=$dimension{$dim}{$instance.'.optionalrequired'}; + if ($counts{'opt_req'} !~ /\S/) { + $counts{'opt_req'}= &Apache::lonxml::get_param('OptionalRequired', + $parstack,$safeeval); + if ($counts{'opt_req'} !~ /\S/) { $counts{'opt_req'} = 0; } + } + return %counts; +} + +sub end_Setup { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=&Apache::lonxml::endredirection(); + my $dim=&get_id($parstack,$safeeval); + my $instance=&get_instance($dim); + my $version=&get_version(); + if ($target eq 'web') { + @Apache::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); + my @instances = $instance; + if (&Apache::response::showallfoils()) { + @instances = @{$dimension{$dim}{'instances'}}; + } + foreach my $instance (@instances) { @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); - } else { - # any other targets no output - undef($result); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); } - pop(@Apache::bridgetask::dimension); - return $result; + } elsif ($target eq 'webgrade' + || $target eq 'grade' && $env{'form.webgrade'}) { + # in case of any side effects that we need + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); + } else { + # any other targets no output + undef($result); } + pop(@Apache::bridgetask::dimension); + return $result; } sub grading_history { @@ -2408,7 +2594,9 @@ sub grading_history { return ''; } my ($result,$grader); - my $scope="resource.$version.0.$dim.$id"; + my $scope="resource.$version.0."; + $scope .= ($dim ne $top) ? "$dim.$id" + : "$id"; foreach my $t (1..$Apache::lonhomework::history{'version'}) { if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) { my ($gname,$gdom) = @@ -2425,11 +2613,12 @@ sub grading_history { $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"'; } if ($entry) { - $result.= "
  • $grader : $entry
    • "; + $result.= "\n\t\t
  • \n\t\t\t$grader :\n\t\t\t $entry \n\t\t
    • "; } } if ($result) { - return '
      '.$result.'
    '; + return "\n\t".'
      '.$result. + "\n\t".'
    '."\n"; } return ''; } @@ -2495,9 +2684,19 @@ sub end_InstanceText { sub start_Criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style); + my $result = ''; if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { my $dim = &get_dim_id(); my $id=&get_id($parstack,$safeeval); + if ($target eq 'web' || $target eq 'webgrade') { + if ($target eq 'webgrade') { + &Apache::lonxml::debug(" for $dim $id stashing results into $dim "); + $dimension{$dim}{'result'} .= &internal_location($id); + } else { + &Apache::lonxml::debug(" not stashing $dim $id"); + #$result .= &internal_location($id); + } + } &Apache::lonxml::debug("Criteria $id with $dim"); if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) { my $instance_id=$Apache::bridgetask::instance{$dim}[-1]; @@ -2514,7 +2713,88 @@ sub start_Criteria { push(@{$dimension{$dim}{'criterias'}},$id); } } - return ''; + return $result; +} + +sub layout_web_Criteria { + my ($dim,$id,$criteria) = @_; + + my $version = &get_version(); + my $status= &get_criteria('status', $version,$dim,$id); + my $comment=&get_criteria('comment',$version,$dim,$id); + my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); + if ($mandatory) { + $mandatory='Mandatory'; + } else { + $mandatory='Optional'; + } + my $status_display=$status; + $status_display=~s/^([a-z])/uc($1)/e; + my $criteria_info.= + '
    '."\n\t".'

    ' + .$mandatory.' Criteria

    '."\n\t".'

    ' + ."\n"; + $criteria =~ s/^\s*//s; + $criteria =~ s/\s*$//s; + $criteria_info.= $criteria; + $criteria_info.="\n\t".'

    '. + "\n\t".'

    '.$status_display.'

    '; + if ($comment =~ /\w/) { + $criteria_info.= + "\n\t". + '

    '.&mt('Comment: [_1]',$comment).'

    '; + } + $criteria_info.="\n".'
    '."\n"; + + return $criteria_info; +} + +sub layout_webgrade_Criteria { + my ($dim,$id,$criteria) = @_; + my $link=&link($id); + my $version = &get_version(); + my $status = &get_criteria('status',$version,$dim,$id); + my %lt = ( 'ungraded' => 'Ungraded', + 'fail' => 'Fail', + 'pass' => 'Pass', + 'review' => 'Review', + 'comment' => 'Additional Comment for Student', + ); + %lt = &Apache::lonlocal::texthash(%lt); + my $comment = &get_criteria('comment',$version,$dim,$id); + $comment = &HTML::Entities::encode($comment,'<>"&'); + my %checked; + foreach my $which ('ungraded','fail','pass','review') { + if ($status eq $which) { $checked{$which} = 'checked="checked"'; } + } + if (!%checked) { $checked{'ungraded'} = 'checked="checked"'; } + my $buttons; + foreach my $which ('ungraded','fail','pass','review') { + $buttons .= < + + $lt{$which} + +END_BUTTON + } + $criteria =~ s/^\s*//s; + $criteria =~ s/\s*$//s; + my $result = < +
    + $criteria +
    +
    +$buttons +
    + +
    +END_CRITERIA + $result .= &grading_history($version,$dim,$id); + return $result; } sub end_Criteria {