--- loncom/interface/slotrequest.pm 2009/01/23 21:34:47 1.86 +++ loncom/interface/slotrequest.pm 2009/03/01 03:23:18 1.89 @@ -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.86 2009/01/23 21:34:47 raeburn Exp $ +# $Id: slotrequest.pm,v 1.89 2009/03/01 03:23:18 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -239,9 +239,7 @@ sub check_for_conflict { } sub make_reservation { - my ($slot_name,$slot,$symb)=@_; - - my ($cnum,$cdom)=&get_course(); + my ($slot_name,$slot,$symb,$cnum,$cdom)=@_; my $value=&Apache::lonnet::EXT("resource.0.availablestudent",$symb, $env{'user.domain'},$env{'user.name'}); @@ -315,13 +313,7 @@ sub make_reservation { if ($value) { $new_value=$value.':'.$new_value; } - 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"); + &store_slot_parm($symb,$slot_name,$parm_level,$new_value,$cnum,$cdom); return $wanted; } @@ -329,6 +321,28 @@ sub make_reservation { 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::instructor_log('slotreservationslog',\%storehash, + '',$env{'user.name'},$env{'user.domain'}, + $cnum,$cdom); + return; +} + sub remove_registration { my ($r) = @_; if ($env{'form.entry'} ne 'remove all') { @@ -345,8 +359,8 @@ sub remove_registration { return; } if (!%consumed) { - $r->print("

".&mt('Slot [_1] has no reservations.', - $slot_name)."

"); + $r->print('

'.&mt('Slot [_1] has no reservations.', + ''.$slot_name.'').'

'); return; } @@ -354,7 +368,7 @@ sub remove_registration { my $names = join(' ',@names); 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 { @@ -371,7 +385,7 @@ sub remove_registration_user { $name,$slot_name,$title); &remove_registration_confirmation($r,$msg,['uname','udom','slotname', - 'entry','symb']); + 'entry','symb','context']); } sub remove_registration_confirmation { @@ -510,6 +524,14 @@ sub release_reservation { if ( $consumed{$entry}->{'name'} eq ($uname.':'.$udom) ) { &Apache::lonnet::del('slot_reservations',[$entry], $cdom,$cnum); + my %storehash = ( + symb => $symb, + slot => $slot_name, + action => 'release', + context => $env{'form.context'}, + ); + &Apache::lonnet::instructor_log('slotreservationslog',\%storehash, + 1,$uname,$udom,$cnum,$cdom); } } @@ -530,7 +552,6 @@ sub release_reservation { '0_availablestudent', $parm_level, $new_param, 'string', $uname, $udom); - my $msg; if ($mgr eq 'F') { $msg = &mt('Released Reservation for user: [_1]',"$uname:$udom"); @@ -557,15 +578,15 @@ sub delete_slot { my $ret = &Apache::lonnet::cput('slots', {$slot_name => \%slot}, $cdom, $cnum); if ($ret eq 'ok') { - $r->print("

Slot $slot_name marked as deleted.

"); + $r->print('

'.&mt('Slot [_1] marked as deleted.',''.$slot_name.'').'

'); } else { - $r->print("

An error ($ret) occurse when attempting to delete Slot $slot_name.

"); + $r->print('

'.&mt('An error occurred when attempting to delete slot: [_1]',''.$slot_name.'')." ($ret)

"); } } else { if (%consumed) { - $r->print("

Slot $slot_name has active reservations.

"); + $r->print('

'.&mt('Slot [_1] has active reservations.',''.$slot_name.'').'

'); } else { - $r->print("

Slot $slot_name does not exist.

"); + $r->print('

'.&mt('Slot [_1] does not exist.',''.$slot_name.'').'

'); } } $r->print('

'. @@ -597,7 +618,7 @@ sub get_slot { my $description1=&get_description($slot_name,\%slot); %slot=&Apache::lonnet::get_slot($env{'form.slotname'}); my $description2=&get_description($env{'form.slotname'},\%slot); - $r->print("

Already have a reservation: $description1

"); + $r->print('

'.&mt('Already have a reservation: [_1].',$description1).'

