--- loncom/homework/inputtags.pm	2009/04/16 14:45:47	1.257
+++ loncom/homework/inputtags.pm	2010/08/07 19:24:03	1.266
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.257 2009/04/16 14:45:47 onken Exp $
+# $Id: inputtags.pm,v 1.266 2010/08/07 19:24:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,6 +53,7 @@ package Apache::inputtags;
 use HTML::Entities();
 use strict;
 use Apache::loncommon;
+use Apache::lonhtmlcommon;
 use Apache::lonlocal;
 use Apache::lonnet;
 use LONCAPA;
@@ -185,9 +186,11 @@ sub start_textfield {
 	    if ($addchars) {
 		$result.=&addchars('HWVAL_'.$resid,$addchars);
 	    }
-	    &Apache::lonhtmlcommon::add_htmlareafields('HWVAL_'.$resid);
+            $result .= &Apache::lonhtmlcommon::htmlareaselectactive();
+            my $textareaclass = 'class="LC_richDetectHtml"';
 	    $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" '.
-		"rows=\"$rows\" cols=\"$cols\">".$oldresponse;
+		      'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass.'>'.
+                      $oldresponse;
 	    if ($oldresponse ne '') {
 
 		#get rid of any startup text if the user has already responded
@@ -394,7 +397,7 @@ sub start_textline {
                                  '&part_'. $Apache::inputtags::part.
                                  '&textresponse'.
                                  '&HWVAL_' . $Apache::inputtags::response['-1'];
-            $result="\n\\\\\n".'\textField{'.$fieldname.'}{'.$size.'}{12 bp}';
+            $result='\textField{'.$fieldname.'}{'.$size.'}{12 bp}';
         } else {
             $result='\framebox['.$size.'][s]{\tiny\strut}';
         }
@@ -479,87 +482,162 @@ sub file_selector {
     $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 = &current_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') { 
+    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&amp;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=&HTML::Entities::encode($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().
+                 '<th>'.&mt('Delete?').'</th>'.
+                 '<th>'.&mt('Name').'</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,@bad_file_list);
+    if ($uploadedfile) {
+        my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+        my ($path,$name) = ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E/(essayresponse/.+/)([^/]+))});
+        my ($status,$hashref,$error) =
+            &current_file_info($url,$uploadedfile,$name,$path);
+        if ($status eq 'ok') {
+            push(@{$okfiles{$name}},$url);
+            $rows{$url} = $hashref;
+            &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) =
+                &current_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".
+                            '<td valign="bottom"><input type="checkbox" name="HWFILE'.$jspart.'_'.$id.'_delete" value="'.
+                            $portfile.'" /></td>'."\n".
+                            '<td><a href="'.$link.'"><img src="'.$icon.
+                            '" border="0" />'.$name.'</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,9 +650,11 @@ sub valid_award {
 			       'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
 			       'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT', 
 			       'MISORDERED_RANK', 'INVALID_FILETYPE',
-                               'EXCESS_FILESIZE', 'DRAFT',
-			       'SUBMITTED', 'ASSIGNED_SCORE',
-			       'APPROX_ANS', 'EXACT_ANS','COMMA_FAIL') {
+                               'EXCESS_FILESIZE', 'FILENAME_INUSE', 
+			       'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT', 
+                               'ANONYMOUS', 'ANONYMOUS_CREDIT',
+                               'ASSIGNED_SCORE', 'APPROX_ANS',
+			       'EXACT_ANS','COMMA_FAIL') {
 	if ($award eq $possibleaward) { return 1; }
     }
     return 0;
@@ -587,7 +667,9 @@ sub valid_award {
 		  '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',
+                  'SUBMITTED_CREDIT', 'ANONYMOUS', 'ANONYMOUS_CREDIT',
                   'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS');
     my $i=0;
     my %fwd_awards = map { ($_,$i++) } @awards;
@@ -611,7 +693,7 @@ sub hide_award {
 	return 1;
     }
     if ($award =~
-	/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|ASSIGNED_SCORE|INCORRECT)/) {
+	/^(?:EXACT_ANS|APPROX_ANS|SUBMITTED|SUBMITTED_CREDIT|ANONYMOUS|ANONYMOUS_CREDIT|ASSIGNED_SCORE|INCORRECT)/) {
 	return 1;
     }
     return 0;
