[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16983] Stable: Merge 16978:16982 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16983] Stable: Merge 16978:16982 from trunk |
|
Date: |
Thu, 17 Aug 2017 04:36:15 -0400 (EDT) |
Revision: 16983
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16983
Author: sigurdne
Date: 2017-08-17 04:36:14 -0400 (Thu, 17 Aug 2017)
Log Message:
-----------
Stable: Merge 16978:16982 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/controller/inc/class.socheck_list.inc.php
branches/Version-2_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-2_0-branch/controller/inc/component/class.check_list_status_info.inc.php
branches/Version-2_0-branch/controller/inc/component/class.check_list_status_manager.inc.php
branches/Version-2_0-branch/controller/inc/component/class.year_calendar.inc.php
branches/Version-2_0-branch/controller/inc/model/class.check_list.inc.php
branches/Version-2_0-branch/controller/setup/setup.inc.php
branches/Version-2_0-branch/controller/setup/tables_current.inc.php
branches/Version-2_0-branch/controller/setup/tables_update.inc.php
branches/Version-2_0-branch/controller/templates/base/check_list/add_check_list.xsl
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-2_0-branch/property/inc/class.sobudget.inc.php
branches/Version-2_0-branch/setup/inc/functions.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-08-16 13:47:42 UTC (rev 16982)
+++ branches/Version-2_0-branch 2017-08-17 08:36:14 UTC (rev 16983)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982
\ No newline at end of property
Modified: branches/Version-2_0-branch/controller/inc/class.socheck_list.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.socheck_list.inc.php
2017-08-16 13:47:42 UTC (rev 16982)
+++ branches/Version-2_0-branch/controller/inc/class.socheck_list.inc.php
2017-08-17 08:36:14 UTC (rev 16983)
@@ -61,7 +61,7 @@
public function get_single( $check_list_id )
{
$check_list_id = (int)$check_list_id;
- $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.control_id, cl.comment as cl_comment, deadline, planned_date,assigned_to,
billable_hours, ";
+ $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.control_id, cl.comment as cl_comment, deadline, original_deadline,
planned_date,assigned_to, billable_hours, ";
$sql .= "completed_date, location_code, component_id,
num_open_cases, num_pending_cases, location_id, ci.id as ci_id,
control_item_id,serie_id ";
$sql .= "FROM controller_check_list cl ";
$sql .= "LEFT JOIN controller_check_item as ci ON cl.id
= ci.check_list_id ";
@@ -75,6 +75,7 @@
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_original_deadline($this->unmarshal($this->db->f('original_deadline'),
'int'));
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
@@ -108,7 +109,7 @@
public function get_single_with_check_items( $check_list_id,
$status, $type )
{
$check_list_id = (int)$check_list_id;
- $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.control_id, cl.comment as cl_comment, deadline, planned_date,
completed_date,assigned_to, num_open_cases, location_code, num_pending_cases, ";
+ $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.control_id, cl.comment as cl_comment, deadline, original_deadline,
planned_date, completed_date,assigned_to, num_open_cases, location_code,
num_pending_cases, ";
$sql .= "ci.id as ci_id, control_item_id,
check_list_id, cl.serie_id";
$sql .= "coi.title as coi_title, coi.required as
coi_required, ";
$sql .= "coi.what_to_do as coi_what_to_do,
coi.how_to_do as coi_how_to_do, coi.control_group_id as coi_control_group_id,
coi.type ";
@@ -144,6 +145,7 @@
$check_list->set_control_id($this->unmarshal($this->db->f('control_id'),
'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_original_deadline($this->unmarshal($this->db->f('original_deadline'),
'int'));
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
@@ -195,7 +197,7 @@
{
$control_id = (int)$control_id;
- $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, assigned_to, ";
+ $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, original_deadline, planned_date,
assigned_to, ";
$sql .= "completed_date, component_id, location_code,
num_open_cases, num_pending_cases ";
$sql .= "ci.id as ci_id, control_item_id,
check_list_id, cl.serie_id";
$sql .= "FROM controller_check_list cl,
controller_check_item ci ";
@@ -221,6 +223,7 @@
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_original_deadline($this->unmarshal($this->db->f('original_deadline'),
'int'));
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
$check_list->set_component_id($this->unmarshal($this->db->f('component_id'),
'int'));
@@ -286,6 +289,7 @@
$check_list->set_status($this->unmarshal($this->db->f('status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('comment'), 'string'));
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_original_deadline($this->unmarshal($this->db->f('original_deadline'),
'int'));
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
$check_list->set_component_id($this->unmarshal($this->db->f('component_id'),
'int'));
@@ -320,7 +324,7 @@
$component_filter = " AND component_id =
{$component_id} AND location_id = {$location_id} ";
}
- $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, assigned_to,";
+ $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, original_deadline, planned_date,
assigned_to,";
$sql .= "completed_date, component_id, location_code,
num_open_cases, num_pending_cases, cl.serie_id ";
$sql .= "FROM controller_check_list cl ";
$sql .= "WHERE cl.control_id = {$control_id} ";
@@ -346,6 +350,7 @@
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment'),
'string'));
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_original_deadline($this->unmarshal($this->db->f('original_deadline'),
'int'));
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
$check_list->set_component_id($this->unmarshal($this->db->f('component_id'),
'int'));
@@ -424,7 +429,7 @@
function get_check_lists_for_location( $location_code,
$from_date_ts, $to_date_ts, $repeat_type_expr = null )
{
$sql = "SELECT c.id as c_id, ";
- $sql .= "cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, completed_date, assigned_to,
";
+ $sql .= "cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, original_deadline, planned_date,
completed_date, assigned_to, ";
$sql .= "cl.component_id as cl_component_id,
cl.location_code as cl_location_code, num_open_cases, num_pending_cases,
cl.serie_id ";
$sql .= "FROM controller_control c ";
$sql .= "LEFT JOIN controller_check_list cl on
cl.control_id = c.id ";
@@ -462,6 +467,7 @@
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_original_deadline($this->unmarshal($this->db->f('original_deadline'),
'int'));
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id'),
'int'));
@@ -531,7 +537,7 @@
$component_id = (int)$component_id;
$sql = "SELECT c.id as c_id, ";
- $sql .= "cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, completed_date, assigned_to,
";
+ $sql .= "cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, original_deadline, planned_date,
completed_date, assigned_to, ";
$sql .= "cl.component_id, cl.location_id,
cl.location_code as cl_location_code, num_open_cases, num_pending_cases,
cl.serie_id ";
$sql .= "FROM controller_control c ";
$sql .= "LEFT JOIN controller_check_list cl on
cl.control_id = c.id ";
@@ -570,6 +576,7 @@
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_original_deadline($this->unmarshal($this->db->f('original_deadline'),
'int'));
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
$check_list->set_component_id($this->unmarshal($this->db->f('component_id'),
'int'));
@@ -608,7 +615,7 @@
{
$control_id = (int)$control_id;
- $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, completed_date, assigned_to,
";
+ $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, original_deadline, planned_date,
completed_date, assigned_to, ";
$sql .= "cl.component_id as cl_component_id,
cl.location_code as cl_location_code, num_open_cases, num_pending_cases,
cl.serie_id ";
$sql .= "FROM controller_check_list cl ";
$sql .= "LEFT JOIN controller_control c on
cl.control_id = c.id ";
@@ -634,6 +641,7 @@
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_original_deadline($this->unmarshal($this->db->f('original_deadline'),
'int'));
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id'),
'int'));
@@ -666,7 +674,7 @@
$component_id = (int)$component_id;
$user_id = (int)$user_id;
- $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, completed_date,
cl.assigned_to, ";
+ $sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, original_deadline, planned_date,
completed_date, cl.assigned_to, ";
$sql .= "cl.component_id as cl_component_id,
cl.location_id as cl_location_id,"
. " cl.location_code as cl_location_code,
num_open_cases, num_pending_cases ,cl.serie_id, cl.billable_hours,
cs.repeat_type ";
$sql .= "FROM controller_check_list cl ";
@@ -697,6 +705,7 @@
$check_list->set_status($this->unmarshal($this->db->f('cl_status'), 'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
$check_list->set_deadline($this->unmarshal($this->db->f('deadline'), 'int'));
+
$check_list->set_original_deadline($this->unmarshal($this->db->f('original_deadline'),
'int'));
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date'),
'int'));
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date'),
'int'));
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id'),
'int'));
@@ -814,6 +823,7 @@
'control_id',
'comment',
'deadline',
+ 'original_deadline',
'planned_date',
'completed_date',
'component_id',
@@ -830,6 +840,7 @@
$this->marshal($check_list->get_control_id(),
'int'),
$this->marshal($check_list->get_comment(),
'string'),
$this->marshal($check_list->get_deadline(),
'int'),
+
$this->marshal($check_list->get_original_deadline(), 'int'),
$this->marshal($check_list->get_planned_date(),
'int'),
$this->marshal($check_list->get_completed_date(), 'int'),
$this->marshal($check_list->get_component_id(),
'int'),
@@ -901,6 +912,7 @@
'status = ' . $check_list->get_status(),
'comment = ' .
$this->marshal($check_list->get_comment(), 'string'),
'deadline = ' .
$this->marshal($check_list->get_deadline(), 'int'),
+ 'original_deadline = ' .
$this->marshal($check_list->get_original_deadline(), 'int'),
'planned_date = ' .
$this->marshal($check_list->get_planned_date(), 'int'),
'completed_date = ' .
$this->marshal($check_list->get_completed_date(), 'int'),
'location_code = ' .
$this->marshal($check_list->get_location_code(), 'string'),
Modified: branches/Version-2_0-branch/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uicheck_list.inc.php
2017-08-16 13:47:42 UTC (rev 16982)
+++ branches/Version-2_0-branch/controller/inc/class.uicheck_list.inc.php
2017-08-17 08:36:14 UTC (rev 16983)
@@ -219,6 +219,7 @@
$type = phpgw::get_var('type');
$control_id = phpgw::get_var('control_id');
$deadline_ts = phpgw::get_var('deadline_ts');
+ $original_deadline_date_ts =
phpgw::get_var('deadline_ts');
$deadline_current =
phpgw::get_var('deadline_current', 'bool');
$serie_id = phpgw::get_var('serie_id', 'int');
@@ -245,6 +246,7 @@
$check_list = new controller_check_list();
$check_list->set_control_id($control_id);
$check_list->set_deadline($deadline_ts);
+
$check_list->set_original_deadline($original_deadline_date_ts);
}
else
{
@@ -678,6 +680,7 @@
$status = (int)phpgw::get_var('status');
$type = phpgw::get_var('type');
$deadline_date = phpgw::get_var('deadline_date',
'string');
+ $original_deadline_date_ts =
phpgw::get_var('original_deadline_date', 'int');
$planned_date = phpgw::get_var('planned_date',
'string');
$completed_date = phpgw::get_var('completed_date',
'string');
$comment = phpgw::get_var('comment', 'string');
@@ -685,6 +688,7 @@
$billable_hours = phpgw::get_var('billable_hours',
'float');
$deadline_date_ts =
date_converter::date_to_timestamp($deadline_date);
+ //$original_deadline_date_ts =
date_converter::date_to_timestamp($original_deadline_date);
$error = false;
@@ -749,6 +753,7 @@
$check_list->set_comment($comment);
$check_list->set_deadline($deadline_date_ts);
+
$check_list->set_original_deadline($original_deadline_date_ts);
$check_list->set_planned_date($planned_date_ts);
$check_list->set_completed_date($completed_date_ts);
@@ -854,7 +859,7 @@
$_serie_id =
$check_list->get_serie_id();
$text_description =
str_replace('&', '&',
"Serie#{$_serie_id}::Mobilefrontend:\\n{$link_mobilefrontend}\\n\\nSerie#{$_serie_id}::Backend:\\n{$link_backend}");
-
+/*
if ($from_address && $to_address)
{
$this->sendIcalEvent($from_name, $from_address, $to_name, $to_address,
$startTime, $endTime, $subject, $html_description, $text_description,
$location);
@@ -863,7 +868,7 @@
{
phpgwapi_cache::message_set("Mangler epostadresse til avsender eller addresat -
eller begge", 'error');
}
- }
+*/ }
if ($check_list_id > 0)
{
Modified:
branches/Version-2_0-branch/controller/inc/component/class.check_list_status_info.inc.php
===================================================================
---
branches/Version-2_0-branch/controller/inc/component/class.check_list_status_info.inc.php
2017-08-16 13:47:42 UTC (rev 16982)
+++
branches/Version-2_0-branch/controller/inc/component/class.check_list_status_info.inc.php
2017-08-17 08:36:14 UTC (rev 16983)
@@ -37,6 +37,7 @@
private $status_text;
private $deadline_date_ts;
private $deadline_date_txt;
+ private $original_deadline_date_ts;
private $info_text;
private $location_code;
private $component_id;
@@ -101,7 +102,17 @@
{
return $this->deadline_date_ts;
}
+
+ public function set_original_deadline_date_ts(
$original_deadline_date_ts )
+ {
+ $this->original_deadline_date_ts =
$original_deadline_date_ts;
+ }
+ public function get_original_deadline_date_ts()
+ {
+ return $this->original_deadline_date_ts;
+ }
+
public function set_deadline_date_txt( $deadline_date_txt )
{
$this->deadline_date_txt = $deadline_date_txt;
@@ -211,6 +222,7 @@
'status_text' => $this->get_status_text(),
'deadline_date_ts' =>
$this->get_deadline_date_ts(),
'deadline_date_txt' =>
$this->get_deadline_date_txt(),
+ 'original_deadline_date_ts' =>
$this->get_original_deadline_date_ts(),
'info_text' => $this->get_info_text(),
'location_code' => $this->get_location_code(),
'location_id' => $this->get_location_id(),
Modified:
branches/Version-2_0-branch/controller/inc/component/class.check_list_status_manager.inc.php
===================================================================
---
branches/Version-2_0-branch/controller/inc/component/class.check_list_status_manager.inc.php
2017-08-16 13:47:42 UTC (rev 16982)
+++
branches/Version-2_0-branch/controller/inc/component/class.check_list_status_manager.inc.php
2017-08-17 08:36:14 UTC (rev 16983)
@@ -103,6 +103,7 @@
$check_list_status_info->set_control_id($this->check_list->get_control_id());
$check_list_status_info->set_deadline_date_txt(date($dateformat,
$this->check_list->get_deadline()));
$check_list_status_info->set_deadline_date_ts($this->check_list->get_deadline());
+
$check_list_status_info->set_original_deadline_date_ts($this->check_list->get_original_deadline());
$check_list_status_info->set_type($this->type);
$check_list_status_info->set_assigned_to($this->check_list->get_assigned_to());
Modified:
branches/Version-2_0-branch/controller/inc/component/class.year_calendar.inc.php
===================================================================
---
branches/Version-2_0-branch/controller/inc/component/class.year_calendar.inc.php
2017-08-16 13:47:42 UTC (rev 16982)
+++
branches/Version-2_0-branch/controller/inc/component/class.year_calendar.inc.php
2017-08-17 08:36:14 UTC (rev 16983)
@@ -51,10 +51,12 @@
$period_end_date_ts =
$this->get_start_date_year_ts($this->year + 1);
$repeat_type = $this->control->get_repeat_type();
$repeat_interval =
$this->control->get_repeat_interval();
+ //$has_check_lists =
// Generates dates for time period with specified
interval
$date_generator = new
date_generator($ctr_start_date_ts, $ctr_end_date_ts, $period_start_date_ts,
$period_end_date_ts, $repeat_type, $repeat_interval);
$dates_array = $date_generator->get_dates();
+// _debug_array($dates_array);
// Set status for control on each date to NOT DONE or
REGISTERED
foreach ($dates_array as $date_ts)
@@ -113,7 +115,54 @@
$this->calendar_array[$month_nr]["info"] = $check_list_status_info->serialize();
}
}
-
+// _debug_array($this->calendar_array);
+ /*Insert code to remove controls with changed due-date
from array*/
+ $m_cnt = 0;
+ $not_done_due_date;
+ $new_calendar_array = array();
+ $found = false;
+ $moved_control_dates = NULL;
+ foreach ($this->calendar_array as $cal)
+ {
+ if(is_array($cal))
+ {
+
if(isset($cal['info']['original_deadline_date_ts']) &&
$cal['info']['original_deadline_date_ts'] > 0)
+ {
+ $found = true;
+ $moved_control_dates[] =
$cal['info']['original_deadline_date_ts'];
+ }
+ }
+ }
+ if($found)
+ {
+ foreach ($this->calendar_array as $cal2)
+ {
+ $m_cnt++;
+ if(is_array($cal2))
+ {
+ if($cal2['info']['status'] ==
'CONTROL_NOT_DONE')
+ {
+
if(in_array($cal2['info']['deadline_date_ts'], $moved_control_dates))
+ {
+
$new_calendar_array[$m_cnt] = NULL;
+ }
+ else
+ {
+
$new_calendar_array[$m_cnt] = $cal2;
+ }
+ }
+ else
+ {
+
$new_calendar_array[$m_cnt] = $cal2;
+ }
+ }
+ else
+ {
+ $new_calendar_array[$m_cnt] =
NULL;
+ }
+ }
+ $this->calendar_array = $new_calendar_array;
+ }
return $this->calendar_array;
}
Modified:
branches/Version-2_0-branch/controller/inc/model/class.check_list.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/model/class.check_list.inc.php
2017-08-16 13:47:42 UTC (rev 16982)
+++ branches/Version-2_0-branch/controller/inc/model/class.check_list.inc.php
2017-08-17 08:36:14 UTC (rev 16983)
@@ -2,7 +2,7 @@
/**
* phpGroupWare - controller: a part of a Facilities Management System.
*
- * @author Erink Holm-Larsen <address@hidden>
+ * @author Erik Holm-Larsen <address@hidden>
* @author Torstein Vadla <address@hidden>
* @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc.
http://www.fsf.org/
* This file is part of phpGroupWare.
@@ -47,6 +47,7 @@
protected $status;
protected $comment;
protected $deadline;
+ protected $original_deadline;
protected $start_date;
protected $end_date;
protected $planned_date;
@@ -169,7 +170,17 @@
{
return $this->deadline;
}
+
+ public function set_original_deadline( $original_deadline )
+ {
+ $this->original_deadline = $original_deadline;
+ }
+ public function get_original_deadline()
+ {
+ return $this->original_deadline;
+ }
+
public function set_check_item_array( $check_item_array )
{
$this->check_item_array = $check_item_array;
@@ -340,6 +351,7 @@
'status' => $this->get_status(),
'comment' => $this->get_comment(),
'deadline' => $this->get_deadline(),
+ 'original_deadline' =>
$this->get_original_deadline(),
'planned_date' => $this->get_planned_date(),
'completed_date' => $this->get_completed_date(),
'start_date' => $this->get_start_date(),
Modified: branches/Version-2_0-branch/controller/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/setup/setup.inc.php 2017-08-16
13:47:42 UTC (rev 16982)
+++ branches/Version-2_0-branch/controller/setup/setup.inc.php 2017-08-17
08:36:14 UTC (rev 16983)
@@ -1,6 +1,6 @@
<?php
$setup_info['controller']['name'] = 'controller';
- $setup_info['controller']['version'] = '0.1.53';
+ $setup_info['controller']['version'] = '0.1.54';
$setup_info['controller']['app_order'] = 100;
$setup_info['controller']['enable'] = 1;
$setup_info['controller']['app_group'] = 'office';
Modified: branches/Version-2_0-branch/controller/setup/tables_current.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/setup/tables_current.inc.php
2017-08-16 13:47:42 UTC (rev 16982)
+++ branches/Version-2_0-branch/controller/setup/tables_current.inc.php
2017-08-17 08:36:14 UTC (rev 16983)
@@ -67,6 +67,7 @@
'status' => array('type' => 'int','precision'
=> '2','nullable' => false),
'comment' => array('type' => 'text', 'nullable'
=> True),
'deadline' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
+ 'original_deadline' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
'planned_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
'completed_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
'component_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
Modified: branches/Version-2_0-branch/controller/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/setup/tables_update.inc.php
2017-08-16 13:47:42 UTC (rev 16982)
+++ branches/Version-2_0-branch/controller/setup/tables_update.inc.php
2017-08-17 08:36:14 UTC (rev 16983)
@@ -1142,3 +1142,17 @@
return
$GLOBALS['setup_info']['controller']['currentver'];
}
}
+
+ $test[] = '0.1.53';
+ function controller_upgrade0_1_53()
+ {
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_check_list','original_deadline',array(
+ 'type' => 'int',
+ 'precision' => '8',
+ 'nullable' => true
+ )
+ );
+
+ $GLOBALS['setup_info']['controller']['currentver'] = '0.1.54';
+ return $GLOBALS['setup_info']['controller']['currentver'];
+ }
\ No newline at end of file
Modified:
branches/Version-2_0-branch/controller/templates/base/check_list/add_check_list.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/check_list/add_check_list.xsl
2017-08-16 13:47:42 UTC (rev 16982)
+++
branches/Version-2_0-branch/controller/templates/base/check_list/add_check_list.xsl
2017-08-17 08:36:14 UTC (rev 16983)
@@ -103,11 +103,16 @@
</div>
</xsl:if>
<label>Fristdato</label>
- <input type="text"
id="deadline_date" name="deadline_date" class="date" readonly="readonly" >
+ <input type="text"
id="deadline_date" name="deadline_date" class="date" >
<xsl:attribute
name="value">
<xsl:value-of
select="php:function('date', $date_format, number(check_list/deadline))"/>
</xsl:attribute>
</input>
+ <input type="hidden"
id="original_deadline_date" name="original_deadline_date" >
+ <xsl:attribute
name="value">
+ <xsl:value-of
select="check_list/deadline"/>
+ </xsl:attribute>
+ </input>
</div>
<!-- PLANNED DATE -->
<div class="row">
Modified:
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
---
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2017-08-16 13:47:42 UTC (rev 16982)
+++
branches/Version-2_0-branch/controller/templates/base/check_list/edit_check_list.xsl
2017-08-17 08:36:14 UTC (rev 16983)
@@ -57,6 +57,11 @@
<xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/deadline))"/></xsl:attribute>
</xsl:if>
</input>
+ <input type="hidden"
id="original_deadline_date" name="original_deadline_date" >
+ <xsl:attribute name="value">
+ <xsl:value-of
select="check_list/original_deadline"/>
+ </xsl:attribute>
+ </input>
</div>
<div class="row">
<label>Planlagt dato</label>
Modified: branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2017-08-16
13:47:42 UTC (rev 16982)
+++ branches/Version-2_0-branch/phpgwapi/inc/functions.inc.php 2017-08-17
08:36:14 UTC (rev 16983)
@@ -738,12 +738,14 @@
}
$request_scheme = empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] ==
'off' ? 'http' : 'https';
-
if(isset($GLOBALS['phpgw_info']['server']['enforce_ssl']) &&
$request_scheme != 'https' )
{
-// Header('Location: https://' .
$GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw_info']['server']['webserver_url'] . $_SERVER['REQUEST_URI']);
- Header("Location:
https://{$GLOBALS['phpgw_info']['server']['hostname']}{$_SERVER['REQUEST_URI']}");
- exit;
+ $script_name = basename($_SERVER['SCRIPT_NAME'], '.php');
+ if(!$script_name == 'xmlrpc' && !$script_name == 'soap')
+ {
+ Header("Location:
https://{$GLOBALS['phpgw_info']['server']['hostname']}{$_SERVER['REQUEST_URI']}");
+ exit;
+ }
}
/************************************************************************\
Modified: branches/Version-2_0-branch/property/inc/class.sobudget.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sobudget.inc.php
2017-08-16 13:47:42 UTC (rev 16982)
+++ branches/Version-2_0-branch/property/inc/class.sobudget.inc.php
2017-08-17 08:36:14 UTC (rev 16983)
@@ -753,10 +753,10 @@
$_actual_cost =
round($budget['actual_cost'] / $_taxfactor);
//for testing
- if($budget['actual_cost'])
- {
- $obligation_orders[] =
$order_id;
- }
+// if($budget['actual_cost'] &&
$order_info['b_account'] == '6610')
+// {
+//
$obligation_orders[$order_id] += $_actual_cost;
+// }
$sum_actual_cost +=
$_actual_cost;
if
((int)$budget['actual_period'] == (int)$filter_period)
@@ -782,7 +782,7 @@
}
}
}
-//_debug_array(array_unique($obligation_orders));
+//_debug_array($obligation_orders);
//_debug_array($_periods);
// _debug_array($obligations);
//----------- ad hoc order
Modified: branches/Version-2_0-branch/setup/inc/functions.inc.php
===================================================================
--- branches/Version-2_0-branch/setup/inc/functions.inc.php 2017-08-16
13:47:42 UTC (rev 16982)
+++ branches/Version-2_0-branch/setup/inc/functions.inc.php 2017-08-17
08:36:14 UTC (rev 16983)
@@ -63,9 +63,9 @@
}
else
{
- die('Your phpGroupWare install is incomplete, please try to '
- . '<a href="http://download.phpgroupware.org/now";'
- . ' target="_blank">download phpGroupWare</a> and try
again');
+ die('Your system install is incomplete, please try to '
+ . '<a
href="http://savannah.nongnu.org/projects/fmsystem/";'
+ . ' target="_blank">download Portico Estate</a> and try
again');
}
// Make sure we have an install id - I don't like this, but it works :(
skwashd mar2008
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16983] Stable: Merge 16978:16982 from trunk,
sigurdne <=