version 1.132, 2016/05/21 21:13:58
|
version 1.138, 2018/06/24 04:11:08
|
Line 465 sub get_consumed_uniqueperiods {
|
Line 465 sub get_consumed_uniqueperiods {
|
return 'error: Unable to determine current status'; |
return 'error: Unable to determine current status'; |
} |
} |
my @problems = $navmap->retrieveResources(undef, |
my @problems = $navmap->retrieveResources(undef, |
sub { $_[0]->is_problem() },1,0); |
sub { $_[0]->is_problem() || $_[0]->is_tool() },1,0); |
my %used_slots; |
my %used_slots; |
foreach my $problem (@problems) { |
foreach my $problem (@problems) { |
my $symb = $problem->symb(); |
my $symb = $problem->symb(); |
Line 805 sub release_reservation {
|
Line 805 sub release_reservation {
|
if ($passed_resource->is_map()) { |
if ($passed_resource->is_map()) { |
my ($a_resource) = |
my ($a_resource) = |
$navmap->retrieveResources($passed_resource, |
$navmap->retrieveResources($passed_resource, |
sub {$_[0]->is_problem()},0,1); |
sub {$_[0]->is_problem() || $_[0]->is_tool() },0,1); |
$symb = $a_resource->symb(); |
$symb = $a_resource->symb(); |
} |
} |
} else { |
} else { |
Line 938 sub get_slot {
|
Line 938 sub get_slot {
|
if ($slot_name && $slot_name ne $conflictable_slot) { |
if ($slot_name && $slot_name ne $conflictable_slot) { |
my %slot=&Apache::lonnet::get_slot($slot_name); |
my %slot=&Apache::lonnet::get_slot($slot_name); |
my $description1=&get_description($slot_name,\%slot); |
my $description1=&get_description($slot_name,\%slot); |
|
my $slottype1=$slot{'type'}; |
%slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
%slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
my $description2=&get_description($env{'form.slotname'},\%slot); |
my $description2=&get_description($env{'form.slotname'},\%slot); |
if ($slot_name ne $env{'form.slotname'}) { |
if ($slottype1 eq 'preassigned') { |
|
$r->print('<p>'.&mt('You already have a reservation: "[_1]", assigned by your instructor.', |
|
$description1).'</p>'. |
|
'<p>'.&mt('Your instructor must unassign it before you can make a new reservation.'). |
|
'</p>'); |
|
} elsif ($slot_name ne $env{'form.slotname'}) { |
$r->print(<<STUFF); |
$r->print(<<STUFF); |
<form method="post" action="/adm/slotrequest"> |
<form method="post" action="/adm/slotrequest"> |
<input type="hidden" name="symb" value="$env{'form.symb'}" /> |
<input type="hidden" name="symb" value="$env{'form.symb'}" /> |
Line 1602 sub show_table {
|
Line 1608 sub show_table {
|
$r->print('</div>'); |
$r->print('</div>'); |
$r->print('<p><input type="submit" name="start" value="'.&mt('Update Display').'" /></p>'); |
$r->print('<p><input type="submit" name="start" value="'.&mt('Update Display').'" /></p>'); |
my $linkstart='<a href="/adm/slotrequest?command=showslots&order='; |
my $linkstart='<a href="/adm/slotrequest?command=showslots&order='; |
$r->print(&Apache::loncommon::start_data_table(). |
my $tableheader = &Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row().' |
&Apache::loncommon::start_data_table_header_row().' |
<th></th>'); |
<th></th>'; |
foreach my $which (@show_order) { |
foreach my $which (@show_order) { |
if ($which ne 'proctor' && exists($show{$which})) { |
if ($which ne 'proctor' && exists($show{$which})) { |
$r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>'); |
$tableheader .= '<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>'; |
} |
} |
} |
} |
$r->print(&Apache::loncommon::end_data_table_header_row()); |
$tableheader .= &Apache::loncommon::end_data_table_header_row(); |
|
my $shownheader = 0; |
|
|
my %name_cache; |
my %name_cache; |
my $slotsort = sub { |
my $slotsort = sub { |
Line 1767 sub show_table {
|
Line 1774 sub show_table {
|
delete => 'Delete', |
delete => 'Delete', |
slotlog => 'History', |
slotlog => 'History', |
); |
); |
my $edit=(<<"EDITLINK"); |
my ($edit,$delete,$showlog,$remove_all); |
|
if ($mgr) { |
|
$edit=(<<"EDITLINK"); |
<a href="/adm/helper/newslot.helper?name=$slot">$lt{'edit'}</a> |
<a href="/adm/helper/newslot.helper?name=$slot">$lt{'edit'}</a> |
EDITLINK |
EDITLINK |
|
|
my $delete=(<<"DELETELINK"); |
$delete=(<<"DELETELINK"); |
<a href="/adm/slotrequest?command=delete&slotname=$slot">$lt{'delete'}</a> |
<a href="/adm/slotrequest?command=delete&slotname=$slot">$lt{'delete'}</a> |
DELETELINK |
DELETELINK |
|
|
my $showlog=(<<"LOGLINK"); |
$remove_all=&remove_link($slot,'remove all').'<br />'; |
|
|
|
if ($ids eq '') { |
|
undef($remove_all); |
|
} else { |
|
undef($delete); |
|
} |
|
} |
|
|
|
$showlog=(<<"LOGLINK"); |
<a href="/adm/slotrequest?command=slotlog&slotname=$slot">$lt{'slotlog'}</a> |
<a href="/adm/slotrequest?command=slotlog&slotname=$slot">$lt{'slotlog'}</a> |
LOGLINK |
LOGLINK |
|
|
my $remove_all=&remove_link($slot,'remove all').'<br />'; |
|
|
|
if ($ids eq '') { |
|
undef($remove_all); |
|
} else { |
|
undef($delete); |
|
} |
|
if ($slots{$slot}{'type'} ne 'schedulable_student') { |
if ($slots{$slot}{'type'} ne 'schedulable_student') { |
undef($showlog); |
undef($showlog); |
undef($remove_all); |
undef($remove_all); |
} |
} |
|
|
|
unless ($shownheader) { |
|
$r->print($tableheader); |
|
$shownheader = 1; |
|
} |
|
|
my $row_start=&Apache::loncommon::start_data_table_row(); |
my $row_start=&Apache::loncommon::start_data_table_row(); |
my $row_end=&Apache::loncommon::end_data_table_row(); |
my $row_end=&Apache::loncommon::end_data_table_row(); |
$r->print($row_start. |
$r->print($row_start. |
Line 1869 $row_end
|
Line 1885 $row_end
|
STUFF |
STUFF |
} |
} |
} |
} |
$r->print(&Apache::loncommon::end_data_table().'</form>'); |
if ($shownheader) { |
|
$r->print(&Apache::loncommon::end_data_table()); |
|
} else { |
|
$r->print('<p>'.&mt('No slots meet the criteria for display').'</p>'); |
|
} |
|
$r->print('</form>'); |
return; |
return; |
} |
} |
|
|
sub manage_reservations { |
sub manage_reservations { |
my ($r,$crstype,$slots,$consumed_uniqueperiods,$allavailable) = @_; |
my ($r,$crstype,$slots,$consumed_uniqueperiods,$allavailable) = @_; |
|
my ($cnum,$cdom)=&get_course(); |
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 1906 sub manage_reservations {
|
Line 1928 sub manage_reservations {
|
'</span>'); |
'</span>'); |
return; |
return; |
} |
} |
my (%parent,%shownparent,%container,%container_title,%contents); |
my (%output,%slotinfo,%statusbymap,%repsymbs,%shownmaps); |
my ($depth,$count,$reservable,$lastcontainer,$rownum,$shown) = (0,0,0,0,0,0); |
my @possibles = $navmap->retrieveResources(undef, |
my @backgrounds = ("LC_odd_row","LC_even_row"); |
sub { $_[0]->is_problem() || $_[0]->is_tool() },1,0); |
|
|
|
foreach my $resource (@possibles) { |
|
my ($useslots) = $resource->slot_control(); |
|
next if (($useslots eq '') || ($useslots =~ /^\s*no\s*$/i)); |
|
my $symb = $resource->symb(); |
|
my ($slot_status,$date,$slot_name) = $resource->check_for_slot('0'); |
|
my ($msg,$get_choices,$slotdescription); |
|
my $status = $resource->simpleStatus('0'); |
|
my ($msg,$get_choices,$slotdescription); |
|
if ($slot_name ne '') { |
|
my %slot=&Apache::lonnet::get_slot($slot_name); |
|
$slotdescription=&get_description($slot_name,\%slot); |
|
} |
|
if ($slot_status == $resource->NOT_IN_A_SLOT) { |
|
$msg=&mt('No current reservation.'); |
|
$get_choices = 1; |
|
} elsif ($slot_status == $resource->NEEDS_CHECKIN) { |
|
$msg='<span class="LC_nobreak">'.&mt('Reserved:'). |
|
' '.$slotdescription.'</span><br />'. |
|
&mt('Access requires proctor validation.'); |
|
} elsif ($slot_status == $resource->WAITING_FOR_GRADE) { |
|
$msg=&mt('Submitted and currently in grading queue.'); |
|
} elsif ($slot_status == $resource->CORRECT) { |
|
$msg=&mt('Problem is unavailable.'); |
|
} elsif ($slot_status == $resource->RESERVED) { |
|
$msg='<span class="LC_nobreak">'.&mt('Reserved:'). |
|
' '.$slotdescription.'</span><br />'. |
|
&mt('Problem is currently available.'); |
|
} elsif ($slot_status == $resource->RESERVED_LOCATION) { |
|
$msg='<span class="LC_nobreak">'.&mt('Reserved:'). |
|
' '.$slotdescription.'</span><br />'. |
|
&mt('Problem is available at a different location.'); |
|
$get_choices = 1; |
|
} elsif ($slot_status == $resource->RESERVED_LATER) { |
|
$msg='<span class="LC_nobreak">'.&mt('Reserved:'). |
|
' '.$slotdescription.'</span><br />'. |
|
&mt('Problem will be available later.'); |
|
$get_choices = 1; |
|
} elsif ($slot_status == $resource->RESERVABLE) { |
|
$msg=&mt('Reservation needed'); |
|
$get_choices = 1; |
|
} elsif ($slot_status == $resource->RESERVABLE_LATER) { |
|
$msg=&mt('Reservation needed: will be reservable later.'); |
|
} elsif ($slot_status == $resource->NOTRESERVABLE) { |
|
$msg=&mt('Reservation needed: none available.'); |
|
} elsif ($slot_status == $resource->UNKNOWN) { |
|
$msg=&mt('Unable to determine status due to network problems.'); |
|
} else { |
|
if ($status != $resource->OPEN) { |
|
$msg = &Apache::lonnavmaps::getDescription($resource,'0'); |
|
} |
|
} |
|
$output{$symb}{'msg'} = $msg; |
|
if (($status == $resource->OPEN) && ($get_choices)) { |
|
$output{$symb}{'hasaction'} = 1; |
|
} |
|
my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($symb); |
|
$mapurl = &Apache::lonnet::clutter($mapurl); |
|
unless ($mapurl =~ /default\.sequence$/) { |
|
$shownmaps{$mapurl} = 1; |
|
my $map = $navmap->getResourceByUrl($mapurl); |
|
if (ref($map)) { |
|
my @pcs = split(/,/,$map->map_hierarchy()); |
|
shift(@pcs); |
|
shift(@pcs); |
|
if (@pcs) { |
|
map { $shownmaps{$navmap->getByMapPc($_)->src()} = 1; } reverse(@pcs); |
|
} |
|
} |
|
} |
|
if (($useslots eq 'map_map') || ($useslots eq 'map')) { |
|
if ($slot_status ne '') { |
|
if (ref($statusbymap{$mapurl}{$slot_status}) eq 'ARRAY') { |
|
push(@{$statusbymap{$mapurl}{$slot_status}},$symb); |
|
} else { |
|
$statusbymap{$mapurl}{$slot_status} = [$symb]; |
|
} |
|
} |
|
} |
|
} |
|
|
|
foreach my $mapurl (keys(%statusbymap)) { |
|
if (ref($statusbymap{$mapurl}) eq 'HASH') { |
|
if (keys(%{$statusbymap{$mapurl}}) == 1) { |
|
my @values = values(%{$statusbymap{$mapurl}}); |
|
my $repsymb = $values[0][0]; |
|
if (ref($output{$repsymb}) eq 'HASH') { |
|
$output{$mapurl}{'msg'} = $output{$repsymb}{'msg'}; |
|
$output{$mapurl}{'hasaction'} = $output{$repsymb}{'hasaction'}; |
|
} |
|
$repsymbs{$mapurl} = $repsymb; |
|
} |
|
} |
|
} |
|
|
|
my (%parent,%container,%container_title); |
|
my ($depth,$count,$reservable,$currcontainer,$rownum,$mapnum,$shown) = (0,0,0,0,0,0,0); |
|
my @backgrounds = ("LC_even_row","LC_odd_row"); |
my $numcolors = scalar(@backgrounds); |
my $numcolors = scalar(@backgrounds); |
my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif"); |
my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif"); |
my $slotheader = '<p>'. |
my $slotheader = '<p>'. |
Line 1916 sub manage_reservations {
|
Line 2036 sub manage_reservations {
|
'</p>'. |
'</p>'. |
'<table class="LC_data_table LC_tableOfContent" id="LC_slot_reservations">'."\n"; |
'<table class="LC_data_table LC_tableOfContent" id="LC_slot_reservations">'."\n"; |
my $shownheader = 0; |
my $shownheader = 0; |
|
my $currmap; |
my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef); |
my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef); |
my (@ordered,%output,$mapitem,$got_map_slot,$currmapoutput,$mapnum); |
|
$mapnum = 0; |
|
$shown = 0; |
|
while (my $resource = $it->next()) { |
while (my $resource = $it->next()) { |
if ($resource == $it->BEGIN_MAP()) { |
if ($resource == $it->BEGIN_MAP()) { |
$depth++; |
$depth++; |
$parent{$depth} = $lastcontainer; |
$parent{$depth} = $currcontainer; |
} |
if (ref($container{$currcontainer})) { |
if ($resource == $it->END_MAP()) { |
my $currmapres = $container{$currcontainer}; |
$depth--; |
my $currmaptitle = $container_title{$currcontainer}; |
$lastcontainer = $parent{$depth}; |
$currmap = $currmapres->src(); |
my %allstatuses; |
my $currmaptype = 'sequence'; |
foreach my $symb (@ordered) { |
if ($currmapres->is_page()) { |
if (ref($output{$symb}) eq 'HASH') { |
$currmaptype = 'page'; |
if (($output{$symb}{'type'} eq 'map_map') || ($output{$symb}{'type'} eq 'map')) { |
} |
if ($output{$symb}{'slotstatus'} ne '') { |
if ($shownmaps{$currmap}) { |
if (ref($allstatuses{$output{$symb}{'slotstatus'}}) eq 'ARRAY') { |
$mapnum ++; |
push(@{$allstatuses{$output{$symb}{'slotstatus'}}},$symb); |
$rownum ++; |
|
$shown ++; |
|
if (!$shownheader) { |
|
$r->print($slotheader); |
|
$shownheader = 1; |
|
} |
|
my $bgcolor = $backgrounds[$shown % $numcolors]; |
|
my ($spacers,$icon); |
|
my $row = '<tr class="'.$bgcolor.'" id="LC_slotmaprow_'.$rownum.'">'; |
|
if (ref($statusbymap{$currmap}) eq 'HASH') { |
|
my ($spacers,$icon) = &show_map_row($depth-1,$location,$currmaptype,$currmaptitle); |
|
my $arrowstate = 'open'; |
|
if (keys(%{$statusbymap{$currmap}}) == 1) { |
|
$arrowstate = 'closed'; |
|
} |
|
$row .= '<td>'.$spacers.'<img src="/adm/lonIcons/arrow.'.$arrowstate.'.gif" '. |
|
'id="arrow'.$mapnum.'" '.'alt="arrow" onmouseover="this.style.cursor=\'pointer\'" '. |
|
'onclick="'."toggleSlotMap('$mapnum','$rownum');".'" />'. |
|
$icon.(' ' x6).'</td>'."\n"; |
|
if (ref($output{$currmap}) eq 'HASH') { |
|
my $formnum = $mapnum.'_'.$reservable+1; |
|
my $class = 'LC_slotmaptext_'.$mapnum; |
|
if ($output{$currmap}{'hasaction'}) { |
|
$row .= '<td valign="top"><span class="'.$class.'">'. |
|
$output{$currmap}{'msg'}. |
|
'</span></td><td valign="top">'. |
|
&slot_chooser($repsymbs{$currmap},$class,$formnum, |
|
$allavailable,$slots,$consumed_uniqueperiods). |
|
'</td>'; |
} else { |
} else { |
$allstatuses{$output{$symb}{'slotstatus'}} = [$symb]; |
$row .= '<td colspan="2" valign="middle"><span class="'.$class.'">'. |
|
$output{$currmap}{'msg'}. |
|
'</span></td>'; |
} |
} |
|
$row .= '</tr>'."\n"; |
|
} else { |
|
$row .= '<td colspan="2"> </td></tr>'."\n"; |
} |
} |
} |
|
} |
|
} |
|
if (keys(%allstatuses) == 1) { |
|
$got_map_slot = 1; |
|
my $repsymb; |
|
my @values = values(%allstatuses); |
|
if (ref($values[0]) eq 'ARRAY') { |
|
if (ref($output{$values[0][0]}) eq 'HASH') { |
|
$repsymb = $values[0][0]; |
|
} |
|
} |
|
if (($mapitem) && ($repsymb)) { |
|
my $formnum = $mapnum.'_'.$output{$repsymb}{'reservable'}; |
|
my $class = 'LC_slotmaptext_'.$mapnum; |
|
if ($output{$repsymb}{'hasaction'}) { |
|
$mapitem .= '<td valign="top"><span class="'.$class.'">'. |
|
$output{$repsymb}{'msg'}. |
|
'</span></td><td valign="top">'. |
|
&slot_chooser($repsymb,$class,$formnum,$allavailable,$slots, |
|
$consumed_uniqueperiods). |
|
'</td>'; |
|
|
|
} else { |
} else { |
$mapitem .= '<td colspan="2" valign="middle"><span class="'.$class.'">'. |
my ($spacers,$icon) = &show_map_row($depth,$location,$currmaptype,$currmaptitle); |
$output{$repsymb}{'msg'}. |
$row .= '<td>'.$spacers.$icon.(' ' x6).'</td><td colspan="2"> </td></tr>'."\n"; |
'</span></td>'; |
|
} |
|
} |
|
my $counter = 0; |
|
foreach my $symb (@ordered) { |
|
if (ref($output{$symb}) eq 'HASH') { |
|
$counter ++; |
|
my $bgcolor = $backgrounds[($output{$symb}{'shown'} + $counter) % $numcolors]; |
|
$currmapoutput .= $output{$symb}{'header'}. |
|
'<tr class="'.$bgcolor.' LC_slotresrow_'.$output{$symb}{'mapnum'}.'"'. |
|
' style="display:none" id="LC_slotresrow_'.$output{$symb}{'rownum'}.'">'. |
|
$output{$symb}{'info'}. |
|
$output{$symb}{'data'}.'</tr>'."\n"; |
|
} |
} |
} |
$r->print($row); |
} else { |
|
my $counter = 0; |
|
foreach my $symb (@ordered) { |
|
if (ref($output{$symb}) eq 'HASH') { |
|
$counter ++; |
|
my $bgcolor = $backgrounds[($output{$symb}{'shown'} + $counter) % $numcolors]; |
|
$currmapoutput .= $output{$symb}{'header'}. |
|
'<tr class="'.$bgcolor.' LC_slotresrow_'.$output{$symb}{'mapnum'}.'"'. |
|
' style="display:table-row" id="LC_slotresrow_'.$output{$symb}{'rownum'}.'">'. |
|
$output{$symb}{'info'}. |
|
$output{$symb}{'data'}.'</tr>'."\n"; |
|
$shown ++; |
|
} |
|
} |
|
} |
|
if ($mapitem) { |
|
if ($got_map_slot) { |
|
$mapitem =~ s{(<img src=\"/adm/lonIcons/arrow\.)open(\.gif\")}{$1closed$2}; |
|
$mapitem .= '</tr>'."\n"; |
|
} else { |
|
$mapitem .= '<td colspan="2"> </td></tr>'."\n"; |
|
} |
} |
} |
} |
$r->print($mapitem.$currmapoutput); |
} elsif ($resource == $it->END_MAP()) { |
@ordered=(); |
$depth--; |
undef(%output); |
$currcontainer = $parent{$depth}; |
$currmapoutput = ''; |
} elsif (ref($resource)) { |
$got_map_slot = ''; |
|
$mapitem = ''; |
|
} |
|
if (ref($resource)) { |
|
my $symb = $resource->symb(); |
my $symb = $resource->symb(); |
$contents{$lastcontainer} ++; |
next if (!$resource->is_problem() && !$resource->is_tool() && |
next if (!$resource->is_problem() && !$resource->is_sequence() && |
!$resource->is_sequence() && !$resource->is_page()); |
!$resource->is_page()); |
|
$count ++; |
$count ++; |
if (($resource->is_sequence()) || ($resource->is_page())) { |
if (($resource->is_sequence()) || ($resource->is_page())) { |
$lastcontainer = $count; |
$currcontainer = $count; |
$container{$lastcontainer} = $resource; |
$container{$currcontainer} = $resource; |
$container_title{$lastcontainer} = $resource->compTitle(); |
$container_title{$currcontainer} = $resource->compTitle(); |
} |
} |
if ($resource->is_problem()) { |
if (($resource->is_problem() || $resource->is_tool)) { |
my ($useslots) = $resource->slot_control(); |
next unless (exists($output{$symb})); |
next if (($useslots eq '') || ($useslots =~ /^\s*no\s*$/i)); |
|
push(@ordered,$symb); |
|
$output{$symb}{type} = $useslots; |
|
my ($msg,$get_choices,$slotdescription); |
|
my $title = $resource->compTitle(); |
|
my $status = $resource->simpleStatus('0'); |
|
my ($slot_status,$date,$slot_name) = $resource->check_for_slot('0'); |
|
|
|
$output{$symb}{'slotstatus'} = $slot_status; |
|
$output{$symb}{'slotname'} = $slot_name; |
|
if ($slot_name ne '') { |
|
my %slot=&Apache::lonnet::get_slot($slot_name); |
|
$slotdescription=&get_description($slot_name,\%slot); |
|
} |
|
if ($slot_status == $resource->NOT_IN_A_SLOT) { |
|
$msg=&mt('No current reservation.'); |
|
$get_choices = 1; |
|
} elsif ($slot_status == $resource->NEEDS_CHECKIN) { |
|
$msg='<span class="LC_nobreak">'.&mt('Reserved:'). |
|
' '.$slotdescription.'</span><br />'. |
|
&mt('Access requires proctor validation.'); |
|
} elsif ($slot_status == $resource->WAITING_FOR_GRADE) { |
|
$msg=&mt('Submitted and currently in grading queue.'); |
|
} elsif ($slot_status == $resource->CORRECT) { |
|
$msg=&mt('Problem is unavailable.'); |
|
} elsif ($slot_status == $resource->RESERVED) { |
|
$msg='<span class="LC_nobreak">'.&mt('Reserved:'). |
|
' '.$slotdescription.'</span><br />'. |
|
&mt('Problem is currently available.'); |
|
} elsif ($slot_status == $resource->RESERVED_LOCATION) { |
|
$msg='<span class="LC_nobreak">'.&mt('Reserved:'). |
|
' '.$slotdescription.'</span><br />'. |
|
&mt('Problem is available at a different location.'); |
|
$get_choices = 1; |
|
} elsif ($slot_status == $resource->RESERVED_LATER) { |
|
$msg='<span class="LC_nobreak">'.&mt('Reserved:'). |
|
' '.$slotdescription.'</span><br />'. |
|
&mt('Problem will be available later.'); |
|
$get_choices = 1; |
|
} elsif ($slot_status == $resource->RESERVABLE) { |
|
$msg=&mt('Reservation needed'); |
|
$get_choices = 1; |
|
} elsif ($slot_status == $resource->RESERVABLE_LATER) { |
|
$msg=&mt('Reservation needed: will be reservable later.'); |
|
} elsif ($slot_status == $resource->NOTRESERVABLE) { |
|
$msg=&mt('Reservation needed: none available.'); |
|
} elsif ($slot_status == $resource->UNKNOWN) { |
|
$msg=&mt('Unable to determine status due to network problems.'); |
|
} else { |
|
if ($status != $resource->OPEN) { |
|
$msg = &Apache::lonnavmaps::getDescription($resource,'0'); |
|
} |
|
} |
|
$output{$symb}{'msg'} = $msg; |
|
$reservable ++; |
$reservable ++; |
$output{$symb}{'reservable'} = $reservable; |
|
my $treelevel = $depth; |
|
my $higherup = $lastcontainer; |
|
if ($depth > 1) { |
|
my @maprows; |
|
while ($treelevel > 1) { |
|
if (ref($container{$higherup})) { |
|
my $res = $container{$higherup}; |
|
last if (defined($shownparent{$higherup})); |
|
my $maptitle = $res->compTitle(); |
|
my $type = 'sequence'; |
|
if ($res->is_page()) { |
|
$type = 'page'; |
|
} |
|
&show_map_row($treelevel,$location,$type,$maptitle, |
|
\@maprows); |
|
$shownparent{$higherup} = 1; |
|
} |
|
$treelevel --; |
|
$higherup = $parent{$treelevel}; |
|
} |
|
for (my $i=0; $i<@maprows; $i++) { |
|
$mapnum ++; |
|
$rownum ++; |
|
$shown ++; |
|
my $bgcolor = $backgrounds[$shown % $numcolors]; |
|
if (!$shownheader) { |
|
$mapitem .= $slotheader; |
|
$shownheader = 1; |
|
} |
|
if (ref($maprows[$i]) eq 'ARRAY') { |
|
if ($i < scalar(@maprows)-1) { |
|
$mapitem .= '<tr class="'.$bgcolor.'" id="LC_slotmaprow_'.$rownum.'">'. |
|
'<td>'.join('',@{$maprows[$i]}).'</td>'. |
|
'<td colspan="2"> </td></tr>'."\n"; |
|
} else { |
|
$mapitem .= |
|
'<tr class="'.$bgcolor.'" id="LC_slotmaprow_'.$rownum.'">'. |
|
'<td>'.$maprows[$i][0]. |
|
'<img src="/adm/lonIcons/arrow.open.gif" id="arrow'.$mapnum.'" '. |
|
'alt="arrow" onmouseover="this.style.cursor=\'pointer\'" '. |
|
'onclick="'."toggleSlotMap('$mapnum','$rownum');".'" />'. |
|
$maprows[$i][1].(' ' x6).'</td>'."\n"; |
|
} |
|
} |
|
} |
|
$output{$symb}{'mapnum'} = $mapnum; |
|
} |
|
$rownum ++; |
$rownum ++; |
$output{$symb}{'rownum'} = $rownum; |
|
$output{$symb}{'shown'} = $shown; |
|
if (!$shownheader) { |
if (!$shownheader) { |
$output{$symb}{'header'} = $slotheader; |
$r->print($slotheader); |
$shownheader = 1; |
$shownheader = 1; |
} |
} |
$output{$symb}{'info'} = '<td>'; |
my $style; |
|
if (exists($output{$currmap})) { |
|
$style = 'none'; |
|
} else { |
|
$style = 'table-row'; |
|
$shown ++; |
|
} |
|
my $title = $resource->compTitle(); |
|
my $bgcolor = $backgrounds[$shown % $numcolors]; |
|
$r->print('<tr class="'.$bgcolor.' LC_slotresrow_'.$mapnum.'"'. |
|
' style="display:'.$style.'" id="LC_slotresrow_'.$rownum.'">'. |
|
'<td>'); |
for (my $i=0; $i<$depth; $i++) { |
for (my $i=0; $i<$depth; $i++) { |
$output{$symb}{'info'} .= '<img src="'.$location.'" alt="" />'; |
$r->print('<img src="'.$location.'" alt="" />'); |
} |
} |
$output{$symb}{'info'} .= '<a href="'.$resource->src().'?symb='.$symb.'">'. |
$r->print('<a href="'.$resource->src().'?symb='.$symb.'">'. |
'<img class="LC_contentImage" src="/adm/lonIcons/'; |
'<img class="LC_contentImage" src="/adm/lonIcons/'); |
if ($resource->is_task()) { |
if ($resource->is_task()) { |
$output{$symb}{'info'} .= 'task.gif" alt="'.&mt('Task'); |
$r->print('task.gif" alt="'.&mt('Task')); |
|
} elsif ($resource->is_tool()) { |
|
$r->print('unknown.gif" alt="'.&mt('External Tool')); |
} else { |
} else { |
$output{$symb}{'info'} .= 'problem.gif" alt="'.&mt('Problem'); |
$r->print('problem.gif" alt="'.&mt('Problem')); |
} |
|
$output{$symb}{'info'} .= '" /><b>'.$title.'</b></a>'.(' ' x6).'</td>'; |
|
|
|
my $hasaction; |
|
if ($status == $resource->OPEN) { |
|
if ($get_choices) { |
|
$hasaction = 1; |
|
$output{$symb}{'hasaction'} = $hasaction; |
|
} |
|
} |
} |
|
$r->print('" /><b>'.$title.'</b></a>'.(' ' x6).'</td>'); |
my $class = 'LC_slottext_'.$mapnum; |
my $class = 'LC_slottext_'.$mapnum; |
if ($hasaction) { |
if ($output{$symb}{'hasaction'}) { |
$output{$symb}{'data'} = '<td valign="top"><span class="'.$class.'">'.$msg.'</span></td>'. |
$r->print('<td valign="top"><span class="'.$class.'">'.$output{$symb}{'msg'}.'</span></td>'. |
'<td valign="top">'. |
'<td valign="top">'. |
&slot_chooser($symb,$class,$reservable,$allavailable,$slots, |
&slot_chooser($symb,$class,$reservable,$allavailable,$slots, |
$consumed_uniqueperiods).'</td>'; |
$consumed_uniqueperiods).'</td>'); |
} else { |
} else { |
$output{$symb}{'data'} = '<td colspan="2" valign="middle">'. |
$r->print('<td colspan="2" valign="middle">'. |
'<span class="'.$class.'">'.$msg.'</span>'. |
'<span class="'.$class.'">'.$output{$symb}{'msg'}.'</span>'. |
'</td>'; |
'</td>'); |
} |
} |
|
$r->print('</tr>'."\n"); |
} |
} |
} |
} |
} |
} |
Line 2184 sub manage_reservations {
|
Line 2175 sub manage_reservations {
|
} |
} |
|
|
sub show_map_row { |
sub show_map_row { |
my ($depth,$location,$type,$title,$maprows) = @_; |
my ($depth,$location,$type,$title) = @_; |
my $spacers; |
my $spacers; |
for (my $i=0; $i<$depth-2; $i++) { |
for (my $i=0; $i<$depth-1; $i++) { |
$spacers .= '<img src="'.$location.'" alt="" />'; |
$spacers .= '<img src="'.$location.'" alt="" />'; |
} |
} |
my $icon; |
my $icon; |
Line 2196 sub show_map_row {
|
Line 2187 sub show_map_row {
|
$icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" /> '."\n"; |
$icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" /> '."\n"; |
} |
} |
$icon .= $title; |
$icon .= $title; |
unshift (@{$maprows},[$spacers,$icon]); |
return ($spacers,$icon); |
return; |
|
} |
} |
|
|
sub slot_chooser { |
sub slot_chooser { |
Line 2258 sub show_reservations {
|
Line 2248 sub show_reservations {
|
$udom = $env{'user.domain'}; |
$udom = $env{'user.domain'}; |
} |
} |
my $formname = 'slotlog'; |
my $formname = 'slotlog'; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my ($cnum,$cdom)=&get_course(); |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my $crstype = &Apache::loncommon::course_type(); |
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') { |
Line 2360 sub show_reservations {
|
Line 2349 sub show_reservations {
|
if ($showntablehdr) { |
if ($showntablehdr) { |
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
if (($curr{'page'} > 1) || ($more_records)) { |
if (($curr{'page'} > 1) || ($more_records)) { |
$r->print('<table><tr>'); |
$r->print('<p>'); |
if ($curr{'page'} > 1) { |
if ($curr{'page'} > 1) { |
$r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>'); |
$r->print('<input type="button" onclick="javascript:chgPage('."'previous'".');" value="'. |
|
&mt('Previous [_1] changes',$curr{'show'}).'" />'); |
} |
} |
if ($more_records) { |
if ($more_records) { |
$r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>'); |
$r->print('<input type="button" onclick="javascript:chgPage('."'next'".');" value="'. |
|
&mt('Next [_1] changes',$curr{'show'}).'" />'); |
} |
} |
$r->print('</tr></table>'); |
$r->print('</p>'); |
$r->print(<<"ENDSCRIPT"); |
$r->print(<<"ENDSCRIPT"); |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
Line 2432 sub show_reservations_log {
|
Line 2423 sub show_reservations_log {
|
return; |
return; |
} |
} |
my $formname = 'reservationslog'; |
my $formname = 'reservationslog'; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my ($cnum,$cdom)=&get_course(); |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my %slotlog=&Apache::lonnet::dump('nohist_slotreservationslog',$cdom,$cnum); |
my %slotlog=&Apache::lonnet::dump('nohist_slotreservationslog',$cdom,$cnum); |
if ((keys(%slotlog))[0]=~/^error\:/) { undef(%slotlog); } |
if ((keys(%slotlog))[0]=~/^error\:/) { undef(%slotlog); } |
|
|
Line 2571 sub show_reservations_log {
|
Line 2561 sub show_reservations_log {
|
if ($showntablehdr) { |
if ($showntablehdr) { |
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
if (($curr{'page'} > 1) || ($more_records)) { |
if (($curr{'page'} > 1) || ($more_records)) { |
$r->print('<table><tr>'); |
$r->print('<p>'); |
if ($curr{'page'} > 1) { |
if ($curr{'page'} > 1) { |
$r->print('<td><a href="javascript:chgPage('."'previous'".');">'.&mt('Previous [_1] changes',$curr{'show'}).'</a></td>'); |
$r->print('<input type="button" onclick="javascript:chgPage('."'previous'".');" value="'. |
|
&mt('Previous [_1] changes',$curr{'show'}).'" />'); |
} |
} |
if ($more_records) { |
if ($more_records) { |
$r->print('<td><a href="javascript:chgPage('."'next'".');">'.&mt('Next [_1] changes',$curr{'show'}).'</a></td>'); |
$r->print('<input type="button" onclick="javascript:chgPage('."'next'".');" value="'. |
|
&mt('Next [_1] changes',$curr{'show'}).'" />'); |
} |
} |
$r->print('</tr></table>'); |
$r->print('</p>'); |
$r->print(<<"ENDSCRIPT"); |
$r->print(<<"ENDSCRIPT"); |
<script type="text/javascript"> |
<script type="text/javascript"> |
function chgPage(caller) { |
function chgPage(caller) { |
Line 2718 sub display_filter {
|
Line 2710 sub display_filter {
|
} |
} |
$output .= '</select></td>'; |
$output .= '</select></td>'; |
} |
} |
$output .= '<td> </td><td valign="middle"><input type="submit" value="'. |
$output .= '<td> </td></tr></table>'. |
&mt('Update Display').'" /></tr></table>'. |
'<p><input type="submit" value="'. |
|
&mt('Update Display').'" /></p>'. |
'<p class="LC_info">'. |
'<p class="LC_info">'. |
&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.' |
&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.' |
,'2.9.0'); |
,'2.9.0'); |
Line 2925 sub csv_upload_map {
|
Line 2918 sub csv_upload_map {
|
if (!$env{'form.datatoken'}) { |
if (!$env{'form.datatoken'}) { |
$datatoken=&Apache::loncommon::upfile_store($r); |
$datatoken=&Apache::loncommon::upfile_store($r); |
} else { |
} else { |
$datatoken=$env{'form.datatoken'}; |
$datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'}); |
&Apache::loncommon::load_tmp_file($r); |
if ($datatoken ne '') { |
|
&Apache::loncommon::load_tmp_file($r,$datatoken); |
|
} |
} |
} |
my @records=&Apache::loncommon::upfile_record_sep(); |
my @records=&Apache::loncommon::upfile_record_sep(); |
if ($env{'form.noFirstLine'}) { shift(@records); } |
if ($env{'form.noFirstLine'}) { shift(@records); } |
Line 2977 sub csvupload_fields {
|
Line 2972 sub csvupload_fields {
|
|
|
sub csv_upload_assign { |
sub csv_upload_assign { |
my ($r,$mgr)= @_; |
my ($r,$mgr)= @_; |
&Apache::loncommon::load_tmp_file($r); |
my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'}); |
|
if ($datatoken ne '') { |
|
&Apache::loncommon::load_tmp_file($r,$datatoken); |
|
} |
my @slotdata = &Apache::loncommon::upfile_record_sep(); |
my @slotdata = &Apache::loncommon::upfile_record_sep(); |
if ($env{'form.noFirstLine'}) { shift(@slotdata); } |
if ($env{'form.noFirstLine'}) { shift(@slotdata); } |
my %fields=&Apache::grades::get_fields(); |
my %fields=&Apache::grades::get_fields(); |
Line 3289 sub handler {
|
Line 3287 sub handler {
|
} |
} |
&csv_upload_map($r); |
&csv_upload_map($r); |
} |
} |
} elsif ($env{'form.command'} eq 'slotlog' && $mgr eq 'F') { |
} elsif (($env{'form.command'} eq 'slotlog') && ($vgr eq 'F')) { |
&show_reservations_log($r); |
&show_reservations_log($r); |
} else { |
} else { |
my $symb=&unescape($env{'form.symb'}); |
my $symb=&unescape($env{'form.symb'}); |