--- loncom/interface/lonparmset.pm 2015/03/12 02:48:15 1.522.2.18 +++ loncom/interface/lonparmset.pm 2014/06/12 22:29:42 1.545 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.522.2.18 2015/03/12 02:48:15 raeburn Exp $ +# $Id: lonparmset.pm,v 1.545 2014/06/12 22:29:42 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -149,7 +149,7 @@ Input: See list below =back -Outputs: See list below +Outputs: See list below: =over 4 @@ -323,6 +323,31 @@ use HTML::Entities; use LONCAPA qw(:DEFAULT :match); +sub startSettingsScreen { + my ($r,$mode,$crstype)=@_; + + my $tabtext = &mt('Course Settings'); + if ($crstype eq 'Community') { + $tabtext = &mt('Community Settings'); + } + $r->print("\n".'
'. + &mt('Unknown ID [_1] at domain [_2]', + "'".$id."'","'".$udom."'"). + '
'; } } else { $uname=$env{'form.uname'}; @@ -2086,16 +2111,20 @@ sub assessparms { $uhome=&Apache::lonnet::homeserver($uname,$udom); if ($uhome eq 'no_host') { $message= - ''.&mt("Unknown user")." '$uname' ". - &mt("at domain")." '$udom'"; + ''. + &mt('Unknown user [_1] at domain [_2]', + "'".$uname."'","'".$udom."'"). + '
'; $uname=''; } else { $csec=&Apache::lonnet::getsection($udom,$uname, $env{'request.course.id'}); if ($csec eq '-1') { - $message=''. - &mt("User")." '$uname' ".&mt("at domain")." '$udom' ". - &mt("not in this course").""; + $message= + ''. + &mt('User [_1] at domain [_2] not in this course', + "'".$uname."'","'".$udom."'"). + '
'; $uname=''; $csec=$env{'form.csec'}; $cgroup=$env{'form.cgroup'}; @@ -2138,7 +2167,7 @@ sub assessparms { my $chome = $env{'course.'.$env{'request.course.id'}.'.home'}; my ($got_chostname,$chostname,$cmajor,$cminor); my $totalstored = 0; - my $now = time; + for (my $i=0;$i<=$#markers;$i++) { my ($needsrelease,$needsnewer,$name); @@ -2172,25 +2201,13 @@ sub assessparms { } } } - } elsif ($markers[$i] =~ /_(type|lenient|retrypartial|discussvote|examcode|printstartdate|printenddate)\&\d+$/) { + } elsif ($markers[$i] =~ /_(type|lenient|retrypartial|discussvote|examcode)\&\d+$/) { $name = $1; my $val = $values[$i]; if ($name eq 'examcode') { if (&Apache::lonnet::validCODE($values[$i])) { $val = 'valid'; } - } elsif ($name eq 'printstartdate') { - if ($val =~ /^\d+$/) { - if ($val > $now) { - $val = 'future'; - } - } - } elsif ($name eq 'printenddate') { - if ($val =~ /^\d+$/) { - if ($val < $now) { - $val = 'past'; - } - } } $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$val"}; @@ -2229,7 +2246,8 @@ sub assessparms { if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys %allparts);} # ------------------------------------------------------------------ Start page - &startpage($r,$pssymb); + my $crstype = &Apache::loncommon::course_type(); + &startpage($r,$pssymb,$crstype); foreach ('tolerance','date_default','date_start','date_end', 'date_interval','int','float','string') { @@ -2309,7 +2327,6 @@ ENDPARMSELSCRIPT .'' .''); } else { - $r->print(); # parameter screen for a single resource. my ($map,$iid,$resource)=&Apache::lonnet::decode_symb($pssymb); my $title = &Apache::lonnet::gettitle($pssymb); @@ -2319,12 +2336,6 @@ ENDPARMSELSCRIPT ''.