--- loncom/homework/bridgetask.pm 2007/01/10 22:46:22 1.217 +++ loncom/homework/bridgetask.pm 2009/03/09 01:58:47 1.244 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.217 2007/01/10 22:46:22 albertel Exp $ +# $Id: bridgetask.pm,v 1.244 2009/03/09 01:58:47 weissno 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; @@ -245,11 +244,20 @@ sub add_grading_button { my $result="\n\t".''; $result.="\n\t".''; - if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { + my $see_all = &Apache::lonnet::allowed('mgq',$env{'request.course.id'}); + my $see_sec = &Apache::lonnet::allowed('mgq',$env{'request.course.id'}. + '/'.$env{'request.course.sec'}); + + if ($see_all || $see_sec) { my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); $result.="\n\t".''."\n\t\t".''; - $result.="\n\t\t\t".''. - "\n\t\t\t".''; + if ($see_all || (!§ion_restricted())) { + $result.="\n\t\t\t".''. + "\n\t\t\t".''; + } else { + $result.="\n\t\t\t".''. + "\n\t\t\t".''; + } $result.="\n\t\t\t".''. &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.=""; } - $result.="". + if ($with_selects) { $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; } + next if (!defined($classlist->{$uname.':'.$udom})); + next if (!&allow_grade_user($classlist->{$uname.':'.$udom})); my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()]; @@ -1587,7 +1650,7 @@ sub show_queue { 'start'); } my $me=$env{'user.name'}.':'.$env{'user.domain'}; - $status=&mt('Locked by [_1] [_2]',$locker,$time); + $status=&mt('Locked by [_1] [_2]',''.$locker.'',$time); if ($me eq $locker) { ($action,$description)=('resume',&mt('Resume')); } else { @@ -1622,15 +1685,46 @@ FORM } $result.= ""; - $result.='".&Apache::loncommon::end_data_table_row(); + $result.='' + .&Apache::loncommon::end_data_table_row(); } } $result.= &Apache::loncommon::end_data_table()."
\n"; return $result; } +sub get_allowed_sections { + my @chosen_sections; + if (§ion_restricted()) { + @chosen_sections = ($env{'request.course.sec'}); + } else { + @chosen_sections = + &Apache::loncommon::get_env_multiple('form.chosensections'); + } + + return @chosen_sections; +} + +sub section_restricted { + my $cid =(&Apache::lonnet::whichuser())[1]; + return (lc($env{'course.'.$cid.'.task_grading'}) eq 'section' + && $env{'request.course.sec'} ne '' ); +} + +sub allow_grade_user { + my ($classlist_entry) = @_; + + if (§ion_restricted() + && $env{'request.course.sec'} ne + $classlist_entry->[&Apache::loncoursedata::CL_SECTION()]) { + return 0; + } + return 1; +} + sub get_queue_counts { my ($queue)=@_; my $result; @@ -1646,11 +1740,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 (!&allow_grade_user($classlist->{$uname.':'.$udom})); + if ($key=~/locked$/) { $locks++; } elsif ($key=~/timestamp$/) { @@ -1727,7 +1824,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 (!&allow_grade_user($classlist->{$uname.':'.$udom})); if ($check_section) { my $section = @@ -1836,7 +1934,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'}; } @@ -1852,6 +1950,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 (!&allow_grade_user($classlist->{$uname.':'.$udom})); push(@users,"$uname:$udom"); } return @users; @@ -1938,15 +2037,15 @@ sub get_from_queue { sub select_user { my ($symb,$cid)=&Apache::lonnet::whichuser(); - my @chosen_sections= - &Apache::loncommon::get_env_multiple('form.chosensections'); - + my @chosen_sections = &get_allowed_sections(); my $classlist = &get_limited_classlist(\@chosen_sections); my $result; if (!(grep(/^all$/,@chosen_sections))) { - $result.='

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

'."\n"; + $result.='

