[Fmsystem-commits] [9050]

[Erik Holm-Larsen]

Revision: 9050
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9050
Author:   erikhl
Date:     2012-03-27 12:25:45 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php
    trunk/activitycalendar/inc/class.socontactperson.inc.php
    trunk/activitycalendar/inc/class.sogroup.inc.php
    trunk/activitycalendar/inc/model/class.activity.inc.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2012-03-27 12:13:01 UTC 
(rev 9049)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-03-27 12:25:45 UTC 
(rev 9050)
@@ -452,15 +452,33 @@
                        
                        if($activity->get_group_id() && 
$activity->get_group_id() > 0)
                        {
-                               $contacts = 
activitycalendar_sogroup::get_instance()->get_contacts($activity->get_group_id());
-                               $activity->set_contact_persons($contacts);
-                               $org_tmp = 
activitycalendar_sogroup::get_instance()->get_orgid_from_group($activity->get_group_id());
-                               $activity->set_organization_id($org_tmp);
+                               if($activity->get_new_org())
+                               {
+                                       $contacts = 
activitycalendar_sogroup::get_instance()->get_contacts_local($activity->get_group_id());
+                                       
$activity->set_contact_persons($contacts);
+                                       //$org_tmp = 
activitycalendar_sogroup::get_instance()->get_orgid_from_group($activity->get_group_id());
+                                       
//$activity->set_organization_id($org_tmp);
+                               }
+                               else
+                               {
+                                       $contacts = 
activitycalendar_sogroup::get_instance()->get_contacts($activity->get_group_id());
+                                       
$activity->set_contact_persons($contacts);
+                                       $org_tmp = 
activitycalendar_sogroup::get_instance()->get_orgid_from_group($activity->get_group_id());
+                                       
$activity->set_organization_id($org_tmp);
+                               }
                        }
                        else if($activity->get_organization_id() && 
$activity->get_organization_id() > 0)
                        {
-                               $contacts = 
activitycalendar_soorganization::get_instance()->get_contacts($activity->get_organization_id());
-                               $activity->set_contact_persons($contacts);
+                               if($activity->get_new_org())
+                               {
+                                       $contacts = 
activitycalendar_soorganization::get_instance()->get_contacts($activity->get_organization_id());
+                                       
$activity->set_contact_persons($contacts);
+                               }
+                               else
+                               {
+                                       $contacts = 
activitycalendar_soorganization::get_instance()->get_contacts_local($activity->get_organization_id());
+                                       
$activity->set_contact_persons($contacts);
+                               }
                        }
                        
                }

Modified: trunk/activitycalendar/inc/class.socontactperson.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.socontactperson.inc.php    2012-03-27 
12:13:01 UTC (rev 9049)
+++ trunk/activitycalendar/inc/class.socontactperson.inc.php    2012-03-27 
12:25:45 UTC (rev 9050)
@@ -205,6 +205,19 @@
                return $result;
        }
        
+       function get_group_contact_name_local($id)
+       {
+               $result = "Ingen";
+       if(isset($id)){
+               $q1="SELECT name, phone, email FROM activity_contact_person 
WHERE id={$id}";
+                       $this->db->query($q1, __LINE__, __FILE__);
+                       while($this->db->next_record()){
+                               $result = $this->db->f('name') . "<br/>" . 
$this->db->f('phone') . "<br/>" . $this->db->f('email');
+                       }
+       }
+               return $result;
+       }
+       
        function get_org_contact_name($id)
        {
                $result = "Ingen";

Modified: trunk/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.sogroup.inc.php    2012-03-27 12:13:01 UTC 
(rev 9049)
+++ trunk/activitycalendar/inc/class.sogroup.inc.php    2012-03-27 12:25:45 UTC 
(rev 9050)
@@ -210,6 +210,20 @@
                return $result;
        }
        
+       function get_group_name_local($group_id)
+       {
+               $result = "Ingen";
+       if(isset($group_id)){
+               $q1="SELECT name FROM activity_group WHERE id={$group_id}";
+                       $this->db->query($q1, __LINE__, __FILE__);
+                       while($this->db->next_record()){
+                               $result = $this->db->f('name');
+                       }
+       }
+               
+               return $result;
+       }
+       
        function get_orgid_from_group($group_id)
        {
                $result = 0;
@@ -307,6 +321,18 @@
        }
                return $desc;
        }
+       
+       function get_description_local($group_id)
+       {
+       if(isset($group_id)){
+               $q1="SELECT description FROM activity_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/model/class.activity.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.activity.inc.php     2012-03-27 
12:13:01 UTC (rev 9049)
+++ trunk/activitycalendar/inc/model/class.activity.inc.php     2012-03-27 
12:25:45 UTC (rev 9050)
@@ -248,9 +248,20 @@
                        $date_format = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
                        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());
+                               if($this->get_new_org())
+                               {
+                                       $group_name = 
activitycalendar_sogroup::get_instance()->get_group_name_local($this->get_group_id());
+                                       $contact_1 = 
activitycalendar_socontactperson::get_instance()->get_group_contact_name_local($this->get_contact_person_1());
+                                       $contact_2 = 
activitycalendar_socontactperson::get_instance()->get_group_contact_name_local($this->get_contact_person_2());
+                                       $desc = 
activitycalendar_sogroup::get_instance()->get_description_local($this->get_group_id());
+                               }
+                               else
+                               {
+                                       $group_name = 
activitycalendar_sogroup::get_instance()->get_group_name($this->get_group_id());
+                                       $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());
+                               }
                                $org_name = 
activitycalendar_soorganization::get_instance()->get_organization_name($this->get_organization_id());
                        }
                        else if(isset($this->organization_id) && 
$this->get_organization_id() > 0)
@@ -291,7 +302,7 @@
                                'id' => $this->get_id(),
                                'title' => $this->get_title(),
                                'organization_id' => $org_name,
-                               'group_id' => 
activitycalendar_sogroup::get_instance()->get_group_name($this->get_group_id()),
+                               'group_id' => $group_name,
                                'district' => $activity_district,
                                'office' => 
activitycalendar_soactivity::get_instance()->get_office_name($this->get_office()),
                                'category' => 
$this->get_so()->get_category_name($this->get_category()),