version 1.77, 2007/04/10 23:31:18
|
version 1.79, 2007/04/11 21:49:02
|
Line 334 sub remove_registration {
|
Line 334 sub remove_registration {
|
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
"^$slot_name\0"); |
"^$slot_name\0"); |
if (&Apache::lonnet::error(%consumed)) { |
if (&Apache::lonnet::error(%consumed)) { |
$r->print("<p>".&mt('A network error has occured.').'</p>'); |
$r->print("<p><span class=\"LC_error\">".&mt('A network error has occured.').'</span></p>'); |
return; |
return; |
} |
} |
if (!%consumed) { |
if (!%consumed) { |
Line 527 sub delete_slot {
|
Line 527 sub delete_slot {
|
if ($ret eq 'ok') { |
if ($ret eq 'ok') { |
$r->print("<p>Slot <tt>$slot_name</tt> marked as deleted.</p>"); |
$r->print("<p>Slot <tt>$slot_name</tt> marked as deleted.</p>"); |
} else { |
} else { |
$r->print("<p> An error ($ret) occurse when attempting to delete Slot <tt>$slot_name</tt>.</p>"); |
$r->print("<p><span class=\"LC_error\"> An error ($ret) occurse when attempting to delete Slot <tt>$slot_name</tt>.</span></p>"); |
} |
} |
} else { |
} else { |
if (%consumed) { |
if (%consumed) { |
Line 554 sub get_slot {
|
Line 554 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>An error occured while attempting to make a reservation. ($1)</p>"); |
$r->print("<p><span class=\"LC_error\">An error occured while attempting to make a reservation. ($1)</span></p>"); |
&return_link($r); |
&return_link($r); |
return 0; |
return 0; |
} |
} |
Line 595 STUFF
|
Line 595 STUFF
|
if (defined($reserved)) { |
if (defined($reserved)) { |
my $retvalue = 0; |
my $retvalue = 0; |
if ($slot_name =~ /^error: (.*)/) { |
if ($slot_name =~ /^error: (.*)/) { |
$r->print("<p>An error occured while attempting to make a reservation. ($1)</p>"); |
$r->print("<p><span class=\"LC_error\">An error occured while attempting to make a reservation. ($1)</span></p>"); |
} elsif ($reserved > -1) { |
} elsif ($reserved > -1) { |
$r->print("<p>Success: $description</p>"); |
$r->print("<p>Success: $description</p>"); |
$retvalue = 1; |
$retvalue = 1; |
Line 616 STUFF
|
Line 616 STUFF
|
} |
} |
|
|
$r->print(<<STUFF); |
$r->print(<<STUFF); |
<p> <font color="red">Failed</font> to reserve a spot for $description. </p> |
<p> <span class="LC_warning">Failed</span> to reserve a spot for $description. </p> |
<p> |
<p> |
<form method="post" action="/adm/slotrequest"> |
<form method="post" action="/adm/slotrequest"> |
<input type="submit" name="Try Again" value="$lt{'try'}" /> |
<input type="submit" name="Try Again" value="$lt{'try'}" /> |
Line 1108 sub show_table {
|
Line 1108 sub show_table {
|
my ($id_count,$ids); |
my ($id_count,$ids); |
|
|
if (exists($show{'scheduled'}) || exists($show{'space'}) ) { |
if (exists($show{'scheduled'}) || exists($show{'space'}) ) { |
my @this_slot = grep(/^$slot\0/,keys(%consumed)); |
my $re_str = "$slot\0"; |
|
my @this_slot = grep(/^\Q$re_str\E/,keys(%consumed)); |
$id_count = scalar(@this_slot); |
$id_count = scalar(@this_slot); |
if (exists($show{'scheduled'})) { |
if (exists($show{'scheduled'})) { |
foreach my $entry (sort { $consumed{$a}{name} cmp |
foreach my $entry (sort { $consumed{$a}{name} cmp |
$consumed{$b}{name} } |
$consumed{$b}{name} } |
(keys(%consumed))) { |
(@this_slot)) { |
my (undef,$id)=split("\0",$entry); |
my (undef,$id)=split("\0",$entry); |
my ($uname,$udom) = split(':',$consumed{$entry}{'name'}); |
my ($uname,$udom) = split(':',$consumed{$entry}{'name'}); |
$ids.= '<nobr>'; |
$ids.= '<nobr>'; |
Line 1547 sub csv_upload_assign {
|
Line 1548 sub csv_upload_assign {
|
} |
} |
$r->print("<p>Created $countdone slots\n</p>"); |
$r->print("<p>Created $countdone slots\n</p>"); |
foreach my $error (@errors) { |
foreach my $error (@errors) { |
$r->print("<p>$error\n</p>"); |
$r->print("<p><span class=\"LC_warning\">$error</span></p>\n"); |
} |
} |
&show_table($r,$mgr); |
&show_table($r,$mgr); |
return ''; |
return ''; |