[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17040] controller: dateformat
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17040] controller: dateformat |
|
Date: |
Fri, 8 Sep 2017 03:43:40 -0400 (EDT) |
Revision: 17040
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17040
Author: sigurdne
Date: 2017-09-08 03:43:40 -0400 (Fri, 08 Sep 2017)
Log Message:
-----------
controller: dateformat
Modified Paths:
--------------
trunk/controller/inc/class.socontrol.inc.php
trunk/controller/inc/class.soprocedure.inc.php
trunk/controller/inc/class.uiprocedure.inc.php
trunk/controller/templates/base/procedure/print_procedure.xsl
Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php 2017-09-05 13:40:49 UTC
(rev 17039)
+++ trunk/controller/inc/class.socontrol.inc.php 2017-09-08 07:43:40 UTC
(rev 17040)
@@ -95,7 +95,7 @@
'description = ' .
$this->marshal($control->get_description(), 'string'),
'start_date = ' .
$this->marshal($control->get_start_date(), 'int'),
'end_date = ' .
$this->marshal($control->get_end_date(), 'int'),
- 'control_area_id = ' .
$this->marshal($control->get_control_area_id()),
+ 'control_area_id = ' .
$this->marshal($control->get_control_area_id(), 'int'),
'repeat_type = ' .
$this->marshal($control->get_repeat_type(), 'string'),
'repeat_interval = ' .
$this->marshal($control->get_repeat_interval(), 'string'),
'procedure_id = ' .
$this->marshal($control->get_procedure_id(), 'int'),
Modified: trunk/controller/inc/class.soprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.soprocedure.inc.php 2017-09-05 13:40:49 UTC
(rev 17039)
+++ trunk/controller/inc/class.soprocedure.inc.php 2017-09-08 07:43:40 UTC
(rev 17040)
@@ -514,6 +514,7 @@
$results = array();
+ $dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$sql = "SELECT p.* FROM controller_procedure p WHERE
{$revision_filter} ORDER BY end_date ASC";
$this->db->query($sql, __LINE__, __FILE__);
@@ -526,11 +527,14 @@
$procedure->set_description($this->unmarshal($this->db->f('description', true),
'string'));
$procedure->set_reference($this->unmarshal($this->db->f('reference', true),
'string'));
$procedure->set_attachment($this->unmarshal($this->db->f('attachment', true),
'string'));
-
$procedure->set_start_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$this->unmarshal($this->db->f('start_date'), 'int')));
-
$procedure->set_end_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$this->unmarshal($this->db->f('end_date'), 'int')));
+
$procedure->set_start_date($GLOBALS['phpgw']->common->show_date($this->unmarshal($this->db->f('start_date'),
'int'), $dateformat));
+ //
$procedure->set_start_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$this->unmarshal($this->db->f('start_date'), 'int')));
+ //
$procedure->set_end_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$this->unmarshal($this->db->f('end_date'), 'int')));
+
$procedure->set_end_date($GLOBALS['phpgw']->common->show_date($this->unmarshal($this->db->f('end_date'),
'int'), $dateformat));
$procedure->set_procedure_id($this->unmarshal($this->db->f('procedure_id'),
'int'));
$procedure->set_revision_no($this->unmarshal($this->db->f('revision_no'),
'int'));
-
$procedure->set_revision_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$this->unmarshal($this->db->f('revision_date'), 'int')));
+ //
$procedure->set_revision_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$this->unmarshal($this->db->f('revision_date'), 'int')));
+
$procedure->set_revision_date($GLOBALS['phpgw']->common->show_date($this->unmarshal($this->db->f('revision_date'),
'int'), $dateformat));
$procedure->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$category =
execMethod('phpgwapi.categories.return_single',
$this->unmarshal($this->db->f('control_area_id'), 'int'));
$procedure->set_control_area_name($category_name = $category[0]['name']);
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2017-09-05 13:40:49 UTC
(rev 17039)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2017-09-08 07:43:40 UTC
(rev 17040)
@@ -57,6 +57,7 @@
'print_procedure' => true
);
+ protected $dateformat;
public function __construct()
{
parent::__construct();
@@ -76,6 +77,7 @@
$config = CreateObject('phpgwapi.config', 'controller');
$config->read();
$this->_category_acl =
isset($config->config_data['acl_at_control_area']) &&
$config->config_data['acl_at_control_area'] == 1 ? true : false;
+ $this->dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
//
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/base.css');
}
@@ -443,8 +445,8 @@
$GLOBALS['phpgw']->jqcal->add_listener('end_date');
$GLOBALS['phpgw']->jqcal->add_listener('revision_date');
- $end_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_end_date() ? $procedure->get_end_date() : '');
- $revision_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_revision_date() ? $procedure->get_revision_date() : '');
+ $end_date =
$GLOBALS['phpgw']->common->show_date($procedure->get_end_date(), $dateformat);
+ $revision_date =
$GLOBALS['phpgw']->common->show_date($procedure->get_revision_date(),
$dateformat);
$data = array
@@ -452,7 +454,7 @@
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, 'procedure', 'procedure_tabview'),
'view' => "view_procedure",
'value_id' => !empty($procedure) ?
$procedure->get_id() : 0,
- 'start_date' =>
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_start_date() ? $procedure->get_start_date() : time()),
+ 'start_date' =>
$GLOBALS['phpgw']->common->show_date($procedure->get_start_date() ?
$procedure->get_start_date() : time(), $dateformat),
'end_date' => $end_date ? $end_date :
'',
'revision_date' => $revision_date ?
$revision_date : '',
'editable' => true,
@@ -539,8 +541,8 @@
if ($procedure->get_start_date() &&
$procedure->get_start_date() != null)
{
- //$procedure_start_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_start_date());
-
$procedure->set_start_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_start_date()));
+ //$procedure_start_date =
date($this->dateformat, $procedure->get_start_date());
+
$procedure->set_start_date(date($this->dateformat,
$procedure->get_start_date()));
}
else
{
@@ -548,8 +550,8 @@
}
if ($procedure->get_end_date() &&
$procedure->get_end_date() != null)
{
- //$procedure_end_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_end_date());
-
$procedure->set_end_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_end_date()));
+ //$procedure_end_date =
date($this->dateformat, $procedure->get_end_date());
+
$procedure->set_end_date(date($this->dateformat, $procedure->get_end_date()));
}
else
{
@@ -557,8 +559,8 @@
}
if ($procedure->get_revision_date() &&
$procedure->get_revision_date() != null)
{
- //$procedure_revision_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_revision_date());
-
$procedure->set_revision_date(date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_revision_date()));
+ //$procedure_revision_date =
date($this->dateformat, $procedure->get_revision_date());
+
$procedure->set_revision_date(date($this->dateformat,
$procedure->get_revision_date()));
}
else
{
@@ -674,7 +676,7 @@
'location' => $location_array,
'control' => $control->toArray(),
'procedure' => $procedure->toArray(),
- 'dateformat' =>
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']
+ 'dateformat' => $this->dateformat
);
//var_dump($procedure->toArray());
Modified: trunk/controller/templates/base/procedure/print_procedure.xsl
===================================================================
--- trunk/controller/templates/base/procedure/print_procedure.xsl
2017-09-05 13:40:49 UTC (rev 17039)
+++ trunk/controller/templates/base/procedure/print_procedure.xsl
2017-09-08 07:43:40 UTC (rev 17040)
@@ -42,7 +42,6 @@
<h4>
<xsl:value-of
select="php:function('lang','Procedure end date')" />
</h4>
- <xsl:value-of
select="procedure/end_date" />
<xsl:variable name="enddate">
<xsl:value-of
select="procedure/end_date" />
</xsl:variable>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17040] controller: dateformat,
sigurdne <=