--- loncom/homework/bridgetask.pm 2006/03/02 22:23:31 1.117 +++ loncom/homework/bridgetask.pm 2006/06/12 23:17:56 1.167 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.117 2006/03/02 22:23:31 albertel Exp $ +# $Id: bridgetask.pm,v 1.167 2006/06/12 23:17:56 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,9 +38,12 @@ 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','Instance','InstanceText','Criteria','ClosingParagraph')); + &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','ClosingParagraph')); } sub initialize_bridgetask { @@ -66,7 +69,7 @@ sub proctor_check_auth { my @allowed=split(",",$slot->{'proctor'}); foreach my $possible (@allowed) { - my ($puser,$pdom)=(split('@',$possible)); + my ($puser,$pdom)=(split(':',$possible)); if ($puser eq $user && $pdom eq $domain) { my $authenticated=0; if ( $slot->{'secret'} =~ /\S/ && @@ -79,39 +82,56 @@ sub proctor_check_auth { $authenticated=1; } } - if ($authenticated && $type eq 'Task') { - # increment version - my $version= - $Apache::lonhomework::history{'resource.0.version'}; - $version++; - - #clean out all current results - foreach my $key (keys(%Apache::lonhomework::history)) { - if ($key=~/^resource\.0\./) { - $Apache::lonhomework::results{$key}=''; - } - } - - #setup new version and who did it - $Apache::lonhomework::results{'resource.0.version'}=$version; - $Apache::lonhomework::results{"resource.$version.0.checkedin"}= - $user.'@'.$domain; - $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}= - $slot_name; - + if ($authenticated) { + &create_new_version($type,$user,$domain,$slot_name); return 1; - } elsif ($authenticated && $type eq 'problem') { - &Apache::lonxml::debug("authed $slot_name"); - $Apache::lonhomework::results{"resource.0.checkedin"}= - $user.'@'.$domain; - $Apache::lonhomework::results{"resource.0.checkedin.slot"}= - $slot_name; } } } return 0; } +sub create_new_version { + my ($type,$user,$domain,$slot_name) = @_; + if ($type eq 'Task') { + # increment version + my $version= + $Apache::lonhomework::history{'resource.0.version'}; + $version++; + &Apache::lonxml::debug("Making version $version"); + #clean out all current results + foreach my $key (keys(%Apache::lonhomework::history)) { + if ($key=~/^resource\.0\./) { + $Apache::lonhomework::results{$key}=''; + } + } + + #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; + } + } 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; + } + } +} + sub get_version { my ($version,$previous); if ($env{'form.previousversion'} && @@ -120,7 +140,11 @@ sub get_version { $version=$env{'form.previousversion'}; $previous=1; } else { - $version=$Apache::lonhomework::history{'resource.0.version'}; + if (defined($Apache::lonhomework::results{'resource.0.version'})) { + $version=$Apache::lonhomework::results{'resource.0.version'}; + } elsif (defined($Apache::lonhomework::history{'resource.0.version'})) { + $version=$Apache::lonhomework::history{'resource.0.version'}; + } $previous=0; } if (wantarray) { @@ -170,16 +194,16 @@ sub add_grading_button { my (undef,$cid)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; - my %sections; - my $numsections=&Apache::loncommon::get_sections($cdom,$cnum,\%sections); + my %sections = &Apache::loncommon::get_sections($cdom,$cnum); + my $size=5; if (scalar(keys(%sections)) < 3) { $size=scalar(keys(%sections))+2; } - my $sec_select = ''."\n"; $sec_select .= "\n"; foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) { - $sec_select .= "\n"; + $sec_select .= "\n"; } $sec_select .= "\n"; @@ -213,7 +237,8 @@ sub add_grading_button { 'gradinguser', 'gradingdomain'); $result.=&Apache::loncommon::studentbrowser_javascript(); - } + $result.= '

