Works on enhancement of project tasks

Add tab "note"

htdocs/commonobject.class.php

@@ -721,8 +721,15 @@ class CommonObject
 		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		if ($this->table_element == 'fichinter') $sql.= " SET note_private = '".addslashes($note)."'";
+		// TODO uniformize fields note_private
-		else $sql.= " SET note = '".addslashes($note)."'";
+		if ($this->table_element == 'fichinter' || $this->table_element == 'projet' || $this->table_element == 'projet_task')
+		{
+			$sql.= " SET note_private = '".addslashes($note)."'";
+		}
+		else
+		{
+			$sql.= " SET note = '".addslashes($note)."'";
+		}
 		$sql.= " WHERE rowid =". $this->id;
 
 		dol_syslog("CommonObject::update_note sql=".$sql, LOG_DEBUG);

htdocs/lib/project.lib.php

@@ -58,6 +58,11 @@ function project_prepare_head($object)
 		$h++;
 	}
 	
+	$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
+	$head[$h][1] = $langs->trans('Notes');
+	$head[$h][2] = 'note';
+	$h++;
+
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:MyModule:@mymodule:/mymodule/mypage.php?id=__ID__');
@@ -106,6 +111,11 @@ function task_prepare_head($object)
 	$head[$h][2] = 'contact';
 	$h++;
 	
+	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id;
+	$head[$h][1] = $langs->trans('Notes');
+	$head[$h][2] = 'note';
+	$h++;
+
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:MyModule:@mymodule:/mymodule/mypage.php?id=__ID__');

htdocs/projet/note.php

