--- loncom/interface/lonparmset.pm	2007/11/02 23:30:56	1.385
+++ loncom/interface/lonparmset.pm	2008/01/26 19:22:24	1.391
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.385 2007/11/02 23:30:56 albertel Exp $
+# $Id: lonparmset.pm,v 1.391 2008/01/26 19:22:24 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2599,8 +2599,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);
 }
 
@@ -2729,6 +2729,8 @@ 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 'date_interval') {
@@ -2752,7 +2754,6 @@ sub listdata {
 sub date_interval_selector {
     my ($thiskey, $showval) = @_;
     my $result;
-    &Apache::lonnet::logthis($showval);
     foreach my $which (['days', 86400, 31],
 		       ['hours', 3600, 23],
 		       ['minutes', 60, 59],
@@ -2760,7 +2761,6 @@ sub date_interval_selector {
 	my ($name, $factor, $max) = @{ $which };
 	my $amount = int($showval/$factor);
 	$showval  %= $factor;
-	&Apache::lonnet::logthis("$amount $factor $showval");
 	my %select = ((map {$_ => $_} (0..$max)),
 		      'select_form_order' => [0..$max]);
 	$result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
@@ -2800,6 +2800,7 @@ my %strings =
 		 [ 'no', 'No' ]],
      'string_problemstatus'
              => [[ '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_feedback_ever', 'No, show no feedback at all.' ]],
      );
@@ -2825,6 +2826,41 @@ sub string_selector {
     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) = @_;
 
@@ -3102,6 +3138,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;
@@ -4127,7 +4208,7 @@ sub handler {
                                              'pres_marker',
                                              'pres_value',
                                              'pres_type',
-                                             'udom','uname','symb','serial']);
+                                             'udom','uname','symb','serial','timebase']);
 
 
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -4207,6 +4288,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