--- loncom/homework/bridgetask.pm 2006/11/14 22:12:58 1.205 +++ loncom/homework/bridgetask.pm 2007/08/03 23:29:57 1.236 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.205 2006/11/14 22:12:58 albertel Exp $ +# $Id: bridgetask.pm,v 1.236 2007/08/03 23:29:57 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,12 +38,11 @@ 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','GraderNote','ClosingParagraph')); + &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','CriteriaText','GraderNote','ClosingParagraph')); } my %dimension; @@ -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; } @@ -244,7 +244,9 @@ sub add_grading_button { my $result="\n\t".''; $result.="\n\t".''; - if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { + if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'}) + || &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'}) + ) { my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); $result.="\n\t".''."\n\t\t".''; $result.="\n\t\t\t".''. @@ -380,6 +382,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; @@ -480,6 +489,7 @@ sub webgrade_standard_info { 'stop' => 'Quit Grading', 'fail' => 'Fail Rest', 'cancel' => 'Cancel', + 'submit' => 'Submit Grades', ); %lt=&Apache::lonlocal::texthash(%lt); @@ -487,26 +497,35 @@ 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::lonnet::whichuser(); my $files = '
Specify a section:
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.= ''; @@ -787,18 +816,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 = ''; @@ -824,6 +869,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'; @@ -852,8 +903,8 @@ sub get_key_todo { 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); @@ -1016,7 +1067,7 @@ sub end_Task { } if (!$previous && $status ne 'SHOW_ANSWER' && &show_task($status,$previous)) { - $result.=&Apache::inputtags::gradestatus('0'); + $result.=&Apache::inputtags::gradestatus('0',$target,1); } $result.=''; @@ -1034,8 +1085,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= @@ -1051,27 +1101,30 @@ DONEBUTTON $start_time=&Apache::lonlocal::locallocaltime($start_time); my $status = - "\n
\n\t"; + "\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(); } } - $status.="\n".'
'."\n"; - my $dim = $top; - my %counts = &get_counts($dim,undef,$parstack, - $safeeval); - $status.="\n
\n\t

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

