[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10495] Merge 10483:10494 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10495] Merge 10483:10494 from trunk |
|
Date: |
Fri, 09 Nov 2012 08:22:47 +0000 |
Revision: 10495
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10495
Author: sigurdne
Date: 2012-11-09 08:22:47 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
Merge 10483:10494 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
branches/Version-1_0-branch/logistic/js/logistic/activity.js
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
branches/Version-1_0-branch/logistic/templates/base/css/base.css
branches/Version-1_0-branch/property/inc/class.botts.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/templates/base/location.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
+
/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
Modified: branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
2012-11-09 08:20:41 UTC (rev 10494)
+++ branches/Version-1_0-branch/logistic/inc/class.soactivity.inc.php
2012-11-09 08:22:47 UTC (rev 10495)
@@ -399,8 +399,13 @@
* @return array of children
*/
- protected function get_children($parent, $level)
+ public function get_children($parent, $level, $reset = false)
{
+ if($reset)
+ {
+ $this->activity_tree = array();
+ }
+
$db = clone($this->db);
$table = "lg_activity";
$sql = "SELECT id, name FROM {$table} WHERE
parent_activity_id = {$parent} ORDER BY name ASC";
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-09 08:20:41 UTC (rev 10494)
+++ branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2012-11-09 08:22:47 UTC (rev 10495)
@@ -118,6 +118,10 @@
'field' => array(
array(
'key' => 'id',
+ 'hidden' => true
+ ),
+ array(
+ 'key' => 'id_link',
'label' => lang('Id'),
'sortable' => true,
'formatter' =>
'YAHOO.portico.formatLink'
@@ -166,12 +170,25 @@
(
array
(
- 'name' =>
'activity_id',
+ 'name' => 'id',
'source' => 'id'
),
)
);
+ $parameters2 = array
+ (
+ 'parameter' => array
+ (
+ array
+ (
+ 'name' =>
'parent_id',
+ 'source' => 'id'
+ ),
+ )
+ );
+
+
$data['datatable']['actions'][] = array
(
'my_name' =>
'new',
@@ -180,7 +197,7 @@
(
'menuaction' =>
'logistic.uiactivity.edit'
)),
- 'parameters' =>
json_encode($parameters)
+ 'parameters' =>
json_encode($parameters2)
);
$data['datatable']['actions'][] = array
@@ -335,7 +352,7 @@
$href = self::link(array('menuaction'
=> 'logistic.uiactivity.view', 'id' => $activity_arr['id']));
- $activity_arr['id'] = "<a
href=\"{$href}\">" . $activity_arr['id'] . "</a>";
+ $activity_arr['id_link'] = "<a
href=\"{$href}\">" . $activity_arr['id'] . "</a>";
$activity_arr['name'] = "<a
href=\"{$href}\">" . $activity_arr['name'] . "</a>";
@@ -356,12 +373,15 @@
if (!$export)
{
+
//Add action column to each row in result table
+/*
array_walk(
$result_data['results'],
array($this,
'_add_links'),
"logistic.uiactivity.view"
);
+*/
}
return $this->yui_results($result_data);
@@ -379,81 +399,93 @@
$project_id = phpgw::get_var('project_id');
if($activity == null)
- {
- if( $project_id && is_numeric($project_id) )
- {
- $project =
$this->so_project->get_single($project_id);
- }
-
+ {
if( $activity_id && is_numeric($activity_id) )
{
$activity =
$this->so->get_single($activity_id);
}
else
{
- $activity = new logistic_activity();
+ $activity = new logistic_activity();
+
+ if( $project_id &&
is_numeric($project_id) )
+ {
+ $project =
$this->so_project->get_single($project_id);
+ $activity->set_project_id(
$project_id );
+ }
+ else if($parent_activity_id > 0)
+ {
+ $activity->set_parent_id(
$parent_activity_id );
+ $parent_activity =
$this->so->get_single( $parent_activity_id );
+ $activity->set_project_id(
$parent_activity->get_project_id() );
+
+
$activity->set_start_date($parent_activity->get_start_date());
+
$activity->set_end_date($parent_activity->get_end_date());
+ }
}
-
- if($activity->get_project_id() == '')
+ }
+
+ $accounts =
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_READ, 'run', 'logistic');
+
+ $activities = $this->so->get();
+
+ if($activity_id)
+ {
+ $exclude = array($activity_id);
+ $children =
$this->so->get_children($activity_id, 0,true);
+
+ foreach($children as $child)
{
- $activity->set_project_id( $project_id
);
+ $exclude[] = $child['id'];
}
-
- if($parent_activity_id > 0)
+
+ $k = count($activities);
+ for ($i=0; $i<$k; $i++)
{
- $activity->set_parent_id(
$parent_activity_id );
- $parent_activity =
$this->so->get_single( $parent_activity_id );
- $activity->set_project_id(
$parent_activity->get_project_id() );
-
-
$activity->set_start_date($parent_activity->get_start_date());
-
$activity->set_end_date($parent_activity->get_end_date());
+ if
(in_array($activities[$i]->get_id(),$exclude))
+ {
+ unset($activities[$i]);
+ }
}
- else
- {
- $projects = $this->so_project->get();
- }
}
- if($activity->get_parent_id() > 0)
- {
- $parent_activity = $this->so->get_single(
$activity->get_parent_id() );
- }
-
- $accounts =
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_READ, 'run', 'logistic');
-
- $activities = $this->so->get();
-
$data = array
(
'responsible_users' => $accounts,
- 'activities' => $activities,
+ 'activities' => $activity_id ? $activities :
array(),
'activity' => $activity,
'editable' => true,
'breadcrumb' => $this->_get_breadcrumb(
$activity_id, 'logistic.uiactivity.edit', 'id')
);
-
+
if($project)
{
$data['project'] = $project;
}
- if($projects)
+// if($activity->get_parent_id() > 0)
+ if( $activity_id )
{
+ $parent_activity = $this->so->get_single(
$activity->get_parent_id() );
+ $data['parent_activity'] = $parent_activity;
+ }
+ else
+ {
+ $projects = $this->so_project->get();
$data['projects'] = $projects;
}
- if($parent_activity)
- {
- $data['parent_activity'] = $parent_activity;
- }
-
$this->use_yui_editor('description');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('logistic') . '::' . lang('Add activity');
- $GLOBALS['phpgw']->jqcal->add_listener('start_date');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date');
+ $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
self::add_javascript('logistic', 'logistic',
'activity.js');
+ self::add_javascript('phpgwapi', 'yui3',
'yui/yui-min.js');
+ self::add_javascript('phpgwapi', 'yui3',
'gallery-formvalidator/gallery-formvalidator-min.js');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yui3/gallery-formvalidator/validatorCss.css');
+
self::render_template_xsl('activity/add_activity_item',
$data);
}
@@ -502,9 +534,9 @@
{
$activity = new logistic_activity();
}
-
+
$activity->populate();
-
+
if( $activity->validate() )
{
$activity_id = $this->so->store($activity);
@@ -518,7 +550,7 @@
public function edit_favorite()
{
- if($activity_id = phpgw::get_var('activity_id'))
+ if($activity_id = phpgw::get_var('id'))
{
$activity = $this->so->get_single($activity_id);
@@ -705,16 +737,23 @@
{
return;
}
+
$path = $this->so->get_path($activity_id);
- $level = count($path) - 1;
- $breadcrumb_array = array();
-
- for ($i=0;$i<$level;$i++)
+
+ foreach($path as $menu_item)
{
- $_link = self::link(array('menuaction' =>
$menuaction, $id_name => $path[$i]['id']));
- $breadcrumb_array[] = "<a
href=\"{$_link}\">{$path[$i]['name']}</a>";
+ if($menu_item['id'] == $activity_id)
+ {
+ $breadcrumb_array[] = array("name" =>
$menu_item['name'], "link" => "", "current" => 1);
+ }
+ else
+ {
+ $_link = self::link(array('menuaction'
=> $menuaction, $id_name => $menu_item['id'] ));
+ $breadcrumb_array[] = array("name" =>
$menu_item['name'], "link" => $_link, "current" => 0);
+ }
+
}
- $breadcrumb_array[] = $path[$level]['name'];
- return implode(' > ', $breadcrumb_array);
+
+ return $breadcrumb_array;
}
}
Modified: branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2012-11-09 08:20:41 UTC (rev 10494)
+++ branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2012-11-09 08:22:47 UTC (rev 10495)
@@ -460,13 +460,13 @@
$db_requirement->transaction_begin();
$requirement_id =
$this->so->store($requirement);
+ $status_delete_values = true;
if( ($old_location_id > 0) &&
(is_numeric($old_location_id) ) && ($old_location_id != $new_location_id) )
{
$status_delete_values =
$this->so_requirement_value->delete_values( $requirement_id );
+ $status_delete_resources =
$this->so_resource_allocation->delete_resources( $requirement_id );
}
- $status_delete_resources =
$this->so_resource_allocation->delete_resources( $requirement_id );
-
if( ($requirement_id > 0) &&
($status_delete_values) && ($status_delete_resources) )
{
$db_requirement->transaction_commit();
@@ -664,11 +664,14 @@
$tabs = $this->make_tab_menu($requirement_id);
+ $activity = $this->so_activity->get_single(
$requirement->get_activity_id() );
+
$data = array
(
'tabs'
=>
$GLOBALS['phpgw']->common->create_tabs($tabs, 1),
'view'
=> "requirement_values",
'requirement'
=> $requirement,
+ 'activity'
=> $activity,
'requirement_attributes_array' =>
$requirement_attributes_array
);
Modified: branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
2012-11-09 08:20:41 UTC (rev 10494)
+++ branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
2012-11-09 08:22:47 UTC (rev 10495)
@@ -246,13 +246,21 @@
public function populate()
{
- $this->set_id( phpgw::get_var('id') );
+ $this->set_id( phpgw::get_var('id', 'int') );
$this->set_name( phpgw::get_var('name') );
- $this->set_responsible_user_id(
phpgw::get_var('responsible_user_id') );
+ $this->set_responsible_user_id(
phpgw::get_var('responsible_user_id', 'int') );
$this->set_description( phpgw::get_var('description') );
- $this->set_parent_id( phpgw::get_var('parent_id') );
- $this->set_project_id( phpgw::get_var('project_id') );
+ if( $parent_id = phpgw::get_var('parent_activity_id',
'int') )
+ {
+ $this->set_parent_id( $parent_id );
+ }
+ else
+ {
+ $this->set_parent_id(
phpgw::get_var('parent_id', 'int') );
+ }
+ $this->set_project_id( phpgw::get_var('project_id',
'int') );
+
$user_id = $GLOBALS['phpgw_info']['user']['id'];
$this->set_update_user( $user_id );
Modified: branches/Version-1_0-branch/logistic/js/logistic/activity.js
===================================================================
--- branches/Version-1_0-branch/logistic/js/logistic/activity.js
2012-11-09 08:20:41 UTC (rev 10494)
+++ branches/Version-1_0-branch/logistic/js/logistic/activity.js
2012-11-09 08:22:47 UTC (rev 10495)
@@ -3,18 +3,12 @@
var parent_id = $(this).val();
var thisForm = $(this).closest("form");
$(thisForm).find("input[name=parent_activity_id]").val(parent_id);
-
- alert(activity_id);
-
});
$("#select_project").change(function () {
var project_id = $(this).val();
var thisForm = $(this).closest("form");
$(thisForm).find("input[name=project_id]").val(project_id);
-
- alert(project_id);
-
});
$("#activity_details input").focus(function(e){
@@ -46,4 +40,42 @@
var wrpElem = $(this).parents("dd");
$(wrpElem).find(".help_text").fadeOut();
});
-});
\ No newline at end of file
+});
+
+
+var arURLParts = strBaseURL.split('?');
+var comboBase = arURLParts[0] + 'phpgwapi/inc/yui-combo-master/combo.php?';
+
+YUI_config = {
+ //Don't combine the files
+ combine: true,
+ //Ignore things that are already loaded (in this process)
+ ignoreRegistered: false,
+ //Set the base path
+ comboBase: comboBase,
+ base: '',
+ //And the root
+ root: '',
+ //Require your deps
+ require: [ ]
+};
+
+
+YUI({
+}).use(
+ 'gallery-formvalidator',
+ function(Y) {
+ Y.on("domready", function () {
+ var form = new Y.Validator(
+ {
+ form:'activity_form',
+ defaultIncorrectIndicatorCss:'validator',
+ defaultCorrectIndicatorCss:'indicator',
+ createCorrectIndicator:true,
+ createIncorrectIndicator:true
+ }
+ );
+
+ });
+
+});
Modified:
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl
2012-11-09 08:20:41 UTC (rev 10494)
+++
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl
2012-11-09 08:22:47 UTC (rev 10495)
@@ -8,10 +8,9 @@
<xsl:when test="view = 'activity_details'">
<xsl:call-template name="yui_phpgw_i18n"/>
+ <!-- =========== HEADING ============== -->
<xsl:choose>
<xsl:when test="activity/id != '' or
activity/id != 0">
-
- <!-- =========== HEADING ==============
-->
<h1 style="float:left;">
<span>
<xsl:value-of
select="php:function('lang', 'Overview for activity')" />
@@ -20,37 +19,25 @@
<xsl:value-of
select="activity/name" />
</span>
</h1>
-
- <!-- =========== BREADCRUMB
============== -->
- <div id="breadcrumb">
- <span>Du er her:</span>
- <xsl:value-of
disable-output-escaping="yes" select="breadcrumb" />
- </div>
-
</xsl:when>
<xsl:otherwise>
-
- <!-- =========== HEADING ==============
-->
<h1 style="float:left;">
<xsl:value-of
select="php:function('lang', 'Requirement allocation')" />
</h1>
-
- <!-- =========== BREADCRUMB
============== -->
- <div id="breadcrumb">
- <span>Du er her:</span>
- <xsl:value-of
disable-output-escaping="yes" select="breadcrumb" />
- </div>
</xsl:otherwise>
</xsl:choose>
-
+
+ <!-- =========== BREADCRUMB ============== -->
+ <xsl:call-template name="breadcrumb" />
+
<xsl:value-of disable-output-escaping="yes"
select="tabs" />
<xsl:call-template name="activity_details" />
</xsl:when>
<xsl:when test="view = 'requirement_overview'">
+
+ <!-- =========== HEADING ============== -->
<xsl:choose>
<xsl:when test="activity/id != '' or
activity/id != 0">
-
- <!-- =========== HEADING ==============
-->
<h1 style="float:left;">
<span>
<xsl:value-of
select="php:function('lang', 'Overview of resources for activity')" />
@@ -59,32 +46,44 @@
<xsl:value-of
select="activity/name" />
</span>
</h1>
-
- <!-- =========== BREADCRUMB
============== -->
- <div id="breadcrumb">
- <span>Du er her:</span>
- <xsl:value-of
disable-output-escaping="yes" select="breadcrumb" />
- </div>
</xsl:when>
<xsl:otherwise>
-
- <!-- =========== HEADING ==============
-->
<h1 style="float:left;">
<xsl:value-of
select="php:function('lang', 'Add criterias')" />
</h1>
-
- <!-- =========== BREADCRUMB
============== -->
- <div id="breadcrumb">
- <span>Du er her:</span>
- <xsl:value-of
disable-output-escaping="yes" select="breadcrumb" />
- </div>
</xsl:otherwise>
</xsl:choose>
-
+
+ <!-- =========== BREADCRUMB ============== -->
+ <xsl:call-template name="breadcrumb" />
+
<xsl:value-of disable-output-escaping="yes"
select="tabs" />
<xsl:call-template name="requirement_overview" />
</xsl:when>
</xsl:choose>
</div>
-
</xsl:template>
+
+<!-- =========== BREADCRUMB TEMPLATE ============== -->
+<xsl:template name="breadcrumb">
+ <div id="breadcrumb">
+ <span class="intro">Du er her:</span>
+ <xsl:for-each select="breadcrumb">
+ <xsl:choose>
+ <xsl:when test="current = 1">
+ <span class="current">
+ <xsl:value-of select="name"/>
+ </span>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{link}">
+ <xsl:value-of select="name"/>
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:if test="not( position() = last() )">
+ <img src="logistic/images/arrow_right.png" />
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+</xsl:template>
Modified:
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
2012-11-09 08:20:41 UTC (rev 10494)
+++
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
2012-11-09 08:22:47 UTC (rev 10495)
@@ -1,5 +1,6 @@
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:template match="data" xmlns:php="http://php.net/xsl";
xmlns:formvalidator="http://www.w3.org/TR/html4/";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info',
'user|preferences|common|dateformat')"/></xsl:variable>
+<xsl:variable name="datetime_format"><xsl:value-of
select="$date_format"/><xsl:text> H:i</xsl:text></xsl:variable>
<xsl:call-template name="yui_phpgw_i18n"/>
<div class="yui-navset yui-navset-top">
@@ -28,25 +29,27 @@
<xsl:variable name="action_url">
<xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:logistic.uiactivity.save')" />
</xsl:variable>
- <form action="{$action_url}" method="post">
+ <xsl:variable name="parent_id"><xsl:value-of
select="parent_activity/id"/></xsl:variable>
+ <form id='activity_form' action="{$action_url}"
method="post">
<input type="hidden" name="id" value =
"{activity/id}" />
<input type="hidden" name="project_id"
value="{activity/project_id}" />
<input type="hidden" name="parent_id"
value="{parent_activity/id}" />
<dl class="proplist-col">
+ <xsl:value-of select="parent_activity/id"/>
<xsl:choose>
- <xsl:when test="(editable) and
(parent_activity/id > 0)">
+ <xsl:when test="(editable) and
(activities !='')">
<dt>
<div
style="margin-bottom: 1em;">
<label style="display:block;"><xsl:value-of select="php:function('lang',
'Choose another main activity for this sub activity')" /></label>
<select id="select_parent_activity" name="parent_activity_id">
-
<option>Velg annen hovedaktivitet</option>
+
<option value="">Velg annen hovedaktivitet</option>
<xsl:for-each select="activities">
<option
value="{id}">
-
<xsl:if test="activity/parent_id = id">
+
<xsl:if test="id = $parent_id">
<xsl:attribute name="selected">
-
selected
-
</xsl:attribute>
+
<xsl:text>selected</xsl:text>
+
</xsl:attribute>
</xsl:if>
<xsl:value-of disable-output-escaping="yes" select="name"/>
</option>
@@ -55,7 +58,7 @@
</div>
</dt>
</xsl:when>
- <xsl:when test="(editable)
and not(parent_activity) and not(project)">
+ <!-- <xsl:when
test="(editable) and not(parent_activity) and not(project)">
<dt>
<div
style="margin-bottom: 1em;">
<label style="display:block;"><xsl:value-of select="php:function('lang',
'Choose the project in which the activity is part of')" /></label>
@@ -74,13 +77,15 @@
</select>
</div>
</dt>
- </xsl:when>
+ </xsl:when>-->
<xsl:otherwise>
<dt>
<div
style="margin-bottom: 1em;">
<label style="display:block;"><xsl:value-of select="php:function('lang',
'Choose another project for the activity')" /></label>
-
<select id="select_project" name="select_project">
-
<option><xsl:value-of select="php:function('lang', 'Choose another
project')" /></option>
+
<select id="select_project" name="select_project"
+
formvalidator:FormField="yes"
+
formvalidator:Type="SelectField">
+
<option value=''><xsl:value-of select="php:function('lang', 'Choose
another project')" /></option>
<xsl:for-each select="projects">
<option
value="{id}">
<xsl:if test="project/id = project_id">
@@ -143,14 +148,14 @@
<div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
</xsl:if>
<div
class="help_text"><xsl:value-of select="php:function('lang','Give start date to
activity')" /></div>
- <input
class="date" id="start_date" name="start_date" type="text">
+ <input
class="datetime" id="start_date" name="start_date" type="text">
<xsl:if
test="activity/start_date != ''">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(activity/start_date))"/></xsl:attribute>
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $datetime_format,
number(activity/start_date))"/></xsl:attribute>
</xsl:if>
</input>
</xsl:when>
<xsl:otherwise>
- <span><xsl:value-of
select="php:function('date', $date_format,
number(activity/start_date))"/></span>
+ <span><xsl:value-of
select="php:function('date', $datetime_format,
number(activity/start_date))"/></span>
</xsl:otherwise>
</xsl:choose>
</dd>
@@ -165,14 +170,14 @@
<div
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)"
/></div>
</xsl:if>
<div
class="help_text"><xsl:value-of select="php:function('lang','Give end date to
activity')" /></div>
- <input
class="date" id="end_date" name="end_date" type="text">
+ <input
class="datetime" id="end_date" name="end_date" type="text">
<xsl:if
test="activity/end_date != ''">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(activity/end_date))"/></xsl:attribute>
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $datetime_format,
number(activity/end_date))"/></xsl:attribute>
</xsl:if>
</input>
</xsl:when>
<xsl:otherwise>
- <span><xsl:value-of
select="php:function('date', $date_format, number(activity/end_date))"/></span>
+ <span><xsl:value-of
select="php:function('date', $datetime_format,
number(activity/end_date))"/></span>
</xsl:otherwise>
</xsl:choose>
</dd>
@@ -222,7 +227,7 @@
<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_activity" value="{$lang_save}" title = "{$lang_save}" />
- <input type="submit"
name="cancel_activity" value="{$lang_cancel}" title = "{$lang_cancel}" />
+ <input class="submit"
type="button" name="cancel_activity" id ='cancel_activity'
value="{$lang_cancel}" title = "{$lang_cancel}"
onClick="document.cancel_form.submit();"/>
</xsl:when>
<xsl:otherwise>
<xsl:variable
name="params">
@@ -240,6 +245,15 @@
</div>
</div>
</div>
+
+<xsl:variable name="cancel_url">
+<xsl:value-of select="php:function('get_phpgw_link', '/index.php',
'menuaction:logistic.uiactivity.index')" />
+</xsl:variable>
+
+<form name="cancel_form" id="cancel_form" action="{$cancel_url}" method="post">
+</form>
+
+
</xsl:template>
<xsl:template match="options">
Modified:
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
2012-11-09 08:20:41 UTC (rev 10494)
+++
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
2012-11-09 08:22:47 UTC (rev 10495)
@@ -1,5 +1,6 @@
<xsl:template name="activity_details" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info',
'user|preferences|common|dateformat')"/></xsl:variable>
+<xsl:variable name="datetime_format"><xsl:value-of
select="$date_format"/><xsl:text> H:i</xsl:text></xsl:variable>
<div class="content-wrp">
<div id="details">
@@ -30,13 +31,13 @@
<label
for="start_date"><xsl:value-of select="php:function('lang','Start date')"
/></label>
</dt>
<dd>
- <span><xsl:value-of
select="php:function('date', $date_format,
number(activity/start_date))"/></span>
+ <span><xsl:value-of
select="php:function('date', $datetime_format,
number(activity/start_date))"/></span>
</dd>
<dt>
<label
for="end_date"><xsl:value-of select="php:function('lang','End date')" /></label>
</dt>
<dd>
- <span><xsl:value-of
select="php:function('date', $date_format, number(activity/end_date))"/></span>
+ <span><xsl:value-of
select="php:function('date', $datetime_format,
number(activity/end_date))"/></span>
</dd>
<dt>
<label
for="end_date">Ansvarlig</label>
Modified: branches/Version-1_0-branch/logistic/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/logistic/templates/base/css/base.css
2012-11-09 08:20:41 UTC (rev 10494)
+++ branches/Version-1_0-branch/logistic/templates/base/css/base.css
2012-11-09 08:22:47 UTC (rev 10495)
@@ -2438,10 +2438,23 @@
margin-bottom: 1em;
}
+#breadcrumb span{
+ font-weight: bold;
+}
+
+#breadcrumb span.intro{
+ margin-right: 5px;
+}
+
#breadcrumb img{
- height: 14px;
+ height: 12px;
+ margin: 0 5px 0 8px;
}
+#breadcrumb span.current{
+ text-decoration: underline;
+}
+
#requirement-container .btn-sm.cancel {
border: 1px solid #CCCCCC;
}
Modified: branches/Version-1_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.botts.inc.php
2012-11-09 08:20:41 UTC (rev 10494)
+++ branches/Version-1_0-branch/property/inc/class.botts.inc.php
2012-11-09 08:22:47 UTC (rev 10495)
@@ -950,7 +950,7 @@
)
)
{
- $receipt_mail =
$this->mail_ticket($receipt['id'],false,$receipt,$ticket['location_code']);
+ $receipt_mail =
$this->mail_ticket($receipt['id'],false,$receipt,$ticket['location_code'],
false, isset($ticket['send_mail']) && $ticket['send_mail'] ? true : false);
}
$criteria = array
@@ -1024,8 +1024,9 @@
return $address_element;
}
- function mail_ticket($id, $fields_updated, $receipt =
array(),$location_code='', $get_message = false)
+ function mail_ticket($id, $fields_updated, $receipt =
array(),$location_code='', $get_message = false, $force_send = false)
{
+ $log_recipients = array();
$this->send =
CreateObject('phpgwapi.send');
$ticket = $this->so->read_single($id);
@@ -1135,6 +1136,7 @@
if(
isset($this->config->config_data['groupnotification']) &&
$this->config->config_data['groupnotification'] && $ticket['group_id'] )
{
+ $log_recipients[] = $group_name;
$members_gross =
$GLOBALS['phpgw']->accounts->member($ticket['group_id'], true);
foreach($members_gross as $user)
{
@@ -1151,6 +1153,7 @@
{
// add owner to recipients
$members[$ticket['user_id']] =
$GLOBALS['phpgw']->accounts->id2name($ticket['user_id']);
+ $log_recipients[] =
$GLOBALS['phpgw']->accounts->get($ticket['user_id'])->__toString();
}
$GLOBALS['phpgw']->preferences->set_account_id($ticket['assignedto'], true);
@@ -1158,10 +1161,12 @@
&&
($GLOBALS['phpgw']->preferences->data['property']['tts_notify_me'] == 1)
)
||
($this->config->config_data['assignednotification'] && $ticket['assignedto'])
+ || ($force_send && $ticket['assignedto'])
)
{
// add assigned to recipients
$members[$ticket['assignedto']] =
$GLOBALS['phpgw']->accounts->id2name($ticket['assignedto']);
+ $log_recipients[] =
$GLOBALS['phpgw']->accounts->get($ticket['assignedto'])->__toString();
}
$error = array();
@@ -1231,9 +1236,12 @@
{
$toarray[] = "{$entry['first_name']}
{$entry['last_name']}<{$entry['email']}>";
}
+
+ $log_recipients[] = "{$entry['first_name']}
{$entry['last_name']}";
}
unset($entry);
+ $rc = false;
if($toarray)
{
$to = implode(';',$toarray);
@@ -1256,6 +1264,10 @@
}
}
+ if($rc && $log_recipients)
+ {
+
$this->historylog->add('M',$id,implode(';',array_unique($log_recipients)));
+ }
/*
if (!$rc &&
($this->config->config_data['groupnotification'] ||
$this->config->config_data['ownernotification'] ||
$this->config->config_data['groupnotification']))
{
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-09 08:20:41 UTC (rev 10494)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2012-11-09 08:22:47 UTC (rev 10495)
@@ -2389,7 +2389,7 @@
)
)
{
- $receipt = $this->bo->mail_ticket($id,
$this->bo->fields_updated, $receipt);
+ $receipt = $this->bo->mail_ticket($id,
$this->bo->fields_updated, $receipt,'', false, isset($values['send_mail']) &&
$values['send_mail'] ? true : false);
}
//--------- files
Modified: branches/Version-1_0-branch/property/templates/base/location.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/location.xsl
2012-11-09 08:20:41 UTC (rev 10494)
+++ branches/Version-1_0-branch/property/templates/base/location.xsl
2012-11-09 08:22:47 UTC (rev 10495)
@@ -401,20 +401,6 @@
</xsl:when>
</xsl:choose>
<xsl:choose>
- <xsl:when
test="entities_link != ''">
- <tr>
-
<td valign="top">
-
<xsl:value-of select="lang_related_info"/>
-
</td>
-
<td>
-
<table width="100%" cellpadding="2" cellspacing="2" align="center">
-
<xsl:apply-templates select="entities_link"/>
-
</table>
-
</td>
- </tr>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
<xsl:when
test="edit_street = 1">
<tr>
<td>
@@ -469,6 +455,20 @@
</xsl:when>
</xsl:choose>
<xsl:apply-templates
select="attributes_general/attributes"/>
+ <xsl:choose>
+ <xsl:when
test="entities_link != ''">
+ <tr>
+
<td valign="top">
+
<xsl:value-of select="lang_related_info"/>
+
</td>
+
<td>
+
<table width="100%" cellpadding="2" cellspacing="2" align="center">
+
<xsl:apply-templates select="entities_link"/>
+
</table>
+
</td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
</table>
</div>
<xsl:call-template
name="attributes_values"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10495] Merge 10483:10494 from trunk,
Sigurd Nes <=