--- loncom/homework/inputtags.pm	2005/03/01 03:23:16	1.158
+++ loncom/homework/inputtags.pm	2005/04/05 15:39:41	1.164
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.158 2005/03/01 03:23:16 albertel Exp $
+# $Id: inputtags.pm,v 1.164 2005/04/05 15:39:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -294,6 +294,65 @@ sub end_hiddenline {
     return "";
 }
 
+# $part -> partid
+# $id -> responseid
+# $uploadefiletypes -> comma seperated list of extensions allowed or * for any
+# $which -> 'uploadedonly'  -> only newly uploaded files
+#           'portfolioonly' -> only allow files from portfolio
+#           'both' -> allow files from either location
+# returns a table row <tr> 
+sub file_selector {
+    my ($part,$id,$uploadedfiletypes,$which)=@_;
+    if (!$uploadedfiletypes) { return ''; }
+    my $result;
+    
+    $result.='<tr><td>';
+    if ($uploadedfiletypes ne '*') {
+	$result.=
+	    &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />';
+    }
+    if ($which eq 'uploadonly' || $which eq 'both') { 
+	$result.=&mt('Submit a file: (only one file can be uploaded)').
+	    ' <br /><input type="file" size="50" name="HWFILE'.
+	    $part.'_'.$id.'" /><br />';
+	my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
+
+	if ($uploadedfile) {
+	    my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+	    push (@Apache::lonxml::extlinks,$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>';
+	    $result.=&mt('Currently submitted: <tt>[_1]</tt>',$curfile);
+	} else {
+	    #$result.=&mt('(Hand in a file you have prepared on your computer)');
+	}
+    }
+    if ( $which eq 'both') { 
+	$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
+    }
+    if ($which eq 'portfolioonly' || $which eq 'both') { 
+	$result.='<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname=HWPORT'.$part.'_'.$id.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
+	    &mt('Select Portfolio Files').'</a><br />'.
+	    '<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.
+	    '<br />';
+	if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
+	    my @filelist;
+	    foreach my $file (split(',',&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
+		my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
+		my $url="/uploaded/$domain/$user/portfolio$file";
+		my $icon=&Apache::loncommon::icon($url);
+		push(@filelist,'<a href="'.$url.'"><img src="'.$icon.
+		     '" border="0" />'.$file.'</a>');
+	    }
+	    $result.=&mt("Portfolio files previously selected: <strong>[_1]</strong>",join(', ',@filelist));
+	}
+    }
+    $result.='</td></tr>'; 
+    return $result;
+}
+
 sub checkstatus {
     my ($value,$awardref,$msgref)=@_;
     for (my $i=0;$i<=$#$awardref;$i++) {
@@ -429,7 +488,7 @@ sub decideoutput {
     } elsif ($award eq 'MISORDERED_RANK') {
 	$message = &mt('You have provided an invalid ranking');
 	if ($target ne 'tex') {
-	    $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
+	    $message.=', '.&mt('please refer to').' '.&Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems');
 	}
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
@@ -749,7 +808,10 @@ sub gradestatus {
 	if ( $maxtries eq '' ) { $maxtries = '2'; } 
 	if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
 	my $tries_text=&mt('Tries');
-	if ( $Apache::lonhomework::type eq 'survey') { $tries_text=&mt('Submissions'); }
+	if ( $Apache::lonhomework::type eq 'survey' ||
+	     $Apache::lonhomework::parsing_a_task) {
+	    $tries_text=&mt('Submissions');
+	}
 	if ( $showbutton ) {
 	    if ($target eq 'tex') {
 		if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam' && $ENV{'form.suppress_tries'} ne 'yes') {
@@ -759,7 +821,8 @@ sub gradestatus {
 		}
 	    } else {
 		$trystr = "<td><nobr>".$tries_text." $tries";
-		if($ENV{'request.state'} ne 'construct') {
+		if ($Apache::lonhomework::parsing_a_task) {
+		} elsif($ENV{'request.state'} ne 'construct') {
 		    $trystr.="/$maxtries";
 		} else {
 		    if (defined($Apache::inputtags::params{'maxtries'})) {
@@ -777,10 +840,9 @@ sub gradestatus {
 	}
 	if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
 	    #last submissions was after due date
-	    if ($target eq 'tex') {
-		$latemessage=' The last submission was after the Due Date ';
-	    } else {
-		$latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>";
+	    $latemessage=&mt(' The last submission was after the Due Date ');;
+	    if ($target eq 'web') {
+		$latemessage='<td bgcolor="#ffaaaa">'.$latemessage.'</td>';
 	    }
 	}
     }