--- loncom/interface/slotrequest.pm 2015/09/07 17:44:11 1.124
+++ loncom/interface/slotrequest.pm 2018/09/02 02:22:09 1.125.2.5
@@ -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.124 2015/09/07 17:44:11 raeburn Exp $
+# $Id: slotrequest.pm,v 1.125.2.5 2018/09/02 02:22:09 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -162,9 +162,24 @@ $js
var startdate = startm+"/"+startd+"/"+starty;
var starttime = new Date(startdate).getTime();
starttime = starttime/1000;
+ var starth = form.start_hour.options[form.start_hour.selectedIndex].value;
+ if (numberRegExp.test(starth)) {
+ starth = parseInt(starth);
+ if (starth > 0 && starth <= 23) {
+ starttime += 3600 * starth;
+ }
+ }
var enddate = endm+"/"+endd+"/"+endy;
var endtime = new Date(enddate).getTime();
endtime = endtime/1000;
+ var endh = form.end_hour.options[form.end_hour.selectedIndex].value;
+ if (numberRegExp.test(endh)) {
+ endh = parseInt(endh);
+ if (endh > 0 && endh <= 23) {
+ endtime += 3600 * endh;
+ }
+ }
+
var shown = 0;
for (var i=0; i<$i; i++) {
if ((slotstart[i] >= starttime) && (slotend[i] <= endtime)) {
@@ -237,7 +252,7 @@ function uncheckSlotRadio() {
if (document.getElementsByClassName) {
slotpicks = document.getElementsByClassName('LC_slotpick_radio');
} else {
- sloctpicks = getElementsByClassName(document.body,'LC_slotpick_radio');
+ slotpicks = getElementsByClassName(document.body,'LC_slotpick_radio');
}
if (slotpicks.length) {
for (var i=0; i '.&mt('You already have a reservation: "[_1]", assigned by your instructor.',
+ $description1).' '.&mt('Your instructor must unassign it before you can make a new reservation.').
+ ' '.&mt('No slots meet the criteria for display').' ');
if ($curr{'page'} > 1) {
- $r->print(''.$linkstart.$which.'">'.$show_fields{$which}.' ';
}
}
- $r->print(&Apache::loncommon::end_data_table_header_row());
+ $tableheader .= &Apache::loncommon::end_data_table_header_row();
+ my $shownheader = 0;
my %name_cache;
my $slotsort = sub {
@@ -1618,30 +1640,39 @@ sub show_table {
delete => 'Delete',
slotlog => 'History',
);
- my $edit=(<<"EDITLINK");
+ my ($edit,$delete,$showlog,$remove_all);
+ if ($mgr) {
+ $edit=(<<"EDITLINK");
$lt{'edit'}
EDITLINK
- my $delete=(<<"DELETELINK");
+ $delete=(<<"DELETELINK");
$lt{'delete'}
DELETELINK
- my $showlog=(<<"LOGLINK");
+ $remove_all=&remove_link($slot,'remove all').'
';
+
+ if ($ids eq '') {
+ undef($remove_all);
+ } else {
+ undef($delete);
+ }
+ }
+
+ $showlog=(<<"LOGLINK");
$lt{'slotlog'}
LOGLINK
- my $remove_all=&remove_link($slot,'remove all').'
';
-
- if ($ids eq '') {
- undef($remove_all);
- } else {
- undef($delete);
- }
if ($slots{$slot}{'type'} ne 'schedulable_student') {
undef($showlog);
undef($remove_all);
}
+ unless ($shownheader) {
+ $r->print($tableheader);
+ $shownheader = 1;
+ }
+
my $row_start=&Apache::loncommon::start_data_table_row();
my $row_end=&Apache::loncommon::end_data_table_row();
$r->print($row_start.
@@ -1710,7 +1741,12 @@ $row_end
STUFF
}
}
- $r->print(&Apache::loncommon::end_data_table().'');
+ if ($shownheader) {
+ $r->print(&Apache::loncommon::end_data_table());
+ } else {
+ $r->print('
');
if (($curr{'page'} > 1) || ($more_records)) {
- $r->print('
');
+ $r->print('');
+ $r->print(' '.&mt('Previous [_1] changes',$curr{'show'}).' ');
+ $r->print('');
}
if ($more_records) {
- $r->print(''.&mt('Next [_1] changes',$curr{'show'}).' ');
+ $r->print('');
}
- $r->print('