--- loncom/interface/slotrequest.pm 2005/08/09 15:04:50 1.6
+++ loncom/interface/slotrequest.pm 2005/10/17 21:21:39 1.25
@@ -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.6 2005/08/09 15:04:50 albertel Exp $
+# $Id: slotrequest.pm,v 1.25 2005/10/17 21:21:39 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);
@@ -125,9 +131,9 @@ sub check_for_reservation {
&Apache::lonxml::debug(time." $slot_name ".
$slots{$slot_name}->{'starttime'}." -- ".
$slots{$slot_name}->{'startreserve'});
- if ($slots{$slot_name}->{'starttime'} > time &&
+ if ($slots{$slot_name}->{'endtime'} > time &&
$slots{$slot_name}->{'startreserve'} < time) {
- # between start of reservation times and start of slot
+ # between start of reservation times and end of slot
return($slot_name, $slots{$slot_name});
}
}
@@ -158,9 +164,6 @@ sub check_for_conflict {
}
-# FIXME - depends on the parameter for the resource to be correct
-# to prevent multiple reservations
-
sub make_reservation {
my ($slot_name,$slot,$symb)=@_;
@@ -189,7 +192,6 @@ sub make_reservation {
my (@ids)=&get_reservation_ids($slot_name);
- # FIXME we could end up having holes...
my $last=0;
foreach my $id (@ids) {
my $num=(split('\0',$id))[1];
@@ -198,9 +200,9 @@ sub make_reservation {
my $wanted=$last+1;
&Apache::lonxml::debug("wanted $wanted ");
- if ($wanted >= $max) {
+ if (scalar(@ids) >= $max) {
# full up
- return -1;
+ return undef;
}
my %reservation=('name' => $env{'user.name'}.'@'.$env{'user.domain'},
@@ -213,7 +215,6 @@ sub make_reservation {
$cdom, $cnum);
if ($success eq 'ok') {
- #FIXME need to set the parm
my $new_value=$slot_name;
if ($value) {
$new_value=$value.':'.$new_value;
@@ -268,7 +269,7 @@ sub release_slot {
my %slot=&Apache::lonnet::get_slot($slot_name);
my $description=&get_description($env{'form.slotname'},\%slot);
$r->print("
Released Reservation: $description
");
- if ($inhibit_return_link) {
+ if (!$inhibit_return_link) {
$r->print('
');
}
@@ -285,44 +286,50 @@ sub get_slot {
%slot=&Apache::lonnet::get_slot($env{'form.slotname'});
my $description2=&get_description($env{'form.slotname'},\%slot);
$r->print("
Already have a reservation: $description1
");
- $r->print(<print(<
STUFF
- $r->print("
You can either ");
- $r->print(<print("
You can either ");
+ $r->print(<
STUFF
- $r->print(' your reservation from '.$description1.' to '.
- $description2.
- ' or '.
- &mt('Return to last resource').'
');
+ }
return;
}
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
my $reserved=&make_reservation($env{'form.slotname'},
\%slot,$symb);
my $description=&get_description($env{'form.slotname'},\%slot);
- if ($reserved > -1) {
- $r->print("
');
+ return;
+ }
}
- my %lt=('request'=>"Request another attempt",
+ my %lt=('request'=>"Availibility list",
'try' =>'Try again');
%lt=&Apache::lonlocal::texthash(%lt);
@@ -411,7 +418,8 @@ sub show_choices {
my $description=&get_description($slot,$slots{$slot});
my $form=&mt('Unavailable');
- if (&space_available($slot,$slots{$slot},$symb)) {
+ if (($slot eq $got_slot) ||
+ &space_available($slot,$slots{$slot},$symb)) {
my $text=&mt('Select');
my $command='get';
if ($slot eq $got_slot) {
@@ -444,18 +452,66 @@ STUFF
}
sub show_table {
- my ($r,$symb)=@_;
+ my ($r,$mgr)=@_;
my ($cnum,$cdom)=&get_course();
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
+ if ( (keys(%slots))[0] =~ /^error: 2 /) {
+ undef(%slots);
+ }
my $available;
- $r->print('
');
- foreach my $slot (sort
- { return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
- (keys(%slots))) {
+ if ($mgr eq 'F') {
+ $r->print('');
+ }
+ my $linkstart='
+
');
}
+sub upload_start {
+ my ($r)=@_;
+ $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,$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,$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('