--- loncom/interface/loncreateuser.pm 2004/11/23 18:03:04 1.88 +++ loncom/interface/loncreateuser.pm 2004/11/30 00:21:24 1.89 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.88 2004/11/23 18:03:04 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.89 2004/11/30 00:21:24 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -213,36 +213,38 @@ sub print_user_modification_page { var userrole = document.cu.role.options[document.cu.role.selectedIndex].value var section; var numsections = 0; - if (document.cu.role.value != "cc") { - for (var i=0; i 1)) { + alert("In each course, each user may only have one student role at a time. You had selected "+numsections+" sections.\\nPlease modify your selections so they include no more than one section.") + return; + } + if ((userrole == 'cc') && (numsections > 0)) { + alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections."); + section = ""; + } var numcourse = getIndex(document.cu.dccourse); if (numcourse == "-1") { alert("There was a problem with your course selection"); @@ -291,6 +293,66 @@ ENDSCRIPT pclose(); } + function setSections() { + var re1 = /^currsec_/; + for (var i=0;i 0) { + if (document.cu.elements[i+1].value != "" && document.cu.elements[i+1].value != null) { + sections = sections + "," + document.cu.elements[i+1].value; + } + } + else { + sections = document.cu.elements[i+1].value; + } + var newsecs = document.cu.elements[i+1].value; + if (newsecs != null && newsecs != "") { + var numsplit = newsecs.split(/,/g); + numsec = numsec + numsplit.length; + } + if ((role == 'st') && (numsec > 1)) { + alert("In each course, each user may only have one student role at a time. You had selected "+numsec+" sections.\\nPlease modify your selections so they include no more than one section.") + return; + } + else { + document.cu.elements[i+2].value = sections; + } + } + } + } + } + document.cu.submit(); + } ENDDOCHEAD @@ -422,13 +484,7 @@ END 'sta' => "Start", 'end' => "End" ); - $r->print(< -

$lt{'rer'}

- - -END - my (%roletext,%sortrole,%roleclass); + my (%roletext,%sortrole,%roleclass,%rolepriv); foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]); my $b1=join('_',(split('_',$b))[1,0]); return $a1 cmp $b1; @@ -567,22 +623,40 @@ END $sortrole{$sortkey}=$envkey; $roletext{$envkey}=$row; $roleclass{$envkey}=$class; + $rolepriv{$envkey}=$allowed; #$r->print($row); } # end of foreach (table building loop) + my $rolesdisplay = 0; + my %output = (); foreach my $type ('Construction Space','Course','Domain','System','Unknown') { - my $output; + $output{$type} = ''; foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { - if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { - $output.=$roletext{$sortrole{$which}}; + if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { + $output{$type}.=$roletext{$sortrole{$which}}; } } - if (defined($output)) { - $r->print("". - ""); + unless($output{$type} eq '') { + $output{$type} = "". + "". + $output{$type}; + $rolesdisplay = 1; } - $r->print($output); } - $r->print('
$lt{'rev'}$lt{'ren'}$lt{'del'}$lt{'rol'}$lt{'ext'}$lt{'sta'}$lt{'end'}
".&mt($type)."
".&mt($type)."
'); + if ($rolesdisplay == 1) { + $r->print(< +

$lt{'rer'}

