--- loncom/homework/bridgetask.pm 2006/05/25 19:55:10 1.156 +++ loncom/homework/bridgetask.pm 2006/11/09 20:20:18 1.198 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.156 2006/05/25 19:55:10 albertel Exp $ +# $Id: bridgetask.pm,v 1.198 2006/11/09 20:20:18 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,25 +38,28 @@ use Apache::lonlocal; use Apache::lonxml; use Apache::slotrequest(); use Time::HiRes qw( gettimeofday tv_interval ); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + BEGIN { - &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','Instance','InstanceText','Criteria','ClosingParagraph')); + &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','GraderNote','ClosingParagraph')); } +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::dimensionlist=(); - # mandatory attribute of all Dimensions seen - %Apache::bridgetask::dimensionmandatory=(); + @Apache::bridgetask::dimension=(); # list of all current Instance ids - @Apache::bridgetask::instance=(); + %Apache::bridgetask::instance=(); # list of all Instance ids seen in this problem @Apache::bridgetask::instancelist=(); # key of queud user data that we are currently grading $Apache::bridgetask::queue_key=''; + undef(%dimension); } sub proctor_check_auth { @@ -80,7 +83,7 @@ sub proctor_check_auth { } } if ($authenticated) { - &create_new_version($type,$user,$domain,$slot_name); + &check_in($type,$user,$domain,$slot_name); return 1; } } @@ -88,8 +91,43 @@ sub proctor_check_auth { return 0; } +sub check_in { + my ($type,$user,$domain,$slot_name) = @_; + my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); + if ( $useslots eq 'map_map') { + &check_in_sequence($user,$domain,$slot_name); + } else { + &create_new_version($type,$user,$domain,$slot_name); + } + return 1; +} + +sub check_in_sequence { + my ($user,$domain,$slot_name) = @_; + my $navmap = Apache::lonnavmaps::navmap->new(); + my ($symb) = &Apache::lonnet::whichuser(); + my ($map) = &Apache::lonnet::decode_symb($symb); + my @resources = + $navmap->retrieveResources($map, sub { $_[0]->is_problem() },0,0); + my %old_history = %Apache::lonhomework::history; + my %old_results = %Apache::lonhomework::results; + + foreach my $res (@resources) { + &Apache::lonxml::debug("doing ".$res->src); + &Apache::structuretags::initialize_storage($res->symb); + my $type = ($res->is_task()) ? 'Task' : 'problem'; + &create_new_version($type,$user,$domain,$slot_name); + &Apache::structuretags::finalize_storage($res->symb); + } + + %Apache::lonhomework::history = %old_history; + %Apache::lonhomework::results = %old_results; +} + sub create_new_version { my ($type,$user,$domain,$slot_name) = @_; + + my $id = '0'; if ($type eq 'Task') { # increment version my $version= @@ -104,28 +142,27 @@ sub create_new_version { } #setup new version and who did it - $Apache::lonhomework::results{'resource.0.version'}=$version; - if (defined($user) && defined($domain)) { - $Apache::lonhomework::results{"resource.$version.0.checkedin"}= - $user.':'.$domain; - } else { - $Apache::lonhomework::results{"resource.$version.0.checkedin"}= - $env{'user.name'}.':'.$env{'user.domain'}; - } - if (defined($slot_name)) { - $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}= - $slot_name; + $Apache::lonhomework::results{'resource.0.version'}=$version; + $id = "$version.0"; + if (!defined($user) || !defined($domain)) { + $user = $env{'user.name'}; + $domain = $env{'user.domain'}; } + } elsif ($type eq 'problem') { &Apache::lonxml::debug("authed $slot_name"); - if (defined($user) && defined($domain)) { - $Apache::lonhomework::results{"resource.0.checkedin"}= - $user.':'.$domain; - } - if (defined($slot_name)) { - $Apache::lonhomework::results{"resource.0.checkedin.slot"}= - $slot_name; - } + } + if (!defined($user) || !defined($domain)) { + $user = $env{'user.name'}; + $domain = $env{'user.domain'}; + } + + $Apache::lonhomework::results{"resource.$id.checkedin"}= + $user.':'.$domain; + + if (defined($slot_name)) { + $Apache::lonhomework::results{"resource.$id.checkedin.slot"}= + $slot_name; } } @@ -188,7 +225,7 @@ sub add_previous_version_button { } sub add_grading_button { - my (undef,$cid)=&Apache::lonxml::whichuser(); + my (undef,$cid)=&Apache::lonnet::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; my %sections = &Apache::loncommon::get_sections($cdom,$cnum); @@ -263,7 +300,7 @@ STUFF } if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } - $symb=&Apache::lonnet::escape($symb); + $symb=&escape($symb); $result.='
'. ''. ''. @@ -289,9 +326,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; } @@ -313,18 +363,52 @@ sub show_task { return 1; } +my @delay; +sub nest { + if (@delay) { + return $delay[-1]; + } else { + return; + } +} + +sub nested_parse { + my ($str,$env,$args) = @_; + my @old_env = @Apache::scripttag::parser_env; + @Apache::scripttag::parser_env = @$env; + if (exists($args->{'set_dim_id'})) { + &enable_dimension_parsing($args->{'set_dim_id'}); + } + push(@delay,(($args->{'delayed_dim_results'})? 1 : 0)); + my $result = &Apache::scripttag::xmlparse($$str); + pop(@delay); + if (exists($args->{'set_dim_id'})) { + &disable_dimension_parsing(); + } + @Apache::scripttag::parser_env = @old_env; + if ($args->{'delayed_dim_results'}) { + my $dim = &get_dim_id(); + &Apache::lonxml::debug(" tossing out $result "); + &Apache::lonxml::debug(" usining out $dim 's ". $dimension{$dim}{'result'}); + return $dimension{$dim}{'result'}; + } + return $result; +} + sub internal_location { my ($id)=@_; return ''; } sub submission_time_stamp { - my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser(); my $submissiontime; my $version=$Apache::lonhomework::history{'resource.0.version'}; for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) { - if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) { + if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'}) + && defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.tries'})) { $submissiontime=$Apache::lonhomework::history{$v.':timestamp'}; + last; } } my $result; @@ -335,16 +419,18 @@ sub submission_time_stamp { my ($color,$when)=('#FF6666','after'); if ($diff > 0) { ($color,$when)=('#336600','before'); } my $info; + $diff = abs($diff); if ($diff%60) { $info=($diff%60).' seconds'; } $diff=int($diff/60); if ($diff%60) { $info=($diff%60).' minutes '.$info; } $diff=int($diff/60); if ($diff) { $info=$diff.' hours '.$info; } $result='

