--- loncom/interface/loncoursedata.pm 2015/03/10 05:13:11 1.193.6.1 +++ loncom/interface/loncoursedata.pm 2013/03/01 04:58:08 1.194 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: loncoursedata.pm,v 1.193.6.1 2015/03/10 05:13:11 raeburn Exp $ +# $Id: loncoursedata.pm,v 1.194 2013/03/01 04:58:08 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1251,7 +1251,6 @@ sub ensure_current_data { } my $student_id = &get_student_id($sname,$sdom); - &get_students_groupids($student_id); my @Result = &Apache::lonmysql::get_rows($student_table, "student_id ='$student_id'"); my $data = undef; @@ -1278,7 +1277,6 @@ sub ensure_current_full_data { ($sdom,$sname,$courseid.'.db',$getuserdir); # my $student_id = &get_student_id($sname,$sdom); - &get_students_groupids($student_id); my @Result = &Apache::lonmysql::get_rows($student_table, "student_id ='$student_id'"); my $updatetime; @@ -2293,12 +2291,13 @@ sub CL_FULLNAME { return 6; } sub CL_STATUS { return 7; } sub CL_TYPE { return 8; } sub CL_LOCKEDTYPE { return 9; } -sub CL_GROUP { return 10; } -sub CL_PERMANENTEMAIL { return 11; } -sub CL_ROLE { return 12; } -sub CL_EXTENT { return 13; } -sub CL_PHOTO { return 14; } -sub CL_THUMBNAIL { return 15; } +sub CL_CREDITS { return 10; } +sub CL_GROUP { return 11; } +sub CL_PERMANENTEMAIL { return 12; } +sub CL_ROLE { return 13; } +sub CL_EXTENT { return 14; } +sub CL_PHOTO { return 15; } +sub CL_THUMBNAIL { return 16; } sub get_classlist { my ($cdom,$cnum) = @_; @@ -2318,9 +2317,9 @@ sub get_classlist { } my ($sname,$sdom) = split(/:/,$student); my @Values = split(/:/,$info); - my ($end,$start,$id,$section,$fullname,$type,$lockedtype); + my ($end,$start,$id,$section,$fullname,$type,$lockedtype,$credits); if (@Values > 2) { - ($end,$start,$id,$section,$fullname,$type,$lockedtype) = @Values; + ($end,$start,$id,$section,$fullname,$type,$lockedtype,$credits) = @Values; } else { # We have to get the data ourselves ($end,$start) = @Values; $section = &Apache::lonnet::getsection($sdom,$sname,$cid); @@ -2359,11 +2358,13 @@ sub get_classlist { $status='Future'; } $classlist{$student} = - [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type,$lockedtype]; + [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type, + $lockedtype,$credits]; } if (wantarray()) { return (\%classlist,['domain','username','end','start','id', - 'section','fullname','status','type','lockedtype']); + 'section','fullname','status','type', + 'lockedtype','credits']); } else { return \%classlist; } @@ -3093,7 +3094,8 @@ $env{'course.'.$cid.'.domain'}, and $env Returns a reference to a hash which contains: keys '$sname:$sdom' - values [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type,$lockedtype] + values [$sdom,$sname,$end,$start,$id,$section,$fullname,$status,$type, + $lockedtype,$credits] The constant values CL_SDOM, CL_SNAME, CL_END, etc. can be used as indices into the returned list to future-proof clients against