--- loncom/homework/bridgetask.pm 2006/11/09 20:20:18 1.198 +++ loncom/homework/bridgetask.pm 2007/01/10 21:46:24 1.216 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.198 2006/11/09 20:20:18 albertel Exp $ +# $Id: bridgetask.pm,v 1.216 2007/01/10 21:46:24 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -98,6 +98,7 @@ sub check_in { &check_in_sequence($user,$domain,$slot_name); } else { &create_new_version($type,$user,$domain,$slot_name); + &Apache::structuretags::finalize_storage($res->symb); } return 1; } @@ -234,36 +235,43 @@ sub add_grading_button { if (scalar(keys(%sections)) < 3) { $size=scalar(keys(%sections))+2; } - my $sec_select = ''."\n"; + $sec_select .= "\t\n"; foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) { - $sec_select .= "\n"; + $sec_select .= "\t\n"; } - $sec_select .= "\n"; + $sec_select .= "\t\n\n"; - my $result=' '; - $result.=''; + $result.="\n\t".''; if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); - $result.=''; - $result.=''; - $result.=''; + $result.="\n\t\t\t".''. + "\n\t\t\t".''; + $result.="\n\t\t\t".''."\n"; + $result.= "\n\t\t\t\t".&mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).''."\n\t\t".''."\n"; ($entries,$ready,$locks)=&get_queue_counts('reviewqueue'); - $result.=''."\n"; - $result.='
Specify a section: '.$sec_select.''.' '."\n\t\t".'
Specify a section: '.$sec_select."\n\t\t\t".''.' '; - $result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).'
'. - ' '. + "\n\t\t\t".''. + "\n\t\t\t\t".' '; $result.=&mt("[_1] entries, [_2] ready, [_3] being graded", - $entries,$ready,$locks).'
'."\n"; - $result.='

'."\n"; - $result.=''; + $entries,$ready,$locks).''."\n\t\t".''."\n"; + $result.="\n\t\t".''. + "\n\t\t\t".''. + "\n\t\t\t\t".' ' + ."\n\t\t".'' + ."\n\t".''."\n"; + $result.="\n\t".'

'. + "\n\t\t".''; + $result.= "\n\t\t".''; $result.=&Apache::loncommon::select_dom_form($env{'user.domain'}, 'gradingdomain'); $result.=' '. @@ -271,7 +279,7 @@ sub add_grading_button { 'gradinguser', 'gradingdomain'); $result.=&Apache::loncommon::studentbrowser_javascript(); - $result.= '

'; + $result.= '

'."\n"; } return $result; } @@ -295,18 +303,19 @@ sub add_request_another_attempt_button { my $description=&Apache::slotrequest::get_description($slot_name, $slot); $result.=(< Will be next available: $description

+

Will be next available: $description

STUFF } if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } $symb=&escape($symb); - $result.='
'. - ''. - ''. + $result.= + "\n\t".''."\n\t\t". + ''."\n\t\t". + ''."\n\t\t". ''. - '
'; + &mt($text).'" />'."\n\t". + ''."\n"; return $result; } @@ -372,6 +381,13 @@ sub nest { } } +sub start_delay { + push(@delay,1); +} +sub end_delay { + pop(@delay); +} + sub nested_parse { my ($str,$env,$args) = @_; my @old_env = @Apache::scripttag::parser_env; @@ -584,7 +600,7 @@ sub start_Task { $result.='
'.&add_grading_button()."
"; + $result.=$uri.'">'.&add_grading_button()."\n"; my $symb=&Apache::lonnet::symbread(); if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { $result.='
'. @@ -683,7 +699,7 @@ sub start_Task { $result.=&preserve_grade_info(); $result.=&internal_location(); - $result.=$form_tag_start. + $result.=$form_tag_start."\t". ''; &Apache::lonxml::startredirection(); } @@ -783,6 +799,9 @@ sub start_Task { if ($target eq 'webgrade') { $result.="\n".'
'; &Apache::lonxml::startredirection(); + &start_delay(); + $dimension{$top}{'result'}=$result; + undef($result); } } elsif ($target eq 'edit') { $result.=$form_tag_start. @@ -1009,7 +1028,12 @@ sub end_Task { if (!$previous && $status ne 'SHOW_ANSWER' && &show_task($status,$previous)) { $result.=&Apache::inputtags::gradestatus('0'); - $result.=''; + } + + $result.=''; + + if (!$previous && $status ne 'SHOW_ANSWER' && + &show_task($status,$previous)) { my $action = &Apache::lonenc::check_encrypt($env{'request.uri'}); $result.=< @@ -1037,27 +1061,31 @@ DONEBUTTON } $start_time=&Apache::lonlocal::locallocaltime($start_time); - my $status = "\n
\n"; + my $status = + "\n
\n\t"; + my $dim = $top; + my %counts = &get_counts($dim,undef,$parstack, + $safeeval); + my $question_status ="\n\t