@@ -0,0 +1,236 @@
+<?php
+/* Copyright (C) 2010 Regis Houssin  <regis@dolibarr.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/**
+ *	\file       htdocs/projet/note.php
+ *	\ingroup    project
+ *	\brief      Fiche d'information sur un projet
+ *	\version    $Id$
+ */
+
+require('./pre.inc.php');
+require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
+
+$langs->load('projects');
+
+$id = isset($_GET["id"])?$_GET["id"]:'';
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'projet', $id);
+
+
+
+/******************************************************************************/
+/*                     Actions                                                */
+/******************************************************************************/
+
+if ($_POST["action"] == 'update_public' && $user->rights->projet->creer)
+{
+	$project = new Project($db);
+	$project->fetch($_GET['id']);
+
+	$db->begin();
+
+	$res=$project->update_note_public($_POST["note_public"],$user);
+	if ($res < 0)
+	{
+		$mesg='<div class="error">'.$project->error.'</div>';
+		$db->rollback();
+	}
+	else
+	{
+		$db->commit();
+	}
+}
+
+if ($_POST['action'] == 'update_private' && $user->rights->projet->creer)
+{
+	$project = new Project($db);
+	$project->fetch($_GET['id']);
+
+	$db->begin();
+
+	$res=$project->update_note($_POST["note_private"],$user);
+	if ($res < 0)
+	{
+		$mesg='<div class="error">'.$project->error.'</div>';
+		$db->rollback();
+	}
+	else
+	{
+		$db->commit();
+	}
+}
+
+
+
+/******************************************************************************/
+/* Affichage fiche                                                            */
+/******************************************************************************/
+
+llxHeader();
+
+$html = new Form($db);
+
+$id = $_GET['id'];
+$ref= $_GET['ref'];
+if ($id > 0 || ! empty($ref))
+{
+	if ($mesg) print $mesg;
+
+	$now=gmmktime();
+
+	$project = new Project($db);
+	$userstatic = new User($db);
+	
+	if ($project->fetch($id, $ref))
+	{
+		if ($project->societe->id > 0)  $result=$project->societe->fetch($project->societe->id);
+		
+		// To verify role of users
+		$userAccess = 0;
+		foreach(array('internal','external') as $source)
+		{
+			$userRole = $project->liste_contact(4,$source);
+			$num=sizeof($userRole);
+			
+			$i = 0;
+			while ($i < $num)
+			{
+				if ($userRole[$i]['code'] == 'PROJECTLEADER' && $user->id == $userRole[$i]['id'])
+				{
+					$userAccess++;
+				}
+				$i++;
+			}
+		}
+		
+		$head = project_prepare_head($project);
+		dol_fiche_head($head, 'note', $langs->trans('Project'), 0, 'project');
+
+		print '<table class="border" width="100%">';
+
+		//$linkback="<a href=\"".$_SERVER["PHP_SELF"]."?page=$page&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder\">".$langs->trans("BackToList")."</a>";
+
+		// Ref
+		print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td>';
+		print $html->showrefnav($project,'ref','',1,'ref','ref');
+		print '</td></tr>';
+			
+		// Label
+		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$project->title.'</td></tr>';
+
+		// Third party
+		print '<tr><td>'.$langs->trans("Company").'</td><td>';
+		if ($project->societe->id > 0) print $project->societe->getNomUrl(1);
+		else print'&nbsp;';
+		print '</td></tr>';
+			
+		// Project leader
+		print '<tr><td>'.$langs->trans("OfficerProject").'</td><td>';
+		$contact = $project->liste_contact(4,'internal');
+		$num=sizeof($contact);
+		if ($num)
+		{
+			$i = 0;
+			while ($i < $num)
+			{
+				if ($contact[$i]['code'] == 'PROJECTLEADER')
+				{
+					$userstatic->id = $contact[$i]['id'];
+					$userstatic->fetch();
+					print $userstatic->getNomUrl(1);
+					print '<br>';
+				}
+				$i++;
+			}
+		}
+		else
+		{
+			print $langs->trans('SharedProject');
+		}
+		print '</td></tr>';
+
+		// Note publique
+		print '<tr><td valign="top">'.$langs->trans("NotePublic").' :</td>';
+		print '<td valign="top" colspan="3">';
+		if ($_GET["action"] == 'edit')
+		{
+			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$project->id.'">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="action" value="update_public">';
+			print '<textarea name="note_public" cols="80" rows="8">'.$project->note_public."</textarea><br>";
+			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+			print '</form>';
+		}
+		else
+		{
+			print ($project->note_public?nl2br($project->note_public):"&nbsp;");
+		}
+		print "</td></tr>";
+
+		// Note privee
+		if (! $user->societe_id)
+		{
+			print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';
+			print '<td valign="top" colspan="3">';
+			if ($_GET["action"] == 'edit')
+			{
+				print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$project->id.'">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<input type="hidden" name="action" value="update_private">';
+				print '<textarea name="note_private" cols="80" rows="8">'.$project->note_private."</textarea><br>";
+				print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+				print '</form>';
+			}
+			else
+			{
+				print ($project->note_private?nl2br($project->note_private):"&nbsp;");
+			}
+			print "</td></tr>";
+		}
+
+		print "</table>";
+
+		print '</div>';
+
+		/*
+		 * Actions
+		 */
+
+		print '<div class="tabsAction">';
+		if ($user->rights->projet->creer && $_GET['action'] <> 'edit')
+		{
+			if ($userAccess)
+			{
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$project->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
+			}
+			else
+			{
+				print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Modify').'</a>';
+			}
+		}
+		print '</div>';
+	}
+}
+$db->close();
+
+llxFooter('$Date$ - $Revision: 1.15 ');
+?>

htdocs/projet/tasks/contact.php

@@ -196,6 +196,11 @@ if ($id > 0 || ! empty($ref))
 		// Label
 		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$task->label.'</td></tr>';
 		
+		// Project
+		print '<tr><td>'.$langs->trans("Project").'</td><td>';
+		print $projectstatic->getNomUrl(1);
+		print '</td></tr>';
+
 		// Customer
 		print "<tr><td>".$langs->trans("Company")."</td>";
 		print '<td colspan="3">';

htdocs/projet/tasks/note.php

