From d9cb1da4d5de3403d85b639e9c04c39a9e3d6d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Mon, 24 Mar 2014 15:22:35 +0100
Subject: [PATCH] Project: make tasks accept a time
---
htdocs/core/lib/project.lib.php | 8 ++++----
htdocs/projet/tasks.php | 13 +++++++------
htdocs/projet/tasks/task.php | 12 ++++++------
3 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 751ebbdfc5f..4a73db2dc40 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -330,12 +330,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
// Date start
print '<td align="center">';
- print dol_print_date($lines[$i]->date_start,'day');
+ print dol_print_date($lines[$i]->date_start,'dayhour');
print '</td>';
// Date end
print '<td align="center">';
- print dol_print_date($lines[$i]->date_end,'day');
+ print dol_print_date($lines[$i]->date_end,'dayhour');
print '</td>';
// Planned Workload (in working hours)
@@ -480,12 +480,12 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
// Date start
print '<td align="center">';
- print dol_print_date($lines[$i]->date_start,'day');
+ print dol_print_date($lines[$i]->date_start,'dayhour');
print '</td>';
// Date end
print '<td align="center">';
- print dol_print_date($lines[$i]->date_end,'day');
+ print dol_print_date($lines[$i]->date_end,'dayhour');
print '</td>';
// Planned Workload
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 794a1198c35..f0a35c14767 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -85,8 +85,8 @@ if ($action == 'createtask' && $user->rights->projet->creer)
{
$error=0;
- $date_start = dol_mktime(0,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']);
- $date_end = dol_mktime(0,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']);
+ $date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyeassskr'],'user');
+ $date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
if (empty($_POST["cancel"]))
{
@@ -234,12 +234,12 @@ if ($id > 0 || ! empty($ref))
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
- print dol_print_date($object->date_start,'day');
+ print dol_print_date($object->date_start,'dayhour');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
- print dol_print_date($object->date_end,'day');
+ print dol_print_date($object->date_end,'dayhour');
print '</td></tr>';
// Other options
@@ -304,12 +304,13 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->socie
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
- print $form->select_date(($date_start?$date_start:''),'dateo',0,0,0,'',1,1);
+ var_dump($date_start);
+ print $form->select_date(($date_start?$date_start:''),'dateo',1,1,0,'',1,1);
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
- print $form->select_date(($date_end?$date_end:-1),'datee',0,0,0,'',1,1);
+ print $form->select_date(($date_end?$date_end:-1),'datee',1,1,0,'',1,1);
print '</td></tr>';
// planned workload
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 5e2f20729cc..566813b4e85 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -87,8 +87,8 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
$object->description = $_POST['description'];
$object->fk_task_parent = $task_parent;
$object->planned_workload = $planned_workload;
- $object->date_start = dol_mktime(0,0,0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear']);
- $object->date_end = dol_mktime(0,0,0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear']);
+ $object->date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear'],'user');
+ $object->date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
$object->progress = $_POST['progress'];
// Fill array 'array_options' with data from add form
@@ -326,12 +326,12 @@ if ($id > 0 || ! empty($ref))
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
- print $form->select_date($object->date_start,'dateo');
+ print $form->select_date($object->date_start,'dateo',1,1);
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
- print $form->select_date($object->date_end?$object->date_end:-1,'datee');
+ print $form->select_date($object->date_end?$object->date_end:-1,'datee',1,1);
print '</td></tr>';
// Planned workload
@@ -415,12 +415,12 @@ if ($id > 0 || ! empty($ref))
// Date start
print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="3">';
- print dol_print_date($object->date_start,'day');
+ print dol_print_date($object->date_start,'dayhour');
print '</td></tr>';
// Date end
print '<tr><td>'.$langs->trans("DateEnd").'</td><td colspan="3">';
- print dol_print_date($object->date_end,'day');
+ print dol_print_date($object->date_end,'dayhour');
print '</td></tr>';
// Planned workload
--
GitLab