'.
+ &mt('Grading [_1] for [_2] at [_3]',
+ &Apache::lonnet::gettitle($symb),$uname,$udom).'
';
$form_tag_start.=
'';
@@ -847,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';
@@ -1039,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.='';
@@ -1057,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=
@@ -1332,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);
@@ -1537,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 | | "; }
@@ -1557,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()];
@@ -1643,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;
@@ -1658,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$/) {
@@ -1739,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 =
@@ -1848,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'};
}
@@ -1864,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;
@@ -2078,13 +2127,8 @@ sub start_ClosingParagraph {
} elsif ($target eq 'webgrade') {
&Apache::lonxml::startredirection();
} elsif ($target eq 'edit') {
- my $bodytext=&Apache::lonxml::get_all_text("/closingparagraph",
- $parser);
$result = &Apache::edit::tag_start($target,$token);
- $result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
} elsif ($target eq 'modified') {
- $result = $token->[4].&Apache::edit::modifiedfield('/closingparagraph',
- $parser);
}
return $result;
}
@@ -2099,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];
@@ -2199,8 +2251,8 @@ sub start_Dimension {
$result.=
&Apache::edit::text_arg('Id:','id',$token,10).' '.
&Apache::edit::select_arg('Passing is Mandatory:','Mandatory',
- [['yes', 'Yes'],
- ['no','No'],],
+ [['Y', 'Yes'],
+ ['N','No'],],
$token).'
'.
&Apache::edit::text_arg('Required number of passed optional elements to pass the '.$token->[1].':',
'OptionalRequired',$token,4).
@@ -2225,12 +2277,8 @@ sub start_QuestionText {
my $dim = &get_dim_id();
$dimension{$dim}{'questiontext'}=$text;
} elsif ($target eq 'edit') {
- my $bodytext=&Apache::lonxml::get_all_text("/questiontext",$parser);
$result = &Apache::edit::tag_start($target,$token);
- $result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
} elsif ($target eq 'modified') {
- $result = $token->[4].&Apache::edit::modifiedfield('/questiontext',
- $parser);
}
return $result;
}
@@ -2239,6 +2287,14 @@ sub end_QuestionText {
return '';
}
+sub insert_QuestionText {
+ return '
+
+
+
+';
+}
+
sub get_instance {
my ($dim)=@_;
my $rand_alg=&Apache::lonnet::get_rand_alg();
@@ -2660,7 +2716,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);
@@ -2707,12 +2764,8 @@ sub start_IntroParagraph {
}
} elsif ($target eq 'edit') {
- my $bodytext=&Apache::lonxml::get_all_text("/introparagraph",$parser);
$result = &Apache::edit::tag_start($target,$token);
- $result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
} elsif ($target eq 'modified') {
- $result = $token->[4].&Apache::edit::modifiedfield('/introparagraph',
- $parser);
}
return $result;
}
@@ -2724,6 +2777,14 @@ sub end_IntroParagraph {
}
}
+sub insert_IntroParagraph {
+ return '
+
+
+
+';
+}
+
sub start_Instance {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $dim = &get_dim_id();
@@ -2780,12 +2841,8 @@ sub start_InstanceText {
my $instance_id=$Apache::bridgetask::instance{$dim}[-1];
$dimension{$dim}{$instance_id.'.text'}=$text;
} elsif ($target eq 'edit') {
- my $bodytext=&Apache::lonxml::get_all_text("/instancetext",$parser);
$result = &Apache::edit::tag_start($target,$token);
- $result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
} elsif ($target eq 'modified') {
- $result = $token->[4].&Apache::edit::modifiedfield('/instancetext',
- $parser);
}
return $result;
}
@@ -2794,6 +2851,14 @@ sub end_InstanceText {
return '';
}
+sub insert_InstanceText {
+ return '
+
+
+
+';
+}
+
sub start_Criteria {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
@@ -2826,41 +2891,12 @@ sub start_Criteria {
push(@{$dimension{$dim}{'criterias'}},$id);
}
} elsif ($target eq 'edit') {
- if (0) {
- $result = &Apache::edit::tag_start($target,$token);
- my $text=&Apache::lonxml::get_all_text("/criteria",$parser);
- &Apache::lonnet::logthis("get_all_text criteria \n$text");
- my $local_parser = HTML::LCParser->new(\$text);
- $local_parser->xml_mode(1);
- $local_parser->marked_sections(1);
- while (1) {
- my $criteria_text =
- &Apache::lonxml::get_all_text('gradernote',$local_parser);
- $result.=
- &Apache::edit::editfield($token->[1],$criteria_text,'',80,4);
-
- # check for a
next might be end
- my $token = $local_parser->get_token();
- # is the end
- last if (!$token);
- my $gradernote = &Apache::lonxml::get_all_text('/gradernote',
- $local_parser);
- # purge the end tag
- my $token = $local_parser->get_token();
- $gradernote = ''.$gradernote.'';
- @Apache::scripttag::parser_env = @_;
- $result .=
- &Apache::edit::end_row().&Apache::edit::start_spanning_row().
- &Apache::scripttag::xmlparse($gradernote).
- &Apache::edit::end_row().&Apache::edit::start_spanning_row();
- }
- }
$result .=&Apache::edit::tag_start($target,$token);
$result.=
&Apache::edit::text_arg('Id:','id',$token,10).' '.
&Apache::edit::select_arg('Passing is Mandatory:','Mandatory',
- [['yes', 'Yes'],
- ['no','No'],],
+ [['Y', 'Yes'],
+ ['N','No'],],
$token)
.'
'.&Apache::edit::end_row().
&Apache::edit::start_spanning_row();
@@ -2960,6 +2996,15 @@ sub end_Criteria {
} elsif ($target eq 'modified') {
}
}
+sub insert_Criteria {
+ return '
+
+
+
+
+
+';
+}
sub start_CriteriaText {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -2967,12 +3012,8 @@ sub start_CriteriaText {
if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
} elsif ($target eq 'edit') {
- my $bodytext=&Apache::lonxml::get_all_text("/criteriatext",$parser);
$result = &Apache::edit::tag_start($target,$token);
- $result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
} elsif ($target eq 'modified') {
- $result = $token->[4].&Apache::edit::modifiedfield('/criteriatext',
- $parser);
}
return $result;
}
@@ -2981,6 +3022,14 @@ sub end_CriteriaText {
return '';
}
+sub insert_CriteriaText {
+ return '
+
+
+
+';
+}
+
sub start_GraderNote {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
@@ -2988,12 +3037,8 @@ sub start_GraderNote {
$result = ''.
&mt('Note to graders:').'';
} elsif ($target eq 'edit') {
- my $bodytext=&Apache::lonxml::get_all_text("/gradernote",$parser);
$result = &Apache::edit::tag_start($target,$token);
- $result.= &Apache::edit::editfield($token->[1],$bodytext,'',80,4);
} elsif ($target eq 'modified') {
- $result = $token->[4].&Apache::edit::modifiedfield('/gradernote',
- $parser);
} elsif ($target eq 'web' || $target eq 'grade') {
my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style);
}
@@ -3009,25 +3054,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\") |
";
+ } 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
-