@@ -0,0 +1,244 @@
+<?php
+/* Copyright (C) 2010 Regis Houssin  <regis@dolibarr.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/**
+ *	\file       htdocs/projet/tasks/note.php
+ *	\ingroup    project
+ *	\brief      Fiche d'information sur une tache
+ *	\version    $Id$
+ */
+
+require('./pre.inc.php');
+require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php");
+require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
+
+$langs->load('projects');
+
+$id = isset($_GET["id"])?$_GET["id"]:'';
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+if (!$user->rights->projet->task->lire) accessforbidden();
+//$result = restrictedArea($user, 'projet', $id, '', 'task'); // TODO ameliorer la verification
+
+
+
+/******************************************************************************/
+/*                     Actions                                                */
+/******************************************************************************/
+
+if ($_POST["action"] == 'update_public' && $user->rights->projet->task->creer)
+{
+	$task = new Task($db);
+	$task->fetch($_GET['id']);
+
+	$db->begin();
+
+	$res=$task->update_note_public($_POST["note_public"],$user);
+	if ($res < 0)
+	{
+		$mesg='<div class="error">'.$task->error.'</div>';
+		$db->rollback();
+	}
+	else
+	{
+		$db->commit();
+	}
+}
+
+if ($_POST['action'] == 'update_private' && $user->rights->projet->task->creer)
+{
+	$task = new Task($db);
+	$task->fetch($_GET['id']);
+
+	$db->begin();
+
+	$res=$task->update_note($_POST["note_private"],$user);
+	if ($res < 0)
+	{
+		$mesg='<div class="error">'.$task->error.'</div>';
+		$db->rollback();
+	}
+	else
+	{
+		$db->commit();
+	}
+}
+
+
+
+/******************************************************************************/
+/* Affichage fiche                                                            */
+/******************************************************************************/
+
+llxHeader();
+
+$html = new Form($db);
+
+$id = $_GET['id'];
+$ref= $_GET['ref'];
+if ($id > 0 || ! empty($ref))
+{
+	if ($mesg) print $mesg;
+
+	$now=gmmktime();
+
+	$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)
+			{
+				if ($userRole[$i]['code'] == 'PROJECTLEADER' && $user->id == $userRole[$i]['id'])
+				{
+					$userAccess++;
+				}
+				$i++;
+			}
+		}
+		
+		$head = task_prepare_head($task);
+		dol_fiche_head($head, 'note', $langs->trans('Task'), 0, 'projecttask');
+
+		print '<table class="border" width="100%">';
+
+		//$linkback="<a href=\"".$_SERVER["PHP_SELF"]."?page=$page&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder\">".$langs->trans("BackToList")."</a>";
+
+		// Ref
+		print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td>';
+		print $html->showrefnav($task,'ref','',1,'ref','ref');
+		print '</td></tr>';
+			
+		// Label
+		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$task->label.'</td></tr>';
+		
+		// Project
+		print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
+		print $projectstatic->getNomUrl(1);
+		print '</td></tr>';
+
+		// Third party
+		print '<tr><td>'.$langs->trans("Company").'</td><td>';
+		if ($projectstatic->societe->id > 0) print $projectstatic->societe->getNomUrl(1);
+		else print'&nbsp;';
+		print '</td></tr>';
+			
+		// Task executive
+		print '<tr><td>'.$langs->trans("TaskExecutive").'</td><td>';
+		$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 '<br>';
+				}
+				$i++;
+			}
+		}
+		else
+		{
+			print $langs->trans('SharedTask');
+		}
+		print '</td></tr>';
+
+		// Note publique
+		print '<tr><td valign="top">'.$langs->trans("NotePublic").' :</td>';
+		print '<td valign="top" colspan="3">';
+		if ($_GET["action"] == 'edit')
+		{
+			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$task->id.'">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="action" value="update_public">';
+			print '<textarea name="note_public" cols="80" rows="8">'.$task->note_public."</textarea><br>";
+			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+			print '</form>';
+		}
+		else
+		{
+			print ($task->note_public?nl2br($task->note_public):"&nbsp;");
+		}
+		print "</td></tr>";
+
+		// Note privee
+		if (! $user->societe_id)
+		{
+			print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';
+			print '<td valign="top" colspan="3">';
+			if ($_GET["action"] == 'edit')
+			{
+				print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$task->id.'">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<input type="hidden" name="action" value="update_private">';
+				print '<textarea name="note_private" cols="80" rows="8">'.$task->note_private."</textarea><br>";
+				print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+				print '</form>';
+			}
+			else
+			{
+				print ($task->note_private?nl2br($task->note_private):"&nbsp;");
+			}
+			print "</td></tr>";
+		}
+
+		print "</table>";
+
+		print '</div>';
+
+		/*
+		 * Actions
+		 */
+
+		print '<div class="tabsAction">';
+		if ($user->rights->projet->task->creer && $_GET['action'] <> 'edit')
+		{
+			if ($userAccess)
+			{
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$task->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
+			}
+			else
+			{
+				print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Modify').'</a>';
+			}
+		}
+		print '</div>';
+	}
+}
+$db->close();
+
+llxFooter('$Date$ - $Revision: 1.15 ');
+?>

