[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10659] Merge 10655:10658 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10659] Merge 10655:10658 from trunk |
|
Date: |
Thu, 10 Jan 2013 08:38:52 +0000 |
Revision: 10659
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10659
Author: sigurdne
Date: 2013-01-10 08:38:51 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Merge 10655:10658 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.boproject.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/hook_settings.inc.php
branches/Version-1_0-branch/property/js/yahoo/project.index.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,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658
Modified: branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
2013-01-10 08:37:00 UTC (rev 10658)
+++ branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
2013-01-10 08:38:51 UTC (rev 10659)
@@ -250,7 +250,7 @@
{
$time = time();
- $_lag = date('n') == 1 ? 12 : 7;
+ $_lag = date('n') == 1 ? 17 : 7;//6 days into next
month, 16 days into next year
if ( date('j',$time) < $_lag ) //Day of the month
without leading zeros
{
Modified: branches/Version-1_0-branch/property/inc/class.boproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2013-01-10 08:37:00 UTC (rev 10658)
+++ branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2013-01-10 08:38:51 UTC (rev 10659)
@@ -38,6 +38,7 @@
var $start;
var $query;
var $filter;
+ var $filter_year;
var $sort;
var $order;
var $cat_id;
@@ -68,11 +69,16 @@
$this->use_session = true;
}
+
+
+ $default_filter_year =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_filter_year'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_filter_year']
== 'current_year' ? date('Y') : 'all';
+
$start =
phpgw::get_var('start', 'int', 'REQUEST', 0);
$query =
phpgw::get_var('query');
$sort =
phpgw::get_var('sort');
$order =
phpgw::get_var('order');
$filter =
phpgw::get_var('filter', 'int');
+ $filter_year =
phpgw::get_var('filter_year', 'string', 'REQUEST', $default_filter_year);
$cat_id =
phpgw::get_var('cat_id', 'int');
$status_id =
phpgw::get_var('status_id');
$user_id =
phpgw::get_var('user_id', 'int');
@@ -84,6 +90,7 @@
$this->allrows =
phpgw::get_var('allrows', 'bool');
$this->start = $start ? $start : 0;
+ $this->filter_year = $filter_year;
if(isset($_POST['query']) || isset($_GET['query']))
{
@@ -447,7 +454,7 @@
'filter' => $this->filter,'cat_id' =>
$this->cat_id,'status_id' => $this->status_id,'wo_hour_cat_id' =>
$this->wo_hour_cat_id,
'start_date'=>$start_date,'end_date'=>$end_date,'allrows'=>isset($data['allrows'])
? $data['allrows'] : '','dry_run' => $data['dry_run'],
'district_id' => $this->district_id, 'criteria'
=> $this->get_criteria($this->criteria_id),
- 'project_type_id' =>
$this->project_type_id));
+ 'project_type_id' =>
$this->project_type_id, 'filter_year' => $this->filter_year));
$this->total_records = $this->so->total_records;
@@ -906,4 +913,9 @@
{
return $this->so->get_periodizations_with_outline();
}
+ public function get_filter_year_list($selected)
+ {
+ $values = $this->so->get_filter_year_list();
+ return $this->bocommon->select_list($selected, $values);
+ }
}
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2013-01-10 08:37:00 UTC (rev 10658)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2013-01-10 08:38:51 UTC (rev 10659)
@@ -121,6 +121,7 @@
$dry_run = isset($data['dry_run']) ?
$data['dry_run'] : '';
$criteria = isset($data['criteria']) &&
$data['criteria'] ? $data['criteria'] : array();
$project_type_id = $data['project_type_id'] ?
(int)$data['project_type_id']:0;
+ $filter_year = isset($data['filter_year']) ?
$data['filter_year'] : '';
$sql = $this->bocommon->fm_cache('sql_project_' .
!!$wo_hour_cat_id);
@@ -689,13 +690,36 @@
. " GROUP BY fm_workorder.id, budget,
combined_cost, billable_hours, closed";
*/
- $sql_workder = 'SELECT
fm_workorder.id, budget, combined_cost, billable_hours, closed, actual_cost,
pending_cost'//, contract_sum, addition, calculation, budget'
- . " FROM fm_workorder"
- . " {$this->join} fm_workorder_status
ON fm_workorder.status = fm_workorder_status.id"
- . " {$this->left_join}
fm_orders_pending_cost_view ON fm_workorder.id =
fm_orders_pending_cost_view.order_id"
- . " WHERE project_id =
'{$project['project_id']}' {$sql_workder_date_filter}";
+
+ if ($filter_year && $filter_year !=
'all')
+ {
+ $_year_arr = array();
+ for ($i=1;$i<14;$i++)
+ {
+ $_year_arr[] =
sprintf("%04s%02s", $filter_year, $i);
+ }
+
+ $sql_filter_period = 'AND
periode IN (' . implode(',', $_year_arr) . ')';
+
+ $sql_workder = 'SELECT
fm_workorder.id, budget, combined_cost, billable_hours, closed,
sum(fm_orders_paid_or_pending_view.amount) AS actual_cost'
+ . " FROM fm_workorder"
+ . " {$this->join}
fm_workorder_status ON fm_workorder.status = fm_workorder_status.id"
+ . " {$this->left_join}
fm_orders_paid_or_pending_view ON (fm_workorder.id =
fm_orders_paid_or_pending_view.order_id {$sql_filter_period})"
+ . " WHERE project_id =
'{$project['project_id']}' {$sql_workder_date_filter} "
+ . " GROUP BY fm_workorder.id,
budget, combined_cost, billable_hours, closed";
//_debug_array($sql_workder);
+ }
+ else
+ {
+ $sql_workder = 'SELECT
fm_workorder.id, budget, combined_cost, billable_hours, closed, actual_cost,
pending_cost'//, contract_sum, addition, calculation, budget'
+ . " FROM fm_workorder"
+ . " {$this->join}
fm_workorder_status ON fm_workorder.status = fm_workorder_status.id"
+ . " {$this->left_join}
fm_orders_pending_cost_view ON fm_workorder.id =
fm_orders_pending_cost_view.order_id"
+ . " WHERE project_id =
'{$project['project_id']}' {$sql_workder_date_filter}";
+ }
+//_debug_array($sql_workder);
+
$this->db->query($sql_workder,__LINE__,__FILE__);
$_obligation = 0;
@@ -708,7 +732,18 @@
if(!$this->db->f('closed'))
{
//$test[] = $this->db->f('id');
- $_obligation =
$_combined_cost - $_actual_cost;
+
+ if ($filter_year &&
$filter_year != 'all')
+ {
+ if($filter_year
== date('Y'))
+ {
+
$_obligation = $_combined_cost - $_actual_cost;
+ }
+ }
+ else
+ {
+ $_obligation =
$_combined_cost - $_actual_cost;
+ }
if((int)$this->db->f('budget') >= 0)
{
if($_obligation
< 0)
@@ -2760,4 +2795,31 @@
return $values;
}
+
+ public function get_filter_year_list()
+ {
+ $sql = 'SELECT min(start_date) AS start_date FROM
fm_project WHERE start_date <> 0';
+ $this->db->query($sql,__LINE__,__FILE__);
+ if($this->db->next_record())
+ {
+ $start_year =
date('Y',$this->db->f('start_date'));
+ }
+ else
+ {
+ $start_year = date('Y');
+ }
+ $end_year = date('Y') + 1;
+ $year_list = array();
+ for ($i=$start_year;$i< $end_year ;$i++)
+ {
+ $year_list[] = array
+ (
+ 'id' => $i,
+ 'name' => $i
+ );
+ }
+ $year_list = array_reverse($year_list);
+
+ return $year_list;
+ }
}
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2013-01-10 08:37:00 UTC (rev 10658)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2013-01-10 08:38:51 UTC (rev 10659)
@@ -100,6 +100,7 @@
$this->user_id = $this->bo->user_id;
$this->criteria_id =
$this->bo->criteria_id;
$this->project_type_id = $this->bo->project_type_id;
+ $this->filter_year =
$this->bo->filter_year;
}
function save_sessiondata()
@@ -231,10 +232,11 @@
."cat_id:'{$this->cat_id}',"
."user_id:'{$this->user_id}',"
."criteria_id:'{$this->criteria_id}',"
-
."project_type_id:':{$this->project_type_id}',"
+
."project_type_id:'{$this->project_type_id}',"
."wo_hour_cat_id:'{$this->wo_hour_cat_id}',"
."second_display:1,"
- ."status_id:'{$this->status_id}'";
+ ."status_id:'{$this->status_id}',"
+ ."filter_year:'{$this->filter_year}'";
$datatable['config']['allow_allrows'] = false;
@@ -280,10 +282,13 @@
$default_value = array
('id'=>'','name'=>lang('no criteria'));
array_unshift
($values_combo_box[5],$default_value);
- $values_combo_box[6] =
$this->bo->get_user_list($this->filter);
- array_unshift
($values_combo_box[6],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('mine
projects')));
+ $values_combo_box[6] =
$this->bo->get_filter_year_list($this->filter_year);
+ array_unshift ($values_combo_box[6],array
('id'=>'all','name'=> lang('all') . ' ' . lang('year')));
+
+ $values_combo_box[7] =
$this->bo->get_user_list($this->filter);
+ array_unshift
($values_combo_box[7],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('mine
projects')));
$default_value = array
('id'=>'','name'=>lang('no user'));
- array_unshift
($values_combo_box[6],$default_value);
+ array_unshift
($values_combo_box[7],$default_value);
$datatable['actions']['form'] = array
@@ -297,7 +302,8 @@
'district_id'
=> $this->district_id,
'part_of_town_id' => $this->part_of_town_id,
'lookup'
=> $lookup,
- 'cat_id'
=> $this->cat_id
+ 'cat_id'
=> $this->cat_id,
+ 'filter_year'
=> $this->filter_year
)
),
'fields' => array
@@ -357,28 +363,27 @@
'type'
=> 'button',
'style'
=> 'filter',
'tab_index' => 6
- ),/*
+ ),
array
- ( //boton
USER
- 'id' =>
'btn_user_id',
- 'name'
=> 'user_id',
- 'value'
=> lang('User'),
+ ( //boton
filter_year
+ 'id' =>
'btn_filter_year',
+ 'name'
=> 'filter_year',
+ 'value'
=> lang('year'),
'type'
=> 'button',
'style'
=> 'filter',
-
'tab_index' => 6
- ),*/
- array
- (
//boton USER
-
// 'id' => 'btn_user_id',
-
'id' => 'sel_filter', // testing traditional listbox for long list
-
'name' => 'filter',
-
'value' => lang('User'),
-
'type' => 'select',
-
'style' => 'filter',
-
'values' => $values_combo_box[6],
-
'onchange'=> 'onChangeSelect("filter");',
-
'tab_index' => 7
- ),
+
'tab_index' => 7
+ ),
+ array
+ (
+ 'id' =>
'sel_filter',
+ 'name'
=> 'filter',
+ 'value'
=> lang('User'),
+ 'type'
=> 'select',
+ 'style'
=> 'filter',
+
'values' => $values_combo_box[7],
+
'onchange'=> 'onChangeSelect("filter");',
+
'tab_index' => 8
+ ),
//for link
"columns", next to Export button
array
(
@@ -390,21 +395,21 @@
'menuaction' => 'property.uiproject.columns'
))."','','width=300,height=600,scrollbars=1')",
'value'
=> lang('columns'),
-
'tab_index' => 13
+
'tab_index' => 14
),
array
(
'type'
=> 'button',
'id'
=> 'btn_export',
'value'
=> lang('download'),
-
'tab_index' => 12
+
'tab_index' => 13
),
array
(
'type'
=> 'button',
'id'
=> 'btn_new',
'value'
=> lang('add'),
-
'tab_index' => 11
+
'tab_index' => 12
),
array
( //hidden
start_date
@@ -432,7 +437,7 @@
'menuaction' => 'property.uiproject.date_search')
)."','','width=350,height=250')",
'value'
=> lang('Date search'),
-
'tab_index' => 10
+
'tab_index' => 11
),
// FIXME test
on lightbox for date search
/*
@@ -451,7 +456,7 @@
'name'
=> 'search',
'value'
=> lang('search'),
'type'
=> 'button',
-
'tab_index' => 9
+
'tab_index' => 10
),
array
( // TEXT INPUT
@@ -461,7 +466,7 @@
'type'
=> 'text',
'onkeypress' => 'return pulsar(event)',
'size'
=> 28,
-
'tab_index' => 8
+
'tab_index' => 9
),
),
'hidden_value' => array
@@ -495,12 +500,12 @@
( //div values
combo_box_5
'id' =>
'values_combo_box_5',
'value'
=> $this->bocommon->select2String($values_combo_box[5])
- )/*,
+ ),
array
- ( //div values
combo_box_5
- 'id' =>
'values_combo_box_5',
- 'value'
=> $this->bocommon->select2String($values_combo_box[5])
- )*/
+ ( //div values
combo_box_6
+ 'id' =>
'values_combo_box_6',
+ 'value'
=> $this->bocommon->select2String($values_combo_box[6])
+ )
)
)
)
Modified: branches/Version-1_0-branch/property/inc/hook_settings.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/hook_settings.inc.php
2013-01-10 08:37:00 UTC (rev 10658)
+++ branches/Version-1_0-branch/property/inc/hook_settings.inc.php
2013-01-10 08:38:51 UTC (rev 10659)
@@ -246,7 +246,14 @@
create_select_box('Default project
type','default_project_type',$default_project_type,'Select your default project
type');
+ $default_project_filter_year =array
+ (
+ 'current_year' => lang('current year'),
+ 'all' => lang('all'),
+ );
+ create_select_box('Default project year
filter','default_project_filter_year',$default_project_filter_year,'Select your
default project year filter');
+
create_select_box('Default project
status','project_status',$_status_project,'The default status for your
projects');
create_select_box('Default workorder
status','workorder_status',$_status_workorder,'The default status for your
workorders');
create_select_box('Default project
categories','project_category',$_categories_project,'The default category for
your projects and workorders');
Modified: branches/Version-1_0-branch/property/js/yahoo/project.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/project.index.js
2013-01-10 08:37:00 UTC (rev 10658)
+++ branches/Version-1_0-branch/property/js/yahoo/project.index.js
2013-01-10 08:38:51 UTC (rev 10659)
@@ -2,15 +2,15 @@
// Declaration of location.index vars
//--------------------------------------------------------
//define SelectButton
- var oMenuButton_0, oMenuButton_1, oMenuButton_2, oMenuButton_3,
oMenuButton_4, oMenuButton_5;
+ var oMenuButton_0, oMenuButton_1, oMenuButton_2, oMenuButton_3,
oMenuButton_4, oMenuButton_5, oMenuButton_6;
var selectsButtons = [
{order:0,
var_URL:'project_type_id',name:'btn_project_type',style:'districtbutton',dependiente:''},
{order:1,
var_URL:'district_id',name:'btn_district_id',style:'districtbutton',dependiente:''},
{order:2,
var_URL:'cat_id',name:'btn_cat_id',style:'categorybutton',dependiente:''},
{order:3,
var_URL:'status_id',name:'btn_status_id',style:'districtbutton',dependiente:''},
- {order:4,
var_URL:'wo_hour_cat_id',name:'btn_hour_category_id',style:'partOFTownbutton',dependiente:''},
-// {order:4, var_URL:'filter',
name:'btn_user_id',style:'ownerIdbutton',dependiente:''},
- {order:5, var_URL:'criteria_id',
name:'btn_criteria_id',style:'criteriabutton',dependiente:''}
+ {order:4,
var_URL:'wo_hour_cat_id',name:'btn_hour_category_id',style:'districtbutton',dependiente:''},
+ {order:5, var_URL:'criteria_id',
name:'btn_criteria_id',style:'criteriabutton',dependiente:''},
+ {order:6, var_URL:'filter_year',
name:'btn_filter_year',style:'districtbutton',dependiente:''}
];
// define buttons
@@ -124,14 +124,12 @@
oMenuButton_5.set("label", ("<em>" +
array_options[5][index][1] + "</em>"));
}
-/*
- //user
- index =
locate_in_array_options(4,"value",path_values.user_id);
+ //filter_year
+ index =
locate_in_array_options(6,"value",path_values.filter_year);
if(index)
{
- oMenuButton_4.set("label", ("<em>" +
array_options[4][index][1] + "</em>"));
+ oMenuButton_6.set("label", ("<em>" +
array_options[6][index][1] + "</em>"));
}
-*/
//focus initial
//--focus for txt_query---
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10659] Merge 10655:10658 from trunk,
Sigurd Nes <=