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

Works on enhancement of project tasks

Browse Source
This commit is contained in:
Regis Houssin 2010-01-29 09:23:28 +00:00
parent 35270b1040
commit 0391dbf1c1
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/install/mysql/migration/2.7.0-2.8.0.sql
View File

@ -119,6 +119,7 @@ ALTER TABLE llx_projet_task ADD COLUMN datev datetime AFTER datee;
ALTER TABLE llx_projet_task CHANGE title label varchar(255) NOT NULL; ALTER TABLE llx_projet_task CHANGE title label varchar(255) NOT NULL;
ALTER TABLE llx_projet_task ADD COLUMN description text AFTER label; ALTER TABLE llx_projet_task ADD COLUMN description text AFTER label;
ALTER TABLE llx_projet_task MODIFY description text; ALTER TABLE llx_projet_task MODIFY description text;
ALTER TABLE llx_projet_task MODIFY duration_effective real DEFAULT 0 NOT NULL;
ALTER TABLE llx_projet_task ADD COLUMN progress integer DEFAULT 0 AFTER duration_effective; ALTER TABLE llx_projet_task ADD COLUMN progress integer DEFAULT 0 AFTER duration_effective;
ALTER TABLE llx_projet_task ADD COLUMN priority integer DEFAULT 0 AFTER progress; ALTER TABLE llx_projet_task ADD COLUMN priority integer DEFAULT 0 AFTER progress;
ALTER TABLE llx_projet_task ADD COLUMN fk_user_modif integer AFTER fk_user_creat; ALTER TABLE llx_projet_task ADD COLUMN fk_user_modif integer AFTER fk_user_creat;

2
htdocs/install/mysql/tables/llx_projet_task.sql
View File

@ -31,7 +31,7 @@ create table llx_projet_task
datev datetime, -- date validation datev datetime, -- date validation
label varchar(255) NOT NULL, label varchar(255) NOT NULL,
description text, description text,
duration_effective real NOT NULL, duration_effective real DEFAULT 0 NOT NULL,
progress integer DEFAULT 0, -- percentage increase progress integer DEFAULT 0, -- percentage increase
priority integer DEFAULT 0, -- priority priority integer DEFAULT 0, -- priority
fk_user_creat integer, -- user who created the task fk_user_creat integer, -- user who created the task

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

@ -77,9 +77,7 @@ if ($_POST["action"] == 'createtask' && $user->rights->projet->creer)
$taskid = $task->create($user); $taskid = $task->create($user);
if ($taskid > 0) if ($taskid > 0)
{ {
$task->update($user);
$result = $task->add_contact($_POST["userid"], 'TASKEXECUTIVE', 'internal'); $result = $task->add_contact($_POST["userid"], 'TASKEXECUTIVE', 'internal');
} }
} }

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

@ -93,14 +93,22 @@ class Task extends CommonObject
$sql.= "fk_projet"; $sql.= "fk_projet";
$sql.= ", fk_task_parent"; $sql.= ", fk_task_parent";
$sql.= ", label"; $sql.= ", label";
$sql.= ", description";
$sql.= ", datec"; $sql.= ", datec";
$sql.= ", fk_user_creat"; $sql.= ", fk_user_creat";
$sql.= ", dateo";
$sql.= ", datee";
$sql.= ", progress";
$sql.= ") VALUES ("; $sql.= ") VALUES (";
$sql.= $this->fk_project; $sql.= $this->fk_project;
$sql.= ", ".$this->fk_task_parent; $sql.= ", ".$this->fk_task_parent;
$sql.= ", '".addslashes($this->label)."'"; $sql.= ", '".addslashes($this->label)."'";
$sql.= ", '".addslashes($this->description)."'";
$sql.= ", ".$this->db->idate($this->date_c); $sql.= ", ".$this->db->idate($this->date_c);
$sql.= ", ".$user->id; $sql.= ", ".$user->id;
$sql.= ", ".($this->date_start!=''?$this->db->idate($this->date_start):'null');
$sql.= ", ".($this->date_end!=''?$this->db->idate($this->date_end):'null');
$sql.= ", ".$this->progress;
$sql.= ")"; $sql.= ")";
$this->db->begin(); $this->db->begin();