version 1.128.2.9, 2006/04/19 20:36:19
|
version 1.128.2.11, 2006/06/19 09:43:38
|
Line 456 sub start_Task {
|
Line 456 sub start_Task {
|
my (undef,undef,$domain,$user)= |
my (undef,undef,$domain,$user)= |
&Apache::lonxml::whichuser(); |
&Apache::lonxml::whichuser(); |
my $files = '<ul>'; |
my $files = '<ul>'; |
|
my $msg; |
foreach my $file (@files) { |
foreach my $file (@files) { |
my $url="/uploaded/$domain/$user/portfolio$file"; |
my $url="/uploaded/$domain/$user/portfolio$file"; |
$file = '<tt>'.$file.'</tt>'; |
$file = '<tt>'.$file.'</tt>'; |
$files .= '<li>'.$file.'</li>'; |
$files .= '<li>'.$file.'</li>'; |
|
$msg .= "<p>Submitted file $file</p>\n"; |
} |
} |
$files.='</ul>'; |
$files.='</ul>'; |
|
my $subject = "Submission message for $title"; |
|
my ($message_status,$comment_status); |
|
my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'}; |
|
$setting =~ s/^\s*(\S*)\s*$/$1/; |
|
$setting = lc($setting); |
|
if ($setting eq 'only_student' |
|
|| $setting eq 'student_and_user_notes_screen') { |
|
$message_status = |
|
&Apache::lonmsg::user_normal_msg($user,$domain,$subject,$msg); |
|
$message_status = '<p>'.&mt('Message sent to user: [_1]', |
|
$message_status).' </p>'; |
|
} |
|
if ($setting eq 'student_and_user_notes_screen') { |
|
$comment_status = |
|
&Apache::lonmsg::store_instructor_comment($subject.'<br />'. |
|
$msg,$user,$domain); |
|
$comment_status = '<p>'.&mt('Message sent to instructor: [_1]', |
|
$comment_status).' </p>'; |
|
} |
|
|
$result.=<<DONESCREEN; |
$result.=<<DONESCREEN; |
<h2>$title</h2> |
<h2>$title</h2> |
Line 470 sub start_Task {
|
Line 491 sub start_Task {
|
<hr /> |
<hr /> |
<p> <a href="/adm/logout">Logout</a> </p> |
<p> <a href="/adm/logout">Logout</a> </p> |
<p> <a href="/adm/roles">Change to a different course</a> </p> |
<p> <a href="/adm/roles">Change to a different course</a> </p> |
|
$message_status |
|
$comment_status |
DONESCREEN |
DONESCREEN |
} elsif ($status ne 'NOT_YET_VIEWED') { |
} elsif ($status ne 'NOT_YET_VIEWED') { |
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>'; |
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>'; |
Line 1796 sub get_instance {
|
Line 1819 sub get_instance {
|
my $mandatory_failed=0; |
my $mandatory_failed=0; |
my $ungraded=0; |
my $ungraded=0; |
my $review=0; |
my $review=0; |
|
|
|
@Apache::scripttag::parser_env = @_; |
|
$result.=&Apache::scripttag::xmlparse($dimension{'intro'}); |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
|
@Apache::scripttag::parser_env = @_; |
|
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.tex |
|
t'}); |
my $link=&link($instance,$id); |
my $link=&link($instance,$id); |
my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_'.$link}; |
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}; |
$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_'.$link}; |
Line 1873 sub grading_history {
|
Line 1902 sub grading_history {
|
sub start_IntroParagraph { |
sub start_IntroParagraph { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'web' || $target eq 'webgrade') { |
if ($tagstack->[-2] eq 'Dimension') { |
if ($tagstack->[-2] eq 'Dimension') { |
$dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style); |
$dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style); |
|
|
Line 1914 sub start_InstanceText {
|
Line 1943 sub start_InstanceText {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $instance_id=$Apache::bridgetask::instance[-1]; |
my $instance_id=$Apache::bridgetask::instance[-1]; |
my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style); |
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; |
$dimension{$instance_id.'.text'}=$text; |
} |
} |
return ''; |
return ''; |