[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10591] Merge 10585:10590 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10591] Merge 10585:10590 from trunk |
|
Date: |
Wed, 12 Dec 2012 14:52:36 +0000 |
Revision: 10591
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10591
Author: sigurdne
Date: 2012-12-12 14:52:35 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Merge 10585:10590 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/js/yahoo/common.js
branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable.js
branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
branches/Version-1_0-branch/property/inc/hook_config.inc.php
branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
branches/Version-1_0-branch/property/templates/base/config.tpl
branches/Version-1_0-branch/property/templates/base/css/base.css
Added Paths:
-----------
branches/Version-1_0-branch/property/js/portico/condition_survey.js
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
+
/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
Modified: branches/Version-1_0-branch/phpgwapi/js/yahoo/common.js
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/yahoo/common.js 2012-12-12
14:50:37 UTC (rev 10590)
+++ branches/Version-1_0-branch/phpgwapi/js/yahoo/common.js 2012-12-12
14:52:35 UTC (rev 10591)
@@ -15,16 +15,14 @@
return config;
};
-/*
- YAHOO.portico.FormatterAmount0 = function(elCell, oRecord, oColumn,
oData)
- {
-alert('hei');
-// var amount = YAHOO.util.Number.format(oData, {decimalPlaces:0,
decimalSeparator:",", thousandsSeparator:" "});
- elCell.innerHTML = "<div align=\"right\">ee"+amount+"</div>";
- }
-*/
+YAHOO.portico.FormatterAmount0 = function(elCell, oRecord, oColumn, oData)
+{
+ var amount = YAHOO.util.Number.format(oData, {decimalPlaces:0,
decimalSeparator:",", thousandsSeparator:" "});
+ elCell.innerHTML = "<div class='nowrap'
align=\"right\">"+amount+"</div>";
+}
+
/** Hook widgets to translations **/
YAHOO.portico.js_alias_method_chain(YAHOO.widget.Calendar, 'init', 'i18n',
function(id, container, config) {
YAHOO.portico.lang('Calendar', config);
@@ -209,7 +207,46 @@
return pag;
};
+YAHOO.portico.getTotalSum = function(name_column,round,paginator,datatable)
+{
+ if(!paginator.getPageRecords())
+ {
+ return '0,00';
+ }
+ begin = end = 0;
+ end = datatable.getRecordSet().getLength();
+ tmp_sum = 0;
+ for(i = begin; i < end; i++)
+ {
+ tmp_sum = tmp_sum +
parseFloat(datatable.getRecordSet().getRecords(0)[i].getData(name_column));
+ }
+ return tmp_sum = YAHOO.util.Number.format(tmp_sum,
{decimalPlaces:round, decimalSeparator:",", thousandsSeparator:" "});
+}
+
+ YAHOO.portico.td_sum = function(sum)
+ {
+ newTD = document.createElement('td');
+ newTD.colSpan = 1;
+ newTD.style.borderTop="1px solid #000000";
+ newTD.style.fontWeight = 'bolder';
+ newTD.style.textAlign = 'right';
+ newTD.style.paddingRight = '0.8em';
+ newTD.style.whiteSpace = 'nowrap';
+ newTD.appendChild(document.createTextNode(sum));
+ newTR.appendChild(newTD);
+ }
+
+ YAHOO.portico.td_empty = function(colspan)
+ {
+ newTD = document.createElement('td');
+ newTD.colSpan = colspan;
+ newTD.style.borderTop="1px solid #000000";
+ newTD.appendChild(document.createTextNode(''));
+ newTR.appendChild(newTD);
+ }
+
+
YAHOO.portico.updateinlineTableHelper = function(container, requestUrl)
{
@@ -363,11 +400,15 @@
var myDataTable = new YAHOO.widget.DataTable(dataTableContainer,
colDefs, myDataSource, options);
+ myDataTable.subscribe("rowMouseoverEvent",
myDataTable.onEventHighlightRow);
+ myDataTable.subscribe("rowMouseoutEvent",
myDataTable.onEventUnhighlightRow);
+
myDataTable.handleDataReturnPayload = function(oRequest, oResponse,
oPayload) {
oPayload.totalRecords = oResponse.meta.totalResultsAvailable;
return oPayload;
}
+
myDataTable.doBeforeLoadData = function(nothing, oResponse, oPayload) {
oPayload.totalRecords = oResponse.meta.totalResultsAvailable;
Modified: branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable.js
===================================================================
--- branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable.js 2012-12-12
14:50:37 UTC (rev 10590)
+++ branches/Version-1_0-branch/phpgwapi/js/yahoo/datatable.js 2012-12-12
14:52:35 UTC (rev 10591)
@@ -86,6 +86,7 @@
sortDir: 'ResultSet.sortDir'
}
};
+
var myDataTable = new YAHOO.widget.DataTable("datatable-container",
YAHOO.portico.columnDefs, myDataSource, {
paginator: pag,
Modified: branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
2012-12-12 14:50:37 UTC (rev 10590)
+++ branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
2012-12-12 14:52:35 UTC (rev 10591)
@@ -250,11 +250,13 @@
{
$time = time();
- if ( date('j',$time) < 7 ) //Day of the month without
leading zeros
+ $_lag = date('n') == 1 ? 12 : 7;
+
+ if ( date('j',$time) < $_lag ) //Day of the month
without leading zeros
{
- $time = $time - (7 * 24 * 3600);
+ $time = $time - ($_lag * 24 * 3600);
}
-
+
$month = date('n', $time);
$year = date('Y',$time);
$check_year = true;
@@ -275,10 +277,24 @@
$check_year = false;
}
}
+
+ if(count($period_list) == 1) //last month in year
+ {
+ $year++;
+ $period = sprintf("%s%02d",$year,1);
+ $period_list[] = array
+ (
+ 'id' => $period,
+ 'name' => $period
+ );
+
+ }
+
foreach ($period_list as &$_period)
{
$_period['selected'] = $_period['id'] ==
$selected ? 1 : 0;
}
+
return $period_list;
}
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
2012-12-12 14:50:37 UTC (rev 10590)
+++ branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
2012-12-12 14:52:35 UTC (rev 10591)
@@ -305,21 +305,73 @@
$sorequest = CreateObject('property.sorequest');
-//_debug_array($survey);
+ $this->_db->transaction_begin();
- $this->_db->transaction_begin();
+ $config = CreateObject('phpgwapi.config','property');
+ $config->read();
+
+
if(!isset($config->config_data['condition_survey_import_cat']) ||
!is_array($config->config_data['condition_survey_import_cat']))
+ {
+ throw new
Exception('property_socondition_survey::import - condition survey import
categories not configured');
+ }
+
+
+
if(!isset($config->config_data['condition_survey_initial_status']) ||
!$config->config_data['condition_survey_initial_status'])
+ {
+ throw new
Exception('property_socondition_survey::import - condition survey initial
status not configured');
+ }
+
+ $cats = CreateObject('phpgwapi.categories', -1,
'property', '.project');
+ $cats->supress_info = true;
+ $categories = $cats->return_sorted_array(0, false, '',
'', '', $globals = true, '', $use_acl = false);
+
/*
- kategorier:
- 13 => D - Drift
- 202 => Kombinasjon
- 14 => U - Investering
- 12 => V - Planlagt
+ $cats_candidates = array
+ (
+ 1 => 'Investment',
+ 2 => 'Operation',
+ 3 => 'Combined::Investment/Operation',
+ 4 => 'Special'
+ );
+
*/
foreach ($import_data as $entry)
{
+
if( ctype_digit($entry['condition_degree']) &&
$entry['condition_degree'] > 0 && strlen($entry['building_part']) > 2)
{
$request = array();
+
+ if( $entry['percentage_investment'] ==
100)
+ {
+
if(isset($config->config_data['condition_survey_import_cat'][1]))
+ {
+ $request['cat_id'] =
(int)$config->config_data['condition_survey_import_cat'][1];
+ }
+ }
+ else
if(!$entry['percentage_investment'])
+ {
+
if(isset($config->config_data['condition_survey_import_cat'][2]))
+ {
+ $request['cat_id'] =
(int)$config->config_data['condition_survey_import_cat'][2];
+ }
+ }
+ else if($entry['percentage_investment']
&& $entry['percentage_investment'] < 100)
+ {
+
if(isset($config->config_data['condition_survey_import_cat'][3]))
+ {
+ $request['cat_id'] =
(int)$config->config_data['condition_survey_import_cat'][3];
+ }
+ }
+
+ if(!isset($request['cat_id']) ||
!$request['cat_id'])
+ {
+ $request['cat_id'] =
(int)$categories[0]['id'];
+ }
+
+
$this->_check_building_part($entry['building_part']);
+
+
$request['condition_survey_id'] =
$survey['id'];
$request['street_name']
= $location_data['street_name'];
$request['street_number']
= $location_data['street_number'];
@@ -329,10 +381,9 @@
$request['origin_item_id']
= (int)$survey['id'];
$request['title']
= substr($entry['title'], 0, 255);
$request['descr']
= $entry['descr'];
- $request['cat_id']
= 13; //???? FIXME
$request['building_part']
= $entry['building_part'];
$request['coordinator']
= $survey['coordinator_id'];
- $request['status']
= 'registrert';//???? FIXME
+ $request['status']
= $config->config_data['condition_survey_initial_status'];
$request['budget']
= $entry['amount'];
$request['planning_date']
= mktime(13,0,0,7,1, $entry['due_year']?$entry['due_year']:date('Y'));
$request['planning_value']
= $entry['amount'];
@@ -346,8 +397,20 @@
'probability' =>
$entry['probability']
)
);
+
//_debug_array($request);
$sorequest->add($request,
$values_attribute = array());
+ if($entry['amount_extra'] > 0)
+ {
+
if(isset($config->config_data['condition_survey_import_cat'][4]))
+ {
+ $request['cat_id'] =
(int)$config->config_data['condition_survey_import_cat'][4];
+ }
+
+ $request['planning_value']
=$entry['amount_extra'];
+ $request['cat_id']
= 13; //???? FIXME
+ $sorequest->add($request,
$values_attribute = array());
+ }
}
}
// die();
@@ -355,6 +418,17 @@
$this->_db->transaction_commit();
}
+ private function _check_building_part($id)
+ {
+ $sql = "SELECT id FROM fm_building_part WHERE id =
'{$id}'";
+ $this->_db->query($sql,__LINE__,__FILE__);
+ if(!$this->_db->next_record())
+ {
+ $sql = "INSERT INTO fm_building_part (id,
descr) VALUES ('{$id}', '{$id}::__')";
+ $this->_db->query($sql,__LINE__,__FILE__);
+ }
+ }
+
public function get_summation($id)
{
$table = 'fm_request';
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
2012-12-12 14:50:37 UTC (rev 10590)
+++ branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
2012-12-12 14:52:35 UTC (rev 10591)
@@ -351,7 +351,7 @@
$file_def = array
(
array('key' =>
'file_name','label'=>lang('Filename'),'sortable'=>false,'resizeable'=>true),
- array('key' =>
'delete_file','label'=>lang('Delete
file'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterCenter'),
+ array('key' =>
'delete_file','label'=>lang('Delete
file'),'sortable'=>false,'resizeable'=>true),
);
@@ -360,7 +360,7 @@
(
'container' =>
'datatable-container_0',
'requestUrl' =>
json_encode(self::link(array('menuaction' =>
'property.uicondition_survey.get_files', 'id' =>
$id,'phpgw_return_as'=>'json'))),
- 'ColumnDefs' => json_encode($file_def),
+ 'ColumnDefs' => $file_def,
);
@@ -378,14 +378,14 @@
(
'container' =>
'datatable-container_1',
'requestUrl' =>
json_encode(self::link(array('menuaction' =>
'property.uicondition_survey.get_related', 'id' =>
$id,'phpgw_return_as'=>'json'))),
- 'ColumnDefs' => json_encode($related_def)
+ 'ColumnDefs' => $related_def
);
$summation_def = array
(
array('key' =>
'building_part','label'=>lang('building
part'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'category','label'=>lang('category'),'sortable'=>true,'resizeable'=>true),
- array('key' => 'period_1','label'=>lang('year')
. ':: < 1'
,'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.portico.formatLink'),
+ array('key' => 'period_1','label'=>lang('year')
. ':: < 1'
,'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
array('key' => 'period_2','label'=>lang('year')
. ':: 1 - 5'
,'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
array('key' => 'period_3','label'=>lang('year')
. ':: 6 - 10'
,'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
array('key' => 'period_4','label'=>lang('year')
. ':: 11 - 15'
,'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
@@ -398,7 +398,7 @@
(
'container' =>
'datatable-container_2',
'requestUrl' =>
json_encode(self::link(array('menuaction' =>
'property.uicondition_survey.get_summation', 'id' =>
$id,'phpgw_return_as'=>'json'))),
- 'ColumnDefs' => json_encode($summation_def)
+ 'ColumnDefs' => $summation_def
);
$data = array
@@ -426,6 +426,8 @@
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yui3/gallery-formvalidator/validatorCss.css');
}
+ self::add_javascript('property', 'portico',
'condition_survey.js');
+
self::add_javascript('phpgwapi', 'tinybox2',
'packed.js');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
@@ -956,6 +958,7 @@
'due_year'
=> 'År (innen)',
'percentage_investment' => 'Andel %
aktivering (U)',
'amount'
=> 'Kalkyle netto totalt (VU)',
+ 'amount_extra' =>
'Merkostnad ENØK (U)',
);
phpgw::import_class('phpgwapi.sbox');
Modified: branches/Version-1_0-branch/property/inc/hook_config.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/hook_config.inc.php
2012-12-12 14:50:37 UTC (rev 10590)
+++ branches/Version-1_0-branch/property/inc/hook_config.inc.php
2012-12-12 14:52:35 UTC (rev 10591)
@@ -277,4 +277,88 @@
HTML;
}
return $out;
+
}
+ /**
+ * Get HTML listboks with categories that are candidates for condition
survey import categories
+ *
+ * @param $config
+ * @return string options for selectbox
+ */
+ function condition_survey_import_cat($config)
+ {
+ $filters = array
+ (
+ 1 => 'Investment',
+ 2 => 'Operation',
+ 3 => 'Combined::Investment/Operation',
+ 4 => 'Special'
+ );
+
+ $cats = CreateObject('phpgwapi.categories', -1, 'property',
'.project');
+ $cats->supress_info = true;
+ $values = $cats->return_sorted_array(0, false, '', '', '',
$globals = true, '', $use_acl = false);
+
+ $filter_assigned =
isset($config['condition_survey_import_cat']) ?
$config['condition_survey_import_cat'] : array();
+
+ $out = '';
+ foreach ( $filters as $filter_key => $filter_name)
+ {
+ $out .= <<<HTML
+ <tr><td><label>{$filter_name}</label></td><td><select
name="newsettings[condition_survey_import_cat][{$filter_key}]">
+HTML;
+ $out .= '<option value="">' . lang('none selected') .
'</option>' . "\n";
+ foreach ( $values as $key => $category)
+ {
+ if(! $category['active'])
+ {
+ continue;
+ }
+
+ $selected = '';
+ if ( isset($filter_assigned[$filter_key]) &&
$filter_assigned[$filter_key] == $category['id'])
+ {
+ $selected = 'selected = "selected"';
+ }
+
+ $out .= <<<HTML
+ <option value='{$category['id']}'{$selected}
title = '{$category['description']}'>{$category['name']}</option>
+HTML;
+ }
+
+ $out .= <<<HTML
+ </select></td></tr>
+HTML;
+ }
+ return $out;
+ }
+
+ /**
+ * Get HTML listbox with initial status that are to be set when
condition survey are imported
+ *
+ * @param $config
+ * @return string HTML listboxes to be placed in a table
+ */
+ function condition_survey_initial_status($config)
+ {
+ $status_entries =
execMethod('property.sorequest.select_status_list');
+
+ $status_assigned =
isset($config['condition_survey_initial_status']) ?
$config['condition_survey_initial_status'] : array();
+
+ $out = '<option value="">' . lang('none selected') .
'</option>' . "\n";
+ foreach ( $status_entries as $status)
+ {
+ $selected = '';
+ if ( $status_assigned == $status['id'])
+ {
+ $selected = 'selected = "selected"';
+ }
+
+ $out .= <<<HTML
+ <option
value='{$status['id']}'{$selected}>{$status['name']}</option>
+HTML;
+ }
+
+ return $out;
+ }
+
Copied: branches/Version-1_0-branch/property/js/portico/condition_survey.js
(from rev 10590, trunk/property/js/portico/condition_survey.js)
===================================================================
--- branches/Version-1_0-branch/property/js/portico/condition_survey.js
(rev 0)
+++ branches/Version-1_0-branch/property/js/portico/condition_survey.js
2012-12-12 14:52:35 UTC (rev 10591)
@@ -0,0 +1,42 @@
+
+
+/********************************************************************************/
+ addFooterDatatable2 = function(paginator,datatable)
+ {
+ //call YAHOO.portico.getTotalSum(name of column) in property.js
+ tmp_sum1 =
YAHOO.portico.getTotalSum('period_1',0,paginator,datatable);
+ tmp_sum2 =
YAHOO.portico.getTotalSum('period_2',0,paginator,datatable);
+ tmp_sum3 =
YAHOO.portico.getTotalSum('period_3',0,paginator,datatable);
+ tmp_sum4 =
YAHOO.portico.getTotalSum('period_4',0,paginator,datatable);
+ tmp_sum5 =
YAHOO.portico.getTotalSum('period_5',0,paginator,datatable);
+ tmp_sum6 =
YAHOO.portico.getTotalSum('period_6',0,paginator,datatable);
+ tmp_sum7 =
YAHOO.portico.getTotalSum('sum',0,paginator,datatable);
+
+ if(typeof(tableYUI0)=='undefined')
+ {
+ tableYUI0 =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[2].parentNode;
+ tableYUI0.setAttribute("id","tableYUI0");
+ }
+ else
+ {
+ tableYUI0.deleteTFoot();
+ }
+
+ //Create ROW
+ newTR = document.createElement('tr');
+
+ YAHOO.portico.td_empty(1);
+ YAHOO.portico.td_sum('Sum');
+ YAHOO.portico.td_sum(tmp_sum1);
+ YAHOO.portico.td_sum(tmp_sum2);
+ YAHOO.portico.td_sum(tmp_sum3);
+ YAHOO.portico.td_sum(tmp_sum4);
+ YAHOO.portico.td_sum(tmp_sum5);
+ YAHOO.portico.td_sum(tmp_sum6);
+ YAHOO.portico.td_sum(tmp_sum7);
+
+ myfoot = tableYUI0.createTFoot();
+ myfoot.setAttribute("id","myfoot");
+ myfoot.appendChild(newTR);
+ }
+
Modified:
branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
2012-12-12 14:50:37 UTC (rev 10590)
+++ branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
2012-12-12 14:52:35 UTC (rev 10591)
@@ -1,5 +1,22 @@
<!-- $Id$ -->
+<func:function name="phpgw:conditional">
+ <xsl:param name="test"/>
+ <xsl:param name="true"/>
+ <xsl:param name="false"/>
+
+ <func:result>
+ <xsl:choose>
+ <xsl:when test="$test">
+ <xsl:value-of select="$true"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$false"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </func:result>
+</func:function>
+
<!-- add / edit -->
<xsl:template match="data" xmlns:formvalidator="http://www.w3.org/TR/html4/";
xmlns:php="http://php.net/xsl";>
<xsl:call-template name="yui_phpgw_i18n"/>
@@ -336,12 +353,45 @@
<xsl:template name="datasource-definition">
<script>
- YAHOO.util.Event.onDOMReady(function(){
-
- <xsl:for-each select="datatable_def">
- YAHOO.portico.inlineTableHelper("<xsl:value-of
select="container"/>", <xsl:value-of select="requestUrl"/>, <xsl:value-of
select="ColumnDefs"/>);
+ var columnDefs = [];
+ YAHOO.util.Event.onDOMReady(function(){
+ <xsl:for-each select="datatable_def">
+ columnDefs = [
+ <xsl:for-each select="ColumnDefs">
+ {
+ resizeable: true,
+ key: "<xsl:value-of
select="key"/>",
+ <xsl:if test="label">
+ label: "<xsl:value-of
select="label"/>",
+ </xsl:if>
+ sortable: <xsl:value-of
select="phpgw:conditional(not(sortable = 0), 'true', 'false')"/>,
+ <xsl:if test="hidden">
+ hidden: true,
+ </xsl:if>
+ <xsl:if test="formatter">
+ formatter: <xsl:value-of
select="formatter"/>,
+ </xsl:if>
+ <xsl:if test="editor">
+ editor: <xsl:value-of
select="editor"/>,
+ </xsl:if>
+ className: "<xsl:value-of
select="className"/>"
+ }<xsl:value-of
select="phpgw:conditional(not(position() = last()), ',', '')"/>
+ </xsl:for-each>
+ ];
+
+ YAHOO.portico.inlineTableHelper("<xsl:value-of
select="container"/>", <xsl:value-of select="requestUrl"/>, columnDefs);
</xsl:for-each>
+ var PaginatorName2 = 'paginator_containerdatatable-container_2';
+ var DatatableName2 = 'datatable_containerdatatable-container_2';
+
+ var myPaginator_2 = YAHOO.portico.Paginator[PaginatorName2];
+ var myDataTable_2 = YAHOO.portico.DataTable[DatatableName2];
+
+ myDataTable_2.subscribe("renderEvent", function()
+ {
+ addFooterDatatable2(myPaginator_2,myDataTable_2);
+ });
});
</script>
Modified: branches/Version-1_0-branch/property/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/config.tpl
2012-12-12 14:50:37 UTC (rev 10590)
+++ branches/Version-1_0-branch/property/templates/base/config.tpl
2012-12-12 14:52:35 UTC (rev 10591)
@@ -479,15 +479,31 @@
<tr class="row_off">
<td>{lang_filter_buildingpart}:</td>
<td>
- <!--to be able to blank the setting - need an
empty value
- <input type = 'hidden'
name="newsettings[list_location_level][]" value="">-->
- <table>
- {hook_filter_buildingpart}
- </table>
+ <table>
+ {hook_filter_buildingpart}
+ </table>
</td>
</tr>
+ <tr class="row_on">
+ <td>{lang_condition_survey_import_category}:</td>
+ <td>
+ <table>
+ {hook_condition_survey_import_cat}
+ </table>
+ </td>
+ </tr>
+ <tr class="row_off">
+
<td>{lang_initial_status_that_are_to_be_set_when_condition_survey_are_imported}:</td>
+ <td>
+ <select
name="newsettings[condition_survey_initial_status]">
+ {hook_condition_survey_initial_status}
+ </select>
+ </td>
+ </tr>
+
+
<!--
groupnotification
-->
Modified: branches/Version-1_0-branch/property/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/property/templates/base/css/base.css
2012-12-12 14:50:37 UTC (rev 10590)
+++ branches/Version-1_0-branch/property/templates/base/css/base.css
2012-12-12 14:52:35 UTC (rev 10591)
@@ -366,6 +366,10 @@
white-space: nowrap;
}
+div.nowrap {
+ white-space: nowrap;
+}
+
.date-container .close-btn {
display: block;
float: right;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10591] Merge 10585:10590 from trunk,
Sigurd Nes <=