version 1.126, 2015/09/23 23:04:53
|
version 1.146, 2023/07/08 16:57:47
|
Line 56 sub fail {
|
Line 56 sub fail {
|
} |
} |
|
|
sub start_page { |
sub start_page { |
my ($r,$title,$brcrum,$js)=@_; |
my ($r,$title,$brcrum,$bread_crumbs_component,$js,$mgr)=@_; |
my $args; |
my $args; |
if (ref($brcrum) eq 'ARRAY') { |
if (ref($brcrum) eq 'ARRAY') { |
$args = {bread_crumbs => $brcrum}; |
$args = {bread_crumbs => $brcrum}; |
|
if ($bread_crumbs_component) { |
|
$args->{bread_crumbs_component} = $bread_crumbs_component; |
|
} |
} |
} |
if (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) { |
if (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) { |
my %loaditems = ( |
my %loaditems = ( |
Line 71 sub start_page {
|
Line 74 sub start_page {
|
$args = { 'add_entries' => \%loaditems }; |
$args = { 'add_entries' => \%loaditems }; |
} |
} |
} |
} |
|
unless (($env{'form.context'} eq 'usermanage') || (($mgr eq 'F') && |
|
(($env{'form.command'} eq 'release') || |
|
($env{'form.command'} eq 'remove_registration')))) { |
|
if ($env{'form.symb'}) { |
|
my $symb=&unescape($env{'form.symb'}); |
|
my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($symb); |
|
if ($resurl =~ /ext\.tool$/) { |
|
my $target; |
|
my ($marker,$exttool) = (split(m{/},$resurl))[3,4]; |
|
$marker=~s/\D//g; |
|
if (($marker) && ($exttool) && ($env{'request.course.id'})) { |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my ($idx,$crstool,$is_tool,%toolhash,%toolsettings); |
|
if ($resurl eq "adm/$cdom/$cnum/$marker/$exttool") { |
|
my %toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum); |
|
$target = $toolsettings{'target'}; |
|
} |
|
} |
|
if ($target eq 'iframe') { |
|
$args->{'only_body'} = 1; |
|
} |
|
} |
|
} |
|
} |
$r->print(&Apache::loncommon::start_page($title,$js,$args)); |
$r->print(&Apache::loncommon::start_page($title,$js,$args)); |
} |
} |
|
|
Line 162 $js
|
Line 190 $js
|
var startdate = startm+"/"+startd+"/"+starty; |
var startdate = startm+"/"+startd+"/"+starty; |
var starttime = new Date(startdate).getTime(); |
var starttime = new Date(startdate).getTime(); |
starttime = starttime/1000; |
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 enddate = endm+"/"+endd+"/"+endy; |
var endtime = new Date(enddate).getTime(); |
var endtime = new Date(enddate).getTime(); |
endtime = endtime/1000; |
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; |
var shown = 0; |
for (var i=0; i<$i; i++) { |
for (var i=0; i<$i; i++) { |
if ((slotstart[i] >= starttime) && (slotend[i] <= endtime)) { |
if ((slotstart[i] >= starttime) && (slotend[i] <= endtime)) { |
Line 245 function uncheckSlotRadio() {
|
Line 288 function uncheckSlotRadio() {
|
} |
} |
} |
} |
} |
} |
|
|
|
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> |
</script> |
ENDSCRIPT |
ENDSCRIPT |
Line 353 sub get_consumed_uniqueperiods {
|
Line 493 sub get_consumed_uniqueperiods {
|
return 'error: Unable to determine current status'; |
return 'error: Unable to determine current status'; |
} |
} |
my @problems = $navmap->retrieveResources(undef, |
my @problems = $navmap->retrieveResources(undef, |
sub { $_[0]->is_problem() },1,0); |
sub { $_[0]->is_problem() || $_[0]->is_tool() },1,0); |
my %used_slots; |
my %used_slots; |
foreach my $problem (@problems) { |
foreach my $problem (@problems) { |
my $symb = $problem->symb(); |
my $symb = $problem->symb(); |
Line 441 sub make_reservation {
|
Line 581 sub make_reservation {
|
return 'error: Unable to determine current status'; |
return 'error: Unable to determine current status'; |
} |
} |
|
|
my $parm_symb = $symb; |
my $symb_for_db = $symb; |
my $parm_level = 1; |
my $parm_level = 1; |
if ($use_slots eq 'map' || $use_slots eq 'map_map') { |
if ($use_slots eq 'map' || $use_slots eq 'map_map') { |
my ($map) = &Apache::lonnet::decode_symb($symb); |
my ($map) = &Apache::lonnet::decode_symb($symb); |
$parm_symb = &Apache::lonnet::symbread($map); |
$symb_for_db = &Apache::lonnet::symbread($map); |
$parm_level = 2; |
$parm_level = 2; |
} |
} |
|
|
Line 488 sub make_reservation {
|
Line 628 sub make_reservation {
|
|
|
my %reservation=('name' => $env{'user.name'}.':'.$env{'user.domain'}, |
my %reservation=('name' => $env{'user.name'}.':'.$env{'user.domain'}, |
'timestamp' => time, |
'timestamp' => time, |
'symb' => $parm_symb); |
'symb' => $symb_for_db); |
|
|
my $success=&Apache::lonnet::newput('slot_reservations', |
my $success=&Apache::lonnet::newput('slot_reservations', |
{"$slot_name\0$wanted" => |
{"$slot_name\0$wanted" => |
Line 500 sub make_reservation {
|
Line 640 sub make_reservation {
|
if ($value) { |
if ($value) { |
$new_value=$value.':'.$new_value; |
$new_value=$value.':'.$new_value; |
} |
} |
&store_slot_parm($symb,$slot_name,$parm_level,$new_value,$cnum,$cdom); |
my $result = &store_slot_parm($symb,$symb_for_db,$slot_name,$parm_level, |
|
$new_value,$cnum,$cdom,$env{'user.name'}, |
|
$env{'user.domain'},'reserve',$env{'form.context'}); |
return $wanted; |
return $wanted; |
} |
} |
|
|
Line 509 sub make_reservation {
|
Line 651 sub make_reservation {
|
} |
} |
|
|
sub store_slot_parm { |
sub store_slot_parm { |
my ($symb,$slot_name,$parm_level,$new_value,$cnum,$cdom) = @_; |
my ($symb_for_parm,$symb_for_db,$slot_name,$parm_level,$new_value, |
my $result=&Apache::lonparmset::storeparm_by_symb($symb, |
$cnum,$cdom,$uname,$udom,$action,$context,$delflag) = @_; |
'0_availablestudent', |
|
$parm_level, $new_value, |
# store new parameter string |
'string', |
my $result=&Apache::lonparmset::storeparm_by_symb($symb_for_parm, |
$env{'user.name'}, |
'0_availablestudent', |
$env{'user.domain'}); |
$parm_level,$new_value, |
|
'string',$uname,$udom); |
&Apache::lonxml::debug("hrrm $result"); |
&Apache::lonxml::debug("hrrm $result"); |
my %storehash = ( |
my %storehash = ( |
symb => $symb, |
symb => $symb_for_db, |
slot => $slot_name, |
slot => $slot_name, |
action => 'reserve', |
action => $action, |
context => $env{'form.context'}, |
context => $context, |
); |
); |
|
|
&Apache::lonnet::write_log('course','slotreservationslog',\%storehash, |
&Apache::lonnet::write_log('course','slotreservationslog',\%storehash, |
'',$env{'user.name'},$env{'user.domain'}, |
$delflag,$uname,$udom,$cnum,$cdom); |
$cnum,$cdom); |
|
&Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash, |
&Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash, |
1,$env{'user.name'},$env{'user.domain'}, |
$delflag,$uname,$udom,$uname,$udom); |
$env{'user.name'},$env{'user.domain'}); |
return $result; |
|
|
return; |
|
} |
} |
|
|
sub remove_registration { |
sub remove_registration { |
Line 627 sub release_all_slot {
|
Line 767 sub release_all_slot {
|
&release_reservation($slot_name,$uname,$udom, |
&release_reservation($slot_name,$uname,$udom, |
$consumed{$entry}{'symb'},$mgr); |
$consumed{$entry}{'symb'},$mgr); |
if (!$result) { |
if (!$result) { |
$r->print('<p><span class="LC_error">'.&mt($msg).'</span></p>'); |
$r->print('<p class="LC_error">'.&mt($msg).'</p>'); |
} else { |
} else { |
$r->print("<p>$msg</p>"); |
$r->print("<p>$msg</p>"); |
} |
} |
Line 657 sub release_slot {
|
Line 797 sub release_slot {
|
my ($result,$msg) = |
my ($result,$msg) = |
&release_reservation($slot_name,$uname,$udom,$symb,$mgr); |
&release_reservation($slot_name,$uname,$udom,$symb,$mgr); |
if (!$result) { |
if (!$result) { |
$r->print('<p><span class="LC_error">'.&mt($msg).'</span></p>'); |
$r->print('<p class="LC_error">'.&mt($msg).'</p>'); |
} else { |
} else { |
$r->print("<p>$msg</p>"); |
$r->print("<p>$msg</p>"); |
} |
} |
Line 675 sub release_reservation {
|
Line 815 sub release_reservation {
|
my ($slot_name,$uname,$udom,$symb,$mgr) = @_; |
my ($slot_name,$uname,$udom,$symb,$mgr) = @_; |
my %slot=&Apache::lonnet::get_slot($slot_name); |
my %slot=&Apache::lonnet::get_slot($slot_name); |
my $description=&get_description($slot_name,\%slot); |
my $description=&get_description($slot_name,\%slot); |
|
my $msg; |
|
|
if ($mgr ne 'F') { |
if ($mgr ne 'F') { |
if ($slot{'starttime'} < time) { |
if ($slot{'starttime'} < time) { |
return (0,&mt('Not allowed to release Reservation: [_1], as it has already ended.',$description)); |
return (0,&mt('Not allowed to release Reservation: [_1], as it has already started.',$description)); |
} |
} |
} |
} |
|
my $context = $env{'form.context'}; |
|
|
# if the reservation symb is for a map get a resource in that map |
# get navmap object |
# to check slot parameters on |
|
my $navmap=Apache::lonnavmaps::navmap->new; |
my $navmap=Apache::lonnavmaps::navmap->new; |
if (!defined($navmap)) { |
if (!defined($navmap)) { |
return (0,'error: Unable to determine current status'); |
return (0,'error: Unable to determine current status'); |
} |
} |
|
|
|
my ($cnum,$cdom)=&get_course(); |
|
|
|
# get slot reservations, check if user has reservation |
|
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
|
"^$slot_name\0"); |
|
|
|
# |
|
# If release is because of a reservation *change*, symb(s) associated with reservation |
|
# being dropped may differ from the current symb. |
|
# |
|
# We need to get symb(s) from slot_reservations.db, and for each symb, update |
|
# the value of the availablestudent parameter, at the appropriate level |
|
# (as dictated by the value of the useslots parameter for the symb and user). |
|
# |
|
# We also delete all entries for the slot being released, for the specific user. |
|
# |
|
|
|
my $conflict; |
|
|
|
if (($env{'form.command'} eq 'change') && ($slot_name eq $env{'form.releaseslot'}) && |
|
($env{'form.slotname'} ne $slot_name)) { |
|
my %changedto = &Apache::lonnet::get_slot($env{'form.slotname'}); |
|
|
|
# check for conflicts |
|
my ($to_uniq_start,$to_uniq_end,$from_uniq_start,$from_uniq_end); |
|
if (ref($changedto{'uniqueperiod'}) eq 'ARRAY') { |
|
($to_uniq_start,$to_uniq_end) = @{$changedto{'uniqueperiod'}}; |
|
} |
|
if (ref($slot{'uniqueperiod'}) eq 'ARRAY') { |
|
($from_uniq_start,$from_uniq_end) = @{$slot{'uniqueperiod'}}; |
|
} |
|
my $to_start = $changedto{'starttime'}; |
|
my $to_end = $changedto{'endtime'}; |
|
my $from_start = $slot{'starttime'}; |
|
my $from_end = $slot{'endtime'}; |
|
|
|
if (! |
|
($from_start < $to_uniq_start && $from_end < $to_uniq_start) || |
|
($from_start > $to_uniq_end && $from_end > $to_uniq_end )) { |
|
$conflict = 1; |
|
} |
|
if (! |
|
($to_start < $from_uniq_start && $to_end < $from_uniq_start) || |
|
($to_start > $from_uniq_end && $to_end > $from_uniq_end )) { |
|
$conflict = 1; |
|
} |
|
|
|
if ($conflict) { |
|
my %symbs_for_slot; |
|
my (%to_delete,%failed,%released); |
|
foreach my $entry (keys(%consumed)) { |
|
if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) { |
|
$symbs_for_slot{$consumed{$entry}->{'symb'}} = 1; |
|
$to_delete{$entry} = 1; |
|
} |
|
} |
|
if (keys(%to_delete)) { |
|
my @removals = keys(%to_delete); |
|
if (&Apache::lonnet::del('slot_reservations',\@removals, |
|
$cdom,$cnum) eq 'ok') { |
|
foreach my $item (keys(%symbs_for_slot)) { |
|
my $result = &update_selectable($navmap,$slot_name,$item,$cdom, |
|
$cnum,$udom,$uname,$context); |
|
if ($result =~ /^error/) { |
|
$failed{$item} = 1; |
|
} else { |
|
$released{$item} = 1; |
|
} |
|
} |
|
} |
|
} |
|
if (keys(%released)) { |
|
$msg = '<span style="font-weight: bold;">'. |
|
&mt('Released Reservation: [_1]',$description).'</span> '. |
|
&mt('The following items had their reservation status change').':'; |
|
my (%folders,%pages,%container,%titles); |
|
foreach my $item (keys(%released)) { |
|
my $res = $navmap->getBySymb($item); |
|
if (ref($res)) { |
|
$titles{$item} = $res->title(); |
|
if ($res->is_map()) { |
|
$folders{$item}{'title'} = $titles{$item}; |
|
if ($res->is_page()) { |
|
$pages{$item}{'title'} = $titles{$item}; |
|
} else { |
|
$folders{$item}{'title'} = $titles{$item}; |
|
} |
|
} else { |
|
my $mapsrc = $res->enclosing_map_src(); |
|
my $map = $navmap->getResourceByUrl($mapsrc); |
|
if (ref($map)) { |
|
if ($map->id() eq '0.0') { |
|
$container{$mapsrc}{'title'} &mt('Top level of course'); |
|
} else { |
|
$container{$mapsrc}{'title'} = $map->title(); |
|
if ($map->is_page()) { |
|
$container{$mapsrc}{'page'} = 1; |
|
} |
|
} |
|
} |
|
$container{$mapsrc}{'resources'}{$item} = 1; |
|
} |
|
} |
|
} |
|
$msg .= '<ul>'; |
|
if (keys(%folders)) { |
|
$msg .= '<li>'.&mt('Folders').': '. |
|
join(', ', map { $folders{$_}{'title'} } (sort { $folders{$b}{'title'} cmp $folders{$a}{'title'} } (keys(%folders)))). |
|
'</li>'; |
|
} |
|
if (keys(%pages)) { |
|
$msg .= '<li>'.&mt('Composite Pages').': '. |
|
join(', ', map { $pages{$_}{'title'} } (sort { $pages{$b}{'title'} cmp $pages{$a}{'title'} } (keys(%pages)))). |
|
'</li>'; |
|
} |
|
if (keys(%container)) { |
|
$msg .= '<li>'.&mt('Resources').':<ul>'; |
|
foreach my $key (sort { $container{$b}{'title'} cmp $container{$a}{'title'} } (keys(%container))) { |
|
if (ref($container{$key}{'resources'}) eq 'HASH') { |
|
$msg .= '<li>'. |
|
join(', ', map { $titles{$_} } (sort(keys(%{$container{$key}{'resources'}})))); |
|
if ($container{$key}{'page'}) { |
|
$msg .= ' '.&mt('(in composite page [_1])',$container{$key}{'title'}).'</li>'; |
|
} else { |
|
$msg .= ' '.&mt('(in folder [_1])',$container{$key}{'title'}).'</li>'; |
|
} |
|
} |
|
} |
|
$msg .= '</ul></li>'; |
|
} |
|
$msg .= '</ul>'; |
|
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); |
|
} else { |
|
if (keys(%to_delete)) { |
|
$msg = &mt('Reservation release partially complete for [_1]',$description); |
|
} else { |
|
$msg = &mt('No entries found for this user to release for [_1].',$description); |
|
} |
|
return (0,$msg); |
|
} |
|
} else { |
|
$msg = &mt('No conflict found; not releasing: [_1].',$description); |
|
return (0,$msg); |
|
} |
|
} |
|
|
|
my $map_symb; |
|
my $parm_symb = $symb; |
my $passed_resource = $navmap->getBySymb($symb); |
my $passed_resource = $navmap->getBySymb($symb); |
|
|
|
# if the reservation symb is for a map get a resource in that map |
|
# to check slot parameters on |
|
my $parm_level = 1; |
if (ref($passed_resource)) { |
if (ref($passed_resource)) { |
if ($passed_resource->is_map()) { |
if ($passed_resource->is_map()) { |
my ($a_resource) = |
my ($a_resource) = |
$navmap->retrieveResources($passed_resource, |
$navmap->retrieveResources($passed_resource, |
sub {$_[0]->is_problem()},0,1); |
sub {$_[0]->is_problem() || $_[0]->is_tool() },0,1); |
$symb = $a_resource->symb(); |
$parm_symb = $a_resource->symb(); |
} |
} |
} else { |
} else { |
unless ($mgr eq 'F') { |
unless ($mgr eq 'F') { |
Line 702 sub release_reservation {
|
Line 1000 sub release_reservation {
|
} |
} |
} |
} |
|
|
# get parameter string, check for existence, rebuild string with the slot |
# Get value of useslots parameter in effect for this user. |
my $student = &Apache::lonnet::EXT("resource.0.availablestudent", |
# If value is map or map_map, then the parm level is 2 (i.e., |
$symb,$udom,$uname); |
# non-recursive enclosing map/folder level for specific user) |
my @slots = split(/:/,$student); |
# and the symb for this reservation in slot_reservations.db |
|
# will be the symb of the map itself. |
my @new_slots; |
|
foreach my $exist_slot (@slots) { |
my $use_slots = &Apache::lonnet::EXT('resource.0.useslots', |
if ($exist_slot eq $slot_name) { next; } |
$parm_symb,$udom,$uname); |
push(@new_slots,$exist_slot); |
if (&Apache::lonnet::error($use_slots)) { |
|
return (0,'error: Unable to determine current status'); |
|
} |
|
if ($use_slots eq 'map' || $use_slots eq 'map_map') { |
|
$parm_level = 2; |
|
if ($passed_resource->is_map()) { |
|
$map_symb = $passed_resource->symb(); |
|
} else { |
|
my ($map) = &Apache::lonnet::decode_symb($symb); |
|
$map_symb = &Apache::lonnet::symbread($map); |
|
} |
} |
} |
my $new_param = join(':',@new_slots); |
|
|
|
my ($cnum,$cdom)=&get_course(); |
# |
|
# If release is *not* because of a reservation change, i.e., this is a "drop" |
|
# by a student, or a removal for a single student by an instructor then |
|
# only remove one entry from slot_reservations.db, where both the user |
|
# and the symb match the current context. If useslots was set to map or |
|
# map_map, then the symb to match in slot_reservations.db is the symb of |
|
# the enclosing map/folder, not the symb of the resource. |
|
# |
|
|
# get slot reservations, check if user has one, if so remove reservation |
my ($match,$symb_to_check); |
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
if ($parm_level == 2) { |
"^$slot_name\0"); |
$symb_to_check = $map_symb; |
|
} else { |
|
$symb_to_check = $parm_symb; |
|
} |
foreach my $entry (keys(%consumed)) { |
foreach my $entry (keys(%consumed)) { |
if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) { |
if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) { |
&Apache::lonnet::del('slot_reservations',[$entry], |
if ($consumed{$entry}->{'symb'} eq $symb_to_check) { |
$cdom,$cnum); |
if (&Apache::lonnet::del('slot_reservations',[$entry], |
my %storehash = ( |
$cdom,$cnum) eq 'ok') { |
symb => $symb, |
$match = $symb_to_check; |
slot => $slot_name, |
} |
action => 'release', |
last; |
context => $env{'form.context'}, |
} |
); |
} |
&Apache::lonnet::write_log('slotreservationslog',\%storehash, |
} |
1,$uname,$udom,$cnum,$cdom); |
if ($match) { |
&Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash, |
if (&update_selectable($navmap,$slot_name,$symb,$cdom, |
1,$uname,$udom,$uname,$udom); |
$cnum,$udom,$uname,$context) =~ /^error/) { |
} |
if ($mgr eq 'F') { |
|
$msg = &mt('Reservation release partially complete for: [_1]',"$uname:$udom").'<br />'. |
|
&mt('Update of availablestudent parameter for [_1] was not completed.',"$uname:$udom"); |
|
} else { |
|
$msg = &mt('Release partially complete for: [_1]',$description); |
|
} |
|
return (0,$msg); |
|
} else { |
|
if ($mgr eq 'F') { |
|
$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom"); |
|
} else { |
|
$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); |
|
} |
|
} else { |
|
$msg = &mt('Release failed for: [_1]',$description); |
|
return (0,$msg); |
} |
} |
|
} |
|
|
my $use_slots = &Apache::lonnet::EXT("resource.0.useslots", |
sub update_selectable { |
$symb,$udom,$uname); |
my ($navmap,$slot_name,$symb,$cdom,$cnum,$udom,$uname,$context) = @_; |
|
return 'error: ' unless (ref($navmap)); |
|
my $symb_for_parm = $symb; |
|
my $passed_resource = $navmap->getBySymb($symb); |
|
return 'error: invalid symb' unless (ref($passed_resource)); |
|
|
|
# if the reservation symb is for a map get a resource in that map |
|
# to check slot parameters on |
|
if ($passed_resource->is_map()) { |
|
my ($a_resource) = |
|
$navmap->retrieveResources($passed_resource, |
|
sub {$_[0]->is_problem() || $_[0]->is_tool() },0,1); |
|
$symb_for_parm = $a_resource->symb(); |
|
} |
|
# get parameter string, check for existence, rebuild string with the slot |
|
my $student = &Apache::lonnet::EXT('resource.0.availablestudent', |
|
$symb_for_parm,$udom,$uname); |
|
|
|
# Get value of useslots parameter in effect for this user. |
|
# If value is map or map_map, then the parm level is 2 (i.e., |
|
# non-recursive enclosing map/folder level for specific user) |
|
# and the symb for this reservation in slot_reservations.db |
|
# will be the symb of the map itself. |
|
|
|
my $use_slots = &Apache::lonnet::EXT('resource.0.useslots', |
|
$symb_for_parm,$udom,$uname); |
&Apache::lonxml::debug("use_slots is $use_slots<br />"); |
&Apache::lonxml::debug("use_slots is $use_slots<br />"); |
|
|
if (&Apache::lonnet::error($use_slots)) { |
if (&Apache::lonnet::error($use_slots)) { |
return (0,'error: Unable to determine current status'); |
return 'error: Unable to determine current status'; |
} |
} |
|
|
my $parm_level = 1; |
my $parm_level = 1; |
if ($use_slots eq 'map' || $use_slots eq 'map_map') { |
if ($use_slots eq 'map' || $use_slots eq 'map_map') { |
$parm_level = 2; |
$parm_level = 2; |
} |
} |
# store new parameter string |
|
my $result=&Apache::lonparmset::storeparm_by_symb($symb, |
my @slots = split(/:/,$student); |
'0_availablestudent', |
|
$parm_level, $new_param, |
my @new_slots; |
'string', $uname, $udom); |
foreach my $exist_slot (@slots) { |
my $msg; |
next if ($exist_slot eq $slot_name); |
if ($mgr eq 'F') { |
push(@new_slots,$exist_slot); |
$msg = &mt('Released Reservation for user: [_1]',"$uname:$udom"); |
|
} else { |
|
$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); |
my $new_value = join(':',@new_slots); |
|
|
|
my $result = &store_slot_parm($symb_for_parm,$symb,$slot_name,$parm_level, |
|
$new_value,$cnum,$cdom,$uname,$udom,'release', |
|
$context,1); |
|
return $result; |
} |
} |
|
|
sub delete_slot { |
sub delete_slot { |
Line 785 sub delete_slot {
|
Line 1147 sub delete_slot {
|
if ($ret eq 'ok') { |
if ($ret eq 'ok') { |
$r->print('<p>'.&mt('Slot [_1] marked as deleted.','<tt>'.$slot_name.'</tt>').'</p>'); |
$r->print('<p>'.&mt('Slot [_1] marked as deleted.','<tt>'.$slot_name.'</tt>').'</p>'); |
} else { |
} else { |
$r->print('<p><span class="LC_error">'.&mt('An error occurred when attempting to delete slot: [_1]','<tt>'.$slot_name.'</tt>')." ($ret)</span></p>"); |
$r->print('<p class="LC_error">'.&mt('An error occurred when attempting to delete slot: [_1]','<tt>'.$slot_name.'</tt>')." ($ret)</p>"); |
} |
} |
} else { |
} else { |
if (%consumed) { |
if (%consumed) { |
Line 801 sub delete_slot {
|
Line 1163 sub delete_slot {
|
|
|
sub return_link { |
sub return_link { |
my ($r) = @_; |
my ($r) = @_; |
|
my $target = &return_target(); |
if (($env{'form.command'} eq 'manageresv') || ($env{'form.context'} eq 'usermanage')) { |
if (($env{'form.command'} eq 'manageresv') || ($env{'form.context'} eq 'usermanage')) { |
$r->print('<p><a href="/adm/slotrequest?command=manageresv">'. |
$r->print('<p><a href="/adm/slotrequest?command=manageresv" target="'.$target.'">'. |
&mt('Return to reservations')); |
&mt('Return to reservations').'</a></p>'); |
} else { |
} else { |
$r->print('<p><a href="/adm/flip?postdata=return:">'. |
$r->print('<p><a href="/adm/flip?postdata=return:" target="'.$target.'">'. |
&mt('Return to last resource').'</a></p>'); |
&mt('Return to last resource').'</a></p>'); |
} |
} |
} |
} |
|
|
|
sub return_target { |
|
my ($target,$ltitarget,$deeplinktarget); |
|
if ($env{'request.lti.login'}) { |
|
$ltitarget = $env{'request.lti.target'}; |
|
} |
|
if ($env{'request.deeplink.login'}) { |
|
$deeplinktarget = $env{'request.deeplink.target'}; |
|
} |
|
if (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) { |
|
$target = '_self'; |
|
} else { |
|
$target = '_top'; |
|
} |
|
return $target; |
|
} |
|
|
sub get_slot { |
sub get_slot { |
my ($r,$symb,$conflictable_slot,$inhibit_return_link)=@_; |
my ($r,$symb,$conflictable_slot,$inhibit_return_link)=@_; |
|
|
Line 817 sub get_slot {
|
Line 1196 sub get_slot {
|
my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot); |
my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot); |
|
|
if ($slot_name =~ /^error: (.*)/) { |
if ($slot_name =~ /^error: (.*)/) { |
$r->print('<p><span class="LC_error">' |
$r->print('<p class="LC_error">' |
.&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>'); |
.'</p>'); |
&return_link($r); |
&return_link($r); |
return 0; |
return 0; |
} |
} |
if ($slot_name && $slot_name ne $conflictable_slot) { |
if ($slot_name && $slot_name ne $conflictable_slot) { |
my %slot=&Apache::lonnet::get_slot($slot_name); |
my %slot=&Apache::lonnet::get_slot($slot_name); |
my $description1=&get_description($slot_name,\%slot); |
my $description1=&get_description($slot_name,\%slot); |
|
my $slottype1=$slot{'type'}; |
%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); |
if ($slot_name ne $env{'form.slotname'}) { |
if ($slottype1 eq 'preassigned') { |
|
$r->print('<p>'.&mt('You already have a reservation: "[_1]", assigned by your instructor.', |
|
$description1).'</p>'. |
|
'<p>'.&mt('Your instructor must unassign it before you can make a new reservation.'). |
|
'</p>'); |
|
} elsif ($slot_name ne $env{'form.slotname'}) { |
$r->print(<<STUFF); |
$r->print(<<STUFF); |
<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'}" /> |
Line 866 STUFF
|
Line 1251 STUFF
|
if (defined($reserved)) { |
if (defined($reserved)) { |
my $retvalue = 0; |
my $retvalue = 0; |
if ($slot_name =~ /^error: (.*)/) { |
if ($slot_name =~ /^error: (.*)/) { |
$r->print('<p><span class="LC_error">' |
$r->print('<p class="LC_error">' |
.&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>'); |
.'</p>'); |
} elsif ($reserved > -1) { |
} elsif ($reserved > -1) { |
$r->print('<p style="font-weight: bold;">'.&mt('Successfully signed up: [_1]',$description).'</p>'); |
$r->print('<p style="font-weight: bold;">'.&mt('Successfully signed up: [_1]',$description).'</p>'); |
$retvalue = 1; |
$retvalue = 1; |
Line 1002 sub allowed_slot {
|
Line 1387 sub allowed_slot {
|
# not allowed for this resource |
# not allowed for this resource |
if (defined($slot->{'symb'})) { |
if (defined($slot->{'symb'})) { |
my $exclude = 1; |
my $exclude = 1; |
my ($slotmap,$slotid,$sloturl) = &Apache::lonnet::decode_symb($slot->{'symb'}); |
my @symbs; |
if ($sloturl=~/\.(page|sequence)$/) { |
if ($slot->{'symb'} =~ /,/) { |
my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb); |
@symbs = split(/\s*,\s*/,$slot->{'symb'}); |
if (($map ne '') && ($map eq $slotmap)) { |
} 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; |
$exclude = 0; |
|
last; |
} |
} |
} elsif ($slot->{'symb'} eq $symb) { |
|
$exclude = 0; |
|
} |
} |
if ($exclude) { |
if ($exclude) { |
unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) { |
unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) { |
Line 1043 sub get_description {
|
Line 1439 sub get_description {
|
} |
} |
|
|
sub show_choices { |
sub show_choices { |
my ($r,$symb,$formname,$num,$slots,$consumed_uniqueperiods,$available,$got_slots)=@_; |
my ($symb,$formname,$num,$class,$slots,$consumed_uniqueperiods,$available,$got_slots)=@_; |
my $output; |
my $output; |
&Apache::lonxml::debug("Checking Slots"); |
&Apache::lonxml::debug("Checking Slots"); |
if (!ref($available) eq 'ARRAY') { |
if (!ref($available) eq 'ARRAY') { |
Line 1052 sub show_choices {
|
Line 1448 sub show_choices {
|
if (!@{$available}) { |
if (!@{$available}) { |
$output = '<span class="LC_info">'.&mt('No available times.').'</span>'; |
$output = '<span class="LC_info">'.&mt('No available times.').'</span>'; |
if ($env{'form.command'} ne 'manageresv') { |
if ($env{'form.command'} ne 'manageresv') { |
$output .= ' <a href="/adm/flip?postdata=return:">'. |
my $target = &return_target(); |
|
$output .= ' <a href="/adm/flip?postdata=return:" target="'.$target.'">'. |
&mt('Return to last resource').'</a>'; |
&mt('Return to last resource').'</a>'; |
} |
} |
$r->print($output); |
if ($class) { |
return; |
return '<div class="'.$class.'">'.$output.'</div>'; |
|
} else { |
|
return $output; |
|
} |
} |
} |
if (@{$available} > 1) { |
if (@{$available} > 1) { |
my $numavailable = scalar(@{$available}); |
my $numavailable = scalar(@{$available}); |
Line 1204 STUFF
|
Line 1604 STUFF
|
if (@{$available} > 1) { |
if (@{$available} > 1) { |
$output .= '</div></fieldset>'; |
$output .= '</div></fieldset>'; |
} |
} |
$r->print($output); |
if ($class) { |
return; |
return '<div class="'.$class.'">'.$output.'</div>'; |
|
} else { |
|
return $output; |
|
} |
} |
} |
|
|
sub to_show { |
sub to_show { |
Line 1306 sub show_table {
|
Line 1709 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 |
|
$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"> |
<input type="hidden" name="command" value="uploadstart" /> |
<input type="hidden" name="command" value="uploadstart" /> |
Line 1319 sub show_table {
|
Line 1718 sub show_table {
|
$r->print('<form method="post" action="/adm/helper/newslot.helper"> |
$r->print('<form method="post" action="/adm/helper/newslot.helper"> |
<input type="submit" name="newslot" value="'.&mt('Create a New Slot').'" /> |
<input type="submit" name="newslot" value="'.&mt('Create a New Slot').'" /> |
</form>'); |
</form>'); |
$r->print(&Apache::loncommon::help_open_topic('Slot AddInterface')); |
$r->print(&Apache::loncommon::help_open_topic('Slot About')); |
$r->print('</div>'); |
$r->print('</div>'); |
} |
} |
|
|
Line 1360 sub show_table {
|
Line 1759 sub show_table {
|
'secret' => 'Secret Word', |
'secret' => 'Secret Word', |
'space' => '# of students/max', |
'space' => '# of students/max', |
'ip' => 'IP or DNS restrictions', |
'ip' => 'IP or DNS restrictions', |
'symb' => 'Resource/Map slot is restricted to.', |
'symb' => 'Resource(s)/Map(s) slot is restricted to.', |
'allowedsections' => 'Sections slot is restricted to.', |
'allowedsections' => 'Sections slot is restricted to.', |
'allowedusers' => 'Users slot is restricted to.', |
'allowedusers' => 'Users slot is restricted to.', |
'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', |
|
'iptied' => 'Unique IP each student',); |
if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
$show_fields{'startreserve'} = &mt('Time members can start reserving'); |
$show_fields{'startreserve'} = &mt('Time members can start reserving'); |
$show_fields{'endreserve'} = &mt('Time members can no longer reserve'); |
$show_fields{'endreserve'} = &mt('Time members can no longer reserve'); |
Line 1373 sub show_table {
|
Line 1773 sub show_table {
|
} |
} |
my @show_order=('name','description','type','starttime','endtime', |
my @show_order=('name','description','type','starttime','endtime', |
'startreserve','endreserve','reservationmsg','secret','space', |
'startreserve','endreserve','reservationmsg','secret','space', |
'ip','symb','allowedsections','allowedusers','uniqueperiod', |
'ip','iptied','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 1472 sub show_table {
|
Line 1872 sub show_table {
|
$r->print('</div>'); |
$r->print('</div>'); |
$r->print('<p><input type="submit" name="start" value="'.&mt('Update Display').'" /></p>'); |
$r->print('<p><input type="submit" name="start" value="'.&mt('Update Display').'" /></p>'); |
my $linkstart='<a href="/adm/slotrequest?command=showslots&order='; |
my $linkstart='<a href="/adm/slotrequest?command=showslots&order='; |
$r->print(&Apache::loncommon::start_data_table(). |
my $tableheader = &Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row().' |
&Apache::loncommon::start_data_table_header_row().' |
<th></th>'); |
<th></th>'; |
foreach my $which (@show_order) { |
foreach my $which (@show_order) { |
if ($which ne 'proctor' && exists($show{$which})) { |
if ($which ne 'proctor' && exists($show{$which})) { |
$r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>'); |
$tableheader .= '<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>'; |
} |
} |
} |
} |
$r->print(&Apache::loncommon::end_data_table_header_row()); |
$tableheader .= &Apache::loncommon::end_data_table_header_row(); |
|
my $shownheader = 0; |
|
|
my %name_cache; |
my %name_cache; |
my $slotsort = sub { |
my $slotsort = sub { |
Line 1575 sub show_table {
|
Line 1976 sub show_table {
|
localtime($slots{$slot}{'uniqueperiod'}[1]); |
localtime($slots{$slot}{'uniqueperiod'}[1]); |
} |
} |
|
|
my $title; |
my @titles; |
if (exists($slots{$slot}{'symb'})) { |
if (exists($slots{$slot}{'symb'})) { |
my (undef,undef,$res)= |
my @symbs; |
&Apache::lonnet::decode_symb($slots{$slot}{'symb'}); |
if ($slots{$slot}{'symb'} =~ /,/) { |
$res = &Apache::lonnet::clutter($res); |
@symbs = split(/\s*,\s*/,$slots{$slot}{'symb'}); |
$title = &Apache::lonnet::gettitle($slots{$slot}{'symb'}); |
} else { |
$title='<a href="'.$res.'?symb='.$slots{$slot}{'symb'}.'">'.$title.'</a>'; |
@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; |
my $allowedsections; |
Line 1629 sub show_table {
|
Line 2038 sub show_table {
|
delete => 'Delete', |
delete => 'Delete', |
slotlog => 'History', |
slotlog => 'History', |
); |
); |
my $edit=(<<"EDITLINK"); |
my ($edit,$delete,$showlog,$remove_all); |
|
if ($mgr) { |
|
$edit=(<<"EDITLINK"); |
<a href="/adm/helper/newslot.helper?name=$slot">$lt{'edit'}</a> |
<a href="/adm/helper/newslot.helper?name=$slot">$lt{'edit'}</a> |
EDITLINK |
EDITLINK |
|
|
my $delete=(<<"DELETELINK"); |
$delete=(<<"DELETELINK"); |
<a href="/adm/slotrequest?command=delete&slotname=$slot">$lt{'delete'}</a> |
<a href="/adm/slotrequest?command=delete&slotname=$slot">$lt{'delete'}</a> |
DELETELINK |
DELETELINK |
|
|
my $showlog=(<<"LOGLINK"); |
$remove_all=&remove_link($slot,'remove all').'<br />'; |
|
|
|
if ($ids eq '') { |
|
undef($remove_all); |
|
} else { |
|
undef($delete); |
|
} |
|
} |
|
|
|
$showlog=(<<"LOGLINK"); |
<a href="/adm/slotrequest?command=slotlog&slotname=$slot">$lt{'slotlog'}</a> |
<a href="/adm/slotrequest?command=slotlog&slotname=$slot">$lt{'slotlog'}</a> |
LOGLINK |
LOGLINK |
|
|
my $remove_all=&remove_link($slot,'remove all').'<br />'; |
|
|
|
if ($ids eq '') { |
|
undef($remove_all); |
|
} else { |
|
undef($delete); |
|
} |
|
if ($slots{$slot}{'type'} ne 'schedulable_student') { |
if ($slots{$slot}{'type'} ne 'schedulable_student') { |
undef($showlog); |
undef($showlog); |
undef($remove_all); |
undef($remove_all); |
} |
} |
|
|
|
unless ($shownheader) { |
|
$r->print($tableheader); |
|
$shownheader = 1; |
|
} |
|
|
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. |
Line 1697 LOGLINK
|
Line 2115 LOGLINK
|
if (exists($show{'ip'})) { |
if (exists($show{'ip'})) { |
$colspan++;$r->print("<td>$slots{$slot}{'ip'}</td>\n"); |
$colspan++;$r->print("<td>$slots{$slot}{'ip'}</td>\n"); |
} |
} |
|
if (exists($show{'iptied'})) { |
|
$colspan++; |
|
if ($slots{$slot}{'iptied'} eq 'yes') { |
|
$r->print('<td>'.&mt('Yes')."</td>\n"); |
|
} elsif ($slots{$slot}{'iptied'} eq 'answer') { |
|
$r->print('<td>'.&mt('Yes, including post-answer date')."</td>\n"); |
|
} else { |
|
$r->print('<td>'.&mt('No')."</td>\n"); |
|
} |
|
} |
if (exists($show{'symb'})) { |
if (exists($show{'symb'})) { |
$colspan++;$r->print("<td>$title</td>\n"); |
$colspan++;$r->print("<td>".join('<br />',@titles)."</td>\n"); |
} |
} |
if (exists($show{'allowedsections'})) { |
if (exists($show{'allowedsections'})) { |
$colspan++;$r->print("<td>$allowedsections</td>\n"); |
$colspan++;$r->print("<td>$allowedsections</td>\n"); |
Line 1721 $row_end
|
Line 2149 $row_end
|
STUFF |
STUFF |
} |
} |
} |
} |
$r->print(&Apache::loncommon::end_data_table().'</form>'); |
if ($shownheader) { |
|
$r->print(&Apache::loncommon::end_data_table()); |
|
} else { |
|
$r->print('<p>'.&mt('No slots meet the criteria for display').'</p>'); |
|
} |
|
$r->print('</form>'); |
return; |
return; |
} |
} |
|
|
sub manage_reservations { |
sub manage_reservations { |
my ($r,$crstype,$slots,$consumed_uniqueperiods,$allavailable) = @_; |
my ($r,$crstype,$slots,$consumed_uniqueperiods,$allavailable) = @_; |
|
my ($cnum,$cdom)=&get_course(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
my $navmap = Apache::lonnavmaps::navmap->new(); |
$r->print('<p>' |
$r->print('<p>' |
.&mt('Instructors may use a reservation system to place restrictions on when and where assignments can be worked on.') |
.&mt('Instructors may use a reservation system to place restrictions on when and where assignments can be worked on.') |
Line 1758 sub manage_reservations {
|
Line 2192 sub manage_reservations {
|
'</span>'); |
'</span>'); |
return; |
return; |
} |
} |
my (%parent,%shownparent,%container,%container_title,%contents); |
my (%output,%slotinfo,%statusbymap,%repsymbs,%shownmaps); |
my ($depth,$count,$reservable,$lastcontainer,$rownum) = (0,0,0,0,0); |
my @possibles = $navmap->retrieveResources(undef, |
my @backgrounds = ("LC_odd_row","LC_even_row"); |
sub { $_[0]->is_problem() || $_[0]->is_tool() },1,0); |
|
|
|
foreach my $resource (@possibles) { |
|
my ($useslots) = $resource->slot_control(); |
|
next if (($useslots eq '') || ($useslots =~ /^\s*no\s*$/i)); |
|
my $symb = $resource->symb(); |
|
my ($slot_status,$date,$slot_name) = $resource->check_for_slot('0'); |
|
my ($msg,$get_choices,$slotdescription); |
|
my $status = $resource->simpleStatus('0'); |
|
my ($msg,$get_choices,$slotdescription); |
|
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'); |
|
} |
|
} |
|
$output{$symb}{'msg'} = $msg; |
|
if (($status == $resource->OPEN) && ($get_choices)) { |
|
$output{$symb}{'hasaction'} = 1; |
|
} |
|
my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($symb); |
|
$mapurl = &Apache::lonnet::clutter($mapurl); |
|
unless ($mapurl =~ /default\.sequence$/) { |
|
$shownmaps{$mapurl} = 1; |
|
my $map = $navmap->getResourceByUrl($mapurl); |
|
if (ref($map)) { |
|
my @pcs = split(/,/,$map->map_hierarchy()); |
|
shift(@pcs); |
|
shift(@pcs); |
|
if (@pcs) { |
|
map { $shownmaps{$navmap->getByMapPc($_)->src()} = 1; } reverse(@pcs); |
|
} |
|
} |
|
} |
|
if (($useslots eq 'map_map') || ($useslots eq 'map')) { |
|
if ($slot_status ne '') { |
|
if (ref($statusbymap{$mapurl}{$slot_status}) eq 'ARRAY') { |
|
push(@{$statusbymap{$mapurl}{$slot_status}},$symb); |
|
} else { |
|
$statusbymap{$mapurl}{$slot_status} = [$symb]; |
|
} |
|
} |
|
} |
|
} |
|
|
|
foreach my $mapurl (keys(%statusbymap)) { |
|
if (ref($statusbymap{$mapurl}) eq 'HASH') { |
|
if (keys(%{$statusbymap{$mapurl}}) == 1) { |
|
my @values = values(%{$statusbymap{$mapurl}}); |
|
my $repsymb = $values[0][0]; |
|
if (ref($output{$repsymb}) eq 'HASH') { |
|
$output{$mapurl}{'msg'} = $output{$repsymb}{'msg'}; |
|
$output{$mapurl}{'hasaction'} = $output{$repsymb}{'hasaction'}; |
|
} |
|
$repsymbs{$mapurl} = $repsymb; |
|
} |
|
} |
|
} |
|
|
|
my (%parent,%container,%container_title); |
|
my ($depth,$count,$reservable,$currcontainer,$rownum,$mapnum,$shown) = (0,0,0,0,0,0,0); |
|
my @backgrounds = ("LC_even_row","LC_odd_row"); |
my $numcolors = scalar(@backgrounds); |
my $numcolors = scalar(@backgrounds); |
my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif"); |
my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif"); |
my $slotheader = '<p>'. |
my $slotheader = '<p>'. |
&mt('Your reservation status for any such assignments is listed below:'). |
&mt('Your reservation status for any such assignments is listed below:'). |
'</p>'. |
'</p>'. |
'<table class="LC_data_table LC_tableOfContent">'."\n"; |
'<table class="LC_data_table LC_tableOfContent" id="LC_slot_reservations">'."\n"; |
my $shownheader = 0; |
my $shownheader = 0; |
|
my $currmap; |
my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef); |
my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef); |
while (my $resource = $it->next()) { |
while (my $resource = $it->next()) { |
if ($resource == $it->BEGIN_MAP()) { |
if ($resource == $it->BEGIN_MAP()) { |
$depth++; |
$depth++; |
$parent{$depth} = $lastcontainer; |
$parent{$depth} = $currcontainer; |
} |
if (ref($container{$currcontainer})) { |
if ($resource == $it->END_MAP()) { |
my $currmapres = $container{$currcontainer}; |
$depth--; |
my $currmaptitle = $container_title{$currcontainer}; |
$lastcontainer = $parent{$depth}; |
$currmap = $currmapres->src(); |
} |
my $currmaptype = 'sequence'; |
if (ref($resource)) { |
if ($currmapres->is_page()) { |
my $symb = $resource->symb(); |
$currmaptype = 'page'; |
my $ressymb = $symb; |
} |
$contents{$lastcontainer} ++; |
if ($shownmaps{$currmap}) { |
next if (!$resource->is_problem() && !$resource->is_sequence() && |
$mapnum ++; |
!$resource->is_page()); |
$rownum ++; |
$count ++; |
$shown ++; |
if (($resource->is_sequence()) || ($resource->is_page())) { |
if (!$shownheader) { |
$lastcontainer = $count; |
$r->print($slotheader); |
$container{$lastcontainer} = $resource; |
$shownheader = 1; |
$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'); |
|
} |
} |
} |
my $bgcolor = $backgrounds[$shown % $numcolors]; |
$reservable ++; |
my ($spacers,$icon); |
my $treelevel = $depth; |
my $row = '<tr class="'.$bgcolor.'" id="LC_slotmaprow_'.$rownum.'">'; |
my $higherup = $lastcontainer; |
if (ref($statusbymap{$currmap}) eq 'HASH') { |
if ($depth > 1) { |
my ($spacers,$icon) = &show_map_row($depth-1,$location,$currmaptype,$currmaptitle); |
my @maprows; |
my $arrowstate = 'open'; |
while ($treelevel > 1) { |
if (keys(%{$statusbymap{$currmap}}) == 1) { |
if (ref($container{$higherup})) { |
$arrowstate = 'closed'; |
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 --; |
$row .= '<td>'.$spacers.'<img src="/adm/lonIcons/arrow.'.$arrowstate.'.gif" '. |
$higherup = $parent{$treelevel}; |
'id="arrow'.$mapnum.'" '.'alt="arrow" onmouseover="this.style.cursor=\'pointer\'" '. |
} |
'onclick="'."toggleSlotMap('$mapnum','$rownum');".'" />'. |
foreach my $item (@maprows) { |
$icon.(' ' x6).'</td>'."\n"; |
$rownum ++; |
if (ref($output{$currmap}) eq 'HASH') { |
my $bgcolor = $backgrounds[$rownum % $numcolors]; |
my $formnum = $mapnum.'_'.$reservable+1; |
if (!$shownheader) { |
my $class = 'LC_slotmaptext_'.$mapnum; |
$r->print($slotheader); |
if ($output{$currmap}{'hasaction'}) { |
$shownheader = 1; |
$row .= '<td valign="top"><span class="'.$class.'">'. |
|
$output{$currmap}{'msg'}. |
|
'</span></td><td valign="top">'. |
|
&slot_chooser($repsymbs{$currmap},$class,$formnum, |
|
$allavailable,$slots,$consumed_uniqueperiods). |
|
'</td>'; |
|
} else { |
|
$row .= '<td colspan="2" valign="middle"><span class="'.$class.'">'. |
|
$output{$currmap}{'msg'}. |
|
'</span></td>'; |
|
} |
|
$row .= '</tr>'."\n"; |
|
} else { |
|
$row .= '<td colspan="2"> </td></tr>'."\n"; |
} |
} |
$r->print('<tr class="'.$bgcolor.'">'.$item.'</tr>'."\n"); |
} else { |
|
my ($spacers,$icon) = &show_map_row($depth,$location,$currmaptype,$currmaptitle); |
|
$row .= '<td>'.$spacers.$icon.(' ' x6).'</td><td colspan="2"> </td></tr>'."\n"; |
} |
} |
|
$r->print($row); |
} |
} |
|
} |
|
} elsif ($resource == $it->END_MAP()) { |
|
$depth--; |
|
$currcontainer = $parent{$depth}; |
|
} elsif (ref($resource)) { |
|
my $symb = $resource->symb(); |
|
next if (!$resource->is_problem() && !$resource->is_tool() && |
|
!$resource->is_sequence() && !$resource->is_page()); |
|
$count ++; |
|
if (($resource->is_sequence()) || ($resource->is_page())) { |
|
$currcontainer = $count; |
|
$container{$currcontainer} = $resource; |
|
$container_title{$currcontainer} = $resource->compTitle(); |
|
} |
|
if ($resource->is_problem() || $resource->is_tool()) { |
|
next unless (exists($output{$symb})); |
|
$reservable ++; |
$rownum ++; |
$rownum ++; |
my $bgcolor = $backgrounds[$rownum % $numcolors]; |
|
if (!$shownheader) { |
if (!$shownheader) { |
$r->print($slotheader); |
$r->print($slotheader); |
$shownheader = 1; |
$shownheader = 1; |
} |
} |
$r->print('<tr class="'.$bgcolor.'"><td>'."\n"); |
my $style; |
|
if (exists($output{$currmap})) { |
|
$style = 'none'; |
|
} else { |
|
$style = 'table-row'; |
|
$shown ++; |
|
} |
|
my $title = $resource->compTitle(); |
|
my $bgcolor = $backgrounds[$shown % $numcolors]; |
|
$r->print('<tr class="'.$bgcolor.' LC_slotresrow_'.$mapnum.'"'. |
|
' style="display:'.$style.'" id="LC_slotresrow_'.$rownum.'">'. |
|
'<td>'); |
for (my $i=0; $i<$depth; $i++) { |
for (my $i=0; $i<$depth; $i++) { |
$r->print('<img src="'.$location.'" alt="" />'); |
$r->print('<img src="'.$location.'" alt="" />'); |
} |
} |
my $result = '<a href="'.$resource->src().'?symb='.$symb.'">'. |
$r->print('<a href="'.$resource->src().'?symb='.$symb.'">'. |
'<img class="LC_contentImage" src="/adm/lonIcons/'; |
'<img class="LC_contentImage" src="/adm/lonIcons/'); |
if ($resource->is_task()) { |
if ($resource->is_task()) { |
$result .= 'task.gif" alt="'.&mt('Task'); |
$r->print('task.gif" alt="'.&mt('Task')); |
|
} elsif ($resource->is_tool()) { |
|
$r->print('unknown.gif" alt="'.&mt('External Tool')); |
} else { |
} else { |
$result .= 'problem.gif" alt="'.&mt('Problem'); |
$r->print('problem.gif" alt="'.&mt('Problem')); |
} |
} |
$result .= '" /><b>'.$title.'</b></a>'.(' ' x6).'</td>'; |
$r->print('" /><b>'.$title.'</b></a>'.(' ' x6).'</td>'); |
my $hasaction; |
my $class = 'LC_slottext_'.$mapnum; |
if ($status == $resource->OPEN) { |
if ($output{$symb}{'hasaction'}) { |
if ($get_choices) { |
$r->print('<td valign="top"><span class="'.$class.'">'.$output{$symb}{'msg'}.'</span></td>'. |
$hasaction = 1; |
'<td valign="top">'. |
} |
&slot_chooser($symb,$class,$reservable,$allavailable,$slots, |
} |
$consumed_uniqueperiods).'</td>'); |
if ($hasaction) { |
|
$result .= '<td valign="top">'.$msg.'</td>'. |
|
'<td valign="top">'; |
|
} else { |
} else { |
$result .= '<td colspan="2" valign="middle">'.$msg.'</td>'; |
$r->print('<td colspan="2" valign="middle">'. |
|
'<span class="'.$class.'">'.$output{$symb}{'msg'}.'</span>'. |
|
'</td>'); |
} |
} |
$r->print($result); |
$r->print('</tr>'."\n"); |
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>'); |
|
} |
} |
} |
} |
} |
} |
Line 1951 sub manage_reservations {
|
Line 2439 sub manage_reservations {
|
} |
} |
|
|
sub show_map_row { |
sub show_map_row { |
my ($depth,$location,$type,$title,$maprows) = @_; |
my ($depth,$location,$type,$title) = @_; |
my $output = '<td>'; |
my $spacers; |
for (my $i=0; $i<$depth-1; $i++) { |
for (my $i=0; $i<$depth-1; $i++) { |
$output .= '<img src="'.$location.'" alt="" />'; |
$spacers .= '<img src="'.$location.'" alt="" />'; |
} |
} |
|
my $icon; |
if ($type eq 'page') { |
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 { |
} 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"; |
$icon .= $title; |
unshift (@{$maprows},$output); |
return ($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 { |
sub show_reservations { |
Line 1975 sub show_reservations {
|
Line 2512 sub show_reservations {
|
$udom = $env{'user.domain'}; |
$udom = $env{'user.domain'}; |
} |
} |
my $formname = 'slotlog'; |
my $formname = 'slotlog'; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my ($cnum,$cdom)=&get_course(); |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my $crstype = &Apache::loncommon::course_type(); |
my $crstype = &Apache::loncommon::course_type(); |
my %log=&Apache::lonnet::dump('nohist_'.$cdom.'_'.$cnum.'_slotlog',$udom,$uname); |
my %log=&Apache::lonnet::dump('nohist_'.$cdom.'_'.$cnum.'_slotlog',$udom,$uname); |
if ($env{'form.origin'} eq 'aboutme') { |
if ($env{'form.origin'} eq 'aboutme') { |
Line 2077 sub show_reservations {
|
Line 2613 sub show_reservations {
|
if ($showntablehdr) { |
if ($showntablehdr) { |
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
if (($curr{'page'} > 1) || ($more_records)) { |
if (($curr{'page'} > 1) || ($more_records)) { |
$r->print('<table><tr>'); |
$r->print('<p>'); |
if ($curr{'page'} > 1) { |
if ($curr{'page'} > 1) { |
$r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>'); |
$r->print('<input type="button" onclick="javascript:chgPage('."'previous'".');" value="'. |
|
&mt('Previous [_1] changes',$curr{'show'}).'" />'); |
} |
} |
if ($more_records) { |
if ($more_records) { |
$r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>'); |
$r->print('<input type="button" onclick="javascript:chgPage('."'next'".');" value="'. |
|
&mt('Next [_1] changes',$curr{'show'}).'" />'); |
} |
} |
$r->print('</tr></table>'); |
$r->print('</p>'); |
$r->print(<<"ENDSCRIPT"); |
$r->print(<<"ENDSCRIPT"); |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
Line 2149 sub show_reservations_log {
|
Line 2687 sub show_reservations_log {
|
return; |
return; |
} |
} |
my $formname = 'reservationslog'; |
my $formname = 'reservationslog'; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my ($cnum,$cdom)=&get_course(); |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my %slotlog=&Apache::lonnet::dump('nohist_slotreservationslog',$cdom,$cnum); |
my %slotlog=&Apache::lonnet::dump('nohist_slotreservationslog',$cdom,$cnum); |
if ((keys(%slotlog))[0]=~/^error\:/) { undef(%slotlog); } |
if ((keys(%slotlog))[0]=~/^error\:/) { undef(%slotlog); } |
|
|
Line 2288 sub show_reservations_log {
|
Line 2825 sub show_reservations_log {
|
if ($showntablehdr) { |
if ($showntablehdr) { |
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
if (($curr{'page'} > 1) || ($more_records)) { |
if (($curr{'page'} > 1) || ($more_records)) { |
$r->print('<table><tr>'); |
$r->print('<p>'); |
if ($curr{'page'} > 1) { |
if ($curr{'page'} > 1) { |
$r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>'); |
$r->print('<input type="button" onclick="javascript:chgPage('."'previous'".');" value="'. |
|
&mt('Previous [_1] changes',$curr{'show'}).'" />'); |
} |
} |
if ($more_records) { |
if ($more_records) { |
$r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>'); |
$r->print('<input type="button" onclick="javascript:chgPage('."'next'".');" value="'. |
|
&mt('Next [_1] changes',$curr{'show'}).'" />'); |
} |
} |
$r->print('</tr></table>'); |
$r->print('</p>'); |
$r->print(<<"ENDSCRIPT"); |
$r->print(<<"ENDSCRIPT"); |
<script type="text/javascript"> |
<script type="text/javascript"> |
function chgPage(caller) { |
function chgPage(caller) { |
Line 2377 sub display_filter {
|
Line 2916 sub display_filter {
|
my (%titles,%maptitles); |
my (%titles,%maptitles); |
my $output = '<br /><table><tr><td valign="top">'. |
my $output = '<br /><table><tr><td valign="top">'. |
'<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'. |
'<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'. |
&Apache::lonmeta::selectbox('show',$curr->{'show'},undef, |
&Apache::lonmeta::selectbox('show',$curr->{'show'},'',undef, |
(&mt('all'),5,10,20,50,100,1000,10000)). |
(&mt('all'),5,10,20,50,100,1000,10000)). |
'</td><td> </td>'; |
'</td><td> </td>'; |
my $startform = |
my $startform = |
Line 2435 sub display_filter {
|
Line 2974 sub display_filter {
|
} |
} |
$output .= '</select></td>'; |
$output .= '</select></td>'; |
} |
} |
$output .= '<td> </td><td valign="middle"><input type="submit" value="'. |
$output .= '<td> </td></tr></table>'. |
&mt('Update Display').'" /></tr></table>'. |
'<p><input type="submit" value="'. |
|
&mt('Update Display').'" /></p>'. |
'<p class="LC_info">'. |
'<p class="LC_info">'. |
&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.' |
&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.' |
,'2.9.0'); |
,'2.9.0'); |
Line 2642 sub csv_upload_map {
|
Line 3182 sub csv_upload_map {
|
if (!$env{'form.datatoken'}) { |
if (!$env{'form.datatoken'}) { |
$datatoken=&Apache::loncommon::upfile_store($r); |
$datatoken=&Apache::loncommon::upfile_store($r); |
} else { |
} else { |
$datatoken=$env{'form.datatoken'}; |
$datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'}); |
&Apache::loncommon::load_tmp_file($r); |
if ($datatoken ne '') { |
|
&Apache::loncommon::load_tmp_file($r,$datatoken); |
|
} |
} |
} |
my @records=&Apache::loncommon::upfile_record_sep(); |
my @records=&Apache::loncommon::upfile_record_sep(); |
if ($env{'form.noFirstLine'}) { shift(@records); } |
if ($env{'form.noFirstLine'}) { shift(@records); } |
Line 2680 sub csvupload_fields {
|
Line 3222 sub csvupload_fields {
|
['endreserve','Reservation End Time'], |
['endreserve','Reservation End Time'], |
['reservationmsg','Message when reservation changed'], |
['reservationmsg','Message when reservation changed'], |
['ip','IP or DNS restriction'], |
['ip','IP or DNS restriction'], |
|
['iptied','Unique IP each student'], |
['proctor','List of proctor ids'], |
['proctor','List of proctor ids'], |
['description','Slot Description'], |
['description','Slot Description'], |
['maxspace','Maximum number of reservations'], |
['maxspace','Maximum number of reservations'], |
['symb','Resource/Map Restriction'], |
['symb','Resource(s)/Map(s) Restriction'], |
['uniqueperiod','Date range of slot exclusion'], |
['uniqueperiod','Date range of slot exclusion'], |
['secret','Secret word proctor uses to validate'], |
['secret','Secret word proctor uses to validate'], |
['allowedsections','Sections slot is restricted to'], |
['allowedsections','Sections slot is restricted to'], |
Line 2693 sub csvupload_fields {
|
Line 3236 sub csvupload_fields {
|
|
|
sub csv_upload_assign { |
sub csv_upload_assign { |
my ($r,$mgr)= @_; |
my ($r,$mgr)= @_; |
&Apache::loncommon::load_tmp_file($r); |
my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'}); |
|
if ($datatoken ne '') { |
|
&Apache::loncommon::load_tmp_file($r,$datatoken); |
|
} |
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(); |
Line 2751 sub csv_upload_assign {
|
Line 3297 sub csv_upload_assign {
|
} |
} |
|
|
if ($entries{$fields{'startreserve'}}) { |
if ($entries{$fields{'startreserve'}}) { |
$slot{'startreserve'}= |
my $date = &UnixDate($entries{$fields{'startreserve'}},"%s"); |
&UnixDate($entries{$fields{'startreserve'}},"%s"); |
if ($date eq '') { |
|
push(@errors,"$name -- No reservation start time set for slot -- value provided had invalid format"); |
|
} else { |
|
$slot{'startreserve'} = $date; |
|
} |
} |
} |
if (defined($slot{'startreserve'}) |
if (defined($slot{'startreserve'}) |
&& $slot{'startreserve'} > $slot{'starttime'}) { |
&& $slot{'startreserve'} > $slot{'starttime'}) { |
Line 2761 sub csv_upload_assign {
|
Line 3311 sub csv_upload_assign {
|
} |
} |
|
|
if ($entries{$fields{'endreserve'}}) { |
if ($entries{$fields{'endreserve'}}) { |
$slot{'endreserve'}= |
my $date = &UnixDate($entries{$fields{'endreserve'}},"%s"); |
&UnixDate($entries{$fields{'endreserve'}},"%s"); |
if ($date eq '') { |
|
push(@errors,"$name -- No reservation end time set for slot -- value provided had invalid format"); |
|
} else { |
|
$slot{'endreserve'} = $date; |
|
} |
} |
} |
if (defined($slot{'endreserve'}) |
if (defined($slot{'endreserve'}) |
&& $slot{'endreserve'} > $slot{'starttime'}) { |
&& $slot{'endreserve'} > $slot{'starttime'}) { |
Line 2788 sub csv_upload_assign {
|
Line 3342 sub csv_upload_assign {
|
'secret','symb') { |
'secret','symb') { |
if ($entries{$fields{$key}}) { |
if ($entries{$fields{$key}}) { |
$slot{$key}=$entries{$fields{$key}}; |
$slot{$key}=$entries{$fields{$key}}; |
|
if ($key eq 'maxspace') { |
|
$slot{$key} =~ s/\D+//g; |
|
} |
} |
} |
} |
} |
|
if ($entries{$fields{'iptied'}} =~ /^\s*(yes|1)\s*$/i) { |
|
$slot{'iptied'}='yes'; |
|
} elsif ($entries{$fields{'iptied'}} =~ /^\s*answer\s*$/i) { |
|
$slot{'iptied'}='answer'; |
|
} |
if ($entries{$fields{'allowedusers'}}) { |
if ($entries{$fields{'allowedusers'}}) { |
$entries{$fields{'allowedusers'}} =~ s/^\s+//; |
$entries{$fields{'allowedusers'}} =~ s/^\s+//; |
$entries{$fields{'allowedusers'}} =~ s/\s+$//; |
$entries{$fields{'allowedusers'}} =~ s/\s+$//; |
Line 2822 sub csv_upload_assign {
|
Line 3384 sub csv_upload_assign {
|
} |
} |
} |
} |
if ($entries{$fields{'uniqueperiod'}}) { |
if ($entries{$fields{'uniqueperiod'}}) { |
my ($start,$end)=split(',',$entries{$fields{'uniqueperiod'}}); |
my ($start,$end)= map { &UnixDate($_,"%s"); } split(',',$entries{$fields{'uniqueperiod'}}); |
my @times=(&UnixDate($start,"%s"), |
if (($start ne '') && ($end ne '')) { |
&UnixDate($end,"%s")); |
$slot{'uniqueperiod'}=[$start,$end]; |
$slot{'uniqueperiod'}=\@times; |
} else { |
|
push(@errors,"$name -- Slot's unique period ignored -- one or both of the comma separated values for start and end had an invalid format"); |
|
} |
} |
} |
if (defined($slot{'uniqueperiod'}) |
if (ref($slot{'uniqueperiod'}) eq 'ARRAY' |
&& $slot{'uniqueperiod'}[0] > $slot{'uniqueperiod'}[1]) { |
&& $slot{'uniqueperiod'}[0] > $slot{'uniqueperiod'}[1]) { |
push(@errors,"$name not created -- Slot's unique period start time is later than the unique period's end time."); |
push(@errors,"$name not created -- Slot's unique period start time is later than the unique period's end time."); |
next; |
next; |
Line 2888 sub handler {
|
Line 3452 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 %crumb_titles = &slot_command_titles(); |
my $brcrum; |
my ($brcrum,$bread_crumbs_component); |
|
|
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'}); |
Line 2924 sub handler {
|
Line 3488 sub handler {
|
} elsif ($vgr eq 'F') { |
} elsif ($vgr eq 'F') { |
if ($env{'form.command'} =~ /^(slotlog|showslots|uploadstart|csvuploadmap|csvuploadassign|delete|release|remove_registration)$/) { |
if ($env{'form.command'} =~ /^(slotlog|showslots|uploadstart|csvuploadmap|csvuploadassign|delete|release|remove_registration)$/) { |
$brcrum =[{href=>"/adm/slotrequest?command=showslots", |
$brcrum =[{href=>"/adm/slotrequest?command=showslots", |
text=>$crumb_titles{'showslots'}}]; |
text=>$crumb_titles{'showslots'}, |
|
help=>'Slot_Use'}]; |
$title = 'Managing Slots'; |
$title = 'Managing Slots'; |
|
$bread_crumbs_component = 'Slots'; |
unless ($env{'form.command'} eq 'showslots') { |
unless ($env{'form.command'} eq 'showslots') { |
if (ref($brcrum) eq 'ARRAY') { |
if (ref($brcrum) eq 'ARRAY') { |
push(@{$brcrum},{href=>"/adm/slotrequest?command=$env{'form.command'}",text=>$crumb_titles{$env{'form.command'}}}); |
push(@{$brcrum},{href=>"/adm/slotrequest?command=$env{'form.command'}",text=>$crumb_titles{$env{'form.command'}}}); |
Line 2953 sub handler {
|
Line 3519 sub handler {
|
if (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) { |
if (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) { |
$js = &reservation_js(\%slots,$consumed_uniqueperiods,$available,$got_slots,$symb); |
$js = &reservation_js(\%slots,$consumed_uniqueperiods,$available,$got_slots,$symb); |
} |
} |
&start_page($r,$title,$brcrum,$js); |
&start_page($r,$title,$brcrum,$bread_crumbs_component,$js,$mgr); |
|
|
if ($env{'form.command'} eq 'manageresv') { |
if ($env{'form.command'} eq 'manageresv') { |
$allavailable = $available; |
$allavailable = $available; |
Line 2990 sub handler {
|
Line 3556 sub handler {
|
} |
} |
&csv_upload_map($r); |
&csv_upload_map($r); |
} |
} |
} elsif ($env{'form.command'} eq 'slotlog' && $mgr eq 'F') { |
} elsif (($env{'form.command'} eq 'slotlog') && ($vgr eq 'F')) { |
&show_reservations_log($r); |
&show_reservations_log($r); |
} else { |
} else { |
my $symb=&unescape($env{'form.symb'}); |
my $symb=&unescape($env{'form.symb'}); |
Line 3012 sub handler {
|
Line 3578 sub handler {
|
my ($status) = &Apache::lonhomework::check_slot_access('0',$type); |
my ($status) = &Apache::lonhomework::check_slot_access('0',$type); |
if ($status eq 'CAN_ANSWER' || |
if ($status eq 'CAN_ANSWER' || |
$status eq 'NEEDS_CHECKIN' || |
$status eq 'NEEDS_CHECKIN' || |
$status eq 'WAITING_FOR_GRADE') { |
$status eq 'WAITING_FOR_GRADE' || |
|
$status eq 'NEED_DIFFERENT_IP') { |
&fail($r,'not_allowed'); |
&fail($r,'not_allowed'); |
return OK; |
return OK; |
} |
} |
if ($env{'form.requestattempt'}) { |
if ($env{'form.requestattempt'}) { |
$r->print('<div class="LC_left_float">'); |
$r->print('<div class="LC_left_float">'); |
&show_choices($r,$symb,undef,undef,\%slots,$consumed_uniqueperiods,$available,$got_slots); |
$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>'); |
$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); |