version 1.418, 2006/07/03 13:39:16
|
version 1.429, 2006/07/17 19:47:20
|
Line 1918 sub get_related_words {
|
Line 1918 sub get_related_words {
|
return (); |
return (); |
} |
} |
my @Words=(); |
my @Words=(); |
|
my $count=0; |
if (exists($thesaurus_db{$keyword})) { |
if (exists($thesaurus_db{$keyword})) { |
# The first element is the number of times |
# The first element is the number of times |
# the word appears. We do not need it now. |
# the word appears. We do not need it now. |
(undef,@Words) = (split(/:/,$thesaurus_db{$keyword})); |
my (undef,@RelatedWords) = (split(/:/,$thesaurus_db{$keyword})); |
for (my $i=0;$i<=$#Words;$i++) { |
my (undef,$mostfrequentcount)=split(/\,/,$RelatedWords[0]); |
($Words[$i],undef)= split(/\,/,$Words[$i]); |
my $threshold=$mostfrequentcount/10; |
|
foreach my $possibleword (@RelatedWords) { |
|
my ($word,$wordcount)=split(/\,/,$possibleword); |
|
if ($wordcount>$threshold) { |
|
push(@Words,$word); |
|
$count++; |
|
if ($count>10) { last; } |
|
} |
} |
} |
} |
} |
untie %thesaurus_db; |
untie %thesaurus_db; |
Line 3107 sub standard_css {
|
Line 3115 sub standard_css {
|
my $data_table_head = $tabbg; |
my $data_table_head = $tabbg; |
my $data_table_light = '#EEEEEE'; |
my $data_table_light = '#EEEEEE'; |
my $data_table_dark = '#DDD'; |
my $data_table_dark = '#DDD'; |
|
my $data_table_darker = '#CCC'; |
my $data_table_highlight = '#FFFF00'; |
my $data_table_highlight = '#FFFF00'; |
my $mail_new = '#FFBB77'; |
my $mail_new = '#FFBB77'; |
my $mail_new_hover = '#DD9955'; |
my $mail_new_hover = '#DD9955'; |
Line 3124 sub standard_css {
|
Line 3133 sub standard_css {
|
h1, h2, h3, th { font-family: $sans } |
h1, h2, h3, th { font-family: $sans } |
a:focus { color: red; background: yellow } |
a:focus { color: red; background: yellow } |
table.thinborder { border-collapse: collapse; } |
table.thinborder { border-collapse: collapse; } |
table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px} |
table.thinborder tr th { border-style: solid; border-width: 1px; background: $tabbg;} |
|
table.thinborder tr td { border-style: solid; border-width: 1px} |
|
|
form, .inline { display: inline; } |
form, .inline { display: inline; } |
.center { text-align: center; } |
.center { text-align: center; } |
.LC_filename {font-family: $mono;} |
.LC_filename {font-family: $mono;} |
Line 3175 table#LC_title_bar td {
|
Line 3186 table#LC_title_bar td {
|
table#LC_title_bar td.LC_title_bar_who { |
table#LC_title_bar td.LC_title_bar_who { |
background: $tabbg; |
background: $tabbg; |
color: $font; |
color: $font; |
font: medium $sans; |
font: small $sans; |
text-align: right; |
text-align: right; |
} |
} |
span.LC_title_bar_title { |
span.LC_title_bar_title { |
Line 3264 td.LC_menubuttons_img {
|
Line 3275 td.LC_menubuttons_img {
|
table.LC_data_table, table.LC_mail_list { |
table.LC_data_table, table.LC_mail_list { |
border: 1px solid #000000; |
border: 1px solid #000000; |
border-collapse: separate; |
border-collapse: separate; |
|
border-spacing: 1px; |
|
} |
|
.LC_data_table_dense { |
|
font-size: small; |
} |
} |
table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th { |
table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th { |
font-weight: bold; |
font-weight: bold; |
background-color: $data_table_head; |
background-color: $data_table_head; |
|
font-size: smaller; |
} |
} |
table.LC_data_table tr td { |
table.LC_data_table tr td { |
background-color: $data_table_light; |
background-color: $data_table_light; |
|
padding: 2px; |
} |
} |
table.LC_data_table tr.LC_even_row td { |
table.LC_data_table tr.LC_even_row td { |
background-color: $data_table_dark; |
background-color: $data_table_dark; |
} |
} |
table.LC_data_table tr.LC_empty td { |
table.LC_data_table tr.LC_data_table_highlight td { |
|
background-color: $data_table_darker; |
|
} |
|
table.LC_data_table tr.LC_empty_row td { |
background-color: #FFFFFF; |
background-color: #FFFFFF; |
|
font-weight: bold; |
|
font-style: italic; |
|
text-align: center; |
|
padding: 8px; |
} |
} |
|
|
table.LC_calendar { |
table.LC_calendar { |
Line 3474 table#LC_helpmenu_links a:hover {
|
Line 3498 table#LC_helpmenu_links a:hover {
|
background: #CCCCFF; |
background: #CCCCFF; |
} |
} |
|
|
|
table.LC_pick_box { |
|
width: 100%; |
|
border-collapse: separate; |
|
background: white; |
|
border: 1px solid black; |
|
border-spacing: 1px; |
|
} |
|
table.LC_pick_box td.LC_pick_box_title { |
|
background: $tabbg; |
|
font-weight: bold; |
|
text-align: right; |
|
width: 184px; |
|
padding: 8px; |
|
} |
|
table.LC_pick_box td.LC_pick_box_separator { |
|
padding: 0px; |
|
height: 1px; |
|
background: black; |
|
} |
|
table.LC_pick_box td.LC_pick_box_submit { |
|
text-align: right; |
|
} |
|
|
|
table.LC_group_priv_box { |
|
background: white; |
|
border: 1px solid black; |
|
border-spacing: 1px; |
|
} |
|
table.LC_group_priv_box td.LC_pick_box_title { |
|
background: $tabbg; |
|
font-weight: bold; |
|
text-align: right; |
|
width: 184px; |
|
} |
|
table.LC_group_priv_box td.LC_groups_fixed { |
|
background: $data_table_light; |
|
text-align: center; |
|
} |
|
table.LC_group_priv_box td.LC_groups_optional { |
|
background: $data_table_dark; |
|
text-align: center; |
|
} |
|
table.LC_group_priv_box td.LC_groups_functionality { |
|
background: $data_table_darker; |
|
text-align: center; |
|
font-weight: bold; |
|
} |
|
table.LC_group_priv td { |
|
text-align: left; |
|
padding: 0px; |
|
} |
|
|
|
table.LC_notify_front_page { |
|
background: white; |
|
border: 1px solid black; |
|
padding: 8px; |
|
} |
|
table.LC_notify_front_page td { |
|
padding: 8px; |
|
} |
|
.LC_navbuttons { |
|
margin: 2ex 0ex 2ex 0ex; |
|
} |
|
.LC_topic_bar { |
|
font-family: $sans; |
|
font-weight: bold; |
|
width: 100%; |
|
background: $tabbg; |
|
vertical-align: middle; |
|
margin: 2ex 0ex 2ex 0ex; |
|
} |
|
.LC_topic_bar span { |
|
vertical-align: middle; |
|
} |
|
.LC_topic_bar img { |
|
vertical-align: bottom; |
|
} |
|
table.LC_course_group_status { |
|
margin: 20px; |
|
} |
|
table.LC_status_selector td { |
|
vertical-align: top; |
|
text-align: center; |
|
padding: 4px; |
|
} |
|
table.LC_descriptive_input td.LC_description { |
|
vertical-align: top; |
|
text-align: right; |
|
font-weight: bold; |
|
} |
|
|
END |
END |
} |
} |
|
|
Line 3844 sub simple_error_page {
|
Line 3959 sub simple_error_page {
|
{ |
{ |
my $row_count; |
my $row_count; |
sub start_data_table { |
sub start_data_table { |
|
my ($add_class) = @_; |
|
my $css_class = (join(' ','LC_data_table',$add_class)); |
undef($row_count); |
undef($row_count); |
return '<table class="LC_data_table">'."\n"; |
return '<table class="'.$css_class.'">'."\n"; |
} |
} |
|
|
sub end_data_table { |
sub end_data_table { |
Line 3854 sub simple_error_page {
|
Line 3971 sub simple_error_page {
|
} |
} |
|
|
sub start_data_table_row { |
sub start_data_table_row { |
|
my ($add_class) = @_; |
$row_count++; |
$row_count++; |
return '<tr '.(($row_count % 2)?'':'class="LC_even_row"').'>'."\n";; |
my $css_class = ($row_count % 2)?'':'LC_even_row'; |
|
$css_class = (join(' ',$css_class,$add_class)); |
|
return '<tr class="'.$css_class.'">'."\n";; |
} |
} |
|
|
sub end_data_table_row { |
sub end_data_table_row { |
return '</tr>'."\n";; |
return '</tr>'."\n";; |
} |
} |
|
|
|
sub start_data_table_empty_row { |
|
$row_count++; |
|
return '<tr class="LC_empty_row" >'."\n";; |
|
} |
|
|
|
sub end_data_table_empty_row { |
|
return '</tr>'."\n";; |
|
} |
|
|
sub start_data_table_header_row { |
sub start_data_table_header_row { |
return '<tr class="LC_header_row">'."\n";; |
return '<tr class="LC_header_row">'."\n";; |
} |
} |
Line 3962 sub check_user_status {
|
Line 4091 sub check_user_status {
|
|
|
Determines all the sections for a course including |
Determines all the sections for a course including |
sections with students and sections containing other roles. |
sections with students and sections containing other roles. |
Incoming parameters: domain, course number, |
Incoming parameters: |
reference to array containing roles for which sections should |
|
be gathered (optional). If the third argument is undefined, |
1. domain |
sections are gathered for any role. |
2. course number |
|
3. reference to array containing roles for which sections should |
|
be gathered (optional). |
|
4. reference to array containing status types for which sections |
|
should be gathered (optional). |
|
|
|
If the third argument is undefined, sections are gathered for any role. |
|
If the fourth argument is undefined, sections are gathered for any status. |
|
Permissible values are 'active' or 'future' or 'previous'. |
|
|
Returns section hash (keys are section IDs, values are |
Returns section hash (keys are section IDs, values are |
number of users in each section), subject to the |
number of users in each section), subject to the |
optional roles filter. |
optional roles filter, optional status filter |
|
|
=cut |
=cut |
|
|
############################################### |
############################################### |
sub get_sections { |
sub get_sections { |
my ($cdom,$cnum,$possible_roles) = @_; |
my ($cdom,$cnum,$possible_roles,$possible_status) = @_; |
if (!defined($cdom) || !defined($cnum)) { |
if (!defined($cdom) || !defined($cnum)) { |
my $cid = $env{'request.course.id'}; |
my $cid = $env{'request.course.id'}; |
|
|
Line 3986 sub get_sections {
|
Line 4123 sub get_sections {
|
} |
} |
|
|
my %sectioncount; |
my %sectioncount; |
|
my $now = time; |
|
|
if (!defined($possible_roles) || (grep(/^st$/,@$possible_roles))) { |
if (!defined($possible_roles) || (grep(/^st$/,@$possible_roles))) { |
my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum); |
my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum); |
my $sec_index = &Apache::loncoursedata::CL_SECTION(); |
my $sec_index = &Apache::loncoursedata::CL_SECTION(); |
my $status_index = &Apache::loncoursedata::CL_STATUS(); |
my $status_index = &Apache::loncoursedata::CL_STATUS(); |
|
my $start_index = &Apache::loncoursedata::CL_START(); |
|
my $end_index = &Apache::loncoursedata::CL_END(); |
|
my $status; |
while (my ($student,$data) = each(%$classlist)) { |
while (my ($student,$data) = each(%$classlist)) { |
my ($section,$status) = ($data->[$sec_index], |
my ($section,$stu_status,$start,$end) = ($data->[$sec_index], |
$data->[$status_index]); |
$data->[$status_index], |
unless ($section eq '-1' || $section =~ /^\s*$/) { |
$data->[$start_index], |
$sectioncount{$section}++; |
$data->[$end_index]); |
|
if ($stu_status eq 'Active') { |
|
$status = 'active'; |
|
} elsif ($end < $now) { |
|
$status = 'previous'; |
|
} elsif ($start > $now) { |
|
$status = 'future'; |
|
} |
|
if ($section ne '-1' && $section !~ /^\s*$/) { |
|
if ((!defined($possible_status)) || (($status ne '') && |
|
(grep/^\Q$status\E$/,@{$possible_status}))) { |
|
$sectioncount{$section}++; |
|
} |
} |
} |
} |
} |
} |
} |
Line 4004 sub get_sections {
|
Line 4157 sub get_sections {
|
if ($user !~ /^(\w{2})/) { next; } |
if ($user !~ /^(\w{2})/) { next; } |
my ($role) = ($user =~ /^(\w{2})/); |
my ($role) = ($user =~ /^(\w{2})/); |
if ($possible_roles && !(grep(/^$role$/,@$possible_roles))) { next; } |
if ($possible_roles && !(grep(/^$role$/,@$possible_roles))) { next; } |
my $section; |
my ($section,$status); |
if ($role eq 'cr' && |
if ($role eq 'cr' && |
$user =~ m-^$role/[^/]*/[^/]*/[^/]*:[^:]*:[^:]*:(\w+)-) { |
$user =~ m-^$role/[^/]*/[^/]*/[^/]*:[^:]*:[^:]*:(\w+)-) { |
$section=$1; |
$section=$1; |
} |
} |
if ($user =~ /^$role:[^:]*:[^:]*:(\w+)/) { $section=$1; } |
if ($user =~ /^$role:[^:]*:[^:]*:(\w+)/) { $section=$1; } |
if (!defined($section) || $section eq '-1') { next; } |
if (!defined($section) || $section eq '-1') { next; } |
$sectioncount{$section}++; |
my ($end,$start) = ($courseroles{$user} =~ /^([^:]*):([^:]*)$/); |
|
if ($end == -1 && $start == -1) { |
|
next; #deleted role |
|
} |
|
if (!defined($possible_status)) { |
|
$sectioncount{$section}++; |
|
} else { |
|
if ((!$end || $end >= $now) && (!$start || $start <= $now)) { |
|
$status = 'active'; |
|
} elsif ($end < $now) { |
|
$status = 'future'; |
|
} elsif ($start > $now) { |
|
$status = 'previous'; |
|
} |
|
if (($status ne '') && (grep/^\Q$status\E$/,@{$possible_status})) { |
|
$sectioncount{$section}++; |
|
} |
|
} |
} |
} |
return %sectioncount; |
return %sectioncount; |
} |
} |
Line 4050 of the possibility of multiple values fo
|
Line 4220 of the possibility of multiple values fo
|
sub get_course_users { |
sub get_course_users { |
my ($cdom,$cnum,$types,$roles,$sections,$users,$userdata) = @_; |
my ($cdom,$cnum,$types,$roles,$sections,$users,$userdata) = @_; |
my %idx = (); |
my %idx = (); |
|
my %seclists; |
|
|
$idx{udom} = &Apache::loncoursedata::CL_SDOM(); |
$idx{udom} = &Apache::loncoursedata::CL_SDOM(); |
$idx{uname} = &Apache::loncoursedata::CL_SNAME(); |
$idx{uname} = &Apache::loncoursedata::CL_SNAME(); |
Line 4066 sub get_course_users {
|
Line 4237 sub get_course_users {
|
foreach my $student (keys(%{$classlist})) { |
foreach my $student (keys(%{$classlist})) { |
my $match = 0; |
my $match = 0; |
my $secmatch = 0; |
my $secmatch = 0; |
|
my $section = $$classlist{$student}[$idx{section}]; |
|
if ($section eq '') { |
|
$section = 'none'; |
|
} |
if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) { |
if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) { |
if (grep/^all$/,@{$sections}) { |
if (grep(/^all$/,@{$sections})) { |
$secmatch = 1; |
$secmatch = 1; |
} elsif ($$classlist{$student}[$idx{section}] eq '') { |
} elsif ($$classlist{$student}[$idx{section}] eq '') { |
if (grep/^none$/,@{$sections}) { |
if (grep(/^none$/,@{$sections})) { |
$secmatch = 1; |
$secmatch = 1; |
} |
} |
} else { |
} else { |
if (grep(/^\Q$$classlist{$student}[$idx{section}]\E$/, |
if (grep(/^\Q$section\E$/,@{$sections})) { |
@{$sections})) { |
|
$secmatch = 1; |
$secmatch = 1; |
} |
} |
} |
} |
if (!$secmatch) { |
if (!$secmatch) { |
next; |
next; |
} |
} |
} |
} |
|
push(@{$seclists{$student}},$section); |
if (defined($$types{'active'})) { |
if (defined($$types{'active'})) { |
if ($$classlist{$student}[$idx{status}] eq 'Active') { |
if ($$classlist{$student}[$idx{status}] eq 'Active') { |
push(@{$$users{st}{$student}},'active'); |
push(@{$$users{st}{$student}},'active'); |
Line 4116 sub get_course_users {
|
Line 4291 sub get_course_users {
|
if (($role) && (grep(/^\Q$role\E$/,@{$roles}))) { |
if (($role) && (grep(/^\Q$role\E$/,@{$roles}))) { |
my ($uname,$udom) = split(/:/,$user); |
my ($uname,$udom) = split(/:/,$user); |
if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) { |
if ((ref($sections) eq 'ARRAY') && (@{$sections} > 0)) { |
if (grep/^all$/,@{$sections}) { |
if (grep(/^all$/,@{$sections})) { |
$secmatch = 1; |
$secmatch = 1; |
} elsif ($usec eq '') { |
} elsif ($usec eq '') { |
if (grep/^none$/,@{$sections}) { |
if (grep(/^none$/,@{$sections})) { |
$secmatch = 1; |
$secmatch = 1; |
} |
} |
} else { |
} else { |
Line 4131 sub get_course_users {
|
Line 4306 sub get_course_users {
|
next; |
next; |
} |
} |
} |
} |
|
if ($usec eq '') { |
|
$usec = 'none'; |
|
} |
if ($uname ne '' && $udom ne '') { |
if ($uname ne '' && $udom ne '') { |
my $status = &check_user_status($udom,$uname,$cdom,$cnum,$role, |
my $status = &check_user_status($udom,$uname,$cdom,$cnum,$role, |
$usec); |
$usec); |
foreach my $type (keys(%{$types})) { |
foreach my $type (keys(%{$types})) { |
if ($status eq $type) { |
if ($status eq $type) { |
@{$$users{$role}{$user}} = $type; |
if (!grep(/^\Q$type\E$/,@{$$users{$role}{$user}})) { |
|
push(@{$$users{$role}{$user}},$type); |
|
} |
$match = 1; |
$match = 1; |
} |
} |
} |
} |
if (($match) && (ref($userdata) eq 'HASH') && |
if (($match) && (ref($userdata) eq 'HASH')) { |
(!exists($$userdata{$uname.':'.$udom}))) { |
if (!exists($$userdata{$uname.':'.$udom})) { |
&get_user_info($udom,$uname,\%idx,$userdata); |
&get_user_info($udom,$uname,\%idx,$userdata); |
|
} |
|
if (!grep(/^\Q$usec\E$/,@{$seclists{$uname.':'.$udom}})) { |
|
push(@{$seclists{$uname.':'.$udom}},$usec); |
|
} |
} |
} |
} |
} |
} |
} |
Line 4156 sub get_course_users {
|
Line 4340 sub get_course_users {
|
if (defined($userdata) && |
if (defined($userdata) && |
!exists($$userdata{$owner.':'.$cdom})) { |
!exists($$userdata{$owner.':'.$cdom})) { |
&get_user_info($cdom,$owner,\%idx,$userdata); |
&get_user_info($cdom,$owner,\%idx,$userdata); |
|
if (!grep(/^none$/,@{$seclists{$owner.':'.$cdom}})) { |
|
push(@{$seclists{$owner.':'.$cdom}},'none'); |
|
} |
} |
} |
} |
} |
} |
} |
} |
} |
|
foreach my $user (keys(%seclists)) { |
|
@{$seclists{$user}} = (sort {$a <=> $b} @{$seclists{$user}}); |
|
$$userdata{$user}[$idx{section}] = join(',',@{$seclists{$user}}); |
|
} |
} |
} |
return; |
return; |
} |
} |