--- loncom/homework/externalresponse.pm	2013/09/11 10:25:50	1.24
+++ loncom/homework/externalresponse.pm	2014/12/06 20:08:16	1.29
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # external style responses
 #
-# $Id: externalresponse.pm,v 1.24 2013/09/11 10:25:50 kruse Exp $
+# $Id: externalresponse.pm,v 1.29 2014/12/06 20:08:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::lonxml();
 use Apache::lonhtmlcommon;
 use Apache::loncommon;
 use Apache::lonnavmaps;
+use Apache::essayresponse;
 use LONCAPA qw(:DEFAULT :match);
 
 BEGIN {
@@ -74,113 +75,75 @@ sub start_externalresponse {
 	}
     } elsif ($target eq 'meta') {
   	$result=&Apache::response::meta_package_write('externalresponse');
-    }
-    elsif ($target eq 'web' &&
-        $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+    } elsif ($target eq 'web') {
         my $part= $Apache::inputtags::part;
-        my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
-        my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
-        my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
-        $uploadedfiletypes=~s/[^\w\,]//g;
-        my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize");
-        if (!defined($maxfilesize)) {
-            $maxfilesize = 10.0; #FIXME This should become a domain configuration 
+        my $coll;
+        if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) {
+            $coll = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
         }
-            if($uploadedfiletypes){
+        if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+            my $ncol= &Apache::lonnet::EXT("resource.$part".'_'."$id.maxcollaborators");
+            my $uploadedfiletypes= &Apache::lonnet::EXT("resource.$part".'_'."$id.uploadedfiletypes");
+            $uploadedfiletypes=~s/[^\w\,]//g;
+            my $maxfilesize=&Apache::lonnet::EXT("resource.$part".'_'."$id.maxfilesize");
+            if (!defined($maxfilesize)) {
+                $maxfilesize = 10.0; #FIXME This should become a domain configuration 
+            }
             my $hiddendraft;
+            if ($uploadedfiletypes) {
                 if (($Apache::lonhomework::type eq 'survey') ||
                     ($Apache::lonhomework::type eq 'surveycred') ||
                     ($Apache::lonhomework::type eq 'anonsurvey') ||
                     ($Apache::lonhomework::type eq 'anonsurveycred')) {
                     $hiddendraft = '<input type="hidden" name="HWDRAFT'.$part.'_'.$id.'" value="yes" />';
                 } else {
-                    my $status_text = &mt('Submission type');
-                    if ($Apache::lonhomework::history{"resource.$part.award"} eq 'DRAFT') {
-                        $status_text .= '<br />'.&mt('(Currently -- draft)');
-                    }
-                    $result = &Apache::lonhtmlcommon::row_title($status_text);
-                    my $closure;
-                    unless ($ncol || $uploadedfiletypes) {
-                        $closure = 1;
-                    }
-                    $result.=
-                        '<label>'.
-                        '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="yes" checked="checked" />&nbsp;'.
-                        &mt('Submit entries below as answer to receive credit').
-                        '</label> <br />'.
-                        '<label>'.
-                        '<input type="radio" name="HWDRAFT'.$part.'_'.$id.'" value="no" />&nbsp;'.
-                        &mt('Save entries below (not submitted for credit yet)').
-                        '</label>'.
-                        &Apache::lonhtmlcommon::row_closure($closure);
+                    $result = &Apache::essayresponse::draft_row($part,$id,$ncol,$uploadedfiletypes);
                 }
-
                 if ($ncol > 0) {
-                    $result.= &Apache::lonhtmlcommon::row_title(&mt('Collaborators')).
-                          '<label>'.
-                          &mt('Collaborators:').' <input type="text" size="70" max="80" name="HWCOL'.
-                          $part.'_'.$id.'" value="'.$coll.'" /><br />'.
-                          &mt('Enter a maximum of [quant,_1,collaborator] using username or username:domain, e.g. smithje or smithje:[_2].',$ncol,$env{'user.domain'});
-                    if ($ncol > 1) {
-                        $result .= '<br />'.&mt('If entering more than one, use spaces to separate the collaborators.');
-	            }
-                    $result .= '</label><br />';
-                    $result .= &Apache::essayresponse::check_collaborators($ncol,$coll) if ($coll =~ /\w+/);
-                    $result .= &Apache::lonhtmlcommon::row_closure();
+                    $result .= &Apache::essayresponse::get_collab_row($part,$id,$coll,$ncol);
                 }
                 my $filesfrom = 'both';
                 my $stuname = &Apache::lonnet::EXT('user.name');
                 my $studom = &Apache::lonnet::EXT('user.domain');
                 if (!&Apache::lonnet::usertools_access($stuname,$studom,'portfolio')) {
-                $filesfrom = 'uploadonly';
+                    $filesfrom = 'uploadonly';
                 }
                 $result.=&Apache::inputtags::file_selector($part,$id,$uploadedfiletypes,
-                                                   $filesfrom,undef,$maxfilesize);
-                if ($result) {
-                    $result =
-                        '<div>'.$hiddendraft.
-                        &Apache::lonhtmlcommon::start_pick_box().
-                        $result.
-                        &Apache::lonhtmlcommon::end_pick_box().'</div>';
-                } else {
-                    $result = $hiddendraft;
+                                                           $filesfrom,undef,$maxfilesize);
+            } else {
+                if ($ncol > 0) {
+                    $result = &Apache::essayresponse::get_collab_row($part,$id,$coll,$ncol,1);
                 }
+            }
+            if ($result) {
+                $result =
+                    '<div>'.$hiddendraft.
+                    &Apache::lonhtmlcommon::start_pick_box().
+                    $result.
+                    &Apache::lonhtmlcommon::end_pick_box().'</div>';
+            } else {
+                $result = $hiddendraft;
+            }
+        } else {
+            $result = &Apache::essayresponse::show_status_table($part,$id,$coll);
         }
-    } elsif ($target eq 'web' &&
-             $Apache::inputtags::status[-1] ne 'CAN_ANSWER') {
-        my $part= $Apache::inputtags::part;
-        my @msgs;
-        if ($Apache::lonhomework::history{"resource.$part.$id.collaborators"} =~ /\S/) {
-            my $coll= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.collaborators"},'<>&"');
-            $result .= '<td><i>'.&mt('Collaborated with [_1]',$coll).'</i></td>';
-        }
-
-        my $current_files_display = &Apache::inputtags::current_file_submissions($part,$id);
-        if ($current_files_display) {
-            $result .= '<td><b>'.&mt('Submitted files:').'</b><br />'.
-                       $current_files_display.'</td>';
-        }
-
-        if ($result ne '') {
-            $result =
-                '<table class="LC_pastsubmission"><tr>'.$result.
-                '</tr></table>';
-        }
-    } 
+    }
     return $result;
 }
 
 sub end_externalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
