[BACK]Return to bridgetask.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/bridgetask.pm between versions 1.109 and 1.114

version 1.109, 2006/02/14 19:41:06 version 1.114, 2006/02/21 22:41:29
Line 375  sub webgrade_standard_info { Line 375  sub webgrade_standard_info {
     my ($version)=&get_version();      my ($version)=&get_version();
     my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();      my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
     my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';      my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
     my $file_list="<ul>\n";      my $file_list="<ul class=\"handininfo\">\n";
     foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {      foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
  my $file=$file_url.$partial_file;   my $file=$file_url.$partial_file;
  $file=~s|/+|/|g;   $file=~s|/+|/|g;
Line 391  sub webgrade_standard_info { Line 391  sub webgrade_standard_info {
        );         );
                 
     my $result=<<INFO;      my $result=<<INFO;
 <div class="handininfo">    <div class="maincontrols">
   <input type="submit" name="next" value="$lt{'done'}" />      <input type="submit" name="next" value="$lt{'done'}" />
   <input type="submit" name="stop" value="$lt{'stop'}" />      <input type="submit" name="stop" value="$lt{'stop'}" />
     </div>
   $file_list    $file_list
 </div>  
 INFO  INFO
     return $result;      return $result;
 }  }
Line 480  sub start_Task { Line 480  sub start_Task {
  } elsif ($env{'form.donescreen'}) {   } elsif ($env{'form.donescreen'}) {
     my $title=&Apache::lonnet::gettitle();      my $title=&Apache::lonnet::gettitle();
     my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});      my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
     my $files='<ul><li>'.join('</li><li>',@files).'</li></ul>';      my (undef,undef,$domain,$user)=
    &Apache::lonxml::whichuser();
       my $files = '<ul>';
       foreach my $file (@files) {
    my $url="/uploaded/$domain/$user/portfolio$file";
    if (! &Apache::lonnet::stat_file($url)) {
       $file = &mt('<font color="red"> Nonexistant file:</font> <tt>[_1]</tt>',$file);
    } else {
       $file = '<tt>'.$file.'</tt>';
    }
    $files .= '<li>'.$file.'</li>';
       }
       $files.='</ul>';
   
     $result.=<<DONESCREEN;      $result.=<<DONESCREEN;
 <h2>$title</h2>  <h2>$title</h2>
 <p> Files submitted: $files </p>  <p> Files submitted: $files </p>
Line 528  DONESCREEN Line 541  DONESCREEN
       $target eq 'webgrade') {        $target eq 'webgrade') {
  my $webgrade='yes';   my $webgrade='yes';
  if ($target eq 'webgrade') {   if ($target eq 'webgrade') {
     $result.=$head_tag_start.$body_tag_start;      $result.=$head_tag_start.'</head>'.$body_tag_start;
     #$result.='<br />Review'.&show_queue('reviewqueue');      #$result.='<br />Review'.&show_queue('reviewqueue');
     #$result.='<br />Grade'.&show_queue('gradingqueue');      #$result.='<br />Grade'.&show_queue('gradingqueue');
  }   }
Line 550  DONESCREEN Line 563  DONESCREEN
     $Apache::bridgetask::queue_key=$todo;      $Apache::bridgetask::queue_key=$todo;
     &Apache::structuretags::initialize_storage();      &Apache::structuretags::initialize_storage();
     &Apache::lonhomework::showhash(%Apache::lonhomework::history);      &Apache::lonhomework::showhash(%Apache::lonhomework::history);
     if ($target eq 'webgrade') {      if ($target eq 'webgrade' && $status_code eq 'selected') {
  #$result.='<br />After -'.&show_queue($env{'form.queue'});   $form_tag_start.=
  $result.="\n".'<table width="100%" style="width:100%" border="1">';      '<input type="hidden" name="queuemode" value="selected" />';
  if ($status_code eq 'selected') {  
     $form_tag_start.=  
  '<input type="hidden" name="queuemode" value="selected" />';  
  }  
     }      }
  } else {   } else {
     if ($target eq 'webgrade') {      if ($target eq 'webgrade') {
Line 610  DONESCREEN Line 619  DONESCREEN
     }      }
     if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }      if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
  }   }
    if ($target eq 'webgrade') {
       $result.="\n".'<div id="criterialist">';
    }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.   $result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
     &Apache::structuretags::problem_edit_header();      &Apache::structuretags::problem_edit_header();
