version 1.226, 2005/11/21 21:51:29
|
version 1.232, 2005/12/22 22:06:54
|
Line 171 sub proctor_checked_in {
|
Line 171 sub proctor_checked_in {
|
|
|
my $key; |
my $key; |
if ($type eq 'Task') { |
if ($type eq 'Task') { |
my $version=$Apache::lonhomework::history{'resource.version'}; |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
$key ="resource.$version.checkedin"; |
$key ="resource.$version.0.checkedin"; |
} elsif ($type eq 'problem') { |
} elsif ($type eq 'problem') { |
$key ='resource.0.checkedin'; |
$key ='resource.0.checkedin'; |
} |
} |
Line 260 sub check_slot_access {
|
Line 260 sub check_slot_access {
|
|
|
if ($type eq 'Task') { |
if ($type eq 'Task') { |
my $version=$Apache::lonhomework::history{'resource.version'}; |
my $version=$Apache::lonhomework::history{'resource.version'}; |
if ($Apache::lonhomework::history{"resource.$version.checkedin"} && |
if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} && |
$Apache::lonhomework::history{"resource.$version.status"} eq 'pass') { |
$Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') { |
return ('SHOW_ANSWER'); |
return ('SHOW_ANSWER'); |
} |
} |
} |
} |
Line 295 sub check_slot_access {
|
Line 295 sub check_slot_access {
|
$slotstatus='CAN_ANSWER'; |
$slotstatus='CAN_ANSWER'; |
} |
} |
|
|
my ($pass_status,$checkedin); |
my ($got_grade,$checkedin); |
if ($type eq 'Task') { |
if ($type eq 'Task') { |
my $version=$Apache::lonhomework::history{'resource.version'}; |
my $version=$Apache::lonhomework::history{'resource.0.version'}; |
$pass_status = |
$got_grade = |
$Apache::lonhomework::history{"resource.$version.status"} eq 'fail'; |
($Apache::lonhomework::history{"resource.$version.0.status"} |
|
=~ /^(?:pass|fail)$/); |
$checkedin = |
$checkedin = |
$Apache::lonhomework::history{"resource.$version.checkedin"}; |
$Apache::lonhomework::history{"resource.$version.0.checkedin"}; |
} elsif ($type eq 'problem') { |
} elsif ($type eq 'problem') { |
$pass_status = 1; |
$got_grade = 1; |
$checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; |
$checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; |
} |
} |
|
|
if ($slotstatus eq 'NOT_IN_A_SLOT' |
if ($slotstatus eq 'NOT_IN_A_SLOT' |
&& $checkedin ) { |
&& $checkedin ) { |
|
|
if ($pass_status) { |
if ($got_grade) { |
return ('SHOW_ANSWER'); |
return ('SHOW_ANSWER'); |
} else { |
} else { |
return ('WAITING_FOR_GRADE'); |
return ('WAITING_FOR_GRADE'); |
Line 753 sub editxmlmode {
|
Line 754 sub editxmlmode {
|
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, |
my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, |
($env{'environment.remote'} ne 'off')); |
($env{'environment.remote'} ne 'off')); |
my $html=&Apache::lonxml::xmlbegin(); |
my $html=&Apache::lonxml::xmlbegin(); |
$result.=$html.$bodytag. |
my $head="<head><title>EditXML $file</title>". |
|
&Apache::edit::js_change_detection()."</head>"; |
|
|
|
$result.=$html.$head.$bodytag. |
&renderpage($request,$file,['no_output_web'],1). |
&renderpage($request,$file,['no_output_web'],1). |
&Apache::lonxml::message_location().' |
&Apache::lonxml::message_location().' |
<form name="lonhomework" method="POST" action="'. |
<form '.&Apache::edit::form_change_detection().' name="lonhomework" method="POST" action="'. |
&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'. |
&HTML::Entities::encode($env{'request.uri'},'<>&"').'">'. |
&Apache::structuretags::remember_problem_state().' |
&Apache::structuretags::remember_problem_state().' |
<input type="hidden" name="problemmode" value="'.&mt('EditXML').'" /> |
<input type="hidden" name="problemmode" value="'.&mt('EditXML').'" /> |
<input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" /> |
<input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" /> |
<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" /> |
<input type="submit" '.&Apache::edit::submit_ask_anyway().'name="problemmode" accesskey="e" value="'.&mt('Edit').'" /> |
|
<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> |
<hr /> |
<hr /> |
<input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" /> |
<input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" /> |
<input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /> |
<input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /> |
<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> |
|
<hr /> |
<hr /> |
' . $xml_help . ' |
' . $xml_help . ' |
<textarea style="width:100%" rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'. |
<textarea '.&Apache::edit::element_change_detection().' style="width:100%" rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'. |
&HTML::Entities::encode($problem,'<>&"').'</textarea> |
&HTML::Entities::encode($problem,'<>&"').'</textarea><br /> |
|
<input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" /> |
|
<input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /> |
</form></body></html>'; |
</form></body></html>'; |
&Apache::lonxml::add_messages(\$result); |
&Apache::lonxml::add_messages(\$result); |
$request->print($result); |
$request->print($result); |