version 1.109, 2010/10/31 15:32:10
|
version 1.112, 2011/12/20 22:44:27
|
Line 137 sub check_for_reservation {
|
Line 137 sub check_for_reservation {
|
return 'error: Unable to determine current status'; |
return 'error: Unable to determine current status'; |
} |
} |
my @got; |
my @got; |
my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots); |
my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots,'starttime'); |
foreach my $slot_name (@sorted_slots) { |
foreach my $slot_name (@sorted_slots) { |
next if (!defined($slots{$slot_name}) || |
next if (!defined($slots{$slot_name}) || |
!ref($slots{$slot_name})); |
!ref($slots{$slot_name})); |
&Apache::lonxml::debug(time." $slot_name ". |
&Apache::lonxml::debug(time." $slot_name ". |
$slots{$slot_name}->{'starttime'}." -- ". |
$slots{$slot_name}->{'starttime'}." -- ". |
$slots{$slot_name}->{'startreserve'}); |
$slots{$slot_name}->{'startreserve'}." -- ". |
if ($slots{$slot_name}->{'endtime'} > time && |
$slots{$slot_name}->{'endreserve'}); |
$slots{$slot_name}->{'startreserve'} < time) { |
if (($slots{$slot_name}->{'endtime'} > time) && |
# between start of reservation times and end of slot |
($slots{$slot_name}->{'startreserve'} < time) && |
|
((!$slots{$slot_name}->{'endreserve'}) || |
|
($slots{$slot_name}->{'endreserve'} > time))) { |
|
# between start of reservation time and end of reservation time |
|
# and before end of slot |
if ($mode eq 'allslots') { |
if ($mode eq 'allslots') { |
push(@got,$slot_name); |
push(@got,$slot_name); |
} else { |
} else { |
Line 641 sub get_slot {
|
Line 645 sub get_slot {
|
<input type="hidden" name="releaseslot" value="$slot_name" /> |
<input type="hidden" name="releaseslot" value="$slot_name" /> |
<input type="hidden" name="command" value="change" /> |
<input type="hidden" name="command" value="change" /> |
STUFF |
STUFF |
$r->print('<p class="LC_error">'.&mt('Reservation currently unchanged').'</p>'. |
$r->print('<p class="LC_error">'.&mt('Reservation currently unchanged').'</p>'); |
'<p class="LC_warning">'); |
|
if ($slot_name ne '') { |
if ($slot_name ne '') { |
$r->print(&mt('To complete the transaction you [_1]must[_2] confirm you want the change to [_3] to be processed.' |
$r->print('<p>'.&mt('To complete the transaction you [_1]must confirm[_2] you want to [_3]process the change[_4] to [_5].' |
,'<b>','</b>','<b>'.$description2.'</b>').'<br />' |
,'<b>','</b>','<i>','</i>','<b>'.$description2.'</b>') |
.'<input type="submit" name="change" value="'.&mt('Process change').'" /></p>' |
.'<br />' |
.&mt('or').'<br /><p>'.&mt('you will continue with the reservation you already had: [_1]' |
.&mt('Or you can choose to [_1]make no change[_2] and continue[_2] with the reservation you already had: [_3].' |
,'<b>'.$description1.'</b>').'</p>'); |
,'<i>','</i>','<b>'.$description1.'</b>') |
|
.'</p><p><span class="LC_nobreak">' |
|
.'<input type="submit" name="change" value="'.&mt('Process the change').'" />' |
|
.(' 'x3) |
|
.'<input type="submit" name="nochange" value="'.&mt('Make no change').'" />' |
|
.'</span></p>'); |
} |
} |
&return_link($r); |
|
$r->print(<<STUFF); |
$r->print(<<STUFF); |
</form> |
</form> |
STUFF |
STUFF |
Line 753 sub allowed_slot {
|
Line 760 sub allowed_slot {
|
if ($slot->{'startreserve'} > time) { |
if ($slot->{'startreserve'} > time) { |
return 0; |
return 0; |
} |
} |
|
# reserve time ended |
|
if (($slot->{'endreserve'}) && |
|
($slot->{'endreserve'} < time)) { |
|
return 0; |
|
} |
&Apache::lonxml::debug("$slot_name reserve good"); |
&Apache::lonxml::debug("$slot_name reserve good"); |
|
|
my $userallowed=0; |
my $userallowed=0; |
Line 830 sub show_choices {
|
Line 842 sub show_choices {
|
my ($r,$symb,$formname)=@_; |
my ($r,$symb,$formname)=@_; |
|
|
my ($cnum,$cdom)=&get_course(); |
my ($cnum,$cdom)=&get_course(); |
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); |
my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom); |
my $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots); |
my $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots); |
if (ref($consumed_uniqueperiods) eq 'HASH') { |
if (ref($consumed_uniqueperiods) eq 'HASH') { |
if (&Apache::lonnet::error(%$consumed_uniqueperiods)) { |
if (&Apache::lonnet::error(%$consumed_uniqueperiods)) { |
Line 1093 sub show_table {
|
Line 1105 sub show_table {
|
'starttime' => 'Start time', |
'starttime' => 'Start time', |
'endtime' => 'End Time', |
'endtime' => 'End Time', |
'startreserve' => 'Time students can start reserving', |
'startreserve' => 'Time students can start reserving', |
|
'endreserve' => 'Time students can no longer reserve', |
'reservationmsg' => 'Message triggered by reservation', |
'reservationmsg' => 'Message triggered by reservation', |
'secret' => 'Secret Word', |
'secret' => 'Secret Word', |
'space' => '# of students/max', |
'space' => '# of students/max', |
Line 1105 sub show_table {
|
Line 1118 sub show_table {
|
'proctor' => 'List of proctors'); |
'proctor' => 'List of proctors'); |
if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
$show_fields{'startreserve'} = &mt('Time members can start reserving'); |
$show_fields{'startreserve'} = &mt('Time members can start reserving'); |
|
$show_fields{'endreserve'} = &mt('Time members can no longer reserve'); |
$show_fields{'scheduled'} = &mt('Scheduled Members'); |
$show_fields{'scheduled'} = &mt('Scheduled Members'); |
} |
} |
my @show_order=('name','description','type','starttime','endtime', |
my @show_order=('name','description','type','starttime','endtime', |
'startreserve','reservationmsg','secret','space','ip','symb', |
'startreserve','endreserve','reservationmsg','secret','space', |
'allowedsections','allowedusers','uniqueperiod', |
'ip','symb','allowedsections','allowedusers','uniqueperiod', |
'scheduled','proctor'); |
'scheduled','proctor'); |
my @show = |
my @show = |
(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show') |
(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show') |
Line 1220 sub show_table {
|
Line 1234 sub show_table {
|
|
|
my %name_cache; |
my %name_cache; |
my $slotsort = sub { |
my $slotsort = sub { |
if ($env{'form.order'}=~/^(type|description|endtime|startreserve|ip|symb|allowedsections|allowedusers|reservationmsg)$/) { |
if ($env{'form.order'}=~/^(type|description|endtime|startreserve|endreserve|ip|symb|allowedsections|allowedusers|reservationmsg)$/) { |
if (lc($slots{$a}->{$env{'form.order'}}) |
if (lc($slots{$a}->{$env{'form.order'}}) |
ne lc($slots{$b}->{$env{'form.order'}})) { |
ne lc($slots{$b}->{$env{'form.order'}})) { |
return (lc($slots{$a}->{$env{'form.order'}}) |
return (lc($slots{$a}->{$env{'form.order'}}) |
Line 1302 sub show_table {
|
Line 1316 sub show_table {
|
&Apache::lonlocal::locallocaltime($slots{$slot}->{'endtime'}):''); |
&Apache::lonlocal::locallocaltime($slots{$slot}->{'endtime'}):''); |
my $start_reserve=($slots{$slot}->{'startreserve'}? |
my $start_reserve=($slots{$slot}->{'startreserve'}? |
&Apache::lonlocal::locallocaltime($slots{$slot}->{'startreserve'}):''); |
&Apache::lonlocal::locallocaltime($slots{$slot}->{'startreserve'}):''); |
|
my $end_reserve=($slots{$slot}->{'endreserve'}? |
|
&Apache::lonlocal::locallocaltime($slots{$slot}->{'endreserve'}):''); |
|
|
my $unique; |
my $unique; |
if (ref($slots{$slot}{'uniqueperiod'})) { |
if (ref($slots{$slot}{'uniqueperiod'})) { |
Line 1409 LOGLINK
|
Line 1425 LOGLINK
|
if (exists($show{'startreserve'})) { |
if (exists($show{'startreserve'})) { |
$colspan++;$r->print("<td>$start_reserve</td>\n"); |
$colspan++;$r->print("<td>$start_reserve</td>\n"); |
} |
} |
|
if (exists($show{'endreserve'})) { |
|
$colspan++;$r->print("<td>$end_reserve</td>\n"); |
|
} |
if (exists($show{'reservationmsg'})) { |
if (exists($show{'reservationmsg'})) { |
$colspan++;$r->print("<td>$reservemsg</td>\n"); |
$colspan++;$r->print("<td>$reservemsg</td>\n"); |
} |
} |
Line 1547 sub manage_reservations {
|
Line 1566 sub manage_reservations {
|
} elsif ($slot_status == $resource->RESERVABLE) { |
} elsif ($slot_status == $resource->RESERVABLE) { |
$msg=&mt('Reservation needed'); |
$msg=&mt('Reservation needed'); |
$get_choices = 1; |
$get_choices = 1; |
|
} elsif ($slot_status == $resource->RESERVABLE_LATER) { |
|
$msg=&mt('Reservation needed: will be reservable later.'); |
} elsif ($slot_status == $resource->NOTRESERVABLE) { |
} elsif ($slot_status == $resource->NOTRESERVABLE) { |
$msg=&mt('Reservation needed: none available.'); |
$msg=&mt('Reservation needed: none available.'); |
} elsif ($slot_status == $resource->UNKNOWN) { |
} elsif ($slot_status == $resource->UNKNOWN) { |
Line 2163 sub slot_change_messaging {
|
Line 2184 sub slot_change_messaging {
|
$msgtitle = &mt('Status of messages about saved reservation'); |
$msgtitle = &mt('Status of messages about saved reservation'); |
} elsif ($action eq 'release') { |
} elsif ($action eq 'release') { |
$msgtitle = &mt('Status of messages about dropped reservation'); |
$msgtitle = &mt('Status of messages about dropped reservation'); |
|
} elsif ($action eq 'nochange') { |
|
$msgtitle = &mt('Status of messages about unchanged existing reservation'); |
} |
} |
return '<span class="LC_info">'.$msgtitle.'</span>' |
return '<span class="LC_info">'.$msgtitle.'</span>' |
.'<ul>' |
.'<ul>' |
Line 2342 sub csvupload_fields {
|
Line 2365 sub csvupload_fields {
|
['starttime','Start Time of slot'], |
['starttime','Start Time of slot'], |
['endtime','End Time of slot'], |
['endtime','End Time of slot'], |
['startreserve','Reservation Start Time'], |
['startreserve','Reservation Start Time'], |
|
['endreserve','Reservation End Time'], |
['reservationmsg','Message when reservation changed'], |
['reservationmsg','Message when reservation changed'], |
['ip','IP or DNS restriction'], |
['ip','IP or DNS restriction'], |
['proctor','List of proctor ids'], |
['proctor','List of proctor ids'], |
Line 2424 sub csv_upload_assign {
|
Line 2448 sub csv_upload_assign {
|
next; |
next; |
} |
} |
|
|
|
if ($entries{$fields{'endreserve'}}) { |
|
$slot{'endreserve'}= |
|
&UnixDate($entries{$fields{'endreserve'}},"%s"); |
|
} |
|
if (defined($slot{'endreserve'}) |
|
&& $slot{'endreserve'} > $slot{'starttime'}) { |
|
push(@errors,"$name not created -- Slot's reservation end time is after the slot's start time."); |
|
next; |
|
} |
|
|
if ($slot{'type'} eq 'schedulable_student') { |
if ($slot{'type'} eq 'schedulable_student') { |
if ($entries{$fields{'reservationmsg'}}) { |
if ($entries{$fields{'reservationmsg'}}) { |
if (($entries{$fields{'reservationmsg'}} eq 'only_student') || |
if (($entries{$fields{'reservationmsg'}} eq 'only_student') || |
Line 2462 sub csv_upload_assign {
|
Line 2496 sub csv_upload_assign {
|
$r->rflush(); |
$r->rflush(); |
$countdone++; |
$countdone++; |
} |
} |
|
if ($countdone) { |
|
&Apache::lonnet::devalidate_slots_cache($cname,$cdom); |
|
} |
$r->print('<p>'.&mt('Created [quant,_1,slot]',$countdone)."\n".'</p>'); |
$r->print('<p>'.&mt('Created [quant,_1,slot]',$countdone)."\n".'</p>'); |
foreach my $error (@errors) { |
foreach my $error (@errors) { |
$r->print('<p><span class="LC_warning">'.$error.'</span></p>'."\n"); |
$r->print('<p><span class="LC_warning">'.$error.'</span></p>'."\n"); |
Line 2625 sub handler {
|
Line 2662 sub handler {
|
} elsif ($env{'form.command'} eq 'get') { |
} elsif ($env{'form.command'} eq 'get') { |
&get_slot($r,$symb); |
&get_slot($r,$symb); |
} elsif ($env{'form.command'} eq 'change') { |
} elsif ($env{'form.command'} eq 'change') { |
if (&get_slot($r,$symb,$env{'form.releaseslot'},1)) { |
if ($env{'form.nochange'}) { |
|
my $slot_name = $env{'form.releaseslot'}; |
|
my @slots = &check_for_reservation($symb,'allslots'); |
|
my $msg; |
|
if (($slot_name ne '') && (grep(/^\Q$slot_name\E/,@slots))) { |
|
my %slot=&Apache::lonnet::get_slot($env{'form.releaseslot'}); |
|
my $description=&get_description($slot_name,\%slot); |
|
$msg = '<span style="font-weight: bold;">'. |
|
&mt('Unchanged reservation: [_1]',$description).'</span><br /><br />'; |
|
my $person = |
|
&Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}); |
|
my $subject = &mt('Reservation unchanged: [_1]',$description); |
|
my $msgbody = &mt('No change to existing registration by [_1] for [_2].',$person,$description); |
|
$msg .= &slot_change_messaging($slot{'reservationmsg'},$subject,$msgbody,'nochange'); |
|
} else { |
|
$msg = '<span class="LC_warning">'.&mt('Reservation no longer reported as available.').'</span>'; |
|
} |
|
$r->print($msg); |
|
&return_link($r); |
|
} elsif (&get_slot($r,$symb,$env{'form.releaseslot'},1)) { |
&release_slot($r,$symb,$env{'form.releaseslot'}); |
&release_slot($r,$symb,$env{'form.releaseslot'}); |
} |
} |
} else { |
} else { |