--- loncom/homework/bridgetask.pm 2006/05/25 19:37:47 1.154 +++ loncom/homework/bridgetask.pm 2006/06/13 21:34:28 1.171 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.154 2006/05/25 19:37:47 albertel Exp $ +# $Id: bridgetask.pm,v 1.171 2006/06/13 21:34:28 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','ClosingParagraph')); } +my %dimension; sub initialize_bridgetask { # id of current Dimension, 0 means that no dimension is current # (inside only) - $Apache::bridgetask::dimension=''; + %Apache::bridgetask::dimension=(); # list of all Dimension ids seen - @Apache::bridgetask::dimensionlist=(); - # mandatory attribute of all Dimensions seen - %Apache::bridgetask::dimensionmandatory=(); + %Apache::bridgetask::top_dimensionlist=(); # 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 { @@ -263,7 +266,7 @@ STUFF } if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } - $symb=&Apache::lonnet::escape($symb); + $symb=&escape($symb); $result.='
'. ''. ''. @@ -362,26 +365,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)=@_; @@ -452,8 +525,10 @@ 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'); @@ -490,30 +565,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').'

    '; } @@ -574,7 +626,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 +641,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 +672,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'})) { @@ -651,6 +716,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; @@ -699,18 +778,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 +825,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 +879,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)); @@ -873,11 +971,11 @@ DONEBUTTON 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} + 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_id.status"} eq 'pass') { + if ($Apache::lonhomework::history{"resource.$version.0.$dim.status"} eq 'pass') { $opt_passed++; } } else { @@ -934,7 +1032,12 @@ DONEBUTTON } 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,11 +1046,11 @@ DONEBUTTON my $ungraded=0; my $review=0; &Apache::lonhomework::showhash(%Apache::lonhomework::results); - foreach my $dim_id (@Apache::bridgetask::dimensionlist) { + foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) { my $status= - $Apache::lonhomework::results{"resource.$version.0.$dim_id.status"}; + $Apache::lonhomework::results{"resource.$version.0.$dim.status"}; my $mandatory= - ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N'); + ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'} ne 'N'); if ($status eq 'pass') { if (!$mandatory) { $optional_passed++; } } elsif ($status eq 'fail') { @@ -963,7 +1066,7 @@ 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("all dim ".join(':',keys(%Apache::bridgetask::top_dimensionlist))."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) { @@ -1088,6 +1191,7 @@ sub check_queue_unlock { my $me=$env{'user.name'}.':'.$env{'user.domain'}; my $who=&queue_key_locked($queue,$key,$cdom,$cnum); if ($who eq $me) { + &Apache::lonxml::debug("unlocking my own $who"); return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum); } elsif ($allow_not_me) { &Apache::lonxml::debug("unlocking $who by $me"); @@ -1144,8 +1248,12 @@ sub setup_env_for_other_user { } sub get_queue_data { - my ($queue)=@_; - my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); + my ($queue,$udom,$uname)=@_; + my ($symb,$cid,$other_udom,$other_uname)=&Apache::lonxml::whichuser(); + if (!$uname || !$udom) { + $uname=$other_uname; + $udom =$other_udom; + } my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; my $todo="$symb\0queue\0$uname:$udom"; @@ -1198,6 +1306,30 @@ sub add_to_queue { return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum); } +sub get_limited_classlist { + my ($sections) = @_; + + my $classlist = &Apache::loncoursedata::get_classlist(); + foreach my $student (keys(%$classlist)) { + if ( $classlist->{$student}[&Apache::loncoursedata::CL_STATUS()] + ne 'Active') { + delete($classlist->{$student}); + } + } + + if (ref($sections) && !grep('all',@{ $sections })) { + foreach my $student (keys(%$classlist)) { + my $section = + $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()]; + if (! grep($section,@{ $sections })) { + delete($classlist->{$student}); + } + } + } + return $classlist; +} + + sub show_queue { my ($queue,$with_selects)=@_; my $result; @@ -1207,36 +1339,66 @@ sub show_queue { my @chosen_sections= &Apache::loncommon::get_env_multiple('form.chosensections'); - &Apache::grades::init_perm(); - my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,); - &Apache::grades::reset_perm(); + + my $classlist = &get_limited_classlist(\@chosen_sections); + if (!(grep(/^all$/,@chosen_sections))) { $result.='

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

    '."\n"; } + my ($view,$view_section); + my $scope = $env{'request.course.id'}; + if (!($view=&Apache::lonnet::allowed('vgr',$scope))) { + $scope .= '/'.$env{'request.course.sec'}; + if ( $view = &Apache::lonnet::allowed('vgr',$scope)) { + $view_section=$env{'request.course.sec'}; + } else { + undef($view); + } + } + my $regexp="^$symb\0"; 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; } + + my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()]; + + my $can_view=1; + if (!$view + || ($view_section && !$section) + || ($view_section && $section && ($view_section ne $section))) { + $can_view=0; + } + 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); @@ -1247,7 +1409,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'}; @@ -1263,7 +1425,7 @@ sub show_queue { $seclist.=''; } - if ($end_time ne '' && time > $end_time) { + if ($can_view && ($end_time ne '' && time > $end_time)) { $result.=(<$status FORM - + } elsif (!$can_view && ($end_time ne '' && time > $end_time)) { + $result.='' } else { $result.='' } } - $result.= ""; $result.='"; + "".&Apache::loncommon::end_data_table_row(); } } - $result.="
    Statususerdata
    userdata
    $uname$uname'.$queue{$key}.'
    '. &Apache::lonlocal::locallocaltime($queue{$key})."
    @@ -1278,19 +1440,20 @@ sub show_queue { '.&mt("Not gradable").' '.&mt("In Progress").' ".$fullname->{$uname.':'.$udom}. + $result.= "".$classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_FULLNAME()]. " ($uname:$udom) '.$slot_text.' End time: '. &Apache::lonlocal::locallocaltime($end_time). - "
    \n"; + $result.= &Apache::loncommon::end_data_table()."
    \n"; return $result; } @@ -1300,6 +1463,9 @@ sub get_queue_counts { my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; + + my $classlist=&get_limited_classlist(); + my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); my ($tmp)=%queue; @@ -1309,12 +1475,14 @@ sub get_queue_counts { my ($entries,$ready_to_grade,$locks)=(0,0,0); my %slot_cache; 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$/) { #ignore } elsif ($key!~/(timestamp|locked)$/) { - my ($symb,$uname,$udom) = &decode_queue_key($key); $entries++; if (my $slot=&slotted_access($queue{$key})) { if (!exists($slot_cache{$slot})) { @@ -1379,14 +1547,18 @@ sub slotted_access { } sub pick_from_queue_data { - my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_; + my ($queue,$check_section,$queuedata,$cdom,$cnum,$classlist)=@_; my @possible; # will hold queue entries that are valid to be selected foreach my $key (keys(%$queuedata)) { if ($key =~ /\0locked$/) { next; } if ($key =~ /\0timestamp$/) { next; } + my ($symb,$uname,$udom)=&decode_queue_key($key); + if (!defined($classlist->{$uname.':'.$udom})) { next; } + if ($check_section) { - my $section=&Apache::lonnet::getsection($uname,$udom); + my $section = + $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()]; if ($section eq $check_section) { &Apache::lonxml::debug("my sec"); next; @@ -1436,7 +1608,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); @@ -1477,6 +1649,8 @@ sub get_queue_symb_status { $cnum=$env{'course.'.$cid.'.num'}; $cdom=$env{'course.'.$cid.'.domain'}; } + my $classlist=&get_limited_classlist(); + my $regexp="^$symb\0"; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); my ($tmp)=%queue; @@ -1486,6 +1660,7 @@ sub get_queue_symb_status { next if ($key=~/locked$/); next if ($key=~/timestamp$/); my ($symb,$uname,$udom) = &decode_queue_key($key); + next if (!defined($classlist->{$uname.':'.$udom})); push(@users,"$uname:$udom"); } return @users; @@ -1501,6 +1676,9 @@ sub get_from_queue { &Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo))); if ($todo) { return $todo; } my $attempts=0; + + my $classlist=&get_limited_classlist(); + while (1) { if ($attempts > 2) { # tried twice to get a queue entry, giving up @@ -1511,21 +1689,22 @@ sub get_from_queue { $cdom,$cnum); &Apache::lonxml::debug("$starttime"); my $regexp="^$symb\0queue\0"; - my $range= ($attempts < 1 ) ? '0-100' : '0-400'; + #my $range= ($attempts < 1 ) ? '0-100' : '0-400'; my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); #make a pass looking for a user _not_ in my section if ($env{'request.course.sec'}) { &Apache::lonxml::debug("sce"); $todo=&pick_from_queue_data($queue,$env{'request.course.sec'}, - \%queue,$cdom,$cnum); + \%queue,$cdom,$cnum,$classlist); &Apache::lonxml::debug("sce $todo"); } # no one _not_ in our section so look for any user that is # ready for grading if (!$todo) { &Apache::lonxml::debug("no sce"); - $todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum); + $todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum, + $classlist); &Apache::lonxml::debug("no sce $todo"); } # no user to grade @@ -1570,18 +1749,17 @@ sub select_user { my @chosen_sections= &Apache::loncommon::get_env_multiple('form.chosensections'); - &Apache::grades::init_perm(); - my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,); - &Apache::grades::reset_perm(); + + my $classlist = &get_limited_classlist(\@chosen_sections); my $result; if (!(grep(/^all$/,@chosen_sections))) { $result.='

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

    '."\n"; } - $result.=''; + $result.=&Apache::loncommon::start_data_table(); - foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) { + 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); my $cnum=$env{'course.'.$cid.'.num'}; @@ -1602,9 +1780,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.='
     '.$fullname->{$student}. + $result.=&Apache::loncommon::start_data_table_row(). + ' '.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()]. ''; } else { my $seclist; @@ -1612,10 +1791,8 @@ sub select_user { $seclist.=''; } - my $studentdis = $student; - $studentdis =~ tr/:/@/; + $result.=&Apache::loncommon::start_data_table_row(); $result.=<
    @@ -1625,7 +1802,7 @@ sub select_user { $seclist
    -     		$fullname->{$student} ($studentdis)$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] ($student) RESULT } @@ -1664,9 +1841,9 @@ RESULT } else { $result.=" "; } - $result.= '
    '; + $result.=&Apache::loncommon::end_data_table(); return $result; } @@ -1711,6 +1888,10 @@ sub end_ClosingParagraph { return $result; } +sub get_dim_id { + return $Apache::bridgetask::dimension[-1]; +} + sub get_id { my ($parstack,$safeeval)=@_; my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval); @@ -1718,19 +1899,50 @@ 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); +} 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 $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); + $dimension{$previous_dim}{'criteria.'.$dim}=''; + $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; + } else { + $Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'}= + &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); + } + push(@Apache::bridgetask::dimension,$dim); &Apache::lonxml::startredirection(); - return &internal_location($dim_id); + 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 { @@ -1740,7 +1952,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; @@ -1752,10 +1964,10 @@ sub get_instance { if (defined($instance)) { return $instance; } &Apache::response::pushrandomnumber(); - my @instances = @{$dimension{'instances'}}; + my @instances = @{$dimension{$dim}{'instances'}}; # remove disabled instances for (my $i=0; $i < $#instances; $i++) { - if ($dimension{$instances[$i].'.disabled'}) { + if ($dimension{$dim}{$instances[$i].'.disabled'}) { splice(@instances,$i,1); $i--; } @@ -1772,6 +1984,18 @@ 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 $entry = "resource.$version.0.$prefix.$what"; + if (exists($Apache::lonhomework::results{$entry})) { + return $Apache::lonhomework::results{$entry}; + } + return $Apache::lonhomework::history{$entry}; +} + { my $last_link; sub link { @@ -1788,16 +2012,21 @@ sub get_instance { my $version=&get_version(); if ($target eq 'web') { @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'intro'}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); my @instances = $instance; if (&Apache::response::showallfoils()) { - @instances = @{$dimension{'instances'}}; + @instances = @{$dimension{$dim}{'instances'}}; } + my $shown_question_text; 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') { + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); + @Apache::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); + + my $task_status = + $Apache::lonhomework::history{"resource.$version.0.status"}; + if ($task_status eq 'pass' || $task_status eq 'fail') { my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"}; my $mandatory='Mandatory'; @@ -1815,24 +2044,21 @@ sub get_instance { 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'} + 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 ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"} eq 'pass') { - $opt_passed++; - } + if ($status eq 'pass') { $opt_passed++; } } else { $man_count++; - if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') { - $man_passed++; - } + if ($status eq 'pass') { $man_passed++; } } } if ($man_passed eq $man_count) { $man_passed='all'; } - my $opt_req=$dimension{$instance.'.optionalrequired'}; + my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; if ($opt_req !~ /\S/) { $opt_req= &Apache::lonxml::get_param('OptionalRequired', @@ -1844,11 +2070,16 @@ sub get_instance { 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'); + 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 $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 { @@ -1865,31 +2096,45 @@ sub get_instance { '

    ' .$mandatory.' Criteria

    '; @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'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"}).'

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

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

    '; } $result.='
    '; } } } + if (exists($dimension{$dim}{'nested'})) { + $dimension{$dim}{'result'}=$result; + undef($result); + } } elsif ($target eq 'webgrade') { # in case of any side effects that we need @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{'intro'}); + &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{$instance.'.text'}); - foreach my $id (@{$dimension{$instance.'.criterias'}}, - @{$dimension{'criterias'}} ) { + &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); + 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.=$dimension{$id}{'result'}; + next; + } + my $link=&link($id); - my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"}; + my $status= &get_criteria('status',$version,$dim,$id); $result.='
    '."\n". '
    '."\n"; @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'criteria.'.$id}); $result.='
    '."\n". - #$dimension{'criteria.'.$id}. + #$dimension{$dim}{'criteria.'.$id}. '
    '."\n". ''."\n". ''."\n". @@ -1897,7 +2142,7 @@ sub get_instance { ''."\n". '
    '."\n". ''."\n". '
      '."\n". '
    • Prev
      • '."\n". @@ -1907,6 +2152,10 @@ sub get_instance { $result.=&grading_history($version,$dim,$id); $last_link=$link; } + if (exists($dimension{$dim}{'nested'})) { + $dimension{$dim}{'result'}=$result; + undef($result); + } } elsif ($target eq 'grade' && $env{'form.webgrade'}) { my $optional_passed=0; my $mandatory_failed=0; @@ -1914,15 +2163,25 @@ sub get_instance { my $review=0; @Apache::scripttag::parser_env = @_; - $result.=&Apache::scripttag::xmlparse($dimension{'intro'}); - foreach my $id (@{$dimension{$instance.'.criterias'}}, - @{$dimension{'criterias'}}) { + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); + @Apache::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); + + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'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'); + + 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}; + } + 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') { @@ -1936,7 +2195,7 @@ sub get_instance { } } # FIXME optional required can apply to only right now... - my $opt_req=$dimension{$instance.'.optionalrequired'}; + my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; if ($opt_req !~ /\S/) { $opt_req= &Apache::lonxml::get_param('OptionalRequired', @@ -1946,7 +2205,7 @@ sub get_instance { if ($optional_passed < $opt_req) { $mandatory_failed++; } - &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); + &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'; @@ -1964,6 +2223,43 @@ sub get_instance { # any other targets no output undef($result); } + 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'}); + @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; } } @@ -2003,9 +2299,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') { @@ -2025,15 +2322,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 ''; } @@ -2043,10 +2341,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 ''; } @@ -2059,18 +2358,22 @@ sub start_Criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style); if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { + my $dim = &get_dim_id(); my $id=&get_id($parstack,$safeeval); + &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 '';