\n
\n"; + $status.="\n".'
'."\n"; foreach my $id (@{$dimension{$dim}{'criterias'}}) { my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; @@ -1103,7 +1156,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); @@ -1257,7 +1311,13 @@ DONEBUTTON &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { - $result.=&Apache::lonxml::endredirection(); + 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'}; @@ -1269,7 +1329,12 @@ DONEBUTTON [@_]); $criteria = &layout_webgrade_Criteria($dim,$id,$criteria); my $internal_location=&internal_location($id); - $result=~s/\Q$internal_location\E/$criteria/; + if ($result =~ m/\Q$internal_location\E/) { + $result=~s/\Q$internal_location\E/$criteria/; + } else { + $result.=$criteria; + } + } } $result.="
"; @@ -1294,9 +1359,7 @@ DONEBUTTON $result.=&Apache::response::meta_stores_write('status','string', 'Bridge Task Status'); } elsif ($target eq 'edit') { - &Apache::structuretags::reset_problem_globals('Task'); - undef($Apache::lonhomework::parsing_a_task); - return ('','no'); + $result.= &Apache::structuretags::problem_edit_footer(); } &Apache::structuretags::reset_problem_globals('Task'); undef($Apache::lonhomework::parsing_a_task); @@ -1499,19 +1562,25 @@ sub show_queue { } } + $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"; } @@ -1519,7 +1588,8 @@ sub show_queue { &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; } + next if (!defined($classlist->{$uname.':'.$udom})); + next if (§ion_restricted($classlist->{$uname.':'.$udom})); my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()]; @@ -1553,9 +1623,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')); @@ -1598,6 +1675,18 @@ FORM return $result; } +sub section_restricted { + my ($classlist_entry) = @_; + my $cid =(&Apache::lonnet::whichuser())[1]; + if (lc($env{'course.'.$cid.'.task_grading'}) eq 'section' + && $env{'request.course.sec'} + && $env{'request.course.sec'} ne + $classlist_entry->[&Apache::loncoursedata::CL_SECTION()]) { + return 1; + } + return 0; +} + sub get_queue_counts { my ($queue)=@_; my $result; @@ -1613,11 +1702,14 @@ sub get_queue_counts { if ($tmp=~/^error: 2 /) { return (0,0,0); } + 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; } + next if (!defined($classlist->{$uname.':'.$udom})); + next if (§ion_restricted($classlist->{$uname.':'.$udom})); + if ($key=~/locked$/) { $locks++; } elsif ($key=~/timestamp$/) { @@ -1665,7 +1757,7 @@ sub queue_key_locked { my ($key_locked,$value)= &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum); if ($key_locked eq "$key\0locked") { - return $value; + return &get_lock_info($value); } return undef; } @@ -1694,7 +1786,8 @@ sub pick_from_queue_data { if ($key =~ /\0timestamp$/) { next; } my ($symb,$uname,$udom)=&decode_queue_key($key); - if (!defined($classlist->{$uname.':'.$udom})) { next; } + next if (!defined($classlist->{$uname.':'.$udom})); + next if (§ion_restricted($classlist->{$uname.':'.$udom})); if ($check_section) { my $section = @@ -1746,6 +1839,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'}); @@ -1757,7 +1868,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$//; @@ -1773,7 +1884,7 @@ sub lock_key { my (undef,$cid)=&Apache::lonnet::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; - my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me}, + my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> [$me,time]}, $cdom,$cnum); &Apache::lonxml::debug("success $success $todo"); if ($success eq 'ok') { @@ -1785,7 +1896,7 @@ sub lock_key { sub get_queue_symb_status { my ($queue,$symb,$cdom,$cnum) = @_; if (!defined($cdom) || !defined($cnum)) { - my (undef,$cid)=&Apache::lonnet::whichuser(); + my (undef,$cid) =&Apache::lonnet::whichuser(); $cnum=$env{'course.'.$cid.'.num'}; $cdom=$env{'course.'.$cid.'.domain'}; } @@ -1801,6 +1912,7 @@ sub get_queue_symb_status { next if ($key=~/timestamp$/); my ($symb,$uname,$udom) = &decode_queue_key($key); next if (!defined($classlist->{$uname.':'.$udom})); + next if (§ion_restricted($classlist->{$uname.':'.$udom})); push(@users,"$uname:$udom"); } return @users; @@ -2014,6 +2126,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; } @@ -2028,6 +2143,14 @@ sub end_ClosingParagraph { return $result; } +sub insert_ClosingParagraph { + return ' + + + +'; +} + sub get_dim_id { if (@Apache::bridgetask::dimension) { return $Apache::bridgetask::dimension[-1]; @@ -2038,18 +2161,29 @@ sub get_dim_id { sub get_id { my ($parstack,$safeeval)=@_; - my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval); - if (!$id) { $id=$Apache::lonxml::curdepth; } - return $id; + return &Apache::lonxml::get_id($parstack,$safeeval); } 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; } { @@ -2076,54 +2210,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; - $dimension{$dim}{'depth'} = 1 + $dimension{$previous_dim}{'depth'}; - - &Apache::lonxml::debug("adding $dim as criteria to $previous_dim"); - } else { - $dimension{$top}{'depth'}=0; - $dimension{$top}{'criteria.'.$dim.'.type'}='dimension'; - $dimension{$top}{'criteria.'.$dim.'.mandatory'}= - &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); - push(@{$dimension{$top}{'criterias'}},$dim); - } - push(@Apache::bridgetask::dimension,$dim); - &Apache::lonxml::startredirection(); - if (!&skip_dimension_parsing($dim)) { - &enable_dimension_parsing($dim); + 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); + } } - 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(); @@ -2185,17 +2354,18 @@ sub link { sub end_Question { return &end_Dimension(@_); } sub end_Dimension { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result=&Apache::lonxml::endredirection(); + my $result; my $dim=&get_id($parstack,$safeeval); - if (&skip_dimension_parsing($dim)) { - &disable_dimension_parsing($dim); - pop(@Apache::bridgetask::dimension); - return; + if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { + $result=&Apache::lonxml::endredirection(); + if (&skip_dimension_parsing($dim)) { + pop(@Apache::bridgetask::dimension); + return; + } } my $instance=&get_instance($dim); my $version=&get_version(); if ($target eq 'web') { - $result .= "\n".'
'."\n"; $result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]); my @instances = $instance; if (&Apache::response::showallfoils()) { @@ -2229,13 +2399,15 @@ sub end_Dimension { } my $dim_info= "\n
\n\t"; - my $question = ('sub' x $dimension{$dim}{'depth'}).'question'; - $question =~ s/^(.)/uc($1)/e; + my $ucquestion = + my $question = + ('sub' x $dimension{$dim}{'depth'}).'question'; + $ucquestion =~ s/^(.)/uc($1)/e; if ($dim_status eq 'pass') { - $dim_info.='

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

