[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7265] Merge 7260:7264 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7265] Merge 7260:7264 from trunk |
|
Date: |
Fri, 06 May 2011 13:12:03 +0000 |
Revision: 7265
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7265
Author: sigurdne
Date: 2011-05-06 13:12:02 +0000 (Fri, 06 May 2011)
Log Message:
-----------
Merge 7260:7264 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
branches/Version-1_0-branch/booking/inc/class.customer_identifier.inc.php
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation.inc.php
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
branches/Version-1_0-branch/booking/setup/phpgw_no.lang
branches/Version-1_0-branch/booking/templates/base/account_code_dimension.xsl
branches/Version-1_0-branch/property/templates/base/entity.xsl
branches/Version-1_0-branch/property/templates/base/location.xsl
branches/Version-1_0-branch/property/templates/base/tts.xsl
Added Paths:
-----------
branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.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
+
/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
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-06 13:08:55 UTC (rev 7264)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2011-05-06 13:12:02 UTC (rev 7265)
@@ -48,8 +48,14 @@
if($sort_field != null) {
$dir = $ascending ? 'ASC' : 'DESC';
+ //$order = "ORDER BY id $dir";
+ $order = "ORDER BY $sort_field $dir";
+ }
+ /*else
+ {
+ $dir = $ascending ? 'ASC' : 'DESC';
$order = "ORDER BY id $dir";
- }
+ }*/
//var_dump($search_type);
//var_dump($search_for);
if($search_for)
@@ -347,4 +353,43 @@
return $targets;
}
+ function get_category_from_name($name)
+ {
+ if($name != null)
+ {
+ $sql = "select id from bb_activity where name like
'%{$name}%'";
+ $this->db->query($sql, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ $result = $this->db->f('id');
+ }
+ }
+ return $result;
+ }
+
+ function get_target_from_sort_id($id)
+ {
+ if($id != null && is_numeric($id))
+ {
+ $sql = "select id from bb_agegroup where sort={$id} and
active=1";
+ $this->db->query($sql, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ $result = $this->db->f('id');
+ }
+ }
+ return $result;
+ }
+
+ function get_orgid_from_orgno($orgno)
+ {
+ if($orgno != null)
+ {
+ $sql = "select id from bb_organization where
organization_number='{$orgno}'";
+ $this->db->query($sql, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ $result = $this->db->f('id');
+ }
+ }
+ return $result;
+ }
+
}
\ No newline at end of file
Modified: branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
2011-05-06 13:08:55 UTC (rev 7264)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
2011-05-06 13:12:02 UTC (rev 7265)
@@ -165,7 +165,7 @@
function get_arena_name($arena_id)
{
$result = "Ingen";
- if(isset($arena_id)){
+ if(isset($arena_id) && $arena_id != ''){
$q1="SELECT arena_name FROM activity_arena WHERE
id={$arena_id}";
$this->db->query($q1, __LINE__, __FILE__);
while($this->db->next_record()){
Copied: branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
(from rev 7264, trunk/activitycalendar/inc/class.uiimport.inc.php)
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
(rev 0)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiimport.inc.php
2011-05-06 13:12:02 UTC (rev 7265)
@@ -0,0 +1,1816 @@
+<?php
+/* phpgw::import_class('rental.uicommon');
+ phpgw::import_class('rental.soparty');
+ phpgw::import_class('rental.socomposite');
+ phpgw::import_class('rental.socontract');
+ phpgw::import_class('rental.sounit');
+ phpgw::import_class('rental.soprice_item');
+ phpgw::import_class('rental.socontract_price_item');
+ phpgw::import_class('rental.sonotification');
+ phpgw::import_class('rental.soadjustment');
+*/
+ phpgw::import_class('activitycalendar.uicommon');
+ phpgw::import_class('activitycalendar.soarena');
+ phpgw::import_class('activitycalendar.soactivity');
+
+ include_class('activitycalendar', 'arena', 'inc/model/');
+ include_class('activitycalendar', 'activity', 'inc/model/');
+/*
+ include_class('rental', 'contract', 'inc/model/');
+ include_class('rental', 'party', 'inc/model/');
+ include_class('rental', 'composite', 'inc/model/');
+ include_class('rental', 'property_location', 'inc/model/');
+ include_class('rental', 'price_item', 'inc/model/');
+ include_class('rental', 'contract_price_item', 'inc/model/');
+ include_class('rental', 'property_location', 'inc/model/');
+ include_class('rental', 'notification', 'inc/model/');
+ include_class('rental', 'adjustment', 'inc/model/');
+*/
+ class activitycalendar_uiimport extends activitycalendar_uicommon
+ {
+ const DELIMITER = ";";
+ const ENCLOSING = "'";
+
+ // List of messages, warnings and errors to be displayed to the
user after the import
+ protected $messages;
+ protected $warnings;
+ protected $errors;
+
+ // File system path to import folder on server
+ protected $path;
+ protected $location_id;
+
+ // Label on the import button. Changes as we step through the
import process.
+ protected $import_button_label;
+
+ protected $defalt_values;
+
+ public $public_functions = array
+ (
+ 'index' => true,
+ 'import_regulations' => true
+ );
+
+ public function __construct()
+ {
+ parent::__construct();
+ self::set_active_menu('import');
+ set_time_limit(10000); //Set the time limit for this
request oto 3000 seconds
+ }
+
+ /**
+ * Dummy method
+ * @see rental/inc/rental_uicommon#query()
+ */
+ public function query()
+ {
+ // Do nothing
+ }
+
+ public function import_regulations()
+ {
+ setlocale(LC_ALL, 'no_NO');
+
+
+ // Set the submit button label to its initial state
+ $this->import_button_label = "Start import";
+
+ var_dump(phpgw::get_var("importstep"));
+
+ // If the parameter 'importsubmit' exist (submit button
in import form), set path
+ if (phpgw::get_var("importsubmit"))
+ {
+ // Get the path for user input or use a default
path
+ $this->path = phpgw::get_var("facilit_path") ?
phpgw::get_var("facilit_path") : '/home/notroot/FacilitExport';
+ phpgwapi_cache::session_set('rental',
'import_path', $this->path);
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'rental.uiimport.import_regulations', 'importstep' =>
'true'));
+ }
+ else if(phpgw::get_var("importstep"))
+ {
+ $this->messages = array();
+ $this->warnings = array();
+ $this->errors = array();
+
+ $start_time = time(); // Start time of import
+ $start = date("G:i:s",$start_time);
+ echo "<h3>Import started at: {$start}</h3>";
+ echo "<ul>";
+ $this->path =
phpgwapi_cache::session_get('rental', 'import_path') . '/Intern';
+
+ $result =
$this->import_adjustment_information(); // Do import step, result determines if
finished for this area
+ echo '<li class="info">Finished importing
adjustment information</li>';
+
+ echo "</ul>";
+ $end_time = time();
+ $difference = ($end_time - $start_time) / 60;
+ $end = date("G:i:s",$end_time);
+ echo "<h3>Import ended at: {$end}. Import
lasted {$difference} minutes.</h3>";
+
+ $this->log_messages("adjustments");
+
+ if ($this->errors) {
+ echo "<ul>";
+ foreach ($this->errors as $error) {
+ echo '<li class="error">Error:
' . $error . '</li>';
+ }
+
+ echo "</ul>";
+ }
+
+ if ($this->warnings) {
+ echo "<ul>";
+ foreach ($this->warnings as $warning) {
+ echo '<li
class="warning">Warning: ' . $warning . '</li>';
+ }
+ echo "</ul>";
+ }
+
+ if ($this->messages) {
+ echo "<ul>";
+
+ foreach ($this->messages as $message) {
+ echo '<li class="info">' .
$message . '</li>';
+ }
+ echo "</ul>";
+ }
+ }
+ else
+ {
+ $this->render('facilit_import_adjustment.php',
array(
+ 'messages' => $this->messages,
+ 'warnings' => $this->warnings,
+ 'errors' => $this->errors,
+ 'button_label' => $this->import_button_label,
+ 'facilit_path' => $path,
+ 'location_id' => $this->location_id)
+ );
+ }
+ }
+
+ /**
+ * Public method.
+ *
+ * @return unknown_type
+ */
+ public function index()
+ {
+ setlocale(LC_ALL, 'no_NO');
+
+ // Set the submit button label to its initial state
+ $this->import_button_label = "Start import";
+// var_dump(phpgw::get_var("importstep"));
+
+ // If the parameter 'importsubmit' exist (submit button
in import form), set path
+ if (phpgw::get_var("importsubmit"))
+ {
+ // Get the path for user input or use a default
path
+ $this->path = phpgw::get_var("facilit_path") ?
phpgw::get_var("facilit_path") : '/home/notroot/FacilitExport';
+ phpgwapi_cache::session_set('rental',
'import_path', $this->path);
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'rental.uiimport.index', 'importstep' => 'true'));
+ }
+ else if(phpgw::get_var("importstep"))
+ {
+ $start_time = time(); // Start time of import
+ $start = date("G:i:s",$start_time);
+ echo "<h3>Import started at: {$start}</h3>";
+ echo "<ul>";
+ $this->path =
'/home/notroot/FacilitExport/aktiviteter';
+
+ $result = $this->import(); // Do import step,
result determines if finished for this area
+ echo '<li class="info">Internleie: finished
step ' .$result. '</li>';
+ while($result != '1')
+ {
+ $result = $this->import();
+ echo '<li class="info">Aktiviteter:
finished step ' .$result. '</li>';
+ flush();
+ }
+/*
+ $this->location_id =
array_search('contract_type_eksternleie', $types);
+ $this->path =
phpgwapi_cache::session_get('rental', 'import_path') . '/Ekstern';
+
+ $result = $this->import(); // Do import step,
result determines if finished for this area
+ echo '<li class="info">Eksternleie: finished
step ' .$result. '</li>';
+ while($result != '7')
+ {
+ $result = $this->import();
+ echo '<li class="info">Eksternleie:
finished step ' .$result. '</li>';
+ flush();
+ }
+
+ $this->location_id =
array_search('contract_type_innleie', $types);
+ $this->path =
phpgwapi_cache::session_get('rental', 'import_path') . '/Innleie';
+
+ $result = $this->import(); // Do import step,
result determines if finished for this area
+ echo '<li class="info">Innleie: finished step '
.$result. '</li>';
+ while($result != '6')
+ {
+ $result = $this->import();
+ echo '<li class="info">Innleie:
finished step ' .$result. '</li>';
+ flush();
+ }
+*/
+ echo "</ul>";
+ $end_time = time();
+ $difference = ($end_time - $start_time) / 60;
+ $end = date("G:i:s",$end_time);
+ echo "<h3>Import ended at: {$end}. Import
lasted {$difference} minutes.";
+ }
+ else
+ {
+ $this->render('facilit_import.php', array(
+ 'messages' => $this->messages,
+ 'warnings' => $this->warnings,
+ 'errors' => $this->errors,
+ 'button_label' => $this->import_button_label,
+ 'facilit_path' => $path,
+ 'location_id' => $this->location_id)
+ );
+ }
+ }
+
+ /**
+ * Import Facilit data to Portico Estate's rental module
+ * The function assumes CSV files have been uploaded to a
location on the server reachable by the
+ * web server user. The CSV files must correspond to the table
names from Facilit, as exported
+ * from Access. Field should be enclosed in single quotes and
separated by comma. The CSV files
+ * must contain the column headers on the first line.
+ *
+ * @return unknown_type
+ */
+ public function import()
+ {
+
+ $steps = 1;
+
+ /* Import logic:
+ *
+ * 1. Do step logic if the session variable is not set
+ * 2. Set step result on session
+ * 3. Set label for import button
+ * 4. Log messages for this step
+ *
+ */
+
+ $this->messages = array();
+ $this->warnings = array();
+ $this->errors = array();
+
+ // Import arenas if not done before and put them on the
users session
+ if (!phpgwapi_cache::session_get('activitycalendar',
'arenas')) {
+ phpgwapi_cache::session_set('activitycalendar',
'arenas', $this->import_arenas());
+ $this->log_messages(1);
+ return '1';
+ $this->clean_up();
+ }
+/*
+ // Import activities if not done before and put them on
the users session
+ if (!phpgwapi_cache::session_get('activitycalendar',
'activities')) {
+ phpgwapi_cache::session_set('activitycalendar',
'activities', $this->import_activities());
+ $this->log_messages(2);
+ return '2';
+ $this->clean_up();
+ }
+*/
+/*
+ // Load composite to contract link table if not done
before and put them on the users session
+ if (!phpgwapi_cache::session_get('rental',
'facilit_rentalobject_to_contract')) {
+ phpgwapi_cache::session_set('rental',
'facilit_rentalobject_to_contract', $this->import_rentalobject_to_contract());
+ $this->log_messages(3);
+ return '3';
+ }
+
+ // Import contracts if not done before and put them on
the users session
+ // Prerequisites: Composites, parties, contract to
composite bindings, and default values for accounts/project number for
+ if (!phpgwapi_cache::session_get('rental',
'facilit_contracts')) {
+ $composites =
phpgwapi_cache::session_get('rental', 'facilit_composites');
+ $rentalobject_to_contract =
phpgwapi_cache::session_get('rental', 'facilit_rentalobject_to_contract');
+ $parties =
phpgwapi_cache::session_get('rental', 'facilit_parties');
+ $location_id = $this->location_id;
+ $defalt_values['account_in'] =
rental_socontract::get_instance()->get_default_account($location_id, true); //IN
+ $defalt_values['account_out'] =
rental_socontract::get_instance()->get_default_account($location_id, false);
//OUT
+ $defalt_values['project_number'] =
rental_socontract::get_instance()->get_default_project_number($location_id);
//PROJECTNUMBER
+ phpgwapi_cache::session_set('rental',
'facilit_contracts', $this->import_contracts($composites,
$rentalobject_to_contract, $parties, $defalt_values));
+ $this->log_messages(4);
+ return '4';
+ }
+
+ // Import price items if not done before and put them
on the users session
+ // Prerequisites: Contracts
+ if (!phpgwapi_cache::session_get('rental',
'facilit_contract_price_items')) {
+ $contracts =
phpgwapi_cache::session_get('rental', 'facilit_contracts');
+ phpgwapi_cache::session_set('rental',
'facilit_contract_price_items', $this->import_contract_price_items($contracts));
+ $this->log_messages(5);
+ return '5';
+ }
+
+ // Import events if not done before and put them on the
users session
+ // Prerequistes: Contracts
+ if (!phpgwapi_cache::session_get('rental',
'facilit_events')) {
+ $contracts =
phpgwapi_cache::session_get('rental', 'facilit_contracts');
+ $event_data =
phpgwapi_cache::session_get('rental', 'facilit_events');
+ $regulation_id_location_id = isset($event_data)
? $event_data : array();
+ phpgwapi_cache::session_set('rental',
'facilit_events', $this->import_events($contracts, $regulation_id_location_id));
+ $this->log_messages(6);
+ return '6';
+ }
+
+ // Import adjustments
+ // Prerequistes: Contracts
+ if (!phpgwapi_cache::session_get('rental',
'facilit_adjustments')) {
+ $contracts =
phpgwapi_cache::session_get('rental', 'facilit_contracts');
+ $event_data =
phpgwapi_cache::session_get('rental', 'facilit_events');
+ $regulation_id_location_id = isset($event_data)
? $event_data : array();
+ $this->import_adjustments($contracts,
$regulation_id_location_id);
+ $this->log_messages(7);
+ $this->clean_up();
+ }
+*/
+ // We're done with the import, so clear all session
variables so we're ready for a new one
+ // We do not clear parties (same for all responsibility
areas)
+ // We do not clear event data, the array is just added
for each
+ phpgwapi_cache::session_clear('activitycalendar',
'arenas');
+ phpgwapi_cache::session_clear('activitycalendar',
'activities');
+/* phpgwapi_cache::session_clear('rental',
'facilit_contracts');
+ phpgwapi_cache::session_clear('rental',
'facilit_contract_price_items');
+ phpgwapi_cache::session_clear('rental',
'facilit_events');
+ phpgwapi_cache::session_clear('rental',
'facilit_adjustments');*/
+ return '1';
+ }
+
+ protected function import_arenas()
+ {
+ $start_time = time();
+
+ $soarena = activitycalendar_soarena::get_instance();
+ $soactivity =
activitycalendar_soactivity::get_instance();
+
+ $datalines = $this->getcsvdata($this->path .
"/import_all.csv");
+
+ $this->messages[] = "Read 'import_all.csv' file in " .
(time() - $start_time) . " seconds";
+ $this->messages[] = "'importfile.csv' contained " .
count($datalines) . " lines";
+
+ foreach ($datalines as $data) {
+/* if(count($data) <= 8)
+ {
+ continue;
+ }
+*/
+ $arena = new activitycalendar_arena();
+ //8: sted, 9:adresse
+ $arena_name = $this->decode($data[7]);
+ $arena_address = $this->decode($data[8]);
+ $curr_arena_id = 0;
+
+ if($arena_name){
+ $arena->set_arena_name($arena_name);
+ $arena->set_address($arena_address);
+
+ // All is good, store notification
+ if ($soarena->store($arena)) {
+ $this->messages[] =
"Successfully imported arena: Name ({$this->decode($data[7])})";
+ $curr_arena_id =
$arena->get_id();
+ } else {
+ $this->errors[] = "Error
importing arena: Name ({$this->decode($data[7])})";
+ $curr_arena_id = 0;
+ }
+ }
+ else
+ {
+ $this->errors[] = "Error importing
arena: Name ({$this->decode($data[7])})";
+ $curr_arena_id = 0;
+ }
+
+ $activity = new activitycalendar_activity();
+ $activity_title = $this->decode($data[1]);
+ $activity_org = $this->decode($data[2]);
+ if($activity_org)
+ {
+ $activity_org =
$soactivity->get_orgid_from_orgno($activity_org);
+ }
+ $activity_adapted = $this->decode($data[3]);
+ $activity_category = $this->decode($data[4]);
+ if($activity_category)
+ {
+ $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]);
+ if($activity_target)
+ {
+ $act_target =
split(',',$activity_target);
+ //var_dump($activity_target);
+ //var_dump($act_target[0]);
+ $activity_target =
$soactivity->get_target_from_sort_id($act_target[0]);
+ }
+ $activity_day = $this->decode($data[9]);
+ $activity_time = $this->decode($data[10]);
+
+ if($activity_title){
+ $activity->set_title($activity_title);
+
$activity->set_organization_id($activity_org);
+
$activity->set_category($activity_category);
+ $activity->set_target($activity_target);
+
$activity->set_description($activity_description);
+ $activity->set_arena($curr_arena_id);
+ $activity->set_time($activity_day.'
'.$activity_time);
+ if($activity_adapted)
+ {
+
$activity->set_special_adaptation(true);
+ }
+ //var_dump($activity);
+ // All is good, store activity
+ if ($soactivity->store($activity)) {
+ $this->messages[] =
"Successfully imported activity: Title ({$this->decode($data[1])})";
+ } else {
+ $this->errors[] = "Error
importing activity: Title ({$this->decode($data[1])})";
+ }
+ }
+ }
+
+ $this->messages[] = "Imported activities. (" . (time()
- $start_time) . " seconds)";
+ return true;
+ }
+
+ protected function import_parties()
+ {
+ $start_time = time();
+ $soparty = rental_soparty::get_instance();
+ $parties = array();
+
+ //Check to see if there is any parties in the database.
If so, do not store these
+ //... double checking to ensure that the user has not
logged out and in again during import
+ $alreay_imported_parties = false;
+ $number_of_parties = $soparty->get_number_of_parties();
+ if($number_of_parties > 0)
+ {
+ return;
+ }
+
+ $datalines = $this->getcsvdata($this->path .
"/u_PersonForetak.csv", true);
+ $this->messages[] = "Read 'u_PersonForetak.csv' file in
" . (time() - $start_time) . " seconds";
+ $this->messages[] = "'u_PersonForetak.csv' contained "
. count($datalines) . " lines";
+ $counter = 1;
+
+ // Loop through each line of the file, parsing CSV data
to a php array
+ foreach ($datalines as $data) {
+ if(count($data) <= 30)
+ {
+ continue;
+ }
+
+ // Create a new rental party we can fill with
info from this line from the file
+ $party = new rental_party();
+
+ $identifier = $this->decode($data[24]);
//cPersonForetaknr
+ //Removed whitespace characters
+ $identifier = str_replace('
','',''.$identifier);
+
+
+
+ // Default information
+ $party->set_address_1($this->decode($data[3]));
//cAdresse1
+ $party->set_address_2($this->decode($data[4]));
//cAdresse2
+
$party->set_postal_code($this->decode($data[5])); //cPostnr
+
$party->set_mobile_phone($this->decode($data[7])); //cMobil
+ $party->set_phone($this->decode($data[8]));
//cTelefon
+ $party->set_fax($this->decode($data[9]));
//cTelefaks
+ $party->set_title($this->decode($data[12]));
//cArbeidstittel
+ $party->set_email($this->decode($data[25]));
//cEpost
+
$party->set_company_name($this->decode($data[10])); //cArbeidsgiver
+
$party->set_department($this->decode($data[11])); //cAvdeling
+
$party->set_account_number($this->decode($data[14])); //cBankkontonr
+
$party->set_reskontro($this->decode($data[23])); //cReskontronr
+ $party->set_comment($this->decode($data[26]));
//cMerknad
+
+ // Insert contract person in comment if present
+ $contact_person = $this->decode($data[6]);
+ if(isset($contact_person)) {
+
$party->set_comment($party->get_comment()."\n\nKontaktperson:
".$contact_person); //cKontaktPerson
+ }
+
+ $valid_identifier = false;
+ switch(strlen(''.$identifier)) {
+ case 4: // Intern organisasjonstilknytning
+ //Should be four number or on the form
'KFxx'
+ if(
+ is_numeric($identifier)
+ ||
+ ((substr($identifier,0,2) == 'KF') &&
is_numeric(substr($identifier,2,2)))
+ )
+ {
+
$party->set_company_name($this->decode($data[2])); //cForetaksnavn
+ $party->set_first_name(null);
+ $party->set_last_name(null);
+
+ // Get location ID
+ $locations = $GLOBALS['phpgw']->locations;
+ $subs =
$locations->get_subs_from_pattern('rental', '.ORG.BK.__.'.$identifier);
//cPersonForetaknr
+ if(count($subs) > 0)
+ {
+
$party->set_location_id($subs[0]['location_id']);
+ }
+ else
+ {
+ $this->warnings[] = "Party with valid
identifier ({$identifier}) not found in internal organisation tree. Company
name({$party->get_company_name()})";
+ }
+ $valid_identifier = true;
+ }
+ break;
+ case 5: //Internal, Should be a result unit on the form
'Rxxxx'
+ if((substr($identifier,0,1) == 'R') &&
is_numeric(substr($identifier,1,4)))
+ {
+ $identifier = substr($identifier,1,4);
+
+
$party->set_company_name($this->decode($data[2])); //cForetaksnavn
+ $party->set_first_name(null);
+ $party->set_last_name(null);
+
+ // Get location ID
+ $locations = $GLOBALS['phpgw']->locations;
+ $subs =
$locations->get_subs_from_pattern('rental', '.ORG.BK.__.'.$identifier);
//cPersonForetaknr
+ if(count($subs) > 0)
+ {
+
$party->set_location_id($subs[0]['location_id']);
+ }
+ else
+ {
+ $this->warnings[] = "Party with valid
identifier ({$identifier}- original R{$identifier}) not found in internal
organisation tree. Company name({$party->get_company_name()})";
+ }
+ $valid_identifier = true;
+ }
+ break;
+ case 6: // Foretak (agresso-id)
+ case 9: // Foretak (org.nr)
+ if(is_numeric($identifier))
+ {
+
$party->set_company_name($this->decode($data[2])); //cForetaksnavn
+ $party->set_first_name(null);
+ $party->set_last_name(null);
+
+ $valid_identifier = true;
+ }
+ break;
+ case 11: // Personnr
+ if(is_numeric($identifier))
+ {
+ if (!$this->is_null($data[0])) {
+
$party->set_first_name($this->decode($data[0])); //cFornavn
+
$party->set_last_name($this->decode($data[1])); //cEtternavn
+ } else {
+ $company_name = explode(' ',
$this->decode($data[2]), 2); //cForetaksnavn
+ $party->set_first_name($company_name[0]);
//cFornavn
+ $party->set_last_name($company_name[1]);
//cEtternavn
+ }
+ $valid_identifier = true;
+
+ }
+ break;
+ }
+
+ if(!$valid_identifier)
+ {
+ $party->set_first_name($this->decode($data[0]));
//cFornavn
+ $party->set_last_name($this->decode($data[1]));
//cEtternavn
+ $party->set_company_name($this->decode($data[2]));
//cForetaksnavn
+ $party->set_is_inactive(true);
+ $this->warnings[] = "Party with unknown 'cPersonForetaknr'
format ({$identifier}). First name ({$party->get_first_name()}). Last
name({$party->get_last_name()}). Company name({$party->get_company_name()})
Setting as inactive.";
+ }
+
+ // Fødselsnr/Foretaksnr/AgressoID
+ $party->set_identifier($identifier);
+
+ // Store party and log message
+ if ($soparty->store($party))
+ {
+ // Add party to collection of parties
keyed by its facilit ID so we can refer to it later.
+ $facilit_id = $data[17];
//nPersonForetakId
+ $parties[$facilit_id] =
$party->get_id();
+ $this->messages[] = "Successfully added
party " . $party->get_name() . " (" . $party->get_id() . ")";
+ }
+ else
+ {
+ $this->errors[] = "Failed to store
party " . $party->get_name();
+ }
+ }
+
+ $this->messages[] = "Successfully imported " .
count($parties) . " contract parties. (" . (time() - $start_time) . "
seconds).";
+
+ //Clean up
+ //unset();
+
+ return $parties;
+ }
+
+ protected function import_composites()
+ {
+ $start_time = time();
+
+ // Storage objects
+ $socomposite = rental_socomposite::get_instance();
+ $socontract = rental_socontract::get_instance();
+ $sounit = rental_sounit::get_instance();
+
+ // Array for mapping the composite ids to the facilit
ids
+ $composites = array();
+
+ //Read source data
+ $datalines = $this->getcsvdata($this->path .
"/u_Leieobjekt.csv");
+ $this->messages[] = "Read 'u_Leieobjekt.csv' file in "
. (time() - $start_time) . " seconds";
+ $this->messages[] = "'u_Leieobjekt.csv' contained " .
count($datalines) . " lines";
+
+ foreach ($datalines as $data) {
+
+ if(count($data) <= 34)
+ {
+ continue;
+ }
+
+ //If the composite differs in terms of object
number the custom address should be set (default false)
+ $set_custom_address = false;
+
+ //Retrieve the title for the responsibility
area we are importing (to hande the respoonsibility areas differently)
+ $title =
$socontract->get_responsibility_title($this->location_id);
+
+ // Variable for the location code (objektnummer)
+ $loc1 = null;
+
+ //Three columns for detemining the correct
object number
+ $object_identifier =
trim($this->decode($data[1])); //cLeieobjektnr
+ $property_identifier =
trim($this->decode($data[4])); //cInstNr
+ $building_identifier =
trim($this->decode($data[5])); //cByggNr
+
+
+ if($title == 'contract_type_internleie')
+ {
+ $property_ok = false;
+
+ //Priority 1: The property identifier
(most up to date)
+ if(isset($property_identifier))
+ {
+ $correct_length_property =
strlen($property_identifier) == 4 ? true : false;
+ $integer_value_property =
((int) $property_identifier) > 0 ? true : false;
+ if($correct_length_property &&
$integer_value_property)
+ {
+ $loc1 =
$property_identifier;
+ $property_ok = true;
+ }
+ }
+
+ //Priority 2: Use the object identifier
+ if(isset($object_identifier))
+ {
+ $correct_length =
strlen($object_identifier) == 6 ? true : false;
+ $integer_value = ((int)
$object_identifier) > 0 ? true : false;
+
+ if($correct_length &&
$integer_value)
+ {
+ if($property_ok)
+ {
+ // ... add
only the building number if the property number is ok
+ $loc1 = $loc1 .
"-" . substr($object_identifier, 4, 2);
+ }
+ else
+ {
+ // ... just use
the object identifier if not
+ $loc1 =
substr_replace($object_identifier,"-",4,0);
+ }
+ }
+ else
+ {
+ // Using non-conforming
object identifier. Gives a warning.
+ $loc1 =
$object_identifier;
+ $set_custom_address =
true;
+ $this->warnings[] =
"Composite (internal contract) has wrong object-number ({$loc1}). Should
consist of 6 numbers. Setting custom address.";
+ }
+ }
+ else if($property_ok)
+ {
+ //If no object number, only
property number
+ $set_custom_address = true;
+ $this->warnings[] = "Composite
(internal contract) has no object-number ({$object_identifier}). Using property
identifier. Setting custom address.";
+ }
+
+ if(!isset($loc1))
+ {
+ // No data exist to determine
the object number
+ $this->warnings[] = "No data
exist to determine the object number. Setting custom address.";
+ $set_custom_address = true;
+ }
+ }
+ else if($title == 'contract_type_eksternleie')
+ {
+ // Two forms for object number
(xxxx.xxxx) AND (xxxx.xxxxxx.xxxx)
+ $parts =
explode('.',$object_identifier);
+
+ for( $i = 0; $i < count($parts); $i++)
+ {
+ $parts[$i] = trim($parts[$i]);
+ }
+
+ if(count($parts) == 2) // (xxxx.xxxx)
+ {
+ //Checking parts for correct
length
+ $correct_length1 =
strlen($parts[0]) == 4 ? true : false;
+ $correct_length2 =
strlen($parts[1]) == 4 ? true : false;
+
+ if($correct_length1 &&
$correct_length2)
+ {
+ //If the first part
contains any characters from the alphabet
+
if(!is_numeric($parts[0]))
+ {
+ // ... relace
the punctuation with an '-'
+ $loc1 =
$parts[0] . "-" . $parts[1];
+ }
+ }
+ }
+ else if(count($parts) == 3) //
(xxxx.xxxxxx.xxxx)
+ {
+ $correct_length =
strlen($parts[1]) == 6 ? true : false;
+ $correct_length_property =
strlen($property_identifier) == 4 ? true : false;
+
+ if($correct_length &&
is_numeric($parts[1]))
+ {
+
if(isset($property_identifier) && $correct_length_property)
+ {
+ // ... add
only the building number if the property number is ok
+ $loc1 =
$property_identifier . "-" . substr($parts[1], 4, 2);
+ }
+ else
+ {
+ // ... insert a
'-' at position 4 if not
+ $loc1 =
substr_replace($parts[1],"-",4,0);
+ }
+ }
+ }
+
+ // If the object identifier is
non-conforming
+
+ // Alernative 1: Try to use the buiding
identifier
+ if(!isset($loc1) &&
isset($building_identifier))
+ {
+ $correct_length =
strlen($building_identifier) == 6 ? true : false;
+ if($correct_length &&
is_numeric($building_identifier))
+ {
+ $loc1 =
substr_replace($building_identifier,"-",4,0);
+ $set_custom_address =
true;
+ $this->warnings[] =
"Composite (external) lacks conforming object number ({$object_identifier}).
Using building identifier ({$loc1}). Setting custom address.";
+ }
+ }
+
+ // Alternative 2: Try to use the
property identifier
+ if(!isset($loc1) &&
isset($property_identifier))
+ {
+ $correct_length =
strlen($property_identifier) == 4 ? true : false;
+ if($correct_length)
+ {
+ //Give a warning
+ $loc1 =
$property_identifier;
+ $set_custom_address =
true;
+ $this->warnings[] =
"Composite (external) lacks conforming object number ({$object_identifier}).
Using property identifier ({$loc1}). Setting custom address.";
+ }
+ }
+
+ // Alternative 3: Use the
non-conforming object number
+ if(!isset($loc1))
+ {
+ $loc1 = $object_identifier;
+ $set_custom_address = true;
+ $this->warnings[] = "Composite
(external) lacks data to create an object number. Using non-conforming object
number ({$loc1}) Setting custom address.";
+ }
+ }
+ else if($title == 'contract_type_innleie')
+ {
+ $correct_length =
strlen($building_identifier) == 6 ? true : false;
+ $integer_value = ((int)
$building_identifier) > 0 ? true : false;
+ $correct_length_property =
strlen($property_identifier) == 4 ? true : false;
+ if($correct_length && $integer_value)
+ {
+ if(isset($property_identifier)
&& $correct_length_property)
+ {
+ // ... add only the
building number if the property number is ok
+ $loc1 =
$property_identifier . "-" . substr($building_identifier, 4, 2);
+ }
+ else
+ {
+ $loc1 =
substr_replace($building_identifier,"-",4,0);
+
+ }
+ }
+ else if(isset($property_identifier) &&
$correct_length_property)
+ {
+ // ... add only the building
number if the property number is ok
+ $loc1 = $property_identifier;
+ $set_custom_address = true;
+ $this->warnings[] = "Composite
(innleie) has non-conforming building identifier ({$building_identifier}).
Using property identifier instead ({$loc1}). Setting custom address.";
+ }
+
+ if(!isset($loc1))
+ {
+ $loc1 = $object_identifier;
+ $set_custom_address = true;
+ $this->warnings[] = "Composite
(innleie) lacks building identifier/property identifier
({$building_identifier}/{$property_identifier}). Using object identifier
instead ({$loc1}). Setting custom address.";
+ }
+ }
+ else
+ {
+ $this->errors[] = "The type of import
({$title}) is invalid";
+ }
+
+ $composite = new rental_composite();
+
+ // Use the first address line as name if no name
+ $name = $this->decode($data[26]);
//cLeieobjektnavn
+ $address1 = $this->decode($data[6]);
//cAdresse1
+ if(!isset($name)){
+ $name = $address1;
+ }
+
+ if($set_custom_address)
+ {
+ // Set address
+
$composite->set_custom_address_1($address1);
+
$composite->set_custom_address_2($this->decode($data[7]));
+
$composite->set_custom_postcode($this->decode($data[8]));
+
$composite->set_has_custom_address(true);
+ }
+
+ $composite->set_name($name);
+
$composite->set_description($this->decode($data[3]));
//cLeieobjektBeskrivelse
+ $composite->set_object_type_id($this->decode($data[25]));
//nLeieobjektTypeId
+ $composite->set_area($this->decode($data[2]));
//nMengde
+ $composite->set_is_active($data[19] == "-1");
//bTilgjengelig
+
+ // Store composite
+ if ($socomposite->store($composite)) {
+ // Add composite to collection of
composite so we can refer to it later.
+ $composites[$data[0]] =
$composite->get_id();
+
+ // Add units only if composite stored
ok.
+ $res = $sounit->store(new
rental_unit(null, $composite->get_id(), new rental_property_location($loc1,
null)));
+ $this->messages[] = "Successfully added
composite " . $composite->get_name() . " (" . $composite->get_id() . ")";
+ if($res)
+ {
+ $this->messages[] =
"Successfully added unit " . $loc1 . " to composite (" . $composite->get_id() .
")";
+ }
+ } else {
+ $this->errors[] = "Failed to store
composite " . $composite->get_name();
+ }
+ }
+
+ $this->messages[] = "Successfully imported " .
count($composites) . " composites (" . (time() - $start_time) . " seconds)";
+
+ return $composites;
+ }
+
+ protected function import_rentalobject_to_contract()
+ {
+ $start_time = time();
+ $rentalobject_to_contract = array();
+ $datalines = $this->getcsvdata($this->path .
"/u_Leieobjekt_Kontrakt.csv");
+ $this->messages[] = "Read 'u_Leieobjekt_Kontrakt.csv'
file in " . (time() - $start_time) . " seconds";
+ $this->messages[] = "'u_Leieobjekt_Kontrakt.csv'
contained " . count($datalines) . " lines";
+
+ foreach ($datalines as $data) {
+ // Array with Facilit Contract ID => Facilit
composite ID
+ $rentalobject_to_contract[$data[1]] = $data[0];
+ }
+
+ $this->messages[] = "Successfully imported " .
count($rentalobject_to_contract) . " contract to composite relations";
+
+ return $rentalobject_to_contract;
+ }
+
+ /**
+ * Step 4: import the contracts from the file 'u_Kontrakt.csv'
+ * @param $composites array mapping facilit ids and protico
ids for composites
+ * @param $rentalobject_to_contract array mapping
composites and contracts
+ * @param $parties array mapping party ids
+ * @param $default_values the default accounts and
project numbers
+ * @return array of contracts
+ */
+ protected function import_contracts($composites,
$rentalobject_to_contract, $parties, $default_values)
+ {
+ $start_time = time();
+ $socontract = rental_socontract::get_instance();
+ $contracts = array();
+ $datalines = $this->getcsvdata($this->path .
"/u_Kontrakt.csv");
+
+ $this->messages[] = "Read 'u_Kontrakt.csv' file in " .
(time() - $start_time) . " seconds";
+ $this->messages[] = "'u_Kontrakt.csv' contained " .
count($datalines) . " lines";
+
+ // Old->new ID mapping
+ $contract_types = array(
+ 2 => 2, // "Internleie - innleid" -> Innleie
+ 3 => 1, // "Internleie - egne" -> Egne
+ 4 => 8, // "Tidsbegrenset" -> Annen (ekstern)
+ 5 => 4, // "Internleie - KF" -> KF
+ 12=> 6, // "Eksten Feste" -> Feste
+ 13=> 7, // "Ekstern Leilighet" -> Leilighet
+ 14=> 8, // "Ekstern Annen" -> Annen
+ 15=> 3, // "Intern - I-kontrakt" -> Inversteringskontrakt
+ 17=> NULL, // "Innleie" -> null
+ 18=> 8, // "Ekstern KF" -> Annen
+ 19=> 8 // "Ekstern I-kontrakt" -> Annen
+ );
+
+ foreach ($datalines as $data) {
+ // Skip this contract if its data is incomplete
+ if(count($data) <= 27)
+ {
+ continue;
+ }
+
+ // Create a new contract object
+ $contract = new rental_contract();
+
+ //Set the contract dates
+ $date_start =
is_numeric(strtotime($this->decode($data[3]))) ?
strtotime($this->decode($data[3])) : null;
+ $date_end =
is_numeric(strtotime($this->decode($data[4]))) ?
strtotime($this->decode($data[4])) : null;
+ $contract->set_contract_date(new
rental_contract_date($date_start,$date_end));
+
+ // Set the old contract identifier
+
$contract->set_old_contract_id($this->decode($data[5])); //cKontraktnr
+
+ // Set the contract biling term
+ $term = $data[10];
//nTermin
+ switch ($term) {
+ case 1: // Monthly
+ $contract->set_term_id(1);
+ break;
+ case 2: // Quarterly
+ $contract->set_term_id(4);
+ break;
+ case 4: // Half-year
+ $contract->set_term_id(3);
+ break;
+ case 5: // Yearly
+ $contract->set_term_id(2);
+ break;
+ }
+
+ // Report non-conforming price periods
+ $price_period = $data[14];
//nPrisPeriode
(4=month, 8=year)
+ if ($price_period == 4) {
+ // The price period is month. We
ignore this but print a warning.
+ $this->warnings[] = "Price period of
contract " . $contract->get_old_contract_id() . " is month. Ignored.";
+ //echo "<br/>Price period of contract "
. $contract->get_old_contract_id() . " is month. Ignored.";
+ }
+ elseif($price_period == 5) {
+ // The price period is 5, which is unknown. We ignore
this but print a warning.
+ $this->warnings[] = "Price period of
contract " . $contract->get_old_contract_id() . " is unknown (value: 5).
Ignored.";
+ //echo "<br/>Price period of contract "
. $contract->get_old_contract_id() . " is unknown (value: 5). Ignored.";
+ }
+
+ $contract_status = $data[6];
+ if($contract_status == 3) { // Report contracts under
dismissal. Send warning if contract status is '3' (Under avslutning)
+ $this->warnings[] = "Status of contract " .
$contract->get_old_contract_id() . " is '".lang('contract_under_dismissal')."'";
+ }
+ else if($contract_status == 1) { // Report
contracts under plannning. Send warning if contract status is '1' (Under
planlegging)
+ $this->warnings[] = "Status of contract " .
$contract->get_old_contract_id() . " is 'Under planlegging'";
+ }
+ else if($contract_status == 2) { //Test: if
the contract is running; is import date within the contract period
+ if($date_start != null && time() <
$date_start)
+ {
+ $this->warnings[] = "Status of
contract " . $contract->get_old_contract_id() . " is 'Løpende' but the start
date is in the future.";
+ }
+ else if($date_end != null && time() >
$date_end)
+ {
+ $this->warnings[] = "Status of
contract " . $contract->get_old_contract_id() . " is 'Løpende' but the end date
is in the past.";
+ }
+ }
+ //Test that the contracts end date is in the past if the
contract has status Ended
+ else if($contract_status == 4){
+ if($date_end == null || time() < $date_end)
+ {
+ $this->warnings[] = "Status of
contract " . $contract->get_old_contract_id() . " is 'Avsluttet' but the end
date not set or in the future.";
+ }
+ }
+
+
+ // Set the billing start date for the contract
+ $billing_start_date =
is_numeric(strtotime($this->decode($data[16]))) ?
strtotime($this->decode($data[16])) : null;
+ $contract->set_billing_start_date($billing_start_date);
+
+ // Deres ref.
+
$contract->set_invoice_header($this->decode($data[17]));
//cFakturaRef
+
$contract->set_comment($this->decode($data[18]));
//cMerknad
+
$contract->set_contract_type_id($contract_types[$this->decode($data[1])]);
//
+
+ // Set the location identifier (responsibiity
area)
+ $contract->set_location_id($this->location_id);
+
+ // Get the composite identifier for the
composite included in this contract
+ $composite_id =
$composites[$rentalobject_to_contract[$data[0]]];
+
+ // Retrieve the title for the responsibility area we are
importing (to hande the respoonsibility areas differently)
+ $title =
$socontract->get_responsibility_title($this->location_id);
+
+ // For external contract types the rented area resides on the
composite ...
+ if($title == 'contract_type_eksternleie') {
+ if($composite_id)
+ {
+ $socomposite = rental_socomposite::get_instance();
+
$contract->set_rented_area($socomposite->get_area($composite_id));
+ }
+ }
+ else if($title == 'contract_type_innleie')
+ {
+ $rented_area_on_contract = $this->decode($data[21]);
+ if(isset($rented_area_on_contract) &&
$rented_area_on_contract > 0)
+ {
+
$contract->set_rented_area($rented_area_on_contract);
+ }
+ else
+ {
+ if($composite_id)
+ {
+ $socomposite =
rental_socomposite::get_instance();
+
$contract->set_rented_area($socomposite->get_area($composite_id));
+ }
+ }
+ }
+ else
+ {
+ // ... and for others contract types the rented area
resides on the contract
+ $contract->set_rented_area($this->decode($data[21]));
+ }
+
+
+ // Retrieve default values for accounts and project numbers
+ if($title == 'contract_type_eksternleie')
+ {
+ $type_id =
$contract->get_contract_type_id();
+ if(!in_array($type_id, array(6,7,8)))
+ {
+
$contract->set_contract_type_id(8);
+ }
+ }
+ else if($title == 'contract_type_internleie')
+ {
+ //Set default account in/out and
project numbers for internal contracts
+
$contract->set_account_in($default_values['account_in']);
+
$contract->set_account_out($default_values['account_out']);
+
$contract->set_project_id($default_values['project_number']);
+
+ // Ansvar/Tjenestested: F.eks:
080400.13000
+ $ansvar_tjeneste =
$this->decode($data[26]);
//cSikkerhetsTekst
+ $ansvar_tjeneste_components =
explode(".", $ansvar_tjeneste);
+ if(count($ansvar_tjeneste_components)
== 2)
+ {
+
$contract->set_responsibility_id($ansvar_tjeneste_components[0]);
+
$contract->set_service_id($ansvar_tjeneste_components[1]);
+ }
+ else
+ {
+ $this->warnings[] = "The
contract (internal) " . $contract->get_old_contract_id() . " lacks service and
responsibility ids";
+ }
+ }
+
+ // Store contract
+ if ($socontract->store($contract)) {
+ // Map contract ids in Facilit and PE
contract id (should be the same)
+ $contracts[$data[0]] =
$contract->get_id();
+
+ // Check if this contract has a
composite and if so add rental composite to contract
+ if
(!$this->is_null($rentalobject_to_contract[$data[0]]) &&
!$this->is_null($composite_id)) {
+
$socontract->add_composite($contract->get_id(), $composite_id);
+ }
+
+ // Check if this contract has a
contract part and if so add party to contract
+ if (!$this->is_null($data[2])) {
//nPersonForetakId
+ $party_id =
$parties[$this->decode($data[2])];
+
$socontract->add_party($contract->get_id(), $party_id);
+ // Set this party to be the
contract invoice recipient
+
$socontract->set_payer($contract->get_id(), $party_id);
+ }
+
+ $this->messages[] = "Successfully added
contract (" . $contract->get_id() . "/". $contract->get_old_contract_id() .")";
+ } else {
+ $this->errors[] = "Failed to store
contract " . $this->decode($data[5]);
+ }
+ }
+
+ $this->messages[] = "Successfully imported " .
count($contracts) . " contracts. (" . (time() - $start_time) . " seconds)";
+ return $contracts;
+ }
+
+ protected function import_contract_price_items($contracts)
+ {
+ $start_time = time();
+ $soprice_item = rental_soprice_item::get_instance();
+ $socontract_price_item =
rental_socontract_price_item::get_instance();
+ $socontract = rental_socontract::get_instance();
+
+ // Read priselementdetaljkontrakt list first so we can
create our complete price items in the next loop
+ // This is an array keyed by the main price item ID
+ $detail_price_items = array();
+ $datalines = $this->getcsvdata($this->path .
"/u_PrisElementDetaljKontrakt.csv");
+
+ $this->messages[] = "Read
'u_PrisElementDetaljKontrakt.csv' file in " . (time() - $start_time) . "
seconds";
+ $this->messages[] = "'u_PrisElementDetaljKontrakt.csv'
contained " . count($datalines) . " lines";
+
+ foreach ($datalines as $data) { //Felt
fra 'PrisElementDetaljKontrakt'
+ if(count($data) <= 10)
+ {
+ continue;
+ }
+
+
+ if(isset($detail_price_items[$data[1]]))
+ {
+ // Update existing detail only start
date is later than existing start date detail
+ if (!$this->is_null($data[4])) {
+ $detail_date =
strtotime($this->decode($data[4]));
+ if($detail_date >
$detail_price_items[$data[1]]['date_start'])
+ {
+
$detail_price_items[$data[1]]['date_start'] = $detail_date;
+
$detail_price_items[$data[1]]['amount'] = str_replace(',','.',$data[3]);
+
$detail_price_items[$data[1]]['price'] = str_replace(',','.',$data[2]);
+ }
+ }
+ }
+ else
+ {
+ //Create a row in the array holding the
details (price, amount, dates) for the price item
+ $detail_price_items[$data[1]] =
//nPrisElementId
+ array(
+ 'price' =>
str_replace(',','.',$data[2]), //nPris
+ 'amount' =>
str_replace(',','.',$data[3]), //nMengde
+ 'date_start' => null,
//dGjelderFra
+ 'date_end' => null
//dGjelderTil
+ );
+
+ if (!$this->is_null($data[4])) {
+
$detail_price_items[$data[1]]['date_start'] =
strtotime($this->decode($data[4]));
+ }
+ if (!$this->is_null($data[5])) {
+
$detail_price_items[$data[1]]['date_end'] = strtotime($this->decode($data[5]));
+ }
+ }
+ }
+
+ $datalines = $this->getcsvdata($this->path .
"/u_PrisElementKontrakt.csv");
+
+ $this->messages[] = "Read 'u_PrisElementKontrakt.csv'
file in " . (time() - $start_time) . " seconds";
+ $this->messages[] = "'u_PrisElementKontrakt.csv'
contained " . count($datalines) . " lines";
+
+ //Retrieve the title for the responsibility area we are
importing (to hande the respoonsibility areas differently)
+ $title =
$socontract->get_responsibility_title($this->location_id);
+ //If we are importing price items for 'Innleie', we
have a default price item in the 'Prisbok' with agresso-id 'INNLEIE'
+ if($title == 'contract_type_innleie'){
+ $admin_price_item =
$soprice_item->get_single_with_id('INNLEIE');
+ }
+
+ foreach ($datalines as $data) {
+ if(count($data) <= 24)
+ {
+ continue;
+ }
+
+ /* If we are importing contract price items for
external or internal:
+ * - see if a pricebook element exist
+ */
+ if($title != 'contract_type_innleie')
+ {
+ // The Agresso-ID is unique for price
items
+ $id = $this->decode($data[12]);
//cVarenr
+ $admin_price_item = null;
+ if(isset($id) && $id != '')
+ {
+ $admin_price_item =
$soprice_item->get_single_with_id($id);
+ }
+ else
+ {
+ $admin_price_item =
$soprice_item->get_single_with_id('UNKNOWN');
+ }
+ }
+
+ // Get the facilit price item id so that we can
retrieve the price item details
+ $facilit_id = $this->decode($data[0]);
//nPrisElementId
+
+ /* Create a new pricebook price item if one
does not exist in the pricebook; store it if it has a new unique agresso-id.
+ * Note: First price item with unique
agresso-id determines title, area or "nr of items", and the price (from the
price item details) */
+ if ($admin_price_item == null) {
+ $admin_price_item = new
rental_price_item();
+
$admin_price_item->set_title($this->decode($data[3]));
//cPrisElementNavn
+ $admin_price_item->set_agresso_id($id);
//cVareNr
+ // This assumes 1 for AREA, and
anything else for count, even blanks
+
$admin_price_item->set_is_area($this->decode($data[4]) == '1' ? true : false);
//nMengdeTypeId
+ // This assumes -1 for adjustable, and
anything else for not adjustable, even blanks
+
$admin_price_item->set_is_adjustable($this->decode($data[17]) == '-1' ? true :
false); //bRegulerbar
+ // Get the price for this price item
+
$admin_price_item->set_price($detail_price_items[$facilit_id]['price']);
+
$admin_price_item->set_responsibility_id($this->location_id);
+
+ if(isset($id))
+ {
+
$soprice_item->store($admin_price_item);
+ $this->messages[] = "Stored
price item ({$id}) with title " . $admin_price_item->get_title() . " in
'Prisbok'";
+ }
+ }
+ else{
+ //check type on price item (not is_area
and data[4]=1, or is_area and data[4] != 1)
+ if($admin_price_item->is_area() &&
$this->decode($data[4] != '1')){
+ $this->warnings[] = "Price item
({$admin_price_item->get_agresso_id()}) - " . $admin_price_item->get_title() .
" - on contract {$contracts[$this->decode($data[1])]} is stored as area price
item, but has record indicating it is not an area price item!";
+ }
+ else if(!$admin_price_item->is_area()
&& $this->decode($data[4] == '1')){
+ $this->warnings[] = "Price item
({$admin_price_item->get_agresso_id()}) - " . $admin_price_item->get_title() .
" - on contract {$contracts[$this->decode($data[1])]} is stored as non-area
price item, but has record indicating it is an area price item!";
+ }
+ }
+
+ $contract_id =
$contracts[$this->decode($data[1])]; //nKontraktId
+
+ if ($contract_id) {
+ // Create a new contract price item
that we can tie to our contract
+ $price_item = new
rental_contract_price_item();
+
+ // Retrieve the contract
+ $contract =
$socontract->get_single($contract_id);
+
+ // Set cLonnsArt for price item as
contract reference
+
$contract->set_reference($this->decode($data[13]));
+
+ // The contract price item title should
be the same as in the price book for internal
+ if($title == 'contract_type_internleie')
+ {
+
$price_item->set_title($admin_price_item->get_title());
+ }
+ else
+ {
+ // ... and overridden by the
price item for innleie and external
+
$price_item->set_title($data[3]);
+ }
+
+ // Set the price book element's
agresso-id and type (area/piece)
+
$price_item->set_agresso_id($admin_price_item->get_agresso_id());
+
+ // If the price item is unknown do not
use the 'is_area' from the price book
+ if($admin_price_item->get_agresso_id()
!= 'UNKNOWN')
+ {
+
$price_item->set_is_area($admin_price_item->is_area());
+ }
+ else
+ {
+
$price_item->set_is_area($this->decode($data[4]) == '1' ? true : false);
+ }
+
+ // Get the price for the price item
details
+
$price_item->set_price($detail_price_items[$facilit_id]['price']);
+
+ // Give a warning if a contract has a price element of
type area with are like 1
+ if($price_item->is_area() &&
($detail_price_items[$facilit_id]['amount'] == '1'))
+ {
+ $this->warnings[] = "Contract " .
$contract->get_old_contract_id() . " has a price item of type area with amount
like 1";
+ }
+
+ // Tie this price item to its parent
admin price item
+
$price_item->set_price_item_id($admin_price_item->get_id());
+
+ if ($admin_price_item->is_area()) {
+
+ $rented_area = $contract->get_rented_area();
+ if(isset($rented_area))
+ {
+ if($detail_price_items[$facilit_id]['amount']
!= $rented_area)
+ {
+ if($rented_area == 0)
+ {
+
$contract->set_rented_area($detail_price_items[$facilit_id]['amount']);
+ $this->warnings[] = "Price item
{$id} - (Facilit ID {$facilit_id}) has area " .
$detail_price_items[$facilit_id]['amount']
+ . " while contract {$contract_id}
already has rented area set to 0. Using rented area from price item.";
+ }
+ else
+ {
+ $this->warnings[] = "Price item
{$id} - (Facilit ID {$facilit_id}) has area " .
$detail_price_items[$facilit_id]['amount']
+ . " while contract {$contract_id}
already has rented area {$rented_area}. Using rented area on contract.";
+ }
+ }
+ }
+ else
+ {
+ //Store price item area on contract if the
contract has no area (not from contract)
+
$contract->set_rented_area($detail_price_items[$facilit_id]['amount']);
+ $this->message[] = "Price item {$id} - (Facilit
ID {$facilit_id}) has area " . $detail_price_items[$facilit_id]['amount']
+ . " while contract {$contract_id}
already no area {$rented_area}. Using rented area on price item.";
+
+ //Store the contract
+ $socontract->store($contract);
+ }
+
+
+ // Set the the contract area on the price item
+
$price_item->set_area($contract->get_rented_area());
+
+ //Calculate the total price for the price item
+ $item_area = $price_item->get_area();
+ $item_price = $price_item->get_price();
+ $price_item->set_total_price($item_area *
$item_price);
+
+ }
+ else
+ {
+
$price_item->set_count($detail_price_items[$facilit_id]['amount']);
+ $item_count =
$price_item->get_count();
+ $item_price = $price_item->get_price();
+
$price_item->set_total_price($item_count * $item_price);
+ }
+
+
+
$price_item->set_date_start($detail_price_items[$facilit_id]['date_start']);
+
$price_item->set_date_end($detail_price_items[$facilit_id]['date_end']);
+
+ // Tie the price item to the contract
it belongs to
+
$price_item->set_contract_id($contract_id);
+
+ // Tie this price item to its parent
admin price item
+
$price_item->set_price_item_id($admin_price_item->get_id());
+
+ //update contract with adjustment share
+ $adjustment_share =
$this->decode($data[18]); //nReguleringsandel
+ if($adjustment_share != null &&
$adjustment_share > 0){
+
$socontract->update_adjustment_share($contract_id, $adjustment_share);
+ }
+
+ // .. and save
+
if($socontract_price_item->import($price_item)) {
+ $this->messages[] = "Successfully imported price item
({$id}) for contract {$contract_id}";
+ }
+ else {
+ $this->warnings[] = "Could not store price item
({$id}) - " . $price_item->get_title();
+ }
+ } else {
+ $this->warnings[] = "Skipped price item
with no contract attached: " . join(", ", $data);
+ }
+ }
+ $this->messages[] = "Imported contract price items. ("
. (time() - $start_time) . " seconds)";
+ return true;
+ }
+
+ protected function import_events($contracts,
$regulation_id_location_id)
+ {
+ $start_time = time();
+
+ $sonotification = rental_sonotification::get_instance();
+ $socontract = rental_socontract::get_instance();
+
+ $datalines = $this->getcsvdata($this->path .
"/u_Hendelse.csv");
+
+ $this->messages[] = "Read 'u_Hendelse.csv' file in " .
(time() - $start_time) . " seconds";
+ $this->messages[] = "'u_Hendelse.csv' contained " .
count($datalines) . " lines";
+
+ foreach ($datalines as $data) {
+ $type_id = $data[2];
+
+ $date_array =
explode(".",$this->decode($data[7]));
+ if(count($date_array) == 3)
+ {
+ $y = $date_array[2];
+ $m = $date_array[1];
+ $d = $date_array[0];
+ $date = strtotime($y."-".$m."-".$d);
+ }
+
+ //Which contract the event is linked to
+ $contract_id =
$contracts[$this->decode($data[1])];
+
+ if(!isset($contract_id) || $contract_id <= 0)
+ {
+ //This event is not bound to a contract
that is part of the currently importing respensibiliry area
+ continue;
+ }
+
+ $location_id = $this->location_id;
+
+ // Add event description to title
+ $title = $this->decode($data[3]);
+ if (!$this->is_null($data[4])) {
+ $title .= " " . $this->decode($data[4]);
+ }
+
+ //Contract ending event
+ if($type_id == '3')
+ {
+ if(isset($date) && is_numeric($date) &&
$contract_id > 0)
+ {
+ $con =
$socontract->get_single($contract_id);
+
if($con->get_contract_date()->has_end_date())
+ {
+ $old_end_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$con->get_contract_date()->get_end_date());
+ $this->errors[] =
"Contract ({$con->get_old_contract_id()}) will be updated with 'contract end'
event (DATE: {$this->decode($data[7])}) event though it already had an end date
{$old_end_date} ";
+ }
+
+
+ //Set date as contract date
+
$socontract->update_contract_end_date($contract_id, $date);
+ $this->messages[] =
"Successfully updated contract end date to '" . $this->decode($data[7]) . "'
for contract {$contract_id} (originaly had end date
({$con->get_contract_date()->get_end_date()}))";
+ if(isset($title) && $title !=
'')
+ {
+ $this->warnings[] =
"Contract event of type end date (" . $this->decode($data[7]) . ") for contract
{$contract_id} has a title {$title} which is not imported";
+ }
+ }
+ else
+ {
+ $this->warnings[] = "Skipped
contract end event with either no date ({$this->decode($data[7])}) or not valid
contract identifier ({$contract_id}/{$this->decode($data[1])})";
+ }
+
+ }
+ else if($type_id == '4')// Event of type
notification
+ {
+ if(isset($title) && $title != '' &&
$contract_id > 0)
+ {
+ // All is good, store
notification
+ $notification = new
rental_notification(null, null, $location_id, $contract_id, $date, $title);
+ if
($sonotification->store($notification)) {
+ $this->messages[] =
"Successfully imported notification '" . $notification->get_message() . "' for
contract {$contract_id}";
+ } else {
+ $this->errors[] =
"Error importing notification " . $notification->get_message() . " for contract
{$contract_id}";
+ }
+ }
+ else
+ {
+ $this->warnings[] = "Skipped
notification with no valid contract identifer ({$contract_id} or no title
({$title})";
+ }
+ }
+ else if($type_id == '1') { //price
adjustment
+ $adjusted = $this->decode($data[8]);
+
+ //$reg_id_generated =
$this->decode($data[9]);
+ $reg_id_regulated =
$this->decode($data[10]);
+
+ /*if(isset($reg_id_generated) &&
$reg_id_generated != '')
+ {
+
$regulation_id_location_id[$reg_id_generated] = $location_id;
+ }*/
+
+ if(isset($reg_id_regulated) &&
$reg_id_regulated != '')
+ {
+
$regulation_id_location_id[$reg_id_regulated] = $location_id;
+ }
+
+
+ if($adjusted == 0 || $adjusted == '0'){
+ $current_year = date('Y');
+ $date_tmp = explode(".",
$this->decode($data[7]));
+ if(count($date_tmp) == 3){
+ $year = $date_tmp[2];
+ $interval =
$this->decode($data[6]);
+ $last_adjusted_year =
$year - $interval;
+ }else{
+ $last_adjusted_year = 0;
+ }
+
+ $contract_id =
$contracts[$data[1]];
+ if($last_adjusted_year <=
$current_year){
+ //update last adjusted
on contract.
+ if($contract_id > 0 &&
$last_adjusted_year > 0){
+ //$result =
$socontract->update_adjustment_year_interval($contract_id, $last_adjusted_year,
$interval);
+ if($result)
+ {
+
$this->messages[] = "Successfully imported regulation. Set last regulation year
'" . $last_adjusted_year . "' for contract {$contract_id} with interval
'{$interval}'";
+ }
+ }
+ }
+ else{
+ $this->warnings[] =
"Skipping adjustment on contract ({$contract_id}) because the contract's last
adjusted year ({$last_adjusted_year}) is after current year '{$current_year}'.";
+ }
+ }
+ }
+ else // Unknown event type
+ {
+ $this->warnings[] = "Unknow event type
" . $type_id . " for contract {$contract_id} with title/description {$title}";
+ }
+ unset($date);
+ }
+
+ //loop through events once more to update previous
adjustments
+ foreach ($datalines as $data) {
+ $type_id = $data[2];
+
+ if($type_id == 1 || $type_id == '1') { //price
adjustment
+ $adjusted = $this->decode($data[8]);
+ if($adjusted == -1 || $adjusted ==
'-1'){
+ $current_year = date('Y');
+ $date_tmp = explode(".",
$this->decode($data[7]));
+ if(count($date_tmp) == 3){
+ $year = $date_tmp[2];
+ }else{
+ $year = 0;
+ }
+
+ //update last adjusted and
interval on contract.
+ $contract_id =
$contracts[$data[1]];
+ if($year <= $current_year){
+ if($contract_id > 0 &&
$year > 0){
+ //$result =
$socontract->update_adjustment_year($contract_id, $year);
+ if($result)
+ {
+
$this->messages[] = "Successfully updated regulation information. Set last
regulation year '" . $year . "' for contract {$contract_id}";
+ }
+ }
+ }
+ else{
+ $this->warnings[] =
"Skipping adjustment-year update on contract {$contract_id} because last
adjusted year is after {$current_year}.";
+ }
+ }
+ }
+ }
+
+ $this->messages[] = "Imported events. (" . (time() -
$start_time) . " seconds)";
+ return $regulation_id_location_id;
+ }
+
+ protected function import_adjustment_information()
+ {
+ $start_time = time();
+
+ $sonotification = rental_sonotification::get_instance();
+ $socontract = rental_socontract::get_instance();
+
+ $datalines = $this->getcsvdata($this->path .
"/u_Hendelse.csv");
+
+ $this->messages[] = "Read 'u_Hendelse.csv' file in " .
(time() - $start_time) . " seconds";
+ $this->messages[] = "'u_Hendelse.csv' contained " .
count($datalines) . " lines";
+
+ foreach ($datalines as $data) {
+ $type_id = $data[2];
+
+ $date_array =
explode(".",$this->decode($data[7]));
+ if(count($date_array) == 3)
+ {
+ $y = $date_array[2];
+ $m = $date_array[1];
+ $d = $date_array[0];
+ $date = strtotime($y."-".$m."-".$d);
+ }
+
+ //Which contract the event is linked to
+ $contract_id = $this->decode($data[1]);
+
+ if(!isset($contract_id) || $contract_id <= 0)
+ {
+ //This event is not bound to a contract
that is part of the currently importing respensibiliry area
+ continue;
+ }
+
+ $location_id = $this->location_id;
+
+ // Add event description to title
+ $title = $this->decode($data[3]);
+ if (!$this->is_null($data[4])) {
+ $title .= " " . $this->decode($data[4]);
+ }
+
+ if($type_id == '1') { //price adjustment
+ $adjusted = $this->decode($data[8]);
+
+ if($adjusted == 0 || $adjusted == '0'){
+ $current_year = date('Y');
+ $date_tmp = explode(".",
$this->decode($data[7]));
+ if(count($date_tmp) == 3){
+ $year = $date_tmp[2];
+ $interval =
$this->decode($data[6]);
+ $last_adjusted_year =
$year - $interval;
+ }else{
+ $last_adjusted_year = 0;
+ }
+
+
+ if($last_adjusted_year <=
$current_year){
+ ;
+ //update last adjusted
on contract.
+ if($contract_id > 0 &&
$last_adjusted_year > 0){
+
//$this->messages[] = "Should set year {$last_adjusted_year} and interval
{$interval} on contract {$contract_id}";
+ $result =
$socontract->update_adjustment_year_interval($contract_id, $last_adjusted_year,
$interval);
+ if($result)
+ {
+
$this->messages[] = "Successfully imported regulation. Set last regulation year
'" . $last_adjusted_year . "' for contract {$contract_id} with interval
'{$interval}'";
+ }
+ else
+ {
+
$this->errors[] = "Error importing regulation. Tried to set last regulation
year '" . $last_adjusted_year . "' for contract {$contract_id} with interval
'{$interval}'";
+ }
+ }
+ }
+ else{
+ $this->warnings[] =
"Skipping adjustment on contract ({$contract_id}) because the contract's last
adjusted year ({$last_adjusted_year}) is after current year '{$current_year}'.";
+ }
+ }
+ }
+ }
+
+ //loop through events once more to update previous
adjustments
+ foreach ($datalines as $data) {
+ $type_id = $data[2];
+
+ if($type_id == 1 || $type_id == '1') { //price
adjustment
+ $adjusted = $this->decode($data[8]);
+ if($adjusted == -1 || $adjusted ==
'-1'){
+
+ $current_year = date('Y');
+ $date_tmp = explode(".",
$this->decode($data[7]));
+ if(count($date_tmp) == 3){
+ $year = $date_tmp[2];
+ }else{
+ $year = 0;
+ }
+ //update last adjusted and
interval on contract.
+ if($year <= $current_year){
+
+ $contract_id =
$this->decode($data[1]);
+
+ if(isset($contract_id)
&& $contract_id > 0 && $year > 0){
+ $result =
$socontract->update_adjustment_year($contract_id, $year);
+ if($result)
+ {
+
$this->messages[] = "Successfully updated regulation information. Set last
regulation year '" . $year . "' for contract {$contract_id}";
+ }
+ else
+ {
+
$this->errors[] = "Error updating regulation information. Tried to set last
regulation year '" . $last_adjusted_year . "' for contract {$contract_id} with
interval '{$interval}'";
+ }
+ }
+ }
+ else{
+ $this->warnings[] =
"Skipping adjustment-year update on contract {$contract_id} because last
adjusted year is after {$current_year}.";
+ }
+ }
+ }
+ }
+ }
+
+ protected function import_adjustments($contracts,
$regulation_id_location_id)
+ {
+ $start_time = time();
+
+ $soadjustment = rental_soadjustment::get_instance();
+
+ $datalines = $this->getcsvdata($this->path .
"/u_Regulering.csv");
+
+ $this->messages[] = "Read 'u_Regulering.csv' file in "
. (time() - $start_time) . " seconds";
+ $this->messages[] = "'u_Regulering.csv' contained " .
count($datalines) . " lines";
+
+ foreach ($datalines as $data) {
+ if(count($data) <= 8)
+ {
+ continue;
+ }
+
+ $adjustment = new rental_adjustment();
+ $regulation_id = $this->decode($data[0]);
//nReguleringId
+ $loc_id =
$regulation_id_location_id[$regulation_id];
+
+ if(isset($loc_id) && $loc_id != '')
+ {
+
$adjustment->set_responsibility_id($loc_id);
+ }
+ else
+ {
+ $this->messages[] = "This adjustment '"
. $regulation_id . "' could not be linked to this responsibility area. Date
({$this->decode($data[1])}), Text ({$this->decode($data[4])}), Interval
({$this->decode($data[2])})";
+ continue;
+ }
+
+ $date_array =
explode(".",$this->decode($data[1])); //dAktuellDato
+ if(count($date_array) == 3)
+ {
+ $y = $date_array[2];
+ $m = $date_array[1];
+ $d = $date_array[0];
+ $date = strtotime($y."-".$m."-".$d);
+ }
+ $adjustment->set_adjustment_date($date);
+
+ $description_array = explode(" ",
$this->decode($data[4])); //cBeskrivelse
+ $number = end($description_array);
+ $percent = substr($number, 0,strlen($number)-2);
+ $percent = str_replace(',', '.', $percent);
+ $adjustment->set_percent($percent);
+
+
$adjustment->set_interval($this->decode($data[2]));
+
+ $adjustment->set_new_price(0);
+ $adjustment->set_price_item_id(0);
+
+
if(!$soadjustment->adjustment_exist($adjustment))
+ {
+ // All is good, store notification
+ if ($soadjustment->store($adjustment)) {
+ $this->messages[] =
"Successfully imported adjustment: Date ({$this->decode($data[1])}), Percent
({$adjustment->get_percent()}), Interval ({$adjustment->get_interval()})";
+ } else {
+ $this->errors[] = "Error
importing adjustment: Date ({$this->decode($data[1])}), Percent
({$adjustment->get_percent()}), Interval ({$adjustment->get_interval()})";
+ }
+ }
+ else
+ {
+ $this->messages[] = "Adjustment already
exist: Date ({$this->decode($data[1])}), Percent
({$adjustment->get_percent()}), Interval ({$adjustment->get_interval()})";
+ }
+ }
+
+ $this->messages[] = "Imported adjustments. (" . (time()
- $start_time) . " seconds)";
+ return true;
+ }
+
+ protected function getcsvdata($path, $skipfirstline = true)
+ {
+ // Open the csv file
+ $handle = fopen($path, "r");
+
+ if ($skipfirstline) {
+ // Read the first line to get the headers out
of the way
+ $this->getcsv($handle);
+ }
+
+ $result = array();
+
+ while(($data = $this->getcsv($handle)) !== false) {
+ $result[] = $data;
+ }
+
+ fclose($handle);
+
+ return $result;
+ }
+
+
+ /**
+ * Read the next line from the given file handle and parse it
to CSV according to the rules set up
+ * in the class constants DELIMITER and ENCLOSING. Returns
FALSE like getcsv on EOF.
+ *
+ * @param file-handle $handle
+ * @return array of values from the parsed csv line
+ */
+ protected function getcsv($handle)
+ {
+ return fgetcsv($handle, 1000, self::DELIMITER,
self::ENCLOSING);
+ }
+
+ /**
+ * Convert from the locale encoding to UTF-8 encoding and
escape single quotes
+ *
+ * @param string $value The value to convert
+ * @return string
+ */
+ protected function decode($value)
+ {
+ $converted = mb_convert_encoding($value, 'UTF-8');
+ if ($this->is_null(trim($converted))) {
+ return null;
+ }
+
+ // Escape single quotes
+ // TODO: This is a DB problem and doesn't belong here
+ return str_replace("'", "\'", $converted);
+ }
+
+ /**
+ * Test a value for null according to several formats that can
exist in the export.
+ * Returns true if the value is null according to these rules,
false otherwise.
+ *
+ * @param string $value The value to test
+ * @return bool
+ */
+ protected function is_null($value)
+ {
+ return ((trim($value) == "") || ($data == "<NULL>") ||
($data == "''"));
+ }
+
+
+ /**
+ * Do end-of-import clean up
+ */
+ protected function clean_up() {
+ $socontract = rental_socontract::get_instance();
+ $socontract->clear_last_edited_table();
+ }
+
+ private function log_messages($step) {
+ sort($this->errors);
+ sort($this->warnings);
+ sort($this->messages);
+
+ $msgs = array_merge(
+ array('----------------Errors--------------------'),
+ $this->errors,
+ array('---------------Warnings-------------------'),
+ $this->warnings,
+ array('---------------Messages-------------------'),
+ $this->messages
+ );
+ $path = $this->path;
+
+ if(is_dir($path.'/logs') || mkdir($path.'/logs')) {
+ file_put_contents("$path/logs/$step.log", implode(PHP_EOL,
$msgs));
+ }
+ else { // Path not writeable
+
+ }
+ }
+ }
+?>
Modified:
branches/Version-1_0-branch/booking/inc/class.customer_identifier.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.customer_identifier.inc.php
2011-05-06 13:08:55 UTC (rev 7264)
+++ branches/Version-1_0-branch/booking/inc/class.customer_identifier.inc.php
2011-05-06 13:12:02 UTC (rev 7265)
@@ -25,7 +25,22 @@
if ($from_entity_customer_identifier =
$this->get_current_identifier_type($from_entity))
{
$to_entity[$this->identifier_type_field] =
$from_entity_customer_identifier;
-
$to_entity[$this->field_prefix.$from_entity_customer_identifier] =
$this->get_current_identifier_value($from_entity);
+ if(intval($from_entity['customer_internal']) == 1)
+ {
+ if (strlen($from_entity['customer_number']) == 5)
+ {
+
$to_entity[$this->field_prefix.$from_entity_customer_identifier] =
$from_entity['customer_number'];
+ }
+ else
+ {
+
$to_entity[$this->field_prefix.$from_entity_customer_identifier] = '';
+ }
+ }
+ else
+ {
+
$to_entity[$this->field_prefix.$from_entity_customer_identifier] =
$this->get_current_identifier_value($from_entity);
+ }
+
}
}
@@ -95,7 +110,7 @@
$identifier_field =
$this->field_prefix.$identifier_field;
$identifier_value = isset($data[$identifier_field]) ?
trim($data[$identifier_field]) : null;
-
+
return (empty($identifier_value) ? null :
$identifier_value);
}
Modified:
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation.inc.php
2011-05-06 13:08:55 UTC (rev 7264)
+++
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation.inc.php
2011-05-06 13:12:02 UTC (rev 7265)
@@ -140,10 +140,10 @@
}
$entity = array(
- 'reservation_type' => $type,
+ 'reservation_type' => $type,
'reservation_id' =>
$reservation['id'],
'cost' =>
$reservation['cost'],
- 'from_'
=> $reservation['from_'],
+ 'from_' =>
$reservation['from_'],
'to_' =>
$reservation['to_'],
'customer_type' => 'external',
'resources' =>
$reservation['resources'],
@@ -262,7 +262,15 @@
protected function set_organization(&$entity, &$organization) {
$entity['organization_id'] = $organization['id'];
- $entity['customer_organization_number'] =
$organization['organization_number'];
+ if (intval($organization['customer_internal']) == 1) {
+ if (strlen($organization['customer_number']) == 5) {
+ $entity['customer_organization_number'] =
$organization['customer_number'];
+ } else {
+ $entity['customer_organization_number'] = '';
+ }
+ } else {
+ $entity['customer_organization_number'] =
$organization['organization_number'];
+ }
}
protected function initialize_completed_booking(&$booking,
&$entity) {
@@ -279,10 +287,10 @@
$org =
$soorg->read_single($group['organization_id']);
$cache[$booking['group_id']] = $org;
}
-
+
$this->set_organization($entity, $org);
- $this->set_customer_type($entity, $org);
- $this->copy_customer_identifier($org, $entity);
+ $this->set_customer_type($entity, $org);
+ $this->copy_customer_identifier($org, $entity);
}
protected function
initialize_completed_allocation(&$allocation, &$entity) {
Modified:
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
2011-05-06 13:08:55 UTC (rev 7264)
+++
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export.inc.php
2011-05-06 13:12:02 UTC (rev 7265)
@@ -98,7 +98,15 @@
* Normalizes data on entity.
*/
public function initialize_entity(&$entity) {
- if (isset($entity['__initialized__']) &&
$entity['__initialized__'] === true) { return $entity; }
+ ob_start();
+ $myFile = "/tmp/debug2.txt";
+ $fh = fopen($myFile, 'w') or die("can't open file");
+ echo '<pre>';print_r($entity);
+ $op = ob_get_contents();
+ fwrite($fh, $op);
+ fclose($fh);
+ ob_end_clean();
+ if (isset($entity['__initialized__']) &&
$entity['__initialized__'] === true) { return $entity; }
$entity['__initialized__'] = true;
//re-index export configurations on their types
@@ -278,7 +286,7 @@
$export_format,
count(array_filter($external_reservations, array($this, 'not_free'))),
$this->calculate_total_cost($external_reservations),
-
$this->format_agresso($external_reservations, $account_codes, $number_generator)
+
$this->format_agresso($external_reservations, $account_codes,
$number_generator,'external')
);
}
}
@@ -289,7 +297,17 @@
* @return array with three elements where index 0: total_rows,
index 1: total_cost, index 2: formatted data
*/
public function export_internal(array &$reservations, array
$account_codes) {
- $export_format = 'csv';
+ $config = CreateObject('phpgwapi.config','booking');
+ $config->read();
+
+ if ($config->config_data['internal_format'] == 'CSV')
+ {
+ $export_format = 'csv';
+ }
+ elseif ($config->config_data['internal_format'] == 'AGGRESSO')
+ {
+ $export_format = 'agresso';
+ }
if (is_array($reservations)) {
if (count($internal_reservations =
array_filter($reservations, array($this, 'select_internal'))) > 0) {
@@ -297,12 +315,24 @@
if (!($number_generator =
$this->sequential_number_generator_so->get_generator_instance('internal'))) {
throw new
UnexpectedValueException("Unable to find sequential number generator for
internal export");
}
- return $this->build_export_result(
- $export_format,
-
count(array_filter($internal_reservations, array($this, 'not_free'))),
-
$this->calculate_total_cost($internal_reservations),
-
$this->format_csv($internal_reservations, $account_codes, $number_generator)
- );
+ if ($config->config_data['internal_format'] == 'CSV')
+ {
+ return
$this->build_export_result(
+ $export_format,
+
count(array_filter($internal_reservations, array($this, 'not_free'))),
+
$this->calculate_total_cost($internal_reservations),
+
$this->format_csv($internal_reservations, $account_codes, $number_generator)
+ );
+ }
+ elseif ($config->config_data['internal_format'] ==
'AGGRESSO')
+ {
+ return
$this->build_export_result(
+ $export_format,
+
count(array_filter($internal_reservations, array($this, 'not_free'))),
+
$this->calculate_total_cost($internal_reservations),
+
$this->format_agresso($internal_reservations, $account_codes,
$number_generator,'internal')
+ );
+ }
}
}
return $this->build_export_result($export_format, 0,
0.0);
@@ -558,7 +588,7 @@
}
}
- public function format_agresso(array &$reservations, array
$account_codes, $sequential_number_generator) {
+ public function format_agresso(array &$reservations, array
$account_codes, $sequential_number_generator,$type) {
//$orders = array();
$export_info = array();
$output = array();
@@ -603,6 +633,8 @@
$trans_type = str_pad(substr(strtoupper('42'), 0, 2),
2, ' ');
$voucher_type = str_pad(substr(strtoupper('FK'), 0, 2),
2, ' ');
+// echo "<pre>";print_r($reservations);exit;
+
foreach($reservations as &$reservation) {
if ($this->get_cost_value($reservation['cost'])
<= 0) {
continue; //Don't export costless rows
@@ -642,7 +674,12 @@
}
//Nøkkelfelt, kundens personnr/orgnr.
- $header['tekst2'] =
str_pad(substr($this->get_customer_identifier_value_for($reservation), 0, 12),
12, ' ');
+ if ($type == 'internal') {
+ $header['tekst2'] =
str_pad(substr($config->config_data['organization_value'], 0, 12), 12, ' ');
+ $header['ext_ord_ref'] =
str_pad(substr($this->get_customer_identifier_value_for($reservation), 0, 15),
15, ' ');
+ } else {
+ $header['tekst2'] =
str_pad(substr($this->get_customer_identifier_value_for($reservation), 0, 12),
12, ' ');
+ }
$header['line_no'] = '0000'; //Nothing here
according to example file but spec. says so
//Topptekst til faktura, knyttet mot fagavdeling
Modified:
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
2011-05-06 13:08:55 UTC (rev 7264)
+++
branches/Version-1_0-branch/booking/inc/class.socompleted_reservation_export_file.inc.php
2011-05-06 13:12:02 UTC (rev 7265)
@@ -9,7 +9,7 @@
$so_completed_reservation_export;
protected static $export_type_to_file_type_map = array(
- 'internal' => 'csv',
+ 'internal' => 'csv',
'external' => 'txt',
);
@@ -34,9 +34,26 @@
}
protected function file_type_for_export_type($export_type) {
- return
isset(self::$export_type_to_file_type_map[$export_type]) ?
-
self::$export_type_to_file_type_map[$export_type] :
- 'txt';
+ $config = CreateObject('phpgwapi.config','booking');
+ $config->read();
+
+ if ($export_type === 'internal') {
+ if ($config->config_data['internal_format'] == 'CSV')
+ {
+ return 'csv';
+ }
+ elseif ($config->config_data['internal_format'] == 'AGGRESSO')
+ {
+ return 'txt';
+ }
+ } elseif ($export_type === 'external'){
+ return 'txt';
+ } else {
+ return 'txt';
+ }
+# return
isset(self::$export_type_to_file_type_map[$export_type]) ?
+#
self::$export_type_to_file_type_map[$export_type] :
+# 'txt';
}
protected function get_available_export_types() {
@@ -193,4 +210,4 @@
}
} catch (booking_unattached_storage_object $e) { }
}
- }
\ No newline at end of file
+ }
Modified:
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
2011-05-06 13:08:55 UTC (rev 7264)
+++
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
2011-05-06 13:12:02 UTC (rev 7265)
@@ -186,8 +186,8 @@
)
);
}
- $data['filters'] = extract_values($_GET,
array("filter_to"));
-
+ $data['filters'] = extract_values($_GET, array("filter_to"));
+
$this->render_template('datatable', $data);
}
@@ -236,8 +236,9 @@
$this->db = $GLOBALS['phpgw']->db;
$exports = $this->bo->read();
array_walk($exports["results"], array($this,
"_add_links"), $this->module.".uicompleted_reservation_export.show");
+
foreach($exports["results"] as &$export) {
- $export = $this->bo->initialize_entity($export);
+ $export =
$this->bo->so->initialize_entity($export);
$this->add_default_display_data($export);
$sql = "SELECT account_lastname,
account_firstname FROM phpgw_accounts WHERE account_lid =
'".$export['created_by_name']."'";
@@ -246,7 +247,6 @@
$export['created_by_name'] =
$record['account_firstname']." ".$record['account_lastname'];
}
}
-
$results = $this->yui_results($exports);
return $results;
}
Modified: branches/Version-1_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-05-06
13:08:55 UTC (rev 7264)
+++ branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-05-06
13:12:02 UTC (rev 7265)
@@ -511,3 +511,6 @@
To cancel allocation use this link booking no For å slette
tildelingen bruk lenken
Show applications booking no Vis søknader
Show messages booking no Vis beskjeder
+Internal account booking no Intern kontering
+Internal customer output format booking no Intern kunde eksport
format
+Internal_account_helptext booking no Data som brukes for faktura
eksport av interne kunder
Modified:
branches/Version-1_0-branch/booking/templates/base/account_code_dimension.xsl
===================================================================
---
branches/Version-1_0-branch/booking/templates/base/account_code_dimension.xsl
2011-05-06 13:08:55 UTC (rev 7264)
+++
branches/Version-1_0-branch/booking/templates/base/account_code_dimension.xsl
2011-05-06 13:12:02 UTC (rev 7265)
@@ -69,6 +69,38 @@
</input>
</dd>
</dl>
+ <div class="clr"/>
+ <dl class="form">
+ <dt class="heading"><xsl:value-of select="php:function('lang',
'Internal account')"/></dt>
+ </dl>
+
+ <p><xsl:value-of select="php:function('lang',
'Internal_account_helptext')"/></p>
+
+ <dl class="form-col">
+ <dt><label for="field_organization_value"><xsl:value-of
select="php:function('lang', 'Organization number')"/></label></dt>
+ <dd>
+ <input id="field_organization_value"
name="organization_value" type="text">
+ <xsl:attribute
name="value"><xsl:value-of
select="config_data/organization_value"/></xsl:attribute>
+ </input>
+ </dd>
+ <dt><label for="field_internal_format"><xsl:value-of
select="php:function('lang', 'Internal customer output format')"/></label></dt>
+ <dd>
+ <select id="field_internal_format"
name="internal_format">
+ <option value="AGGRESSO">
+ <xsl:if test="config_data/internal_format='AGGRESSO'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ AGGRESSO
+ </option>
+ <option value="CSV">
+ <xsl:if test="config_data/internal_format='CSV'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ CSV
+ </option>
+ </select>
+ </dd>
+ </dl>
<div class="form-buttons">
<input type="submit">
<xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Save')"/></xsl:attribute>
Modified: branches/Version-1_0-branch/property/templates/base/entity.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/entity.xsl
2011-05-06 13:08:55 UTC (rev 7264)
+++ branches/Version-1_0-branch/property/templates/base/entity.xsl
2011-05-06 13:12:02 UTC (rev 7265)
@@ -299,19 +299,18 @@
</div>
</xsl:when>
</xsl:choose>
-
- <xsl:choose>
- <xsl:when test="mode = 'edit'">
- <table cellpadding="2"
cellspacing="2" width="80%" align="center">
- <tr height="50">
- <td
colspan="2" align = "center">
-
<xsl:apply-templates select="table_apply"/>
- </td>
- </tr>
- </table>
- </xsl:when>
- </xsl:choose>
</div>
+ <xsl:choose>
+ <xsl:when test="mode = 'edit'">
+ <table cellpadding="2"
cellspacing="2" width="80%" align="center">
+ <tr height="50">
+ <td colspan="2"
align = "center">
+
<xsl:apply-templates select="table_apply"/>
+ </td>
+ </tr>
+ </table>
+ </xsl:when>
+ </xsl:choose>
</form>
<xsl:choose>
<xsl:when test="value_id!=''">
Modified: branches/Version-1_0-branch/property/templates/base/location.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/location.xsl
2011-05-06 13:08:55 UTC (rev 7264)
+++ branches/Version-1_0-branch/property/templates/base/location.xsl
2011-05-06 13:12:02 UTC (rev 7265)
@@ -557,38 +557,35 @@
</div>
</xsl:when>
</xsl:choose>
-
- <table cellpadding="2" cellspacing="2"
width="80%" align="center">
-
- <tr height="50">
- <xsl:choose>
- <xsl:when
test="edit != ''">
- <td>
-
<xsl:variable name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
-
<input type="submit" name="save" value="{$lang_save}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_save_statustext"/>
-
</xsl:attribute>
-
</input>
- </td>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when
test="check_history != ''">
- <td>
-
<xsl:variable name="lang_history"><xsl:value-of
select="lang_history"/></xsl:variable>
-
<input type="submit" name="get_history" value="{$lang_history}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="lang_history_statustext"/>
-
</xsl:attribute>
-
</input>
- </td>
- </xsl:when>
- </xsl:choose>
- </tr>
- </table>
</div>
-
+ <table cellpadding="2" cellspacing="2"
width="80%" align="center">
+ <tr height="50">
+ <xsl:choose>
+ <xsl:when test="edit !=
''">
+ <td>
+
<xsl:variable name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
+ <input
type="submit" name="save" value="{$lang_save}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_save_statustext"/>
+
</xsl:attribute>
+ </input>
+ </td>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="check_history != ''">
+ <td>
+
<xsl:variable name="lang_history"><xsl:value-of
select="lang_history"/></xsl:variable>
+ <input
type="submit" name="get_history" value="{$lang_history}">
+
<xsl:attribute name="title">
+
<xsl:value-of select="lang_history_statustext"/>
+
</xsl:attribute>
+ </input>
+ </td>
+ </xsl:when>
+ </xsl:choose>
+ </tr>
+ </table>
</form>
<table>
<tr>
Modified: branches/Version-1_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tts.xsl 2011-05-06
13:08:55 UTC (rev 7264)
+++ branches/Version-1_0-branch/property/templates/base/tts.xsl 2011-05-06
13:12:02 UTC (rev 7265)
@@ -1360,33 +1360,23 @@
<div id="paging_1"></div>
<div id="datatable-container_1"></div>
</div>
-<table cellpadding="2" cellspacing="2" width="80%" align="center">
- <tr height="50">
- <td>
- <input type="hidden" id="save" name="values[save]"
value=""></input>
- <input type="button" name="save"
onClick="confirm_session('save');">
- <xsl:attribute name="value">
- <xsl:value-of
select="php:function('lang', 'save')" />
- </xsl:attribute>
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'save the ticket')" />
- </xsl:attribute>
- </input>
- </td>
-<!--
- <td>
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
- <input type="submit"
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return
true;">
- <xsl:attribute name="title">
- <xsl:value-of
select="php:function('lang', 'save the ticket')" />
- </xsl:attribute>
- </input>
- </td>
--->
- </tr>
- </table>
- </div>
</div>
+ <table cellpadding="2" cellspacing="2" width="80%" align="center">
+ <tr height="50">
+ <td>
+ <input type="hidden" id="save"
name="values[save]" value=""></input>
+ <input type="button" name="save"
onClick="confirm_session('save');">
+ <xsl:attribute name="value">
+ <xsl:value-of
select="php:function('lang', 'save')" />
+ </xsl:attribute>
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'save the ticket')" />
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </table>
+</div>
</form>
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7265] Merge 7260:7264 from trunk,
Sigurd Nes <=