[LON-CAPA-cvs] cvs: loncom(GCI_3) /homework inputtags.pm
raeburn
raeburn@source.lon-capa.org
Mon, 13 Sep 2010 04:26:26 -0000
This is a MIME encoded message
--raeburn1284351986
Content-Type: text/plain
raeburn Mon Sep 13 04:26:26 2010 EDT
Modified files: (Branch: GCI_3)
/loncom/homework inputtags.pm
Log:
- Customization for GCI_3
- 1.264, 1.265, 1.268, 1.269, 1.270, 1.271.
- Suppress "Submission Type" row and path in name of file
for submissions to dropbox in GCI Submission problem.
--raeburn1284351986
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20100913042626.txt"
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.260.4.1 loncom/homework/inputtags.pm:1.260.4.2
--- loncom/homework/inputtags.pm:1.260.4.1 Sun Dec 6 21:00:15 2009
+++ loncom/homework/inputtags.pm Mon Sep 13 04:26:26 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.260.4.1 2009/12/06 21:00:15 raeburn Exp $
+# $Id: inputtags.pm,v 1.260.4.2 2010/09/13 04:26:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -53,6 +53,7 @@
use HTML::Entities();
use strict;
use Apache::loncommon;
+use Apache::lonhtmlcommon;
use Apache::lonlocal;
use Apache::lonnet;
use LONCAPA;
@@ -479,87 +480,177 @@
$jspart=~s/\./_/g;
my $result;
-
- $result.='<tr><td>';
- if (($uploadedfiletypes ne '*') || ($maxfilesize)) {
- if ($uploadedfiletypes ne '*') {
- $result.=
- &mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';
- }
- if ($maxfilesize) {
- $result.=&mt('Combined size of files not to exceed: [_1] MB[_2].',
- '<b>'.$maxfilesize.'</b>').'<br />';
- }
- $result .= '<br />';
+ my $current_files_display = ¤t_file_submissions($part,$id);
+ my $addfiles;
+ if ($current_files_display) {
+ $result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')).
+ $current_files_display.
+ &Apache::lonhtmlcommon::row_closure();
+ $addfiles = &mt('Submit other file(s)');
+ } else {
+ $addfiles = &mt('Choose file(s) to submit');
+ }
+ $result .= &Apache::lonhtmlcommon::row_title($addfiles);
+ my $constraints;
+ if ($uploadedfiletypes ne '*') {
+ $constraints =
+ &mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';
+ }
+ if ($maxfilesize) {
+ $constraints .= &mt('Combined size of all files not to exceed: [_1] MB[_2].',
+ '<b>'.$maxfilesize.'</b>').'<br />';
+ }
+ if ($constraints) {
+ $result .= $constraints.'<br />';
}
if ($which eq 'uploadonly' || $which eq 'both') {
- $result.=&mt('Submit a file: (only one file can be uploaded)').
+ $result.=&mt('Submit a file: (only one file per submission)').
' <br /><input type="file" size="50" name="HWFILE'.
$jspart.'_'.$id.'" /><br />';
- $result .= &show_past_file_submission($part,$id);
}
if ( $which eq 'both') {
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
}
if ($which eq 'portfolioonly' || $which eq 'both') {
$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
- &mt('Select Portfolio Files').'</a><br />'.
+ &mt('Select Portfolio Files: (one or more files per submission)').'</a><br />'.
'<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
'<br />';
- $result .= &show_past_portfile_submission($part,$id);
+
}
- $result.='</td></tr>';
+ $result.=&Apache::lonhtmlcommon::row_closure(1);
return $result;
}
-sub show_past_file_submission {
+sub current_file_submissions {
my ($part,$id) = @_;
- my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
-
- return if (!$uploadedfile);
-
- my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
- &Apache::lonxml::extlink($url);
- &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
- my $icon=&Apache::loncommon::icon($url);
- my $curfile='<a href="'.$url.'"><img src="'.$icon.
- '" border="0" />'.$uploadedfile.'</a>';
- return &mt('Currently submitted: [_1]','<tt>'.$curfile.'</tt>');
-
-}
-
-sub show_past_portfile_submission {
- my ($part,$id) = @_;
- if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}!~/[^\s]/){
- return;
+ my $jspart=$part;
+ $jspart=~s/\./_/g;
+ my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"};
+ my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"};
+ return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/));
+ my $header = &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row();
+ if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+ $header .= '<th>'.&mt('Delete?').'</th>';
+ }
+ $header .= '<th>'.&mt('File').'</th>'.
+ '<th>'.&mt('Size (MB)').'</th>'.
+ '<th>'.&mt('Last Modified').'</th>'.
+ &Apache::loncommon::end_data_table_header_row();
+ my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser();
+ my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/);
+ my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list);
+ if ($uploadedfile) {
+ my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+ my $link = &HTML::Entities::encode($url,'<>&"');
+ my ($path,$name) = ($url =~ m{^(/uploaded/\Q$udom\E/\Q$uname\E/essayresponse.*/)([^/]+)$});
+ my ($status,$hashref,$error) =
+ ¤t_file_info($url,$link,$name,$path);
+ if ($status eq 'ok') {
+ push(@{$okfiles{$name}},$url);
+ $rows{$url} = $hashref;
+ $legacy{$url} = 1;
+ &Apache::lonxml::extlink($url);
+ &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
+ } else {
+ push(@bad_file_list,$error);
+ }
+ }
+ if ($portfiles =~ /[^\s]/) {
+ my $prefix = "/uploaded/$udom/$uname/portfolio";
+ foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {
+ my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
+ my $url = $prefix.$path.$name;
+ my $uploadedfile = &HTML::Entities::encode($url,'<>&"');
+ my ($status,$hashref,$error) =
+ ¤t_file_info($url,$uploadedfile,$name,$path);
+ if ($status eq 'ok') {
+ push(@{$okfiles{$name}},$url);
+ $rows{$url} = $hashref;
+ } else {
+ push(@bad_file_list,$error);
+ }
+ }
+ }
+ foreach my $name (sort(keys(%okfiles))) {
+ if (ref($okfiles{$name}) eq 'ARRAY') {
+ foreach my $url (@{$okfiles{$name}}) {
+ if (ref($rows{$url}) eq 'HASH') {
+ my $link = $rows{$url}{link};
+ my $portfile = $rows{$url}{path}.$rows{$url}{name};
+ $portfile = &HTML::Entities::encode($portfile,'<>&"');
+ if ($link) {
+ my $icon=&Apache::loncommon::icon($url);
+ unless ($header_shown) {
+ $result .= $header;
+ $header_shown = 1;
+ }
+ $result.=
+ &Apache::loncommon::start_data_table_row()."\n";
+ if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+ $result .=
+ '<td valign="bottom"><input type="checkbox" name="HWFILE'.$jspart.'_'.$id.'_delete"'.
+ ' value="'.$portfile.'" /></td>'."\n";
+ }
+ my $showname = $rows{$url}{path}.$name;
+ if ($legacy{$url}) {
+ $showname = $name.' '.&mt('not in portfolio');
+ }
+ if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
+ $showname = $name;
+ }
+ $result .=
+ '<td><a href="'.$link.'"><img src="'.$icon.
+ '" border="0" />'.$showname.'</a></td>'."\n".
+ '<td align="right" valign="bottom">'.$rows{$url}{size}.'</td>'."\n".
+ '<td align="right" valign="bottom">'.$rows{$url}{lastmodified}.'</td>'."\n".
+ &Apache::loncommon::end_data_table_row();
+ }
+ }
+ }
+ }
+ }
+ if ($header_shown) {
+ $result .= &Apache::loncommon::end_data_table();
}
- my (@file_list,@bad_file_list);
- foreach my $file (split(/\s*,\s*/,&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
- my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
- my $url="/uploaded/$domain/$user/portfolio$file";
- my $icon=&Apache::loncommon::icon($url);
- push(@file_list,'<a href="'.$url.'"><img src="'.$icon.
- '" border="0" />'.$file.'</a>');
- if (! &Apache::lonnet::stat_file($url)) {
- &Apache::lonnet::logthis("bad file is $url");
- push(@bad_file_list,'<a href="'.$url.'"><img src="'.$icon.
- '" border="0" />'.$file.'</a>');
- }
- }
- my $files = '<span class="LC_filename">'.
- join('</span>, <span class="LC_filename">',@file_list).
- '</span>';
- my $result = &mt("Portfolio files previously selected: [_1]",$files);
if (@bad_file_list) {
- my $bad_files = '<span class="LC_filename">'.
- join('</span>, <span class="LC_filename">',@bad_file_list).
- '</span>';
- $result.='<p><span class="LC_error">'
- .&mt("These file(s) don't exist: [_1]",$bad_files)
- .'</span></p>';
+ my $bad_files = '<span class="LC_filename">'.
+ join('</span>, <span class="LC_filename">',@bad_file_list).
+ '</span>';
+ $result.='<p class="LC_error">'.
+ &mt("These file(s) don't exist: [_1]",$bad_files).
+ '</p>';
}
return $result;
+}
+sub current_file_info {
+ my ($url,$uploadedfile,$name,$path) = @_;
+ my ($status,$error,%info);
+ my @stat = &Apache::lonnet::stat_file($url);
+ if ((@stat) && ($stat[0] ne 'no_such_dir')) {
+ my ($lastmod,$size);
+ if ($stat[9] =~ /^\d+$/) {
+ $lastmod = &Apache::lonlocal::locallocaltime($stat[9]);
+ }
+ $size = $stat[7]/(1024*1024);
+ $size = sprintf("%.3f",$size);
+ %info = (
+ link => $uploadedfile,
+ name => $name,
+ path => $path,
+ size => $size,
+ lastmodified => $lastmod,
+ );
+ $status = 'ok';
+ } else {
+ &Apache::lonnet::logthis("bad file is $url");
+ my $icon=&Apache::loncommon::icon($url);
+ $error = '<a href="'.$url.'"><img src="'.$icon.
+ '" border="0" />'.$uploadedfile.'</a>';
+ }
+ return ($status,\%info,$error);
}
sub valid_award {
@@ -572,8 +663,8 @@
'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT',
'MISORDERED_RANK', 'INVALID_FILETYPE',
- 'EXCESS_FILESIZE', 'DRAFT',
- 'SUBMITTED', 'ASSIGNED_SCORE',
+ 'EXCESS_FILESIZE', 'FILENAME_INUSE',
+ 'DRAFT', 'SUBMITTED', 'ASSIGNED_SCORE',
'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
if ($award eq $possibleaward) { return 1; }
}
@@ -587,7 +678,8 @@
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR',
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
- 'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED',
+ 'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE',
+ 'DRAFT', 'SUBMITTED',
'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS');
my $i=0;
my %fwd_awards = map { ($_,$i++) } @awards;
@@ -817,6 +909,16 @@
$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.');
$css_class=$possible_class{'not_charged_try'};
$button=1;
+ } elsif ($award eq 'FILENAME_INUSE') {
+ $message = &mt('You have already uploaded a file with that filename.');
+ if ($target eq 'tex') {
+ $message.= "\\\\\n";
+ } else {
+ $message .= '<br />';
+ }
+ $message .= &mt('Please use a different file name.');
+ $css_class=$possible_class{'not_charged_try'};
+ $button=1;
} elsif ($award eq 'INVALID_FILETYPE') {
$message = &mt("Submission won't be graded. The type of file submitted is not allowed.");
$css_class=$possible_class{'not_charged_try'};
--raeburn1284351986--