'; + } return $result; } @@ -222,6 +247,12 @@ sub add_request_another_attempt_button { if (!$text) { $text="Request another attempt"; } my $result; my $symb=&Apache::lonnet::symbread(); + # not a slot access based resource + my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb); + if ($useslots =~ /^\s*no\s*$/i) { + return ''; + } + my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb); my $action='get_reservation'; if ($slot_name) { @@ -235,7 +266,7 @@ STUFF } if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } - $symb=&Apache::lonnet::escape($symb); + $symb=&escape($symb); $result.='
'. ''. ''. @@ -258,64 +289,14 @@ sub preserve_grade_info { } sub style { - return (< -.LC_fail, .LC_pass, .LC_neutral { - position: relative; - margin : 5px; - margin-bottom :10px; - padding : 4px; - padding-left : 75px; - border : thin solid; - font-weight : bolder; - font-size: smaller; - font-family: Arial; - background-color : rgb(255,240,225); -} - -.LC_fail h4, .LC_pass h4 { - position:absolute; - left: -4px; - top: -8px; - padding:2px; - margin:0; - background-color : rgb(255,240,225); - border : thin solid; -} - -.LC_fail { - color: red; -} - -.LC_pass { - color : green; -} - -.LC_neutral { - color : blue; -} - -.LC_question { - border : thin solid black; - padding : 4px; - margin-bottom : 1em; -} - -.LC_grade { - font-size: x-large; - font-family: Arial; - position:absolute; - left: 5px; - top: -5px; - width: 70px; -} - -div#feedback h1 { - color : inherit; -} - + my ($target) = @_; + if ($target eq 'web' + || $target eq 'webgrade') { + return (< STYLE - + } + return; } sub show_task { @@ -327,7 +308,8 @@ sub show_task { ( $status eq 'NOT_IN_A_SLOT') || ( $status eq 'NEEDS_CHECKIN') || ( $status eq 'WAITING_FOR_GRADE') || - ( $status eq 'INVALID_ACCESS') )) { + ( $status eq 'INVALID_ACCESS') || + ( &get_version() eq ''))) { return 0; } if ($env{'form.donescreen'}) { return 0; } @@ -371,35 +353,118 @@ sub submission_time_stamp { return $result; } -sub webgrade_standard_info { - my ($version)=&get_version(); - my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); +sub file_list { + my ($files,$uname,$udom) = @_; + if (!defined($uname) || !defined($udom)) { + (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); + } my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/'; - my $file_list="
    \n"; - foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) { + + my $file_list="
      \n"; + foreach my $partial_file (split(',',$files)) { 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=('done' => 'Next Item', + 'stop' => 'Quit Grading', + 'fail' => 'Fail Rest', + 'cancel' => 'Cancel', + ); + my %lt=&Apache::lonlocal::texthash(%lt); - my %lt=&Apache::lonlocal::texthash('done' => 'Done', - 'stop' => 'Stop', - ); - my $result=< +
    +INFO + + if (&grade_mode() eq 'regrade') { + $result.=< +INFO + } + + $result.=< +
    $file_list INFO return $result; } +sub done_screen { + my ($version) = @_; + 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 = '
      '; + my $msg; + foreach my $file (@files) { + my $url="/uploaded/$domain/$user/portfolio$file"; + if (! &Apache::lonnet::stat_file($url)) { + $file = &mt(' 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)=@_; @@ -414,20 +479,32 @@ sub start_Task { } $Apache::lonhomework::parsing_a_task=1; - #should get back a or the neccesary stuff to start XML/MathML - my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= - &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); - - $body_tag_start = '
    '."\n"; + + my $name; + if ($target eq 'web' || $target eq 'webgrade') { + $name = &Apache::structuretags::get_resource_name($parstack,$safeeval); + } + + my ($result,$form_tag_start); + if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex' + || $target eq 'edit') { + ($result,$form_tag_start) = + &Apache::structuretags::page_start($target,$token,$tagstack, + $parstack,$parser,$safeeval, + $name,&style($target)); + $result .= '
    '."\n"; + } + if ($target eq 'web' && $env{'request.state'} ne 'construct') { - if ($Apache::lonhomework::modifygrades) { - $body_tag_start.=''.&add_grading_button().""; + $result.=$uri.'">'.&add_grading_button().""; my $symb=&Apache::lonnet::symbread(); if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { - $body_tag_start.='
    '. + $result.=''. ''. ''. ''. + $result.=''. ''. ''. ''.$body_tag_start; if ($env{'request.state'} eq 'construct') { $result.=$form_tag_start; } @@ -479,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').'

    '; } @@ -521,17 +584,18 @@ DONESCREEN if ($status eq 'NEEDS_CHECKIN') { if(&proctor_check_auth($slot_name,$slot,'Task') && defined($Apache::inputtags::slot_name)) { - my $result=&add_to_queue('gradingqueue', - [$Apache::inputtags::slot_name]); + my $result= + &add_to_queue('gradingqueue', + {'type' => 'Task', + 'time' => time, + 'slot' => + $Apache::inputtags::slot_name}); &Apache::lonxml::debug("add_to_queue said $result"); } } } } elsif ($target eq 'web') { - my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval); - $result.="$head_tag_start$name - $body_tag_start \n".&style(); - + $result.=&preserve_grade_info(); $result.=&internal_location(); $result.=$form_tag_start. @@ -542,7 +606,9 @@ DONESCREEN $target eq 'webgrade') { my $webgrade='yes'; if ($target eq 'webgrade') { - $result.=$head_tag_start.''.$body_tag_start; + $result.= "\n".'
    '."\n". + ''; #$result.='
    Review'.&show_queue('reviewqueue'); #$result.='
    Grade'.&show_queue('gradingqueue'); } @@ -560,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); @@ -575,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; @@ -595,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'})) { @@ -621,10 +700,10 @@ DONESCREEN if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); } } if ($target eq 'webgrade') { - $result.="\n".'
    '; + $result.="\n".'
    '; } } elsif ($target eq 'edit') { - $result.=$head_tag_start."".$body_tag_start.$form_tag_start. + $result.=$form_tag_start. &Apache::structuretags::problem_edit_header(); $Apache::lonxml::warnings_error_header= &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."
    "; @@ -637,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; @@ -660,7 +753,7 @@ sub get_key_todo { } - my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + my $me=$env{'user.name'}.':'.$env{'user.domain'}; #need to try both queues.. if (defined($env{'form.regradeaspecificsubmission'}) && @@ -685,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'); @@ -706,7 +815,7 @@ sub get_key_todo { #otherwise (defined($who) && $who ne $me) some else has it... return (undef,'not_allowed', &mt('Another user ([_1]) currently has the record for [_2] locked.', - $who,$env{'form.gradinguser'}.'@'.$env{'form.gradingdomain'})); + $who,$env{'form.gradinguser'}.':'.$env{'form.gradingdomain'})); } @@ -716,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'); } @@ -768,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)); @@ -829,11 +941,19 @@ DONEBUTTON my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"}; my $title=&Apache::lonnet::gettitle(); + my $start_time; + my $slot_name= $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"}; - my %slot=&Apache::lonnet::get_slot($slot_name); - my $start_time= - &Apache::lonlocal::locallocaltime($slot{'starttime'}); + if ($slot_name) { + my %slot=&Apache::lonnet::get_slot($slot_name); + + $start_time=$slot{'starttime'} + } else { + $start_time= + &Apache::lonnet::EXT('resource.0.opendate'); + } + $start_time=&Apache::lonlocal::locallocaltime($start_time); my $status = "\n
    \n"; @@ -862,6 +982,7 @@ DONEBUTTON $man_count++; } } + my $opt_req=&Apache::lonxml::get_param('OptionalRequired', $parstack,$safeeval); if ($opt_req !~ /\S/) { $opt_req='0'; } @@ -870,9 +991,8 @@ DONEBUTTON my $internal_location=&internal_location(); $result=~s/\Q$internal_location\E/$status/; } - } - if ($target eq 'web') { - $result.="\n
    \n".&Apache::lonxml::xmlend().''; + $result.="\n
    \n". + &Apache::loncommon::end_page({'discussion' => 1}); } } if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { @@ -896,14 +1016,28 @@ DONEBUTTON } &Apache::lonhomework::showhash(%Apache::lonhomework::results); &Apache::structuretags::finalize_storage(); - if ($award eq 'SUBMITTED' - && defined($Apache::inputtags::slot_name)) { - &add_to_queue('gradingqueue',[$Apache::inputtags::slot_name]); + 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}); + } } } 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); @@ -934,7 +1068,7 @@ DONEBUTTON } &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::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'}; + $env{'user.name'}.':'.$env{'user.domain'}; if ($review) { $Apache::lonhomework::results{"resource.$version.0.status"}='review'; if ($env{'form.queue'} eq 'reviewqueue') { @@ -1002,7 +1136,7 @@ DONEBUTTON &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { - $result.="
    \n
    "; + $result.="
    "; #$result.=' '; #$result.=' '; #$result.=' '; - $result.=''."\n
    \n". - &Apache::loncommon::endbodytag().''; + $result.=''."\n
    \n\n". + &Apache::loncommon::end_page(); } elsif ($target eq 'meta') { $result.=&Apache::response::meta_package_write('Task'); $result.=&Apache::response::meta_stores_write('solved','string', @@ -1037,7 +1171,7 @@ sub move_between_queues { } else { $cur_data = ['none']; } - my $result=&add_to_queue($dest_queue,[$cur_data->[0]]); + my $result=&add_to_queue($dest_queue,$cur_data); if ($result ne 'ok') { return $result; } @@ -1050,13 +1184,14 @@ sub check_queue_unlock { if ($queue eq 'none') { return 'ok'; } my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); if (!defined($key)) { - $key="$symb\0queue\0$uname\@$udom"; + $key="$symb\0queue\0$uname:$udom"; } my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; - my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + 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"); @@ -1113,11 +1248,15 @@ 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"; + my $todo="$symb\0queue\0$uname:$udom"; my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum); if ($key eq $todo && ref($value)) { return $value; @@ -1136,17 +1275,17 @@ sub check_queue_for_key { if (defined($results{"$todo\0locked"})) { return 'locked'; } - my $slot; - if (ref($results{$todo}) eq 'ARRAY') { - $slot = $results{$todo}[0]; - } elsif (ref($results{$todo}) eq 'HASH') { - $slot = $results{$todo}{'slot'}; - } - if (defined($slot)) { + if (my $slot=&slotted_access($results{$todo})) { my %slot_data=&Apache::lonnet::get_slot($slot); if ($slot_data{'endtime'} > time) { return 'in_progress'; } + } else { + my ($symb) = &decode_queue_key($todo); + my $due_date = &Apache::lonhomework::due_date('0',$symb); + if ($due_date > time) { + return 'in_progress'; + } } return 'enqueued'; } @@ -1163,10 +1302,34 @@ sub add_to_queue { my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; my %data; - $data{"$symb\0queue\0$uname\@$udom"}=$user_data; + $data{"$symb\0queue\0$uname:$udom"}=$user_data; 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; @@ -1176,43 +1339,80 @@ 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.=""; - my $slot=$queue{$key}->[0]; - my %slot_data=&Apache::lonnet::get_slot($slot); + $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); + $end_time = $slot_data{'endtime'}; + $slot_text = &mt('Slot: [_1]',$slot); + } else { + $end_time = &Apache::lonhomework::due_date('0',$symb); + $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'}; + my $me=$env{'user.name'}.':'.$env{'user.domain'}; $status=&mt('Locked by [_1]',$queue{"$key\0locked"}); if ($me eq $queue{"$key\0locked"}) { ($action,$description)=('resume',&mt('Resume')); @@ -1225,7 +1425,7 @@ sub show_queue { $seclist.=''; } - if (time > $slot_data{'endtime'}) { + 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.= ""; - $result.='"; + $result.= ""; + $result.='".&Apache::loncommon::end_data_table_row(); } } - $result.="
    Statususerdata
    userdata
    $uname$uname'.$queue{$key}.'
    '. &Apache::lonlocal::locallocaltime($queue{$key})."
    @@ -1240,19 +1440,20 @@ sub show_queue { '.&mt("Not gradable").' '.&mt("In Progress").''.&mt("In Progress").' ".$fullname->{$uname.':'.$udom}. - " ($uname\@$udom) Slot: '.$slot.' End time: '. - &Apache::lonlocal::locallocaltime($slot_data{'endtime'}). - "
    ".$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; } @@ -1262,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; @@ -1271,20 +1475,28 @@ 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++; - my $slot=$queue{$key}->[0]; - if (!exists($slot_cache{$slot})) { - my %slot_data=&Apache::lonnet::get_slot($slot); - $slot_cache{$slot} = \%slot_data; - } - if (time > $slot_cache{$slot}{'endtime'}) { - $ready_to_grade++; + if (my $slot=&slotted_access($queue{$key})) { + if (!exists($slot_cache{$slot})) { + my %slot_data=&Apache::lonnet::get_slot($slot); + $slot_cache{$slot} = \%slot_data; + } + if (time > $slot_cache{$slot}{'endtime'}) { + $ready_to_grade++; + } + } else { + my $due_date = &Apache::lonhomework::due_date('0',$symb); + if ($due_date ne '' && time > $due_date) { + $ready_to_grade++; + } } } } @@ -1293,13 +1505,13 @@ sub get_queue_counts { sub encode_queue_key { my ($symb,$udom,$uname)=@_; - return "$symb\0queue\0$uname\@$udom"; + return "$symb\0queue\0$uname:$udom"; } sub decode_queue_key { my ($key)=@_; my ($symb,undef,$user) = split("\0",$key); - my ($uname,$udom) = split('@',$user); + my ($uname,$udom) = split(':',$user); return ($symb,$uname,$udom); } @@ -1318,46 +1530,86 @@ sub queue_key_locked { return undef; } +sub slotted_access { + my ($queue_entry) = @_; + if (ref($queue_entry) eq 'ARRAY') { + if (defined($queue_entry->[0])) { + return $queue_entry->[0]; + } + return undef; + } elsif (ref($queue_entry) eq 'HASH') { + if (defined($queue_entry->{'slot'})) { + return $queue_entry->{'slot'}; + } + return undef; + } + return undef; +} + 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; } } - my $slot=$queuedata->{$key}[0]; - my %slot_data=&Apache::lonnet::get_slot($slot); - if ($slot_data{'endtime'} > time) { - &Apache::lonxml::debug("not time"); - next; + my $end_time; + if (my $slot=&slotted_access($queuedata->{$key})) { + &Apache::lonxml::debug("looking at slot $slot"); + my %slot_data=&Apache::lonnet::get_slot($slot); + if ($slot_data{'endtime'} < time) { + $end_time = $slot_data{'endtime'}; + } else { + &Apache::lonxml::debug("not time ".$slot_data{'endtime'}); + next; + } + } else { + my $due_date = &Apache::lonhomework::due_date('0',$symb); + if ($due_date < time) { + $end_time = $due_date; + } else { + &Apache::lonxml::debug("not time $due_date"); + next; + } } + if (exists($queuedata->{"$key\0locked"})) { &Apache::lonxml::debug("someone already has um."); next; } - push(@possible,[$key,$slot_data{'endtime'}]); + push(@possible,[$key,$end_time]); } if (@possible) { # sort entries in order by slot end time @possible = sort { $a->[1] <=> $b->[1] } @possible; - # pick one of the first ten entries - my $max=($#possible < 10) ? $#possible : 10; - return $possible[int(rand($max))][0]; + # pick one of the entries in the top 10% in small queues and one + # of the first ten entries in large queues + #my $ten_percent = int($#possible * 0.1); + #if ($ten_percent < 1 ) { $ten_percent = 1; } + #if ($ten_percent > 10) { $ten_percent = 10; } + #my $max=($#possible < $ten_percent) ? $#possible : $ten_percent; + + #return $possible[int(rand($max))][0]; + return $possible[0][0]; } return undef; } sub find_mid_grade { my ($queue,$symb,$cdom,$cnum)=@_; - my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'}); - my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + 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); if ($who eq $me) { return $todo; } @@ -1377,7 +1629,7 @@ sub find_mid_grade { sub lock_key { my ($queue,$todo)=@_; - my $me=$env{'user.name'}.'@'.$env{'user.domain'}; + my $me=$env{'user.name'}.':'.$env{'user.domain'}; my (undef,$cid)=&Apache::lonxml::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; @@ -1397,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; @@ -1406,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; @@ -1421,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 @@ -1431,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 @@ -1490,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'}; @@ -1522,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; @@ -1532,10 +1791,8 @@ sub select_user { $seclist.=''; } - my $studentdis = $student; - $studentdis =~ tr/:/@/; + $result.=&Apache::loncommon::start_data_table_row(); $result.=<
    @@ -1545,7 +1802,7 @@ sub select_user { $seclist
    -
    $fullname->{$student} ($studentdis)$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] ($student) RESULT } @@ -1584,9 +1841,9 @@ RESULT } else { $result.=" "; } - $result.= '
    '; + $result.=&Apache::loncommon::end_data_table(); return $result; } @@ -1639,6 +1896,16 @@ sub get_id { } my %dimension; +sub start_Setup { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + undef(%dimension); + my $dim_id=&get_id($parstack,$safeeval); + $Apache::bridgetask::dimension=$dim_id; + undef(@Apache::bridgetask::instance); + &Apache::lonxml::startredirection(); + return &internal_location($dim_id); +} +sub start_Question { return &start_Dimension(@_); } sub start_Dimension { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; undef(%dimension); @@ -1652,6 +1919,20 @@ sub start_Dimension { return &internal_location($dim_id); } +sub start_QuestionText { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $dim_id=$Apache::bridgetask::dimension; + my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style); + if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { + $dimension{'questiontext'}=$text; + } + return ''; +} + +sub end_QuestionText { + return ''; +} + sub get_instance { my ($dim)=@_; my $rand_alg=&Apache::lonnet::get_rand_alg(); @@ -1681,9 +1962,11 @@ sub get_instance { } @instances = &Math::Random::random_permutation(@instances); $instance = $instances[($version-1)%scalar(@instances)]; - $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = - $instance; - $Apache::lonhomework::results{'INTERNAL_store'} = 1; + if ($version =~ /^\d$/) { + $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = + $instance; + $Apache::lonhomework::results{'INTERNAL_store'} = 1; + } &Apache::response::poprandomnumber(); return $instance; } @@ -1691,6 +1974,12 @@ sub get_instance { { my $last_link; + 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(); @@ -1704,9 +1993,12 @@ sub get_instance { if (&Apache::response::showallfoils()) { @instances = @{$dimension{'instances'}}; } + my $shown_question_text; foreach my $instance (@instances) { @Apache::scripttag::parser_env = @_; $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); + @Apache::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{'questiontext'}); if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' || $Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') { @@ -1726,11 +2018,12 @@ sub get_instance { my $man_passed=0; my $opt_count=0; my $opt_passed=0; - foreach my $id (@{$dimension{$instance.'.criterias'}}) { - if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} + 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.$instance.$id.status"} eq 'pass') { + if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"} eq 'pass') { $opt_passed++; } } else { @@ -1741,17 +2034,24 @@ sub get_instance { } } if ($man_passed eq $man_count) { $man_passed='all'; } + my $opt_req=$dimension{$instance.'.optionalrequired'}; - if ($opt_req !~ /\S/) { $opt_req='0'; } + 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'}}) { - my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"}; - my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}; - my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); + 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 { @@ -1764,15 +2064,14 @@ sub get_instance { } my $status_display=$status; $status_display=~s/^([a-z])/uc($1)/e; - @Apache::scripttag::parser_env = @_; $result.= '

    ' .$mandatory.' Criteria

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

    '.$status_display.'

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

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

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

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

    '; } $result.='
    '; } @@ -1784,32 +2083,33 @@ sub get_instance { &Apache::scripttag::xmlparse($dimension{'intro'}); @Apache::scripttag::parser_env = @_; &Apache::scripttag::xmlparse($dimension{$instance.'.text'}); - foreach my $id (@{$dimension{$instance.'.criterias'}}) { - my $link='LC_GRADE_criteria_'.$instance.'_'.$id; - my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"}; - $result.='
    '."\n". - ''."\n". - ''."\n". - '
    '."\n"; + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{'questiontext'}); + 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{$instance.'.criteria.'.$id}); + $result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id}); $result.='
    '."\n". - #$dimension{$instance.'.criteria.'.$id}. - '
    '."\n"; - $result.=&grading_history($version,$dim,$instance,$id); + $result.=&grading_history($version,$dim,$id); $last_link=$link; } } elsif ($target eq 'grade' && $env{'form.webgrade'}) { @@ -1817,10 +2117,20 @@ sub get_instance { my $mandatory_failed=0; my $ungraded=0; my $review=0; - foreach my $id (@{$dimension{$instance.'.criterias'}}) { - my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id}; - $Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id}; - my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); + + @Apache::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{'intro'}); + @Apache::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'}); + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{'questiontext'}); + + foreach my $id (@{$dimension{$instance.'.criterias'}}, + @{$dimension{'criterias'}}) { + my $link=&link($id); + 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') { @@ -1833,7 +2143,15 @@ sub get_instance { $ungraded++; } } - if ($optional_passed < $dimension{$instance.'.optionalrequired'}) { + # 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++; } &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); @@ -1856,19 +2174,54 @@ sub get_instance { } 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{'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'}); + @Apache::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{'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{'intro'}); + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{$instance.'.text'}); + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{'questiontext'}); + } else { + # any other targets no output + undef($result); + } + return $result; + } } sub grading_history { - my ($version,$dim,$instance,$criteria) = @_; + my ($version,$dim,$id) = @_; if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { return ''; } my ($result,$grader); - my $scope="resource.$version.0.$dim.$instance.$criteria"; + my $scope="resource.$version.0.$dim.$id"; foreach my $t (1..$Apache::lonhomework::history{'version'}) { if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) { my ($gname,$gdom) = - split('@',$Apache::lonhomework::history{$t.':resource.0.regrader'}); + split(':',$Apache::lonhomework::history{$t.':resource.0.regrader'}); my $fullname = &Apache::loncommon::plainname($gname,$gdom); $grader = &Apache::loncommon::aboutmewrapper($fullname, $gname,$gdom); @@ -1885,7 +2238,7 @@ sub grading_history { } } if ($result) { - return '
      '.$result.'
    '; + return '
      '.$result.'
    '; } return ''; } @@ -1893,12 +2246,13 @@ sub grading_history { sub start_IntroParagraph { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'web' || $target eq 'webgrade') { - if ($tagstack->[-2] eq 'Dimension') { - $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style); - - } elsif ($target eq 'webgrade') { - &Apache::lonxml::get_all_text('/introparagraph',$parser,$style); + if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { + if ($tagstack->[-2] eq 'Dimension' || $tagstack->[-2] eq 'Question' ) { + $dimension{'intro'}= + &Apache::lonxml::get_all_text('/introparagraph', + $parser,$style); + } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') { + &Apache::lonxml::startredirection(); } } @@ -1906,6 +2260,10 @@ sub start_IntroParagraph { } sub end_IntroParagraph { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + if ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') { + my $result = &Apache::lonxml::endredirection(); + } } sub start_Instance { @@ -1930,7 +2288,7 @@ sub start_InstanceText { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $instance_id=$Apache::bridgetask::instance[-1]; my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style); - if ($target eq 'web' || $target eq 'webgrade') { + if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { $dimension{$instance_id.'.text'}=$text; } return ''; @@ -1942,14 +2300,21 @@ sub end_InstanceText { sub start_Criteria { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $instance_id=$Apache::bridgetask::instance[-1]; my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style); if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { my $id=&get_id($parstack,$safeeval); - $dimension{$instance_id.'.criteria.'.$id}=$criteria; - $dimension{$instance_id.'.criteria.'.$id.'.mandatory'}= - &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); - push(@{$dimension{$instance_id.'.criterias'}},$id); + 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"}= + &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); + push(@{$dimension{$instance_id.'.criterias'}},"$instance_id.$id"); + } else { + $dimension{'criteria.'.$id}=$criteria; + $dimension{'criteria.'.$id.'.mandatory'}= + &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); + push(@{$dimension{'criterias'}},$id); + } } return ''; } @@ -1988,7 +2353,7 @@ sub proctor_validation_screen { Student who should be logged in is: Name:$name Student ID:$env{'environment.id'} - Usename$user\@$domain + Usename$user:$domain