[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15222] rental: more on application
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15222] rental: more on application |
|
Date: |
Mon, 30 May 2016 20:24:46 +0000 (UTC) |
Revision: 15222
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15222
Author: sigurdne
Date: 2016-05-30 20:24:46 +0000 (Mon, 30 May 2016)
Log Message:
-----------
rental: more on application
Modified Paths:
--------------
trunk/property/inc/class.bogeneric.inc.php
trunk/rental/inc/class.uiapplication.inc.php
trunk/rental/inc/model/class.application.inc.php
trunk/rental/templates/base/application.xsl
Added Paths:
-----------
trunk/rental/js/rental/application.edit.js
Modified: trunk/property/inc/class.bogeneric.inc.php
===================================================================
--- trunk/property/inc/class.bogeneric.inc.php 2016-05-30 12:09:11 UTC (rev
15221)
+++ trunk/property/inc/class.bogeneric.inc.php 2016-05-30 20:24:46 UTC (rev
15222)
@@ -351,4 +351,20 @@
{
return $this->so->edit_field($data);
}
+
+ public function get_single_attrib_value( array $data )
+ {
+ $ret = $id = $data['id'];
+ $type = $data['type'];
+ $attrib_name = $data['attrib_name'];
+ $ret = $id;
+ if($id = (int)$id)
+ {
+ $sogeneric = CreateObject('property.sogeneric',
$type);
+ $sogeneric_data =
$sogeneric->read_single(array('id' => $id));
+ $ret = $sogeneric_data[$attrib_name];
+ }
+ return $ret;
+ }
+
}
\ No newline at end of file
Modified: trunk/rental/inc/class.uiapplication.inc.php
===================================================================
--- trunk/rental/inc/class.uiapplication.inc.php 2016-05-30 12:09:11 UTC
(rev 15221)
+++ trunk/rental/inc/class.uiapplication.inc.php 2016-05-30 20:24:46 UTC
(rev 15222)
@@ -280,6 +280,8 @@
'cancel_url' =>
$GLOBALS['phpgw']->link('/index.php', $link_index),
'lang_save' => lang('save'),
'lang_cancel' => lang('cancel'),
+ 'value_ecodimb' => $application->get_ecodimb(),
+ 'value_ecodimb_descr' =>
ExecMethod('property.bogeneric.get_single_attrib_value', array('type' =>
'dimb', 'id' => $application->get_ecodimb(), 'attrib_name' => 'descr' )),
// 'lang_current_price_type' =>
lang($application->get_price_type_title()),
// 'lang_adjustable_text' =>
$application->get_adjustable_text(),
// 'lang_standard_text' =>
$application->get_standard_text(),
@@ -298,10 +300,10 @@
// 'responsibility_id' => $responsibility_id,
'mode' => $mode,
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
- 'validator' =>
phpgwapi_jquery::formvalidator_generate(array('location',
- 'date',
- 'security', 'file'))
);
+
phpgwapi_jquery::formvalidator_generate(array('date','security', 'file'));
+ phpgwapi_jquery::load_widget('autocomplete');
+ self::add_javascript('rental', 'rental',
'application.edit.js');
self::render_template_xsl(array('application'),
array($mode => $data));
}
Modified: trunk/rental/inc/model/class.application.inc.php
===================================================================
--- trunk/rental/inc/model/class.application.inc.php 2016-05-30 12:09:11 UTC
(rev 15221)
+++ trunk/rental/inc/model/class.application.inc.php 2016-05-30 20:24:46 UTC
(rev 15222)
@@ -31,6 +31,7 @@
class rental_application extends rental_model
{
+ protected $ecodimb;
protected $title;
protected $description;
protected $name;
@@ -43,7 +44,16 @@
{
parent::__construct((int)$id);
}
+ public function set_ecodimb( $ecodimb )
+ {
+ $this->ecodimb = $ecodimb;
+ }
+ public function get_ecodimb()
+ {
+ return $this->ecodimb;
+ }
+
public function set_title( $title )
{
$this->title = $title;
Added: trunk/rental/js/rental/application.edit.js
===================================================================
--- trunk/rental/js/rental/application.edit.js (rev 0)
+++ trunk/rental/js/rental/application.edit.js 2016-05-30 20:24:46 UTC (rev
15222)
@@ -0,0 +1,5 @@
+
+var oArgs = {menuaction: 'property.uigeneric.index', type: 'dimb', type_id:0};
+var strURL = phpGWLink('index.php', oArgs, true);
+JqueryPortico.autocompleteHelper(strURL, 'ecodimb_name', 'ecodimb',
'ecodimb_container', 'descr');
+
Modified: trunk/rental/templates/base/application.xsl
===================================================================
--- trunk/rental/templates/base/application.xsl 2016-05-30 12:09:11 UTC (rev
15221)
+++ trunk/rental/templates/base/application.xsl 2016-05-30 20:24:46 UTC (rev
15222)
@@ -29,6 +29,26 @@
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="tabs"/>
<div id="showing">
+ <fieldset>
+ <div class="pure-control-group">
+ <xsl:variable name="lang_dimb">
+ <xsl:value-of
select="php:function('lang', 'dimb')"/>
+ </xsl:variable>
+ <label>
+ <xsl:value-of
select="$lang_dimb"/>
+ </label>
+ <input type="hidden"
id="ecodimb" name="values[ecodimb]" value="{value_ecodimb}"/>
+ <input type="text"
id="ecodimb_name" name="values[ecodimb_name]" value="{value_ecodimb_descr}">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+ <xsl:value-of
select="$lang_dimb"/>
+ </xsl:attribute>
+ </input>
+ <div id="ecodimb_container"/>
+ </div>
+ </fieldset>
<!--fieldset>
<input type="hidden" name="id"
value="{price_item_id}"/>
<div class="pure-control-group">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15222] rental: more on application,
sigurdne <=