". + &question_status_message(\%counts,-1). + "

\n"; + if ($bt_status eq 'pass') { $status.='

You passed the '.$title.' given on '. $start_time.'

'; + $status.=$question_status; } if ($bt_status eq 'fail') { $status.='

You did not pass the '.$title.' given on '. $start_time.'

'; + $status.=$question_status; if (!$previous) { $status.=&add_request_another_attempt_button(); } } - $status.='
'; - my $dim = $top; - my %counts = &get_counts($dim,undef,$parstack, - $safeeval); - $status.="\n

". - &question_status_message(\%counts,-1). - "

\n"; + $status.="\n".'
'."\n"; foreach my $id (@{$dimension{$dim}{'criterias'}}) { my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; @@ -1089,7 +1117,8 @@ DONEBUTTON } - if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { + if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous + && $status eq 'CAN_ANSWER') { my $award='SUBMITTED'; &Apache::essayresponse::file_submission("$version.0",'bridgetask', 'portfiles',\$award); @@ -1243,7 +1272,13 @@ DONEBUTTON &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { - $result.=&Apache::lonxml::endredirection(); + if (&nest()) { + &Apache::lonxml::endredirection(); + &end_delay(); + $result.=$dimension{$top}{'result'}; + } else { + $result.=&Apache::lonxml::endredirection(); + } my $dim = $top; foreach my $id (@{$dimension{$dim}{'criterias'}} ) { my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; @@ -1255,7 +1290,12 @@ DONEBUTTON [@_]); $criteria = &layout_webgrade_Criteria($dim,$id,$criteria); my $internal_location=&internal_location($id); - $result=~s/\Q$internal_location\E/$criteria/; + if ($result =~ m/\Q$internal_location\E/) { + $result=~s/\Q$internal_location\E/$criteria/; + } else { + $result.=$criteria; + } + } } $result.="
"; @@ -1539,8 +1579,16 @@ sub show_queue { my $ekey=&escape($key); my ($action,$description,$status)=('select',&mt('Select')); if (exists($queue{"$key\0locked"})) { + my $locker = $queue{"$key\0locked"}; + my $time; + if (ref($queue{"$key\0locked"}) eq 'ARRAY') { + ($locker, $time) = @{$queue{"$key\0locked"}}; + $time = + &Apache::lonnavmaps::timeToHumanString($time, + 'start'); + } my $me=$env{'user.name'}.':'.$env{'user.domain'}; - $status=&mt('Locked by [_1]',$queue{"$key\0locked"}); + $status=&mt('Locked by [_1] [_2]',$locker,$time); if ($me eq $queue{"$key\0locked"}) { ($action,$description)=('resume',&mt('Resume')); } else { @@ -1759,7 +1807,7 @@ sub lock_key { my (undef,$cid)=&Apache::lonnet::whichuser(); my $cnum=$env{'course.'.$cid.'.num'}; my $cdom=$env{'course.'.$cid.'.domain'}; - my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me}, + my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> [$me,time]}, $cdom,$cnum); &Apache::lonxml::debug("success $success $todo"); if ($success eq 'ok') { @@ -2035,7 +2083,7 @@ sub start_Setup { my $dim = &get_id($parstack,$safeeval); push(@Apache::bridgetask::dimension,$dim); &Apache::lonxml::startredirection(); - return &internal_location($dim); + return;# &internal_location($dim); } { @@ -2087,11 +2135,14 @@ sub start_Dimension { $dimension{$top}{'criteria.'.$dim.'.mandatory'}= &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); push(@{$dimension{$top}{'criterias'}},$dim); + $dimension{$dim}{'nested'}=$top; } push(@Apache::bridgetask::dimension,$dim); &Apache::lonxml::startredirection(); - &enable_dimension_parsing($dim); - return &internal_location($dim); + if (!&skip_dimension_parsing($dim)) { + &enable_dimension_parsing($dim); + } + return;# &internal_location($dim); } sub start_QuestionText { @@ -2210,39 +2261,68 @@ sub end_Dimension { if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') { $mandatory='Optional'; } - my $dim_info="
\n"; - my $question = ('sub' x $dimension{$dim}{'depth'}).'question'; - $question =~ s/^(.)/uc($1)/e; + my $dim_info= + "\n
\n\t"; + my $ucquestion = + my $question = + ('sub' x $dimension{$dim}{'depth'}).'question'; + $ucquestion =~ s/^(.)/uc($1)/e; if ($dim_status eq 'pass') { - $dim_info.='

