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

Diff for /loncom/homework/bridgetask.pm between versions 1.76 and 1.77

version 1.76, 2005/11/04 15:31:53 version 1.77, 2005/11/15 19:50:22
Line 470  DONESCREEN Line 470  DONESCREEN
  }   }
     } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {      } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {
  if ($status eq 'NEEDS_CHECKIN') {   if ($status eq 'NEEDS_CHECKIN') {
     &proctor_check_auth($slot_name,$slot);      if(&proctor_check_auth($slot_name,$slot)) {
    my $result=&add_to_queue('gradingqueue',
    $Apache::inputtags::slot_name);
    &Apache::lonxml::debug("add_to_queue said $result");
       }
  }   }
     }      }
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
Line 690  sub end_Task { Line 694  sub end_Task {
 <h2>'.&mt('Submit Portfolio Files for Grading').'</h2>  <h2>'.&mt('Submit Portfolio Files for Grading').'</h2>
 <p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').  <p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').
   "</table>";    "</table>";
    }
    if (!$previous && !$env{'form.donescreen'}) {
     $result.=&Apache::inputtags::gradestatus('0');      $result.=&Apache::inputtags::gradestatus('0');
     $result.='</form>';      $result.='</form>';
     $result.=<<DONEBUTTON;      $result.=<<DONEBUTTON;
Line 698  sub end_Task { Line 704  sub end_Task {
    <input type="submit" value="Done" />     <input type="submit" value="Done" />
 </form>  </form>
 DONEBUTTON  DONEBUTTON
  }                  }
  if (&show_task($status,$previous) &&   if (&show_task($status,$previous) &&
     $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {      $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {
     my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};      my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};
Line 765  DONEBUTTON Line 771  DONEBUTTON
     $Apache::lonhomework::results{"resource.$version.0.submission"}='';      $Apache::lonhomework::results{"resource.$version.0.submission"}='';
     } else {      } else {
  delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});   delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});
    $award = '';
     }      }
     &Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
     &Apache::structuretags::finalize_storage();      &Apache::structuretags::finalize_storage();
Line 882  DONEBUTTON Line 889  DONEBUTTON
  $result.='</form>'.&Apache::loncommon::endbodytag().'</html>';   $result.='</form>'.&Apache::loncommon::endbodytag().'</html>';
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result.=&Apache::response::meta_package_write('Task');   $result.=&Apache::response::meta_package_write('Task');
         $result.=&meta_stores_write('solved','string','Problem Status');          $result.=&Apache::response::meta_stores_write('solved','string',
  $result.=&meta_stores_write('tries','int_zeropos',        'Problem Status');
     'Number of Attempts');   $result.=&Apache::response::meta_stores_write('tries','int_zeropos',
  $result.=&meta_stores_write('awarded','float',        'Number of Attempts');
     'Partial Credit Factor');   $result.=&Apache::response::meta_stores_write('awarded','float',
  $result.=&meta_stores_write('status','string',        'Partial Credit Factor');
     'Bridge Task Status');   $result.=&Apache::response::meta_stores_write('status','string',
         'Bridge Task Status');
     }      }
     undef($Apache::lonhomework::parsing_a_task);      undef($Apache::lonhomework::parsing_a_task);
     return $result;      return $result;
Line 995  sub add_to_queue { Line 1003  sub add_to_queue {
     my $cdom=$env{'course.'.$cid.'.domain'};      my $cdom=$env{'course.'.$cid.'.domain'};
     my %data;      my %data;
     $data{"$symb\0queue\0$uname\@$udom"}=[$slot_name];      $data{"$symb\0queue\0$uname\@$udom"}=[$slot_name];
     return &Apache::lonnet::put($queue,\%data,$cdom,$cnum);      return &Apache::lonnet::newput($queue,\%data,$cdom,$cnum);
 }  }
   
 sub show_queue {  sub show_queue {
Removed from v.1.76  
changed lines
  Added in v.1.77

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