Annotation of loncom/homework/bridgetask.pm, revision 1.49
1.1 albertel 1: # The LearningOnline Network with CAPA
2: # definition of tags that give a structure to a document
3: #
1.49 ! albertel 4: # $Id: bridgetask.pm,v 1.48 2005/09/14 21:03:48 albertel Exp $
1.1 albertel 5: #
6: # Copyright Michigan State University Board of Trustees
7: #
8: # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
9: #
10: # LON-CAPA is free software; you can redistribute it and/or modify
11: # it under the terms of the GNU General Public License as published by
12: # the Free Software Foundation; either version 2 of the License, or
13: # (at your option) any later version.
14: #
15: # LON-CAPA is distributed in the hope that it will be useful,
16: # but WITHOUT ANY WARRANTY; without even the implied warranty of
17: # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18: # GNU General Public License for more details.
19: #
20: # You should have received a copy of the GNU General Public License
21: # along with LON-CAPA; if not, write to the Free Software
22: # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23: #
24: # /home/httpd/html/adm/gpl.txt
25: #
26: # http://www.lon-capa.org/
27: #
28: ###
29:
30:
31: package Apache::bridgetask;
32:
33: use strict;
34: use Apache::lonnet;
35: use Apache::File();
36: use Apache::lonmenu;
37: use Apache::lonlocal;
38: use Apache::lonxml;
1.37 albertel 39: use Apache::slotrequest();
1.1 albertel 40: use Time::HiRes qw( gettimeofday tv_interval );
1.9 albertel 41:
1.1 albertel 42: BEGIN {
43: &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Instance','InstanceText','Criteria','ClosingParagraph'));
44: }
45:
1.9 albertel 46: sub initialize_bridgetask {
47: # id of current Dimension, 0 means that no dimension is current
48: # (inside <Task> only)
49: $Apache::bridgetask::dimension='';
50: # list of all Dimension ids seen
51: @Apache::bridgetask::dimensionlist=();
1.20 albertel 52: # mandatory attribute of all Dimensions seen
53: %Apache::bridgetask::dimensionmandatory=();
1.9 albertel 54: # list of all current Instance ids
55: @Apache::bridgetask::instance=();
56: # list of all Instance ids seen in this problem
57: @Apache::bridgetask::instancelist=();
1.15 albertel 58: # key of queud user data that we are currently grading
59: $Apache::bridgetask::queue_key='';
1.9 albertel 60: }
61:
1.4 albertel 62: sub proctor_check_auth {
1.22 albertel 63: my ($slot_name,$slot)=@_;
1.11 albertel 64: my $user=$env{'form.proctorname'};
65: my $domain=$env{'form.proctordomain'};
1.4 albertel 66:
67: my @allowed=split(",",$slot->{'proctor'});
68: foreach my $possible (@allowed) {
69: my ($puser,$pdom)=(split('@',$possible));
70: if ($puser eq $user && $pdom eq $domain) {
1.11 albertel 71: my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom);
1.4 albertel 72: if ($authhost ne 'no_host') {
1.23 albertel 73: my $version=
74: $Apache::lonhomework::results{'resource.version'}=
1.27 albertel 75: ++$Apache::lonhomework::history{'resource.version'};
1.23 albertel 76: $Apache::lonhomework::results{"resource.$version.checkedin"}=
1.4 albertel 77: $user.'@'.$domain;
1.23 albertel 78: $Apache::lonhomework::results{"resource.$version.checkedin.slot"}=
1.22 albertel 79: $slot_name;
1.28 albertel 80: foreach my $key (keys(%Apache::lonhomework::history)) {
81: if ($key=~/^resource\.0\./) {
82: $Apache::lonhomework::results{$key}='';
83: }
84: }
1.4 albertel 85: return 1;
86: }
87: }
88: }
89: return 0;
90: }
91:
1.25 albertel 92: sub get_version {
1.29 albertel 93: my ($version,$previous);
1.25 albertel 94: if ($env{'form.previousversion'} &&
1.36 albertel 95: $env{'form.previousversion'} ne 'current' &&
1.25 albertel 96: defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {
1.29 albertel 97: $version=$env{'form.previousversion'};
98: $previous=1;
99: } else {
100: $version=$Apache::lonhomework::history{'resource.version'};
101: $previous=0;
102: }
103: if (wantarray) {
104: return ($version,$previous);
1.25 albertel 105: }
1.29 albertel 106: return $version;
1.25 albertel 107: }
108:
1.8 albertel 109: sub add_previous_version_button {
1.25 albertel 110: my ($status)=@_;
1.8 albertel 111: my $result;
1.29 albertel 112: if ($Apache::lonhomework::history{'resource.version'} eq '') {
1.25 albertel 113: return '';
114: }
1.29 albertel 115: if ($Apache::lonhomework::history{'resource.version'} < 2 &&
116: $status ne 'NEEDS_CHECKIN') {
1.25 albertel 117: return '';
118: }
1.29 albertel 119: my $version=&get_version();
120: if ($env{'form.previousversion'} ne '' &&
121: $env{'form.previousversion'} eq $version) {
122: $result.="<h3>".&mt("Showing previous version [_1]",$version).
123: "</h3>\n";
124: }
125: my @to_show;
126: foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) {
127: if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) {
128: push(@to_show,$test_version);
129: }
130: }
131: my $list='<option>'.
132: join("</option>\n<option>",@to_show).
133: "</option>\n";
1.36 albertel 134: $list.='<option value="current">'.&mt('Current').'</option>';
1.29 albertel 135: $result.='<form name="getprevious" method="POST" action="';
136: my $uri=$env{'request.uri'};
137: if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
138: $result.=$uri.'">'.
139: &mt(' Show a previously done version: [_1]','<select onchange="this.form.submit()" name="previousversion">
140: <option>'.&mt('Pick one').'</option>
141: '.$list.'
142: </select>')."</form>";
1.8 albertel 143: return $result;
144: }
145:
1.13 albertel 146: sub add_grading_button {
1.29 albertel 147: my $result=' <input type="submit" name="gradeasubmission" value="'.
1.13 albertel 148: &mt("Get a submission to grade").'" />';
149: $result.='<input type="hidden" name="grade_target" value="webgrade" />';
1.40 albertel 150: if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
1.34 albertel 151: my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
152: $result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);
153:
154: $result.=' <input type="submit" name="reviewagrading" value="'.
155: &mt("Select an entry from the grading queue").'" /> </p>'."\n";
156:
157: ($entries,$ready,$locks)=&get_queue_counts('reviewqueue');
158: $result.='<p>'.&mt("Review Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);
1.32 albertel 159: $result.=' <input type="submit" name="reviewasubmission" value="'.
1.34 albertel 160: &mt("Select an entry from the review queue").'" /> </p>'."\n";
1.49 ! albertel 161: $result.=' <input type="submit" name="regradeasubmission" value="'.
! 162: &mt("Select a user to regrade.").'" /> </p>'."\n";
1.32 albertel 163: }
1.13 albertel 164: return $result;
165: }
166:
1.22 albertel 167: sub add_request_another_attempt_button {
1.38 albertel 168: my ($text)=@_;
169: if (!$text) { $text="Request another attempt"; }
1.25 albertel 170: my $result;
1.36 albertel 171: my $symb=&Apache::lonnet::symbread();
1.37 albertel 172: my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);
1.38 albertel 173: my $action='get_reservation';
1.37 albertel 174: if ($slot_name) {
1.38 albertel 175: $text="Change reservation.";
176: $action='change_reservation';
1.37 albertel 177: my $description=&Apache::slotrequest::get_description($slot_name,
178: $slot);
179: $result.=(<<STUFF);
180: <p> Will be next available: $description </p>
181: STUFF
182: }
1.38 albertel 183:
184: if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
185: $symb=&Apache::lonnet::escape($symb);
186: $result.='<form method="POST" action="/adm/slotrequest">'.
187: '<input type="hidden" name="symb" value="'.$symb.'" />'.
188: '<input type="hidden" name="command" value="'.$action.'" />'.
189: '<input type="submit" name="requestattempt" value="'.
190: &mt($text).'" />'.
191: '</form>';
1.25 albertel 192: return $result;
1.22 albertel 193: }
194:
1.30 albertel 195: sub preserve_grade_info {
196: my $result;
197: # if we are viewing someone else preserve that info
198: if (defined $env{'form.grade_symb'}) {
199: foreach my $field ('symb','courseid','domain','username') {
200: $result .= '<input type="hidden" name="grade_'.$field.
201: '" value="'.$env{"form.grade_$field"}.'" />'."\n";
202: }
203: }
204: return $result;
205: }
206:
1.1 albertel 207: sub start_Task {
208: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
209:
1.4 albertel 210: my ($status,$accessmsg,$slot);
1.16 albertel 211: if ($target ne 'webgrade') {
212: &Apache::structuretags::initialize_storage();
213: &Apache::lonhomework::showhash(%Apache::lonhomework::history);
214: }
215:
1.4 albertel 216: $Apache::lonhomework::parsing_a_task=1;
1.1 albertel 217: #should get back a <html> or the neccesary stuff to start XML/MathML
218: my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
219: &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
1.16 albertel 220:
1.8 albertel 221: if ($target eq 'web') {
1.13 albertel 222: if ($Apache::lonhomework::modifygrades) {
223: $body_tag_start.='<form name="gradesubmission" method="POST" action="';
224: my $uri=$env{'request.uri'};
225: if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
226: $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
1.38 albertel 227: my $symb=&Apache::lonnet::symbread();
1.40 albertel 228: if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
229: $body_tag_start.='<form method="POST" action="/adm/slotrequest">'.
230: '<input type="hidden" name="symb" value="'.$symb.'" />'.
231: '<input type="hidden" name="command" value="showslots" />'.
232: '<input type="submit" name="requestattempt" value="'.
233: &mt('Show Slot list').'" />'.
234: '</form>';
235: }
1.13 albertel 236: }
1.8 albertel 237: }
1.21 albertel 238: if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
1.1 albertel 239: $target eq 'tex') {
1.29 albertel 240: my ($version,$previous)=&get_version();
1.14 albertel 241: ($status,$accessmsg,my $slot_name,$slot) =
1.4 albertel 242: &Apache::lonhomework::check_task_access('0');
1.9 albertel 243: push(@Apache::inputtags::status,$status);
1.14 albertel 244: $Apache::inputtags::slot_name=$slot_name;
1.1 albertel 245: my $expression='$external::datestatus="'.$status.'";';
1.23 albertel 246: $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';
1.1 albertel 247: &Apache::run::run($expression,$safeeval);
248: &Apache::lonxml::debug("Got $status");
1.25 albertel 249: $body_tag_start.=&add_previous_version_button($status);
1.29 albertel 250: if (!$previous && (
251: ( $status eq 'CLOSED' ) ||
252: ( $status eq 'BANNED') ||
253: ( $status eq 'UNAVAILABLE') ||
254: ( $status eq 'NOT_IN_A_SLOT') ||
255: ( $status eq 'NEEDS_CHECKIN') ||
256: ( $status eq 'WAITING_FOR_GRADE') ||
257: ( $status eq 'INVALID_ACCESS') )) {
1.1 albertel 258: my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
259: if ( $target eq "web" ) {
1.4 albertel 260: $result.= $head_tag_start.'</head>'.$body_tag_start;
261: my $msg;
1.1 albertel 262: if ($status eq 'UNAVAILABLE') {
263: $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
1.3 albertel 264: } elsif ($status eq 'NOT_IN_A_SLOT') {
265: $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
1.38 albertel 266: $msg.=&add_request_another_attempt_button("Sign up for time to work.");
1.4 albertel 267: } elsif ($status eq 'NEEDS_CHECKIN') {
268: $msg.='<h1>'.&mt('You need the Proctor to validate you.').
269: '</h1>'.&proctor_validation_screen($slot);
1.22 albertel 270: } elsif ($status eq 'WAITING_FOR_GRADE') {
271: $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
1.1 albertel 272: } elsif ($status ne 'NOT_YET_VIEWED') {
273: $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
274: }
275: if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
276: $msg.='The problem '.$accessmsg;
277: }
278: $result.=$msg.'<br />';
279: } elsif ($target eq 'tex') {
280: $result.='\begin{document}\noindent \vskip 1 mm \begin{minipage}{\textwidth}\vskip 0 mm';
281: if ($status eq 'UNAVAILABLE') {
282: $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
283: } else {
284: $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
285: }
1.22 albertel 286: } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {
1.4 albertel 287: if ($status eq 'NEEDS_CHECKIN') {
1.41 albertel 288: &proctor_check_auth($slot_name,$slot);
1.4 albertel 289: }
1.1 albertel 290: }
291: } elsif ($target eq 'web') {
292: my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);
293: $result.="$head_tag_start<title>$name</title></head>
1.36 albertel 294: $body_tag_start \n";
295:
1.29 albertel 296: my ($version,$previous)=&get_version();
1.25 albertel 297: if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
1.22 albertel 298: $result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';
1.29 albertel 299: if (!$previous) {
300: $result.=&add_request_another_attempt_button();
301: }
1.22 albertel 302: }
1.25 albertel 303: if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
1.22 albertel 304: $result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';
305: }
1.36 albertel 306: $result.=$form_tag_start.
307: '<input type="hidden" name="submitted" value="yes" />';
308: $result.=&preserve_grade_info();
309:
1.1 albertel 310: }
1.21 albertel 311: } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
312: $target eq 'webgrade') {
1.32 albertel 313: my $webgrade='yes';
1.21 albertel 314: if ($target eq 'webgrade') {
1.32 albertel 315: $result.=$head_tag_start.$body_tag_start;
1.49 ! albertel 316: #$result.='<br />Review'.&show_queue('reviewqueue');
! 317: #$result.='<br />Grade'.&show_queue('gradingqueue');
1.30 albertel 318: }
1.33 albertel 319: # FIXME Blast! still need to reorg this, need to reshow the
320: # queue being reviewed once done with the grade pass...
321: # Hrrm, vaildation pass should perhaps say 'not_locked'
322: # perhaps do a search if there is a key that is mine and if
323: # there isn't reshow the queue....
324: my ($todo,$status_code)=&get_key_todo($target);
325:
326: &Apache::lonnet::logthis("got todo -$todo- stat -$status_code-");
327: if ($todo) {
328: &setup_env_for_other_user($todo,$safeeval);
329: my ($symb,$uname,$udom)=&decode_queue_key($todo);
330: $result.="\n".'<table><tr><td>Found '.
331: &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
332: $form_tag_start.=
333: '<input type="hidden" name="gradingkey" value="'.
334: &Apache::lonnet::escape($todo).'" />';
335: $Apache::bridgetask::queue_key=$todo;
336: &Apache::structuretags::initialize_storage();
337: &Apache::lonhomework::showhash(%Apache::lonhomework::history);
338: if ($target eq 'webgrade') {
1.49 ! albertel 339: #$result.='<br />After -'.&show_queue($env{'form.queue'});
1.33 albertel 340: $result.="\n".'<table width="100%" style="width:100%" border="1">';
341: if ($status_code eq 'selected') {
342: $form_tag_start.=
343: '<input type="hidden" name="queuemode" value="selected" />';
344: }
345: }
1.15 albertel 346: } else {
1.33 albertel 347: if ($target eq 'webgrade') {
348: $result.="\n";
349: if ($status_code eq 'stop') {
350: $result.='<b>'.&mt("Stopped grading.").'</b>';
351: } elsif ($status_code eq 'lock_failed') {
352: $result.='<b>'.&mt("Failed to lock the request record.").'</b>';
353: } elsif ($status_code eq 'unlock') {
354: $result.='<b>'.&mt("Unlocked the requested record.").'</b>';
355: $result.=&show_queue($env{'form.queue'},1);
356: } elsif ($status_code eq 'show_list') {
357: $result.=&show_queue($env{'form.queue'},1);
1.49 ! albertel 358: } elsif ($status_code eq 'select_user') {
! 359: $result.=&select_user();
1.33 albertel 360: } else {
361: $result.='<b>'.&mt("No user to be graded.").'</b>';
1.32 albertel 362: }
1.21 albertel 363: }
1.33 albertel 364: $webgrade='no';
365: my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
1.32 albertel 366: }
367: if ($target eq 'webgrade' && defined($env{'form.queue'})) {
368: $result.=$form_tag_start;
369: $result.='<input type="hidden" name="webgrade" value="'.
370: $webgrade.'" />';
371: $result.='<input type="hidden" name="queue" value="'.
372: $env{'form.queue'}.'" />';
1.15 albertel 373: }
1.1 albertel 374: } else {
375: # page_start returned a starting result, delete it if we don't need it
376: $result = '';
377: }
378: return $result;
379: }
380:
1.32 albertel 381: sub get_key_todo {
382: my ($target)=@_;
383: my $todo;
1.33 albertel 384:
385: if (defined($env{'form.reviewasubmission'})) {
386: &Apache::lonnet::logthis("review a submission....");
387: $env{'form.queue'}='reviewqueue';
388: return (undef,'show_list');
389: }
390:
391: if (defined($env{'form.reviewagrading'})) {
392: &Apache::lonxml::debug("review a grading....");
393: $env{'form.queue'}='gradingqueue';
394: return (undef,'show_list');
395: }
396:
1.49 ! albertel 397: if (defined($env{'form.regradeasubmission'})) {
! 398: &Apache::lonxml::debug("regrade a grading....");
! 399: $env{'form.queue'}='none';
! 400: return (undef,'select_user');
! 401: }
! 402:
1.32 albertel 403: my $queue=$env{'form.queue'};
1.33 albertel 404:
1.32 albertel 405: if (!defined($queue)) {
406: $env{'form.queue'}=$queue='gradingqueue';
407: }
1.33 albertel 408:
1.32 albertel 409: my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});
1.33 albertel 410:
1.49 ! albertel 411: if ($env{'form.queue'} eq 'none') {
! 412: if (defined($env{'form.gradingkey'})) {
! 413: if ($target eq 'webgrade') {
! 414: if ($env{'form.stop'}) {
! 415: return (undef,'stop');
! 416: } elsif ($env{'form.next'}) {
! 417: return (undef,'show_list');
! 418: }
! 419: }
! 420: return ($gradingkey,'selected');
! 421: } else {
! 422: return (undef,'show_list');
! 423: }
! 424: }
1.32 albertel 425: if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})
1.33 albertel 426: && !defined($env{'form.gradingaction'})
427: && $env{'form.queuemode'} eq 'selected') {
428:
429: my $who=&queue_key_locked($queue,$gradingkey);
430: my $me=$env{'user.name'}.'@'.$env{'user.domain'};
431: if ($who eq $me) {
432: &Apache::lonxml::debug("Found a key was given to me");
433: return ($gradingkey,'selected');
434: } else {
435: return (undef,'show_list');
436: }
437:
438: }
439:
440: if ($target eq 'webgrade' && $env{'form.queuemode'} eq 'selected') {
441: if ($env{'form.gradingaction'} eq 'resume') {
442: delete($env{'form.gradingaction'});
443: &Apache::lonxml::debug("Resuming a key");
1.32 albertel 444: return ($gradingkey);
1.33 albertel 445: } elsif ($env{'form.gradingaction'} eq 'unlock') {
446: &Apache::lonxml::debug("Unlocking a key ".
447: &check_queue_unlock($queue,$gradingkey,1));
448: return (undef,'unlock');
449: } elsif ($env{'form.gradingaction'} eq 'select') {
450: &Apache::lonxml::debug("Locking a key");
451: if (&lock_key($queue,$gradingkey)) {
452: &Apache::lonxml::debug("Success $queue");
453: return ($gradingkey);
454: }
455: &Apache::lonxml::debug("Failed $queue");
456: return (undef,'lock_failed');
1.32 albertel 457: }
458: }
1.33 albertel 459:
460: if ($env{'form.queuemode'} ne 'selected') {
461: # don't get something new from the queue if they hit the stop button
462: if (!($env{'form.stop'} && $target eq 'webgrade')
463: && !$env{'form.gradingaction'}) {
464: &Apache::lonxml::debug("Getting anew $queue");
465: return (&get_from_queue($queue));
466: } else {
467: return (undef,'stop');
468: }
1.32 albertel 469: }
1.33 albertel 470: return (undef,undef)
1.32 albertel 471: }
472:
1.1 albertel 473: sub end_Task {
474: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
475: my $result='';
476: my $status=$Apache::inputtags::status['-1'];
1.29 albertel 477: my ($version,$previous)=&get_version();
1.1 albertel 478: if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
1.15 albertel 479: $target eq 'tex') {
1.1 albertel 480: if (
1.11 albertel 481: (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
1.1 albertel 482: ($target eq 'answer') || ($target eq 'tex')
483: ) {
484: if ($target eq 'web') {
1.29 albertel 485: if ($status eq 'CAN_ANSWER' && !$previous) {
1.15 albertel 486: $result.="\n".'<table border="1">'.
1.28 albertel 487: &Apache::inputtags::file_selector("$version.0",
488: "bridgetask","*",
1.46 albertel 489: 'portfolioonly',
490: '
491: <h2>'.&mt('Submit Portfolio Files for Grading').'</h2>
492: <p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').
1.9 albertel 493: "</table>";
494: $result.=&Apache::inputtags::gradestatus('0');
495: }
1.13 albertel 496: }
497: if ($target eq 'web' || $target eq 'webgrade') {
1.1 albertel 498: $result.=&Apache::lonxml::xmlend().'</html>';
499: }
500: }
1.29 albertel 501: if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
1.12 albertel 502: my $award='SUBMITTED';
1.28 albertel 503: &Apache::essayresponse::file_submission("$version.0",'bridgetask',
1.20 albertel 504: 'portfiles',\$award);
1.14 albertel 505: if ($award eq 'SUBMITTED' &&
1.28 albertel 506: $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}) {
507: $Apache::lonhomework::results{"resource.0.tries"}=
508: $Apache::lonhomework::results{"resource.$version.0.tries"}=
509: 1+$Apache::lonhomework::history{"resource.$version.0.tries"};
510:
511: $Apache::lonhomework::results{"resource.0.award"}=
512: $Apache::lonhomework::results{"resource.$version.0.award"}=
513: $award;
1.10 albertel 514: }
1.4 albertel 515: &Apache::lonhomework::showhash(%Apache::lonhomework::results);
516: &Apache::structuretags::finalize_storage();
1.14 albertel 517: if ($award eq 'SUBMITTED') {
1.31 albertel 518: &add_to_queue('gradingqueue',$Apache::inputtags::slot_name);
1.14 albertel 519: }
1.1 albertel 520: }
1.32 albertel 521: if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') {
1.20 albertel 522: my $optional_required=
523: &Apache::lonxml::get_param('OptionalRequired',$parstack,
524: $safeeval);
525: my $optional_passed=0;
526: my $mandatory_failed=0;
527: my $ungraded=0;
528: my $review=0;
1.21 albertel 529: &Apache::lonhomework::showhash(%Apache::lonhomework::results);
1.20 albertel 530: foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
531: my $status=
1.25 albertel 532: $Apache::lonhomework::results{"resource.$version.$dim_id.status"};
1.20 albertel 533: my $mandatory=
534: ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
535: if ($status eq 'pass') {
536: if (!$mandatory) { $optional_passed++; }
537: } elsif ($status eq 'fail') {
538: if ($mandatory) { $mandatory_failed++; }
539: } elsif ($status eq 'ungraded') {
540: $ungraded++;
541: } elsif ($status eq 'review') {
542: $review++;
1.49 ! albertel 543: } else {
! 544: $ungraded++;
! 545: }
1.20 albertel 546: }
547: if ($optional_passed < $optional_required) {
548: $mandatory_failed++;
549: }
1.21 albertel 550: &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
551: $Apache::lonhomework::results{'resource.grader'}=
1.20 albertel 552: $env{'user.name'}.'@'.$env{'user.domain'};
553: if ($review) {
1.25 albertel 554: $Apache::lonhomework::results{"resource.$version.status"}='review';
1.33 albertel 555: if ($env{'form.queue'} eq 'reviewqueue') {
556: &check_queue_unlock($env{'form.queue'});
557: &Apache::lonxml::debug(" still needs review not changing status.");
558: } else {
1.49 ! albertel 559: &move_between_queues($env{'form.queue'},'reviewqueue');
1.33 albertel 560: }
1.20 albertel 561: } elsif ($ungraded) {
1.25 albertel 562: $Apache::lonhomework::results{"resource.$version.status"}='ungraded';
1.49 ! albertel 563: if ($env{'form.queue'} eq 'reviewqueue' ||
! 564: $env{'form.queue'} eq 'none' ) {
1.33 albertel 565: &Apache::lonxml::debug("moving back.");
1.49 ! albertel 566: &move_between_queues($env{'form.queue'},'gradingqueue');
1.33 albertel 567: } else {
568: &check_queue_unlock($env{'form.queue'});
569: }
1.20 albertel 570: } elsif ($mandatory_failed) {
1.25 albertel 571: $Apache::lonhomework::results{"resource.$version.status"}='fail';
572: $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';
573: $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';
574: $Apache::lonhomework::results{"resource.$version.0.awarded"}='0';
1.39 albertel 575: &remove_from_queue($env{'form.queue'});
576:
577: my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
578: $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
579: $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
580: &Apache::grades::version_portfiles(
581: \%Apache::lonhomework::results,
582: ["$version.0.bridgetask"],$courseid,
583: $symb,$udom,$uname,
584: ["$version.0.bridgetask"]);
1.20 albertel 585: } else {
1.25 albertel 586: $Apache::lonhomework::results{"resource.$version.status"}='pass';
587: $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
588: $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';
589: $Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
1.32 albertel 590: &remove_from_queue($env{'form.queue'});
1.39 albertel 591:
592: my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
593: $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
594: $Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
595: &Apache::grades::version_portfiles(
596: \%Apache::lonhomework::results,
597: ["$version.0.bridgetask"],$courseid,
598: $symb,$udom,$uname,
599: ["$version.0.bridgetask"]);
1.20 albertel 600: }
1.26 albertel 601: $Apache::lonhomework::results{"resource.status"}=
602: $Apache::lonhomework::results{"resource.$version.status"};
1.28 albertel 603: if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) {
1.26 albertel 604: $Apache::lonhomework::results{"resource.0.award"}=
605: $Apache::lonhomework::results{"resource.$version.award"};
606: $Apache::lonhomework::results{"resource.0.awarded"}=
607: $Apache::lonhomework::results{"resource.$version.awarded"};
608: $Apache::lonhomework::results{"resource.0.solved"}=
609: $Apache::lonhomework::results{"resource.$version.solved"};
1.25 albertel 610: }
1.21 albertel 611: &Apache::structuretags::finalize_storage();
1.20 albertel 612: }
1.15 albertel 613: } elsif ($target eq 'webgrade') {
1.18 albertel 614: $result.="</table>\n<hr />";
1.20 albertel 615: #$result.='<input type="submit" name="next" value="'.
616: # &mt('Save & Next').'" /> ';
617: #$result.='<input type="submit" name="end" value="'.
618: # &mt('Save & Stop Grading').'" /> ';
619: #$result.='<input type="submit" name="throwaway" value="'.
620: # &mt('Throw Away & Stop Grading').'" /> ';
621: #$result.='<input type="submit" name="save" value="'.
622: # &mt('Save Partial Grade and Continue Grading').'" /> ';
1.15 albertel 623: $result.='</form>'.&Apache::loncommon::endbodytag().'</html>';
1.1 albertel 624: } elsif ($target eq 'meta') {
1.2 albertel 625: $result.='<parameter part="0" package="Task"></parameter>'."\n";
1.1 albertel 626: #$result.=&Apache::response::meta_part_order();
627: #$result.=&Apache::response::meta_response_order();
628: }
1.4 albertel 629: undef($Apache::lonhomework::parsing_a_task);
1.1 albertel 630: return $result;
631: }
632:
1.31 albertel 633: sub move_between_queues {
634: my ($src_queue,$dest_queue)=@_;
1.49 ! albertel 635: my $cur_data;
! 636: if ($src_queue ne 'none') {
! 637: $cur_data=&get_queue_data($src_queue);
! 638: if (!$cur_data) { return 'not_exist'; }
! 639: } else {
! 640: $cur_data = ['none'];
! 641: }
1.31 albertel 642: my $result=&add_to_queue($dest_queue,$cur_data->[0]);
643: if ($result ne 'ok') {
644: return $result;
645: }
646: &check_queue_unlock($src_queue);
647: return &remove_from_queue($src_queue);
1.21 albertel 648: }
649:
650: sub check_queue_unlock {
1.32 albertel 651: my ($queue,$key,$allow_not_me)=@_;
1.49 ! albertel 652: if ($queue eq 'none') { return 'ok'; }
1.30 albertel 653: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
1.32 albertel 654: if (!defined($key)) {
655: $key="$symb\0queue\0$uname\@$udom";
656: }
1.30 albertel 657: my $cnum=$env{'course.'.$cid.'.num'};
658: my $cdom=$env{'course.'.$cid.'.domain'};
659: my $me=$env{'user.name'}.'@'.$env{'user.domain'};
660: my $who=&queue_key_locked($queue,$key,$cdom,$cnum);
661: if ($who eq $me) {
1.32 albertel 662: return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
663: } elsif ($allow_not_me) {
1.33 albertel 664: &Apache::lonxml::debug("unlocking $who by $me");
1.32 albertel 665: return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
1.30 albertel 666: }
1.32 albertel 667: return 'not_owner';
1.21 albertel 668: }
669:
670: sub remove_from_queue {
1.30 albertel 671: my ($queue)=@_;
1.49 ! albertel 672: if ($queue eq 'none') { return 'ok'; }
1.27 albertel 673: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
674: my $cnum=$env{'course.'.$cid.'.num'};
675: my $cdom=$env{'course.'.$cid.'.domain'};
676: my $key="$symb\0queue\0$uname\@$udom";
677: my @keys=($key,"$key\0locked");
1.31 albertel 678: return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);
1.21 albertel 679: }
680:
1.16 albertel 681: sub setup_env_for_other_user {
682: my ($queue_key,$safeeval)=@_;
683: my ($symb,$uname,$udom)=&decode_queue_key($queue_key);
1.30 albertel 684: &Apache::lonxml::debug("setup_env for $queue_key");
1.16 albertel 685: $env{'form.grade_symb'}=$symb;
686: $env{'form.grade_domain'}=$udom;
687: $env{'form.grade_username'}=$uname;
688: $env{'form.grade_courseid'}=$env{'request.course.id'};
689: &Apache::lonxml::initialize_rndseed($safeeval);
690: }
691:
1.31 albertel 692: sub get_queue_data {
693: my ($queue)=@_;
694: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
695: my $cnum=$env{'course.'.$cid.'.num'};
696: my $cdom=$env{'course.'.$cid.'.domain'};
697: my $todo="$symb\0queue\0$uname\@$udom";
698: my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);
699: if ($key eq $todo && ref($value)) {
700: return $value;
701: }
702: return undef;
703: }
704:
1.49 ! albertel 705: sub check_queue_for_key {
! 706: my ($cid,$queue,$todo)=@_;
! 707: my $cnum=$env{'course.'.$cid.'.num'};
! 708: my $cdom=$env{'course.'.$cid.'.domain'};
! 709: my %results=
! 710: &Apache::lonnet::get($queue,[$todo,"$todo\0locked"],$cdom,$cnum);
! 711:
! 712: if (exists($results{$todo}) && ref($results{$todo})) {
! 713: if (defined($results{"$todo\0locked"})) {
! 714: return 'locked';
! 715: }
! 716: return 'enqueued';
! 717: }
! 718: return undef;
! 719: }
! 720:
1.14 albertel 721: sub add_to_queue {
1.31 albertel 722: my ($queue,$slot_name)=@_;
1.49 ! albertel 723: if ($queue eq 'none') { return 'ok'; }
1.14 albertel 724: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
725: my $cnum=$env{'course.'.$cid.'.num'};
726: my $cdom=$env{'course.'.$cid.'.domain'};
727: my %data;
1.31 albertel 728: $data{"$symb\0queue\0$uname\@$udom"}=[$slot_name];
729: return &Apache::lonnet::put($queue,\%data,$cdom,$cnum);
1.14 albertel 730: }
731:
732: sub show_queue {
1.32 albertel 733: my ($queue,$with_selects)=@_;
1.14 albertel 734: my $result;
735: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
736: my $cnum=$env{'course.'.$cid.'.num'};
737: my $cdom=$env{'course.'.$cid.'.domain'};
1.16 albertel 738: my $regexp="^$symb\0";
1.30 albertel 739: my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
1.31 albertel 740: my ($tmp)=%queue;
741: if ($tmp=~/^error: 2 /) {
1.33 albertel 742: return "\n<h3>Current Queue - $queue</h3><table border='1'><tr><td>Empty</td></tr></table>";
1.31 albertel 743: }
1.33 albertel 744: $result.="\n<h3>Current Queue - $queue </h3><table border='1'><tr>";
1.32 albertel 745: if ($with_selects) { $result.="<th></th>"; }
746: $result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";
1.14 albertel 747: foreach my $key (sort(keys(%queue))) {
1.32 albertel 748: if ($key=~/locked$/ && !$with_selects) {
1.16 albertel 749: my ($symb,$uname,$udom) = &decode_queue_key($key);
750: my $title=&Apache::lonnet::gettitle($symb);
1.27 albertel 751: $result.="<tr><td>$title</td><td>$uname</td>";
1.16 albertel 752: $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
1.32 albertel 753: } elsif ($key=~/timestamp$/ && !$with_selects) {
1.16 albertel 754: my ($symb,undef) = split("\0",$key);
755: my $title=&Apache::lonnet::gettitle($symb);
1.27 albertel 756: $result.="<tr><td>$title</td><td></td>";
1.16 albertel 757: $result.='<td>last queue modification time</td><td>'.
758: &Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
1.32 albertel 759: } elsif ($key!~/(timestamp|locked)$/) {
1.16 albertel 760: my ($symb,$uname,$udom) = &decode_queue_key($key);
761: my $title=&Apache::lonnet::gettitle($symb);
1.32 albertel 762: $result.="<tr>";
1.35 albertel 763: my $slot=$queue{$key}->[0];
764: my %slot_data=&Apache::lonnet::get_slot($slot);
1.32 albertel 765: if ($with_selects) {
766: my $ekey=&Apache::lonnet::escape($key);
767: my ($action,$description)=('select',&mt('Select'));
768: if (exists($queue{"$key\0locked"})) {
769: my $me=$env{'user.name'}.'@'.$env{'user.domain'};
770: if ($me eq $queue{"$key\0locked"}) {
771: ($action,$description)=('resume',&mt('Resume'));
772: } else {
773: ($action,$description)=('unlock',&mt('Unlock'));
774: }
775: }
1.35 albertel 776: if (time > $slot_data{'endtime'}) {
777: $result.=(<<FORM);
1.32 albertel 778: <td>
779: <form method="POST">
780: <input type="hidden" name="gradingkey" value="$ekey" />
781: <input type="hidden" name="queue" value="$queue" />
782: <input type="hidden" name="gradingaction" value="$action" />
783: <input type="hidden" name="webgrade" value="no" />
1.33 albertel 784: <input type="hidden" name="queuemode" value="selected" />
1.32 albertel 785: <input type="submit" name="submit" value="$description" />
786: </form>
787: </td>
788: FORM
1.35 albertel 789:
790: } else {
791: $result.='<td>'.&mt("In Progress").'</td>'
792: }
1.32 albertel 793: }
794: $result.="<td>$title</td><td>$uname</td>";
1.27 albertel 795: $result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '.
1.20 albertel 796: &Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
797: "</td></tr>";
1.16 albertel 798: }
1.14 albertel 799: }
1.15 albertel 800: $result.="</table><hr />\n";
1.14 albertel 801: return $result;
802: }
803:
1.34 albertel 804: sub get_queue_counts {
805: my ($queue)=@_;
806: my $result;
807: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
808: my $cnum=$env{'course.'.$cid.'.num'};
809: my $cdom=$env{'course.'.$cid.'.domain'};
810: my $regexp="^$symb\0";
811: my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
812: my ($tmp)=%queue;
813: if ($tmp=~/^error: 2 /) {
814: return (0,0,0);
815: }
816: my ($entries,$ready_to_grade,$locks)=(0,0,0);
817: foreach my $key (sort(keys(%queue))) {
818: if ($key=~/locked$/) {
819: $locks++;
820: } elsif ($key=~/timestamp$/) {
821: #ignore
822: } elsif ($key!~/(timestamp|locked)$/) {
823: my ($symb,$uname,$udom) = &decode_queue_key($key);
824: $entries++;
825: my $slot=$queue{$key}->[0];
826: my %slot_data=&Apache::lonnet::get_slot($slot);
827: if (time > $slot_data{'endtime'}) {
828: $ready_to_grade++;
829: }
830: }
831: }
832: return ($entries,$ready_to_grade,$locks);
833: }
834:
1.49 ! albertel 835: sub encode_queue_key {
! 836: my ($symb,$udom,$uname)=@_;
! 837: return "$symb\0queue\0$uname\@$udom";
! 838: }
! 839:
1.14 albertel 840: sub decode_queue_key {
841: my ($key)=@_;
842: my ($symb,undef,$user) = split("\0",$key);
843: my ($uname,$udom) = split('@',$user);
844: return ($symb,$uname,$udom);
845: }
846:
847: sub queue_key_locked {
1.30 albertel 848: my ($queue,$key,$cdom,$cnum)=@_;
1.33 albertel 849: if (!defined($cdom) || !defined($cnum)) {
850: my (undef,$cid)=&Apache::lonxml::whichuser();
851: $cnum=$env{'course.'.$cid.'.num'};
852: $cdom=$env{'course.'.$cid.'.domain'};
853: }
1.14 albertel 854: my ($key_locked,$value)=
1.30 albertel 855: &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum);
1.14 albertel 856: if ($key_locked eq "$key\0locked") {
857: return $value;
858: }
859: return undef;
860: }
861:
862: sub pick_from_queue_data {
1.30 albertel 863: my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
864: foreach my $key (keys(%$queuedata)) {
1.14 albertel 865: my ($symb,$uname,$udom)=&decode_queue_key($key);
866: if ($check_section) {
867: my $section=&Apache::lonnet::getsection($uname,$udom);
1.17 albertel 868: if ($section eq $check_section) {
1.33 albertel 869: &Apache::lonxml::debug("my sec");
1.15 albertel 870: next;
871: }
1.14 albertel 872: }
1.30 albertel 873: my $slot=$queuedata->{$key}[0];
1.14 albertel 874: my %slot_data=&Apache::lonnet::get_slot($slot);
1.15 albertel 875: if ($slot_data{'endtime'} > time) {
1.33 albertel 876: &Apache::lonxml::debug("not time");
1.15 albertel 877: next;
878: }
1.30 albertel 879: if (&queue_key_locked($queue,$key,$cdom,$cnum)) {
1.33 albertel 880: &Apache::lonxml::debug("someone already has um.");
1.15 albertel 881: next;
882: }
1.14 albertel 883: return $key;
884: }
885: return undef;
886: }
887:
1.15 albertel 888: sub find_mid_grade {
1.30 albertel 889: my ($queue,$symb,$cdom,$cnum)=@_;
1.16 albertel 890: my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
1.15 albertel 891: my $me=$env{'user.name'}.'@'.$env{'user.domain'};
892: if ($todo) {
1.30 albertel 893: my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
1.15 albertel 894: if ($who eq $me) { return $todo; }
895: }
896: my $regexp="^$symb\0.*\0locked\$";
1.30 albertel 897: my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
1.15 albertel 898: foreach my $key (keys(%locks)) {
899: my $who=$locks{$key};
900: if ($who eq $me) {
901: $todo=$key;
902: $todo=~s/\0locked$//;
903: return $todo;
904: }
905: }
906: return undef;
907: }
908:
1.32 albertel 909: sub lock_key {
910: my ($queue,$todo)=@_;
911: my $me=$env{'user.name'}.'@'.$env{'user.domain'};
912: my (undef,$cid)=&Apache::lonxml::whichuser();
913: my $cnum=$env{'course.'.$cid.'.num'};
914: my $cdom=$env{'course.'.$cid.'.domain'};
915: my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},
916: $cdom,$cnum);
1.33 albertel 917: &Apache::lonxml::debug("success $success $todo");
1.32 albertel 918: if ($success eq 'ok') {
919: return 1;
920: }
921: return 0;
922: }
923:
1.14 albertel 924: sub get_from_queue {
1.30 albertel 925: my ($queue)=@_;
1.14 albertel 926: my $result;
927: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
928: my $cnum=$env{'course.'.$cid.'.num'};
929: my $cdom=$env{'course.'.$cid.'.domain'};
1.32 albertel 930: my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);
1.33 albertel 931: &Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo)));
1.16 albertel 932: if ($todo) { return $todo; }
1.14 albertel 933: while (1) {
934: my $starttime=time;
1.30 albertel 935: &Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime},
1.14 albertel 936: $cdom,$cnum);
1.33 albertel 937: &Apache::lonxml::debug("$starttime");
1.14 albertel 938: my $regexp="^$symb\0queue\0";
1.30 albertel 939: my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
1.33 albertel 940: #make a pass looking for a user _not_ in my section
1.14 albertel 941: if ($env{'request.course.sec'}) {
1.33 albertel 942: &Apache::lonxml::debug("sce");
1.30 albertel 943: $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
944: \%queue,$cdom,$cnum);
1.33 albertel 945: &Apache::lonxml::debug("sce $todo");
1.14 albertel 946: }
1.33 albertel 947: # no one _not_ in our section so look for any user that is
948: # ready for grading
1.14 albertel 949: if (!$todo) {
1.33 albertel 950: &Apache::lonxml::debug("no sce");
1.31 albertel 951: $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
952: \%queue,$cdom,$cnum);
1.33 albertel 953: &Apache::lonxml::debug("no sce $todo");
1.14 albertel 954: }
955: # no user to grade
956: if (!$todo) { last; }
1.33 albertel 957: &Apache::lonxml::debug("got $todo");
1.14 albertel 958: # otherwise found someone so lets try to lock them
1.32 albertel 959: # unless someone else already picked them
960: if (!&lock_key($queue,$todo)) { next; }
1.14 albertel 961: my (undef,$endtime)=
1.30 albertel 962: &Apache::lonnet::get($queue,["$symb\0timestamp"],
1.14 albertel 963: $cdom,$cnum);
1.33 albertel 964: &Apache::lonxml::debug("emd $endtime");
1.14 albertel 965: # someone else already modified the queue,
966: # perhaps our picked user wass already fully graded between
967: # when we picked him and when we locked his record? so lets
968: # double check.
969: if ($endtime != $starttime) {
970: my ($key,$value)=
1.30 albertel 971: &Apache::lonnet::get($queue,["$todo"],
1.14 albertel 972: $cdom,$cnum);
1.33 albertel 973: &Apache::lonxml::debug("check $key .. $value");
1.14 albertel 974: if ($key eq $todo && ref($value)) {
975: } else {
1.30 albertel 976: &Apache::lonnet::del($queue,["$todo\0locked"],
1.14 albertel 977: $cdom,$cnum);
1.33 albertel 978: &Apache::lonxml::debug("del");
1.14 albertel 979: next;
980: }
981: }
1.33 albertel 982: &Apache::lonxml::debug("last $todo");
1.14 albertel 983: last;
984: }
985: return $todo;
986: }
987:
1.49 ! albertel 988: sub select_user {
! 989: my ($symb,$cid)=&Apache::lonxml::whichuser();
! 990: my $result.='<table border="1">';
! 991:
! 992: &Apache::grades::init_perm();
! 993: my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all',);
! 994: &Apache::grades::reset_perm();
! 995:
! 996: foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
! 997: my ($uname,$udom) = split(/:/,$student);
! 998: my %status = &get_student_status($symb,$cid,$udom,$uname);
! 999: my $queue = 'none';
! 1000: if ($status{'reviewqueue'} eq 'enqueued') {
! 1001: $queue = 'reviewqueue';
! 1002: } elsif ($status{'gradingqueue'} eq 'enqueued') {
! 1003: $queue = 'gradingqueue';
! 1004: }
! 1005: my $todo =
! 1006: &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
! 1007: $result.=<<RESULT;
! 1008: <tr>
! 1009: <td>
! 1010: <form method="POST">
! 1011: <input type="hidden" name="gradingkey" value="$todo" />
! 1012: <input type="hidden" name="queue" value="$queue" />
! 1013: <input type="hidden" name="webgrade" value="no" />
! 1014: <input type="submit" name="submit" value="Regrade" />
! 1015: </form>
! 1016: <td>$fullname->{$student}</td>
! 1017: <td>
! 1018: RESULT
! 1019:
! 1020: if ($status{'status'} eq 'pass') {
! 1021: $result .= '<font color="green">'.&mt('Passed').'</font>';
! 1022: } elsif ($status{'status'} eq 'fail') {
! 1023: $result .= '<font color="red">'.&mt('Failed').'</font>';
! 1024: } elsif ($status{'status'} eq 'review') {
! 1025: $result .= '<font color="blue">'.&mt('Under Review').'</font>';
! 1026: } elsif ($status{'status'} eq 'ungraded') {
! 1027: $result .= &mt('Ungraded');
! 1028: } elsif ($status{'status'} ne '') {
! 1029: $result .= '<font color="orange">'.&mt('Unknown Status').'</font>';
! 1030: } else {
! 1031: $result.=" ";
! 1032: }
! 1033: if ($status{'version'}) {
! 1034: $result .= ' '.&mt('Version').' '.$status{'version'};
! 1035: }
! 1036: $result.= '</td><td>';
! 1037: if ($status{'reviewqueue'} eq 'enqueued') {
! 1038: $result .= &mt('Awaiting Review');
! 1039: } elsif ($status{'reviewqueue'} eq 'locked') {
! 1040: $result .= &mt('Under Review');
! 1041: } elsif ($status{'gradingqueue'} eq 'enqueued') {
! 1042: $result .= &mt('Awaiting Grading');
! 1043: } elsif ($status{'gradingqueue'} eq 'locked') {
! 1044: $result .= &mt('Being Graded');
! 1045: } else {
! 1046: $result.=" ";
! 1047: }
! 1048: $result.= '</td></tr>';
! 1049: }
! 1050: $result.='</table>';
! 1051: return $result;
! 1052: }
! 1053:
! 1054: sub get_student_status {
! 1055: my ($symb,$cid,$udom,$uname)=@_;
! 1056: my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
! 1057: $udom,$uname);
! 1058: my %status;
! 1059: $status{'status'}=$record{'resource.status'};
! 1060: $status{'version'}=$record{'resource.version'};
! 1061: $status{'grader'}=$record{'resource.grader'};
! 1062: $status{'reviewqueue'}=&check_queue_for_key($cid,'reviewqueue',
! 1063: &encode_queue_key($symb,$udom,$uname));
! 1064: $status{'gradingqueue'}=&check_queue_for_key($cid,'gradingqueue',
! 1065: &encode_queue_key($symb,$udom,$uname));
! 1066: return %status;
! 1067: }
! 1068:
1.1 albertel 1069: sub start_ClosingParagraph {
1070: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1071: my $result;
1072: if ($target eq 'web') {
1.13 albertel 1073: } elsif ($target eq 'webgrade') {
1074: &Apache::lonxml::startredirection();
1.1 albertel 1075: }
1076: return $result;
1077: }
1078:
1079: sub end_ClosingParagraph {
1080: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1081: my $result;
1082: if ($target eq 'web') {
1.13 albertel 1083: } elsif ($target eq 'webgrade') {
1084: &Apache::lonxml::endredirection();
1.1 albertel 1085: }
1086: return $result;
1087: }
1088:
1.19 albertel 1089: sub get_id {
1090: my ($parstack,$safeeval)=@_;
1091: my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval);
1092: if (!$id) { $id=$Apache::lonxml::curdepth; }
1093: return $id;
1094: }
1095:
1.1 albertel 1096: my %dimension;
1097: sub start_Dimension {
1098: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1099: undef(%dimension);
1.19 albertel 1100: my $dim_id=&get_id($parstack,$safeeval);
1.9 albertel 1101: $Apache::bridgetask::dimension=$dim_id;
1102: push(@Apache::bridgetask::dimensionlist,$dim_id);
1103: undef(@Apache::bridgetask::instance);
1.20 albertel 1104: $Apache::bridgetask::dimensionmandatory{$dim_id}=
1105: &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
1.1 albertel 1106: return '';
1107: }
1108:
1.13 albertel 1109: sub get_instance {
1110: &Apache::response::pushrandomnumber();
1111: my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
1.29 albertel 1112: my $num=@order;
1113: my $version=&get_version();
1114: my $which=($version-1)%$num;
1115: return $order[$which];
1.13 albertel 1116: }
1117:
1.18 albertel 1118: {
1119: my $last_link;
1120: sub end_Dimension {
1121: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1122: my $result;
1.25 albertel 1123: my $dim=&get_id($parstack,$safeeval);
1.19 albertel 1124: my $instance=&get_instance();
1.25 albertel 1125: my $version=&get_version();
1.18 albertel 1126: if ($target eq 'web') {
1.47 albertel 1127: @Apache::scripttag::parser_env = @_;
1128: $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
1129: @Apache::scripttag::parser_env = @_;
1130: $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
1.26 albertel 1131: if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||
1132: $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
1.22 albertel 1133: foreach my $id (@{$dimension{$instance.'.criterias'}}) {
1.25 albertel 1134: my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
1135: my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
1.22 albertel 1136: $result.='<table border="1"><tr><td>';
1137: if ($status eq 'fail') {
1138: $result.='<font color="red">'.&mt('Did not pass').'</font>';
1139: } elsif ($status eq 'pass') {
1140: $result.='<font color="green">'.&mt('Passed').'</font>';
1141: } else {
1.49 ! albertel 1142: &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");
1.22 albertel 1143: }
1144: $result.='</td></tr><tr><td>';
1.25 albertel 1145: if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
1146: $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</td></tr><tr><td>';
1.22 albertel 1147: }
1148: $result.=$dimension{$instance.'.criteria.'.$id}.
1149: '</td></tr></table>';
1150: }
1151: }
1.18 albertel 1152: } elsif ($target eq 'webgrade') {
1.47 albertel 1153: # in case of any side effects that we need
1154: @Apache::scripttag::parser_env = @_;
1155: &Apache::scripttag::xmlparse($dimension{'intro'});
1156: @Apache::scripttag::parser_env = @_;
1157: &Apache::scripttag::xmlparse($dimension{$instance.'.text'});
1.18 albertel 1158: foreach my $id (@{$dimension{$instance.'.criterias'}}) {
1159: my $link='criteria_'.$instance.'_'.$id;
1.25 albertel 1160: my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
1.19 albertel 1161: $result.='<tr><td width="100%" valign="top">'.
1.18 albertel 1162: '<a name="'.$link.'" />'.
1163: '<a name="next_'.$last_link.'" />'.
1.47 albertel 1164: '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">';
1165: @Apache::scripttag::parser_env = @_;
1166: $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
1167: $result.='</textarea>'.
1.18 albertel 1168: #$dimension{$instance.'.criteria.'.$id}.
1169: '</td>'.
1.19 albertel 1170: '<td><nobr>Additional Comment for Student</nobr> <br />'.
1.25 albertel 1171: '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'.
1.18 albertel 1172: '</td>'.
1173: '<td>'.
1.47 albertel 1174: '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label></nobr><br />'.
1.30 albertel 1175: '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'.
1176: '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'.
1177: '<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label><br />'.
1.18 albertel 1178: '</td>'.
1179: '<td>'.
1180: '<a href="#'.$last_link.'">Prev</a><br />'.
1.20 albertel 1181: '<a href="#next_'.$link.'">Next</a><br /><br /><br />'.
1182: '<input type="submit" name="next" value="'.
1183: &mt('Done').'" /> '.
1.30 albertel 1184: '<input type="submit" name="stop" value="'.
1185: &mt('Stop').'" /> '.
1.18 albertel 1186: '</td></tr>';
1.22 albertel 1187: $result.='<tr><td colspan="4">';
1188: my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
1189: my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
1.43 albertel 1190: foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
1.22 albertel 1191: my $file=$file_url.$partial_file;
1192: &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
1.48 albertel 1193: $result.='<nobr><a href="'.$file.'" target="lonGRDs"><img src="'.
1.22 albertel 1194: &Apache::loncommon::icon($file).'" border=0"> '.$file.
1.48 albertel 1195: '</a></nobr> ';
1.22 albertel 1196: }
1197: $result.='</td></tr>';
1.18 albertel 1198: $last_link=$link;
1199: }
1.22 albertel 1200: } elsif ($target eq 'grade' && $env{'form.webgrade'}) {
1.19 albertel 1201: my $optional_passed=0;
1.20 albertel 1202: my $mandatory_failed=0;
1203: my $ungraded=0;
1204: my $review=0;
1.19 albertel 1205: foreach my $id (@{$dimension{$instance.'.criterias'}}) {
1.25 albertel 1206: my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
1207: $Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
1.20 albertel 1208: my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
1209: if ($status eq 'pass') {
1210: if (!$mandatory) { $optional_passed++; }
1211: } elsif ($status eq 'fail') {
1212: if ($mandatory) { $mandatory_failed++; }
1.21 albertel 1213: } elsif ($status eq 'review') {
1214: $review++;
1.20 albertel 1215: } elsif ($status eq 'ungraded') {
1216: $ungraded++;
1.21 albertel 1217: } else {
1.47 albertel 1218: $ungraded++;
1.19 albertel 1219: }
1220: }
1.20 albertel 1221: if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
1222: $mandatory_failed++;
1223: }
1.21 albertel 1224: &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
1.20 albertel 1225: if ($review) {
1.25 albertel 1226: $Apache::lonhomework::results{"resource.$version.$dim.status"}=
1.22 albertel 1227: 'review';
1.20 albertel 1228: } elsif ($ungraded) {
1.25 albertel 1229: $Apache::lonhomework::results{"resource.$version.$dim.status"}=
1.22 albertel 1230: 'ungraded';
1.20 albertel 1231: } elsif ($mandatory_failed) {
1.25 albertel 1232: $Apache::lonhomework::results{"resource.$version.$dim.status"}=
1.22 albertel 1233: 'fail';
1.20 albertel 1234: } else {
1.25 albertel 1235: $Apache::lonhomework::results{"resource.$version.$dim.status"}=
1.22 albertel 1236: 'pass';
1.20 albertel 1237: }
1.13 albertel 1238: }
1.18 albertel 1239: return $result;
1.1 albertel 1240: }
1241: }
1242:
1243: sub start_IntroParagraph {
1244: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1245: my $result;
1.13 albertel 1246: if ($target eq 'web' || $target eq 'webgrade') {
1.47 albertel 1247: if ($tagstack->[-2] eq 'Dimension') {
1248: $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser);
1249:
1250: } elsif ($target eq 'webgrade') {
1251: &Apache::lonxml::get_all_text('/introparagraph',$parser);
1.1 albertel 1252: }
1.47 albertel 1253:
1.1 albertel 1254: }
1255: return $result;
1256: }
1257:
1258: sub end_IntroParagraph {
1259: }
1260:
1261: sub start_Instance {
1262: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1.19 albertel 1263: my $id=&get_id($parstack,$safeeval);
1264: push(@{$dimension{'instances'}},$id);
1265: push(@Apache::bridgetask::instance,$id);
1266: push(@Apache::bridgetask::instancelist,$id);
1.20 albertel 1267: $dimension{$id.'.optionalrequired'}=
1.19 albertel 1268: &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
1.1 albertel 1269: return '';
1270: }
1271:
1272: sub end_Instance {
1273: }
1274:
1275: sub start_InstanceText {
1276: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1.47 albertel 1277: my $instance_id=$Apache::bridgetask::instance[-1];
1278: my $text=&Apache::lonxml::get_all_text('/instancetext',$parser);
1.13 albertel 1279: if ($target eq 'web' || $target eq 'webgrade') {
1.47 albertel 1280: $dimension{$instance_id.'.text'}=$text;
1.1 albertel 1281: }
1282: return '';
1283: }
1284:
1285: sub end_InstanceText {
1286: return '';
1287: }
1288:
1289: sub start_Criteria {
1290: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1.9 albertel 1291: my $instance_id=$Apache::bridgetask::instance[-1];
1.47 albertel 1292: my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser);
1.21 albertel 1293: if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
1.19 albertel 1294: my $id=&get_id($parstack,$safeeval);
1.1 albertel 1295: $dimension{$instance_id.'.criteria.'.$id}=$criteria;
1.19 albertel 1296: $dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=
1297: &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
1.1 albertel 1298: push(@{$dimension{$instance_id.'.criterias'}},$id);
1299: }
1300: return '';
1301: }
1302:
1.47 albertel 1303: sub end_Criteria {
1304: }
1305:
1.4 albertel 1306: sub proctor_validation_screen {
1307: my ($slot) = @_;
1308: my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
1.5 albertel 1309: my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
1.44 albertel 1310: my $name=&Apache::loncommon::plainname($user,$domain);
1311:
1.4 albertel 1312: my $msg;
1.11 albertel 1313: if ($env{'form.proctorpassword'}) {
1.4 albertel 1314: $msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
1315: .'</font></p>';
1316: }
1.47 albertel 1317: if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
1.4 albertel 1318: my $result= (<<ENDCHECKOUT);
1319: <h2>Proctor Validation</h2>
1320: <p>Your room's proctor needs to validate your access to this resource.</p>
1321: $msg
1.11 albertel 1322: <form name="checkout" method="POST" action="$env{'request.uri'}">
1.4 albertel 1323: <input type="hidden" name="validate" value="yes" />
1324: <input type="hidden" name="submitted" value="yes" />
1325: <table>
1.44 albertel 1326: <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>
1.4 albertel 1327: <tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
1.46 albertel 1328: <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>
1.4 albertel 1329: </table>
1330: <input type="submit" name="checkoutbutton" value="Validate" /><br />
1.44 albertel 1331: <table border="1">
1332: <tr><td>
1333: <table>
1334: <tr><td colspan="2">Student who should be logged in is:</td></tr>
1335: <tr><td>Name:</td><td>$name</td></tr>
1.45 albertel 1336: <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>
1.44 albertel 1337: <tr><td>Usename</td><td>$user\@$domain</td></tr>
1338: <tr><td colspan="2"><img src="$url" /></td></tr>
1339: </table>
1340: </tr></td>
1341: </table>
1.4 albertel 1342: </form>
1343: ENDCHECKOUT
1344: return $result;
1345: }
1346:
1.1 albertel 1347: 1;
1348: __END__
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
![[BACK]](/icons/back.gif){kind=icon}
Return to bridgetask.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / homework