--- loncom/interface/lonparmset.pm 2003/09/04 01:09:04 1.122 +++ loncom/interface/lonparmset.pm 2003/09/05 03:47:47 1.124 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.122 2003/09/04 01:09:04 www Exp $ +# $Id: lonparmset.pm,v 1.124 2003/09/05 03:47:47 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1666,6 +1666,26 @@ ENDENV } ################################################## +my $tableopen; + +sub tablestart { + if ($tableopen) { + return ''; + } else { + $tableopen=1; + return ''; + } +} + +sub tableend { + if ($tableopen) { + $tableopen=0; + return '
ParameterDeleteSet to ...
'; + } else { + return''; + } +} + sub overview { my $r=shift; my $bodytag=&Apache::loncommon::bodytag( @@ -1678,48 +1698,97 @@ sub overview { LON-CAPA Course Environment $bodytag -
+ ENDOVER +# Setting + my %olddata=&Apache::lonnet::dump('resourcedata',$dom,$crs); + my %newdata=(); + undef %newdata; + my @deldata=(); + undef @deldata; + foreach (keys %ENV) { + if ($_=~/^form\.([a-z]+)\_(.+)$/) { + my $cmd=$1; + my $thiskey=$2; + if ($cmd eq 'set') { + my $data=$ENV{$_}; + if ($olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; } + } elsif ($cmd eq 'del') { + push (@deldata,$thiskey); + } elsif ($cmd eq 'datepointer') { + my $data=&Apache::lonhtmlcommon::get_date_from_form($ENV{$_}); + if ($olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; } + } + } + } +# Store + &Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs); + &Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs); # Read and display my %resourcedata=&Apache::lonnet::dump('resourcedata',$dom,$crs); my $oldsection=''; my $oldrealm=''; my $oldpart=''; + my $pointer=0; + $tableopen=0; foreach my $thiskey (sort keys %resourcedata) { - my ($course,$middle,$part,$name)= - ($thiskey=~/^(\w+)\.(.*)\.*([\w\s]+)\.(\w+)$/); - unless ($name eq 'type') { + if ($resourcedata{$thiskey.'.type'}) { + my ($course,$middle,$part,$name)= + ($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/); my $section='All Students'; if ($middle=~/^\[(.*)\]\./) { $section='Group/Section: '.$1; $middle=~s/^\[(.*)\]\.//; } - my $realm='All Resources'; + $middle=~s/\.$//; + my $realm='All Resources'; if ($middle=~/^(.+)\_\_\_\(all\)$/) { - $realm='Folder/Map: '.$1; + $realm='Folder/Map: '.&Apache::lonnet::gettitle($1).''; } elsif ($middle) { - $realm='Resource: '.$middle; + $realm='Resource: '.&Apache::lonnet::gettitle($middle).''; } if ($section ne $oldsection) { - $r->print("\n

$section

"); + $r->print(&tableend()."\n

$section

"); $oldsection=$section; $oldrealm=''; } if ($realm ne $oldrealm) { - $r->print("\n

$realm

"); + $r->print(&tableend()."\n

$realm

"); $oldrealm=$realm; $oldpart=''; } if ($part ne $oldpart) { - $r->print("\n

Part: $part

"); + $r->print(&tableend(). + "\n

Part: $part

"); $oldpart=$part; } - - $r->print('
'.$name.': '.$thiskey.' = '.$resourcedata{$thiskey}); +# +# Ready to print +# + $r->print(&tablestart().''.$name. + ':'); + if ($resourcedata{$thiskey.'.type'}=~/^date/) { + my $jskey='key_'.$pointer; + $pointer++; + $r->print( + &Apache::lonhtmlcommon::date_setter('overviewform', + $jskey, + $resourcedata{$thiskey}). +'' + ); + } else { + $r->print( + ''); + } + $r->print(''); } } - $r->print('
'); + + $r->print(&tableend(). + '

'); } ##################################################