'.$question.' : you passed this '.$mandatory.' question

'; + $dim_info.='

'.$ucquestion.' : you passed the above '.$mandatory.' '.$question.'

'; } if ($dim_status eq 'fail') { - $dim_info.='

'.$question.' : you did not pass this '.$mandatory.' question

'; + $dim_info.='

'.$ucquestion.' : you did not pass the above '.$mandatory.' '.$question.'

'; } my %counts = &get_counts($dim,$instance,$parstack, $safeeval); - $dim_info.="\n

" + $dim_info.="\n\t

" .&question_status_message(\%counts, $dimension{$dim}{'depth'}) - ."

\n
"; + ."

\n
\n"; foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}}, @{$dimension{$dim}{'criterias'}}) { my $type = $dimension{$dim}{'criteria.'.$id.'.type'}; if ($type eq 'dimension') { - $result.=$dimension{$id}{'result'}; - next; + if (defined($dimension{$id}{'result'})) { + $result.=$dimension{$id}{'result'}; + next; + } else { + $dim_info .= + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_],{'set_dim_id' => $id}); + } + } else { + my $criteria = + &nested_parse(\$dimension{$dim}{'criteria.'.$id}, + [@_]); + $dim_info .= &layout_web_Criteria($dim,$id,$criteria); } - my $criteria = - &nested_parse(\$dimension{$dim}{'criteria.'.$id}, - [@_]); - $dim_info .= &layout_web_Criteria($dim,$id,$criteria); } + # puts the results at the end of the dimension + $result .= $dim_info; - my $internal_location=&internal_location($dim); - $result=~s/\Q$internal_location\E/$dim_info/; + # puts the results at the beginning of the dimension + # my $internal_location=&internal_location($dim); + # $result=~s/\Q$internal_location\E/$dim_info/; + } + } + if ($result !~ /^\s*$/s) { + # FIXME? this maybe unneccssary in the future, (CSE101 BT + # from Fall 2006 geenrate a div that attempts to hide some + # of the output in an odd way, this is a workaround so + # those old ones will continue to work. # It puts the + # LC_question div to come after any starting closie div + # that the dimension produces + if ($result =~ m{^\s*}) { + $result =~ s{^(\s*)} + {$1\n
}; + } else { + $result = "\n".'
'. + "\n".$result; } + $result .= "\n
\n"; } } elsif ($target eq 'webgrade') { # in case of any side effects that we need @@ -2266,7 +2346,11 @@ sub end_Dimension { [@_]); $criteria = &layout_webgrade_Criteria($dim,$id,$criteria); my $internal_location=&internal_location($id); - $result=~s/\Q$internal_location\E/$criteria/; + if ($result =~ m/\Q$internal_location\E/) { + $result =~ s/\Q$internal_location\E/$criteria/; + } else { + $result.=$criteria ; + } } } if (&nest()) { @@ -2360,7 +2444,7 @@ sub question_status_message { foreach my $type ('cri','dim') { if ($counts->{$req.'_'.$type}) { push(@sections, - $counts->{$req.'_'.$type.'_passed'}.' of '. + $counts->{$req.'_'.$type.'_passed'}.' of the '. $counts->{$req.'_'.$type}.' '. $req{$req}.' '.$type{$type}); } @@ -2499,11 +2583,12 @@ sub grading_history { $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"'; } if ($entry) { - $result.= "
  • $grader : $entry
  • "; + $result.= "\n\t\t
  • \n\t\t\t$grader :\n\t\t\t $entry \n\t\t
  • "; } } if ($result) { - return ''; + return "\n\t".''."\n"; } return ''; } @@ -2574,12 +2659,12 @@ sub start_Criteria { my $dim = &get_dim_id(); my $id=&get_id($parstack,$safeeval); if ($target eq 'web' || $target eq 'webgrade') { - if ($target eq 'webgrade' && $dim ne 'top') { + if ($target eq 'webgrade') { &Apache::lonxml::debug(" for $dim $id stashing results into $dim "); $dimension{$dim}{'result'} .= &internal_location($id); } else { &Apache::lonxml::debug(" not stashing $dim $id"); - $result .= &internal_location($id); + #$result .= &internal_location($id); } } &Apache::lonxml::debug("Criteria $id with $dim"); @@ -2616,15 +2701,21 @@ sub layout_web_Criteria { my $status_display=$status; $status_display=~s/^([a-z])/uc($1)/e; my $criteria_info.= - '

    ' - .$mandatory.' Criteria

    '; + '

    '."\n\t".'

    ' + .$mandatory.' Criteria

    '."\n\t".'

    ' + ."\n"; + $criteria =~ s/^\s*//s; + $criteria =~ s/\s*$//s; $criteria_info.= $criteria; - $criteria_info.='

    '.$status_display.'

    '; + $criteria_info.="\n\t".'

    '. + "\n\t".'

    '.$status_display.'

    '; if ($comment =~ /\w/) { - $criteria_info.='

    '. - &mt('Comment: [_1]',$comment).'

    '; + $criteria_info.= + "\n\t". + '

    '.&mt('Comment: [_1]',$comment).'

    '; } - $criteria_info.='
    '; + $criteria_info.="\n".'
    '."\n"; + return $criteria_info; } @@ -2633,34 +2724,46 @@ sub layout_webgrade_Criteria { my $link=&link($id); my $version = &get_version(); my $status = &get_criteria('status',$version,$dim,$id); - my $result = - '
    '."\n". - '
    '."\n". - $criteria. - '
    '."\n". - '
    '."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n". - '
    '."\n". - ''."\n". - '
    '."\n". - &grading_history($version,$dim,$id); + my %lt = ( 'ungraded' => 'Ungraded', + 'fail' => 'Fail', + 'pass' => 'Pass', + 'review' => 'Review', + 'comment' => 'Additional Comment for Student', + ); + %lt = &Apache::lonlocal::texthash(%lt); + my $comment = &get_criteria('comment',$version,$dim,$id); + $comment = &HTML::Entities::encode($comment,'<>"&'); + my %checked; + foreach my $which ('ungraded','fail','pass','review') { + if ($status eq $which) { $checked{$which} = 'checked="checked"'; } + } + if (!%checked) { $checked{'ungraded'} = 'checked="checked"'; } + my $buttons; + foreach my $which ('ungraded','fail','pass','review') { + $buttons .= < + + $lt{$which} + +END_BUTTON + } + $criteria =~ s/^\s*//s; + $criteria =~ s/\s*$//s; + my $result = < +
    + $criteria +
    +
    +$buttons +
    + +
    +END_CRITERIA + $result .= &grading_history($version,$dim,$id); return $result; }