htdocs/projet/tasks/task.class.php

@@ -37,7 +37,7 @@ class Task extends CommonObject
 	var $error;							//!< To return error code (or message)
 	var $errors=array();				//!< To return several error codes (or messages)
 	var $element='project_task';		//!< Id that identify managed objects
-	var $table_element='project_task';	//!< Name of table without prefix where object is stored
+	var $table_element='projet_task';	//!< Name of table without prefix where object is stored
 
     var $id;
 

htdocs/projet/tasks/task.php

@@ -114,6 +114,7 @@ if ($taskid)
 {
 	$task = new Task($db);
 	$projectstatic = new Project($db);
+	$userstatic = new User($db);
 	
 	if ($task->fetch($taskid) >= 0 )
 	{
@@ -143,15 +144,18 @@ if ($taskid)
 			print '<tr><td>'.$langs->trans("Label").'</td>';
 			print '<td><input size="30" name="label" value="'.$task->label.'"></td></tr>';
 			
+			// Project
 			print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
 			print $projectstatic->getNomUrl(1);
 			print '</td></tr>';
 			
+			// Third party
 			print '<td>'.$langs->trans("Company").'</td><td colspan="3">';
 			if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
 			else print '&nbsp;';
 			print '</td></tr>';
 			
+			// Task parent
 			print '<tr><td>'.$langs->trans("ChildOfTask").'</td><td>';
 			print $formother->selectProjectTasks($task->fk_task_parent,$projectstatic->id, 'task_parent', $user->admin?0:1, 0);
 			print '</td></tr>';
@@ -208,15 +212,42 @@ if ($taskid)
 			// Label
 			print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$task->label.'</td></tr>';
 			
+			// Project
 			print '<tr><td>'.$langs->trans("Project").'</td><td colspan="3">';
 			print $projectstatic->getNomUrl(1);
 			print '</td></tr>';
 			
+			// Third party
 			print '<td>'.$langs->trans("Company").'</td><td colspan="3">';
 			if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
 			else print '&nbsp;';
 			print '</td></tr>';
 			
+			// Task executive
+			print '<tr><td>'.$langs->trans("TaskExecutive").'</td><td>';
+			$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 '<br>';
+					}
+					$i++;
+				}
+			}
+			else
+			{
+				print $langs->trans('SharedTask');
+			}
+			print '</td></tr>';
+			
 			// Date start
 			print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">';
 			print dol_print_date($task->date_start,'day');

htdocs/projet/tasks/time.php

@@ -46,9 +46,6 @@ llxHeader("",$langs->trans("Task"));
 
 $html = new Form($db);
 
-$projectstatic = new Project($db);
-
-
 if ($_GET["id"] > 0)
 {
 	/*
@@ -56,6 +53,9 @@ if ($_GET["id"] > 0)
 	 *
 	 */
 	$task = new Task($db);
+	$projectstatic = new Project($db);
+	$userstatic = new User($db);
+	
 	if ($task->fetch($_GET["id"]) >= 0 )
 	{
 		$result=$projectstatic->fetch($task->fk_project);
@@ -82,17 +82,45 @@ if ($_GET["id"] > 0)
 		// Label
 		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$task->label.'</td></tr>';
 
+		// Project
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
 		print $projectstatic->getNomUrl(1);
 		print '</td></tr>';
 
+		// Third party
 		print '<td>'.$langs->trans("Company").'</td><td>';
 		if ($projectstatic->societe->id) print $projectstatic->societe->getNomUrl(1);
 		else print '&nbsp;';
 		print '</td></tr>';
 		
-		/* List of time spent */
+		// Task executive
+		print '<tr><td>'.$langs->trans("TaskExecutive").'</td><td>';
+		$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 '<br>';
+				}
+				$i++;
+			}
+		}
+		else
+		{
+			print $langs->trans('SharedTask');
+		}
+		print '</td></tr>';
 
+		/*
+		 *  List of time spent 
+		 */
 		$sql = "SELECT t.task_date, t.task_duration, t.fk_user, u.login, u.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
 		$sql .= " , ".MAIN_DB_PREFIX."user as u";