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

Add task progress in list

Browse Source
This commit is contained in:
Regis Houssin 2010-03-04 09:04:36 +00:00
parent 72d0b60bbe
commit b7201c5c5d
6 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,8 +42,9 @@ Activity=Activity
Activities=Tasks/activities Activities=Tasks/activities
MyActivity=My activity MyActivity=My activity
MyActivities=My tasks/activities MyActivities=My tasks/activities
DurationEffective=Effective duration
MyProjects=My projects MyProjects=My projects
DurationEffective=Effective duration
Progress=Progress
Time=Time Time=Time
ListProposalsAssociatedProject=List of the commercial proposals associated with the project ListProposalsAssociatedProject=List of the commercial proposals associated with the project
ListOrdersAssociatedProject=List of customers' orders associated with the project ListOrdersAssociatedProject=List of customers' orders associated with the project

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

@ -44,6 +44,7 @@ MyActivity=Mon activité
MyActivities=Mes tâches/activités MyActivities=Mes tâches/activités
MyProjects=Mes projets MyProjects=Mes projets
DurationEffective=Durée effective DurationEffective=Durée effective
Progress=Progression
Time=Temps Time=Temps
ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet
ListOrdersAssociatedProject=Liste des commandes clients associées au projet ListOrdersAssociatedProject=Liste des commandes clients associées au projet

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

@ -427,6 +427,11 @@ function PLines(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole
else print '</a>'; else print '</a>';
print "</td>\n"; print "</td>\n";
// Progress
print '<td align="right">';
print $lines[$i]->progress.' %';
print '</td>';
// Time spent // Time spent
print '<td align="right">'; print '<td align="right">';
if ($showlineingray) print '<i>'; if ($showlineingray) print '<i>';

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

@ -280,6 +280,7 @@ else
if ($projectstatic->id) print '<td>'.$langs->trans("Project").'</td>'; if ($projectstatic->id) print '<td>'.$langs->trans("Project").'</td>';
print '<td width="80">'.$langs->trans("RefTask").'</td>'; print '<td width="80">'.$langs->trans("RefTask").'</td>';
print '<td>'.$langs->trans("LabelTask").'</td>'; print '<td>'.$langs->trans("LabelTask").'</td>';
print '<td align="right">'.$langs->trans("Progress").'</td>';
print '<td align="right">'.$langs->trans("TimeSpent").'</td>'; print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
print "</tr>\n"; print "</tr>\n";
// Show all lines in taskarray (recursive function to go down on tree) // Show all lines in taskarray (recursive function to go down on tree)

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

@ -80,6 +80,7 @@ print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Project").'</td>'; print '<td>'.$langs->trans("Project").'</td>';
print '<td width="80">'.$langs->trans("RefTask").'</td>'; print '<td width="80">'.$langs->trans("RefTask").'</td>';
print '<td>'.$langs->trans("LabelTask").'</td>'; print '<td>'.$langs->trans("LabelTask").'</td>';
print '<td align="right">'.$langs->trans("Progress").'</td>';
print '<td align="right">'.$langs->trans("TimeSpent").'</td>'; print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
print "</tr>\n"; print "</tr>\n";
// Show all lines in taskarray (recursive function to go down on tree) // Show all lines in taskarray (recursive function to go down on tree)

3
htdocs/projet/tasks/task.class.php
View File

@ -451,7 +451,7 @@ class Task extends CommonObject
// List of tasks (does not care about permissions. Filtering will be done later) // List of tasks (does not care about permissions. Filtering will be done later)
$sql = "SELECT p.rowid as projectid, p.ref, p.title as plabel, p.public"; $sql = "SELECT p.rowid as projectid, p.ref, p.title as plabel, p.public";
$sql.= ", t.rowid as taskid, t.label, t.fk_task_parent, t.duration_effective"; $sql.= ", t.rowid as taskid, t.label, t.fk_task_parent, t.duration_effective, t.progress";
if ($mode == 0) if ($mode == 0)
{ {
$sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
@ -503,6 +503,7 @@ class Task extends CommonObject
$tasks[$i]->description = $obj->description; $tasks[$i]->description = $obj->description;
$tasks[$i]->fk_parent = $obj->fk_task_parent; $tasks[$i]->fk_parent = $obj->fk_task_parent;
$tasks[$i]->duration = $obj->duration_effective; $tasks[$i]->duration = $obj->duration_effective;
$tasks[$i]->progress = $obj->progress;
$tasks[$i]->public = $obj->public; $tasks[$i]->public = $obj->public;
} }