lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug of project module

Browse Source
This commit is contained in:
Laurent Destailleur 2009-01-14 16:40:45 +00:00
parent c961d89934
commit 54449e3465
15 changed files with 155 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/includes/menus/barre_left/eldy_backoffice.php
View File

@ -768,7 +768,7 @@ class MenuLeft {
$newmenu->add(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("Tasks"), 0, $user->rights->projet->lire); $newmenu->add(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("Tasks"), 0, $user->rights->projet->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("Mytasks"), 1, $user->rights->projet->lire); $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("MyTasks"), 1, $user->rights->projet->lire);
$newmenu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("TimeSpent"), 0, $user->rights->projet->lire); $newmenu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("TimeSpent"), 0, $user->rights->projet->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); $newmenu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer);

2
htdocs/includes/menus/barre_left/eldy_frontoffice.php
View File

@ -737,7 +737,7 @@ class MenuLeft {
$newmenu->add(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("Tasks"), 0, $user->rights->projet->lire); $newmenu->add(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("Tasks"), 0, $user->rights->projet->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
$newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("Mytasks"), 1, $user->rights->projet->lire); $newmenu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("MyTasks"), 1, $user->rights->projet->lire);
$newmenu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("TimeSpent"), 0, $user->rights->projet->lire); $newmenu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("TimeSpent"), 0, $user->rights->projet->lire);
$newmenu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); $newmenu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer);

2
htdocs/langs/ca_ES/projects.lang
View File

@ -21,7 +21,7 @@ RefTask=Ref. tasca
LabelTask=Etiqueta tasca LabelTask=Etiqueta tasca
NewTimeSpent=Nou temps dedicat NewTimeSpent=Nou temps dedicat
MyTimeSpent=El meu temps dedicat MyTimeSpent=El meu temps dedicat
Mytasks=Les meves tasques MyTasks=Les meves tasques
Tasks=Tasques Tasks=Tasques
Task=Tasca Task=Tasca
NewTask=Nova tasca NewTask=Nova tasca

2
htdocs/langs/en_US/projects.lang
View File

@ -23,7 +23,7 @@ RefTask=Ref. task
LabelTask=Label task LabelTask=Label task
NewTimeSpent=New time spent NewTimeSpent=New time spent
MyTimeSpent=My time spent MyTimeSpent=My time spent
Mytasks=My tasks MyTasks=My tasks
Tasks=Tasks Tasks=Tasks
Task=Task Task=Task
NewTask=New task NewTask=New task

2
htdocs/langs/es_ES/projects.lang
View File

@ -21,7 +21,7 @@ RefTask=Ref. tarea
LabelTask=Etiqueta tarea LabelTask=Etiqueta tarea
NewTimeSpent=Nuevo tiempo dedicado NewTimeSpent=Nuevo tiempo dedicado
MyTimeSpent=Mi tiempo dedicado MyTimeSpent=Mi tiempo dedicado
Mytasks=Mis tareas MyTasks=Mis tareas
Tasks=Tareas Tasks=Tareas
Task=Tarea Task=Tarea
NewTask=Nueva tarea NewTask=Nueva tarea

2
htdocs/langs/fr_FR/projects.lang
View File

@ -23,7 +23,7 @@ RefTask=Ref. t
LabelTask=Libellé tâche LabelTask=Libellé tâche
NewTimeSpent=Nouveau consommé NewTimeSpent=Nouveau consommé
MyTimeSpent=Mon consommé MyTimeSpent=Mon consommé
Mytasks=Mes tâches MyTasks=Mes tâches
Tasks=Tâches Tasks=Tâches
Task=Tâche Task=Tâche
NewTask=Nouvelle tâche NewTask=Nouvelle tâche

2
htdocs/langs/it_IT/projects.lang
View File

@ -14,7 +14,7 @@ ShowProject =Visualizza progetto
SetProject =Impostare progetto SetProject =Impostare progetto
NoProject =Nessun progetto definito NoProject =Nessun progetto definito
NbOpenTasks =Numeri aperto compiti NbOpenTasks =Numeri aperto compiti
Mytasks =I miei compiti MyTasks =I miei compiti
Tasks =Compiti Tasks =Compiti
Task =Attività Task =Attività
NewTask =Nuova attività NewTask =Nuova attività

