[BACK]Return to lonwhatsnew.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonwhatsnew.pm between versions 1.40 and 1.49

version 1.40, 2005/12/20 15:56:38 version 1.49, 2006/01/12 09:32:26
Line 58  sub handler { Line 58  sub handler {
     my $command = $env{'form.command'};      my $command = $env{'form.command'};
     my $refpage = $env{'form.refpage'};      my $refpage = $env{'form.refpage'};
   
     &Apache::loncommon::content_type($r,'text/html');      my %checkallowed = ( coursenormalmail => 1,
     $r->send_http_header;   coursecritmail => 1, );
     my $crsid = $env{'request.course.id'};      foreach my $perm_check (['whn','whatsnew',1],
     $crsid =~ s/_/\//;       ['pch','coursediscussion',1],
     if ((!($env{'request.course.id'})) ||       ['mgr','handgrading',1],
                              ($env{'request.role'} !~ /\Q$crsid\E$/)) {      ['vgr','abovethreshold',1],
         # Not in a course, or no role in course      ['opa','haserrors',1],
         $env{'user.error.msg'}="/adm/whatsnew::0:0:Cannot display what's new screen";      ['mdc','versionchanges',0],
       ) {
    my ($perm,$key,$check_section) = @{ $perm_check };
    my $scope = $env{'request.course.id'};
    if (!($checkallowed{$key} = &Apache::lonnet::allowed($perm,$scope))) {
       $scope .= '/'.$env{'request.course.sec'};
       if ( $check_section ) {
    $checkallowed{$key} = &Apache::lonnet::allowed($perm,$scope);
       }
       if ($checkallowed{$key}) {
    $checkallowed{$key.'_section'} = $env{'request.course.sec'};
       }
    }
       }
   
       if ( ! $env{'request.course.fn'} || ! $checkallowed{'whatsnew'}) {
           # Not in a course, or no whn priv in course
           $env{'user.error.msg'}="/adm/whatsnew::whn:0:0:Cannot display what's new page";
         return HTTP_NOT_ACCEPTABLE;          return HTTP_NOT_ACCEPTABLE;
     }      }
   
     my %checkallowed = (      &Apache::loncommon::content_type($r,'text/html');
              coursediscussion => &Apache::lonnet::allowed('pch',$env{'request.course.id'}),      $r->send_http_header;
              handgrading => &Apache::lonnet::allowed('mgr',$env{'request.course.id'}),  
              abovethreshold => &Apache::lonnet::allowed('vgr',$env{'request.course.id'}),  
              haserrors => &Apache::lonnet::allowed('opa',$env{'request.course.id'}),  
              versionchanges => &Apache::lonnet::allowed('opa',$env{'request.course.id'}),  
              coursenormalmail => 1,  
              coursecritmail => 1,  
     );  
   
     $r->print(&display_header($command,\%checkallowed));      $r->print(&display_header($command,\%checkallowed));
   
Line 85  sub handler { Line 95  sub handler {
     &Apache::lonhtmlcommon::add_breadcrumb      &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/whatsnew',              ({href=>'/adm/whatsnew',
               text=>"Display Action Items"});                text=>"Display Action Items"});
     if (($command eq 'chgthreshold') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {      if (($command eq 'chgthreshold') && $checkallowed{'abovethreshold'}) {
         &Apache::lonhtmlcommon::add_breadcrumb          &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,              ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,
               text=>"Change thresholds"});                text=>"Change thresholds"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs          $r->print(&Apache::lonhtmlcommon::breadcrumbs
             (undef,"What's New?",'Course_Action_Items_Thresholds'));              (undef,"What's New?",#'Course_Action_Items_Thresholds'
     } elsif (($command eq 'chginterval') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {       ));
       } elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) {
         &Apache::lonhtmlcommon::add_breadcrumb          &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,              ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,
               text=>"Change interval"});                text=>"Change interval"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs          $r->print(&Apache::lonhtmlcommon::breadcrumbs
             (undef,"What's New?",'Course_Action_Items_Intervals'));              (undef,"What's New?",#'Course_Action_Items_Intervals'
     } elsif (($command eq 'chgdisc') && (&Apache::lonnet::allowed('pch',$env{'request.course.id'}))) {       ));
       } elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) {
         &Apache::lonhtmlcommon::add_breadcrumb          &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,              ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,
               text=>"Change discussion display"});                text=>"Change discussion display"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs          $r->print(&Apache::lonhtmlcommon::breadcrumbs
             (undef,"What's New?",'Course_Action_Items_Intervals'));              (undef,"What's New?",#'Course_Action_Items_Intervals'
        ));
     } elsif ($command eq 'courseinit') {      } elsif ($command eq 'courseinit') {
         &Apache::lonhtmlcommon::add_breadcrumb          &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage,              ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage,
               text=>"Course initialization preference"});                text=>"Course initialization preference"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs          $r->print(&Apache::lonhtmlcommon::breadcrumbs
             (undef,"What's New?",'Course_Action_Items_Initialization'));              (undef,"What's New?",#'Course_Action_Items_Initialization'
        ));
     } else {      } else {
         $r->print(&Apache::lonhtmlcommon::breadcrumbs          $r->print(&Apache::lonhtmlcommon::breadcrumbs
             (undef,"What's New?",'Course_Action_Items_Display'));              (undef,"What's New?",#'Course_Action_Items_Display'
        ));
     }      }
     &display_main_box($r,$command,$refpage,\%checkallowed);      &display_main_box($r,$command,$refpage,\%checkallowed);
     return OK;      return OK;
