[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7512] Merge 7508:7511 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7512] Merge 7508:7511 from trunk |
|
Date: |
Thu, 18 Aug 2011 13:47:55 +0000 |
Revision: 7512
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7512
Author: sigurdne
Date: 2011-08-18 13:47:51 +0000 (Thu, 18 Aug 2011)
Log Message:
-----------
Merge 7508:7511 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
branches/Version-1_0-branch/activitycalendarfrontend/setup/setup.inc.php
branches/Version-1_0-branch/property/inc/class.solocation.inc.php
branches/Version-1_0-branch/property/inc/import/default/cvs_import_vedlikeholdsplan_bkb
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,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507
+
/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,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2011-08-18 13:44:46 UTC (rev 7511)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2011-08-18 13:47:51 UTC (rev 7512)
@@ -830,6 +830,10 @@
$city = '';
}
$district = $org_info['district'];
+ if(!$district)
+ {
+ $district = '';
+ }
$activity_id = $org_info['activity_id'];
$show_in_portal = 1;
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
2011-08-18 13:44:46 UTC (rev 7511)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
2011-08-18 13:47:51 UTC (rev 7512)
@@ -217,6 +217,7 @@
unset($contact2);
unset($contact3);
unset($contact4);
+ unset($new_group_id);
$internal_arena = $this->decode($data[9]);
if($internal_arena)
Modified: branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
2011-08-18 13:44:46 UTC (rev 7511)
+++ branches/Version-1_0-branch/activitycalendar/setup/setup.inc.php
2011-08-18 13:47:51 UTC (rev 7512)
@@ -40,7 +40,10 @@
$setup_info['activitycalendar']['tables'] = array(
'activity_activity',
- 'activity_arena'
+ 'activity_arena',
+ 'activity_organization',
+ 'activity_group',
+ 'activity_contact_person'
);
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendarfrontend/setup/setup.inc.php
2011-08-18 13:44:46 UTC (rev 7511)
+++ branches/Version-1_0-branch/activitycalendarfrontend/setup/setup.inc.php
2011-08-18 13:47:51 UTC (rev 7512)
@@ -31,7 +31,7 @@
$setup_info['activitycalendarfrontend']['depends'][] = array(
'appname' => 'activitycalendar',
- 'versions' => Array('0.1.3','0.1.4')
+ 'versions' => Array('0.1.3','0.1.4','0.1.5')
);
/* The hooks this app includes, needed for hooks registration */
Modified: branches/Version-1_0-branch/property/inc/class.solocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2011-08-18 13:44:46 UTC (rev 7511)
+++ branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2011-08-18 13:47:51 UTC (rev 7512)
@@ -264,7 +264,7 @@
$start =
isset($data['start']) && $data['start'] ? $data['start'] : 0;
$filter =
isset($data['filter']) && $data['filter'] ? $data['filter'] : 0;
$query =
isset($data['query']) ? $data['query'] : '';
- $sort =
isset($data['sort']) && $data['sort'] ? $data['sort'] : 'DESC';
+ $sort =
isset($data['sort']) && $data['sort'] ? $data['sort'] : 'ASC';
$order =
isset($data['order']) ? $data['order'] : '';
$cat_id =
isset($data['cat_id']) && $data['cat_id'] ? $data['cat_id']:'';
$type_id =
isset($data['type_id']) ? $data['type_id'] : '';
@@ -291,13 +291,13 @@
switch ($order)
{
- case 'undefined':
- $order = '';
- break;
- case 'loc1':
- $order = 'fm_location1.loc1';
- break;
- default:
+ case 'undefined':
+ $order = '';
+ break;
+ case 'loc1':
+ $order = 'fm_location1.loc1';
+ break;
+ default:
}
@@ -638,17 +638,17 @@
$this->uicols = $uicols;
- if ($order)
+ if ($order && !$order =='fm_location1.loc1')
{
- $ordermethod = " order by $order $sort";
+ $ordermethod = " ORDER BY {$order} {$sort}";
}
else
{
- $ordermethod = ' order by fm_location' .
($type_id) .'.loc1 ASC';
+ $ordermethod = " ORDER BY
fm_location{$type_id}.loc1 {$sort}";
if ($type_id > 1)
{
- for ($i=1;$i<($type_id+1);$i++)
+ for ($i=2;$i<($type_id+1);$i++)
{
$ordermethod .=
",fm_location{$type_id}.loc{$i} ASC";
}
Modified:
branches/Version-1_0-branch/property/inc/import/default/cvs_import_vedlikeholdsplan_bkb
===================================================================
---
branches/Version-1_0-branch/property/inc/import/default/cvs_import_vedlikeholdsplan_bkb
2011-08-18 13:44:46 UTC (rev 7511)
+++
branches/Version-1_0-branch/property/inc/import/default/cvs_import_vedlikeholdsplan_bkb
2011-08-18 13:47:51 UTC (rev 7512)
@@ -19,10 +19,17 @@
$debug = $this->debug;
$error = false;
$type = $data[0];
- $location_code = $data[1];
+ $location_arr = explode('-',$data[1]);
+ $location_code = $location_arr[0] . '-' .
sprintf("%02d",$data[2]);
$location_data =
execMethod('property.solocation.read_single', $location_code );
-_debug_array($data);
+
+ if($debug)
+ {
+ _debug_array($data);
+ }
+
+
//_debug_array($location_data);die();
if(!$location_data)
{
@@ -54,11 +61,11 @@
$this->db->next_record();
$id = $this->db->f('value')+1;
- if($data[4])
+ if($data[7])
{
$entry_date_info = explode('/',$data[4]);
}
- else if($data[5])
+ else if($data[8])
{
$entry_date_info = explode('/',$data[5]);
}
@@ -81,20 +88,45 @@
_debug_array($entry_date_info);
_debug_array($entry_date);
+ $status = 'registrert';
+
+ if($data[3])//historikk
+ {
+ $status = 'avsluttet';
+ }
+
+ if($data[9])//Status - Utført
+ {
+ if($data[9] == 'Delvis')
+ {
+ $status = 'delvis';
+ }
+ else if($data[9] == 'Utgått')
+ {
+ $status = 'kansellert';
+ }
+ else
+ {
+ $status = 'avsluttet';
+ $value_set['closed_date']
= strtotime("{$data[9]}/06/24");
+ }
+ }
+
+
$value_set['id']
= $id;
- $value_set['title']
= $this->db->db_addslashes("{$data[7]}: {$data[10]}");
+ $value_set['title']
= $this->db->db_addslashes("{$data[0]}::{$data[6]}::{$data[20]}");
$value_set['owner']
= $this->account;
$value_set['category'] =
$category;
- $value_set['descr']
= $this->db->db_addslashes("{$type}\n{$data[7]}: {$data[10]}");
+ $value_set['descr']
= $this->db->db_addslashes("{$data[0]}\n{$data[6]}\n{$data[20]}");
$value_set['location_code'] =
$location_code;
$value_set['address'] =
$address;
$value_set['entry_date'] =
$entry_date;
- $value_set['budget'] =
(int)str_replace(',', '', $data[12]);
- $value_set['status'] =
$data['status'];
+ $value_set['budget'] =
(int)str_replace(',', '', $data[21]);
+ $value_set['status'] =
$status;
// $value_set['branch_id'] =
$data['branch_id'];
// $value_set['coordinator'] =
$coordinator;
$value_set['authorities_demands'] =
$authorities_demands;
- $value_set['building_part'] =
$building_part;
+ $value_set['building_part'] =
$data[5];
// $value_set['start_date'] =
$data['start_date'];
// $value_set['end_date'] =
$data['end_date'];
// $value_set['regulations'] =
$data['regulations'] ? ',' . implode(',',$data['regulations']) . ',' : '';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7512] Merge 7508:7511 from trunk,
Sigurd Nes <=