--- loncom/interface/lonparmset.pm	2007/09/03 15:34:12	1.379
+++ loncom/interface/lonparmset.pm	2008/01/22 22:37:18	1.389
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.379 2007/09/03 15:34:12 raeburn Exp $
+# $Id: lonparmset.pm,v 1.389 2008/01/22 22:37:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2124,9 +2124,19 @@ sub crsenv {
                 if ($name eq 'cloners') {
                     &change_clone($value,\@oldcloner);
                 }
-                # Flush the course logs so course description is immediately updated
+                # Update environment and nohist_courseids.db
                 if ($name eq 'description' && defined($value)) {
-                    &Apache::lonnet::flushcourselogs();
+                    my %crsinfo = 
+                        &Apache::lonnet::courseiddump($dom,'.',1,'.','.',
+                                                 $crs,undef,undef,'Course');
+                    &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');
+                    }
                 }
             } else {
                 $setoutput.=&mt('Unable to set').' <b>'.$name.'</b> '.&mt('to').
@@ -2493,16 +2503,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">'.
@@ -2527,26 +2549,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; 
-		    }
-		}
 	    }
 	}
     }
@@ -2582,6 +2584,26 @@ sub extractuser {
     return ($key=~/^$env{'request.course.id'}.\[useropt\:($match_username)\:($match_domain)\]\./);
 }
 
