Changeset 3976

Timestamp:

04/11/11 15:57:01 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1607 - Incluir um campo Observações na Agenda

Location:

branches/2.2.0.1/calendar

Files:

• inc/class.bocalendar.inc.php (modified) (3 diffs)
• inc/class.bocustom_fields.inc.php (modified) (1 diff)
• inc/class.socalendar.inc.php (modified) (1 diff)
• inc/class.socalendar__.inc.php (modified) (1 diff)
• inc/class.socalendar_sql.inc.php (modified) (2 diffs)
• inc/class.uicalendar.inc.php (modified) (3 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)
• setup/tables_current.inc.php (modified) (1 diff)
• setup/tables_update.inc.php (modified) (1 diff)

branches/2.2.0.1/calendar/inc/class.bocalendar.inc.php

@@ -1120 +1120 @@
                                 $event['title'] = stripslashes($event['title']);
                                 $event['description'] = stripslashes($event['description']);
+                                $event['observations'] = stripslashes($event['observations']);
                                 $event['ex_participants'] = stripslashes($event['ex_participants']);
                                 $datetime_check = $this->validate_update($event);
@@ -1187 +1188 @@
                                 $this->so->set_title($l_cal['title']);
                                 $this->so->set_description($l_cal['description']);
+                                $this->so->set_observations($l_cal['observations']);
                                 $this->so->set_attachment($l_cal['attachment']);
                                 $this->so->set_ex_participants($l_cal['ex_participants']);
@@ -3963 +3965 @@
                         );
 
+                        $var['observations'] = Array(
+                                'field' => $this->translate('Observations'),
+                                'data'  => $event['observations']
+                        );
+                        
                         $var['attachment'] = Array(
                                 'field' => $this->translate('Attachment'),

branches/2.2.0.1/calendar/inc/class.bocustom_fields.inc.php

@@ -32 +32 @@
                         'alarm'       => 'Alarm',
                         'recure_type' => 'Repetition',
+                        'observations' => 'Observations',
                         'alter_by'   =>  'Alter by',
                         'attachment' => 'attachment'

branches/2.2.0.1/calendar/inc/class.socalendar.inc.php

@@ -369 +369 @@
                         $this->cal->set_description($description);
                 }
+
+                function set_observations($observations='')
+                {
+                    $this->cal->set_observations($observations);
+                }
+
                 function set_attachment($attachment='')
                 {
                         $this->cal->set_attachment($attachment);
                 }
+
                 function set_ex_participants($ex_participants='')
                 {

branches/2.2.0.1/calendar/inc/class.socalendar__.inc.php

@@ -102 +102 @@
                 }
 
+                function set_observations($observations='')
+                {
+                    $this->add_attribute('observations',$observations);
+                }
+
                 function set_alter_by($alter_by='')
                 {

branches/2.2.0.1/calendar/inc/class.socalendar_sql.inc.php

@@ -569 +569 @@
                                 $this->set_title(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('title'))));
                                 $this->set_description(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('description'))));
+                                $this->set_observations(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('observations'))));
                                 $this->set_alter_by(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('alter_by'))));
                                 $this->set_attachment(stripslashes($GLOBALS['phpgw']->strip_html($this->stream->f('attachment'))));
@@ -978 +979 @@
                                         . "title='".$this->stream->db_addslashes($event['title'])."', "
                                         . "description='".$this->stream->db_addslashes($event['description'])."', "
+                                        . "observations='".$this->stream->db_addslashes($event['observations'])."', "
                                         . "attachment='".$this->stream->db_addslashes(serialize($event['attachment']))."', "
                                         . "alter_by='".$this->stream->db_addslashes($GLOBALS['phpgw_info']['user']['fullname'])."', "

branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php

@@ -4988 +4988 @@
                                 'tr_color' => $this->theme['th_bg'],
                                 'field' => lang('Title'),
-                                'data'  => '<input name="cal[title]" size="45" maxlength="80" value="'.$event['title'].'">'
+                                'data'  => '<input name="cal[title]" size="103" maxlength="300" value="'.$event['title'].'">'
                         );
 
@@ -4994 +4994 @@
                         $var['description'] = Array(
                                 'field' => lang('Full Description'),
-                                'data'  => '<textarea name="cal[description]" rows="5" cols="40" wrap="virtual" maxlength="2048">'.$event['description'].'</textarea>'
+                                'data'  => '<textarea name="cal[description]" rows="5" cols="88" wrap="virtual" maxlength="2048">'.$event['description'].'</textarea>'
                         );
 
@@ -5422 +5422 @@
 //                      $this->output_template_array($p,'row','list',Array('data' => '<script src="simple_show_hide.js" type="text/javascript"></script>'));
 
+// Observations
+                        $var['observations'] = Array(
+                                'field' => lang('Observations'),
+                                'data'  => '<textarea name="cal[observations]" rows="5" cols="88" wrap="virtual" maxlength="2048">'.$event['observations'].'</textarea>'
+                        );
+
                         if ($event['attachment'] == '' || $event['attachment'] == 'ERROR' || is_array($event['attachment']))
                             $data =  '<a onClick="javascript:addAttach()" href="#divFiles" >Anexos: adicionar+</a><div id="divFiles"</div>';

branches/2.2.0.1/calendar/setup/tables_current.inc.php

@@ -27 +27 @@
                                 'title' => array('type' => 'varchar','precision' => '80','nullable' => False,'default' => '1'),
                                 'description' => array('type' => 'text','nullable' => True),
+                                'observations' => array('type' => 'text','nullable' => True),
                                 'attachment' => array('type' => 'text','nullable' => True),
                                 'location' => array('type' => 'varchar','precision' => '255','nullable' => True),

branches/2.2.0.1/calendar/setup/tables_update.inc.php

@@ -83 +83 @@
         function calendar_upgrade2_2_000()
         {
+            $GLOBALS['phpgw_setup']->db->query("ALTER TABLE phpgw_cal ADD COLUMN observations text");
             $GLOBALS['phpgw_setup']->db->query("ALTER TABLE phpgw_cal ADD COLUMN alter_by varchar(160)");
             $GLOBALS['phpgw_setup']->db->query("ALTER TABLE phpgw_cal ADD COLUMN attachment text");