version 1.86, 2009/01/23 21:34:47
|
version 1.122, 2015/05/10 03:58:12
|
Line 56 sub fail {
|
Line 56 sub fail {
|
} |
} |
|
|
sub start_page { |
sub start_page { |
my ($r,$title)=@_; |
my ($r,$title,$brcrum,$js)=@_; |
$r->print(&Apache::loncommon::start_page($title)); |
my $args; |
|
if (ref($brcrum) eq 'ARRAY') { |
|
$args = {bread_crumbs => $brcrum}; |
|
} |
|
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 { |
sub end_page { |
Line 65 sub end_page {
|
Line 79 sub end_page {
|
$r->print(&Apache::loncommon::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 enddate = endm+"/"+endd+"/"+endy; |
|
var endtime = new Date(enddate).getTime(); |
|
endtime = endtime/1000; |
|
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 { |
|
sloctpicks = getElementsByClassName(document.body,'LC_slotpick_radio'); |
|
} |
|
if (slotpicks.length) { |
|
for (var i=0; i<slotpicks.length; i++) { |
|
slotpicks[i].checked = false; |
|
} |
|
} |
|
} |
|
// ]]> |
|
</script> |
|
ENDSCRIPT |
|
|
|
} |
|
|
|
|
=pod |
=pod |
|
|
slot_reservations db |
slot_reservations db |
Line 117 sub check_for_reservation {
|
Line 304 sub check_for_reservation {
|
my ($symb,$mode)=@_; |
my ($symb,$mode)=@_; |
my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb, |
my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb, |
$env{'user.domain'}, $env{'user.name'}); |
$env{'user.domain'}, $env{'user.name'}); |
|
|
my $course = &Apache::lonnet::EXT("resource.0.available", $symb, |
my $course = &Apache::lonnet::EXT("resource.0.available", $symb, |
$env{'user.domain'}, $env{'user.name'}); |
$env{'user.domain'}, $env{'user.name'}); |
my @slots = (split(/:/,$student), split(/:/, $course)); |
my @slots = (split(/:/,$student), split(/:/, $course)); |
Line 133 sub check_for_reservation {
|
Line 319 sub check_for_reservation {
|
return 'error: Unable to determine current status'; |
return 'error: Unable to determine current status'; |
} |
} |
my @got; |
my @got; |
foreach my $slot_name (sort { |
my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots,'starttime'); |
if (ref($slots{$a}) && ref($slots{$b})) { |
foreach my $slot_name (@sorted_slots) { |
return $slots{$a}{'starttime'} <=> $slots{$b}{'starttime'} |
|
} |
|
if (ref($slots{$a})) { return -1;} |
|
if (ref($slots{$b})) { return 1;} |
|
return 0; |
|
} @slots) { |
|
next if (!defined($slots{$slot_name}) || |
next if (!defined($slots{$slot_name}) || |
!ref($slots{$slot_name})); |
!ref($slots{$slot_name})); |
&Apache::lonxml::debug(time." $slot_name ". |
&Apache::lonxml::debug(time." $slot_name ". |
$slots{$slot_name}->{'starttime'}." -- ". |
$slots{$slot_name}->{'starttime'}." -- ". |
$slots{$slot_name}->{'startreserve'}); |
$slots{$slot_name}->{'startreserve'}." -- ". |
if ($slots{$slot_name}->{'endtime'} > time && |
$slots{$slot_name}->{'endreserve'}); |
$slots{$slot_name}->{'startreserve'} < time) { |
if (($slots{$slot_name}->{'endtime'} > time) && |
# between start of reservation times and end of slot |
($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') { |
if ($mode eq 'allslots') { |
push(@got,$slot_name); |
push(@got,$slot_name); |
} else { |
} else { |
Line 216 sub check_for_conflict {
|
Line 400 sub check_for_conflict {
|
if (!defined($new_slot->{'uniqueperiod'})) { return undef; } |
if (!defined($new_slot->{'uniqueperiod'})) { return undef; } |
|
|
if (!ref($consumed_uniqueperiods)) { |
if (!ref($consumed_uniqueperiods)) { |
$consumed_uniqueperiods = &get_consumed_uniqueperiods($slots); |
if ($consumed_uniqueperiods =~ /^error: /) { |
if (ref($consumed_uniqueperiods) eq 'HASH') { |
return $consumed_uniqueperiods; |
if (&Apache::lonnet::error(%$consumed_uniqueperiods)) { |
|
return 'error: Unable to determine current status'; |
|
} |
|
} else { |
} 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'}}; |
my ($new_uniq_start,$new_uniq_end) = @{$new_slot->{'uniqueperiod'}}; |
foreach my $slot_name (keys(%$consumed_uniqueperiods)) { |
foreach my $slot_name (keys(%$consumed_uniqueperiods)) { |
my ($start,$end)=@{$consumed_uniqueperiods->{$slot_name}}; |
my ($start,$end)=@{$consumed_uniqueperiods->{$slot_name}}; |
Line 239 sub check_for_conflict {
|
Line 426 sub check_for_conflict {
|
} |
} |
|
|
sub make_reservation { |
sub make_reservation { |
my ($slot_name,$slot,$symb)=@_; |
my ($slot_name,$slot,$symb,$cnum,$cdom)=@_; |
|
|
my ($cnum,$cdom)=&get_course(); |
|
|
|
my $value=&Apache::lonnet::EXT("resource.0.availablestudent",$symb, |
my $value=&Apache::lonnet::EXT("resource.0.availablestudent",$symb, |
$env{'user.domain'},$env{'user.name'}); |
$env{'user.domain'},$env{'user.name'}); |
Line 315 sub make_reservation {
|
Line 500 sub make_reservation {
|
if ($value) { |
if ($value) { |
$new_value=$value.':'.$new_value; |
$new_value=$value.':'.$new_value; |
} |
} |
my $result=&Apache::lonparmset::storeparm_by_symb($symb, |
&store_slot_parm($symb,$slot_name,$parm_level,$new_value,$cnum,$cdom); |
'0_availablestudent', |
|
$parm_level, $new_value, |
|
'string', |
|
$env{'user.name'}, |
|
$env{'user.domain'}); |
|
&Apache::lonxml::debug("hrrm $result"); |
|
return $wanted; |
return $wanted; |
} |
} |
|
|
Line 329 sub make_reservation {
|
Line 508 sub make_reservation {
|
return undef; |
return undef; |
} |
} |
|
|
|
sub store_slot_parm { |
|
my ($symb,$slot_name,$parm_level,$new_value,$cnum,$cdom) = @_; |
|
my $result=&Apache::lonparmset::storeparm_by_symb($symb, |
|
'0_availablestudent', |
|
$parm_level, $new_value, |
|
'string', |
|
$env{'user.name'}, |
|
$env{'user.domain'}); |
|
&Apache::lonxml::debug("hrrm $result"); |
|
my %storehash = ( |
|
symb => $symb, |
|
slot => $slot_name, |
|
action => 'reserve', |
|
context => $env{'form.context'}, |
|
); |
|
|
|
&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; |
|
} |
|
|
sub remove_registration { |
sub remove_registration { |
my ($r) = @_; |
my ($r) = @_; |
if ($env{'form.entry'} ne 'remove all') { |
if ($env{'form.entry'} ne 'remove all') { |
Line 345 sub remove_registration {
|
Line 550 sub remove_registration {
|
return; |
return; |
} |
} |
if (!%consumed) { |
if (!%consumed) { |
$r->print("<p>".&mt('Slot <tt>[_1]</tt> has no reservations.', |
$r->print('<p>'.&mt('Slot [_1] has no reservations.', |
$slot_name)."</p>"); |
'<tt>'.$slot_name.'</tt>').'</p>'); |
return; |
return; |
} |
} |
|
|
Line 354 sub remove_registration {
|
Line 559 sub remove_registration {
|
my $names = join(' ',@names); |
my $names = join(' ',@names); |
|
|
my $msg = &mt('Remove all of [_1] from slot [_2]?',$names,$slot_name); |
my $msg = &mt('Remove all of [_1] from slot [_2]?',$names,$slot_name); |
&remove_registration_confirmation($r,$msg,['entry','slotname']); |
&remove_registration_confirmation($r,$msg,['entry','slotname','context']); |
} |
} |
|
|
sub remove_registration_user { |
sub remove_registration_user { |
Line 371 sub remove_registration_user {
|
Line 576 sub remove_registration_user {
|
$name,$slot_name,$title); |
$name,$slot_name,$title); |
|
|
&remove_registration_confirmation($r,$msg,['uname','udom','slotname', |
&remove_registration_confirmation($r,$msg,['uname','udom','slotname', |
'entry','symb']); |
'entry','symb','context']); |
} |
} |
|
|
sub remove_registration_confirmation { |
sub remove_registration_confirmation { |
Line 383 sub remove_registration_confirmation {
|
Line 588 sub remove_registration_confirmation {
|
'<input type="hidden" name="'.$parm.'" value="' |
'<input type="hidden" name="'.$parm.'" value="' |
.&HTML::Entities::encode($env{'form.'.$parm},'"<>&\'').'" />'."\n"; |
.&HTML::Entities::encode($env{'form.'.$parm},'"<>&\'').'" />'."\n"; |
} |
} |
my %lt = &Apache::lonlocal::texthash('yes' => 'Yes', |
my %lt = &Apache::lonlocal::texthash( |
'no' => 'No',); |
'yes' => 'Yes', |
|
'no' => 'No', |
|
); |
$r->print(<<"END_CONFIRM"); |
$r->print(<<"END_CONFIRM"); |
<p> $msg </p> |
<p> $msg </p> |
<form action="/adm/slotrequest" method="post"> |
<form action="/adm/slotrequest" method="post"> |
Line 510 sub release_reservation {
|
Line 717 sub release_reservation {
|
if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) { |
if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) { |
&Apache::lonnet::del('slot_reservations',[$entry], |
&Apache::lonnet::del('slot_reservations',[$entry], |
$cdom,$cnum); |
$cdom,$cnum); |
|
my %storehash = ( |
|
symb => $symb, |
|
slot => $slot_name, |
|
action => 'release', |
|
context => $env{'form.context'}, |
|
); |
|
&Apache::lonnet::write_log('slotreservationslog',\%storehash, |
|
1,$uname,$udom,$cnum,$cdom); |
|
&Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash, |
|
1,$uname,$udom,$uname,$udom); |
} |
} |
} |
} |
|
|
Line 530 sub release_reservation {
|
Line 747 sub release_reservation {
|
'0_availablestudent', |
'0_availablestudent', |
$parm_level, $new_param, |
$parm_level, $new_param, |
'string', $uname, $udom); |
'string', $uname, $udom); |
|
|
my $msg; |
my $msg; |
if ($mgr eq 'F') { |
if ($mgr eq 'F') { |
$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom"); |
$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom"); |
} else { |
} 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); |
return (1,$msg); |
} |
} |
Line 557 sub delete_slot {
|
Line 777 sub delete_slot {
|
my $ret = &Apache::lonnet::cput('slots', {$slot_name => \%slot}, |
my $ret = &Apache::lonnet::cput('slots', {$slot_name => \%slot}, |
$cdom, $cnum); |
$cdom, $cnum); |
if ($ret eq 'ok') { |
if ($ret eq 'ok') { |
$r->print("<p>Slot <tt>$slot_name</tt> marked as deleted.</p>"); |
$r->print('<p>'.&mt('Slot [_1] marked as deleted.','<tt>'.$slot_name.'</tt>').'</p>'); |
} else { |
} else { |
$r->print("<p><span class=\"LC_error\"> An error ($ret) occurse when attempting to delete Slot <tt>$slot_name</tt>.</span></p>"); |
$r->print('<p><span class="LC_error">'.&mt('An error occurred when attempting to delete slot: [_1]','<tt>'.$slot_name.'</tt>')." ($ret)</span></p>"); |
} |
} |
} else { |
} else { |
if (%consumed) { |
if (%consumed) { |
$r->print("<p>Slot <tt>$slot_name</tt> has active reservations.</p>"); |
$r->print('<p>'.&mt('Slot [_1] has active reservations.','<tt>'.$slot_name.'</tt>').'</p>'); |
} else { |
} else { |
$r->print("<p>Slot <tt>$slot_name</tt> does not exist.</p>"); |
$r->print('<p>'.&mt('Slot [_1] does not exist.','<tt>'.$slot_name.'</tt>').'</p>'); |
} |
} |
} |
} |
$r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
$r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
Line 575 sub delete_slot {
|
Line 795 sub delete_slot {
|
|
|
sub return_link { |
sub return_link { |
my ($r) = @_; |
my ($r) = @_; |
$r->print('<p><a href="/adm/flip?postdata=return:">'. |
if (($env{'form.command'} eq 'manageresv') || ($env{'form.context'} eq 'usermanage')) { |
&mt('Return to last resource').'</a></p>'); |
$r->print('<p><a href="/adm/slotrequest?command=manageresv">'. |
|
&mt('Return to reservations')); |
|
} else { |
|
$r->print('<p><a href="/adm/flip?postdata=return:">'. |
|
&mt('Return to last resource').'</a></p>'); |
|
} |
} |
} |
|
|
sub get_slot { |
sub get_slot { |
Line 597 sub get_slot {
|
Line 822 sub get_slot {
|
my $description1=&get_description($slot_name,\%slot); |
my $description1=&get_description($slot_name,\%slot); |
%slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
%slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
my $description2=&get_description($env{'form.slotname'},\%slot); |
my $description2=&get_description($env{'form.slotname'},\%slot); |
$r->print("<p>Already have a reservation: $description1</p>"); |
|
if ($slot_name ne $env{'form.slotname'}) { |
if ($slot_name ne $env{'form.slotname'}) { |
$r->print(<<STUFF); |
$r->print(<<STUFF); |
<form method="post" action="/adm/slotrequest"> |
<form method="post" action="/adm/slotrequest"> |
Line 606 sub get_slot {
|
Line 830 sub get_slot {
|
<input type="hidden" name="releaseslot" value="$slot_name" /> |
<input type="hidden" name="releaseslot" value="$slot_name" /> |
<input type="hidden" name="command" value="change" /> |
<input type="hidden" name="command" value="change" /> |
STUFF |
STUFF |
$r->print("<p>You can either "); |
$r->print('<p class="LC_error">'.&mt('Reservation currently unchanged').'</p>'); |
$r->print(<<STUFF); |
if ($slot_name ne '') { |
<input type="submit" name="change" value="Change" /> |
$r->print('<p>'.&mt('To complete the transaction you [_1]must confirm[_2] you want to [_3]process the change[_4] to [_5].' |
STUFF |
,'<b>','</b>','<i>','</i>','<b>'.$description2.'</b>') |
$r->print(' your reservation from <b>'.$description1.'</b> to <b>'. |
.'<br />' |
$description2. |
.&mt('Or you can choose to [_1]make no change[_2] and continue[_2] with the reservation you already had: [_3].' |
'</b> <br />or </p>'); |
,'<i>','</i>','<b>'.$description1.'</b>') |
&return_link($r); |
.'</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); |
$r->print(<<STUFF); |
</form> |
</form> |
STUFF |
STUFF |
} else { |
} else { |
|
$r->print('<p>'.&mt('Already have a reservation: [_1].',$description1).'</p>'); |
&return_link($r); |
&return_link($r); |
} |
} |
return 0; |
return 0; |
} |
} |
|
|
|
my ($cnum,$cdom)=&get_course(); |
my $reserved=&make_reservation($env{'form.slotname'}, |
my $reserved=&make_reservation($env{'form.slotname'}, |
\%slot,$symb); |
\%slot,$symb,$cnum,$cdom); |
my $description=&get_description($env{'form.slotname'},\%slot); |
my $description=&get_description($env{'form.slotname'},\%slot); |
if (defined($reserved)) { |
if (defined($reserved)) { |
my $retvalue = 0; |
my $retvalue = 0; |
Line 633 STUFF
|
Line 864 STUFF
|
.&mt('An error occurred while attempting to make a reservation. ([_1])',$1) |
.&mt('An error occurred while attempting to make a reservation. ([_1])',$1) |
.'</span></p>'); |
.'</span></p>'); |
} elsif ($reserved > -1) { |
} elsif ($reserved > -1) { |
$r->print("<p>Success: $description</p>"); |
$r->print('<p style="font-weight: bold;">'.&mt('Successfully signed up: [_1]',$description).'</p>'); |
$retvalue = 1; |
$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) { |
} elsif ($reserved < 0) { |
$r->print("<p>Already reserved: $description</p>"); |
$r->print('<p>'.&mt('Already reserved: [_1]',$description).'</p>'); |
} |
} |
if (!$inhibit_return_link) { &return_link($r); } |
if (!$inhibit_return_link) { &return_link($r); } |
return 1; |
return 1; |
} |
} |
|
|
my %lt=('request'=>"Availibility list", |
my %lt = &Apache::lonlocal::texthash( |
'try' =>'Try again'); |
'request' => 'Availability list', |
%lt=&Apache::lonlocal::texthash(%lt); |
'try' => 'Try again?', |
|
'or' => 'or', |
|
); |
|
|
my $extra_input; |
my $extra_input; |
if ($conflictable_slot) { |
if ($conflictable_slot) { |
$extra_input='<input type="hidden" name="releaseslot" value="'.$env{'form.slotname'}.'" />'; |
$extra_input='<input type="hidden" name="releaseslot" value="'.$env{'form.slotname'}.'" />'; |
} |
} |
|
|
|
$r->print('<p>'.&mt('[_1]Failed[_2] to reserve a slot for [_3].','<span class="LC_warning">','</span>',$description).'</p>'); |
$r->print(<<STUFF); |
$r->print(<<STUFF); |
<p> <span class="LC_warning">Failed</span> to reserve a spot for $description. </p> |
|
<p> |
<p> |
<form method="post" action="/adm/slotrequest"> |
<form method="post" action="/adm/slotrequest"> |
<input type="submit" name="Try Again" value="$lt{'try'}" /> |
<input type="submit" name="Try Again" value="$lt{'try'}" /> |
Line 661 STUFF
|
Line 901 STUFF
|
<input type="hidden" name="command" value="$env{'form.command'}" /> |
<input type="hidden" name="command" value="$env{'form.command'}" /> |
$extra_input |
$extra_input |
</form> |
</form> |
? |
|
</p> |
</p> |
<p> |
<p> |
or |
$lt{'or'} |
<form method="post" action="/adm/slotrequest"> |
<form method="post" action="/adm/slotrequest"> |
<input type="hidden" name="symb" value="$env{'form.symb'}" /> |
<input type="hidden" name="symb" value="$env{'form.symb'}" /> |
<input type="submit" name="requestattempt" value="$lt{'request'}" /> |
<input type="submit" name="requestattempt" value="$lt{'request'}" /> |
</form> |
</form> |
</p> |
|
or |
|
STUFF |
STUFF |
|
|
if (!$inhibit_return_link) { &return_link($r); } |
if (!$inhibit_return_link) { |
|
$r->print(&mt('or').'</p>'); |
|
&return_link($r); |
|
} else { |
|
$r->print('</p>'); |
|
} |
return 0; |
return 0; |
} |
} |
|
|
sub allowed_slot { |
sub allowed_slot { |
my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods)=@_; |
my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods,$toskip)=@_; |
|
|
#already started |
#already started |
if ($slot->{'starttime'} < time) { |
if ($slot->{'starttime'} < time) { |
Line 703 sub allowed_slot {
|
Line 945 sub allowed_slot {
|
if ($slot->{'startreserve'} > time) { |
if ($slot->{'startreserve'} > time) { |
return 0; |
return 0; |
} |
} |
|
# reserve time ended |
|
if (($slot->{'endreserve'}) && |
|
($slot->{'endreserve'} < time)) { |
|
return 0; |
|
} |
&Apache::lonxml::debug("$slot_name reserve good"); |
&Apache::lonxml::debug("$slot_name reserve good"); |
|
|
my $userallowed=0; |
my $userallowed=0; |
Line 749 sub allowed_slot {
|
Line 996 sub allowed_slot {
|
# not allowed for this resource |
# not allowed for this resource |
if (defined($slot->{'symb'}) |
if (defined($slot->{'symb'}) |
&& $slot->{'symb'} ne $symb) { |
&& $slot->{'symb'} ne $symb) { |
return 0; |
unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) { |
|
return 0; |
|
} |
} |
} |
|
|
my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots, |
my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots, |
Line 777 sub get_description {
|
Line 1026 sub get_description {
|
} |
} |
|
|
sub show_choices { |
sub show_choices { |
my ($r,$symb)=@_; |
my ($r,$symb,$formname,$num,$slots,$consumed_uniqueperiods,$available,$got_slots)=@_; |
|
my $output; |
my ($cnum,$cdom)=&get_course(); |
&Apache::lonxml::debug("Checking Slots"); |
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); |
if (!ref($available) eq 'ARRAY') { |
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; |
return; |
} |
} |
my $available; |
if (!@{$available}) { |
&Apache::lonxml::debug("Checking Slots"); |
$output = '<span class="LC_info">'.&mt('No available times.').'</span>'; |
my @got_slots=&check_for_reservation($symb,'allslots'); |
if ($env{'form.command'} ne 'manageresv') { |
if ($got_slots[0] =~ /^error: /) { |
$output .= ' <a href="/adm/flip?postdata=return:">'. |
$r->print('<span class="LC_error">'. |
&mt('Return to last resource').'</a>'; |
&mt('An error occurred determining slot availability'). |
} |
'</span>'); |
$r->print($output); |
return; |
return; |
} |
} |
$r->print('<table border="1">'); |
if (@{$available} > 1) { |
foreach my $slot (sort |
my $numavailable = scalar(@{$available}); |
{ return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} } |
my $numreserved = 0; |
(keys(%slots))) { |
my $js; |
|
my $j = 0; |
&Apache::lonxml::debug("Checking Slot $slot"); |
foreach my $got (@{$got_slots}) { |
next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots, |
unless (($got eq '') || (!defined($got))) { |
$consumed_uniqueperiods)); |
$numreserved ++; |
|
if ($env{'form.command'} eq 'manageresv') { |
$available++; |
$js .= " currslot[$j]='$got';\n"; |
|
$j++; |
my $description=&get_description($slot,$slots{$slot}); |
} |
|
} |
|
} |
|
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> |
|
|
my $form=&mt('Unavailable'); |
ENDSCRIPT |
if ((grep(/^\Q$slot\E$/,@got_slots)) || |
} |
&space_available($slot,$slots{$slot},$symb)) { |
$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">'; |
|
} else { |
|
$output .= &Apache::loncommon::start_data_table(); |
|
} |
|
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)) { |
my $text=&mt('Select'); |
my $text=&mt('Select'); |
my $command='get'; |
my $command='get'; |
if (grep(/^\Q$slot\E$/,@got_slots)) { |
if (grep(/^\Q$slot\E$/,@{$got_slots})) { |
$text=&mt('Drop Reservation'); |
$text=&mt('Drop Reservation'); |
$command='release'; |
$command='release'; |
} else { |
} else { |
my $conflict = &check_for_conflict($symb,$slot,$slots{$slot}, |
my $conflict = &check_for_conflict($symb,$slot,$slots->{$slot}, |
\%slots, |
$slots,$consumed_uniqueperiods); |
$consumed_uniqueperiods); |
|
if ($conflict) { |
if ($conflict) { |
if ($conflict =~ /^error: /) { |
if ($conflict =~ /^error: /) { |
$r->print('<tr><td><span class="LC_error" colspan="2">' |
$form = '<span class="LC_error">'. |
.&mt('Slot: [_1] has unknown status.',$description) |
&mt('Slot: [_1] has unknown status.',$description). |
.'</span></td></tr>'); |
'</span>'; |
} else { |
} else { |
$text=&mt('Change Reservation'); |
$text=&mt('Change Reservation'); |
$command='get'; |
$command='get'; |
Line 841 sub show_choices {
|
Line 1143 sub show_choices {
|
} |
} |
} |
} |
my $escsymb=&escape($symb); |
my $escsymb=&escape($symb); |
$form=<<STUFF; |
if (!$form) { |
<form method="post" action="/adm/slotrequest"> |
my $name; |
|
if ($formname) { |
|
$name = 'name="'.$formname.'"'; |
|
} |
|
my $context = 'user'; |
|
if ($env{'form.command'} eq 'manageresv') { |
|
$context = 'usermanage'; |
|
} |
|
$form=<<STUFF; |
|
<form method="post" action="/adm/slotrequest" $name> |
<input type="submit" name="Select" value="$text" /> |
<input type="submit" name="Select" value="$text" /> |
<input type="hidden" name="symb" value="$escsymb" /> |
<input type="hidden" name="symb" value="$escsymb" /> |
<input type="hidden" name="slotname" value="$slot" /> |
<input type="hidden" name="slotname" value="$slot" /> |
<input type="hidden" name="command" value="$command" /> |
<input type="hidden" name="command" value="$command" /> |
|
<input type="hidden" name="context" value="$context" /> |
</form> |
</form> |
STUFF |
STUFF |
} |
} |
$r->print(<<STUFF); |
} else { |
<tr> |
$form = &mt('Unavailable'); |
|
} |
|
if ($env{'form.command'} eq 'manageresv') { |
|
$output .= '<tr id="LC_slotrow_'.$num.'_'.$slot.'" >'; |
|
} else { |
|
$output .= &Apache::loncommon::start_data_table_row('','LC_slotrow_'.$num.'_'.$slot); |
|
} |
|
$output .= " |
<td>$form</td> |
<td>$form</td> |
<td>$description</td> |
<td>$description</td>\n"; |
</tr> |
if ($env{'form.command'} eq 'manageresv') { |
STUFF |
$output .= '</tr>'; |
|
} else { |
|
$output .= &Apache::loncommon::end_data_table_row(); |
|
} |
} |
} |
|
if ($env{'form.command'} eq 'manageresv') { |
if (!$available) { |
$output .= '</table>'; |
$r->print('<tr><td>No available times. <a href="/adm/flip?postdata=return:">'. |
} else { |
&mt('Return to last resource').'</a></td></tr>'); |
$output .= &Apache::loncommon::end_data_table(); |
|
} |
|
if (@{$available} > 1) { |
|
$output .= '</div></fieldset>'; |
} |
} |
$r->print('</table>'); |
$r->print($output); |
|
return; |
} |
} |
|
|
sub to_show { |
sub to_show { |
Line 946 sub remove_link {
|
Line 1272 sub remove_link {
|
$symb = &escape($symb); |
$symb = &escape($symb); |
|
|
return <<"END_LINK"; |
return <<"END_LINK"; |
<a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&symb=$symb" |
<a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&symb=$symb&context=manage" |
>($remove)</a> |
>($remove)</a> |
END_LINK |
END_LINK |
|
|
Line 956 sub show_table {
|
Line 1282 sub show_table {
|
my ($r,$mgr)=@_; |
my ($r,$mgr)=@_; |
|
|
my ($cnum,$cdom)=&get_course(); |
my ($cnum,$cdom)=&get_course(); |
|
my $crstype=&Apache::loncommon::course_type($cdom.'_'.$cnum); |
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); |
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); |
if ( (keys(%slots))[0] =~ /^error: 2 /) { |
if ( (keys(%slots))[0] =~ /^error: 2 /) { |
undef(%slots); |
undef(%slots); |
Line 963 sub show_table {
|
Line 1290 sub show_table {
|
my $available; |
my $available; |
if ($mgr eq 'F') { |
if ($mgr eq 'F') { |
# FIXME: This line should be deleted once Slots uses breadcrumbs |
# 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('<div>'); |
$r->print('<form method="post" action="/adm/slotrequest"> |
$r->print('<form method="post" action="/adm/slotrequest"> |
Line 977 sub show_table {
|
Line 1305 sub show_table {
|
$r->print(&Apache::loncommon::help_open_topic('Slot AddInterface')); |
$r->print(&Apache::loncommon::help_open_topic('Slot AddInterface')); |
$r->print('</div>'); |
$r->print('</div>'); |
} |
} |
|
|
|
if (!keys(%slots)) { |
|
$r->print( |
|
'<p class="LC_info">' |
|
.&mt('No slots have been created in this '.lc($crstype).'.') |
|
.'</p>' |
|
); |
|
return; |
|
} |
|
|
my %Saveable_Parameters = ('show' => 'array', |
my %Saveable_Parameters = ('show' => 'array', |
'when' => 'scalar', |
'when' => 'scalar', |
Line 1001 sub show_table {
|
Line 1338 sub show_table {
|
'starttime' => 'Start time', |
'starttime' => 'Start time', |
'endtime' => 'End Time', |
'endtime' => 'End Time', |
'startreserve' => 'Time students can start reserving', |
'startreserve' => 'Time students can start reserving', |
|
'endreserve' => 'Time students can no longer reserve', |
|
'reservationmsg' => 'Message triggered by reservation', |
'secret' => 'Secret Word', |
'secret' => 'Secret Word', |
'space' => '# of students/max', |
'space' => '# of students/max', |
'ip' => 'IP or DNS restrictions', |
'ip' => 'IP or DNS restrictions', |
Line 1010 sub show_table {
|
Line 1349 sub show_table {
|
'uniqueperiod' => 'Period of time slot is unique', |
'uniqueperiod' => 'Period of time slot is unique', |
'scheduled' => 'Scheduled Students', |
'scheduled' => 'Scheduled Students', |
'proctor' => 'List of proctors'); |
'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', |
my @show_order=('name','description','type','starttime','endtime', |
'startreserve','secret','space','ip','symb', |
'startreserve','endreserve','reservationmsg','secret','space', |
'allowedsections','allowedusers','uniqueperiod', |
'ip','symb','allowedsections','allowedusers','uniqueperiod', |
'scheduled','proctor'); |
'scheduled','proctor'); |
my @show = |
my @show = |
(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show') |
(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show') |
Line 1078 sub show_table {
|
Line 1422 sub show_table {
|
<th>'.&mt('Slot Name Filter').'</th> |
<th>'.&mt('Slot Name Filter').'</th> |
<th>'.&mt('Options').'</th> |
<th>'.&mt('Options').'</th> |
</tr> |
</tr> |
<tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order). |
<tr><td valign="top">'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order). |
'</td> |
'</td> |
<td> |
<td valign="top"> |
'.&Apache::loncommon::multiple_select_form('studisplay',\@stu_display, |
'.&Apache::loncommon::multiple_select_form('studisplay',\@stu_display, |
6,\%stu_display_fields, |
6,\%stu_display_fields, |
\@stu_display_order).' |
\@stu_display_order).' |
</td> |
</td> |
<td>'.&Apache::loncommon::select_form($when,'when',%when_fields). |
<td valign="top">'.&Apache::loncommon::select_form($when,'when',\%when_fields). |
'</td> |
'</td> |
<td>'.&Apache::loncommon::select_form($name_filter_type, |
<td valign="top">'.&Apache::loncommon::select_form($name_filter_type, |
'name_filter_type', |
'name_filter_type', |
%name_filter_type_fields). |
\%name_filter_type_fields). |
'<br />'. |
'<br />'. |
&Apache::lonhtmlcommon::textbox('name_filter_value', |
&Apache::lonhtmlcommon::textbox('name_filter_value', |
$env{'form.name_filter_value'}, |
$env{'form.name_filter_value'}, |
15). |
15). |
'</td> |
'</td> |
<td> |
<td valign="top"> |
<table> |
<table> |
<tr> |
<tr> |
<td rowspan="2">Deleted slots:</td> |
<td rowspan="2">'.&mt('Deleted slots:').'</td> |
<td><label>'.$show_radio.'Show</label></td> |
<td><label>'.$show_radio.&mt('Show').'</label></td> |
</tr> |
</tr> |
<tr> |
<tr> |
<td><label>'.$hide_radio.'Hide</label></td> |
<td><label>'.$hide_radio.&mt('Hide').'</label></td> |
</tr> |
</tr> |
</table> |
</table> |
</td> |
</td> |
Line 1123 sub show_table {
|
Line 1467 sub show_table {
|
|
|
my %name_cache; |
my %name_cache; |
my $slotsort = sub { |
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'}}) |
if (lc($slots{$a}->{$env{'form.order'}}) |
ne lc($slots{$b}->{$env{'form.order'}})) { |
ne lc($slots{$b}->{$env{'form.order'}})) { |
return (lc($slots{$a}->{$env{'form.order'}}) |
return (lc($slots{$a}->{$env{'form.order'}}) |
Line 1160 sub show_table {
|
Line 1504 sub show_table {
|
if ($tmp =~ /^error: /) { undef(%consumed); } |
if ($tmp =~ /^error: /) { undef(%consumed); } |
} |
} |
|
|
|
my %msgops = &slot_reservationmsg_options(); |
|
|
foreach my $slot (sort $slotsort (keys(%slots))) { |
foreach my $slot (sort $slotsort (keys(%slots))) { |
if (!&to_show($slot,$slots{$slot},$when, |
if (!&to_show($slot,$slots{$slot},$when, |
$env{'form.deleted'},$name_filter)) { next; } |
$env{'form.deleted'},$name_filter)) { next; } |
|
my $reservemsg; |
if (defined($slots{$slot}->{'type'}) |
if (defined($slots{$slot}->{'type'}) |
&& $slots{$slot}->{'type'} ne 'schedulable_student') { |
&& $slots{$slot}->{'type'} eq 'schedulable_student') { |
#next; |
$reservemsg = $msgops{$slots{$slot}->{'reservationmsg'}}; |
} |
} |
my $description=&get_description($slot,$slots{$slot}); |
my $description=&get_description($slot,$slots{$slot}); |
my ($id_count,$ids); |
my ($id_count,$ids); |
Line 1202 sub show_table {
|
Line 1549 sub show_table {
|
&Apache::lonlocal::locallocaltime($slots{$slot}->{'endtime'}):''); |
&Apache::lonlocal::locallocaltime($slots{$slot}->{'endtime'}):''); |
my $start_reserve=($slots{$slot}->{'startreserve'}? |
my $start_reserve=($slots{$slot}->{'startreserve'}? |
&Apache::lonlocal::locallocaltime($slots{$slot}->{'startreserve'}):''); |
&Apache::lonlocal::locallocaltime($slots{$slot}->{'startreserve'}):''); |
|
my $end_reserve=($slots{$slot}->{'endreserve'}? |
|
&Apache::lonlocal::locallocaltime($slots{$slot}->{'endreserve'}):''); |
|
|
my $unique; |
my $unique; |
if (ref($slots{$slot}{'uniqueperiod'})) { |
if (ref($slots{$slot}{'uniqueperiod'})) { |
Line 1258 sub show_table {
|
Line 1607 sub show_table {
|
} |
} |
my $proctors=join(', ',@proctors); |
my $proctors=join(', ',@proctors); |
|
|
|
my %lt = &Apache::lonlocal::texthash ( |
|
edit => 'Edit', |
|
delete => 'Delete', |
|
slotlog => 'History', |
|
); |
my $edit=(<<"EDITLINK"); |
my $edit=(<<"EDITLINK"); |
<a href="/adm/helper/newslot.helper?name=$slot">Edit</a> |
<a href="/adm/helper/newslot.helper?name=$slot">$lt{'edit'}</a> |
EDITLINK |
EDITLINK |
|
|
my $delete=(<<"DELETELINK"); |
my $delete=(<<"DELETELINK"); |
<a href="/adm/slotrequest?command=delete&slotname=$slot">Delete</a> |
<a href="/adm/slotrequest?command=delete&slotname=$slot">$lt{'delete'}</a> |
DELETELINK |
DELETELINK |
|
|
|
my $showlog=(<<"LOGLINK"); |
|
<a href="/adm/slotrequest?command=slotlog&slotname=$slot">$lt{'slotlog'}</a> |
|
LOGLINK |
|
|
my $remove_all=&remove_link($slot,'remove all').'<br />'; |
my $remove_all=&remove_link($slot,'remove all').'<br />'; |
|
|
if ($ids ne '') { undef($delete); } |
if ($ids eq '') { |
if ($slots{$slot}{'type'} ne 'schedulable_student' |
undef($remove_all); |
|| $ids eq '') { |
} else { |
|
undef($delete); |
|
} |
|
if ($slots{$slot}{'type'} ne 'schedulable_student') { |
|
undef($showlog); |
undef($remove_all); |
undef($remove_all); |
} |
} |
|
|
my $row_start=&Apache::loncommon::start_data_table_row(); |
my $row_start=&Apache::loncommon::start_data_table_row(); |
my $row_end=&Apache::loncommon::end_data_table_row(); |
my $row_end=&Apache::loncommon::end_data_table_row(); |
$r->print($row_start. |
$r->print($row_start. |
"\n<td rowspan=\"$rowspan\">$edit $delete</td>\n"); |
"\n<td rowspan=\"$rowspan\">$edit $delete $showlog</td>\n"); |
if (exists($show{'name'})) { |
if (exists($show{'name'})) { |
$colspan++;$r->print("<td>$slot</td>"); |
$colspan++;$r->print("<td>$slot</td>"); |
} |
} |
Line 1296 DELETELINK
|
Line 1658 DELETELINK
|
if (exists($show{'startreserve'})) { |
if (exists($show{'startreserve'})) { |
$colspan++;$r->print("<td>$start_reserve</td>\n"); |
$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'})) { |
if (exists($show{'secret'})) { |
$colspan++;$r->print("<td>$slots{$slot}{'secret'}</td>\n"); |
$colspan++;$r->print("<td>$slots{$slot}{'secret'}</td>\n"); |
} |
} |
Line 1336 $row_end
|
Line 1704 $row_end
|
STUFF |
STUFF |
} |
} |
} |
} |
$r->print('</table></form>'); |
$r->print(&Apache::loncommon::end_data_table().'</form>'); |
|
return; |
|
} |
|
|
|
sub manage_reservations { |
|
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>' |
|
); |
|
if (!defined($navmap)) { |
|
$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 @backgrounds = ("LC_odd_row","LC_even_row"); |
|
my $numcolors = scalar(@backgrounds); |
|
my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif"); |
|
my $slotheader = '<p>'. |
|
&mt('Your reservation status for any such assignments is listed below:'). |
|
'</p>'. |
|
'<table class="LC_data_table LC_tableOfContent">'."\n"; |
|
my $shownheader = 0; |
|
my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef); |
|
while (my $resource = $it->next()) { |
|
if ($resource == $it->BEGIN_MAP()) { |
|
$depth++; |
|
$parent{$depth} = $lastcontainer; |
|
} |
|
if ($resource == $it->END_MAP()) { |
|
$depth--; |
|
$lastcontainer = $parent{$depth}; |
|
} |
|
if (ref($resource)) { |
|
my $symb = $resource->symb(); |
|
my $ressymb = $symb; |
|
$contents{$lastcontainer} ++; |
|
next if (!$resource->is_problem() && !$resource->is_sequence() && |
|
!$resource->is_page()); |
|
$count ++; |
|
if (($resource->is_sequence()) || ($resource->is_page())) { |
|
$lastcontainer = $count; |
|
$container{$lastcontainer} = $resource; |
|
$container_title{$lastcontainer} = $resource->compTitle(); |
|
} |
|
if ($resource->is_problem()) { |
|
my ($useslots) = $resource->slot_control(); |
|
next if (($useslots eq '') || ($useslots =~ /^\s*no\s*$/i)); |
|
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'); |
|
if ($slot_name ne '') { |
|
my %slot=&Apache::lonnet::get_slot($slot_name); |
|
$slotdescription=&get_description($slot_name,\%slot); |
|
} |
|
if ($slot_status == $resource->NOT_IN_A_SLOT) { |
|
$msg=&mt('No current reservation.'); |
|
$get_choices = 1; |
|
} elsif ($slot_status == $resource->NEEDS_CHECKIN) { |
|
$msg='<span class="LC_nobreak">'.&mt('Reserved:'). |
|
' '.$slotdescription.'</span><br />'. |
|
&mt('Access requires proctor validation.'); |
|
} elsif ($slot_status == $resource->WAITING_FOR_GRADE) { |
|
$msg=&mt('Submitted and currently in grading queue.'); |
|
} elsif ($slot_status == $resource->CORRECT) { |
|
$msg=&mt('Problem is unavailable.'); |
|
} elsif ($slot_status == $resource->RESERVED) { |
|
$msg='<span class="LC_nobreak">'.&mt('Reserved:'). |
|
' '.$slotdescription.'</span><br />'. |
|
&mt('Problem is currently available.'); |
|
} elsif ($slot_status == $resource->RESERVED_LOCATION) { |
|
$msg='<span class="LC_nobreak">'.&mt('Reserved:'). |
|
' '.$slotdescription.'</span><br />'. |
|
&mt('Problem is available at a different location.'); |
|
$get_choices = 1; |
|
} elsif ($slot_status == $resource->RESERVED_LATER) { |
|
$msg='<span class="LC_nobreak">'.&mt('Reserved:'). |
|
' '.$slotdescription.'</span><br />'. |
|
&mt('Problem will be available later.'); |
|
$get_choices = 1; |
|
} 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) { |
|
$msg=&mt('Unable to determine status due to network problems.'); |
|
} else { |
|
if ($status != $resource->OPEN) { |
|
$msg = &Apache::lonnavmaps::getDescription($resource,'0'); |
|
} |
|
} |
|
$reservable ++; |
|
my $treelevel = $depth; |
|
my $higherup = $lastcontainer; |
|
if ($depth > 1) { |
|
my @maprows; |
|
while ($treelevel > 1) { |
|
if (ref($container{$higherup})) { |
|
my $res = $container{$higherup}; |
|
last if (defined($shownparent{$higherup})); |
|
my $maptitle = $res->compTitle(); |
|
my $type = 'sequence'; |
|
if ($res->is_page()) { |
|
$type = 'page'; |
|
} |
|
&show_map_row($treelevel,$location,$type,$maptitle, |
|
\@maprows); |
|
$shownparent{$higherup} = 1; |
|
} |
|
$treelevel --; |
|
$higherup = $parent{$treelevel}; |
|
} |
|
foreach my $item (@maprows) { |
|
$rownum ++; |
|
my $bgcolor = $backgrounds[$rownum % $numcolors]; |
|
if (!$shownheader) { |
|
$r->print($slotheader); |
|
$shownheader = 1; |
|
} |
|
$r->print('<tr class="'.$bgcolor.'">'.$item.'</tr>'."\n"); |
|
} |
|
} |
|
$rownum ++; |
|
my $bgcolor = $backgrounds[$rownum % $numcolors]; |
|
if (!$shownheader) { |
|
$r->print($slotheader); |
|
$shownheader = 1; |
|
} |
|
$r->print('<tr class="'.$bgcolor.'"><td>'."\n"); |
|
for (my $i=0; $i<$depth; $i++) { |
|
$r->print('<img src="'.$location.'" alt="" />'); |
|
} |
|
my $result = '<a href="'.$resource->src().'?symb='.$symb.'">'. |
|
'<img class="LC_contentImage" src="/adm/lonIcons/'; |
|
if ($resource->is_task()) { |
|
$result .= 'task.gif" alt="'.&mt('Task'); |
|
} else { |
|
$result .= 'problem.gif" alt="'.&mt('Problem'); |
|
} |
|
$result .= '" /><b>'.$title.'</b></a>'.(' ' x6).'</td>'; |
|
my $hasaction; |
|
if ($status == $resource->OPEN) { |
|
if ($get_choices) { |
|
$hasaction = 1; |
|
} |
|
} |
|
if ($hasaction) { |
|
$result .= '<td valign="top">'.$msg.'</td>'. |
|
'<td valign="top">'; |
|
} else { |
|
$result .= '<td colspan="2" valign="middle">'.$msg.'</td>'; |
|
} |
|
$r->print($result); |
|
if ($hasaction) { |
|
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>'); |
|
} else { |
|
my $formname = 'manageres_'.$reservable; |
|
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 ((defined($slots->{$slot}->{'symb'})) && |
|
($slots->{$slot}->{'symb'} ne $symb)) { |
|
next; |
|
} |
|
} |
|
push(@available,$slot); |
|
} |
|
} |
|
&show_choices($r,$symb,$formname,$reservable,$slots,$consumed_uniqueperiods, |
|
\@available,\@got_slots); |
|
} |
|
} |
|
$r->print('</td>'); |
|
} |
|
$r->print('</tr>'); |
|
} |
|
} |
|
} |
|
if ($shownheader) { |
|
$r->print('</table>'); |
|
} |
|
if (!$reservable) { |
|
$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('<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="" />'; |
|
} |
|
if ($type eq 'page') { |
|
$output .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" /> '."\n"; |
|
} else { |
|
$output .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" /> '."\n"; |
|
} |
|
$output .= $title.'</td><td colspan="2"> </td>'."\n"; |
|
unshift (@{$maprows},$output); |
|
return; |
|
} |
|
|
|
sub show_reservations { |
|
my ($r,$uname,$udom) = @_; |
|
if (!defined($uname)) { |
|
$uname = $env{'user.name'}; |
|
} |
|
if (!defined($udom)) { |
|
$udom = $env{'user.domain'}; |
|
} |
|
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">'); |
|
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 |
|
my $now = time(); |
|
my $defstart = $now - (7*24*3600); #7 days ago |
|
my %defaults = ( |
|
page => '1', |
|
show => '10', |
|
action => 'any', |
|
log_start_date => $defstart, |
|
log_end_date => $now, |
|
); |
|
my $more_records = 0; |
|
|
|
# set current |
|
my %curr; |
|
foreach my $item ('show','page','action') { |
|
$curr{$item} = $env{'form.'.$item}; |
|
} |
|
my ($startdate,$enddate) = |
|
&Apache::lonuserutils::get_dates_from_form('log_start_date', |
|
'log_end_date'); |
|
$curr{'log_start_date'} = $startdate; |
|
$curr{'log_end_date'} = $enddate; |
|
foreach my $key (keys(%defaults)) { |
|
if ($curr{$key} eq '') { |
|
$curr{$key} = $defaults{$key}; |
|
} |
|
} |
|
my ($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/); |
|
$r->print(&display_filter($formname,$cdom,$cnum,\%curr,$version)); |
|
my $showntablehdr = 0; |
|
my $tablehdr = &Apache::loncommon::start_data_table(). |
|
&Apache::loncommon::start_data_table_header_row(). |
|
'<th> </th><th>'.&mt('When').'</th><th>'.&mt('Action').'</th>'. |
|
'<th>'.&mt('Description').'</th><th>'.&mt('Start time').'</th>'. |
|
'<th>'.&mt('End time').'</th><th>'.&mt('Resource').'</th>'. |
|
&Apache::loncommon::end_data_table_header_row(); |
|
my ($minshown,$maxshown); |
|
$minshown = 1; |
|
my $count = 0; |
|
if ($curr{'show'} ne &mt('all')) { |
|
$maxshown = $curr{'page'} * $curr{'show'}; |
|
if ($curr{'page'} > 1) { |
|
$minshown = 1 + ($curr{'page'} - 1) * $curr{'show'}; |
|
} |
|
} |
|
my (%titles,%maptitles); |
|
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'})); |
|
if ($curr{'show'} ne &mt('all')) { |
|
if ($count >= $curr{'page'} * $curr{'show'}) { |
|
$more_records = 1; |
|
last; |
|
} |
|
} |
|
if ($curr{'action'} ne 'any') { |
|
next if ($log{$id}{'logentry'}{'action'} ne $curr{'action'}); |
|
} |
|
$count ++; |
|
next if ($count < $minshown); |
|
if (!$showntablehdr) { |
|
$r->print($tablehdr); |
|
$showntablehdr = 1; |
|
} |
|
my $symb = $log{$id}{'logentry'}{'symb'}; |
|
my $slot_name = $log{$id}{'logentry'}{'slot'}; |
|
my %slot=&Apache::lonnet::get_slot($slot_name); |
|
my $description = $slot{'description'}; |
|
my $start = ($slot{'starttime'}? |
|
&Apache::lonlocal::locallocaltime($slot{'starttime'}):''); |
|
my $end = ($slot{'endtime'}? |
|
&Apache::lonlocal::locallocaltime($slot{'endtime'}):''); |
|
my $title = &get_resource_title($symb,\%titles,\%maptitles); |
|
my $chgaction = $log{$id}{'logentry'}{'action'}; |
|
if ($chgaction ne '' && $lt{$chgaction} ne '') { |
|
$chgaction = $lt{$chgaction}; |
|
} |
|
$r->print(&Apache::loncommon::start_data_table_row().'<td>'.$count.'</td><td>'.&Apache::lonlocal::locallocaltime($log{$id}{'exe_time'}).'</td><td>'.$chgaction.'</td><td>'.$description.'</td><td>'.$start.'</td><td>'.$end.'</td><td>'.$title.'</td>'.&Apache::loncommon::end_data_table_row()."\n"); |
|
} |
|
if ($showntablehdr) { |
|
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
|
if (($curr{'page'} > 1) || ($more_records)) { |
|
$r->print('<table><tr>'); |
|
if ($curr{'page'} > 1) { |
|
$r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>'); |
|
} |
|
if ($more_records) { |
|
$r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>'); |
|
} |
|
$r->print('</tr></table>'); |
|
$r->print(<<"ENDSCRIPT"); |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function chgPage(caller) { |
|
if (caller == 'previous') { |
|
document.$formname.page.value --; |
|
} |
|
if (caller == 'next') { |
|
document.$formname.page.value ++; |
|
} |
|
document.$formname.submit(); |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
ENDSCRIPT |
|
} |
|
} else { |
|
$r->print('<span class="LC_info">' |
|
.&mt('There are no transactions to display.') |
|
.'</span>' |
|
); |
|
} |
|
$r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'."\n". |
|
'<input type="hidden" name="command" value="showresv" />'."\n"); |
|
if ($env{'form.origin'} eq 'aboutme') { |
|
$r->print('<input type="hidden" name="origin" value="'.$env{'form.origin'}.'" />'."\n". |
|
'<input type="hidden" name="uname" value="'.$env{'form.uname'}.'" />'."\n". |
|
'<input type="hidden" name="udom" value="'.$env{'form.udom'}.'" />'."\n"); |
|
} |
|
$r->print('</form>'); |
|
return; |
|
} |
|
|
|
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; |
|
} else { |
|
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
|
if (keys(%slot) == 0) { |
|
$r->print('<div class="LC_warning">'.&mt('Invalid slot name: [_1]',$env{'form.slotname'}).'</div>'); |
|
$badslot = 1; |
|
} elsif ($slot{type} ne 'schedulable_student') { |
|
my $description = &get_description($env{'form.slotname'},\%slot); |
|
$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; |
|
} |
|
} |
|
if ($badslot) { |
|
$r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
|
&mt('Return to slot list').'</a></p>'); |
|
return; |
|
} |
|
my $formname = 'reservationslog'; |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my %slotlog=&Apache::lonnet::dump('nohist_slotreservationslog',$cdom,$cnum); |
|
if ((keys(%slotlog))[0]=~/^error\:/) { undef(%slotlog); } |
|
|
|
my (%log,@allsymbs); |
|
if (keys(%slotlog)) { |
|
foreach my $key (keys(%slotlog)) { |
|
if (ref($slotlog{$key}) eq 'HASH') { |
|
if (ref($slotlog{$key}{'logentry'}) eq 'HASH') { |
|
if ($slotlog{$key}{'logentry'}{'slot'} eq $env{'form.slotname'}) { |
|
$log{$key} = $slotlog{$key}; |
|
if ($slotlog{$key}{'logentry'}{'symb'} ne '') { |
|
push(@allsymbs,$slotlog{$key}{'logentry'}{'symb'}); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
|
|
$r->print('<form action="/adm/slotrequest" method="post" name="'.$formname.'">'); |
|
my %saveable_parameters = ('show' => 'scalar',); |
|
&Apache::loncommon::store_course_settings('reservationslog', |
|
\%saveable_parameters); |
|
&Apache::loncommon::restore_course_settings('reservationslog', |
|
\%saveable_parameters); |
|
# set defaults |
|
my $now = time(); |
|
my $defstart = $now - (7*24*3600); #7 days ago |
|
my %defaults = ( |
|
page => '1', |
|
show => '10', |
|
chgcontext => 'any', |
|
action => 'any', |
|
symb => 'any', |
|
log_start_date => $defstart, |
|
log_end_date => $now, |
|
); |
|
my $more_records = 0; |
|
|
|
# set current |
|
my %curr; |
|
foreach my $item ('show','page','chgcontext','action','symb') { |
|
$curr{$item} = $env{'form.'.$item}; |
|
} |
|
my ($startdate,$enddate) = |
|
&Apache::lonuserutils::get_dates_from_form('log_start_date', |
|
'log_end_date'); |
|
$curr{'log_start_date'} = $startdate; |
|
$curr{'log_end_date'} = $enddate; |
|
foreach my $key (keys(%defaults)) { |
|
if ($curr{$key} eq '') { |
|
$curr{$key} = $defaults{$key}; |
|
} |
|
} |
|
my (%whodunit,%changed,$version); |
|
($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/); |
|
|
|
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
|
my $description = $slot{'description'}; |
|
$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(). |
|
&Apache::loncommon::start_data_table_header_row(). |
|
'<th> </th><th>'.&mt('When').'</th><th>'.&mt('Who made the change'). |
|
'</th><th>'.&mt('Affected User').'</th><th>'.&mt('Action').'</th>'. |
|
'<th>'.&mt('Resource').'</th><th>'.&mt('Context').'</th>'. |
|
&Apache::loncommon::end_data_table_header_row(); |
|
my ($minshown,$maxshown); |
|
$minshown = 1; |
|
my $count = 0; |
|
if ($curr{'show'} ne &mt('all')) { |
|
$maxshown = $curr{'page'} * $curr{'show'}; |
|
if ($curr{'page'} > 1) { |
|
$minshown = 1 + ($curr{'page'} - 1) * $curr{'show'}; |
|
} |
|
} |
|
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'}) || |
|
($log{$id}{'exe_time'} > $curr{'log_end_date'})); |
|
if ($curr{'show'} ne &mt('all')) { |
|
if ($count >= $curr{'page'} * $curr{'show'}) { |
|
$more_records = 1; |
|
last; |
|
} |
|
} |
|
if ($curr{'chgcontext'} ne 'any') { |
|
if ($curr{'chgcontext'} eq 'user') { |
|
next if (($log{$id}{'logentry'}{'context'} ne 'user') && |
|
($log{$id}{'logentry'}{'context'} ne 'usermanage')); |
|
} else { |
|
next if ($log{$id}{'logentry'}{'context'} ne $curr{'chgcontext'}); |
|
} |
|
} |
|
if ($curr{'action'} ne 'any') { |
|
next if ($log{$id}{'logentry'}{'action'} ne $curr{'action'}); |
|
} |
|
if ($curr{'symb'} ne 'any') { |
|
next if ($log{$id}{'logentry'}{'symb'} ne $curr{'symb'}); |
|
} |
|
$count ++; |
|
next if ($count < $minshown); |
|
if (!$showntablehdr) { |
|
$r->print($tablehdr); |
|
$showntablehdr = 1; |
|
} |
|
if ($whodunit{$log{$id}{'exe_uname'}.':'.$log{$id}{'exe_udom'}} eq '') { |
|
$whodunit{$log{$id}{'exe_uname'}.':'.$log{$id}{'exe_udom'}} = |
|
&Apache::loncommon::plainname($log{$id}{'exe_uname'},$log{$id}{'exe_udom'}); |
|
} |
|
if ($changed{$log{$id}{'uname'}.':'.$log{$id}{'udom'}} eq '') { |
|
$changed{$log{$id}{'uname'}.':'.$log{$id}{'udom'}} = |
|
&Apache::loncommon::plainname($log{$id}{'uname'},$log{$id}{'udom'}); |
|
} |
|
my $symb = $log{$id}{'logentry'}{'symb'}; |
|
my $title = &get_resource_title($symb,\%titles,\%maptitles); |
|
my $chgcontext = $log{$id}{'logentry'}{'context'}; |
|
if ($chgcontext ne '' && $lt{$chgcontext} ne '') { |
|
$chgcontext = $lt{$chgcontext}; |
|
} |
|
my $chgaction = $log{$id}{'logentry'}{'action'}; |
|
if ($chgaction ne '' && $lt{$chgaction} ne '') { |
|
$chgaction = $lt{$chgaction}; |
|
} |
|
$r->print(&Apache::loncommon::start_data_table_row().'<td>'.$count.'</td><td>'.&Apache::lonlocal::locallocaltime($log{$id}{'exe_time'}).'</td><td>'.$whodunit{$log{$id}{'exe_uname'}.':'.$log{$id}{'exe_udom'}}.'</td><td>'.$changed{$log{$id}{'uname'}.':'.$log{$id}{'udom'}}.'</td><td>'.$chgaction.'</td><td>'.$title.'</td><td>'.$chgcontext.'</td>'.&Apache::loncommon::end_data_table_row()."\n"); |
|
} |
|
if ($showntablehdr) { |
|
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
|
if (($curr{'page'} > 1) || ($more_records)) { |
|
$r->print('<table><tr>'); |
|
if ($curr{'page'} > 1) { |
|
$r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>'); |
|
} |
|
if ($more_records) { |
|
$r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>'); |
|
} |
|
$r->print('</tr></table>'); |
|
$r->print(<<"ENDSCRIPT"); |
|
<script type="text/javascript"> |
|
function chgPage(caller) { |
|
if (caller == 'previous') { |
|
document.$formname.page.value --; |
|
} |
|
if (caller == 'next') { |
|
document.$formname.page.value ++; |
|
} |
|
document.$formname.submit(); |
|
return; |
|
} |
|
</script> |
|
ENDSCRIPT |
|
} |
|
} else { |
|
$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'}.'" />'. |
|
'<input type="hidden" name="command" value="slotlog" /></form>'. |
|
'<p><a href="/adm/slotrequest?command=showslots">'. |
|
&mt('Return to slot list').'</a></p>'); |
|
return; |
|
} |
|
|
|
sub get_resource_title { |
|
my ($symb,$titles,$maptitles) = @_; |
|
my $title; |
|
if ((ref($titles) eq 'HASH') && (ref($maptitles) eq 'HASH')) { |
|
if (defined($titles->{$symb})) { |
|
$title = $titles->{$symb}; |
|
} else { |
|
$title = &Apache::lonnet::gettitle($symb); |
|
my $maptitle; |
|
my ($mapurl) = &Apache::lonnet::decode_symb($symb); |
|
if (defined($maptitles->{$mapurl})) { |
|
$maptitle = $maptitles->{$mapurl}; |
|
} else { |
|
if ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) { |
|
$maptitle=&mt('Main Content'); |
|
} else { |
|
$maptitle=&Apache::lonnet::gettitle($mapurl); |
|
} |
|
$maptitles->{$mapurl} = $maptitle; |
|
} |
|
if ($maptitle ne '') { |
|
$title .= ' '.&mt('(in [_1])',$maptitle); |
|
} |
|
$titles->{$symb} = $title; |
|
} |
|
} else { |
|
$title = $symb; |
|
} |
|
return $title; |
|
} |
|
|
|
sub reservationlog_contexts { |
|
my ($crstype) = @_; |
|
my %lt = &Apache::lonlocal::texthash ( |
|
any => 'Any', |
|
user => 'By student', |
|
manage => 'Via Slot Manager', |
|
parameter => 'Via Parameter Manager', |
|
reserve => 'Made reservation', |
|
release => 'Dropped reservation', |
|
usermanage => 'By student', |
|
); |
|
if ($crstype eq 'Community') { |
|
$lt{'user'} = &mt('By member'); |
|
$lt{'usermanage'} = $lt{'user'}; |
|
} |
|
return %lt; |
|
} |
|
|
|
sub display_filter { |
|
my ($formname,$cdom,$cnum,$curr,$version,$allsymbs) = @_; |
|
my $nolink = 1; |
|
my (%titles,%maptitles); |
|
my $output = '<br /><table><tr><td valign="top">'. |
|
'<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'. |
|
&Apache::lonmeta::selectbox('show',$curr->{'show'},undef, |
|
(&mt('all'),5,10,20,50,100,1000,10000)). |
|
'</td><td> </td>'; |
|
my $startform = |
|
&Apache::lonhtmlcommon::date_setter($formname,'log_start_date', |
|
$curr->{'log_start_date'},undef, |
|
undef,undef,undef,undef,undef,undef,$nolink); |
|
my $endform = |
|
&Apache::lonhtmlcommon::date_setter($formname,'log_end_date', |
|
$curr->{'log_end_date'},undef, |
|
undef,undef,undef,undef,undef,undef,$nolink); |
|
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>'. |
|
$endform.'</td></tr></table></td><td> </td>'; |
|
if (ref($allsymbs) eq 'ARRAY') { |
|
$output .= '<td valign="top"><b>'.&mt('Resource').'</b><br />'. |
|
'<select name="resource"><option value="any"'; |
|
if ($curr->{'resource'} eq 'any') { |
|
$output .= ' selected="selected"'; |
|
} |
|
$output .= '>'.&mt('Any').'</option>'."\n"; |
|
foreach my $symb (@{$allsymbs}) { |
|
my $title = &get_resource_title($symb,\%titles,\%maptitles); |
|
my $selstr = ''; |
|
if ($curr->{'resource'} eq $symb) { |
|
$selstr = ' selected="selected"'; |
|
} |
|
$output .= ' <option value="'.$symb.'"'.$selstr.'>'.$title.'</option>'; |
|
} |
|
$output .= '</select></td><td> </td><td valign="top"><b>'. |
|
&mt('Context:').'</b><br /><select name="chgcontext">'; |
|
foreach my $chgtype ('any','user','manage','parameter') { |
|
my $selstr = ''; |
|
if ($curr->{'chgcontext'} eq $chgtype) { |
|
$output .= $selstr = ' selected="selected"'; |
|
} |
|
$output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n"; |
|
} |
|
$output .= '</select></td>'; |
|
} else { |
|
$output .= '<td valign="top"><b>'.&mt('Action').'</b><br />'. |
|
'<select name="action"><option value="any"'; |
|
if ($curr->{'action'} eq 'any') { |
|
$output .= ' selected="selected"'; |
|
} |
|
$output .= '>'.&mt('Any').'</option>'."\n"; |
|
foreach my $actiontype ('reserve','release') { |
|
my $selstr = ''; |
|
if ($curr->{'action'} eq $actiontype) { |
|
$output .= $selstr = ' selected="selected"'; |
|
} |
|
$output .= '<option value="'.$actiontype.'"'.$selstr.'>'.$lt{$actiontype}.'</option>'."\n"; |
|
} |
|
$output .= '</select></td>'; |
|
} |
|
$output .= '<td> </td><td valign="middle"><input type="submit" value="'. |
|
&mt('Update Display').'" /></tr></table>'. |
|
'<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 LON-CAPA server is version [_1]',$version); |
|
} |
|
$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 { |
sub upload_start { |
my ($r)=@_; |
my ($r)=@_; |
$r->print(&Apache::grades::checkforfile_js()); |
$r->print( |
my $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n"; |
&Apache::grades::checkforfile_js() |
$result.=' <b>'. |
.'<h2>'.&mt('Upload a file containing the slot definitions').'</h2>' |
&mt('Specify a file containing the slot definitions.'). |
.'<form method="post" enctype="multipart/form-data"' |
'</b></td></tr>'."\n"; |
.' action="/adm/slotrequest" name="slotupload">' |
$result.='<tr bgcolor=#ffffe6><td>'."\n"; |
.'<input type="hidden" name="command" value="csvuploadmap" />' |
my $upfile_select=&Apache::loncommon::upfile_select_html(); |
.&Apache::lonhtmlcommon::start_pick_box() |
my $ignore=&mt('Ignore First Line'); |
.&Apache::lonhtmlcommon::row_title(&mt('File')) |
$result.=<<ENDUPFORM; |
.&Apache::loncommon::upfile_select_html() |
<form method="post" enctype="multipart/form-data" action="/adm/slotrequest" name="slotupload"> |
.&Apache::lonhtmlcommon::row_closure() |
<input type="hidden" name="command" value="csvuploadmap" /> |
.&Apache::lonhtmlcommon::row_title( |
$upfile_select |
'<label for="noFirstLine">' |
<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Data" /> |
.&mt('Ignore First Line') |
<label><input type="checkbox" name="noFirstLine" />$ignore</label> |
.'</label>') |
</form> |
.'<input type="checkbox" name="noFirstLine" id="noFirstLine" />' |
ENDUPFORM |
.&Apache::lonhtmlcommon::row_closure(1) |
$result.='</td></tr></table>'."\n"; |
.&Apache::lonhtmlcommon::end_pick_box() |
$result.='</td></tr></table>'."\n"; |
.'<p>' |
$r->print($result); |
.'<input type="button" onclick="javascript:checkUpload(this.form);"' |
|
.' value="'.&mt('Next').'" />' |
|
.'</p>' |
|
.'</form>' |
|
); |
} |
} |
|
|
sub csvuploadmap_header { |
sub csvuploadmap_header { |
Line 1373 sub csvuploadmap_header {
|
Line 2504 sub csvuploadmap_header {
|
|
|
my $checked=(($env{'form.noFirstLine'})?' checked="checked"':''); |
my $checked=(($env{'form.noFirstLine'})?' checked="checked"':''); |
my $ignore=&mt('Ignore First Line'); |
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); |
$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="associate" value="" /> |
<input type="hidden" name="datatoken" value="$datatoken" /> |
<input type="hidden" name="datatoken" value="$datatoken" /> |
<input type="hidden" name="fileupload" value="$env{'form.fileupload'}" /> |
<input type="hidden" name="fileupload" value="$env{'form.fileupload'}" /> |
Line 1390 to this page if the data selected is ins
|
Line 2545 to this page if the data selected is ins
|
<input type="hidden" name="upfile_associate" |
<input type="hidden" name="upfile_associate" |
value="$env{'form.upfile_associate'}" /> |
value="$env{'form.upfile_associate'}" /> |
<input type="hidden" name="command" value="csvuploadassign" /> |
<input type="hidden" name="command" value="csvuploadassign" /> |
<hr /> |
|
<script type="text/javascript" language="Javascript"> |
<script type="text/javascript" language="Javascript"> |
|
// <![CDATA[ |
$javascript |
$javascript |
|
// ]]> |
</script> |
</script> |
ENDPICK |
ENDPICK |
return ''; |
return ''; |
Line 1401 ENDPICK
|
Line 2557 ENDPICK
|
|
|
sub csvuploadmap_footer { |
sub csvuploadmap_footer { |
my ($request,$i,$keyfields) =@_; |
my ($request,$i,$keyfields) =@_; |
|
my $buttontext = &mt('Create Slots'); |
$request->print(<<ENDPICK); |
$request->print(<<ENDPICK); |
</table> |
|
<input type="hidden" name="nfields" value="$i" /> |
<input type="hidden" name="nfields" value="$i" /> |
<input type="hidden" name="keyfields" value="$keyfields" /> |
<input type="hidden" name="keyfields" value="$keyfields" /> |
<input type="button" onClick="javascript:verify(this.form)" value="Create Slots" /><br /> |
<input type="button" onclick="javascript:verify(this.form)" value="$buttontext" /><br /> |
</form> |
</form> |
ENDPICK |
ENDPICK |
} |
} |
|
|
sub csvupload_javascript_reverse_associate { |
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); |
return(<<ENDPICK); |
function verify(vf) { |
function verify(vf) { |
var foundstart=0; |
var foundstart=0; |
Line 1437 ENDPICK
|
Line 2593 ENDPICK
|
} |
} |
|
|
sub csvupload_javascript_forward_associate { |
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); |
return(<<ENDPICK); |
function verify(vf) { |
function verify(vf) { |
var foundstart=0; |
var foundstart=0; |
Line 1504 sub csvupload_fields {
|
Line 2660 sub csvupload_fields {
|
['starttime','Start Time of slot'], |
['starttime','Start Time of slot'], |
['endtime','End Time of slot'], |
['endtime','End Time of slot'], |
['startreserve','Reservation Start Time'], |
['startreserve','Reservation Start Time'], |
|
['endreserve','Reservation End Time'], |
|
['reservationmsg','Message when reservation changed'], |
['ip','IP or DNS restriction'], |
['ip','IP or DNS restriction'], |
['proctor','List of proctor ids'], |
['proctor','List of proctor ids'], |
['description','Slot Description'], |
['description','Slot Description'], |
Line 1522 sub csv_upload_assign {
|
Line 2680 sub csv_upload_assign {
|
my @slotdata = &Apache::loncommon::upfile_record_sep(); |
my @slotdata = &Apache::loncommon::upfile_record_sep(); |
if ($env{'form.noFirstLine'}) { shift(@slotdata); } |
if ($env{'form.noFirstLine'}) { shift(@slotdata); } |
my %fields=&Apache::grades::get_fields(); |
my %fields=&Apache::grades::get_fields(); |
$r->print('<h3>Creating Slots</h3>'); |
$r->print('<h3>'.&mt('Creating Slots').'</h3>'); |
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $countdone=0; |
my $countdone=0; |
Line 1585 sub csv_upload_assign {
|
Line 2743 sub csv_upload_assign {
|
next; |
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', |
foreach my $key ('ip','proctor','description','maxspace', |
'secret','symb') { |
'secret','symb') { |
if ($entries{$fields{$key}}) { |
if ($entries{$fields{$key}}) { |
Line 1609 sub csv_upload_assign {
|
Line 2791 sub csv_upload_assign {
|
$r->rflush(); |
$r->rflush(); |
$countdone++; |
$countdone++; |
} |
} |
$r->print("<p>Created $countdone slots\n</p>"); |
if ($countdone) { |
|
&Apache::lonnet::devalidate_slots_cache($cname,$cdom); |
|
} |
|
$r->print('<p>'.&mt('Created [quant,_1,slot]',$countdone)."\n".'</p>'); |
foreach my $error (@errors) { |
foreach my $error (@errors) { |
$r->print("<p><span class=\"LC_warning\">$error</span></p>\n"); |
$r->print('<p><span class="LC_warning">'.$error.'</span></p>'."\n"); |
} |
} |
&show_table($r,$mgr); |
&show_table($r,$mgr); |
return ''; |
return ''; |
} |
} |
|
|
|
sub slot_command_titles { |
|
my %titles = ( |
|
slotlog => 'Reservation Logs', |
|
showslots => 'Manage Slots', |
|
showresv => 'Reservation History', |
|
manageresv => 'Manage Reservations', |
|
uploadstart => 'Upload Slots File', |
|
csvuploadmap => 'Upload Slots File', |
|
csvuploadassign => 'Upload Slots File', |
|
delete => 'Slot Deletion', |
|
release => 'Reservation Result', |
|
remove_reservation => 'Remove Registration', |
|
get_reservation => 'Request Reservation', |
|
); |
|
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 { |
sub handler { |
my $r=shift; |
my $r=shift; |
|
|
Line 1628 sub handler {
|
Line 2839 sub handler {
|
} |
} |
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); |
|
|
|
my %crumb_titles = &slot_command_titles(); |
|
my $brcrum; |
|
|
my $vgr=&Apache::lonnet::allowed('vgr',$env{'request.course.id'}); |
my $vgr=&Apache::lonnet::allowed('vgr',$env{'request.course.id'}); |
my $mgr=&Apache::lonnet::allowed('mgr',$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'; |
|
} |
|
} elsif ($env{'form.command'} eq 'manageresv') { |
|
if (($vgr eq 'F') || ($mgr eq 'F')) { |
|
$env{'form.command'} = 'showslots'; |
|
} |
|
} |
my $title='Requesting Another Worktime'; |
my $title='Requesting Another Worktime'; |
if ($env{'form.command'} =~ /^(showslots|uploadstart|csvuploadmap|csvuploadassign)$/ && $vgr eq 'F') { |
if ($env{'form.command'} eq 'showresv') { |
$title = 'Managing Slots'; |
$title = 'Reservation History'; |
|
if ($env{'form.origin'} eq 'aboutme') { |
|
$brcrum =[{href=>"/adm/$env{'form.udom'}/$env{'form.uname'}/aboutme",text=>'Personal Information Page'}]; |
|
} else { |
|
$brcrum =[{href=>"/adm/slotrequest?command=manageresv",text=>'Manage Reservations'}]; |
|
} |
|
if (ref($brcrum) eq 'ARRAY') { |
|
push(@{$brcrum},{href=>"/adm/slotrequest?command=showresv",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", |
|
text=>$crumb_titles{'showslots'}}]; |
|
$title = 'Managing Slots'; |
|
unless ($env{'form.command'} eq 'showslots') { |
|
if (ref($brcrum) eq 'ARRAY') { |
|
push(@{$brcrum},{href=>"/adm/slotrequest?command=$env{'form.command'}",text=>$crumb_titles{$env{'form.command'}}}); |
|
} |
|
} |
|
} |
|
} elsif ($env{'form.command'} eq 'release') { |
|
if ($env{'form.context'} eq 'usermanage') { |
|
$brcrum =[{href=>"/adm/slotrequest?command=manageresv", |
|
text=>$crumb_titles{'showslots'}}]; |
|
$title = 'Manage Reservations'; |
|
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); |
my ($symb,$js,$available,$allavailable,$got_slots); |
|
$available = []; |
if ($env{'form.command'} eq 'showslots' && $vgr eq 'F') { |
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,\%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') { |
&show_table($r,$mgr); |
&show_table($r,$mgr); |
} elsif ($env{'form.command'} eq 'remove_registration' && $mgr eq 'F') { |
} elsif ($env{'form.command'} eq 'remove_registration' && $mgr eq 'F') { |
&remove_registration($r); |
&remove_registration($r); |
Line 1664 sub handler {
|
Line 2943 sub handler {
|
} |
} |
&csv_upload_map($r); |
&csv_upload_map($r); |
} |
} |
|
} elsif ($env{'form.command'} eq 'slotlog' && $mgr eq 'F') { |
|
&show_reservations_log($r); |
} else { |
} else { |
my $symb=&unescape($env{'form.symb'}); |
my $symb=&unescape($env{'form.symb'}); |
if (!defined($symb)) { |
if (!defined($symb)) { |
Line 1689 sub handler {
|
Line 2970 sub handler {
|
return OK; |
return OK; |
} |
} |
if ($env{'form.requestattempt'}) { |
if ($env{'form.requestattempt'}) { |
&show_choices($r,$symb); |
$r->print('<div class="LC_left_float">'); |
|
&show_choices($r,$symb,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') { |
} elsif ($env{'form.command'} eq 'release') { |
&release_slot($r,$symb); |
&release_slot($r,$symb); |
} elsif ($env{'form.command'} eq 'get') { |
} elsif ($env{'form.command'} eq 'get') { |
&get_slot($r,$symb); |
&get_slot($r,$symb); |
} elsif ($env{'form.command'} eq 'change') { |
} 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'}); |
&release_slot($r,$symb,$env{'form.releaseslot'}); |
} |
} |
} else { |
} else { |
$r->print("<p>Unknown command: ".$env{'form.command'}."</p>"); |
$r->print('<p>'.&mt('Unknown command: [_1]',$env{'form.command'}).'</p>'); |
} |
} |
} |
} |
&end_page($r); |
&end_page($r); |