Changeset 4705 for trunk/calendar/inc

Timestamp:

07/13/11 15:35:43 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1950 - Destacar feriados no módulo calendario (dia, semana, mes) r4550

File:

• trunk/calendar/inc/class.uicalendar.inc.php (modified) (7 diffs)

trunk/calendar/inc/class.uicalendar.inc.php

@@ -5165 +5165 @@
                         )
                     );
-
+                    $this->bo->read_holidays($params['year']);
                     $next = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day + 7,$this->bo->year);
                     $prev = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day - 7,$this->bo->year);
@@ -5188 +5188 @@
                         'new_week'   => $tpl,
                     );
-
+                    $feriados_do_ano = Array();
+                    foreach ($this->bo->cached_holidays as $key => $value)
+                        {
+                            $feriados_do_ano[$key] = utf8_encode($this->bo->cached_holidays[$key][0]['name']);
+                        }
                     $p->set_file($templates);
                     $p->set_block('new_week','day','day');
@@ -5202 +5206 @@
                     $p->set_var('user',$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner));
                     $p->set_var('events_json',json_encode($result_events_json['events_to_show_json'])?json_encode($result_events_json['events_to_show_json']):'null');
+                    $p->set_var('holidays_json',json_encode($feriados_do_ano)?json_encode($feriados_do_ano):null);
                     return $p->fp('out','day');
 
@@ -5210 +5215 @@
                         $p = CreateObject('phpgwapi.Template',$this->template_dir);
                         $p->set_unknowns('keep');
-
                         $tpl = 'new_month.tpl';
 
@@ -5257 +5261 @@
                                         )
                                 );
-
+                        $this->bo->read_holidays($params['year']);
                         $print =  '<a href="javascript:void(0)" id="printFriendly">['.lang('Printer Friendly').']</a>';
 
@@ -5277 +5281 @@
                         }
 
+                        $feriados_do_ano = Array();
+                        foreach ($this->bo->cached_holidays as $key => $value)
+                        {
+                            $feriados_do_ano[$key] = utf8_encode($this->bo->cached_holidays[$key][0]['name']);
+                        }
                         $m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
                         $p->set_file($templates);
@@ -5293 +5302 @@
                         $p->set_var('user',$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner));
                         $p->set_var('events_json',json_encode($result_events_json['events_to_show_json'])?json_encode($result_events_json['events_to_show_json']):'null');
+                        $p->set_var('holidays_json',json_encode($feriados_do_ano)?json_encode($feriados_do_ano):null);
                         return $p->fp('out','day');
                 }