--- loncom/interface/lonmodifycourse.pm 2010/07/08 23:19:19 1.56 +++ loncom/interface/lonmodifycourse.pm 2011/01/15 18:24:16 1.59 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # handler for DC-only modifiable course settings # -# $Id: lonmodifycourse.pm,v 1.56 2010/07/08 23:19:19 raeburn Exp $ +# $Id: lonmodifycourse.pm,v 1.59 2011/01/15 18:24:16 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -226,8 +226,9 @@ sub print_modification_menu { $categorytitle = 'View/Modify Course Settings'; $setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.'); $setparams_text = 'View/Modify course owner, institutional code, and default authentication'; - $cat_text = 'View/Modify catalog settings for course'; + $cat_text = 'View/Modify catalog settings for course'; } + my $anon_text = 'Responder threshold required to display anonymous survey submissions'; my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom); my @additional_params = &catalog_settable($domconf{'coursecategories'},$type); @@ -256,6 +257,14 @@ sub print_modification_menu { linktitle => '' }, { + linktext => 'View/Modify responders threshold for anonymous survey submissions display', + url => &phaseurl('setanon'), + permission => 1, + #help => '', + icon => 'anonsurveythreshold.png', + linktitle => '' + }, + { linktext => $cat_text, url => &phaseurl('catsettings'), permission => (@additional_params > 0), @@ -292,7 +301,8 @@ sub print_modification_menu { $menu_html .= '
  • '.&mt('Course owner (permitted to assign Course Coordinator roles in the course).').'
    • '. '
  • '.&mt("Institutional code and default authentication (both required for auto-enrollment of students from institutional datafeeds).").'
    • '; } - $menu_html .= '
  • '.$setquota_text.'
    • '."\n"; + $menu_html .= '
  • '.$setquota_text.'
    • '. + '
  • '.$anon_text.'
    • '."\n"; foreach my $item (@additional_params) { if ($type eq 'Community') { if ($item eq 'togglecats') { @@ -409,11 +419,11 @@ sub print_setquota { my $hidden_elements = &hidden_form_elements(); my $helpitem = &Apache::loncommon::help_open_topic('Modify_Course_Quota'); $r->print(< +

    $lt{'cquo'} $cdesc

    $helpitem $lt{'gpqu'}: Mb      - +

    $hidden_elements $lt{'back'} @@ -422,6 +432,45 @@ ENDDOCUMENT return; } +sub print_set_anonsurvey_threshold { + my ($r,$cdom,$cnum,$cdesc,$type) = @_; + my %lt = &Apache::lonlocal::texthash( + 'resp' => 'Responder threshold for anonymous survey submissions display:', + 'sufa' => 'Anonymous survey submissions displayed when responders exceeds', + 'modi' => 'Save', + 'back' => 'Pick another action', + ); + my %settings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum); + my $threshold = $settings{'internal.anonsurvey_threshold'}; + if ($threshold eq '') { + my %domconfig = + &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); + if (ref($domconfig{'coursedefaults'}) eq 'HASH') { + $threshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'}; + if ($threshold eq '') { + $threshold = 10; + } + } else { + $threshold = 10; + } + } + &print_header($r,$type); + my $hidden_elements = &hidden_form_elements(); + my $helpitem = &Apache::loncommon::help_open_topic('Modify_Anonsurvey_Threshold'); + $r->print(< +

    $lt{'resp'} $cdesc

    +

    +$helpitem $lt{'sufa'}:      + +

    +$hidden_elements +$lt{'back'} + +ENDDOCUMENT + return; +} + sub print_catsettings { my ($r,$cdom,$cnum,$cdesc,$type) = @_; &print_header($r,$type); @@ -796,6 +845,8 @@ sub modify_course { push(@warnings,&mt('There is no owner associated with this LON-CAPA course.'). '
    '.&mt('If automated enrollment at your institution requires validation of course owners, automated enrollment will fail.')); } else { + my %crsenv = &Apache::lonnet::get('environment',['internal.co-owners'],$cdom,$cnum); + my $coowners = $crsenv{'internal.co-owners'}; if (@sections > 0) { if ($changed{'code'}) { foreach my $sec (@sections) { @@ -804,7 +855,7 @@ sub modify_course { my $inst_course_id = $newattr{'coursecode'}.$1; my $course_check = &Apache::lonnet::auto_validate_courseID($cnum,$cdom,$inst_course_id); if ($course_check eq 'ok') { - my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'}); + my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners); unless ($outcome eq 'ok') { push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).'
    '); @@ -821,7 +872,7 @@ sub modify_course { if ($sec =~ m/^(.+):/) { my $instsec = $1; my $inst_course_id = $newattr{'coursecode'}.$instsec; - my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'}); + my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'},$coowners); unless ($outcome eq 'ok') { push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome)); } @@ -837,7 +888,7 @@ sub modify_course { foreach my $xlist (@xlists) { if ($xlist =~ m/^(.+):/) { my $instxlist = $1; - my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$instxlist,$newattr{'courseowner'}); + my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$instxlist,$newattr{'courseowner'},$coowners); unless ($outcome eq 'ok') { push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for crosslisted class "[_2]" for the following reason: "[_3]".',$description,$instxlist,$outcome)); } @@ -991,7 +1042,7 @@ sub update_coowners { if ($designhash{$cdom.'.autoassign.co-owners'}) { my @newcoowners = (); if ($settings->{'internal.co-owners'}) { - my @currcoown = split(',',$settings->{'internal.coowners'}); + my @currcoown = split(',',$settings->{'internal.co-owners'}); my ($updatecoowners,$delcoowners); foreach my $person (@currcoown) { my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$person); @@ -1067,7 +1118,7 @@ sub modify_quota { } else { if ($putreply eq 'ok') { my %updatedsettings = &Apache::lonnet::get('environment',['internal.coursequota'],$cdom,$cnum); - $r->print(&mt('The disk space allocated for group portfolio files is now: [_1] Mb.',$updatedsettings{'internal.coursequota'})); + $r->print(&mt('The disk space allocated for group portfolio files is now: [_1] Mb.',''.$updatedsettings{'internal.coursequota'}.'')); my $usage = &Apache::longroup::sum_quotas($cdom.'_'.$cnum); if ($usage >= $updatedsettings{'internal.coursequota'}) { my $newoverquota; @@ -1101,6 +1152,62 @@ sub modify_quota { return; } +sub modify_anonsurvey_threshold { + my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_; + &print_header($r,$type); + $r->print('
    '."\n". + '

    '.&mt('Responder threshold required for display of anonymous survey submissions:'). + ' '.$cdesc.'


    '); + my %oldsettings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum); + my %domconfig = + &Apache::lonnet::get_dom('configuration',['coursedefaults'],$cdom); + my $defaultthreshold; + if (ref($domconfig{'coursedefaults'}) eq 'HASH') { + $defaultthreshold = $domconfig{'coursedefaults'}{'anonsurvey_threshold'}; + if ($defaultthreshold eq '') { + $defaultthreshold = 10; + } + } else { + $defaultthreshold = 10; + } + if ($env{'form.threshold'} eq '') { + $r->print(&mt('The proposed responder threshold for display of anonymous survey submissions was blank, so the threshold is unchanged.')); + } else { + my $newthreshold = $env{'form.threshold'}; + if ($newthreshold =~ /^\s*(\d+)\s*$/) { + $newthreshold = $1; + if ($oldsettings{'internal.anonsurvey_threshold'} eq $env{'form.threshold'}) { + $r->print(&mt('Responder threshold for anonymous survey submissions display remains unchanged: [_1].',$env{'form.threshold'})); + } else { + my %cenv = ( + 'internal.anonsurvey_threshold' => $env{'form.threshold'}, + ); + my $putreply = &Apache::lonnet::put('environment',\%cenv,$cdom, + $cnum); + if (($oldsettings{'internal.anonsurvey_threshold'} eq '') && + ($env{'form.threshold'} == $defaultthreshold)) { + $r->print(&mt('The responder threshold for display of anonymous survey submissions is the default for this domain: [_1].',$defaultthreshold)); + } else { + if ($putreply eq 'ok') { + my %updatedsettings = &Apache::lonnet::get('environment',['internal.anonsurvey_threshold'],$cdom,$cnum); + $r->print(&mt('The responder threshold for display of anonymous survey submissions is now: [_1].',''.$updatedsettings{'internal.anonsurvey_threshold'}.'')); + } else { + $r->print(&mt('An error occurred storing the responder threshold for anonymous submissions display: '). + $putreply); + } + } + } + } else { + $r->print(&mt('The proposed responder threshold for display of anonymous submissions contained invalid characters, so the threshold is unchanged.')); + } + } + $r->print('

    '. + ''. + &mt('Pick another action').''); + $r->print(&hidden_form_elements().'

    '); + return; +} + sub modify_catsettings { my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_; &print_header($r,$type); @@ -1264,17 +1371,45 @@ function gochoose(cname,cdom,cdesc) { |; } elsif ($phase eq 'setquota') { - $js .= <<'ENDSCRIPT'; + my $invalid = &mt('The quota you entered contained invalid characters.'); + my $alert = &mt('You must enter a number'); + my $regexp = '/^\s*(\d+\.?\d*|\.\d+)\s*$/'; + $js .= <<"ENDSCRIPT"; +ENDSCRIPT + } elsif ($phase eq 'setanon') { + my $invalid = &mt('The responder threshold you entered is invalid.'); + my $alert = &mt('You must enter a positive integer.'); + my $regexp = ' /^\s*\d+\s*$/'; + $js .= <<"ENDSCRIPT"; + ENDSCRIPT @@ -1371,7 +1506,8 @@ sub hidden_form_elements { my $hidden_elements = &Apache::lonhtmlcommon::echo_form_input(['gosearch','updater','coursecode', 'prevphase','numlocalcc','courseowner','login','coursequota','intarg', - 'locarg','krbarg','krbver','counter','hidefromcat','usecategory'])."\n". + 'locarg','krbarg','krbver','counter','hidefromcat','usecategory', + 'threshold'])."\n". ''; return $hidden_elements; } @@ -1459,7 +1595,21 @@ sub handler { ({href=>"javascript:changePage(document.$phase,'$phase')", text=>"Result"}); &modify_quota($r,$cdom,$cnum,$cdesc,$domdesc,$type); - } elsif ($phase eq 'viewparms') { + } elsif ($phase eq 'setanon') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'$phase')", + text=>"Threshold for anonymous submissions display"}); + &print_set_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$type); + + } elsif ($phase eq 'processthreshold') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'setanon')", + text=>"Threshold for anonymous submissions display"}); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:changePage(document.$phase,'$phase')", + text=>"Result"}); + &modify_anonsurvey_threshold($r,$cdom,$cnum,$cdesc,$domdesc,$type); + } elsif ($phase eq 'viewparms') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:changePage(document.$phase,'viewparms')", text=>"Display settings"});