| '.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order).
' |
-
+ |
'.&Apache::loncommon::multiple_select_form('studisplay',\@stu_display,
6,\%stu_display_fields,
\@stu_display_order).'
|
- '.&Apache::loncommon::select_form($when,'when',%when_fields).
+ | '.&Apache::loncommon::select_form($when,'when',%when_fields).
' |
- '.&Apache::loncommon::select_form($name_filter_type,
+ | '.&Apache::loncommon::select_form($name_filter_type,
'name_filter_type',
%name_filter_type_fields).
'
'.
@@ -1051,7 +1169,7 @@ sub show_table {
$env{'form.name_filter_value'},
15).
' |
-
+ |
| Deleted slots: |
@@ -1214,26 +1332,39 @@ sub show_table {
}
my $proctors=join(', ',@proctors);
+ my %lt = &Apache::lonlocal::texthash (
+ edit => 'Edit',
+ delete => 'Delete',
+ slotlog => 'History',
+ );
my $edit=(<<"EDITLINK");
-Edit
+$lt{'edit'}
EDITLINK
my $delete=(<<"DELETELINK");
-Delete
+$lt{'delete'}
DELETELINK
+ my $showlog=(<<"LOGLINK");
+$lt{'slotlog'}
+LOGLINK
+
my $remove_all=&remove_link($slot,'remove all').'
';
- if ($ids ne '') { undef($delete); }
- if ($slots{$slot}{'type'} ne 'schedulable_student'
- || $ids eq '') {
+ if ($ids eq '') {
+ undef($remove_all);
+ } else {
+ undef($delete);
+ }
+ if ($slots{$slot}{'type'} ne 'schedulable_student') {
+ undef($showlog);
undef($remove_all);
}
my $row_start=&Apache::loncommon::start_data_table_row();
my $row_end=&Apache::loncommon::end_data_table_row();
$r->print($row_start.
- "\n$edit $delete | \n");
+ "\n$edit $delete $showlog | \n");
if (exists($show{'name'})) {
$colspan++;$r->print("$slot | ");
}
@@ -1292,7 +1423,641 @@ $row_end
STUFF
}
}
- $r->print(' ');
+ $r->print(&Apache::loncommon::end_data_table().'');
+ return;
+}
+
+sub manage_reservations {
+ my ($r,$type) = @_;
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ $r->print(''
+ .&mt('Instructors may use a reservation system to place restrictions on when and where assignments can be worked on.')
+ .'
'
+ .&mt('One example is for management of laboratory space, which is only available at certain times, and has a limited number of seats.')
+ .' '
+ .&mt('Your reservation status for any such assignments is listed below:')
+ .' '
+ );
+ if (!defined($navmap)) {
+ $r->print(''.
+ &mt('Unable to retrieve information about course contents').
+ ' ');
+ &Apache::lonnet::logthis('Manage Reservations - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
+ return;
+ }
+ my (%parent,%shownparent,%container,%container_title,%contents);
+ my ($depth,$count,$reservable,$lastcontainer,$rownum) = (0,0,0,0,0);
+ my @backgrounds = ("LC_odd_row","LC_even_row");
+ my $numcolors = scalar(@backgrounds);
+ my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace_21.gif");
+ $r->print(''."\n");
+ my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
+ while (my $resource = $it->next()) {
+ if ($resource == $it->BEGIN_MAP()) {
+ $depth++;
+ $parent{$depth} = $lastcontainer;
+ }
+ if ($resource == $it->END_MAP()) {
+ $depth--;
+ $lastcontainer = $parent{$depth};
+ }
+ if (ref($resource)) {
+ my $symb = $resource->symb();
+ my $ressymb = $symb;
+ $contents{$lastcontainer} ++;
+ next if (!$resource->is_problem() && !$resource->is_sequence() &&
+ !$resource->is_page());
+ $count ++;
+ if (($resource->is_sequence()) || ($resource->is_page())) {
+ $lastcontainer = $count;
+ $container{$lastcontainer} = $resource;
+ $container_title{$lastcontainer} = $resource->compTitle();
+ }
+ if ($resource->is_problem()) {
+ my ($useslots) = $resource->slot_control();
+ next if (($useslots eq '') || ($useslots =~ /^\s*no\s*$/i));
+ 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');
+ 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=''.&mt('Reserved:').
+ ' '.$slotdescription.'
'.
+ &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=''.&mt('Reserved:').
+ ' '.$slotdescription.'
'.
+ &mt('Problem is currently available.');
+ } elsif ($slot_status == $resource->RESERVED_LOCATION) {
+ $msg=''.&mt('Reserved:').
+ ' '.$slotdescription.'
'.
+ &mt('Problem is available at a different location.');
+ $get_choices = 1;
+ } elsif ($slot_status == $resource->RESERVED_LATER) {
+ $msg=''.&mt('Reserved:').
+ ' '.$slotdescription.'
'.
+ &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->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');
+ }
+ }
+ $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};
+ }
+ foreach my $item (@maprows) {
+ $rownum ++;
+ my $bgcolor = $backgrounds[$rownum % $numcolors];
+ $r->print(''.$item.' '."\n");
+ }
+ }
+ $rownum ++;
+ my $bgcolor = $backgrounds[$rownum % $numcolors];
+ $r->print(''."\n");
+ for (my $i=0; $i<$depth; $i++) {
+ $r->print(' ');
+ }
+ my $result = ''.
+ ') {
+ $result .= 'task.gif) '.$title.''.(' ' x6).' | ';
+ my $hasaction;
+ if ($status == $resource->OPEN) {
+ if ($get_choices) {
+ $hasaction = 1;
+ }
+ }
+ if ($hasaction) {
+ $result .= ''.$msg.' | '.
+ ''.(' ' x6);
+ } else {
+ $result .= ' | '.$msg.' | ';
+ }
+ $r->print($result);
+ if ($hasaction) {
+ my $formname = 'manageres_'.$reservable;
+ &show_choices($r,$symb,$formname);
+ $r->print('');
+ }
+ $r->print(' ');
+ }
+ }
+ }
+ if (!$reservable) {
+ $r->print(''.&mt('No course items currently require a reservation to gain access.').'');
+ }
+ $r->print(' '.
+ ''.
+ &mt('Reservation History').' ');
+}
+
+sub show_map_row {
+ my ($depth,$location,$type,$title,$maprows) = @_;
+ my $output = ' | ';
+ for (my $i=0; $i<$depth-1; $i++) {
+ $output .= '';
+ }
+ if ($type eq 'page') {
+ $output .= ' '."\n";
+ } else {
+ $output .= ' '."\n";
+ }
+ $output .= $title.' | | '."\n";
+ unshift (@{$maprows},$output);
+ return;
+}
+
+sub show_reservations {
+ my ($r,$uname,$udom) = @_;
+ if (!defined($uname)) {
+ $uname = $env{'user.name'};
+ }
+ if (!defined($udom)) {
+ $udom = $env{'user.domain'};
+ }
+ my $formname = 'slotlog';
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my %log=&Apache::lonnet::dump('nohist_'.$cdom.'_'.$cnum.'_slotlog',$udom,$uname);
+ if ($env{'form.origin'} eq 'aboutme') {
+ $r->print(''.
+ &mt('History of student-schedulable slots for: [_1]',
+ &Apache::loncommon::plainname($env{'form.uname'},$env{'form.udom'},
+ 'firstname')).'
');
+ }
+ $r->print('');
+ return;
+}
+
+sub show_reservations_log {
+ my ($r) = @_;
+ my $badslot;
+ if ($env{'form.slotname'} eq '') {
+ $r->print(''.&mt('No slot name provided').'
');
+ $badslot = 1;
+ } else {
+ my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
+ if (keys(%slot) == 0) {
+ $r->print(''.&mt('Invalid slot name: [_1]',$env{'form.slotname'}).'
');
+ $badslot = 1;
+ } elsif ($slot{type} ne 'schedulable_student') {
+ my $description = &get_description($env{'form.slotname'},\%slot);
+ $r->print(''.&mt('Reservation history unavailable for non-student-schedulable slot: [_1].',$description).'
');
+ $badslot = 1;
+ }
+ }
+ if ($badslot) {
+ $r->print(''.
+ &mt('Return to slot list').'
');
+ return;
+ }
+ my $formname = 'reservationslog';
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my %slotlog=&Apache::lonnet::dump('nohist_slotreservationslog',$cdom,$cnum);
+ if ((keys(%slotlog))[0]=~/^error\:/) { undef(%slotlog); }
+
+ my (%log,@allsymbs);
+ if (keys(%slotlog)) {
+ foreach my $key (keys(%slotlog)) {
+ if (ref($slotlog{$key}) eq 'HASH') {
+ if (ref($slotlog{$key}{'logentry'}) eq 'HASH') {
+ if ($slotlog{$key}{'logentry'}{'slot'} eq $env{'form.slotname'}) {
+ $log{$key} = $slotlog{$key};
+ if ($slotlog{$key}{'logentry'}{'symb'} ne '') {
+ push(@allsymbs,$slotlog{$key}{'logentry'}{'symb'});
+ }
+ }
+ }
+ }
+ }
+ }
+
+ $r->print(''.
+ ''.
+ &mt('Return to slot list').'
');
+ return;
+}
+
+sub get_resource_title {
+ my ($symb,$titles,$maptitles) = @_;
+ my $title;
+ if ((ref($titles) eq 'HASH') && (ref($maptitles) eq 'HASH')) {
+ if (defined($titles->{$symb})) {
+ $title = $titles->{$symb};
+ } else {
+ $title = &Apache::lonnet::gettitle($symb);
+ my $maptitle;
+ my ($mapurl) = &Apache::lonnet::decode_symb($symb);
+ if (defined($maptitles->{$mapurl})) {
+ $maptitle = $maptitles->{$mapurl};
+ } else {
+ if ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) {
+ $maptitle=&mt('Main Course Documents');
+ } else {
+ $maptitle=&Apache::lonnet::gettitle($mapurl);
+ }
+ $maptitles->{$mapurl} = $maptitle;
+ }
+ if ($maptitle ne '') {
+ $title .= ' '.&mt('(in [_1])',$maptitle);
+ }
+ $titles->{$symb} = $title;
+ }
+ } else {
+ $title = $symb;
+ }
+ return $title;
+}
+
+sub reservationlog_contexts {
+ my %lt = &Apache::lonlocal::texthash (
+ any => 'Any',
+ user => 'By student',
+ manage => 'Via Slot Manager',
+ parameter => 'Via Parameter Manager',
+ reserve => 'Made reservation',
+ release => 'Dropped reservation',
+ usermanage => 'By student',
+ );
+ return %lt;
+}
+
+sub display_filter {
+ my ($formname,$cdom,$cnum,$curr,$version,$allsymbs) = @_;
+ my $nolink = 1;
+ my (%titles,%maptitles);
+ my $output = '
'.
+ ''.&mt('Changes/page:').'
'.
+ &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
+ (&mt('all'),5,10,20,50,100,1000,10000)).
+ ' | | ';
+ my $startform =
+ &Apache::lonhtmlcommon::date_setter($formname,'log_start_date',
+ $curr->{'log_start_date'},undef,
+ undef,undef,undef,undef,undef,undef,$nolink);
+ my $endform =
+ &Apache::lonhtmlcommon::date_setter($formname,'log_end_date',
+ $curr->{'log_end_date'},undef,
+ undef,undef,undef,undef,undef,undef,$nolink);
+ my %lt = &reservationlog_contexts();
+ $output .= ''.&mt('Window during which changes occurred:').
+ '
| '.&mt('After:').
+ ' | '.$startform.' | | '.&mt('Before:').' | '.
+ $endform.' |
| | ';
+ if (ref($allsymbs) eq 'ARRAY') {
+ $output .= ''.&mt('Resource').'
'.
+ ' | | '.
+ &mt('Context:').'
| ';
+ } else {
+ $output .= ''.&mt('Action').'
'.
+ ' | ';
+ }
+ $output .= ' | |
'.
+ ''.
+ &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.8.99.0 or later are displayed.');
+ if ($version) {
+ $output .= ' '.&mt('This server is version [_3].','','',$version);
+ }
+ $output .= '
';
+ return $output;
}
sub upload_start {
@@ -1302,7 +2067,7 @@ sub upload_start {
$result.=' '.
&mt('Specify a file containing the slot definitions.').
'
'."\n";
- $result.=''."\n";
my $upfile_select=&Apache::loncommon::upfile_select_html();
my $ignore=&mt('Ignore First Line');
$result.=<print(<
-
+
ENDPICK
}
@@ -1478,7 +2244,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;
@@ -1565,14 +2331,31 @@ 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 '';
}
+sub slot_command_titles {
+ my %titles = (
+ slotlog => 'Reservation Logs',
+ showslots => 'Manage Slots',
+ showresv => 'Reservation History',
+ manageresv => 'Manage Reservations',
+ uploadstart => 'Upload Slots File',
+ csvuploadmap => 'Upload Slots File',
+ csvuploadassign => 'Upload Slots File',
+ delete => 'Slot Deletion',
+ release => 'Reservation Result',
+ remove_reservation => 'Remove Registration',
+ get_reservation => 'Request Reservation',
+ );
+ return %titles;
+}
+
sub handler {
my $r=shift;
@@ -1584,16 +2367,65 @@ sub handler {
}
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
-
+
+ my %crumb_titles = &slot_command_titles();
+ my $brcrum;
+
my $vgr=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
my $mgr=&Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+ if ($env{'form.command'} eq 'showslots') {
+ if (($vgr ne 'F') && ($mgr ne 'F')) {
+ $env{'form.command'} = 'manageresv';
+ }
+ } elsif ($env{'form.command'} eq 'manageresv') {
+ if (($vgr eq 'F') || ($mgr eq 'F')) {
+ $env{'form.command'} = 'showslots';
+ }
+ }
my $title='Requesting Another Worktime';
- if ($env{'form.command'} =~ /^(showslots|uploadstart|csvuploadmap|csvuploadassign)$/ && $vgr eq 'F') {
- $title = 'Managing Slots';
+ if ($env{'form.command'} eq 'showresv') {
+ $title = 'Reservation History';
+ if ($env{'form.origin'} eq 'aboutme') {
+ $brcrum =[{href=>"/adm/$env{'form.udom'}/$env{'form.uname'}/aboutme",text=>'Personal Information Page'}];
+ } else {
+ $brcrum =[{href=>"/adm/slotrequest?command=manageresv",text=>'Manage Reservations'}];
+ }
+ if (ref($brcrum) eq 'ARRAY') {
+ push(@{$brcrum},{href=>"/adm/slotrequest?command=showresv",text=>$title});
+ }
+ } elsif ($env{'form.command'} eq 'manageresv') {
+ $title = 'Manage Reservations';
+ $brcrum =[{href=>"/adm/slotrequest?command=manageresv",text=>$title}];
+ } elsif ($vgr eq 'F') {
+ if ($env{'form.command'} =~ /^(slotlog|showslots|uploadstart|csvuploadmap|csvuploadassign|delete|release|remove_registration)$/) {
+ $brcrum =[{href=>"/adm/slotrequest?command=showslots",
+ text=>$crumb_titles{'showslots'}}];
+ $title = 'Managing Slots';
+ unless ($env{'form.command'} eq 'showslots') {
+ if (ref($brcrum) eq 'ARRAY') {
+ push(@{$brcrum},{href=>"/adm/slotrequest?command=$env{'form.command'}",text=>$crumb_titles{$env{'form.command'}}});
+ }
+ }
+ }
+ } elsif ($env{'form.command'} eq 'release') {
+ if ($env{'form.context'} eq 'usermanage') {
+ $brcrum =[{href=>"/adm/slotrequest?command=manageresv",
+ text=>$crumb_titles{'showslots'}}];
+ $title = 'Manage Reservations';
+ if (ref($brcrum) eq 'ARRAY') {
+ push(@{$brcrum},{href=>"/adm/slotrequest?command=$env{'form.command'}",text=>$crumb_titles{$env{'form.command'}}});
+ }
+
+ }
}
- &start_page($r,$title);
+ &start_page($r,$title,$brcrum);
- if ($env{'form.command'} eq 'showslots' && $vgr eq 'F') {
+ if ($env{'form.command'} eq 'manageresv') {
+ my $crstype = &Apache::loncommon::course_type();
+ &manage_reservations($r,$crstype);
+ } elsif ($env{'form.command'} eq 'showresv') {
+ &show_reservations($r,$env{'form.uname'},$env{'form.udom'});
+ } elsif ($env{'form.command'} eq 'showslots' && $vgr eq 'F') {
&show_table($r,$mgr);
} elsif ($env{'form.command'} eq 'remove_registration' && $mgr eq 'F') {
&remove_registration($r);
@@ -1620,6 +2452,8 @@ sub handler {
}
&csv_upload_map($r);
}
+ } elsif ($env{'form.command'} eq 'slotlog' && $mgr eq 'F') {
+ &show_reservations_log($r);
} else {
my $symb=&unescape($env{'form.symb'});
if (!defined($symb)) {
@@ -1655,7 +2489,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);
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.
|