[Fmsystem-commits] [7277] import-fix

[Erik Holm-Larsen]

Revision: 7277
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7277
Author:   erikhl
Date:     2011-05-10 08:12:05 +0000 (Tue, 10 May 2011)
Log Message:
-----------
import-fix

Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php
    trunk/activitycalendar/inc/class.uiimport.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 2011-05-10 07:55:58 UTC 
(rev 7276)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-10 08:12:05 UTC 
(rev 7277)
@@ -151,6 +151,7 @@
                        $columns[] = 'activity.organization_id';
                        $columns[] = 'activity.group_id';
                        $columns[] = 'activity.district';
+                       $columns[] = 'activity.office';
                        $columns[] = 'activity.state';
                        $columns[] = 'activity.category';
                        $columns[] = 'activity.target';
@@ -218,6 +219,7 @@
                        'organization_id = '. 
$this->marshal($activity->get_organization_id(), 'int'),
                        'group_id = '     . 
$this->marshal($activity->get_group_id(), 'int'),
                        'district =  '     . 
$this->marshal($activity->get_district(), 'int'),
+                       'office =  '     . 
$this->marshal($activity->get_office(), 'int'),
                        'category = '          . 
$this->marshal($activity->get_category(), 'int'),
                        'state = '          . 
$this->marshal($activity->get_state(), 'int'),
                        'target = '   . $this->marshal($activity->get_target(), 
'string'),
@@ -320,6 +322,16 @@
                return $district;
        }
        
+       function get_district_from_name($name)
+       {
+               $this->db->query("SELECT district_id FROM fm_part_of_town where 
name like UPPER('{$name}') ", __LINE__, __FILE__);
+               $this->db->query($sql, __LINE__, __FILE__);
+               while($this->db->next_record()){
+                       $result = $this->db->f('district_id');
+               }       
+               return $result;
+       }
+       
        function get_district_name($district_id)
        {
                $result = "Ingen";
@@ -334,7 +346,21 @@
                return $result;
        }
        
+       function get_office_name($district_id)
+       {
+               $result = "Ingen";
+               if($district_id != null)
+               {
+                       $sql = "SELECT descr FROM fm_district where 
id=$district_id";
+                       $this->db->query($sql, __LINE__, __FILE__);
+                       while($this->db->next_record()){
+                               $result = $this->db->f('descr');
+                       }
+       }
+               return $result;
+       }
        
+       
        function get_target_name($target_id)
        {
                $result = "Ingen";

Modified: trunk/activitycalendar/inc/class.uiimport.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiimport.inc.php   2011-05-10 07:55:58 UTC 
(rev 7276)
+++ trunk/activitycalendar/inc/class.uiimport.inc.php   2011-05-10 08:12:05 UTC 
(rev 7277)
@@ -268,7 +268,11 @@
                                                $activity_updated_date = 
strtotime($y."-".$m."-".$d);
                                        }
                                }
-                               //$activity_district = $this->decode($data[21]);
+                               $activity_district = $this->decode($data[21]);
+                               if($activity_district)
+                               {
+                                       $activity_district = 
$soactivity->get_district_from_name($activity_district);
+                               }
                                
                                if($activity_title){
                                        $activity->set_title($activity_title);
@@ -283,6 +287,7 @@
                                                
$activity->set_special_adaptation(true);
                                        }
                                        $activity->set_office($this->office);
+                                       
$activity->set_district($activity_district);
                                        
$activity->set_last_change_date($activity_updated_date);
                                        //var_dump($activity);
                                        // All is good, store activity

Modified: trunk/activitycalendar/inc/model/class.activity.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.activity.inc.php     2011-05-10 
07:55:58 UTC (rev 7276)
+++ trunk/activitycalendar/inc/model/class.activity.inc.php     2011-05-10 
08:12:05 UTC (rev 7277)
@@ -14,6 +14,7 @@
                protected $organization_id;
                protected $group_id;
                protected $district;
+               protected $office;
                protected $category;
                protected $state;
                protected $target;
@@ -72,6 +73,13 @@
                
                public function get_district() { return $this->district; }
                
+               public function set_office($office)
+               {
+                       $this->office = $office;
+               }
+               
+               public function get_office() { return $this->office; }
+               
                public function set_target($target)
                {
                        $this->target = $target;
@@ -211,6 +219,7 @@
                                'organization_id' => 
activitycalendar_soorganization::get_instance()->get_organization_name($this->get_organization_id()),
                                'group_id' => 
activitycalendar_sogroup::get_instance()->get_group_name($this->get_group_id()),
                                'district' => 
activitycalendar_soactivity::get_instance()->get_district_name($this->get_district()),
+                               '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(),