[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc class.uiprojects_base.inc.php, 1.4 class
|
From: |
ceb |
|
Subject: |
[Phpgroupware-cvs] projects/inc class.uiprojects_base.inc.php, 1.4 class.uiprojects.inc.php, 1.155 class.boprojects.inc.php, 1.153 |
|
Date: |
Tue, 15 Mar 2005 17:06:00 +0100 |
Update of projects/inc
Modified Files:
Branch: MAIN
class.uiprojects_base.inc.php lines: +3 -1
class.uiprojects.inc.php lines: +43 -56
class.boprojects.inc.php lines: +3 -3
Log Message:
update
====================================================
Index: projects/inc/class.uiprojects_base.inc.php
diff -u projects/inc/class.uiprojects_base.inc.php:1.3
projects/inc/class.uiprojects_base.inc.php:1.4
--- projects/inc/class.uiprojects_base.inc.php:1.3 Tue Mar 15 13:17:54 2005
+++ projects/inc/class.uiprojects_base.inc.php Tue Mar 15 16:06:16 2005
@@ -228,6 +228,7 @@
}
$GLOBALS['phpgw']->js->validate_file('tabs','tabs');
$GLOBALS['phpgw']->js->validate_file('core','popup');
+
$GLOBALS['phpgw']->js->validate_file('core','projects','projects');
if(!is_object($GLOBALS['phpgw']->css))
{
@@ -940,6 +941,7 @@
$GLOBALS['phpgw']->template->set_var('lang_main',lang('Main project'));
$GLOBALS['phpgw']->template->set_var('lang_add_milestone',lang('add
milestone'));
+
$GLOBALS['phpgw']->template->set_var('lang_milestones',lang('milestones'));
$GLOBALS['phpgw']->template->set_var('lang_result',lang('result'));
$GLOBALS['phpgw']->template->set_var('lang_test',lang('test'));
====================================================
Index: projects/inc/class.uiprojects.inc.php
diff -u projects/inc/class.uiprojects.inc.php:1.154
projects/inc/class.uiprojects.inc.php:1.155
--- projects/inc/class.uiprojects.inc.php:1.154 Tue Mar 15 13:17:54 2005
+++ projects/inc/class.uiprojects.inc.php Tue Mar 15 16:06:16 2005
@@ -49,7 +49,6 @@
//'accounts_popup' => True,
//'e_accounts_popup' => True,
'list_budget' => True,
- 'project_mstones' => True,
'assign_employee_roles' => True,
'report' => True,
'export_cost_accounting' => True,
@@ -745,17 +744,16 @@
{
$GLOBALS['phpgw']->js =
createObject('phpgwapi.javascript');
}
- $GLOBALS['phpgw']->js->validate_file('api', 'tabs');
$jscal = CreateObject('phpgwapi.jscalendar');
-
+
$action =
get_var('action',array('GET','POST'));
$pro_main =
get_var('pro_main',array('GET','POST'));
$pro_parent =
get_var('pro_parent',array('GET','POST'));
$book_activities =
get_var('book_activities',array('POST'));
$bill_activities =
get_var('bill_activities',array('POST'));
$project_id =
get_var('project_id',array('GET','POST'));
- $name = get_var('name',array('POST'));
+ //$name = get_var('name',array('POST'));
$values = get_var('values',array('POST'));
$sdate = get_var('sdate',array('GET','POST'));
$edate = get_var('edate',array('GET','POST'));
@@ -787,7 +785,7 @@
$link_data = array
(
- 'menuaction' =>
'projects.uiprojects.tree_view_projects',
+ 'menuaction' =>
'projects.uiprojects.edit_project',
'pro_main' => $pro_main,
'action' => $action,
'project_id' => $project_id,
@@ -820,31 +818,6 @@
//_debug_array($sdate);
- $jscal = CreateObject('phpgwapi.jscalendar');
- if(is_array($sdate))
- {
- $start_array =
$jscal->input2date($sdate['str']);
- $start_val = $start_array['raw'];
- }
-
- if(is_array($edate))
- {
- $end_array =
$jscal->input2date($edate['str']);
- $end_val = $end_array['raw'];
- }
-
- if(is_array($psdate))
- {
- $pstart_array =
$jscal->input2date($psdate['str']);
- $pstart_val = $pstart_array['raw'];
- }
-
- if(is_array($pedate))
- {
- $pend_array =
$jscal->input2date($pedate['str']);
- $pend_val = $pend_array['raw'];
- }
-
if ($_POST['save'] || $_POST['apply'])
{
$this->cat_id = ($values['cat'] ?
$values['cat'] : '');
@@ -908,6 +881,7 @@
if($_POST['save'])
{
unset($jscal);
+ $link_data['menuaction'] =
'projects.uiprojects.tree_view_projects';
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
else
@@ -916,25 +890,22 @@
}
}
}
-
- if($_POST['cancel'])
+ elseif($_POST['cancel'])
{
if(!$project_id)
{
$link_data['project_id'] = $pro_parent;
}
-
+ $link_data['menuaction'] =
'projects.uiprojects.tree_view_projects';
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
-
- if($_POST['delete'])
+ elseif($_POST['delete'])
{
$link_data['menuaction'] =
'projects.uiprojects.delete_project';
$link_data['pa_id'] = $project_id;
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
-
- if($_POST['mstone_save'] || $_GET['mstone_save'])
+ elseif($_POST['mstone_save'])
{
$mstone_edate =
get_var('mstone_edate',array('GET','POST'));
$vmstone =
get_var('vmstone',array('GET','POST'));
@@ -948,7 +919,10 @@
$mstone['project_id'] = $project_id;
$mstone['edate'] =
$mstone_end_val;
$mstone['title'] =
$vmstone['title'];
-
+ if($vmstone['s_id'])
+ {
+ $mstone['s_id'] = $vmstone['s_id'];
+ }
$error =
$this->boprojects->check_mstone($mstone);
if(is_array($error))
{
@@ -960,8 +934,7 @@
$message = lang('milestone has been
saved');
}
}
-
- if($_POST['roles'])
+ elseif($_POST['roles'])
{
$link_data['menuaction'] =
'projects.uiprojects.assign_employee_roles';
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
@@ -976,12 +949,14 @@
if(!is_array($values))
{
+ $link_data['menuaction'] =
'projects.uiprojects.tree_view_projects';
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
$check = array('action' =>
$action,'coordinator' => $values['coordinator'],'main' =>
$values['main'],'parent' => $values['parent']);
if(!$this->boprojects->edit_perms($check))
{
+ $link_data['menuaction'] =
'projects.uiprojects.tree_view_projects';
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
}
@@ -1005,12 +980,11 @@
$GLOBALS['phpgw']->template->set_block('edit_form','accounting_own','accounting_ownhandle');
$nopref = $this->boprojects->check_prefs();
- if (is_array($nopref) && !$_POST['save'] &&
!$_POST['apply'])
+ if (is_array($nopref))
{
$message .=
$GLOBALS['phpgw']->common->error_list($nopref);
}
-
-
$GLOBALS['phpgw']->template->set_var('message',$message);
+
$prefs = $this->boprojects->read_prefs();
$GLOBALS['phpgw']->template->set_var('addressbook_link',$GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'phpgwapi.pbaddbook_projects.show',
@@ -1028,7 +1002,6 @@
'hidebcc' => 1,
'targettagto' => 'staff'
)));
-
if($pro_main)
{
$main =
$this->boprojects->read_single_project($pro_main,'planned');
@@ -1047,13 +1020,16 @@
if(!isset($values['plan_bottom_up']))
{
$values['plan_bottom_up'] = 'N';
+
+ //_debug_array($values);
}
if ($project_id)
{
//$values =
$this->boprojects->read_single_project($project_id);
-
- if(($_POST['save'] || $_POST['apply']) &&
$error)
+ $edit_mstone =
get_var('edit_mstone',array('GET','POST'));
+ $delete_mstone =
get_var('delete_mstone',array('GET','POST'));
+ if((($_POST['save'] || $_POST['apply']) &&
$error) || $_POST['mstone_save'] || $edit_mstone || $delete_mstone)
{
$values['coordinator'] =
$_POST['accountid'];
$values['employees'] =
$_POST['employees'];
@@ -1106,15 +1082,24 @@
$pstart =
$pstart_val?$pstart_val:($values['psdate']?$values['psdate']:'');
$pend =
$pend_val?$pend_val:($values['psdate']?$values['pedate']:'');
-
$GLOBALS['phpgw']->template->set_var('lang_milestones',lang('milestones').':');
-
$GLOBALS['phpgw']->template->set_var('edit_mstones_button','<input
type="submit" name="mstone" value="' . lang('edit milestones') . '">');
$GLOBALS['phpgw']->template->set_var('edit_roles_events_button','<input
type="submit" name="roles" value="' . lang('edit roles and events') . '">');
-
// ---- BEGIN MILESTONES
- $mstones =
$this->boprojects->get_mstones($project_id);
+ if($edit_mstone)
+ {
+ $s_id =
get_var('s_id',array('GET','POST'));
+ $single_mstone =
$this->boprojects->get_single_mstone($s_id);
+ }
+ if($delete_mstone)
+ {
+ $s_id =
get_var('s_id',array('GET','POST'));
+
$this->boprojects->delete_item(array('id' => $s_id));
+ $message = lang('milestone has been
deleted');
+ }
+
+ $mstones =
$this->boprojects->get_mstones($project_id);
if(is_array($mstones))
{
for($i=0;$i<count($mstones);++$i)
@@ -1149,15 +1134,16 @@
}
}
-
$GLOBALS['phpgw']->template->set_var('mstone_old_edate',$mstone_edate);
-
$GLOBALS['phpgw']->template->set_var('s_id',$values['s_id']);
+
$GLOBALS['phpgw']->template->set_var('mstone_old_edate',$single_mstone['edate']);
+
$GLOBALS['phpgw']->template->set_var('s_id',$single_mstone['s_id']);
$GLOBALS['phpgw']->template->set_var('lang_new',lang('new milestone'));
$GLOBALS['phpgw']->template->set_var('lang_save_mstone',lang('save milestone'));
$GLOBALS['phpgw']->template->set_var('new_checked',$values['new']?'
checked':'');
-
$GLOBALS['phpgw']->template->set_var('mstone_title',$GLOBALS['phpgw']->strip_html($vmstone['mstone_title']));
+
$GLOBALS['phpgw']->template->set_var('mstone_title',$GLOBALS['phpgw']->strip_html($single_mstone['title']));
+
+ $msend =
$single_mstone['edate']?$single_mstone['edate']:($end?mktime(12,0,0,date('m',$end),date('d',$end),date('Y',$end)):mktime(12,0,0,date('m'),date('d'),date('Y')));
- $end =
$end_val?$end_val:($values['edate']?mktime(12,0,0,date('m',$values['edate']),date('d',$values['edate']),date('Y',$values['edate'])):mktime(12,0,0,date('m'),date('d'),date('Y')));
-
$GLOBALS['phpgw']->template->set_var('mstone_end_date_select',$jscal->input('mstone_edate[str]',$end));
+
$GLOBALS['phpgw']->template->set_var('mstone_end_date_select',$jscal->input('mstone_edate[str]',$msend));
$GLOBALS['phpgw']->template->fp('mstones_tabhandle','mstones_tab',True);
$GLOBALS['phpgw']->template->fp('mstones_tabcontenthandle','mstones_tabcontent',True);
@@ -1211,6 +1197,7 @@
break;
}
}
+
$GLOBALS['phpgw']->template->set_var('message',$message);
$GLOBALS['phpgw']->template->set_var('start_date_select',$jscal->input('sdate[str]',$start));
$GLOBALS['phpgw']->template->set_var('end_date_select',$jscal->input('edate[str]',$end));
====================================================
Index: projects/inc/class.boprojects.inc.php
diff -u projects/inc/class.boprojects.inc.php:1.152
projects/inc/class.boprojects.inc.php:1.153
--- projects/inc/class.boprojects.inc.php:1.152 Tue Mar 15 00:30:03 2005
+++ projects/inc/class.boprojects.inc.php Tue Mar 15 16:06:16 2005
@@ -2120,7 +2120,7 @@
$values['s_id'] =
$this->soprojects->add_mstone($values);
}
- $values['old_edate'] = intval($values['old_edate']);
+ /*$values['old_edate'] = intval($values['old_edate']);
$async = CreateObject('phpgwapi.asyncservice');
if($values['edate'] > 0 && $values['old_edate'] !=
$values['edate'])
{
@@ -2140,7 +2140,7 @@
$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_base.inc.php, 1.4 class.uiprojects.inc.php, 1.155 class.boprojects.inc.php, 1.153,
ceb <=