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

Diff for /loncom/homework/inputtags.pm between versions 1.54 and 1.70

version 1.54, 2002/03/08 19:55:00 version 1.70, 2002/10/28 19:19:19
Line 28 Line 28
 # 2/19 Guy   # 2/19 Guy 
   
 package Apache::inputtags;  package Apache::inputtags;
   use HTML::Entities();
 use strict;  use strict;
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::inputtags',('textfield','textline','datasubmission'));    &Apache::lonxml::register('Apache::inputtags',('textfield','textline'));
 }  }
   
   
Line 75  sub start_textfield { Line 76  sub start_textfield {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";    my $result = "";
   my $id = &start_input($parstack,$safeeval);    my $id = &start_input($parstack,$safeeval);
     my $resid=$Apache::inputtags::response[-1];
   if ($target eq 'web') {    if ($target eq 'web') {
     my $oldresponse = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};      $Apache::lonxml::evaluate--;
     my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);  
     if ( $cols eq '') { $cols = 80; }  
     my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);  
     if ( $rows eq '') { $rows = 10; }  
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {      if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       $result= '<textarea name="HWVAL'.$Apache::inputtags::response['-1'].'" '.   my $partid=$Apache::inputtags::part;
  "rows=\"$rows\" cols=\"$cols\">".$oldresponse;   my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"});
    my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
    if ( $cols eq '') { $cols = 80; }
    my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
    if ( $rows eq '') { $rows = 10; }
    $result= '<textarea name="HWVAL'.$resid.'" '.
       "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
    if ($oldresponse ne '') {
       #get rid of any startup text if the user has already responded
       &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
    }
     } else {      } else {
       $result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';   #right or wrong don't show it
     }   #$result='<table border="1"><tr><td><i>'.$oldresponse.'</i></td></tr></table>';
     if ($oldresponse ne '') {   $result='';
       #get rid of any startup text if the user has already responded   #get rid of any startup text
       &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);   &Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
     }      }
   }    } elsif ($target eq 'grade') {
   if ($target eq 'grade') {  
     my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);      my $seedtext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
     if ($seedtext eq $ENV{'form.HWVAL'.$Apache::inputtags::response[-1]}) {      if ($seedtext eq $ENV{'form.HWVAL'.$resid}) {
       # if the seed text is still there it wasn't a real submission        # if the seed text is still there it wasn't a real submission
       $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}='';        $ENV{'form.HWVAL'.$resid}='';
     }      }
     } elsif ($target eq 'edit') {
       $result.=&Apache::edit::tag_start($target,$token);
       $result.=&Apache::edit::text_arg('Rows:','rows',$token,4);
       $result.=&Apache::edit::text_arg('Columns:','cols',$token,4);
       my $bodytext=&Apache::lonxml::get_all_text("/textfield",$$parser[-1]);
       $result.=&Apache::edit::editfield($token->[1],$bodytext,'Text you want to appear by default:',80,2);
     } elsif ($target eq 'modified') {
       my $constructtag=&Apache::edit::get_new_args($token,$parstack,
    $safeeval,'rows','cols');
       if ($constructtag) {
         $result = &Apache::edit::rebuild_tag($token);
       } else {
         $result=$token->[4];
       }
       $result.=&Apache::edit::modifiedfield();
   }    }
   return $result;    return $result;
 }  }
   
 sub end_textfield {  sub end_textfield {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
   if ($target eq 'web') {    if ($target eq 'web') {
       $Apache::lonxml::evaluate++;
     if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {      if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
       return "</textarea>";        return "</textarea>";
     }      }
     } elsif ($target eq 'edit') {
       $result=&Apache::edit::end_table();
   }    }
   &end_input;    &end_input;
   return '';    return $result;
 }  }
   
 sub start_textline {  sub start_textline {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result = "";    my $result = "";
   if ($target eq 'web') {    if ($target eq 'web') {
     my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);      $Apache::lonxml::evaluate--;
     if ($size eq '') { $size=20; }  
     my $partid=$Apache::inputtags::part;  
     my $id=$Apache::inputtags::response['-1'];  
     my $oldresponse =   
       $Apache::lonhomework::history{"resource.$partid.$id.submission"};  
     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);
         if ($size eq '') { $size=20; }
         my $partid=$Apache::inputtags::part;
         my $id=$Apache::inputtags::response[-1];
         my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
       $result= '<input type="text" name="HWVAL'.$id.'" value="'.        $result= '<input type="text" name="HWVAL'.$id.'" value="'.
  $oldresponse.'" size="'.$size.'" />';   $oldresponse.'" size="'.$size.'" />';
     } else {      } else {
       $result='<i>'.$oldresponse.'</i>';        #right or wrong don't show what was last typed in.
         #$result='<i>'.$oldresponse.'</i>';
         $result='';
     }      }
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token);      $result=&Apache::edit::tag_start($target,$token);
Line 142  sub start_textline { Line 170  sub start_textline {
   
 sub end_textline {  sub end_textline {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'edit') { return ('','no'); }    if    ($target eq 'web') { $Apache::lonxml::evaluate++; }
     elsif ($target eq 'edit') { return ('','no'); }
   return "";    return "";
 }  }
   
 sub start_datasubmission {  
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;  
   my $id = &Apache::response::start_response($parstack,$safeeval);  
   my $result;  
   if ($target eq 'meta') {  
     $result = &Apache::response::meta_stores_write($token->[2]->{'name'},  
    $token->[2]->{'type'},  
    $token->[2]->{'display'});  
     $result .= &Apache::response::meta_package_write('datasubmission');  
   }  
   return $result;  
 }  
   
 sub end_datasubmission {  
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;  
   my $result;  
   if ( $target eq 'web' ) {  
   } elsif ($target eq 'grade' ) {  
     if ( defined $ENV{'form.submitted'}) {  
       &Apache::response::setup_params('datasubmission');  
       my $partid = $Apache::inputtags::part;  
       my $id = $Apache::inputtags::response['-1'];  
       my $response = $ENV{'form.HWVAL'.$id};  
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);  
       if ( $response =~ /[^\s]/) {  
  $Apache::lonhomework::results{"resource.$partid.$id.$name"}=  
   $response;  
       }  
     }  
   }  
   &Apache::response::end_response;  
   return $result;  
 }  
   
 sub finalizeawards {  sub finalizeawards {
   my $result='';    my $result='';
   my $award;    my $award;
Line 195  sub finalizeawards { Line 190  sub finalizeawards {
     if ($blankcount == ($#_ + 1)) { $result = 'NO_RESPONSE'; }      if ($blankcount == ($#_ + 1)) { $result = 'NO_RESPONSE'; }
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
       foreach $award (@_) { if ($award eq 'MISSING_ANSWER') {$result='MISSING_ANSWER'; last;}}
     }
     if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}      foreach $award (@_) { if ($award eq 'ERROR') {$result='ERROR'; last;}}
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
Line 223  sub finalizeawards { Line 221  sub finalizeawards {
     foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'INCORRECT') {$result=$award; last;} }
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
       foreach $award (@_) { if ($award eq 'DRAFT') {$result=$award; last;} }
     }
     if ($result eq '' ) {
     foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }      foreach $award (@_) { if ($award eq 'SUBMITTED') {$result=$award; last;} }
   }    }
   if ($result eq '' ) {    if ($result eq '' ) {
Line 233  sub finalizeawards { Line 234  sub finalizeawards {
 }  }
   
 sub decideoutput {  sub decideoutput {
   my ($award,$solved,$previous)=@_;    my ($award,$solved,$previous,$target)=@_;
   my $message='';    my $message='';
   my $button=0;    my $button=0;
   my $previousmsg;    my $previousmsg;
Line 241  sub decideoutput { Line 242  sub decideoutput {
   if ($previous) { $previousmsg='You have entered that answer before'; }    if ($previous) { $previousmsg='You have entered that answer before'; }
   
   if      ($solved =~ /^correct/) {    if      ($solved =~ /^correct/) {
     $message = "<b>You are correct.</b> Your receipt is ".      if ($target eq 'tex') {
         $message = '\textbf{You are correct}. Your receipt is '.
         &Apache::lonnet::receipt;
       } else {
         $message = "<b>You are correct.</b> Your receipt is ".
       &Apache::lonnet::receipt;        &Apache::lonnet::receipt;
       }
     $button=0;      $button=0;
     $previousmsg='';      $previousmsg='';
   } elsif ($solved =~ /^excused/) {    } elsif ($solved =~ /^excused/) {
Line 289  sub decideoutput { Line 295  sub decideoutput {
   } elsif ($award eq 'SUBMITTED') {    } elsif ($award eq 'SUBMITTED') {
     $message = "Your submission has been recorded.";      $message = "Your submission has been recorded.";
     $button=1;      $button=1;
     } elsif ($award eq 'DRAFT') {
       $message = "A draft copy has been saved.";
       $button=1;
   } else {    } else {
     $message = "Unknown message: $award";      $message = "Unknown message: $award";
     $button=1;      $button=1;
Line 318  sub setgradedata { Line 327  sub setgradedata {
       $Apache::lonhomework::results{"resource.$id.tries"} =        $Apache::lonhomework::results{"resource.$id.tries"} =
  $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"} =
  'incorrect_attempted';   'incorrect_attempted'
     } elsif ( $award eq 'SUBMITTED' ) {      } elsif ( $award eq 'SUBMITTED' ) {
       $Apache::lonhomework::results{"resource.$id.tries"} =        $Apache::lonhomework::results{"resource.$id.tries"} =
  $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"} =
  'ungraded_attempted';   'ungraded_attempted';
       } elsif ( $award eq 'DRAFT' ) {
         $Apache::lonhomework::results{"resource.$id.solved"} = '';
     } elsif ( $award eq 'NO_RESPONSE' ) {      } elsif ( $award eq 'NO_RESPONSE' ) {
       return '';        return '';
     } else {      } else {
Line 337  sub setgradedata { Line 348  sub setgradedata {
       delete($Apache::lonhomework::results{"resource.$id.tries"});        delete($Apache::lonhomework::results{"resource.$id.tries"});
       $Apache::lonhomework::results{"resource.$id.previous"} = '1';        $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        #delete all data as they student didn't do anything, but save
         #the list of collaborators.
       foreach my $key (keys(%Apache::lonhomework::results)) {        foreach my $key (keys(%Apache::lonhomework::results)) {
  if ($key =~ /^resource\.$id\./) {   if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) {
   &Apache::lonxml::debug("Removing $key");    &Apache::lonxml::debug("Removing $key");
   delete($Apache::lonhomework::results{$key});    delete($Apache::lonhomework::results{$key});
  }   }
       }        }
       #and since they didn't do anything we were never here        #and since they didn't do anything we were never here
Line 383  sub grade { Line 395  sub grade {
 }  }
   
 sub gradestatus {  sub gradestatus {
   my ($id) = @_;    my ($id,$target) = @_;
   my $showbutton = 1;    my $showbutton = 1;
   my $message = '';    my $message = '';
   my $latemessage = '';    my $latemessage = '';
Line 401  sub gradestatus { Line 413  sub gradestatus {
     if ( $award ne '' ) {      if ( $award ne '' ) {
       &Apache::lonxml::debug('Getting message');        &Apache::lonxml::debug('Getting message');
       ($showbutton,$message,$previousmsg) =        ($showbutton,$message,$previousmsg) =
  &decideoutput($award,$solved,$previous);   &decideoutput($award,$solved,$previous,$target);
       $message="<td bgcolor=\"#aaffaa\">$message</td>";        if ($target eq 'tex') {
       if ($previousmsg) {   $message=' '.$message.' ';
  $previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>";        } else {
    $message="<td bgcolor=\"#aaffaa\">$message</td>";
    if ($previousmsg) {
     $previousmsg="<td bgcolor=\"#ffaaaa\">$previousmsg</td>";
    }
       }        }
     }      }
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};      my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
Line 414  sub gradestatus { Line 430  sub gradestatus {
     if ( $maxtries eq '' ) { $maxtries = '2'; }       if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }       if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
     if ( $showbutton ) {      if ( $showbutton ) {
       $trystr = "<td>Tries $tries/$maxtries</td>";        if ($target eq 'tex') {
     if ($ENV{'request.state'} ne "construct") {
         $trystr = ' {\small \textit{Tries} '.$tries.'/'.$maxtries.'} \vskip 0 mm ';
     }
         } else {
            $trystr = "<td>Tries $tries/$maxtries</td>";
         }
     }      }
     if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}      if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $showbutton ) {       if ( $showbutton ) { 
       $button = '<br /><input type="submit" name="submit" value="Submit Answer" />';        if ($target ne 'tex') {
           $button = '<br /><input type="submit" name="submit" value="Submit Answer" />';
         }
     }      }
     if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {      if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
       #last submissions was after due date        #last submissions was after due date
       $latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>";        if ($target eq 'tex') {
     $latemessage=' The last submission was after the Due Date ';
         } else {
           $latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>";
         }
     }      }
   }    }
   my $output= $previousmsg.$latemessage.$message.$trystr;    my $output= $previousmsg.$latemessage.$message.$trystr;
   if ($output =~ /^\s*$/) {    if ($output =~ /^\s*$/) {
     return $button;      return $button;
   } else {    } else {
     return $button.'<table><tr>'.$output.'</tr></table>';      if ($target eq 'tex') {
         return $button.' \vskip 0 mm '.$output.' ';
       } else {
         return $button.'<table><tr>'.$output.'</tr></table>';
       }
   }    }
 }  }
 1;  1;
Removed from v.1.54  
changed lines
  Added in v.1.70

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