--- loncom/interface/slotrequest.pm 2009/06/30 15:03:28 1.99
+++ loncom/interface/slotrequest.pm 2015/09/27 22:35:39 1.130
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for requesting to have slots added to a students record
#
-# $Id: slotrequest.pm,v 1.99 2009/06/30 15:03:28 bisitz Exp $
+# $Id: slotrequest.pm,v 1.130 2015/09/27 22:35:39 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,7 +37,7 @@ use Apache::lonnet;
use Apache::lonnavmaps();
use Date::Manip;
use lib '/home/httpd/lib/perl/';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
sub fail {
my ($r,$code)=@_;
@@ -56,12 +56,22 @@ sub fail {
}
sub start_page {
- my ($r,$title,$brcrum)=@_;
+ my ($r,$title,$brcrum,$js)=@_;
my $args;
if (ref($brcrum) eq 'ARRAY') {
$args = {bread_crumbs => $brcrum};
}
- $r->print(&Apache::loncommon::start_page($title,undef,$args));
+ if (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) {
+ my %loaditems = (
+ onload => 'javascript:uncheckSlotRadio();',
+ );
+ if (ref($args) eq 'HASH') {
+ $args->{'add_entries'} = \%loaditems;
+ } else {
+ $args = { 'add_entries' => \%loaditems };
+ }
+ }
+ $r->print(&Apache::loncommon::start_page($title,$js,$args));
}
sub end_page {
@@ -69,6 +79,291 @@ sub end_page {
$r->print(&Apache::loncommon::end_page());
}
+sub reservation_js {
+ my ($slots,$consumed_uniqueperiods,$available,$got_slots,$symb) = @_;
+ return unless ((ref($slots) eq 'HASH') && (ref($available) eq 'ARRAY'));
+ my $toskip;
+ if ($symb eq '') {
+ $toskip = { symb => 1, };
+ }
+ my ($i,$j) = (0,0);
+ my $js;
+ foreach my $slot (sort
+ { return $slots->{$a}->{'starttime'} <=> $slots->{$b}->{'starttime'} }
+ (keys(%{$slots}))) {
+
+ next if (!&allowed_slot($slot,$slots->{$slot},$symb,$slots,
+ $consumed_uniqueperiods,$toskip));
+ $js .= " slotstart[$i]='$slots->{$slot}->{'starttime'}';\n".
+ " slotend[$i]='$slots->{$slot}->{'endtime'}';\n".
+ " slotname[$i]='$slot';\n";
+ if (($symb) && (ref($got_slots) eq 'ARRAY')) {
+ if (grep(/^\Q$slot\E$/,@{$got_slots})) {
+ $js .= " currslot[$j]='$slot';\n";
+ $j++;
+ }
+ }
+ $i++;
+ push(@{$available},$slot);
+ }
+ if ($j) {
+ $js = " var currslot = new Array($j);\n\n$js";
+ }
+ my %alerts = &Apache::lonlocal::texthash (
+ none => 'No reservable time slots found',
+ invalid => 'Invalid date format',
+ );
+ return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function updateSlotDisplay(form,num,slotpickradio) {
+ var slotstart = new Array($i);
+ var slotend = new Array($i);
+ var slotname = new Array($i);
+$js
+
+ if (slotpickradio == 'all') {
+ for (var i=0; i<$i; i++) {
+ if (document.getElementById('LC_slotrow_'+num+'_'+slotname[i])) {
+ document.getElementById('LC_slotrow_'+num+'_'+slotname[i]).style.display = '';
+ }
+ if (document.getElementById('LC_slotsearch_'+num)) {
+ document.getElementById('LC_slotsearch_'+num).style.display = 'block';
+ }
+ }
+ } else {
+ if (slotpickradio == 'show') {
+ for (var i=0; i<$i; i++) {
+ if (document.getElementById('LC_slotrow_'+num+'_'+slotname[i])) {
+ document.getElementById('LC_slotrow_'+num+'_'+slotname[i]).style.display = 'none';
+ }
+ }
+ for (var j=0; j<$j; j++) {
+ if (document.getElementById('LC_slotrow_'+num+'_'+currslot[j])) {
+ document.getElementById('LC_slotrow_'+num+'_'+currslot[j]).style.display = '';
+ }
+ }
+ if (document.getElementById('LC_slotsearch_'+num)) {
+ document.getElementById('LC_slotsearch_'+num).style.display = 'block';
+ }
+ } else {
+ var numberRegExp = /^[0-9]+\$/;
+ var startm = form.start_month.options[form.start_month.selectedIndex].value;
+ var startd = form.start_day.value;
+ startd=startd.trim();
+ var starty = form.start_year.value;
+ starty=starty.trim();
+ var endm = form.end_month.options[form.end_month.selectedIndex].value;
+ var endd = form.end_day.value;
+ endd=endd.trim();
+ var endy = form.end_year.value;
+ endy=endy.trim();
+ if (numberRegExp.test(endd) && numberRegExp.test(endy) && numberRegExp.test(startd) && numberRegExp.test(starty)) {
+ var startdate = startm+"/"+startd+"/"+starty;
+ var starttime = new Date(startdate).getTime();
+ starttime = starttime/1000;
+ var starth = form.start_hour.options[form.start_hour.selectedIndex].value;
+ if (numberRegExp.test(starth)) {
+ starth = parseInt(starth);
+ if (starth > 0 && starth <= 23) {
+ starttime += 3600 * starth;
+ }
+ }
+ var enddate = endm+"/"+endd+"/"+endy;
+ var endtime = new Date(enddate).getTime();
+ endtime = endtime/1000;
+ var endh = form.end_hour.options[form.end_hour.selectedIndex].value;
+ if (numberRegExp.test(endh)) {
+ endh = parseInt(endh);
+ if (endh > 0 && endh <= 23) {
+ endtime += 3600 * endh;
+ }
+ }
+
+ var shown = 0;
+ for (var i=0; i<$i; i++) {
+ if ((slotstart[i] >= starttime) && (slotend[i] <= endtime)) {
+ if (document.getElementById('LC_slotrow_'+num+'_'+slotname[i])) {
+ document.getElementById('LC_slotrow_'+num+'_'+slotname[i]).style.display = '';
+ shown ++;
+ }
+ } else {
+ if (document.getElementById('LC_slotrow_'+num+'_'+slotname[i])) {
+ document.getElementById('LC_slotrow_'+num+'_'+slotname[i]).style.display = 'none';
+ }
+ }
+ }
+ if (document.getElementById('LC_slotsearch_'+num)) {
+ if (shown) {
+ document.getElementById('LC_slotsearch_'+num).style.display = 'block';
+ } else {
+ document.getElementById('LC_slotsearch_'+num).style.display = 'none';
+ }
+ }
+ if (shown == 0) {
+ alert('$alerts{"none"}');
+ }
+ } else {
+ alert('$alerts{"invalid"}');
+ }
+ }
+ }
+ return;
+}
+
+function toggleSlotDisplay(form,num) {
+ if (form.slotpick.length) {
+ for (var i=0; i<form.slotpick.length; i++) {
+ if (form.slotpick[i].checked) {
+ var val = form.slotpick[i].value;
+ if (document.getElementById('LC_slotfilter_'+num)) {
+ document.getElementById('LC_slotsearch_'+num).style.display = 'none';
+ if (val == 'filter') {
+ document.getElementById('LC_slotfilter_'+num).style.display = 'block';
+ } else {
+ document.getElementById('LC_slotfilter_'+num).style.display = 'none';
+ if (val == 'all') {
+ updateSlotDisplay(form,num,val);
+ } else {
+ updateSlotDisplay(form,num,val);
+ }
+ }
+ }
+ break;
+ }
+ }
+ }
+ return false;
+}
+
+if (!document.getElementsByClassName) {
+ function getElementsByClassName(node, classname) {
+ var a = [];
+ var re = new RegExp('(^| )'+classname+'( |$)');
+ var els = node.getElementsByTagName("*");
+ for(var i=0,j=els.length; i<j; i++)
+ if(re.test(els[i].className))a.push(els[i]);
+ return a;
+ }
+}
+
+function uncheckSlotRadio() {
+ var slotpicks;
+ if (document.getElementsByClassName) {
+ slotpicks = document.getElementsByClassName('LC_slotpick_radio');
+ } else {
+ slotpicks = getElementsByClassName(document.body,'LC_slotpick_radio');
+ }
+ if (slotpicks.length) {
+ for (var i=0; i<slotpicks.length; i++) {
+ slotpicks[i].checked = false;
+ }
+ }
+}
+
+function toggleSlotMap(maprownum,rownum) {
+ if (document.getElementById('arrow'+maprownum)) {
+ var img = document.getElementById('arrow'+maprownum);
+ var rowdisplay;
+ var celldisplay = '';
+ if (img.src.indexOf('arrow.open.gif')!=-1) {
+ img.src = '/adm/lonIcons/arrow.closed.gif';
+ rowdisplay = 'none';
+ }
+ else {
+ img.src = '/adm/lonIcons/arrow.open.gif';
+ rowdisplay = 'table-row';
+ celldisplay = 'none';
+ }
+ var resrows;
+ var maptext;
+ if (document.getElementsByClassName) {
+ resrows = document.getElementsByClassName('LC_slotresrow_'+maprownum);
+ maptext = document.getElementsByClassName('LC_slotmaptext_'+maprownum);
+ } else {
+ resrows = getElementsByClassName(document.body,'LC_slotresrow_'+maprownum);
+ maptext = getElementsByClassName(document.body,'LC_slotmaptext_'+maprownum);
+ }
+ if (maptext.length) {
+ for (var i=0; i<maptext.length; i++) {
+ maptext[i].style.display = celldisplay;
+ }
+ }
+ if (resrows.length) {
+ var mapbgidx = 0;
+ var rowclasses = ['LC_even_row','LC_odd_row'];
+ var mapbgClass = 'LC_even_row';
+ var regExpBg = /LC_odd_row/i;
+ if (rowdisplay == 'table-row') {
+ if (document.getElementById('LC_slotmaprow_'+rownum)) {
+ mapbgClass = document.getElementById('LC_slotmaprow_'+rownum).className;
+ if (regExpBg.test(mapbgClass)) {
+ mapbgidx = 1;
+ }
+ }
+ }
+ for (var i=0; i<resrows.length; i++) {
+ resrows[i].style.display = rowdisplay;
+ if (rowdisplay == 'table-row') {
+ mapbgidx ++;
+ var bgcolnew = mapbgidx % 2;
+ var bgcolold = (mapbgidx+1) % 2;
+ var k = i+parseInt(rownum)+1;
+ if (document.getElementById('LC_slotresrow_'+k)) {
+ document.getElementById('LC_slotresrow_'+k).className = document.getElementById('LC_slotresrow_'+k).className.replace(rowclasses[bgcolold],rowclasses[bgcolnew]);
+ }
+ }
+ }
+ if (document.getElementById('LC_slot_reservations')) {
+ var numrowsOdd = resrows.length % 2;
+ if (numrowsOdd) {
+ var lastbgClass = 'LC_even_row';
+ var idx = 0;
+ var lastresnum = parseInt(rownum) + resrows.length;
+ if (rowdisplay == 'none') {
+ lastresnum = rownum;
+ if (document.getElementById('LC_slotmaprow_'+rownum)) {
+ lastbgClass = document.getElementById('LC_slotmaprow_'+rownum).className;
+ }
+ } else {
+ lastresnum = parseInt(rownum) + resrows.length;
+ if (document.getElementById('LC_slotresrow_'+lastresnum)) {
+ lastbgClass = document.getElementById('LC_slotresrow_'+lastresnum).className;
+ }
+ }
+ if (regExpBg.test(lastbgClass)) {
+ idx = 1;
+ }
+ var table = document.getElementById('LC_slot_reservations');
+ if ((table.rows.length) && (table.rows.length >= lastresnum)) {
+ for (var i=lastresnum; i<table.rows.length; i++) {
+ if (table.rows[i].style.display != 'none') {
+ idx ++;
+ var bgcolnew = idx % 2;
+ var bgcolold = (idx+1) % 2;
+ j = i+1;
+ if (document.getElementById('LC_slotmaprow_'+j)) {
+ document.getElementById('LC_slotmaprow_'+j).className = rowclasses[bgcolnew];
+ } else {
+ if (document.getElementById('LC_slotresrow_'+j)) {
+ document.getElementById('LC_slotresrow_'+j).className = document.getElementById('LC_slotresrow_'+j).className.replace(rowclasses[bgcolold],rowclasses[bgcolnew]);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+// ]]>
+</script>
+ENDSCRIPT
+
+}
+
+
=pod
slot_reservations db
@@ -121,7 +416,6 @@ sub check_for_reservation {
my ($symb,$mode)=@_;
my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb,
$env{'user.domain'}, $env{'user.name'});
-
my $course = &Apache::lonnet::EXT("resource.0.available", $symb,
$env{'user.domain'}, $env{'user.name'});
my @slots = (split(/:/,$student), split(/:/, $course));
@@ -137,16 +431,20 @@ sub check_for_reservation {
return 'error: Unable to determine current status';
}
my @got;
- my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots);
+ my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots,'starttime');
foreach my $slot_name (@sorted_slots) {
next if (!defined($slots{$slot_name}) ||
!ref($slots{$slot_name}));
&Apache::lonxml::debug(time." $slot_name ".
$slots{$slot_name}->{'starttime'}." -- ".
- $slots{$slot_name}->{'startreserve'});
- if ($slots{$slot_name}->{'endtime'} > time &&
- $slots{$slot_name}->{'startreserve'} < time) {
- # between start of reservation times and end of slot
+ $slots{$slot_name}->{'startreserve'}." -- ".
+ $slots{$slot_name}->{'endreserve'});
+ if (($slots{$slot_name}->{'endtime'} > time) &&
+ ($slots{$slot_name}->{'startreserve'} < time) &&
+ ((!$slots{$slot_name}->{'endreserve'}) ||
+ ($slots{$slot_name}->{'endreserve'} > time))) {
+ # between start of reservation time and end of reservation time
+ # and before end of slot
if ($mode eq 'allslots') {
push(@got,$slot_name);
} else {
@@ -214,16 +512,19 @@ sub check_for_conflict {
if (!defined($new_slot->{'uniqueperiod'})) { return undef; }
if (!ref($consumed_uniqueperiods)) {
- $consumed_uniqueperiods = &get_consumed_uniqueperiods($slots);
- if (ref($consumed_uniqueperiods) eq 'HASH') {
- if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
- return 'error: Unable to determine current status';
- }
+ if ($consumed_uniqueperiods =~ /^error: /) {
+ return $consumed_uniqueperiods;
} else {
- return 'error: Unable to determine current status';
+ $consumed_uniqueperiods = &get_consumed_uniqueperiods($slots);
+ if (ref($consumed_uniqueperiods) eq 'HASH') {
+ if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
+ return 'error: Unable to determine current status';
+ }
+ } else {
+ return 'error: Unable to determine current status';
+ }
}
- }
-
+ }
my ($new_uniq_start,$new_uniq_end) = @{$new_slot->{'uniqueperiod'}};
foreach my $slot_name (keys(%$consumed_uniqueperiods)) {
my ($start,$end)=@{$consumed_uniqueperiods->{$slot_name}};
@@ -335,12 +636,12 @@ sub store_slot_parm {
context => $env{'form.context'},
);
- &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
- '',$env{'user.name'},$env{'user.domain'},
- $cnum,$cdom);
- &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
- 1,$env{'user.name'},$env{'user.domain'},
- $env{'user.name'},$env{'user.domain'});
+ &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
+ '',$env{'user.name'},$env{'user.domain'},
+ $cnum,$cdom);
+ &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
+ 1,$env{'user.name'},$env{'user.domain'},
+ $env{'user.name'},$env{'user.domain'});
return;
}
@@ -500,14 +801,20 @@ sub release_reservation {
return (0,'error: Unable to determine current status');
}
my $passed_resource = $navmap->getBySymb($symb);
- if ($passed_resource->is_map()) {
- my ($a_resource) =
- $navmap->retrieveResources($passed_resource,
- sub {$_[0]->is_problem()},0,1);
- $symb = $a_resource->symb();
+ if (ref($passed_resource)) {
+ if ($passed_resource->is_map()) {
+ my ($a_resource) =
+ $navmap->retrieveResources($passed_resource,
+ sub {$_[0]->is_problem()},0,1);
+ $symb = $a_resource->symb();
+ }
+ } else {
+ unless ($mgr eq 'F') {
+ return (0,'error: Unable to determine current status');
+ }
}
- # get parameter string, check for existance, rebuild string with the slot
+ # get parameter string, check for existence, rebuild string with the slot
my $student = &Apache::lonnet::EXT("resource.0.availablestudent",
$symb,$udom,$uname);
my @slots = split(/:/,$student);
@@ -534,10 +841,10 @@ sub release_reservation {
action => 'release',
context => $env{'form.context'},
);
- &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
- 1,$uname,$udom,$cnum,$cdom);
- &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
- 1,$uname,$udom,$uname,$udom);
+ &Apache::lonnet::write_log('slotreservationslog',\%storehash,
+ 1,$uname,$udom,$cnum,$cdom);
+ &Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+ 1,$uname,$udom,$uname,$udom);
}
}
@@ -562,7 +869,11 @@ sub release_reservation {
if ($mgr eq 'F') {
$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom");
} else {
- $msg = &mt('Released Reservation: [_1]',$description);
+ $msg = '<span style="font-weight: bold;">'.&mt('Released reservation: [_1]',$description).'</span><br /><br />';
+ my $person = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+ my $subject = &mt('Reservation change: [_1]',$description);
+ my $msgbody = &mt('Reservation released by [_1] for [_2].',$person,$description);
+ $msg .= &slot_change_messaging($slot{'reservationmsg'},$subject,$msgbody,'release');
}
return (1,$msg);
}
@@ -629,7 +940,6 @@ sub get_slot {
my $description1=&get_description($slot_name,\%slot);
%slot=&Apache::lonnet::get_slot($env{'form.slotname'});
my $description2=&get_description($env{'form.slotname'},\%slot);
- $r->print('<p>'.&mt('Already have a reservation: [_1].',$description1).'</p>');
if ($slot_name ne $env{'form.slotname'}) {
$r->print(<<STUFF);
<form method="post" action="/adm/slotrequest">
@@ -638,19 +948,24 @@ sub get_slot {
<input type="hidden" name="releaseslot" value="$slot_name" />
<input type="hidden" name="command" value="change" />
STUFF
- $r->print('<p>'
- .&mt('You can either [_1]Change[_2] your reservation from [_3] to [_4] or'
- ,'<input type="submit" name="change" value="'
- ,'" />'
- ,'<b>'.$description1.'</b>'
- ,'<b>'.$description2.'</b>')
- .'<br /></p>'
- );
- &return_link($r);
+ $r->print('<p class="LC_error">'.&mt('Reservation currently unchanged').'</p>');
+ if ($slot_name ne '') {
+ $r->print('<p>'.&mt('To complete the transaction you [_1]must confirm[_2] you want to [_3]process the change[_4] to [_5].'
+ ,'<b>','</b>','<i>','</i>','<b>'.$description2.'</b>')
+ .'<br />'
+ .&mt('Or you can choose to [_1]make no change[_2] and continue[_2] with the reservation you already had: [_3].'
+ ,'<i>','</i>','<b>'.$description1.'</b>')
+ .'</p><p><span class="LC_nobreak">'
+ .'<input type="submit" name="change" value="'.&mt('Process the change').'" />'
+ .(' 'x3)
+ .'<input type="submit" name="nochange" value="'.&mt('Make no change').'" />'
+ .'</span></p>');
+ }
$r->print(<<STUFF);
</form>
STUFF
} else {
+ $r->print('<p>'.&mt('Already have a reservation: [_1].',$description1).'</p>');
&return_link($r);
}
return 0;
@@ -667,8 +982,15 @@ STUFF
.&mt('An error occurred while attempting to make a reservation. ([_1])',$1)
.'</span></p>');
} elsif ($reserved > -1) {
- $r->print('<p>'.&mt('Success: [_1]',$description).'</p>');
+ $r->print('<p style="font-weight: bold;">'.&mt('Successfully signed up: [_1]',$description).'</p>');
$retvalue = 1;
+ my $person = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+ my $subject = &mt('Reservation change: [_1]',$description);
+ my $msgbody = &mt('Successful reservation by [_1] for [_2].',$person,$description);
+ my $msg = &slot_change_messaging($slot{'reservationmsg'},$subject,$msgbody,'reserve');
+ if ($msg) {
+ $r->print($msg);
+ }
} elsif ($reserved < 0) {
$r->print('<p>'.&mt('Already reserved: [_1]',$description).'</p>');
}
@@ -677,7 +999,7 @@ STUFF
}
my %lt = &Apache::lonlocal::texthash(
- 'request' => 'Availibility list',
+ 'request' => 'Availability list',
'try' => 'Try again?',
'or' => 'or',
);
@@ -716,7 +1038,7 @@ STUFF
}
sub allowed_slot {
- my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods)=@_;
+ my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods,$toskip)=@_;
#already started
if ($slot->{'starttime'} < time) {
@@ -741,6 +1063,11 @@ sub allowed_slot {
if ($slot->{'startreserve'} > time) {
return 0;
}
+ # reserve time ended
+ if (($slot->{'endreserve'}) &&
+ ($slot->{'endreserve'} < time)) {
+ return 0;
+ }
&Apache::lonxml::debug("$slot_name reserve good");
my $userallowed=0;
@@ -785,9 +1112,33 @@ sub allowed_slot {
return 0 if (!$userallowed);
# not allowed for this resource
- if (defined($slot->{'symb'})
- && $slot->{'symb'} ne $symb) {
- return 0;
+ if (defined($slot->{'symb'})) {
+ my $exclude = 1;
+ my @symbs;
+ if ($slot->{'symb'} =~ /,/) {
+ @symbs = split(/\s*,\s*/,$slot->{'symb'});
+ } else {
+ @symbs = ($slot->{'symb'});
+ }
+ my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb);
+ foreach my $reqsymb (@symbs) {
+ next if ($reqsymb eq '');
+ my ($slotmap,$slotid,$sloturl) = &Apache::lonnet::decode_symb($reqsymb);
+ if ($sloturl=~/\.(page|sequence)$/) {
+ if (($map ne '') && ($map eq $sloturl)) {
+ $exclude = 0;
+ last;
+ }
+ } elsif ($reqsymb eq $symb) {
+ $exclude = 0;
+ last;
+ }
+ }
+ if ($exclude) {
+ unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) {
+ return 0;
+ }
+ }
}
my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots,
@@ -815,76 +1166,119 @@ sub get_description {
}
sub show_choices {
- my ($r,$symb,$formname)=@_;
-
- my ($cnum,$cdom)=&get_course();
- my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
- my $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots);
- if (ref($consumed_uniqueperiods) eq 'HASH') {
- if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
- $r->print('<span class="LC_error">'.
- &mt('An error occurred determining slot availability').
- '</span>');
- return;
- }
- } elsif ($consumed_uniqueperiods =~ /^error: /) {
- $r->print('<span class="LC_error">'.
- &mt('An error occurred determining slot availability').
- '</span>');
- return;
- }
- my (@available,$output);
+ my ($symb,$formname,$num,$class,$slots,$consumed_uniqueperiods,$available,$got_slots)=@_;
+ my $output;
&Apache::lonxml::debug("Checking Slots");
- my @got_slots=&check_for_reservation($symb,'allslots');
- if ($got_slots[0] =~ /^error: /) {
- $r->print('<span class="LC_error">'.
- &mt('An error occurred determining slot availability').
- '</span>');
+ if (!ref($available) eq 'ARRAY') {
return;
}
- foreach my $slot (sort
- { return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
- (keys(%slots))) {
-
- &Apache::lonxml::debug("Checking Slot $slot");
- next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots,
- $consumed_uniqueperiods));
-
- push(@available,$slot);
- }
- if (!@available) {
- $output = &mt('No available times.');
+ if (!@{$available}) {
+ $output = '<span class="LC_info">'.&mt('No available times.').'</span>';
if ($env{'form.command'} ne 'manageresv') {
$output .= ' <a href="/adm/flip?postdata=return:">'.
&mt('Return to last resource').'</a>';
}
- $r->print($output);
- return;
+ if ($class) {
+ return '<div class="'.$class.'">'.$output.'</div>';
+ } else {
+ return $output;
+ }
+ }
+ if (@{$available} > 1) {
+ my $numavailable = scalar(@{$available});
+ my $numreserved = 0;
+ my $js;
+ my $j = 0;
+ foreach my $got (@{$got_slots}) {
+ unless (($got eq '') || (!defined($got))) {
+ $numreserved ++;
+ if ($env{'form.command'} eq 'manageresv') {
+ $js .= " currslot[$j]='$got';\n";
+ $j++;
+ }
+ }
+ }
+ my $showfilter = 'none';
+ $output .= '<fieldset><legend>'.&mt('Actions').'</legend>'."\n".
+ '<form method="post" name="reservationdisplay_'.$num.
+ '" action="" onsubmit="toggleSlotDisplay(this.form,'."'$num'".');">';
+ my @options = ('all','filter');
+ if ($numreserved) {
+ unshift(@options,'show');
+ }
+ my %resmenu = &Apache::lonlocal::texthash (
+ show => 'Show current reservation',
+ all => 'Show all',
+ filter => 'Search by date',
+ );
+ foreach my $option (@options) {
+ my $onclick = "toggleSlotDisplay(this.form,'$num');";
+ if (($option eq 'show') && ($env{'form.command'} eq 'manageresv')) {
+ $onclick .= "currSlotDisplay$num(this.form,'$num');";
+ }
+ $output .= '<span class="LC_nobreak"><label>'.
+ '<input type="radio" class="LC_slotpick_radio" name="slotpick" value="'.
+ $option.'" onclick="'.$onclick.'" />'.
+ $resmenu{$option}.
+ '</label></span>'.(' ' x3)."\n";
+ }
+ $output .= '</form>';
+ my $chooserform = 'reservationchooser_'.$num;
+ my $starttime = $slots->{$available->[0]}->{'starttime'};
+ my $endtime = $slots->{$available->[-1]}->{'starttime'};
+ if ($env{'form.command'} eq 'manageresv') {
+ $output .= <<"ENDSCRIPT";
+
+<script type="text/javascript">
+// <![CDATA[
+function currSlotDisplay$num() {
+ var currslot = new Array($numreserved);
+$js
+ for (var j=0; j<$numreserved; j++) {
+ if (document.getElementById('LC_slotrow_$num\_'+currslot[j])) {
+ document.getElementById('LC_slotrow_$num\_'+currslot[j]).style.display = '';
+ }
+ }
+}
+// ]]>
+</script>
+
+ENDSCRIPT
+ }
+ $output .=
+ '<div id="LC_slotfilter_'.$num.'" style="display:'.$showfilter.'">'.
+ '<form method="post" name="'.$chooserform.'" action="">'.
+ '<table><tr><td>'.&mt('Open after').'</td><td>'.
+ &Apache::lonhtmlcommon::date_setter($chooserform,'start',$starttime,'','','','','','','',1,1).
+ '</td></tr><tr><td>'.&mt('Closed before').'</td><td>'.
+ &Apache::lonhtmlcommon::date_setter($chooserform,'end',$endtime,'','','','','','','',1,1).
+ '</td></tr></table><br />'.
+ '<input type="button" name="slotfilter" value="Search for reservable slots" onclick="updateSlotDisplay(this.form,'."'$num'".');" />'.
+ '</form></div><div id="LC_slotsearch_'.$num.'" style="display:none"><hr />';
}
if ($env{'form.command'} eq 'manageresv') {
- $output = '<table border="0">';
+ $output .= '<table border="0">';
} else {
- $output = &Apache::loncommon::start_data_table();
+ $output .= &Apache::loncommon::start_data_table();
}
- foreach my $slot (@available) {
- my $description=&get_description($slot,$slots{$slot});
+ foreach my $slot (@{$available}) {
+ my $description=&get_description($slot,$slots->{$slot});
my $form;
- if ((grep(/^\Q$slot\E$/,@got_slots)) ||
- &space_available($slot,$slots{$slot},$symb)) {
+ if ((grep(/^\Q$slot\E$/,@{$got_slots})) ||
+ &space_available($slot,$slots->{$slot},$symb)) {
my $text=&mt('Select');
my $command='get';
- if (grep(/^\Q$slot\E$/,@got_slots)) {
+ if (grep(/^\Q$slot\E$/,@{$got_slots})) {
$text=&mt('Drop Reservation');
$command='release';
} else {
- my $conflict = &check_for_conflict($symb,$slot,$slots{$slot},
- \%slots,
- $consumed_uniqueperiods);
+ my $conflict = &check_for_conflict($symb,$slot,$slots->{$slot},
+ $slots,$consumed_uniqueperiods);
if ($conflict) {
if ($conflict =~ /^error: /) {
$form = '<span class="LC_error">'.
- &mt('Slot: [_1] has unknown status.',$description).
- '</span>';
+ &mt('Slot: [_1] has unknown status.',$description).
+ '</span>';
} else {
$text=&mt('Change Reservation');
$command='get';
@@ -893,15 +1287,16 @@ sub show_choices {
}
my $escsymb=&escape($symb);
if (!$form) {
+ my $name;
if ($formname) {
- $formname = 'name="'.$formname.'" ';
+ $name = 'name="'.$formname.'"';
}
my $context = 'user';
if ($env{'form.command'} eq 'manageresv') {
$context = 'usermanage';
}
$form=<<STUFF;
- <form method="post" action="/adm/slotrequest" $formname>
+ <form method="post" action="/adm/slotrequest" $name>
<input type="submit" name="Select" value="$text" />
<input type="hidden" name="symb" value="$escsymb" />
<input type="hidden" name="slotname" value="$slot" />
@@ -914,9 +1309,9 @@ STUFF
$form = &mt('Unavailable');
}
if ($env{'form.command'} eq 'manageresv') {
- $output .= '<tr>';
+ $output .= '<tr id="LC_slotrow_'.$num.'_'.$slot.'" >';
} else {
- $output .= &Apache::loncommon::start_data_table_row();
+ $output .= &Apache::loncommon::start_data_table_row('','LC_slotrow_'.$num.'_'.$slot);
}
$output .= "
<td>$form</td>
@@ -930,9 +1325,16 @@ STUFF
if ($env{'form.command'} eq 'manageresv') {
$output .= '</table>';
} else {
- $output .= &Apache::loncommon::end_data_table();
+ $output .= &Apache::loncommon::end_data_table();
+ }
+ if (@{$available} > 1) {
+ $output .= '</div></fieldset>';
+ }
+ if ($class) {
+ return '<div class="'.$class.'">'.$output.'</div>';
+ } else {
+ return $output;
}
- $r->print($output);
}
sub to_show {
@@ -1026,6 +1428,7 @@ sub show_table {
my ($r,$mgr)=@_;
my ($cnum,$cdom)=&get_course();
+ my $crstype=&Apache::loncommon::course_type($cdom.'_'.$cnum);
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
if ( (keys(%slots))[0] =~ /^error: 2 /) {
undef(%slots);
@@ -1033,7 +1436,8 @@ sub show_table {
my $available;
if ($mgr eq 'F') {
# FIXME: This line should be deleted once Slots uses breadcrumbs
- $r->print(&Apache::loncommon::help_open_topic('Slot About', 'Help on slots'));
+ $r->print('<br />'.&Apache::loncommon::help_open_topic(
+ 'Slot About', &mt('Help on slots')));
$r->print('<div>');
$r->print('<form method="post" action="/adm/slotrequest">
@@ -1049,7 +1453,11 @@ sub show_table {
}
if (!keys(%slots)) {
- $r->print('<div>'.&mt('No slots have been created in this course.').'</div>');
+ $r->print(
+ '<p class="LC_info">'
+ .&mt('No slots have been created in this '.lc($crstype).'.')
+ .'</p>'
+ );
return;
}
@@ -1076,18 +1484,25 @@ sub show_table {
'starttime' => 'Start time',
'endtime' => 'End Time',
'startreserve' => 'Time students can start reserving',
+ 'endreserve' => 'Time students can no longer reserve',
+ 'reservationmsg' => 'Message triggered by reservation',
'secret' => 'Secret Word',
'space' => '# of students/max',
'ip' => 'IP or DNS restrictions',
- 'symb' => 'Resource slot is restricted to.',
+ 'symb' => 'Resource(s)/Map(s) slot is restricted to.',
'allowedsections' => 'Sections slot is restricted to.',
'allowedusers' => 'Users slot is restricted to.',
'uniqueperiod' => 'Period of time slot is unique',
'scheduled' => 'Scheduled Students',
'proctor' => 'List of proctors');
+ if ($crstype eq 'Community') {
+ $show_fields{'startreserve'} = &mt('Time members can start reserving');
+ $show_fields{'endreserve'} = &mt('Time members can no longer reserve');
+ $show_fields{'scheduled'} = &mt('Scheduled Members');
+ }
my @show_order=('name','description','type','starttime','endtime',
- 'startreserve','secret','space','ip','symb',
- 'allowedsections','allowedusers','uniqueperiod',
+ 'startreserve','endreserve','reservationmsg','secret','space',
+ 'ip','symb','allowedsections','allowedusers','uniqueperiod',
'scheduled','proctor');
my @show =
(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show')
@@ -1160,11 +1575,11 @@ sub show_table {
6,\%stu_display_fields,
\@stu_display_order).'
</td>
- <td valign="top">'.&Apache::loncommon::select_form($when,'when',%when_fields).
+ <td valign="top">'.&Apache::loncommon::select_form($when,'when',\%when_fields).
'</td>
<td valign="top">'.&Apache::loncommon::select_form($name_filter_type,
'name_filter_type',
- %name_filter_type_fields).
+ \%name_filter_type_fields).
'<br />'.
&Apache::lonhtmlcommon::textbox('name_filter_value',
$env{'form.name_filter_value'},
@@ -1173,11 +1588,11 @@ sub show_table {
<td valign="top">
<table>
<tr>
- <td rowspan="2">Deleted slots:</td>
- <td><label>'.$show_radio.'Show</label></td>
+ <td rowspan="2">'.&mt('Deleted slots:').'</td>
+ <td><label>'.$show_radio.&mt('Show').'</label></td>
</tr>
<tr>
- <td><label>'.$hide_radio.'Hide</label></td>
+ <td><label>'.$hide_radio.&mt('Hide').'</label></td>
</tr>
</table>
</td>
@@ -1198,7 +1613,7 @@ sub show_table {
my %name_cache;
my $slotsort = sub {
- if ($env{'form.order'}=~/^(type|description|endtime|startreserve|ip|symb|allowedsections|allowedusers)$/) {
+ if ($env{'form.order'}=~/^(type|description|endtime|startreserve|endreserve|ip|symb|allowedsections|allowedusers|reservationmsg)$/) {
if (lc($slots{$a}->{$env{'form.order'}})
ne lc($slots{$b}->{$env{'form.order'}})) {
return (lc($slots{$a}->{$env{'form.order'}})
@@ -1235,12 +1650,15 @@ sub show_table {
if ($tmp =~ /^error: /) { undef(%consumed); }
}
+ my %msgops = &slot_reservationmsg_options();
+
foreach my $slot (sort $slotsort (keys(%slots))) {
if (!&to_show($slot,$slots{$slot},$when,
$env{'form.deleted'},$name_filter)) { next; }
+ my $reservemsg;
if (defined($slots{$slot}->{'type'})
- && $slots{$slot}->{'type'} ne 'schedulable_student') {
- #next;
+ && $slots{$slot}->{'type'} eq 'schedulable_student') {
+ $reservemsg = $msgops{$slots{$slot}->{'reservationmsg'}};
}
my $description=&get_description($slot,$slots{$slot});
my ($id_count,$ids);
@@ -1277,6 +1695,8 @@ sub show_table {
&Apache::lonlocal::locallocaltime($slots{$slot}->{'endtime'}):'');
my $start_reserve=($slots{$slot}->{'startreserve'}?
&Apache::lonlocal::locallocaltime($slots{$slot}->{'startreserve'}):'');
+ my $end_reserve=($slots{$slot}->{'endreserve'}?
+ &Apache::lonlocal::locallocaltime($slots{$slot}->{'endreserve'}):'');
my $unique;
if (ref($slots{$slot}{'uniqueperiod'})) {
@@ -1284,13 +1704,21 @@ sub show_table {
localtime($slots{$slot}{'uniqueperiod'}[1]);
}
- my $title;
+ my @titles;
if (exists($slots{$slot}{'symb'})) {
- my (undef,undef,$res)=
- &Apache::lonnet::decode_symb($slots{$slot}{'symb'});
- $res = &Apache::lonnet::clutter($res);
- $title = &Apache::lonnet::gettitle($slots{$slot}{'symb'});
- $title='<a href="'.$res.'?symb='.$slots{$slot}{'symb'}.'">'.$title.'</a>';
+ my @symbs;
+ if ($slots{$slot}{'symb'} =~ /,/) {
+ @symbs = split(/\s*,\s*/,$slots{$slot}{'symb'});
+ } else {
+ @symbs = ($slots{$slot}{'symb'});
+ }
+ foreach my $reqsymb (@symbs) {
+ my (undef,undef,$res) =
+ &Apache::lonnet::decode_symb($reqsymb);
+ $res = &Apache::lonnet::clutter($res);
+ my $title = &Apache::lonnet::gettitle($reqsymb);
+ push(@titles,'<a href="'.$res.'?symb='.$reqsymb.'">'.$title.'</a>');
+ }
}
my $allowedsections;
@@ -1384,6 +1812,12 @@ LOGLINK
if (exists($show{'startreserve'})) {
$colspan++;$r->print("<td>$start_reserve</td>\n");
}
+ if (exists($show{'endreserve'})) {
+ $colspan++;$r->print("<td>$end_reserve</td>\n");
+ }
+ if (exists($show{'reservationmsg'})) {
+ $colspan++;$r->print("<td>$reservemsg</td>\n");
+ }
if (exists($show{'secret'})) {
$colspan++;$r->print("<td>$slots{$slot}{'secret'}</td>\n");
}
@@ -1401,7 +1835,7 @@ LOGLINK
$colspan++;$r->print("<td>$slots{$slot}{'ip'}</td>\n");
}
if (exists($show{'symb'})) {
- $colspan++;$r->print("<td>$title</td>\n");
+ $colspan++;$r->print("<td>".join('<br />',@titles)."</td>\n");
}
if (exists($show{'allowedsections'})) {
$colspan++;$r->print("<td>$allowedsections</td>\n");
@@ -1429,30 +1863,52 @@ STUFF
}
sub manage_reservations {
- my ($r,$type) = @_;
+ my ($r,$crstype,$slots,$consumed_uniqueperiods,$allavailable) = @_;
my $navmap = Apache::lonnavmaps::navmap->new();
$r->print('<p>'
.&mt('Instructors may use a reservation system to place restrictions on when and where assignments can be worked on.')
.'<br />'
.&mt('One example is for management of laboratory space, which is only available at certain times, and has a limited number of seats.')
- .'</p><p>'
- .&mt('Your reservation status for any such assignments is listed below:')
.'</p>'
);
if (!defined($navmap)) {
- $r->print('<div class="LC_error">'.
- &mt('Unable to retrieve information about course contents').
- '</div>');
- &Apache::lonnet::logthis('Manage Reservations - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
+ $r->print('<div class="LC_error">');
+ if ($crstype eq 'Community') {
+ $r->print(&mt('Unable to retrieve information about community contents'));
+ } else {
+ $r->print(&mt('Unable to retrieve information about course contents'));
+ }
+ $r->print('</div>');
+ &Apache::lonnet::logthis('Manage Reservations - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
+ return;
+ }
+ if (ref($consumed_uniqueperiods) eq 'HASH') {
+ if (&Apache::lonnet::error(%$consumed_uniqueperiods)) {
+ $r->print('<span class="LC_error">'.
+ &mt('An error occurred determining slot availability.').
+ '</span>');
+ return;
+ }
+ } elsif ($consumed_uniqueperiods =~ /^error: /) {
+ $r->print('<span class="LC_error">'.
+ &mt('An error occurred determining slot availability.').
+ '</span>');
return;
}
my (%parent,%shownparent,%container,%container_title,%contents);
- my ($depth,$count,$reservable,$lastcontainer,$rownum) = (0,0,0,0,0);
+ my ($depth,$count,$reservable,$lastcontainer,$rownum,$shown) = (0,0,0,0,0,0);
my @backgrounds = ("LC_odd_row","LC_even_row");
my $numcolors = scalar(@backgrounds);
my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif");
- $r->print('<table class="LC_data_table LC_tableOfContent">'."\n");
+ my $slotheader = '<p>'.
+ &mt('Your reservation status for any such assignments is listed below:').
+ '</p>'.
+ '<table class="LC_data_table LC_tableOfContent" id="LC_slot_reservations">'."\n";
+ my $shownheader = 0;
my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
+ my (@ordered,%output,$mapitem,$got_map_slot,$currmapoutput,$mapnum);
+ $mapnum = 0;
+ $shown = 0;
while (my $resource = $it->next()) {
if ($resource == $it->BEGIN_MAP()) {
$depth++;
@@ -1461,10 +1917,90 @@ sub manage_reservations {
if ($resource == $it->END_MAP()) {
$depth--;
$lastcontainer = $parent{$depth};
+ my %allstatuses;
+ foreach my $symb (@ordered) {
+ if (ref($output{$symb}) eq 'HASH') {
+ if (($output{$symb}{'type'} eq 'map_map') || ($output{$symb}{'type'} eq 'map')) {
+ if ($output{$symb}{'slotstatus'} ne '') {
+ if (ref($allstatuses{$output{$symb}{'slotstatus'}}) eq 'ARRAY') {
+ push(@{$allstatuses{$output{$symb}{'slotstatus'}}},$symb);
+ } else {
+ $allstatuses{$output{$symb}{'slotstatus'}} = [$symb];
+ }
+ }
+ }
+ }
+ }
+ if (keys(%allstatuses) == 1) {
+ $got_map_slot = 1;
+ my $repsymb;
+ my @values = values(%allstatuses);
+ if (ref($values[0]) eq 'ARRAY') {
+ if (ref($output{$values[0][0]}) eq 'HASH') {
+ $repsymb = $values[0][0];
+ }
+ }
+ if (($mapitem) && ($repsymb)) {
+ my $formnum = $mapnum.'_'.$output{$repsymb}{'reservable'};
+ my $class = 'LC_slotmaptext_'.$mapnum;
+ if ($output{$repsymb}{'hasaction'}) {
+ $mapitem .= '<td valign="top"><span class="'.$class.'">'.
+ $output{$repsymb}{'msg'}.
+ '</span></td><td valign="top">'.
+ &slot_chooser($repsymb,$class,$formnum,$allavailable,$slots,
+ $consumed_uniqueperiods).
+ '</td>';
+
+ } else {
+ $mapitem .= '<td colspan="2" valign="middle"><span class="'.$class.'">'.
+ $output{$repsymb}{'msg'}.
+ '</span></td>';
+ }
+ }
+ my $counter = 0;
+ foreach my $symb (@ordered) {
+ if (ref($output{$symb}) eq 'HASH') {
+ $counter ++;
+ my $bgcolor = $backgrounds[($output{$symb}{'shown'} + $counter) % $numcolors];
+ $currmapoutput .= $output{$symb}{'header'}.
+ '<tr class="'.$bgcolor.' LC_slotresrow_'.$output{$symb}{'mapnum'}.'"'.
+ ' style="display:none" id="LC_slotresrow_'.$output{$symb}{'rownum'}.'">'.
+ $output{$symb}{'info'}.
+ $output{$symb}{'data'}.'</tr>'."\n";
+ }
+ }
+ } else {
+ my $counter = 0;
+ foreach my $symb (@ordered) {
+ if (ref($output{$symb}) eq 'HASH') {
+ $counter ++;
+ my $bgcolor = $backgrounds[($output{$symb}{'shown'} + $counter) % $numcolors];
+ $currmapoutput .= $output{$symb}{'header'}.
+ '<tr class="'.$bgcolor.' LC_slotresrow_'.$output{$symb}{'mapnum'}.'"'.
+ ' style="display:table-row" id="LC_slotresrow_'.$output{$symb}{'rownum'}.'">'.
+ $output{$symb}{'info'}.
+ $output{$symb}{'data'}.'</tr>'."\n";
+ $shown ++;
+ }
+ }
+ }
+ if ($mapitem) {
+ if ($got_map_slot) {
+ $mapitem =~ s{(<img src=\"/adm/lonIcons/arrow\.)open(\.gif\")}{$1closed$2};
+ $mapitem .= '</tr>'."\n";
+ } else {
+ $mapitem .= '<td colspan="2"> </td></tr>'."\n";
+ }
+ }
+ $r->print($mapitem.$currmapoutput);
+ @ordered=();
+ undef(%output);
+ $currmapoutput = '';
+ $got_map_slot = '';
+ $mapitem = '';
}
if (ref($resource)) {
my $symb = $resource->symb();
- my $ressymb = $symb;
$contents{$lastcontainer} ++;
next if (!$resource->is_problem() && !$resource->is_sequence() &&
!$resource->is_page());
@@ -1477,10 +2013,15 @@ sub manage_reservations {
if ($resource->is_problem()) {
my ($useslots) = $resource->slot_control();
next if (($useslots eq '') || ($useslots =~ /^\s*no\s*$/i));
+ push(@ordered,$symb);
+ $output{$symb}{type} = $useslots;
my ($msg,$get_choices,$slotdescription);
my $title = $resource->compTitle();
my $status = $resource->simpleStatus('0');
my ($slot_status,$date,$slot_name) = $resource->check_for_slot('0');
+
+ $output{$symb}{'slotstatus'} = $slot_status;
+ $output{$symb}{'slotname'} = $slot_name;
if ($slot_name ne '') {
my %slot=&Apache::lonnet::get_slot($slot_name);
$slotdescription=&get_description($slot_name,\%slot);
@@ -1513,6 +2054,8 @@ sub manage_reservations {
} elsif ($slot_status == $resource->RESERVABLE) {
$msg=&mt('Reservation needed');
$get_choices = 1;
+ } elsif ($slot_status == $resource->RESERVABLE_LATER) {
+ $msg=&mt('Reservation needed: will be reservable later.');
} elsif ($slot_status == $resource->NOTRESERVABLE) {
$msg=&mt('Reservation needed: none available.');
} elsif ($slot_status == $resource->UNKNOWN) {
@@ -1522,7 +2065,9 @@ sub manage_reservations {
$msg = &Apache::lonnavmaps::getDescription($resource,'0');
}
}
+ $output{$symb}{'msg'} = $msg;
$reservable ++;
+ $output{$symb}{'reservable'} = $reservable;
my $treelevel = $depth;
my $higherup = $lastcontainer;
if ($depth > 1) {
@@ -1543,72 +2088,156 @@ sub manage_reservations {
$treelevel --;
$higherup = $parent{$treelevel};
}
- foreach my $item (@maprows) {
+ for (my $i=0; $i<@maprows; $i++) {
+ $mapnum ++;
$rownum ++;
- my $bgcolor = $backgrounds[$rownum % $numcolors];
- $r->print('<tr class="'.$bgcolor.'">'.$item.'</tr>'."\n");
+ $shown ++;
+ my $bgcolor = $backgrounds[$shown % $numcolors];
+ if (!$shownheader) {
+ $mapitem .= $slotheader;
+ $shownheader = 1;
+ }
+ if (ref($maprows[$i]) eq 'ARRAY') {
+ if ($i < scalar(@maprows)-1) {
+ $mapitem .= '<tr class="'.$bgcolor.'" id="LC_slotmaprow_'.$rownum.'">'.
+ '<td>'.join('',@{$maprows[$i]}).'</td>'.
+ '<td colspan="2"> </td></tr>'."\n";
+ } else {
+ $mapitem .=
+ '<tr class="'.$bgcolor.'" id="LC_slotmaprow_'.$rownum.'">'.
+ '<td>'.$maprows[$i][0].
+ '<img src="/adm/lonIcons/arrow.open.gif" id="arrow'.$mapnum.'" '.
+ 'alt="arrow" onmouseover="this.style.cursor=\'pointer\'" '.
+ 'onclick="'."toggleSlotMap('$mapnum','$rownum');".'" />'.
+ $maprows[$i][1].(' ' x6).'</td>'."\n";
+ }
+ }
}
+ $output{$symb}{'mapnum'} = $mapnum;
}
$rownum ++;
- my $bgcolor = $backgrounds[$rownum % $numcolors];
- $r->print('<tr class="'.$bgcolor.'"><td>'."\n");
+ $output{$symb}{'rownum'} = $rownum;
+ $output{$symb}{'shown'} = $shown;
+ if (!$shownheader) {
+ $output{$symb}{'header'} = $slotheader;
+ $shownheader = 1;
+ }
+ $output{$symb}{'info'} = '<td>';
for (my $i=0; $i<$depth; $i++) {
- $r->print('<img src="'.$location.'" alt="" />');
+ $output{$symb}{'info'} .= '<img src="'.$location.'" alt="" />';
}
- my $result = '<a href="'.$resource->src().'?symb='.$symb.'">'.
- '<img class="LC_contentImage" src="/adm/lonIcons/';
+ $output{$symb}{'info'} .= '<a href="'.$resource->src().'?symb='.$symb.'">'.
+ '<img class="LC_contentImage" src="/adm/lonIcons/';
if ($resource->is_task()) {
- $result .= 'task.gif" alt="'.&mt('Task');
+ $output{$symb}{'info'} .= 'task.gif" alt="'.&mt('Task');
} else {
- $result .= 'problem.gif" alt="'.&mt('Problem');
+ $output{$symb}{'info'} .= 'problem.gif" alt="'.&mt('Problem');
}
- $result .= '" /><b>'.$title.'</b></a>'.(' ' x6).'</td>';
+ $output{$symb}{'info'} .= '" /><b>'.$title.'</b></a>'.(' ' x6).'</td>';
+
my $hasaction;
if ($status == $resource->OPEN) {
if ($get_choices) {
$hasaction = 1;
+ $output{$symb}{'hasaction'} = $hasaction;
}
}
+ my $class = 'LC_slottext_'.$mapnum;
if ($hasaction) {
- $result .= '<td valgn="middle">'.$msg.'</td>'.
- '<td valign="middle">'.(' ' x6);
+ $output{$symb}{'data'} = '<td valign="top"><span class="'.$class.'">'.$msg.'</span></td>'.
+ '<td valign="top">'.
+ &slot_chooser($symb,$class,$reservable,$allavailable,$slots,
+ $consumed_uniqueperiods).'</td>';
} else {
- $result .= '<td colspan="2" valign="middle">'.$msg.'</td>';
- }
- $r->print($result);
- if ($hasaction) {
- my $formname = 'manageres_'.$reservable;
- &show_choices($r,$symb,$formname);
- $r->print('</td>');
+ $output{$symb}{'data'} = '<td colspan="2" valign="middle">'.
+ '<span class="'.$class.'">'.$msg.'</span>'.
+ '</td>';
}
- $r->print('</tr>');
}
}
}
+ if ($shownheader) {
+ $r->print('</table>');
+ }
if (!$reservable) {
- $r->print('<span class="LC_info">'.&mt('No course items currently require a reservation to gain access.').'</span>');
+ $r->print('<span class="LC_info">');
+ if ($crstype eq 'Community') {
+ $r->print(&mt('No community items currently require a reservation to gain access.'));
+ } else {
+ $r->print(&mt('No course items currently require a reservation to gain access.'));
+ }
+ $r->print('</span>');
}
- $r->print('</table>'.
- '<p><a href="/adm/slotrequest?command=showresv">'.
+ $r->print('<p><a href="/adm/slotrequest?command=showresv">'.
&mt('Reservation History').'</a></p>');
}
sub show_map_row {
my ($depth,$location,$type,$title,$maprows) = @_;
- my $output = '<td>';
- for (my $i=0; $i<$depth-1; $i++) {
- $output .= '<img src="'.$location.'" alt="" />';
+ my $spacers;
+ for (my $i=0; $i<$depth-2; $i++) {
+ $spacers .= '<img src="'.$location.'" alt="" />';
}
+ my $icon;
if ($type eq 'page') {
- $output .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" /> '."\n";
+ $icon = '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" /> '."\n";
} else {
- $output .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" /> '."\n";
+ $icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" /> '."\n";
}
- $output .= $title.'</td><td colspan="2"> </td>'."\n";
- unshift (@{$maprows},$output);
+ $icon .= $title;
+ unshift (@{$maprows},[$spacers,$icon]);
return;
}
+sub slot_chooser {
+ my ($symb,$class,$formnum,$allavailable,$slots,$consumed_uniqueperiods) = @_;
+ my $output;
+ my @got_slots=&check_for_reservation($symb,'allslots');
+ if ($got_slots[0] =~ /^error: /) {
+ $output = '<span class="'.$class.'"><span class="LC_error">'.
+ &mt('An error occurred determining slot availability.').
+ '</span></span>';
+ } else {
+ my $formname = 'manageres_'.$formnum;
+ if (ref($allavailable) eq 'ARRAY') {
+ my @available;
+ if (ref($slots) eq 'HASH') {
+ foreach my $slot (@{$allavailable}) {
+ # not allowed for this resource
+ if (ref($slots->{$slot}) eq 'HASH') {
+ if ($slots->{$slot}->{'symb'} ne '') {
+ my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb);
+ my $exclude = 1;
+ my @reqsymbs = split(/\s*,\s*/,$slots->{$slot}->{'symb'});
+ if (@reqsymbs) {
+ if (grep(/^\Q$symb\E$/,@reqsymbs)) {
+ $exclude = 0;
+ } else {
+ foreach my $reqsymb (@reqsymbs) {
+ my (undef,undef,$sloturl) = &Apache::lonnet::decode_symb($reqsymb);
+ if ($sloturl=~/\.(page|sequence)$/) {
+ if (($map ne '') && ($map eq $sloturl)) {
+ $exclude = 0;
+ last;
+ }
+ }
+ }
+ }
+ next if ($exclude);
+ }
+ }
+ }
+ push(@available,$slot);
+ }
+ }
+ $output .= &show_choices($symb,$formname,$formnum,$class,
+ $slots,$consumed_uniqueperiods,
+ \@available,\@got_slots);
+ }
+ }
+ return $output;
+}
+
sub show_reservations {
my ($r,$uname,$udom) = @_;
if (!defined($uname)) {
@@ -1620,12 +2249,21 @@ sub show_reservations {
my $formname = 'slotlog';
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $crstype = &Apache::loncommon::course_type();
my %log=&Apache::lonnet::dump('nohist_'.$cdom.'_'.$cnum.'_slotlog',$udom,$uname);
if ($env{'form.origin'} eq 'aboutme') {
- $r->print('<div class="LC_fontsize_large">'.
- &mt('History of student-reservable slots for: [_1]',
- &Apache::loncommon::plainname($env{'form.uname'},$env{'form.udom'},
- 'firstname')).'</div>');
+ $r->print('<div class="LC_fontsize_large">');
+ my $name = &Apache::loncommon::plainname($env{'form.uname'},$env{'form.udom'},
+ 'firstname');
+ if ($crstype eq 'Community') {
+ $r->print(&mt('History of member-reservable slots for: [_1]',
+ $name));
+ } else {
+ $r->print(&mt('History of student-reservable slots for: [_1]',
+ $name));
+
+ }
+ $r->print('</div>');
}
$r->print('<form action="/adm/slotrequest" method="post" name="'.$formname.'">');
# set defaults
@@ -1674,7 +2312,7 @@ sub show_reservations {
}
}
my (%titles,%maptitles);
- my %lt = &reservationlog_contexts();
+ my %lt = &reservationlog_contexts($crstype);
foreach my $id (sort { $log{$b}{'exe_time'}<=>$log{$a}{'exe_time'} } (keys(%log))) {
next if (($log{$id}{'exe_time'} < $curr{'log_start_date'}) ||
($log{$id}{'exe_time'} > $curr{'log_end_date'}));
@@ -1721,6 +2359,7 @@ sub show_reservations {
$r->print('</tr></table>');
$r->print(<<"ENDSCRIPT");
<script type="text/javascript">
+// <![CDATA[
function chgPage(caller) {
if (caller == 'previous') {
document.$formname.page.value --;
@@ -1731,12 +2370,13 @@ function chgPage(caller) {
document.$formname.submit();
return;
}
+// ]]>
</script>
ENDSCRIPT
}
} else {
$r->print('<span class="LC_info">'
- .&mt('There are no transactions to display')
+ .&mt('There are no transactions to display.')
.'</span>'
);
}
@@ -1754,6 +2394,7 @@ ENDSCRIPT
sub show_reservations_log {
my ($r) = @_;
my $badslot;
+ my $crstype = &Apache::loncommon::course_type();
if ($env{'form.slotname'} eq '') {
$r->print('<div class="LC_warning">'.&mt('No slot name provided').'</div>');
$badslot = 1;
@@ -1764,7 +2405,13 @@ sub show_reservations_log {
$badslot = 1;
} elsif ($slot{type} ne 'schedulable_student') {
my $description = &get_description($env{'form.slotname'},\%slot);
- $r->print('<div class="LC_warning">'.&mt('Reservation history unavailable for non-student-reservable slot: [_1].',$description).'</div>');
+ $r->print('<div class="LC_warning">');
+ if ($crstype eq 'Community') {
+ $r->print(&mt('Reservation history unavailable for non-member-reservable slot: [_1].',$description));
+ } else {
+ $r->print(&mt('Reservation history unavailable for non-student-reservable slot: [_1].',$description));
+ }
+ $r->print('</div>');
$badslot = 1;
}
}
@@ -1835,9 +2482,13 @@ sub show_reservations_log {
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
my $description = $slot{'description'};
- $r->print('<span class="LC_fontsize_large">'.
- &mt('Reservation changes for student-reservable slot: [_1]',$description).'</span><br />');
-
+ $r->print('<span class="LC_fontsize_large">');
+ if ($crstype eq 'Community') {
+ $r->print(&mt('Reservation changes for member-reservable slot: [_1]',$description));
+ } else {
+ $r->print(&mt('Reservation changes for student-reservable slot: [_1]',$description));
+ }
+ $r->print('</span><br />');
$r->print(&display_filter($formname,$cdom,$cnum,\%curr,$version,\@allsymbs));
my $showntablehdr = 0;
my $tablehdr = &Apache::loncommon::start_data_table().
@@ -1855,7 +2506,7 @@ sub show_reservations_log {
$minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
}
}
- my %lt = &reservationlog_contexts();
+ my %lt = &reservationlog_contexts($crstype);
my (%titles,%maptitles);
foreach my $id (sort { $log{$b}{'exe_time'}<=>$log{$a}{'exe_time'} } (keys(%log))) {
next if (($log{$id}{'exe_time'} < $curr{'log_start_date'}) ||
@@ -1933,7 +2584,7 @@ function chgPage(caller) {
ENDSCRIPT
}
} else {
- $r->print(&mt('There are no records to display'));
+ $r->print(&mt('There are no records to display.'));
}
$r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
'<input type="hidden" name="slotname" value="'.$env{'form.slotname'}.'" />'.
@@ -1957,7 +2608,7 @@ sub get_resource_title {
$maptitle = $maptitles->{$mapurl};
} else {
if ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) {
- $maptitle=&mt('Main Course Documents');
+ $maptitle=&mt('Main Content');
} else {
$maptitle=&Apache::lonnet::gettitle($mapurl);
}
@@ -1975,6 +2626,7 @@ sub get_resource_title {
}
sub reservationlog_contexts {
+ my ($crstype) = @_;
my %lt = &Apache::lonlocal::texthash (
any => 'Any',
user => 'By student',
@@ -1984,6 +2636,10 @@ sub reservationlog_contexts {
release => 'Dropped reservation',
usermanage => 'By student',
);
+ if ($crstype eq 'Community') {
+ $lt{'user'} = &mt('By member');
+ $lt{'usermanage'} = $lt{'user'};
+ }
return %lt;
}
@@ -2004,7 +2660,8 @@ sub display_filter {
&Apache::lonhtmlcommon::date_setter($formname,'log_end_date',
$curr->{'log_end_date'},undef,
undef,undef,undef,undef,undef,undef,$nolink);
- my %lt = &reservationlog_contexts();
+ my $crstype = &Apache::loncommon::course_type();
+ my %lt = &reservationlog_contexts($crstype);
$output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:').
'</b><br /><table><tr><td>'.&mt('After:').
'</td><td>'.$startform.'</td></tr><tr><td>'.&mt('Before:').'</td><td>'.
@@ -2052,36 +2709,77 @@ sub display_filter {
}
$output .= '<td> </td><td valign="middle"><input type="submit" value="'.
&mt('Update Display').'" /></tr></table>'.
- '<span class="LC_roleslog_note">'.
- &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.8.99.0 or later are displayed.');
+ '<p class="LC_info">'.
+ &mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
+ ,'2.9.0');
if ($version) {
- $output .= ' '.&mt('This server is version [_3].','<b>','</b>',$version);
+ $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
}
- $output .= '</span><hr /><br />';
+ $output .= '</p><hr /><br />';
return $output;
}
+sub slot_change_messaging {
+ my ($setting,$subject,$msg,$action) = @_;
+ my $user = $env{'user.name'};
+ my $domain = $env{'user.domain'};
+ my ($message_status,$comment_status);
+ if ($setting eq 'only_student'
+ || $setting eq 'student_and_user_notes_screen') {
+ $message_status =
+ &Apache::lonmsg::user_normal_msg($user,$domain,$subject,$msg);
+ $message_status = '<li>'.&mt('Sent to you: [_1]',
+ $message_status).' </li>';
+ }
+ if ($setting eq 'student_and_user_notes_screen') {
+ $comment_status =
+ &Apache::lonmsg::store_instructor_comment($subject.'<br />'.
+ $msg,$user,$domain);
+ $comment_status = '<li>'.&mt('Entry added to course record (viewable by instructor): [_1]',
+ $comment_status).'</li>';
+ }
+ if ($message_status || $comment_status) {
+ my $msgtitle;
+ if ($action eq 'reserve') {
+ $msgtitle = &mt('Status of messages about saved reservation');
+ } elsif ($action eq 'release') {
+ $msgtitle = &mt('Status of messages about dropped reservation');
+ } elsif ($action eq 'nochange') {
+ $msgtitle = &mt('Status of messages about unchanged existing reservation');
+ }
+ return '<span class="LC_info">'.$msgtitle.'</span>'
+ .'<ul>'
+ .$message_status
+ .$comment_status
+ .'</ul><hr />';
+ }
+}
+
sub upload_start {
my ($r)=@_;
- $r->print(&Apache::grades::checkforfile_js());
- my $result.='<table width="100%" border="0"><tr bgcolor="#E6FFFF"><td>'."\n";
- $result.=' <b>'.
- &mt('Specify a file containing the slot definitions.').
- '</b></td></tr>'."\n";
- $result.='<tr bgcolor="#ffffe6"><td>'."\n";
- my $upfile_select=&Apache::loncommon::upfile_select_html();
- my $ignore=&mt('Ignore First Line');
- $result.=<<ENDUPFORM;
-<form method="post" enctype="multipart/form-data" action="/adm/slotrequest" name="slotupload">
-<input type="hidden" name="command" value="csvuploadmap" />
-$upfile_select
-<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Data" />
-<label><input type="checkbox" name="noFirstLine" />$ignore</label>
-</form>
-ENDUPFORM
- $result.='</td></tr></table>'."\n";
- $result.='</td></tr></table>'."\n";
- $r->print($result);
+ $r->print(
+ &Apache::grades::checkforfile_js()
+ .'<h2>'.&mt('Upload a file containing the slot definitions').'</h2>'
+ .'<form method="post" enctype="multipart/form-data"'
+ .' action="/adm/slotrequest" name="slotupload">'
+ .'<input type="hidden" name="command" value="csvuploadmap" />'
+ .&Apache::lonhtmlcommon::start_pick_box()
+ .&Apache::lonhtmlcommon::row_title(&mt('File'))
+ .&Apache::loncommon::upfile_select_html()
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title(
+ '<label for="noFirstLine">'
+ .&mt('Ignore First Line')
+ .'</label>')
+ .'<input type="checkbox" name="noFirstLine" id="noFirstLine" />'
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ .'<p>'
+ .'<input type="button" onclick="javascript:checkUpload(this.form);"'
+ .' value="'.&mt('Next').'" />'
+ .'</p>'
+ .'</form>'
+ );
}
sub csvuploadmap_header {
@@ -2095,16 +2793,40 @@ sub csvuploadmap_header {
my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
my $ignore=&mt('Ignore First Line');
- my $help_field = &Apache::loncommon::help_open_topic('Slot SelectingField');
+ my $buttontext = &mt('Reverse Association');
+
+ $r->print(
+ '<form method="post" enctype="multipart/form-data" action="/adm/slotrequest" name="slotupload">'
+ .'<h2>'.&mt('Identify fields in uploaded list').'</h2>'
+ .'<div class="LC_columnSection">'
+ .&Apache::loncommon::help_open_topic(
+ 'Slot About',&mt('Help on slots'))
+ .' '.&Apache::loncommon::help_open_topic(
+ 'Slot SelectingField',&mt('Help on selecting Fields'))
+ ."</div>\n"
+ .'<p class="LC_info">'
+ .&mt('Total number of records found in file: [_1]','<b>'.$distotal.'</b>')
+ ."</p>\n"
+ );
+ if ($distotal == 0) {
+ $r->print('<p class="LC_warning">'.&mt('None found').'</p>');
+ }
+ $r->print(
+ '<p>'
+ .&mt('Enter as many fields as you can.').'<br />'
+ .&mt('The system will inform you and bring you back to this page,[_1]if the data selected is insufficient to create the slots.','<br />')
+ .'</p>'
+ );
+ $r->print(
+ '<div class="LC_left_float">'
+ .'<fieldset><legend>'.&mt('Functions').'</legend>'
+ .'<label><input type="checkbox" name="noFirstLine"'.$checked.' />'.$ignore.'</label>'
+ .' <input type="button" value="'.$buttontext
+ .'" onclick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />'
+ .'</fieldset></div><br clear="all" />'
+ );
$r->print(<<ENDPICK);
-<form method="post" enctype="multipart/form-data" action="/adm/slotrequest" name="slotupload">
-<h3>Identify fields $help_field</h3>
-Total number of records found in file: $distotal <hr />
-Enter as many fields as you can. The system will inform you and bring you back
-to this page if the data selected is insufficient to create the slots.<hr />
-<input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
-<label><input type="checkbox" name="noFirstLine"$checked />$ignore</label>
<input type="hidden" name="associate" value="" />
<input type="hidden" name="datatoken" value="$datatoken" />
<input type="hidden" name="fileupload" value="$env{'form.fileupload'}" />
@@ -2112,9 +2834,10 @@ to this page if the data selected is ins
<input type="hidden" name="upfile_associate"
value="$env{'form.upfile_associate'}" />
<input type="hidden" name="command" value="csvuploadassign" />
-<hr />
<script type="text/javascript" language="Javascript">
+// <![CDATA[
$javascript
+// ]]>
</script>
ENDPICK
return '';
@@ -2125,16 +2848,15 @@ sub csvuploadmap_footer {
my ($request,$i,$keyfields) =@_;
my $buttontext = &mt('Create Slots');
$request->print(<<ENDPICK);
-</table>
<input type="hidden" name="nfields" value="$i" />
<input type="hidden" name="keyfields" value="$keyfields" />
-<input type="button" onClick="javascript:verify(this.form)" value="$buttontext" /><br />
+<input type="button" onclick="javascript:verify(this.form)" value="$buttontext" /><br />
</form>
ENDPICK
}
sub csvupload_javascript_reverse_associate {
- my $error1=&mt('You need to specify the name, starttime, endtime and a type');
+ my $error1=&mt('You need to specify the name, start time, end time and a type.');
return(<<ENDPICK);
function verify(vf) {
var foundstart=0;
@@ -2160,7 +2882,7 @@ ENDPICK
}
sub csvupload_javascript_forward_associate {
- my $error1=&mt('You need to specify the name, starttime, endtime and a type');
+ my $error1=&mt('You need to specify the name, start time, end time and a type.');
return(<<ENDPICK);
function verify(vf) {
var foundstart=0;
@@ -2227,11 +2949,13 @@ sub csvupload_fields {
['starttime','Start Time of slot'],
['endtime','End Time of slot'],
['startreserve','Reservation Start Time'],
+ ['endreserve','Reservation End Time'],
+ ['reservationmsg','Message when reservation changed'],
['ip','IP or DNS restriction'],
['proctor','List of proctor ids'],
['description','Slot Description'],
['maxspace','Maximum number of reservations'],
- ['symb','Resource Restriction'],
+ ['symb','Resource(s)/Map(s) Restriction'],
['uniqueperiod','Date range of slot exclusion'],
['secret','Secret word proctor uses to validate'],
['allowedsections','Sections slot is restricted to'],
@@ -2308,13 +3032,67 @@ sub csv_upload_assign {
next;
}
+ if ($entries{$fields{'endreserve'}}) {
+ $slot{'endreserve'}=
+ &UnixDate($entries{$fields{'endreserve'}},"%s");
+ }
+ if (defined($slot{'endreserve'})
+ && $slot{'endreserve'} > $slot{'starttime'}) {
+ push(@errors,"$name not created -- Slot's reservation end time is after the slot's start time.");
+ next;
+ }
+
+ if ($slot{'type'} eq 'schedulable_student') {
+ if ($entries{$fields{'reservationmsg'}}) {
+ if (($entries{$fields{'reservationmsg'}} eq 'only_student') ||
+ ($entries{$fields{'reservationmsg'}} eq 'student_and_user_notes_screen')) {
+ $slot{'reservationmsg'}=$entries{$fields{'reservationmsg'}};
+ } else {
+ unless (($entries{$fields{'reservationmsg'}} eq 'none') ||
+ ($entries{$fields{'reservationmsg'}} eq '')) {
+ push(@errors,"$name -- Slot's reservationmsg setting ignored - not one of: 'only_student', 'student_and_user_notes_screen', 'none' or ''");
+ }
+ }
+ }
+ }
+
foreach my $key ('ip','proctor','description','maxspace',
'secret','symb') {
if ($entries{$fields{$key}}) {
$slot{$key}=$entries{$fields{$key}};
}
}
-
+ if ($entries{$fields{'allowedusers'}}) {
+ $entries{$fields{'allowedusers'}} =~ s/^\s+//;
+ $entries{$fields{'allowedusers'}} =~ s/\s+$//;
+ my @allowedusers;
+ foreach my $poss (split(/\s*,\s*/,$entries{$fields{'allowedusers'}})) {
+ my ($possuname,$possudom) = split(/:/,$poss);
+ if (($possuname =~ /^$match_username$/) && ($possudom =~ /^$match_domain$/)) {
+ unless (grep(/^\Q$poss\E$/,@allowedusers)) {
+ push(@allowedusers,$poss);
+ }
+ }
+ }
+ if (@allowedusers > 0) {
+ $slot{'allowedusers'} = join(',',@allowedusers);
+ }
+ }
+ if ($entries{$fields{'allowedsections'}}) {
+ $entries{$fields{'allowedsections'}} =~ s/^\s+//;
+ $entries{$fields{'allowedsections'}} =~ s/\s+$//;
+ my @allowedsections;
+ foreach my $poss (split(/\s*,\s*/,$entries{$fields{'allowedsections'}})) {
+ if (($poss !~ /\W/) && ($poss ne 'none')) {
+ unless (grep(/^\Q$poss\E$/,@allowedsections)) {
+ push(@allowedsections,$poss);
+ }
+ }
+ }
+ if (@allowedsections > 0) {
+ $slot{'allowedsections'} = join(',',@allowedsections);
+ }
+ }
if ($entries{$fields{'uniqueperiod'}}) {
my ($start,$end)=split(',',$entries{$fields{'uniqueperiod'}});
my @times=(&UnixDate($start,"%s"),
@@ -2332,6 +3110,9 @@ sub csv_upload_assign {
$r->rflush();
$countdone++;
}
+ if ($countdone) {
+ &Apache::lonnet::devalidate_slots_cache($cname,$cdom);
+ }
$r->print('<p>'.&mt('Created [quant,_1,slot]',$countdone)."\n".'</p>');
foreach my $error (@errors) {
$r->print('<p><span class="LC_warning">'.$error.'</span></p>'."\n");
@@ -2357,6 +3138,15 @@ sub slot_command_titles {
return %titles;
}
+sub slot_reservationmsg_options {
+ my %options = &Apache::lonlocal::texthash (
+ only_student => 'Sent to student',
+ student_and_user_notes_screen => 'Sent to student and added to user notes',
+ none => 'None sent and no record in user notes',
+ );
+ return %options;
+}
+
sub handler {
my $r=shift;
@@ -2374,6 +3164,7 @@ sub handler {
my $vgr=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
my $mgr=&Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+ my (%slots,$consumed_uniqueperiods);
if ($env{'form.command'} eq 'showslots') {
if (($vgr ne 'F') && ($mgr ne 'F')) {
$env{'form.command'} = 'manageresv';
@@ -2394,9 +3185,14 @@ sub handler {
if (ref($brcrum) eq 'ARRAY') {
push(@{$brcrum},{href=>"/adm/slotrequest?command=showresv",text=>$title});
}
- } elsif ($env{'form.command'} eq 'manageresv') {
- $title = 'Manage Reservations';
- $brcrum =[{href=>"/adm/slotrequest?command=manageresv",text=>$title}];
+ } elsif (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) {
+ if ($env{'form.command'} eq 'manageresv') {
+ $title = 'Manage Reservations';
+ $brcrum =[{href=>"/adm/slotrequest?command=manageresv",text=>$title}];
+ }
+ my ($cnum,$cdom)=&get_course();
+ %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
+ $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots);
} elsif ($vgr eq 'F') {
if ($env{'form.command'} =~ /^(slotlog|showslots|uploadstart|csvuploadmap|csvuploadassign|delete|release|remove_registration)$/) {
$brcrum =[{href=>"/adm/slotrequest?command=showslots",
@@ -2416,14 +3212,27 @@ sub handler {
if (ref($brcrum) eq 'ARRAY') {
push(@{$brcrum},{href=>"/adm/slotrequest?command=$env{'form.command'}",text=>$crumb_titles{$env{'form.command'}}});
}
-
}
+ } else {
+ $brcrum =[];
}
- &start_page($r,$title,$brcrum);
+ my ($symb,$js,$available,$allavailable,$got_slots);
+ $available = [];
+ if ($env{'form.requestattempt'}) {
+ $symb=&unescape($env{'form.symb'});
+ @{$got_slots}=&check_for_reservation($symb,'allslots');
+ }
+ if (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) {
+ $js = &reservation_js(\%slots,$consumed_uniqueperiods,$available,$got_slots,$symb);
+ }
+ &start_page($r,$title,$brcrum,$js);
if ($env{'form.command'} eq 'manageresv') {
+ $allavailable = $available;
+ undef($available);
+ undef($got_slots);
my $crstype = &Apache::loncommon::course_type();
- &manage_reservations($r,$crstype);
+ &manage_reservations($r,$crstype,\%slots,$consumed_uniqueperiods,$allavailable);
} elsif ($env{'form.command'} eq 'showresv') {
&show_reservations($r,$env{'form.uname'},$env{'form.udom'});
} elsif ($env{'form.command'} eq 'showslots' && $vgr eq 'F') {
@@ -2480,13 +3289,34 @@ sub handler {
return OK;
}
if ($env{'form.requestattempt'}) {
- &show_choices($r,$symb);
+ $r->print('<div class="LC_left_float">');
+ $r->print(&show_choices($symb,undef,undef,undef,\%slots,$consumed_uniqueperiods,$available,$got_slots));
+ $r->print('</div><div style="padding:0;clear:both;margin:0;border:0"></div>');
} elsif ($env{'form.command'} eq 'release') {
&release_slot($r,$symb);
} elsif ($env{'form.command'} eq 'get') {
&get_slot($r,$symb);
} elsif ($env{'form.command'} eq 'change') {
- if (&get_slot($r,$symb,$env{'form.releaseslot'},1)) {
+ if ($env{'form.nochange'}) {
+ my $slot_name = $env{'form.releaseslot'};
+ my @slots = &check_for_reservation($symb,'allslots');
+ my $msg;
+ if (($slot_name ne '') && (grep(/^\Q$slot_name\E/,@slots))) {
+ my %slot=&Apache::lonnet::get_slot($env{'form.releaseslot'});
+ my $description=&get_description($slot_name,\%slot);
+ $msg = '<span style="font-weight: bold;">'.
+ &mt('Unchanged reservation: [_1]',$description).'</span><br /><br />';
+ my $person =
+ &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+ my $subject = &mt('Reservation unchanged: [_1]',$description);
+ my $msgbody = &mt('No change to existing registration by [_1] for [_2].',$person,$description);
+ $msg .= &slot_change_messaging($slot{'reservationmsg'},$subject,$msgbody,'nochange');
+ } else {
+ $msg = '<span class="LC_warning">'.&mt('Reservation no longer reported as available.').'</span>';
+ }
+ $r->print($msg);
+ &return_link($r);
+ } elsif (&get_slot($r,$symb,$env{'form.releaseslot'},1)) {
&release_slot($r,$symb,$env{'form.releaseslot'});
}
} else {