[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11430] Merge 11423:11429 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11430] Merge 11423:11429 from trunk |
|
Date: |
Tue, 05 Nov 2013 09:09:04 +0000 |
Revision: 11430
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11430
Author: sigurdne
Date: 2013-11-05 09:09:03 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
Merge 11423:11429 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.hook_helper.inc.php
branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
branches/Version-1_0-branch/controller/js/controller/ajax.js
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_month.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_year.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_agresso_X205.php
branches/Version-1_0-branch/property/inc/export/default/Agresso_X114
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429
Modified: branches/Version-1_0-branch/controller/inc/class.hook_helper.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.hook_helper.inc.php
2013-11-04 14:36:06 UTC (rev 11429)
+++ branches/Version-1_0-branch/controller/inc/class.hook_helper.inc.php
2013-11-05 09:09:03 UTC (rev 11430)
@@ -268,14 +268,25 @@
// $my_planned_controls_HTML .= "<ul
style='overflow:hidden;'>";
- $_row_class = '"on"';
foreach($my_planned_controls as $planned_date_ts =>
$planned_controls_on_date)
{
foreach($planned_controls_on_date as
$my_planned_control)
{
- $my_planned_controls_HTML .= "<tr class
= {$_row_class}>";
- $_row_class = $_row_class = '"on"' ?
'"off"' : '"on"';
+ switch ($_row_class)
+ {
+ case 'on':
+ $_row_class = 'off';
+ break;
+ case 'off':
+ $_row_class = 'on';
+ break;
+ default:
+ $_row_class = 'on';
+ }
+
+ $my_planned_controls_HTML .= "<tr class
= '{$_row_class}'>";
+
$deadline_ts = $my_planned_control[0];
$my_control = $my_planned_control[1];
Modified: branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2013-11-04 14:36:06 UTC (rev 11429)
+++ branches/Version-1_0-branch/controller/inc/class.socontrol.inc.php
2013-11-05 09:09:03 UTC (rev 11430)
@@ -608,7 +608,7 @@
$title = $this->unmarshal($this->db->f('title',
true), 'string');
$location_code =
$this->unmarshal($this->db->f('location_code', true), 'string');
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code,'extra' => array('noattrib' => true)));
$location_arr = explode('-', $location_code);
$loc_name_arr = array();
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2013-11-04 14:36:06 UTC (rev 11429)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2013-11-05 09:09:03 UTC (rev 11430)
@@ -451,11 +451,27 @@
$control_id = phpgw::get_var('control_id', 'int');
$control = $this->so_control->get_single($control_id);
$year = phpgw::get_var('year', 'int');
+ $location_code = phpgw::get_var('location_code');
+ $locations_list = array();
+
if (is_numeric($control_id) & $control_id > 0)
{
$locations_for_control_array =
$this->so_control->get_locations_for_control($control_id);
$components_for_control_array =
$this->so_control->get_components_for_control($control_id);
+ foreach ($locations_for_control_array as
$location)
+ {
+ $locations_list[] = array
+ (
+ 'id' =>
$location['location_code'],
+ 'name' =>
$location['loc_name'],
+ 'selected' =>
$location_code == $location['location_code'] ? 1 : 0
+ );
+ }
+
+ reset($locations_for_control_array);
+ unset($location);
+
}
// Validates year. If year is not set, current year is
chosen
@@ -469,12 +485,18 @@
$locations_with_calendar_array = array();
+
// LOCATIONS: Process aggregated values for controls
with repeat type day or week
if ($control->get_repeat_type() <=
controller_control::REPEAT_TYPE_WEEK)
{
foreach ($locations_for_control_array as
$location)
{
$curr_location_code =
$location['location_code'];
+
+ if(!$location_code ||
$curr_location_code != $location_code)
+ {
+ continue;
+ }
$cl_criteria = new
controller_check_list();
$cl_criteria->set_control_id($control->get_id());
@@ -523,6 +545,11 @@
{
$curr_location_code =
$location['location_code'];
+ if(!$location_code ||
$curr_location_code != $location_code)
+ {
+ continue;
+ }
+
$repeat_type =
$control->get_repeat_type();
$check_lists_array =
$this->so->get_check_lists_for_control_and_location($control_id,
$curr_location_code, $from_date_ts, $to_date_ts, $repeat_type);
@@ -578,12 +605,14 @@
$data = array
(
+ 'locations_list'
=> $locations_list,
'my_locations'
=> $my_locations,
'control'
=> $control->toArray(),
'heading_array'
=> $heading_array,
'locations_with_calendar_array' =>
$locations_with_calendar_array,
'components_with_calendar_array' =>
$components_with_calendar_array,
'current_year'
=> $year,
+ 'location_code'
=> $location_code
);
self::render_template_xsl(array('calendar/view_calendar_year_for_locations',
'calendar/check_list_status_manager',
@@ -599,11 +628,25 @@
$control = $this->so_control->get_single($control_id);
$year = intval(phpgw::get_var('year'));
$month = intval(phpgw::get_var('month'));
+ $location_code = phpgw::get_var('location_code');
if (is_numeric($control_id) & $control_id > 0)
{
$locations_for_control_array =
$this->so_control->get_locations_for_control($control_id);
$components_for_control_array =
$this->so_control->get_components_for_control($control_id);
+ foreach ($locations_for_control_array as
$location)
+ {
+ $locations_list[] = array
+ (
+ 'id' =>
$location['location_code'],
+ 'name' =>
$location['loc_name'],
+ 'selected' =>
$location_code == $location['location_code'] ? 1 : 0
+ );
+ }
+
+ reset($locations_for_control_array);
+ unset($location);
+
}
// Validates year. If year is not set, current year is
chosen
@@ -624,6 +667,11 @@
{
$curr_location_code =
$location['location_code'];
+ if(!$location_code || $curr_location_code !=
$location_code)
+ {
+ continue;
+ }
+
$repeat_type = $control->get_repeat_type();
$check_lists_array =
$this->so->get_check_lists_for_control_and_location($control_id,
$curr_location_code, $from_date_ts, $to_date_ts, $control->get_repeat_type());
@@ -655,16 +703,18 @@
$heading_array =
month_calendar::get_heading_array($year, $month);
$data = array
- (
- 'control' => $control->toArray(),
- 'my_locations' => $my_locations,
- 'property_array' => $property_array,
- 'location_array' => $location_array,
- 'heading_array' => $heading_array,
- 'locations_with_calendar_array' =>
$locations_with_calendar_array,
- 'components_with_calendar_array' =>
$components_with_calendar_array,
- 'current_year' => $year,
- 'current_month_nr' => $month,
+ (
+ 'control'
=> $control->toArray(),
+ 'my_locations'
=> $my_locations,
+ 'property_array'
=> $property_array,
+ 'location_array'
=> $location_array,
+ 'heading_array'
=> $heading_array,
+ 'locations_with_calendar_array' =>
$locations_with_calendar_array,
+ 'components_with_calendar_array' =>
$components_with_calendar_array,
+ 'current_year'
=> $year,
+ 'current_month_nr'
=> $month,
+ 'locations_list'
=> $locations_list,
+ 'location_code'
=> $location_code
);
self::render_template_xsl(array('calendar/view_calendar_month_for_locations',
'calendar/check_list_status_manager',
Modified: branches/Version-1_0-branch/controller/js/controller/ajax.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/ajax.js
2013-11-04 14:36:06 UTC (rev 11429)
+++ branches/Version-1_0-branch/controller/js/controller/ajax.js
2013-11-05 09:09:03 UTC (rev 11430)
@@ -574,6 +574,23 @@
window.location.href = requestUrl;
}
+ else if(location_code != "" & period_type ==
'view_year_for_locations')
+ {
+ var control_id =
$(thisForm).find("input[name='control_id']").val();
+ var oArgs =
{menuaction:'controller.uicalendar.view_calendar_year_for_locations'};
+ var baseUrl = phpGWLink('index.php', oArgs, false);
+ var requestUrl = baseUrl + "&location_code=" +
location_code + "&year=" + year + "&control_id=" + control_id;
+ window.location.href = requestUrl;
+ }
+ else if(location_code != "" & period_type ==
'view_month_for_locations')
+ {
+ var control_id =
$(thisForm).find("input[name='control_id']").val();
+ var oArgs =
{menuaction:'controller.uicalendar.view_calendar_month_for_locations'};
+ var baseUrl = phpGWLink('index.php', oArgs, false);
+ var requestUrl = baseUrl + "&location_code=" +
location_code + "&year=" + year + "&control_id=" + control_id;
+ window.location.href = requestUrl;
+ }
+
});
// CALENDAR FILTERS
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_month.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_month.xsl
2013-11-04 14:36:06 UTC (rev 11429)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_month.xsl
2013-11-05 09:09:03 UTC (rev 11430)
@@ -1,6 +1,7 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="nav_calendar_month" xmlns:php="http://php.net/xsl";>
<xsl:param name="view" />
+<xsl:param name="location_code" />
<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="calNav">
@@ -13,6 +14,8 @@
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id" />
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of select="$location_code"/>
</xsl:when>
<xsl:when test="$view =
'VIEW_CONTROLS_FOR_LOCATION'">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
@@ -39,6 +42,8 @@
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id" />
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of select="$location_code"/>
</xsl:when>
<xsl:when test="$view =
'VIEW_CONTROLS_FOR_LOCATION'">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
@@ -71,6 +76,8 @@
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id" />
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of select="$location_code"/>
</xsl:when>
<xsl:when test="$view =
'VIEW_CONTROLS_FOR_LOCATION'">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
@@ -97,6 +104,8 @@
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id" />
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of select="$location_code"/>
</xsl:when>
<xsl:when test="$view =
'VIEW_CONTROLS_FOR_LOCATION'">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_year.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_year.xsl
2013-11-04 14:36:06 UTC (rev 11429)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/nav_calendar_year.xsl
2013-11-05 09:09:03 UTC (rev 11430)
@@ -1,6 +1,8 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="nav_calendar_year" xmlns:php="http://php.net/xsl";>
<xsl:param name="view" />
+<xsl:param name="location_code" />
+
<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="calNav">
<a class="showPrev">
@@ -10,6 +12,8 @@
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_year_for_locations</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of
select="control/id" />
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="$location_code"/>
</xsl:when>
<xsl:when test="$view =
'VIEW_CONTROLS_FOR_LOCATION'">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
@@ -34,6 +38,8 @@
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_year_for_locations</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of
select="control/id" />
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="$location_code"/>
</xsl:when>
<xsl:when test="$view =
'VIEW_CONTROLS_FOR_LOCATION'">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2013-11-04 14:36:06 UTC (rev 11429)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2013-11-05 09:09:03 UTC (rev 11430)
@@ -3,12 +3,46 @@
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
<xsl:variable name="month_str">month <xsl:value-of select="current_month_nr"/>
capitalized</xsl:variable>
<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="location_code"><xsl:value-of select="location_code"
/></xsl:variable>
<div id="main_content">
<div id="control_plan">
<div class="top">
<h1>Kontrollplan for <xsl:value-of
select="control/title"/></h1>
<h3>Oversikt for <span class="month"><xsl:value-of
select="php:function('lang', $month_str)" /></span><span
class="year"><xsl:value-of select="current_year"/></span></h3>
+ <div id="choose-my-location" class="select-box">
+ <label>Velg en lokasjon</label>
+ <form action="#">
+ <input type="hidden"
name="period_type" value="view_month_for_locations" />
+ <input type="hidden"
name="year">
+ <xsl:attribute name="value">
+ <xsl:value-of
select="current_year"/>
+ </xsl:attribute>
+ </input>
+ <input type="hidden"
name="control_id">
+ <xsl:attribute name="value">
+ <xsl:value-of
select="//control/id"/>
+ </xsl:attribute>
+ </input>
+ <select id="choose-my-location"
class="select-location">
+ <option>Velg bygg</option>
+ <xsl:for-each
select="locations_list">
+ <option>
+ <xsl:if
test="selected = 1">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="id"/>
+ </xsl:attribute>
+ <xsl:value-of
select="id"/>
+ <xsl:text> -
</xsl:text>
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </form>
+ </div>
+
</div>
<div class="middle">
<!-- ===================== ICON COLOR MAP
================= -->
@@ -23,6 +57,8 @@
<xsl:value-of
select="current_year"/>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of
select="control/id"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="$location_code"/>
<xsl:value-of
select="$session_url"/>
</xsl:attribute>
Årsoversikt
@@ -32,6 +68,7 @@
<!-- ===================== CALENDAR NAVIGATION
================= -->
<xsl:call-template name="nav_calendar_month">
<xsl:with-param
name="view">VIEW_LOCATIONS_FOR_CONTROL</xsl:with-param>
+ <xsl:with-param name="location_code"><xsl:value-of
select="$location_code"/></xsl:with-param>
</xsl:call-template>
</div>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2013-11-04 14:36:06 UTC (rev 11429)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2013-11-05 09:09:03 UTC (rev 11430)
@@ -2,7 +2,9 @@
<xsl:template match="data" 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="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+<xsl:variable name="location_code"><xsl:value-of select="location_code"
/></xsl:variable>
+
<div id="main_content">
<div id="control_plan">
@@ -10,6 +12,39 @@
<h1>Kontrollplan for <xsl:value-of
select="control/title"/></h1>
<h3>Periode: <xsl:value-of select="current_year"/></h3>
+ <div id="choose-my-location" class="select-box">
+ <label>Velg en lokasjon</label>
+ <form action="#">
+ <input type="hidden"
name="period_type" value="view_year_for_locations" />
+ <input type="hidden"
name="year">
+ <xsl:attribute name="value">
+ <xsl:value-of
select="current_year"/>
+ </xsl:attribute>
+ </input>
+ <input type="hidden"
name="control_id">
+ <xsl:attribute name="value">
+ <xsl:value-of
select="//control/id"/>
+ </xsl:attribute>
+ </input>
+ <select id="choose-my-location"
class="select-location">
+ <option>Velg bygg</option>
+ <xsl:for-each
select="locations_list">
+ <option>
+ <xsl:if
test="selected = 1">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="id"/>
+ </xsl:attribute>
+ <xsl:value-of
select="id"/>
+ <xsl:text> -
</xsl:text>
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </form>
+ </div>
+
</div>
<div class="middle">
@@ -19,6 +54,7 @@
<!-- ===================== CALENDAR NAVIGATION
================= -->
<xsl:call-template name="nav_calendar_year">
<xsl:with-param
name="view">VIEW_LOCATIONS_FOR_CONTROL</xsl:with-param>
+ <xsl:with-param name="location_code"><xsl:value-of
select="$location_code"/></xsl:with-param>
</xsl:call-template>
</div>
<div id="cal_wrp">
@@ -42,6 +78,8 @@
<xsl:number/>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="//control/id"/>
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of select="$location_code"/>
<xsl:value-of select="$session_url"/>
</xsl:attribute>
@@ -108,6 +146,8 @@
<xsl:number/>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="//control/id"/>
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of select="$location_code"/>
<xsl:value-of select="$session_url"/>
</xsl:attribute>
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2013-11-04 14:36:06 UTC (rev 11429)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2013-11-05 09:09:03 UTC (rev 11430)
@@ -1339,7 +1339,6 @@
#calendar .location-name, #calendar .component-type {
width: 150px;
text-align: left;
- white-space: nowrap;
}
#calendar .frequency {
Modified:
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_agresso_X205.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_agresso_X205.php
2013-11-04 14:36:06 UTC (rev 11429)
+++
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_agresso_X205.php
2013-11-05 09:09:03 UTC (rev 11430)
@@ -34,9 +34,9 @@
*/
- class Import_fra_basware_X205
+ class Import_fra_agresso_X205
{
- var $function_name = 'Import_fra_basware_X205';
+ var $function_name = 'Import_fra_agresso_X205';
var $auto_tax = true;
var $mvakode=0;
var $kildeid=1;
@@ -144,7 +144,7 @@
'message' =>
$this->receipt['message'],
'lang_confirm_msg' =>
$lang_confirm_msg,
'lang_yes' =>
$lang_yes,
- 'lang_yes_statustext' => 'Importer faktura
fra Basware',
+ 'lang_yes_statustext' => 'Importer faktura
fra Agresso',
'lang_no_statustext' => 'tilbake',
'lang_no' =>
lang('no'),
'lang_done' =>
'Avbryt',
@@ -152,7 +152,7 @@
);
$appname = lang('location');
- $function_msg = 'Importer faktura fra Basware';
+ $function_msg = 'Importer faktura fra Agresso';
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('confirm' => $data));
$GLOBALS['phpgw']->xslttpl->pp();
@@ -774,7 +774,7 @@
if($e)
{
$GLOBALS['phpgw']->log->error(array(
- 'text' =>
'import_fra_basware_X205::import() : error when trying to execute
import_end_file(): %1',
+ 'text' =>
'import_fra_agresso_X205::import() : error when trying to execute
import_end_file(): %1',
'p1' =>
$e->getMessage(),
'p2' => '',
'line' =>
__LINE__,
Modified: branches/Version-1_0-branch/property/inc/export/default/Agresso_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Agresso_X114
2013-11-04 14:36:06 UTC (rev 11429)
+++ branches/Version-1_0-branch/property/inc/export/default/Agresso_X114
2013-11-05 09:09:03 UTC (rev 11430)
@@ -632,11 +632,11 @@
{
if(!$external_voucher_id)
{
- throw new Exception('Agresso_X114::LagFilnavn()
Mangler SCANNINGNO' );
+ throw new Exception('Agresso_X114::LagFilnavn()
Mangler KEY' );
}
$fil_katalog =
$this->config->config_data['export']['path'];
- $Filnavn = $fil_katalog .
"/x114_{$this->client_code}_{$external_voucher_id}.xml";
+ $Filnavn = $fil_katalog .
"/x114_{$this->client_code}_OK_{$external_voucher_id}.xml";
//Sjekk om filen eksisterer
if (file_exists($Filnavn))
@@ -815,45 +815,13 @@
$comment = array();
foreach ($oRsBilag as $line)
{
- $comment[] =
"{$line['belop']}::{$line['process_log']}";
-
- $BelopFelt = 'godkjentbelop';
-
-/*
- //Bestem belops felt
- if ($line['splitt'] == 0)
+ if($line['process_log'])
{
- //Bilaget er ikke splittet
- if ($line['godkjentbelop'] <>
$line['belop'])
- {
- $BelopFelt = 'godkjentbelop';
- //Logg til avviks tabell
- if ($download=='on')
- {
-//
$this->soXport->log_to_deviation_table($line);
- }
- }
- else
- {
- $BelopFelt = 'belop';
- }
+ $comment[] =
"{$line['belop']}::{$line['process_log']}";
}
-*/
- //Bilaget er splittet
-/*
- if ($line['godkjentbelop'] == $line['belop'])
- {
- $BelopFelt = 'godkjentbelop';
- }
- else
- {
- //Ikke lovlig
- $message = lang('Avvik mellom
fakturabelop og godkjent belop pa splittet faktura!');
- $this->errorhandler($batchid,$message);
- return $message;
- }
-*/
+ $BelopFelt = 'godkjentbelop';
+
$amount = $line[$BelopFelt] * 100;
$amount = number_format($amount,0,'','');
@@ -929,7 +897,7 @@
(
'TRANSACTIONTYPE' =>
'R114',
'ACCOUNTLINK.CODE' =>
$line['spbudact_code'], // 4180
- 'CURRENCY'
=> $line['currency']
+ 'CURRENCY'
=> $line['currency'],
'AMOUNT'
=> $amount, // 312500
'TAXCODE'
=> $line['mvakode'],
'APPROVER.FULLNAME' =>
$line['budsjettansvarligid'], //Batch 04 - 14
@@ -960,7 +928,7 @@
(
'TRANSACTIONTYPE' =>
'R114',
'ACCOUNTLINK.CODE' => 2400,
- 'CURRENCY'
=> $oRsBilag[0]['currency']
+ 'CURRENCY'
=> $oRsBilag[0]['currency'],
'AMOUNT'
=> (-1 * $sum_amount),
'TAXCODE'
=> $oRsBilag[0]['mvakode'],
'APPROVER.FULLNAME' => '',
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11430] Merge 11423:11429 from trunk,
Sigurd Nes <=