' + .&mt('Showing only sections [_1].' + ,''.join(', ',@chosen_sections).'') + .'

'."\n"; } $result.=&Apache::loncommon::start_data_table(); @@ -1982,6 +2081,7 @@ sub select_user { $seclist.=''; } + my $buttontext=&mt('Regrade'); $result.=&Apache::loncommon::start_data_table_row(); $result.=< @@ -1990,10 +2090,10 @@ sub select_user { - + $seclist - + "; + } 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 proctors 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 %lt = &Apache::lonlocal::texthash( + 'prva' => "Proctor Validation", + 'yoro' => "Your room's proctor needs to validate your access to this resource.", + 'prus' => "Proctor's Username:", + 'pasw' => "Password:", + 'prdo' => "Proctor's Domain:", + 'vali' => 'Validate', + 'stui' => "Student who should be logged in is:", + 'name' => "Name:", + 'sid' => "Student/Employee ID:", + 'unam' => "Username:", + ); my $result= (<Proctor Validation -

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

+

$lt{'prva'}

+

$lt{'yoro'}

$msg -
+
Specify a section: '.$sec_select."\n\t\t\t".''.&mt('Specify a section:').' '.$sec_select."\n\t\t\t".''.&mt('Grading section:').' '.$env{'request.course.sec'}."\n\t\t\t".''.' '; @@ -286,7 +294,7 @@ sub add_grading_button { sub add_request_another_attempt_button { my ($text)=@_; - if (!$text) { $text="Request another attempt"; } + if (!$text) { $text=&mt('Request another attempt'); } my $result; my $symb=&Apache::lonnet::symbread(); # not a slot access based resource @@ -298,13 +306,14 @@ sub add_request_another_attempt_button { my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb); my $action='get_reservation'; if ($slot_name) { - $text="Change reservation."; + $text=&mt('Change reservation.'); $action='change_reservation'; my $description=&Apache::slotrequest::get_description($slot_name, $slot); - $result.=(< Will be next available: $description

-STUFF + $result.='

' + .&mt('Will be next available:') + .' '.$description + .'

