[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14452] fixed display of dates on procedures
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [14452] fixed display of dates on procedures |
Date: |
Mon, 23 Nov 2015 08:08:18 +0000 |
Revision: 14452
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14452
Author: erikhl
Date: 2015-11-23 08:08:09 +0000 (Mon, 23 Nov 2015)
Log Message:
-----------
fixed display of dates on procedures
Modified Paths:
--------------
trunk/controller/inc/class.uiprocedure.inc.php
trunk/controller/templates/base/procedure/print_procedure.xsl
trunk/controller/templates/base/procedure/procedure_item.xsl
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2015-11-23 06:37:38 UTC
(rev 14451)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2015-11-23 08:08:09 UTC
(rev 14452)
@@ -190,6 +190,9 @@
if(isset($_POST['save_procedure'])) // The user has
pressed the save button
{
+ //var_dump($_POST);
+
//var_dump(strtotime(phpgw::get_var('start_date')));
+ //die;
if(!$this->add && !$this->edit)
{
phpgwapi_cache::message_set('No
access', 'error');
@@ -212,9 +215,9 @@
$procedure->set_description($description_txt);
$procedure->set_reference($reference_txt);
$procedure->set_attachment(phpgw::get_var('attachment'));
-
$procedure->set_start_date(strtotime(phpgw::get_var('start_date_hidden')));
-
$procedure->set_end_date(strtotime(phpgw::get_var('end_date_hidden')));
-
$procedure->set_revision_date(strtotime(phpgw::get_var('revision_date_hidden')));
+
$procedure->set_start_date(strtotime(phpgw::get_var('start_date')));
+
$procedure->set_end_date(strtotime(phpgw::get_var('end_date')));
+
$procedure->set_revision_date(strtotime(phpgw::get_var('revision_date')));
$procedure->set_control_area_id(phpgw::get_var('control_area'));
$revision =
(int)$procedure->get_revision_no();
@@ -288,8 +291,8 @@
$procedure->set_description($description_txt);
$procedure->set_reference($reference_txt);
$procedure->set_attachment(phpgw::get_var('attachment'));
-
$procedure->set_start_date(strtotime(phpgw::get_var('start_date_hidden')));
-
$procedure->set_end_date(strtotime(phpgw::get_var('end_date_hidden')));
+
$procedure->set_start_date(strtotime(phpgw::get_var('start_date')));
+
$procedure->set_end_date(strtotime(phpgw::get_var('end_date')));
$procedure->set_control_area_id(phpgw::get_var('control_area'));
if(isset($procedure_id) &&
$procedure_id > 0)
@@ -499,19 +502,35 @@
$procedure->set_responsibility(str_replace(' ', ' ',
$procedure->get_responsibility()));
$procedure->set_reference(str_replace(' ',
' ', $procedure->get_reference()));
- $procedure_array = $procedure->toArray();
+
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_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()));
}
+ else
+ {
+ $procedure->set_start_date("");
+ }
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_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()));
}
+ else
+ {
+ $procedure->set_end_date("");
+ }
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_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()));
}
+ else
+ {
+ $procedure->set_revision_date("");
+ }
+ $procedure_array = $procedure->toArray();
if(!$view_revision)
{
@@ -527,7 +546,7 @@
$table_values[] = array('row'
=> $rev);
}
}
-
+
$tabs = array(
array(
'label' =>
lang('Procedure')
Modified: trunk/controller/templates/base/procedure/print_procedure.xsl
===================================================================
--- trunk/controller/templates/base/procedure/print_procedure.xsl
2015-11-23 06:37:38 UTC (rev 14451)
+++ trunk/controller/templates/base/procedure/print_procedure.xsl
2015-11-23 08:08:09 UTC (rev 14452)
@@ -23,8 +23,8 @@
</xsl:if>
</div>
<div>
- <label for="revision_date"><xsl:value-of
select="php:function('lang','Procedure revision date')" /></label>
- <xsl:if test="procedure/revision_date != 0">
+ <xsl:if test="procedure/revision_date != 0">
+ <label for="revision_date"><xsl:value-of
select="php:function('lang','Procedure revision date')" /></label>
<xsl:variable name="revisiondate"><xsl:value-of
select="procedure/revision_date" /></xsl:variable>
<xsl:value-of select="php:function('date',
$date_format, $revisiondate)" />
</xsl:if>
@@ -32,7 +32,7 @@
<div>
<xsl:if test="procedure/end_date != 0">
<label for="end_date"><xsl:value-of
select="php:function('lang','Procedure end date')" /></label>
-
+ <xsl:value-of select="procedure/end_date" />
<xsl:variable name="enddate"><xsl:value-of
select="procedure/end_date" /></xsl:variable>
<xsl:value-of select="php:function('date',
$date_format, $enddate)" />
</xsl:if>
Modified: trunk/controller/templates/base/procedure/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_item.xsl
2015-11-23 06:37:38 UTC (rev 14451)
+++ trunk/controller/templates/base/procedure/procedure_item.xsl
2015-11-23 08:08:09 UTC (rev 14452)
@@ -56,7 +56,7 @@
</input>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="start_date" />
+ <xsl:value-of
select="procedure/start_date" />
</xsl:otherwise>
</xsl:choose>
</dd>
@@ -70,7 +70,7 @@
</input>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="revision_date" />
+ <xsl:value-of
select="procedure/revision_date" />
</xsl:otherwise>
</xsl:choose>
</dd>
@@ -84,7 +84,7 @@
</input>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of
select="end_date" />
+ <xsl:value-of
select="procedure/end_date" />
</xsl:otherwise>
</xsl:choose>
</dd>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14452] fixed display of dates on procedures,
Erik Holm-Larsen <=