Changeset 4705

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

Location:

trunk/calendar

Files:

• inc/class.uicalendar.inc.php (modified) (7 diffs)
• js/dhtmlx/codebase/dhtmlxscheduler.css (modified) (1 diff)
• js/dhtmlx/sources/ext/ext_new_month.js (added)
• js/dhtmlx/sources/ext/ext_new_week.js (modified) (1 diff)
• templates/default/new_month.tpl (modified) (3 diffs)
• templates/default/new_week.tpl (modified) (1 diff)

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');
                 }

trunk/calendar/js/dhtmlx/codebase/dhtmlxscheduler.css

@@ -11 +11 @@
 
     }
+
+    .dhx_holiday .dhx_month_head{background-color:#c68686;}
+    .dhx_holiday .dhx_month_body{background-color:#dab0b0;}
+
+    .dhx_now_holiday .dhx_month_head{background-color:#c68686;}
+    .dhx_now_holiday .dhx_month_body{background-color:#E2EDFF;}
+    

trunk/calendar/js/dhtmlx/sources/ext/ext_new_week.js

@@ -120 +120 @@
                                 html+="<td";
                                 var cls = "";
+                                var clstitle = "";
                                 if (sd.valueOf()==cd.valueOf())
                                         cls='dhx_now';
+                                var aaaa = sd.getFullYear();
+                                var mm = sd.getMonth()+1;
+                                var dd = sd.getDate();
+                                aaaa = aaaa.toString();
+                                mm = mm.toString();
+                                dd = dd.toString();
+                                if(mm.length < 2) mm = '0' + mm;
+                                if(dd.length < 2) dd = '0' + dd;
+                                var aaaammdd = aaaa + mm + dd;
+                                if (holidayTab[aaaammdd])
+                                {
+                                        cls = 'dhx_holiday';
+                                        clstitle = holidayTab[aaaammdd];
+                                }
+
+                                if (sd.valueOf()==cd.valueOf() && holidayTab[aaaammdd])
+                                {
+                                        cls = 'dhx_now_holiday';
+                                        clstitle = holidayTab[aaaammdd];
+                                }
+
                                 html+=" class='"+cls+" "+this.templates.month_date_class(sd,cd)+"' ";
-                                html+="><div class='dhx_month_head'>"+this.templates.week_scale_date(sd)+"</div><div class='dhx_month_body' "+tdcss[j]+"></div></td>"
+                                html+="><div class='dhx_month_head' title='" + clstitle + "'> "+this.templates.week_scale_date(sd)+"</div><div class='dhx_month_body' "+tdcss[j]+"></div></td>"
                                 sd=this.date.add(sd,1,"day");
                                 if(i==3)

trunk/calendar/templates/default/new_month.tpl

@@ -5 +5 @@
 <script src="calendar/js/dhtmlx/sources/ext/ext_pdf.js"></script>
 <script src="calendar/js/dhtmlx/sources/locale_pt.js"></script>
+<script src="calendar/js/dhtmlx/sources/ext/ext_new_month.js"></script>
 <script>
 
@@ -68 +69 @@
 
 <script>
-
+    var holidayTab = {holidays_json};
     function printMode(printType)
     {
@@ -150 +151 @@
         scheduler.parse({events_json},"json");
 
+
+
     }
 

trunk/calendar/templates/default/new_week.tpl

@@ -7 +7 @@
 <script src="calendar/js/dhtmlx/sources/ext/ext_new_week.js"></script>
 <script>
-
+    var holidayTab = {holidays_json};
     resize = function(){