[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11471] Merge 11465:11470 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11471] Merge 11465:11470 from trunk |
|
Date: |
Mon, 18 Nov 2013 10:33:08 +0000 |
Revision: 11471
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11471
Author: sigurdne
Date: 2013-11-18 10:33:08 +0000 (Mon, 18 Nov 2013)
Log Message:
-----------
Merge 11465:11470 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
branches/Version-1_0-branch/property/inc/class.soentity.inc.php
branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
branches/Version-1_0-branch/setup/inc/functions.inc.php
branches/Version-1_0-branch/setup/index.php
branches/Version-1_0-branch/setup/manageheader.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,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,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464
+
/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,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470
Modified: branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2013-11-18 09:22:51 UTC (rev 11470)
+++ branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2013-11-18 10:33:08 UTC (rev 11471)
@@ -1572,11 +1572,18 @@
$count_uicols_name=count($name);
+ $text_format = array();
$m=0;
for ($k=0;$k<$count_uicols_name;$k++)
{
if(!isset($input_type[$k]) ||
$input_type[$k]!='hidden')
{
+ if(preg_match('/^loc/i', $name[$k]))
+ {
+ $text_format[$m] = true;
+
//$objPHPExcel->getActiveSheet()->getStyle('B3:B7')->applyFromArray($styleArray);
+
+ }
$objPHPExcel->setActiveSheetIndex(0)->setCellValueByColumnAndRow($m, 1,
$descr[$k]);
$m++;
}
@@ -1608,8 +1615,14 @@
$rows = count($row);
for ($i=0; $i < $rows; $i++)
{
-
$objPHPExcel->setActiveSheetIndex(0)->setCellValueByColumnAndRow($i, $line,
$row[$i]);
- //
$objPHPExcel->setActiveSheetIndex(0)->setCellValue($col . $i, $row[$i] );
+ if(isset($text_format[$i]))
+ {
+
$objPHPExcel->setActiveSheetIndex(0)->setCellValueExplicitByColumnAndRow($i,
$line, $row[$i], PHPExcel_Cell_DataType::TYPE_STRING);
+ }
+ else
+ {
+
$objPHPExcel->setActiveSheetIndex(0)->setCellValueByColumnAndRow($i, $line,
$row[$i]);
+ }
}
$col++;
}
Modified:
branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
2013-11-18 09:22:51 UTC (rev 11470)
+++ branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
2013-11-18 10:33:08 UTC (rev 11471)
@@ -406,21 +406,21 @@
$entry['amount_operation']
= (int) str_replace(array(' ', ','),array('','.'),$entry['amount_operation']);
$entry['amount_potential_grants'] = (int)
str_replace(array(' ', ','),array('','.'),$entry['amount_potential_grants']);
$entry['import_type']
= (int) $entry['import_type'];
+ $entry['condition_degree']
= (int) $entry['condition_degree'];
}
+
unset($entry);
$custom = createObject('phpgwapi.custom_fields');
$attributes =
$custom->find('property','.project.request', 0, '','','',true, true);
-
-
$origin_id =
$GLOBALS['phpgw']->locations->get_id('property', '.project.condition_survey');
foreach ($import_data as $entry)
{
+ if( $entry['condition_degree'] > 0 &&
$entry['building_part'] && $entry['import_type'] > 0)
+ {
- if( ctype_digit($entry['condition_degree']) &&
$entry['condition_degree'] > 0 && $entry['building_part'] &&
(int)$entry['import_type'] > 0)
- {
$request = array();
if( $entry['amount_investment'] &&
!$entry['amount_operation'] )
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2013-11-18 09:22:51 UTC (rev 11470)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2013-11-18 10:33:08 UTC (rev 11471)
@@ -1645,7 +1645,7 @@
$values['user_id'] =
$this->db->f('user_id');
$values['entry_date'] =
$this->db->f('entry_date');
- $xmldata = $this->db->f('xml_representation');
+ $xmldata =
$this->db->f('xml_representation',true);
$xml = new DOMDocument('1.0', 'utf-8');
$xml->loadXML($xmldata);
Modified:
branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
2013-11-18 09:22:51 UTC (rev 11470)
+++ branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
2013-11-18 10:33:08 UTC (rev 11471)
@@ -992,6 +992,10 @@
$objPHPExcel->setActiveSheetIndex((int)$sheet_id);
$data =
$objPHPExcel->getActiveSheet()->toArray(null,true,true,true);
+
+ // $format =
$objPHPExcel->getActiveSheet()->getStyle('R13')->getNumberFormat()->getFormatCode();
+ // $value =
$objPHPExcel->getActiveSheet()->getCell('R13')->getCalculatedValue();
+
}
catch(Exception $e)
{
@@ -1069,7 +1073,6 @@
}
else if($data && $step == 4)
{
-// _debug_array($columns);
$rows = count($data)+1;
@@ -1083,7 +1086,7 @@
{
if($_value_key !=
'_skip_import_')
{
- $_result[$_value_key]
=trim($data[$i][$_row_key]);
+ $_result[$_value_key] =
$objPHPExcel->getActiveSheet()->getCell("{$_row_key}{$i}")->getCalculatedValue();
}
}
@@ -1107,7 +1110,6 @@
// $msg = "'{$cached_file}' contained " .
count($import_data) . " lines";
// phpgwapi_cache::message_set($msg, 'message');
-// _debug_array($import_data);die();
}
@@ -1150,7 +1152,6 @@
self::render_template_xsl(array('condition_survey_import'), $data);
-
}
Modified: branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2013-11-18 09:22:51 UTC (rev 11470)
+++ branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2013-11-18 10:33:08 UTC (rev 11471)
@@ -29,9 +29,17 @@
// Label on the import button. Changes as we step through the
import process.
protected $import_button_label;
+ protected $download_template_button_label;
protected $defalt_values;
+
+ private $valid_tables = array
+ (
+ 'fm_vendor',
+ 'fm_condition_survey'
+ );
+
public function __construct()
{
if ( !$GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin')
@@ -46,6 +54,11 @@
$this->account =
(int)$GLOBALS['phpgw_info']['user']['account_id'];
$this->db = & $GLOBALS['phpgw']->db;
$this->table = phpgw::get_var('table');
+
+ if($this->table && !in_array($this->table,
$this->valid_tables))
+ {
+ throw new Exception("Not a valid table:
{$this->table}");
+ }
}
@@ -58,7 +71,39 @@
{
// Set the submit button label to its initial state
$this->import_button_label = "Start import";
+ $this->download_template_button_label = 'Download
template';
+ $check_method = 0;
+ if($this->conv_type = phpgw::get_var('conv_type'))
+ {
+ $check_method ++;
+ }
+ if ($location_id = phpgw::get_var('location_id', 'int'))
+ {
+ $check_method ++;
+ }
+
+ if($table = phpgw::get_var('table'))
+ {
+ $check_method ++;
+ }
+
+ if($check_method > 1)
+ {
+ phpgwapi_cache::session_set('property',
'import_message', 'choose only one target!');
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction'=>'property.uiimport.index'));
+ }
+
+
+ phpgwapi_cache::session_set('property',
'import_settings', $_POST);
+
+ $download_template =
phpgw::get_var('download_template');
+
+ if($download_template)
+ {
+ $this->get_template($location_id);
+ }
+
// If the parameter 'importsubmit' exist (submit button
in import form), set path
if (phpgw::get_var("importsubmit"))
{
@@ -68,29 +113,7 @@
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction'=>'property.uiimport.index'));
}
- phpgwapi_cache::session_set('property',
'import_settings', $_POST);
- $check_method = 0;
- if($this->conv_type =
phpgw::get_var('conv_type'))
- {
- $check_method ++;
- }
- if ($location_id =
phpgw::get_var('location_id', 'int'))
- {
- $check_method ++;
- }
-
- if($table = phpgw::get_var('table'))
- {
- $check_method ++;
- }
-
- if($check_method > 1)
- {
- phpgwapi_cache::session_set('property',
'import_message', 'choose only one target!');
-
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction'=>'property.uiimport.index'));
- }
-
$start_time = time(); // Start time of import
$start = date("G:i:s",$start_time);
echo "<h3>Import started at: {$start}</h3>";
@@ -236,12 +259,8 @@
HTML;
}
- // $tables = $this->db->table_names();
- $tables = array
- (
- 'fm_vendor',
- 'fm_condition_survey'
- );
+ $tables = $this->valid_tables;
+
sort($tables);
$table_option = '<option value="">' .
lang('none selected') . '</option>' . "\n";
@@ -310,6 +329,9 @@
<input type="checkbox"
name="debug" id="debug" {$debug_checked} value ='1' />
</p>
<p>
+ <input type="submit"
name="download_template" value="{$this->download_template_button_label}" />
+ </p>
+ <p>
<input type="submit"
name="importsubmit" value="{$this->import_button_label}" />
</p>
</fieldset>
@@ -347,6 +369,117 @@
return $this->steps;
}
+ protected function get_template($location_id = 0)
+ {
+ $data = array();
+ $_fields = array();
+ if(!$location_id && $this->table)
+ {
+ $metadata = $this->db->metadata($this->table);
+
+ foreach ($metadata as $field => $info)
+ {
+ $_fields[$field] = true;
+ }
+
+ $sql = "SELECT * FROM {$this->table}";
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ while ($this->db->next_record())
+ {
+ $data[] = $this->db->Record;
+ }
+
+ }
+ else if($location_id && !$category =
execMethod('property.soadmin_entity.get_single_category', $location_id ))
+ {
+ throw new Exception("Not a valid location for
{$location_id}");
+ }
+ else if($location_id)
+ {
+ $entity_id = $category['entity_id'];
+ $cat_id = $category['id'];
+
+ if ($category['is_eav'])
+ {
+ $this->table = 'fm_bim_item';
+
+ $metadata =
$this->db->metadata($this->table);
+
+ foreach ($metadata as $field => $info)
+ {
+ if ($field ==
'xml_representation' || $field == 'guid')
+ {
+ continue;
+ }
+ $_fields[$field] = true;
+ }
+
+ $custom =
createObject('property.custom_fields');
+ $attributes =
$custom->find2($location_id, 0, '', 'ASC', 'attrib_sort', true, true);
+
+
+ $sql = "SELECT * FROM {$this->table}
WHERE location_id = $location_id ORDER BY id ASC";
+
$this->db->query($sql,__LINE__,__FILE__);
+
+ while ($this->db->next_record())
+ {
+ $_row_data = array();
+ foreach ($_fields as $_field =>
$dummy)
+ {
+ $_row_data[$_field] =
$this->db->f($_field,true);
+ }
+
+ $xmldata =
$this->db->f('xml_representation',true);
+ $xml = new DOMDocument('1.0',
'utf-8');
+ $xml->loadXML($xmldata);
+
+ foreach($attributes as
$attribute)
+ {
+
$_row_data[$attribute['column_name']] =
$xml->getElementsByTagName($attribute['column_name'])->item(0)->nodeValue;
+ }
+
+ $data[] = $_row_data;
+ }
+
+ foreach($attributes as $attribute)
+ {
+
$_fields[$attribute['column_name']] = true;
+ }
+ }
+ else
+ {
+ $this->table =
"fm_entity_{$category['entity_id']}_{$category['id']}";
+ $metadata =
$this->db->metadata($this->table);
+ foreach ($metadata as $field => $info)
+ {
+ $_fields[$field] = true;
+ }
+
+ $sql = "SELECT * FROM {$this->table}";
+
$this->db->query($sql,__LINE__,__FILE__);
+
+ while ($this->db->next_record())
+ {
+ $data[] = $this->db->Record;
+ }
+ }
+ }
+
+ $fields = array_keys($_fields);
+
+ if(phpgw::get_var('debug', 'bool'))
+ {
+ _debug_array($fields);
+ }
+ else
+ {
+ $bocommon = CreateObject('property.bocommon');
+ $bocommon->download($data, $fields, $fields);
+ $GLOBALS['phpgw']->common->phpgw_exit();
+ }
+ }
+
protected function import_data()
{
$metadata = array();
@@ -479,13 +612,13 @@
$rows = count($data)+1;
- for ($i=$start; $i<$rows; $i++ )
+ for ($row=$start; $row<$rows; $row++ )
{
$_result = array();
$j=0;
- foreach($data[$i] as $key => $value)
+ foreach($data[$row] as $key => $value)
{
- $_result[$j] = trim($value);
+ $_result[] =
$objPHPExcel->getActiveSheet()->getCellByColumnAndRow($j,$row)->getCalculatedValue();
$j++;
}
$result[] = $_result;
Modified: branches/Version-1_0-branch/setup/inc/functions.inc.php
===================================================================
--- branches/Version-1_0-branch/setup/inc/functions.inc.php 2013-11-18
09:22:51 UTC (rev 11470)
+++ branches/Version-1_0-branch/setup/inc/functions.inc.php 2013-11-18
10:33:08 UTC (rev 11471)
@@ -32,12 +32,17 @@
require_once('../header.inc.php');
}
- if ( !function_exists('filter_var') || !function_exists('json_encode')
) // filter_var() and json_encode are only available in PHP 5.2+
+ if (version_compare(phpversion(), '5.2.0', '<'))
{
die('<h1>You appear to be using PHP ' . PHP_VERSION . "
phpGroupWare requires 5.2.0 or later <br>\n"
. 'Please contact your System Administrator</h1>');
}
+ if ( !function_exists('json_encode') ) // Some distributions have
removed the standard JSON extension as of PHP 5.5rc2 due to a license conflict
+ {
+ die('<h1>You have to install php5-json</h1>');
+ }
+
/* If we included the header.inc.php, but it is somehow broken, cover
ourselves... */
if ( !defined('PHPGW_SERVER_ROOT') )
{
Modified: branches/Version-1_0-branch/setup/index.php
===================================================================
--- branches/Version-1_0-branch/setup/index.php 2013-11-18 09:22:51 UTC (rev
11470)
+++ branches/Version-1_0-branch/setup/index.php 2013-11-18 10:33:08 UTC (rev
11471)
@@ -147,7 +147,7 @@
$setup_tpl->set_var('subaction', $subaction);
// Old PHP
- if ( version_compare('5.2.0', phpversion()) === 1 )
+ if (version_compare(phpversion(), '5.2.0', '<'))
{
$GLOBALS['phpgw_setup']->html->show_header($GLOBALS['phpgw_info']['setup']['header_msg'],True);
$GLOBALS['phpgw_setup']->html->show_alert_msg('Error',
Modified: branches/Version-1_0-branch/setup/manageheader.php
===================================================================
--- branches/Version-1_0-branch/setup/manageheader.php 2013-11-18 09:22:51 UTC
(rev 11470)
+++ branches/Version-1_0-branch/setup/manageheader.php 2013-11-18 10:33:08 UTC
(rev 11471)
@@ -272,6 +272,14 @@
}
+ if ( !function_exists('json_encode') ) // Some
distributions have removed the standard JSON extension as of PHP 5.5rc2 due to
a license conflict
+ {
+ $detected .= '<b><p align="center" class="msg">'
+ . "You have to install php5-json\n"
+ .
'</p></b><td></tr></table></body></html>';
+ die($detected);
+ }
+
$get_max_value_length = '';
if(ini_get('suhosin.get.max_value_length'))
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11471] Merge 11465:11470 from trunk,
Sigurd Nes <=