--- loncom/homework/bridgetask.pm 2006/09/28 18:59:11 1.182 +++ loncom/homework/bridgetask.pm 2007/08/01 23:57:35 1.234 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.182 2006/09/28 18:59:11 albertel Exp $ +# $Id: bridgetask.pm,v 1.234 2007/08/01 23:57:35 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,21 +38,20 @@ 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','QuestionText','Setup','Instance','InstanceText','Criteria','ClosingParagraph')); + &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','CriteriaText','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::top_dimensionlist=(); # list of all current Instance ids %Apache::bridgetask::instance=(); # list of all Instance ids seen in this problem @@ -98,6 +97,7 @@ sub check_in { &check_in_sequence($user,$domain,$slot_name); } else { &create_new_version($type,$user,$domain,$slot_name); + &Apache::structuretags::finalize_storage(); } return 1; } @@ -105,7 +105,7 @@ sub check_in { sub check_in_sequence { my ($user,$domain,$slot_name) = @_; my $navmap = Apache::lonnavmaps::navmap->new(); - my ($symb) = &Apache::lonxml::whichuser(); + my ($symb) = &Apache::lonnet::whichuser(); my ($map) = &Apache::lonnet::decode_symb($symb); my @resources = $navmap->retrieveResources($map, sub { $_[0]->is_problem() },0,0); @@ -225,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); @@ -234,36 +234,43 @@ sub add_grading_button { if (scalar(keys(%sections)) < 3) { $size=scalar(keys(%sections))+2; } - my $sec_select = ''."\n"; + $sec_select .= "\t\n"; foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) { - $sec_select .= "\n"; + $sec_select .= "\t\n"; } - $sec_select .= "\n"; + $sec_select .= "\t\n\n"; - my $result=' '; - $result.=''; + $result.="\n\t".''; if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); - $result.=''; - $result.=''; - $result.=''; + $result.="\n\t\t\t".''. + "\n\t\t\t".''; + $result.="\n\t\t\t".''."\n"; + $result.= "\n\t\t\t\t".&mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).''."\n\t\t".''."\n"; ($entries,$ready,$locks)=&get_queue_counts('reviewqueue'); - $result.=''."\n"; - $result.='
Specify a section: '.$sec_select.''.' '."\n\t\t".'
Specify a section: '.$sec_select."\n\t\t\t".''.' '; - $result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).'
'. - ' '. + "\n\t\t\t".''. + "\n\t\t\t\t".' '; $result.=&mt("[_1] entries, [_2] ready, [_3] being graded", - $entries,$ready,$locks).'
'."\n"; - $result.='

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

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

'; + $result.= '

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

+

Will be next available: $description

