[LON-CAPA-cvs] cvs: loncom /interface lonparmset.pm

albertel lon-capa-cvs@mail.lon-capa.org
Sat, 15 Apr 2006 01:05:01 -0000


albertel		Fri Apr 14 21:05:01 2006 EDT

  Modified files:              
    /loncom/interface	lonparmset.pm 
  Log:
  - hmm, seems more readable this way....
  
  
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.287 loncom/interface/lonparmset.pm:1.288
--- loncom/interface/lonparmset.pm:1.287	Fri Apr 14 12:38:43 2006
+++ loncom/interface/lonparmset.pm	Fri Apr 14 21:05:01 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.287 2006/04/14 16:38:43 albertel Exp $
+# $Id: lonparmset.pm,v 1.288 2006/04/15 01:05:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3399,33 +3399,46 @@
     foreach my $id (sort { $exetime{$a}<=>$exetime{$b} } (keys(%exetime))) {
         my ($part,$name)=($parmlog{$id.'_spnam'}=~/^(.*)[\_\.]([^\_\.]+)$/);
         my $spnam=$part.'_'.$name;
-	$r->print('<tr><td>'.
-		  &Apache::lonlocal::locallocaltime($parmlog{$id.'_exe_time'}).
-		  '</td><td>'.
-		  &Apache::loncommon::aboutmewrapper(
-						     &Apache::loncommon::plainname($parmlog{$id.'_exe_uname'},
-										   $parmlog{$id.'_exe_udom'}),
-						     $parmlog{$id.'_exe_uname'},
-						     $parmlog{$id.'_exe_udom'}).'<br /><tt>'.
-		  $parmlog{$id.'_exe_uname'}.':'.$parmlog{$id.'_exe_udom'}.'</tt>'.
-		  ((($parmlog{$id.'_exe_uname'} ne $env{'user.name'}) ||
-		    ($parmlog{$id.'_exe_udom'} ne $env{'user.domain'}))?
-		   '<br />'.&Apache::loncommon::messagewrapper(&mt('Send message'),
-							       $parmlog{$id.'_exe_uname'},
-							       $parmlog{$id.'_exe_udom'}):'').
-		  '</td><td>'.
-                  $level{'parmlevel_'.$parmlog{$id.'_snum'}}.
-                  '</td><td>'.
-                  &mt($allparms{$name}).'<br /><tt>'.$name.'</tt>'.
-                  '</td><td>'.
-                  ($part?&mt('Part: [_1]',$part):&mt('All parts')).
-		  '</td><td>'.
-                  $parmlog{$id.'_symb'}.
-		  '</td><td>'.
-		  ($parmlog{$id.'_nval'}?
-		   (&isdateparm($spnam)?&Apache::lonlocal::locallocaltime($parmlog{$id.'_nval'}):$parmlog{$id.'_nval'})
-		   :&mt('Deleted Parameter')).
-		  '</td></tr>');
+	my $time =
+	    &Apache::lonlocal::locallocaltime($parmlog{$id.'_exe_time'});
+	my $name = 
+	    &Apache::loncommon::plainname($parmlog{$id.'_exe_uname'},
+					  $parmlog{$id.'_exe_udom'});
+	my $about_me_link = 
+	    &Apache::loncommon::aboutmewrapper($name,
+					       $parmlog{$id.'_exe_uname'},
+					       $parmlog{$id.'_exe_udom'});
+
+	my $send_msg_link;
+	if ((($parmlog{$id.'_exe_uname'} ne $env{'user.name'}) 
+	     || ($parmlog{$id.'_exe_udom'} ne $env{'user.domain'}))) {
+	    my $send_msg_link ='<br />'.
+		&Apache::loncommon::messagewrapper(&mt('Send message'),
+						   $parmlog{$id.'_exe_uname'},
+						   $parmlog{$id.'_exe_udom'});
+	}
+	my $value;
+	if ($parmlog{$id.'_nval'}) {
+	    if (&isdateparm($spnam)) {
+		$value = 
+		    &Apache::lonlocal::locallocaltime($parmlog{$id.'_nval'});
+	    } else {
+		$value = $parmlog{$id.'_nval'};
+	    }
+	} else {
+	    $value = &mt('Deleted Parameter');
+	}
+	$r->print('<tr><td>'.$time.'</td>
+                       <td>'.$about_me_link.'<br />
+                            <tt>'.$parmlog{$id.'_exe_udom'}.'</tt><br />
+                            <tt>'.$parmlog{$id.'_exe_uname'}.
+			          ':'.$parmlog{$id.'_exe_udom'}.'</tt>'.
+			    $send_msg_link.'</td>
+                       <td>'.$level{'parmlevel_'.$parmlog{$id.'_snum'}}.'</td>
+                       <td>'.&mt($allparms{$name}).'<br /><tt>'.$name.'</tt></td>
+                       <td>'.($part?&mt('Part: [_1]',$part):&mt('All parts')).'</td>
+                       <td>'.$parmlog{$id.'_symb'}.'</td>
+                       <td>'.$value.'</td></tr>');
     }
     $r->print('</table>');
     $r->print(&Apache::loncommon::end_page());