From f0ce92292a28da61dd1b427170bd3563f108a905 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Jun 2014 14:20:58 +0200
Subject: [PATCH] Fix: date start/end of project was lost on some tabs. Fix:
Bad file name for gantt include.
---
htdocs/projet/contact.php | 10 ++++++++++
htdocs/projet/element.php | 10 ++++++++++
.../{ganttchart.php => ganttchart.inc.php} | 2 +-
htdocs/projet/ganttview.php | 17 ++++++++++++++---
htdocs/projet/note.php | 10 ++++++++++
htdocs/projet/tasks.php | 4 ++--
htdocs/projet/tasks/contact.php | 10 ++++++++++
htdocs/projet/tasks/document.php | 10 ++++++++++
htdocs/projet/tasks/note.php | 10 ++++++++++
htdocs/projet/tasks/task.php | 10 ++++++++++
htdocs/projet/tasks/time.php | 10 ++++++++++
11 files changed, 97 insertions(+), 6 deletions(-)
rename htdocs/projet/{ganttchart.php => ganttchart.inc.php} (99%)
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 97b489cc3e4..c6880547c60 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -192,6 +192,16 @@ if ($id > 0 || ! empty($ref))
// Statut
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 '</div>';
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 04164a38579..322820b361d 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -128,6 +128,16 @@ print '</td></tr>';
// Statut
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 '</div>';
diff --git a/htdocs/projet/ganttchart.php b/htdocs/projet/ganttchart.inc.php
similarity index 99%
rename from htdocs/projet/ganttchart.php
rename to htdocs/projet/ganttchart.inc.php
index b3701191142..7b4249a0128 100644
--- a/htdocs/projet/ganttchart.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -16,7 +16,7 @@
*/
/**
- * \file htdocs/projet/ganttchart.php
+ * \file htdocs/projet/ganttchart.inc.php
* \ingroup projet
* \brief Gantt diagram of a project
*/
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 77767fd446f..79d302addd3 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -137,6 +137,17 @@ if ($id > 0 || ! empty($ref))
// Statut
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 '</div>';
@@ -184,8 +195,8 @@ if (count($tasksarray)>0)
// Show Gant diagram from $taskarray using JSGantt
- $dateformat=$langs->trans("FormatDateShort"); // Used by include ganttchart.php later
- $dateformat=$langs->trans("FormatDateShortJQuery"); // 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.inc.php later
$array_contacts=array();
$tasks=array();
$project_dependencies=array();
@@ -244,7 +255,7 @@ if (count($tasksarray)>0)
{
//var_dump($_SESSION);
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";
}
else
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 710d4b9f50d..493141cbe95 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -118,6 +118,16 @@ if ($id > 0 || ! empty($ref))
// Statut
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 '<br>';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index fc02da1c821..356eed55e6d 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -232,12 +232,12 @@ if ($id > 0 || ! empty($ref))
// Date start
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>';
// Date end
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>';
// Other options
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index a86dd329e4c..f0bdce25fca 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -202,6 +202,16 @@ if ($id > 0 || ! empty($ref))
// Statut
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>';
dol_fiche_end();
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 29aca5f23f7..50763f839f7 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -166,6 +166,16 @@ if ($object->id > 0)
// Statut
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>';
dol_fiche_end();
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index f0f72810e8a..a6f8846ce0e 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -148,6 +148,16 @@ if ($object->id > 0)
// Statut
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>';
dol_fiche_end();
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 62dfb3cbe68..dd83cf57d8f 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -243,6 +243,16 @@ if ($id > 0 || ! empty($ref))
// Statut
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>';
dol_fiche_end();
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 4d70ddae36b..2ef635dbe53 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -234,6 +234,16 @@ if ($id > 0 || ! empty($ref))
// Statut
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>';
dol_fiche_end();
--
GitLab