Will be next available: $description
STUFF } if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } $symb=&escape($symb); - $result.=''; + &mt($text).'" />'."\n\t". + ''."\n"; return $result; } @@ -372,6 +389,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; @@ -472,6 +496,7 @@ sub webgrade_standard_info { 'stop' => 'Quit Grading', 'fail' => 'Fail Rest', 'cancel' => 'Cancel', + 'submit' => 'Submit Grades', ); %lt=&Apache::lonlocal::texthash(%lt); @@ -479,26 +504,35 @@ sub webgrade_standard_info {
INFO
- if (&grade_mode() eq 'regrade') {
+ if ($env{'request.state'} eq 'construct') {
$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 = '- ';
@@ -575,7 +609,6 @@ sub start_Task {
&Apache::structuretags::page_start($target,$token,$tagstack,
$parstack,$parser,$safeeval,
$name,&style($target));
- $result .= '
- $grader : $entry "; + $result.= "\n\t\t
- \n\t\t\t$grader :\n\t\t\t $entry \n\t\t "; } } if ($result) { - return '
'."\n";
}
if ($target eq 'web' && $env{'request.state'} ne 'construct') {
@@ -584,9 +617,10 @@ sub start_Task {
$result.='";
+ $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.='';
+ 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'
@@ -624,6 +660,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;
@@ -683,7 +724,7 @@ sub start_Task {
$result.=&preserve_grade_info();
$result.=&internal_location();
- $result.=$form_tag_start.
+ $result.=$form_tag_start."\t".
'';
&Apache::lonxml::startredirection();
}
@@ -691,6 +732,7 @@ sub start_Task {
$target eq 'webgrade') {
my $webgrade='yes';
if ($target eq 'webgrade') {
+ $result .= '
'."\n";
$result.= "\n".'
'."\n".
'';
@@ -703,8 +745,12 @@ sub start_Task {
if ($todo) {
&setup_env_for_other_user($todo,$safeeval);
my ($symb,$uname,$udom)=&decode_queue_key($todo);
- $result.="\n".'
';
+ if ($env{'request.state'} eq 'construct') {
+ $symb = $env{'request.uri'};
+ }
+ $result.="\n".'
'. + "\n'.&mt('Empty').' '.
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table();
+ return $result;
}
my $title=&Apache::lonnet::gettitle($symb);
- $result.="\nStatus $classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] ($student)
+ $classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] ($student) Sec: $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()]
RESULT
}
@@ -2019,6 +2154,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;
}
@@ -2033,6 +2171,14 @@ sub end_ClosingParagraph {
return $result;
}
+sub insert_ClosingParagraph {
+ return '
+
+ ';
+}
+
sub get_dim_id {
if (@Apache::bridgetask::dimension) {
return $Apache::bridgetask::dimension[-1];
@@ -2043,18 +2189,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;
}
{
@@ -2081,49 +2238,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 {
- $dimension{$top}{'criteria.'.$dim.'.type'}='dimension';
- $dimension{$top}{'criteria.'.$dim.'.mandatory'}=
- &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
- push(@{$dimension{$top}{'criterias'}},$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); + } } - 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();
@@ -2185,12 +2382,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();
@@ -2226,56 +2425,71 @@ sub end_Dimension {
if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') {
$mandatory='Optional';
}
- my $dim_info="
+
+
+ ';
+}
+
+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 '
| Found '. - &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.' |
'. + &mt('Grading [_1] for [_2] at [_3]', + &Apache::lonnet::gettitle($symb),$uname,$udom).'
'; $form_tag_start.= ''; @@ -770,27 +816,42 @@ 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".'';
&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 = ''; @@ -816,6 +877,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'; @@ -844,9 +911,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; @@ -1008,8 +1082,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.=<
@@ -1021,8 +1100,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=
@@ -1037,46 +1115,31 @@ DONEBUTTON
}
$start_time=&Apache::lonlocal::locallocaltime($start_time);
- my $status = "\n
";
@@ -1299,9 +1374,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);
@@ -1463,11 +1536,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});
}
}
@@ -1483,8 +1556,7 @@ 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);
@@ -1504,19 +1576,24 @@ sub show_queue {
}
}
+ $result .=
+ '"; - 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 = ''; @@ -816,6 +877,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'; @@ -844,9 +911,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; @@ -1008,8 +1082,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.=<
\n";
+ my $status =
+ "\n
'."\n";
foreach my $id (@{$dimension{$dim}{'criterias'}}) {
my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
@@ -1108,7 +1171,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);
@@ -1262,7 +1326,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'};
@@ -1274,7 +1344,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.="\n\t";
+ my $dim = $top;
+ my %counts = &get_counts($dim,undef,$parstack,
+ $safeeval);
+ my $question_status ="\n\t
';
- my $man_count=0;
- my $man_passed=0;
- my $opt_count=0;
- my $opt_passed=0;
- my $dim = $top;
- foreach my $id (@{$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=&Apache::lonxml::get_param('OptionalRequired',
- $parstack,$safeeval);
- if ($opt_req !~ /\S/) { $opt_req='0'; }
-
- $status.="\n". + &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.='".&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";
-
+
+ $status.="\n".''. + &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 "\nCurrent Queue - $queue
". + $result.= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_row(). 'Current Queue - $title $queue
". + $result.= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(); if ($with_selects) { $result.="'. + &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 ' +
\n";
+ my $dim_info=
+ "\n
\n";
foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
@{$dimension{$dim}{'criterias'}}) {
my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
if ($type eq 'dimension') {
- $result.=$dimension{$id}{'result'};
- next;
+ if (defined($dimension{$id}{'result'})) {
+ $result.=$dimension{$id}{'result'};
+ next;
+ } else {
+ $dim_info .=
+ &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+ [@_],{'set_dim_id' => $id});
+ }
+ } else {
+ my $criteria =
+ &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+ [@_]);
+ $dim_info .= &layout_web_Criteria($dim,$id,$criteria);
}
- my $criteria =
- &nested_parse(\$dimension{$dim}{'criteria.'.$id},
- [@_]);
- $dim_info .= &layout_web_Criteria($dim,$id,$criteria);
}
-
- my $internal_location=&internal_location($dim);
- $result=~s/\Q$internal_location\E/$dim_info/;
+ # puts the results at the end of the dimension
+ if ($result =~m{\n\t";
+ my $ucquestion =
+ my $question =
+ ('sub' x $dimension{$dim}{'depth'}).'question';
+ $ucquestion =~ s/^(.)/uc($1)/e;
if ($dim_status eq 'pass') {
- $dim_info.='
";
+ my %counts = &get_counts($dim,$instance,$parstack,
+ $safeeval);
+
+ $dim_info.="\n\tQuestion : you passed this '.$mandatory.' question
'; + $dim_info.=''.$ucquestion.' : you passed this '.$mandatory.' '.$question.'
'; } if ($dim_status eq 'fail') { - $dim_info.='Question : you did not pass this '.$mandatory.' question
'; + $dim_info.=''.$ucquestion.' : 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; } - } - $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" + .&question_status_message(\%counts, + $dimension{$dim}{'depth'}) + ."
\n};
+ } else {
+ $result = "\n".'
+ ';
+}
+
sub start_Instance {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $dim = &get_dim_id();
@@ -2489,36 +2824,82 @@ 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') {
- $result .= &internal_location($id);
+ 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')) {
@@ -2535,6 +2916,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; } @@ -2554,15 +2950,21 @@ sub layout_web_Criteria { my $status_display=$status; $status_display=~s/^([a-z])/uc($1)/e; my $criteria_info.= - ''."\n";
+
return $criteria_info;
}
@@ -2571,49 +2973,102 @@ sub layout_webgrade_Criteria {
my $link=&link($id);
my $version = &get_version();
my $status = &get_criteria('status',$version,$dim,$id);
- my $result =
- '
+
+ $lt{$which}
+
+END_BUTTON
+ }
+ $criteria =~ s/^\s*//s;
+ $criteria =~ s/\s*$//s;
+ my $result = <
+
+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 '
+'.
+ "\n".$result;
}
+ $result .= "\n
\n";
}
} elsif ($target eq 'webgrade') {
# in case of any side effects that we need
@@ -2284,7 +2498,7 @@ sub end_Dimension {
$result.=
&nested_parse(\$dimension{$dim}{'questiontext'},[@_],
{'set_dim_id' => undef,
- 'delayed_dim_results' => 0});
+ 'delayed_dim_results' => 1});
foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
@{$dimension{$dim}{'criterias'}} ) {
my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
@@ -2299,7 +2513,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()) {
@@ -2373,21 +2591,125 @@ 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;
}
+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});
+ }
+ }
+ }
+
+ 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=&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'});
@@ -2420,7 +2742,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);
@@ -2443,11 +2766,12 @@ sub grading_history {
$entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';
}
if ($entry) {
- $result.= "- '.$result.'
- '.$result.
+ "\n\t".'
'. + &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 ' +
'.&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; } @@ -2554,15 +2950,21 @@ sub layout_web_Criteria { my $status_display=$status; $status_display=~s/^([a-z])/uc($1)/e; my $criteria_info.= - '
' - .$mandatory.' Criteria
'; + '
'."\n\t".'
';
+ $criteria_info.="\n".'' + .$mandatory.' Criteria
'."\n\t".'' + ."\n"; + $criteria =~ s/^\s*//s; + $criteria =~ s/\s*$//s; $criteria_info.= $criteria; - $criteria_info.='
'.$status_display.'
'; + $criteria_info.="\n\t".''. + "\n\t".''.$status_display.'
'; if ($comment =~ /\w/) { - $criteria_info.=''. - &mt('Comment: [_1]',$comment).'
'; + $criteria_info.= + "\n\t". + ''.&mt('Comment: [_1]',$comment).'
'; } - $criteria_info.=''."\n".
- '
'."\n".
- &grading_history($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 .= <'."\n".
- $criteria.
- '
'."\n".
- ''."\n".
- ''."\n".
- ''."\n".
- ''."\n".
- ''."\n".
- '
'."\n".
- ''."\n".
- '
+ $criteria
+
+
+$buttons
+
+
+'.
+ $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 {
@@ -2625,25 +3080,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 = "![](\"$url\")
Proctor Validation
'.&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= (<Your room's proctor needs to validate your access to this resource.
$msg -