version 1.67, 2003/06/20 18:34:52
|
version 1.71, 2003/07/02 19:52:56
|
Line 79 sub modifystudent {
|
Line 79 sub modifystudent {
|
# We are in this course |
# We are in this course |
my $section=$1; |
my $section=$1; |
$section='' if ($course eq $courseid.'_st'); |
$section='' if ($course eq $courseid.'_st'); |
if ( ((!$section) && (!$csec)) || ($section ne $csec) ) { |
if ($section eq $csec) { |
|
$result .= 'ok:'; |
|
} elsif ( ((!$section) && (!$csec)) || ($section ne $csec) ) { |
my (undef,$end,$start)=split(/\_/,$roles{$course}); |
my (undef,$end,$start)=split(/\_/,$roles{$course}); |
my $now=time; |
my $now=time; |
# if this is an active role |
# if this is an active role |
if (!($start && ($now<$start)) || !($end && ($now>$end))) { |
if (!($start && ($now<$start)) || !($end && ($now>$end))) { |
my $reply=&Apache::lonnet::modifystudent |
my $reply=&Apache::lonnet::modifystudent |
($udom,$unam,'','','','','','','', |
# dom name id mode pass f m l g |
|
($udom,$unam,'', '', '',undef,undef,undef,undef, |
$section,time,undef,undef,$desiredhost); |
$section,time,undef,undef,$desiredhost); |
$result .= $reply.':'; |
$result .= $reply.':'; |
} |
} |
Line 254 function verify_message (vf,founduname,f
|
Line 257 function verify_message (vf,founduname,f
|
if (foundname==0) { message='No name fields specified. '; } |
if (foundname==0) { message='No name fields specified. '; } |
if (foundid==0) { message+='No ID or student number field specified. '; } |
if (foundid==0) { message+='No ID or student number field specified. '; } |
if (foundsec==0) { message+='No section or group field specified. '; } |
if (foundsec==0) { message+='No section or group field specified. '; } |
if (vf.startdate.value=='') { |
|
message+='No starting date set. '; |
|
} |
|
if (vf.enddate.value=='') { |
|
message+='No ending date set. '; |
|
} |
|
if ((vf.enddate.value!='') && (vf.startdate.value!='')) { |
|
if (Math.round(vf.enddate.value)<Math.round(vf.startdate.value)) { |
|
alert('Ending date is before starting date'); |
|
return; |
|
} |
|
} |
|
if (message!='') { |
if (message!='') { |
message+='Continue enrollment?'; |
message+='Continue enrollment?'; |
if (confirm(message)) { |
if (confirm(message)) { |
pclose(); |
|
vf.state.value='enrolling'; |
vf.state.value='enrolling'; |
vf.submit(); |
vf.submit(); |
} |
} |
} else { |
} else { |
pclose(); |
|
vf.state.value='enrolling'; |
vf.state.value='enrolling'; |
vf.submit(); |
vf.submit(); |
} |
} |
} |
} |
|
|
|
|
function pclose() { |
|
parmwin=window.open("/adm/rat/empty.html","LONCAPAparms", |
|
"height=350,width=350,scrollbars=no,menubar=no"); |
|
parmwin.close(); |
|
} |
|
|
|
$pjump_def |
|
|
|
function dateset() { |
|
if (document.studentform.pres_marker.value=='end') { |
|
document.studentform.enddate.value= |
|
document.studentform.pres_value.value; |
|
} |
|
if (document.studentform.pres_marker.value=='start') { |
|
document.studentform.startdate.value= |
|
document.studentform.pres_value.value; |
|
} |
|
pclose(); |
|
} |
|
|
|
$authheader |
$authheader |
ENDPICK |
ENDPICK |
|
|
Line 466 sub print_upload_manager_footer {
|
Line 434 sub print_upload_manager_footer {
|
my $intform = &Apache::loncommon::authform_internal(%param); |
my $intform = &Apache::loncommon::authform_internal(%param); |
my $locform = &Apache::loncommon::authform_local(%param); |
my $locform = &Apache::loncommon::authform_local(%param); |
my $domform = &domain_form($defdom); |
my $domform = &domain_form($defdom); |
|
my $date_table = &date_setting_table(); |
$r->print(<<ENDPICK); |
$r->print(<<ENDPICK); |
</table> |
</table> |
<input type=hidden name=nfields value=$i> |
<input type=hidden name=nfields value=$i> |
Line 484 $locform
|
Line 453 $locform
|
<h3>LON-CAPA Domain for Students</h3> |
<h3>LON-CAPA Domain for Students</h3> |
LON-CAPA domain: $domform <p> |
LON-CAPA domain: $domform <p> |
<h3>Starting and Ending Dates</h3> |
<h3>Starting and Ending Dates</h3> |
<input type="hidden" value='' name="pres_value" > |
<p> |
<input type="hidden" value='' name="pres_type" > |
$date_table |
<input type="hidden" value='' name="pres_marker" > |
</p> |
<input type="hidden" value='$today' name="startdate" > |
|
<input type="hidden" value='$halfyear' name="enddate" > |
|
<a |
|
href="javascript:pjump('date_start','Enrollment Starting Date',document.studentform.startdate.value,'start','studentform.pres','dateset');" |
|
>Set Starting Date</a><p> |
|
|
|
<a |
|
href="javascript:pjump('date_end','Enrollment Ending Date',document.studentform.enddate.value,'end','studentform.pres','dateset');" |
|
>Set Ending Date</a><p> |
|
<h3>Full Update</h3> |
<h3>Full Update</h3> |
<input type=checkbox name=fullup value=yes> Full update |
<input type=checkbox name=fullup value=yes> Full update |
(also print list of users not enrolled anymore)<p> |
(also print list of users not enrolled anymore)<p> |
Line 558 sub print_upload_manager_form {
|
Line 518 sub print_upload_manager_form {
|
# ======================================================= Enroll single student |
# ======================================================= Enroll single student |
sub enroll_single_student { |
sub enroll_single_student { |
my $r=shift; |
my $r=shift; |
|
# |
|
# We do the dates first because the action of making them the defaul |
|
# in the course is entirely seperate from the action of enrolling the |
|
# student. Also, a failure in setting the dates as default is not fatal |
|
# to the process of enrolling / modifying a student. |
|
my ($startdate,$enddate) = &get_dates_from_form(); |
|
if ($ENV{'form.makedatesdefault'}) { |
|
$r->print(&make_dates_default($startdate,$enddate)); |
|
} |
|
|
$r->print('<h3>Enrolling Student</h3>'); |
$r->print('<h3>Enrolling Student</h3>'); |
$r->print('<p>Enrolling '.$ENV{'form.cuname'}." \@ ". |
$r->print('<p>Enrolling '.$ENV{'form.cuname'}." \@ ". |
$ENV{'form.lcdomain'}.'</p>'); |
$ENV{'form.lcdomain'}.'</p>'); |
Line 599 sub enroll_single_student {
|
Line 569 sub enroll_single_student {
|
&modifystudent($ENV{'form.lcdomain'},$ENV{'form.cuname'}, |
&modifystudent($ENV{'form.lcdomain'},$ENV{'form.cuname'}, |
$ENV{'request.course.id'},$ENV{'form.csec'}, |
$ENV{'request.course.id'},$ENV{'form.csec'}, |
$desiredhost); |
$desiredhost); |
my $startdate = |
|
&Apache::lonhtmlcommon::get_date_from_form('startdate'); |
|
my $enddate = |
|
&Apache::lonhtmlcommon::get_date_from_form('enddate'); |
|
&Apache::lonnet::logthis('startdate = '.$startdate); |
|
&Apache::lonnet::logthis('enddate = '.$enddate); |
|
my $login_result = &Apache::lonnet::modifystudent |
my $login_result = &Apache::lonnet::modifystudent |
($ENV{'form.lcdomain'},$ENV{'form.cuname'}, |
($ENV{'form.lcdomain'},$ENV{'form.cuname'}, |
$ENV{'form.cstid'},$amode,$genpwd, |
$ENV{'form.cstid'},$amode,$genpwd, |
Line 630 sub enroll_single_student {
|
Line 594 sub enroll_single_student {
|
} |
} |
} |
} |
|
|
|
sub setup_date_selectors { |
|
my ($starttime,$endtime) = @_; |
|
if (! defined($starttime)) { |
|
$starttime = time; |
|
if (exists($ENV{'course.'.$ENV{'request.course.id'}. |
|
'.default_enrollment_start_date'})) { |
|
$starttime = $ENV{'course.'.$ENV{'request.course.id'}. |
|
'.default_enrollment_start_date'}; |
|
} |
|
} |
|
if (! defined($endtime)) { |
|
$endtime = time+(6*30*24*60*60); # 6 months from now, approx |
|
if (exists($ENV{'course.'.$ENV{'request.course.id'}. |
|
'.default_enrollment_end_date'})) { |
|
$endtime = $ENV{'course.'.$ENV{'request.course.id'}. |
|
'.default_enrollment_end_date'}; |
|
} |
|
} |
|
my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform', |
|
'startdate', |
|
$starttime); |
|
my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform', |
|
'enddate', |
|
$endtime); |
|
return ($startdateform,$enddateform); |
|
} |
|
|
|
sub get_dates_from_form { |
|
my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate'); |
|
my $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate'); |
|
if ($ENV{'form.no_end_date'}) { |
|
$enddate = 0; |
|
} |
|
return ($startdate,$enddate); |
|
} |
|
|
|
sub date_setting_table { |
|
my ($starttime,$endtime) = @_; |
|
my ($startform,$endform)=&setup_date_selectors($starttime,$endtime); |
|
my $dateDefault = '<nobr>'. |
|
'<input type="checkbox" name="makedatesdefault" />'. |
|
' make these dates the default for future enrollment'; |
|
my $perpetual = '<nobr><input type="checkbox" name="no_end_date"'; |
|
if (defined($endtime) && $endtime == 0) { |
|
$perpetual .= ' checked'; |
|
} |
|
$perpetual.= ' />'.' no ending date</nobr>'; |
|
my $result = ''; |
|
$result .= "<table>\n"; |
|
$result .= '<tr><td align="right">Starting Date</td>'. |
|
'<td>'.$startform.'</td>'. |
|
'<td>'.$dateDefault.'</td>'."</tr>\n"; |
|
$result .= '<tr><td align="right">Ending Date</td>'. |
|
'<td>'.$endform.'</td>'. |
|
'<td>'.$perpetual.'</td>'."</tr>\n"; |
|
$result .= "</table>\n"; |
|
return $result; |
|
} |
|
|
|
sub make_dates_default { |
|
my ($startdate,$enddate) = @_; |
|
my $result = ''; |
|
my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
|
my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; |
|
my $put_result = &Apache::lonnet::put('environment', |
|
{'default_enrollment_start_date'=>$startdate, |
|
'default_enrollment_end_date' =>$enddate},$dom,$crs); |
|
if ($put_result eq 'ok') { |
|
$result .= "Set default start and end dates for course<br />"; |
|
# |
|
# Refresh the course environment |
|
&Apache::lonnet::coursedescription($ENV{'request.course.id'}); |
|
} else { |
|
$result .= "Unable to set default dates for course:".$put_result. |
|
'<br />'; |
|
} |
|
return $result; |
|
} |
|
|
# ======================================================= Menu Phase Two Enroll |
# ======================================================= Menu Phase Two Enroll |
sub print_enroll_single_student_form { |
sub print_enroll_single_student_form { |
my $r=shift; |
my $r=shift; |
Line 650 sub print_enroll_single_student_form {
|
Line 693 sub print_enroll_single_student_form {
|
my $locform = &Apache::loncommon::authform_local(%param); |
my $locform = &Apache::loncommon::authform_local(%param); |
# Set up domain selection form |
# Set up domain selection form |
my $domform = &domain_form($defdom); |
my $domform = &domain_form($defdom); |
my $starttime = 'now'; |
my $date_table = &date_setting_table(); |
if (exists($ENV{'course.'.$ENV{'request.course.id'}. |
|
'.default_enrollment_start_date'})) { |
|
$starttime = $ENV{'course.'.$ENV{'request.course.id'}. |
|
'.default_enrollment_start_date'}; |
|
} |
|
my $endtime = time+(6*30*24*60*60); # 6 months from now, approx |
|
if (exists($ENV{'course.'.$ENV{'request.course.id'}. |
|
'.default_enrollment_end_date'})) { |
|
$endtime = $ENV{'course.'.$ENV{'request.course.id'}. |
|
'.default_enrollment_end_date'}; |
|
} |
|
my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform', |
|
'startdate', |
|
$starttime); |
|
my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform', |
|
'enddate', |
|
$endtime); |
|
# Print it all out |
# Print it all out |
$r->print(<<END); |
$r->print(<<END); |
<input type="hidden" name="action" value="enrollstudent"> |
<input type="hidden" name="action" value="enrollstudent"> |
Line 733 $locform
|
Line 759 $locform
|
|
|
<p>Group/Section: <input type="text" name="csec" size="5" /> |
<p>Group/Section: <input type="text" name="csec" size="5" /> |
<p> |
<p> |
<!-- Date setting form elements --> |
$date_table |
<input type="hidden" name="pres_value" value='' /> |
|
<input type="hidden" name="pres_type" value='' /> |
|
<input type="hidden" name="pres_marker" value='' /> |
|
<input type="hidden" name="startdate" value='$today' /> |
|
<input type="hidden" name="enddate" value='$halfyear' /> |
|
</p><p> |
|
<table> |
|
<tr><td align="right" ><b>Starting Date</b></td><td>$startdateform</td></tr> |
|
<tr><td align="right" ><b>Ending Date</b></td><td>$enddateform</td></tr> |
|
</table> |
|
</p> |
</p> |
<h3>ID/Student Number</h3> |
<h3>ID/Student Number</h3> |
<p> |
<p> |
Line 1007 sub print_modify_student_form {
|
Line 1023 sub print_modify_student_form {
|
# determine the students starting and ending times and section |
# determine the students starting and ending times and section |
my ($starttime,$endtime,$section) = &get_enrollment_data($sname,$sdom); |
my ($starttime,$endtime,$section) = &get_enrollment_data($sname,$sdom); |
# Deal with date forms |
# Deal with date forms |
my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform', |
my $date_table = &date_setting_table($starttime,$endtime); |
'startdate', |
|
$starttime); |
|
my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform', |
|
'enddate', |
|
$endtime); |
|
# |
# |
if (! exists($ENV{'form.Status'}) || |
if (! exists($ENV{'form.Status'}) || |
$ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) { |
$ENV{'form.Status'} !~ /^(Any|Expired|Active)$/) { |
Line 1052 Disable ID/Student Number Safeguard and
|
Line 1063 Disable ID/Student Number Safeguard and
|
(only do if you know what you are doing) |
(only do if you know what you are doing) |
</p><p> |
</p><p> |
<b>Section</b>: <input type="text" name="section" value="$section" size="4"/> |
<b>Section</b>: <input type="text" name="section" value="$section" size="4"/> |
</p><p> |
|
<table> |
|
<tr><td align="right"><b>Starting Date:</b></td><td>$startdateform</td></tr> |
|
<tr><td align="right"><b>Ending Date:</b></td><td>$enddateform</td></tr> |
|
</table> |
|
</p> |
</p> |
|
<p>$date_table</p> |
<input type="submit" value="Submit Modifications" /> |
<input type="submit" value="Submit Modifications" /> |
</body></html> |
</body></html> |
END |
END |
Line 1069 END
|
Line 1076 END
|
# |
# |
sub modify_single_student { |
sub modify_single_student { |
my $r = shift; |
my $r = shift; |
|
# |
|
# Do the date defaults first |
|
my ($starttime,$endtime) = &get_dates_from_form(); |
|
if ($ENV{'form.makedatesdefault'}) { |
|
$r->print(&make_dates_default($starttime,$endtime)); |
|
} |
# Get the 'sortby' and 'Status' variables so the user goes back to their |
# Get the 'sortby' and 'Status' variables so the user goes back to their |
# previous screen |
# previous screen |
my $sortby = $ENV{'form.sortby'}; |
my $sortby = $ENV{'form.sortby'}; |
Line 1101 sub modify_single_student {
|
Line 1114 sub modify_single_student {
|
my $section = $ENV{'form.section'}; |
my $section = $ENV{'form.section'}; |
my $courseid = $ENV{'request.course.id'}; |
my $courseid = $ENV{'request.course.id'}; |
my $sid = $ENV{'form.id'}; |
my $sid = $ENV{'form.id'}; |
my $starttime = &Apache::lonhtmlcommon::get_date_from_form('startdate'); |
|
my $endtime = &Apache::lonhtmlcommon::get_date_from_form('enddate'); |
|
my $displayable_starttime = localtime($starttime); |
my $displayable_starttime = localtime($starttime); |
my $displayable_endtime = localtime($endtime); |
my $displayable_endtime = localtime($endtime); |
# |
# |
Line 1153 sub modify_single_student {
|
Line 1164 sub modify_single_student {
|
</table> |
</table> |
<h3>Role Information</h3> |
<h3>Role Information</h3> |
<table> |
<table> |
<tr><td>Start Time </td><td> $displayable_starttime </td></tr> |
<tr><td align="right"><b>Start Time:</b></td><td> $displayable_starttime </td></tr> |
<tr><td>End Time </td><td> $displayable_endtime </td></tr> |
<tr><td align="right"><b>End Time:</b></td><td> $displayable_endtime </td></tr> |
</table> |
</table> |
<p> |
<p> |
END |
END |
Line 1213 sub get_enrollment_data {
|
Line 1224 sub get_enrollment_data {
|
my $section = ''; |
my $section = ''; |
my $count = scalar(keys(%roles)); |
my $count = scalar(keys(%roles)); |
while (my ($course,$role) = each(%roles)) { |
while (my ($course,$role) = each(%roles)) { |
&Apache::lonnet::logthis('course = '.$course.' role = '.$role); |
|
if ($course=~ /^\/$courseid\/*\s*(\w+)*_st$/ ) { |
if ($course=~ /^\/$courseid\/*\s*(\w+)*_st$/ ) { |
# |
# |
# Get active role |
# Get active role |
Line 1417 sub upfile_drop_add {
|
Line 1427 sub upfile_drop_add {
|
} |
} |
} |
} |
# |
# |
my $startdate = $ENV{'form.startdate'}; |
my ($startdate,$enddate) = &get_dates_from_form(); |
my $enddate = $ENV{'form.enddate'}; |
if ($ENV{'form.makedatesdefault'}) { |
if ($startdate=~/\D/) { $startdate=''; } |
$r->print(&make_dates_default($startdate,$enddate)); |
if ($enddate=~/\D/) { $enddate=''; } |
} |
# Determine domain and desired host (home server) |
# Determine domain and desired host (home server) |
my $domain=$ENV{'form.lcdomain'}; |
my $domain=$ENV{'form.lcdomain'}; |
my $desiredhost = $ENV{'form.lcserver'}; |
my $desiredhost = $ENV{'form.lcserver'}; |