5
htdocs/lib/project.lib.php
View File

@ -40,6 +40,11 @@ function project_prepare_head($objsoc)
$head[$h][2] = 'tasks'; $head[$h][2] = 'tasks';
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/fiche.php?id='.$objsoc->id.'&mode=mine';
$head[$h][1] = $langs->trans("MyTasks");
$head[$h][2] = 'mytasks';
$h++;
if ($conf->propal->enabled || $conf->commande->enabled || $conf->facture->enabled) if ($conf->propal->enabled || $conf->commande->enabled || $conf->facture->enabled)
{ {
$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$objsoc->id; $head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$objsoc->id;

22
htdocs/project.class.php
View File

@ -424,24 +424,34 @@ class Project extends CommonObject
} }
/** /**
* Return list of project - tasks * Return list of task for project
* @param user Object user to limit task affected to a particular user
* *
* @return unknown * @return unknown
*/ */
function getTasksArray() function getTasksArray($user=0)
{ {
$tasks = array(); $tasks = array();
/* List of tasks */ /* List of tasks */
$sql = "SELECT p.rowid as projectid, p.ref, p.title as ptitle,"; $sql = "SELECT p.rowid as projectid, p.ref, p.title as ptitle,";
$sql.= " t.rowid, t.title, t.fk_task_parent, t.duration_effective"; $sql.= " t.rowid, t.title, t.fk_task_parent, t.duration_effective";
$sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid"; if (is_object($user))
if ($this->id) $sql .= " WHERE t.fk_projet =".$this->id; {
$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
$sql.= ", ".MAIN_DB_PREFIX."projet_task_actors as ta";
}
else
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
}
$sql.=" WHERE 1 = 1";
if ($this->id) $sql .= " AND t.fk_projet =".$this->id;
if (is_object($user)) $sql .= " AND t.fk_projet = p.rowid AND ta.fk_projet_task = t.rowid AND ta.fk_user =".$user->id;
$sql.= " ORDER BY p.ref, t.title"; $sql.= " ORDER BY p.ref, t.title";
dolibarr_syslog("Project::getTasksArray sql=".$sql); dolibarr_syslog("Project::getTasksArray sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {

2
htdocs/projet/activity/pre.inc.php
View File

@ -51,7 +51,7 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("Tasks"), 0, $user->rights->projet->lire); $menu->add(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("Tasks"), 0, $user->rights->projet->lire);
$menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
$menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("Mytasks"), 1, $user->rights->projet->lire); $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("MyTasks"), 1, $user->rights->projet->lire);
$menu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("TimeSpent"), 0, $user->rights->projet->lire); $menu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("TimeSpent"), 0, $user->rights->projet->lire);
$menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer);

5
htdocs/projet/liste.php
View File

@ -59,9 +59,8 @@ $pagenext = $page + 1;
/** /*
* Affichage de la liste des projets * View
*
*/ */
llxHeader(); llxHeader();

2
htdocs/projet/pre.inc.php
View File

@ -54,7 +54,7 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("Tasks"), 0, $user->rights->projet->lire); $menu->add(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("Tasks"), 0, $user->rights->projet->lire);
$menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
$menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("Mytasks"), 1, $user->rights->projet->lire); $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("MyTasks"), 1, $user->rights->projet->lire);
$menu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("TimeSpent"), 0, $user->rights->projet->lire); $menu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("TimeSpent"), 0, $user->rights->projet->lire);
$menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer);

15
htdocs/projet/tasks/fiche.php
View File

