[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9217] property: s agreement
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9217] property: s agreement |
|
Date: |
Tue, 24 Apr 2012 11:04:50 +0000 |
Revision: 9217
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9217
Author: sigurdne
Date: 2012-04-24 11:04:50 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
property: s agreement
Modified Paths:
--------------
trunk/property/inc/class.sos_agreement.inc.php
trunk/property/inc/class.uis_agreement.inc.php
trunk/property/templates/base/attributes_form.xsl
trunk/property/templates/base/s_agreement.xsl
Modified: trunk/property/inc/class.sos_agreement.inc.php
===================================================================
--- trunk/property/inc/class.sos_agreement.inc.php 2012-04-24 09:32:18 UTC
(rev 9216)
+++ trunk/property/inc/class.sos_agreement.inc.php 2012-04-24 11:04:50 UTC
(rev 9217)
@@ -705,7 +705,7 @@
$values['id'] =
$this->db->f('id');
$values['entry_date'] =
$this->db->f('entry_date');
$values['cat_id'] =
$this->db->f('category');
- $values['member_of'] =
explode(',',$this->db->f('member_of'));
+ $values['member_of'] =
explode(',',trim($this->db->f('member_of'),','));
$values['cat_id'] =
$this->db->f('category');
$values['start_date'] =
$this->db->f('start_date');
$values['end_date'] =
$this->db->f('end_date');
@@ -779,7 +779,8 @@
if($values['member_of'])
{
- $values['member_of']=',' .
implode(',',$values['member_of']) . ',';
+ $member_of = ',' .
implode(',',$values['member_of']) . ',';
+ $values['member_of']= $member_of;
}
$this->db->transaction_begin();
@@ -850,6 +851,12 @@
$this->db->query("INSERT INTO fm_orders (id,type)
VALUES ($id,'s_agreement')");
+ if( $member_of && $values['vendor_id'])
+ {
+ $vendor_id = (int)$values['vendor_id'];
+ $this->db->query("UPDATE fm_vendor SET
member_of = '{$member_of}' WHERE id= {$vendor_id}");
+ }
+
$receipt['s_agreement_id']=
$id;//$this->db->get_last_insert_id($table,'id');
$receipt['message'][] = array('msg'=>lang('s_agreement
%1 has been saved',$receipt['s_agreement_id']));
@@ -1011,8 +1018,8 @@
function edit($values,$values_attribute = array())
{
- //_debug_array($values);
- //_debug_array($values_attribute);
+// _debug_array($values);
+// _debug_array($values_attribute);
$table = 'fm_s_agreement';
@@ -1021,7 +1028,8 @@
if($values['member_of'])
{
- $values['member_of']=',' .
implode(',',$values['member_of']) . ',';
+ $member_of = ',' .
implode(',',$values['member_of']) . ',';
+ $values['member_of']= $member_of;
}
if(isset($values['extra']) &&
is_array($values['extra']))
@@ -1052,6 +1060,8 @@
$value_set['name'] = $values['name'];
$value_set['descr'] = $values['descr'];
+ $value_set['vendor_id'] = $values['vendor_id'];
+
if($value_set)
{
$value_set = ',' .
$this->db->validate_update($value_set);
@@ -1077,6 +1087,12 @@
$this->db->query("UPDATE fm_s_agreement_pricing set
index_date=" . intval($values['start_date']) . " WHERE id=1 AND agreement_id=
'{$values['s_agreement_id']}'");
+ if( $member_of && $values['vendor_id'])
+ {
+ $vendor_id = (int)$values['vendor_id'];
+ $this->db->query("UPDATE fm_vendor SET
member_of = '{$member_of}' WHERE id= {$vendor_id}");
+ }
+
$this->db->transaction_commit();
$receipt['s_agreement_id']= $values['s_agreement_id'];
$receipt['message'][] = array('msg'=>lang('s_agreement
%1 has been edited',$values['s_agreement_id']));
Modified: trunk/property/inc/class.uis_agreement.inc.php
===================================================================
--- trunk/property/inc/class.uis_agreement.inc.php 2012-04-24 09:32:18 UTC
(rev 9216)
+++ trunk/property/inc/class.uis_agreement.inc.php 2012-04-24 11:04:50 UTC
(rev 9217)
@@ -1043,8 +1043,21 @@
$msgbox_data = $this->bocommon->msgbox_data($receipt);
- $member_of_data =
$this->cats->formatted_xslt_list(array('selected' => $this->member_id,'globals'
=> true,link_data => array()));
+ if($values['vendor_id'])
+ {
+ $generic =
CreateObject('property.bogeneric');
+ $generic->get_location_info('vendor');
+ $vendor = $generic->read_single(array('id' =>
$values['vendor_id']));
+ $member_of = explode(',',
trim($vendor['member_of'],','));
+ }
+ else
+ {
+ $member_of = array();
+ }
+
+ $member_of_data =
$this->cats->formatted_xslt_list(array('selected' => $member_of,'globals' =>
true));
+
$table_add[] = array
(
'lang_add'
=> lang('add detail'),
@@ -1533,7 +1546,7 @@
'lang_member_of'
=> lang('member of'),
'member_of_name'
=> 'member_id',
- 'member_of_list'
=> $member_of_data['cat_list'],
+ 'member_of_list2'
=> $member_of_data['cat_list'],
'attributes_group'
=> $attributes,
'lookup_functions'
=> $values['lookup_functions'],
Modified: trunk/property/templates/base/attributes_form.xsl
===================================================================
--- trunk/property/templates/base/attributes_form.xsl 2012-04-24 09:32:18 UTC
(rev 9216)
+++ trunk/property/templates/base/attributes_form.xsl 2012-04-24 11:04:50 UTC
(rev 9217)
@@ -583,7 +583,7 @@
<xsl:variable name="counter">
<xsl:value-of select="counter"/>
</xsl:variable>
- <table cellpadding="2" cellspacing="2" width="50%" align="left">
+ <table cellpadding="2" cellspacing="2" align="left">
<xsl:for-each select="choice">
<tr>
<xsl:attribute name="class">
@@ -600,10 +600,6 @@
</xsl:choose>
</xsl:attribute>
<td align="left">
- <xsl:value-of select="value"/>
- <xsl:text> </xsl:text>
- </td>
- <td align="left">
<xsl:choose>
<xsl:when
test="checked='checked'">
<input
type="{input_type}" name="values_attribute[{$counter}][value][]" value="{id}"
checked="checked"/>
@@ -612,7 +608,11 @@
<input
type="{input_type}" name="values_attribute[{$counter}][value][]" value="{id}"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:text> </xsl:text>
</td>
+ <td align="left">
+ <xsl:value-of select="value"/>
+ </td>
</tr>
</xsl:for-each>
</table>
Modified: trunk/property/templates/base/s_agreement.xsl
===================================================================
--- trunk/property/templates/base/s_agreement.xsl 2012-04-24 09:32:18 UTC
(rev 9216)
+++ trunk/property/templates/base/s_agreement.xsl 2012-04-24 11:04:50 UTC
(rev 9217)
@@ -233,7 +233,7 @@
</xsl:template>
<!-- add / edit -->
- <xsl:template match="edit">
+ <xsl:template match="edit" xmlns:php="http://php.net/xsl";>
<script type="text/javascript">
self.name="first_Window";
<xsl:value-of select="lookup_functions"/>
@@ -377,19 +377,18 @@
</td>
</tr>
<xsl:choose>
- <xsl:when
test="member_of_list != ''">
+ <xsl:when
test="member_of_list2 != ''">
<tr>
-
<td valign="top">
-
<xsl:value-of select="lang_member_of"/>
-
</td>
-
<td>
-
<xsl:variable name="lang_member_of_statustext">
-
<xsl:value-of select="lang_member_of_statustext"/>
-
</xsl:variable>
-
<select name="values[member_of][]" class="forms" multiple="multiple"
onMouseover="window.status='{$lang_member_of_statustext}'; return true;"
onMouseout="window.status='';return true;">
-
<xsl:apply-templates select="member_of_list"/>
-
</select>
-
</td>
+
<div id="member_of">
+
<td valign="top">
+
<xsl:value-of select="php:function('lang', 'member of')"/>
+
</td>
+
<td valign="top">
+
<p style="height: 80px; overflow: auto; border: 5px solid #eee;
background: #eee; color: #000; margin-bottom: 1.5em;">
+
<xsl:apply-templates select="member_of_list2"/>
+
</p>
+
</td>
+
</div>
</tr>
</xsl:when>
</xsl:choose>
@@ -1753,3 +1752,14 @@
</xsl:otherwise>
</xsl:choose>
</xsl:template>
+ <!-- New template-->
+
+ <xsl:template match="member_of_list2">
+ <input type="checkbox" name="values[member_of][]"
value="{cat_id}">
+ <xsl:if test="selected != ''">
+ <xsl:attribute name="checked"
value="checked"/>
+ </xsl:if>
+ </input>
+ <xsl:value-of disable-output-escaping="yes"
select="name"/>
+ <br/>
+ </xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9217] property: s agreement,
Sigurd Nes <=