--- loncom/interface/slotrequest.pm 2005/06/04 08:17:06 1.4
+++ loncom/interface/slotrequest.pm 2005/10/07 20:00:20 1.20
@@ -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.4 2005/06/04 08:17:06 albertel Exp $
+# $Id: slotrequest.pm,v 1.20 2005/10/07 20:00:20 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,17 +131,38 @@ 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});
}
}
return (undef,undef);
}
-# FIXME - depends on the parameter for the resource to be correct
-# tho prevent multiple reservations
+sub check_for_conflict {
+ my ($symb,$new_slot_name)=@_;
+ my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb,
+ $env{'user.domain'}, $env{'user.name'});
+ my $course = &Apache::lonnet::EXT("resource.0.available", $symb,
+ $env{'user.domain'}, $env{'user.name'});
+ my @slots = (split(/:/,$student), split(/:/, $course));
+ my ($cnum,$cdom)=&get_course();
+ my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum);
+ foreach my $slot_name (@slots) {
+ next if (!defined($slots{$slot_name}) ||
+ !ref($slots{$slot_name}));
+
+ next if (!defined($slots{$slot_name}->{'uniqueperiod'}) ||
+ !ref($slots{$slot_name}->{'uniqueperiod'}));
+ my ($start,$end)=@{$slots{$slot_name}->{'uniqueperiod'}};
+ if ($start");
- if ($wanted >= $max) {
+ if (scalar(@ids) >= $max) {
# full up
- return -1;
+ return undef;
}
my %reservation=('name' => $env{'user.name'}.'@'.$env{'user.domain'},
@@ -189,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;
@@ -207,26 +232,104 @@ sub make_reservation {
return undef;
}
+sub release_slot {
+ my ($r,$symb,$slot_name,$inhibit_return_link)=@_;
+
+ if ($slot_name eq '') { $slot_name=$env{'form.slotname'}; }
+ my ($cnum,$cdom)=&get_course();
+
+ # get parameter string, check for existance, rebuild string with the slot
+
+ my @slots = split(/:/,&Apache::lonnet::EXT("resource.0.availablestudent",
+ $symb,$env{'user.domain'},
+ $env{'user.name'}));
+ my @new_slots;
+ foreach my $exist_slot (@slots) {
+ if ($exist_slot eq $slot_name) { next; }
+ push(@new_slots,$exist_slot);
+ }
+ my $new_param = join(':',@new_slots);
+
+ # get slot reservations, check if user has one, if so remove reservation
+ my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+ "^$slot_name\0");
+ foreach my $entry (keys(%consumed)) {
+ if ( $consumed{$entry}->{'name'} eq
+ ($env{'user.name'}.'@'.$env{'user.domain'}) ) {
+ &Apache::lonnet::del('slot_reservations',[$entry],
+ $cdom,$cnum);
+ }
+ }
+ # store new parameter string
+ my $result=&Apache::lonparmset::storeparm_by_symb($symb,
+ '0_availablestudent',
+ 1, $new_param, 'string',
+ $env{'user.name'},
+ $env{'user.domain'});
+ my %slot=&Apache::lonnet::get_slot($slot_name);
+ my $description=&get_description($env{'form.slotname'},\%slot);
+ $r->print("
');
+ }
+ return 1;
+}
+
sub get_slot {
my ($r,$symb)=@_;
+ my $slot_name=&check_for_conflict($symb,$env{'form.slotname'});
+ if ($slot_name) {
+ my %slot=&Apache::lonnet::get_slot($slot_name);
+ my $description1=&get_description($slot_name,\%slot);
+ %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
+ my $description2=&get_description($env{'form.slotname'},\%slot);
+ $r->print("
Already have a reservation: $description1
");
+ if ($slot_name ne $env{'form.slotname'}) {
+ $r->print(<
+
+
+
+
+STUFF
+ $r->print("
You can either ");
+ $r->print(<
+STUFF
+ $r->print(' your reservation from '.$description1.' to '.
+ $description2.
+ ' or '.
+ &mt('Return to last resource').'
');
+ return;
+ }
}
- my %lt=('request'=>"Request another attempt",
+ my %lt=('request'=>"Availibility list",
'try' =>'Try again');
%lt=&Apache::lonlocal::texthash(%lt);
@@ -259,26 +362,27 @@ sub allowed_slot {
my ($slot_name,$slot,$symb)=@_;
#already started
if ($slot->{'starttime'} < time) {
- return 0;
+ # all open slot to be schedulable
+ #return 0;
}
-
+ &Apache::lonxml::debug("$slot_name starttime good");
#already ended
if ($slot->{'endtime'} < time) {
return 0;
}
-
+ &Apache::lonxml::debug("$slot_name endtime good");
# not allowed to pick this one
if (defined($slot->{'type'})
&& $slot->{'type'} ne 'schedulable_student') {
return 0;
}
-
+ &Apache::lonxml::debug("$slot_name type good");
# not allowed for this resource
if (defined($slot->{'symb'})
&& $slot->{'symb'} ne $symb) {
return 0;
}
-
+ &Apache::lonxml::debug("$slot_name symb good");
return 1;
}
@@ -300,10 +404,13 @@ sub show_choices {
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
my $available;
$r->print('
');
+ &Apache::lonxml::debug("Checking Slots");
+ my ($got_slot)=&check_for_reservation($symb);
foreach my $slot (sort
{ return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
(keys(%slots))) {
-
+
+ &Apache::lonxml::debug("Checking Slot $slot");
next if (!&allowed_slot($slot,$slots{$slot}));
$available++;
@@ -311,14 +418,21 @@ 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) {
+ $text=&mt('Free Reservation');
+ $command='release';
+ }
my $escsymb=&Apache::lonnet::escape($symb);
$form=<
-
+
-
+
STUFF
}
@@ -331,27 +445,373 @@ STUFF
}
if (!$available) {
- $r->print('
');
}
+sub show_table {
+ 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;
+ if ($mgr eq 'F') {
+ $r->print('');
+ }
+ $r->print('
+
+
+
Slot name
+
Type
+
Description
+
Start Time
+
End Time
+
Max space
+
Scheduled Students
+
Proctors
+
Unique Period
+
');
+ 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;
+ }
+ my $description=&get_description($slot,$slots{$slot});
+ my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum,
+ "^$slot\0");
+ my $ids;
+ foreach my $entry (sort(keys(%consumed))) {
+ my (undef,$id)=split("\0",$entry);
+ $ids.= $id.'-> '.$consumed{$entry}->{'name'}.' ';
+ }
+ 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]);
+ }
+
+ my @proctors = map {
+ my ($uname,$udom)=split(/@/,$_);
+ my $fullname=&Apache::loncommon::plainname($uname,$udom);
+ $fullname=~s/\s/ /g;
+ &Apache::loncommon::aboutmewrapper($fullname,$uname,$udom);
+ } (split(/\s*,\s*/,$slots{$slot}->{'proctor'}));
+
+ my $proctors=join(', ',@proctors);
+
+
+ my $edit=(<
+
+
+
+
+EDITFORM
+ $r->print(<
+
$edit
+
$slot
+
$slots{$slot}->{'type'}
+
$description
+
$start
+
$end
+
$slots{$slot}->{'maxspace'}
+
$ids
+
$proctors
+
$unique
+
+STUFF
+ }
+ $r->print('
');
+}
+
+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('