--- loncom/interface/loncreateuser.pm 2006/05/18 01:08:51 1.117
+++ loncom/interface/loncreateuser.pm 2006/06/27 17:48:53 1.123
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.117 2006/05/18 01:08:51 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.123 2006/06/27 17:48:53 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -65,6 +65,8 @@ use Apache::lonnet;
use Apache::loncommon;
use Apache::lonlocal;
use Apache::longroup;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
my $loginscript; # piece of javascript used in two separate instances
my $generalrule;
@@ -140,7 +142,7 @@ sub print_username_entry_form {
'nr' => "Name of Role",
'cre' => "Custom Role Editor"
);
- my $help = &Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface');
+ my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface');
my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
$r->print(<<"ENDDOCUMENT");
@@ -193,81 +195,6 @@ sub user_modification_js {
$nondc_setsection_code
- function setSections() {
- var re1 = /^currsec_/;
- var groups = new Array($groupslist);
- for (var i=0;i<document.cu.elements.length;i++) {
- var str = document.cu.elements[i].name;
- var checkcurr = str.match(re1);
- if (checkcurr != null) {
- var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
- if (document.cu.elements[i-1].checked == true) {
- var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
- match = re2.exec(str);
- var role = match[1];
- if (role == 'cc') {
- alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
- }
- else {
- var sections = '';
- var numsec = 0;
- var sections;
- for (var j=0; j<document.cu.elements[i].length; j++) {
- if (document.cu.elements[i].options[j].selected == true ) {
- if (document.cu.elements[i].options[j].value != "") {
- if (numsec == 0) {
- if (document.cu.elements[i].options[j].value != "") {
- sections = document.cu.elements[i].options[j].value;
- numsec ++;
- }
- }
- else {
- sections = sections + "," + document.cu.elements[i].options[j].value
- numsec ++;
- }
- }
- }
- }
- if (numsec > 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 newseclist = document.cu.elements[i+1].value;
- var newsecs = new Array();
- if (newseclist != null && newseclist != "") {
- newsecs = newseclist.split(/,/g);
- numsec = numsec + newsecs.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 {
- for (var j=0; j<newsecs.length; j++) {
- if ((newsecs[j] == 'all') ||
- (newsecs[j] == 'none')) {
- alert("'"+newsecs[j]+"' may not be used as the name for a section, as it is a reserved word.\\nPlease choose a different section name.");
- return;
- }
- for (var k=0; k<groups.length; k++) {
- if (newsecs[j] == groups[k]) {
- alert("'"+newsecs[j]+"' may not be used as a section name, as it is the name of a course group.\\nSection names and group names must be distinct. Please choose a different section name.");
- return;
- }
- }
- }
- document.cu.elements[i+2].value = sections;
- }
- }
- }
- }
- }
- document.cu.submit();
- }
</script>
END
}
@@ -302,7 +229,8 @@ sub print_user_modification_page {
$ccdomain=~s/\W//g;
my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
my $dc_setcourse_code = '';
- my $nondc_setsection_code = '';
+ my $nondc_setsection_code = '';
+
my %loaditem;
my $groupslist;
@@ -314,7 +242,18 @@ sub print_user_modification_page {
if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
my $dcdom = $1;
- $loaditem{'onload'} = "document.cu.coursedesc.value=''";
+ $loaditem{'onload'} = "document.cu.coursedesc.value='';";
+ my @rolevals = ('st','ta','ep','in','cc');
+ my (@crsroles,@grproles);
+ for (my $i=0; $i<@rolevals; $i++) {
+ $crsroles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Course');
+ $grproles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Group');
+ }
+ my $rolevalslist = join('","',@rolevals);
+ my $crsrolenameslist = join('","',@crsroles);
+ my $grprolenameslist = join('","',@grproles);
+ my $pickcrsfirst = '<--'.&mt('Pick course first');
+ my $pickgrpfirst = '<--'.&mt('Pick group first');
$dc_setcourse_code = <<"ENDSCRIPT";
function setCourse() {
var course = document.cu.dccourse.value;
@@ -382,10 +321,10 @@ sub print_user_modification_page {
else {
var coursename = "_$dcdom"+"_"+course+"_"+userrole
document.cu.elements[numcourse].name = "act"+coursename
- document.cu.elements[numcourse+4].name = "sec"+coursename
- document.cu.elements[numcourse+4].value = section
- document.cu.elements[numcourse+5].name = "start"+coursename
- document.cu.elements[numcourse+6].name = "end"+coursename
+ document.cu.elements[numcourse+5].name = "sec"+coursename
+ document.cu.elements[numcourse+5].value = section
+ document.cu.elements[numcourse+7].name = "start"+coursename
+ document.cu.elements[numcourse+8].name = "end"+coursename
}
}
document.cu.submit();
@@ -399,6 +338,36 @@ sub print_user_modification_page {
}
return -1;
}
+
+ function setType() {
+ var crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
+ rolevals = new Array("$rolevalslist");
+ if (crstype == 'Group') {
+ if (document.cu.currsec.options[0].text == "$pickcrsfirst") {
+ document.cu.currsec.options[0].text = "$pickgrpfirst";
+ }
+ grprolenames = new Array("$grprolenameslist");
+ for (var i=0; i<rolevals.length; i++) {
+ if (document.cu.role.selectedIndex == i) {
+ document.cu.role.options[i] = new Option(grprolenames[i],rolevals[i],true,false);
+ } else {
+ document.cu.role.options[i] = new Option(grprolenames[i],rolevals[i],false,false);
+ }
+ }
+ } else {
+ if (document.cu.currsec.options[0].text == "$pickgrpfirst") {
+ document.cu.currsec.options[0].text = "$pickcrsfirst";
+ }
+ crsrolenames = new Array("$crsrolenameslist");
+ for (var i=0; i<rolevals.length; i++) {
+ if (document.cu.role.selectedIndex == i) {
+ document.cu.role.options[i] = new Option(crsrolenames[i],rolevals[i],true,false);
+ } else {
+ document.cu.role.options[i] = new Option(crsrolenames[i],rolevals[i],false,false);
+ }
+ }
+ }
+ }
ENDSCRIPT
} else {
$nondc_setsection_code = <<"ENDSECCODE";
@@ -644,6 +613,7 @@ END
'<br />'.&mt('Domain').': '.$coursedom.(' 'x8).
&Apache::loncommon::syllabuswrapper('Syllabus',$coursedir,$coursedom);
$sortkey.="\0".$coursedata{'description'};
+ $class=$coursedata{'type'};
} else {
$carea=&mt('Unavailable course').': '.$area;
$sortkey.="\0".&mt('Unavailable course').': '.$area;
@@ -735,7 +705,7 @@ END
}
my $plaintext='';
unless ($croletitle) {
- $plaintext=&Apache::lonnet::plaintext($role_code);
+ $plaintext=&Apache::lonnet::plaintext($role_code,$class)
} else {
$plaintext=
"Customrole '$croletitle' defined by $croleuname\@$croleudom";
@@ -755,7 +725,7 @@ END
} # end of foreach (table building loop)
my $rolesdisplay = 0;
my %output = ();
- foreach my $type ('Construction Space','Course','Domain','System','Unknown') {
+ foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
$output{$type} = '';
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) {
@@ -777,7 +747,7 @@ END
<tr><th>$lt{'rev'}</th><th>$lt{'ren'}</th><th>$lt{'del'}</th><th>$lt{'rol'}</th><th>$lt{'e
xt'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th>
END
- foreach my $type ('Construction Space','Course','Domain','System','Unknown') {
+ foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
if ($output{$type}) {
$r->print($output{$type}."\n");
}
@@ -975,11 +945,11 @@ ENDDROW
$r->print($domaintext);
}
#
-# Course level
+# Course and group levels
#
if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
- $r->print(&course_level_dc($1));
+ $r->print(&course_level_dc($1,'Course'));
$r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()">'."\n");
} else {
$r->print(&course_level_table(%inccourses));
@@ -1226,9 +1196,9 @@ END
&Apache::lonnet::critical('put:'.
$env{'course.'.$cid.'.domain'}.':'.
$env{'course.'.$cid.'.num'}.':classlist:'.
- &Apache::lonnet::escape($env{'form.ccuname'}.':'.
+ &escape($env{'form.ccuname'}.':'.
$env{'form.ccdomain'}).'='.
- &Apache::lonnet::escape($now.':'),
+ &escape($now.':'),
$env{'course.'.$cid.'.home'}).'</b><br />');
}
}
@@ -1253,9 +1223,9 @@ END
&Apache::lonnet::critical('put:'.
$env{'course.'.$cid.'.domain'}.':'.
$env{'course.'.$cid.'.num'}.':classlist:'.
- &Apache::lonnet::escape($env{'form.ccuname'}.':'.
+ &escape($env{'form.ccuname'}.':'.
$env{'form.ccdomain'}).'='.
- &Apache::lonnet::escape($now.':'),
+ &escape($now.':'),
$env{'course.'.$cid.'.home'}).'</b><br />');
}
}
@@ -1614,7 +1584,7 @@ sub custom_role_editor {
}
my %lt=&Apache::lonlocal::texthash(
'prv' => "Privilege",
- 'crl' => "Course Level",
+ 'crl' => "Course/Group Level",
'dml' => "Domain Level",
'ssl' => "System Level"
);
@@ -1626,16 +1596,17 @@ sub custom_role_editor {
<tr><th>$lt{'prv'}</th><th>$lt{'crl'}</th><th>$lt{'dml'}</th>
<th>$lt{'ssl'}</th></tr>
ENDCCF
- foreach (sort keys %full) {
- $r->print('<tr><td>'.&Apache::lonnet::plaintext($_).'</td><td>'.
- ($courselevel{$_}?'<input type="checkbox" name="'.$_.':c" '.
- ($courselevelcurrent{$_}?'checked="1"':'').' />':' ').
+ foreach my $priv (sort keys %full) {
+ my $privtext = &Apache::lonnet::plaintext($priv);
+ $r->print('<tr><td>'.$privtext.'</td><td>'.
+ ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.':c" '.
+ ($courselevelcurrent{$priv}?'checked="1"':'').' />':' ').
'</td><td>'.
- ($domainlevel{$_}?'<input type="checkbox" name="'.$_.':d" '.
- ($domainlevelcurrent{$_}?'checked="1"':'').' />':' ').
+ ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.':d" '.
+ ($domainlevelcurrent{$priv}?'checked="1"':'').' />':' ').
'</td><td>'.
- ($systemlevel{$_}?'<input type="checkbox" name="'.$_.':s" '.
- ($systemlevelcurrent{$_}?'checked="1"':'').' />':' ').
+ ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.':s" '.
+ ($systemlevelcurrent{$priv}?'checked="1"':'').' />':' ').
'</td></tr>');
}
$r->print(
@@ -1763,7 +1734,7 @@ sub course_level_table {
'new' => "Define new section",
'ssd' => "Set Start Date",
'sed' => "Set End Date",
- 'crl' => "Course Level",
+ 'crl' => "Course/Group Level",
'act' => "Activate",
'rol' => "Role",
'ext' => "Extent",
@@ -1778,6 +1749,7 @@ sub course_level_table {
$thiscourse=~s:_:/:g;
my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
my $area=$coursedata{'description'};
+ my $type=$coursedata{'type'};
if (!defined($area)) { $area=&mt('Unavailable course').': '.$_; }
my $bgcol=$thiscourse;
$bgcol=~s/[^7-9a-e]//g;
@@ -1790,9 +1762,13 @@ sub course_level_table {
&Apache::loncommon::get_sections($domain,$cnum);
}
}
- foreach ('st','ta','ep','ad','in','cc') {
+ foreach ('st','ta','ep','in','cc') {
if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
my $plrole=&Apache::lonnet::plaintext($_);
+ # Was this left in by mistake?
+ # if ($type eq 'Group') {
+ # $plrole = &Apache::loncommon::convert_role($plrole,$type);
+ # }
$table .= <<ENDEXTENT;
<tr bgcolor="#$bgcol">
<td><input type="checkbox" name="act_$protectedcourse\_$_"></td>
@@ -1909,12 +1885,10 @@ sub course_level_dc {
'<input type="hidden" name="origdom" value="'.$dcdom.'" />'.
'<input type="hidden" name="dccourse" value="" />';
my $courseform='<b>'.&Apache::loncommon::selectcourse_link
- ('cu','dccourse','dcdomain','coursedesc').'</b>';
-
- my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,$dcdom);
+ ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course/Group').'</b>';
+ my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom);
my %lt=&Apache::lonlocal::texthash(
- 'crl' => "Course Level",
- 'crt' => "Course Title",
+ 'typ' => "Type",
'rol' => "Role",
'grs' => "Section",
'exs' => "Existing sections",
@@ -1924,11 +1898,16 @@ sub course_level_dc {
'ssd' => "Set Start Date",
'sed' => "Set End Date"
);
- my $header = '<h4>'.$lt{'crl'}.'</h4>'.
- '<table border="2"><tr><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th></tr>';
- my $otheritems = '<tr><td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'".'cu'."'".','."'".'dccourse'."'".','."'".'dcdomain'."'".','."'".'coursedesc'."',''".')" /></td>'.
+ my $header = '<h4>'.&mt('Course/Group Level').'</h4>'.
+ '<table border="2"><tr><th>'.$lt{'typ'}.'</th><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th></tr>';
+ my $otheritems = '<tr><td><select name="crstype" onChange="javascript:setType();">'."\n".
+ ' <option value="">'.&mt('Please select')."\n".
+ ' <option value="Course">'.&mt('Course')."\n".
+ ' <option value="Group">'.&mt('Group')."\n".
+ '</select>'."\n".
+ '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','".')" /></td>'."\n".
'<td><select name="role">'."\n";
- foreach ('st','ta','ep','ad','in','cc') {
+ foreach ('st','ta','ep','in','cc') {
my $plrole=&Apache::lonnet::plaintext($_);
$otheritems .= ' <option value="'.$_.'">'.$plrole;
}