'."\n";
if ($target eq 'web' || $target eq 'webgrade') {
@@ -504,11 +458,7 @@ sub start_Task {
my $files = '
';
foreach my $file (@files) {
my $url="/uploaded/$domain/$user/portfolio$file";
- if (! &Apache::lonnet::stat_file($url)) {
- $file = &mt(' Nonexistant file: [_1]',$file);
- } else {
- $file = ''.$file.'';
- }
+ $file = ''.$file.'';
$files .= '- '.$file.'
';
}
$files.='
';
@@ -547,7 +497,7 @@ DONESCREEN
}
} elsif ($target eq 'web') {
$result.="$head_tag_start
- $body_tag_start \n".&style();
+ $body_tag_start \n";
$result.=&preserve_grade_info();
$result.=&internal_location();
@@ -563,7 +513,7 @@ DONESCREEN
''.$body_tag_start.
"\n".'
'."\n".
'';
+ src="/res/adm/includes/task_grading.js">';
#$result.='
Review'.&show_queue('reviewqueue');
#$result.='
Grade'.&show_queue('gradingqueue');
}
@@ -1023,7 +973,7 @@ DONEBUTTON
&Apache::structuretags::finalize_storage();
}
} elsif ($target eq 'webgrade') {
- $result.="
\n
";
+ $result.="
";
#$result.=''."\n";
+ '
'."\n";
@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
$result.='
'."\n".
@@ -1842,7 +1796,13 @@ sub get_instance {
my $mandatory_failed=0;
my $ungraded=0;
my $review=0;
+
+ @Apache::scripttag::parser_env = @_;
+ $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
foreach my $id (@{$dimension{$instance.'.criterias'}}) {
+ @Apache::scripttag::parser_env = @_;
+ $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.tex
+t'});
my $link=&link($instance,$id);
my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_'.$link};
$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
@@ -1919,12 +1879,12 @@ sub grading_history {
sub start_IntroParagraph {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'web' || $target eq 'webgrade') {
+ if ($target eq 'web' || $target eq 'web' || $target eq 'webgrade') {
if ($tagstack->[-2] eq 'Dimension') {
$dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
- } elsif ($target eq 'webgrade') {
- &Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
+ } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
+ &Apache::lonxml::startredirection();
}
}
@@ -1932,6 +1892,10 @@ sub start_IntroParagraph {
}
sub end_IntroParagraph {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ if ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
+ my $result = &Apache::lonxml::endredirection();
+ }
}
sub start_Instance {
@@ -1956,7 +1920,7 @@ sub start_InstanceText {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $instance_id=$Apache::bridgetask::instance[-1];
my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
- if ($target eq 'web' || $target eq 'webgrade') {
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
$dimension{$instance_id.'.text'}=$text;
}
return '';