Diff for /loncom/homework/essayresponse.pm between versions 1.54 and 1.58

version 1.54, 2004/12/14 20:12:30 version 1.58, 2005/01/31 22:00:40
Line 67  sub start_essayresponse { Line 67  sub start_essayresponse {
         if ($uploadedfiletypes) {          if ($uploadedfiletypes) {
     $result.='<tr><td>'.&mt('Submit a file: (only one file can be uploaded)').      $result.='<tr><td>'.&mt('Submit a file: (only one file can be uploaded)').
  ' <br /><input type="file" size="50" name="HWFILE'.   ' <br /><input type="file" size="50" name="HWFILE'.
 # $part.'_'.$id.'" onFocus="this.form.enctype='.   $part.'_'.$id.'" /><br />'.
 # "'multipart/form-data'".';" /><br />'.  
  $part.'_'.$id.'" '.  
  &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'.   &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />'.
                 '<strong>OR:</strong><br /><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"))'."'".'>Select Portfolio Files</a>'.                  '<strong>OR:</strong><br /><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"))'."'".'>Select Portfolio Files</a>'.
                 '<br />'.                  '<br />'.
Line 110  sub end_essayresponse { Line 108  sub end_essayresponse {
     $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators      $Apache::lonhomework::results{"resource.$part.$id.collaborators"}=$collaborators
  if ($collaborators ne $previous_list);   if ($collaborators ne $previous_list);
  }   }
  if ( defined($ENV{'form.submitted'}) &&   if (  &Apache::response::submitted('scantron') ) {
      $ENV{'form.submitted'} eq 'scantron' ) {  
     $increment=&Apache::response::scored_response($part,$id);      $increment=&Apache::response::scored_response($part,$id);
  } elsif ( defined($ENV{'form.submitted'}) ) {   } elsif ( &Apache::response::submitted() ) {
     my $response      = $ENV{'form.HWVAL_'.$id};      my $response      = $ENV{'form.HWVAL_'.$id};
             my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};              my $filename= $ENV{'form.HWFILE'.$part.'_'.$id.'.filename'};
             my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id};              my $portfiles = $ENV{'form.HWPORT'.$part.'_'.$id};
             &Apache::lonnet::logthis("portfiles now $portfiles");  
     if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {      if (( $response =~ /[^\s]/) || ($filename =~ /[^\s]/) || ($portfiles =~ /[^\s]/)) {
   my $award;    my $award;
         if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {          if ($ENV{'form.HWDRAFT'.$part.'_'.$id} eq 'yes') {
Line 153  sub end_essayresponse { Line 149  sub end_essayresponse {
                     &Apache::lonnet::clear_selected_files($name);                      &Apache::lonnet::clear_selected_files($name);
                     $uploadedflag=1;                      $uploadedflag=1;
            } else {             } else {
       my ($dsymb,$crsid,$domain,$name)=&Apache::lonxml::whichuser();
                  &Apache::lonnet::unmark_as_readonly($domain,$name,$dsymb.$crsid);
                $Apache::lonhomework::results{"resource.$part.$id.portfiles"}="";                 $Apache::lonhomework::results{"resource.$part.$id.portfiles"}="";
            }             }
  $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;   $Apache::lonhomework::results{"resource.$part.$id.submission"}=$response;

Removed from v.1.54  
changed lines
  Added in v.1.58


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>