*
* This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
*/
/**
- * \file htdocs/projet/tasks/who.php
+ * \file htdocs/projet/tasks/contact.php
* \ingroup project
- * \brief Fiche taches d'un projet
+ * \brief Actors of a task
* \version $Id$
*/
@@ -156,7 +156,7 @@ llxHeader('', $langs->trans("Task"));
$html = new Form($db);
$formcompany = new FormCompany($db);
$contactstatic = new Contact($db);
-$projectstatic = new Project($db);
+$project = new Project($db);
/* *************************************************************************** */
@@ -174,8 +174,8 @@ if ($id > 0 || ! empty($ref))
if ( $task->fetch($id,$ref) > 0)
{
- $result=$projectstatic->fetch($task->fk_project);
- if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
+ $result=$project->fetch($task->fk_project);
+ if (! empty($project->socid)) $project->societe->fetch($project->socid);
$head = task_prepare_head($task);
dol_fiche_head($head, 'contact', $langs->trans("Task"), 0, 'projecttask');
@@ -190,21 +190,21 @@ if ($id > 0 || ! empty($ref))
// Ref
print '| '.$langs->trans('Ref').' | ';
- print $html->showrefnav($task,'ref',$linkback,1,'ref','ref','');
+ print $html->showrefnav($task,'id','',1,'rowid','ref','','');
print ' |
';
// Label
print '| '.$langs->trans("Label").' | '.$task->label.' |
';
-
+
// Project
print '| '.$langs->trans("Project").' | ';
- print $projectstatic->getNomUrl(1);
+ print $project->getNomUrl(1);
print ' |
';
// Customer
print "| ".$langs->trans("Company")." | ";
print '';
- if ($projectstatic->societe->id > 0) print $projectstatic->societe->getNomUrl(1);
+ if ($project->societe->id > 0) print $project->societe->getNomUrl(1);
else print ' ';
print ' |
';
@@ -268,30 +268,33 @@ if ($id > 0 || ! empty($ref))
print '';
print '';
- // Ligne ajout pour contact externe
- $var=!$var;
- print "";
+ // Line to add an external contact. Only if project linked to a third party.
+ if ($project->socid)
+ {
+ $var=!$var;
+ print "
";
- print '| ';
- print img_object('','contact').' '.$langs->trans("ThirdPartyContacts");
- print ' | ';
+ print '';
+ print img_object('','contact').' '.$langs->trans("ThirdPartyContacts");
+ print ' | ';
- print '';
- $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$projectstatic->societe->id;
- $selectedCompany = $formcompany->selectCompaniesForNewContact($task, 'id', $selectedCompany, 'newcompany');
- print ' | ';
+ print '';
+ $selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$project->societe->id;
+ $selectedCompany = $formcompany->selectCompaniesForNewContact($task, 'id', $selectedCompany, 'newcompany');
+ print ' | ';
- print '';
- $nbofcontacts=$html->select_contacts($selectedCompany,'','contactid',0);
- if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
- print ' | ';
- print '';
- $formcompany->selectTypeContact($task, '', 'type','external','rowid');
- print ' | ';
- print ' | ';
- print '
';
+ print '';
+ $nbofcontacts=$html->select_contacts($selectedCompany,'','contactid',0);
+ if ($nbofcontacts == 0) print $langs->trans("NoContactDefined");
+ print ' | ';
+ print '';
+ $formcompany->selectTypeContact($task, '', 'type','external','rowid');
+ print ' | ';
+ print ' | ';
+ print '';
+ }
print "";
diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php
index dcf29f28f4d..0fafd70ec8a 100644
--- a/htdocs/projet/tasks/fiche.php
+++ b/htdocs/projet/tasks/fiche.php
@@ -263,7 +263,7 @@ else
// can have a parent that is not affected to him).
$tasksarray=$task->getTasksArray(0, 0, $project->id, $socid, 0);
// We load also tasks limited to a particular user
- $tasksrole=($_REQUEST["mode"]=='mine' ? $task->getTasksForProjectOwnedByAUser(0,$user,$project->id,0) : '');
+ $tasksrole=($_REQUEST["mode"]=='mine' ? $task->getUserRolesForProjetsOrTasks(0,$user,$project->id,0) : '');
print '';
print '';
diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php
index 30225b095a3..34146948302 100644
--- a/htdocs/projet/tasks/index.php
+++ b/htdocs/projet/tasks/index.php
@@ -77,7 +77,7 @@ $task = new Task($db);
// can have a parent that is not affected to him).
$tasksarray=$task->getTasksArray(0, 0, $project->id, $socid);
// We load also tasks limited to a particular user
-$tasksrole=($_REQUEST["mode"]=='mine' ? $task->getTasksForProjectOwnedByAUser(0,$user,$project->id,0) : '');
+$tasksrole=($_REQUEST["mode"]=='mine' ? $task->getUserRolesForProjetsOrTasks(0,$user,$project->id,0) : '');
print '';
print '';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 0dc99d3f996..79f64cfa52e 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -81,10 +81,9 @@ if ($_POST['action'] == 'update_private' && $user->rights->projet->task->creer)
}
-
-/******************************************************************************/
-/* Affichage fiche */
-/******************************************************************************/
+/*
+ * View
+ */
llxHeader();
@@ -101,19 +100,19 @@ if ($id > 0 || ! empty($ref))
$task = new Task($db);
$projectstatic = new Project($db);
$userstatic = new User($db);
-
+
if ($task->fetch($id, $ref))
{
$result=$projectstatic->fetch($task->fk_project);
if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
-
+
// To verify role of users
$userAccess = 0;
foreach(array('internal','external') as $source)
{
$userRole = $projectstatic->liste_contact(4,$source);
$num=sizeof($userRole);
-
+
$i = 0;
while ($i < $num)
{
@@ -124,7 +123,7 @@ if ($id > 0 || ! empty($ref))
$i++;
}
}
-
+
$head = task_prepare_head($task);
dol_fiche_head($head, 'note', $langs->trans('Task'), 0, 'projecttask');
@@ -134,12 +133,12 @@ if ($id > 0 || ! empty($ref))
// Ref
print '
| '.$langs->trans("Ref").' | ';
- print $html->showrefnav($task,'ref','',1,'ref','ref');
+ print $html->showrefnav($task,'id','',1,'rowid','ref','','');
print ' |
';
-
+
// Label
print '| '.$langs->trans("Label").' | '.$task->label.' |
';
-
+
// Project
print '| '.$langs->trans("Project").' | ';
print $projectstatic->getNomUrl(1);
@@ -150,31 +149,6 @@ if ($id > 0 || ! empty($ref))
if ($projectstatic->societe->id > 0) print $projectstatic->societe->getNomUrl(1);
else print' ';
print ' |
';
-
- // Task executive
- print '| '.$langs->trans("TaskExecutive").' | ';
- $contact = $task->liste_contact(4,'internal');
- $num=sizeof($contact);
- if ($num)
- {
- $i = 0;
- while ($i < $num)
- {
- if ($contact[$i]['code'] == 'TASKEXECUTIVE')
- {
- $userstatic->id = $contact[$i]['id'];
- $userstatic->fetch();
- print $userstatic->getNomUrl(1);
- print '
';
- }
- $i++;
- }
- }
- else
- {
- print $langs->trans('SharedTask');
- }
- print ' |
';
// Note publique
print '| '.$langs->trans("NotePublic").' : | ';
diff --git a/htdocs/projet/tasks/task.class.php b/htdocs/projet/tasks/task.class.php
index e0c902e8f49..3c10f323f4d 100644
--- a/htdocs/projet/tasks/task.class.php
+++ b/htdocs/projet/tasks/task.class.php
@@ -503,7 +503,7 @@ class Task extends CommonObject
if ((! $obj->public) && ($userp || $usert)) // If not public and we ask a filter on user
{
- if (! $this->getTasksForProjectOwnedByAUser($userp, $usert, $obj->projectid, $obj->rowid))
+ if (! $this->getUserRolesForProjetsOrTasks($userp, $usert, $obj->projectid, $obj->rowid))
{
$error++;
}
@@ -541,7 +541,7 @@ class Task extends CommonObject
* @param taskid
* @return array Array of role of user for each projects or each tasks
*/
- function getTasksForProjectOwnedByAUser($userp,$usert,$projectid=0,$taskid=0)
+ function getUserRolesForProjetsOrTasks($userp,$usert,$projectid=0,$taskid=0)
{
$tasksrole = array();
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 2213707c091..c3785ced8ee 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2006-2009 Laurent Destailleur
+ * Copyright (C) 2006-2010 Laurent Destailleur
* Copyright (C) 2010 Regis Houssin
*
* This program is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->projet-
{
$task = new Task($db);
$task->fetch($_POST["id"]);
-
+
$tmparray=explode('_',$_POST['task_parent']);
$task_parent=$tmparray[1];
if (empty($task_parent)) $task_parent = 0; // If task_parent is ''
@@ -115,72 +115,72 @@ if ($taskid)
$task = new Task($db);
$projectstatic = new Project($db);
$userstatic = new User($db);
-
+
if ($task->fetch($taskid) >= 0 )
{
$result=$projectstatic->fetch($task->fk_project);
if (! empty($projectstatic->socid)) $projectstatic->societe->fetch($projectstatic->socid);
-
+
$head=task_prepare_head($task);
-
+
dol_fiche_head($head, 'task', $langs->trans("Task"),0,'projecttask');
-
+
if ($_GET["action"] == 'edit' && $user->rights->projet->task->creer)
{
print '