Changeset 583

Timestamp:

01/08/09 16:11:54 (15 years ago)

Author:

niltonneto

Message:

Resolve #390.

Location:

trunk/calendar

Files:

• inc/class.bocalendar.inc.php (modified) (2 diffs)
• inc/class.socalendar.inc.php (modified) (1 diff)
• inc/class.socalendar_sql.inc.php (modified) (2 diffs)
• inc/class.uicalendar.inc.php (modified) (6 diffs)
• templates/celepar/js/edit.js (modified) (1 diff)

trunk/calendar/inc/class.bocalendar.inc.php

@@ -867 +867 @@
                                 $this->fix_update_time($l_start);
                                 $this->fix_update_time($l_end);
-
-                                if(!isset($l_cal['private']))
-                                {
-                                        $l_cal['private'] = 'public';
-                                }
                                 if(!isset($l_cal['ex_participants']))
                                 {
@@ -882 +877 @@
                                 }
 
-                                $is_public = (int)(isset($l_cal['public']) ? $l_cal['public'] : $l_cal['private'] == 'public');
+                                $is_public = ($l_cal['type'] != 'private');
                                 $this->so->event_init();
                                 $this->add_attribute('uid',$l_cal['uid']);
+                                $this->add_attribute('type',$l_cal['type']);
                                 if($l_cal['ex_participants']) {
                                         $this->add_attribute('ex_participants',$l_cal['ex_participants']);

trunk/calendar/inc/class.socalendar.inc.php

@@ -91 +91 @@
                                 }
                                 $cats = $GLOBALS['phpgw']->categories->return_all_children($this->cat_id);
-                                $extra .= "AND (phpgw_cal.category".(count($cats) > 1 ? ' IN ('.implode(',',$cats).')' : '='.(int)$this->cat_id);
+                                $extra .= "AND (phpgw_cal.category".(count($cats) > 1 ? ' IN ('.implode(',',$cats).')' : '=\''.(int)$this->cat_id."'");
                                 foreach($cats as $cat)
                                 {

trunk/calendar/inc/class.socalendar_sql.inc.php

@@ -563 +563 @@
                                 $this->add_attribute('owner',(int)$this->stream->f('owner'));
                                 $this->add_attribute('id',(int)$this->stream->f('cal_id'));
+                                $this->add_attribute('type',$this->stream->f('cal_type'));
                                 $this->set_class((int)$this->stream->f('is_public'));
                                 $this->set_category($this->stream->f('category'));
@@ -954 +955 @@
                         else
                         {
-                                $type = 'E';
+                                if ($event['type'] == 'hourAppointment')
+                                        $type = 'H';
+                                else
+                                        $type = 'E';
                         }
 

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

@@ -4394 +4394 @@
                         $var['category'] = Array(
                                 'field' => lang('Category'),
-                                'data'  => '<select name="categories[]" multiple size="5">'.$this->cat->formated_list('select','all',$check_cats,True).'</select>'
+                                'data'  => '<select name="categories[]" onchange="javascript:updateTitleField(this)" multiple size="5">'.$this->cat->formated_list('select','all',$check_cats,True).'</select>'
                         );
 
@@ -4460 +4460 @@
                         );
 
-// Access
+                        // Access
                         $var['access'] = Array(
-                                'field' => lang('Private'),
-                                'data'  => '<input type="checkbox" name="cal[private]" value="private"'.(!$event['public']?' checked':'').'>'
-                        );
+                                'field' => lang('Type'),
+                                'data'  => '<select onchange="javascript:changeViewMode(this.value);" id="cal[type]" name="cal[type]"><option value="normal">'.lang('Normal').'</option><option value="private" '.(!$event['public']?'SELECTED':'').' >'. lang('Private').'</option><option value="hourAppointment" '.($event['type'] == 'H'?'SELECTED':'').' >'.lang('Hours Appointment').'</option></select>'
+                        ); //event['public']
 
 // Participants
