Diff for /loncom/interface/lonparmset.pm between versions 1.383 and 1.387

version 1.383, 2007/10/17 00:27:44 version 1.387, 2007/11/17 02:50:49
Line 2503  sub storedata { Line 2503  sub storedata {
             if ($tuname) {              if ($tuname) {
  $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;   $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
     }      }
     if ($cmd eq 'set') {      if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
  my $data=$env{$_};   my ($data, $typeof, $text);
                 my $typeof=$env{'form.typeof_'.$thiskey};   if ($cmd eq 'set') {
   if ($$olddata{$thiskey} ne $data) {       $data=$env{$_};
       $typeof=$env{'form.typeof_'.$thiskey};
       $text = &mt('Saved modified parameter for');
    } elsif ($cmd eq 'datepointer') {
       $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
       $typeof=$env{'form.typeof_'.$thiskey};
       $text = &mt('Saved modified date for');
    } elsif ($cmd eq 'dateinterval') {
       $data=&get_date_interval_from_form($thiskey);
       $typeof=$env{'form.typeof_'.$thiskey};
       $text = &mt('Saved modified date for');
    }
    if (defined($data) and $$olddata{$thiskey} ne $data) { 
     if ($tuname) {      if ($tuname) {
  if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,   if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
  $tkey.'.type' => $typeof},   $tkey.'.type' => $typeof},
  $tudom,$tuname) eq 'ok') {   $tudom,$tuname) eq 'ok') {
     &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);      &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
     $r->print('<br />'.&mt('Saved modified parameter for').' '.      $r->print('<br />'.$text.' '.
       &Apache::loncommon::plainname($tuname,$tudom));        &Apache::loncommon::plainname($tuname,$tudom));
  } else {   } else {
     $r->print('<div class="LC_error">'.      $r->print('<div class="LC_error">'.
Line 2537  sub storedata { Line 2549  sub storedata {
  } else {   } else {
     push (@deldata,$thiskey,$thiskey.'.type');      push (@deldata,$thiskey,$thiskey.'.type');
  }   }
     } elsif ($cmd eq 'datepointer') {  
  my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});  
                 my $typeof=$env{'form.typeof_'.$thiskey};  
  if (defined($data) and $$olddata{$thiskey} ne $data) {   
     if ($tuname) {  
  if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,  
  $tkey.'.type' => $typeof},  
  $tudom,$tuname) eq 'ok') {  
     &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);  
     $r->print('<br />'.&mt('Saved modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));  
  } else {  
     $r->print('<div class="LC_error">'.  
       &mt('Error saving parameters').'</div>');  
  }  
  &Apache::lonnet::devalidateuserresdata($tuname,$tudom);  
     } else {  
  $newdata{$thiskey}=$data;  
  $newdata{$thiskey.'.type'}=$typeof;   
     }  
  }  
     }      }
  }   }
     }      }
Line 2739  sub listdata { Line 2731  sub listdata {
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.  '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
 &date_sanity_info($$resourcedata{$thiskey})  &date_sanity_info($$resourcedata{$thiskey})
   );    );
       } elsif ($thistype eq 'date_interval') {
    $r->print(&date_interval_selector($thiskey,
     $$resourcedata{$thiskey}));
     } elsif ($thistype =~ m/^string/) {      } elsif ($thistype =~ m/^string/) {
  $r->print(&string_selector($thistype,$thiskey,   $r->print(&string_selector($thistype,$thiskey,
    $$resourcedata{$thiskey}));     $$resourcedata{$thiskey}));
Line 2753  sub listdata { Line 2748  sub listdata {
     return $foundkeys;      return $foundkeys;
 }  }
   
   
   sub date_interval_selector {
       my ($thiskey, $showval) = @_;
       my $result;
       foreach my $which (['days', 86400, 31],
          ['hours', 3600, 23],
          ['minutes', 60, 59],
          ['seconds',  1, 59]) {
    my ($name, $factor, $max) = @{ $which };
    my $amount = int($showval/$factor);
    $showval  %= $factor;
    my %select = ((map {$_ => $_} (0..$max)),
         'select_form_order' => [0..$max]);
    $result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
      %select);
    $result .= ' '.&mt($name);
       }
       $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
       return $result;
   
   }
   
   sub get_date_interval_from_form {
       my ($key) = @_;
       my $seconds = 0;
       foreach my $which (['days', 86400],
          ['hours', 3600],
          ['minutes', 60],
          ['seconds',  1]) {
    my ($name, $factor) = @{ $which };
    if (defined($env{'form.'.$name.'_'.$key})) {
       $seconds += $env{'form.'.$name.'_'.$key} * $factor;
    }
       }
       return $seconds;
   }
   
   
 sub default_selector {  sub default_selector {
     my ($thiskey, $showval) = @_;      my ($thiskey, $showval) = @_;
     return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'">' ;      return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';
 }  }
   
 my %strings =   my %strings = 
Line 2765  my %strings = Line 2798  my %strings =
  [ 'no', 'No' ]],   [ 'no', 'No' ]],
      'string_problemstatus'       'string_problemstatus'
              => [[ 'yes', 'Yes' ],               => [[ 'yes', 'Yes' ],
    [ 'answer', 'Yes, and show correct answer if they exceed the maxium number of tries.' ],
  [ 'no', 'No, don\'t show correct/incorrect feedback.' ],   [ 'no', 'No, don\'t show correct/incorrect feedback.' ],
  [ 'no_feedback_ever', 'No, show no feedback at all.' ]],   [ 'no_feedback_ever', 'No, show no feedback at all.' ]],
      );       );

Removed from v.1.383  
changed lines
  Added in v.1.387


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