--- loncom/interface/slotrequest.pm 2005/09/13 07:33:59 1.16
+++ loncom/interface/slotrequest.pm 2005/11/08 03:13:20 1.29
@@ -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.16 2005/09/13 07:33:59 albertel Exp $
+# $Id: slotrequest.pm,v 1.29 2005/11/08 03:13:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -53,12 +53,10 @@ sub fail {
}
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('
'.$env{'form.command'}.'
');
+ $r->print($html.''.&mt($title).'');
+ $r->print(&Apache::loncommon::bodytag($title));
}
sub end_page {
@@ -453,33 +451,94 @@ STUFF
}
sub show_table {
- my ($r,$symb,$mgr)=@_;
+ 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 %Saveable_Parameters = ('show' => 'array');
+
+ &Apache::loncommon::store_course_settings('chart',\%Saveable_Parameters);
+ &Apache::loncommon::restore_course_settings('chart',\%Saveable_Parameters);
+
+ my %fields=&Apache::lonlocal::texthash(
+ 'name' => 'Slot Name',
+ 'description' => 'Description',
+ 'type' => 'Type',
+ 'starttime' => 'Start time',
+ 'endtime' => 'End Time',
+ 'startreserve' => 'Time students can start reserving',
+ 'secret' => 'Secret Word',
+ 'maxspace' => 'Maxium # of students',
+ 'ip' => 'IP or DNS restrictions',
+ 'symb' => 'Resource slot is restricted to.',
+ 'uniqueperiod' => 'Period of time slot is unique',
+ 'proctor' => 'List of proctors');
+ my @order=('name','description','type','starttime','endtime',
+ 'startreserve','secret','maxspace','ip','symb',
+ 'uniqueperiod','proctor');
+ my @sel =
+ (exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show')
+ : keys(%fields);
+ my %sel = map { $_ => 1 } (@sel);
+
+ $r->print('
+EDITFORM
+
+ $r->print("
\n
$edit
\n");
+ if (exists($sel{'name'})) {
+ $colspan++;$r->print("
$slot
");
+ }
+ if (exists($sel{'type'})) {
+ $colspan++;$r->print("
$slots{$slot}->{'type'}
\n");
+ }
+ if (exists($sel{'description'})) {
+ $colspan++;$r->print("
$description
\n");
+ }
+ if (exists($sel{'starttime'})) {
+ $colspan++;$r->print("
$start
\n");
+ }
+ if (exists($sel{'endtime'})) {
+ $colspan++;$r->print("
$end
\n");
+ }
+ if (exists($sel{'startreserve'})) {
+ $colspan++;$r->print("
$start_reserve
\n");
+ }
+ if (exists($sel{'secret'})) {
+ $colspan++;$r->print("
$slots{$slot}{'secret'}
\n");
+ }
+ if (exists($sel{'maxspace'})) {
+ $colspan++;$r->print("
$slots{$slot}{'maxspace'}
\n");
+ }
+ if (exists($sel{'ip'})) {
+ $colspan++;$r->print("
$slots{$slot}{'ip'}
\n");
+ }
+ if (exists($sel{'symb'})) {
+ $colspan++;$r->print("
$title
\n");
+ }
+ if (exists($sel{'uniqueperiod'})) {
+ $colspan++;$r->print("
$unique
\n");
+ }
+ $colspan++;$r->print("
$ids
\n
\n");
+ if (exists($sel{'proctor'})) {
+ $r->print(<
-
$slot
-
$slots{$slot}->{'type'}
-
$description
-
$start
-
$end
-
$slots{$slot}->{'maxspace'}
-
$ids
-
$slots{$slot}->{'proctor'}
-
$unique
+
$proctors
STUFF
+ }
}
$r->print('');
}
sub upload_start {
- my ($r,$symb)=@_;
+ my ($r)=@_;
$r->print(&Apache::grades::checkforfile_js());
my $result.='
'."\n";
$result.=' '.
@@ -529,7 +655,6 @@ sub upload_start {
my $ignore=&mt('Ignore First Line');
$result.=<
-
$upfile_select
@@ -542,7 +667,7 @@ ENDUPFORM
}
sub csvuploadmap_header {
- my ($r,$symb,$datatoken,$distotal)= @_;
+ my ($r,$datatoken,$distotal)= @_;
my $javascript;
if ($env{'form.upfile_associate'} eq 'reverse') {
$javascript=&csvupload_javascript_reverse_associate();
@@ -566,7 +691,6 @@ to this page if the data selected is ins
-