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

Fix: date start/end of project was lost on some tabs.

Browse Source 
Fix: Bad file name for gantt include.
This commit is contained in:
Laurent Destailleur 2014-06-14 14:20:58 +02:00
parent e8bca38daf
commit f0ce92292a
11 changed files with 97 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/projet/contact.php
View File

@ -192,6 +192,16 @@ if ($id > 0 || ! empty($ref))
// Statut // Statut
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>'; print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print dol_print_date($object->date_start,'day');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($object->date_end,'day');
print '</td></tr>';
print "</table>"; print "</table>";
print '</div>'; print '</div>';

10
htdocs/projet/element.php
View File

@ -128,6 +128,16 @@ print '</td></tr>';
// Statut // Statut
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$project->getLibStatut(4).'</td></tr>'; print '<tr><td>'.$langs->trans("Status").'</td><td>'.$project->getLibStatut(4).'</td></tr>';
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print dol_print_date($object->date_start,'day');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($object->date_end,'day');
print '</td></tr>';
print '</table>'; print '</table>';
print '</div>'; print '</div>';

2
htdocs/projet/ganttchart.php → htdocs/projet/ganttchart.inc.php
View File

@ -16,7 +16,7 @@
*/ */
/** /**
* \file htdocs/projet/ganttchart.php * \file htdocs/projet/ganttchart.inc.php
* \ingroup projet * \ingroup projet
* \brief Gantt diagram of a project * \brief Gantt diagram of a project
*/ */

17
htdocs/projet/ganttview.php
View File

@ -137,6 +137,17 @@ if ($id > 0 || ! empty($ref))
// Statut // Statut
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>'; print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print dol_print_date($object->date_start,'day');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($object->date_end,'day');
print '</td></tr>';
print '</table>'; print '</table>';
print '</div>'; print '</div>';
@ -184,8 +195,8 @@ if (count($tasksarray)>0)
// Show Gant diagram from $taskarray using JSGantt // Show Gant diagram from $taskarray using JSGantt
$dateformat=$langs->trans("FormatDateShort"); // Used by include ganttchart.php later $dateformat=$langs->trans("FormatDateShort"); // Used by include ganttchart.inc.php later
$dateformat=$langs->trans("FormatDateShortJQuery"); // Used by include ganttchart.php later $dateformat=$langs->trans("FormatDateShortJQuery"); // Used by include ganttchart.inc.php later
$array_contacts=array(); $array_contacts=array();
$tasks=array(); $tasks=array();
$project_dependencies=array(); $project_dependencies=array();
@ -244,7 +255,7 @@ if (count($tasksarray)>0)
{ {
//var_dump($_SESSION); //var_dump($_SESSION);
print '<div id="tabs" class="ganttcontainer" style="border: 1px solid #ACACAC;">'."\n"; print '<div id="tabs" class="ganttcontainer" style="border: 1px solid #ACACAC;">'."\n";
include_once DOL_DOCUMENT_ROOT.'/projet/ganttchart.php'; include_once DOL_DOCUMENT_ROOT.'/projet/ganttchart.inc.php';
print '</div>'."\n"; print '</div>'."\n";
} }
else else

10
htdocs/projet/note.php
View File

@ -118,6 +118,16 @@ if ($id > 0 || ! empty($ref))
// Statut // Statut
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>'; print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print dol_print_date($object->date_start,'day');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($object->date_end,'day');
print '</td></tr>';
print "</table>"; print "</table>";
print '<br>'; print '<br>';

4
htdocs/projet/tasks.php
View File

@ -232,12 +232,12 @@ if ($id > 0 || ! empty($ref))
// Date start // Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>'; print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print dol_print_date($object->date_start,'dayhour'); print dol_print_date($object->date_start,'day');
print '</td></tr>'; print '</td></tr>';
// Date end // Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>'; print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($object->date_end,'dayhour'); print dol_print_date($object->date_end,'day');
print '</td></tr>'; print '</td></tr>';
// Other options // Other options

10
htdocs/projet/tasks/contact.php
View File

@ -202,6 +202,16 @@ if ($id > 0 || ! empty($ref))
// Statut // Statut
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>'; print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print dol_print_date($projectstatic->date_start,'day');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($projectstatic->date_end,'day');
print '</td></tr>';
print '</table>'; print '</table>';
dol_fiche_end(); dol_fiche_end();

10
htdocs/projet/tasks/document.php
View File

@ -166,6 +166,16 @@ if ($object->id > 0)
// Statut // Statut
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>'; print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print dol_print_date($projectstatic->date_start,'day');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($projectstatic->date_end,'day');
print '</td></tr>';
print '</table>'; print '</table>';
dol_fiche_end(); dol_fiche_end();

10
htdocs/projet/tasks/note.php
View File

@ -148,6 +148,16 @@ if ($object->id > 0)
// Statut // Statut
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>'; print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print dol_print_date($projectstatic->date_start,'day');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($projectstatic->date_end,'day');
print '</td></tr>';
print '</table>'; print '</table>';
dol_fiche_end(); dol_fiche_end();

10
htdocs/projet/tasks/task.php
View File

@ -243,6 +243,16 @@ if ($id > 0 || ! empty($ref))
// Statut // Statut
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>'; print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print dol_print_date($projectstatic->date_start,'day');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($projectstatic->date_end,'day');
print '</td></tr>';
print '</table>'; print '</table>';
dol_fiche_end(); dol_fiche_end();

10
htdocs/projet/tasks/time.php
View File

@ -234,6 +234,16 @@ if ($id > 0 || ! empty($ref))
// Statut // Statut
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>'; print '<tr><td>'.$langs->trans("Status").'</td><td>'.$projectstatic->getLibStatut(4).'</td></tr>';
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
print dol_print_date($projectstatic->date_start,'day');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
print dol_print_date($projectstatic->date_end,'day');
print '</td></tr>';
print '</table>'; print '</table>';
dol_fiche_end(); dol_fiche_end();