';
}
if (!empty($show_empty)) {
$out.= ' ';
@@ -191,6 +192,160 @@ class FormProjets
}
}
+ /**
+ * Output a combo list with projects qualified for a third party
+ *
+ * @param int $socid Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
+ * @param int $selected Id task preselected
+ * @param string $htmlname Nom de la zone html
+ * @param int $maxlength Maximum length of label
+ * @param int $option_only Return only html options lines without the select tag
+ * @param int $show_empty Add an empty line
+ * @param int $discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
+ * @param int $forcefocus Force focus on field (works with javascript only)
+ * @param int $disabled Disabled
+ * @return int Nber of project if OK, <0 if KO
+ */
+ function select_task($socid=-1, $selected='', $htmlname='taskid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0)
+ {
+ global $user,$conf,$langs;
+
+ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+ $out='';
+
+ $hideunselectables = false;
+ if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+
+ $projectsListId = false;
+ if (empty($user->rights->projet->all->lire))
+ {
+ $projectstatic=new Project($this->db);
+ $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
+ }
+
+ // Search all projects
+ $sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.ref, p.title, p.fk_soc, p.fk_statut, p.public';
+ $sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p, '.MAIN_DB_PREFIX.'projet_task as t';
+ $sql.= " WHERE p.entity = ".$conf->entity;
+ $sql.= " AND t.fk_projet = p.rowid";
+ if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
+ if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+ if ($socid > 0) $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+ $sql.= " ORDER BY p.ref, t.ref ASC";
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ $minmax='';
+
+ // Use select2 selector
+ $nodatarole='';
+ if (! empty($conf->use_javascript_ajax))
+ {
+ include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+ $comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
+ $out.=$comboenhancement;
+ $nodatarole=($comboenhancement?' data-role="none"':'');
+ $minmax='minwidth100';
+ }
+
+ if (empty($option_only)) {
+ $out.= '';
+ }
+ if (!empty($show_empty)) {
+ $out.= ' ';
+ }
+ $num = $this->db->num_rows($resql);
+ $i = 0;
+ if ($num)
+ {
+ while ($i < $num)
+ {
+ $obj = $this->db->fetch_object($resql);
+ // If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
+ if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+ {
+ // Do nothing
+ }
+ else
+ {
+ if ($discard_closed == 1 && $obj->fk_statut == 2)
+ {
+ $i++;
+ continue;
+ }
+
+ $labeltoshow=dol_trunc($obj->ref,18);
+ //if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
+ //else $labeltoshow.=' ('.$langs->trans("Private").')';
+ $labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
+
+ $disabled=0;
+ if ($obj->fk_statut == 0)
+ {
+ $disabled=1;
+ $labeltoshow.=' - '.$langs->trans("Draft");
+ }
+ else if ($obj->fk_statut == 2)
+ {
+ if ($discard_close == 2) $disabled=1;
+ $labeltoshow.=' - '.$langs->trans("Closed");
+ }
+ else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+ {
+ $disabled=1;
+ $labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+ }
+ // Label for task
+ $labeltoshow.=' - '.$obj->tref.' '.dol_trunc($obj->tlabel,$maxlenght);
+
+ if (!empty($selected) && $selected == $obj->rowid)
+ {
+ $out.= '';
+ }
+ else
+ {
+ if ($hideunselectables && $disabled && ($selected != $obj->rowid))
+ {
+ $resultat='';
+ }
+ else
+ {
+ $resultat=' public) $labeltoshow.=' ('.$langs->trans("Public").')';
+ //else $labeltoshow.=' ('.$langs->trans("Private").')';
+ $resultat.='>';
+ $resultat.=$labeltoshow;
+ $resultat.=' ';
+ }
+ $out.= $resultat;
+ }
+ }
+ $i++;
+ }
+ }
+ if (empty($option_only)) {
+ $out.= ' ';
+ }
+
+ print $out;
+
+ $this->db->free($resql);
+ return $num;
+ }
+ else
+ {
+ dol_print_error($this->db);
+ return -1;
+ }
+ }
+
+
/**
* Build a HTML select list of element of same thirdparty to suggest to link them to project
*
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 1bf4c9531df..556dbc0a1c6 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -507,7 +507,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
* @param int $preselectedday Preselected day
* @return $inc
*/
-function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0, $preselectedday='')
+function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=1, $preselectedday='')
{
global $db, $user, $bc, $langs;
global $form, $formother, $projectstatic, $taskstatic;
@@ -676,7 +676,7 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t
* @param int $restricteditformytask 0=No restriction, 1=Enable add time only if task is a task i am affected to
* @return $inc
*/
-function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0)
+function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=1)
{
global $db, $user, $bc, $langs;
global $form, $formother, $projectstatic, $taskstatic;
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 4fd51981a99..25db18df474 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -14,7 +14,8 @@ MyTasksDesc=This view is limited to projects or tasks you are a contact for (wha
OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
+AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
+OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
ProjectsArea=Projects area
NewProject=New project
AddProject=Create project
@@ -148,4 +149,6 @@ TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
ProjectsWithThisUserAsContact=Projects with this user as contact
TasksWithThisUserAsContact=Tasks assigned to this user
ResourceNotAssignedToProject=Not assigned to project
-ResourceNotAssignedToTask=Not assigned to task
\ No newline at end of file
+ResourceNotAssignedToTask=Not assigned to task
+AssignTaskToMe=Assign task to me
+AssignTask=Assign
\ No newline at end of file
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index f8f9daf8de9..f1431f37042 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -30,12 +30,15 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
$langs->load('projects');
$action=GETPOST('action');
$mode=GETPOST("mode");
$id=GETPOST('id','int');
+$taskid=GETPOST('taskid');
$mine=0;
if ($mode == 'mine') $mine=1;
@@ -63,6 +66,8 @@ $week=GETPOST("week","int")?GETPOST("week","int"):date("W");
$daytoparse = $now;
if ($year && $month && $day) $daytoparse=dol_mktime(0, 0, 0, $month, $day, $year);
+$object=new Task($db);
+
/*
* Actions
@@ -75,10 +80,48 @@ if (GETPOST('submitdateselect'))
$action = '';
}
+
+if ($action == 'assign')
+{
+ if ($taskid > 0)
+ {
+ $result = $object->fetch($taskid, $ref);
+ if ($result < 0) $error++;
+ }
+ else
+ {
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
+ $error++;
+ }
+ if (! GETPOST('type'))
+ {
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), '', 'errors');
+ $error++;
+ }
+ if (! $error)
+ {
+ $idfortaskuser=$user->id;
+ $result = $object->add_contact($idfortaskuser, GETPOST("type"), 'internal');
+ }
+
+ if ($result < 0)
+ {
+ if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+ {
+ $langs->load("errors");
+ setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'warnings');
+ }
+ else
+ {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ }
+
+ $action='';
+}
+
if ($action == 'addtime' && $user->rights->projet->creer)
{
- $task = new Task($db);
-
$timespent_duration=array();
foreach($_POST as $key => $time)
@@ -151,6 +194,8 @@ if ($action == 'addtime' && $user->rights->projet->creer)
$form=new Form($db);
$formother = new FormOther($db);
+$formcompany=new FormCompany($db);
+$formproject=new FormProjets($db);
$projectstatic=new Project($db);
$project = new Project($db);
$taskstatic = new Task($db);
@@ -218,7 +263,14 @@ else
if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').''.$langs->trans("Duration").' ';
print "\n";
// By default, we can edit only tasks we are assigned to
-$restricteditformytask=(empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJECTS)?1:0);
+$restrictviewformytask=(empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED)?1:0);
if (count($tasksarray) > 0)
{
$j=0;
- projectLinesPerDay($j, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $daytoparse);
+ projectLinesPerDay($j, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restrictviewformytask, $daytoparse);
}
else
{
@@ -290,6 +342,21 @@ print "});";
print '';
+// Add a new project/task
+print '
'.$langs->trans("Total").'
@@ -300,7 +352,6 @@ print '';
print ''."\n\n";
-
$modeinput='hours';
print '';
+// Add a new project/task
+print '