Index: /branches/2.2.0.1/calendar/setup/tables_current.inc.php =================================================================== --- /branches/2.2.0.1/calendar/setup/tables_current.inc.php (revision 3972) +++ /branches/2.2.0.1/calendar/setup/tables_current.inc.php (revision 3976) @@ -27,4 +27,5 @@ '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), Index: /branches/2.2.0.1/calendar/setup/tables_update.inc.php =================================================================== --- /branches/2.2.0.1/calendar/setup/tables_update.inc.php (revision 3973) +++ /branches/2.2.0.1/calendar/setup/tables_update.inc.php (revision 3976) @@ -83,4 +83,5 @@ 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"); Index: /branches/2.2.0.1/calendar/inc/class.bocustom_fields.inc.php =================================================================== --- /branches/2.2.0.1/calendar/inc/class.bocustom_fields.inc.php (revision 3968) +++ /branches/2.2.0.1/calendar/inc/class.bocustom_fields.inc.php (revision 3976) @@ -32,4 +32,5 @@ 'alarm' => 'Alarm', 'recure_type' => 'Repetition', + 'observations' => 'Observations', 'alter_by' => 'Alter by', 'attachment' => 'attachment' Index: /branches/2.2.0.1/calendar/inc/class.bocalendar.inc.php =================================================================== --- /branches/2.2.0.1/calendar/inc/class.bocalendar.inc.php (revision 3973) +++ /branches/2.2.0.1/calendar/inc/class.bocalendar.inc.php (revision 3976) @@ -1120,4 +1120,5 @@ $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,4 +1188,5 @@ $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,4 +3965,9 @@ ); + $var['observations'] = Array( + 'field' => $this->translate('Observations'), + 'data' => $event['observations'] + ); + $var['attachment'] = Array( 'field' => $this->translate('Attachment'), Index: /branches/2.2.0.1/calendar/inc/class.socalendar__.inc.php =================================================================== --- /branches/2.2.0.1/calendar/inc/class.socalendar__.inc.php (revision 3968) +++ /branches/2.2.0.1/calendar/inc/class.socalendar__.inc.php (revision 3976) @@ -102,4 +102,9 @@ } + function set_observations($observations='') + { + $this->add_attribute('observations',$observations); + } + function set_alter_by($alter_by='') { Index: /branches/2.2.0.1/calendar/inc/class.socalendar_sql.inc.php =================================================================== --- /branches/2.2.0.1/calendar/inc/class.socalendar_sql.inc.php (revision 3968) +++ /branches/2.2.0.1/calendar/inc/class.socalendar_sql.inc.php (revision 3976) @@ -569,4 +569,5 @@ $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,4 +979,5 @@ . "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'])."', " Index: /branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php =================================================================== --- /branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php (revision 3966) +++ /branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php (revision 3976) @@ -4988,5 +4988,5 @@ 'tr_color' => $this->theme['th_bg'], 'field' => lang('Title'), - 'data' => '' + 'data' => '' ); @@ -4994,5 +4994,5 @@ $var['description'] = Array( 'field' => lang('Full Description'), - 'data' => '' + 'data' => '' ); @@ -5422,4 +5422,10 @@ // $this->output_template_array($p,'row','list',Array('data' => '')); +// Observations + $var['observations'] = Array( + 'field' => lang('Observations'), + 'data' => '' + ); + if ($event['attachment'] == '' || $event['attachment'] == 'ERROR' || is_array($event['attachment'])) $data = 'Anexos: adicionar+