[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16848] Stable: Merge 16845:16847 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16848] Stable: Merge 16845:16847 from trunk |
|
Date: |
Wed, 7 Jun 2017 06:46:11 -0400 (EDT) |
Revision: 16848
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16848
Author: sigurdne
Date: 2017-06-07 06:46:11 -0400 (Wed, 07 Jun 2017)
Log Message:
-----------
Stable: Merge 16845:16847 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.uireport.inc.php
branches/Version-2_0-branch/property/js/portico/report.edit.js
branches/Version-2_0-branch/property/templates/base/report.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
branches/Version-2_0-branch/booking/
branches/Version-2_0-branch/bookingfrontend/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-06-07 10:44:21 UTC (rev 16847)
+++ branches/Version-2_0-branch 2017-06-07 10:46:11 UTC (rev 16848)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
-/branches/dev-syncromind-2:14933-16835
+/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
\ 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
\ No newline at end of property
Index: branches/Version-2_0-branch/booking
===================================================================
--- branches/Version-2_0-branch/booking 2017-06-07 10:44:21 UTC (rev 16847)
+++ branches/Version-2_0-branch/booking 2017-06-07 10:46:11 UTC (rev 16848)
Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
-/branches/dev-syncromind-2/booking:14933-16835
+/branches/dev-syncromind-2/booking:14933-16846
/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
-/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836
\ No newline at end of property
+/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15360-15541,15543-15566,15568-15569,15585-15617,15621-15630,15637-15639,15641-15643,15645,15647-15665,15667-15668,15695-15712,15714-15764,15820-15849,15889-15900,15902-16046,16055,16101-16130,16144-16212,16297-16305,16307-16314,16393-16395,16490-16497,16514-16517,16534,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16616-16618,16730,16734-16739,16748-16750,16769-16774,16785-16788,16796-16802,16835-16836,16846-16847
\ No newline at end of property
Index: branches/Version-2_0-branch/bookingfrontend
===================================================================
--- branches/Version-2_0-branch/bookingfrontend 2017-06-07 10:44:21 UTC (rev
16847)
+++ branches/Version-2_0-branch/bookingfrontend 2017-06-07 10:46:11 UTC (rev
16848)
Property changes on: branches/Version-2_0-branch/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
-/branches/dev-syncromind-2/bookingfrontend:14933-16835
+/branches/dev-syncromind-2/bookingfrontend:14933-16846
/branches/stavangerkommune/bookingfrontend:9468-12740,12986
-/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836
\ No newline at end of property
+/trunk/bookingfrontend:14721-14732,14770-14783,14794-14808,14824-14825,14838,14886-14894,14906-14909,14917-14919,14924-14978,14980-15258,15297,15312-15335,15585-15617,15621-15630,15714-15764,15813-15814,15820-15849,15889-15900,15902-16046,16101-16130,16144-16212,16297-16305,16307-16314,16316-16318,16385,16387,16393-16395,16399-16402,16586-16588,16603-16608,16734-16739,16752-16755,16785-16788,16796-16802,16835-16836,16846-16847
\ No newline at end of property
Modified: branches/Version-2_0-branch/property/inc/class.uireport.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uireport.inc.php
2017-06-07 10:44:21 UTC (rev 16847)
+++ branches/Version-2_0-branch/property/inc/class.uireport.inc.php
2017-06-07 10:46:11 UTC (rev 16848)
@@ -339,7 +339,7 @@
'select_count_sum' => lang('Select at least one
count/sum operation'),
'select_operator' => lang('Select an operator
for:'),
'enter_value' => lang('Enter a value for:'),
- 'enter_second_value' => lang('Enter a second
value for:'),
+ 'select_conector' => lang('Select an conector
for:'),
'choose_dataset' => lang('choose dataset'),
'and' => lang('AND'),
Modified: branches/Version-2_0-branch/property/js/portico/report.edit.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/report.edit.js
2017-06-07 10:44:21 UTC (rev 16847)
+++ branches/Version-2_0-branch/property/js/portico/report.edit.js
2017-06-07 10:46:11 UTC (rev 16848)
@@ -245,13 +245,24 @@
var order = "";
var field = "";
var operator = "";
-
+ var text = "";
+ var conector = "";
+
+ var values = {};
+ values['cbo_restricted_value'] = {};
+ values['cbo_operator'] = {};
+ values['txt_value1'] = {};
+ values['cbo_conector'] = {};
+
+ var length = 0;
$('.criteria').each(function()
{
order = $(this).val();
field = $("#cbo_restricted_value_" + order).val();
operator = $("#cbo_operator_" + order).val();
-
+ text = $("#txt_value1_" + order).val();
+ conector = $("#cbo_conector_" + order).val();
+
if (field == "")
{
return true;
@@ -261,8 +272,6 @@
{
result = false;
alert(lang['select_operator'] + ' ' + field);
- $("#cbo_operator_" + order).focus();
-
return false;
}
@@ -271,15 +280,43 @@
case (in_array_object(operator, operators_null)):
break;
default:
- if ($("#txt_value1_" + order).val() == "")
+ if (text == "")
{
result = false;
alert(lang['enter_value'] + ' ' +
field);
- $("#txt_value1_" + order).focus();
- }
- }
+ }
+ }
+
+ if (result)
+ {
+ values['cbo_restricted_value'][order] = field;
+ values['cbo_operator'][order] = operator;
+ values['txt_value1'][order] = text;
+ values['cbo_conector'][order] = conector;
+ length++;
+ }
});
+ if (result == false)
+ {
+ return false;
+ }
+
+ var n = 0;
+ $.each(values.cbo_restricted_value, function(key, value)
+ {
+ if (n < (length - 1))
+ {
+ if ($("#cbo_conector_" + key).val() == '')
+ {
+ result = false;
+ alert(lang['select_conector'] + ' ' +
values.cbo_restricted_value[key]);
+ return false;
+ }
+ }
+ n++;
+ });
+
return result;
}
Modified: branches/Version-2_0-branch/property/templates/base/report.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/report.xsl
2017-06-07 10:44:21 UTC (rev 16847)
+++ branches/Version-2_0-branch/property/templates/base/report.xsl
2017-06-07 10:46:11 UTC (rev 16848)
@@ -290,18 +290,29 @@
var order = "";
var field = "";
var operator = "";
-
+ var text = "";
+ var conector = "";
+
+ var values = {};
+ values['cbo_restricted_value'] = {};
+ values['cbo_operator'] = {};
+ values['txt_value1'] = {};
+ values['cbo_conector'] = {};
+
+ var length = 0;
$('.criteria').each(function()
{
order = $(this).val();
field = $("#cbo_restricted_value_" +
order).val();
operator = $("#cbo_operator_" + order).val();
-
+ text = $("#txt_value1_" + order).val();
+ conector = $("#cbo_conector_" + order).val();
+
if (field == "")
{
return true;
}
-
+
if (field && operator == "")
{
result = {
@@ -311,7 +322,7 @@
return false;
}
-
+
switch (true)
{
case (in_array_object(operator,
operators_null)):
@@ -324,10 +335,40 @@
message :
lang['enter_value'] + ' ' + field
}
}
- }
+ }
+ if (jQuery.isEmptyObject(result))
+ {
+ values['cbo_restricted_value'][order] =
field;
+ values['cbo_operator'][order] =
operator;
+ values['txt_value1'][order] = text;
+ values['cbo_conector'][order] =
conector;
+ length++;
+ }
});
+ if (!jQuery.isEmptyObject(result))
+ {
+ return result;
+ }
+
+ var n = 0;
+ $.each(values.cbo_restricted_value, function(key,
value)
+ {
+ if (n < (length - 1))
+ {
+ if ($("#cbo_conector_" + key).val() ==
'')
+ {
+ result = {
+ element :
$("#cbo_conector_" + key),
+ message :
lang['select_conector'] + ' ' + values.cbo_restricted_value[key]
+ }
+ return false;
+ }
+ }
+ n++;
+ });
+
return result;
}
@@ -350,13 +391,6 @@
return result;
}
- /*result = validate_group();
- if (!jQuery.isEmptyObject(result))
- {
-
$('#responsiveTabsGroups').responsiveTabs('activate', 1);
- return result;
- }*/
-
result = validate_aggregate();
if (!jQuery.isEmptyObject(result))
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16848] Stable: Merge 16845:16847 from trunk,
sigurdne <=