Annotation of loncom/homework/bridgetask.pm, revision 1.38
1.1 albertel 1: # The LearningOnline Network with CAPA
2: # definition of tags that give a structure to a document
3: #
1.38 ! albertel 4: # $Id: bridgetask.pm,v 1.37 2005/06/04 08:17:06 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.32 albertel 150: if ( 1) {
151: #need a permissions for limitng this to 'powerful users'
1.34 albertel 152:
153: my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
154: $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);
155:
156: $result.=' <input type="submit" name="reviewagrading" value="'.
157: &mt("Select an entry from the grading queue").'" /> </p>'."\n";
158:
159: ($entries,$ready,$locks)=&get_queue_counts('reviewqueue');
160: $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 161: $result.=' <input type="submit" name="reviewasubmission" value="'.
1.34 albertel 162: &mt("Select an entry from the review queue").'" /> </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();
! 228: $body_tag_start.='<form method="POST" action="/adm/slotrequest">'.
! 229: '<input type="hidden" name="symb" value="'.$symb.'" />'.
! 230: '<input type="hidden" name="command" value="showslots" />'.
! 231: '<input type="submit" name="requestattempt" value="'.
! 232: &mt('Show Slot list').'" />'.
! 233: '</form>';
! 234:
1.13 albertel 235: }
1.8 albertel 236: }
1.21 albertel 237: if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
1.1 albertel 238: $target eq 'tex') {
1.29 albertel 239: my ($version,$previous)=&get_version();
1.14 albertel 240: ($status,$accessmsg,my $slot_name,$slot) =
1.4 albertel 241: &Apache::lonhomework::check_task_access('0');
1.9 albertel 242: push(@Apache::inputtags::status,$status);
1.14 albertel 243: $Apache::inputtags::slot_name=$slot_name;
1.1 albertel 244: my $expression='$external::datestatus="'.$status.'";';
1.23 albertel 245: $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';
1.1 albertel 246: &Apache::run::run($expression,$safeeval);
247: &Apache::lonxml::debug("Got $status");
1.25 albertel 248: $body_tag_start.=&add_previous_version_button($status);
1.29 albertel 249: if (!$previous && (
250: ( $status eq 'CLOSED' ) ||
251: ( $status eq 'BANNED') ||
252: ( $status eq 'UNAVAILABLE') ||
253: ( $status eq 'NOT_IN_A_SLOT') ||
254: ( $status eq 'NEEDS_CHECKIN') ||
255: ( $status eq 'WAITING_FOR_GRADE') ||
256: ( $status eq 'INVALID_ACCESS') )) {
1.1 albertel 257: my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
258: if ( $target eq "web" ) {
1.4 albertel 259: $result.= $head_tag_start.'</head>'.$body_tag_start;
260: my $msg;
1.1 albertel 261: if ($status eq 'UNAVAILABLE') {
262: $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
1.3 albertel 263: } elsif ($status eq 'NOT_IN_A_SLOT') {
264: $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
1.38 ! albertel 265: $msg.=&add_request_another_attempt_button("Sign up for time to work.");
1.4 albertel 266: } elsif ($status eq 'NEEDS_CHECKIN') {
267: $msg.='<h1>'.&mt('You need the Proctor to validate you.').
268: '</h1>'.&proctor_validation_screen($slot);
1.22 albertel 269: } elsif ($status eq 'WAITING_FOR_GRADE') {
270: $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
1.1 albertel 271: } elsif ($status ne 'NOT_YET_VIEWED') {
272: $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
273: }
274: if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
275: $msg.='The problem '.$accessmsg;
276: }
277: $result.=$msg.'<br />';
278: } elsif ($target eq 'tex') {
279: $result.='\begin{document}\noindent \vskip 1 mm \begin{minipage}{\textwidth}\vskip 0 mm';
280: if ($status eq 'UNAVAILABLE') {
281: $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
282: } else {
283: $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
284: }
1.22 albertel 285: } elsif ($target eq 'grade' && !$env{'form.webgrade'}) {
1.4 albertel 286: if ($status eq 'NEEDS_CHECKIN') {
1.22 albertel 287: if (&proctor_check_auth($slot_name,$slot)) {
1.4 albertel 288: #FIXME immeadiatly add this to the grading queue
289: # with slot->{'endtime'} for when grading can
290: # begin on this resource
1.22 albertel 291: # FIXME I think the above is done by default,
292: # need to check that
293: # failure doesn't do this.
1.4 albertel 294: }
295: }
1.1 albertel 296: }
297: } elsif ($target eq 'web') {
298: my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval);
299: $result.="$head_tag_start<title>$name</title></head>
1.36 albertel 300: $body_tag_start \n";
301:
1.29 albertel 302: my ($version,$previous)=&get_version();
1.25 albertel 303: if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
1.22 albertel 304: $result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>';
1.29 albertel 305: if (!$previous) {
306: $result.=&add_request_another_attempt_button();
307: }
1.22 albertel 308: }
1.25 albertel 309: if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') {
1.22 albertel 310: $result.='<h1><font color="green">'.&mt('Passed').'</font></h1>';
311: }
1.36 albertel 312: $result.=$form_tag_start.
313: '<input type="hidden" name="submitted" value="yes" />';
314: $result.=&preserve_grade_info();
315:
1.1 albertel 316: }
1.21 albertel 317: } elsif ( ($target eq 'grade' && $env{'form.webgrade'}) ||
318: $target eq 'webgrade') {
1.32 albertel 319: my $webgrade='yes';
1.21 albertel 320: if ($target eq 'webgrade') {
1.32 albertel 321: $result.=$head_tag_start.$body_tag_start;
1.31 albertel 322: $result.='<br />Review'.&show_queue('reviewqueue');
1.33 albertel 323: $result.='<br />Grade'.&show_queue('gradingqueue');
1.30 albertel 324: }
1.33 albertel 325: # FIXME Blast! still need to reorg this, need to reshow the
326: # queue being reviewed once done with the grade pass...
327: # Hrrm, vaildation pass should perhaps say 'not_locked'
328: # perhaps do a search if there is a key that is mine and if
329: # there isn't reshow the queue....
330: my ($todo,$status_code)=&get_key_todo($target);
331:
332: &Apache::lonnet::logthis("got todo -$todo- stat -$status_code-");
333: if ($todo) {
334: &setup_env_for_other_user($todo,$safeeval);
335: my ($symb,$uname,$udom)=&decode_queue_key($todo);
336: $result.="\n".'<table><tr><td>Found '.
337: &Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
338: $form_tag_start.=
339: '<input type="hidden" name="gradingkey" value="'.
340: &Apache::lonnet::escape($todo).'" />';
341: $Apache::bridgetask::queue_key=$todo;
342: &Apache::structuretags::initialize_storage();
343: &Apache::lonhomework::showhash(%Apache::lonhomework::history);
344: if ($target eq 'webgrade') {
345: $result.='<br />After -'.&show_queue($env{'form.queue'});
346: $result.="\n".'<table width="100%" style="width:100%" border="1">';
347: if ($status_code eq 'selected') {
348: $form_tag_start.=
349: '<input type="hidden" name="queuemode" value="selected" />';
350: }
351: }
1.15 albertel 352: } else {
1.33 albertel 353: if ($target eq 'webgrade') {
354: $result.="\n";
355: if ($status_code eq 'stop') {
356: $result.='<b>'.&mt("Stopped grading.").'</b>';
357: } elsif ($status_code eq 'lock_failed') {
358: $result.='<b>'.&mt("Failed to lock the request record.").'</b>';
359: } elsif ($status_code eq 'unlock') {
360: $result.='<b>'.&mt("Unlocked the requested record.").'</b>';
361: $result.=&show_queue($env{'form.queue'},1);
362: } elsif ($status_code eq 'show_list') {
363: $result.=&show_queue($env{'form.queue'},1);
364: } else {
365: $result.='<b>'.&mt("No user to be graded.").'</b>';
1.32 albertel 366: }
1.21 albertel 367: }
1.33 albertel 368: $webgrade='no';
369: my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
1.32 albertel 370: }
371: if ($target eq 'webgrade' && defined($env{'form.queue'})) {
372: $result.=$form_tag_start;
373: $result.='<input type="hidden" name="webgrade" value="'.
374: $webgrade.'" />';
375: $result.='<input type="hidden" name="queue" value="'.
376: $env{'form.queue'}.'" />';
1.15 albertel 377: }
1.1 albertel 378: } else {
379: # page_start returned a starting result, delete it if we don't need it
380: $result = '';
381: }
382: return $result;
383: }
384:
1.32 albertel 385: sub get_key_todo {
386: my ($target)=@_;
387: my $todo;
1.33 albertel 388:
389: if (defined($env{'form.reviewasubmission'})) {
390: &Apache::lonnet::logthis("review a submission....");
391: $env{'form.queue'}='reviewqueue';
392: return (undef,'show_list');
393: }
394:
395: if (defined($env{'form.reviewagrading'})) {
396: &Apache::lonxml::debug("review a grading....");
397: $env{'form.queue'}='gradingqueue';
398: return (undef,'show_list');
399: }
400:
1.32 albertel 401: my $queue=$env{'form.queue'};
1.33 albertel 402:
1.32 albertel 403: if (!defined($queue)) {
404: $env{'form.queue'}=$queue='gradingqueue';
405: }
1.33 albertel 406:
1.32 albertel 407: my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});
1.33 albertel 408:
1.32 albertel 409: if (defined($env{'form.queue'}) && defined($env{'form.gradingkey'})
1.33 albertel 410: && !defined($env{'form.gradingaction'})
411: && $env{'form.queuemode'} eq 'selected') {
412:
413: my $who=&queue_key_locked($queue,$gradingkey);
414: my $me=$env{'user.name'}.'@'.$env{'user.domain'};
415: if ($who eq $me) {
416: &Apache::lonxml::debug("Found a key was given to me");
417: return ($gradingkey,'selected');
418: } else {
419: return (undef,'show_list');
420: }
421:
422: }
423:
424: if ($target eq 'webgrade' && $env{'form.queuemode'} eq 'selected') {
425: if ($env{'form.gradingaction'} eq 'resume') {
426: delete($env{'form.gradingaction'});
427: &Apache::lonxml::debug("Resuming a key");
1.32 albertel 428: return ($gradingkey);
1.33 albertel 429: } elsif ($env{'form.gradingaction'} eq 'unlock') {
430: &Apache::lonxml::debug("Unlocking a key ".
431: &check_queue_unlock($queue,$gradingkey,1));
432: return (undef,'unlock');
433: } elsif ($env{'form.gradingaction'} eq 'select') {
434: &Apache::lonxml::debug("Locking a key");
435: if (&lock_key($queue,$gradingkey)) {
436: &Apache::lonxml::debug("Success $queue");
437: return ($gradingkey);
438: }
439: &Apache::lonxml::debug("Failed $queue");
440: return (undef,'lock_failed');
1.32 albertel 441: }
442: }
1.33 albertel 443:
444: if ($env{'form.queuemode'} ne 'selected') {
445: # don't get something new from the queue if they hit the stop button
446: if (!($env{'form.stop'} && $target eq 'webgrade')
447: && !$env{'form.gradingaction'}) {
448: &Apache::lonxml::debug("Getting anew $queue");
449: return (&get_from_queue($queue));
450: } else {
451: return (undef,'stop');
452: }
1.32 albertel 453: }
1.33 albertel 454: return (undef,undef)
1.32 albertel 455: }
456:
1.1 albertel 457: sub end_Task {
458: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
459: my $result='';
460: my $status=$Apache::inputtags::status['-1'];
1.29 albertel 461: my ($version,$previous)=&get_version();
1.1 albertel 462: if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
1.15 albertel 463: $target eq 'tex') {
1.1 albertel 464: if (
1.11 albertel 465: (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
1.1 albertel 466: ($target eq 'answer') || ($target eq 'tex')
467: ) {
468: if ($target eq 'web') {
1.29 albertel 469: if ($status eq 'CAN_ANSWER' && !$previous) {
1.15 albertel 470: $result.="\n".'<table border="1">'.
1.28 albertel 471: &Apache::inputtags::file_selector("$version.0",
472: "bridgetask","*",
1.9 albertel 473: 'portfolioonly').
474: "</table>";
475: $result.=&Apache::inputtags::gradestatus('0');
476: }
1.13 albertel 477: }
478: if ($target eq 'web' || $target eq 'webgrade') {
1.1 albertel 479: $result.=&Apache::lonxml::xmlend().'</html>';
480: }
481: }
1.29 albertel 482: if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
1.12 albertel 483: my $award='SUBMITTED';
1.28 albertel 484: &Apache::essayresponse::file_submission("$version.0",'bridgetask',
1.20 albertel 485: 'portfiles',\$award);
1.14 albertel 486: if ($award eq 'SUBMITTED' &&
1.28 albertel 487: $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}) {
488: $Apache::lonhomework::results{"resource.0.tries"}=
489: $Apache::lonhomework::results{"resource.$version.0.tries"}=
490: 1+$Apache::lonhomework::history{"resource.$version.0.tries"};
491:
492: $Apache::lonhomework::results{"resource.0.award"}=
493: $Apache::lonhomework::results{"resource.$version.0.award"}=
494: $award;
1.10 albertel 495: }
1.4 albertel 496: &Apache::lonhomework::showhash(%Apache::lonhomework::results);
497: &Apache::structuretags::finalize_storage();
1.14 albertel 498: if ($award eq 'SUBMITTED') {
1.31 albertel 499: &add_to_queue('gradingqueue',$Apache::inputtags::slot_name);
1.14 albertel 500: }
1.1 albertel 501: }
1.32 albertel 502: if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') {
1.20 albertel 503: my $optional_required=
504: &Apache::lonxml::get_param('OptionalRequired',$parstack,
505: $safeeval);
506: my $optional_passed=0;
507: my $mandatory_failed=0;
508: my $ungraded=0;
509: my $review=0;
1.21 albertel 510: &Apache::lonhomework::showhash(%Apache::lonhomework::results);
1.20 albertel 511: foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
512: my $status=
1.25 albertel 513: $Apache::lonhomework::results{"resource.$version.$dim_id.status"};
1.20 albertel 514: my $mandatory=
515: ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
516: if ($status eq 'pass') {
517: if (!$mandatory) { $optional_passed++; }
518: } elsif ($status eq 'fail') {
519: if ($mandatory) { $mandatory_failed++; }
520: } elsif ($status eq 'ungraded') {
521: $ungraded++;
522: } elsif ($status eq 'review') {
523: $review++;
524: }
525: }
526: if ($optional_passed < $optional_required) {
527: $mandatory_failed++;
528: }
1.21 albertel 529: &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
530: $Apache::lonhomework::results{'resource.grader'}=
1.20 albertel 531: $env{'user.name'}.'@'.$env{'user.domain'};
532: if ($review) {
1.25 albertel 533: $Apache::lonhomework::results{"resource.$version.status"}='review';
1.33 albertel 534: if ($env{'form.queue'} eq 'reviewqueue') {
535: &check_queue_unlock($env{'form.queue'});
536: &Apache::lonxml::debug(" still needs review not changing status.");
537: } else {
538: &move_between_queues('gradingqueue','reviewqueue');
539: }
1.20 albertel 540: } elsif ($ungraded) {
1.25 albertel 541: $Apache::lonhomework::results{"resource.$version.status"}='ungraded';
1.32 albertel 542: # FIXME if in review queue need to move back to grading queue
1.33 albertel 543: if ($env{'form.queue'} eq 'reviewqueue') {
544: &Apache::lonxml::debug("moving back.");
545: &move_between_queues('reviewqueue','gradingqueue');
546: } else {
547: &check_queue_unlock($env{'form.queue'});
548: }
1.20 albertel 549: } elsif ($mandatory_failed) {
1.25 albertel 550: $Apache::lonhomework::results{"resource.$version.status"}='fail';
551: $Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';
552: $Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';
553: $Apache::lonhomework::results{"resource.$version.0.awarded"}='0';
1.32 albertel 554: &remove_from_queue($env{'form.queue'});
1.20 albertel 555: } else {
1.25 albertel 556: $Apache::lonhomework::results{"resource.$version.status"}='pass';
557: $Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
558: $Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';
559: $Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
1.32 albertel 560: &remove_from_queue($env{'form.queue'});
1.20 albertel 561: }
1.26 albertel 562: $Apache::lonhomework::results{"resource.status"}=
563: $Apache::lonhomework::results{"resource.$version.status"};
1.28 albertel 564: if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) {
1.26 albertel 565: $Apache::lonhomework::results{"resource.0.award"}=
566: $Apache::lonhomework::results{"resource.$version.award"};
567: $Apache::lonhomework::results{"resource.0.awarded"}=
568: $Apache::lonhomework::results{"resource.$version.awarded"};
569: $Apache::lonhomework::results{"resource.0.solved"}=
570: $Apache::lonhomework::results{"resource.$version.solved"};
1.25 albertel 571: }
1.21 albertel 572: &Apache::structuretags::finalize_storage();
1.20 albertel 573: }
1.15 albertel 574: } elsif ($target eq 'webgrade') {
1.18 albertel 575: $result.="</table>\n<hr />";
1.20 albertel 576: #$result.='<input type="submit" name="next" value="'.
577: # &mt('Save & Next').'" /> ';
578: #$result.='<input type="submit" name="end" value="'.
579: # &mt('Save & Stop Grading').'" /> ';
580: #$result.='<input type="submit" name="throwaway" value="'.
581: # &mt('Throw Away & Stop Grading').'" /> ';
582: #$result.='<input type="submit" name="save" value="'.
583: # &mt('Save Partial Grade and Continue Grading').'" /> ';
1.15 albertel 584: $result.='</form>'.&Apache::loncommon::endbodytag().'</html>';
1.1 albertel 585: } elsif ($target eq 'meta') {
1.2 albertel 586: $result.='<parameter part="0" package="Task"></parameter>'."\n";
1.1 albertel 587: #$result.=&Apache::response::meta_part_order();
588: #$result.=&Apache::response::meta_response_order();
589: }
1.4 albertel 590: undef($Apache::lonhomework::parsing_a_task);
1.1 albertel 591: return $result;
592: }
593:
1.31 albertel 594: sub move_between_queues {
595: my ($src_queue,$dest_queue)=@_;
596: my $cur_data=&get_queue_data($src_queue);
597: if (!$cur_data) { return 'not_exist'; }
598: my $result=&add_to_queue($dest_queue,$cur_data->[0]);
599: if ($result ne 'ok') {
600: return $result;
601: }
602: &check_queue_unlock($src_queue);
603: return &remove_from_queue($src_queue);
1.21 albertel 604: }
605:
606: sub check_queue_unlock {
1.32 albertel 607: my ($queue,$key,$allow_not_me)=@_;
1.30 albertel 608: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
1.32 albertel 609: if (!defined($key)) {
610: $key="$symb\0queue\0$uname\@$udom";
611: }
1.30 albertel 612: my $cnum=$env{'course.'.$cid.'.num'};
613: my $cdom=$env{'course.'.$cid.'.domain'};
614: my $me=$env{'user.name'}.'@'.$env{'user.domain'};
615: my $who=&queue_key_locked($queue,$key,$cdom,$cnum);
616: if ($who eq $me) {
1.32 albertel 617: return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
618: } elsif ($allow_not_me) {
1.33 albertel 619: &Apache::lonxml::debug("unlocking $who by $me");
1.32 albertel 620: return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
1.30 albertel 621: }
1.32 albertel 622: return 'not_owner';
1.21 albertel 623: }
624:
625: sub remove_from_queue {
1.30 albertel 626: my ($queue)=@_;
1.27 albertel 627: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
628: my $cnum=$env{'course.'.$cid.'.num'};
629: my $cdom=$env{'course.'.$cid.'.domain'};
630: my $key="$symb\0queue\0$uname\@$udom";
631: my @keys=($key,"$key\0locked");
1.31 albertel 632: return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);
1.21 albertel 633: }
634:
1.16 albertel 635: sub setup_env_for_other_user {
636: my ($queue_key,$safeeval)=@_;
637: my ($symb,$uname,$udom)=&decode_queue_key($queue_key);
1.30 albertel 638: &Apache::lonxml::debug("setup_env for $queue_key");
1.16 albertel 639: $env{'form.grade_symb'}=$symb;
640: $env{'form.grade_domain'}=$udom;
641: $env{'form.grade_username'}=$uname;
642: $env{'form.grade_courseid'}=$env{'request.course.id'};
643: &Apache::lonxml::initialize_rndseed($safeeval);
644: }
645:
1.31 albertel 646: sub get_queue_data {
647: my ($queue)=@_;
648: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
649: my $cnum=$env{'course.'.$cid.'.num'};
650: my $cdom=$env{'course.'.$cid.'.domain'};
651: my $todo="$symb\0queue\0$uname\@$udom";
652: my ($key,$value)=&Apache::lonnet::get($queue,[$todo],$cdom,$cnum);
653: if ($key eq $todo && ref($value)) {
654: return $value;
655: }
656: return undef;
657: }
658:
1.14 albertel 659: sub add_to_queue {
1.31 albertel 660: my ($queue,$slot_name)=@_;
1.14 albertel 661: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
662: my $cnum=$env{'course.'.$cid.'.num'};
663: my $cdom=$env{'course.'.$cid.'.domain'};
664: my %data;
1.31 albertel 665: $data{"$symb\0queue\0$uname\@$udom"}=[$slot_name];
666: return &Apache::lonnet::put($queue,\%data,$cdom,$cnum);
1.14 albertel 667: }
668:
669: sub show_queue {
1.32 albertel 670: my ($queue,$with_selects)=@_;
1.14 albertel 671: my $result;
672: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
673: my $cnum=$env{'course.'.$cid.'.num'};
674: my $cdom=$env{'course.'.$cid.'.domain'};
1.16 albertel 675: my $regexp="^$symb\0";
1.30 albertel 676: my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
1.31 albertel 677: my ($tmp)=%queue;
678: if ($tmp=~/^error: 2 /) {
1.33 albertel 679: return "\n<h3>Current Queue - $queue</h3><table border='1'><tr><td>Empty</td></tr></table>";
1.31 albertel 680: }
1.33 albertel 681: $result.="\n<h3>Current Queue - $queue </h3><table border='1'><tr>";
1.32 albertel 682: if ($with_selects) { $result.="<th></th>"; }
683: $result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";
1.14 albertel 684: foreach my $key (sort(keys(%queue))) {
1.32 albertel 685: if ($key=~/locked$/ && !$with_selects) {
1.16 albertel 686: my ($symb,$uname,$udom) = &decode_queue_key($key);
687: my $title=&Apache::lonnet::gettitle($symb);
1.27 albertel 688: $result.="<tr><td>$title</td><td>$uname</td>";
1.16 albertel 689: $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
1.32 albertel 690: } elsif ($key=~/timestamp$/ && !$with_selects) {
1.16 albertel 691: my ($symb,undef) = split("\0",$key);
692: my $title=&Apache::lonnet::gettitle($symb);
1.27 albertel 693: $result.="<tr><td>$title</td><td></td>";
1.16 albertel 694: $result.='<td>last queue modification time</td><td>'.
695: &Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
1.32 albertel 696: } elsif ($key!~/(timestamp|locked)$/) {
1.16 albertel 697: my ($symb,$uname,$udom) = &decode_queue_key($key);
698: my $title=&Apache::lonnet::gettitle($symb);
1.32 albertel 699: $result.="<tr>";
1.35 albertel 700: my $slot=$queue{$key}->[0];
701: my %slot_data=&Apache::lonnet::get_slot($slot);
1.32 albertel 702: if ($with_selects) {
703: my $ekey=&Apache::lonnet::escape($key);
704: my ($action,$description)=('select',&mt('Select'));
705: if (exists($queue{"$key\0locked"})) {
706: my $me=$env{'user.name'}.'@'.$env{'user.domain'};
707: if ($me eq $queue{"$key\0locked"}) {
708: ($action,$description)=('resume',&mt('Resume'));
709: } else {
710: ($action,$description)=('unlock',&mt('Unlock'));
711: }
712: }
1.35 albertel 713: if (time > $slot_data{'endtime'}) {
714: $result.=(<<FORM);
1.32 albertel 715: <td>
716: <form method="POST">
717: <input type="hidden" name="gradingkey" value="$ekey" />
718: <input type="hidden" name="queue" value="$queue" />
719: <input type="hidden" name="gradingaction" value="$action" />
720: <input type="hidden" name="webgrade" value="no" />
1.33 albertel 721: <input type="hidden" name="queuemode" value="selected" />
1.32 albertel 722: <input type="submit" name="submit" value="$description" />
723: </form>
724: </td>
725: FORM
1.35 albertel 726:
727: } else {
728: $result.='<td>'.&mt("In Progress").'</td>'
729: }
1.32 albertel 730: }
731: $result.="<td>$title</td><td>$uname</td>";
1.27 albertel 732: $result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '.
1.20 albertel 733: &Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
734: "</td></tr>";
1.16 albertel 735: }
1.14 albertel 736: }
1.15 albertel 737: $result.="</table><hr />\n";
1.14 albertel 738: return $result;
739: }
740:
1.34 albertel 741: sub get_queue_counts {
742: my ($queue)=@_;
743: my $result;
744: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
745: my $cnum=$env{'course.'.$cid.'.num'};
746: my $cdom=$env{'course.'.$cid.'.domain'};
747: my $regexp="^$symb\0";
748: my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
749: my ($tmp)=%queue;
750: if ($tmp=~/^error: 2 /) {
751: return (0,0,0);
752: }
753: my ($entries,$ready_to_grade,$locks)=(0,0,0);
754: foreach my $key (sort(keys(%queue))) {
755: if ($key=~/locked$/) {
756: $locks++;
757: } elsif ($key=~/timestamp$/) {
758: #ignore
759: } elsif ($key!~/(timestamp|locked)$/) {
760: my ($symb,$uname,$udom) = &decode_queue_key($key);
761: $entries++;
762: my $slot=$queue{$key}->[0];
763: my %slot_data=&Apache::lonnet::get_slot($slot);
764: if (time > $slot_data{'endtime'}) {
765: $ready_to_grade++;
766: }
767: }
768: }
769: return ($entries,$ready_to_grade,$locks);
770: }
771:
1.14 albertel 772: sub decode_queue_key {
773: my ($key)=@_;
774: my ($symb,undef,$user) = split("\0",$key);
775: my ($uname,$udom) = split('@',$user);
776: return ($symb,$uname,$udom);
777: }
778:
779: sub queue_key_locked {
1.30 albertel 780: my ($queue,$key,$cdom,$cnum)=@_;
1.33 albertel 781: if (!defined($cdom) || !defined($cnum)) {
782: my (undef,$cid)=&Apache::lonxml::whichuser();
783: $cnum=$env{'course.'.$cid.'.num'};
784: $cdom=$env{'course.'.$cid.'.domain'};
785: }
1.14 albertel 786: my ($key_locked,$value)=
1.30 albertel 787: &Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum);
1.14 albertel 788: if ($key_locked eq "$key\0locked") {
789: return $value;
790: }
791: return undef;
792: }
793:
794: sub pick_from_queue_data {
1.30 albertel 795: my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
796: foreach my $key (keys(%$queuedata)) {
1.14 albertel 797: my ($symb,$uname,$udom)=&decode_queue_key($key);
798: if ($check_section) {
799: my $section=&Apache::lonnet::getsection($uname,$udom);
1.17 albertel 800: if ($section eq $check_section) {
1.33 albertel 801: &Apache::lonxml::debug("my sec");
1.15 albertel 802: next;
803: }
1.14 albertel 804: }
1.30 albertel 805: my $slot=$queuedata->{$key}[0];
1.14 albertel 806: my %slot_data=&Apache::lonnet::get_slot($slot);
1.15 albertel 807: if ($slot_data{'endtime'} > time) {
1.33 albertel 808: &Apache::lonxml::debug("not time");
1.15 albertel 809: next;
810: }
1.30 albertel 811: if (&queue_key_locked($queue,$key,$cdom,$cnum)) {
1.33 albertel 812: &Apache::lonxml::debug("someone already has um.");
1.15 albertel 813: next;
814: }
1.14 albertel 815: return $key;
816: }
817: return undef;
818: }
819:
1.15 albertel 820: sub find_mid_grade {
1.30 albertel 821: my ($queue,$symb,$cdom,$cnum)=@_;
1.16 albertel 822: my $todo=&Apache::lonnet::unescape($env{'form.gradingkey'});
1.15 albertel 823: my $me=$env{'user.name'}.'@'.$env{'user.domain'};
824: if ($todo) {
1.30 albertel 825: my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
1.15 albertel 826: if ($who eq $me) { return $todo; }
827: }
828: my $regexp="^$symb\0.*\0locked\$";
1.30 albertel 829: my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
1.15 albertel 830: foreach my $key (keys(%locks)) {
831: my $who=$locks{$key};
832: if ($who eq $me) {
833: $todo=$key;
834: $todo=~s/\0locked$//;
835: return $todo;
836: }
837: }
838: return undef;
839: }
840:
1.32 albertel 841: sub lock_key {
842: my ($queue,$todo)=@_;
843: my $me=$env{'user.name'}.'@'.$env{'user.domain'};
844: my (undef,$cid)=&Apache::lonxml::whichuser();
845: my $cnum=$env{'course.'.$cid.'.num'};
846: my $cdom=$env{'course.'.$cid.'.domain'};
847: my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},
848: $cdom,$cnum);
1.33 albertel 849: &Apache::lonxml::debug("success $success $todo");
1.32 albertel 850: if ($success eq 'ok') {
851: return 1;
852: }
853: return 0;
854: }
855:
1.14 albertel 856: sub get_from_queue {
1.30 albertel 857: my ($queue)=@_;
1.14 albertel 858: my $result;
859: my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
860: my $cnum=$env{'course.'.$cid.'.num'};
861: my $cdom=$env{'course.'.$cid.'.domain'};
1.32 albertel 862: my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);
1.33 albertel 863: &Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo)));
1.16 albertel 864: if ($todo) { return $todo; }
1.14 albertel 865: while (1) {
866: my $starttime=time;
1.30 albertel 867: &Apache::lonnet::put($queue,{"$symb\0timestamp"=>$starttime},
1.14 albertel 868: $cdom,$cnum);
1.33 albertel 869: &Apache::lonxml::debug("$starttime");
1.14 albertel 870: my $regexp="^$symb\0queue\0";
1.30 albertel 871: my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
1.33 albertel 872: #make a pass looking for a user _not_ in my section
1.14 albertel 873: if ($env{'request.course.sec'}) {
1.33 albertel 874: &Apache::lonxml::debug("sce");
1.30 albertel 875: $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
876: \%queue,$cdom,$cnum);
1.33 albertel 877: &Apache::lonxml::debug("sce $todo");
1.14 albertel 878: }
1.33 albertel 879: # no one _not_ in our section so look for any user that is
880: # ready for grading
1.14 albertel 881: if (!$todo) {
1.33 albertel 882: &Apache::lonxml::debug("no sce");
1.31 albertel 883: $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
884: \%queue,$cdom,$cnum);
1.33 albertel 885: &Apache::lonxml::debug("no sce $todo");
1.14 albertel 886: }
887: # no user to grade
888: if (!$todo) { last; }
1.33 albertel 889: &Apache::lonxml::debug("got $todo");
1.14 albertel 890: # otherwise found someone so lets try to lock them
1.32 albertel 891: # unless someone else already picked them
892: if (!&lock_key($queue,$todo)) { next; }
1.14 albertel 893: my (undef,$endtime)=
1.30 albertel 894: &Apache::lonnet::get($queue,["$symb\0timestamp"],
1.14 albertel 895: $cdom,$cnum);
1.33 albertel 896: &Apache::lonxml::debug("emd $endtime");
1.14 albertel 897: # someone else already modified the queue,
898: # perhaps our picked user wass already fully graded between
899: # when we picked him and when we locked his record? so lets
900: # double check.
901: if ($endtime != $starttime) {
902: my ($key,$value)=
1.30 albertel 903: &Apache::lonnet::get($queue,["$todo"],
1.14 albertel 904: $cdom,$cnum);
1.33 albertel 905: &Apache::lonxml::debug("check $key .. $value");
1.14 albertel 906: if ($key eq $todo && ref($value)) {
907: } else {
1.30 albertel 908: &Apache::lonnet::del($queue,["$todo\0locked"],
1.14 albertel 909: $cdom,$cnum);
1.33 albertel 910: &Apache::lonxml::debug("del");
1.14 albertel 911: next;
912: }
913: }
1.33 albertel 914: &Apache::lonxml::debug("last $todo");
1.14 albertel 915: last;
916: }
917: return $todo;
918: }
919:
1.1 albertel 920: sub start_ClosingParagraph {
921: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
922: my $result;
923: if ($target eq 'web') {
1.13 albertel 924: } elsif ($target eq 'webgrade') {
925: &Apache::lonxml::startredirection();
1.1 albertel 926: }
927: return $result;
928: }
929:
930: sub end_ClosingParagraph {
931: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
932: my $result;
933: if ($target eq 'web') {
1.13 albertel 934: } elsif ($target eq 'webgrade') {
935: &Apache::lonxml::endredirection();
1.1 albertel 936: }
937: return $result;
938: }
939:
1.19 albertel 940: sub get_id {
941: my ($parstack,$safeeval)=@_;
942: my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval);
943: if (!$id) { $id=$Apache::lonxml::curdepth; }
944: return $id;
945: }
946:
1.1 albertel 947: my %dimension;
948: sub start_Dimension {
949: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
950: undef(%dimension);
1.19 albertel 951: my $dim_id=&get_id($parstack,$safeeval);
1.9 albertel 952: $Apache::bridgetask::dimension=$dim_id;
953: push(@Apache::bridgetask::dimensionlist,$dim_id);
954: undef(@Apache::bridgetask::instance);
1.20 albertel 955: $Apache::bridgetask::dimensionmandatory{$dim_id}=
956: &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
1.1 albertel 957: return '';
958: }
959:
1.13 albertel 960: sub get_instance {
961: &Apache::response::pushrandomnumber();
962: my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
1.29 albertel 963: my $num=@order;
964: my $version=&get_version();
965: my $which=($version-1)%$num;
966: return $order[$which];
1.13 albertel 967: }
968:
1.18 albertel 969: {
970: my $last_link;
971: sub end_Dimension {
972: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
973: my $result;
1.25 albertel 974: my $dim=&get_id($parstack,$safeeval);
1.19 albertel 975: my $instance=&get_instance();
1.25 albertel 976: my $version=&get_version();
1.18 albertel 977: if ($target eq 'web') {
978: $result=$dimension{'intro'}.$dimension{$instance.'.text'};
1.26 albertel 979: if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||
980: $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
1.22 albertel 981: foreach my $id (@{$dimension{$instance.'.criterias'}}) {
1.25 albertel 982: my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
983: my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
1.22 albertel 984: $result.='<table border="1"><tr><td>';
985: if ($status eq 'fail') {
986: $result.='<font color="red">'.&mt('Did not pass').'</font>';
987: } elsif ($status eq 'pass') {
988: $result.='<font color="green">'.&mt('Passed').'</font>';
989: } else {
990: &Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status");
991: }
992: $result.='</td></tr><tr><td>';
1.25 albertel 993: if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
994: $result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</td></tr><tr><td>';
1.22 albertel 995: }
996: $result.=$dimension{$instance.'.criteria.'.$id}.
997: '</td></tr></table>';
998: }
999: }
1.18 albertel 1000: } elsif ($target eq 'webgrade') {
1001: foreach my $id (@{$dimension{$instance.'.criterias'}}) {
1002: my $link='criteria_'.$instance.'_'.$id;
1.25 albertel 1003: my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
1.19 albertel 1004: $result.='<tr><td width="100%" valign="top">'.
1.18 albertel 1005: '<a name="'.$link.'" />'.
1006: '<a name="next_'.$last_link.'" />'.
1007: '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">'.$dimension{$instance.'.criteria.'.$id}.'</textarea>'.
1008: #$dimension{$instance.'.criteria.'.$id}.
1009: '</td>'.
1.19 albertel 1010: '<td><nobr>Additional Comment for Student</nobr> <br />'.
1.25 albertel 1011: '<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 1012: '</td>'.
1013: '<td>'.
1.30 albertel 1014: '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>'.&mt('Ungraded').'</label></nobr><br />'.
1015: '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'.
1016: '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'.
1017: '<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label><br />'.
1.18 albertel 1018: '</td>'.
1019: '<td>'.
1020: '<a href="#'.$last_link.'">Prev</a><br />'.
1.20 albertel 1021: '<a href="#next_'.$link.'">Next</a><br /><br /><br />'.
1022: '<input type="submit" name="next" value="'.
1023: &mt('Done').'" /> '.
1.30 albertel 1024: '<input type="submit" name="stop" value="'.
1025: &mt('Stop').'" /> '.
1.18 albertel 1026: '</td></tr>';
1.22 albertel 1027: $result.='<tr><td colspan="4">';
1028: my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
1029: my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
1.23 albertel 1030: foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.bridgetask.portfiles"})) {
1.22 albertel 1031: my $file=$file_url.$partial_file;
1032: &Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
1033: $result.='<a href="'.$file.'" target="lonGRDs"><img src="'.
1034: &Apache::loncommon::icon($file).'" border=0"> '.$file.
1035: '</a>';
1036: }
1037: $result.='</td></tr>';
1.18 albertel 1038: $last_link=$link;
1039: }
1.22 albertel 1040: } elsif ($target eq 'grade' && $env{'form.webgrade'}) {
1.19 albertel 1041: my $optional_passed=0;
1.20 albertel 1042: my $mandatory_failed=0;
1043: my $ungraded=0;
1044: my $review=0;
1.19 albertel 1045: foreach my $id (@{$dimension{$instance.'.criterias'}}) {
1.25 albertel 1046: my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
1047: $Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
1.20 albertel 1048: my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
1049: if ($status eq 'pass') {
1050: if (!$mandatory) { $optional_passed++; }
1051: } elsif ($status eq 'fail') {
1052: if ($mandatory) { $mandatory_failed++; }
1.21 albertel 1053: } elsif ($status eq 'review') {
1054: $review++;
1.20 albertel 1055: } elsif ($status eq 'ungraded') {
1056: $ungraded++;
1.21 albertel 1057: } else {
1.22 albertel 1058: &Apache::lonxml::error("got weird status --$status--");
1.19 albertel 1059: }
1060: }
1.20 albertel 1061: if ($optional_passed < $dimension{$instance.'.optionalrequired'}) {
1062: $mandatory_failed++;
1063: }
1.21 albertel 1064: &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 1065: if ($review) {
1.25 albertel 1066: $Apache::lonhomework::results{"resource.$version.$dim.status"}=
1.22 albertel 1067: 'review';
1.20 albertel 1068: } elsif ($ungraded) {
1.25 albertel 1069: $Apache::lonhomework::results{"resource.$version.$dim.status"}=
1.22 albertel 1070: 'ungraded';
1.20 albertel 1071: } elsif ($mandatory_failed) {
1.25 albertel 1072: $Apache::lonhomework::results{"resource.$version.$dim.status"}=
1.22 albertel 1073: 'fail';
1.20 albertel 1074: } else {
1.25 albertel 1075: $Apache::lonhomework::results{"resource.$version.$dim.status"}=
1.22 albertel 1076: 'pass';
1.20 albertel 1077: }
1.13 albertel 1078: }
1.18 albertel 1079: return $result;
1.1 albertel 1080: }
1081: }
1082:
1083: sub start_IntroParagraph {
1084: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1085: my $result;
1.13 albertel 1086: if ($target eq 'web' || $target eq 'webgrade') {
1087: if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') {
1.1 albertel 1088: &Apache::lonxml::startredirection();
1089: }
1090: }
1091: return $result;
1092: }
1093:
1094: sub end_IntroParagraph {
1095: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1096: my $result;
1.13 albertel 1097: if ($target eq 'web' || $target eq 'webgrade') {
1098: if ($tagstack->[-2] eq 'Dimension' || $target eq 'webgrade') {
1.1 albertel 1099: $dimension{'intro'}=&Apache::lonxml::endredirection();
1100: }
1101: }
1102: return $result;
1103: }
1104:
1105: sub start_Instance {
1106: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1.19 albertel 1107: my $id=&get_id($parstack,$safeeval);
1108: push(@{$dimension{'instances'}},$id);
1109: push(@Apache::bridgetask::instance,$id);
1110: push(@Apache::bridgetask::instancelist,$id);
1.20 albertel 1111: $dimension{$id.'.optionalrequired'}=
1.19 albertel 1112: &Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
1.1 albertel 1113: return '';
1114: }
1115:
1116: sub end_Instance {
1117: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1118: return '';
1119: }
1120:
1121: sub start_InstanceText {
1122: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1.13 albertel 1123: if ($target eq 'web' || $target eq 'webgrade') {
1.1 albertel 1124: &Apache::lonxml::startredirection();
1125: }
1126: return '';
1127: }
1128:
1129: sub end_InstanceText {
1130: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1.9 albertel 1131: my $instance_id=$Apache::bridgetask::instance[-1];
1.13 albertel 1132: if ($target eq 'web' || $target eq 'webgrade') {
1.1 albertel 1133: $dimension{$instance_id.'.text'}=&Apache::lonxml::endredirection();
1134: }
1135: return '';
1136: }
1137:
1138: sub start_Criteria {
1139: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1.21 albertel 1140: if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
1.1 albertel 1141: &Apache::lonxml::startredirection();
1142: }
1143: return '';
1144: }
1145:
1146: sub end_Criteria {
1147: my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
1.9 albertel 1148: my $instance_id=$Apache::bridgetask::instance[-1];
1.21 albertel 1149: if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
1.1 albertel 1150: my $criteria=&Apache::lonxml::endredirection();
1.19 albertel 1151: my $id=&get_id($parstack,$safeeval);
1.1 albertel 1152: $dimension{$instance_id.'.criteria.'.$id}=$criteria;
1.19 albertel 1153: $dimension{$instance_id.'.criteria.'.$id.'.mandatory'}=
1154: &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
1.1 albertel 1155: push(@{$dimension{$instance_id.'.criterias'}},$id);
1156: }
1157: return '';
1158: }
1159:
1.4 albertel 1160: sub proctor_validation_screen {
1161: my ($slot) = @_;
1162: my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
1.5 albertel 1163: my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
1.11 albertel 1164: $user=$env{'form.proctorname'};
1165: if ($env{'form.proctordomain'}) { $domain=$env{'form.proctordomain'}; }
1.4 albertel 1166: my $msg;
1.11 albertel 1167: if ($env{'form.proctorpassword'}) {
1.4 albertel 1168: $msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
1169: .'</font></p>';
1170: }
1171: my $result= (<<ENDCHECKOUT);
1172: <h2>Proctor Validation</h2>
1173: <p>Your room's proctor needs to validate your access to this resource.</p>
1174: $msg
1.11 albertel 1175: <form name="checkout" method="POST" action="$env{'request.uri'}">
1.4 albertel 1176: <input type="hidden" name="validate" value="yes" />
1177: <input type="hidden" name="submitted" value="yes" />
1178: <table>
1179: <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$user" /></td></tr>
1180: <tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
1.6 albertel 1181: <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$domain" /></td></tr>
1.4 albertel 1182: </table>
1183: <input type="submit" name="checkoutbutton" value="Validate" /><br />
1184: Student who should be logged in is:<br />
1.5 albertel 1185: <img src="$url" /><br />
1.4 albertel 1186: </form>
1187: ENDCHECKOUT
1188: return $result;
1189: }
1190:
1.1 albertel 1191: 1;
1192: __END__
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>