[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc class.uiprojects.inc.php, 1.156 class.ui
|
From: |
ceb |
|
Subject: |
[Phpgroupware-cvs] projects/inc class.uiprojects.inc.php, 1.156 class.uiprojects_base.inc.php, 1.5 class.boprojects.inc.php, 1.154 |
|
Date: |
Wed, 16 Mar 2005 17:26:00 +0100 |
Update of projects/inc
Modified Files:
Branch: MAIN
class.uiprojects.inc.php lines: +2 -1
class.uiprojects_base.inc.php lines: +6 -1
class.boprojects.inc.php lines: +22 -27
Log Message:
update
====================================================
Index: projects/inc/class.uiprojects.inc.php
diff -u projects/inc/class.uiprojects.inc.php:1.155
projects/inc/class.uiprojects.inc.php:1.156
--- projects/inc/class.uiprojects.inc.php:1.155 Tue Mar 15 16:06:16 2005
+++ projects/inc/class.uiprojects.inc.php Wed Mar 16 16:26:40 2005
@@ -918,6 +918,7 @@
$mstone['project_id'] = $project_id;
$mstone['edate'] =
$mstone_end_val;
+ $mstone['old_edate'] = $vmstone['old_edate'];
$mstone['title'] =
$vmstone['title'];
if($vmstone['s_id'])
{
====================================================
Index: projects/inc/class.uiprojects_base.inc.php
diff -u projects/inc/class.uiprojects_base.inc.php:1.4
projects/inc/class.uiprojects_base.inc.php:1.5
--- projects/inc/class.uiprojects_base.inc.php:1.4 Tue Mar 15 16:06:16 2005
+++ projects/inc/class.uiprojects_base.inc.php Wed Mar 16 16:26:40 2005
@@ -892,6 +892,8 @@
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
$GLOBALS['phpgw']->template->set_var('lang_project',lang('Project'));
+
$GLOBALS['phpgw']->template->set_var('lang_sub_projects',lang('Sub projects'));
+
$GLOBALS['phpgw']->template->set_var('lang_ttracker',lang('time tracker'));
$GLOBALS['phpgw']->template->set_var('lang_statistics',lang('Statistics'));
$GLOBALS['phpgw']->template->set_var('lang_roles',lang('roles'));
@@ -905,6 +907,8 @@
$GLOBALS['phpgw']->template->set_var('lang_customer',lang('Customer'));
$GLOBALS['phpgw']->template->set_var('lang_coordinator',lang('Coordinator'));
$GLOBALS['phpgw']->template->set_var('lang_employees',lang('Employees'));
+
$GLOBALS['phpgw']->template->set_var('lang_project_team',lang('project team'));
+
$GLOBALS['phpgw']->template->set_var('lang_person',lang('Person'));
$GLOBALS['phpgw']->template->set_var('lang_organization',lang('Organization'));
$GLOBALS['phpgw']->template->set_var('lang_creator',lang('creator'));
@@ -1073,6 +1077,7 @@
$GLOBALS['phpgw']->template->set_var('lang_action',lang('action'));
$GLOBALS['phpgw']->template->set_var('lang_plus_jobs',lang('Jobs included'));
+
// stats
$GLOBALS['phpgw']->template->set_var('lang_archiv',lang('archive'));
====================================================
Index: projects/inc/class.boprojects.inc.php
diff -u projects/inc/class.boprojects.inc.php:1.153
projects/inc/class.boprojects.inc.php:1.154
--- projects/inc/class.boprojects.inc.php:1.153 Tue Mar 15 16:06:16 2005
+++ projects/inc/class.boprojects.inc.php Wed Mar 16 16:26:40 2005
@@ -1284,13 +1284,19 @@
function format_date($date = 0)
{
- $d = array();
if($date > 0)
{
- $d['date'] = $date + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'];
- $d['date_formatted'] =
$GLOBALS['phpgw']->common->show_date($date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $d = array
+ (
+ 'date' =>
$date + (60*60) *
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset'],
+ 'date_formatted' =>
$GLOBALS['phpgw']->common->show_date($date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']),
+ 'day' =>
date('d',$values['edate']),
+ 'month' =>
date('m',$values['edate']),
+ 'year' =>
date('Y',$values['edate'])
+ );
+ return $d;
}
- return $d;
+ return False;
}
function formatted_edate($edate = 0,$colored = True,$type =
'project')
@@ -1316,10 +1322,6 @@
$event_extra =
$this->soconfig->get_event_extra($event);
- /*if
(mktime(2,0,0,$month,$day+($event_extra*2),$year) >= $edate)
- {
- $edateout = '<font color="ECC200"><b>'
. $edateout . '</b></font>';
- }*/
if
(mktime(12,0,0,$month,$day+$event_extra,$year) >= $edate)
{
$edateout = '<font color="CC0000"><b>'
. $edateout . '</b></font>';
@@ -1932,7 +1934,7 @@
$values['project_id'] =
$this->soprojects->add_project($values);
- // if parent isset we its a new sub project
else its a new main project
+ // if parent isset its a new sub project else
its a new main project
if(isset($values['parent']) &&
($values['parent']>0))
{ // for a new subproject update the parent
project
// calc new_value - old_value (old
values doesnt exists!)
@@ -1992,7 +1994,6 @@
// update direct work setting for all jobs of
this project
$this->direct_work_set_job_setting($values['project_id'],
$values['direct_work']);
}
-
return $values['project_id'];
}
@@ -2081,14 +2082,14 @@
{
if ($values['edate'] > $pro_edate)
{
- $error[] = lang('milestone date
can not be after projects date due');
+ $error[] = lang('milestone date
due can not be after projects end date');
}
}
if ($pro_sdate > 0)
{
if ($values['edate'] < $pro_sdate)
{
- $error[] = lang('milestone date
can not be before projects date due');
+ $error[] = lang('milestone date
due can not be before projects start date');
}
}
}
@@ -2105,10 +2106,7 @@
function save_mstone($values)
{
- if ($values['emonth'] || $values['eday'] ||
$values['eyear'])
- {
- $values['edate'] =
mktime(12,0,0,$values['emonth'],$values['eday'],$values['eyear']);
- }
+ _debug_array($values);
$values['edate'] = intval($values['edate']);
if (intval($values['s_id']) > 0)
@@ -2120,28 +2118,25 @@
$values['s_id'] =
$this->soprojects->add_mstone($values);
}
- /*$values['old_edate'] = intval($values['old_edate']);
- $async = CreateObject('phpgwapi.asyncservice');
+ $values['old_edate'] = intval($values['old_edate']);
if($values['edate'] > 0 && $values['old_edate'] !=
$values['edate'])
{
+ $async = CreateObject('phpgwapi.asyncservice');
$co =
$this->soprojects->return_value('co',$values['project_id']);
$event_extra =
$this->soconfig->get_event_extra('milestone date due');
- $next =
mktime(date('H',time()),date('i',time())+5,0,$values['emonth'],$values['eday']-$event_extra,$values['eyear']);
$edate = $this->format_date($values['edate']);
+
+ $next =
mktime(date('H',time()),date('i',time())+5,0,$edate['month'],$edate['day']-$event_extra,$edate['year']);
+
$async->write(array('id' => 'ms-' .
$values['s_id'] . '-project-' . $values['project_id'], 'next' => $next,'times'
=> array('year' => date('Y',$next),
'month'
=> date('m',$next),'day' => date('d',$next),'hour' => date('H',$next),'min' =>
date('i',$next))
,'account_id' => $co,'method' => 'projects.boprojects.send_alarm',
'data'
=> array('project_id' => $values['project_id'],'event_type' => 'milestone date
due',
'edate'
=> $edate['date_formatted'],'ms_title' => $values['title'])));
- }
- if($values['edate'] == 0)
- {
- $aid = 'ms-' . $values['s_id'] . '-project-' .
$values['project_id'];
- $async->delete($aid);
- }
- unset($async);*/
+ unset($async);
+ }
return $values['s_id'];
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] projects/inc class.uiprojects.inc.php, 1.156 class.uiprojects_base.inc.php, 1.5 class.boprojects.inc.php, 1.154,
ceb <=