loncom/homework/bridgetask.pm - diff

Return to bridgetask.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/bridgetask.pm between versions 1.128.2.1 and 1.128.2.9

version 1.128.2.1, 2006/03/29 14:03:53	version 1.128.2.9, 2006/04/19 20:36:19
Line 349 sub webgrade_standard_info {	Line 349 sub webgrade_standard_info {

my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',	my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',
'stop' => 'Quit Grading',	'stop' => 'Quit Grading',
	'fail' => 'Fail Rest',
);	);

my $result=<<INFO;	my $result=<<INFO;
<div class="LC_GRADING_maincontrols">	<div class="LC_GRADING_maincontrols">
<input type="submit" name="next" value="$lt{'done'}" />	<input type="submit" name="next" value="$lt{'done'}" />
<input type="submit" name="stop" value="$lt{'stop'}" />	<input type="submit" name="stop" value="$lt{'stop'}" />
	<input type="button" name="fail" value="$lt{'fail'}"
	onclick="javascript:onFailRest()" />
</div>	</div>
$file_list	$file_list
INFO	INFO
Line 970 DONEBUTTON	Line 973 DONEBUTTON
&Apache::structuretags::finalize_storage();	&Apache::structuretags::finalize_storage();
}	}
} elsif ($target eq 'webgrade') {	} elsif ($target eq 'webgrade') {
$result.="</div>\n<hr />";	$result.="</div>";
#$result.='<input type="submit" name="next" value="'.	#$result.='<input type="submit" name="next" value="'.
# &mt('Save & Next').'" /> ';	# &mt('Save & Next').'" /> ';
#$result.='<input type="submit" name="end" value="'.	#$result.='<input type="submit" name="end" value="'.
Line 1315 sub pick_from_queue_data {	Line 1318 sub pick_from_queue_data {
if (@possible) {	if (@possible) {
# sort entries in order by slot end time	# sort entries in order by slot end time
@possible = sort { $a->[1] <=> $b->[1] } @possible;	@possible = sort { $a->[1] <=> $b->[1] } @possible;
# pick one of the first ten entries	# pick one of the entries in the top 10% in small queues and one
my $max=($#possible < 10) ? $#possible : 10;	# of the first ten entries in large queues
return $possible[int(rand($max))][0];	#my $ten_percent = int($#possible * 0.1);
	#if ($ten_percent < 1 ) { $ten_percent = 1; }
	#if ($ten_percent > 10) { $ten_percent = 10; }
	#my $max=($#possible < $ten_percent) ? $#possible : $ten_percent;

	#return $possible[int(rand($max))][0];
	return $possible[0][0];
}	}
return undef;	return undef;
}	}
Line 1760 sub get_instance {	Line 1769 sub get_instance {
my $link=&link($instance,$id);	my $link=&link($instance,$id);
my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};	my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".	$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
'<a name="'.$link.'" />'."\n".	'<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n";
'<a name="next_'.$last_link.'" />'."\n".
'<div class="LC_GRADING_criteriatext">'."\n";
@Apache::scripttag::parser_env = @_;	@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});	$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
$result.='</div>'."\n".	$result.='</div>'."\n".
Line 1872 sub start_IntroParagraph {	Line 1879 sub start_IntroParagraph {

} elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {	} elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
&Apache::lonxml::startredirection();	&Apache::lonxml::startredirection();
} else {
&Apache:;lonxml::error("Invalid use of <IntroParagraph> inside of <".$tagstack->[-2].">");
&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
}	}

}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.128.2.1
changed lines
	Added in v.1.128.2.9