--- loncom/interface/lonuserutils.pm 2013/02/19 17:30:35 1.149
+++ loncom/interface/lonuserutils.pm 2013/05/03 16:29:34 1.152
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.149 2013/02/19 17:30:35 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.152 2013/05/03 16:29:34 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -399,6 +399,12 @@ sub javascript_validations {
$param{'curr_autharg'} = $curr_authfield;
}
+ my $showcredits;
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
+ if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) {
+ $showcredits = 1;
+ }
+
my ($setsection_call,$setsections_js);
my $finish = " vf.submit();\n";
if ($mode eq 'upload') {
@@ -408,13 +414,14 @@ sub javascript_validations {
$setsection_call = 'setSections(document.'.$param{'formname'}.",'$crstype'".');';
$setsections_js =
&setsections_javascript($param{'formname'},$groupslist,
- $mode,'',$crstype);
+ $mode,'',$crstype,$showcredits);
} else {
$setsection_call = "'ok'";
}
} elsif ($context eq 'domain') {
$setsection_call = 'setCourse()';
- $setsections_js = &dc_setcourse_js($param{'formname'},$mode,$context);
+ $setsections_js = &dc_setcourse_js($param{'formname'},$mode,
+ $context,$showcredits);
}
$finish = " var checkSec = $setsection_call\n".
" if (checkSec == 'ok') {\n".
@@ -437,13 +444,16 @@ sub javascript_validations {
domain => 'The optional domain field was not specified.',
continue => 'Continue adding users?',
);
+ if ($showcredits) {
+ $alert{'credits'} = &mt('The optional credits field was not specified');
+ }
if (($mode eq 'upload') && ($context eq 'domain')) {
$alert{'inststatus'} = &mt('The optional affiliation field was not specified');
}
my $function_name = <<"END";
$setsections_js
-function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain,foundinststatus) {
+function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain,foundinststatus,foundcredits) {
END
my ($authnum,%can_assign) = &Apache::loncommon::get_assignable_auth($domain);
my $auth_checks;
@@ -500,6 +510,7 @@ END
return;
}
}
+/* regexp here to check for non \d \. in credits */
END
} else {
$auth_checks .= (<<END);
@@ -572,6 +583,16 @@ END
message+='$alert{'domain'}';
}
END
+ if ($showcredits) {
+ $optional_checks .= <<END;
+ if (foundcredits==0) {
+ if (message!='') {
+ message+='\\n';
+ }
+ message+='$alert{'credits'}';
+ }
+END
+ }
if (($mode eq 'upload') && ($context eq 'domain')) {
$optional_checks .= (<<END);
@@ -656,6 +677,7 @@ function verify(vf,sec_caller) {
var foundrole=0;
var founddomain=0;
var foundinststatus=0;
+ var foundcredits=0;
var tw;
for (i=0;i<=vf.nfields.value;i++) {
tw=eval('vf.f'+i+'.selectedIndex');
@@ -668,8 +690,9 @@ function verify(vf,sec_caller) {
if (tw==11) { foundrole=1; }
if (tw==12) { founddomain=1; }
if (tw==13) { foundinststatus=1; }
+ if (tw==14) { foundcredits=1; }
}
- verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain,foundinststatus);
+ verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain,foundinststatus,foundcredits);
}
//
@@ -692,6 +715,7 @@ function verify(vf,sec_caller) {
// 11 = role
// 12 = domain
// 13 = inststatus
+// 14 = foundcredits
function flip(vf,tf) {
var nw=eval('vf.f'+tf+'.selectedIndex');
@@ -789,6 +813,7 @@ function verify(vf,sec_caller) {
var foundrole=0;
var founddomain=0;
var foundinststatus=0;
+ var foundcredits=0;
var tw;
for (i=0;i<=vf.nfields.value;i++) {
tw=eval('vf.f'+i+'.selectedIndex');
@@ -801,8 +826,9 @@ function verify(vf,sec_caller) {
if (i==10 && tw!=0) { foundrole=1; }
if (i==11 && tw!=0) { founddomain=1; }
if (i==12 && tw!=0) { foundinstatus=1; }
+ if (i==13 && tw!=0) { foundcredits=1; }
}
- verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain,foundinststatus);
+ verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain,foundinststatus,foundcredits);
}
function flip(vf,tf) {
@@ -834,7 +860,8 @@ ENDPICK
###############################################################
###############################################################
sub print_upload_manager_footer {
- my ($r,$i,$keyfields,$defdom,$today,$halfyear,$context,$permission,$crstype) = @_;
+ my ($r,$i,$keyfields,$defdom,$today,$halfyear,$context,$permission,$crstype,
+ $showcredits) = @_;
my $form = 'document.studentform';
my $formname = 'studentform';
my ($krbdef,$krbdefdom) =
@@ -923,9 +950,15 @@ sub print_upload_manager_footer {
&mt('Default role'))
.&mt('Choose the role to assign to users without a value specified in the uploaded file.')
} elsif ($context eq 'course') {
- $Str .= &Apache::lonhtmlcommon::row_title(
+ if ($showcredits) {
+ $Str .= &Apache::lonhtmlcommon::row_title(
+ &mt('Default role, section and credits'))
+ .&mt('Choose the role and/or section(s) and/or credits to assign to users without values specified in the uploaded file.');
+ } else {
+ $Str .= &Apache::lonhtmlcommon::row_title(
&mt('Default role and section'))
- .&mt('Choose the role and/or section(s) to assign to users without values specified in the uploaded file.');
+ .&mt('Choose the role and/or section(s) to assign to users without values specified in the uploaded file.');
+ }
} else {
$Str .= &Apache::lonhtmlcommon::row_title(
&mt('Default role and/or section(s)'))
@@ -933,7 +966,8 @@ sub print_upload_manager_footer {
}
if (($context eq 'domain') || ($context eq 'author')) {
$Str .= '<br />';
- my ($options,$cb_script,$coursepick) = &default_role_selector($context,1);
+ my ($options,$cb_script,$coursepick) =
+ &default_role_selector($context,1,'',$showcredits);
if ($context eq 'domain') {
$Str .= '<p>'
.'<b>'.&mt('Domain Level').'</b><br />'
@@ -950,8 +984,13 @@ sub print_upload_manager_footer {
} else {
my ($cnum,$cdom) = &get_course_identity();
my $rowtitle = &mt('section');
- my $secbox = §ion_picker($cdom,$cnum,'Any',$rowtitle,
- $permission,$context,'upload',$crstype);
+ my $defaultcredits;
+ if ($showcredits) {
+ $defaultcredits = &get_defaultcredits();
+ }
+ my $secbox = §ion_picker($cdom,$cnum,'Any',$rowtitle,$permission,
+ $context,'upload',$crstype,$showcredits,
+ $defaultcredits);
$Str .= $secbox
.&Apache::lonhtmlcommon::row_closure();
my %lt;
@@ -997,6 +1036,43 @@ sub print_upload_manager_footer {
return;
}
+sub get_defaultcredits {
+ my ($cdom,$cnum) = @_;
+
+ if ($cdom eq '' || $cnum eq '') {
+ return unless ($env{'request.course.id'});
+ $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ }
+ return unless(($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/));
+ my ($defaultcredits,$domdefcredits);
+ my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+ if ($domdefaults{'officialcredits'} || $domdefaults{'unofficialcredits'}) {
+ my $instcode = $env{'course.'.$cdom.'_'.$cnum.'.internal.coursecode'};
+ if ($instcode) {
+ $domdefcredits = $domdefaults{'officialcredits'};
+ } else {
+ $domdefcredits = $domdefaults{'unofficialcredits'};
+ }
+ } else {
+ return;
+ }
+
+ if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
+ $defaultcredits = $env{'course.'.$cdom.'_'.$cnum.'.internal.defaultcredits'};
+ } elsif (exists($env{'course.'.$cdom.'_'.$cnum.'.internal.defaultcredits'})) {
+ $defaultcredits = $env{'course.'.$cdom.'_'.$cnum.'.internal.defaultcredits'};
+ } else {
+ my %crsinfo =
+ &Apache::lonnet::coursedescription("$cdom/$cnum",{'one_time' => 1});
+ $defaultcredits = $crsinfo{'internal.defaultcredits'};
+ }
+ if ($defaultcredits eq '') {
+ $defaultcredits = $domdefcredits;
+ }
+ return $defaultcredits;
+}
+
sub forceid_change {
my ($context) = @_;
my $output =
@@ -1018,7 +1094,7 @@ sub forceid_change {
###############################################################
###############################################################
sub print_upload_manager_form {
- my ($r,$context,$permission,$crstype) = @_;
+ my ($r,$context,$permission,$crstype,$showcredits) = @_;
my $firstLine;
my $datatoken;
if (!$env{'form.datatoken'}) {
@@ -1051,7 +1127,9 @@ sub print_upload_manager_form {
'domain_choice' => 'scalar',
'inststatus_choice' => 'scalar',
};
- my $defdom = $env{'request.role.domain'};
+ if ($showcredits) {
+ $col_setting_names->{'credits_choice'} = 'scalar';
+ }
if ($context eq 'course') {
&Apache::loncommon::restore_course_settings('enrollment_upload',
$col_setting_names);
@@ -1059,6 +1137,7 @@ sub print_upload_manager_form {
&Apache::loncommon::restore_settings($context,'user_upload',
$col_setting_names);
}
+ my $defdom = $env{'request.role.domain'};
#
# Determine kerberos parameters as appropriate
my ($krbdef,$krbdefdom) =
@@ -1084,6 +1163,10 @@ sub print_upload_manager_form {
['role',&mt('Role'), $env{'form.role_choice'}],
['domain',&mt('Domain'), $env{'form.domain_choice'}],
['inststatus',&mt('Affiliation'), $env{'form.inststatus_choice'}]);
+ if ($showcredits) {
+ push(@field,
+ ['credits',&mt('Student Credits'), $env{'form.credits_choice'}]);
+ }
if ($env{'form.upfile_associate'} eq 'reverse') {
&Apache::loncommon::csv_print_samples($r,\@records);
$i=&Apache::loncommon::csv_print_select_table($r,\@records,
@@ -1101,7 +1184,7 @@ sub print_upload_manager_form {
}
}
&print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear,
- $context,$permission,$crstype);
+ $context,$permission,$crstype,$showcredits);
}
sub setup_date_selectors {
@@ -1258,7 +1341,7 @@ sub make_dates_default {
}
sub default_role_selector {
- my ($context,$checkpriv,$crstype) = @_;
+ my ($context,$checkpriv,$crstype,$showcredits) = @_;
my %customroles;
my ($options,$coursepick,$cb_jscript);
if ($context ne 'author') {
@@ -1270,6 +1353,7 @@ sub default_role_selector {
'grs' => "Section",
'exs' => "Existing sections",
'new' => "New section",
+ 'crd' => "Credits",
);
$options = '<select name="defaultrole">'."\n".
' <option value="">'.&mt('Please select').'</option>'."\n";
@@ -1289,12 +1373,18 @@ sub default_role_selector {
}
my $courseform = &Apache::loncommon::selectcourse_link
('studentform','dccourse','dcdomain','coursedesc',"$env{'request.role.domain'}",undef,'Course/Community');
+ my ($credit_elem,$creditsinput);
+ if ($showcredits) {
+ $credit_elem = 'credits';
+ $creditsinput = '<td><input type="text" name="credits" value="" /></td>';
+ }
$cb_jscript =
- &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'},'currsec','studentform','courserole','Course/Community');
+ &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'},'currsec','studentform','courserole','Course/Community',$credit_elem);
$coursepick = &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
'<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th>'.
'<th>'.$lt{'grs'}.'</th>'.
+ '<th>'.$lt{'crd'}.'</th>'.
&Apache::loncommon::end_data_table_header_row().
&Apache::loncommon::start_data_table_row()."\n".
'<td><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'studentform','dccourse','dcdomain','coursedesc','','','','crstype'".')" /></td>'."\n".
@@ -1316,7 +1406,7 @@ sub default_role_selector {
'<input type="hidden" name="dccourse" value="" />'.
'<input type="hidden" name="dcdomain" value="" />'.
'<input type="hidden" name="crstype" value="" />'.
- '</td></tr></table></td>'.
+ '</td></tr></table></td>'.$creditsinput.
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table()."\n";
}
@@ -1453,7 +1543,7 @@ sub my_custom_roles {
sub print_userlist {
my ($r,$mode,$permission,$context,$formname,$totcodes,$codetitles,
- $idlist,$idlist_titles) = @_;
+ $idlist,$idlist_titles,$showcredits) = @_;
my $format = $env{'form.output'};
if (! exists($env{'form.sortby'})) {
$env{'form.sortby'} = 'username';
@@ -1488,10 +1578,6 @@ sub print_userlist {
@statuses = ('future');
}
-# if ($context eq 'course') {
-# $r->print(&display_adv_courseroles());
-# }
- #
# Interface output
$r->print('<form name="studentform" method="post" action="/adm/createuser">'."\n".
'<input type="hidden" name="action" value="'.
@@ -1529,7 +1615,7 @@ sub print_userlist {
$r->print(§ion_group_filter($cnum,$cdom));
}
$r->print('</div><div class="LC_left_float">'.
- &column_checkboxes($context,$mode,$formname).
+ &column_checkboxes($context,$mode,$formname,$showcredits).
'</div>');
if ($env{'form.phase'} eq '') {
$r->print('<br clear="all" />'.
@@ -1543,9 +1629,9 @@ sub print_userlist {
&list_submit_button(&mt('Update Display'))."\n");
}
- my @cols = &infocolumns($context,$mode);
+ my @cols = &infocolumns($context,$mode,$showcredits);
if (!@cols) {
- $r->print('<hr clear="all" /><span class="LC_warning">'.
+ $r->print('<hr style="clear:both;" /><span class="LC_warning">'.
&mt('No user information selected for display.').'</span>'.
'<input type="hidden" name="phase" value="display" /></form>'."\n");
return;
@@ -1588,7 +1674,7 @@ sub print_userlist {
$r->print('<hr />'.&mt('Searching ...').'<br /> <br />');
}
} else {
- $r->print('<hr clear="all" /><div id="searching">'.&mt('Searching ...').'</div>');
+ $r->print('<hr style="clear:both;" /><div id="searching">'.&mt('Searching ...').'</div>');
}
$r->rflush();
if ($context eq 'course') {
@@ -1730,10 +1816,12 @@ sub print_userlist {
my $usercount;
if ($env{'form.action'} eq 'modifystudent') {
($usercount) = &show_users_list($r,$context,'view',$permission,
- $env{'form.Status'},\%userlist,$keylist);
+ $env{'form.Status'},\%userlist,$keylist,'',
+ $showcredits);
} else {
($usercount) = &show_users_list($r,$context,$env{'form.output'},
- $permission,$env{'form.Status'},\%userlist,$keylist);
+ $permission,$env{'form.Status'},\%userlist,
+ $keylist,'',$showcredits);
}
if (!$usercount) {
$r->print('<br /><span class="LC_info">'
@@ -1854,12 +1942,12 @@ sub section_group_filter {
}
sub infocolumns {
- my ($context,$mode) = @_;
+ my ($context,$mode,$showcredits) = @_;
my @cols;
if (($mode eq 'pickauthor') || ($mode eq 'autoenroll')) {
- @cols = &get_cols_array($context,$mode);
+ @cols = &get_cols_array($context,$mode,$showcredits);
} else {
- my @posscols = &get_cols_array($context,$mode);
+ my @posscols = &get_cols_array($context,$mode,$showcredits);
if ($env{'form.phase'} ne '') {
my @checkedcols = &Apache::loncommon::get_env_multiple('form.showcol');
foreach my $col (@checkedcols) {
@@ -1875,7 +1963,7 @@ sub infocolumns {
}
sub get_cols_array {
- my ($context,$mode) = @_;
+ my ($context,$mode,$showcredits) = @_;
my @cols;
if ($mode eq 'pickauthor') {
@cols = ('username','fullname','status','email');
@@ -1893,6 +1981,9 @@ sub get_cols_array {
}
push(@cols,'email');
if (($context eq 'course') && ($mode ne 'autoenroll')) {
+ if ($showcredits) {
+ push(@cols,'credits');
+ }
push(@cols,'lastlogin','clicker');
}
if (($context eq 'course') && ($mode ne 'autoenroll') &&
@@ -1907,8 +1998,8 @@ sub get_cols_array {
}
sub column_checkboxes {
- my ($context,$mode,$formname) = @_;
- my @cols = &get_cols_array($context,$mode);
+ my ($context,$mode,$formname,$showcredits) = @_;
+ my @cols = &get_cols_array($context,$mode,$showcredits);
my @showncols = &Apache::loncommon::get_env_multiple('form.showcol');
my (%disabledchk,%unchecked);
if ($env{'form.phase'} eq '') {
@@ -1917,6 +2008,9 @@ sub column_checkboxes {
$disabledchk{'role'} = 1;
$unchecked{'photo'} = 1;
$unchecked{'clicker'} = 1;
+ if ($showcredits) {
+ $unchecked{'credits'} = 1;
+ }
} elsif ($context eq 'domain') {
$unchecked{'extent'} = 1;
}
@@ -2012,6 +2106,7 @@ sub get_column_names {
'end' => "end date",
'status' => "status",
'role' => "role",
+ 'credits' => "credits",
'type' => "enroll type/action",
'email' => "e-mail address",
'photo' => "photo",
@@ -2281,29 +2376,6 @@ sub instcode_from_coursefilter {
return $instcode;
}
-sub display_adv_courseroles {
- my $output;
- #
- # List course personnel
- my %coursepersonnel =
- &Apache::lonnet::get_course_adv_roles($env{'request.course.id'});
- #
- $output = '<br />'.&Apache::loncommon::start_data_table();
- foreach my $role (sort(keys(%coursepersonnel))) {
- next if ($role =~ /^\s*$/);
- $output .= &Apache::loncommon::start_data_table_row().
- '<td>'.$role.'</td><td>';
- foreach my $user (split(',',$coursepersonnel{$role})) {
- my ($puname,$pudom)=split(':',$user);
- $output .= ' '.&Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($puname,$pudom),
- $puname,$pudom);
- }
- $output .= '</td>'.&Apache::loncommon::end_data_table_row();
- }
- $output .= &Apache::loncommon::end_data_table();
-}
-
sub make_keylist_array {
my ($index,$keylist);
$index->{'domain'} = &Apache::loncoursedata::CL_SDOM();
@@ -2322,6 +2394,7 @@ sub make_keylist_array {
$index->{'extent'} = &Apache::loncoursedata::CL_EXTENT();
$index->{'photo'} = &Apache::loncoursedata::CL_PHOTO();
$index->{'thumbnail'} = &Apache::loncoursedata::CL_THUMBNAIL();
+ $index->{'credits'} = &Apache::loncoursedata::CL_CREDITS();
foreach my $key (keys(%{$index})) {
$keylist->[$index->{$key}] = $key;
}
@@ -2370,7 +2443,8 @@ sub process_date_info {
}
sub show_users_list {
- my ($r,$context,$mode,$permission,$statusmode,$userlist,$keylist,$formname)=@_;
+ my ($r,$context,$mode,$permission,$statusmode,$userlist,$keylist,$formname,
+ $showcredits)=@_;
if ($formname eq '') {
$formname = 'studentform';
}
@@ -2385,6 +2459,9 @@ sub show_users_list {
my @sortable = ('username','domain','id','fullname','start','end','email','role');
if ($context eq 'course') {
push(@sortable,('section','groups','type'));
+ if ($showcredits) {
+ push(@sortable,'credits');
+ }
} else {
push(@sortable,'extent');
}
@@ -2395,11 +2472,12 @@ sub show_users_list {
$sortby = 'username';
}
my $setting = $env{'form.roletype'};
- my ($cid,$cdom,$cnum,$classgroups,$crstype);
+ my ($cid,$cdom,$cnum,$classgroups,$crstype,$defaultcredits);
if ($context eq 'course') {
$cid = $env{'request.course.id'};
$crstype = &Apache::loncommon::course_type();
($cnum,$cdom) = &get_course_identity($cid);
+ $defaultcredits = $env{'course.'.$cid.'.internal.defaultcredits'};
($classgroups) = &Apache::loncoursedata::get_group_memberships(
$userlist,$keylist,$cdom,$cnum);
if ($mode eq 'autoenroll') {
@@ -2492,7 +2570,7 @@ END
$r->print(<<END);
<input type="hidden" name="sortby" value="$sortby" />
END
- my @cols = &infocolumns($context,$mode);
+ my @cols = &infocolumns($context,$mode,$showcredits);
my %coltxt = &get_column_names($context);
my %acttxt = &Apache::lonlocal::texthash(
'pr' => "Proceed",
@@ -2794,6 +2872,11 @@ END
'gif','thumbnail');
}
}
+ if (($role eq 'st') && ($defaultcredits)) {
+ if ($userlist->{$user}->[$index{'credits'}] eq '') {
+ $userlist->{$user}->[$index{'credits'}] = $defaultcredits;
+ }
+ }
}
}
my %emails = &Apache::loncommon::getemails($uname,$udom);
@@ -2911,7 +2994,8 @@ END
$checkval .= ':'.$in{'section'};
if ($role eq 'st') {
$checkval .= ':'.$in{'type'}.':'.
- $in{'lockedtype'};
+ $in{'lockedtype'}.':'.
+ $in{'credits'};
}
}
}
@@ -3159,6 +3243,7 @@ sub select_actions {
chgdates => "Change starting/ending dates",
chgsec => "Change section associated with user roles",
);
+ # FIXME Add an option to change credits for student roles.
my ($output,$options,%choices);
# FIXME Disable actions for now for roletype=course in domain context
if ($context eq 'domain' && $setting eq 'course') {
@@ -3286,11 +3371,13 @@ ENDTWO
}
sub date_section_selector {
- my ($context,$permission,$crstype) = @_;
+ my ($context,$permission,$crstype,$showcredits) = @_;
my $callingform = $env{'form.callingform'};
my $formname = 'dateselect';
my $groupslist = &get_groupslist();
- my $sec_js = &setsections_javascript($formname,$groupslist);
+ my $sec_js =
+ &setsections_javascript($formname,$groupslist,undef,undef,$crstype,
+ $showcredits);
my $output = <<"END";
<script type="text/javascript">
// <![CDATA[
@@ -3422,7 +3509,8 @@ ENDJS
$info = '<input type="hidden" name="retainsec" value="0" />';
}
my $rowtitle = &mt('New section to assign');
- my $secbox = §ion_picker($cdom,$cnum,$env{'form.showrole'},$rowtitle,$permission,$context,'',$crstype);
+ my $secbox = §ion_picker($cdom,$cnum,$env{'form.showrole'},$rowtitle,
+ $permission,$context,'chgsec',$crstype);
$output .= $info.$secbox;
}
$output .= '<p>'.
@@ -3432,13 +3520,14 @@ ENDJS
}
sub section_picker {
- my ($cdom,$cnum,$role,$rowtitle,$permission,$context,$mode,$crstype) = @_;
+ my ($cdom,$cnum,$role,$rowtitle,$permission,$context,$mode,$crstype,
+ $showcredits,$credits) = @_;
my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
my $sections_select .= &course_sections(\%sections_count,$role);
my $secbox = '<div>'.&Apache::lonhtmlcommon::start_pick_box()."\n";
if ($mode eq 'upload') {
my ($options,$cb_script,$coursepick) =
- &default_role_selector($context,1,$crstype);
+ &default_role_selector($context,1,$crstype,$showcredits);
$secbox .= &Apache::lonhtmlcommon::row_title(&mt('role'),'LC_oddrow_value').
$options. &Apache::lonhtmlcommon::row_closure(1)."\n";
}
@@ -3456,8 +3545,17 @@ sub section_picker {
$env{'request.course.sec'}.'" />'.
$env{'request.course.sec'};
}
- $secbox .= &Apache::lonhtmlcommon::row_closure(1)."\n".
- &Apache::lonhtmlcommon::end_pick_box().'</div>';
+ $secbox .= &Apache::lonhtmlcommon::row_closure(1)."\n";
+ unless ($mode eq 'chgsec') {
+ if ($showcredits) {
+ $secbox .=
+ &Apache::lonhtmlcommon::row_title(&mt('credits (students)'),
+ 'LC_evenrow_value')."\n".
+ '<input type="text" name="credits" size="3" value="'.$credits.'" />'."\n".
+ &Apache::lonhtmlcommon::row_closure(1)."\n";
+ }
+ }
+ $secbox .= &Apache::lonhtmlcommon::end_pick_box().'</div>';
return $secbox;
}
@@ -3898,7 +3996,7 @@ sub print_first_users_upload_form {
# ================================================= Drop/Add from uploaded file
sub upfile_drop_add {
- my ($r,$context,$permission) = @_;
+ my ($r,$context,$permission,$showcredits) = @_;
&Apache::loncommon::load_tmp_file($r);
my @userdata=&Apache::loncommon::upfile_record_sep();
if($env{'form.noFirstLine'}){shift(@userdata);}
@@ -3919,25 +4017,17 @@ sub upfile_drop_add {
}
#
# Store the field choices away
- foreach my $field (qw/username names
- fname mname lname gen id sec ipwd email role domain/) {
+ my @storefields = qw/username names fname mname lname gen id
+ sec ipwd email role domain inststatus/;
+ if ($showcredits) {
+ push (@storefields,'credits');
+ }
+ my %fieldstype;
+ foreach my $field (@storefields) {
$env{'form.'.$field.'_choice'}=$fields{$field};
+ $fieldstype{$field.'_choice'} = 'scalar';
}
- &Apache::loncommon::store_course_settings('enrollment_upload',
- { 'username_choice' => 'scalar',
- 'names_choice' => 'scalar',
- 'fname_choice' => 'scalar',
- 'mname_choice' => 'scalar',
- 'lname_choice' => 'scalar',
- 'gen_choice' => 'scalar',
- 'id_choice' => 'scalar',
- 'sec_choice' => 'scalar',
- 'ipwd_choice' => 'scalar',
- 'email_choice' => 'scalar',
- 'role_choice' => 'scalar',
- 'domain_choice' => 'scalar',
- 'inststatus_choice' => 'scalar'});
- #
+ &Apache::loncommon::store_course_settings('enrollment_upload',\%fieldstype);
my ($cid,$crstype,$setting);
if ($context eq 'domain') {
$setting = $env{'form.roleaction'};
@@ -4005,19 +4095,30 @@ sub upfile_drop_add {
$amode = ''; # This causes the loop below to be skipped
}
}
- my ($defaultsec,$defaultrole);
+ my ($defaultsec,$defaultrole,$defaultcredits,$commoncredits);
if ($context eq 'domain') {
if ($setting eq 'domain') {
$defaultrole = $env{'form.defaultrole'};
} elsif ($setting eq 'course') {
$defaultrole = $env{'form.courserole'};
$defaultsec = $env{'form.sections'};
+ if ($showcredits) {
+ $commoncredits = $env{'form.credits'};
+ if ($crstype ne 'Community') {
+ my %coursehash=&Apache::lonnet::coursedescription($cid);
+ $defaultcredits = $coursehash{'internal.defaultcredits'};
+ }
+ }
}
} elsif ($context eq 'author') {
$defaultrole = $env{'form.defaultrole'};
} elsif ($context eq 'course') {
$defaultrole = $env{'form.defaultrole'};
$defaultsec = $env{'form.sections'};
+ if ($showcredits) {
+ $commoncredits = $env{'form.credits'};
+ $defaultcredits = $env{'course.'.$cid.'.internal.defaultcredits'};
+ }
}
# Check to see if user information can be changed
my @userinfo = ('firstname','middlename','lastname','generation',
@@ -4277,6 +4378,21 @@ sub upfile_drop_add {
foreach (\$id,\$fname,\$mname,\$lname,\$gen,\$inststatus) {
$$_ =~ s/(\s+$|^\s+)//g;
}
+ my $credits;
+ if ($showcredits) {
+ if (($role eq 'st') && ($crstype ne 'Community')) {
+ $credits = $entries{$fields{'credits'}};
+ if ($credits ne '') {
+ $credits =~ s/[^\d\.]//g;
+ }
+ if ($credits eq '') {
+ $credits = $commoncredits;
+ }
+ if ($credits eq $defaultcredits) {
+ undef($credits);
+ }
+ }
+ }
# check against rules
my $checkid = 0;
my $newuser = 0;
@@ -4407,7 +4523,7 @@ sub upfile_drop_add {
$fname,$mname,$lname,$gen,$sec,$enddate,
$startdate,$env{'form.forceid'},
$desiredhost,$email,'manual','',$cid,
- '',$context,$inststatus);
+ '',$context,$inststatus,$credits);
$userresult = $roleresult;
} else {
if ($role ne '') {
@@ -4681,7 +4797,7 @@ sub update_user_list {
foreach my $item (@changelist) {
my ($role,$uname,$udom,$cid,$sec,$scope,$result,$type,$locktype,
@sections,$scopestem,$singlesec,$showsecs,$warn_singlesec,
- $nothingtodo,$keepnosection);
+ $nothingtodo,$keepnosection,$credits);
if ($choice eq 'drop') {
($uname,$udom,$sec) = split(/:/,$item,-1);
$role = 'st';
@@ -4694,7 +4810,8 @@ sub update_user_list {
$scope = $scopestem.'/'.$sec;
}
} elsif ($context eq 'course') {
- ($uname,$udom,$role,$sec,$type,$locktype) = split(/\:/,$item,-1);
+ ($uname,$udom,$role,$sec,$type,$locktype,$credits) =
+ split(/\:/,$item);
$cid = $env{'request.course.id'};
$scopestem = '/'.$cid;
$scopestem =~s/\_/\//g;
@@ -4713,7 +4830,7 @@ sub update_user_list {
} elsif ($setting eq 'author') {
($uname,$udom,$role,$scope) = split(/\:/,$item);
} elsif ($setting eq 'course') {
- ($uname,$udom,$role,$cid,$sec,$type,$locktype) =
+ ($uname,$udom,$role,$cid,$sec,$type,$locktype,$credits) =
split(/\:/,$item);
$scope = '/'.$cid;
$scope =~s/\_/\//g;
@@ -4736,7 +4853,7 @@ sub update_user_list {
$end = $now;
if ($role eq 'st') {
$result =
- &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context);
+ &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
} else {
$result =
&Apache::lonnet::revokerole($udom,$uname,$scope,$role,
@@ -4744,7 +4861,7 @@ sub update_user_list {
}
} elsif ($choice eq 'delete') {
if ($role eq 'st') {
- &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$now,$start,$type,$locktype,$cid,'',$context);
+ &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$now,$start,$type,$locktype,$cid,'',$context,$credits);
}
$result =
&Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now,
@@ -4757,7 +4874,7 @@ sub update_user_list {
}
if ($choice eq 'reenable') {
if ($role eq 'st') {
- $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context);
+ $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
} else {
$result =
&Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
@@ -4765,14 +4882,14 @@ sub update_user_list {
}
} elsif ($choice eq 'activate') {
if ($role eq 'st') {
- $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context);
+ $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
} else {
$result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
$now,'','',$context);
}
} elsif ($choice eq 'chgdates') {
if ($role eq 'st') {
- $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context);
+ $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
} else {
$result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
$start,'','',$context);
@@ -4842,7 +4959,7 @@ sub update_user_list {
} else {
if ($role eq 'st') {
$result =
- &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid,'',$context);
+ &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid,'',$context,$credits);
} else {
my $newscope = $scopestem;
$result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start,'','',$context);
@@ -4856,7 +4973,7 @@ sub update_user_list {
foreach my $newsec (@newsecs) {
if (!grep(/^\Q$newsec\E$/,@retained)) {
if ($role eq 'st') {
- $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid,'',$context);
+ $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
if (@newsecs > 1) {
my $showsingle;
if ($newsec eq '') {
@@ -5148,14 +5265,18 @@ sub get_groupslist {
}
sub setsections_javascript {
- my ($formname,$groupslist,$mode,$checkauth,$crstype) = @_;
+ my ($formname,$groupslist,$mode,$checkauth,$crstype,$showcredits) = @_;
my ($checkincluded,$finish,$rolecode,$setsection_js);
if ($mode eq 'upload') {
$checkincluded = 'formname.name == "'.$formname.'"';
$finish = "return 'ok';";
$rolecode = "var role = formname.defaultrole.options[formname.defaultrole.selectedIndex].value;\n";
} elsif ($formname eq 'cu') {
- $checkincluded = 'formname.elements[i-1].checked == true';
+ if (($crstype eq 'Course') && ($showcredits)) {
+ $checkincluded = "((role == 'st') && (formname.elements[i-2].checked == true)) || ((role != 'st') && (formname.elements[i-1].checked == true))";
+ } else {
+ $checkincluded = 'formname.elements[i-1].checked == true';
+ }
if ($checkauth) {
$finish = "var authcheck = auth_check();\n".
" if (authcheck == 'ok') {\n".
@@ -5214,8 +5335,8 @@ function setSections(formname,crstype) {
var checkcurr = str.match(re1);
if (checkcurr != null) {
var num = i;
+ $rolecode
if ($checkincluded) {
- $rolecode
if (role == 'cc' || role == 'co') {
if (role == 'cc') {
alert("$alerts{'secd'}\\n$alerts{'accr'}");
@@ -5588,7 +5709,7 @@ sub get_course_identity {
}
sub dc_setcourse_js {
- my ($formname,$mode,$context) = @_;
+ my ($formname,$mode,$context,$showcredits) = @_;
my ($dc_setcourse_code,$authen_check);
my $cctext = &Apache::lonnet::plaintext('cc');
my $cotext = &Apache::lonnet::plaintext('co');
@@ -5674,7 +5795,7 @@ function setCourse() {
}
SCRIPTTOP
if ($mode ne 'upload') {
- $dc_setcourse_code .= (<<"ENDSCRIPT");
+ $dc_setcourse_code .= (<<"SCRIPTMID");
var coursename = "_$env{'request.role.domain'}"+"_"+course+"_"+userrole
var numcourse = getIndex(document.$formname.dccourse);
if (numcourse == "-1") {
@@ -5700,6 +5821,16 @@ SCRIPTTOP
if (numend != "-1") {
document.$formname.elements[numend].name = "end"+coursename
}
+SCRIPTMID
+ if ($showcredits) {
+ $dc_setcourse_code .= <<ENDCRED;
+ var numcredits = getIndex(document.$formname.credits);
+ if (numcredits != "-1") {
+ document.$formname.elements[numcredits].name = "credits"+coursename;
+ }
+ENDCRED
+ }
+ $dc_setcourse_code .= <<ENDSCRIPT;
}
}
var authcheck = auth_check();