[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7300] added import functionality:
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [7300] added import functionality: |
|
Date: |
Wed, 25 May 2011 06:12:41 +0000 |
Revision: 7300
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7300
Author: erikhl
Date: 2011-05-25 06:12:41 +0000 (Wed, 25 May 2011)
Log Message:
-----------
added import functionality:
set org to active if connected to an activity
set org description to imported if connected to activity
changed display of activity description
Modified Paths:
--------------
trunk/activitycalendar/inc/class.sogroup.inc.php
trunk/activitycalendar/inc/class.soorganization.inc.php
trunk/activitycalendar/inc/class.uiactivities.inc.php
trunk/activitycalendar/inc/class.uiimport.inc.php
trunk/activitycalendar/inc/model/class.activity.inc.php
trunk/activitycalendar/templates/base/activity.php
Modified: trunk/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.sogroup.inc.php 2011-05-25 05:49:39 UTC
(rev 7299)
+++ trunk/activitycalendar/inc/class.sogroup.inc.php 2011-05-25 06:12:41 UTC
(rev 7300)
@@ -180,6 +180,18 @@
return $contacts;
}
+
+ function get_description($group_id)
+ {
+ if(isset($group_id)){
+ $q1="SELECT description FROM bb_group WHERE id={$group_id}";
+ $this->db->query($q1, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ $desc = $this->db->f('description');
+ }
+ }
+ return $desc;
+ }
protected function populate(int $group_id, &$group)
{
Modified: trunk/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soorganization.inc.php 2011-05-25
05:49:39 UTC (rev 7299)
+++ trunk/activitycalendar/inc/class.soorganization.inc.php 2011-05-25
06:12:41 UTC (rev 7300)
@@ -160,6 +160,18 @@
}
return $contacts;
}
+
+ function get_description($organization_id)
+ {
+ if(isset($organization_id)){
+ $q1="SELECT description FROM bb_organization WHERE
id={$organization_id}";
+ $this->db->query($q1, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ $desc = $this->db->f('description');
+ }
+ }
+ return $desc;
+ }
/**
* Function for adding a new party to the database. Updates the party
object.
Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php 2011-05-25
05:49:39 UTC (rev 7299)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php 2011-05-25
06:12:41 UTC (rev 7300)
@@ -114,10 +114,12 @@
if(isset($g_id) && $g_id > 0)
{
$persons =
activitycalendar_sogroup::get_instance()->get_contacts($g_id);
+ $desc =
activitycalendar_sogroup::get_instance()->get_description($g_id);
}
else if(isset($o_id) && $o_id > 0)
{
$persons =
activitycalendar_soorganization::get_instance()->get_contacts($o_id);
+ $desc =
activitycalendar_soorganization::get_instance()->get_description($o_id);
}
$arenas = activitycalendar_soarena::get_instance()->get(null,
null, null, null, null, null, null);
$organizations =
activitycalendar_soorganization::get_instance()->get(null, null, null, null,
null, null, null);
@@ -139,7 +141,7 @@
$activity->set_category(phpgw::get_var('category'));
$target_array = phpgw::get_var('target');
$activity->set_target(implode(",",
$target_array));
-
$activity->set_description(phpgw::get_var('description'));
+ $activity->set_description($desc);
$activity->set_time(phpgw::get_var('time'));
$activity->set_contact_persons($persons);
$activity->set_special_adaptation(phpgw::get_var('special_adaptation'));
Modified: trunk/activitycalendar/inc/class.uiimport.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiimport.inc.php 2011-05-25 05:49:39 UTC
(rev 7299)
+++ trunk/activitycalendar/inc/class.uiimport.inc.php 2011-05-25 06:12:41 UTC
(rev 7300)
@@ -226,6 +226,21 @@
if($activity_org)
{
$activity_org =
$soactivity->get_orgid_from_orgno($activity_org);
+ if($activity_org)
+ {
+
$soactivity->set_org_active($activity_org);
+ $activity_description =
$this->decode($data[5]);
+ if($activity_description)
+ {
+ //update description on
organization
+
$soactivity->update_org_description($activity_org, $activity_description);
+
//var_dump(strlen($activity_description));
+
//if(strlen($activity_description) > 255)
+ //{
+
//$activity_description = substr($activity_description,0,254);
+ //}
+ }
+ }
}
$activity_adapted = $this->decode($data[3]);
$activity_category = $this->decode($data[4]);
@@ -233,15 +248,6 @@
{
$activity_category =
$soactivity->get_category_from_name($activity_category);
}
- $activity_description = $this->decode($data[5]);
- if($activity_description)
- {
-
//var_dump(strlen($activity_description));
- if(strlen($activity_description) > 255)
- {
- $activity_description =
substr($activity_description,0,254);
- }
- }
$activity_target = $this->decode($data[6]);
//var_dump($activity_target);
if($activity_target)
Modified: trunk/activitycalendar/inc/model/class.activity.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.activity.inc.php 2011-05-25
05:49:39 UTC (rev 7299)
+++ trunk/activitycalendar/inc/model/class.activity.inc.php 2011-05-25
06:12:41 UTC (rev 7300)
@@ -202,11 +202,13 @@
{
$contact_1 =
activitycalendar_socontactperson::get_instance()->get_org_contact_name($this->get_contact_person_1());
$contact_2 =
activitycalendar_socontactperson::get_instance()->get_org_contact_name($this->get_contact_person_2());
+ $desc =
activitycalendar_soorganization::get_instance()->get_description($this->get_organization_id());
}
else if(isset($this->group_id) && $this->get_group_id()
> 0)
{
$contact_1 =
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_1());
$contact_2 =
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_2());
+ $desc =
activitycalendar_sogroup::get_instance()->get_description($this->get_group_id());
}
else
{
@@ -222,7 +224,7 @@
'office' =>
activitycalendar_soactivity::get_instance()->get_office_name($this->get_office()),
'category' =>
$this->get_so()->get_category_name($this->get_category()),
'state' => lang('state_'.$this->get_state()),
- 'description' => $this->get_description(),
+ 'description' => $desc,
'arena' =>
activitycalendar_soarena::get_instance()->get_arena_name($this->get_arena()),
'time' => $this->get_time(),
'contact_person_1' => $contact_1,
Modified: trunk/activitycalendar/templates/base/activity.php
===================================================================
--- trunk/activitycalendar/templates/base/activity.php 2011-05-25 05:49:39 UTC
(rev 7299)
+++ trunk/activitycalendar/templates/base/activity.php 2011-05-25 06:12:41 UTC
(rev 7300)
@@ -279,23 +279,12 @@
?>
</dd>
<dt>
- <?php if($activity->get_description()
|| $editable) { ?>
+ <?php if($activity->get_description())
{ ?>
<label for="description"><?php echo
lang('description') ?></label>
<?php } ?>
</dt>
<dd>
- <?php
- if ($editable)
- {
- ?>
- <textarea cols="100" rows="5"
name="description" id="description"><?php echo $activity->get_description()
?></textarea>
- <?php
- }
- else
- {
- echo
$activity->get_description();
- }
- ?>
+ <?php echo
$activity->get_description(); ?>
</dd>
<dt>
<?php if($activity->get_time() ||
$editable) { ?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7300] added import functionality:,
Erik Holm-Larsen <=