| ');
my %threshold_titles = &Apache::lonlocal::texthash (
@@ -150,37 +169,58 @@ sub display_main_box {
degdiff => 'Degree of difficulty',
numstudents => 'Total number of students with submissions',
);
-
- my %interval_titles = &Apache::lonlocal::texthash (
- -1 => 'since start of course',
- 2592000 => 'since last month',
- 604800 => 'since last week',
- 86400 => 'since yesterday',
+ my %versions = (
+ -1 => "version changes since start of $lctype",
+ 2592000 => 'version changes since last month',
+ 604800 => 'version changes since last week',
+ 86400 => 'version changes since yesterday',
+ );
+ my %newroles = (
+ -1 => "roles which have become active since start of $lctype",
+ 2592000 => 'roles which have become active since last month',
+ 604800 => 'roles which have become active since last week',
+ 86400 => 'roles which have become active since yesterday',
+ );
+ my %oldroles = (
+ -1 => "roles which expired since start of $lctype",
+ 2592000 => 'roles which expired since last month',
+ 604800 => 'roles which expired since last week',
+ 86400 => 'roles which expired since yesterday',
+ );
+ my %interval_titles = (
+ versions => \%versions,
+ newroles => \%newroles,
+ oldroles => \%oldroles,
);
-
my %initpage = &Apache::lonlocal::texthash (
- firstres => 'first resource in the course',
+ firstres => "first resource in the $lctype",
whatsnew => "what's new? page",
userpref => 'your general user preferences',
- coursespecific => 'specific setting for this course',
+ coursespecific => "specific setting for this $lctype",
);
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
if (($command eq 'chgthreshold')
&& $checkallowed->{'abovethreshold'}) {
- &display_threshold_config($r,$refpage,$tabbg,\%threshold_titles,
+ &display_threshold_config($r,$refpage,\%threshold_titles,
$cdom,$crs);
} elsif (($command eq 'chginterval')
&& $checkallowed->{'versionchanges'}) {
- &display_interval_config($r,$refpage,\%interval_titles);
+ &display_interval_config($r,$refpage,\%interval_titles,'versions');
} elsif (($command eq 'chgdisc')
&& $checkallowed->{'coursediscussion'}) {
&display_discussion_config($r,$refpage);
} elsif ($command eq 'courseinit') {
&courseinit_config($r,$refpage,\%initpage);
+ } elsif (($command eq 'chgnewroleinterval')
+ && $checkallowed->{'newroles'}) {
+ &display_interval_config($r,$refpage,\%interval_titles,'newroles');
+ } elsif (($command eq 'chgoldroleinterval')
+ && $checkallowed->{'oldroles'}) {
+ &display_interval_config($r,$refpage,\%interval_titles,'oldroles');
} else {
- &display_actions_box($r,$tabbg,$command,$refpage,\%threshold_titles,
+ &display_actions_box($r,$command,$refpage,\%threshold_titles,
\%interval_titles,\%initpage,$cdom,$crs,$checkallowed);
}
my $end_page = &Apache::loncommon::end_page();
@@ -203,12 +243,13 @@ sub display_header {
my ($command,$checkallowed) = @_;
my $scripttag;
- unless ($command eq 'chgthreshold' || $command eq 'chginterval') {
+ unless ($command eq 'chgthreshold' || $command eq 'chginterval' ||
+ $command eq 'chgoldroleinterval' || $command eq 'chgnewroleinterval') {
$scripttag = <<"END";
';
}
- return &Apache::loncommon::start_page('Course Action Items',$scripttag);
+ my $course_type=&Apache::loncommon::course_type();
+ return &Apache::loncommon::start_page($course_type.' Action Items',
+ $scripttag);
}
#-------------------------------
@@ -236,19 +279,20 @@ END
#-------------------------------
sub display_actions_box {
- my ($r,$tabbg,$command,$refpage,$threshold_titles,$interval_titles,
- $initpage,$cdom,$crs,$checkallowed) = @_;
- my $rowColor1 = "#ffffff";
- my $rowColor2 = "#eeeeee";
-
+ my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage,
+ $cdom,$crs,$checkallowed) = @_;
my $udom = $env{'user.domain'};
my $uname = $env{'user.name'};
my $cid = $env{'request.course.id'};
-
+ my $crstype = &Apache::loncommon::course_type();
+ my $lctype = lc($crstype);
+ my %stulabel = (
+ 'Course' => 'students',
+ 'Group' => 'members',
+ );
my %lt = &Apache::lonlocal::texthash(
- 'yacc' => 'You are accessing an invalid course.',
+ 'yacc' => 'You are accessing an invalid course',
'gtfr' => 'Go to first resource',
- 'pgse' => 'Page set to be displayed after you have selected a role in this course?',
'hial' => 'Hide all',
'shal' => 'Show all',
);
@@ -266,7 +310,10 @@ sub display_actions_box {
my @warnings = ();
my $msgcount = 0;
my $critmsgcount = 0;
-
+ my $expirecount;
+ my %expired;
+ my $activecount;
+ my %activated;
my %res_title = ();
my %show = ();
my $needitems = 0;
@@ -277,16 +324,12 @@ sub display_actions_box {
$result = &store_courseinit_setting($uname,$udom,$cid,$initpage);
}
- my %threshold = (
- av_attempts => 2,
- degdiff => 0.5,
- numstudents => 2,
- );
+ my %threshold = ();
my %pagedesc = &Apache::lonlocal::texthash (
firstres => 'First resource',
whatsnew => "What's New? page",
userpref => 'user preference',
- coursespecific => 'course only',
+ coursespecific => $lctype.' only',
default => 'default',
);
@@ -294,7 +337,7 @@ sub display_actions_box {
my $currinit = $pagedesc{$initdisp}.' ('.$pagedesc{$initcontrol}.')';
unless ($cid) {
- $r->print(' '); + $r->print(' '.$lt{'yacc'}.' '); return; } @@ -303,17 +346,23 @@ sub display_actions_box { &GDBM_READER(),0640)) { my $furl=$bighash{'first_url'}; untie(%bighash); - $r->print(''.$lt{'gtfr'}. - ''); + $r->print(''.$lt{'gtfr'}. + ' '); } } - $r->print($lt{'pgse'}.' '.&mt('Currently: [_1]',''.$currinit.''). - ' '); - + $r->print(&mt('Page set to be displayed after you have selected a role in this '.$lctype).'.' + .' ' + .&mt('Currently: [_1].',''.$currinit.'') + .' ' + .&mt('[_1]Change[_2] for just [_3]this course[_4] or for all [_5]your courses[_6].' + ,'' + ,'' + ,'' + ,'' + ,'' + ,'') + .' '); + if ($command eq 'reset') { $result = &process_reset($cdom,$crs); } elsif ($command eq 'update') { @@ -327,9 +376,9 @@ sub display_actions_box { my $store_result=&store_display_settings($uname,$udom,$cid,$checkallowed); unless ($store_result eq 'ok') { - &Apache::lonnet::logthis('Error storing whatsnew settings: '. - $store_result.' for '.'user '.$uname.':'.$udom.' in course '.$cid); - $result .= &mt('Unable to store visibility settings due to [_1]', + &Apache::lonnet::logthis('Error saving whatsnew settings: '. + $store_result.' for '.'user '.$uname.':'.$udom.' in '.$lctype.' '.$cid); + $result .= &mt('Unable to save visibility settings due to [_1]', $store_result); } @@ -338,37 +387,88 @@ sub display_actions_box { } $r->rflush(); - + my (%timediff,%interval); my %display_settings = &get_display_settings($uname,$udom,$cid); - my $timediff = $display_settings{$cid.':interval'}; - unless (defined($timediff)) { $timediff = 604800; } + $timediff{'versions'} = $display_settings{$cid.':interval'}; + unless (defined($timediff{'versions'})) { $timediff{'versions'} = 604800; } + $interval{'versions'} = $interval_titles->{'versions'}->{$timediff{'versions'}}; + + my %headings = &Apache::lonlocal::texthash( + coursediscussion => 'Unread '.$lctype.' discussion posts', + handgrading => 'Problems requiring handgrading', + haserrors => 'Problems with errors', + coursenormalmail => 'New '.$lctype.' messages', + coursecritmail => 'New critical messages in '.$lctype, + ); + + if ($timediff{'versions'} == -1) { + $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since start of '.$lctype); + } elsif ($timediff{'versions'} == 2592000) { + $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since last month'); + } elsif ($timediff{'versions'} == 604800) { + $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since last week'); + } elsif ($timediff{'versions'} == 86400) { + $headings{'versionchanges'} = &mt('Resources in '.$lctype.' with version changes since yesterday'); + } + + $timediff{'oldroles'} = $display_settings{$cid.':oldroleinterval'}; + unless (defined($timediff{'oldroles'})) { $timediff{'oldroles'} = 604800; } + $interval{'oldroles'} = $interval_titles->{'oldroles'}->{$timediff{'oldroles'}}; + + if ($timediff{'oldroles'} == -1) { + $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since start of '.$lctype); + } elsif ($timediff{'oldroles'} == 2592000) { + $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since last month'); + } elsif ($timediff{'oldroles'} == 604800) { + $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since last week'); + } elsif ($timediff{'oldroles'} == 86400) { + $headings{'oldroles'} = &mt('Roles for which access to '.$lctype.' has expired since yesterday'); + } + + $timediff{'newroles'} = $display_settings{$cid.':newroleinterval'}; + unless (defined($timediff{'newroles'})) { $timediff{'newroles'} = 604800; } + $interval{'newroles'} = $interval_titles->{'newroles'}->{$timediff{'newroles'}}; + + if ($timediff{'newroles'} == -1) { + $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since start of '.$lctype); + } elsif ($timediff{'newroles'} == 2592000) { + $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since last month'); + } elsif ($timediff{'newroles'} == 604800) { + $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since last week'); + } elsif ($timediff{'newroles'} == 86400) { + $headings{'newroles'} = &mt('Roles for which access to '.$lctype.' has become available since yesterday'); + } + my $now = time; - my $interval = $$interval_titles{$timediff}; - if ($timediff == -1) { - $timediff = time; - } - my $starttime = $now - $timediff; + if ($timediff{'versions'} == -1) { + $timediff{'versions'} = time; + } + my $starttime = $now - $timediff{'versions'}; + + if ($timediff{'newroles'} == -1) { + $timediff{'newroles'} = time; + } + my $activatedstart = $now - $timediff{'newroles'}; + + if ($timediff{'oldroles'} == -1) { + $timediff{'oldroles'} = time; + } + my $expiredstart = $now - $timediff{'oldroles'}; + my $countunread = $display_settings{$cid.':countunread'}; unless (defined($countunread)) { $countunread = 'on'; } - - my %headings = &Apache::lonlocal::texthash( - coursediscussion => 'Unread course discussion posts', - handgrading => 'Problems requiring handgrading', - haserrors => 'Problems with errors', - versionchanges => 'Resources in course with version changes '.$interval, - coursenormalmail => 'New course messages', - coursecritmail => 'New critical messages in course', - ); - if ($$checkallowed{'abovethreshold'}) { &get_curr_thresholds(\%threshold,$uname,$udom,$cid,$cdom,$crs); } - $headings{'abovethreshold'} = &mt('Problems with av. attempts').' ≥ '.$threshold{'av_attempts'}.' '.&mt('or deg. difficulty').' ≥ '.$threshold{'degdiff'}.' '.&mt('and total number of students with submissions').' ≥ '.$threshold{'numstudents'}; + $headings{'abovethreshold'} = + &mt('(Problems with av. attempts ≥ [_1] or deg. difficulty ≥ [_2]) [_3] and total number of '.$stulabel{$crstype}.' with submissions ≥ [_4]', + $threshold{'av_attempts'},$threshold{'degdiff'}, + ' ',$threshold{'numstudents'}); - my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail'); + my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles'); foreach my $key (keys(%{$checkallowed})) { if ($key =~ /_section$/) { next; } @@ -381,7 +481,8 @@ sub display_actions_box { } foreach my $item (@actionorder) { - unless ($item eq 'coursenormalmail' || $item eq 'coursecritmail') { + unless ($item eq 'coursenormalmail' || $item eq 'coursecritmail' || + $item eq 'newroles' || $item eq 'oldroles') { if ($show{$item}) { $needitems = 1; last; @@ -390,7 +491,7 @@ sub display_actions_box { } if ($needitems) { - &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,$rowColor1,$rowColor2,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread); + &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread); } if ($show{'coursenormalmail'}) { $msgcount = &getnormalmail(\@newmsgs); @@ -398,7 +499,12 @@ sub display_actions_box { if ($show{'coursecritmail'}) { $critmsgcount = &getcritmail(\@critmsgs); } - + if ($show{'oldroles'}) { + $expirecount = &getexpired(\%expired,$expiredstart,'previous'); + } + if ($show{'newroles'}) { + $activecount = &getactivated(\%activated,$activatedstart,'active'); + } $r->print(qq|$lt{'hial'} $lt{'shal'}
|