'; + $dim_info.='

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

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

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

'; + $dim_info.='

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

'; } my %counts = &get_counts($dim,$instance,$parstack, $safeeval); @@ -2265,14 +2437,32 @@ sub end_Dimension { } } # puts the results at the end of the dimension - $result .= $dim_info; - + if ($result =~m{}) { + $result=~s{}{$dim_info}; + } else { + $result .= $dim_info; + } # puts the results at the beginning of the dimension # my $internal_location=&internal_location($dim); # $result=~s/\Q$internal_location\E/$dim_info/; } } - $result .= "\n
\n"; + 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'},[@_]); @@ -2295,7 +2485,11 @@ sub end_Dimension { [@_]); $criteria = &layout_webgrade_Criteria($dim,$id,$criteria); my $internal_location=&internal_location($id); - $result=~s/\Q$internal_location\E/$criteria/; + if ($result =~ m/\Q$internal_location\E/) { + $result =~ s/\Q$internal_location\E/$criteria/; + } else { + $result.=$criteria ; + } } } if (&nest()) { @@ -2369,12 +2563,16 @@ sub end_Dimension { $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); } - &disable_dimension_parsing(); - pop(@Apache::bridgetask::dimension); + if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') { + &disable_dimension_parsing(); + pop(@Apache::bridgetask::dimension); + } return $result; } @@ -2389,7 +2587,7 @@ sub question_status_message { foreach my $type ('cri','dim') { if ($counts->{$req.'_'.$type}) { push(@sections, - $counts->{$req.'_'.$type.'_passed'}.' of '. + $counts->{$req.'_'.$type.'_passed'}.' of the '. $counts->{$req.'_'.$type}.' '. $req{$req}.' '.$type{$type}); } @@ -2409,7 +2607,15 @@ sub question_status_message { $status .= '.'; if ($counts->{'opt'}) { $status .= ' You were required to pass '.$counts->{'opt_req'}. - ' optional component'.($counts->{'opt_req'} == 1?'':'s'); + ' 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; } @@ -2469,10 +2675,13 @@ sub get_counts { sub end_Setup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result=&Apache::lonxml::endredirection(); + 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'}); @@ -2505,7 +2714,8 @@ sub end_Setup { sub grading_history { my ($version,$dim,$id) = @_; - if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { + if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'}) + && !&Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) { return ''; } my ($result,$grader); @@ -2551,6 +2761,9 @@ sub start_IntroParagraph { &Apache::lonxml::startredirection(); } + } elsif ($target eq 'edit') { + $result = &Apache::edit::tag_start($target,$token); + } elsif ($target eq 'modified') { } return $result; } @@ -2562,6 +2775,14 @@ sub end_IntroParagraph { } } +sub insert_IntroParagraph { + return ' + + + +'; +} + sub start_Instance { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $dim = &get_dim_id(); @@ -2575,41 +2796,81 @@ 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' && $dim ne 'top') { + 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); + #$result .= &internal_location($id); } } &Apache::lonxml::debug("Criteria $id with $dim"); @@ -2627,6 +2888,21 @@ 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 $result; } @@ -2713,17 +2989,58 @@ END_CRITERIA } 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') { - return '
'. + $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); } - my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style); - return; + return $result; } sub end_GraderNote { @@ -2735,25 +3052,56 @@ sub end_GraderNote { return; } +sub insert_GraderNote { + return ' + + + +'; +} sub proctor_validation_screen { my ($slot) = @_; 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 -
+ @@ -2769,7 +3117,7 @@ sub proctor_validation_screen { - + $url
Name:$name
Student ID:$env{'environment.id'}
Usename$user:$domain