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

Diff for /loncom/homework/inputtags.pm between versions 1.93 and 1.109

version 1.93, 2003/04/21 20:59:02 version 1.109, 2003/07/15 21:26:23
Line 33  use strict; Line 33  use strict;
 use Apache::loncommon;  use Apache::loncommon;
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::inputtags',('textfield','textline'));    &Apache::lonxml::register('Apache::inputtags',('hiddenline','textfield','textline'));
 }  }
   
   
Line 52  sub initialize_inputtags { Line 52  sub initialize_inputtags {
   @Apache::inputtags::previous_version=();    @Apache::inputtags::previous_version=();
   # id of current part, 0 means that no part is current (inside <problem> only    # id of current part, 0 means that no part is current (inside <problem> only
   $Apache::inputtags::part='';    $Apache::inputtags::part='';
     # list of all part ids seen
     @Apache::inputtags::partlist=();
   # list of problem date statuses, the first element is for <problem>    # list of problem date statuses, the first element is for <problem>
   # if there is a second element it is for the current <part>    # if there is a second element it is for the current <part>
   @Apache::inputtags::status=();    @Apache::inputtags::status=();
Line 59  sub initialize_inputtags { Line 61  sub initialize_inputtags {
   %Apache::inputtags::params=();    %Apache::inputtags::params=();
   # list of all ids, for <import>, these get join()ed and prepended    # list of all ids, for <import>, these get join()ed and prepended
   @Apache::inputtags::import=();    @Apache::inputtags::import=();
     # list of all import ids seen
     @Apache::inputtags::importlist=();
   }
   
   sub check_for_duplicate_ids {
       my %check;
       foreach my $id (@Apache::inputtags::partlist,
       @Apache::inputtags::responselist,
       @Apache::inputtags::importlist) {
    $check{$id}++;
       }
       my @duplicates;
       foreach my $id (sort(keys(%check))) {
    if ($check{$id} > 1) {
       push(@duplicates,$id);
    }
       }
       if (@duplicates) {
    &Apache::lonxml::error("Duplicated ids found, problem will operate incorrectly. Duplicated ids seen: ",join(', ',@duplicates));
       }
 }  }
   
 sub start_input {  sub start_input {
Line 122  sub start_textfield { Line 144  sub start_textfield {
     } else {      } else {
       $result=$token->[4];        $result=$token->[4];
     }      }
       my $bodytext=&Apache::lonxml::get_all_text("/textfield",$parser);
     $result.=&Apache::edit::modifiedfield();      $result.=&Apache::edit::modifiedfield();
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
         my $number_of_lines = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
         my $width_of_box = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
       if ($$tagstack[-2] eq 'essayresponse' and $Apache::lonhomework::type eq 'exam') {        if ($$tagstack[-2] eq 'essayresponse' and $Apache::lonhomework::type eq 'exam') {
   my $number_of_lines= &Apache::lonxml::get_param('rows',$parstack,$safeeval);  
   $result = '\fbox{\fbox{\parbox{\textwidth-5mm}{';    $result = '\fbox{\fbox{\parbox{\textwidth-5mm}{';
  for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}    for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
  $result.='\strut \\\\\strut \\\\\strut \\\\\strut \\\\}}}';    $result.='\strut \\\\\strut \\\\\strut \\\\\strut \\\\}}}';
         } else {
     my $TeXwidth=$width_of_box/80;
     $result = '\vskip 1 mm \fbox{\fbox{\parbox{'.$TeXwidth.'\textwidth-5mm}{';
     for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
     $result.='}}}\vskip 2 mm ';
       }        }
   }    }
   return $result;    return $result;
Line 154  sub start_textline { Line 183  sub start_textline {
   my $result = "";    my $result = "";
   if ($target eq 'web') {    if ($target eq 'web') {
     $Apache::lonxml::evaluate--;      $Apache::lonxml::evaluate--;
       my $partid=$Apache::inputtags::part;
       my $id=$Apache::inputtags::response[-1];
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {      if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);        my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
       my $maxlength;        my $maxlength;
       if ($size eq '') { $size=20; } else {        if ($size eq '') { $size=20; } else {
  if ($size < 20) { $maxlength=$size; }   if ($size < 20) { $maxlength=$size; }
       }        }
       my $partid=$Apache::inputtags::part;  
       my $id=$Apache::inputtags::response[-1];  
       my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});        my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
       if ($Apache::lonhomework::type ne 'exam') {        if ($Apache::lonhomework::type ne 'exam') {
         $result= '<input type="text" name="HWVAL_'.$id.'" value="'.          $result= '<input type="text" name="HWVAL_'.$id.'" value="'.
Line 194  sub end_textline { Line 223  sub end_textline {
   return "";    return "";
 }  }
   
   sub start_hiddenline {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result = "";
       if ($target eq 'web') {
    $Apache::lonxml::evaluate--;
    if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       my $partid=$Apache::inputtags::part;
       my $id=$Apache::inputtags::response[-1];
       my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
       if ($Apache::lonhomework::type ne 'exam') {
    $result= '<input type="hidden" name="HWVAL_'.$id.'" value="'.
       $oldresponse.'" />';
       }
    }
       } elsif ($target eq 'edit') {
    $result=&Apache::edit::tag_start($target,$token);
    $result.=&Apache::edit::end_table;
       }
       return $result;
   }
   
   sub end_hiddenline {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     if    ($target eq 'web') { $Apache::lonxml::evaluate++; }
     elsif ($target eq 'edit') { return ('','no'); }
     return "";
   }
   
 sub finalizeawards {  sub finalizeawards {
   my $result='';    my $result='';
   my $award;    my $award;
Line 217  sub finalizeawards { Line 274  sub finalizeawards {
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'NO_RESPONSE') {$result='NO_RESPONSE'; last;} }      foreach $award (@_) { if ($award eq 'NO_RESPONSE') {$result='NO_RESPONSE'; last;} }
   }    }
     if ($result eq '' ) {
       foreach $award (@_) { if ($award eq 'TOO_LONG') {$result='TOO_LONG'; last;}}
     }
   if ($result eq '' ) {    if ($result eq '' ) {
     foreach $award (@_) {       foreach $award (@_) { 
       if ($award eq 'UNIT_FAIL' ||        if ($award eq 'UNIT_FAIL' ||
Line 266  sub decideoutput { Line 325  sub decideoutput {
   my $message='';    my $message='';
   my $button=0;    my $button=0;
   my $previousmsg;    my $previousmsg;
     my $bgcolor='orange';
     my %possiblecolors =
         ( 'correct' => '#aaffaa',
    'charged_try' => '#ffaaaa',
    'not_charged_try' => '#ffffaa',
    'no_message' => '#fffff',
         );
   if ($previous) { $previousmsg='You have entered that answer before'; }    if ($previous) { $previousmsg='You have entered that answer before'; }
   
   if      ($solved =~ /^correct/) {    if      ($solved =~ /^correct/) {
Line 278  sub decideoutput { Line 343  sub decideoutput {
   } else {    } else {
       $message = "<b>You are correct.</b>";        $message = "<b>You are correct.</b>";
   }    }
   $message=' Your receipt is '.&Apache::lonnet::receipt;            unless ($ENV{'course.'.
      $ENV{'request.course.id'}.
      '.disable_receipt_display'} eq 'yes') { 
         $message.='<br />Your receipt is '.&Apache::lonnet::receipt().
     &Apache::loncommon::help_open_topic('Receipt');
     }
       }        }
         $bgcolor=$possiblecolors{'correct'};
       $button=0;        $button=0;
       $previousmsg='';        $previousmsg='';
   } elsif ($solved =~ /^excused/) {    } elsif ($solved =~ /^excused/) {
       $message = "<b>You are excused from the problem.</b>";        $message = "<b>You are excused from the problem.</b>";
         $bgcolor=$possiblecolors{'charged_try'};
       $button=0;        $button=0;
       $previousmsg='';        $previousmsg='';
   } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {    } elsif ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS' ) {
       if ($solved =~ /^incorrect/ || $solved eq '') {        if ($solved =~ /^incorrect/ || $solved eq '') {
   $message = "Incorrect";    $message = "Incorrect";
     $bgcolor=$possiblecolors{'charged_try'};
   $button=1;    $button=1;
       } else {        } else {
   $message = "<b>You are correct.</b> Your receipt is ".    $message = "<b>You are correct.</b>";
    &Apache::lonnet::receipt;            unless ($ENV{'course.'.
      $ENV{'request.course.id'}.
      '.disable_receipt_display'} eq 'yes') { 
                 $message.='<br />Your receipt is '.&Apache::lonnet::receipt().
     &Apache::loncommon::help_open_topic('Receipt');
     }
     $bgcolor=$possiblecolors{'correct'};
   $button=0;    $button=0;
   $previousmsg='';    $previousmsg='';
       }        }
   } elsif ($award eq 'NO_RESPONSE') {    } elsif ($award eq 'NO_RESPONSE') {
       $message = '';        $message = '';
         $bgcolor=$possiblecolors{'no_feedback'};
       $button=1;        $button=1;
   } elsif ($award eq 'MISSING_ANSWER') {    } elsif ($award eq 'MISSING_ANSWER') {
       $message = 'Some parts were not submitted';        $message = 'Some parts were not submitted';
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button = 1;        $button = 1;
     } elsif ($award eq 'ERROR') {
         $message = 'An error occured while grading your answer.';
         $bgcolor=$possiblecolors{'not_charged_try'};
         $button = 1;
     } elsif ($award eq 'TOO_LONG') {
         $message = "The submitted answer was too long.";
         $bgcolor=$possiblecolors{'not_charged_try'};
         $button=1;
   } elsif ($award eq 'WANTED_NUMERIC') {    } elsif ($award eq 'WANTED_NUMERIC') {
       $message = "This question expects a numeric answer";        $message = "This question expects a numeric answer";
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'MISORDERED_RANK') {    } elsif ($award eq 'MISORDERED_RANK') {
       $message = 'You have provided an invalid ranking, please refer to '.        $message = 'You have provided an invalid ranking, please refer to '.
        &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';    &Apache::loncommon::help_open_topic('Ranking_Problems','help on ranking problems').'.';
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'INVALID_FILETYPE') {    } elsif ($award eq 'INVALID_FILETYPE') {
       $message = 'The filetype extension of the file you uploaded is not allowed.';        $message = 'The filetype extension of the file you uploaded is not allowed.';
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'SIG_FAIL') {    } elsif ($award eq 'SIG_FAIL') {
       $message = "Please adjust significant figures.";# you provided %s significant figures";        $message = "Please adjust significant figures.";# you provided %s significant figures";
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'UNIT_FAIL') {    } elsif ($award eq 'UNIT_FAIL') {
       $message = "Units incorrect. ".        $message = "Units incorrect. ".
        &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s";         &Apache::loncommon::help_open_topic('Physical_Units'); #Computer reads units as %s";
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'UNIT_NOTNEEDED') {    } elsif ($award eq 'UNIT_NOTNEEDED') {
       $message = "Only a number required.";# Computer reads units of %s";        $message = "Only a number required.";# Computer reads units of %s";
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'NO_UNIT') {    } elsif ($award eq 'NO_UNIT') {
       $message = "Units required".        $message = "Units required".
        &Apache::loncommon::help_open_topic('Physical_Units');    &Apache::loncommon::help_open_topic('Physical_Units');
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'BAD_FORMULA') {    } elsif ($award eq 'BAD_FORMULA') {
       $message = "Unable to understand formula";        $message = "Unable to understand formula";
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'INCORRECT') {    } elsif ($award eq 'INCORRECT') {
       $message = "Incorrect";        $message = "Incorrect";
         $bgcolor=$possiblecolors{'charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'SUBMITTED') {    } elsif ($award eq 'SUBMITTED') {
       $message = "Your submission has been recorded.";        $message = "Your submission has been recorded.";
         $bgcolor=$possiblecolors{'correct'};
       $button=1;        $button=1;
   } elsif ($award eq 'DRAFT') {    } elsif ($award eq 'DRAFT') {
       $message = "A draft copy has been saved.";        $message = "A draft copy has been saved.";
         $bgcolor=$possiblecolors{'not_charged_try'};
       $button=1;        $button=1;
   } elsif ($award eq 'ASSIGNED_SCORE') {    } elsif ($award eq 'ASSIGNED_SCORE') {
       $message = "A score has been assigned.";        $message = "A score has been assigned.";
         $bgcolor=$possiblecolors{'correct'};
       $button=0;        $button=0;
   } else {    } else {
       $message = "Unknown message: $award";        $message = "Unknown message: $award";
       $button=1;        $button=1;
   }     }
   if (lc($Apache::lonhomework::problemstatus) ne 'yes') {    if (lc($Apache::lonhomework::problemstatus) eq 'no') {
       $message = "Answer Submitted";        $message = "Answer Submitted";
         $bgcolor=$possiblecolors{'correct'};
       $button=1;        $button=1;
   }    }
   return ($button,$message,$previousmsg);    return ($button,$bgcolor,$message,$previousmsg);
 }  }
   
 sub removealldata {  sub removealldata {
Line 370  sub setgradedata { Line 472  sub setgradedata {
     $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;      $Apache::lonhomework::results{"resource.$id.afterduedate"}=$award;
     return '';      return '';
   } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~    } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} !~
        /^correct/ || $Apache::lonhomework::scantronmode) {         /^correct/ || $Apache::lonhomework::scantronmode ||
       lc($Apache::lonhomework::problemstatus) eq 'no') {
     #handle assignment of tries and solved status      #handle assignment of tries and solved status
     my $solvemsg;      my $solvemsg;
     if ($Apache::lonhomework::scantronmode) {      if ($Apache::lonhomework::scantronmode) {
Line 386  sub setgradedata { Line 489  sub setgradedata {
     $Apache::lonhomework::history{"resource.$id.tries"} + 1;      $Apache::lonhomework::history{"resource.$id.tries"} + 1;
  $Apache::lonhomework::results{"resource.$id.solved"} =   $Apache::lonhomework::results{"resource.$id.solved"} =
     $solvemsg;      $solvemsg;
  my $numawards=scalar(@Apache::inputtags::responselist);   my $numawards=scalar(@Apache::inputtags::response);
  &Apache::lonxml::debug("Whaaa!");  
  $Apache::lonhomework::results{"resource.$id.awarded"} = 0;   $Apache::lonhomework::results{"resource.$id.awarded"} = 0;
  foreach my $res (@Apache::inputtags::responselist) {   foreach my $res (@Apache::inputtags::response) {
     $Apache::lonhomework::results{"resource.$id.awarded"}+=      $Apache::lonhomework::results{"resource.$id.awarded"}+=
        $Apache::lonhomework::results{"resource.$id.$res.awarded"};         $Apache::lonhomework::results{"resource.$id.$res.awarded"};
  }   }
Line 422  sub setgradedata { Line 524  sub setgradedata {
     } else {      } else {
       $Apache::lonhomework::results{"resource.$id.solved"} =        $Apache::lonhomework::results{"resource.$id.solved"} =
  'incorrect_attempted';   'incorrect_attempted';
         if (lc($Apache::lonhomework::problemstatus) eq 'no') {
     $Apache::lonhomework::results{"resource.$id.tries"} =
         $Apache::lonhomework::history{"resource.$id.tries"} + 1;
         }
     }      }
   
     # check if this was a previous submission if it was delete the      # check if this was a previous submission if it was delete the
     # unneeded data and update the previously_used attribute      # unneeded data and update the previously_used attribute
     if ( $previously_used eq 'PREVIOUSLY_USED') {      if ( $previously_used eq 'PREVIOUSLY_USED') {
       delete($Apache::lonhomework::results{"resource.$id.tries"});   if (lc($Apache::lonhomework::problemstatus) ne 'no') {
       $Apache::lonhomework::results{"resource.$id.previous"} = '1';      delete($Apache::lonhomework::results{"resource.$id.tries"});
       $Apache::lonhomework::results{"resource.$id.previous"} = '1';
    }
     } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {      } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
       #delete all data as they student didn't do anything, but save        #delete all data as they student didn't do anything, but save
       #the list of collaborators.        #the list of collaborators.
Line 454  sub grade { Line 562  sub grade {
   my $response='';    my $response='';
   if ( defined $ENV{'form.submitted'}) {    if ( defined $ENV{'form.submitted'}) {
     my @awards = ();      my @awards = ();
     foreach $response (@Apache::inputtags::responselist) {      foreach $response (@Apache::inputtags::response) {
       &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");        &Apache::lonxml::debug("looking for response.$id.$response.awarddetail");
       my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};        my $value=$Apache::lonhomework::results{"resource.$id.$response.awarddetail"};
       &Apache::lonxml::debug("keeping $value from $response for $id");        &Apache::lonxml::debug("keeping $value from $response for $id");
Line 490  sub grade { Line 598  sub grade {
 sub gradestatus {  sub gradestatus {
   my ($id,$target) = @_;    my ($id,$target) = @_;
   my $showbutton = 1;    my $showbutton = 1;
     my $bgcolor = '';
   my $message = '';    my $message = '';
   my $latemessage = '';    my $latemessage = '';
   my $trystr='';    my $trystr='';
Line 505  sub gradestatus { Line 614  sub gradestatus {
     &Apache::lonxml::debug("Found Award |$award|$solved|");      &Apache::lonxml::debug("Found Award |$award|$solved|");
     if ( $award ne '' ) {      if ( $award ne '' ) {
       &Apache::lonxml::debug('Getting message');        &Apache::lonxml::debug('Getting message');
       ($showbutton,$message,$previousmsg) =        ($showbutton,$bgcolor,$message,$previousmsg) =
  &decideoutput($award,$solved,$previous,$target);   &decideoutput($award,$solved,$previous,$target);
       if ($target eq 'tex') {        if ($target eq 'tex') {
  $message=' '.$message.' ';   $message=' '.$message.' ';
       } else {        } else {
  $message="<td bgcolor=\"#aaffaa\">$message</td>";   $message="<td bgcolor=\"$bgcolor\">$message</td>";
  if ($previousmsg) {   if ($previousmsg) {
   $previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>";    $previousmsg="<td bgcolor=\"#aaaaff\">$previousmsg</td>";
  }   }
       }        }
     }      }
Line 524  sub gradestatus { Line 633  sub gradestatus {
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }       if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
     if ( $showbutton ) {      if ( $showbutton ) {
       if ($target eq 'tex') {        if ($target eq 'tex') {
   if ($ENV{'request.state'} ne "construct") {    if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') {
       $trystr = ' {\small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 0 mm ';        $trystr = ' {\vskip 1 mm \small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
   } else {    } else {
       $trystr = '\vskip 0 mm ';        $trystr = '\vskip 0 mm ';
   }    }
Removed from v.1.93  
changed lines
  Added in v.1.109

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