'); if ($slot_name ne $env{'form.slotname'}) { $r->print(< @@ -606,13 +627,14 @@ sub get_slot { STUFF - $r->print("

You can either "); - $r->print(< -STUFF - $r->print(' your reservation from '.$description1.' to '. - $description2. - '
or

'); + $r->print('

' + .&mt('You can either [_1]Change[_2] your reservation from [_3] to [_4] or' + ,'' + ,''.$description1.'' + ,''.$description2.'') + .'

' + ); &return_link($r); $r->print(< @@ -623,8 +645,9 @@ STUFF return 0; } + my ($cnum,$cdom)=&get_course(); my $reserved=&make_reservation($env{'form.slotname'}, - \%slot,$symb); + \%slot,$symb,$cnum,$cdom); my $description=&get_description($env{'form.slotname'},\%slot); if (defined($reserved)) { my $retvalue = 0; @@ -633,17 +656,18 @@ STUFF .&mt('An error occurred while attempting to make a reservation. ([_1])',$1) .'

'); } elsif ($reserved > -1) { - $r->print("

Success: $description

"); + $r->print('

'.&mt('Success: [_1]',$description).'

'); $retvalue = 1; } elsif ($reserved < 0) { - $r->print("

Already reserved: $description

"); + $r->print('

'.&mt('Already reserved: [_1]',$description).'

'); } if (!$inhibit_return_link) { &return_link($r); } return 1; } my %lt=('request'=>"Availibility list", - 'try' =>'Try again'); + 'try' =>'Try again?', + 'or' => 'or'); %lt=&Apache::lonlocal::texthash(%lt); my $extra_input; @@ -651,8 +675,8 @@ STUFF $extra_input=''; } + $r->print('

'.&mt('[_1]Failed[_2] to reserve a slot for [_3].','','',$description).'

'); $r->print(< Failed to reserve a spot for $description.

@@ -661,19 +685,20 @@ STUFF $extra_input
-?

-or +$lt{'or'}

-

-or STUFF - if (!$inhibit_return_link) { &return_link($r); } + if (!$inhibit_return_link) { + $r->print(&mt('or').'

').&return_link($r); + } else { + $r->print('

'); + } return 0; } @@ -847,6 +872,7 @@ sub show_choices { + STUFF } @@ -859,7 +885,8 @@ STUFF } if (!$available) { - $r->print('No available times. '. + $r->print(''.&mt('No available times.'). + ' '. &mt('Return to last resource').''); } $r->print(''); @@ -946,7 +973,7 @@ sub remove_link { $symb = &escape($symb); return <<"END_LINK"; - ($remove) END_LINK @@ -1346,7 +1373,7 @@ sub upload_start { $result.=' '. &mt('Specify a file containing the slot definitions.'). ''."\n"; - $result.=''."\n"; + $result.=''."\n"; my $upfile_select=&Apache::loncommon::upfile_select_html(); my $ignore=&mt('Ignore First Line'); $result.=<print(< -
+
ENDPICK } @@ -1522,7 +1550,7 @@ sub csv_upload_assign { my @slotdata = &Apache::loncommon::upfile_record_sep(); if ($env{'form.noFirstLine'}) { shift(@slotdata); } my %fields=&Apache::grades::get_fields(); - $r->print('

Creating Slots

'); + $r->print('

'.&mt('Creating Slots').'

'); my $cname=$env{'course.'.$env{'request.course.id'}.'.num'}; my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; my $countdone=0; @@ -1609,9 +1637,9 @@ sub csv_upload_assign { $r->rflush(); $countdone++; } - $r->print("

Created $countdone slots\n

"); + $r->print('

'.&mt('Created [quant,_1,slot]',$countdone)."\n".'

'); foreach my $error (@errors) { - $r->print("

$error

\n"); + $r->print('

'.$error.'

'."\n"); } &show_table($r,$mgr); return ''; @@ -1699,7 +1727,7 @@ sub handler { &release_slot($r,$symb,$env{'form.releaseslot'}); } } else { - $r->print("

Unknown command: ".$env{'form.command'}."

"); + $r->print('

'.&mt('Unknown command: [_1]',$env{'form.command'}).'

'); } } &end_page($r);