--- loncom/interface/lonparmset.pm	2007/10/06 04:32:49	1.382
+++ loncom/interface/lonparmset.pm	2008/04/05 16:10:52	1.394
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.382 2007/10/06 04:32:49 raeburn Exp $
+# $Id: lonparmset.pm,v 1.394 2008/04/05 16:10:52 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2026,6 +2026,8 @@ sub crsenv {
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 
+    my (%crsinfo,$chome);
+
     #
     # Go through list of changes
     foreach (keys %env) {
@@ -2120,19 +2122,37 @@ sub crsenv {
             my $put_result = &Apache::lonnet::put('environment',
                                                   {$name=>$value},$dom,$crs);
             if ($put_result eq 'ok') {
-                $setoutput.=&mt('Set').' <b>'.$name.'</b> '.&mt('to').' <b>'.$value.'</b>.<br />';
+                $setoutput.=&mt('Set').' <b>'.$name.'</b> '.&mt('to').' <b>';
+                if ($name =~ /^default_enrollment_(start|end)_date$/) {
+                    $setoutput .= &Apache::lonlocal::locallocaltime($value);
+                } else {
+                    $setoutput .= $value;
+                }
+                $setoutput .= '</b>.<br />';
                 if ($name eq 'cloners') {
                     &change_clone($value,\@oldcloner);
                 }
                 # Update environment and nohist_courseids.db
-                if ($name eq 'description' && defined($value)) {
-                    my %crsinfo = 
-                        &Apache::lonnet::courseiddump($dom,'.',1,'.','.',
+                if ($name eq 'description' || $name eq 'cloners') {
+                    if ($chome eq '') {
+                        %crsinfo =
+                            &Apache::lonnet::courseiddump($dom,'.',1,'.','.',
                                                  $crs,undef,undef,'Course');
-                    &Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.description' => $value);
+                        $chome = &Apache::lonnet::homeserver($crs,$dom);
+                    }
+                }
+                if ($name eq 'description' && defined($value)) {
+                    &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.description' => $value});
                     if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') {
                         $crsinfo{$env{'request.course.id'}}{'description'} = $value; 
-                        my $chome = &Apache::lonnet::homeserver($crs,$dom);
+                        my $putresult =
+                            &Apache::lonnet::courseidput($dom,\%crsinfo,
+                                                         $chome,'notime');
+                    }
+                }
+                if ($name eq 'cloners') {
+                    if (ref($crsinfo{$env{'request.course.id'}}) eq 'HASH') {
+                        $crsinfo{$env{'request.course.id'}}{'cloners'} = $value;
                         my $putresult =
                             &Apache::lonnet::courseidput($dom,\%crsinfo,
                                                          $chome,'notime');
@@ -2318,6 +2338,7 @@ Use * to allow unrestricted cloning in a
 
 	     'texengine'
 	         => '<b>'.&mt('Force all students in the course to use a specific math rendering engine.').'</b><br />'.&mt('(Valid options are [_1].)','"tth", "jsMath", "mimetex"').'</b>',
+
              ); 
         my @Display_Order = ('url','description','courseid','cloners','grading',
                              'externalsyllabus',
@@ -2503,16 +2524,28 @@ sub storedata {
             if ($tuname) {
 		$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
 	    }
-	    if ($cmd eq 'set') {
-		my $data=$env{$_};
-                my $typeof=$env{'form.typeof_'.$thiskey};
- 		if ($$olddata{$thiskey} ne $data) { 
+	    if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
+		my ($data, $typeof, $text);
+		if ($cmd eq 'set') {
+		    $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 (&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 parameter for').' '.
+			    $r->print('<br />'.$text.' '.
 				      &Apache::loncommon::plainname($tuname,$tudom));
 			} else {
 			    $r->print('<div class="LC_error">'.
@@ -2537,26 +2570,6 @@ sub storedata {
 		} else {
 		    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; 
-		    }
-		}
 	    }
 	}
     }
@@ -2607,8 +2620,8 @@ sub parse_listdata_key {
 	$realm=~s/\.type//;
     }
     # split into resource+part and parameter name
-    my ($res, $parm) = ($realm=~/^(.*)\.(.*)$/);
-    my ($res, $part) = ($res  =~/^(.*)\.(.*)$/);
+    my ($res,    $parm) = ($realm=~/^(.*)\.(.*)$/);
+       ($res, my $part) = ($res  =~/^(.*)\.(.*)$/);
     return ($student,$res,$part,$parm);
 }
 
@@ -2737,32 +2750,18 @@ sub listdata {
 						      $$resourcedata{$thiskey},
 							      '',1,'','').
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
+(($$resourcedata{$thiskey}!=0)?'<a href="/adm/parmset?&action=dateshift1&timebase='.$$resourcedata{$thiskey}.'">'.
+&mt('Shift all dates based on this date').'</a>':'').
 &date_sanity_info($$resourcedata{$thiskey})
 			  );
-	    } elsif ($thistype eq 'string_yesno') {
-		my $showval;
-		if (defined($$resourcedata{$thiskey})) {
-		    $showval=$$resourcedata{$thiskey};
-		}
-		$r->print('<label><input type="radio" name="set_'.$thiskey.
-			  '" value="yes"');
-		if ($showval eq 'yes') {
-		    $r->print(' checked="checked"');
-		}
-                $r->print(' />'.&mt('Yes').'</label> ');
-		$r->print('<label><input type="radio" name="set_'.$thiskey.
-			  '" value="no"');
-		if ($showval eq 'no') {
-		    $r->print(' checked="checked"');
-		}
-                $r->print(' />'.&mt('No').'</label>');
+	    } elsif ($thistype eq 'date_interval') {
+		$r->print(&date_interval_selector($thiskey,
+						  $$resourcedata{$thiskey}));
+	    } elsif ($thistype =~ m/^string/) {
+		$r->print(&string_selector($thistype,$thiskey,
+					   $$resourcedata{$thiskey}));
 	    } else {
-		my $showval;
-		if (defined($$resourcedata{$thiskey})) {
-		    $showval=$$resourcedata{$thiskey};
-		}
-		$r->print('<input type="text" name="set_'.$thiskey.'" value="'.
-			  $showval.'">');
+		$r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
 	    }
 	    $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
 		      $thistype.'">');
@@ -2772,6 +2771,117 @@ sub listdata {
     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 {
+    my ($thiskey, $showval) = @_;
+    return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';
+}
+
+my %strings = 
+    (
+     'string_yesno'
+             => [[ 'yes', 'Yes' ],
+		 [ 'no', 'No' ]],
+     'string_problemstatus'
+             => [[ 'yes', 'Yes' ],
+		 [ 'answer', 'Yes, and show correct answer if they exceed the maximum number of tries.' ],
+		 [ 'no', 'No, don\'t show correct/incorrect feedback.' ],
+		 [ 'no_feedback_ever', 'No, show no feedback at all.' ]],
+     );
+
+
+sub string_selector {
+    my ($thistype, $thiskey, $showval) = @_;
+    
+    if (!exists($strings{$thistype})) {
+	return &default_selector($thiskey,$showval);
+    }
+
+    my $result;
+    foreach my $possibilities (@{ $strings{$thistype} }) {
+	my ($name, $description) = @{ $possibilities };
+	$result .= '<label><input type="radio" name="set_'.$thiskey.
+		  '" value="'.$name.'"';
+	if ($showval eq $name) {
+	    $result .= ' checked="checked"';
+	}
+	$result .= ' />'.&mt($description).'</label> ';
+    }
+    return $result;
+}
+
+#
+# Shift all start and end dates by $shift
+#
+
+sub dateshift {
+    my ($shift)=@_;
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+# ugly retro fix for broken version of types
+    foreach my $key (keys %data) {
+        if ($key=~/\wtype$/) {
+            my $newkey=$key;
+            $newkey=~s/type$/\.type/;
+            $data{$newkey}=$data{$key};
+            delete $data{$key};
+        }
+    }
+    my %storecontent=();
+# go through all parameters and look for dates
+    foreach my $key (keys %data) {
+       if ($data{$key.'.type'}=~/^date_(start|end)$/) {
+          my $newdate=$data{$key}+$shift;
+          $storecontent{$key}=$newdate;
+       }
+    }
+    my $reply=&Apache::lonnet::cput
+                ('resourcedata',\%storecontent,$dom,$crs);
+    if ($reply eq 'ok') {
+       &log_parmset(\%storecontent);
+    }
+    &Apache::lonnet::devalidatecourseresdata($crs,$dom);
+    return $reply;
+}
+
 sub newoverview {
     my ($r) = @_;
 
@@ -3002,8 +3112,8 @@ ENDOVER
 	next if (!exists($resourcedata->{$thiskey.'.type'})
 		 && $thiskey=~/\.type$/);
 	my %data = &parse_key($thiskey);
-	if (exists($data{'realm_exists'})
-	    && !$data{'realm_exists'}) {
+	if (1) { #exists($data{'realm_exists'})
+	    #&& !$data{'realm_exists'}) {
 	    $r->print(&Apache::loncommon::start_data_table_row().
 		      '<tr>'.
 		      '<td><input type="checkbox" name="del_'.$thiskey.'" /></td>'		      );
@@ -3049,6 +3159,51 @@ ENDOVER
 	      &Apache::loncommon::end_page());
 }
 
+sub date_shift_one {
+    my ($r) = @_;
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+    my $start_page=&Apache::loncommon::start_page('Shift Dates');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
+    $r->print(<<ENDOVER);
+$start_page
+$breadcrumbs
+ENDOVER
+    $r->print('<form name="shiftform" method="post">'.
+              '<table><tr><td>'.&mt('Currently set date:').'</td><td>'.
+              &Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.
+              '<tr><td>'.&mt('Shifted date:').'</td><td>'.
+                    &Apache::lonhtmlcommon::date_setter('shiftform',
+                                                        'timeshifted',
+                                                        $env{'form.timebase'},,
+                                                        '').
+              '</td></tr></table>'.
+              '<input type="hidden" name="action" value="dateshift2" />'.
+              '<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.
+              '<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');
+    $r->print(&Apache::loncommon::end_page());
+}
+
+sub date_shift_two {
+    my ($r) = @_;
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $start_page=&Apache::loncommon::start_page('Shift Dates');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
+    $r->print(<<ENDOVER);
+$start_page
+$breadcrumbs
+ENDOVER
+    my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
+    $r->print(&mt('Shifting all dates such that [_1] becomes [_2]',
+              &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+              &Apache::lonlocal::locallocaltime($timeshifted)));
+    my $delta=$timeshifted-$env{'form.timebase'};
+    &dateshift($delta);
+    $r->print(&Apache::loncommon::end_page());
+}
+
 sub parse_key {
     my ($key) = @_;
     my %data;
@@ -3449,7 +3604,7 @@ sub order_meta_fields {
 	my $ordered_fields = join ",", @neworder;
         my $put_result = &Apache::lonnet::put('environment',
                            {'metadata.addedorder'=>$ordered_fields},$dom,$crs); 	
-	&Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);
+	&Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields});
     }
     my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
     my $ordered_fields;
@@ -4074,7 +4229,7 @@ sub handler {
                                              'pres_marker',
                                              'pres_value',
                                              'pres_type',
-                                             'udom','uname','symb','serial']);
+                                             'udom','uname','symb','serial','timebase']);
 
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -4154,6 +4309,14 @@ sub handler {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=cleanparameters',
 						    text=>"Clean Parameters"});
 	    &clean_parameters($r);
+        } elsif ($env{'form.action'} eq 'dateshift1' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
+                                                    text=>"Shifting Dates"});
+            &date_shift_one($r);
+        } elsif ($env{'form.action'} eq 'dateshift2' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
+                                                    text=>"Shifting Dates"});
+            &date_shift_two($r);
 	}       
     } else {
 # ----------------------------- Not in a course, or not allowed to modify parms