'. - &mt('Student submitted [_1] [_2] the deadline. - (Submission was at [_3], end of period was [_4].)', - $info,$when,scalar(localtime($submissiontime)), - scalar(localtime($slot{'endtime'}))). + &mt('Student submitted [_1] [_2] the deadline. '. + '(Submission was at [_3], end of period was [_4].)', + $info,$when, + &Apache::lonlocal::locallocaltime($submissiontime), + &Apache::lonlocal::locallocaltime($slot{'endtime'})). '

'; } return $result; @@ -353,7 +439,7 @@ sub submission_time_stamp { sub file_list { my ($files,$uname,$udom) = @_; if (!defined($uname) || !defined($udom)) { - (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); + (undef,undef,$udom,$uname) = &Apache::lonnet::whichuser(); } my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; @@ -362,26 +448,44 @@ sub file_list { my $file=$file_url.$partial_file; $file=~s|/+|/|g; &Apache::lonnet::allowuploaded('/adm/bridgetask',$file); - $file_list.='
  • '.$file. - '
    • '."\n"; + $file_list.='
  • file icon '.$file. + '
    • '."\n"; } $file_list.="\n"; return $file_list; } +sub grade_mode { + if ($env{'form.regrade'} || $env{'form.regradeaspecificsubmission'}) { + return 'regrade'; + } + return 'queue_grade'; +} + sub webgrade_standard_info { my ($version)=&get_version(); my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}); - my %lt=&Apache::lonlocal::texthash('done' => 'Next Item', - 'stop' => 'Quit Grading', - 'fail' => 'Fail Rest', - ); - + my %lt=('done' => 'Next Item', + 'stop' => 'Quit Grading', + 'fail' => 'Fail Rest', + 'cancel' => 'Cancel', + ); + %lt=&Apache::lonlocal::texthash(%lt); + my $result=< +INFO + + if (&grade_mode() eq 'regrade') { + $result.=< +INFO + } + + $result.=< Nonexistent file: '. + '[_1]',$file); + $msg .= "

    Submitted non-existant file $file

    \n"; + } else { + $file = ''.$file.''; + $msg .= "

    Submitted file $file

    \n"; + } + $files .= '
  • '.$file.'
    • '; + } + $files.=''; + my $subject = "Submission message for $title"; + my ($message_status,$comment_status); + my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'}; + $setting =~ s/^\s*(\S*)\s*$/$1/; + $setting = lc($setting); + if ($setting eq 'only_student' + || $setting eq 'student_and_user_notes_screen') { + $message_status = + &Apache::lonmsg::user_normal_msg($user,$domain,$subject,$msg); + $message_status = '

    '.&mt('Message sent to user: [_1]', + $message_status).'

    '; + } + if ($setting eq 'student_and_user_notes_screen') { + $comment_status = + &Apache::lonmsg::store_instructor_comment($subject.'
    '. + $msg,$user,$domain); + $comment_status = '

    '.&mt('Message sent to instructor: [_1]', + $comment_status).'

    '; + } + return <$title +

    Files submitted: $files

    +

    You are now done with this Bridge Task

    +
    +

    Logout

    +

    Change to a different course

    +$message_status +$comment_status +DONESCREEN + +} + sub start_Task { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my ($status,$accessmsg,$slot); + &Apache::structuretags::init_problem_globals('Task'); if ($target ne 'webgrade') { - &Apache::structuretags::init_problem_globals('Task'); &Apache::structuretags::initialize_storage(); &Apache::lonhomework::showhash(%Apache::lonhomework::history); if ($env{'request.state'} eq 'construct') { @@ -452,13 +608,17 @@ sub start_Task { if ($target eq 'web' && $env{'request.state'} eq 'construct') { $form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'}); } - if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' || - $target eq 'tex') { + if ($target eq 'web' + || ($target eq 'grade' && !$env{'form.webgrade'}) + || $target eq 'answer' + || $target eq 'tex') { my ($version,$previous)=&get_version(); ($status,$accessmsg,my $slot_name,$slot) = &Apache::lonhomework::check_slot_access('0','Task'); if ($status eq 'CAN_ANSWER' && $version eq '') { - &create_new_version('Task',undef,undef,$slot_name); + # CAN_ANSWER mode, and no current version, unproctored access + # thus self-checkedin + &check_in('Task',undef,undef,$slot_name); &add_to_queue('gradingqueue',{'type' => 'Task', 'time' => time, 'slot' => $slot_name}); @@ -490,30 +650,7 @@ sub start_Task { } elsif ($status eq 'WAITING_FOR_GRADE') { $msg.='

    '.&mt('Your submission is in the grading queue.').'

    '; } elsif ($env{'form.donescreen'}) { - my $title=&Apache::lonnet::gettitle(); - my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'}); - my (undef,undef,$domain,$user)= - &Apache::lonxml::whichuser(); - my $files = '
      '; - foreach my $file (@files) { - my $url="/uploaded/$domain/$user/portfolio$file"; - if (! &Apache::lonnet::stat_file($url)) { - $file = &mt(' Nonexistant file: [_1]',$file); - } else { - $file = ''.$file.''; - } - $files .= '
    • '.$file.'
      • '; - } - $files.='
    '; - - $result.=<$title -

    Files submitted: $files

    -

    You are now done with this Bridge Task

    -
    -

    Logout

    -

    Change to a different course

    -DONESCREEN + $result .= &done_screen($version); } elsif ($status ne 'NOT_YET_VIEWED') { $msg.='

    '.&mt('Not open to be viewed').'

    '; } @@ -545,7 +682,7 @@ DONESCREEN } elsif ($target eq 'web') { $result.=&preserve_grade_info(); - $result.=&internal_location(); + $result.=&internal_location(); $result.=$form_tag_start. ''; &Apache::lonxml::startredirection(); @@ -560,11 +697,7 @@ DONESCREEN #$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) { @@ -574,7 +707,7 @@ DONESCREEN &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.''; $form_tag_start.= ''; + &escape($todo).'" />'; $Apache::bridgetask::queue_key=$todo; &Apache::structuretags::initialize_storage(); &Apache::lonhomework::showhash(%Apache::lonhomework::history); @@ -589,6 +722,17 @@ DONESCREEN &mt('Return to resource').'

    '; if ($status_code eq 'stop') { $result.=''.&mt("Stopped grading.").''.$back; + } elsif ($status_code eq 'cancel') { + $result.=''.&mt("Cancelled grading.").''.$back; + } elsif ($status_code eq 'never_versioned') { + $result.=''. + &mt("Requested user has never accessed the task."). + ''.$back; + } elsif ($status_code =~ /still_open:(.*)/) { + my $date = &Apache::lonlocal::locallocaltime($1); + $result.=''. + &mt("Task is still open, will close at [_1].",$date). + ''.$back; } elsif ($status_code eq 'lock_failed') { $result.=''.&mt("Failed to lock the requested record.") .''.$back; @@ -609,6 +753,8 @@ DONESCREEN } } $webgrade='no'; + } + if (!$todo || $env{'form.cancel'}) { my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style); } if ($target eq 'webgrade' && defined($env{'form.queue'})) { @@ -636,6 +782,7 @@ DONESCREEN } if ($target eq 'webgrade') { $result.="\n".'
    '; + &Apache::lonxml::startredirection(); } } elsif ($target eq 'edit') { $result.=$form_tag_start. @@ -651,6 +798,20 @@ DONESCREEN return $result; } +sub get_task_end_time { + my ($queue_entry,$symb,$udom,$uname) = @_; + + my $end_time; + if (my $slot = &slotted_access($queue_entry)) { + my %slot_data=&Apache::lonnet::get_slot($slot); + $end_time = $slot_data{'endtime'}; + } else { + $end_time = &Apache::lonhomework::due_date('0',$symb, + $udom,$uname); + } + return $end_time; +} + sub get_key_todo { my ($target)=@_; my $todo; @@ -680,7 +841,7 @@ sub get_key_todo { if (defined($env{'form.regradeaspecificsubmission'}) && defined($env{'form.gradinguser'}) && defined($env{'form.gradingdomain'}) ) { - my ($symb,$cid)=&Apache::lonxml::whichuser(); + my ($symb,$cid)=&Apache::lonnet::whichuser(); my $cnum = $env{'course.'.$cid.'.num'}; my $cdom = $env{'course.'.$cid.'.domain'}; my $uname = $env{'form.gradinguser'}; @@ -699,18 +860,34 @@ sub get_key_todo { if (!$queue) { $env{'form.queue'} = $queue = 'none'; #not queued so doing either a re or pre grade + my %status = &Apache::lonnet::restore($symb,$cid,$udom,$uname); + if ($status{'resource.0.version'} < 1) { + return (undef,'never_versioned'); + } return ($gradingkey); } + if ($queue) { + my $queue_entry = &get_queue_data($queue,$udom,$uname); + + my $end_time = &get_task_end_time($queue_entry,$symb, + $udom,$uname); + if ($end_time > time) { + return (undef,"still_open:$end_time"); + } + } + my $who=&queue_key_locked($queue,$gradingkey); if ($who eq $me) { #already have the lock - $env{'form.gradingkey'}=&Apache::lonnet::escape($gradingkey); + $env{'form.gradingkey'}=&escape($gradingkey); + &Apache::lonxml::debug("already locked"); return ($gradingkey); } if (!defined($who)) { if (&lock_key($queue,$gradingkey)) { + &Apache::lonxml::debug("newly locked"); return ($gradingkey); } else { return (undef,'lock_failed'); @@ -730,13 +907,15 @@ sub get_key_todo { $env{'form.queue'}=$queue='gradingqueue'; } - my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'}); + my $gradingkey=&unescape($env{'form.gradingkey'}); if ($env{'form.queue'} eq 'none') { if (defined($env{'form.gradingkey'})) { if ($target eq 'webgrade') { if ($env{'form.stop'}) { return (undef,'stop'); + } elsif ($env{'form.cancel'}) { + return (undef,'cancel'); } elsif ($env{'form.next'}) { return (undef,'select_user'); } @@ -782,7 +961,8 @@ sub get_key_todo { if ($env{'form.queuemode'} ne 'selected') { # don't get something new from the queue if they hit the stop button - if (!($env{'form.stop'} && $target eq 'webgrade') + if (!(($env{'form.cancel'} || $env{'form.stop'}) + && $target eq 'webgrade') && !$env{'form.gradingaction'}) { &Apache::lonxml::debug("Getting anew $queue"); return (&get_from_queue($queue)); @@ -870,25 +1050,26 @@ DONEBUTTON $status.=&add_request_another_attempt_button(); } } - my $man_count=0; - my $opt_count=0; - my $opt_passed=0; - foreach my $dim_id (@Apache::bridgetask::dimensionlist) { - if ($Apache::bridgetask::dimensionmandatory{$dim_id} - eq 'N') { - $opt_count++; - if ($Apache::lonhomework::history{"resource.$version.0.$dim_id.status"} eq 'pass') { - $opt_passed++; - } - } else { - $man_count++; + $status.='
    '; + my $dim = $top; + my %counts = &get_counts($dim,undef,$parstack, + $safeeval); + $status.="\n

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

    \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/; @@ -897,6 +1078,17 @@ DONEBUTTON &Apache::loncommon::end_page({'discussion' => 1}); } } + + my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); + my %queue_data = ('type' => 'Task', + 'time' => time,); + if (defined($Apache::inputtags::slot_name)) { + $queue_data{'slot'} = $Apache::inputtags::slot_name; + } elsif (defined($Apache::lonhomework::history{"resource.$version.0.checkedin.slot"})) { + $queue_data{'slot'} = $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"}; + } + + if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { my $award='SUBMITTED'; &Apache::essayresponse::file_submission("$version.0",'bridgetask', @@ -919,22 +1111,15 @@ DONEBUTTON &Apache::lonhomework::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); if ($award eq 'SUBMITTED') { - my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); - if ($useslots =~ /^\s*no\s*$/i) { - &add_to_queue('gradingqueue', - {'type' => 'Task', - 'time' => time}); - } elsif (defined($Apache::inputtags::slot_name)) { - &add_to_queue('gradingqueue', - {'type' => 'Task', - 'time' => time, - 'slot' => $Apache::inputtags::slot_name}); - } + &add_to_queue('gradingqueue',\%queue_data); } - } elsif ($Apache::lonhomework::results{'INTERNAL_store'}) { - &Apache::structuretags::finalize_storage(); } - if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') { + if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes' + && exists($env{'form.cancel'})) { + &check_queue_unlock($env{'form.queue'}); + &Apache::lonxml::debug(" cancelled grading .".$env{'form.queue'}); + } elsif ($target eq 'grade' && $env{'form.webgrade'} eq 'yes' + && !exists($env{'form.cancel'})) { my $optional_required= &Apache::lonxml::get_param('OptionalRequired',$parstack, $safeeval); @@ -943,19 +1128,29 @@ DONEBUTTON my $ungraded=0; my $review=0; &Apache::lonhomework::showhash(%Apache::lonhomework::results); - foreach my $dim_id (@Apache::bridgetask::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_id.status"}; - my $mandatory= - ($Apache::bridgetask::dimensionmandatory{$dim_id} 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++; } @@ -963,34 +1158,19 @@ DONEBUTTON if ($optional_passed < $optional_required) { $mandatory_failed++; } - &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::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) { $Apache::lonhomework::results{"resource.$version.0.status"}='review'; - if ($env{'form.queue'} eq 'reviewqueue') { - &check_queue_unlock($env{'form.queue'}); - &Apache::lonxml::debug(" still needs review not changing status."); - } else { - &move_between_queues($env{'form.queue'},'reviewqueue'); - } } elsif ($ungraded) { $Apache::lonhomework::results{"resource.$version.0.status"}='ungraded'; - if ($env{'form.queue'} eq 'reviewqueue' || - $env{'form.queue'} eq 'none' ) { - &Apache::lonxml::debug("moving back."); - &move_between_queues($env{'form.queue'},'gradingqueue'); - } else { - &check_queue_unlock($env{'form.queue'}); - } } elsif ($mandatory_failed) { $Apache::lonhomework::results{"resource.$version.0.status"}='fail'; $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override'; $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT'; $Apache::lonhomework::results{"resource.$version.0.awarded"}='0'; - &remove_from_queue($env{'form.queue'}); - - my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser(); if ($env{'form.regrade'} ne 'yes') { $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= @@ -1006,9 +1186,7 @@ DONEBUTTON $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override'; $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS'; $Apache::lonhomework::results{"resource.$version.0.awarded"}='1'; - &remove_from_queue($env{'form.queue'}); - - my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser(); if ($env{'form.regrade'} ne 'yes') { $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}= $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}; @@ -1031,9 +1209,56 @@ DONEBUTTON } &minimize_storage(); &Apache::structuretags::finalize_storage(); + + # data stored, now handle queue + if ($review) { + if ($env{'form.queue'} eq 'reviewqueue') { + &check_queue_unlock($env{'form.queue'}); + &Apache::lonxml::debug(" still needs review not changing status."); + } else { + if ($env{'form.queue'} ne 'none') { + &move_between_queues($env{'form.queue'},'reviewqueue'); + } else { + &add_to_queue('reviewqueue',\%queue_data); + } + } + } elsif ($ungraded) { + if ($env{'form.queue'} eq 'reviewqueue') { + &Apache::lonxml::debug("moving back."); + &move_between_queues($env{'form.queue'}, + 'gradingqueue'); + } elsif ($env{'form.queue'} eq 'none' ) { + &add_to_queue('gradingqueue',\%queue_data); + } else { + &check_queue_unlock($env{'form.queue'}); + } + } elsif ($mandatory_failed) { + &remove_from_queue($env{'form.queue'}); + } else { + &remove_from_queue($env{'form.queue'}); + } + } + if (exists($Apache::lonhomework::results{'INTERNAL_store'})) { + # instance generation occured and hasn't yet been stored + &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { - $result.=""; + $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); + $result=~s/\Q$internal_location\E/$criteria/; + } + } + $result.=""; #$result.=' '; #$result.='{$student}[&Apache::loncoursedata::CL_STATUS()] + ne 'Active') { + delete($classlist->{$student}); + } + } - if (!grep('all',@{ $sections })) { + if (ref($sections) && !grep('all',@{ $sections })) { foreach my $student (keys(%$classlist)) { my $section = $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()]; @@ -1219,7 +1460,7 @@ sub get_limited_classlist { sub show_queue { my ($queue,$with_selects)=@_; my $result; - my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; @@ -1248,12 +1489,20 @@ sub show_queue { my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); my ($tmp)=%queue; if ($tmp=~/^error: 2 /) { - return "\n

    Current Queue - $queue

    Empty
    "; + return "\n

    Current Queue - $queue

    ". + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_row(). + ''.&mt('Empty').''. + &Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table(); } my $title=&Apache::lonnet::gettitle($symb); - $result.="\n

    Current Queue - $title $queue

    "; + $result.="\n

    Current Queue - $title $queue

    ". + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(); if ($with_selects) { $result.=""; } - $result.=""; + $result.="". + &Apache::loncommon::end_data_table_header_row(); foreach my $key (sort(keys(%queue))) { my ($symb,$uname,$udom) = &decode_queue_key($key); if (!defined($classlist->{$uname.':'.$udom})) { next; } @@ -1268,14 +1517,15 @@ sub show_queue { } if ($key=~/locked$/ && !$with_selects) { - $result.=""; + $result.= &Apache::loncommon::start_data_table_row(). + ""; $result.=''; } elsif ($key=~/timestamp$/ && !$with_selects) { - $result.=""; + $result.=&Apache::loncommon::start_data_table_row().""; $result.='"; } elsif ($key!~/(timestamp|locked)$/) { - $result.=""; + $result.= &Apache::loncommon::start_data_table_row(); my ($end_time,$slot_text); if (my $slot=&slotted_access($queue{$key})) { my %slot_data=&Apache::lonnet::get_slot($slot); @@ -1286,7 +1536,7 @@ sub show_queue { $slot_text = ''; } if ($with_selects) { - my $ekey=&Apache::lonnet::escape($key); + my $ekey=&escape($key); my ($action,$description,$status)=('select',&mt('Select')); if (exists($queue{"$key\0locked"})) { my $me=$env{'user.name'}.':'.$env{'user.domain'}; @@ -1327,21 +1577,21 @@ FORM " ($uname:$udom)"; $result.='"; + "".&Apache::loncommon::end_data_table_row(); } } - $result.="
    Statususerdata
    userdata
    $uname$uname'.$queue{$key}.'
    '. &Apache::lonlocal::locallocaltime($queue{$key})."
    '.$slot_text.' End time: '. &Apache::lonlocal::locallocaltime($end_time). - "
    \n"; + $result.= &Apache::loncommon::end_data_table()."
    \n"; return $result; } sub get_queue_counts { my ($queue)=@_; my $result; - my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; - my $classlist=&Apache::loncoursedata::get_classlist(); + my $classlist=&get_limited_classlist(); my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); @@ -1354,7 +1604,6 @@ sub get_queue_counts { foreach my $key (sort(keys(%queue))) { my ($symb,$uname,$udom) = &decode_queue_key($key); if (!defined($classlist->{$uname.':'.$udom})) { next; } - if ($key=~/locked$/) { $locks++; } elsif ($key=~/timestamp$/) { @@ -1395,7 +1644,7 @@ sub decode_queue_key { sub queue_key_locked { my ($queue,$key,$cdom,$cnum)=@_; if (!defined($cdom) || !defined($cnum)) { - my (undef,$cid)=&Apache::lonxml::whichuser(); + my (undef,$cid)=&Apache::lonnet::whichuser(); $cnum=$env{'course.'.$cid.'.num'}; $cdom=$env{'course.'.$cid.'.domain'}; } @@ -1485,7 +1734,7 @@ sub pick_from_queue_data { sub find_mid_grade { my ($queue,$symb,$cdom,$cnum)=@_; - my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'}); + my $todo=&unescape($env{'form.gradingkey'}); my $me=$env{'user.name'}.':'.$env{'user.domain'}; if ($todo) { my $who=&queue_key_locked($queue,$todo,$cdom,$cnum); @@ -1507,7 +1756,7 @@ sub find_mid_grade { sub lock_key { my ($queue,$todo)=@_; my $me=$env{'user.name'}.':'.$env{'user.domain'}; - my (undef,$cid)=&Apache::lonxml::whichuser(); + 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}, @@ -1522,11 +1771,11 @@ sub lock_key { sub get_queue_symb_status { my ($queue,$symb,$cdom,$cnum) = @_; if (!defined($cdom) || !defined($cnum)) { - my (undef,$cid)=&Apache::lonxml::whichuser(); + my (undef,$cid)=&Apache::lonnet::whichuser(); $cnum=$env{'course.'.$cid.'.num'}; $cdom=$env{'course.'.$cid.'.domain'}; } - my $classlist=&Apache::loncoursedata::get_classlist(); + my $classlist=&get_limited_classlist(); my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); @@ -1546,7 +1795,7 @@ sub get_queue_symb_status { sub get_from_queue { my ($queue)=@_; my $result; - my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum); @@ -1554,7 +1803,7 @@ sub get_from_queue { if ($todo) { return $todo; } my $attempts=0; - my $classlist=&Apache::loncoursedata::get_classlist(); + my $classlist=&get_limited_classlist(); while (1) { if ($attempts > 2) { @@ -1622,7 +1871,7 @@ sub get_from_queue { } sub select_user { - my ($symb,$cid)=&Apache::lonxml::whichuser(); + my ($symb,$cid)=&Apache::lonnet::whichuser(); my @chosen_sections= &Apache::loncommon::get_env_multiple('form.chosensections'); @@ -1634,7 +1883,7 @@ sub select_user { $result.='

    Showing only sections '.join(', ',@chosen_sections). '.

    '."\n"; } - $result.=''; + $result.=&Apache::loncommon::start_data_table(); foreach my $student (sort {lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]) cmp lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]) } (keys(%$classlist))) { my ($uname,$udom) = split(/:/,$student); @@ -1657,9 +1906,10 @@ sub select_user { } } my $todo = - &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname)); + &escape(&encode_queue_key($symb,$udom,$uname)); if ($cannot_grade) { - $result.=''; + $result.= ''.&Apache::loncommon::end_data_table_row(); } - $result.='
     '.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()]. + $result.=&Apache::loncommon::start_data_table_row(). + ' '.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()]. ''; } else { my $seclist; @@ -1667,8 +1917,8 @@ sub select_user { $seclist.=''; } + $result.=&Apache::loncommon::start_data_table_row(); $result.=< @@ -1717,9 +1967,9 @@ RESULT } else { $result.=" "; } - $result.= '
    '; + $result.=&Apache::loncommon::end_data_table(); return $result; } @@ -1764,6 +2014,14 @@ sub end_ClosingParagraph { return $result; } +sub get_dim_id { + if (@Apache::bridgetask::dimension) { + return $Apache::bridgetask::dimension[-1]; + } else { + return $top; + } +} + sub get_id { my ($parstack,$safeeval)=@_; my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval); @@ -1771,19 +2029,83 @@ sub get_id { return $id; } -my %dimension; +sub start_Setup { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + #undef(%dimension); + my $dim = &get_id($parstack,$safeeval); + push(@Apache::bridgetask::dimension,$dim); + &Apache::lonxml::startredirection(); + return &internal_location($dim); +} + +{ + my @allowed; + sub enable_dimension_parsing { + my ($id) = @_; + push(@allowed,$id); + } + sub disable_dimension_parsing { + pop(@allowed); + } + sub skip_dimension_parsing { + my ($check) = @_; + if (!@allowed) { return 0;} + # if unspecified allow any id + if ($allowed[-1] eq undef) { return 0;} + + return ($check ne $allowed[-1]); + } +} + sub start_Question { return &start_Dimension(@_); } sub start_Dimension { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - undef(%dimension); - my $dim_id=&get_id($parstack,$safeeval); - $Apache::bridgetask::dimension=$dim_id; - push(@Apache::bridgetask::dimensionlist,$dim_id); - undef(@Apache::bridgetask::instance); - $Apache::bridgetask::dimensionmandatory{$dim_id}= - &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $dim = &get_id($parstack,$safeeval); + my $previous_dim; + if (@Apache::bridgetask::dimension) { + $previous_dim = $Apache::bridgetask::dimension[-1]; + push(@{$Apache::bridgetask::dimension{$previous_dim}{'contains'}}, + $dim); + if(&skip_dimension_parsing($dim)) { + $dimension{$previous_dim}{'criteria.'.$dim} = + $token->[4] + .&Apache::lonxml::get_all_text('/'.$tagstack->[-1],$parser, + $style) + .'[-1].'>'; + } + $dimension{$previous_dim}{'criteria.'.$dim.'.type'}='dimension'; + $dimension{$previous_dim}{'criteria.'.$dim.'.mandatory'}= + &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 { + $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); + } + push(@Apache::bridgetask::dimension,$dim); &Apache::lonxml::startredirection(); - return &internal_location($dim_id); + &enable_dimension_parsing($dim); + return &internal_location($dim); +} + +sub start_QuestionText { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $dim = &get_dim_id(); + my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style); + if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { + $dimension{$dim}{'questiontext'}=$text; + } + return ''; +} + +sub end_QuestionText { + return ''; } sub get_instance { @@ -1793,7 +2115,7 @@ sub get_instance { $rand_alg eq '64bit2' || $rand_alg eq '64bit3' || $rand_alg eq '64bit4' ) { &Apache::response::pushrandomnumber(); - my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); + my @order=&Math::Random::random_permutation(@{$dimension{$dim}{'instances'}}); my $num=@order; my $version=&get_version(); my $which=($version-1)%$num; @@ -1805,220 +2127,351 @@ sub get_instance { if (defined($instance)) { return $instance; } &Apache::response::pushrandomnumber(); - my @instances = @{$dimension{'instances'}}; - # remove disabled instances - for (my $i=0; $i < $#instances; $i++) { - if ($dimension{$instances[$i].'.disabled'}) { - splice(@instances,$i,1); - $i--; + if (ref($dimension{$dim}{'instances'}) eq 'ARRAY') { + my @instances = @{$dimension{$dim}{'instances'}}; + # remove disabled instances + for (my $i=0; $i < $#instances; $i++) { + if ($dimension{$dim}{$instances[$i].'.disabled'}) { + splice(@instances,$i,1); + $i--; + } + } + @instances = &Math::Random::random_permutation(@instances); + $instance = $instances[($version-1)%scalar(@instances)]; + if ($version =~ /^\d$/) { + $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = + $instance; + $Apache::lonhomework::results{'INTERNAL_store'} = 1; } - } - @instances = &Math::Random::random_permutation(@instances); - $instance = $instances[($version-1)%scalar(@instances)]; - if ($version =~ /^\d$/) { - $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = - $instance; - $Apache::lonhomework::results{'INTERNAL_store'} = 1; } &Apache::response::poprandomnumber(); return $instance; } } -{ - my $last_link; - sub link { - my ($id) = @_; - $id =~ s/\./_/g; - return 'LC_GRADING_criteria_'.$id; +sub get_criteria { + my ($what,$version,$dim,$id) = @_; + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + 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}; + } + return $Apache::lonhomework::history{$entry}; +} + +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); - my $instance=&get_instance($dim); - my $version=&get_version(); - if ($target eq 'web') { - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'intro'}); - my @instances = $instance; - if (&Apache::response::showallfoils()) { - @instances = @{$dimension{'instances'}}; - } - foreach my $instance (@instances) { - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); - if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' || - $Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') { - - 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{$instance.'.criterias'}}, - @{$dimension{'criterias'}} ) { - if ($dimension{'criteria.'.$id.'.mandatory'} - eq 'N') { - $opt_count++; - if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"} eq 'pass') { - $opt_passed++; - } - } else { - $man_count++; - if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') { - $man_passed++; - } - } - } - if ($man_passed eq $man_count) { $man_passed='all'; } - - my $opt_req=$dimension{$instance.'.optionalrequired'}; - if ($opt_req !~ /\S/) { - $opt_req= - &Apache::lonxml::get_param('OptionalRequired', - $parstack,$safeeval); - if ($opt_req !~ /\S/) { $opt_req = 0; } - } - $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{$instance.'.criterias'}}, - @{$dimension{'criterias'}}) { - my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"}; - my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}; - my $mandatory=($dimension{'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"); - } - my $status_display=$status; - $status_display=~s/^([a-z])/uc($1)/e; + 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.= - '

    ' - .$mandatory.' Criteria

    '; - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id}); - $result.='

    '.$status_display.'

    '; - if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}) { - $result.='

    '.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}).'

    '; - } - $result.='
    '; + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_],{'set_dim_id' => $id}); } } - } - } elsif ($target eq 'webgrade') { - # in case of any side effects that we need - @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{'intro'}); - @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$instance.'.text'}); - foreach my $id (@{$dimension{$instance.'.criterias'}}, - @{$dimension{'criterias'}} ) { - my $link=&link($id); - my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"}; - $result.='
    '."\n". - '
    '."\n"; - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id}); - $result.='
    '."\n". - #$dimension{'criteria.'.$id}. - '
    '."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - '
    '."\n". - ''."\n". - '
      '."\n". - '
    • Prev
      • '."\n". - '
    • Next
      • '."\n". - '
    '."\n". - '
    '."\n"; - $result.=&grading_history($version,$dim,$id); - $last_link=$link; - } - } elsif ($target eq 'grade' && $env{'form.webgrade'}) { - my $optional_passed=0; - my $mandatory_failed=0; - my $ungraded=0; - my $review=0; - - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'intro'}); - foreach my $id (@{$dimension{$instance.'.criterias'}}, - @{$dimension{'criterias'}}) { - my $link=&link($id); - @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); - my $status=$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}; - my $mandatory=($dimension{'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 { - $ungraded++; + } 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"; + my $question = ('sub' x $dimension{$dim}{'depth'}).'question'; + $question =~ s/^(.)/uc($1)/e; + 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 %counts = &get_counts($dim,$instance,$parstack, + $safeeval); + + $dim_info.="\n

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

    \n
    "; + + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$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}, + [@_]); + $dim_info .= &layout_web_Criteria($dim,$id,$criteria); } + + my $internal_location=&internal_location($dim); + $result=~s/\Q$internal_location\E/$dim_info/; } - # FIXME optional required can apply to only right now... - my $opt_req=$dimension{$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++; + } + } 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); + $result=~s/\Q$internal_location\E/$criteria/; } - &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$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'; + } + 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}); + } + 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'; } - return $result; + } else { + # any other targets no output + undef($result); + } + &disable_dimension_parsing(); + pop(@Apache::bridgetask::dimension); + return $result; +} + +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 '. + $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 component'.($counts->{'opt_req'} == 1?'':'s'); + } + 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 = @_; + $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'}); + @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 { @@ -2027,7 +2480,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) = @@ -2056,9 +2511,10 @@ sub grading_history { sub start_IntroParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; + my $dim = &get_dim_id(); if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { if ($tagstack->[-2] eq 'Dimension' || $tagstack->[-2] eq 'Question' ) { - $dimension{'intro'}= + $dimension{$dim}{'intro'}= &Apache::lonxml::get_all_text('/introparagraph', $parser,$style); } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') { @@ -2078,15 +2534,16 @@ sub end_IntroParagraph { sub start_Instance { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $id=&get_id($parstack,$safeeval); - push(@{$dimension{'instances'}},$id); - push(@Apache::bridgetask::instance,$id); + my $dim = &get_dim_id(); + my $id = &get_id($parstack,$safeeval); + push(@{$dimension{$dim}{'instances'}},$id); + push(@{$Apache::bridgetask::instance{$dim}},$id); push(@Apache::bridgetask::instancelist,$id); - $dimension{$id.'.optionalrequired'}= + $dimension{$dim}{$id.'.optionalrequired'}= &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval); my $disabled = &Apache::lonxml::get_param('Disabled',$parstack,$safeeval); if (lc($disabled) eq 'yes') { - $dimension{$id.'.disabled'}='1'; + $dimension{$dim}{$id.'.disabled'}='1'; } return ''; } @@ -2096,10 +2553,11 @@ sub end_Instance { sub start_InstanceText { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $instance_id=$Apache::bridgetask::instance[-1]; + my $dim = &get_dim_id(); + my $instance_id=$Apache::bridgetask::instance{$dim}[-1]; my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style); if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { - $dimension{$instance_id.'.text'}=$text; + $dimension{$dim}{$instance_id.'.text'}=$text; } return ''; } @@ -2111,30 +2569,129 @@ 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' && $dim ne 'top') { + &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[-1]; - $dimension{"criteria.$instance_id.$id"}=$criteria; - $dimension{"criteria.$instance_id.$id.mandatory"}= + my $instance_id=$Apache::bridgetask::instance{$dim}[-1]; + $dimension{$dim}{"criteria.$instance_id.$id"}=$criteria; + $dimension{$dim}{"criteria.$instance_id.$id.type"}='criteria'; + $dimension{$dim}{"criteria.$instance_id.$id.mandatory"}= &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); - push(@{$dimension{$instance_id.'.criterias'}},"$instance_id.$id"); + push(@{$dimension{$dim}{$instance_id.'.criterias'}},"$instance_id.$id"); } else { - $dimension{'criteria.'.$id}=$criteria; - $dimension{'criteria.'.$id.'.mandatory'}= + $dimension{$dim}{'criteria.'.$id}=$criteria; + $dimension{$dim}{'criteria.'.$id.'.type'}='criteria'; + $dimension{$dim}{'criteria.'.$id.'.mandatory'}= &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); - push(@{$dimension{'criterias'}},$id); + 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.= + '

    ' + .$mandatory.' Criteria

    '; + $criteria_info.= $criteria; + $criteria_info.='

    '.$status_display.'

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

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

    '; + } + $criteria_info.='
    '; + 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 $result = + '
    '."\n". + '
    '."\n". + $criteria. + '
    '."\n". + '
    '."\n". + ''."\n". + ''."\n". + ''."\n". + ''."\n". + '
    '."\n". + ''."\n". + '
    '."\n". + &grading_history($version,$dim,$id); + return $result; } sub end_Criteria { } +sub start_GraderNote { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + + if ($target eq 'webgrade') { + return '
    '. + &mt('Note to graders:').''; + } + my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style); + return; +} + +sub end_GraderNote { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + + if ($target eq 'webgrade') { + return '
    '; + } + return; +} + + + sub proctor_validation_screen { my ($slot) = @_; - my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser(); + my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser(); my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg'); my $name=&Apache::loncommon::plainname($user,$domain);