[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17106] more on eventplanner
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17106] more on eventplanner |
|
Date: |
Thu, 21 Sep 2017 11:31:19 -0400 (EDT) |
Revision: 17106
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17106
Author: sigurdne
Date: 2017-09-21 11:31:19 -0400 (Thu, 21 Sep 2017)
Log Message:
-----------
more on eventplanner
Modified Paths:
--------------
trunk/eventplanner/inc/class.uiapplication.inc.php
trunk/eventplanner/inc/model/class.application.inc.php
trunk/eventplanner/setup/phpgw_no.lang
trunk/eventplanner/setup/setup.inc.php
trunk/eventplanner/setup/tables_current.inc.php
trunk/eventplanner/setup/tables_update.inc.php
trunk/eventplanner/templates/base/application.xsl
Modified: trunk/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uiapplication.inc.php 2017-09-21 10:52:01 UTC
(rev 17105)
+++ trunk/eventplanner/inc/class.uiapplication.inc.php 2017-09-21 15:31:19 UTC
(rev 17106)
@@ -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: trunk/eventplanner/inc/model/class.application.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.application.inc.php 2017-09-21
10:52:01 UTC (rev 17105)
+++ trunk/eventplanner/inc/model/class.application.inc.php 2017-09-21
15:31:19 UTC (rev 17106)
@@ -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: trunk/eventplanner/setup/phpgw_no.lang
===================================================================
--- trunk/eventplanner/setup/phpgw_no.lang 2017-09-21 10:52:01 UTC (rev
17105)
+++ trunk/eventplanner/setup/phpgw_no.lang 2017-09-21 15:31:19 UTC (rev
17106)
@@ -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: trunk/eventplanner/setup/setup.inc.php
===================================================================
--- trunk/eventplanner/setup/setup.inc.php 2017-09-21 10:52:01 UTC (rev
17105)
+++ trunk/eventplanner/setup/setup.inc.php 2017-09-21 15:31:19 UTC (rev
17106)
@@ -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: trunk/eventplanner/setup/tables_current.inc.php
===================================================================
--- trunk/eventplanner/setup/tables_current.inc.php 2017-09-21 10:52:01 UTC
(rev 17105)
+++ trunk/eventplanner/setup/tables_current.inc.php 2017-09-21 15:31:19 UTC
(rev 17106)
@@ -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: trunk/eventplanner/setup/tables_update.inc.php
===================================================================
--- trunk/eventplanner/setup/tables_update.inc.php 2017-09-21 10:52:01 UTC
(rev 17105)
+++ trunk/eventplanner/setup/tables_update.inc.php 2017-09-21 15:31:19 UTC
(rev 17106)
@@ -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: trunk/eventplanner/templates/base/application.xsl
===================================================================
--- trunk/eventplanner/templates/base/application.xsl 2017-09-21 10:52:01 UTC
(rev 17105)
+++ trunk/eventplanner/templates/base/application.xsl 2017-09-21 15:31:19 UTC
(rev 17106)
@@ -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>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17106] more on eventplanner,
sigurdne <=