Diff for /loncom/homework/grades.pm between versions 1.310 and 1.312

version 1.310, 2006/02/07 13:38:16 version 1.312, 2006/02/13 22:11:51
Line 1814  KEYWORDS Line 1814  KEYWORDS
  $lastsubonly.='<br /><a href="'.$file.'" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';   $lastsubonly.='<br /><a href="'.$file.'" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
  $lastsubonly.=' Return commented document to student. <input type="file" name="part'.$partid.'_returndoc';   $lastsubonly.=' Return commented document to student. <input type="file" name="part'.$partid.'_returndoc';
  $lastsubonly.=$file_counter.'" />'."\n";   $lastsubonly.=$file_counter.'" />'."\n";
    $lastsubonly.='<input type="hidden" name="respid" value="'.$respid.'" />';
  $lastsubonly.='<input type="hidden" name="returndocorig'.$file_counter.'" value="'.$file.'" />';   $lastsubonly.='<input type="hidden" name="returndocorig'.$file_counter.'" value="'.$file.'" />';
   
     }      }
Line 2224  sub saveHandGrade { Line 2225  sub saveHandGrade {
     my @parts = split(/:/,$env{'form.partlist'.$newflg});      my @parts = split(/:/,$env{'form.partlist'.$newflg});
     foreach my $new_part (@parts) {      foreach my $new_part (@parts) {
  #collaborator may vary for different parts   #collaborator may vary for different parts
  $request->print('form.part'.$new_part.'_returndoc1');  
  if ($submitter && $new_part ne $part) { next; }   if ($submitter && $new_part ne $part) { next; }
  my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part};   my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part};
  if ($dropMenu eq 'excused') {   if ($dropMenu eq 'excused') {
Line 2293  sub saveHandGrade { Line 2293  sub saveHandGrade {
     $newrecord{'resource.'.$new_part.'.regrader'}=      $newrecord{'resource.'.$new_part.'.regrader'}=
  "$env{'user.name'}:$env{'user.domain'}";   "$env{'user.name'}:$env{'user.domain'}";
  }   }
  $request->print('form.part'.$new_part.'_returndoc1');  
         if ($env{'form.part'.$new_part.'_returndoc1'}) {          if ($env{'form.part'.$new_part.'_returndoc1'}) {
             # if multiple files are uploaded names will be 'returndoc2', 'returndoc3'              # if multiple files are uploaded names will be 'returndoc2','returndoc3'
              
             my $portfolio_root = &Apache::loncommon::propath($domain,              my $portfolio_root = &Apache::loncommon::propath($domain,
     $stuname).      $stuname).
     '/userfiles/portfolio';      '/userfiles/portfolio';
                 $request->print('<br>'.$portfolio_root.'<br>');                  $request->print('<br>'.$portfolio_root.'<br>');
                   
     #                my $result=&Apache::lonnet::userfileupload('uploaddoc','',      #                my $result=&Apache::lonnet::userfileupload('uploaddoc','',
     #         'portfolio'.$env{'form.currentpath'});      #         'portfolio'.$env{'form.currentpath'});
           
             my $file_counter = 1;              my $file_counter = 1;
             while ($env{'form.'.$new_part.'_returndoc'.$file_counter}) {              my $respid = $env{'form.respid'};
               while ($env{'form.part'.$new_part.'_returndoc'.$file_counter}) {
                 my $fname=$env{'form.returndoc'.$file_counter.'.filename'};                  my $fname=$env{'form.returndoc'.$file_counter.'.filename'};
                   $newrecord{"resource.$new_part.$respid.handback"} = $env{'form.returndocorig'.$file_counter};
                 $request->print("<br />".$fname." will be the uploaded file name");                  $request->print("<br />".$fname." will be the uploaded file name");
                 $request->print("<font color=\"red\">Will upload document</font>".$env{'form.returndocorig'.$file_counter});                  $request->print("<font color=\"red\">Will upload document</font>".$env{'form.returndocorig'.$file_counter});
                 $file_counter++;                  $file_counter++;
Line 3336  sub csvuploadmap { Line 3339  sub csvuploadmap {
     unshift(@fields,['none','']);      unshift(@fields,['none','']);
     $i=&Apache::loncommon::csv_samples_select_table($request,\@records,      $i=&Apache::loncommon::csv_samples_select_table($request,\@records,
     \@fields);      \@fields);
     foreach my $rec (@records) {              foreach my $rec (@records) {
  my %temp = &Apache::loncommon::record_sep($rec);                  my %temp = &Apache::loncommon::record_sep($rec);
  if (%temp) {                  if (%temp) {
     $keyfields=join(',',sort(keys(%temp)));                      $keyfields=join(',',sort(keys(%temp)));
     last;                      last;
  }                  }
     }              }
  }   }
     }      }
     &csvuploadmap_footer($request,$i,$keyfields);      &csvuploadmap_footer($request,$i,$keyfields);

Removed from v.1.310  
changed lines
  Added in v.1.312


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