[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.bocommon.inc.php inc/class.b...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.bocommon.inc.php inc/class.b... |
|
Date: |
Fri, 16 Mar 2007 14:14:56 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/03/16 14:14:56
Modified files:
inc : class.bocommon.inc.php class.boproject.inc.php
setup : setup.inc.php tables_update.inc.php
templates/base/css: base.css
Log message:
End_date for projects
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boproject.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/property/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/property/setup/tables_update.inc.php?cvsroot=phpgroupware&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/css/base.css?cvsroot=phpgroupware&r1=1.2&r2=1.3
Patches:
Index: inc/class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- inc/class.bocommon.inc.php 19 Feb 2007 21:02:41 -0000 1.62
+++ inc/class.bocommon.inc.php 16 Mar 2007 14:14:56 -0000 1.63
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.bocommon.inc.php,v 1.62 2007/02/19 21:02:41
sigurdne Exp $
+ * @version $Id: class.bocommon.inc.php,v 1.63 2007/03/16 14:14:56
sigurdne Exp $
*/
/**
@@ -182,8 +182,12 @@
}
- function date_array($datestr)
+ function date_array($datestr = '')
{
+ if(!$datestr)
+ {
+ return false;
+ }
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$fields = split('[./-]',$datestr);
Index: inc/class.boproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boproject.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- inc/class.boproject.inc.php 20 Feb 2007 22:22:20 -0000 1.22
+++ inc/class.boproject.inc.php 16 Mar 2007 14:14:56 -0000 1.23
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.boproject.inc.php,v 1.22 2007/02/20 22:22:20
sigurdne Exp $
+ * @version $Id: class.boproject.inc.php,v 1.23 2007/03/16 14:14:56
sigurdne Exp $
*/
/**
@@ -250,7 +250,7 @@
$project =
$this->so->read_single($project_id);
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$project['start_date'] =
$GLOBALS['phpgw']->common->show_date($project['start_date'],$dateformat);
- $project['end_date'] =
$GLOBALS['phpgw']->common->show_date($project['end_date'],$dateformat);
+ $project['end_date'] =
isset($project['end_date']) && $project['end_date'] ?
$GLOBALS['phpgw']->common->show_date($project['end_date'],$dateformat) : '';
$workorder_data =
$this->so->project_workorder_data($project_id);
$sum_workorder_budget = 0;
@@ -332,7 +332,7 @@
$project
= $this->so->read_single($project_id);
$dateformat
= $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$project['start_date'] =
$GLOBALS['phpgw']->common->show_date($project['start_date'],$dateformat);
- $project['end_date'] =
$GLOBALS['phpgw']->common->show_date($project['end_date'],$dateformat);
+ $project['end_date'] =
isset($project['end_date']) && $project['end_date'] ?
$GLOBALS['phpgw']->common->show_date($project['end_date'],$dateformat) : '';
if($project['location_code'])
{
@@ -454,7 +454,7 @@
$end_date =
$this->bocommon->date_array($project['end_date']);
$project['start_date'] = mktime
(2,0,0,$start_date['month'],$start_date['day'],$start_date['year']);
- $project['end_date'] = mktime
(2,0,0,$end_date['month'],$end_date['day'],$end_date['year']);
+ $project['end_date'] = $end_date ? mktime
(2,0,0,$end_date['month'],$end_date['day'],$end_date['year']) : '';
if ($action=='edit')
Index: setup/setup.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/setup/setup.inc.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- setup/setup.inc.php 2 Jan 2007 14:43:03 -0000 1.57
+++ setup/setup.inc.php 16 Mar 2007 14:14:56 -0000 1.58
@@ -8,12 +8,12 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: setup.inc.php,v 1.57 2007/01/02 14:43:03 sigurdne Exp $
+ * @version $Id: setup.inc.php,v 1.58 2007/03/16 14:14:56 sigurdne Exp $
*/
$setup_info['property']['name'] = 'property';
$setup_info['property']['title'] = 'Property';
- $setup_info['property']['version'] = '0.9.17.536';
+ $setup_info['property']['version'] = '0.9.17.537';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Index: setup/tables_update.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/setup/tables_update.inc.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- setup/tables_update.inc.php 2 Jan 2007 14:43:03 -0000 1.65
+++ setup/tables_update.inc.php 16 Mar 2007 14:14:56 -0000 1.66
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: tables_update.inc.php,v 1.65 2007/01/02 14:43:03
sigurdne Exp $
+ * @version $Id: tables_update.inc.php,v 1.66 2007/03/16 14:14:56
sigurdne Exp $
*/
/**
@@ -1756,4 +1756,24 @@
}
+ /**
+ * Update property version from 0.9.17.536 to 0.9.17.537
+ */
+
+ $test[] = '0.9.17.536';
+ function property_upgrade0_9_17_536()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('fm_project','end_date',array(
+ 'type' => 'int',
+ 'precision' => 4,
+ 'nullable' => 'True'
+ ));
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.537';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
\ No newline at end of file
Index: templates/base/css/base.css
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/css/base.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- templates/base/css/base.css 30 Oct 2006 18:13:27 -0000 1.2
+++ templates/base/css/base.css 16 Mar 2007 14:14:56 -0000 1.3
@@ -41,7 +41,7 @@
textarea
{
- white-space: normal;
+/* white-space: normal;*/
}
br
- [Phpgroupware-cvs] property inc/class.bocommon.inc.php inc/class.b...,
Sigurd Nes <=