version 1.104, 2009/10/15 23:53:46
|
version 1.107, 2010/05/27 04:44:33
|
Line 847 sub show_choices {
|
Line 847 sub show_choices {
|
(keys(%slots))) { |
(keys(%slots))) { |
|
|
&Apache::lonxml::debug("Checking Slot $slot"); |
&Apache::lonxml::debug("Checking Slot $slot"); |
next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots, |
next if (!&allowed_slot($slot,$slots{$slot},$symb,\%slots, |
$consumed_uniqueperiods)); |
$consumed_uniqueperiods)); |
|
|
push(@available,$slot); |
push(@available,$slot); |
Line 1026 sub show_table {
|
Line 1026 sub show_table {
|
my ($r,$mgr)=@_; |
my ($r,$mgr)=@_; |
|
|
my ($cnum,$cdom)=&get_course(); |
my ($cnum,$cdom)=&get_course(); |
|
my $crstype=&Apache::loncommon::course_type($cdom.'_'.$cnum); |
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); |
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); |
if ( (keys(%slots))[0] =~ /^error: 2 /) { |
if ( (keys(%slots))[0] =~ /^error: 2 /) { |
undef(%slots); |
undef(%slots); |
Line 1049 sub show_table {
|
Line 1050 sub show_table {
|
} |
} |
|
|
if (!keys(%slots)) { |
if (!keys(%slots)) { |
$r->print('<div>'.&mt('No slots have been created in this course.').'</div>'); |
if ($crstype eq 'Community') { |
|
$r->print('<div>'.&mt('No slots have been created in this community.').'</div>'); |
|
} else { |
|
$r->print('<div>'.&mt('No slots have been created in this course.').'</div>'); |
|
} |
return; |
return; |
} |
} |
|
|
Line 1085 sub show_table {
|
Line 1090 sub show_table {
|
'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'); |
|
if ($crstype eq 'Community') { |
|
$show_fields{'startreserve'} = &mt('Time members can start reserving'); |
|
$show_fields{'scheduled'} = &mt('Scheduled Members'); |
|
} |
my @show_order=('name','description','type','starttime','endtime', |
my @show_order=('name','description','type','starttime','endtime', |
'startreserve','secret','space','ip','symb', |
'startreserve','secret','space','ip','symb', |
'allowedsections','allowedusers','uniqueperiod', |
'allowedsections','allowedusers','uniqueperiod', |
Line 1429 STUFF
|
Line 1438 STUFF
|
} |
} |
|
|
sub manage_reservations { |
sub manage_reservations { |
my ($r,$type) = @_; |
my ($r,$crstype) = @_; |
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 1438 sub manage_reservations {
|
Line 1447 sub manage_reservations {
|
.'</p>' |
.'</p>' |
); |
); |
if (!defined($navmap)) { |
if (!defined($navmap)) { |
$r->print('<div class="LC_error">'. |
$r->print('<div class="LC_error">'); |
&mt('Unable to retrieve information about course contents'). |
if ($crstype eq 'Community') { |
'</div>'); |
$r->print(&mt('Unable to retrieve information about community contents')); |
&Apache::lonnet::logthis('Manage Reservations - could not create navmap object in '.lc($type).':'.$env{'request.course.id'}); |
} else { |
|
$r->print(&mt('Unable to retrieve information about course contents')); |
|
} |
|
$r->print('</div>'); |
|
&Apache::lonnet::logthis('Manage Reservations - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'}); |
return; |
return; |
} |
} |
my (%parent,%shownparent,%container,%container_title,%contents); |
my (%parent,%shownparent,%container,%container_title,%contents); |
Line 1599 sub manage_reservations {
|
Line 1612 sub manage_reservations {
|
$r->print('</table>'); |
$r->print('</table>'); |
} |
} |
if (!$reservable) { |
if (!$reservable) { |
$r->print('<span class="LC_info">'.&mt('No course items currently require a reservation to gain access.').'</span>'); |
$r->print('<span class="LC_info">'); |
|
if ($crstype eq 'Community') { |
|
$r->print(&mt('No community items currently require a reservation to gain access.')); |
|
} else { |
|
$r->print(&mt('No course items currently require a reservation to gain access.')); |
|
} |
|
$r->print('</span>'); |
} |
} |
$r->print('<p><a href="/adm/slotrequest?command=showresv">'. |
$r->print('<p><a href="/adm/slotrequest?command=showresv">'. |
&mt('Reservation History').'</a></p>'); |
&mt('Reservation History').'</a></p>'); |
Line 1632 sub show_reservations {
|
Line 1651 sub show_reservations {
|
my $formname = 'slotlog'; |
my $formname = 'slotlog'; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
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') { |
$r->print('<div class="LC_fontsize_large">'. |
$r->print('<div class="LC_fontsize_large">'); |
&mt('History of student-reservable slots for: [_1]', |
my $name = &Apache::loncommon::plainname($env{'form.uname'},$env{'form.udom'}, |
&Apache::loncommon::plainname($env{'form.uname'},$env{'form.udom'}, |
'firstname'); |
'firstname')).'</div>'); |
if ($crstype eq 'Community') { |
|
$r->print(&mt('History of member-reservable slots for: [_1]', |
|
$name)); |
|
} else { |
|
$r->print(&mt('History of student-reservable slots for: [_1]', |
|
$name)); |
|
|
|
} |
|
$r->print('</div>'); |
} |
} |
$r->print('<form action="/adm/slotrequest" method="post" name="'.$formname.'">'); |
$r->print('<form action="/adm/slotrequest" method="post" name="'.$formname.'">'); |
# set defaults |
# set defaults |
Line 1686 sub show_reservations {
|
Line 1714 sub show_reservations {
|
} |
} |
} |
} |
my (%titles,%maptitles); |
my (%titles,%maptitles); |
my %lt = &reservationlog_contexts(); |
my %lt = &reservationlog_contexts($crstype); |
foreach my $id (sort { $log{$b}{'exe_time'}<=>$log{$a}{'exe_time'} } (keys(%log))) { |
foreach my $id (sort { $log{$b}{'exe_time'}<=>$log{$a}{'exe_time'} } (keys(%log))) { |
next if (($log{$id}{'exe_time'} < $curr{'log_start_date'}) || |
next if (($log{$id}{'exe_time'} < $curr{'log_start_date'}) || |
($log{$id}{'exe_time'} > $curr{'log_end_date'})); |
($log{$id}{'exe_time'} > $curr{'log_end_date'})); |
Line 1766 ENDSCRIPT
|
Line 1794 ENDSCRIPT
|
sub show_reservations_log { |
sub show_reservations_log { |
my ($r) = @_; |
my ($r) = @_; |
my $badslot; |
my $badslot; |
|
my $crstype = &Apache::loncommon::course_type(); |
if ($env{'form.slotname'} eq '') { |
if ($env{'form.slotname'} eq '') { |
$r->print('<div class="LC_warning">'.&mt('No slot name provided').'</div>'); |
$r->print('<div class="LC_warning">'.&mt('No slot name provided').'</div>'); |
$badslot = 1; |
$badslot = 1; |
Line 1776 sub show_reservations_log {
|
Line 1805 sub show_reservations_log {
|
$badslot = 1; |
$badslot = 1; |
} elsif ($slot{type} ne 'schedulable_student') { |
} elsif ($slot{type} ne 'schedulable_student') { |
my $description = &get_description($env{'form.slotname'},\%slot); |
my $description = &get_description($env{'form.slotname'},\%slot); |
$r->print('<div class="LC_warning">'.&mt('Reservation history unavailable for non-student-reservable slot: [_1].',$description).'</div>'); |
$r->print('<div class="LC_warning">'); |
|
if ($crstype eq 'Community') { |
|
$r->print(&mt('Reservation history unavailable for non-member-reservable slot: [_1].',$description)); |
|
} else { |
|
$r->print(&mt('Reservation history unavailable for non-student-reservable slot: [_1].',$description)); |
|
} |
|
$r->print('</div>'); |
$badslot = 1; |
$badslot = 1; |
} |
} |
} |
} |
Line 1847 sub show_reservations_log {
|
Line 1882 sub show_reservations_log {
|
|
|
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
my $description = $slot{'description'}; |
my $description = $slot{'description'}; |
$r->print('<span class="LC_fontsize_large">'. |
$r->print('<span class="LC_fontsize_large">'); |
&mt('Reservation changes for student-reservable slot: [_1]',$description).'</span><br />'); |
if ($crstype eq 'Community') { |
|
$r->print(&mt('Reservation changes for member-reservable slot: [_1]',$description)); |
|
} else { |
|
$r->print(&mt('Reservation changes for student-reservable slot: [_1]',$description)); |
|
} |
|
$r->print('</span><br />'); |
$r->print(&display_filter($formname,$cdom,$cnum,\%curr,$version,\@allsymbs)); |
$r->print(&display_filter($formname,$cdom,$cnum,\%curr,$version,\@allsymbs)); |
my $showntablehdr = 0; |
my $showntablehdr = 0; |
my $tablehdr = &Apache::loncommon::start_data_table(). |
my $tablehdr = &Apache::loncommon::start_data_table(). |
Line 1867 sub show_reservations_log {
|
Line 1906 sub show_reservations_log {
|
$minshown = 1 + ($curr{'page'} - 1) * $curr{'show'}; |
$minshown = 1 + ($curr{'page'} - 1) * $curr{'show'}; |
} |
} |
} |
} |
my %lt = &reservationlog_contexts(); |
my %lt = &reservationlog_contexts($crstype); |
my (%titles,%maptitles); |
my (%titles,%maptitles); |
foreach my $id (sort { $log{$b}{'exe_time'}<=>$log{$a}{'exe_time'} } (keys(%log))) { |
foreach my $id (sort { $log{$b}{'exe_time'}<=>$log{$a}{'exe_time'} } (keys(%log))) { |
next if (($log{$id}{'exe_time'} < $curr{'log_start_date'}) || |
next if (($log{$id}{'exe_time'} < $curr{'log_start_date'}) || |
Line 1987 sub get_resource_title {
|
Line 2026 sub get_resource_title {
|
} |
} |
|
|
sub reservationlog_contexts { |
sub reservationlog_contexts { |
|
my ($crstype) = @_; |
my %lt = &Apache::lonlocal::texthash ( |
my %lt = &Apache::lonlocal::texthash ( |
any => 'Any', |
any => 'Any', |
user => 'By student', |
user => 'By student', |
Line 1996 sub reservationlog_contexts {
|
Line 2036 sub reservationlog_contexts {
|
release => 'Dropped reservation', |
release => 'Dropped reservation', |
usermanage => 'By student', |
usermanage => 'By student', |
); |
); |
|
if ($crstype eq 'Community') { |
|
$lt{'user'} = &mt('By member'); |
|
$lt{'usermanage'} = $lt{'user'}; |
|
} |
return %lt; |
return %lt; |
} |
} |
|
|
Line 2016 sub display_filter {
|
Line 2060 sub display_filter {
|
&Apache::lonhtmlcommon::date_setter($formname,'log_end_date', |
&Apache::lonhtmlcommon::date_setter($formname,'log_end_date', |
$curr->{'log_end_date'},undef, |
$curr->{'log_end_date'},undef, |
undef,undef,undef,undef,undef,undef,$nolink); |
undef,undef,undef,undef,undef,undef,$nolink); |
my %lt = &reservationlog_contexts(); |
my $crstype = &Apache::loncommon::course_type(); |
|
my %lt = &reservationlog_contexts($crstype); |
$output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:'). |
$output .= '<td valign="top"><b>'.&mt('Window during which changes occurred:'). |
'</b><br /><table><tr><td>'.&mt('After:'). |
'</b><br /><table><tr><td>'.&mt('After:'). |
'</td><td>'.$startform.'</td></tr><tr><td>'.&mt('Before:').'</td><td>'. |
'</td><td>'.$startform.'</td></tr><tr><td>'.&mt('Before:').'</td><td>'. |