@ -138,7 +138,8 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer)
print '<form action="fiche.php" method="post">'; print '<form action="fiche.php" method="post">';
print '<input type="hidden" name="action" value="createtask">'; print '<input type="hidden" name="action" value="createtask">';
if ($_GET['id']) print '<input type="hidden" name="id" value="'.$_GET['id'].'">'; if ($_GET['id']) print '<input type="hidden" name="id" value="'.$_GET['id'].'">';
if ($_GET['mode']) print '<input type="hidden" name="mode" value="'.$_GET['mode'].'">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
@ -173,9 +174,13 @@ else
* Fiche projet en mode visu * Fiche projet en mode visu
* *
*/ */
$tab='tasks';
if ($_REQUEST["mode"]=='mine') $tab='mytasks';
$head=project_prepare_head($projet); $head=project_prepare_head($projet);
dolibarr_fiche_head($head, 'tasks', $langs->trans("Project")); dolibarr_fiche_head($head, $tab, $langs->trans("Project"));
$param=($_REQUEST["mode"]=='mine'?'&mode=mine':'');
print '<form name="addtime" method="POST" action="fiche.php?id='.$projet->id.'">'; print '<form name="addtime" method="POST" action="fiche.php?id='.$projet->id.'">';
@ -185,7 +190,7 @@ else
print '<tr><td width="30%">'; print '<tr><td width="30%">';
print $langs->trans("Ref"); print $langs->trans("Ref");
print '</td><td>'; print '</td><td>';
print $form->showrefnav($projet,'ref','',1,'ref','ref'); print $form->showrefnav($projet,'ref','',1,'ref','ref','',$param);
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>'; print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>';
@ -196,7 +201,7 @@ else
//print '<td>&nbsp;</td>'; //print '<td>&nbsp;</td>';
print '</tr>'; print '</tr>';
$tasksarray=$projet->getTasksArray(); $tasksarray=$projet->getTasksArray($_REQUEST["mode"]=='mine'?$user:0);
print '</table>'; print '</table>';
@ -213,7 +218,7 @@ else
if ($user->rights->projet->creer) if ($user->rights->projet->creer)
{ {
print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$projet->id.'&amp;action=create">'.$langs->trans('AddTask').'</a>'; print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$projet->id.'&action=create'.$param.'">'.$langs->trans('AddTask').'</a>';
} }
print '</div>'; print '</div>';

7
htdocs/projet/tasks/index.php
View File

@ -58,10 +58,11 @@ if ($_POST["action"] == 'createtask' && $user->rights->projet->creer)
/* /*
* View * View
*/ */
$form=new Form($db); $form=new Form($db);
$title=$langs->trans("Tasks"); $title=$langs->trans("Tasks");
if ($mode == 'mine') $title=$langs->trans("Mytasks"); if ($mode == 'mine') $title=$langs->trans("MyTasks");
llxHeader("",$title,"Projet"); llxHeader("",$title,"Projet");
@ -70,7 +71,7 @@ llxHeader("",$title,"Projet");
*/ */
$h=0; $h=0;
$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/index.php'; $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/index.php'.($_GET["mode"]?'?mode='.$_GET["mode"]:'');
$head[$h][1] = $title; $head[$h][1] = $title;
$head[$h][2] = 'tasks'; $head[$h][2] = 'tasks';
$h++; $h++;
@ -78,7 +79,7 @@ $h++;
dolibarr_fiche_head($head, 'tasks', $title); dolibarr_fiche_head($head, 'tasks', $title);
$projet = new Project($db); $projet = new Project($db);
$tasksarray=$projet->getTasksArray(); $tasksarray=$projet->getTasksArray($_GET["mode"]=='mine'?$user:0);
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';

2
htdocs/projet/tasks/pre.inc.php
View File

@ -50,7 +50,7 @@ function llxHeader($head = "", $title="", $help_url='')
$menu->add(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("Tasks"), 0, $user->rights->projet->lire); $menu->add(DOL_URL_ROOT."/projet/tasks/index.php", $langs->trans("Tasks"), 0, $user->rights->projet->lire);
$menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer); $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/fiche.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
$menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("Mytasks"), 1, $user->rights->projet->lire); $menu->add_submenu(DOL_URL_ROOT."/projet/tasks/index.php?mode=mine", $langs->trans("MyTasks"), 1, $user->rights->projet->lire);
$menu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("TimeSpent"), 0, $user->rights->projet->lire); $menu->add(DOL_URL_ROOT."/projet/activity/index.php", $langs->trans("TimeSpent"), 0, $user->rights->projet->lire);
$menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); $menu->add_submenu(DOL_URL_ROOT."/projet/activity/list.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer);