[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16104] more on rental
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16104] more on rental |
|
Date: |
Mon, 19 Dec 2016 13:48:05 +0000 (UTC) |
Revision: 16104
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16104
Author: sigurdne
Date: 2016-12-19 13:48:05 +0000 (Mon, 19 Dec 2016)
Log Message:
-----------
more on rental
Modified Paths:
--------------
trunk/eventplanner/inc/class.uicommon.inc.php
trunk/phpgwapi/inc/class.socommon.inc.php
trunk/phpgwapi/inc/model/class.model.inc.php
trunk/rental/inc/class.bomoveout.inc.php
trunk/rental/inc/class.uimoveout.inc.php
trunk/rental/inc/model/class.moveout.inc.php
trunk/rental/templates/base/moveout.xsl
Modified: trunk/eventplanner/inc/class.uicommon.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uicommon.inc.php 2016-12-19 09:35:31 UTC
(rev 16103)
+++ trunk/eventplanner/inc/class.uicommon.inc.php 2016-12-19 13:48:05 UTC
(rev 16104)
@@ -64,9 +64,15 @@
{
if($field_info['action'] & PHPGW_ACL_READ)
{
+ $label =
!empty($field_info['translated_label']) ? $field_info['translated_label'] :'';
+ if(!$label)
+ {
+ $label
=!empty($field_info['label']) ? lang($field_info['label']) : $field;
+ }
+
$data = array(
'key' => $field,
- 'label' =>
!empty($field_info['label']) ? lang($field_info['label']) : $field,
+ 'label' => $label,
'sortable' =>
!empty($field_info['sortable']) ? true : false,
'hidden' =>
!empty($field_info['hidden']) ? true : false,
);
Modified: trunk/phpgwapi/inc/class.socommon.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.socommon.inc.php 2016-12-19 09:35:31 UTC (rev
16103)
+++ trunk/phpgwapi/inc/class.socommon.inc.php 2016-12-19 13:48:05 UTC (rev
16104)
@@ -52,6 +52,8 @@
$this->skip_limit_query = null;
$this->fields = $fields;
$this->table_name = $table_name;
+ $this->dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+
}
/**
@@ -147,6 +149,10 @@
{
return json_decode($value, true);
}
+ else if ($type == 'datestring')
+ {
+ return date($this->dateformat,
strtotime($value));
+ }
return $value;
}
Modified: trunk/phpgwapi/inc/model/class.model.inc.php
===================================================================
--- trunk/phpgwapi/inc/model/class.model.inc.php 2016-12-19 09:35:31 UTC
(rev 16103)
+++ trunk/phpgwapi/inc/model/class.model.inc.php 2016-12-19 13:48:05 UTC
(rev 16104)
@@ -283,7 +283,7 @@
/**
* Implement in subclasses
*/
- public function get_custom_fields()
+ public static function get_custom_fields()
{
return array();
}
Modified: trunk/rental/inc/class.bomoveout.inc.php
===================================================================
--- trunk/rental/inc/class.bomoveout.inc.php 2016-12-19 09:35:31 UTC (rev
16103)
+++ trunk/rental/inc/class.bomoveout.inc.php 2016-12-19 13:48:05 UTC (rev
16104)
@@ -79,13 +79,11 @@
unset($params['filters']['active']);
}
$values =
rental_somoveout::get_instance()->read($params);
- // $status_text = rental_moveout::get_status_list();
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
foreach ($values['results'] as &$entry)
{
- // $entry['status'] =
$status_text[$entry['status']];
- $entry['created'] =
$GLOBALS['phpgw']->common->show_date($entry['created']);
- $entry['modified'] =
$GLOBALS['phpgw']->common->show_date($entry['modified']);
+ $entry['created'] = date($dateformat,
$entry['created']);//$GLOBALS['phpgw']->common->show_date($entry['created']);
+ $entry['modified'] = date($dateformat,
$entry['modified']);//$GLOBALS['phpgw']->common->show_date($entry['modified']);
}
return $values;
}
@@ -101,7 +99,7 @@
$values = new rental_moveout();
}
- $custom_fields =
rental_moveout::get_instance()->get_custom_fields();
+ $custom_fields = rental_moveout::get_custom_fields();
if($custom_fields)
{
$custom_fields =
rental_somoveout::get_instance()->read_custom_field_values($id, $custom_fields);
Modified: trunk/rental/inc/class.uimoveout.inc.php
===================================================================
--- trunk/rental/inc/class.uimoveout.inc.php 2016-12-19 09:35:31 UTC (rev
16103)
+++ trunk/rental/inc/class.uimoveout.inc.php 2016-12-19 13:48:05 UTC (rev
16104)
@@ -57,7 +57,7 @@
$this->bo = createObject('rental.bomoveout');
$this->fields = rental_moveout::get_fields();
$this->permissions =
rental_moveout::get_instance()->get_permission_array();
- $this->custom_fields =
rental_moveout::get_instance()->get_custom_fields();
+ $this->custom_fields =
rental_moveout::get_custom_fields();
}
public function index()
Modified: trunk/rental/inc/model/class.moveout.inc.php
===================================================================
--- trunk/rental/inc/model/class.moveout.inc.php 2016-12-19 09:35:31 UTC
(rev 16103)
+++ trunk/rental/inc/model/class.moveout.inc.php 2016-12-19 13:48:05 UTC
(rev 16104)
@@ -48,8 +48,6 @@
$attributes,// custom fields
$values_attribute;// custom fields
- static $custom_fields = array();
-
protected $field_of_responsibility_name = '.moveout';
public function __construct( int $id = null )
@@ -68,18 +66,14 @@
return new rental_moveout();
}
- public function set_custom_fields()
+ public static function get_custom_fields()
{
- $this->custom_fields =
$GLOBALS['phpgw']->custom_fields->find('rental', self::acl_location, 0, '',
'ASC', 'attrib_sort', true, true);
- }
-
- public function get_custom_fields()
- {
- if (!$this->custom_fields)
+ static $custom_fields = array();
+ if(!$custom_fields)
{
- $this->set_custom_fields();
+ $custom_fields =
$GLOBALS['phpgw']->custom_fields->find('rental', self::acl_location, 0, '',
'ASC', 'attrib_sort', true, true);
}
- return $this->custom_fields;
+ return $custom_fields;
}
public function get_organized_fields()
@@ -148,6 +142,7 @@
)
);
+
if($debug)
{
foreach ($fields as $field => $field_info)
@@ -159,6 +154,20 @@
}
}
+
+ $custom_fields = self::get_custom_fields();
+
+ foreach ($custom_fields as $attrib_id => $attrtib)
+ {
+ $fields[$attrtib['name']] = array(
+ 'action'=> $attrtib['list'],
+ 'type' => $attrtib['datatype']
== 'D' || $attrtib['datatype'] == 'DT' ? 'datestring' : 'string',
+ 'label' =>
$attrtib['input_text'],
+ 'translated_label' =>
$attrtib['input_text'],
+ 'sortable' =>
!!$attrtib['attrib_sort'],
+ 'query' => !!$attrtib['search']
+ );
+ }
return $fields;
}
Modified: trunk/rental/templates/base/moveout.xsl
===================================================================
--- trunk/rental/templates/base/moveout.xsl 2016-12-19 09:35:31 UTC (rev
16103)
+++ trunk/rental/templates/base/moveout.xsl 2016-12-19 13:48:05 UTC (rev
16104)
@@ -188,14 +188,6 @@
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'rented_area')"/>
- </label>
- <div id="rented_area"
class="pure-custom">
- <xsl:value-of
select="contract/rented_area"/>
- </div>
- </div>
- <div class="pure-control-group">
- <label>
<xsl:value-of
select="php:function('lang', 'billing_terms')"/>
</label>
<div id="term_label"
class="pure-custom">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16104] more on rental,
sigurdne <=