[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7280] Merge 7274:7279 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7280] Merge 7274:7279 from trunk |
|
Date: |
Tue, 10 May 2011 10:09:43 +0000 |
Revision: 7280
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7280
Author: sigurdne
Date: 2011-05-10 10:09:42 +0000 (Tue, 10 May 2011)
Log Message:
-----------
Merge 7274:7279 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2011-05-10 08:57:32 UTC (rev 7279)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2011-05-10 10:09:42 UTC (rev 7280)
@@ -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'),
@@ -263,6 +265,7 @@
$activity->set_organization_id($this->unmarshal($this->db->f('organization_id'),
'int'));
$activity->set_group_id($this->unmarshal($this->db->f('group_id'), 'int'));
$activity->set_district($this->unmarshal($this->db->f('district'), 'int'));
+
$activity->set_office($this->unmarshal($this->db->f('office'), 'int'));
$activity->set_category($this->unmarshal($this->db->f('category'), 'int'));
$activity->set_state($this->unmarshal($this->db->f('state'), 'int'));
$activity->set_target($this->unmarshal($this->db->f('target'), 'string'));
@@ -320,6 +323,15 @@
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__);
+ 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:
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2011-05-10 08:57:32 UTC (rev 7279)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2011-05-10 10:09:42 UTC (rev 7280)
@@ -73,6 +73,7 @@
$categories =
activitycalendar_soactivity::get_instance()->get_categories();
$targets =
activitycalendar_soactivity::get_instance()->get_targets();
+ $offices =
activitycalendar_soactivity::get_instance()->select_district_list();
$districts =
activitycalendar_soactivity::get_instance()->select_district_list();
// Retrieve the arena object or create a new one
@@ -108,6 +109,7 @@
$activity->set_group_id(phpgw::get_var('group_id'));
$activity->set_arena(phpgw::get_var('arena_id'));
$activity->set_district(phpgw::get_var('district'));
+ $activity->set_office(phpgw::get_var('office'));
$activity->set_state(phpgw::get_var('state'));
$activity->set_category(phpgw::get_var('category'));
$target_array = phpgw::get_var('target');
@@ -137,6 +139,7 @@
'categories' => $categories,
'targets' => $targets,
'districts' => $districts,
+ 'offices' => $offices,
'editable' => true,
'message' => isset($message) ? $message :
phpgw::get_var('message'),
'error' => isset($error) ? $error :
phpgw::get_var('error')
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
2011-05-10 08:57:32 UTC (rev 7279)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
2011-05-10 10:09:42 UTC (rev 7280)
@@ -65,9 +65,9 @@
{
// Get the path for user input or use a default
path
$this->path = phpgw::get_var("import_path") ?
phpgw::get_var("import_path") : '/home/notroot/FacilitExport';
- $this->district = phpgw::get_var("district") ?
phpgw::get_var("district") : '1';
+ $this->office = phpgw::get_var("district") ?
phpgw::get_var("district") : '1';
phpgwapi_cache::session_set('activitycalendar',
'import_path', $this->path);
- phpgwapi_cache::session_set('activitycalendar',
'import_district', $this->district);
+ phpgwapi_cache::session_set('activitycalendar',
'import_district', $this->office);
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendar.uiimport.index', 'importstep' =>
'true'));
}
else if(phpgw::get_var("importstep"))
@@ -77,7 +77,7 @@
echo "<h3>Import started at: {$start}</h3>";
echo "<ul>";
$this->path =
phpgwapi_cache::session_get('activitycalendar', 'import_path') . '/aktiviteter';
- $this->district =
phpgwapi_cache::session_get('activitycalendar', 'import_district');
+ $this->office =
phpgwapi_cache::session_get('activitycalendar', 'import_district');
//$this->path =
'/home/notroot/FacilitExport/aktiviteter';
$result = $this->import(); // Do import step,
result determines if finished for this area
@@ -175,7 +175,7 @@
return '1';
}
- protected function import_arenas($office)
+ protected function import_arenas()
{
$start_time = time();
@@ -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);
@@ -282,7 +286,8 @@
{
$activity->set_special_adaptation(true);
}
-
$activity->set_district($this->district);
+ $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:
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2011-05-10 08:57:32 UTC (rev 7279)
+++
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2011-05-10 10:09:42 UTC (rev 7280)
@@ -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(),
Modified: branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2011-05-10 08:57:32 UTC (rev 7279)
+++ branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2011-05-10 10:09:42 UTC (rev 7280)
@@ -369,4 +369,5 @@
state_3 activitycalendar no Akseptert
state_4 activitycalendar no Behandlet
state_5 activitycalendar no Avvist
-activity_import activitycalendar no Importer aktiviteter
\ No newline at end of file
+activity_import activitycalendar no Importer aktiviteter
+office activitycalendar no Kontor
\ No newline at end of file
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
2011-05-10 08:57:32 UTC (rev 7279)
+++ branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
2011-05-10 10:09:42 UTC (rev 7280)
@@ -222,22 +222,22 @@
?>
</dd>
<dt>
- <?php if($activity->get_district() ||
$editable) { ?>
- <label for="district"><?php echo
lang('district') ?></label>
+ <?php if($activity->get_office() ||
$editable) { ?>
+ <label for="office"><?php echo
lang('office') ?></label>
<?php } ?>
</dt>
<dd>
<?php
if ($editable)
{
- $selected_district =
$activity->get_district();
+ $selected_office =
$activity->get_office();
?>
- <select name="district">
- <option value="0">Ingen
bydel valgt</option>
+ <select name="office">
+ <option value="0">Ingen
kontor valgt</option>
<?php
- foreach($districts as
$district)
+ foreach($offices as
$office)
{
- echo "<option
".($selected_district == $district['id'] ? 'selected="selected"' : "")."
value=\"{$district['id']}\">".$district['name']."</option>";
+ echo "<option
".($selected_office == $office['id'] ? 'selected="selected"' : "")."
value=\"{$office['id']}\">".$office['name']."</option>";
}
?>
</select>
Modified: branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2011-05-10 08:57:32 UTC (rev 7279)
+++ branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2011-05-10 10:09:42 UTC (rev 7280)
@@ -2130,7 +2130,7 @@
$fields = implode(',', $fields);
- $this->_db->query("SELECT id, {$fields} FROM {$table}
{$filtermthod} {$ordermethod}");
+ $this->_db->query("SELECT
{$this->location_info['id']['name']} as id, {$fields} FROM {$table}
{$filtermthod} {$ordermethod}");
$return_fields = isset($data['fields']) &&
$data['fields'] && is_array($data['fields']) ? $data['fields'] : array();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7280] Merge 7274:7279 from trunk,
Sigurd Nes <=