--- loncom/interface/slotrequest.pm 2018/09/14 21:06:22 1.125.2.6 +++ 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.6 2018/09/14 21:06:22 raeburn Exp $ +# $Id: slotrequest.pm,v 1.126 2015/09/23 23:04:53 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -162,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)) { @@ -744,10 +729,10 @@ sub release_reservation { action => 'release', context => $env{'form.context'}, ); - &Apache::lonnet::write_log('course','slotreservationslog', - \%storehash,1,$uname,$udom,$cnum,$cdom); - &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog', - \%storehash,1,$uname,$udom,$uname,$udom); + &Apache::lonnet::write_log('slotreservationslog',\%storehash, + 1,$uname,$udom,$cnum,$cdom); + &Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash, + 1,$uname,$udom,$uname,$udom); } } @@ -841,15 +826,9 @@ sub get_slot { 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(<'.&mt('No slots meet the criteria for display').'
'); - } - $r->print(''); + $r->print(&Apache::loncommon::end_data_table().''); return; } @@ -2102,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('