[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16993] eventplanner: application public_type
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16993] eventplanner: application public_type |
|
Date: |
Mon, 21 Aug 2017 09:03:57 -0400 (EDT) |
Revision: 16993
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16993
Author: sigurdne
Date: 2017-08-21 09:03:57 -0400 (Mon, 21 Aug 2017)
Log Message:
-----------
eventplanner: application public_type
Modified Paths:
--------------
trunk/eventplanner/inc/class.uiapplication.inc.php
trunk/eventplanner/inc/class.uievents.inc.php
trunk/eventplanner/inc/class.uivendor_report.inc.php
trunk/eventplanner/inc/model/class.application.inc.php
trunk/eventplanner/inc/model/class.customer.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
trunk/eventplanner/templates/base/customer.xsl
trunk/eventplannerfrontend/templates/base/application.xsl
trunk/eventplannerfrontend/templates/base/application_info.xsl
Modified: trunk/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uiapplication.inc.php 2017-08-21 13:02:30 UTC
(rev 16992)
+++ trunk/eventplanner/inc/class.uiapplication.inc.php 2017-08-21 13:03:57 UTC
(rev 16993)
@@ -362,6 +362,19 @@
)
);
+ $list_public_types = array(
+ array(
+ 'id' => 0,
+ 'name' => lang('application public type
public'),
+ 'selected' => $application->non_public == 0 ? 1
: 0
+ ),
+ array('id' => 1,
+ 'name' => lang('application public type non
public'),
+ 'selected' => $application->non_public == 1 ? 1
: 0
+ ),
+
+ );
+
$datatable_def[] = array(
'container' => 'datatable-container_1',
'requestUrl' =>
json_encode(self::link(array('menuaction' =>
"{$this->currentapp}.uicalendar.query_relaxed",
@@ -421,6 +434,7 @@
'application' => $application,
'new_vendor_url' =>
self::link(array('menuaction' => "{$this->currentapp}.uivendor.add")),
'list_case_officer' => array('options' =>
$case_officer_options),
+ 'list_public_types' => array('options' =>
$list_public_types),
'cat_select' =>
$this->cats->formatted_xslt_list(array(
'select_name' => 'category_id',
'selected' =>
$application->category_id ? $application->category_id : $default_category,
Modified: trunk/eventplanner/inc/class.uievents.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uievents.inc.php 2017-08-21 13:02:30 UTC
(rev 16992)
+++ trunk/eventplanner/inc/class.uievents.inc.php 2017-08-21 13:03:57 UTC
(rev 16993)
@@ -242,6 +242,8 @@
$category =
$this->cats->return_single($application->category_id);
+ $application->public_type = $application->non_public ==
1 ? lang('application public type non public') : lang('application public type
public');
+
$data = array(
'datatable_def' => $datatable_def,
'cancel_url' => self::link(array('menuaction'
=> "{$this->currentapp}.uievents.index",)),
Modified: trunk/eventplanner/inc/class.uivendor_report.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uivendor_report.inc.php 2017-08-21
13:02:30 UTC (rev 16992)
+++ trunk/eventplanner/inc/class.uivendor_report.inc.php 2017-08-21
13:03:57 UTC (rev 16993)
@@ -314,6 +314,8 @@
'function' => "set_tab('first_tab')"
);
+ $application->public_type = $application->non_public ==
1 ? lang('application public type non public') : lang('application public type
public');
+
$data = array(
'form_action' => self::link(array('menuaction'
=> "{$this->currentapp}.uivendor_report.save")),
'cancel_url' => self::link(array('menuaction'
=> "{$this->currentapp}.uivendor_report.index",)),
Modified: trunk/eventplanner/inc/model/class.application.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.application.inc.php 2017-08-21
13:02:30 UTC (rev 16992)
+++ trunk/eventplanner/inc/model/class.application.inc.php 2017-08-21
13:03:57 UTC (rev 16993)
@@ -62,6 +62,8 @@
$audience_limit,
$title,
$description,
+ $non_public,
+ $public_type,
$summary,
$remark,
$contact_name,
@@ -181,6 +183,12 @@
'sortable' => false,
'required' => true,
),
+ 'non_public' => array('action'=> PHPGW_ACL_ADD
| PHPGW_ACL_EDIT,
+ 'type' => 'int',
+ 'label' => 'application public type',
+ 'sortable' => false,
+ 'required' => false,
+ ),
'summary' => array('action'=> 0,
'type' => 'html',
'label' => 'summary',
Modified: trunk/eventplanner/inc/model/class.customer.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.customer.inc.php 2017-08-21 13:02:30 UTC
(rev 16992)
+++ trunk/eventplanner/inc/model/class.customer.inc.php 2017-08-21 13:03:57 UTC
(rev 16993)
@@ -64,6 +64,7 @@
$max_events,
$account_number,
$description,
+ $grant_non_public,
$remark,
$comments,
$comment;
@@ -160,6 +161,12 @@
'sortable' => false,
'required' => true
),
+ 'grant_non_public' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+ 'type' => 'int',
+ 'label' => 'want offer for non public',
+ 'sortable' => false,
+ 'required' => false
+ ),
'remark' => array('action'=> PHPGW_ACL_ADD |
PHPGW_ACL_EDIT,
'type' => 'string',
'label' => 'description',
Modified: trunk/eventplanner/setup/phpgw_no.lang
===================================================================
--- trunk/eventplanner/setup/phpgw_no.lang 2017-08-21 13:02:30 UTC (rev
16992)
+++ trunk/eventplanner/setup/phpgw_no.lang 2017-08-21 13:03:57 UTC (rev
16993)
@@ -154,4 +154,9 @@
canceled subject eventplannerfrontend no Overskrift ved
kansellering
vendor canceled text eventplannerfrontend no Tekst til utøver ved
kansellering
customer canceled text eventplannerfrontend no Tekst til mottakersted
ved kansellering
-default application category eventplannerfrontend no Standard
søknadskategori
\ No newline at end of file
+default application category eventplannerfrontend no Standard
søknadskategori
+want offer for non public eventplanner no Ønsker å motta
nærtilbud
+application public type eventplanner no Nær/Bredde-tilbud
+application public type non public eventplanner no Nærtilbud (et
arrangement der kun noen få brukere/beboere på en institusjon kan delta, f.eks.
et skrivekurs, malekurs)
+application public type public eventplanner no Breddetilbud (et
arrangement der alle brukere/beboere på en institusjon kan delta)
+
Modified: trunk/eventplanner/setup/setup.inc.php
===================================================================
--- trunk/eventplanner/setup/setup.inc.php 2017-08-21 13:02:30 UTC (rev
16992)
+++ trunk/eventplanner/setup/setup.inc.php 2017-08-21 13:03:57 UTC (rev
16993)
@@ -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.009';
+ $setup_info['eventplanner']['version'] = '0.9.18.010';
$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-08-21 13:02:30 UTC
(rev 16992)
+++ trunk/eventplanner/setup/tables_current.inc.php 2017-08-21 13:03:57 UTC
(rev 16993)
@@ -98,6 +98,7 @@
'number_of_users' => array('type' => 'int',
'precision' => '4', 'nullable' => true),
'max_events' => array('type' => 'int',
'precision' => '4', 'nullable' => true),
'description' => array('type' => 'text',
'nullable' => False),
+ 'grant_non_public' => array('type' => 'int',
'precision' => '2', 'nullable' => true),
'remark' => array('type' => 'text', 'nullable'
=> True),
'secret' => array('type' => 'text', 'nullable'
=> False),
'organization_number' => array('type' =>
'varchar', 'precision' => '9','nullable' => True),
@@ -148,6 +149,7 @@
'other_participants' => array('type' => 'text',
'nullable' => True),
'title' => array('type' => 'text', 'nullable'
=> False),
'description' => array('type' => 'text',
'nullable' => False),
+ 'non_public' => array('type' => 'int',
'precision' => '2', 'nullable' => true),
'summary' => array('type' => 'text', 'nullable'
=> true),
'remark' => array('type' => 'text', 'nullable'
=> True),
'contact_name' => array('type' => 'text',
'nullable' => False),
Modified: trunk/eventplanner/setup/tables_update.inc.php
===================================================================
--- trunk/eventplanner/setup/tables_update.inc.php 2017-08-21 13:02:30 UTC
(rev 16992)
+++ trunk/eventplanner/setup/tables_update.inc.php 2017-08-21 13:03:57 UTC
(rev 16993)
@@ -372,3 +372,27 @@
}
return $GLOBALS['setup_info']['eventplanner']['currentver'];
}
+
+ $test[] = '0.9.18.009';
+ function eventplanner_upgrade0_9_18_009()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('eventplanner_customer',
'grant_non_public', array(
+ 'type' => 'int',
+ 'precision' => 2,
+ 'nullable' => true
+ ));
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('eventplanner_application',
'non_public', array(
+ 'type' => 'int',
+ 'precision' => 2,
+ 'nullable' => true
+ ));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['eventplanner']['currentver'] =
'0.9.18.010';
+ }
+ return $GLOBALS['setup_info']['eventplanner']['currentver'];
+ }
Modified: trunk/eventplanner/templates/base/application.xsl
===================================================================
--- trunk/eventplanner/templates/base/application.xsl 2017-08-21 13:02:30 UTC
(rev 16992)
+++ trunk/eventplanner/templates/base/application.xsl 2017-08-21 13:03:57 UTC
(rev 16993)
@@ -282,6 +282,15 @@
</div>
<div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'application public type')"/>
+ </label>
+ <select
id="non_public" name="non_public" class="pure-input-1-2" >
+
<xsl:apply-templates select="list_public_types/options"/>
+ </select>
+ </div>
+
+ <div
class="pure-control-group">
<xsl:variable
name="lang_date_start">
<xsl:value-of select="php:function('lang', 'date start')"/>
</xsl:variable>
Modified: trunk/eventplanner/templates/base/customer.xsl
===================================================================
--- trunk/eventplanner/templates/base/customer.xsl 2017-08-21 13:02:30 UTC
(rev 16992)
+++ trunk/eventplanner/templates/base/customer.xsl 2017-08-21 13:03:57 UTC
(rev 16993)
@@ -286,6 +286,16 @@
</div>
<div class="pure-control-group">
<label>
+ <xsl:value-of
select="php:function('lang', 'want offer for non public')"/>
+ </label>
+ <input type="checkbox"
name="grant_non_public" id="grant_non_public" value="1">
+ <xsl:if
test="customer/grant_non_public = 1">
+
<xsl:attribute name="checked" value="checked"/>
+ </xsl:if>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label>
<xsl:value-of
select="php:function('lang', 'remark')"/>
</label>
<textarea cols="47"
rows="7" name="remark">
Modified: trunk/eventplannerfrontend/templates/base/application.xsl
===================================================================
--- trunk/eventplannerfrontend/templates/base/application.xsl 2017-08-21
13:02:30 UTC (rev 16992)
+++ trunk/eventplannerfrontend/templates/base/application.xsl 2017-08-21
13:03:57 UTC (rev 16993)
@@ -273,6 +273,15 @@
</div>
<div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'application public type')"/>
+ </label>
+ <select
id="non_public" name="non_public" class="pure-input-1-2" >
+
<xsl:apply-templates select="list_public_types/options"/>
+ </select>
+ </div>
+
+ <div
class="pure-control-group">
<xsl:variable
name="lang_date_start">
<xsl:value-of select="php:function('lang', 'date start')"/>
</xsl:variable>
Modified: trunk/eventplannerfrontend/templates/base/application_info.xsl
===================================================================
--- trunk/eventplannerfrontend/templates/base/application_info.xsl
2017-08-21 13:02:30 UTC (rev 16992)
+++ trunk/eventplannerfrontend/templates/base/application_info.xsl
2017-08-21 13:03:57 UTC (rev 16993)
@@ -78,6 +78,7 @@
</tbody>
</table>
</div>
+
<div class="pure-control-group">
<label>
<xsl:value-of select="php:function('lang',
'event timespan')"/>
@@ -84,6 +85,12 @@
</label>
<xsl:value-of select="application/timespan"/>
</div>
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="php:function('lang',
'application public type')"/>
+ </label>
+ <xsl:value-of select="application/public_type"/>
+ </div>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16993] eventplanner: application public_type,
sigurdne <=