--- loncom/interface/slotrequest.pm 2005/06/04 07:44:48 1.3
+++ loncom/interface/slotrequest.pm 2005/11/02 22:46:12 1.28
@@ -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.3 2005/06/04 07:44:48 albertel Exp $
+# $Id: slotrequest.pm,v 1.28 2005/11/02 22:46:12 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,24 +34,29 @@ 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.').'
');
+ } elsif ($code eq 'not_allowed') {
+ $r->print(''.&mt('Not allowed to sign up or change reservations at this time.').'
');
+ } else {
+ $r->print(''.&mt('Failed.').'
');
}
+
$r->print(''.
&mt('Return to last resource').'
');
&end_page($r);
}
sub start_page {
- my ($r)=@_;
+ my ($r,$title)=@_;
my $html=&Apache::lonxml::xmlbegin();
- $r->print($html.''.
- &mt('Request another Worktime').' ');
- $r->print(&Apache::loncommon::bodytag('Requesting another Worktime'));
+ $r->print($html.''.&mt($title).' ');
+ $r->print(&Apache::loncommon::bodytag($title));
}
sub end_page {
@@ -105,8 +110,58 @@ sub space_available {
return 0;
}
-# FIXME - depends on the parameter for the resource to be correct
-# tho prevent multiple reservations
+sub check_for_reservation {
+ my ($symb)=@_;
+ 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));
+
+ &Apache::lonxml::debug(" slot list is ".join(':',@slots));
+
+ 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}));
+ &Apache::lonxml::debug(time." $slot_name ".
+ $slots{$slot_name}->{'starttime'}." -- ".
+ $slots{$slot_name}->{'startreserve'});
+ if ($slots{$slot_name}->{'endtime'} > time &&
+ $slots{$slot_name}->{'startreserve'} < time) {
+ # between start of reservation times and end of slot
+ return($slot_name, $slots{$slot_name});
+ }
+ }
+ return (undef,undef);
+}
+
+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 ($startReleased Reservation: $description
");
+ if (!$inhibit_return_link) {
+ $r->print(''.
+ &mt('Return to last resource').'
');
+ }
+ 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(<
+ You can either ");
+ $r->print(<'.$description1.' to '.
+ $description2.
+ ' '.
+ &mt('Return to last resource').'
');
+ $r->print(<
+STUFF
+ } else {
+ $r->print(''.
+ &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("Success: $description
");
- $r->print(''.
- &mt('Return to last resource').'
');
- return;
- } elsif ($reserved < 0) {
- $r->print("Already reserved: $description
");
- $r->print(''.
- &mt('Return to last resource').'
');
- return;
+ if (defined($reserved)) {
+ if ($reserved > -1) {
+ $r->print("Success: $description
");
+ $r->print(''.
+ &mt('Return to last resource').'
');
+ return;
+ } elsif ($reserved < 0) {
+ $r->print("Already reserved: $description
");
+ $r->print(''.
+ &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);
@@ -230,26 +361,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;
}
@@ -257,7 +389,7 @@ sub get_description {
my ($slot_name,$slot)=@_;
my $description=$slot->{'description'};
if (!defined($description)) {
- $description=&mt('[_1] From [_2] to [_3]',$slot,
+ $description=&mt('[_1] From [_2] to [_3]',$slot_name,
&Apache::lonlocal::locallocaltime($slot->{'starttime'}),
&Apache::lonlocal::locallocaltime($slot->{'endtime'}));
}
@@ -271,10 +403,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++;
@@ -282,14 +417,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=<
- No avaliable times. '.
+ $r->print('No available times. '.
&mt('Return to last resource').'
');
}
+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('');
+ }
+ my $linkstart='
+
+ '.$linkstart.'name" >Slot name
+ '.$linkstart.'type" >Type
+ '.$linkstart.'description" >Description
+ '.$linkstart.'starttime" >Start Time
+ '.$linkstart.'endtime" >End Time
+ '.$linkstart.'startreserve">Time Students Can Start Reserving
+ '.$linkstart.'secret" >Secret
+ '.$linkstart.'maxspace" >Max space
+ Scheduled Students
+ '.$linkstart.'unique" >Unique Period
+ ');
+ my %name_cache;
+ my $slotsort = sub {
+ if ($env{'form.order'}=~/^(type|description|endtime|maxspace)$/) {
+ if (lc($slots{$a}->{$env{'form.order'}})
+ ne lc($slots{$b}->{$env{'form.order'}})) {
+ return (lc($slots{$a}->{$env{'form.order'}})
+ cmp lc($slots{$b}->{$env{'form.order'}}));
+ }
+ } elsif ($env{'form.order'} eq 'name') {
+ if (lc($a) cmp lc($b)) {
+ return lc($a) cmp lc($b);
+ }
+ } elsif ($env{'form.order'} eq 'unique') {
+
+ if ($slots{$a}->{'uniqueperiod'}[0]
+ ne $slots{$b}->{'uniqueperiod'}[0]) {
+ return ($slots{$a}->{'uniqueperiod'}[0]
+ cmp $slots{$b}->{'uniqueperiod'}[0]);
+ }
+ if ($slots{$a}->{'uniqueperiod'}[1]
+ ne $slots{$b}->{'uniqueperiod'}[1]) {
+ return ($slots{$a}->{'uniqueperiod'}[1]
+ cmp $slots{$b}->{'uniqueperiod'}[1]);
+ }
+ }
+ return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'};
+ };
+ foreach my $slot (sort $slotsort (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'}.'
+
+ $edit
+ $slot
+ $slots{$slot}->{'type'}
+ $description
+ $start
+ $end
+ $start_reserve
+ $slots{$slot}->{'secret'}
+ $slots{$slot}->{'maxspace'}
+ $ids
+ $unique
+
+
+ $proctors
+
+STUFF
+ }
+ $r->print('');
+}
+
+sub upload_start {
+ my ($r)=@_;
+ $r->print(&Apache::grades::checkforfile_js());
+ my $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
+[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('Creating Slots ');
+ my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $countdone=0;
+ foreach my $slot (@slotdata) {
+ my %slot;
+ my %entries=&Apache::loncommon::record_sep($slot);
+ my $domain;
+ my $name=$entries{$fields{'name'}};
+ if ($entries{$fields{'type'}}) {
+ $slot{'type'}=$entries{$fields{'type'}};
+ } else {
+ $slot{'type'}='preassigned';
+ }
+ if ($entries{$fields{'starttime'}}) {
+ $slot{'starttime'}=&UnixDate($entries{$fields{'starttime'}},"%s");
+ }
+ if ($entries{$fields{'endtime'}}) {
+ $slot{'endtime'}=&UnixDate($entries{$fields{'endtime'}},"%s");
+ }
+ if ($entries{$fields{'startreserve'}}) {
+ $slot{'startreserve'}=
+ &UnixDate($entries{$fields{'startreserve'}},"%s");
+ }
+ foreach my $key ('ip','proctor','description','maxspace',
+ 'secret','symb') {
+ if ($entries{$fields{$key}}) {
+ $slot{$key}=$entries{$fields{$key}};
+ }
+ }
+ if ($entries{$fields{'uniqueperiod'}}) {
+ my ($start,$end)=split(',',$entries{$fields{'uniqueperiod'}});
+ my @times=(&UnixDate($start,"%s"),
+ &UnixDate($end,"%s"));
+ $slot{'uniqueperiod'}=\@times;
+ }
+
+ &Apache::lonnet::cput('slots',{$name=>\%slot},$cdom,$cname);
+ $r->print('.');
+ $r->rflush();
+ $countdone++;
+ }
+ $r->print("Unknown command: ".$env{'form.command'}."
");
+ }
}
&end_page($r);
return OK;