[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14931] more on orders
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [14931] more on orders |
Date: |
Mon, 25 Apr 2016 08:24:28 +0000 |
Revision: 14931
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14931
Author: sigurdne
Date: 2016-04-25 08:24:27 +0000 (Mon, 25 Apr 2016)
Log Message:
-----------
more on orders
Modified Paths:
--------------
trunk/property/inc/class.sogeneric.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/class.uiworkorder.inc.php
trunk/property/js/portico/project.edit.js
trunk/property/templates/base/project.xsl
trunk/property/templates/base/workorder.xsl
Modified: trunk/property/inc/class.sogeneric.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric.inc.php 2016-04-25 07:38:04 UTC (rev
14930)
+++ trunk/property/inc/class.sogeneric.inc.php 2016-04-25 08:24:27 UTC (rev
14931)
@@ -278,6 +278,10 @@
$querymethod .= " OR
{$table}.{$this->location_info['id']['name']} $this->_like '%$query%'";
$where = 'OR';
}
+ else
+ {
+ $querymethod .= " OR CAST
({$table}.{$this->location_info['id']['name']} AS TEXT) $this->_like
'%$query%'";
+ }
foreach ($this->location_info['fields'] as
$field)
{
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2016-04-25 07:38:04 UTC (rev
14930)
+++ trunk/property/inc/class.uiproject.inc.php 2016-04-25 08:24:27 UTC (rev
14931)
@@ -73,6 +73,7 @@
'get_vouchers' => true,
'check_missing_project_budget' => true,
'get_external_project'=> true,
+ 'get_ecodimb' => true
);
function __construct()
@@ -2624,6 +2625,26 @@
return array('ResultSet' => array('Result' => $values));
}
+ public function get_ecodimb()
+ {
+ if (!$this->acl_read)
+ {
+ return;
+ }
+
+ $query = phpgw::get_var('query');
+
+ $sogeneric = CreateObject('property.sogeneric', 'dimb');
+ $values = $sogeneric->read(array('query' => $query));
+
+ foreach ($values as &$value)
+ {
+ $value['name'] = "{$value['id']}
{$value['descr']}";
+ }
+
+ return array('ResultSet' => array('Result' => $values));
+ }
+
private function _get_external_project_name( $id )
{
$ret = '';
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2016-04-25 07:38:04 UTC
(rev 14930)
+++ trunk/property/inc/class.uiworkorder.inc.php 2016-04-25 08:24:27 UTC
(rev 14931)
@@ -2247,6 +2247,7 @@
'value_sum_estimated_cost' =>
$sum_estimated_cost,
'value_contract_sum' =>
isset($this->receipt['error']) && $this->receipt['error'] ?
$_POST['values']['contract_sum'] : '',
'ecodimb_data' => $ecodimb_data,
+ 'project_ecodimb' => $project['ecodimb'],
'vendor_data' => $vendor_data,
'location_data' => $location_data,
'location_template_type' =>
$location_template_type,
Modified: trunk/property/js/portico/project.edit.js
===================================================================
--- trunk/property/js/portico/project.edit.js 2016-04-25 07:38:04 UTC (rev
14930)
+++ trunk/property/js/portico/project.edit.js 2016-04-25 08:24:27 UTC (rev
14931)
@@ -448,3 +448,7 @@
var oArgs = {menuaction: 'property.uiproject.get_external_project'};
var strURL = phpGWLink('index.php', oArgs, true);
JqueryPortico.autocompleteHelper(strURL, 'external_project_name',
'external_project_id', 'external_project_container');
+
+var oArgs = {menuaction: 'property.uiproject.get_ecodimb'};
+var strURL = phpGWLink('index.php', oArgs, true);
+JqueryPortico.autocompleteHelper(strURL, 'ecodimb_name', 'ecodimb',
'ecodimb_container');
Modified: trunk/property/templates/base/project.xsl
===================================================================
--- trunk/property/templates/base/project.xsl 2016-04-25 07:38:04 UTC (rev
14930)
+++ trunk/property/templates/base/project.xsl 2016-04-25 08:24:27 UTC (rev
14931)
@@ -340,11 +340,43 @@
<div id="external_project_container"/>
</div>
- <xsl:choose>
+ <!--xsl:choose>
<xsl:when test="ecodimb_data!=''">
<xsl:call-template
name="ecodimb_form"/>
</xsl:when>
- </xsl:choose>
+ </xsl:choose-->
+
+
+ <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>
+ <xsl:if test="mode='edit'">
+ <input type="hidden"
id="ecodimb" name="values[ecodimb]" value="{ecodimb_data/value_ecodimb}"/>
+ </xsl:if>
+ <input type="text" id="ecodimb_name"
name="values[ecodimb_name]" value="{ecodimb_data/value_ecodimb}
{ecodimb_data/value_ecodimb_descr}">
+ <xsl:choose>
+ <xsl:when
test="mode='edit'">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="disabled">
+
<xsl:text>disabled</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+
<xsl:value-of select="$lang_dimb"/>
+ </xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </input>
+ <div id="ecodimb_container"/>
+ </div>
+
<xsl:choose>
<xsl:when test="b_account_data!=''">
<xsl:choose>
Modified: trunk/property/templates/base/workorder.xsl
===================================================================
--- trunk/property/templates/base/workorder.xsl 2016-04-25 07:38:04 UTC (rev
14930)
+++ trunk/property/templates/base/workorder.xsl 2016-04-25 08:24:27 UTC (rev
14931)
@@ -598,22 +598,30 @@
<label>
<xsl:value-of
select="$lang_dimb"/>
</label>
- <input type="hidden"
id="ecodimb" name="values[ecodimb]" value="{ecodimb_data/value_ecodimb}"/>
+ <xsl:if test="mode='edit' and
project_ecodimb =''">
+ <input type="hidden"
id="ecodimb" name="values[ecodimb]" value="{ecodimb_data/value_ecodimb}"/>
+ </xsl:if>
<input type="text"
id="ecodimb_name" name="values[ecodimb_name]"
value="{ecodimb_data/value_ecodimb} {ecodimb_data/value_ecodimb_descr}">
<xsl:choose>
<xsl:when
test="mode='edit'">
<xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
</xsl:attribute>
+
<xsl:choose>
+
<xsl:when test="project_ecodimb !=''">
+
<xsl:attribute name="disabled">
+
<xsl:text>disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
</xsl:when>
- <xsl:otherwise
test="mode='edit'">
+ <xsl:otherwise>
<xsl:attribute name="disabled">
<xsl:text>disabled</xsl:text>
</xsl:attribute>
<xsl:attribute name="data-validation-error-msg">
<xsl:value-of select="$lang_dimb"/>
</xsl:attribute>
-
</xsl:otherwise>
</xsl:choose>
</input>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14931] more on orders,
Sigurd Nes <=