--- loncom/interface/lonparmset.pm 2005/06/06 15:46:02 1.213
+++ loncom/interface/lonparmset.pm 2005/06/18 18:51:50 1.230
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.213 2005/06/06 15:46:02 www Exp $
+# $Id: lonparmset.pm,v 1.230 2005/06/18 18:51:50 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -70,6 +70,8 @@ my $parmhashid;
my %parmhash;
my $symbsid;
my %symbs;
+my $rulesid;
+my %rules;
# --- end local caches
@@ -240,6 +242,38 @@ sub symbcache {
return $symbs{$id};
}
+sub resetrulescache {
+ $rulesid='';
+}
+
+sub rulescache {
+ my $id=shift;
+ if ($rulesid ne $env{'request.course.id'}) {
+ %rules=();
+ }
+ unless (defined($rules{$id})) {
+ my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+ %rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
+ $rulesid=$env{'request.course.id'};
+ }
+ return $rules{$id};
+}
+
+sub preset_defaults {
+ my $type=shift;
+ if (&rulescache($type.'_action') eq 'default') {
+# yes, there is something
+ return (&rulescache($type.'_hours'),
+ &rulescache($type.'_min'),
+ &rulescache($type.'_sec'),
+ &rulescache($type.'_value'));
+ } else {
+# nothing there or something else
+ return ('','','','','');
+ }
+}
+
##################################################
##################################################
#
@@ -271,7 +305,57 @@ sub storeparm {
# - username
# - userdomain
+my %recstack;
sub storeparm_by_symb {
+ my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$recflag)=@_;
+ unless ($recflag) {
+# first time call
+ %recstack=();
+ $recflag=1;
+ }
+# store parameter
+ &storeparm_by_symb_inner
+ ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec);
+ my ($prefix,$parm)=($spnam=~/^(.*[\_\.])([^\_\.]+)$/);
+# remember that this was set
+ $recstack{$parm}=1;
+# what does this trigger?
+ foreach my $triggered (split(/\:/,&rulescache($parm.'_triggers'))) {
+# don't backfire
+ unless ((!$triggered) || ($recstack{$triggered})) {
+ my $action=&rulescache($triggered.'_action');
+ my ($whichaction,$whichparm)=($action=~/^(.*\_)([^\_]+)$/);
+# set triggered parameter on same level
+ my $newspnam=$prefix.$triggered;
+ my $newvalue='';
+ my $active=1;
+ if ($action=~/^when\_setting/) {
+# are there restrictions?
+ if (&rulescache($triggered.'_triggervalue')=~/\w/) {
+ $active=0;
+ foreach my $possiblevalue (split(/\s*\,\s*/,&rulescache($triggered.'_triggervalue'))) {
+ if (lc($possiblevalue) eq lc($nval)) { $active=1; }
+ }
+ }
+ $newvalue=&rulescache($triggered.'_value');
+ } else {
+ my $totalsecs=((&rulescache($triggered.'_days')*24+&rulescache($triggered.'_hours'))*60+&rulescache($triggered.'_min'))*60+&rulescache($triggered.'_sec');
+ if ($action=~/^later\_than/) {
+ $newvalue=$nval+$totalsecs;
+ } else {
+ $newvalue=$nval-$totalsecs;
+ }
+ }
+ if ($active) {
+ &storeparm_by_symb($symb,$newspnam,$snum,$newvalue,&rulescache($triggered.'_type'),
+ $uname,$udom,$csec,$recflag);
+ }
+ }
+ }
+ return '';
+}
+
+sub storeparm_by_symb_inner {
# ---------------------------------------------------------- Get symb, map, etc
my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec)=@_;
# ---------------------------------------------------------- Construct prefixes
@@ -440,11 +524,12 @@ sub plink {
$winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
}
}
-
-
+ my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
+ my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
+ unless (defined($winvalue)) { $winvalue=$val; }
return
''.
+ .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
&valout($value,$type).'';
}
@@ -776,8 +861,18 @@ sub parmmenu {
checkthis('duedate','pscat');
checkthis('opendate','pscat');
checkthis('answerdate','pscat');
- checkthis('interval','pscat');
- }
+ }
+
+ function checkdisset() {
+ checkthis('discussend','pscat');
+ checkthis('discusshide','pscat');
+ }
+
+ function checkcontdates() {
+ checkthis('contentopen','pscat');
+ checkthis('contentclose','pscat');
+ }
+
function checkvisi() {
checkthis('hiddenresource','pscat');
@@ -820,12 +915,14 @@ ENDSCRIPT
}
$r->print('
-Select All
-Select Standard
+Select All
+Select Common Only
|
-Select Dates
-Select Visibilities
-Select Part Parameters
+Add Problem Dates
+Add Content Dates
+Add Discussion Settings
+Add Visibilities
+Add Part Parameters
|
Unselect All
|
@@ -972,6 +1069,20 @@ sub keysindisplayorder {
} (keys %{$name});
}
+sub sortmenu {
+ my ($r,$sortorder)=@_;
+ $r->print('
print(' checked="on"');
+ }
+ $r->print(' />'.&mt('Sort by realm first, then student (group/section)'));
+ $r->print('
print(' checked="on"');
+ }
+ $r->print(' />'.&mt('Sort by student (group/section) first, then realm'));
+}
+
sub standardkeyorder {
return ('parameter_0_opendate' => 1,
'parameter_0_duedate' => 2,
@@ -990,7 +1101,9 @@ sub standardkeyorder {
'parameter_0_ordered' => 15,
'parameter_0_tol' => 16,
'parameter_0_sig' => 17,
- 'parameter_0_turnoffunit' => 18);
+ 'parameter_0_turnoffunit' => 18,
+ 'parameter_0_discussend' => 19,
+ 'parameter_0_discusshide' => 20);
}
##################################################
@@ -1048,7 +1161,7 @@ sub assessparms {
my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
$alllevs{'Resource Level'}='full';
- $alllevs{'Map Level'}='map';
+ $alllevs{'Map/Folder Level'}='map';
$alllevs{'Course Level'}='general';
my %allparms;
@@ -1766,8 +1879,8 @@ sub crsenv {
'anonymous_quiz'
=> ''.&mt('Anonymous quiz/exam').'
'.
' ('.&mt('yes').' '.&mt('to avoid print students names').' )',
- 'default_enrollment_start_date' => ''.&mt('Default beginning date when enrolling students').'',
- 'default_enrollment_end_date' => ''.&mt('Default ending date when enrolling students').'',
+ 'default_enrollment_start_date' => ''.&mt('Default beginning date for student access.').'',
+ 'default_enrollment_end_date' => ''.&mt('Default ending date for student access.').'',
'nothideprivileged' => ''.&mt('Privileged users that should not be hidden on staff listings').''.
'
(user:domain,user:domain,...)',
'languages' => ''.&mt('Languages used').'',
@@ -2036,7 +2149,7 @@ sub extractuser {
}
sub listdata {
- my ($r,$resourcedata,$listdata)=@_;
+ my ($r,$resourcedata,$listdata,$sortorder)=@_;
# Start list output
my $oldsection='';
@@ -2045,7 +2158,15 @@ sub listdata {
my $pointer=0;
$tableopen=0;
my $foundkeys=0;
- foreach my $thiskey (sort keys %{$listdata}) {
+ foreach my $thiskey (sort {
+ if ($sortorder eq 'realmstudent') {
+ my ($astudent,$arealm)=($a=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
+ my ($bstudent,$brealm)=($b=~/^$env{'request.course.id'}\.([^\.]+)\.(.+)\.[^\.]+$/);
+ ($arealm cmp $brealm) || ($astudent cmp $bstudent);
+ } else {
+ $a cmp $b;
+ }
+ } keys %{$listdata}) {
if ($$listdata{$thiskey.'.type'}) {
my $thistype=$$listdata{$thiskey.'.type'};
if ($$resourcedata{$thiskey.'.type'}) {
@@ -2072,22 +2193,44 @@ sub listdata {
my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
$realm=''.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).'
('.$url.' in '.$map.' id: '.$id.')';
}
- if ($section ne $oldsection) {
- $r->print(&tableend()."\n
$section
");
- $oldsection=$section;
- $oldrealm='';
- }
- if ($realm ne $oldrealm) {
- $r->print(&tableend()."\n$realm
");
- $oldrealm=$realm;
- $oldpart='';
+ if ($sortorder eq 'realmstudent') {
+ if ($realm ne $oldrealm) {
+ $r->print(&tableend()."\n
$realm
");
+ $oldrealm=$realm;
+ $oldsection='';
+ }
+ if ($section ne $oldsection) {
+ $r->print(&tableend()."\n$section
");
+ $oldsection=$section;
+ $oldpart='';
+ }
+ } else {
+ if ($section ne $oldsection) {
+ $r->print(&tableend()."\n
$section
");
+ $oldsection=$section;
+ $oldrealm='';
+ }
+ if ($realm ne $oldrealm) {
+ $r->print(&tableend()."\n$realm
");
+ $oldrealm=$realm;
+ $oldpart='';
+ }
}
if ($part ne $oldpart) {
$r->print(&tableend().
- "\n".&mt('Part').": $part
");
+ "\n".&mt('Part').": $part");
$oldpart=$part;
}
#
+# Preset defaults?
+#
+ my ($hour,$min,$sec,$val)=('','','','');
+ unless ($$resourcedata{$thiskey}) {
+ my ($parmname)=($thiskey=~/\.(\w+)$/);
+ ($hour,$min,$sec,$val)=&preset_defaults($parmname);
+ }
+
+#
# Ready to print
#
$r->print(&tablestart().'
'.$name.
@@ -2100,12 +2243,38 @@ sub listdata {
$r->print(
&Apache::lonhtmlcommon::date_setter('overviewform',
$jskey,
- $$resourcedata{$thiskey}).
+ $$resourcedata{$thiskey},
+ '',1,'','',$hour,$min,$sec).
''
);
+ } elsif ($thistype eq 'string_yesno') {
+ my $showval;
+ if (defined($$resourcedata{$thiskey})) {
+ $showval=$$resourcedata{$thiskey};
+ } else {
+ $showval=$val;
+ }
+ $r->print(' ');
+ $r->print('');
} else {
+ my $showval;
+ if (defined($$resourcedata{$thiskey})) {
+ $showval=$$resourcedata{$thiskey};
+ } else {
+ $showval=$val;
+ }
$r->print('');
+ $showval.'">');
}
$r->print('');
@@ -2117,8 +2286,7 @@ sub listdata {
sub newoverview {
my $r=shift;
- my $bodytag=&Apache::loncommon::bodytag(
- 'Set Course Assessment Parameters');
+ my $bodytag=&Apache::loncommon::bodytag('Set Parameters');
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
@@ -2130,7 +2298,7 @@ $html
$bodytag
$breadcrumbs
- | ');
§ionmenu($r,\@selected_sections);
- $r->print(' |
'.
- '');
+
+ $r->print('');
+
+ my $sortorder=$env{'form.sortorder'};
+ unless ($sortorder) { $sortorder='realmstudent'; }
+ &sortmenu($r,$sortorder);
+
+ $r->print('');
# Build the list data hash from the specified parms
@@ -2248,7 +2422,7 @@ ENDOVER
# List data
- &listdata($r,$resourcedata,$listdata);
+ &listdata($r,$resourcedata,$listdata,$sortorder);
}
$r->print(&tableend().
((($env{'form.store'}) || ($env{'form.dis'}))?'':'').
@@ -2257,8 +2431,7 @@ ENDOVER
sub overview {
my $r=shift;
- my $bodytag=&Apache::loncommon::bodytag(
- 'Modify Course Assessment Parameters');
+ my $bodytag=&Apache::loncommon::bodytag('Modify Parameters');
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
@@ -2280,9 +2453,14 @@ ENDOVER
my $resourcedata=&readdata($crs,$dom);
+
+ my $sortorder=$env{'form.sortorder'};
+ unless ($sortorder) { $sortorder='realmstudent'; }
+ &sortmenu($r,$sortorder);
+
# List data
- my $foundkeys=&listdata($r,$resourcedata,$resourcedata);
+ my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
$r->print(&tableend().''.
($foundkeys?'':&mt('There are no parameters.')).'