+ + +END + foreach my $type ('Construction Space','Course','Domain','System','Unknown') { + if ($output{$type}) { + $r->print($output{$type}."\n"); + } + } + $r->print('
$lt{'rev'}$lt{'ren'}$lt{'del'}$lt{'rol'}$lt{'e +xt'}$lt{'sta'}$lt{'end'}
'); + } } # End of unless my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); if ($currentauth=~/^krb(4|5):/) { @@ -724,9 +798,11 @@ ENDCOAUTH # # Domain level # - $r->print('

'.&mt('Domain Level').'

'. + my $num_domain_level = 0; + my $domaintext = + '

'.&mt('Domain Level').'

'. ''. - ''); + ''; foreach ( sort( keys(%incdomains))) { my $thisdomain=$_; foreach ('dc','li','dg','au','sc') { @@ -736,7 +812,8 @@ ENDCOAUTH 'ssd' => "Set Start Date", 'sed' => "Set End Date" ); - $r->print(< @@ -752,17 +829,21 @@ ENDDROW } } } - $r->print('
'.&mt('Activate').''.&mt('Role').''.&mt('Extent').''.&mt('Start').''.&mt('End').'
'.&mt('Start').''.&mt('End').'
$plrole
'); + $domaintext.=''; + if ($num_domain_level > 0) { + $r->print($domaintext); + } # # Course level # + my $num_sections; if ($ENV{'request.role'} =~ m-^dc\./(\w+)/$-) { $r->print(&course_level_dc($1)); $r->print('
'."\n"); } else { $r->print(&course_level_table(%inccourses)); - $r->print("
\n"); + $r->print('
'."\n"); } $r->print(""); } @@ -1044,24 +1125,29 @@ END } } elsif ($_=~/^form\.ren/) { if ($_=~/^form\.ren\:([^\_]+)\_([^\_]+)$/) { - my $result=&Apache::lonnet::assignrole($ENV{'form.ccdomain'}, - $ENV{'form.ccuname'},$1,$2,0,$now); - $r->print(&mt('Re-Enabling [_1] in [_2]: [_3]', - $2,$1,$result).'
'); - if ($2 eq 'st') { - $1=~/^\/(\w+)\/(\w+)/; - my $cid=$1.'_'.$2; - $r->print(&mt('Add to classlist').': '. - &Apache::lonnet::critical( - 'put:'.$ENV{'course.'.$cid.'.domain'}.':'. - $ENV{'course.'.$cid.'.num'}.':classlist:'. - &Apache::lonnet::escape( - $ENV{'form.ccuname'}.':'. - $ENV{'form.ccdomain'} ).'='. - &Apache::lonnet::escape(':'.$now), - $ENV{'course.'.$cid.'.home'}) - .'
'); + my $url = $1; + my $role = $2; + my $logmsg; + my $output; + if ($role eq 'st') { + if ($url =~ m-^/(\w+)/(\w+)/?(\w*)$-) { + my $result = &commit_studentrole(\$logmsg,$url,$role,$now,0,$1,$2,$3); + if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) { + $output = "Error: $result\n"; + } else { + $output = &mt('Assigning').' '.$role.' in '.$url. + &mt('starting').' '.localtime($now). + ':
'.$logmsg.'
'. + &mt('Add to classlist').': ok
'; + } + } + } else { + my $result=&Apache::lonnet::assignrole($ENV{'form.ccdomain'}, + $ENV{'form.ccuname'},$url,$role,0,$now); + $output = &mt('Re-Enabling [_1] in [_2]: [_3]', + $role,$url,$result).'
'; } + $r->print($output); } } elsif ($_=~/^form\.act/) { if ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) { @@ -1079,7 +1165,7 @@ END # split multiple sections my %sections = (); - my $num_sections = &build_roles($ENV{'form.sec_'.$full},\%sections); + my $num_sections = &build_roles($ENV{'form.sec_'.$full},\%sections,$5); if ($num_sections == 0) { $r->print(&commit_customrole($url,$three,$four,$five,$start,$end)); } else { @@ -1102,22 +1188,22 @@ END my $type = 'three'; # split multiple sections my %sections = (); - my $num_sections = &build_roles($ENV{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections); + my $num_sections = &build_roles($ENV{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections,$three); if ($num_sections == 0) { - $r->print(&commit_standardrole($url,$three,$start,$end,$one,$two)); + $r->print(&commit_standardrole($url,$three,$start,$end,$one,$two,'')); } else { my $emptysec = 0; foreach my $sec (sort {$a cmp $b} keys %sections) { $sec =~ s/\W//g; if ($sec ne '') { my $securl = $url.'/'.$sec; - $r->print(&commit_standardrole($securl,$three,$start,$end,$one,$two)); + $r->print(&commit_standardrole($securl,$three,$start,$end,$one,$two,$sec)); } else { $emptysec = 1; } } if ($emptysec) { - $r->print(&commit_standardrole($url,$three,$start,$end,$one,$two)); + $r->print(&commit_standardrole($url,$three,$start,$end,$one,$two,'')); } } } elsif ($_=~/^form\.act\_([^\_]+)\_([^\_]+)$/) { @@ -1132,21 +1218,21 @@ END my $url='/'.$1.'/'; # split multiple sections my %sections = (); - my $num_sections = &build_roles($ENV{'form.sec_'.$1.'_'.$2},\%sections); + my $num_sections = &build_roles($ENV{'form.sec_'.$1.'_'.$2},\%sections,$2); if ($num_sections == 0) { - $r->print(&commit_standardrole($url,$2,$start,$end,$1)); + $r->print(&commit_standardrole($url,$2,$start,$end,$1,undef,'')); } else { my $emptysec = 0; foreach my $sec (sort {$a cmp $b} keys %sections) { if ($sec ne '') { my $securl = $url.'/'.$sec; - $r->print(&commit_standardrole($securl,$2,$start,$end,$1)); + $r->print(&commit_standardrole($securl,$2,$start,$end,$1,undef,$sec)); } else { $emptysec = 1; } } if ($emptysec) { - $r->print(&commit_standardrole($url,$2,$start,$end,$1)); + $r->print(&commit_standardrole($url,$2,$start,$end,$1,undef,'')); } } # Assign the role and report it. @@ -1179,47 +1265,99 @@ sub commit_customrole { } sub commit_standardrole { - my ($url,$three,$start,$end,$one,$two) = @_; - my $output = (&mt('Assigning').' '.$three.' in '.$url. - ($start?', '.&mt('starting').' '.localtime($start):''). - ($end?', '.&mt('ending').' '.localtime($end):'').': '. - &Apache::lonnet::assignrole( - $ENV{'form.ccdomain'},$ENV{'form.ccuname'}, - $url,$three,$end,$start). - '
'); - -# Handle students differently - if (($three eq 'st') && defined($one) && defined($two)) { - $url=~/^\/(\w+)\/(\w+)/; - my $cid=$one.'_'.$two; - $output .= (&mt('Add to classlist').': '. - &Apache::lonnet::critical( - 'put:'.$ENV{'course.'.$cid.'.domain'}.':'. - $ENV{'course.'.$cid.'.num'}.':classlist:'. - &Apache::lonnet::escape( - $ENV{'form.ccuname'}.':'. - $ENV{'form.ccdomain'} ).'='. - &Apache::lonnet::escape($end.':'.$start), - $ENV{'course.'.$cid.'.home'}) - .'
'); + my ($url,$three,$start,$end,$one,$two,$sec) = @_; + my $output; + my $logmsg; + if ($three eq 'st') { + my $result = &commit_studentrole(\$logmsg,$url,$three,$start,$end,$one,$two,$sec); + if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) { + $output = "Error: $result\n"; + } else { + $output = &mt('Assigning').' '.$three.' in '.$url. + ($start?', '.&mt('starting').' '.localtime($start):''). + ($end?', '.&mt('ending').' '.localtime($end):''). + ': '.$result.'
'. + &mt('Add to classlist').': ok
'; + } + } else { + $output = (&mt('Assigning').' '.$three.' in '.$url. + ($start?', '.&mt('starting').' '.localtime($start):''). + ($end?', '.&mt('ending').' '.localtime($end):'').': '. + &Apache::lonnet::assignrole( + $ENV{'form.ccdomain'},$ENV{'form.ccuname'}, + $url,$three,$end,$start). + '
'); } return $output; } +sub commit_studentrole { + my ($logmsg,$url,$three,$start,$end,$one,$two,$sec) = @_; + my $udom = $ENV{'form.ccdomain'}; + my $uname = $ENV{'form.ccuname'}; + my $linefeed = '
'."\n"; + my $result; + if (defined($one) && defined($two)) { + my $cid=$one.'_'.$two; + my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid); + my $secchange = 0; + my $expire_role_result; + my $modify_section_result; + unless ($oldsec eq '-1') { + unless ($sec eq $oldsec) { + $secchange = 1; + my $uurl='/'.$cid; + $uurl=~s/\_/\//g; + if ($oldsec) { + $uurl.='/'.$oldsec; + } + $expire_role_result = &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',time); + $result = $expire_role_result; + } + } + if (($expire_role_result eq 'ok') || ($secchange == 0)) { + $modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid); + if ($modify_section_result =~ /^ok/) { + if ($secchange == 1) { + $$logmsg .= "Section for $uname switched from old section: $oldsec to new section: $sec".$linefeed; + } elsif ($oldsec eq '-1') { + $$logmsg .= "New student role for $uname in section $sec in course $cid".$linefeed; + } else { + $$logmsg .= "Student $uname assigned to unchanged section $sec in course $cid".$linefeed; + } + } else { + $$logmsg .= "Error when attempting section change for $uname from old section $oldsec to new section: $sec in course $cid -error: $modify_section_result".$linefeed; + } + $result = $modify_section_result; + } elsif ($secchange == 1) { + $$logmsg .= "Error when attempting to expire role for $uname in old section $oldsec in course $cid -error: $expire_role_result".$linefeed; + } + } else { + $$logmsg .= "Incomplete course id defined. Addition of user $uname from domain $udom to course $one\_$two, section $sec not completed.$linefeed"; + $result = "Error: incomplete course id\n"; + } + return $result; +} sub build_roles { - my ($sectionstr,$sections) = @_; + my ($sectionstr,$sections,$role) = @_; my $num_sections = 0; if ($sectionstr=~ /,/) { my @secnums = split/,/,$sectionstr; - foreach my $sec (@secnums) { - $sec =~ ~s/\W//g; - unless ($sec eq "") { - if (exists($$sections{$sec})) { - $$sections{$sec} ++; - } else { - $$sections{$sec} = 1; - $num_sections ++; + if ($role eq 'st') { + $secnums[0] =~ s/\W//g; + $$sections{$secnums[0]} = 1; + $num_sections = 1; + } else { + foreach my $sec (@secnums) { + $sec =~ ~s/\W//g; + unless ($sec eq "") { + if (exists($$sections{$sec})) { + $$sections{$sec} ++; + } else { + $$sections{$sec} = 1; + $num_sections ++; + } } } } @@ -1442,11 +1580,24 @@ sub handler { #-------------------------------------------------- functions for &phase_two sub course_level_table { - my %inccourses = @_; + my (%inccourses) = @_; my $table = ''; # Custom Roles? my %customroles=&my_custom_roles(); + my %lt=&Apache::lonlocal::texthash( + 'exs' => "Existing sections", + 'new' => "Define new section", + 'ssd' => "Set Start Date", + 'sed' => "Set End Date", + 'crl' => "Course Level", + 'act' => "Activate", + 'rol' => "Role", + 'ext' => "Extent", + 'grs' => "Group/Section", + 'sta' => "Start", + 'end' => "End" + ); foreach (sort( keys(%inccourses))) { my $thiscourse=$_; @@ -1458,7 +1609,9 @@ sub course_level_table { my $bgcol=$thiscourse; $bgcol=~s/[^7-9a-e]//g; $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6); - my ($domain)=split(/\//,$thiscourse); + my ($domain,$cnum)=split(/\//,$thiscourse); + my %sections_count = (); + my $num_sections = &Apache::loncommon::get_sections($domain,$cnum,\%sections_count); foreach ('st','ta','ep','ad','in','cc') { if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) { my $plrole=&Apache::lonnet::plaintext($_); @@ -1469,18 +1622,25 @@ sub course_level_table { $area
Domain: $domain ENDEXTENT if ($_ ne 'cc') { - $table .= < -ENDSECTION + if ($num_sections > 0) { + my $currsec = &course_sections($num_sections,\%sections_count,$protectedcourse.'_'.$_); + $table .= + ''. + ''. + ''. + ''. + ''. + '
'.$lt{'exs'}.'
'. + $currsec.'		   '.$lt{'new'}.'
'. + '
'; + } else { + $table .= ''; + } } else { - $table .= <  -ENDSECTION + $table .= ' '; } - my %lt=&Apache::lonlocal::texthash( - 'ssd' => "Set Start Date", - 'sed' => "Set End Date" - ); $table .= < "Set Start Date", - 'sed' => "Set End Date" - ); - $table .= < $plrole $area - +END + if ($num_sections > 0) { + my $currsec = &course_sections($num_sections,\%sections_count,$customrole); + $table.= + ''. + ''. + ''. + ''. + ''. + '
'.$lt{'exs'}.'
'. + $currsec.'		   '.$lt{'new'}.'
'. + '
'; + } else { + $table .= ''; + } + $table .= < $lt{'ssd'} @@ -1519,15 +1692,6 @@ ENDENTRY } return '' if ($table eq ''); # return nothing if there is nothing # in the table - my %lt=&Apache::lonlocal::texthash( - 'crl' => "Course Level", - 'act' => "Activate", - 'rol' => "Role", - 'ext' => "Extent", - 'grs' => "Group/Section", - 'sta' => "Start", - 'end' => "End" - ); my $result = <$lt{'crl'} @@ -1538,6 +1702,21 @@ ENDTABLE return $result; } +sub course_sections { + my ($num_sections,$sections_count,$role) = @_; + my $output = ''; + my @sections = (sort {$a <=> $b} keys %{$sections_count}); + $output = ''; + return $output; +} + sub course_level_dc { my ($dcdom) = @_; my %customroles=&my_custom_roles(); @@ -1562,7 +1741,7 @@ sub course_level_dc { ); my $header = '

'.$lt{'crl'}.'

'. '
$lt{'act'}$lt{'rol'}$lt{'ext'}
'; - my $otheritems = ''. + my $otheritems = ''. '
'.$courseform.''.$lt{'rol'}.''.$lt{'grs'}.''.$lt{'sta'}.''.$lt{'end'}.'