--- loncom/homework/essayresponse.pm	2014/12/06 17:46:40	1.121
+++ loncom/homework/essayresponse.pm	2019/02/19 14:24:01	1.126
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # essay (ungraded) style responses
 #
-# $Id: essayresponse.pm,v 1.121 2014/12/06 17:46:40 raeburn Exp $
+# $Id: essayresponse.pm,v 1.126 2019/02/19 14:24:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,7 +68,7 @@ sub start_essayresponse {
                 ($Apache::lonhomework::type eq 'anonsurveycred')) {
                 $hiddendraft = '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" />';
             } else {
-                $result = &draft_row($part,$id,$ncol,$uploadedfiletypes);
+                $result = &draft_row($part,$id,$ncol,$uploadedfiletypes,'essayresponse');
 	    }
 	    if ($ncol > 0) {
                 $result .= &get_collab_row($part,$id,$coll,$ncol);
@@ -98,7 +98,7 @@ sub start_essayresponse {
 }
 
 sub draft_row {
-    my ($part,$id,$ncol,$uploadedfiletypes) = @_;
+    my ($part,$id,$ncol,$uploadedfiletypes,$resptype) = @_;
     my $status_text = &mt('Submission type');
     if ($Apache::lonhomework::history{"resource.$part.award"} eq 'DRAFT') {
         $status_text .= '<br />'.&mt('(Currently -- draft)');
@@ -107,14 +107,23 @@ sub draft_row {
     unless ($ncol || $uploadedfiletypes) {
         $closure = 1;
     }
+    my %label = (
+        draft => {
+                   essayresponse => &mt('Save entries below (not submitted for credit yet)'),
+                   externalresponse => &mt('Save entries below (not submitted for grading yet)'),
+                 },
+        submit => {
+                    essayresponse => &mt('Submit entries below as answer to receive credit'),
+                    externalresponse => &mt('Submit entries below for grading'),
+                  }
+    );
     return &Apache::lonhtmlcommon::row_title($status_text).
            '<label>'.
            '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" />'.
-           '&nbsp;'.&mt('Submit entries below as answer to receive credit').'</label> <br />'.
+           '&nbsp;'.$label{'submit'}{$resptype}.'</label> <br />'.
            '<label>'.
            '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" />&nbsp;'.
-           &mt('Save entries below (not submitted for credit yet)').
-           '</label>'.
+           $label{'draft'}{$resptype}.'</label>'.
            &Apache::lonhtmlcommon::row_closure($closure);
 }
 
@@ -217,16 +226,30 @@ sub end_essayresponse {
 				      &escape($crsid));
 			my $essayurl=
 			    &Apache::lonnet::declutter($ENV{'REQUEST_URI'});
-			my ($adom,$aname,$apath)=
-			    ($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
-                        $apath=&escape($apath);
-			$apath=~s/\W/\_/gs;
-			&Apache::lonnet::put('nohist_essay_'.$apath,
-					 { $akey => $response },$adom,$aname);
-		    }
+                        if ($essayurl eq 'lib/templates/simpleproblem.problem') {
+                            my %crsinfo = &Apache::lonnet::coursedescription($crsid);
+                            my $cdom = $crsinfo{'domain'};
+                            my $cnum = $crsinfo{'num'};
+                            my ($map,$id,$res) = &Apache::lonnet::decode_symb($symb);
+                            if ($map =~ m{^\Quploaded/$cdom/$cnum/\E(default(?:|_\d+)\.(?:sequence|page))$}) {
+                                my $apath = $1.'_'.$id;
+                                $apath=~s/\W/\_/gs;
+                                my $akey = join('.',&escape($name),&escape($domain));
+                                &Apache::lonnet::put('nohist_essay_'.$apath,
+                                                     { $akey => $response },$cdom,$cnum);
+                            }
+                        } else {
+			    my ($adom,$aname,$apath)=
+			        ($essayurl=~/^($LONCAPA::domain_re)\/($LONCAPA::username_re)\/(.*)$/);
+                            $apath=&escape($apath);
+			    $apath=~s/\W/\_/gs;
+			    &Apache::lonnet::put('nohist_essay_'.$apath,
+                                                 { $akey => $response },$adom,$aname);
+                        }
+                    }
                 }
             }
-	} 
+        }
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::end_table();
 
@@ -318,7 +341,14 @@ sub file_submission {
     if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"} ||
         $Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}) {
         if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}) {
-            @portfiles = split(/,/,$Apache::lonhomework::history{"resource.$part.$id.portfiles"});
+            my @possfiles = split(/,/,$Apache::lonhomework::history{"resource.$part.$id.portfiles"});
+            foreach my $file (@possfiles) {
+                my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
+                my ($origname,$version,$ext) = &Apache::lonnet::file_name_version_ext($name);
+                unless ($version) {
+                    push(@portfiles,$file);
+                }
+            }
         }
         $uploadedurl = $Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
         if (ref($deletions) eq 'ARRAY') {
@@ -534,7 +564,7 @@ sub file_submission {
         my @todelete = map { "/uploaded/$udom/$uname/portfolio".$_;  } keys(%port_delete);
         if (@tolock || @todelete) {
             if (ref($info) eq 'HASH') {
-                if ($info->{'ip'}) {
+                if (($info->{'ip'}) && ($info->{'is_submit'})) {
                     my @adds;
                     if (@tolock) {
                         @adds = map { "/uploaded/$udom/$uname/portfolio".$_;  } @tolock;