STUFF } if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } $symb=&escape($symb); - $result.='
'. - ''. - ''. + $result.= + "\n\t".''."\n\t\t". + ''."\n\t\t". + ''."\n\t\t". ''. - '
'; + &mt($text).'" />'."\n\t". + ''."\n"; return $result; } @@ -326,9 +334,22 @@ sub style { my ($target) = @_; if ($target eq 'web' || $target eq 'webgrade') { - return (< STYLE + if ($env{'browser.type'} eq 'explorer' + && $env{'browser.os'} eq 'win' ) { + if ($env{'browser.version'} < 7) { + $style .= (< +STYLE + } else { + $style .= (< +STYLE + } + } + return $style; } return; } @@ -359,6 +380,13 @@ sub nest { } } +sub start_delay { + push(@delay,1); +} +sub end_delay { + pop(@delay); +} + sub nested_parse { my ($str,$env,$args) = @_; my @old_env = @Apache::scripttag::parser_env; @@ -388,11 +416,12 @@ sub internal_location { } 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; } @@ -425,7 +454,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/'; @@ -458,6 +487,7 @@ sub webgrade_standard_info { 'stop' => 'Quit Grading', 'fail' => 'Fail Rest', 'cancel' => 'Cancel', + 'submit' => 'Submit Grades', ); %lt=&Apache::lonlocal::texthash(%lt); @@ -465,28 +495,37 @@ sub webgrade_standard_info {
INFO - if (&grade_mode() eq 'regrade') { + if ($env{'request.state'} eq 'construct') { $result.=< +INFO + } else { + if (&grade_mode() eq 'regrade' && $env{'request.state'} ne 'construct') { + $result.=< INFO - } + } - $result.=< +INFO + } + $result.=<
$file_list INFO return $result; + } sub done_screen { my ($version) = @_; - my $title=&Apache::lonnet::gettitle(); + my $title=&Apache::lonnet::gettitle($env{'request.uri'}); my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'}); - my (undef,undef,$domain,$user)= &Apache::lonxml::whichuser(); + my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser(); my $files = '
    '; my $msg; foreach my $file (@files) { @@ -561,7 +600,6 @@ sub start_Task { &Apache::structuretags::page_start($target,$token,$tagstack, $parstack,$parser,$safeeval, $name,&style($target)); - $result .= '
    '."\n"; } if ($target eq 'web' && $env{'request.state'} ne 'construct') { @@ -570,7 +608,7 @@ sub start_Task { $result.='
    '.&add_grading_button()."
    "; + $result.=$uri.'">'.&add_grading_button()."\n"; my $symb=&Apache::lonnet::symbread(); if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { $result.='
    '. @@ -591,7 +629,7 @@ sub start_Task { } } } - if ($target eq 'web' && $env{'request.state'} eq 'construct') { + if ($target =~/(web|webgrade)/ && $env{'request.state'} eq 'construct') { $form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'}); } if ($target eq 'web' @@ -610,6 +648,11 @@ sub start_Task { 'slot' => $slot_name}); ($version,$previous)=&get_version(); } + + my $status_id = + ($previous || $status eq 'SHOW_ANSWER') ? 'LC_task_feedback' + : 'LC_task_take'; + $result .= '
    '."\n"; push(@Apache::inputtags::status,$status); $Apache::inputtags::slot_name=$slot_name; @@ -668,8 +711,8 @@ sub start_Task { } elsif ($target eq 'web') { $result.=&preserve_grade_info(); - $result.=&internal_location(); - $result.=$form_tag_start. + $result.=&internal_location(); + $result.=$form_tag_start."\t". ''; &Apache::lonxml::startredirection(); } @@ -677,24 +720,25 @@ sub start_Task { $target eq 'webgrade') { my $webgrade='yes'; if ($target eq 'webgrade') { + $result .= '
    '."\n"; $result.= "\n".'
    '."\n". ''; #$result.='
    Review'.&show_queue('reviewqueue'); #$result.='
    Grade'.&show_queue('gradingqueue'); } - # FIXME Blast! still need to reorg this, need to reshow the - # queue being reviewed once done with the grade pass... - # Hrrm, vaildation pass should perhaps say 'not_locked' - # perhaps do a search if there is a key that is mine and if - # there isn't reshow the queue.... + my ($todo,$status_code,$msg)=&get_key_todo($target); if ($todo) { &setup_env_for_other_user($todo,$safeeval); my ($symb,$uname,$udom)=&decode_queue_key($todo); - $result.="\n".'
    Found '. - &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'
    '; + if ($env{'request.state'} eq 'construct') { + $symb = $env{'request.uri'}; + } + $result.="\n".'

    '. + &mt('Grading [_1] for [_2] at [_3]', + &Apache::lonnet::gettitle($symb),$uname,$udom).'

    '; $form_tag_start.= ''; @@ -769,17 +813,34 @@ sub start_Task { } } if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); } + } elsif ($target eq 'webgrade' + && $env{'request.state'} eq 'construct') { + $result.=$form_tag_start; + $result.=''; + $result.=&webgrade_standard_info(); } if ($target eq 'webgrade') { $result.="\n".'
    '; + &Apache::lonxml::startredirection(); + &start_delay(); + $dimension{$top}{'result'}=$result; + undef($result); } } elsif ($target eq 'edit') { $result.=$form_tag_start. &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.")."
    "; - my $temp=&Apache::edit::insertlist($target,$token); - $result.=$temp; + $result.= &Apache::edit::text_arg('Required number of passed optional elements to pass the Task:','OptionalRequired',$token,10)."
    \n"; + $result.= &Apache::edit::insertlist($target,$token); + } elsif ($target eq 'modified') { + my $constructtag= + &Apache::edit::get_new_args($token,$parstack,$safeeval, + 'OptionalRequired'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + } } else { # page_start returned a starting result, delete it if we don't need it $result = ''; @@ -805,6 +866,12 @@ sub get_key_todo { my ($target)=@_; my $todo; + if ($env{'request.state'} eq 'construct') { + my ($symb,$cid,$udom,$uname) = &Apache::lonnet::whichuser(); + my $gradingkey=&encode_queue_key($symb,$udom,$uname); + return ($gradingkey); + } + if (defined($env{'form.reviewasubmission'})) { &Apache::lonxml::debug("review a submission...."); $env{'form.queue'}='reviewqueue'; @@ -830,11 +897,11 @@ 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'}; - my $udom = $env{'form.gradingdomain'}; + my $uname = &LONCAPA::clean_username($env{'form.gradinguser'}); + my $udom = &LONCAPA::clean_domain($env{'form.gradingdomain'}); my $gradingkey=&encode_queue_key($symb,$udom,$uname); @@ -997,8 +1064,13 @@ sub end_Task { } if (!$previous && $status ne 'SHOW_ANSWER' && &show_task($status,$previous)) { - $result.=&Apache::inputtags::gradestatus('0'); - $result.=''; + $result.=&Apache::inputtags::gradestatus('0',$target,1); + } + + $result.=''; + + if (!$previous && $status ne 'SHOW_ANSWER' && + &show_task($status,$previous)) { my $action = &Apache::lonenc::check_encrypt($env{'request.uri'}); $result.=< @@ -1010,8 +1082,7 @@ DONEBUTTON if (&show_task($status,$previous) && $Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass|fail)$/) { my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"}; - my $title=&Apache::lonnet::gettitle(); - + my $title=&Apache::lonnet::gettitle($env{'request.uri'}); my $start_time; my $slot_name= @@ -1026,38 +1097,43 @@ DONEBUTTON } $start_time=&Apache::lonlocal::locallocaltime($start_time); - my $status = "\n
    \n"; + my $status = + "\n
    \n\t"; + my $dim = $top; + my %counts = &get_counts($dim,undef,$parstack, + $safeeval); + my $question_status ="\n\t

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

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

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

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

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

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

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

    \n"; my $internal_location=&internal_location(); $result=~s/\Q$internal_location\E/$status/; @@ -1077,7 +1153,8 @@ DONEBUTTON } - if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { + if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous + && $status eq 'CAN_ANSWER') { my $award='SUBMITTED'; &Apache::essayresponse::file_submission("$version.0",'bridgetask', 'portfiles',\$award); @@ -1101,8 +1178,6 @@ DONEBUTTON if ($award eq 'SUBMITTED') { &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' && exists($env{'form.cancel'})) { @@ -1118,19 +1193,29 @@ DONEBUTTON my $ungraded=0; my $review=0; &Apache::lonhomework::showhash(%Apache::lonhomework::results); - foreach my $dim (keys(%Apache::bridgetask::top_dimensionlist)) { + my $dim = $top; + foreach my $id (@{$dimension{$dim}{'criterias'}}) { + my $link=&link($id); + + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + + if ($type eq 'criteria') { + # dimensional 'criteria' don't get assigned grades + $Apache::lonhomework::results{"resource.$version.0.$id.status"}=$env{'form.HWVAL_'.$link}; + $Apache::lonhomework::results{"resource.$version.0.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; + } my $status= - $Apache::lonhomework::results{"resource.$version.0.$dim.status"}; - my $mandatory= - ($Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'} ne 'N'); + $Apache::lonhomework::results{"resource.$version.0.$id.status"}; + my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); + if ($status eq 'pass') { if (!$mandatory) { $optional_passed++; } } elsif ($status eq 'fail') { if ($mandatory) { $mandatory_failed++; } - } elsif ($status eq 'ungraded') { - $ungraded++; } elsif ($status eq 'review') { $review++; + } elsif ($status eq 'ungraded') { + $ungraded++; } else { $ungraded++; } @@ -1138,40 +1223,19 @@ DONEBUTTON if ($optional_passed < $optional_required) { $mandatory_failed++; } - &Apache::lonxml::debug("all dim ".join(':',keys(%Apache::bridgetask::top_dimensionlist))."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); + &Apache::lonxml::debug(" task results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); $Apache::lonhomework::results{'resource.0.regrader'}= $env{'user.name'}.':'.$env{'user.domain'}; if ($review) { $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 { - if ($env{'form.queue'} ne 'none') { - &move_between_queues($env{'form.queue'},'reviewqueue'); - } else { - &add_to_queue('reviewqueue',\%queue_data); - } - } } elsif ($ungraded) { $Apache::lonhomework::results{"resource.$version.0.status"}='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) { $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"}= @@ -1187,9 +1251,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"}; @@ -1212,9 +1274,67 @@ 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.="
    "; + if (&nest()) { + &Apache::lonxml::endredirection(); + &end_delay(); + $result.=$dimension{$top}{'result'}; + } else { + $result.=&Apache::lonxml::endredirection(); + } + my $dim = $top; + foreach my $id (@{$dimension{$dim}{'criterias'}} ) { + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + if ($type eq 'dimension') { + # dimensional 'criteria' don't get assigned grades + next; + } else { + my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_]); + $criteria = &layout_webgrade_Criteria($dim,$id,$criteria); + my $internal_location=&internal_location($id); + if ($result =~ m/\Q$internal_location\E/) { + $result=~s/\Q$internal_location\E/$criteria/; + } else { + $result.=$criteria; + } + + } + } + $result.="
    "; #$result.=' '; #$result.=''. + &mt('Return to resource').'


    '. + "\n

    Current Queue - $queue

    "; 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

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

    Current Queue - $title $queue

    ". + $result.= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(); if ($with_selects) { $result.="Status"; } @@ -1495,9 +1619,16 @@ sub show_queue { my $ekey=&escape($key); my ($action,$description,$status)=('select',&mt('Select')); if (exists($queue{"$key\0locked"})) { + my ($locker,$time) = + &get_lock_info($queue{"$key\0locked"}); + if ($time) { + $time = + &Apache::lonnavmaps::timeToHumanString($time, + 'start'); + } my $me=$env{'user.name'}.':'.$env{'user.domain'}; - $status=&mt('Locked by [_1]',$queue{"$key\0locked"}); - if ($me eq $queue{"$key\0locked"}) { + $status=&mt('Locked by [_1] [_2]',$locker,$time); + if ($me eq $locker) { ($action,$description)=('resume',&mt('Resume')); } else { ($action,$description)=('unlock',&mt('Unlock')); @@ -1543,7 +1674,7 @@ FORM 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'}; @@ -1560,7 +1691,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$/) { @@ -1601,14 +1731,14 @@ 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'}; } my ($key_locked,$value)= &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum); if ($key_locked eq "$key\0locked") { - return $value; + return &get_lock_info($value); } return undef; } @@ -1689,6 +1819,24 @@ sub pick_from_queue_data { return undef; } +sub get_lock_info { + my ($lock_info) = @_; + if (wantarray) { + if (ref($lock_info) eq 'ARRAY') { + return @{$lock_info}; + } else { + return ($lock_info); + } + } else { + if (ref($lock_info) eq 'ARRAY') { + return $lock_info->[0]; + } else { + return $lock_info; + } + } + return; +} + sub find_mid_grade { my ($queue,$symb,$cdom,$cnum)=@_; my $todo=&unescape($env{'form.gradingkey'}); @@ -1700,7 +1848,7 @@ sub find_mid_grade { my $regexp="^$symb\0.*\0locked\$"; my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp); foreach my $key (keys(%locks)) { - my $who=$locks{$key}; + my $who= &get_lock_info($locks{$key}); if ($who eq $me) { $todo=$key; $todo=~s/\0locked$//; @@ -1713,10 +1861,10 @@ 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}, + my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> [$me,time]}, $cdom,$cnum); &Apache::lonxml::debug("success $success $todo"); if ($success eq 'ok') { @@ -1728,7 +1876,7 @@ 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'}; } @@ -1752,7 +1900,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); @@ -1828,7 +1976,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'); @@ -1957,6 +2105,9 @@ sub start_ClosingParagraph { if ($target eq 'web') { } elsif ($target eq 'webgrade') { &Apache::lonxml::startredirection(); + } elsif ($target eq 'edit') { + $result = &Apache::edit::tag_start($target,$token); + } elsif ($target eq 'modified') { } return $result; } @@ -1971,8 +2122,20 @@ sub end_ClosingParagraph { return $result; } +sub insert_ClosingParagraph { + return ' + + + +'; +} + sub get_dim_id { - return $Apache::bridgetask::dimension[-1]; + if (@Apache::bridgetask::dimension) { + return $Apache::bridgetask::dimension[-1]; + } else { + return $top; + } } sub get_id { @@ -1984,11 +2147,24 @@ sub get_id { sub start_Setup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - #undef(%dimension); + my $result; my $dim = &get_id($parstack,$safeeval); push(@Apache::bridgetask::dimension,$dim); - &Apache::lonxml::startredirection(); - return &internal_location($dim); + if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { + &Apache::lonxml::startredirection(); + } elsif ($target eq 'edit') { + $result = &Apache::edit::tag_start($target,$token); + $result.= &Apache::edit::text_arg('Id:','id',$token,10). + &Apache::edit::end_row(). + &Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag= + &Apache::edit::get_new_args($token,$parstack,$safeeval,'id'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + } + } + return $result; } { @@ -2015,47 +2191,89 @@ sub start_Dimension { 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; - &Apache::lonxml::debug("adding $dim as criteria to $previous_dim"); - } else { - $Apache::bridgetask::top_dimensionlist{$dim}{'manadatory'}= - &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); + my $result; + if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { + 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); + $dimension{$dim}{'nested'}=$top; + } + push(@Apache::bridgetask::dimension,$dim); + &Apache::lonxml::startredirection(); + if (!&skip_dimension_parsing($dim)) { + &enable_dimension_parsing($dim); + } + } elsif ($target eq 'edit') { + $result = &Apache::edit::tag_start($target,$token); + $result.= + &Apache::edit::text_arg('Id:','id',$token,10).' '. + &Apache::edit::select_arg('Passing is Mandatory:','Mandatory', + [['Y', 'Yes'], + ['N','No'],], + $token).'
    '. + &Apache::edit::text_arg('Required number of passed optional elements to pass the '.$token->[1].':', + 'OptionalRequired',$token,4). + &Apache::edit::end_row(). + &Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag= + &Apache::edit::get_new_args($token,$parstack,$safeeval, + 'id','Mandatory','OptionalRequired'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + } } - push(@Apache::bridgetask::dimension,$dim); - &Apache::lonxml::startredirection(); - &enable_dimension_parsing($dim); - return &internal_location($dim); + return $result;# &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); + my $result; if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { + my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style); + my $dim = &get_dim_id(); $dimension{$dim}{'questiontext'}=$text; + } elsif ($target eq 'edit') { + $result = &Apache::edit::tag_start($target,$token); + } elsif ($target eq 'modified') { } - return ''; + return $result; } sub end_QuestionText { return ''; } +sub insert_QuestionText { + return ' + + + +'; +} + sub get_instance { my ($dim)=@_; my $rand_alg=&Apache::lonnet::get_rand_alg(); @@ -2100,8 +2318,8 @@ sub get_instance { sub get_criteria { my ($what,$version,$dim,$id) = @_; my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; - my $prefix = ($type eq 'criteria') ? "$dim.$id" - : "$id"; + my $prefix = ($type eq 'criteria' && $dim ne $top) ? "$dim.$id" + : "$id"; my $entry = "resource.$version.0.$prefix.$what"; if (exists($Apache::lonhomework::results{$entry})) { return $Apache::lonhomework::results{$entry}; @@ -2109,290 +2327,370 @@ sub get_criteria { return $Apache::lonhomework::history{$entry}; } -{ - 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(); - my $dim=&get_id($parstack,$safeeval); +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; + my $dim=&get_id($parstack,$safeeval); + if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { + $result=&Apache::lonxml::endredirection(); if (&skip_dimension_parsing($dim)) { - &disable_dimension_parsing($dim); pop(@Apache::bridgetask::dimension); return; } - my $instance=&get_instance($dim); - my $version=&get_version(); - if ($target eq 'web') { - $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); - my @instances = $instance; - if (&Apache::response::showallfoils()) { - @instances = @{$dimension{$dim}{'instances'}}; - } - my $shown_question_text; - foreach my $instance (@instances) { - $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'}, - [@_]); - $result .= &nested_parse(\$dimension{$dim}{'questiontext'}, - [@_],{'set_dim_id' => undef}); - my $task_status = - $Apache::lonhomework::history{"resource.$version.0.status"}; - if ($task_status ne 'pass' && $task_status ne 'fail') { - - foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, - @{$dimension{$dim}{'criterias'}}) { - my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; - &Apache::lonxml::debug("$id is $type"); - if ($type eq 'dimension') { - $result.= - &nested_parse(\$dimension{$dim}{'criteria.'.$id}, - [@_],{'set_dim_id' => $id}); - } - } - } else { - my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"}; - my $mandatory='Mandatory'; - if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') { - $mandatory='Optional'; - } - my $dim_info="
    \n"; - if ($dim_status eq 'pass') { - $dim_info.='

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

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

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

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

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

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

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

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

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

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

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

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

    ' - .$mandatory.' Criteria

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

    '.$status_display.'

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

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

    '; - } - $result.='
    '; + [@_]); + $dim_info .= &layout_web_Criteria($dim,$id,$criteria); } } - } - } elsif ($target eq 'webgrade') { - # in case of any side effects that we need - &nested_parse(\$dimension{$dim}{'intro'},[@_]); - &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]); - $result.= - &nested_parse(\$dimension{$dim}{'questiontext'},[@_], - {'set_dim_id' => undef, - 'delayed_dim_results' => 1}); - foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, - @{$dimension{$dim}{'criterias'}} ) { - my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; - if ($type eq 'dimension') { - # dimensional 'criteria' don't get assigned grades - $result.= - &nested_parse(\$dimension{$dim}{'criteria.'.$id}, - [@_],{'set_dim_id' => $id}); - next; - } - - my $link=&link($id); - my $status= &get_criteria('status',$version,$dim,$id); - $result.='
    '."\n". - '
    '."\n"; - $result.= - &nested_parse(\$dimension{$dim}{'criteria.'.$id},[@_]); - - $result.='
    '."\n". - '
    '."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - '
    '."\n". - ''."\n". - '
      '."\n". - '
    • Prev
    • '."\n". - '
    • Next
    • '."\n". - '
    '."\n". - '
    '."\n"; - $result.=&grading_history($version,$dim,$id); - $last_link=$link; - } - if (&nest()) { - &Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'}); - $dimension{$dimension{$dim}{'nested'}}{'result'}.=$result; - undef($result); - } - } 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}; + # puts the results at the end of the dimension + if ($result =~m{}) { + $result=~s{}{$dim_info}; } else { - $result .= - &nested_parse(\$dimension{$dim}{'criteria.'.$id}, - [@_],{'set_dim_id' => $id}); + $result .= $dim_info; } - 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++; + # puts the results at the beginning of the dimension + # my $internal_location=&internal_location($dim); + # $result=~s/\Q$internal_location\E/$dim_info/; + } + } + if ($result !~ /^\s*$/s) { + # FIXME? this maybe unneccssary in the future, (CSE101 BT + # from Fall 2006 geenrate a div that attempts to hide some + # of the output in an odd way, this is a workaround so + # those old ones will continue to work. # It puts the + # LC_question div to come after any starting closie div + # that the dimension produces + if ($result =~ m{^\s*
    }) { + $result =~ s{^(\s*
    )} + {$1\n
    }; + } else { + $result = "\n".'
    '. + "\n".$result; + } + $result .= "\n
    \n"; + } + } elsif ($target eq 'webgrade') { + # in case of any side effects that we need + &nested_parse(\$dimension{$dim}{'intro'},[@_]); + &nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]); + $result.= + &nested_parse(\$dimension{$dim}{'questiontext'},[@_], + {'set_dim_id' => undef, + 'delayed_dim_results' => 1}); + foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}} ) { + my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; + if ($type eq 'dimension') { + # dimensional 'criteria' don't get assigned grades + $result.= + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_],{'set_dim_id' => $id}); + next; + } else { + my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_]); + $criteria = &layout_webgrade_Criteria($dim,$id,$criteria); + my $internal_location=&internal_location($id); + if ($result =~ m/\Q$internal_location\E/) { + $result =~ s/\Q$internal_location\E/$criteria/; } else { - $ungraded++; + $result.=$criteria ; } } - # FIXME optional required can apply to only right now... - my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'}; - if ($opt_req !~ /\S/) { - $opt_req= - &Apache::lonxml::get_param('OptionalRequired', - $parstack,$safeeval); - if ($opt_req !~ /\S/) { $opt_req = 0; } - } - if ($optional_passed < $opt_req) { - $mandatory_failed++; - } - &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'; + } + 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'; } + } elsif ($target eq 'edit') { + } elsif ($target eq 'modified') { + } else { + # any other targets no output + undef($result); + } + if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { &disable_dimension_parsing(); pop(@Apache::bridgetask::dimension); - return $result; } + 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'}); +sub question_status_message { + my ($counts,$depth) = @_; + my %req = ('man' => 'mandatory', + 'opt' => 'optional',); + my %type = ('cri' => 'criteria', + 'dim' => ('sub'x($depth+1)).'questions',); + my @sections; + foreach my $req ('man','opt') { + foreach my $type ('cri','dim') { + if ($counts->{$req.'_'.$type}) { + push(@sections, + $counts->{$req.'_'.$type.'_passed'}.' of the '. + $counts->{$req.'_'.$type}.' '. + $req{$req}.' '.$type{$type}); } - } 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'}); + } + } + + my $status = 'You passed '; + if (@sections == -1) { + } elsif (@sections == 1) { + $status .= $sections[0]; + } elsif (@sections == 2) { + $status .= $sections[0].' and '.$sections[1]; + } else { + my $last = pop(@sections); + $status .= join(', ',@sections).', and '.$last; + } + $status .= '.'; + if ($counts->{'opt'}) { + $status .= ' You were required to pass '.$counts->{'opt_req'}. + ' optional '; + if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) { + $status .= + ($counts->{'opt_req'} == 1?'criterion':'criteria'); + } else { + $status .= + 'component'.($counts->{'opt_req'} == 1?'':'s'); + } + $status .= '.'; + } + return $status; +} + +sub get_counts { + my ($dim,$instance,$parstack,$safeeval) = @_; + my %counts; + my @possible = ('man_cri','man_dim', + 'opt_cri','opt_dim', + 'man_cri_passed', 'man_dim_passed', + 'opt_cri_passed', 'opt_dim_passed', + 'man_passed', + 'opt_passed', + 'opt_req'); + foreach my $which (@possible) { $counts{$which} = 0; } + + my $version = &get_version(); + + foreach my $id ( @{$dimension{$dim}{$instance.'.criterias'}}, + @{$dimension{$dim}{'criterias'}} ) { + my $status = &get_criteria('status',$version,$dim,$id); + my $which; + if ($dimension{$dim}{'criteria.'.$id.'.mandatory'} + eq 'N') { + $which = 'opt'; + } else { + $which = 'man'; + } + $counts{$which}++; + if ($status eq 'pass') { $counts{$which.'_passed'}++; } + if ($dimension{$dim}{'criteria.'.$id.'.type'} + eq 'dimension') { + $which .= '_dim'; + } else { + $which .= '_cri'; + } + $counts{$which}++; + if ($status eq 'pass') { $counts{$which.'_passed'}++; } + + + } + if ($counts{'man_dim_passed'} eq $counts{'man_dim'}) { + $counts{'man_dim_passed'}='all'; + } + if ($counts{'man_cri_passed'} eq $counts{'man_cri'}) { + $counts{'man_cri_passed'}='all'; + } + + $counts{'opt_req'}=$dimension{$dim}{$instance.'.optionalrequired'}; + if ($counts{'opt_req'} !~ /\S/) { + $counts{'opt_req'}= &Apache::lonxml::get_param('OptionalRequired', + $parstack,$safeeval); + if ($counts{'opt_req'} !~ /\S/) { $counts{'opt_req'} = 0; } + } + return %counts; +} + +sub end_Setup { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result; + my $dim=&get_id($parstack,$safeeval); + my $instance=&get_instance($dim); + my $version=&get_version(); + if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { + $result=&Apache::lonxml::endredirection(); + } + if ($target eq 'web') { + @Apache::scripttag::parser_env = @_; + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); + my @instances = $instance; + if (&Apache::response::showallfoils()) { + @instances = @{$dimension{$dim}{'instances'}}; + } + foreach my $instance (@instances) { @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); @Apache::scripttag::parser_env = @_; - &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); - } else { - # any other targets no output - undef($result); + $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); } - pop(@Apache::bridgetask::dimension); - return $result; + } elsif ($target eq 'webgrade' + || $target eq 'grade' && $env{'form.webgrade'}) { + # in case of any side effects that we need + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{$dim}{'intro'}); + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'}); + @Apache::scripttag::parser_env = @_; + &Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'}); + } else { + # any other targets no output + undef($result); } + pop(@Apache::bridgetask::dimension); + return $result; } sub grading_history { @@ -2401,7 +2699,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) = @@ -2418,11 +2718,12 @@ sub grading_history { $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"'; } if ($entry) { - $result.= "
  • $grader : $entry
  • "; + $result.= "\n\t\t
  • \n\t\t\t$grader :\n\t\t\t $entry \n\t\t
  • "; } } if ($result) { - return '
      '.$result.'
    '; + return "\n\t".'
      '.$result. + "\n\t".'
    '."\n"; } return ''; } @@ -2440,6 +2741,9 @@ sub start_IntroParagraph { &Apache::lonxml::startredirection(); } + } elsif ($target eq 'edit') { + $result = &Apache::edit::tag_start($target,$token); + } elsif ($target eq 'modified') { } return $result; } @@ -2451,6 +2755,14 @@ sub end_IntroParagraph { } } +sub insert_IntroParagraph { + return ' + + + +'; +} + sub start_Instance { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $dim = &get_dim_id(); @@ -2464,33 +2776,83 @@ sub start_Instance { if (lc($disabled) eq 'yes') { $dimension{$dim}{$id.'.disabled'}='1'; } - return ''; + my $result; + if ($target eq 'edit') { + $result = &Apache::edit::tag_start($target,$token); + $result.= + &Apache::edit::text_arg('Id:','id',$token,10).' '. + &Apache::edit::select_arg('Instance is Disabled:','Disabled', + [['no', 'No'], + ['yes','Yes'],], + $token) + .'
    '. + &Apache::edit::text_arg('Required number of passed optional elements to pass the Instance:', + 'OptionalRequired',$token,4) + .&Apache::edit::end_row(). + &Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag= + &Apache::edit::get_new_args($token,$parstack,$safeeval, + 'id','OptionalRequired','Disabled'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + } + } + return $result; } sub end_Instance { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result; + if ($target eq 'edit') { + $result = &Apache::edit::tag_end($target,$token); + } + return $result; } sub start_InstanceText { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $dim = &get_dim_id(); - my $instance_id=$Apache::bridgetask::instance{$dim}[-1]; - my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style); + my $result; if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { + my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style); + my $dim = &get_dim_id(); + my $instance_id=$Apache::bridgetask::instance{$dim}[-1]; $dimension{$dim}{$instance_id.'.text'}=$text; + } elsif ($target eq 'edit') { + $result = &Apache::edit::tag_start($target,$token); + } elsif ($target eq 'modified') { } - return ''; + return $result; } sub end_InstanceText { return ''; } +sub insert_InstanceText { + return ' + + + +'; +} + 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 $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style); my $dim = &get_dim_id(); my $id=&get_id($parstack,$safeeval); + if ($target eq 'web' || $target eq 'webgrade') { + if ($target eq 'webgrade') { + &Apache::lonxml::debug(" for $dim $id stashing results into $dim "); + $dimension{$dim}{'result'} .= &internal_location($id); + } else { + &Apache::lonxml::debug(" not stashing $dim $id"); + #$result .= &internal_location($id); + } + } &Apache::lonxml::debug("Criteria $id with $dim"); if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) { my $instance_id=$Apache::bridgetask::instance{$dim}[-1]; @@ -2506,30 +2868,220 @@ sub start_Criteria { &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); push(@{$dimension{$dim}{'criterias'}},$id); } + } elsif ($target eq 'edit') { + $result .=&Apache::edit::tag_start($target,$token); + $result.= + &Apache::edit::text_arg('Id:','id',$token,10).' '. + &Apache::edit::select_arg('Passing is Mandatory:','Mandatory', + [['Y', 'Yes'], + ['N','No'],], + $token) + .'
    '.&Apache::edit::end_row(). + &Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag= + &Apache::edit::get_new_args($token,$parstack,$safeeval, + 'id','Mandatory'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } - return ''; + return $result; +} + +sub layout_web_Criteria { + my ($dim,$id,$criteria) = @_; + + my $version = &get_version(); + my $status= &get_criteria('status', $version,$dim,$id); + my $comment=&get_criteria('comment',$version,$dim,$id); + my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N'); + if ($mandatory) { + $mandatory='Mandatory'; + } else { + $mandatory='Optional'; + } + my $status_display=$status; + $status_display=~s/^([a-z])/uc($1)/e; + my $criteria_info.= + '
    '."\n\t".'

    ' + .$mandatory.' Criteria

    '."\n\t".'

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

    '. + "\n\t".'

    '.$status_display.'

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

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

    '; + } + $criteria_info.="\n".'
    '."\n"; + + return $criteria_info; +} + +sub layout_webgrade_Criteria { + my ($dim,$id,$criteria) = @_; + my $link=&link($id); + my $version = &get_version(); + my $status = &get_criteria('status',$version,$dim,$id); + my %lt = ( 'ungraded' => 'Ungraded', + 'fail' => 'Fail', + 'pass' => 'Pass', + 'review' => 'Review', + 'comment' => 'Additional Comment for Student', + ); + %lt = &Apache::lonlocal::texthash(%lt); + my $comment = &get_criteria('comment',$version,$dim,$id); + $comment = &HTML::Entities::encode($comment,'<>"&'); + my %checked; + foreach my $which ('ungraded','fail','pass','review') { + if ($status eq $which) { $checked{$which} = 'checked="checked"'; } + } + if (!%checked) { $checked{'ungraded'} = 'checked="checked"'; } + my $buttons; + foreach my $which ('ungraded','fail','pass','review') { + $buttons .= < + + $lt{$which} + +END_BUTTON + } + $criteria =~ s/^\s*//s; + $criteria =~ s/\s*$//s; + my $result = < +
    + $criteria +
    +
    +$buttons +
    + +
    +END_CRITERIA + $result .= &grading_history($version,$dim,$id); + return $result; } sub end_Criteria { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + if ($target eq 'edit') { + } elsif ($target eq 'modified') { + } +} +sub insert_Criteria { + return ' + + + + + +'; +} + +sub start_CriteriaText { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { + + } elsif ($target eq 'edit') { + $result = &Apache::edit::tag_start($target,$token); + } elsif ($target eq 'modified') { + } + return $result; +} + +sub end_CriteriaText { + return ''; +} + +sub insert_CriteriaText { + return ' + + + +'; } +sub start_GraderNote { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ($target eq 'webgrade') { + $result = '
    '. + &mt('Note to graders:').''; + } elsif ($target eq 'edit') { + $result = &Apache::edit::tag_start($target,$token); + } elsif ($target eq 'modified') { + } elsif ($target eq 'web' || $target eq 'grade') { + my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style); + } + return $result; +} + +sub end_GraderNote { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + + if ($target eq 'webgrade') { + return '
    '; + } + return; +} + +sub insert_GraderNote { + 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'); + if ($url ne '/adm/lonKaputt/lonlogo_broken.gif') { + $url = ""; + } else { + undef($url); + } + my $name=&Apache::loncommon::plainname($user,$domain); my $msg; if ($env{'form.proctorpassword'}) { - $msg='

    '.&mt("Failed to authenticate the proctor.") - .'

    '; + $msg.='

    ' + .&mt("Failed to authenticate the proctor.") + .'

    '; } + + my $valid; + my @possible_proctors=split(",",$slot->{'proctor'}); + foreach my $proctor (@possible_proctors) { + if ($proctor =~ /$LONCAPA::username_re:$LONCAPA::domain_re/) { + $valid = 1; + last; + } + } + if (!$valid) { + $msg.='

    ' + .&mt("No valid poctors are defined.") + .'

    '; + } + if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; } + my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'}); + $uri = &HTML::Entities::encode($uri,'<>&"'); my $result= (<Proctor Validation

    Your room's proctor needs to validate your access to this resource.

    $msg -
    + @@ -2545,7 +3097,7 @@ sub proctor_validation_screen { - + $url
    Name:$name
    Student ID:$env{'environment.id'}
    Usename$user:$domain