[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10529] Merge 10524:10528 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10529] Merge 10524:10528 from trunk |
|
Date: |
Thu, 22 Nov 2012 13:15:59 +0000 |
Revision: 10529
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10529
Author: sigurdne
Date: 2012-11-22 13:15:58 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Merge 10524:10528 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
branches/Version-1_0-branch/property/inc/class.uientity.inc.php
branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/js/yahoo/lookup.entity.index.js
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
branches/Version-1_0-branch/property/templates/base/entity.xsl
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
+
/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
Modified: branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2012-11-21 13:32:45 UTC (rev 10528)
+++ branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2012-11-22 13:15:58 UTC (rev 10529)
@@ -723,7 +723,8 @@
{
$tabs = array();
- if($activity_id > 0){
+ if($activity_id > 0)
+ {
$activity = $this->so->get_single($activity_id);
@@ -731,13 +732,15 @@
array(
'label' => "1: " .
lang('Activity details'),
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'logistic.uiactivity.view',
-
'id' => $activity->get_id()))
+
'id' => $activity->get_id()))
), array(
'label' => "2: " .
lang('Requirement allocation'),
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'logistic.uiactivity.view_resource_allocation',
-
'activity_id' => $activity->get_id()))
+
'activity_id' => $activity->get_id()))
));
- }else{
+ }
+ else
+ {
$tabs = array(
array(
'label' => "1: " .
lang('Activity details')
Modified: branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2012-11-21 13:32:45 UTC (rev 10528)
+++ branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2012-11-22 13:15:58 UTC (rev 10529)
@@ -2007,7 +2007,7 @@
* @param array $insert_record array containing fields to
collect from post
* @return updated values
*/
- function collect_locationdata($values = '',$insert_record =
array())
+ function collect_locationdata($values = array(),$insert_record
= array())
{
//_debug_array($insert_record);die();
if($insert_record)
@@ -2024,7 +2024,7 @@
{
foreach ($insert_record['extra'] as
$key => $column)
{
- if(isset($_POST[$key]))
+ if(isset($_POST[$key]) &&
$_POST[$key])
{
$values['extra'][$column] = phpgw::get_var($key, 'string', 'POST');
}
Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2012-11-21 13:32:45 UTC (rev 10528)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2012-11-22 13:15:58 UTC (rev 10529)
@@ -791,14 +791,35 @@
if(isset($ticket['origin_id']) && $ticket['origin_id']
&& isset($ticket['origin_item_id']) && $ticket['origin_item_id'])
{
$interlink_data = array
- (
- 'location1_id' =>
$ticket['origin_id'],
- 'location1_item_id' =>
$ticket['origin_item_id'],
- 'location2_id' =>
$GLOBALS['phpgw']->locations->get_id('property', '.ticket'),
- 'location2_item_id' => $id,
- 'account_id' =>
$this->account
- );
+ (
+ 'location1_id' =>
$ticket['origin_id'],
+ 'location1_item_id' =>
$ticket['origin_item_id'],
+ 'location2_id' =>
$GLOBALS['phpgw']->locations->get_id('property', '.ticket'),
+ 'location2_item_id' => $id,
+ 'account_id' =>
$this->account
+ );
+ }
+ else if(isset($ticket['extra']) &&
is_array($ticket['extra']) && isset($ticket['extra']['p_num']) &&
$ticket['extra']['p_num'])
+ {
+ $ticket['origin_id'] =
$GLOBALS['phpgw']->locations->get_id('property',
".entity.{$ticket['extra']['p_entity_id']}.{$ticket['extra']['p_cat_id']}");
+
+ $this->db->query('SELECT prefix FROM
fm_entity_category WHERE entity_id = '. (int)$ticket['extra']['p_entity_id'] .
' AND id = ' . (int)$ticket['extra']['p_cat_id']);
+ $this->db->next_record();
+ $prefix = $this->db->f('prefix');
+ $ticket['origin_item_id'] = (int)
ltrim($ticket['extra']['p_num'], $prefix);
+
+ $interlink_data = array
+ (
+ 'location1_id' =>
$ticket['origin_id'],
+ 'location1_item_id' =>
$ticket['origin_item_id'],
+ 'location2_id' =>
$GLOBALS['phpgw']->locations->get_id('property', '.ticket'),
+ 'location2_item_id' => $id,
+ 'account_id' =>
$this->account
+ );
+ }
+ if($interlink_data)
+ {
$interlink =
CreateObject('property.interlink');
$interlink->add($interlink_data,$this->db);
}
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-11-21 13:32:45 UTC (rev 10528)
+++ branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
2012-11-22 13:15:58 UTC (rev 10529)
@@ -65,6 +65,12 @@
public function index()
{
+ if(!$this->acl_read)
+ {
+ $this->bocommon->no_access();
+ return;
+ }
+
if (phpgw::get_var('phpgw_return_as') == 'json')
{
return $this->query();
@@ -267,22 +273,48 @@
$values = array();
+ phpgwapi_yui::tabview_setup('survey_edit_tabview');
+ $tabs = array();
+ $tabs['generic'] = array('label' =>
lang('generic'), 'link' => '#generic');
+ $active_tab = 'generic';
+ $tabs['documents'] = array('label' =>
lang('documents'), 'link' => null);
+ $tabs['import'] = array('label' => lang('import'),
'link' => null);
+
+ $tabs['documents']['link'] = '#documents';
+ $tabs['import']['link'] = '#import';
+
if ($id)
{
+
$values = $this->so->read_single( array('id' =>
$id, 'view' => $mode == 'view') );
}
+
$categories =
$this->_get_categories($survey['category']);
+ $bolocation = CreateObject('property.bolocation');
+ $location_data = $bolocation->initiate_ui_location(array
+ (
+ 'values' =>
$values['location_data'],
+ 'type_id' => 2,
+ 'no_link' => $_no_link, //
disable lookup links for location type less than type_id
+ 'lookup_type' => $mode == 'edit' ?
'form' : 'view',
+ 'tenant' => false,
+ 'lookup_entity' => array(),
+ 'entity_data' =>
isset($values['p'])?$values['p']:''
+ ));
+
+
$data = array
(
- 'survey' => $values,
- 'categories' => array('options' =>
$categories),
- 'status_list' => array('options' =>
execMethod('property.bogeneric.get_list',array('type' =>
'condition_survey_status', 'selected' => $values['status_id'], 'add_empty' =>
true))),
- 'editable' => $mode == 'edit'
+ 'survey' => $values,
+ 'categories' => array('options' =>
$categories),
+ 'status_list' => array('options' =>
execMethod('property.bogeneric.get_list',array('type' =>
'condition_survey_status', 'selected' => $values['status_id'], 'add_empty' =>
true))),
+ 'editable' => $mode ==
'edit',
+ 'tabs' =>
phpgwapi_yui::tabview_generate($tabs, $active_tab),
+ 'location_data' => $location_data,
);
-// $this->use_yui_editor(array('description'));
$GLOBALS['phpgw']->jqcal->add_listener('report_date');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . '::' . lang('condition survey');
Modified: branches/Version-1_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2012-11-21 13:32:45 UTC (rev 10528)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2012-11-22 13:15:58 UTC (rev 10529)
@@ -1969,7 +1969,7 @@
}
}
- $tabs['related'] = array('label' =>
lang('related'), 'link' => '#related');
+ $tabs['related'] = array('label' =>
lang('log'), 'link' => '#related');
$_target = array();
if(isset($values['target']) &&
$values['target'])
{
Modified: branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
2012-11-21 13:32:45 UTC (rev 10528)
+++ branches/Version-1_0-branch/property/inc/class.uilookup.inc.php
2012-11-22 13:15:58 UTC (rev 10529)
@@ -1977,12 +1977,24 @@
(
array
( //boton
CATEGORY
+
+ 'id' =>
'sel_cat_id',
+ 'name'
=> 'cat_id',
+ 'value'
=> lang('Category'),
+ 'type'
=> 'select',
+ 'style'
=> 'filter',
+
'values' => $values_combo_box[0],
+
'onchange'=> 'onChangeSelect("cat_id");',
+
'tab_index' => 1
+
+/*
'id' =>
'btn_cat_id',
'name'
=> 'cat_id',
'value'
=> lang('Category'),
'type'
=> 'button',
'style'
=> 'filter',
'tab_index' => 1
+*/
),
array
( //boton
CATEGORY
@@ -2023,11 +2035,12 @@
),
'hidden_value' => array
(
- array
+ /* array
( //div values
combo_box_0
'id' =>
'values_combo_box_0',
'value'
=> $bocommon->select2String($values_combo_box[0]) //i.e. id,value/id,vale/
),
+ */
array
( //div values
combo_box_1
'id' =>
'values_combo_box_1',
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2012-11-21 13:32:45 UTC (rev 10528)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2012-11-22 13:15:58 UTC (rev 10529)
@@ -1780,7 +1780,6 @@
$values =
$this->bocommon->collect_locationdata($values,$insert_record);
-
if(!$values['subject'] &&
isset($this->bo->config->config_data['tts_mandatory_title']) &&
$this->bo->config->config_data['tts_mandatory_title'])
{
$receipt['error'][]=array('msg'=>lang('Please enter a title !'));
Modified: branches/Version-1_0-branch/property/js/yahoo/lookup.entity.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/lookup.entity.index.js
2012-11-21 13:32:45 UTC (rev 10528)
+++ branches/Version-1_0-branch/property/js/yahoo/lookup.entity.index.js
2012-11-22 13:15:58 UTC (rev 10529)
@@ -3,11 +3,11 @@
//--------------------------------------------------------
//define SelectButton
- var oMenuButton_0, oMenuButton_1, oMenuButton_2;
+ var oMenuButton_0, oMenuButton_1;//, oMenuButton_2;
var selectsButtons = [
- {order:0,
var_URL:'cat_id',name:'btn_cat_id',style:'districtbutton',dependiente:''},
- {order:1, var_URL:'district_id',name:'btn_district_id',
style:'districtbutton', dependiente:''},
- {order:2, var_URL:'criteria_id',
name:'btn_criteria_id',style:'criteriabutton',dependiente:''}
+// {order:0,
var_URL:'cat_id',name:'btn_cat_id',style:'districtbutton',dependiente:''},
+ {order:0, var_URL:'district_id',name:'btn_district_id',
style:'districtbutton', dependiente:''},
+ {order:1, var_URL:'criteria_id',
name:'btn_criteria_id',style:'criteriabutton',dependiente:''}
]
// define buttons
@@ -26,6 +26,25 @@
date_search : 0 //if search has link "Data search"
}
+ this.myParticularRenderEvent = function()
+ {
+ }
+
+ this.onChangeSelect = function(type)
+ {
+ var myselect=document.getElementById("sel_"+ type);
+ for (var i=0; i<myselect.options.length; i++)
+ {
+ if (myselect.options[i].selected==true)
+ {
+ break;
+ }
+ }
+ eval("path_values." +type +"='"+myselect.options[i].value+"'");
+ execute_ds();
+ }
+
+
/****************************************************************************************/
this.particular_setting = function()
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2012-11-21
13:32:45 UTC (rev 10528)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2012-11-22
13:15:58 UTC (rev 10529)
@@ -1015,6 +1015,7 @@
location not chosen! property no Lokalisering er ikke valgt
location type property no Lokaliserings type
location type not chosen! property no Lokaliseringsnivå ikke
valgt
+log property no Logg
longevity property no Levetid
lookup property no Slå opp
lookup template property no Slå opp standardbeskrivelser
Modified:
branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
2012-11-21 13:32:45 UTC (rev 10528)
+++ branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
2012-11-22 13:15:58 UTC (rev 10529)
@@ -1,25 +1,116 @@
<!-- $Id:$ -->
+ <!-- add / edit -->
<xsl:template match="data" xmlns:formvalidator="http://www.w3.org/TR/html4/";
xmlns:php="http://php.net/xsl";>
+ <xsl:choose>
+ <xsl:when test="mode = 'edit'">
+ <script type="text/javascript">
+ self.name="first_Window";
+ <xsl:value-of
select="lookup_functions"/>
+ </script>
+ </xsl:when>
+ </xsl:choose>
+ <script type="text/javascript">
+ var property_js = <xsl:value-of select="property_js"/>;
+ var base_java_url = <xsl:value-of
select="base_java_url"/>;
+ var datatable = new Array();
+ var myColumnDefs = new Array();
-<!--<xsl:call-template name="yui_phpgw_i18n"/>-->
-<div class="yui-navset yui-navset-top">
+ <xsl:for-each select="datatable">
+ datatable[<xsl:value-of select="name"/>] = [
+ {
+ values:<xsl:value-of
select="values"/>,
+ total_records: <xsl:value-of
select="total_records"/>,
+ edit_action: <xsl:value-of
select="edit_action"/>,
+ is_paginator: <xsl:value-of
select="is_paginator"/>,
+ footer:<xsl:value-of
select="footer"/>
+ }
+ ]
+ </xsl:for-each>
+
+ <xsl:for-each select="myColumnDefs">
+ myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
+ </xsl:for-each>
+ </script>
+ <div class="yui-navset" id="survey_edit_tabview">
- <h1>
+ <h1>
<xsl:value-of select="php:function('lang', 'condition
survey')" />
- </h1>
-
- <div class="content-wrp">
- <xsl:variable name="action_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:property.uicondition_survey.save')" />
- </xsl:variable>
+ </h1>
+
+ <xsl:variable name="action_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.save')" />
+ </xsl:variable>
+
<form name="form" id="form" action="{$action_url}"
method="post" ENCTYPE="multipart/form-data">
- <div class="formBody">
- <div class="row">
- <div class="label">
- <label
for="name"><xsl:value-of select="php:function('lang', 'name')" /></label>
- </div>
+ <table cellpadding="2" cellspacing="2"
width="80%" align="center">
+ <xsl:choose>
+ <xsl:when test="msgbox_data !=
''">
+ <tr>
+ <td
align="left" colspan="3">
+
<xsl:call-template name="msgbox"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="value_id !=''">
+ <tr>
+ <td
class="th_text" valign="top">
+ <a
href="{link_pdf}" target="_blank">PDF</a>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ </table>
+ <table cellpadding="2" cellspacing="2"
width="80%" align="center">
+ <tr>
+ <td class="th_text">
+ <xsl:value-of
select="lang_entity"/>
+ </td>
+ <td class="th_text">
+ <xsl:value-of
select="entity_name"/>
+ </td>
+ </tr>
+ <xsl:choose>
+ <xsl:when test="value_id!=''">
+ <tr>
+ <td
valign="top">
+
<xsl:value-of select="lang_id"/>
+ </td>
+ <td>
+
<xsl:value-of select="value_num"/>
+ <input
type="hidden" name="location_code" value="{location_code}"/>
+ <input
type="hidden" name="lookup_tenant" value="{lookup_tenant}"/>
+ <input
type="hidden" name="values[id]" value="{value_id}"/>
+ <input
type="hidden" name="values[num]" value="{value_num}"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ </table>
+ <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
+ <div class="yui-content">
+ <div id="generic">
+ <table>
+ <xsl:choose>
+ <xsl:when
test="location_data!=''">
+ <xsl:choose>
+
<xsl:when test="editable = 1">
+
<xsl:call-template name="location_form"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:call-template name="location_view"/>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+ <tr>
+ <td>
+ <label for="name"><xsl:value-of
select="php:function('lang', 'name')" /></label>
+ </td>
+ <td>
<xsl:choose>
<xsl:when
test="editable = 1">
<input
id="title" name='title' type="text"
@@ -31,12 +122,14 @@
<xsl:value-of
select="survey/title" />
</xsl:otherwise>
</xsl:choose>
- <div class="clearDiv"></div>
- </div>
- <div class="row">
- <div class="label">
+ </td>
+ </tr>
+ <tr>
+ <td>
+
<label
for="name"><xsl:value-of select="php:function('lang', 'description')" /></label>
- </div>
+ </td>
+ <td>
<xsl:choose>
<xsl:when
test="editable = 1">
<textarea
id="description" name="values[description]" rows="5" cols="60"
@@ -49,12 +142,13 @@
<xsl:value-of
select="project/description" disable-output-escaping="yes"/>
</xsl:otherwise>
</xsl:choose>
- <div class="clearDiv"></div>
- </div>
- <div class="row">
- <div class="label">
- <label
for="category"><xsl:value-of select="php:function('lang', 'category')"
/></label>
- </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <label
for="category"><xsl:value-of select="php:function('lang', 'category')"
/></label>
+ </td>
+ <td>
<xsl:choose>
<xsl:when
test="editable = 1">
<select
id="cat_id" name="values[cat_id]"
@@ -69,24 +163,24 @@
</select>
</xsl:otherwise>
</xsl:choose>
- <div class="clearDiv"></div>
- </div>
-
- <div class="row">
- <div class="label">
+ </td>
+ </tr>
+ <tr>
+ <td>
<label
for="category"><xsl:value-of select="php:function('lang', 'date')" /></label>
- </div>
+ </td>
+ <td>
<input id="report_date"
name='values[report_date]' type="text"
formvalidator:FormField="yes"
formvalidator:type="TextBaseField"/>
- <div
class="clearDiv"></div>
- </div>
-
- <div class="row">
- <div class="label">
- <label
for="status"><xsl:value-of select="php:function('lang', 'status')" /></label>
- </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <label
for="status"><xsl:value-of select="php:function('lang', 'status')" /></label>
+ </td>
+ <td>
<xsl:choose>
<xsl:when
test="editable = 1">
<select
id="status_id" name="values[status_id]"
@@ -101,20 +195,19 @@
</select>
</xsl:otherwise>
</xsl:choose>
- <div class="clearDiv"></div>
- </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <label
for="vendor"><xsl:value-of select="php:function('lang', 'vendor')" /></label>
+ </td>
+ <td>
- <div class="row">
- <div class="label">
- <label
for="vendor"><xsl:value-of select="php:function('lang', 'vendor')" /></label>
- </div>
<xsl:choose>
<xsl:when
test="editable = 1">
<div
class="autocomplete">
- <input
type="hidden" id="vendor_id" name="values[vendor_id]"
value="{survey/vendor_id}"
-
formvalidator:FormField="yes"
-
formvalidator:type="TextBaseField"/>
+ <input
type="hidden" id="vendor_id" name="values[vendor_id]"
value="{survey/vendor_id}"/>
<input
type="text" id="vendor_name" name="vendor_name" value="{survey/vendor_name}">
</input>
<div
id="vendor_container"/>
@@ -124,13 +217,14 @@
<xsl:value-of
select="survey/vendor_name" />
</xsl:otherwise>
</xsl:choose>
- <div class="clearDiv"></div>
- </div>
-
<!--
- <div class="row">
+ </td>
+ </tr>
+ <tr>
+ <td>
+
<div class="label">
<label
for="age2">Age:</label>
</div>
@@ -140,8 +234,7 @@
formvalidator:max="100"
formvalidator:min="10"/>
<div class="clearDiv"></div>
- </div>
- <div class="row">
+
<div class="label">
<label
for="income2">Income ($):</label>
</div>
@@ -152,41 +245,146 @@
formvalidator:max="40000"
formvalidator:maxInclusive="true"/>
<div class="clearDiv"></div>
- </div>
-->
- <div class="form-buttons">
- <xsl:choose>
- <xsl:when
test="editable = 1">
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
- <xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
- <input
type="submit" name="save_project" value="{$lang_save}" title = "{$lang_save}" />
- <input
class="submit" type="button" name="cancelButton" id ='cancelButton'
value="{$lang_cancel}" title = "{$lang_cancel}"
onClick="document.cancel_form.submit();"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:variable
name="lang_edit"><xsl:value-of select="php:function('lang', 'edit')"
/></xsl:variable>
- <xsl:variable
name="lang_new_activity"><xsl:value-of select="php:function('lang',
't_new_activity')" /></xsl:variable>
- <input
type="submit" name="edit_project" value="{$lang_edit}" title = "{$lang_edit}" />
- <input
type="submit" name="new_activity" value="{$lang_new_activity}" title =
"{$lang_new_activity}" />
- </xsl:otherwise>
- </xsl:choose>
+
+ </td>
+ </tr>
+
+ </table>
</div>
+
+ <div id="documents">
+ </div>
+ <div id="import">
+ </div>
+
+
+ <xsl:choose>
+ <xsl:when test="files!='' or
fileupload = 1">
+ <div id="files">
+ <script
type="text/javascript">
+ var
fileuploader_action = <xsl:value-of select="fileuploader_action"/>;
+ </script>
+ <table
cellpadding="2" cellspacing="2" width="80%" align="center">
+ <!--
<xsl:call-template name="file_list"/> -->
+ <tr>
+
<td align="left" valign="top">
+
<xsl:value-of select="//lang_files"/>
+
</td>
+
<td>
+
<div id="datatable-container_0"/>
+
</td>
+ </tr>
+
<xsl:choose>
+
<xsl:when test="cat_list='' and fileupload = 1 and mode = 'edit'">
+
<xsl:call-template name="file_upload"/>
+
</xsl:when>
+
</xsl:choose>
+ </table>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="documents !=
''">
+ <div id="document">
+ <!-- Some style
for the expand/contract section-->
+ <style>
+
#expandcontractdiv {border:1px dotted #dedede; margin:0 0 .5em 0;
padding:0.4em;}
+
#treeDiv1 { background: #fff; padding:1em; margin-top:1em; }
+ </style>
+ <script
type="text/javascript">
+ var
documents = <xsl:value-of select="documents"/>;
+ </script>
+ <!-- markup for
expand/contract links -->
+ <div
id="expandcontractdiv">
+ <a
id="expand" href="#">
+
<xsl:value-of select="php:function('lang', 'expand all')"/>
+ </a>
+
<xsl:text> </xsl:text>
+ <a
id="collapse" href="#">
+
<xsl:value-of select="php:function('lang', 'collapse all')"/>
+ </a>
+ </div>
+ <div
id="treeDiv1"/>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="value_id !=''">
+ <div id="related">
+ <table
cellpadding="2" cellspacing="2" width="80%" align="center">
+ <tr>
+
<td valign='top'>
+
<xsl:value-of select="php:function('lang', 'started from')"/>
+
</td>
+
<td>
+
<div id="datatable-container_1"/>
+
</td>
+ </tr>
+ <tr>
+
<td valign='top'>
+
<xsl:value-of select="php:function('lang', 'used in')"/>
+
</td>
+
<td>
+
<div id="datatable-container_2"/>
+
</td>
+ </tr>
+ </table>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+
</div>
- </form>
- <xsl:variable name="cancel_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:property.uicondition_survey.index')" />
- </xsl:variable>
+ <table>
+ <tr>
+ <td>
+ </td>
+ <td>
+ <div class="form-buttons">
+ <xsl:choose>
+ <xsl:when
test="editable = 1">
+
<xsl:variable name="lang_save"><xsl:value-of select="php:function('lang',
'save')" /></xsl:variable>
+
<xsl:variable name="lang_cancel"><xsl:value-of select="php:function('lang',
'cancel')" /></xsl:variable>
+ <input
type="submit" name="save_project" value="{$lang_save}" title = "{$lang_save}" />
+ <input
class="submit" type="button" name="cancelButton" id ='cancelButton'
value="{$lang_cancel}" title = "{$lang_cancel}"
onClick="document.cancel_form.submit();"/>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:variable name="lang_edit"><xsl:value-of select="php:function('lang',
'edit')" /></xsl:variable>
+
<xsl:variable name="lang_new_activity"><xsl:value-of
select="php:function('lang', 't_new_activity')" /></xsl:variable>
+ <input
type="submit" name="edit_project" value="{$lang_edit}" title = "{$lang_edit}" />
+ <input
type="submit" name="new_activity" value="{$lang_new_activity}" title =
"{$lang_new_activity}" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+ </td>
+ </tr>
- <form name="cancel_form" id="cancel_form"
action="{$cancel_url}" method="post">
+ </table>
+
+
</form>
</div>
+ <div id="lightbox-placeholder"
style="background-color:#000000;color:#FFFFFF;display:none">
+ <div class="hd"
style="background-color:#000000;color:#000000; border:0; text-align:center">
+ <xsl:value-of select="php:function('lang',
'fileuploader')"/>
+ </div>
+ <div class="bd" style="text-align:center;"> </div>
+ </div>
-</div>
+ <xsl:variable name="cancel_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.index')" />
+ </xsl:variable>
+ <form name="cancel_form" id="cancel_form"
action="{$cancel_url}" method="post">
+ </form>
-</xsl:template>
+ </xsl:template>
+
+
<xsl:template match="options">
<option value="{id}">
<xsl:if test="selected = 'selected'">
Modified: branches/Version-1_0-branch/property/templates/base/entity.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/entity.xsl
2012-11-21 13:32:45 UTC (rev 10528)
+++ branches/Version-1_0-branch/property/templates/base/entity.xsl
2012-11-22 13:15:58 UTC (rev 10529)
@@ -292,7 +292,7 @@
<table
cellpadding="2" cellspacing="2" width="80%" align="center">
<tr>
<td valign='top'>
-
<xsl:value-of select="php:function('lang', 'started from')"/>
+
<!--<xsl:value-of select="php:function('lang', 'started from')"/>-->
</td>
<td>
<div id="datatable-container_1"/>
@@ -300,7 +300,7 @@
</tr>
<tr>
<td valign='top'>
-
<xsl:value-of select="php:function('lang', 'used in')"/>
+
<!--<xsl:value-of select="php:function('lang', 'used in')"/>-->
</td>
<td>
<div id="datatable-container_2"/>
@@ -310,24 +310,6 @@
</div>
</xsl:when>
</xsl:choose>
-
- <!--
- <xsl:choose>
- <xsl:when test="related_link !=
''">
- <div id="related">
- <table
cellpadding="2" cellspacing="2" width="80%" align="center">
- <tr>
-
<td>
-
<table width="100%" cellpadding="2" cellspacing="2" align="center">
-
<xsl:apply-templates select="related_link"/>
-
</table>
-
</td>
- </tr>
- </table>
- </div>
- </xsl:when>
- </xsl:choose>
- -->
</div>
<xsl:choose>
<xsl:when test="mode = 'edit'">
@@ -511,20 +493,3 @@
</xsl:when>
</xsl:choose>
</xsl:template>
-
- <!-- New template-->
- <xsl:template match="related_link">
- <xsl:variable name="lang_entity_statustext">
- <xsl:value-of select="lang_entity_statustext"/>
- </xsl:variable>
- <xsl:variable name="entity_link">
- <xsl:value-of select="entity_link"/>
- </xsl:variable>
- <tr>
- <td class="small_text" align="left">
- <a href="{$entity_link}"
onMouseover="window.status='{$lang_entity_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of select="text_entity"/>
- </a>
- </td>
- </tr>
- </xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10529] Merge 10524:10528 from trunk,
Sigurd Nes <=