-Set Defaults for All Resources in $foldermap$showtitle $uname \($person\) $uname \($person\) ".&mt('all').' ".&mt('all').' $cgroup".
- " $cgroup".
+ " $csec".
- " $csec".
+ " $coursename \n");
+ $r->print(''
+ .&mt('Set Defaults for All Resources in [_1]Specifically for [_2][_3]'
+ ,$foldermap.''.$showtitle.' '.$coursename.' \n"
+ );
#---------------------------------------------------------------- print table
$r->print('
');
$r->print(''.&mt('Parameter Name').' ');
@@ -1878,7 +2000,7 @@ ENDMAPONE
\%type,\%display,$defbgone,$defbgtwo,$defbgthree,
$parmlev,$uname,$udom,$csec,$cgroup);
}
- $r->print("
");
+ $r->print("
'.
+ &mt("Invalid email address specified, address must be of the form username:domain what was specified was ([_1])",$user).
+ ' ';
+ undef($value);
+ } elsif (&Apache::lonnet::homeserver($user,$domain) eq 'no_host') {
+ $setoutput.= ''.
+ &mt("Invalid email address specified, user [_1] is unknown.",$name).
+ ' ';
+ undef($value);
+ }
+ }
+ }
# Get existing cloners
my @oldcloner = ();
if ($name eq 'cloners') {
@@ -2048,40 +2204,89 @@ sub crsenv {
#
# Let the user know we made the changes
if ($name && defined($value)) {
- my $failed_cloners;
+ my %failed_cloners;
if ($name eq 'cloners') {
$value =~ s/\s//g;
$value =~ s/^,//;
$value =~ s/,$//;
# check requested clones are valid users.
- $failed_cloners = &check_cloners(\$value,\@oldcloner);
+ %failed_cloners = &check_cloners(\$value,\@oldcloner);
}
my $put_result = &Apache::lonnet::put('environment',
{$name=>$value},$dom,$crs);
if ($put_result eq 'ok') {
- $setoutput.=&mt('Set').' '.$name.' '.&mt('to').' '.$value.' .'.$name.' '.&mt('to').' ';
+ if ($name =~ /^default_enrollment_(start|end)_date$/) {
+ $setoutput .= &Apache::lonlocal::locallocaltime($value);
+ } elsif ($name eq 'categories') {
+ $setoutput .= $env{'form.categories_display'};
+ } else {
+ $setoutput .= $value;
+ }
+ $setoutput .= ' .'.$name.' '.&mt('to').
' '.$value.' '.&mt('due to').' '.$put_result.'.'.$failed_cloners.' , '.
- &mt('reason').' - '.&mt('LON-CAPA user(s) do(es) not exist').
- '.'.
- &mt('add the user(s)').' , '.
- &mt('and then return to the ').
- ''.
- &mt('Course Parameters page').' '.
- &mt('to add the new user(s) to the list of possible cloners').
- '.'.$failed_cloners{'format'}.
+ ' , '.&mt('reason').' - '.
+ &mt('Invalid format');
+ $num ++;
+ }
+ if (defined($failed_cloners{'domain'})) {
+ $fails[$num] .= ''.$failed_cloners{'domain'}.
+ ' , '.&mt('reason').' - '.
+ &mt('Domain does not exist');
+ $num ++;
+ }
+ if (defined($failed_cloners{'newuser'})) {
+ $fails[$num] .= ''.$failed_cloners{'newuser'}. ' , '.&mt('reason').' - '.
+ &mt('LON-CAPA user(s) do(es) not exist.').
+ '.'.
+ &mt('add the user(s)').' , '.
+ &mt('and then return to the ').
+ ''.
+ &mt('Course Parameters page').' '.
+ &mt('to add the new user(s) to the list of possible cloners');
+ }
+ $setoutput .= join('; ',@fails).'.'.&mt('Top Level Map').' '.
+ ('url' => ''.&mt('Top Level Map').' ".
&mt('Select Map').' '.
- &mt('Modification may make assessment data inaccessible').
+ &mt('Modification may make assessment data inaccessible!').
' ',
'description' => ''.&mt('Course Description').' ',
'courseid' => ''.&mt('Course ID or number').
' '.&mt('Users allowed to clone course').' (user:domain,user:domain) '.&mt('Users allowed to clone course').' '.&mt('user:domain,user:domain,*:domain').' ")*:domain "').'* "'),
'grading' => ''.&mt('Grading').' "standard", "external", or "spreadsheet" '.&Apache::loncommon::help_open_topic('GradingOptions'),
- 'default_xml_style' => ''.&mt('Default XML Style File').' '.
+ &mt('[_1], [_2], or [_3]','"standard "','"external "','"spreadsheet "').&Apache::loncommon::help_open_topic('GradingOptions'),
+ 'task_grading' => ''.&mt('Bridge Task Grading').' any "','"section "').')',
+ 'default_xml_style' => ''.&mt('Default XML Style File').' $SelectStyleFile '.&mt('Feedback Addresses for Resource Content Question').
- ' user:domain,'.
- 'user:domain(section;section;...;*;...),... )',
- 'question.email.text' => ''.&mt('Custom Text for Resource Content Question Option in Feedback').
- ' ',
- 'comment.email' => ''.&mt('Feedback Addresses for Course Content Comments').' user:domain,user:domain(section;section;...;*;...),... )',
- 'comment.email.text' => ''.&mt('Custom Text for Course Content Option in Feedback').
- ' ',
- 'policy.email' => ''.&mt('Feedback Addresses for Course Policy').' '.
- 'user:domain,user:domain(section;section;...;*;...),... )',
- 'policy.email.text' => ''.&mt('Custom Text for Course Policy Option in Feedback').
- ' ',
- 'hideemptyrows' => ''.&mt('Hide Empty Rows in Spreadsheets').' yes ').')',
- 'pageseparators' => ''.&mt('Visibly Separate Items on Pages').' yes ').', '.
- &mt('changes will not show until next login').')',
- 'student_classlist_view' => ''.&mt('Allow students to view classlist.').' '.&mt('("all":students can view all sections,"section":students can only view their own section.blank or "disabled" prevents student view.'),
-
- 'plc.roles.denied'=> ''.&mt('Disallow live chatroom use for Roles').
- ' st ": '.
- &mt('student').', "ta ": '.
- 'TA, "in ": '.
- &mt('instructor').';'.&mt('role,role,...').' ) '.
- Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
+ 'question.email' => ''.&mt('Feedback Addresses for Resource Content Question').' '.&mt('user:domain,user:domain(section;section;...;*;...),...').' ")',
+ 'question.email.text' => ''.&mt('Custom Text for Resource Content Question Option in Feedback').' ',
+ 'comment.email' => ''.&mt('Feedback Addresses for Course Content Comments').' '.&mt('user:domain,user:domain(section;section;...;*;...),...').' ")',
+ 'comment.email.text' => ''.&mt('Custom Text for Course Content Option in Feedback').' ',
+ 'policy.email' => ''.&mt('Feedback Addresses for Course Policy').' '.&mt('user:domain,user:domain(section;section;...;*;...),...').' ")',
+ 'policy.email.text' => ''.&mt('Custom Text for Course Policy Option in Feedback').' ',
+ 'hideemptyrows' => ''.&mt('Hide Empty Rows in Spreadsheets').' yes "').')',
+ 'pageseparators' => ''.&mt('Visibly Separate Items on Pages').' yes "').' '
+ .&mt('Changes will not show until next login.').')',
+ 'student_classlist_view' => ''.&mt('Allow students to view classlist.').' all "','"section "','"disabled "').')',
+ 'student_classlist_portfiles' => ''.&mt('Include link to accessible portfolio files').' yes "').')',
+ 'student_classlist_opt_in' => ''.&mt("Student's agreement needed for listing in student-viewable roster").' yes "').')',
+ 'plc.roles.denied'=> ''.&mt('Disallow live chatroom use for Roles').' st "','"ta "','"in "').')'.&mt('role,role,...').' ") '
+ .Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
'plc.users.denied' =>
''.&mt('Disallow live chatroom use for Users').' user:domain,user:domain,... )',
+ '("'.&mt('user:domain,user:domain,...').' ")',
- 'pch.roles.denied'=> ''.&mt('Disallow Resource Discussion for Roles').
- ' st ": '.
- 'student, "ta ": '.
- 'TA, "in ": '.
- 'instructor;role,role,... ) '.
- Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
+ 'pch.roles.denied'=> ''.&mt('Disallow Resource Discussion for Roles').' st "','"ta "','"in "')
+ .'("'.&mt('role,role,...').' ") '
+ .Apache::loncommon::help_open_topic("Course_Disable_Discussion"),
'pch.users.denied' =>
''.&mt('Disallow Resource Discussion for Users').' user:domain,user:domain,... )',
+ '("'.&mt('user:domain,user:domain,...').' ")',
'spreadsheet_default_classcalc'
=> ''.&mt('Default Course Spreadsheet').' '.
'$SelectSpreadsheetFile '.&mt('Default Student Spreadsheet').' '.
+ => ''.&mt('Default Student Spreadsheet').' $SelectSpreadsheetFile '.&mt('Allow limited HTML in discussion posts').' yes ").')',
+ '('.&mt('Set value to [_1] to allow.','"yes "').')',
'allow_discussion_post_editing'
- => ''.&mt('Allow users with specified roles to edit/delete their own discussion posts').' st ": '.
- &mt('student').', "ta ": '.
- 'TA, "in ": '.
- &mt('instructor').'; ('.&mt('role:section,role:section,..., e.g., st:001,st:002,in,cc would permit students in sections 001 and 002 and instructors in any section, and course coordinators to edit their own posts.').' )yes ").')',
+ => ''.&mt('Allow users with specified roles to edit/delete their own discussion posts').' st "','"ta "','"in "').')yes "').')'
+ .'("'.&mt('role:section,role:section,...').' ")st:001,st:002,in,cc " would permit students in sections 001 and 002 and instructors in any section, and course coordinators to edit their own posts.').')',
'rndseed'
- => ''.&mt('Randomization algorithm used').' '.&mt('Modifying this will make problems').' '.
- &mt('have different numbers and answers').' ',
+ => ''.&mt('Randomization algorithm used').' '
+ .&mt('Modifying this will make problems have different numbers and answers!')
+ .' ',
'receiptalg'
=> ''.&mt('Receipt algorithm used').' '.&mt('Suppress number of tries in printing').' yes ').')',
+ ' ('.&mt('[_1] to suppress, anything else to not suppress','"yes "').')',
'problem_stream_switch'
=> ''.&mt('Allow problems to be split over pages').' yes ').')',
+ ' ('.&mt('[_1] if allowed, anything else if not','"yes "').')',
'default_paper_size'
=> ''.&mt('Default paper type').' Print header format; substitutions : %n student name %c course id %a assignment note, numbers after the % limit the field size',
- 'anonymous_quiz'
- => ''.&mt('Anonymous quiz/exam').' '.&mt('yes').' '.&mt('to avoid print students names').' '.&mt('Print header format').' % limit the field size.','"%n "','"%c "','"%a "'),
'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,... )',
+ 'nothideprivileged' => ''.&mt('Privileged users that should not be hidden on staff listings').' '.&mt('user:domain,user:domain,*:domain').' ")',
'languages' => ''.&mt('Languages used').' ',
'disable_receipt_display'
=> ''.&mt('Disable display of problem receipts').' yes ').')',
'task_messages'
- => ''.&mt('Send message to student when clicking Done on Tasks').' only_student ','student_and_user_notes_screen ').')',
+ => ''.&mt('Send message to student when clicking Done on Tasks').' only_student "','"student_and_user_notes_screen "').')',
'disablesigfigs'
=> ''.&mt('Disable checking of Significant Figures').' yes ').')',
@@ -2224,23 +2432,55 @@ sub crsenv {
'externalsyllabus'
=> ''.&mt('URL of Syllabus (not using internal handler)').' ',
'tthoptions'
- => ''.&mt('Default set of options to pass to tth/m when converting tex').' '
- );
- my @Display_Order = ('url','description','courseid','cloners','grading',
+ => ''.&mt('Default set of options to pass to tth/m when converting tex').' ',
+
+ 'texengine'
+ => ''.&mt('Force all students in the course to use a specific math rendering engine.').' jsMath "','"mimetex "','"tth "').')',
+ 'timezone'
+ => ''.&mt('Timezone in which the course takes place').' ',
+
+ 'suppress_embed_prompt'
+ => ''.&mt('Suppress prompt to upload items referenced in a web page being uploaded to portfolio, when current role is student.').' yes "').')',
+ 'hidefromcat'
+ => ''.&mt('Exclude from course catalog').' yes "').')',
+ 'categories'
+ => ''.&mt('Categorize course').' '.
+ &mt('Display Categories').' ',
+ 'datelocale'
+ => ''.&mt('Locale used for course calendar').' ',
+ );
+ my @Display_Order = ('url','description','courseid','cloners');
+ (my $can_toggle_cat,$can_categorize) = &can_modify_catsettings($dom);
+ if ($can_toggle_cat) {
+ push(@Display_Order,'hidefromcat');
+ }
+ if ($can_categorize) {
+ push(@Display_Order,'categories');
+ }
+ push (@Display_Order,('grading',
'externalsyllabus',
'default_xml_style','pageseparators',
- 'question.email','question.email.text','comment.email','comment.email.text','policy.email','policy.email.text',
+ 'question.email','question.email.text','comment.email',
+ 'comment.email.text','policy.email','policy.email.text',
'student_classlist_view',
+ 'student_classlist_opt_in',
+ 'student_classlist_portfiles',
'plc.roles.denied','plc.users.denied',
'pch.roles.denied','pch.users.denied',
'allow_limited_html_in_feedback',
'allow_discussion_post_editing',
'languages',
+ 'timezone',
+ 'datelocale',
'nothideprivileged',
'rndseed',
'receiptalg',
'problem_stream_switch',
'suppress_tries',
+ 'suppress_embed_prompt',
'default_paper_size',
'print_header_format',
'disable_receipt_display',
@@ -2251,12 +2491,14 @@ sub crsenv {
'default_enrollment_start_date',
'default_enrollment_end_date',
'tthoptions',
+ 'texengine',
'disablesigfigs',
'disableexampointprint',
- 'task_messages'
- );
+ 'task_messages','task_grading'));
foreach my $parameter (sort(keys(%values))) {
- unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
+ unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
+ ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
+ || ($parameter eq 'type')) {
if (! $descriptions{$parameter}) {
$descriptions{$parameter}=$parameter;
push(@Display_Order,$parameter);
@@ -2279,6 +2521,39 @@ sub crsenv {
$values{$parameter},
$onchange).
'';
+ } elsif ($parameter eq 'timezone') {
+ my $includeempty = 1;
+ my $timezone = &Apache::lonlocal::gettimezone();
+ $output .= ''.
+ &Apache::loncommon::select_timezone($parameter.'_value',
+ $timezone,
+ $onchange,$includeempty).' ';
+ } elsif ($parameter eq 'datelocale') {
+ my $includeempty = 1;
+ my $locale_obj = &Apache::lonlocal::getdatelocale();
+ my $currdatelocale;
+ if (ref($locale_obj)) {
+ $currdatelocale = $locale_obj->id();
+ }
+ $output .= ''.
+ &Apache::loncommon::select_datelocale($parameter.'_value',
+ $currdatelocale,
+ $onchange,$includeempty).' ';
+ } elsif ($parameter eq 'categories') {
+ my $catdisplay;
+ if ($values{'categories'} ne '') {
+ my @curritems = split(/\&/,$values{'categories'});
+ foreach my $item (@curritems) {
+ my ($name,$parent,$pos) = split(/:/,$item);
+ $catdisplay .= &unescape($name).'&';
+ }
+ $catdisplay =~ s/\&$//;
+ }
+ $output .= ''.
+ ' ';
} else {
$output .= ''.
&Apache::lonhtmlcommon::textbox($parameter.'_value',
@@ -2305,21 +2580,33 @@ sub crsenv {
my %lt=&Apache::lonlocal::texthash(
'par' => 'Parameter',
'val' => 'Value',
- 'set' => 'Set',
- 'sce' => 'Set Course Environment'
+ 'set' => 'Set?',
+ 'sav' => 'Save'
);
my $Parameter=&mt('Parameter');
my $Value=&mt('Value');
my $Set=&mt('Set');
- my $browse_js=
- '';
-
+ my ($jscript,$categorize_js);
+ my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
+ if ($can_categorize) {
+ $categorize_js = <';
my $start_page =
&Apache::loncommon::start_page('Set Course Environment',
- $browse_js);
+ $jscript);
my $end_page =
&Apache::loncommon::end_page();
my $end_table=&Apache::loncommon::end_data_table();
@@ -2328,17 +2615,110 @@ $start_page
$breadcrumbs
$end_page
ENDENV
}
+
+sub can_modify_catsettings {
+ my ($dom) = @_;
+ my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
+ my ($can_toggle_cat,$can_categorize);
+ if (ref($domconf{'coursecategories'}) eq 'HASH') {
+ if ($domconf{'coursecategories'}{'togglecats'} eq 'crs') {
+ $can_toggle_cat = 1;
+ }
+ if ($domconf{'coursecategories'}{'categorize'} eq 'crs') {
+ $can_categorize = 1;
+ }
+ }
+ return ($can_toggle_cat,$can_categorize);
+}
+
+sub assign_course_categories {
+ my ($r) = @_;
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $hascats = 0;
+ my $cathash;
+ my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
+ if (ref($domconf{'coursecategories'}) eq 'HASH') {
+ $cathash = $domconf{'coursecategories'}{'cats'};
+ if (ref($cathash) eq 'HASH') {
+ $hascats = 1;
+ }
+ }
+ my $catwin_js;
+ if ($hascats) {
+ my $alert = &mt('Use \"Save\" in the main window to save course categories');
+ $catwin_js = <
+
+function updateCategories() {
+ var newcategories = '';
+ var unescapedcats = '';
+ if (document.chgcats.usecategory.length) {
+ for (var i=0; i 0) {
+ newcategories = newcategories.slice(0,-1);
+ }
+ if (unescapedcats.length > 0) {
+ unescapedcats = unescapedcats.slice(0,-3);
+ }
+ } else {
+ if (document.chgcats.usecategory.checked == true) {
+ newcategories = document.chgcats.usecategory.value;
+ unescapedcats = document.chgcats.catname.value;
+ }
+ }
+ opener.document.envform.categories_value.value = newcategories;
+ opener.document.envform.categories_display.value = unescapedcats;
+ opener.document.envform.categories_setparmval.checked = true;
+ alert("$alert");
+ self.close();
+ return;
+}
+
+
+ENDSCRIPT
+ } else {
+ my $onload;
+ }
+ my $start_page =
+ &Apache::loncommon::start_page('Course Categories',$catwin_js,
+ {'only_body' => 1,});
+ my $end_page = &Apache::loncommon::end_page();
+ my $categoriesform = ''.&mt('Categorize Course').' ';
+ if ($hascats) {
+ my %currsettings =
+ &Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum);
+ $categoriesform .= &mt('Assign one or more categories to this course.').''.
- &mt('Error storing parameters').'
');
+ &mt('Error saving parameters').'');
}
&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
} else {
@@ -2441,26 +2833,6 @@ sub storedata {
} else {
push (@deldata,$thiskey,$thiskey.'.type');
}
- } elsif ($cmd eq 'datepointer') {
- my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
- my $typeof=$env{'form.typeof_'.$thiskey};
- if (defined($data) and $$olddata{$thiskey} ne $data) {
- if ($tuname) {
- if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
- $tkey.'.type' => $typeof},
- $tudom,$tuname) eq 'ok') {
- &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
- $r->print(''.
- &mt('Error storing parameters').'
');
- }
- &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
- } else {
- $newdata{$thiskey}=$data;
- $newdata{$thiskey.'.type'}=$typeof;
- }
- }
}
}
}
@@ -2482,10 +2854,10 @@ sub storedata {
if ($putentries) {
if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
&log_parmset(\%newdata,0);
- $r->print(''.&mt('Stored [_1] parameter(s)',$putentries/2).' ');
+ $r->print(''.&mt('Saved [_1] parameter(s)',$putentries/2).' ');
} else {
$r->print(''.
- &mt('Error storing parameters').'
');
+ &mt('Error saving parameters').'');
}
&Apache::lonnet::devalidatecourseresdata($crs,$dom);
}
@@ -2496,6 +2868,26 @@ sub extractuser {
return ($key=~/^$env{'request.course.id'}.\[useropt\:($match_username)\:($match_domain)\]\./);
}
+sub parse_listdata_key {
+ my ($key,$listdata) = @_;
+ # split into student/section affected, and
+ # the realm (folder/resource part and parameter
+ my ($student,$realm) =
+ ($key=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)$/);
+ # if course wide student would be undefined
+ if (!defined($student)) {
+ ($realm)=($key=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
+ }
+ # strip off the .type if it's not the Question type parameter
+ if ($realm=~/\.type$/ && !exists($listdata->{$key.'.type'})) {
+ $realm=~s/\.type//;
+ }
+ # split into resource+part and parameter name
+ my ($res, $parm) = ($realm=~/^(.*)\.(.*)$/);
+ ($res, my $part) = ($res =~/^(.*)\.(.*)$/);
+ return ($student,$res,$part,$parm);
+}
+
sub listdata {
my ($r,$resourcedata,$listdata,$sortorder)=@_;
# Start list output
@@ -2507,40 +2899,48 @@ sub listdata {
$tableopen=0;
my $foundkeys=0;
my %keyorder=&standardkeyorder();
+
foreach my $thiskey (sort {
+ my ($astudent,$ares,$apart,$aparm) = &parse_listdata_key($a,$listdata);
+ my ($bstudent,$bres,$bpart,$bparm) = &parse_listdata_key($b,$listdata);
+
+ # get the numerical order for the param
+ $aparm=$keyorder{'parameter_0_'.$aparm};
+ $bparm=$keyorder{'parameter_0_'.$bparm};
+
+ my $result=0;
+
if ($sortorder eq 'realmstudent') {
- my ($astudent,$arealm)=($a=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
- my ($bstudent,$brealm)=($b=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)\.[^\.]+$/);
- if (!defined($astudent)) {
- ($arealm)=($a=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
- }
- if (!defined($bstudent)) {
- ($brealm)=($b=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
- }
- $arealm=~s/\.type//;
- my ($ares, $aparm) = ($arealm=~/^(.*)\.(.*)$/);
- $aparm=$keyorder{'parameter_0_'.$aparm};
- $brealm=~s/\.type//;
- my ($bres, $bparm) = ($brealm=~/^(.*)\.(.*)$/);
- $bparm=$keyorder{'parameter_0_'.$bparm};
- if ($ares eq $bres) {
- if (defined($aparm) && defined($bparm)) {
- ($aparm <=> $bparm);
- } elsif (defined($aparm)) {
- -1;
- } elsif (defined($bparm)) {
- 1;
- } else {
- ($arealm cmp $brealm) || ($astudent cmp $bstudent);
- }
- } else {
- ($arealm cmp $brealm) || ($astudent cmp $bstudent);
+ if ($ares ne $bres ) {
+ $result = ($ares cmp $bres);
+ } elsif ($astudent ne $bstudent) {
+ $result = ($astudent cmp $bstudent);
+ } elsif ($apart ne $bpart ) {
+ $result = ($apart cmp $bpart);
}
} else {
- $a cmp $b;
+ if ($astudent ne $bstudent) {
+ $result = ($astudent cmp $bstudent);
+ } elsif ($ares ne $bres ) {
+ $result = ($ares cmp $bres);
+ } elsif ($apart ne $bpart ) {
+ $result = ($apart cmp $bpart);
+ }
}
+
+ if (!$result) {
+ if (defined($aparm) && defined($bparm)) {
+ $result = ($aparm <=> $bparm);
+ } elsif (defined($aparm)) {
+ $result = -1;
+ } elsif (defined($bparm)) {
+ $result = 1;
+ }
+ }
+
+ $result;
} keys %{$listdata}) {
-
+
if ($$listdata{$thiskey.'.type'}) {
my $thistype=$$listdata{$thiskey.'.type'};
if ($$resourcedata{$thiskey.'.type'}) {
@@ -2592,7 +2992,7 @@ sub listdata {
}
if ($part ne $oldpart) {
$r->print(&tableend().
- "\n".&mt('Part').": $part ");
+ "\n".''.&mt('Part').": $part ");
$oldpart=$part;
}
#
@@ -2613,41 +3013,138 @@ sub listdata {
$$resourcedata{$thiskey},
'',1,'','').
''.
+&mt('Shift all dates based on this date').' '.&Apache::loncommon::end_data_table_row());
}
}
return $foundkeys;
}
+
+sub date_interval_selector {
+ my ($thiskey, $showval) = @_;
+ my $result;
+ foreach my $which (['days', 86400, 31],
+ ['hours', 3600, 23],
+ ['minutes', 60, 59],
+ ['seconds', 1, 59]) {
+ my ($name, $factor, $max) = @{ $which };
+ my $amount = int($showval/$factor);
+ $showval %= $factor;
+ my %select = ((map {$_ => $_} (0..$max)),
+ 'select_form_order' => [0..$max]);
+ $result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
+ %select);
+ $result .= ' '.&mt($name);
+ }
+ $result .= '
@@ -2766,7 +3266,7 @@ ENDOVER
&listdata($r,$resourcedata,$listdata,$sortorder);
}
$r->print(&tableend().
- ((($env{'form.store'}) || ($env{'form.dis'}))?'
':'').
+ ((($env{'form.store'}) || ($env{'form.dis'}))?'
':'').
''.&Apache::loncommon::end_page());
}
@@ -2864,7 +3364,7 @@ ENDOVER
$r->print(''.
&mt('These parameters refer to resources that do not exist.').
' '.
- ''.
@@ -2875,8 +3375,8 @@ ENDOVER
next if (!exists($resourcedata->{$thiskey.'.type'})
&& $thiskey=~/\.type$/);
my %data = &parse_key($thiskey);
- if (exists($data{'realm_exists'})
- && !$data{'realm_exists'}) {
+ if (1) { #exists($data{'realm_exists'})
+ #&& !$data{'realm_exists'}) {
$r->print(&Apache::loncommon::start_data_table_row().
' '.
''.
- '
'.
&Apache::loncommon::end_page());
}
+sub date_shift_one {
+ my ($r) = @_;
+ my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+ my $start_page=&Apache::loncommon::start_page('Shift Dates');
+ my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
+ $r->print(<print('');
+ $r->print(&Apache::loncommon::end_page());
+}
+
+sub date_shift_two {
+ my ($r) = @_;
+ my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $start_page=&Apache::loncommon::start_page('Shift Dates');
+ my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
+ $r->print(<print(&mt('Shifting all dates such that [_1] becomes [_2]',
+ &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+ &Apache::lonlocal::locallocaltime($timeshifted)));
+ my $delta=$timeshifted-$env{'form.timebase'};
+ &dateshift($delta);
+ $r->print(&Apache::loncommon::end_page());
+}
+
sub parse_key {
my ($key) = @_;
my %data;
@@ -2947,7 +3492,6 @@ sub parse_key {
$data{'realm_type'} = 'folder';
$data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
($data{'realm_exists'}) = &Apache::lonnet::is_on_map($data{'realm'});
- &Apache::lonnet::logthis($1." siad ". $data{'realm_exists'} );
} elsif ($middle) {
$data{'realm'} = $middle;
$data{'realm_type'} = 'symb';
@@ -2994,48 +3538,63 @@ where $action is add or drop, and $clone
user for whom cloning ability is to be changed in course.
=cut
-
+
##################################################
##################################################
sub extract_cloners {
my ($clonelist,$allowclone) = @_;
if ($clonelist =~ /,/) {
- @{$allowclone} = split/,/,$clonelist;
+ @{$allowclone} = split(/,/,$clonelist);
} else {
$$allowclone[0] = $clonelist;
}
}
-
sub check_cloners {
my ($clonelist,$oldcloner) = @_;
- my ($clean_clonelist,$disallowed);
+ my ($clean_clonelist,%disallowed);
my @allowclone = ();
&extract_cloners($$clonelist,\@allowclone);
foreach my $currclone (@allowclone) {
- if (!grep/^$currclone$/,@$oldcloner) {
- my ($uname,$udom) = split/:/,$currclone;
- if ($uname && $udom) {
- if (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
- $disallowed .= $currclone.',';
+ if (!grep(/^\Q$currclone\E$/,@$oldcloner)) {
+ if ($currclone eq '*') {
+ $clean_clonelist .= $currclone.',';
+ } else {
+ my ($uname,$udom) = split(/:/,$currclone);
+ if ($uname eq '*') {
+ if ($udom =~ /^$match_domain$/) {
+ if (!&Apache::lonnet::domain($udom)) {
+ $disallowed{'domain'} .= $currclone.',';
+ } else {
+ $clean_clonelist .= $currclone.',';
+ }
+ } else {
+ $disallowed{'format'} .= $currclone.',';
+ }
+ } elsif ($currclone !~/^($match_username)\:($match_domain)$/) {
+ $disallowed{'format'} .= $currclone.',';
} else {
- $clean_clonelist .= $currclone.',';
+ if (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+ $disallowed{'newuser'} .= $currclone.',';
+ } else {
+ $clean_clonelist .= $currclone.',';
+ }
}
}
} else {
$clean_clonelist .= $currclone.',';
}
}
- if ($disallowed) {
- $disallowed =~ s/,$//;
+ foreach my $key (keys(%disallowed)) {
+ $disallowed{$key} =~ s/,$//;
}
if ($clean_clonelist) {
$clean_clonelist =~ s/,$//;
}
$$clonelist = $clean_clonelist;
- return $disallowed;
-}
+ return %disallowed;
+}
sub change_clone {
my ($clonelist,$oldcloner) = @_;
@@ -3048,43 +3607,47 @@ sub change_clone {
my @allowclone;
&extract_cloners($clonelist,\@allowclone);
foreach my $currclone (@allowclone) {
- if (!grep/^$currclone$/,@$oldcloner) {
- ($uname,$udom) = split/:/,$currclone;
- if ($uname && $udom) {
- unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
- my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
- if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
- if ($currclonecrs{'cloneable'} eq '') {
- $currclonecrs{'cloneable'} = $clone_crs;
- } else {
- $currclonecrs{'cloneable'} .= ','.$clone_crs;
+ if (!grep(/^$currclone$/,@$oldcloner)) {
+ if ($currclone ne '*') {
+ ($uname,$udom) = split(/:/,$currclone);
+ if ($uname && $udom && $uname ne '*') {
+ if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
+ my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+ if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
+ if ($currclonecrs{'cloneable'} eq '') {
+ $currclonecrs{'cloneable'} = $clone_crs;
+ } else {
+ $currclonecrs{'cloneable'} .= ','.$clone_crs;
+ }
+ &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
}
- &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
}
}
}
}
}
foreach my $oldclone (@$oldcloner) {
- if (!grep/^$oldclone$/,@allowclone) {
- ($uname,$udom) = split/:/,$oldclone;
- if ($uname && $udom) {
- unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
- my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
- my %newclonecrs = ();
- if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
- if ($currclonecrs{'cloneable'} =~ /,/) {
- my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
- foreach (@currclonecrs) {
- unless ($_ eq $clone_crs) {
- $newclonecrs{'cloneable'} .= $_.',';
+ if (!grep(/^\Q$oldclone\E$/,@allowclone)) {
+ if ($oldclone ne '*') {
+ ($uname,$udom) = split(/:/,$oldclone);
+ if ($uname && $udom && $uname ne '*' ) {
+ if (&Apache::lonnet::homeserver($uname,$udom) ne 'no_host') {
+ my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+ my %newclonecrs = ();
+ if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
+ if ($currclonecrs{'cloneable'} =~ /,/) {
+ my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
+ foreach my $crs (@currclonecrs) {
+ if ($crs ne $clone_crs) {
+ $newclonecrs{'cloneable'} .= $crs.',';
+ }
}
+ $newclonecrs{'cloneable'} =~ s/,$//;
+ } else {
+ $newclonecrs{'cloneable'} = '';
}
- $newclonecrs{'cloneable'} =~ s/,$//;
- } else {
- $newclonecrs{'cloneable'} = '';
+ &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
}
- &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
}
}
}
@@ -3123,6 +3686,7 @@ ENDMAINFORMHEAD
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $vgr = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+ my $mgr = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
my @menu =
( { divider=>'Settings for Your Course',
@@ -3140,6 +3704,11 @@ ENDMAINFORMHEAD
url => '/adm/slotrequest?command=showslots',
permission => $vgr,
},
+ { text => 'Reset Student Access Times',
+ url => '/adm/helper/resettimes.helper',
+ permission => $mgr,
+ },
+
{ text => 'Set Parameter Setting Default Actions',
action => 'setdefaults',
permission => $parm_permission,
@@ -3234,21 +3803,21 @@ sub output_row {
my $multiple_checked;
my $single_checked;
if ($options =~ m/onlyone/) {
- $multiple_checked = "";
- $single_checked = " CHECKED ";
+ $multiple_checked = '';
+ $single_checked = ' checked="checked"';
} else {
- $multiple_checked = " CHECKED ";
- $single_checked = "";
+ $multiple_checked = ' checked="checked"';
+ $single_checked = '';
}
$output .= &Apache::loncommon::continue_data_table_row();
$output .= ''.(' ' x 10).'
- ';
+ '.(' ' x 10).'
';
+ '.&mt('Student may select only one choice from list').'';
$output .= &Apache::loncommon::end_data_table_row();
}
return ($output);
@@ -3298,7 +3867,7 @@ sub order_meta_fields {
my $ordered_fields = join ",", @neworder;
my $put_result = &Apache::lonnet::put('environment',
{'metadata.addedorder'=>$ordered_fields},$dom,$crs);
- &Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);
+ &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields});
}
my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
my $ordered_fields;
@@ -3653,7 +4222,7 @@ ENDYESNO
}
$r->print(&Apache::loncommon::end_data_table().
"\n