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

Diff for /loncom/interface/lonannounce.pm between versions 1.70 and 1.79

version 1.70, 2008/05/18 19:45:46 version 1.79, 2009/04/04 21:47:40
Line 38  use Apache::lonrss(); Line 38  use Apache::lonrss();
 use Apache::lonnet;  use Apache::lonnet;
 use HTML::Entities();  use HTML::Entities();
 use LONCAPA qw(:match);  use LONCAPA qw(:match);
   use DateTime;
   use DateTime::TimeZone;
   
 my %todayhash;  my %todayhash;
 my %showedcheck;  my %showedcheck;
Line 51  sub editfield { Line 53  sub editfield {
     my $enddateform = &Apache::lonhtmlcommon::date_setter('anno',      my $enddateform = &Apache::lonhtmlcommon::date_setter('anno',
                                                           'enddate',                                                            'enddate',
                                                           $end);                                                            $end);
     my $help=&Apache::loncommon::help_open_menu('Calendar Add Announcement','Calendar_Add_Announcement',274,'Communication Tools');      #my $help=&Apache::loncommon::help_open_menu('Calendar Add Announcement','Calendar_Add_Announcement',274,'Communication Tools');
     my %lt=&Apache::lonlocal::texthash('post' => 'Post Announcement',      my $help=&Apache::loncommon::help_open_topic('Calendar_Add_Announcement');
       
       my %lt=&Apache::lonlocal::texthash('annon' => 'Course Announcements',
                                          'post' => 'Post Announcement',
        'start' => 'Starting date',         'start' => 'Starting date',
        'end' => 'Ending date',         'end' => 'Ending date',
        'incrss' => 'Include in course RSS newsfeed');         'incrss' => 'Include in course RSS newsfeed');
   
     $r->print(<<ENDFORM);      $r->print(<<ENDFORM);
 $help  <h2>$lt{'annon'} $help</h2>
 <form name="anno" method="post">  <form name="anno" method="post">
 <input type="hidden" value='' name="action" />  <input type="hidden" value='' name="action" />
 <table><tr><td>$lt{'start'}:</td><td>$startdateform</td></tr>  <table><tr><td>$lt{'start'}:</td><td>$startdateform</td></tr>
Line 292  sub order { Line 297  sub order {
 }  }
   
 sub nextday {  sub nextday {
     my %th=@_;      my ($tk,%th)=@_;
     $th{'day'}++;      my ($incmonth,$incyear);
       if ($th{'day'} > 27) {
           if ($th{'month'} == 2) {
               if ($th{'day'} == 29) { 
                   $incmonth = 1;
               } elsif ($th{'day'} == 28) {
                   if (!&is_leap_year($tk)) {
                      $incmonth = 1;
                   }
               }
           } elsif (($th{'month'} == 4) || ($th{'month'} == 6) || 
                    ($th{'month'} == 9) || ($th{'month'} == 11)) {
               if ($th{'day'} == 30) {
                   $incmonth = 1;
               }
           } elsif ($th{'day'} == 31) {
               if ($th{'month'} == 12) {
                   $incyear = 1;
               } else {
                   $incmonth = 1;
               }
           }
           if ($incyear) {
               $th{'day'} = 1;
               $th{'month'} = 1;
               $th{'year'}++;
           } elsif ($incmonth) {
               $th{'day'} = 1;
               $th{'month'}++;
           } else {
               $th{'day'}++;
           }
       } else {
           $th{'day'}++;
       }
     return (&Apache::loncommon::maketime(%th),$th{'month'});      return (&Apache::loncommon::maketime(%th),$th{'month'});
 }  }
   
   sub is_leap_year {
       my ($thistime) = @_;
       my ($is_leap,$timezone,$dt);
       $timezone = &Apache::lonlocal::gettimezone();
       eval {
           $dt = DateTime->from_epoch(epoch => $thistime)
                         ->set_time_zone($timezone);
       };
       if (!$@) {
           $is_leap = $dt->is_leap_year;
       }
       return $is_leap;
   }
   
 sub display_msg {  sub display_msg {
     my ($msg) = @_;      my ($msg) = @_;
   
Line 323  sub display_msg { Line 376  sub display_msg {
 sub showday {  sub showday {
     my ($tk,$mode,%allcal)=@_;      my ($tk,$mode,%allcal)=@_;
     my %th=&Apache::loncommon::timehash($tk);      my %th=&Apache::loncommon::timehash($tk);
     my ($nextday,$nextmonth)=&nextday(%th);      my ($nextday,$nextmonth)=&nextday($tk,%th);
     my @outp;      my @outp;
     if ($mode) {      if ($mode) {
  my $oneday=24*3600;   my $oneday=24*3600;
Line 362  sub picklink { Line 415  sub picklink {
   
 sub dialscript {  sub dialscript {
     return (<<ENDDIA);      return (<<ENDDIA);
 <script language="Javascript">  <script type="text/javascript" language="JavaScript">
 function dialin(day,month,year) {  function dialin(day,month,year) {
  opener.document.$env{'form.formname'}.$env{'form.element'}\_year.value=year;   opener.document.$env{'form.formname'}.$env{'form.element'}\_year.value=year;
     var slct=opener.document.$env{'form.formname'}.$env{'form.element'}\_month;      var slct=opener.document.$env{'form.formname'}.$env{'form.element'}\_month;
Line 415  sub output_ics_file { Line 468  sub output_ics_file {
     $r->print("END:VCALENDAR$crlf");      $r->print("END:VCALENDAR$crlf");
 }  }
   
   sub show_timezone {
       my $tzone = &Apache::lonlocal::gettimezone();
       my $dt = DateTime->now();
       my $tz = DateTime::TimeZone->new( name => $tzone );
       return &mt('([_1] time zone)',$tz->short_name_for_datetime($dt));
   }
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     if ($r->uri=~/\.(ics|ical)$/) {      if ($r->uri=~/\.(ics|ical)$/) {
Line 446  sub handler { Line 506  sub handler {
  '&element='.$env{'form.element'};   '&element='.$env{'form.element'};
 # --------------------------------------------- Find out first day of the month  # --------------------------------------------- Find out first day of the month
   
     my %firstday=&Apache::loncommon::timehash(      my $tk = &Apache::loncommon::maketime( 'day' => 1,
        &Apache::loncommon::maketime( 'day' => 1, 'month'=> $month,                                             'month'=> $month,
                                      'year' => $year, 'hours' => 0,                                             'year' => $year, 
      'minutes' => 0, 'seconds' => 0,                                             'hour' => 0,
                                      'dlsav' => -1 ));             'minute' => 0, 
                                              'second' => 0);
       my %firstday = &Apache::loncommon::timehash($tk);
     my $weekday=$firstday{'weekday'};      my $weekday=$firstday{'weekday'};
   
 # ------------------------------------------------------------ Print the screen  # ------------------------------------------------------------ Print the screen
     my $js = <<ENDDOCUMENT;      my $js = <<ENDDOCUMENT;
 <script type="text/javascript">  <script type="text/javascript" language="JavaScript">
   
     function trysubmit() {      function trysubmit() {
         document.anno.action.value="new";          document.anno.action.value="new";
Line 475  ENDDOCUMENT Line 538  ENDDOCUMENT
   &dialscript().    &dialscript().
   '<font size="1">');    '<font size="1">');
     } else {      } else {
        $r->print(&Apache::loncommon::start_page("Announcements and Calendar",          my $brcrum = [{href=>"/adm/announcements",text=>"Announcements and Calendar"}];
  $js));          $r->print(&Apache::loncommon::start_page("Communication",$js,{'bread_crumbs' => $brcrum}));
     }      }
 # does this user have privileges to post, etc?  # does this user have privileges to post, etc?
     my $allowed=0;      my $allowed=0;
Line 507  ENDDOCUMENT Line 570  ENDDOCUMENT
  }   }
     }      }
  }   }
  $r->print(<<SERVERANNOUNCE);   $r->print('<form name="serveranno" method="post">'
 <form name="serveranno" method="post">                   .'<h2>'.&mt('Post Server Announcements').'</h2>'
 <h3>Post Server Announcements</h3>                   .&mt('Post announcements to the system login and roles screen').'<br />'
 Post announcements to the system login and roles screen<br />                   .'<i>'.&mt('(leave blank to delete announcement)').'</i><br />'
 <i>(leave blank to delete announcement)</i><br />                   .'<textarea name="serverannnounce" cols="60" rows="5"></textarea><br />'
 <textarea name="serverannnounce" cols="60" rows="5"></textarea><br />                   .&mt('Check machines:').'<br />'
 Check machines:<br />          );
 SERVERANNOUNCE  
 # list servers  # list servers
     my %hostname = &Apache::lonnet::all_hostnames();      my %hostname = &Apache::lonnet::all_hostnames();
     foreach my $host (sort(keys(%hostname))) {      foreach my $host (sort(keys(%hostname))) {
  if (&Apache::lonnet::allowed('psa',   if (&Apache::lonnet::allowed('psa',
      &Apache::lonnet::host_domain($host))) {       &Apache::lonnet::host_domain($host))) {
     $r->print ('<br /><label><input type="checkbox" name="postto_'.$host.'" /> '.      $r->print ('<label><input type="checkbox" name="postto_'.$host.'" /> '.
        $host.' <tt>'.$hostname{$host}.'</tt> '.         $host.' <tt>'.$hostname{$host}.'</tt> '.
        '</label><a href="http://'.$hostname{$host}.         '</label><a href="http://'.$hostname{$host}.
        '/announcement.txt?time='.time.'" target="annowin">current</a>');         '/announcement.txt?time='.time.'" target="annowin">'.
                          &mt('Current Announcement').'</a><br />');
  }   }
     }      }
     $r->print(      $r->print(
   '<br /><input type="submit" name="serveraction" value="Post"></form><hr />');    '<br /><input type="submit" name="serveraction" value="'.&mt('Post').'" /></form><hr />');
     }      }
     if ($allowed) {      if ($allowed) {
         my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};          my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
Line 580  SERVERANNOUNCE Line 643  SERVERANNOUNCE
     if ($pm<1) { ($pm,$py)=(12,$year-1); }      if ($pm<1) { ($pm,$py)=(12,$year-1); }
     if ($fm>12){ ($fm,$fy)=(1,$year+1); }      if ($fm>12){ ($fm,$fy)=(1,$year+1); }
   
     $r->print('<h1>'.('',&mt('January'),&mt('February'),&mt('March'),      $r->print('<h2>'.&mt('Calendar').'</h2>'
                .'<h3>'.('',&mt('January'),&mt('February'),&mt('March'),
       &mt('April'),&mt('May'),        &mt('April'),&mt('May'),
       &mt('June'),&mt('July'),&mt('August'),        &mt('June'),&mt('July'),&mt('August'),
                       &mt('September'),&mt('October'),                        &mt('September'),&mt('October'),
                       &mt('November'),&mt('December'))[$month].' '.                        &mt('November'),&mt('December'))[$month].' '.
               $year.'</h1>');                $year.' '.&show_timezone().'</h3>');
 # Reached the end of times, give up  # Reached the end of times, give up
     if (($year<1970) || ($year>2037)) {      if (($year<1970) || ($year>2037)) {
  $r->print('<h3>No calendar available for this date.</h3>'.   $r->print('<p class="LC_warning">'
  '<a href="/adm/announcements?month='.$todayhash{'month'}.                   .&mt('No calendar available for this date.')
  '&year='.$todayhash{'year'}.'">Current Month</a>'.                   .'</p>'
   &Apache::loncommon::end_page());                   .'<a href="/adm/announcements?month='.$todayhash{'month'}
                    .'&year='.$todayhash{'year'}.'">'.&mt('Current Month').'</a>'
    .&Apache::loncommon::end_page());
  return OK;   return OK;
     }      }
   
Line 599  SERVERANNOUNCE Line 665  SERVERANNOUNCE
     if ($env{'form.pickdate'} eq 'yes') {      if ($env{'form.pickdate'} eq 'yes') {
  $class .= " LC_calendar_pickdate";   $class .= " LC_calendar_pickdate";
     }      }
   # ------------------------------------------------ Determine first day of a week
       my $datelocale =  &Apache::lonlocal::getdatelocale();
       my $days_in_week = 7;
       my $startweek = 0;
       if (ref($datelocale)) {
           $startweek = $datelocale->first_day_of_week();
           if ($startweek == $days_in_week)  { $startweek = 0; }
       }
       my @days = ('Sun','Mon','Tue','Wed','Thu','Fri','Sat');
       my @localdays;
       if ($startweek == 0) {
           @localdays = @days;
       } else {
           my $endday = $days_in_week - $startweek;
           for (my $i=0; $i<$days_in_week; $i++) {
               if ($i < $endday) {
                   $localdays[$i] = $days[$i+$startweek];
               } else {
                   $localdays[$i] = $days[$i-$endday];
               }
           }
       }
   
   # ----------------------------------------------------------- Weekday in locale
       my $loc_weekday = $weekday - $startweek;
       if ($loc_weekday < 0) {
           $loc_weekday += $days_in_week; 
       }
   
     $r->print(      $r->print(
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.   '<a href="/adm/announcements?month='.$pm.'&year='.$py.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.   ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
Line 607  SERVERANNOUNCE Line 702  SERVERANNOUNCE
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.   '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.   '&year='.$todayhash{'year'}.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><p>'.   ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><p>'.
         '<table class="'.$class.'" cols="7" rows="5"><tr>          '<table class="'.$class.'" cols="7" rows="5"><tr>');
 <th>'.&mt('Sun').'</th>      for (my $i=0; $i<@localdays; $i++) {
 <th>'.&mt('Mon').'</th>          $r->print('<th>'.&mt($localdays[$i]).'</th>');
 <th>'.&mt('Tue').'</th>      }
 <th>'.&mt('Wed').'</th>      $r->print('</tr>');
 <th>'.&mt('Thu').'</th>  
 <th>'.&mt('Fri').'</th>  
 <th>'.&mt('Sat').'</th></tr>');  
   
     my $tk=&Apache::loncommon::maketime(%firstday);  
     my $outp;      my $outp;
     my $nm;      my $nm;
   
 # ---------------------------------------------------------------- Actual table  # ---------------------------------------------------------------- Actual table
     $r->print('<tr>');      $r->print('<tr>');
     for (my $i=0;$i<$weekday;$i++) { $r->print(&emptycell); }      for (my $i=0;$i<$loc_weekday;$i++) { $r->print(&emptycell); }
     for (my $i=$weekday;$i<=6;$i++) {       for (my $i=$loc_weekday;$i<=6;$i++) {
         ($tk,$nm,$outp)=&showday($tk,0,%allcal);          ($tk,$nm,$outp)=&showday($tk,0,%allcal);
         $r->print($outp);          $r->print($outp);
     }      }
     $r->print('</tr>');      $r->print('</tr>');
   
       my $lastrow = 0;
       my $lastday = 0;
     for (my $k=0;$k<=4;$k++) {      for (my $k=0;$k<=4;$k++) {
         $r->print('<tr>');          if (!$lastrow) {
         for (my $i=0;$i<=6;$i++) {              $r->print('<tr>');
             ($tk,$nm,$outp)=&showday($tk,0,%allcal);              for (my $i=0;$i<=6;$i++) {
             if ($month!=$nm) { $outp=&emptycell; }                  if ($lastday) {
             $r->print($outp);                      $outp = &emptycell();
                   } else {
                       my $currtk = $tk;
                       ($tk,$nm,$outp)=&showday($tk,0,%allcal);
                       if ($month!=$nm) { $lastday = 1; }
                   }
                   $r->print($outp);
               }
               if ($lastday) {
                   $lastrow = 1;
               }
               $r->print('</tr>');
         }          }
         $r->print('</tr>');  
     }      }
 # ------------------------------------------------------------------- End table  # ------------------------------------------------------------------- End table
     $r->print('</table>');      $r->print('</table>');
 # ----------------------------------------------------------------- Check marks  # ----------------------------------------------------------------- Check marks
     undef(%showedcheck);      undef(%showedcheck);
 # --------------------------------------------------------------- Remove button  # --------------------------------------------------------------- Remove button
     if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries">'.      if ($allowed) { $r->print('<br /><input type="button" onClick="removesub()" value="'.&mt('Remove Checked Entries').'">'.
       &Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').'</form>'); }        &Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').'</form>'); }
     $r->print('<p>'.      $r->print('<p>'.
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.   '<a href="/adm/announcements?month='.$pm.'&year='.$py.
Removed from v.1.70  
changed lines
  Added in v.1.79

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