--- loncom/interface/loncoursedata.pm 2018/03/11 12:49:53 1.201.2.1 +++ loncom/interface/loncoursedata.pm 2017/12/18 23:51:14 1.202 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: loncoursedata.pm,v 1.201.2.1 2018/03/11 12:49:53 raeburn Exp $ +# $Id: loncoursedata.pm,v 1.202 2017/12/18 23:51:14 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1775,7 +1775,7 @@ sub populate_weight_table { my @resources; foreach my $seq (@sequences) { push(@resources,$navmap->retrieveResources($seq, - sub {shift->is_problem();}, + sub {shift->is_gradable();}, 0,0,0)); } if (! scalar(@resources)) { @@ -1933,7 +1933,7 @@ sub rank_students_by_scores_on_resources $limits =~ s/( AND )$//; # Remove extra conjunction $request .= "WHERE $limits"; } - $request .= " $award_clause GROUP BY a.student_id ORDER BY score, b.student"; + $request .= " $award_clause GROUP BY a.student_id ORDER BY score"; #&Apache::lonnet::logthis('request = '.$/.$request); my $sth = $dbh->prepare($request) or die "Can't prepare $request"; $sth->execute();