@@ -817,6 +899,16 @@ sub decideoutput {
         $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'};
@@ -872,8 +964,19 @@ sub decideoutput {
 	$message = &mt("Your submission has been recorded.");
 	$css_class=$possible_class{'no_grade'};
 	$button=1;
+    } elsif ($award eq 'SUBMITTED_CREDIT') {
+        $message = &mt("Your submission has been recorded, and credit awarded.");
+        $css_class=$possible_class{'correct'};
+        $button=1;
+    } elsif ($award eq 'ANONYMOUS') {
+        $message = &mt("Your anonymous submission has been recorded.");
+        $css_class=$possible_class{'no_grade'};
+        $button=1;
+    } elsif ($award eq 'ANONYMOUS_CREDIT') {
+        $message = &mt("Your anonymous submission has been recorded, and credit awarded.");
+        $css_class=$possible_class{'correct'};
     } elsif ($award eq 'DRAFT') {
-	$message = &mt("A draft copy has been saved.");
+	$message = &mt("Copy saved but not submitted.");
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'ASSIGNED_SCORE') {
@@ -1035,6 +1138,18 @@ sub setgradedata {
 	    $Apache::lonhomework::results{"resource.$id.solved"} =
 		$solvemsg;
 	    $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
+        } elsif ( $award eq 'SUBMITTED_CREDIT' ) {
+            $Apache::lonhomework::results{"resource.$id.tries"} =
+                $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+            $Apache::lonhomework::results{"resource.$id.solved"} =
+                'credit_attempted';
+            $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
+        }  elsif ( $award eq 'ANONYMOUS_CREDIT' ) {
+            $Apache::lonhomework::results{"resource.$id.tries"} =
+                $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+            $Apache::lonhomework::results{"resource.$id.solved"} =
+                'credit_attempted';
+            $Apache::lonhomework::results{"resource.$id.awarded"} = '1';
 	} elsif ( $award eq 'INCORRECT' ) {
 	    $Apache::lonhomework::results{"resource.$id.tries"} =
 		$Apache::lonhomework::history{"resource.$id.tries"} + 1;
@@ -1049,6 +1164,11 @@ sub setgradedata {
 		$Apache::lonhomework::history{"resource.$id.tries"} + 1;
 	    $Apache::lonhomework::results{"resource.$id.solved"} =
 		'ungraded_attempted';
+        }  elsif ( $award eq 'ANONYMOUS' ) {
+            $Apache::lonhomework::results{"resource.$id.tries"} =
+                $Apache::lonhomework::history{"resource.$id.tries"} + 1;
+            $Apache::lonhomework::results{"resource.$id.solved"} =
+                'ungraded_attempted';
 	} elsif ( $award eq 'DRAFT' ) {
 	    $Apache::lonhomework::results{"resource.$id.solved"} = '';
 	} elsif ( $award eq 'NO_RESPONSE' ) {
@@ -1108,6 +1228,10 @@ sub setgradedata {
     if ($award eq 'SUBMITTED') {
 	&Apache::response::add_to_gradingqueue();
     }
+    if (($Apache::lonhomework::type eq 'anonsurvey') ||
+        ($Apache::lonhomework::type eq 'anonsurveycred')) {
+        $Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
+    }
 }
 
 sub find_which_previous {
@@ -1220,12 +1344,7 @@ sub get_grade_messages {
     if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
-    my $tries_text=&mt('Tries');
-    if ( $Apache::lonhomework::type eq 'survey' ||
-	 $Apache::lonhomework::parsing_a_task) {
-	$tries_text=&mt('Submissions');
-    }
-
+    my $tries_text= &get_tries_text();;
     if ($showbutton) {
 	if ($target eq 'tex') {
 	    if ($env{'request.state'} ne "construct"
@@ -1237,7 +1356,7 @@ sub get_grade_messages {
 		$trystr = '\vskip 0 mm ';
 	    }
 	} else {
-	    $trystr = '<td><span class="LC_nobreak">'.$tries_text." $tries";
+	    $trystr = '<td><span class="LC_nobreak">'.&mt($tries_text)." $tries";
 	    if ($Apache::lonhomework::parsing_a_task) {
 	    } elsif($env{'request.state'} ne 'construct') {
 		$trystr.="/$maxtries";
@@ -1289,11 +1408,9 @@ sub gradestatus {
 	if ( $showbutton ) { 
 	    if ($target ne 'tex') {
 		$button = 
-		    '<input 
-                          onmouseup="javascript:setSubmittedPart(\''.$id.'\')"
-                           onsubmit="javascript:setSubmittedPart(\''.$id.'\')"
-                        type="submit" name="submit_'.$id.'"
-                         value="'.&mt('Submit Answer').'" />';
+            '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';"
+                    type="submit" name="submit_'.$id.'"
+                    value="'.&mt('Submit Answer').'" />';
 	    }
 	}
 
@@ -1326,7 +1443,13 @@ sub previous_tries {
 
     foreach my $i (1..$Apache::lonhomework::history{'version'}) {
 	my $prefix = $i.":resource.$id";
-
+        my $is_anon; 
+        if (defined($env{'form.grade_symb'})) {
+            if (($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurvey') || 
+                ($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurveycred')) {
+                $is_anon = 1;
+            }
+        }
 	next if (!exists($Apache::lonhomework::history{"$prefix.award"}));
 	$count++;
 	$count_lookup{$i} = $count;
@@ -1371,7 +1494,11 @@ sub previous_tries {
 		    $submission = 
 			$Apache::lonhomework::history{"$prefix.submission"};
 		}
-		$output.='<td>'.$submission.'</td>';
+                if ($is_anon) {
+                    $output.='<td>'.&mt('(only shown to submitter)').'</td>';
+                } else {
+		    $output.='<td>'.$submission.'</td>';
+                }
 	    } else {
 		$output.='<td></td>';
 	    }
@@ -1389,8 +1516,9 @@ sub previous_tries {
     $output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>';
 
     my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
+    my $tries_text = &get_tries_text('link');
     my $start_page =
-	&Apache::loncommon::start_page('Previous Tries', undef,
+	&Apache::loncommon::start_page($tries_text, undef,
 				       {'only_body'      => 1,
 					'bgcolor'        => '#FFFFFF',
 					'js_ready'       => 1,
@@ -1405,12 +1533,34 @@ sub previous_tries {
 // <![CDATA[
     function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}
 // ]]>
-</script><a href=\"javascript:$function_name();void(0);\">".&mt("Previous Tries")."</a><br />";
+</script><a href=\"javascript:$function_name();void(0);\">".&mt($tries_text)."</a><br />";
     #use Data::Dumper;
     #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
     return $result;
 }
 
+sub get_tries_text {
+    my ($context) = @_;
+    my $tries_text;
+    if ($context eq 'link') {
+        $tries_text = 'Previous Tries';
+    } else {
+        $tries_text = 'Tries';
+    }
+    if ( $Apache::lonhomework::type eq 'survey' ||
+         $Apache::lonhomework::type eq 'surveycred' ||
+         $Apache::lonhomework::type eq 'anonsurvey' ||
+         $Apache::lonhomework::type eq 'anonsurveycred' ||
+         $Apache::lonhomework::parsing_a_task) {
+        if ($context eq 'link') {
+            $tries_text = 'Previous Submissions';
+        } else {
+            $tries_text = 'Submissions';
+        }
+    }
+    return $tries_text;
+}
+
 1;
 __END__