--- loncom/interface/slotrequest.pm 2005/08/09 15:38:13 1.7
+++ loncom/interface/slotrequest.pm 2005/09/13 08:12:03 1.18
@@ -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.7 2005/08/09 15:38:13 albertel Exp $
+# $Id: slotrequest.pm,v 1.18 2005/09/13 08:12:03 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,13 +34,19 @@ use Apache::Constants qw(:common :http :
use Apache::loncommon();
use Apache::lonlocal;
use Apache::lonnet;
+use Date::Manip;
sub fail {
my ($r,$code)=@_;
if ($code eq 'not_valid') {
- $r->print('
'.&mt('Unable to understand what resource you wanted to sign up for.').'
'.$env{'form.symb'});
+ $r->print('
'.&mt('Unable to understand what resource you wanted to sign up for.').'
');
&end_page($r);
@@ -446,18 +452,36 @@ STUFF
}
sub show_table {
- my ($r,$symb)=@_;
+ my ($r,$symb,$mgr)=@_;
my ($cnum,$cdom)=&get_course();
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
my $available;
- $r->print('
');
foreach my $slot (sort
{ return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
(keys(%slots))) {
if (defined($slots{$slot}->{'type'})
&& $slots{$slot}->{'type'} ne 'schedulable_student') {
- next;
+ #next;
}
my $description=&get_description($slot,$slots{$slot});
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
@@ -469,23 +493,257 @@ sub show_table {
}
my $start=localtime($slots{$slot}->{'starttime'});
my $end=localtime($slots{$slot}->{'endtime'});
+ my $unique;
+ if (ref($slots{$slot}{'uniqueperiod'})) {
+ $unique=localtime($slots{$slot}{'uniqueperiod'}[0]).','.
+ localtime($slots{$slot}{'uniqueperiod'}[1]);
+ }
+
$r->print(<
$slot
+
$slots{$slot}->{'type'}
$description
$start
$end
$slots{$slot}->{'maxspace'}
$ids
+
$slots{$slot}->{'proctor'}
+
$unique
STUFF
}
$r->print('
');
}
+sub upload_start {
+ my ($r,$symb)=@_;
+ $r->print(&Apache::grades::checkforfile_js());
+ my $result.='
'."\n";
+ $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.=<
+
+
+$upfile_select
+
+
+
+ENDUPFORM
+ $result.='
'."\n";
+ $result.='
'."\n";
+ $r->print($result);
+}
+
+sub csvuploadmap_header {
+ my ($r,$symb,$datatoken,$distotal)= @_;
+ my $javascript;
+ if ($env{'form.upfile_associate'} eq 'reverse') {
+ $javascript=&csvupload_javascript_reverse_associate();
+ } else {
+ $javascript=&csvupload_javascript_forward_associate();
+ }
+
+ my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
+ my $ignore=&mt('Ignore First Line');
+ $r->print(<
+
Identify fields
+Total number of records found in file: $distotal
+Enter as many fields as you can. The system will inform you and bring you back
+to this page if the data selected is insufficient to create the slots.
+
+
+
+
+
+
+
+
+
+
+
+ENDPICK
+ return '';
+
+}
+
+sub csvuploadmap_footer {
+ my ($request,$i,$keyfields) =@_;
+ $request->print(<
+
+
+
+
+ENDPICK
+}
+
+sub csvupload_javascript_reverse_associate {
+ my $error1=&mt('You need to specify the name, starttime, endtime and a type');
+ return(<[0].','; }
+ chop($keyfields);
+ } else {
+ unshift(@fields,['none','']);
+ $i=&Apache::loncommon::csv_samples_select_table($r,\@records,
+ \@fields);
+ my %sone=&Apache::loncommon::record_sep($records[0]);
+ $keyfields=join(',',sort(keys(%sone)));
+ }
+ }
+ &csvuploadmap_footer($r,$i,$keyfields);
+
+ return '';
+}
+
+sub csvupload_fields {
+ return (['name','Slot name'],
+ ['type','Type of slot'],
+ ['starttime','Start Time of slot'],
+ ['endtime','End Time of slot'],
+ ['startreserve','Reservation Start Time'],
+ ['ip','IP or DNS restriction'],
+ ['proctor','List of proctor ids'],
+ ['description','Slot Description'],
+ ['maxspace','Maximum number of reservations'],
+ ['symb','Resource Restriction'],
+ ['uniqueperiod','Date range of slot exclusion'],
+ ['secret','Secret word proctor uses to validate']);
+}
+
+sub csv_upload_assign {
+ my ($r,$symb,$mgr)= @_;
+ &Apache::loncommon::load_tmp_file($r);
+ my @slotdata = &Apache::loncommon::upfile_record_sep();
+ if ($env{'form.noFirstLine'}) { shift(@slotdata); }
+ my %fields=&Apache::grades::get_fields();
+ $r->print('