Line 988  DONEBUTTON Line 1000  DONEBUTTON
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
  }   }
     } elsif ($target eq 'webgrade') {      } elsif ($target eq 'webgrade') {
  $result.="</table>\n<hr />";   $result.="</div>\n<hr />";
  #$result.='<input type="submit" name="next" value="'.   #$result.='<input type="submit" name="next" value="'.
  #    &mt('Save &amp; Next').'" /> ';   #    &mt('Save &amp; Next').'" /> ';
  #$result.='<input type="submit" name="end" value="'.   #$result.='<input type="submit" name="end" value="'.
Line 1771  sub get_instance { Line 1783  sub get_instance {
     foreach my $id (@{$dimension{$instance.'.criterias'}}) {      foreach my $id (@{$dimension{$instance.'.criterias'}}) {
  my $link='criteria_'.$instance.'_'.$id;   my $link='criteria_'.$instance.'_'.$id;
  my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};   my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
  $result.='<tr><td width="100%" valign="top">'.   $result.='<div class="criteria" id="'.$link.'">'."\n".
     '<a name="'.$link.'" />'.      '<a name="'.$link.'" />'."\n".
     '<a name="next_'.$last_link.'" />'.      '<a name="next_'.$last_link.'" />'."\n".
     '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">';      '<div class="criteriatext">'."\n";
  @Apache::scripttag::parser_env = @_;   @Apache::scripttag::parser_env = @_;
  $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});   $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
  $result.='</textarea>'.   $result.='</div>'."\n".
     #$dimension{$instance.'.criteria.'.$id}.      #$dimension{$instance.'.criteria.'.$id}.
     '</td>'.      '<div class="grade">'."\n".
     '<td><nobr>Additional Comment for Student</nobr> <br />'.      '<label class="ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
     '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'.      '<label class="fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
     '</td>'.      '<label class="pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
     '<td>'.      '<label class="review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
     '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label></nobr><br />'.      '</div>'."\n".
     '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'.      '<label class="comment">'.&mt('Additional Comment for Student')."\n".
     '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'.      '<textarea class="comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\n".
     '<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label><br />'.      '</label>'."\n".
     '</td>'.      '<ul class="navbuttons">'."\n".
     '<td>'.      '<li><a href="#'.$last_link.'">Prev</a></li>'."\n".
     '<a href="#'.$last_link.'">Prev</a><br />'.      '<li><a href="#next_'.$link.'">Next</a></li>'."\n".
     '<a href="#next_'.$link.'">Next</a><br /><br /><br />'.      '</ul>'."\n".
     '</td></tr>';                      '</div>'."\n";
    $result.=&grading_history($version,$dim,$instance,$id);
  $last_link=$link;   $last_link=$link;
     }      }
  } elsif ($target eq 'grade' && $env{'form.webgrade'}) {   } elsif ($target eq 'grade' && $env{'form.webgrade'}) {
Line 1841  sub get_instance { Line 1854  sub get_instance {
     }      }
 }  }
   
   sub grading_history {
       my ($version,$dim,$instance,$criteria) = @_;
       if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
    return '';
       }
       my ($result,$grader);
       my $scope="resource.$version.0.$dim.$instance.$criteria";
       foreach my $t (1..$Apache::lonhomework::history{'version'}) {
    if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) {
       my ($gname,$gdom) = 
    split('@',$Apache::lonhomework::history{$t.':resource.0.regrader'});
       my $fullname = &Apache::loncommon::plainname($gname,$gdom);
       $grader = &Apache::loncommon::aboutmewrapper($fullname,
    $gname,$gdom);
    }
    my $entry;
    if (exists($Apache::lonhomework::history{"$t:$scope.status"})) {
       $entry.="<tt>".$Apache::lonhomework::history{"$t:$scope.status"}.'</tt>';
    }
    if (exists($Apache::lonhomework::history{"$t:$scope.comment"})) {
       $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';
    }
    if ($entry) {
       $result.= "<li>$grader : $entry </li>";
    }
       }
       if ($result) {
    return '<ul class="pastgrading">'.$result.'</ul>';
       }
       return '';
   }
   
 sub start_IntroParagraph {  sub start_IntroParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
Removed from v.1.109  
changed lines
  Added in v.1.114

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