[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17109] Stable: Merge 17102:17108 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17109] Stable: Merge 17102:17108 from trunk |
|
Date: |
Thu, 21 Sep 2017 11:35:41 -0400 (EDT) |
Revision: 17109
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17109
Author: sigurdne
Date: 2017-09-21 11:35:40 -0400 (Thu, 21 Sep 2017)
Log Message:
-----------
Stable: Merge 17102:17108 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
branches/Version-2_0-branch/eventplannerfrontend/inc/class.uimetasettings.inc.php
branches/Version-2_0-branch/eventplannerfrontend/inc/model/class.metasettings.inc.php
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/config.tpl
branches/Version-2_0-branch/eventplannerfrontend/templates/base/metasettings.xsl
branches/Version-2_0-branch/phpgwapi/inc/class.data_cleaner.inc.php
branches/Version-2_0-branch/property/inc/class.sobudget.inc.php
branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-2_0-branch/property/setup/default_records.inc.php
branches/Version-2_0-branch/property/setup/setup.inc.php
branches/Version-2_0-branch/property/setup/tables_update.inc.php
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-09-21 15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch 2017-09-21 15:35:40 UTC (rev 17109)
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,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17104
\ 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,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108
\ No newline at end of property
Modified:
branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-09-21 15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uiapplication.inc.php
2017-09-21 15:35:40 UTC (rev 17109)
@@ -267,7 +267,6 @@
$config_frontend = CreateObject('phpgwapi.config',
'eventplannerfrontend')->read();
- $application_condition =
!empty($config_frontend['application_condition']) ?
$config_frontend['application_condition'] : null;
$tabs = array();
$tabs['first_tab'] = array(
'label' => lang('application'),
@@ -540,7 +539,9 @@
'value_active_tab' => $active_tab,
'multi_upload_parans' =>
"{menuaction:'{$this->currentapp}.uiapplication.build_multi_upload_file',
id:'{$id}'}",
'multiple_uploader' => true,
- 'application_condition' =>
$application_condition
+ 'application_condition' =>
!empty($config_frontend['application_condition']) ?
$config_frontend['application_condition'] : null,
+ 'user_agreement_text_1'=>
!empty($config_frontend['user_agreement_text_1']) ?
$config_frontend['user_agreement_text_1'] : null,
+ 'user_agreement_text_2'=>
!empty($config_frontend['user_agreement_text_2']) ?
$config_frontend['user_agreement_text_2'] : null,
);
phpgwapi_jquery::formvalidator_generate(array('date',
'security', 'file'));
phpgwapi_jquery::load_widget('autocomplete');
Modified:
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
2017-09-21 15:32:34 UTC (rev 17108)
+++
branches/Version-2_0-branch/eventplanner/inc/model/class.application.inc.php
2017-09-21 15:35:40 UTC (rev 17109)
@@ -42,6 +42,8 @@
protected
$id,
+ $agreement_1,
+ $agreement_2,
$active,
$display_in_dashboard,
$category_id,
@@ -298,6 +300,14 @@
'type' => 'int',
'required' => false,
),
+ 'agreement_1' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+ 'type' => 'int',
+ 'required' => true,
+ ),
+ 'agreement_2' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+ 'type' => 'int',
+ 'required' => true,
+ ),
'audience_limit' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
'type' => 'int',
'required' => false,
@@ -304,7 +314,7 @@
),
'rig_up_min_before' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
'type' => 'int',
- 'required' => false,
+ 'required' => true,
),
'rig_up_num_person' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
'type' => 'int',
@@ -320,7 +330,7 @@
),
'rig_down_min_after' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
'type' => 'int',
- 'required' => false,
+ 'required' => true,
),
'power' => array('action'=> PHPGW_ACL_ADD |
PHPGW_ACL_EDIT,
'type' => 'int',
@@ -367,6 +377,14 @@
if($currentapp == 'eventplanner')
{
$backend_fields = array(
+ 'agreement_1' => array('action'=> 0,
+ 'type' => 'int',
+ 'required' => false,
+ ),
+ 'agreement_2' => array('action'=> 0,
+ 'type' => 'int',
+ 'required' => false,
+ ),
'num_granted_events' =>
array('action'=> PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
'type' => 'int',
'label' => 'number of granted
events',
Modified: branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-09-21 15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch/eventplanner/setup/phpgw_no.lang
2017-09-21 15:35:40 UTC (rev 17109)
@@ -169,4 +169,6 @@
active application year eventplanner no Aktivt søknadsår
my bookings eventplanner no Mine bookinger
My customer report eventplanner no Mine tilbakemeldinger
-send eventplanner no Send inn
\ No newline at end of file
+send eventplanner no Send inn
+publishing eventplanner no Publisering
+user agreement eventplanner no Betingelser
\ No newline at end of file
Modified: branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
2017-09-21 15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch/eventplanner/setup/setup.inc.php
2017-09-21 15:35:40 UTC (rev 17109)
@@ -11,7 +11,7 @@
* @version $Id: setup.inc.php 14728 2016-02-11 22:28:46Z sigurdne $
*/
$setup_info['eventplanner']['name'] = 'eventplanner';
- $setup_info['eventplanner']['version'] = '0.9.18.010';
+ $setup_info['eventplanner']['version'] = '0.9.18.011';
$setup_info['eventplanner']['app_order'] = 20;
$setup_info['eventplanner']['enable'] = 1;
$setup_info['eventplanner']['app_group'] = 'office';
Modified: branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
2017-09-21 15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch/eventplanner/setup/tables_current.inc.php
2017-09-21 15:35:40 UTC (rev 17109)
@@ -183,6 +183,8 @@
'equipment_remark' => array('type' => 'text',
'nullable' => true),
'raider' => array('type' => 'text', 'nullable'
=> true),
'json_representation' => array('type' =>
'jsonb', 'nullable' => true),
+ 'agreement_1' => array('type' => 'int',
'precision' => '2', 'nullable' => true),
+ 'agreement_2' => array('type' => 'int',
'precision' => '2', 'nullable' => true),
),
'pk' => array('id'),
'fk' => array(
Modified: branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
2017-09-21 15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch/eventplanner/setup/tables_update.inc.php
2017-09-21 15:35:40 UTC (rev 17109)
@@ -396,3 +396,28 @@
}
return $GLOBALS['setup_info']['eventplanner']['currentver'];
}
+
+ $test[] = '0.9.18.010';
+ function eventplanner_upgrade0_9_18_010()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('eventplanner_application',
'agreement_1', array(
+ 'type' => 'int',
+ 'precision' => 2,
+ 'nullable' => true
+ ));
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('eventplanner_application',
'agreement_2', array(
+ 'type' => 'int',
+ 'precision' => 2,
+ 'nullable' => true
+ ));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['eventplanner']['currentver'] =
'0.9.18.011';
+ }
+ return $GLOBALS['setup_info']['eventplanner']['currentver'];
+ }
+
Modified:
branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
===================================================================
--- branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
2017-09-21 15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch/eventplanner/templates/base/application.xsl
2017-09-21 15:35:40 UTC (rev 17109)
@@ -92,8 +92,74 @@
</div>
<input type="hidden" id="active_tab"
name="active_tab" value="{value_active_tab}"/>
<div id="first_tab">
- <xsl:value-of
disable-output-escaping="yes" select="application_condition"/>
<fieldset>
+ <xsl:value-of
disable-output-escaping="yes" select="application_condition"/>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'publishing')"/>
+ </label>
+ <table
id="user_agreement_publishing" class="pure-table pure-custom pure-input-1-2"
border="0" cellspacing="2" cellpadding="2">
+ <tr>
+
<td colspan = "2">
+
<xsl:value-of disable-output-escaping="yes"
select="user_agreement_text_1"/>
+
</td>
+ </tr>
+ <tr>
+
<th style="text-align:left">
+
<xsl:value-of select="php:function('lang', 'yes')"/>
+
</th>
+
<th style="text-align:left">
+
<xsl:value-of select="php:function('lang', 'no')"/>
+
</th>
+ </tr>
+ <tr>
+
<td>
+
<input type="radio" disabled="disabled">
+
<xsl:if test="application/agreement_1 = 1">
+
<xsl:attribute name="checked" value="checked"/>
+
</xsl:if>
+
</input>
+
</td>
+
<td>
+
<input type="radio" disabled="disabled">
+
<xsl:if test="application/agreement_1 = 2">
+
<xsl:attribute name="checked" value="checked"/>
+
</xsl:if>
+
</input>
+
</td>
+ </tr>
+ </table>
+ </div>
+
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'user agreement')"/>
+ </label>
+ <table
id="user_agreement_table" class="pure-table pure-custom pure-input-1-2"
border="0" cellspacing="2" cellpadding="2">
+ <tr>
+
<td>
+
<xsl:value-of disable-output-escaping="yes"
select="user_agreement_text_2"/>
+
</td>
+ </tr>
+ <tr>
+
<th style="text-align:left" class="pure-input-1-2">
+
<xsl:value-of select="php:function('lang', 'yes')"/>
+
</th>
+ </tr>
+ <tr>
+
<td style="text-align:left">
+
<input type="checkbox" disabled="disabled">
+
<xsl:if test="application/agreement_2 = 1">
+
<xsl:attribute name="checked" value="checked"/>
+
</xsl:if>
+
</input>
+
</td>
+ </tr>
+ </table>
+ </div>
+
+ </fieldset>
+ <fieldset>
<legend>
<xsl:value-of
select="php:function('lang', 'application')"/>
</legend>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/inc/class.uimetasettings.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/inc/class.uimetasettings.inc.php
2017-09-21 15:32:34 UTC (rev 17108)
+++
branches/Version-2_0-branch/eventplannerfrontend/inc/class.uimetasettings.inc.php
2017-09-21 15:35:40 UTC (rev 17109)
@@ -97,6 +97,8 @@
$meta['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::rich_text_editor('field_frontpage_text');
self::rich_text_editor('application_condition');
+ self::rich_text_editor('user_agreement_text_1');
+ self::rich_text_editor('user_agreement_text_2');
self::render_template_xsl('metasettings',
array('config_data' => $config->config_data,
'meta' => $meta));
Modified:
branches/Version-2_0-branch/eventplannerfrontend/inc/model/class.metasettings.inc.php
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/inc/model/class.metasettings.inc.php
2017-09-21 15:32:34 UTC (rev 17108)
+++
branches/Version-2_0-branch/eventplannerfrontend/inc/model/class.metasettings.inc.php
2017-09-21 15:35:40 UTC (rev 17109)
@@ -82,6 +82,14 @@
'application_condition' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
'type' => 'html',
'history' => false
+ ),
+ 'user_agreement_text_1' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+ 'type' => 'html',
+ 'history' => false
+ ),
+ 'user_agreement_text_2' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+ 'type' => 'html',
+ 'history' => false
)
);
return $fields;
Modified:
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
2017-09-21 15:32:34 UTC (rev 17108)
+++
branches/Version-2_0-branch/eventplannerfrontend/js/portico/application.edit.js
2017-09-21 15:35:40 UTC (rev 17109)
@@ -147,7 +147,7 @@
"background - color": '#FFF',
display: "block"
});
-
+/*
var offset = $("#submitbox").offset();
var topPadding = 180;
@@ -189,7 +189,7 @@
;
});
}
-
+*/
});
check_button_names = function ()
@@ -476,7 +476,71 @@
errorMessage: 'Type is required',
errorMessageKey: 'application_types'
});
+$.formUtils.addValidator({
+ name: 'publishing',
+ validatorFunction: function (value, $el, config, language, $form)
+ {
+ var n = 0;
+ $('#user_agreement_publishing input').each(function ()
+ {
+ if ($(this).prop("checked"))
+ {
+ n++;
+ }
+ });
+ var v = (n > 0) ? true : false;
+ if (v === false)
+ {
+ $('#user_agreement_publishing').css("background-color",
"#f2dede");
+ $('#user_agreement_publishing').css("border", "#b94a48
1px solid");
+ }
+ else
+ {
+ $('#user_agreement_publishing').css("background-color",
"white");
+ $('#user_agreement_publishing').css("border", "black");
+ }
+
+ return v;
+ },
+ errorMessage: 'User agreement publishing is required',
+ errorMessageKey: 'user_agreement_1'
+});
+
+$.formUtils.addValidator({
+ name: 'user_agreement_2',
+ validatorFunction: function (value, $el, config, language, $form)
+ {
+ var n = 0;
+ $('#user_agreement_table input').each(function ()
+ {
+ if ($(this).prop("checked"))
+ {
+ n++;
+ }
+ });
+ var v = (n > 0) ? true : false;
+
+ if (v === false)
+ {
+ $('#user_agreement_table').css("background-color",
"#f2dede");
+ $('#user_agreement_table').css("border", "#b94a48 1px
solid");
+ }
+ else
+ {
+ $('#user_agreement_table').css("background-color",
"white");
+ $('#user_agreement_table').css("border", "black");
+ }
+
+ return v;
+ },
+ errorMessage: 'User agreement is required',
+ errorMessageKey: 'user_agreement_2'
+});
+
+
+
+
this.fileuploader = function (section)
{
multi_upload_parans.section = section;
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
2017-09-21 15:32:34 UTC (rev 17108)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/application.xsl
2017-09-21 15:35:40 UTC (rev 17109)
@@ -81,8 +81,82 @@
-->
<input type="hidden" id="active_tab"
name="active_tab" value="{value_active_tab}"/>
<div id="first_tab">
- <xsl:value-of
disable-output-escaping="yes" select="application_condition"/>
<fieldset>
+ <xsl:value-of
disable-output-escaping="yes" select="application_condition"/>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'publishing')"/>
+ </label>
+ <table
id="user_agreement_publishing" class="pure-table pure-custom pure-input-1-2"
border="0" cellspacing="2" cellpadding="2">
+ <tr>
+
<td colspan = "2">
+
<xsl:value-of disable-output-escaping="yes"
select="user_agreement_text_1"/>
+
</td>
+ </tr>
+ <tr>
+
<th style="text-align:left">
+
<xsl:value-of select="php:function('lang', 'yes')"/>
+
</th>
+
<th style="text-align:left">
+
<xsl:value-of select="php:function('lang', 'no')"/>
+
</th>
+ </tr>
+ <tr>
+
<td>
+
<input type="radio" name="agreement_1" id="agreement_1_1" value="1">
+
<xsl:if test="application/agreement_1 = 1">
+
<xsl:attribute name="checked" value="checked"/>
+
</xsl:if>
+
</input>
+
</td>
+
<td>
+
<input type="radio" name="agreement_1" id="agreement_1_2" value="2">
+
<xsl:if test="application/agreement_1 = 2">
+
<xsl:attribute name="checked" value="checked"/>
+
</xsl:if>
+
</input>
+
</td>
+ </tr>
+ </table>
+ <input
type="text" data-validation="publishing" size="1" style="visibility: hidden;">
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="php:function('lang', 'publishing')"/>
+
</xsl:attribute>
+ </input>
+ </div>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'user agreement')"/>
+ </label>
+ <table
id="user_agreement_table" class="pure-table pure-custom pure-input-1-2"
border="0" cellspacing="2" cellpadding="2">
+ <tr>
+
<td>
+
<xsl:value-of disable-output-escaping="yes"
select="user_agreement_text_2"/>
+
</td>
+ </tr>
+ <tr>
+
<th style="text-align:left" class="pure-input-1-2">
+
<xsl:value-of select="php:function('lang', 'yes')"/>
+
</th>
+ </tr>
+ <tr>
+
<td style="text-align:left">
+
<input type="checkbox" name="agreement_2" id="agreement_2" value="1">
+
<xsl:if test="application/agreement_2 = 1">
+
<xsl:attribute name="checked" value="checked"/>
+
</xsl:if>
+
</input>
+
</td>
+ </tr>
+ </table>
+ <input
type="text" data-validation="user_agreement_2" size="1" style="visibility:
hidden;">
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="php:function('lang', 'user agreement')"/>
+
</xsl:attribute>
+ </input>
+ </div>
+ </fieldset>
+ <fieldset>
<legend>
<xsl:value-of
select="php:function('lang', 'application')"/>
</legend>
@@ -444,7 +518,7 @@
<xsl:value-of select="php:function('lang', 'size of stage')"/>
</label>
<div
class="pure-custom">
- <table
class="pure-table" border="0" cellspacing="2" cellpadding="2">
+ <table
class="pure-table pure-input-1-2" border="0" cellspacing="2" cellpadding="2">
<thead>
<tr>
<th>
@@ -498,7 +572,7 @@
<label>
<xsl:value-of select="php:function('lang', 'stage requirement')"/>
</label>
- <textarea
cols="47" rows="7" name="stage_requirement">
+ <textarea
cols="47" rows="7" name="stage_requirement" class="pure-input-1-2">
<xsl:value-of select="application/stage_requirement"/>
</textarea>
</div>
@@ -538,7 +612,7 @@
<label>
</label>
<div
class="pure-custom">
- <table
class="pure-table pure-table-bordered" border="0" cellspacing="2"
cellpadding="2">
+ <table
class="pure-table pure-table-bordered pure-input-1-2" border="0"
cellspacing="2" cellpadding="2">
<thead>
<tr>
<th></th>
@@ -685,7 +759,7 @@
<div
class="pure-control-group">
<label>
</label>
- <textarea
cols="47" rows="7" name="raider">
+ <textarea
cols="47" rows="7" name="raider" class="pure-input-1-2">
<xsl:value-of select="application/raider"/>
</textarea>
</div>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/config.tpl
===================================================================
--- branches/Version-2_0-branch/eventplannerfrontend/templates/base/config.tpl
2017-09-21 15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch/eventplannerfrontend/templates/base/config.tpl
2017-09-21 15:35:40 UTC (rev 17109)
@@ -14,11 +14,11 @@
</tr>
<tr>
<td>{lang_site_title}</td>
- <td><input name="newsettings[site_title]"
value="{value_site_title}"></td>
+ <td><input name="newsettings[site_title]"
value='{value_site_title}'></td>
</tr>
<tr>
<td>{lang_footer_info}</td>
- <td><input name="newsettings[footer_info]"
value="{value_footer_info}"></td>
+ <td><input name="newsettings[footer_info]"
value='{value_footer_info}'></td>
</tr>
<tr>
<td>{lang_auth_type}:</td>
Modified:
branches/Version-2_0-branch/eventplannerfrontend/templates/base/metasettings.xsl
===================================================================
---
branches/Version-2_0-branch/eventplannerfrontend/templates/base/metasettings.xsl
2017-09-21 15:32:34 UTC (rev 17108)
+++
branches/Version-2_0-branch/eventplannerfrontend/templates/base/metasettings.xsl
2017-09-21 15:35:40 UTC (rev 17109)
@@ -9,7 +9,7 @@
<label
for="field_metatag_author">
<xsl:value-of
select="php:function('lang', 'Author')"/>
</label>
- <input
id="field_metatag_author" name="metatag_author" type="text" size="50">
+ <input
id="field_metatag_author" name="metatag_author" type="text" size="50"
class="pure-input-1-2">
<xsl:attribute
name="value">
<xsl:value-of
select="config_data/metatag_author"/>
</xsl:attribute>
@@ -19,7 +19,7 @@
<label
for="field_metatag_robots">
<xsl:value-of
select="php:function('lang', 'Robots')"/>
</label>
- <input
id="field_metatag_robots" name="metatag_robots" type="text" size="50">
+ <input
id="field_metatag_robots" name="metatag_robots" type="text" size="50"
class="pure-input-1-2">
<xsl:attribute
name="value">
<xsl:value-of
select="config_data/metatag_robots"/>
</xsl:attribute>
@@ -29,7 +29,7 @@
<label
for="field_metatag_keywords">
<xsl:value-of
select="php:function('lang', 'keywords')"/>
</label>
- <input
id="field_metatag_keywords" name="metatag_keywords" type="text" size="50">
+ <input
id="field_metatag_keywords" name="metatag_keywords" type="text" size="50"
class="pure-input-1-2">
<xsl:attribute
name="value">
<xsl:value-of
select="config_data/metatag_keywords"/>
</xsl:attribute>
@@ -39,11 +39,9 @@
<label
for="field_metatag_description">
<xsl:value-of
select="php:function('lang', 'description')"/>
</label>
- <div class="pure-custom">
- <textarea
id="field_metatag_description" class="full-width" name="metatag_description">
- <xsl:value-of
select="config_data/metatag_description"/>
- </textarea>
- </div>
+ <textarea
id="field_metatag_description" name="metatag_description" rows="10"
class="pure-custom pure-input-1-2">
+ <xsl:value-of
select="config_data/metatag_description"/>
+ </textarea>
</div>
<div class="pure-control-group">
@@ -51,7 +49,7 @@
<xsl:value-of
select="php:function('lang', 'Frontpage text')"/>
</label>
<div class="pure-custom">
- <textarea
id="field_frontpage_text" class="full-width" name="frontpage_text">
+ <textarea
id="field_frontpage_text" class="pure-input-1-2" name="frontpage_text">
<xsl:value-of
disable-output-escaping="yes" select="config_data/frontpage_text"/>
</textarea>
</div>
@@ -66,6 +64,31 @@
</textarea>
</div>
</div>
+ <div class="pure-control-group">
+ <label
for="user_agreement_text_1">
+ <xsl:value-of
select="php:function('lang', 'user agreement 1')"/>
+ </label>
+ <div class="pure-custom">
+ <textarea
id="user_agreement_text_1" class="full-width" name="user_agreement_text_1">
+ <xsl:value-of
disable-output-escaping="yes" select="config_data/user_agreement_text_1"/>
+ </textarea>
+ </div>
+ </div>
+ <div class="pure-control-group">
+ <label
for="user_agreement_text_2">
+ <xsl:value-of
select="php:function('lang', 'user agreement 2')"/>
+ </label>
+ <div class="pure-custom">
+ <textarea
id="user_agreement_text_2" class="full-width" name="user_agreement_text_2">
+ <xsl:value-of
disable-output-escaping="yes" select="config_data/user_agreement_text_2"/>
+ </textarea>
+ </div>
+ </div>
+
+
+
+
+
</div>
</div>
<div class="form-buttons">
Modified: branches/Version-2_0-branch/phpgwapi/inc/class.data_cleaner.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.data_cleaner.inc.php
2017-09-21 15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.data_cleaner.inc.php
2017-09-21 15:35:40 UTC (rev 17109)
@@ -252,9 +252,15 @@
// Just try to save a <a href="titi.org"> my site </a>
// you get a <a href="/phpgw/redirect.php?go=titi.org">
my site </a>
$data =
preg_replace_callback('/href\s*=\s*([\\\]?["\']?)((?(1)[^\1]*?|[^\s]+))(?(1)\1|)/i',
-// create_function('$m', 'return \'href="\' .
(strlen($m[2]) && $m[2]{0} == \'#\' ? $m[2] :
$GLOBALS[\'phpgw\']->safe_redirect(urldecode($m[2]))) . \'"\';'),
function ($m)
{
+ $url = $m[2];
+
+ /**
+ * Taken care of by HTMLPurifier
+ */
+
+ /*
if(preg_match('/redirect.php\?go=/i',
$m[2]))
{
$url = $m[2];
@@ -267,6 +273,7 @@
{
$url = strlen($m[2]) &&
$m[2]{0} == '#' ? $m[2] : $GLOBALS['phpgw']->safe_redirect(urldecode($m[2]));
}
+ */
$ret = 'href="'. $url .'"';
return $ret;
},
Modified: branches/Version-2_0-branch/property/inc/class.sobudget.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sobudget.inc.php
2017-09-21 15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch/property/inc/class.sobudget.inc.php
2017-09-21 15:35:40 UTC (rev 17109)
@@ -638,10 +638,10 @@
}
$this->db->query('SELECT id, percent FROM fm_ecomva',
__LINE__, __FILE__);
- $_taxcode = array(0 => 0);
+ $tax_codes = array(0 => 0);
while ($this->db->next_record())
{
- $_taxcode[$this->db->f('id')] =
$this->db->f('percent');
+ $tax_codes[$this->db->f('id')] =
$this->db->f('percent');
}
$sql = "SELECT DISTINCT fm_workorder.id AS id,
fm_location1.mva,fm_workorder.project_id,"
@@ -749,8 +749,7 @@
break;
}
- $_taxfactor = 1 +
($_taxcode[(int)$order_info['mva']] / 100);
- $_actual_cost =
round($budget['actual_cost'] / $_taxfactor);
+ $_actual_cost =
round($budget['actual_cost']);
//for testing
// if($budget['actual_cost'] &&
$order_info['b_account'] == '6610')
Modified: branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
2017-09-21 15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch/property/inc/class.soworkorder.inc.php
2017-09-21 15:35:40 UTC (rev 17109)
@@ -1990,6 +1990,14 @@
return $cached_info;
}
+
+ $sql = "SELECT id, percent FROM fm_ecomva";
+ $this->db->query($sql, __LINE__, __FILE__);
+ $tax_codes = array();
+ while ($this->db->next_record())
+ {
+ $tax_codes[$this->db->f('id')] =
$this->db->f('percent');
+ }
$closed_period = array();
$active_period = array();
@@ -2051,7 +2059,7 @@
}
}
- $sql = "SELECT periode, amount AS actual_cost,
periodization, periodization_start"
+ $sql = "SELECT periode, amount AS actual_cost,
periodization, periodization_start, mvakode AS tax_code"
. " FROM fm_workorder {$this->join}
fm_orders_paid_or_pending_view ON fm_workorder.id =
fm_orders_paid_or_pending_view.order_id"
. " WHERE order_id = '{$order_id}' ORDER BY
periode ASC";
$this->db->query($sql, __LINE__, __FILE__);
@@ -2061,12 +2069,20 @@
while ($this->db->next_record())
{
$_periode = $this->db->f('periode');
+ $_tax_code = $this->db->f('tax_code');
+ $_actual_cost = $this->db->f('actual_cost');
+
+ if($_tax_code && !empty($tax_codes[$_tax_code]))
+ {
+ $_actual_cost = $_actual_cost / (1 +
($tax_codes[$_tax_code] / 100));
+ }
+
$periode = $_periode ? $_periode : 'dummy';
//strange...
if ($periode == 'dummy')
{
-
$orders_paid_or_pending_temp[date('Ym')]['actual_cost'] +=
$this->db->f('actual_cost');
+
$orders_paid_or_pending_temp[date('Ym')]['actual_cost'] += $_actual_cost;
$orders_paid_or_pending_temp[date('Ym')]['periode'] = date('Ym');
$orders_paid_or_pending_temp[date('Ym')]['periodization'] =
$this->db->f('periodization');
$orders_paid_or_pending_temp[date('Ym')]['periodization_start'] =
$this->db->f('periodization_start');
@@ -2079,7 +2095,7 @@
'periodization' =>
(int)$this->db->f('periodization'),
'periodization_start' =>
$this->db->f('periodization_start'),
);
-
$orders_paid_or_pending_temp[$periode]['actual_cost'] +=
$this->db->f('actual_cost');
+
$orders_paid_or_pending_temp[$periode]['actual_cost'] += $_actual_cost;
}
}
// _debug_array($orders_paid_or_pending_temp);die();
Modified: branches/Version-2_0-branch/property/setup/default_records.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/default_records.inc.php
2017-09-21 15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch/property/setup/default_records.inc.php
2017-09-21 15:35:40 UTC (rev 17109)
@@ -901,15 +901,31 @@
switch ($GLOBALS['phpgw_info']['server']['db_type'])
{
case 'postgres':
- $sql = 'CREATE OR REPLACE VIEW
fm_orders_paid_or_pending_view AS
- SELECT orders_paid_or_pending.order_id,
orders_paid_or_pending.periode,orders_paid_or_pending.amount,orders_paid_or_pending.periodization,
orders_paid_or_pending.periodization_start
- FROM ( SELECT fm_ecobilagoverf.pmwrkord_code
AS order_id, fm_ecobilagoverf.periode, sum(fm_ecobilagoverf.godkjentbelop) AS
amount, fm_ecobilagoverf.periodization, fm_ecobilagoverf.periodization_start
- FROM fm_ecobilagoverf
- GROUP BY
fm_ecobilagoverf.pmwrkord_code, fm_ecobilagoverf.periode,
fm_ecobilagoverf.periodization, fm_ecobilagoverf.periodization_start
- UNION ALL
- SELECT
fm_ecobilag.pmwrkord_code AS order_id, fm_ecobilag.periode,
sum(fm_ecobilag.godkjentbelop) AS amount, fm_ecobilag.periodization,
fm_ecobilag.periodization_start
- FROM fm_ecobilag
- GROUP BY
fm_ecobilag.pmwrkord_code, fm_ecobilag.periode, fm_ecobilag.periodization,
fm_ecobilag.periodization_start) orders_paid_or_pending ORDER BY
orders_paid_or_pending.periode, orders_paid_or_pending.order_id';
+ $sql = 'CREATE OR REPLACE VIEW
public.fm_orders_paid_or_pending_view AS
+ SELECT orders_paid_or_pending.order_id,
+ orders_paid_or_pending.periode,
+ orders_paid_or_pending.amount,
+ orders_paid_or_pending.periodization,
+ orders_paid_or_pending.periodization_start,
+ orders_paid_or_pending.mvakode
+ FROM ( SELECT fm_ecobilagoverf.pmwrkord_code
AS order_id,
+ fm_ecobilagoverf.periode,
+
sum(fm_ecobilagoverf.godkjentbelop) AS amount,
+
fm_ecobilagoverf.periodization,
+
fm_ecobilagoverf.periodization_start,
+ fm_ecobilagoverf.mvakode
+ FROM fm_ecobilagoverf
+ GROUP BY
fm_ecobilagoverf.pmwrkord_code, fm_ecobilagoverf.periode,
fm_ecobilagoverf.periodization,
fm_ecobilagoverf.periodization_start,fm_ecobilagoverf.mvakode
+ UNION ALL
+ SELECT
fm_ecobilag.pmwrkord_code AS order_id,
+ fm_ecobilag.periode,
+
sum(fm_ecobilag.godkjentbelop) AS amount,
+ fm_ecobilag.periodization,
+
fm_ecobilag.periodization_start,
+ fm_ecobilag.mvakode
+ FROM fm_ecobilag
+ GROUP BY
fm_ecobilag.pmwrkord_code, fm_ecobilag.periode, fm_ecobilag.periodization,
fm_ecobilag.periodization_start, fm_ecobilag.mvakode) orders_paid_or_pending
+ ORDER BY orders_paid_or_pending.periode,
orders_paid_or_pending.order_id';
$GLOBALS['phpgw_setup']->oProc->query($sql, __LINE__,
__FILE__);
break;
Modified: branches/Version-2_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/setup.inc.php 2017-09-21
15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch/property/setup/setup.inc.php 2017-09-21
15:35:40 UTC (rev 17109)
@@ -11,7 +11,7 @@
* @version $Id$
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.721';
+ $setup_info['property']['version'] = '0.9.17.722';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified: branches/Version-2_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/tables_update.inc.php
2017-09-21 15:32:34 UTC (rev 17108)
+++ branches/Version-2_0-branch/property/setup/tables_update.inc.php
2017-09-21 15:35:40 UTC (rev 17109)
@@ -9846,4 +9846,55 @@
$GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.721';
return $GLOBALS['setup_info']['property']['currentver'];
}
- }
\ No newline at end of file
+ }
+
+ /**
+ * Update property version from 0.9.17.721 to 0.9.17.722
+ *
+ */
+ $test[] = '0.9.17.721';
+
+ function property_upgrade0_9_17_721()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->query("DELETE FROM fm_cache");
+
+ $GLOBALS['phpgw_setup']->oProc->query("DROP VIEW
fm_orders_paid_or_pending_view");
+
+ $sql = 'CREATE OR REPLACE VIEW
public.fm_orders_paid_or_pending_view AS
+ SELECT orders_paid_or_pending.order_id,
+ orders_paid_or_pending.periode,
+ orders_paid_or_pending.amount,
+ orders_paid_or_pending.periodization,
+ orders_paid_or_pending.periodization_start,
+ orders_paid_or_pending.mvakode
+ FROM ( SELECT fm_ecobilagoverf.pmwrkord_code AS
order_id,
+ fm_ecobilagoverf.periode,
+ sum(fm_ecobilagoverf.godkjentbelop)
AS amount,
+ fm_ecobilagoverf.periodization,
+ fm_ecobilagoverf.periodization_start,
+ fm_ecobilagoverf.mvakode
+ FROM fm_ecobilagoverf
+ GROUP BY
fm_ecobilagoverf.pmwrkord_code, fm_ecobilagoverf.periode,
fm_ecobilagoverf.periodization,
fm_ecobilagoverf.periodization_start,fm_ecobilagoverf.mvakode
+ UNION ALL
+ SELECT fm_ecobilag.pmwrkord_code AS
order_id,
+ fm_ecobilag.periode,
+ sum(fm_ecobilag.godkjentbelop) AS
amount,
+ fm_ecobilag.periodization,
+ fm_ecobilag.periodization_start,
+ fm_ecobilag.mvakode
+ FROM fm_ecobilag
+ GROUP BY fm_ecobilag.pmwrkord_code,
fm_ecobilag.periode, fm_ecobilag.periodization,
fm_ecobilag.periodization_start, fm_ecobilag.mvakode) orders_paid_or_pending
+ ORDER BY orders_paid_or_pending.periode,
orders_paid_or_pending.order_id';
+
+ $GLOBALS['phpgw_setup']->oProc->query($sql, __LINE__, __FILE__);
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.722';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
+
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17109] Stable: Merge 17102:17108 from trunk,
sigurdne <=