+    my $response;
     my $part=$Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];
     my $increment     = 1;
     if ($target eq 'grade') {
+        &Apache::essayresponse::get_collaborators($part,$id);
 	if (  &Apache::response::submitted('scantron') ) {
 	    my $increment=&Apache::response::scored_response($part,$id);
 	} elsif ( &Apache::response::submitted() ) {
-            my $response      = $env{'form.HWVAL_'.$id};
+            $response      = $env{'form.HWVAL_'.$id};
             my $jspart=$part;
             $jspart=~s/\./_/g;
             my $filename = $env{'form.HWFILE'.$jspart.'_'.$id.'.filename'} ||
@@ -194,7 +157,7 @@ sub end_externalresponse {
             if ($Apache::lonhomework::history{"resource.$part.award"} eq 'DRAFT') {
                 $was_draft = 1;
             }
-            if (($response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/) ||
+            if (($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/) ||
                 (@deletions > 0) || ($was_draft && $is_submit)) {
                 my $award='DRAFT';
                 if ($env{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
@@ -210,7 +173,24 @@ sub end_externalresponse {
                 }
                 my $uploadedflag=0;
                 my $totalsize=0;
-                &Apache::essayresponse::file_submission($part,$id,\$award,\$uploadedflag,\$totalsize,\@deletions);
+                my %info = (
+                             'is_submit' => $is_submit,
+                           );
+                my $url = &Apache::lonxml::get_param('url',$parstack,$safeeval);
+                if ($url =~ m{^https?://([^/]+)/}) {
+                    use Socket;
+                    my $ip = gethostbyname($1);
+                    if (length($ip) eq 4) {
+                        $info{'ip'} = inet_ntoa($ip);
+                    }
+                } elsif ($url =~ m{^/}) {
+                    my $ip = &Apache::lonnet::get_host_ip($Apache::lonnet::perlvar{'lonHostID'});
+                    if ($ip =~ /^[\d\.]+$/) {
+                        $info{'ip'} = $ip;
+                    }
+                }
+                &Apache::essayresponse::file_submission($part,$id,\$award,\$uploadedflag,\$totalsize,
+                                                        \@deletions,'externalresponse',\%info);
                 $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;
                 $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$award;
                 my %previous=&Apache::response::check_for_previous($response,$part,$id);
@@ -239,9 +219,12 @@ sub end_externalresponse {
                 }
             ($award eq 'DRAFT') ? ($externalgrade = 0) : ($externalgrade =1);
             }
-          if($externalgrade){
-	    my $response = &Apache::response::getresponse();
+          if (&Apache::response::getresponse() =~ /[^\s]/) {
+               $response = &Apache::response::getresponse();
+               $externalgrade = 1;
+          }  
 
+          if ($externalgrade) {
             my $filesresults=0;
 # Previously turned in files
             my %previously_turned_in=();
@@ -320,7 +303,8 @@ sub end_externalresponse {
                                                    'uploadedurl']);
         if (&Apache::response::show_answer()) {
            $result.='<table border="1"><tr><th>'.&mt('Your answer:').'</th></tr><tr><td><pre>'.
-                    $Apache::lonhomework::history{"resource.$part.$id.submission"}.
+                    &HTML::Entities::encode(
+                        $Apache::lonhomework::history{"resource.$part.$id.submission"},'"<>&').
                     '</pre></td></table><br />'.&Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval).
                     '<br />';
         }