+sub parse_listdata_key {
+    my ($key,$listdata) = @_;
+    # split into student/section affected, and
+    # the realm (folder/resource part and parameter
+    my ($student,$realm) = 
+	($key=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)$/);
+    # if course wide student would be undefined
+    if (!defined($student)) {
+	($realm)=($key=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
+    }
+    # strip off the .type if it's not the Question type parameter
+    if ($realm=~/\.type$/ && !exists($listdata->{$key.'.type'})) {
+	$realm=~s/\.type//;
+    }
+    # split into resource+part and parameter name
+    my ($res,    $parm) = ($realm=~/^(.*)\.(.*)$/);
+       ($res, my $part) = ($res  =~/^(.*)\.(.*)$/);
+    return ($student,$res,$part,$parm);
+}
+
 sub listdata {
     my ($r,$resourcedata,$listdata,$sortorder)=@_;
 # Start list output
@@ -2593,40 +2615,48 @@ sub listdata {
     $tableopen=0;
     my $foundkeys=0;
     my %keyorder=&standardkeyorder();
+
     foreach my $thiskey (sort {
+	my ($astudent,$ares,$apart,$aparm) = &parse_listdata_key($a,$listdata);
+	my ($bstudent,$bres,$bpart,$bparm) = &parse_listdata_key($b,$listdata);
+
+	# get the numerical order for the param
+	$aparm=$keyorder{'parameter_0_'.$aparm};
+	$bparm=$keyorder{'parameter_0_'.$bparm};
+
+	my $result=0;
+
 	if ($sortorder eq 'realmstudent') {
-	    my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
-	    my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
-	    if (!defined($astudent)) {
-		($arealm)=($a=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
-	    }
-	    if (!defined($bstudent)) {
-		($brealm)=($b=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
-	    }
-	    $arealm=~s/\.type//;
-	    my ($ares, $aparm) = ($arealm=~/^(.*)\.(.*)$/);
-	    $aparm=$keyorder{'parameter_0_'.$aparm};
-	    $brealm=~s/\.type//;
-	    my ($bres, $bparm) = ($brealm=~/^(.*)\.(.*)$/);
-	    $bparm=$keyorder{'parameter_0_'.$bparm};	   
-	    if ($ares eq $bres) {
-		if (defined($aparm) && defined($bparm)) {
-		    ($aparm <=> $bparm);
-		} elsif (defined($aparm)) {
-		    -1;
-		} elsif (defined($bparm)) {
-		    1;
-		} else {
-		    ($arealm cmp $brealm) || ($astudent cmp $bstudent);
-		}
-	    } else {
-		($arealm cmp $brealm) || ($astudent cmp $bstudent);
+            if ($ares     ne $bres    ) {
+		$result = ($ares     cmp $bres);
+            } elsif ($astudent ne $bstudent) { 
+		$result = ($astudent cmp $bstudent);
+	    } elsif ($apart    ne $bpart   ) {
+		$result = ($apart    cmp $bpart);
 	    }
 	} else {
-	    $a cmp $b;
+	    if      ($astudent ne $bstudent) { 
+		$result = ($astudent cmp $bstudent);
+	    } elsif ($ares     ne $bres    ) {
+		$result = ($ares     cmp $bres);
+	    } elsif ($apart    ne $bpart   ) {
+		$result = ($apart    cmp $bpart);
+	    }
 	}
+	    
+	if (!$result) {
+            if (defined($aparm) && defined($bparm)) {
+		$result = ($aparm <=> $bparm);
+            } elsif (defined($aparm)) {
+		$result = -1;
+            } elsif (defined($bparm)) {
+		$result = 1;
+	    }
+	}
+
+	$result;
     } keys %{$listdata}) {
-	 
+
 	if ($$listdata{$thiskey.'.type'}) {
             my $thistype=$$listdata{$thiskey.'.type'};
             if ($$resourcedata{$thiskey.'.type'}) {
@@ -2701,30 +2731,14 @@ sub listdata {
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
 &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.'">');
@@ -2734,6 +2748,109 @@ 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 maxium 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};
+        }
+    }
+# 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;
+          &Apache::lonnet::put('resourcedata',{$key => $newdate},$dom,$crs);
+       }
+    }
+}
+
 sub newoverview {
     my ($r) = @_;
 
@@ -2964,8 +3081,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>'		      );
@@ -3082,14 +3199,14 @@ where $action is add or drop, and $clone
 user for whom cloning ability is to be changed in course. 
 
 =cut
-                                                                                            
+
 ##################################################
 ##################################################
 
 sub extract_cloners {
     my ($clonelist,$allowclone) = @_;
     if ($clonelist =~ /,/) {
-        @{$allowclone} = split/,/,$clonelist;
+        @{$allowclone} = split(/,/,$clonelist);
     } else {
         $$allowclone[0] = $clonelist;
     }
@@ -3101,15 +3218,14 @@ sub check_cloners {
     my @allowclone = ();
     &extract_cloners($$clonelist,\@allowclone);
     foreach my $currclone (@allowclone) {
-        if (!grep/^\Q$currclone\E$/,@$oldcloner) {
+        if (!grep(/^\Q$currclone\E$/,@$oldcloner)) {
             if ($currclone eq '*') {
                 $clean_clonelist .= $currclone.',';
             } else {
                 my ($uname,$udom) = split(/:/,$currclone);
                 if ($uname eq '*') {
                     if ($udom =~ /^$match_domain$/) {
-                        my @alldoms = &Apache::lonnet::all_domains();
-                        if (!grep(/^\Q$udom\E$/,@alldoms)) {
+                        if (!&Apache::lonnet::domain($udom)) {
                             $disallowed{'domain'} .= $currclone.',';
                         } else {
                             $clean_clonelist .= $currclone.',';
@@ -3152,9 +3268,9 @@ sub change_clone {
         my @allowclone;
         &extract_cloners($clonelist,\@allowclone);
         foreach my $currclone (@allowclone) {
-            if (!grep/^$currclone$/,@$oldcloner) {
+            if (!grep(/^$currclone$/,@$oldcloner)) {
                 if ($currclone ne '*') {
-                    ($uname,$udom) = split/:/,$currclone;
+                    ($uname,$udom) = split(/:/,$currclone);
                     if ($uname && $udom && $uname ne '*') {
                         if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
                             my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
@@ -3172,9 +3288,9 @@ sub change_clone {
             }
         }
         foreach my $oldclone (@$oldcloner) {
-            if (!grep/^$oldclone$/,@allowclone) {
+            if (!grep(/^\Q$oldclone\E$/,@allowclone)) {
                 if ($oldclone ne '*') {
-                    ($uname,$udom) = split/:/,$oldclone;
+                    ($uname,$udom) = split(/:/,$oldclone);
                     if ($uname && $udom && $uname ne '*' ) {
                         if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
                             my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');