Line 152  sub display_main_box { Line 167  sub display_main_box {
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
   
     if (($command eq 'chgthreshold') &&       if (($command eq 'chgthreshold') 
                (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {   && $checkallowed->{'abovethreshold'}) {
         &display_threshold_config($r,$refpage,$tabbg,\%threshold_titles,          &display_threshold_config($r,$refpage,$tabbg,\%threshold_titles,
                                                                    $cdom,$crs);                                                                     $cdom,$crs);
     } elsif (($command eq 'chginterval') &&       } elsif (($command eq 'chginterval') 
                (&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) {       && $checkallowed->{'versionchanges'}) {
         &display_interval_config($r,$refpage,\%interval_titles);          &display_interval_config($r,$refpage,\%interval_titles);
     } elsif (($command eq 'chgdisc') &&       } elsif (($command eq 'chgdisc') 
                (&Apache::lonnet::allowed('pch',$env{'request.course.id'}))) {       && $checkallowed->{'coursediscussion'}) {
         &display_discussion_config($r,$refpage);          &display_discussion_config($r,$refpage);
     } elsif ($command eq 'courseinit') {      } elsif ($command eq 'courseinit') {
         &courseinit_config($r,$refpage,\%initpage);          &courseinit_config($r,$refpage,\%initpage);
Line 200  function change_display(caller,change) { Line 215  function change_display(caller,change) {
 function changeAll(change) {  function changeAll(change) {
 END  END
         foreach my $item (keys(%{$checkallowed})) {          foreach my $item (keys(%{$checkallowed})) {
       if ($item =~ /_section$/) { next; }
             if ($$checkallowed{$item}) {              if ($$checkallowed{$item}) {
                 $scripttag.='document.visible.display_'.$item.'.value=change'.                  $scripttag.='document.visible.display_'.$item.'.value=change'.
                             "\n";                              "\n";
Line 300  sub display_actions_box { Line 316  sub display_actions_box {
         }          }
     }      }
     $r->print($lt{'pgse'}.' '.&mt('Currently: [_1]','<i>'.$currinit.'</i>').      $r->print($lt{'pgse'}.' '.&mt('Currently: [_1]','<i>'.$currinit.'</i>').
               '<nobr>&nbsp;&nbsp;'.&mt('[_1] for just [_2]','<b>Change</b>',                ' <nobr>&nbsp;&nbsp;'.&mt('[_1] for just [_2]','<b>Change</b>',
               '<a href="/adm/whatsnew?command=courseinit&refpage='.$refpage.                '<a href="/adm/whatsnew?command=courseinit&refpage='.$refpage.
               '">this course</a>').' '.&mt('or for all [_1].',                '">this course</a>').' '.&mt('or for all [_1].',
               '<a href="/adm/preferences?action=changecourseinit&refpage='.                '<a href="/adm/preferences?action=changecourseinit&refpage='.
Line 363  sub display_actions_box { Line 379  sub display_actions_box {
     my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail');      my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail');
   
     foreach my $key (keys(%{$checkallowed})) {      foreach my $key (keys(%{$checkallowed})) {
    if ($key =~ /_section$/) { next; }
         $show{$key} = 0;          $show{$key} = 0;
         if ($$checkallowed{$key}) {          if ($$checkallowed{$key}) {
             unless ($display_settings{$cid.':'.$key} eq 'hide') {              unless ($display_settings{$cid.':'.$key} eq 'hide') {
Line 394  sub display_actions_box { Line 411  sub display_actions_box {
      &nbsp;&nbsp;<a href="javascript:changeAll('show');">$lt{'shal'}</a>       &nbsp;&nbsp;<a href="javascript:changeAll('show');">$lt{'shal'}</a>
      <form method="post" name="visible" action="/adm/whatsnew">\n|);       <form method="post" name="visible" action="/adm/whatsnew">\n|);
     foreach my $item (keys(%{$checkallowed})) {      foreach my $item (keys(%{$checkallowed})) {
    if ($item =~ /_section$/) { next; }
         if ($$checkallowed{$item}) {          if ($$checkallowed{$item}) {
             $r->print('<input type="hidden" name="display_'.$item.'" />'."\n");              $r->print('<input type="hidden" name="display_'.$item.'" />'."\n");
         }          }
Line 404  sub display_actions_box { Line 422  sub display_actions_box {
     my $displayed = 0;      my $displayed = 0;
     my $totalboxes = 0;      my $totalboxes = 0;
     foreach my $key (keys(%{$checkallowed})) {      foreach my $key (keys(%{$checkallowed})) {
    if ($key =~ /_section$/) { next; }
    if ($key eq 'whatsnew' ) { next; } # whatsnew check creates no box
         if ($$checkallowed{$key}) {          if ($$checkallowed{$key}) {
             $totalboxes ++;              $totalboxes ++;
         }          }
Line 549  sub display_discussion_config { Line 569  sub display_discussion_config {
     if ($current eq '') {      if ($current eq '') {
         $current = 'on';          $current = 'on';
     }      }
     my %status = (      my %opposite = ( 
                     on => 'checked="checked"',                        'on' => 'off',
                     off => 'checked="checked"',                        'off' => 'on',
                  );                      );
     $status{$current} = '';      $r->print('<script type="text/javascript">
     $r->print('<br />'.&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.').'<br />'.&mt('This can increase the time taken to gather data for the [_1] page by a few seconds.',"<i>What's New?</i>").'&nbsp;&nbsp;'.&mt('Currently set to [_1] .'),"<b>$current</b>.");  function toggle_countunread(choice) {
       if (choice == "unchanged") {
           document.discussionswitch.command.value = "";
       }
       document.discussionswitch.submit();
   }
   </script>');
       $r->print('<br />'.&mt('Choose whether or not to display a count of the number of new posts for each resource or bulletin board which has unread posts.').'<br />'.&mt('This can increase the time taken to gather data for the [_1] page by a few seconds.',"<i>What's New?</i>").'&nbsp;&nbsp;'.&mt('Currently set to [_1].','<b>'.$current.'</b>'));
     $r->print('<br /><br />      $r->print('<br /><br />
 <form method="post" name="discussionswitch" action="/adm/whatsnew">'.  <form method="post" name="discussionswitch" action="/adm/whatsnew">
 &mt('Display of unread post counts?').'&nbsp;  
 <input type="hidden" name="command" value="newdiscconf" />  <input type="hidden" name="command" value="newdiscconf" />
 <input type="hidden" name="refpage" value="'.$refpage.'" />  <input type="hidden" name="refpage" value="'.$refpage.'" />
 <input type ="radio" '.$status{'on'}.' name="countunread" value="on">on  <input type="hidden" name="countunread" value="'.$opposite{$current}.'" />
 &nbsp;&nbsp;&nbsp;  
 <input type ="radio" '.$status{'off'}.' name="countunread" value="off">off  
 ');  ');
     $r->print('<br/><br />      $r->print('<br/>
                <input type="submit" name="display" value="'.                 <input type="button" name="display" value="'.
                &mt('Make changes').'" /></form>');                 &mt('Change to [_1]',$opposite{$current}).'" 
                  onclick="javascript:toggle_countunread('."'change'".')" />
                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp&nbsp;&nbsp;
                  <input type="button" name="nochange" value="'.
                  &mt("No change").'" 
                  onclick="javascript:toggle_countunread('."'unchanged'".')" />
                  </form>');
     return;      return;
 }  }
   
Line 602  $$initpage{$current}</b>.<br /><br /> Line 632  $$initpage{$current}</b>.<br /><br />
 $lt{'padc'}&nbsp;&nbsp;  $lt{'padc'}&nbsp;&nbsp;
 END  END
     foreach my $choice (@chgstate) {      foreach my $choice (@chgstate) {
         $r->print('<nobr><input type="radio" name="courseinit_control" value="'.          $r->print('<nobr><label><input type="radio" name="courseinit_control" value="'.
                    $choice.'"/>'.$$initpage{$choice}.'&nbsp;&nbsp;</nobr>');                     $choice.'"/>'.$$initpage{$choice}.'&nbsp;&nbsp;</label></nobr>');
     }      }
     $r->print('<br /><br />'.&mt('If').' '.$$initpage{'coursespecific'}.      $r->print('<br /><br />'.&mt('If').' '.$$initpage{'coursespecific'}.
               '<br />'.$lt{'chce'}." \n");                '<br />'.$lt{'chce'}." \n");
     foreach my $choice (@chgentry) {      foreach my $choice (@chgentry) {
         $r->print('<nobr><input type="radio" name="courseinit_page" value="'.          $r->print('<nobr><label><input type="radio" name="courseinit_page" value="'.
                   $choice.'"/>'.$$initpage{$choice}.'&nbsp;&nbsp;</nobr>');                    $choice.'"/>'.$$initpage{$choice}.'&nbsp;&nbsp;</label></nobr>');
     }      }
     $r->print('<br /><br /><input type="submit" name="display" value="'.      $r->print('<br /><br /><input type="submit" name="display" value="'.
                $lt{'moce'}.'" /></form>');                 $lt{'moce'}.'" /></form>');
Line 865  sub check_thresholds { Line 895  sub check_thresholds {
         if ($resource->handgrade($part) eq 'yes') {          if ($resource->handgrade($part) eq 'yes') {
             next;              next;
         }          }
           if ($resource->is_survey($part)) {
               next;
           }
         %{$stats{$part}} = ();          %{$stats{$part}} = ();
         my ($attempts,$users,$corrects,$degdiff,$av_attempts);          my ($attempts,$users,$corrects,$degdiff,$av_attempts);
         if (exists($$resourcetracker{$symb."\0".$part."\0attempts"})) {          if (exists($$resourcetracker{$symb."\0".$part."\0attempts"})) {
Line 1401  sub get_display_settings { Line 1434  sub get_display_settings {
     my ($tmp) = keys(%settings);      my ($tmp) = keys(%settings);
     if ($tmp=~ /^(con_lost|error|no_such_host)/i) {      if ($tmp=~ /^(con_lost|error|no_such_host)/i) {
         %settings = ();          %settings = ();
         unless ($tmp eq 'error: 2 tie(GDBM) Failed while attempting dump') {          unless ($tmp =~ /^error: 2 /) {
             &logthis('Error retrieving whatsnew settings: '.$tmp.' for '.              &Apache::lonnet::logthis('Error retrieving whatsnew settings: '.
                                 $uname.':'.$udom.' for course: '.$cid);              $tmp.' for '.$uname.':'.$udom.' for course: '.$cid);
         }          }
     }      }
     return %settings;      return %settings;
Line 1414  sub store_display_settings { Line 1447  sub store_display_settings {
     my %whatsnew_settings;      my %whatsnew_settings;
     my $result;      my $result;
     foreach my $key (keys(%{$checkallowed})) {      foreach my $key (keys(%{$checkallowed})) {
    if ($key =~ /_section$/) { next; }
         if (exists($env{'form.display_'.$key})) {          if (exists($env{'form.display_'.$key})) {
             unless ($env{'form.display_'.$key} eq '') {              unless ($env{'form.display_'.$key} eq '') {
                 $whatsnew_settings{$cid.':'.$key} = $env{'form.display_'.$key};                  $whatsnew_settings{$cid.':'.$key} = $env{'form.display_'.$key};
Removed from v.1.40  
changed lines
  Added in v.1.49

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>