'; } if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } @@ -314,7 +323,7 @@ STUFF ''."\n\t\t". ''."\n\t\t". ''."\n\t". + $text.'" />'."\n\t". ''."\n"; return $result; } @@ -464,7 +473,7 @@ sub file_list { my $file=$file_url.$partial_file; $file=~s|/+|/|g; &Apache::lonnet::allowuploaded('/adm/bridgetask',$file); - $file_list.='
  • file icon '.$file. '
    • '."\n"; } @@ -488,6 +497,7 @@ sub webgrade_standard_info { 'stop' => 'Quit Grading', 'fail' => 'Fail Rest', 'cancel' => 'Cancel', + 'submit' => 'Submit Grades', ); %lt=&Apache::lonlocal::texthash(%lt); @@ -495,26 +505,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 = '
      '; @@ -522,17 +541,19 @@ sub done_screen { 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"; + $file = '' + .&mt('[_1]Nonexistent file:[_2]' + ,' ' + ,' '.$file.''); + $msg .= "

      ".&mt('Submitted non-existent file [_1]',$file)."

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

      Submitted file $file

      \n"; + $msg .= "

      ".&mt('Submitted file [_1]',$file)."

      \n"; } $files .= '
    • '.$file.'
      • '; } $files.='
    '; - my $subject = "Submission message for $title"; + my $subject = &mt('Submission message for [_1]',$title); my ($message_status,$comment_status); my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'}; $setting =~ s/^\s*(\S*)\s*$/$1/; @@ -551,16 +572,14 @@ sub done_screen { $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 + return "

    $title

    " + .'

    '.&mt('Files submitted: [_1]',$files).'

    ' + .'

    '.&mt('You are now done with this Bridge Task').'

    ' + .'
    ' + .'

    '.&mt('Logout').'

    ' +.'

    '.&mt('Change to a different course').'

    ' +.$message_status +.$comment_status; } @@ -591,7 +610,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') { @@ -602,7 +620,8 @@ sub start_Task { if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } $result.=$uri.'">'.&add_grading_button()."\n"; my $symb=&Apache::lonnet::symbread(); - 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'})) { $result.='
    '. ''. ''. @@ -612,16 +631,18 @@ sub start_Task { my $target_id = &Apache::lonstathelpers::make_target_id({symb => $symb, part => '0'}); - $result.=''. - ''. - ''. - ''. - '
    '; + if (!§ion_restricted()) { + $result.='
    '. + ''. + ''. + ''. + '
    '; + } } } } - 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' @@ -640,6 +661,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; @@ -707,6 +733,7 @@ sub start_Task { $target eq 'webgrade') { my $webgrade='yes'; if ($target eq 'webgrade') { + $result .= '
    '."\n"; $result.= "\n".'
    '."\n". ''; @@ -719,8 +746,12 @@ sub start_Task { 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.= ''; @@ -786,15 +817,20 @@ sub start_Task { $result.=''; } - if ($env{'form.chosensections'}) { - my @chosen_sections= - &Apache::loncommon::get_env_multiple('form.chosensections'); + if ($env{'form.chosensections'} || §ion_restricted()) { + my @chosen_sections = &get_allowed_sections(); foreach my $sec (@chosen_sections) { $result.=''; } } 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".'
    '; @@ -808,8 +844,15 @@ sub start_Task { &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 = ''; @@ -835,6 +878,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'; @@ -863,9 +912,16 @@ 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'}); + + if (§ion_restricted()) { + my $classlist=&get_limited_classlist(); + if (!&allow_grade_user($classlist->{$uname.':'.$udom})) { + return (undef,'not_allowed', + &mt('Requested student ([_1]) is in a section you aren\'t allowed to grade.',$uname.':'.$udom)); + } + } my $gradingkey=&encode_queue_key($symb,$udom,$uname); my $queue; @@ -1027,7 +1083,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.=''; @@ -1035,18 +1091,18 @@ sub end_Task { if (!$previous && $status ne 'SHOW_ANSWER' && &show_task($status,$previous)) { my $action = &Apache::lonenc::check_encrypt($env{'request.uri'}); + my $donetext = &mt('Done'); $result.=< - + 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= @@ -1072,13 +1128,15 @@ DONEBUTTON "

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

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

    '; + $status.='

    ' + .&mt('You passed the [_1] given on [_2].',$title,$start_time) + .'

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

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

    '; + $status.='

    ' + .&mt('You did not pass the [_1] given on [_2].',$title,$start_time) + .'

    '; $status.=$question_status; if (!$previous) { $status.=&add_request_another_attempt_button(); @@ -1268,7 +1326,7 @@ DONEBUTTON } } if (exists($Apache::lonhomework::results{'INTERNAL_store'})) { - # instance generation occured and hasn't yet been stored + # instance generation occurred and hasn't yet been stored &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { @@ -1320,9 +1378,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); @@ -1484,11 +1540,11 @@ sub get_limited_classlist { } } - if (ref($sections) && !grep('all',@{ $sections })) { + if (ref($sections) && !grep {$_ eq 'all'} (@{ $sections })) { foreach my $student (keys(%$classlist)) { my $section = $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()]; - if (! grep($section,@{ $sections })) { + if (! grep {$_ eq $section} (@{ $sections })) { delete($classlist->{$student}); } } @@ -1504,14 +1560,15 @@ sub show_queue { my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; - my @chosen_sections= - &Apache::loncommon::get_env_multiple('form.chosensections'); + my @chosen_sections = &get_allowed_sections(); my $classlist = &get_limited_classlist(\@chosen_sections); if (!(grep(/^all$/,@chosen_sections))) { - $result.='

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

    '."\n"; + $result.='

    ' + .&mt('Showing only sections [_1].' + ,''.join(', ',@chosen_sections).'') + ."

    \n"; } my ($view,$view_section); @@ -1525,27 +1582,33 @@ sub show_queue { } } + $result .= + '

    '. + &mt('Return to resource').'

    '. + "\n

    ".&mt('Current Queue - [_1]',$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').'Statususerdata'.&mt('Status').''.&mt('User').''.&mt('Data').'".$classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_FULLNAME()]. " ($uname:$udom) '.$slot_text.' End time: '. - &Apache::lonlocal::locallocaltime($end_time). - "'.$slot_text.' ' + .&mt('End time: [_1]' + ,&Apache::lonlocal::locallocaltime($end_time)) + .'$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] ($student)$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] ($student) Sec: $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()] RESULT } @@ -2065,6 +2165,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; } @@ -2079,6 +2182,14 @@ sub end_ClosingParagraph { return $result; } +sub insert_ClosingParagraph { + return ' + + + +'; +} + sub get_dim_id { if (@Apache::bridgetask::dimension) { return $Apache::bridgetask::dimension[-1]; @@ -2089,18 +2200,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; } { @@ -2127,55 +2249,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); - $dimension{$dim}{'nested'}=$top; - } - 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(); @@ -2237,12 +2393,14 @@ 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(); @@ -2285,10 +2443,14 @@ sub end_Dimension { ('sub' x $dimension{$dim}{'depth'}).'question'; $ucquestion =~ s/^(.)/uc($1)/e; if ($dim_status eq 'pass') { - $dim_info.='

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

    '; + $dim_info.='

    '.$ucquestion.' : ' + .&mt('you passed this [_1] [_2]',$mandatory,$question) + .'

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

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

    '; + $dim_info.='

    '.$ucquestion.' : ' + .&mt('you did not pass this [_1] [_2]',$mandatory,$question) + .'

    '; } my %counts = &get_counts($dim,$instance,$parstack, $safeeval); @@ -2318,8 +2480,11 @@ 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/; @@ -2441,12 +2606,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; } @@ -2480,8 +2649,11 @@ sub question_status_message { } $status .= '.'; if ($counts->{'opt'}) { - $status .= ' You were required to pass '.$counts->{'opt_req'}. - ' optional component'.($counts->{'opt_req'} == 1?'':'s'); + if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) { + $status .= ' '.&mt('You were required to pass [quant,_1,optional criterion,optional criteria].',$counts->{'opt_req'}); + } else { + $status .= ' '.&mt('You were required to pass [quant,_1,optional component].',$counts->{'opt_req'}); + } } return $status; } @@ -2541,10 +2713,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'}); @@ -2577,7 +2752,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); @@ -2623,6 +2799,9 @@ sub start_IntroParagraph { &Apache::lonxml::startredirection(); } + } elsif ($target eq 'edit') { + $result = &Apache::edit::tag_start($target,$token); + } elsif ($target eq 'modified') { } return $result; } @@ -2634,6 +2813,14 @@ sub end_IntroParagraph { } } +sub insert_IntroParagraph { + return ' + + + +'; +} + sub start_Instance { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $dim = &get_dim_id(); @@ -2647,32 +2834,72 @@ 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') { @@ -2699,6 +2926,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; } @@ -2785,17 +3027,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 { @@ -2807,46 +3090,90 @@ 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 = "
    - - - + + +
    Proctor's Username:
    Password:
    Proctor's Domain:
    $lt{'prus'}
    $lt{'pasw'}
    $lt{'prdo'}
    -
    +
    - - - - - + + + + + $url
    Student who should be logged in is:
    Name:$name
    Student ID:$env{'environment.id'}
    Usename$user:$domain
    $lt{'stui'}
    $lt{'name'}$name
    $lt{'sid'}$env{'environment.id'}
    $lt{'unam'}$user:$domain
    ENDCHECKOUT + return $result; }