version 1.229, 2005/12/15 23:27:22
|
version 1.233, 2006/02/10 18:36:37
|
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 198 sub check_ip_acc {
|
Line 198 sub check_ip_acc {
|
my $ip=$ENV{'REMOTE_ADDR'}; |
my $ip=$ENV{'REMOTE_ADDR'}; |
my $name; |
my $name; |
foreach my $pattern (split(',',$acc)) { |
foreach my $pattern (split(',',$acc)) { |
|
$pattern =~ s/^\s*//; |
|
$pattern =~ s/\s*$//; |
if ($pattern =~ /\*$/) { |
if ($pattern =~ /\*$/) { |
#35.8.* |
#35.8.* |
$pattern=~s/\*//; |
$pattern=~s/\*//; |
Line 260 sub check_slot_access {
|
Line 262 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 297 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 764 sub editxmlmode {
|
Line 767 sub editxmlmode {
|
&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').'" /> |
<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').'" /> |