diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php index 849e89ba16c..771cb7d99cc 100644 --- a/htdocs/projet/ganttchart.inc.php +++ b/htdocs/projet/ganttchart.inc.php @@ -90,7 +90,7 @@ if (g) var barText = "Resource"; var graphFormat = "day"; - g.setDateInputFormat('yyyy-mm-dd'); // Set format of input dates ('mm/dd/yyyy', 'dd/mm/yyyy', 'yyyy-mm-dd') + g.setDateInputFormat('mm/dd/yyyy'); // Set format of input dates ('mm/dd/yyyy', 'dd/mm/yyyy', does not work with 'yyyy-mm-dd') g.setDateDisplayFormat(''); /* For JSGanttImproved g.setDateTaskDisplayFormat(''); */ /* For JSGanttImproved g.setDayMajorDateDisplayFormat('dd mon'); */ @@ -143,8 +143,8 @@ function constructGanttLine($tarr,$task,$project_dependencies,$level=0,$project_ $start_date = $task["task_start_date"]; $end_date = $task["task_end_date"]; if (!$end_date) $end_date = $start_date; - $start_date = dol_print_date($start_date,"%Y-%m-%d"); - $end_date = dol_print_date($end_date,"%Y-%m-%d"); + $start_date = dol_print_date($start_date,"%m/%d/%Y"); + $end_date = dol_print_date($end_date,"%m/%d/%Y"); // Resources $resources = $task["task_resources"]; // Define depend (ex: "", "4,13", ...) diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 5f1589d59dc..b5843feb0a8 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -150,8 +150,9 @@ if ($id > 0 || ! empty($ref)) /* - * Actions + * Buttons actions */ + print '
'; if ($user->rights->projet->all->creer || $user->rights->projet->creer) @@ -205,6 +206,7 @@ if (count($tasksarray)>0) $tasks[$taskcursor]['task_milestone']=0; $tasks[$taskcursor]['task_percent_complete']=$val->progress; //$tasks[$taskcursor]['task_name']=$task->getNomUrl(1); + //print dol_print_date($val->date_start).dol_print_date($val->date_end).'
'."\n"; $tasks[$taskcursor]['task_name']=$val->label; $tasks[$taskcursor]['task_start_date']=$val->date_start; $tasks[$taskcursor]['task_end_date']=$val->date_end; @@ -243,7 +245,6 @@ if (count($tasksarray)>0) //print "xxx".$val->id.$tasks[$taskcursor]['task_resources']; $taskcursor++; } - //var_dump($tasks); print "\n";