@@ -4751 +4751 @@
                                 'data'  => '<input name="cal[recur_interval]" size="4" maxlength="4" value="'.$event['recur_interval'].'">'
                         );
+//                      $this->output_template_array($p,'row','list',Array('data' => '<script src="simple_show_hide.js" type="text/javascript"></script>'));
 
                         if (!isset($this->fields))
@@ -4758 +4759 @@
                                 $this->stock_fields = &$this->custom_fields->stock_fields;
                         }
+                        $this->output_template_array($p,'row','list',$var['access']);
+                        unset($var['access']);
+
                         $preserved = False;
                         foreach($this->fields as $field => $data)
@@ -4777 +4781 @@
                                                         case 'recure_type':
                                                                 $p->set_var('tr_color',$this->theme['th_bg']);
-                                                                $p->set_var('hr_text','<center><b>'.lang('Repeating Event Information').'</b></center>');
+                                                                $p->set_var('hr_text','<center name="cal[rpt_label]"><b>'.lang('Repeating Event Information').'</b></center>');
                                                                 $p->parse('row','hr',True);
                                                                 $this->output_template_array($p,'row','list',$var['recure_type']);
@@ -4869 +4873 @@
                         $p->set_var('cancel_button',$cancel_button);
                         $p->pparse('out','edit_entry');
+                        echo "<script src='calendar/templates/celepar/js/edit.js' type='text/javascript'></script>";
+                        echo "<script>var type=document.getElementById('cal[type]'); changeViewMode(type.value);</script>";
+
                         
                 }

trunk/calendar/templates/celepar/js/edit.js

@@ -92 +92 @@
                 selectOpener.options[selectOpener.options.length-1].selected = true;
         }
-        
+function changeViewMode(chValue){
+        switch (chValue){
+                case 'hourAppointment':
+                        var names=new Array('title','priority','location','alarmhours','alarmminutes','recur_type','rpt_use_end','recur_interval','rpt_label');
+                        for (var i=0; i < names.length; i++)
+                        {
+                                var Field = document.getElementsByName('cal['+names[i]+']');
+                                if (Field[0])
+                                        Field[0].parentNode.parentNode.style.display = "none";
+                        }
+
+                        Field = document.getElementsByName('participants[]');
+                        Field[0].parentNode.parentNode.style.display = "none";
+                        Field[1].parentNode.parentNode.style.display = "none";
+                        Field = document.getElementById('txt_loading');
+                        Field.parentNode.parentNode.style.display = "none";
+                        Field = document.getElementsByName('cal[rpt_day][]');
+                        Field[0].parentNode.parentNode.style.display = "none";
+                        break;
+                default:
+                        var names=new Array('title','priority','location','alarmhours','alarmminutes','recur_type','rpt_use_end','recur_interval','rpt_label');
+                        for (var i=0; i < names.length; i++)
+                        {
+                                var Field = document.getElementsByName('cal['+names[i]+']');
+                                if (Field[0])
+                                        Field[0].parentNode.parentNode.style.display = "";
+                        }
+                        Field = document.getElementsByName('participants[]');
+                        Field[0].parentNode.parentNode.style.display = "";
+                        Field[1].parentNode.parentNode.style.display = "";
+                        Field = document.getElementById('txt_loading');
+                        Field.parentNode.parentNode.style.display = "";
+                        Field = document.getElementsByName('cal[rpt_day][]');
+                        Field[0].parentNode.parentNode.style.display = "";
+                        break;
+        }
+
+}
+function updateTitleField(select){
+        var typeField = document.getElementsByName('cal[type]');
+        if (typeField[0].value != 'hourAppointment')
+                return;
+        var titleField = document.getElementsByName('cal[title]');
+        var optionsArray = select.childNodes;
+        titleField[0].value = '';
+        for(option in optionsArray)
+                if (optionsArray[option].selected)
+                        titleField[0].value += optionsArray[option].text + ' ';
+}
+
+        
 // Fim