[LON-CAPA-cvs] cvs: loncom /html/adm/help/tex Chart_Enrollment_Status.tex /interface lonhtmlcommon.pm lonstatistics.pm /interface/spreadsheet classcalc.pm /interface/statistics loncorrectproblemplot.pm longradinganalysis.pm lonproblemanalysis.pm lonproblemstatistics.pm lonstudentassessment.pm lonstudentsubmissions.pm lonsubmissiontimeanalysis.pm lonsurveyreports.pm
raeburn
lon-capa-cvs@mail.lon-capa.org
Fri, 18 Aug 2006 15:15:45 -0000
This is a MIME encoded message
--raeburn1155914145
Content-Type: text/plain
raeburn Fri Aug 18 11:15:45 2006 EDT
Modified files:
/loncom/interface lonstatistics.pm lonhtmlcommon.pm
/loncom/interface/statistics loncorrectproblemplot.pm
longradinganalysis.pm
lonproblemanalysis.pm
lonproblemstatistics.pm
lonstudentassessment.pm
lonstudentsubmissions.pm
lonsubmissiontimeanalysis.pm
lonsurveyreports.pm
/loncom/interface/spreadsheet classcalc.pm
/loncom/html/adm/help/tex Chart_Enrollment_Status.tex
Log:
Bug 4954. Filter title changed from "Enrollment Status" to "Access Status". Access Status selections in lonhtmlcommon set to:
Currently Has Access
Will Have Future Access
Previously Had Access
Any Access Status
See comment appended to bug 4954 for more information.
Documentation updated to include ability to selectively display students with future access.
--raeburn1155914145
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20060818111545.txt"
Index: loncom/interface/lonstatistics.pm
diff -u loncom/interface/lonstatistics.pm:1.136 loncom/interface/lonstatistics.pm:1.137
--- loncom/interface/lonstatistics.pm:1.136 Tue May 30 08:46:09 2006
+++ loncom/interface/lonstatistics.pm Fri Aug 18 11:15:38 2006
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstatistics.pm,v 1.136 2006/05/30 12:46:09 www Exp $
+# $Id: lonstatistics.pm,v 1.137 2006/08/18 15:15:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -432,7 +432,7 @@
=item §ion_and_enrollment_description
Returns a string describing the currently selected section(s), group(s) and
-enrollment status.
+access status.
Inputs: mode = 'plaintext' or 'localized' (defaults to 'localized')
'plaintext' is used for example in Excel spreadsheets.
@@ -449,9 +449,9 @@
my @groups = &Apache::lonstatistics::get_selected_groups();
my $description;
if ($mode eq 'localized') {
- $description = &mt('Unable to determine section, groups and enrollment');
+ $description = &mt('Unable to determine section, groups and access status');
} elsif ($mode eq 'plaintext') {
- $description = 'Unable to determine section, groups and enrollment';
+ $description = 'Unable to determine section, groups and access status';
} else {
$description = 'Bad parameter passed to lonstatistics::section_and_enrollment_description';
&Apache::lonnet::logthis($description);
@@ -459,9 +459,9 @@
$description = §ion_or_group_text($mode,'section',@sections).
' '.§ion_or_group_text($mode,'group',@groups);
if ($mode eq 'localized') {
- $description .= &mt(' [_1] enrollment status.',$env{'form.Status'});
+ $description .= &mt(' [_1] access status.',$env{'form.Status'});
} elsif ($mode eq 'plaintext') {
- $description .= ' '.$env{'form.Status'}.' enrollment status.';
+ $description .= ' '.$env{'form.Status'}.' access status.';
}
return $description;
}
@@ -931,7 +931,7 @@
$Str .= '<tr>';
$Str .= '<th align="center"><b>'.&mt('Sections').'</b></th>';
$Str .= '<th align="center"><b>'.&mt('Groups').'</b></th>';
- $Str .= '<th align="center"><b>'.&mt('Enrollment Status').'</b></th>';
+ $Str .= '<th align="center"><b>'.&mt('Access Status').'</b></th>';
$Str .= '</tr>'.$/;
$Str .= '<tr>';
$Str .= '<td>'.
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.152 loncom/interface/lonhtmlcommon.pm:1.153
--- loncom/interface/lonhtmlcommon.pm:1.152 Tue Aug 8 15:10:54 2006
+++ loncom/interface/lonhtmlcommon.pm Fri Aug 18 11:15:38 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.152 2006/08/08 19:10:54 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.153 2006/08/18 15:15:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -699,10 +699,10 @@
}
$Str .= ' size="'.$size.'" ';
$Str .= '>'."\n";
- foreach my $type (['Active', &mt('Currently Enrolled')],
- ['Future', &mt('Future Enrollment')],
- ['Expired', &mt('Previously Enrolled')],
- ['Any', &mt('Any Enrollment Status')]) {
+ foreach my $type (['Active', &mt('Currently Has Access')],
+ ['Future', &mt('Will Have Future Access')],
+ ['Expired', &mt('Previously Had Access')],
+ ['Any', &mt('Any Access Status')]) {
my ($name,$label) = @$type;
$Str .= '<option value="'.$name.'" ';
if ($status eq $name) {
Index: loncom/interface/statistics/loncorrectproblemplot.pm
diff -u loncom/interface/statistics/loncorrectproblemplot.pm:1.20 loncom/interface/statistics/loncorrectproblemplot.pm:1.21
--- loncom/interface/statistics/loncorrectproblemplot.pm:1.20 Fri May 5 16:03:43 2006
+++ loncom/interface/statistics/loncorrectproblemplot.pm Fri Aug 18 11:15:38 2006
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: loncorrectproblemplot.pm,v 1.20 2006/05/05 20:03:43 raeburn Exp $
+# $Id: loncorrectproblemplot.pm,v 1.21 2006/08/18 15:15:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -297,7 +297,7 @@
$Str .= '<tr>';
$Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
$Str .= '<td align="center"><b>'.&mt('Groups').'</b></td>';
- $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
+ $Str .= '<td align="center"><b>'.&mt('Access Status').'</b></td>';
$Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>';
$Str .= '<td rowspan="2">'.
&Apache::lonstathelpers::limit_by_time_form().'</td>';
Index: loncom/interface/statistics/longradinganalysis.pm
diff -u loncom/interface/statistics/longradinganalysis.pm:1.6 loncom/interface/statistics/longradinganalysis.pm:1.7
--- loncom/interface/statistics/longradinganalysis.pm:1.6 Thu Jun 1 15:21:22 2006
+++ loncom/interface/statistics/longradinganalysis.pm Fri Aug 18 11:15:38 2006
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: longradinganalysis.pm,v 1.6 2006/06/01 19:21:22 albertel Exp $
+# $Id: longradinganalysis.pm,v 1.7 2006/08/18 15:15:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -309,7 +309,7 @@
$str .= '<tr>';
$str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
$str .= '<td align="center"><b>'.&mt('Groups').'</b></td>';
- $str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
+ $str .= '<td align="center"><b>'.&mt('Access Status').'</b></td>';
$str .= '<td>'.&mt('<b>Output as</b> [_1]',$output_selector).'</td>';
$str .= '</tr>'."\n";
##
Index: loncom/interface/statistics/lonproblemanalysis.pm
diff -u loncom/interface/statistics/lonproblemanalysis.pm:1.127 loncom/interface/statistics/lonproblemanalysis.pm:1.128
--- loncom/interface/statistics/lonproblemanalysis.pm:1.127 Thu Aug 17 17:19:47 2006
+++ loncom/interface/statistics/lonproblemanalysis.pm Fri Aug 18 11:15:38 2006
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonproblemanalysis.pm,v 1.127 2006/08/17 21:19:47 raeburn Exp $
+# $Id: lonproblemanalysis.pm,v 1.128 2006/08/18 15:15:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1835,7 +1835,7 @@
$Str .= '<tr>';
$Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
$Str .= '<td align="center"><b>'.&mt('Groups').'</b></td>';
- $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
+ $Str .= '<td align="center"><b>'.&mt('Access Status').'</b></td>';
$Str .= '<td align="center"> </td>';
$Str .= '</tr>'."\n";
##
Index: loncom/interface/statistics/lonproblemstatistics.pm
diff -u loncom/interface/statistics/lonproblemstatistics.pm:1.109 loncom/interface/statistics/lonproblemstatistics.pm:1.110
--- loncom/interface/statistics/lonproblemstatistics.pm:1.109 Tue May 30 08:46:50 2006
+++ loncom/interface/statistics/lonproblemstatistics.pm Fri Aug 18 11:15:38 2006
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonproblemstatistics.pm,v 1.109 2006/05/30 12:46:50 www Exp $
+# $Id: lonproblemstatistics.pm,v 1.110 2006/08/18 15:15:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -617,7 +617,7 @@
$Str .= '<tr>';
$Str .= '<td align="center"><b>'.&mt('Sections').'</b></td>';
$Str .= '<td align="center"><b>'.&mt('Groups').'</b></td>';
- $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b></td>';
+ $Str .= '<td align="center"><b>'.&mt('Access Status').'</b></td>';
$Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b></td>';
$Str .= '<td align="center"><b>'.&mt('Statistics').'</b></td>';
$Str .= '<td rowspan="2">'.
Index: loncom/interface/statistics/lonstudentassessment.pm
diff -u loncom/interface/statistics/lonstudentassessment.pm:1.142 loncom/interface/statistics/lonstudentassessment.pm:1.143
--- loncom/interface/statistics/lonstudentassessment.pm:1.142 Sun Jul 2 23:54:32 2006
+++ loncom/interface/statistics/lonstudentassessment.pm Fri Aug 18 11:15:38 2006
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentassessment.pm,v 1.142 2006/07/03 03:54:32 albertel Exp $
+# $Id: lonstudentassessment.pm,v 1.143 2006/08/18 15:15:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -330,7 +330,7 @@
$Str .= '<td align="center"><b>'.&mt('Student Data</b>').
&Apache::loncommon::help_open_topic("Chart_Student_Data").
'</td>';
- $Str .= '<td align="center"><b>'.&mt('Enrollment Status').'</b>'.
+ $Str .= '<td align="center"><b>'.&mt('Access Status').'</b>'.
&Apache::loncommon::help_open_topic("Chart_Enrollment_Status").
'</td>';
$Str .= '<td align="center"><b>'.&mt('Sequences and Folders').'</b>'.
Index: loncom/interface/statistics/lonstudentsubmissions.pm
diff -u loncom/interface/statistics/lonstudentsubmissions.pm:1.45 loncom/interface/statistics/lonstudentsubmissions.pm:1.46
--- loncom/interface/statistics/lonstudentsubmissions.pm:1.45 Tue May 30 08:46:50 2006
+++ loncom/interface/statistics/lonstudentsubmissions.pm Fri Aug 18 11:15:38 2006
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentsubmissions.pm,v 1.45 2006/05/30 12:46:50 www Exp $
+# $Id: lonstudentsubmissions.pm,v 1.46 2006/08/18 15:15:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1090,7 +1090,7 @@
$Str .= '<tr>';
$Str .= '<th>'.&mt('Sections').'</th>';
$Str .= '<th>'.&mt('Groups').'</th>';
- $Str .= '<th>'.&mt('Enrollment Status').'</th>';
+ $Str .= '<th>'.&mt('Access Status').'</th>';
$Str .= '<th>'.&mt('Output as [_1]',$output_selector).'</th>';
$Str .= '</tr>'."\n";
#
Index: loncom/interface/statistics/lonsubmissiontimeanalysis.pm
diff -u loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.26 loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.27
--- loncom/interface/statistics/lonsubmissiontimeanalysis.pm:1.26 Fri May 5 16:03:43 2006
+++ loncom/interface/statistics/lonsubmissiontimeanalysis.pm Fri Aug 18 11:15:38 2006
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonsubmissiontimeanalysis.pm,v 1.26 2006/05/05 20:03:43 raeburn Exp $
+# $Id: lonsubmissiontimeanalysis.pm,v 1.27 2006/08/18 15:15:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -402,7 +402,7 @@
$Str .= '<tr>';
$Str .= '<th align="center">'.&mt('Sections').'</th>';
$Str .= '<th align="center">'.&mt('Groups').'</th>';
- $Str .= '<th align="center">'.&mt('Enrollment Status').'</th>';
+ $Str .= '<th align="center">'.&mt('Access Status').'</th>';
$Str .= '</tr>'."\n";
##
##
Index: loncom/interface/statistics/lonsurveyreports.pm
diff -u loncom/interface/statistics/lonsurveyreports.pm:1.13 loncom/interface/statistics/lonsurveyreports.pm:1.14
--- loncom/interface/statistics/lonsurveyreports.pm:1.13 Tue May 30 08:46:50 2006
+++ loncom/interface/statistics/lonsurveyreports.pm Fri Aug 18 11:15:38 2006
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonsurveyreports.pm,v 1.13 2006/05/30 12:46:50 www Exp $
+# $Id: lonsurveyreports.pm,v 1.14 2006/08/18 15:15:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -615,7 +615,7 @@
$Str .= '<tr>';
$Str .= '<th>'.&mt('Sections').'</th>';
$Str .= '<th>'.&mt('Groups').'</th>';
- $Str .= '<th>'.&mt('Enrollment Status').'</th>';
+ $Str .= '<th>'.&mt('Access Status').'</th>';
$Str .= '<th>'.&mt('Output Format').'</th>';
$Str .= '<th>'.' '.'</th>';
$Str .= '</tr>'."\n";
Index: loncom/interface/spreadsheet/classcalc.pm
diff -u loncom/interface/spreadsheet/classcalc.pm:1.27 loncom/interface/spreadsheet/classcalc.pm:1.28
--- loncom/interface/spreadsheet/classcalc.pm:1.27 Mon May 1 02:17:16 2006
+++ loncom/interface/spreadsheet/classcalc.pm Fri Aug 18 11:15:39 2006
@@ -1,5 +1,5 @@
#
-# $Id: classcalc.pm,v 1.27 2006/05/01 06:17:16 raeburn Exp $
+# $Id: classcalc.pm,v 1.28 2006/08/18 15:15:39 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -85,7 +85,7 @@
&Apache::lonstatistics::clear_classlist_variables();
foreach (['Sections',&Apache::lonstatistics::SectionSelect('Section','multiple',3)],
['Groups',&Apache::lonstatistics::GroupSelect('Group','multiple',3)],
- ['Enrollment Status',&Apache::lonhtmlcommon::StatusOptions(undef,undef,3)],
+ ['Access Status',&Apache::lonhtmlcommon::StatusOptions(undef,undef,3)],
['Output Format',$self->output_selector()]) {
my ($name,$selector) = @{$_};
$toprow .= '<th align="center"><b>'.&mt($name).'</b></th>';
Index: loncom/html/adm/help/tex/Chart_Enrollment_Status.tex
diff -u loncom/html/adm/help/tex/Chart_Enrollment_Status.tex:1.1 loncom/html/adm/help/tex/Chart_Enrollment_Status.tex:1.2
--- loncom/html/adm/help/tex/Chart_Enrollment_Status.tex:1.1 Sun Jun 19 13:58:59 2005
+++ loncom/html/adm/help/tex/Chart_Enrollment_Status.tex Fri Aug 18 11:15:39 2006
@@ -1,7 +1,10 @@
\label{Chart_Enrollment_Status}
-The default is to see students who are currently enrolled in your
-class. You can choose to view dropped students by selecting previous
-enrolled. You can also choose to view all students (currently enrolled,
-dropped students, and students who are in the course but have not
-reached their enrollment date).
+The default is to see students who currently have access to your
+course. You can choose to view dropped students by selecting ``Previously
+Had Access'', and students who are enrolled in the course but have not
+reached their access start date by selecting ``Will Have Future Access''.
+ You can also choose to view all students
+(students who currently have access, dropped students,
+ and students who are enrolled in the course but have not
+reached their access start date) by selecting ``Any Access Status''.
--raeburn1155914145--