--- loncom/interface/slotrequest.pm 2021/01/18 21:58:57 1.125.2.10 +++ loncom/interface/slotrequest.pm 2015/09/23 23:04:53 1.126 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler for requesting to have slots added to a students record # -# $Id: slotrequest.pm,v 1.125.2.10 2021/01/18 21:58:57 raeburn Exp $ +# $Id: slotrequest.pm,v 1.126 2015/09/23 23:04:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -56,13 +56,10 @@ sub fail { } sub start_page { - my ($r,$title,$brcrum,$bread_crumbs_component,$js)=@_; + my ($r,$title,$brcrum,$js)=@_; my $args; if (ref($brcrum) eq 'ARRAY') { $args = {bread_crumbs => $brcrum}; - if ($bread_crumbs_component) { - $args->{bread_crumbs_component} = $bread_crumbs_component; - } } if (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) { my %loaditems = ( @@ -165,24 +162,9 @@ $js var startdate = startm+"/"+startd+"/"+starty; var starttime = new Date(startdate).getTime(); starttime = starttime/1000; - var starth = form.start_hour.options[form.start_hour.selectedIndex].value; - if (numberRegExp.test(starth)) { - starth = parseInt(starth); - if (starth > 0 && starth <= 23) { - starttime += 3600 * starth; - } - } var enddate = endm+"/"+endd+"/"+endy; var endtime = new Date(enddate).getTime(); endtime = endtime/1000; - var endh = form.end_hour.options[form.end_hour.selectedIndex].value; - if (numberRegExp.test(endh)) { - endh = parseInt(endh); - if (endh > 0 && endh <= 23) { - endtime += 3600 * endh; - } - } - var shown = 0; for (var i=0; i<$i; i++) { if ((slotstart[i] >= starttime) && (slotend[i] <= endtime)) { @@ -459,11 +441,11 @@ sub make_reservation { return 'error: Unable to determine current status'; } - my $symb_for_db = $symb; + my $parm_symb = $symb; my $parm_level = 1; if ($use_slots eq 'map' || $use_slots eq 'map_map') { my ($map) = &Apache::lonnet::decode_symb($symb); - $symb_for_db = &Apache::lonnet::symbread($map); + $parm_symb = &Apache::lonnet::symbread($map); $parm_level = 2; } @@ -506,7 +488,7 @@ sub make_reservation { my %reservation=('name' => $env{'user.name'}.':'.$env{'user.domain'}, 'timestamp' => time, - 'symb' => $symb_for_db); + 'symb' => $parm_symb); my $success=&Apache::lonnet::newput('slot_reservations', {"$slot_name\0$wanted" => @@ -518,9 +500,7 @@ sub make_reservation { if ($value) { $new_value=$value.':'.$new_value; } - 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'}); + &store_slot_parm($symb,$slot_name,$parm_level,$new_value,$cnum,$cdom); return $wanted; } @@ -529,27 +509,29 @@ sub make_reservation { } sub store_slot_parm { - my ($symb_for_parm,$symb_for_db,$slot_name,$parm_level,$new_value, - $cnum,$cdom,$uname,$udom,$action,$context,$delflag) = @_; - - # store new parameter string - my $result=&Apache::lonparmset::storeparm_by_symb($symb_for_parm, - '0_availablestudent', - $parm_level,$new_value, - 'string',$uname,$udom); + 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_for_db, + symb => $symb, slot => $slot_name, - action => $action, - context => $context, + action => 'reserve', + context => $env{'form.context'}, ); &Apache::lonnet::write_log('course','slotreservationslog',\%storehash, - $delflag,$uname,$udom,$cnum,$cdom); + '',$env{'user.name'},$env{'user.domain'}, + $cnum,$cdom); &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash, - $delflag,$uname,$udom,$uname,$udom); - return $result; + 1,$env{'user.name'},$env{'user.domain'}, + $env{'user.name'},$env{'user.domain'}); + + return; } sub remove_registration { @@ -645,7 +627,7 @@ sub release_all_slot { &release_reservation($slot_name,$uname,$udom, $consumed{$entry}{'symb'},$mgr); if (!$result) { - $r->print('
'.&mt($msg).'
'); + $r->print(''.&mt($msg).'
'); } else { $r->print("$msg
"); } @@ -675,7 +657,7 @@ sub release_slot { my ($result,$msg) = &release_reservation($slot_name,$uname,$udom,$symb,$mgr); if (!$result) { - $r->print(''.&mt($msg).'
'); + $r->print(''.&mt($msg).'
'); } else { $r->print("$msg
"); } @@ -693,184 +675,26 @@ sub release_reservation { my ($slot_name,$uname,$udom,$symb,$mgr) = @_; my %slot=&Apache::lonnet::get_slot($slot_name); my $description=&get_description($slot_name,\%slot); - my $msg; if ($mgr ne 'F') { if ($slot{'starttime'} < time) { - return (0,&mt('Not allowed to release Reservation: [_1], as it has already started.',$description)); + return (0,&mt('Not allowed to release Reservation: [_1], as it has already ended.',$description)); } } - my $context = $env{'form.context'}; - # get navmap object + # if the reservation symb is for a map get a resource in that map + # to check slot parameters on my $navmap=Apache::lonnavmaps::navmap->new; if (!defined($navmap)) { 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 = ''. - &mt('Released Reservation: [_1]',$description).' '. - &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 .= ''.&mt('Slot [_1] marked as deleted.',''.$slot_name.'').'
'); } else { - $r->print(''.&mt('An error occurred when attempting to delete slot: [_1]',''.$slot_name.'')." ($ret)
"); + $r->print(''.&mt('An error occurred when attempting to delete slot: [_1]',''.$slot_name.'')." ($ret)
"); } } else { if (%consumed) { @@ -1057,24 +817,18 @@ sub get_slot { my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot); if ($slot_name =~ /^error: (.*)/) { - $r->print('' + $r->print('
' .&mt('An error occurred while attempting to make a reservation. ([_1])',$1) - .'
'); + .''); &return_link($r); return 0; } if ($slot_name && $slot_name ne $conflictable_slot) { my %slot=&Apache::lonnet::get_slot($slot_name); my $description1=&get_description($slot_name,\%slot); - my $slottype1=$slot{'type'}; %slot=&Apache::lonnet::get_slot($env{'form.slotname'}); my $description2=&get_description($env{'form.slotname'},\%slot); - if ($slottype1 eq 'preassigned') { - $r->print(''.&mt('You already have a reservation: "[_1]", assigned by your instructor.', - $description1).'
'. - ''.&mt('Your instructor must unassign it before you can make a new reservation.'). - '
'); - } elsif ($slot_name ne $env{'form.slotname'}) { + if ($slot_name ne $env{'form.slotname'}) { $r->print(<' + $r->print('
' .&mt('An error occurred while attempting to make a reservation. ([_1])',$1) - .'
'); + .''); } elsif ($reserved > -1) { $r->print(''.&mt('Successfully signed up: [_1]',$description).'
'); $retvalue = 1; @@ -1246,10 +1000,21 @@ sub allowed_slot { return 0 if (!$userallowed); # not allowed for this resource - if (defined($slot->{'symb'}) - && $slot->{'symb'} ne $symb) { - unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) { - return 0; + if (defined($slot->{'symb'})) { + my $exclude = 1; + my ($slotmap,$slotid,$sloturl) = &Apache::lonnet::decode_symb($slot->{'symb'}); + if ($sloturl=~/\.(page|sequence)$/) { + my ($map,$id,$url) = &Apache::lonnet::decode_symb($symb); + if (($map ne '') && ($map eq $slotmap)) { + $exclude = 0; + } + } elsif ($slot->{'symb'} eq $symb) { + $exclude = 0; + } + if ($exclude) { + unless ((ref($toskip) eq 'HASH') && ($toskip->{'symb'})) { + return 0; + } } } @@ -1541,6 +1306,10 @@ sub show_table { } my $available; if ($mgr eq 'F') { + # FIXME: This line should be deleted once Slots uses breadcrumbs + $r->print(''.&mt('No slots meet the criteria for display').'
'); - } - $r->print(''); + $r->print(&Apache::loncommon::end_data_table().''); return; } @@ -2323,16 +2077,14 @@ sub show_reservations { if ($showntablehdr) { $r->print(&Apache::loncommon::end_data_table().''); + $r->print('
'.&mt('Previous [_1] changes',$curr{'show'}).' | '); } if ($more_records) { - $r->print(''); + $r->print(''.&mt('Next [_1] changes',$curr{'show'}).' | '); } - $r->print(''); + $r->print('