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

Diff for /loncom/homework/lonhomework.pm between versions 1.281 and 1.286

version 1.281, 2007/10/31 17:40:00 version 1.286, 2007/11/20 17:53:22
Line 49  use Apache::matchresponse(); Line 49  use Apache::matchresponse();
 use Apache::chemresponse();  use Apache::chemresponse();
 use Apache::drawimage();  use Apache::drawimage();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use HTML::Entities();  
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Time::HiRes qw( gettimeofday tv_interval );  use Time::HiRes qw( gettimeofday tv_interval );
 use Apache::lonnet();  use HTML::Entities();
   use File::Copy();
   
 # FIXME - improve commenting  # FIXME - improve commenting
   
Line 494  sub check_access { Line 494  sub check_access {
    $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {     $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
     $status = 'CANNOT_ANSWER';      $status = 'CANNOT_ANSWER';
  }   }
    if ($status eq 'CANNOT_ANSWER'
       && &show_answer_problem_status()) {
       $status = 'SHOW_ANSWER';
    }
     }      }
     if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') {      if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') {
  my $interval=&Apache::lonnet::EXT("resource.$id.interval");   my @interval=&Apache::lonnet::EXT("resource.$id.interval");
  &Apache::lonxml::debug("looking for interval $interval");   &Apache::lonxml::debug("looking for interval @interval");
  if ($interval) {   if ($interval[0]) {
     my $first_access=&Apache::lonnet::get_first_access('map');      my $first_access=&Apache::lonnet::get_first_access($interval[1]);
     &Apache::lonxml::debug("looking for accesstime $first_access");      &Apache::lonxml::debug("looking for accesstime $first_access");
     if (!$first_access) {      if (!$first_access) {
  $status='NOT_YET_VIEWED';   $status='NOT_YET_VIEWED';
  my $due_date = &due_date($id);   my $due_date = &due_date($id);
  my $seconds_left = $due_date - time;   my $seconds_left = $due_date - time;
  if ($seconds_left > $interval || $due_date eq '') {   if ($seconds_left > $interval[0] || $due_date eq '') {
     $seconds_left = $interval;      $seconds_left = $interval[0];
  }   }
  $datemsg=&seconds_to_human_length($seconds_left);   $datemsg=&seconds_to_human_length($seconds_left);
     }      }
Line 532  sub check_access { Line 536  sub check_access {
 sub due_date {  sub due_date {
     my ($part_id,$symb,$udom,$uname)=@_;      my ($part_id,$symb,$udom,$uname)=@_;
     my $date;      my $date;
     my $interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb,      my @interval= &Apache::lonnet::EXT("resource.$part_id.interval",$symb,
        $udom,$uname);         $udom,$uname);
     &Apache::lonxml::debug("looking for interval $part_id $symb $interval");      &Apache::lonxml::debug("looking for interval $part_id $symb @interval");
     my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb,      my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb,
        $udom,$uname);         $udom,$uname);
     &Apache::lonxml::debug("looking for due_date $part_id $symb $due_date");      &Apache::lonxml::debug("looking for due_date $part_id $symb $due_date");
     if ($interval =~ /\d+/) {      if ($interval[0] =~ /\d+/) {
  my $first_access=&Apache::lonnet::get_first_access('map',$symb);   my $first_access=&Apache::lonnet::get_first_access($interval[1],$symb);
  &Apache::lonxml::debug("looking for first_access $first_access");   &Apache::lonxml::debug("looking for first_access $first_access ($interval[1])");
  if (defined($first_access)) {   if (defined($first_access)) {
     $interval = $first_access+$interval;      my $interval = $first_access+$interval[0];
     $date = ($interval < $due_date)? $interval : $due_date;      $date = (!$due_date || $interval < $due_date) ? $interval
                                                             : $due_date;
  } else {   } else {
     $date = $due_date;      $date = $due_date;
  }   }
Line 683  sub handle_save_or_undo { Line 688  sub handle_save_or_undo {
     my $error=0;      my $error=0;
     if ($env{'form.Undo'} eq &mt('undo')) {      if ($env{'form.Undo'} eq &mt('undo')) {
  my $error=0;   my $error=0;
  if (!copy($file,$filetmp)) { $error=1; }   if (!&File::Copy::copy($file,$filetmp)) { $error=1; }
  if ((!$error) && (!copy($filebak,$file))) { $error=1; }   if ((!$error) && (!&File::Copy::copy($filebak,$file))) { $error=1; }
  if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }   if ((!$error) && (!&File::Copy::move($filetmp,$filebak))) { $error=1; }
  if (!$error) {   if (!$error) {
     &Apache::lonxml::info("<p><b>".      &Apache::lonxml::info("<p><b>".
   &mt("Undid changes, Switched [_1] and [_2]",    &mt("Undid changes, Switched [_1] and [_2]",
Line 882  sub analyze { Line 887  sub analyze {
   
     sub show_problem_status {      sub show_problem_status {
  return ($show_problem_status eq 'yes'   return ($show_problem_status eq 'yes'
    || $show_problem_status eq 'answer'
  || $show_problem_status eq '');   || $show_problem_status eq '');
     }      }
           
Line 892  sub analyze { Line 898  sub analyze {
     sub show_no_problem_status {      sub show_no_problem_status {
  return ($show_problem_status eq 'no_feedback_ever');   return ($show_problem_status eq 'no_feedback_ever');
     }      }
     
       sub show_answer_problem_status {
    return ($show_problem_status eq 'answer');
       }
 }  }
   
 sub editxmlmode {  sub editxmlmode {
Line 1059  sub finished_parsing { Line 1069  sub finished_parsing {
     undef($Apache::lonhomework::parsing_a_task);      undef($Apache::lonhomework::parsing_a_task);
 }  }
   
 # with no arg it returns a HTML <option> list of the template titles  
 # with one arg it returns the filename associated with the arg passed  
 sub get_template_list {  sub get_template_list {
     my ($namewanted,$extension) = @_;      my ($extension) = @_;
     my $result;      my $result;
     my @allnames;      my @allnames;
     &Apache::lonxml::debug("Looking for :$extension:");      &Apache::lonxml::debug("Looking for :$extension:");
     foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {      my $glob_extension  = $extension;
  &Apache::lonxml::debug("Looking at $file");      if ($extension eq 'survey' || $extension eq 'exam') {
  my $name=&Apache::lonnet::metadata($file,'title');   $glob_extension = 'problem';
  &Apache::lonxml::debug("Got a name $name");      }
  if ($namewanted && ($name eq $namewanted)) {      my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
     $result=$file;       '/templates/*.'.$glob_extension);
     last;      @files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title'))]} (@files);
  } else {      @files = sort {$a->[1] cmp $b->[1]} (@files);
     if ($name) { push (@allnames, $name); }      foreach my $file (@files) {
  }   next if ($file->[1] !~ /\S/);
     }   $result .=
     if (@allnames && !$result) {      '<label><input type="radio" name="template" value="'.$file->[0].'" />'.
  $result="<option>".&mt("Select a")." $extension ".&mt('template')."</option>\n<option>".      $file->[1].'</label><br />';
     join('</option><option>',sort(@allnames)).'</option>';  
     }      }
     return $result;      return $result;
 }  }
   
 sub newproblem {  sub newproblem {
     my ($request) = @_;      my ($request) = @_;
     my $extension=$request->uri;  
     $extension=~s:^.*\.([\w]+)$:$1:;      if ($env{'form.template'}) {
     &Apache::lonxml::debug("Looking for :$extension:");   my $file = $env{'form.template'};
     my $templatelist=&get_template_list('',$extension);  
     if ($env{'form.template'} &&  
  $env{'form.template'} ne "Select a $extension template") {  
  use File::Copy;  
  my $file = &get_template_list($env{'form.template'},$extension);  
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  copy($file,$dest);   &File::Copy::copy($file,$dest);
  &renderpage($request,$dest);   &renderpage($request,$dest);
     } elsif($env{'form.newfile'} && !$templatelist) {   return;
  # I don't like hard-coded filenames but for now, this will work.      }
  use File::Copy;  
       my ($extension) = ($request->uri =~ m/\.(\w+)$/);
       &Apache::lonxml::debug("Looking for :$extension:");
       my $templatelist=&get_template_list($extension);
       if ($env{'form.newfile'} && !$templatelist) {
    # no templates found
  my $templatefilename =   my $templatefilename =
     $request->dir_config('lonIncludes').'/templates/blank.'.$extension;      $request->dir_config('lonIncludes').'/templates/blank.'.$extension;
  &Apache::lonxml::debug("$templatefilename");   &Apache::lonxml::debug("$templatefilename");
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  copy($templatefilename,$dest);   &File::Copy::copy($templatefilename,$dest);
  &renderpage($request,$dest);   &renderpage($request,$dest);
     } else {      } else {
  my $url=&HTML::Entities::encode($request->uri,'<>&"');   my $url=&HTML::Entities::encode($request->uri,'<>&"');
Line 1112  sub newproblem { Line 1119  sub newproblem {
  $shownurl=~s-^/~-/priv/-;   $shownurl=~s-^/~-/priv/-;
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  my $errormsg;   my $errormsg;
  if ($env{'form.newfile'}) {  
     $errormsg='<p><span class="LC_error">'.&mt('You did not select a template.').'</span></p>'."\n";  
  }  
  my $instructions;   my $instructions;
  my $start_page =    my $start_page = 
     &Apache::loncommon::start_page("Create New $extension");      &Apache::loncommon::start_page("Create New $extension");
Line 1127  $errormsg Line 1131  $errormsg
 <p>  <p>
 <b>  <b>
 ".&mt("To create a new $extension, select a template from the".  ".&mt("To create a new $extension, select a template from the".
       "pull-down menu below. Then click on the \"Create $extension\" button.")."</b>        " list below. Then click on the \"Create $extension\" button.")."</b>
 </p><form action=\"$url\" method=\"POST\">");  </p><form action=\"$url\" method=\"POST\">");
   
  if (defined($templatelist)) {   if (defined($templatelist)) {
     $request->print("<select name=\"template\">$templatelist</select>");      $request->print($templatelist);
  }   }
  $request->print("<br /><input type=\"submit\" name=\"newfile\" value=\"".&mt('Create')." $extension\" />");   $request->print('<br /><input type="submit" name="newfile" value="'.
    &mt("Create $extension").'" />');
  $request->print("</form></p>".&Apache::loncommon::end_page());   $request->print("</form></p>".&Apache::loncommon::end_page());
     }      }
     return '';      return;
 }  }
   
 sub update_construct_style {  sub update_construct_style {
Removed from v.1.281  
changed lines
  Added in v.1.286

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