diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 73f69e0..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/.idea/doliproject.iml b/.idea/doliproject.iml
deleted file mode 100644
index c956989..0000000
--- a/.idea/doliproject.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 28a804d..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 3cb885f..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/README.md b/README.md
index e6f7824..c6c4519 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,25 @@
# DOLIPROJECT POUR [DOLIBARR ERP CRM](https://www.dolibarr.org)
+## Informations
+
+Version du module: 1.3.0
+
+Dernière mise à jour: 18/08/2022
+
+Prérequis:
+* Dolibarr min version 14.0.0
+* Dolibarr min version 15.0.3
+
+Thème: Eldy Menu
+
+Editeur/Licence: [Eoxia](https://www.eoxia.com) / GPL-v3
+
+Assitance: [Forum www.dolibarr.fr](https://www.dolibarr.fr) / Par mail à contact@eoxia.com
+
+Demo: [Demo DoliProject](https://www.doliproject.projetm.com) - ID: demo - Password: demo
+
+Documentation: [Wiki DoliProject](https://wiki.dolibarr.org/index.php/Module_DoliProject)
+
## Fonctionnalités
- Module ajoutant la possibilité de simplifier la création de tâche liée à un projet à partir d'une facture.
@@ -10,7 +30,7 @@
# Méthode 1 :
- Depuis le menu "Déployer/Installer un module externe" de Dolibarr :
-- Glisser l'archive ZIP 'module_doliproject-1.1.0' et cliquer sur "SEND"
+- Glisser l'archive ZIP 'module_doliproject-1.2.0' et cliquer sur "SEND"
- Activer le module dans la liste des Modules/Applications installés
# Méthode 2 :
@@ -18,4 +38,4 @@
- Dans le dossier "dolibarr/htdocs/custom" copier la ligne suivante :
```
git clone https://github.com/Eoxia/doliproject.git
-```
\ No newline at end of file
+```
diff --git a/admin/project.php b/admin/project.php
new file mode 100644
index 0000000..ae24453
--- /dev/null
+++ b/admin/project.php
@@ -0,0 +1,217 @@
+
+ * Copyright (C) 2020 SuperAdmin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see '.$langs->trans("BackToModuleList").' ';
+
+print load_fiche_titre($langs->trans($page_name), $linkback, 'object_doliproject@doliproject');
+
+// Configuration header
+$head = doliprojectAdminPrepareHead();
+dol_fiche_head($head, 'projecttasks', '', -1, 'doliproject@doliproject');
+dol_get_fiche_head($head, 'projecttasks', '', -1, 'doliproject@doliproject');
+
+// Project
+print load_fiche_titre($langs->transnoentities("HRProject"), '', '');
+
+print '';
+
+//Time spent
+print load_fiche_titre($langs->transnoentities("TimeSpent"), '', '');
+
+print '';
+
+print '';
+print '' . $langs->transnoentities("Parameters") . ' ';
+print '' . $langs->transnoentities("Status") . ' ';
+print '' . $langs->transnoentities("Action") . ' ';
+print '' . $langs->transnoentities("ShortInfo") . ' ';
+print ' ';
+
+print '' . $langs->transnoentities("SpendMoreTimeThanPlanned") . ' ';
+print '';
+print ajax_constantonoff('DOLIPROJECT_SPEND_MORE_TIME_THAN_PLANNED');
+print ' ';
+print '';
+print '';
+print ' ';
+print '';
+print $form->textwithpicto('', $langs->transnoentities("SpendMoreTimeThanPlannedHelp"), 1, 'help');
+print ' ';
+print '
';
+
+//Theme dasboard time spent
+print load_fiche_titre($langs->transnoentities("ThemeDashboardTimeSpent"), '', '');
+
+print '';
+
+// Page end
+llxFooter();
+$db->close();
diff --git a/class/actions_doliproject.class.php b/class/actions_doliproject.class.php
index 07d14fa..02e94e3 100644
--- a/class/actions_doliproject.class.php
+++ b/class/actions_doliproject.class.php
@@ -503,7 +503,7 @@ public function printCommonFooter($parameters, &$object, &$action, $hookmanager)
InputTime.type = "number";
InputTime.value = global->DOLIPROJECT_DEFAUT_TICKET_TIME)?$conf->global->DOLIPROJECT_DEFAUT_TICKET_TIME:0); ?>;
let $tr = $('');
- $tr.append($('').append('trans('NewTimeSpent');?>'));
+ $tr.append($(' ').append('trans('DoliProjectNewTimeSpent');?>'));
$tr.append($(' ').append(InputTime));
let currElement = $("form[name='ticket'] > table tbody");
@@ -517,26 +517,67 @@ public function printCommonFooter($parameters, &$object, &$action, $hookmanager)
setEventMessages($ticket->error,$ticket->errors,'errors');
}
dol_htmloutput_events();
+ } else if ((GETPOST('action') == '' || empty(GETPOST('action')) || GETPOST('action') == 'view')) {
+ require_once __DIR__ . '/../../../projet/class/task.class.php';
+
+ $task = new Task($this->db);
+ $ticket = new Ticket($this->db);
+
+ $ticket->fetch(GETPOST('id'));
+ $ticket->fetch_optionals();
+
+ $task_id = $ticket->array_options['options_fk_task'];
+
+ $task->fetch($task_id);
+
+ if (!empty($task_id) && $task_id > 0) { ?>
+
+ db);
+ $ticket = new Ticket($this->db);
+
+ $ticket->fetch(GETPOST('id'));
+ $ticket->fetch_optionals();
+
+ $alltasks = $task->getTasksArray(null, null, $ticket->fk_project);
+ if (is_array($alltasks) && !empty($alltasks)) {
+ foreach ($alltasks as $tasksingle) {
+ $taskArray[$tasksingle->id] = $tasksingle->ref . ' - ' . $tasksingle->label;
+ }
+ }
+
+ if (is_array($taskArray) && !empty($taskArray)) { ?>
+
+ id);
}
-
-// $result = isTaskFavorite(GETPOST('id'), $user->id);
if (isTaskFavorite(GETPOST('id'), $user->id)) {
- $favoriteStar = '
';
+ $favoriteStar = '
';
+ $favoriteStar = ' '.$langs->trans("Categories").' ';
+ $html .= $form->showCategories($invoice_id, 'invoice', 1);
+ $html .= ' ' . $langs->trans("Categories") . ' ';
+ $cate_arbo = $form->select_all_categories('invoice', '', 'parent', 64, 0, 1);
+ print img_picto('', 'category') . $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+ print " '.$langs->trans("Categories").' ';
+// $cate_arbo = $form->select_all_categories('invoice', '', 'parent', 64, 0, 1);
+// $c = new Categorie($this->db);
+// $cats = $c->containing($object->id, 'invoice');
+// $arrayselected = array();
+// if (is_array($cats)) {
+// foreach ($cats as $cat) {
+// $arrayselected[] = $cat->id;
+// }
+// }
+// print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+// print " '.$langs->trans("Categories").' ';
+ print $form->showCategories($object->id, 'invoice', 1);
+ print " '.$langs->trans("Categories").' ';
+ print $form->showCategories($object->id, 'invoicerec', 1);
+ print " '."\n";
+ print '';
+ print $projectstatic->getNomUrl(1, '', 0, ''.$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+ if ($thirdpartystatic->id > 0) {
+ print ' - '.$thirdpartystatic->getNomUrl(1);
+ }
+ if ($projectstatic->title) {
+ print ' - ';
+ print ''.$projectstatic->title.' ';
+ }
+
+ print ' ';
+ print '';
+ if (!empty($conf->use_javascript_ajax)) {
+ print img_picto("Auto fill", 'rightarrow', "class='auto-fill-timespent-project' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
+ }
+ print ' ' . $langs->trans('DivideTimeIntoTasks');
+ print ' ';
+
+ print '';
+
+ print ' ';
+
+ print '';
+
+ print ' ';
+ print ' ';
+ }
+
+ if ($oldprojectforbreak != -1) {
+ $oldprojectforbreak = $projectstatic->id;
+ }
+
+ print ''."\n";
+
+ // User
+ /*
+ print '';
+ print $fuser->getNomUrl(1, 'withproject', 'time');
+ print ' ';
+ */
+
+ // Project
+ if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+ print "";
+ if ($oldprojectforbreak == -1) {
+ print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+ }
+ print " ";
+ }
+
+ // Thirdparty
+ if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+ print '';
+ if ($thirdpartystatic->id > 0) {
+ print $thirdpartystatic->getNomUrl(1, 'project', 10);
+ }
+ print ' ';
+ }
+
+ // Ref
+ print '';
+ print '';
+ for ($k = 0; $k < $level; $k++) {
+ print '';
+ }
+ print $taskstatic->getNomUrl(1, 'withproject', 'time');
+ // Label task
+ print ''.$taskstatic->label.'';
+ for ($k = 0; $k < $level; $k++) {
+ print "
";
+ }
+ print " \n";
+
+ // TASK extrafields
+ $extrafieldsobjectkey = 'projet_task';
+ $extrafieldsobjectprefix = 'efpt.';
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+
+ if (!empty($arrayfields['timeconsumed']['checked'])) {
+ // Time spent by everybody
+ print '';
+ // $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
+ if ($lines[$i]->duration) {
+ print '';
+ print convertSecondToTime($lines[$i]->duration, 'allhourmin');
+ print ' ';
+ } else {
+ print '--:--';
+ }
+ print " \n";
+
+ // Time spent by user
+ print '';
+ $tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);
+ if ($tmptimespent['total_duration']) {
+ print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
+ } else {
+ print '--:--';
+ }
+ print " \n";
+ }
+
+ $disabledproject = 1;
+ $disabledtask = 1;
+
+ // If at least one role for project
+ if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer) {
+ $disabledproject = 0;
+ $disabledtask = 0;
+ }
+ // If $restricteditformytask is on and I have no role on task, i disable edit
+ if ($restricteditformytask && empty($tasksrole[$lines[$i]->id])) {
+ $disabledtask = 1;
+ }
+
+ if ($restrictBefore && $preselectedday < $restrictBefore) {
+ $disabledtask = 1;
+ }
+
+ // Select hour
+ print '';
+ $tableCell = $form->selectDate($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, $disabledtask);
+ print $tableCell;
+ print ' ';
+
+ $cssonholiday = '';
+ if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon']) {
+ $cssonholiday .= 'onholidayallday ';
+ } elseif (!$isavailable[$preselectedday]['morning']) {
+ $cssonholiday .= 'onholidaymorning ';
+ } elseif (!$isavailable[$preselectedday]['afternoon']) {
+ $cssonholiday .= 'onholidayafternoon ';
+ }
+
+ global $daytoparse;
+ $tmparray = dol_getdate($daytoparse, true); // detail of current day
+
+ $idw = ($tmparray['wday'] - (empty($conf->global->MAIN_START_WEEK) ? 0 : 1));
+ global $numstartworkingday, $numendworkingday;
+ $cssweekend = '';
+ if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) { // This is a day is not inside the setup of working days, so we use a week-end css.
+ $cssweekend = 'weekend';
+ }
+
+ // Duration
+ print '';
+ $dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
+ $totalforeachday[$preselectedday] += $dayWorkLoad;
+
+ $alreadyspent = '';
+ if ($dayWorkLoad > 0) {
+ $alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');
+ }
+
+ $idw = 0;
+
+ $tableCell = '';
+ $tableCell .= ' + ';
+ //$tableCell.=' ';
+ if (!empty($conf->use_javascript_ajax)) {
+ $tableCell .= img_picto("Auto fill", 'rightarrow', "class='auto-fill-timespent' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
+ }
+ $tableCell .= $form->select_duration($lines[$i]->id.'duration', '', $disabledtask, 'text', 0, 1);
+ //$tableCell.=' ';
+
+ // Note
+ print '';
+ print '';
+ print ' ';
+
+ // Warning
+ print '';
+ if ((!$lines[$i]->public) && $disabledproject) {
+ print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
+ } elseif ($disabledtask) {
+ $titleassigntask = $langs->trans("AssignTaskToMe");
+ if ($fuser->id != $user->id) {
+ $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+ }
+
+ print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+ }
+ print ' ';
+
+ print " \n";
+ }
+
+ $inc++;
+ $level++;
+ if ($lines[$i]->id > 0) {
+ //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
+ //var_dump($totalforeachday);
+ $ret = doliprojectLinesPerDay($inc, $lines[$i]->id, $fuser, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable, $oldprojectforbreak, $arrayfields, $extrafields);
+ //var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
+ //var_dump($ret);
+ foreach ($ret as $key => $val) {
+ $totalforeachday[$key] += $val;
+ }
+ //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
+ //var_dump($totalforeachday);
+ }
+ $level--;
+ } else {
+ //$level--;
+ }
+ }
+
+ return $totalforeachday;
+}
+
+/**
+ * Prepare array with list of tabs
+ *
+ * @param string $mode Mode
+ * @param string $fuser Filter on user
+ * @return array Array of tabs to show
+ */
+function doliproject_timesheet_prepare_head($mode, $fuser = null)
+{
+ global $langs, $conf, $user;
+ $h = 0;
+ $head = array();
+
+ $h = 0;
+
+ $param = '';
+ $param .= ($mode ? '&mode='.$mode : '');
+ if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) {
+ $param .= '&search_usertoprocessid='.$fuser->id;
+ }
+
+ if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERMONTH)) {
+ $head[$h][0] = DOL_URL_ROOT."/custom/doliproject/view/timespent_month.php".($param ? '?'.$param : '');
+ $head[$h][1] = $langs->trans("InputPerMonth");
+ $head[$h][2] = 'inputpermonth';
+ $h++;
+ }
+
+ if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK)) {
+ $head[$h][0] = DOL_URL_ROOT."/custom/doliproject/view/timespent_week.php".($param ? '?'.$param : '');
+ $head[$h][1] = $langs->trans("InputPerWeek");
+ $head[$h][2] = 'inputperweek';
+ $h++;
+ }
+
+ if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME)) {
+ $head[$h][0] = DOL_URL_ROOT."/custom/doliproject/view/timespent_day.php".($param ? '?'.$param : '');
+ $head[$h][1] = $langs->trans("InputPerDay");
+ $head[$h][2] = 'inputperday';
+ $h++;
+ }
+
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'project_timesheet');
+
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'project_timesheet', 'remove');
+
+ return $head;
+}
+
+/**
+ * Sets object to given categories.
+ *
+ * Adds it to non existing supplied categories.
+ * Deletes object from existing categories not supplied (if remove_existing==true).
+ * Existing categories are left untouch.
+ *
+ * @param int[]|int $categories Category ID or array of Categories IDs
+ * @param string $type_categ Category type ('customer', 'supplier', 'website_page', ...) definied into const class Categorie type
+ * @param boolean $remove_existing True: Remove existings categories from Object if not supplies by $categories, False: let them
+ * @return int <0 if KO, >0 if OK
+ */
+function setCategoriesObject($categories, $type_categ = '', $remove_existing = true, $object)
+{
+ // Handle single category
+ if (!is_array($categories)) {
+ $categories = array($categories);
+ }
+
+ dol_syslog(get_class($object)."::setCategoriesCommon Oject Id:".$object->id.' type_categ:'.$type_categ.' nb tag add:'.count($categories), LOG_DEBUG);
+
+ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+ if (empty($type_categ)) {
+ dol_syslog(__METHOD__.': Type '.$type_categ.'is an unknown category type. Done nothing.', LOG_ERR);
+ return -1;
+ }
+
+ // Get current categories
+ $c = new Categorie($object->db);
+ $existing = $c->containing($object->id, $type_categ, 'id');
+ if ($remove_existing) {
+ // Diff
+ if (is_array($existing)) {
+ $to_del = array_diff($existing, $categories);
+ $to_add = array_diff($categories, $existing);
+ } else {
+ $to_del = array(); // Nothing to delete
+ $to_add = $categories;
+ }
+ } else {
+ $to_del = array(); // Nothing to delete
+ $to_add = array_diff($categories, $existing);
+ }
+
+ $error = 0;
+ $ok = 0;
+
+ // Process
+ foreach ($to_del as $del) {
+ if ($c->fetch($del) > 0) {
+ $result=$c->del_type($object, $type_categ);
+ if ($result < 0) {
+ $error++;
+ $object->error = $c->error;
+ $object->errors = $c->errors;
+ break;
+ } else {
+ $ok += $result;
+ }
+ }
+ }
+ foreach ($to_add as $add) {
+ if ($c->fetch($add) > 0) {
+ $result = $c->add_type($object, $type_categ);
+ if ($result < 0) {
+ $error++;
+ $object->error = $c->error;
+ $object->errors = $c->errors;
+ break;
+ } else {
+ $ok += $result;
+ }
+ }
+ }
+
+ return $error ? -1 * $error : $ok;
+}
+
+/**
+ * Output a task line into a perday intput mode
+ *
+ * @param string $inc Line output identificator (start to 0, then increased by recursive call)
+ * @param int $firstdaytoshow First day to show
+ * @param User|null $fuser Restrict list to user if defined
+ * @param string $parent Id of parent task to show (0 to show all)
+ * @param Task[] $lines Array of lines (list of tasks but we will show only if we have a specific role on task)
+ * @param int $level Level (start to 0, then increased/decrease by recursive call)
+ * @param string $projectsrole Array of roles user has on project
+ * @param string $tasksrole Array of roles user has on task
+ * @param string $mine Show only task lines I am assigned to
+ * @param int $restricteditformytask 0=No restriction, 1=Enable add time only if task is assigned to me, 2=Enable add time only if tasks is assigned to me and hide others
+ * @param array $isavailable Array with data that say if user is available for several days for morning and afternoon
+ * @param int $oldprojectforbreak Old project id of last project break
+ * @param array $arrayfields Array of additional column
+ * @param Extrafields $extrafields Object extrafields
+ * @return array Array with time spent for $fuser for each day of week on tasks in $lines and substasks
+ */
+function projectLinesPerDayOnMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak = 0, $arrayfields = array(), $extrafields = null, $dayInMonth)
+{
+ global $conf, $db, $user, $langs;
+ global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
+
+ $numlines = count($lines);
+
+ $lastprojectid = 0;
+ $workloadforid = array();
+ $totalforeachday = array();
+ $lineswithoutlevel0 = array();
+
+ // Create a smaller array with sublevels only to be used later. This increase dramatically performances.
+ if ($parent == 0) { // Always and only if at first level
+ for ($i = 0; $i < $numlines; $i++) {
+ if ($lines[$i]->fk_task_parent) {
+ $lineswithoutlevel0[] = $lines[$i];
+ }
+ }
+ }
+
+ //dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
+
+ if (empty($oldprojectforbreak)) {
+ $oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break
+ }
+
+ $restrictBefore = null;
+
+ if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+ $restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+ }
+
+ for ($i = 0; $i < $numlines; $i++) {
+ if ($parent == 0) {
+ $level = 0;
+ }
+
+ if ($lines[$i]->fk_task_parent == $parent) {
+ $obj = &$lines[$i]; // To display extrafields
+
+ // If we want all or we have a role on task, we show it
+ if (empty($mine) || !empty($tasksrole[$lines[$i]->id])) {
+ //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
+
+ if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id])) { // we have no role on task and we request to hide such cases
+ continue;
+ }
+
+ // Break on a new project
+ if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid) {
+ $lastprojectid = $lines[$i]->fk_project;
+ $projectstatic->id = $lines[$i]->fk_project;
+ }
+
+ //var_dump('--- '.$level.' '.$firstdaytoshow.' '.$fuser->id.' '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
+ //var_dump($projectstatic->monthWorkLoadPerTask);
+ if (empty($workloadforid[$projectstatic->id])) {
+ loadTimeSpentMonthByDay($firstdaytoshow, 0, $fuser->id, $projectstatic); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->monthWorkLoadPerTask for all days of a week
+ $workloadforid[$projectstatic->id] = 1;
+ }
+ //var_dump('--- '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
+
+ $projectstatic->id = $lines[$i]->fk_project;
+ $projectstatic->ref = $lines[$i]->projectref;
+ $projectstatic->title = $lines[$i]->projectlabel;
+ $projectstatic->public = $lines[$i]->public;
+ $projectstatic->thirdparty_name = $lines[$i]->thirdparty_name;
+ $projectstatic->status = $lines[$i]->projectstatus;
+
+ $taskstatic->id = $lines[$i]->id;
+ $taskstatic->ref = ($lines[$i]->ref ? $lines[$i]->ref : $lines[$i]->id);
+ $taskstatic->label = $lines[$i]->label;
+ $taskstatic->date_start = $lines[$i]->date_start;
+ $taskstatic->date_end = $lines[$i]->date_end;
+
+ $thirdpartystatic->id = $lines[$i]->thirdparty_id;
+ $thirdpartystatic->name = $lines[$i]->thirdparty_name;
+ $thirdpartystatic->email = $lines[$i]->thirdparty_email;
+
+ if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id)) {
+ $addcolspan = 0;
+ if (!empty($arrayfields['t.planned_workload']['checked'])) {
+ $addcolspan++;
+ }
+ if (!empty($arrayfields['t.progress']['checked'])) {
+ $addcolspan++;
+ }
+ if (!empty($arrayfields['timeconsumed']['checked'])) {
+ $addcolspan++;
+ }
+ foreach ($arrayfields as $key => $val) {
+ if ($val['checked'] && substr($key, 0, 5) == 'efpt.') {
+ $addcolspan++;
+ }
+ }
+
+ if ($conf->global->DOLIPROJECT_SHOW_ONLY_FAVORITE_TASKS) {
+ $taskfavorite = isTaskFavorite($lines[$i]->id, $fuser->id);
+ } else {
+ $taskfavorite = 1;
+ }
+
+ print ''."\n";
+ print '';
+ print $projectstatic->getNomUrl(1, '', 0, ''.$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+ if ($thirdpartystatic->id > 0) {
+ print ' - '.$thirdpartystatic->getNomUrl(1);
+ }
+ if ($projectstatic->title) {
+ print ' - ';
+ print ''.dol_trunc($projectstatic->title, '64').' ';
+ }
+
+ /*$colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);
+ print '';
+
+ print '';
+
+ // PROJECT fields
+ if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['p.opp_amount']['checked'])) print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['p.opp_percent']['checked'])) print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['p.usage_bill_time']['checked'])) print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
+
+ $extrafieldsobjectkey='projet';
+ $extrafieldsobjectprefix='efp.';
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+
+ print ' ';
+ print '';
+
+ // PROJECT fields
+ if (! empty($arrayfields['p.fk_opp_status']['checked']))
+ {
+ print '';
+ $code = dol_getIdFromCode($db, $lines[$i]->fk_opp_status, 'c_lead_status', 'rowid', 'code');
+ if ($code) print $langs->trans("OppStatus".$code);
+ print " \n";
+ }
+ if (! empty($arrayfields['p.opp_amount']['checked']))
+ {
+ print '';
+ print price($lines[$i]->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+ print " \n";
+ }
+ if (! empty($arrayfields['p.opp_percent']['checked']))
+ {
+ print '';
+ print price($lines[$i]->opp_percent, 0, $langs, 1, 0).' %';
+ print " \n";
+ }
+ if (! empty($arrayfields['p.budget_amount']['checked']))
+ {
+ print '';
+ print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+ print " \n";
+ }
+ if (! empty($arrayfields['p.usage_bill_time']['checked']))
+ {
+ print '';
+ print yn($lines[$i]->usage_bill_time);
+ print " \n";
+ }
+
+ $extrafieldsobjectkey='projet';
+ $extrafieldsobjectprefix='efp.';
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+
+ print ' ';
+ print '
';
+ */
+
+ print ' ';
+ print ' ';
+ }
+
+ if ($oldprojectforbreak != -1) {
+ $oldprojectforbreak = $projectstatic->id;
+ }
+
+ if ($conf->global->DOLIPROJECT_SHOW_ONLY_FAVORITE_TASKS) {
+ $taskfavorite = isTaskFavorite($lines[$i]->id, $fuser->id);
+ } else {
+ $taskfavorite = 1;
+ }
+
+ print ''."\n";
+
+ // User
+ /*
+ print '';
+ print $fuser->getNomUrl(1, 'withproject', 'time');
+ print ' ';
+ */
+
+ // Project
+ if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+ print '';
+ if ($oldprojectforbreak == -1) {
+ print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+ }
+ print " ";
+ }
+
+ // Thirdparty
+ if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+ print '';
+ if ($thirdpartystatic->id > 0) {
+ print $thirdpartystatic->getNomUrl(1, 'project');
+ }
+ print ' ';
+ }
+
+ // Ref
+ print '';
+ print '';
+ for ($k = 0; $k < $level; $k++) {
+ print '';
+ }
+ print $taskstatic->getNomUrl(1, 'withproject', 'time');
+ // Label task
+ print ''.dol_trunc($taskstatic->label, '64').' ';
+ for ($k = 0; $k < $level; $k++) {
+ print "
";
+ }
+ print " \n";
+
+ // TASK extrafields
+ $extrafieldsobjectkey = 'projet_task';
+ $extrafieldsobjectprefix = 'efpt.';
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+
+ // Planned Workload
+ if (!empty($arrayfields['t.planned_workload']['checked'])) {
+ print '';
+ if ($lines[$i]->planned_workload) {
+ print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
+ } else {
+ print '--:--';
+ }
+ print ' ';
+ }
+
+ if (!empty($arrayfields['t.progress']['checked'])) {
+ // Progress declared %
+ print '';
+ print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
+ print ' ';
+ }
+
+ if (!empty($arrayfields['timeconsumed']['checked'])) {
+ // Time spent by user
+ print '';
+ $firstday = dol_print_date($firstdaytoshow, 'dayrfc');
+ $currentMonth = date( 'm', dol_now());
+ $year = GETPOST('reyear', 'int') ?GETPOST('reyear', 'int') : (GETPOST("year", 'int') ?GETPOST("year", "int") : date("Y"));
+ $month = GETPOST('remonth', 'int') ?GETPOST('remonth', 'int') : (GETPOST("month", 'int') ?GETPOST("month", "int") : date("m"));
+ if ($currentMonth == $month) {
+ $lastday = dol_print_date(dol_now(), 'dayrfc');
+ } else {
+ $lastdaytoshow = dol_get_last_day($year, $month);
+ $lastday = dol_print_date($lastdaytoshow, 'dayrfc');
+ }
+ $filter = ' AND t.task_datehour BETWEEN ' . "'" . $firstday . "'" . ' AND ' . "'" . $lastday . "'";
+ $tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id, $filter);
+ if ($tmptimespent['total_duration']) {
+ print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
+ } else {
+ print '--:--';
+ }
+ print " \n";
+ }
+
+ $disabledproject = 1;
+ $disabledtask = 1;
+ //print "x".$lines[$i]->fk_project;
+ //var_dump($lines[$i]);
+ //var_dump($projectsrole[$lines[$i]->fk_project]);
+ // If at least one role for project
+ if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer) {
+ $disabledproject = 0;
+ $disabledtask = 0;
+ }
+ // If $restricteditformytask is on and I have no role on task, i disable edit
+ if ($restricteditformytask && empty($tasksrole[$lines[$i]->id])) {
+ $disabledtask = 1;
+ }
+
+ //var_dump($projectstatic->monthWorkLoadPerTask);
+
+ // Fields to show current time
+ $tableCell = '';
+ $modeinput = 'hours';
+ for ($idw = 0; $idw < $dayInMonth; $idw++) {
+ $tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
+
+ $cssonholiday = '';
+ if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon']) {
+ $cssonholiday .= 'onholidayallday ';
+ } elseif (!$isavailable[$tmpday]['morning']) {
+ $cssonholiday .= 'onholidaymorning ';
+ } elseif (!$isavailable[$tmpday]['afternoon']) {
+ $cssonholiday .= 'onholidayafternoon ';
+ }
+
+ $tmparray = dol_getdate($tmpday);
+ $dayWorkLoad = $projectstatic->monthWorkLoadPerTask[$tmpday][$lines[$i]->id];
+ $totalforeachday[$tmpday] += $dayWorkLoad;
+
+ $alreadyspent = '';
+ if ($dayWorkLoad > 0) {
+ $alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');
+ }
+ $alttitle = $langs->trans("AddHereTimeSpentForDay", $tmparray['day'], $tmparray['mon']);
+
+ global $numstartworkingday, $numendworkingday;
+ $cssweekend = '';
+ if (($idw + 1 < $numstartworkingday) || ($idw + 1 > $numendworkingday)) { // This is a day is not inside the setup of working days, so we use a week-end css.
+ //$cssweekend = 'weekend';
+ }
+
+ $disabledtaskday = $disabledtask;
+
+ if (! $disabledtask && $restrictBefore && $tmpday < $restrictBefore) {
+ $disabledtaskday = 1;
+ }
+
+ $tableCell = '';
+ //$tableCell .= 'idw='.$idw.' '.$conf->global->MAIN_START_WEEK.' '.$numstartworkingday.'-'.$numendworkingday;
+ $placeholder = '';
+ if ($alreadyspent) {
+ $tableCell .= ' ';
+ print $tableCell;
+ }
+
+ // Warning
+ print '';
+ if ((!$lines[$i]->public) && $disabledproject) {
+ print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
+ } elseif ($disabledtask) {
+ $titleassigntask = $langs->trans("AssignTaskToMe");
+ if ($fuser->id != $user->id) {
+ $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+ }
+
+ print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+ }
+ print ' ';
+
+ print " \n";
+ }
+
+ // Call to show task with a lower level (task under the current task)
+ $inc++;
+ $level++;
+ if ($lines[$i]->id > 0) {
+ //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
+ //var_dump($totalforeachday);
+ $ret = projectLinesPerDayOnMonth($inc, $firstdaytoshow, $fuser, $lines[$i]->id, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak, $arrayfields, $extrafields, $dayInMonth);
+ //var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
+ //var_dump($ret);
+ foreach ($ret as $key => $val) {
+ $totalforeachday[$key] += $val;
+ }
+ //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
+ //var_dump($totalforeachday);
+ }
+ $level--;
+ } else {
+ //$level--;
+ }
+ }
+
+ return $totalforeachday;
+}
+
+/**
+ * Load time spent into this->weekWorkLoad and this->weekWorkLoadPerTask for all day of a week of project.
+ * Note: array weekWorkLoad and weekWorkLoadPerTask are reset and filled at each call.
+ *
+ * @param int $datestart First day of week (use dol_get_first_day to find this date)
+ * @param int $taskid Filter on a task id
+ * @param int $userid Time spent by a particular user
+ * @return int <0 if OK, >0 if KO
+ */
+function loadTimeSpentMonthByDay($datestart, $taskid = 0, $userid = 0, $project)
+{
+ $error = 0;
+
+ $project->monthWorkLoad = array();
+ $project->monthWorkLoadPerTask = array();
+
+ if (empty($datestart)) {
+ dol_print_error('', 'Error datestart parameter is empty');
+ }
+
+ $sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.task_datehour, ptt.fk_task";
+ $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
+ $sql .= " WHERE ptt.fk_task = pt.rowid";
+ $sql .= " AND pt.fk_projet = ".((int) $project->id);
+ $sql .= " AND (ptt.task_date >= '".$project->db->idate($datestart)."' ";
+ $sql .= " AND ptt.task_date <= '".$project->db->idate(dol_time_plus_duree($datestart, 1, 'm') - 1)."')";
+ if ($task_id) {
+ $sql .= " AND ptt.fk_task=".((int) $taskid);
+ }
+ if (is_numeric($userid)) {
+ $sql .= " AND ptt.fk_user=".((int) $userid);
+ }
+
+ //print $sql;
+ $resql = $project->db->query($sql);
+ if ($resql) {
+ $daylareadyfound = array();
+
+ $num = $project->db->num_rows($resql);
+ $i = 0;
+ // Loop on each record found, so each couple (project id, task id)
+ while ($i < $num) {
+ $obj = $project->db->fetch_object($resql);
+ $day = $project->db->jdate($obj->task_date); // task_date is date without hours
+ if (empty($daylareadyfound[$day])) {
+ $project->monthWorkLoad[$day] = $obj->task_duration;
+ $project->monthWorkLoadPerTask[$day][$obj->fk_task] = $obj->task_duration;
+ } else {
+ $project->monthWorkLoad[$day] += $obj->task_duration;
+ $project->monthWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration;
+ }
+ $daylareadyfound[$day] = 1;
+ $i++;
+ }
+ $project->db->free($resql);
+ return 1;
+ } else {
+ $project->error = "Error ".$project->db->lasterror();
+ dol_syslog(get_class($project)."::fetch ".$project->error, LOG_ERR);
+ return -1;
+ }
+}
+
+/**
+ * Output a task line into a perday intput mode
+ *
+ * @param string $inc Line output identificator (start to 0, then increased by recursive call)
+ * @param int $firstdaytoshow First day to show
+ * @param User|null $fuser Restrict list to user if defined
+ * @param string $parent Id of parent task to show (0 to show all)
+ * @param Task[] $lines Array of lines (list of tasks but we will show only if we have a specific role on task)
+ * @param int $level Level (start to 0, then increased/decrease by recursive call)
+ * @param string $projectsrole Array of roles user has on project
+ * @param string $tasksrole Array of roles user has on task
+ * @param string $mine Show only task lines I am assigned to
+ * @param int $restricteditformytask 0=No restriction, 1=Enable add time only if task is assigned to me, 2=Enable add time only if tasks is assigned to me and hide others
+ * @param array $isavailable Array with data that say if user is available for several days for morning and afternoon
+ * @param int $oldprojectforbreak Old project id of last project break
+ * @param array $arrayfields Array of additional column
+ * @param Extrafields $extrafields Object extrafields
+ * @return array Array with time spent for $fuser for each day of week on tasks in $lines and substasks
+ */
+function projectLinesPerWeekDoliProject(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak = 0, $arrayfields = array(), $extrafields = null)
+{
+ global $conf, $db, $user, $langs;
+ global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
+
+ $numlines = count($lines);
+
+ $lastprojectid = 0;
+ $workloadforid = array();
+ $totalforeachday = array();
+ $lineswithoutlevel0 = array();
+
+ // Create a smaller array with sublevels only to be used later. This increase dramatically performances.
+ if ($parent == 0) { // Always and only if at first level
+ for ($i = 0; $i < $numlines; $i++) {
+ if ($lines[$i]->fk_task_parent) {
+ $lineswithoutlevel0[] = $lines[$i];
+ }
+ }
+ }
+
+ //dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
+
+ if (empty($oldprojectforbreak)) {
+ $oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break
+ }
+
+ $restrictBefore = null;
+
+ if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+ $restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
+ }
+
+ for ($i = 0; $i < $numlines; $i++) {
+ if ($parent == 0) {
+ $level = 0;
+ }
+
+ if ($lines[$i]->fk_task_parent == $parent) {
+ $obj = &$lines[$i]; // To display extrafields
+
+ // If we want all or we have a role on task, we show it
+ if (empty($mine) || !empty($tasksrole[$lines[$i]->id])) {
+ //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
+
+ if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id])) { // we have no role on task and we request to hide such cases
+ continue;
+ }
+
+ // Break on a new project
+ if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid) {
+ $lastprojectid = $lines[$i]->fk_project;
+ $projectstatic->id = $lines[$i]->fk_project;
+ }
+
+ //var_dump('--- '.$level.' '.$firstdaytoshow.' '.$fuser->id.' '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
+ //var_dump($projectstatic->weekWorkLoadPerTask);
+ if (empty($workloadforid[$projectstatic->id])) {
+ $projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+ $workloadforid[$projectstatic->id] = 1;
+ }
+ //var_dump($projectstatic->weekWorkLoadPerTask);
+ //var_dump('--- '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
+
+ $projectstatic->id = $lines[$i]->fk_project;
+ $projectstatic->ref = $lines[$i]->projectref;
+ $projectstatic->title = $lines[$i]->projectlabel;
+ $projectstatic->public = $lines[$i]->public;
+ $projectstatic->thirdparty_name = $lines[$i]->thirdparty_name;
+ $projectstatic->status = $lines[$i]->projectstatus;
+
+ $taskstatic->id = $lines[$i]->id;
+ $taskstatic->ref = ($lines[$i]->ref ? $lines[$i]->ref : $lines[$i]->id);
+ $taskstatic->label = $lines[$i]->label;
+ $taskstatic->date_start = $lines[$i]->date_start;
+ $taskstatic->date_end = $lines[$i]->date_end;
+
+ $thirdpartystatic->id = $lines[$i]->thirdparty_id;
+ $thirdpartystatic->name = $lines[$i]->thirdparty_name;
+ $thirdpartystatic->email = $lines[$i]->thirdparty_email;
+
+ if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id)) {
+ $addcolspan = 0;
+ if (!empty($arrayfields['t.planned_workload']['checked'])) {
+ $addcolspan++;
+ }
+ if (!empty($arrayfields['t.progress']['checked'])) {
+ $addcolspan++;
+ }
+ foreach ($arrayfields as $key => $val) {
+ if ($val['checked'] && substr($key, 0, 5) == 'efpt.') {
+ $addcolspan++;
+ }
+ }
+
+ if ($conf->global->DOLIPROJECT_SHOW_ONLY_FAVORITE_TASKS) {
+ $taskfavorite = isTaskFavorite($lines[$i]->id, $fuser->id);
+ } else {
+ $taskfavorite = 1;
+ }
+
+ print ''."\n";
+ print '';
+ print $projectstatic->getNomUrl(1, '', 0, ''.$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+ if ($thirdpartystatic->id > 0) {
+ print ' - '.$thirdpartystatic->getNomUrl(1);
+ }
+ if ($projectstatic->title) {
+ print ' - ';
+ print ''.dol_trunc($projectstatic->title, '64').' ';
+ }
+
+ /*$colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);
+ print '';
+
+ print '';
+
+ // PROJECT fields
+ if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['p.opp_amount']['checked'])) print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['p.opp_percent']['checked'])) print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+ if (! empty($arrayfields['p.usage_bill_time']['checked'])) print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
+
+ $extrafieldsobjectkey='projet';
+ $extrafieldsobjectprefix='efp.';
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+
+ print ' ';
+ print '';
+
+ // PROJECT fields
+ if (! empty($arrayfields['p.fk_opp_status']['checked']))
+ {
+ print '';
+ $code = dol_getIdFromCode($db, $lines[$i]->fk_opp_status, 'c_lead_status', 'rowid', 'code');
+ if ($code) print $langs->trans("OppStatus".$code);
+ print " \n";
+ }
+ if (! empty($arrayfields['p.opp_amount']['checked']))
+ {
+ print '';
+ print price($lines[$i]->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+ print " \n";
+ }
+ if (! empty($arrayfields['p.opp_percent']['checked']))
+ {
+ print '';
+ print price($lines[$i]->opp_percent, 0, $langs, 1, 0).' %';
+ print " \n";
+ }
+ if (! empty($arrayfields['p.budget_amount']['checked']))
+ {
+ print '';
+ print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+ print " \n";
+ }
+ if (! empty($arrayfields['p.usage_bill_time']['checked']))
+ {
+ print '';
+ print yn($lines[$i]->usage_bill_time);
+ print " \n";
+ }
+
+ $extrafieldsobjectkey='projet';
+ $extrafieldsobjectprefix='efp.';
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+
+ print ' ';
+ print '
';
+ */
+
+ print ' ';
+ print ' ';
+ }
+
+ if ($oldprojectforbreak != -1) {
+ $oldprojectforbreak = $projectstatic->id;
+ }
+
+ if ($conf->global->DOLIPROJECT_SHOW_ONLY_FAVORITE_TASKS) {
+ $taskfavorite = isTaskFavorite($lines[$i]->id, $fuser->id);
+ } else {
+ $taskfavorite = 1;
+ }
+
+ print ''."\n";
+
+ // User
+ /*
+ print '';
+ print $fuser->getNomUrl(1, 'withproject', 'time');
+ print ' ';
+ */
+
+ // Project
+ if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+ print '';
+ if ($oldprojectforbreak == -1) {
+ print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+ }
+ print " ";
+ }
+
+ // Thirdparty
+ if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+ print '';
+ if ($thirdpartystatic->id > 0) {
+ print $thirdpartystatic->getNomUrl(1, 'project');
+ }
+ print ' ';
+ }
+
+ // Ref
+ print '';
+ print '';
+ for ($k = 0; $k < $level; $k++) {
+ print '';
+ }
+ print $taskstatic->getNomUrl(1, 'withproject', 'time');
+ // Label task
+ print ''.dol_trunc($taskstatic->label, '64').' ';
+ for ($k = 0; $k < $level; $k++) {
+ print "
";
+ }
+ print " \n";
+
+ // TASK extrafields
+ $extrafieldsobjectkey = 'projet_task';
+ $extrafieldsobjectprefix = 'efpt.';
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+
+ // Planned Workload
+ if (!empty($arrayfields['t.planned_workload']['checked'])) {
+ print '';
+ if ($lines[$i]->planned_workload) {
+ print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
+ } else {
+ print '--:--';
+ }
+ print ' ';
+ }
+
+ if (!empty($arrayfields['t.progress']['checked'])) {
+ // Progress declared %
+ print '';
+ print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
+ print ' ';
+ }
+
+ if (!empty($arrayfields['timeconsumed']['checked'])) {
+ // Time spent by everybody
+ print '';
+ // $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
+ if ($lines[$i]->duration) {
+ print '';
+ print convertSecondToTime($lines[$i]->duration, 'allhourmin');
+ print ' ';
+ } else {
+ print '--:--';
+ }
+ print " \n";
+
+ // Time spent by user
+ print '';
+ $firstday = dol_print_date($firstdaytoshow, 'dayrfc');
+ $CurrentDate = dol_getdate(dol_now());
+ $currentWeek = getWeekNumber($CurrentDate['mday'], $CurrentDate['mon'], $CurrentDate['year']);
+ $Date = dol_getdate($firstdaytoshow);
+ $Week = getWeekNumber($Date['mday'], $Date['mon'], $Date['year']);
+
+ if ($currentWeek == $Week) {
+ $firstDay = date( 'd', $firstdaytoshow);
+ $currentDay = date( 'd', dol_now());
+ $nbday = $currentDay - $firstDay;
+ } else {
+ $nbday = 6;
+ }
+ $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, $nbday, 'd');
+
+ $lastday = dol_print_date($lastdaytoshow, 'dayrfc');
+ $filter = ' AND t.task_datehour BETWEEN ' . "'" . $firstday . "'" . ' AND ' . "'" . $lastday . "'";
+ $tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id, $filter);
+ if ($tmptimespent['total_duration']) {
+ print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
+ } else {
+ print '--:--';
+ }
+ print " \n";
+ }
+
+ $disabledproject = 1;
+ $disabledtask = 1;
+ //print "x".$lines[$i]->fk_project;
+ //var_dump($lines[$i]);
+ //var_dump($projectsrole[$lines[$i]->fk_project]);
+ // If at least one role for project
+ if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer) {
+ $disabledproject = 0;
+ $disabledtask = 0;
+ }
+ // If $restricteditformytask is on and I have no role on task, i disable edit
+ if ($restricteditformytask && empty($tasksrole[$lines[$i]->id])) {
+ $disabledtask = 1;
+ }
+
+ //var_dump($projectstatic->weekWorkLoadPerTask);
+
+ // Fields to show current time
+ $tableCell = '';
+ $modeinput = 'hours';
+ for ($idw = 0; $idw < 7; $idw++) {
+ $tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
+
+ $cssonholiday = '';
+ if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon']) {
+ $cssonholiday .= 'onholidayallday ';
+ } elseif (!$isavailable[$tmpday]['morning']) {
+ $cssonholiday .= 'onholidaymorning ';
+ } elseif (!$isavailable[$tmpday]['afternoon']) {
+ $cssonholiday .= 'onholidayafternoon ';
+ }
+
+ $tmparray = dol_getdate($tmpday);
+ $dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
+ $totalforeachday[$tmpday] += $dayWorkLoad;
+
+ $alreadyspent = '';
+ if ($dayWorkLoad > 0) {
+ $alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');
+ }
+ $alttitle = $langs->trans("AddHereTimeSpentForDay", $tmparray['day'], $tmparray['mon']);
+
+ global $numstartworkingday, $numendworkingday;
+ $cssweekend = '';
+ if (($idw + 1 < $numstartworkingday) || ($idw + 1 > $numendworkingday)) { // This is a day is not inside the setup of working days, so we use a week-end css.
+ $cssweekend = 'weekend';
+ }
+
+ $disabledtaskday = $disabledtask;
+
+ if (! $disabledtask && $restrictBefore && $tmpday < $restrictBefore) {
+ $disabledtaskday = 1;
+ }
+
+ $tableCell = '';
+ //$tableCell .= 'idw='.$idw.' '.$conf->global->MAIN_START_WEEK.' '.$numstartworkingday.'-'.$numendworkingday;
+ $placeholder = '';
+ if ($alreadyspent) {
+ $tableCell .= ' ';
+ print $tableCell;
+ }
+
+ // Warning
+ print '';
+ if ((!$lines[$i]->public) && $disabledproject) {
+ print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
+ } elseif ($disabledtask) {
+ $titleassigntask = $langs->trans("AssignTaskToMe");
+ if ($fuser->id != $user->id) {
+ $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+ }
+
+ print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+ }
+ print ' ';
+
+ print " \n";
+ }
+
+ // Call to show task with a lower level (task under the current task)
+ $inc++;
+ $level++;
+ if ($lines[$i]->id > 0) {
+ //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
+ //var_dump($totalforeachday);
+ $ret = projectLinesPerWeekDoliProject($inc, $firstdaytoshow, $fuser, $lines[$i]->id, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak, $arrayfields, $extrafields);
+ //var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
+ //var_dump($ret);
+ foreach ($ret as $key => $val) {
+ $totalforeachday[$key] += $val;
+ }
+ //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
+ //var_dump($totalforeachday);
+ }
+ $level--;
+ } else {
+ //$level--;
+ }
+ }
+
+ return $totalforeachday;
+}
diff --git a/sql/data.sql b/sql/data.sql
new file mode 100644
index 0000000..88107e1
--- /dev/null
+++ b/sql/data.sql
@@ -0,0 +1,2 @@
+INSERT INTO `llx_c_actioncomm` (`id`, `code`, `type`, `libelle`, `module`, `active`, `todo`, `color`, `picto`, `position`) VALUES (70, 'AC_TEL_IN', 'system', 'Incoming phone call', NULL, 1, NULL, NULL, NULL, 10);
+INSERT INTO `llx_c_actioncomm` (`id`, `code`, `type`, `libelle`, `module`, `active`, `todo`, `color`, `picto`, `position`) VALUES (71, 'AC_TEL_OUT', 'system', 'Outgoing phone call', NULL, 1, NULL, NULL, NULL, 11);
diff --git a/sql/llx_categorie_invoice.key.sql b/sql/llx_categorie_invoice.key.sql
new file mode 100644
index 0000000..cd00af7
--- /dev/null
+++ b/sql/llx_categorie_invoice.key.sql
@@ -0,0 +1,19 @@
+-- Copyright (C) 2022 EOXIA
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see https://www.gnu.org/licenses/.
+
+ALTER TABLE llx_categorie_invoice ADD PRIMARY KEY pk_categorie_invoice (fk_categorie, fk_invoice);
+ALTER TABLE llx_categorie_invoice ADD INDEX idx_categorie_invoice_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_invoice ADD INDEX idx_categorie_invoice_fk_invoice (fk_invoice);
+ALTER TABLE llx_categorie_invoice ADD CONSTRAINT fk_categorie_invoice_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
diff --git a/sql/llx_categorie_invoice.sql b/sql/llx_categorie_invoice.sql
new file mode 100644
index 0000000..41ba2e4
--- /dev/null
+++ b/sql/llx_categorie_invoice.sql
@@ -0,0 +1,20 @@
+-- Copyright (C) 2022 EOXIA
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see https://www.gnu.org/licenses/.
+
+CREATE TABLE llx_categorie_invoice(
+ fk_categorie integer NOT NULL,
+ fk_invoice integer NOT NULL,
+ import_key varchar(14)
+) ENGINE=innodb;
diff --git a/sql/llx_categorie_invoicerec.key.sql b/sql/llx_categorie_invoicerec.key.sql
new file mode 100644
index 0000000..a9c55e1
--- /dev/null
+++ b/sql/llx_categorie_invoicerec.key.sql
@@ -0,0 +1,19 @@
+-- Copyright (C) 2022 EOXIA
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see https://www.gnu.org/licenses/.
+
+ALTER TABLE llx_categorie_invoicerec ADD PRIMARY KEY pk_categorie_invoicerec (fk_categorie, fk_invoicerec);
+ALTER TABLE llx_categorie_invoicerec ADD INDEX idx_categorie_invoicerec_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_invoicerec ADD INDEX idx_categorie_invoicerec_fk_invoicerec (fk_invoicerec);
+ALTER TABLE llx_categorie_invoicerec ADD CONSTRAINT fk_categorie_invoicerec_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
diff --git a/sql/llx_categorie_invoicerec.sql b/sql/llx_categorie_invoicerec.sql
new file mode 100644
index 0000000..8247d50
--- /dev/null
+++ b/sql/llx_categorie_invoicerec.sql
@@ -0,0 +1,20 @@
+-- Copyright (C) 2022 EOXIA
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see https://www.gnu.org/licenses/.
+
+CREATE TABLE llx_categorie_invoicerec(
+ fk_categorie integer NOT NULL,
+ fk_invoicerec integer NOT NULL,
+ import_key varchar(14)
+) ENGINE=innodb;
diff --git a/view/recurringinvoicestatistics.php b/view/recurringinvoicestatistics.php
new file mode 100644
index 0000000..3244d13
--- /dev/null
+++ b/view/recurringinvoicestatistics.php
@@ -0,0 +1,446 @@
+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see ';
+
+// Show filter box
+print '
';
+print '
';
+
+print '
';
+print '
';
+print '';
+print ''.$langs->trans("Year").' ';
+print ''.$langs->trans("NumberOfRecurringBills").' ';
+print '% ';
+print ''.$langs->trans("AmountTotal").' ';
+print '% ';
+print ''.$langs->trans("AmountAverage").' ';
+print '% ';
+print ' ';
+
+$oldyear = 0;
+foreach ($data as $val) {
+ $year = $val['year'];
+ while ($year && $oldyear > $year + 1) { // If we have empty year
+ $oldyear--;
+
+ print '';
+ print ' 0 ? '&userid='.$userid : '').'">'.$oldyear.' 0 ';
+ print '0 ';
+ print '0 ';
+ print ' ';
+ }
+
+ print '';
+ print ' 0 ? '&userid='.$userid : '').'">'.$year.' '.$val['nb'].' ';
+ print ''.(!empty($val['nb_diff']) && $val['nb_diff'] < 0 ? '' : '+').round(!empty($val['nb_diff']) ? $val['nb_diff'] : 0).'% ';
+ print ''.price(price2num($val['total'], 'MT'), 1).' '.( !empty($val['total_diff']) && $val['total_diff'] < 0 ? '' : '+').round(!empty($val['total_diff']) ? $val['total_diff'] : 0).'% ';
+ print ''.price(price2num($val['avg'], 'MT'), 1).' '.(!empty($val['avg_diff']) && $val['avg_diff'] < 0 ? '' : '+').round(!empty($val['avg_diff']) ? $val['avg_diff'] : 0).'% ';
+ print ' ';
+ $oldyear = $year;
+}
+
+print '
';
+print '
';
+
+print '
';
+
+// Show graphs
+print '
';
+if ($mesg) {
+ print $mesg;
+} else {
+ print $px1->show();
+ print "
';
+
+print '
';
+
+print dol_get_fiche_end();
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/view/timespent.php b/view/timespent_day.php
similarity index 81%
rename from view/timespent.php
rename to view/timespent_day.php
index 3f10466..ac997bb 100644
--- a/view/timespent.php
+++ b/view/timespent_day.php
@@ -42,12 +42,18 @@
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
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/admin.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';
require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+require_once DOL_DOCUMENT_ROOT.'/custom/doliproject/lib/doliproject_functions.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/custom/doliproject/class/workinghours.class.php';
+
+global $conf, $user, $langs, $db;
+
// Load translation files required by the page
$langs->loadLangs(array('projects', 'users', 'companies'));
@@ -125,6 +131,9 @@
$object = new Task($db);
$project = new Project($db);
+$workinghours = new WorkingHours($db);
+
+$current_workinghours = $workinghours->fetchCurrentWorkingHours($user->id, 'user');
// Extra fields
$extrafields = new ExtraFields($db);
@@ -265,7 +274,6 @@
if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilteraction') != 'listafterchangingselectedfields') {
$timespent_duration = array();
-
if (is_array($_POST)) {
foreach ($_POST as $key => $time) {
if (intval($time) > 0) {
@@ -290,6 +298,17 @@
}
if (count($timespent_duration) > 0) {
+ $timespent_minutes = 0;
+ foreach($timespent_duration as $key => $val) {
+ $timespent_minutes += $val / 60;
+ }
+ if (!$conf->global->DOLIPROJECT_SPEND_MORE_TIME_THAN_PLANNED) {
+ if ($timespent_minutes > GETPOST('nonconsumedtime')) {
+ setEventMessages($langs->trans("TooMuchTimeSpent"), null, 'errors');
+ header('Location: '.$_SERVER["PHP_SELF"].'?'.($projectid ? 'id='.$projectid : '').($search_usertoprocessid ? '&search_usertoprocessid='.urlencode($search_usertoprocessid) : '').($mode ? '&mode='.$mode : '').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday);
+ exit;
+ }
+ }
foreach ($timespent_duration as $key => $val) {
$object->fetch($key);
$taskid = $object->id;
@@ -336,8 +355,16 @@
} else {
setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
}
+
}
+if ($action == 'showOnlyFavoriteTasks') {
+ if ($conf->global->DOLIPROJECT_SHOW_ONLY_FAVORITE_TASKS == 1) {
+ dolibarr_set_const($db, 'DOLIPROJECT_SHOW_ONLY_FAVORITE_TASKS', 0, 'integer', 0, '', $conf->entity);
+ } else {
+ dolibarr_set_const($db, 'DOLIPROJECT_SHOW_ONLY_FAVORITE_TASKS', 1, 'integer', 0, '', $conf->entity);
+ }
+}
/*
@@ -373,6 +400,57 @@
$project->fetch_thirdparty();
}
+if (GETPOST('year')) {
+ $year_post = GETPOST('year');
+} else if (GETPOST('reyear')) {
+ $year_post = GETPOST('reyear');
+} else if (GETPOST('addtimeyear')) {
+ $year_post = GETPOST('addtimeyear');
+}
+if (GETPOST('month')) {
+ $month_post = GETPOST('month');
+} else if (GETPOST('remonth')) {
+ $month_post = GETPOST('remonth');
+} else if (GETPOST('addtimemonth')) {
+ $month_post = GETPOST('addtimemonth');
+}
+if (GETPOST('day')) {
+ $day_post = GETPOST('day');
+} else if (GETPOST('reday')) {
+ $day_post = GETPOST('reday');
+} else if (GETPOST('addtimeday')) {
+ $day_post = GETPOST('addtimeday');
+}
+
+$wanted_date = $year_post ? $year_post . '-' . ($month_post > 9 ? $month_post : 0 . $month_post) . '-' . ($day_post > 9 ? $day_post : 0 . $day_post) : date("Y-m-d", dol_now());
+$today_workinghours = 'workinghours_' . strtolower(date("l", dol_strlen($wanted_date) > 0 ? strtotime($wanted_date) : dol_now()));
+
+$worked_hours = floor($current_workinghours->$today_workinghours / 60);
+$worked_minutes = ($current_workinghours->$today_workinghours % 60);
+$worked_minutes = $worked_minutes < 10 ? 0 . $worked_minutes : $worked_minutes;
+
+$today_consumed_time = $taskstatic->fetchAllTimeSpent($user, ' AND ptt.task_date = "' . $wanted_date . '"');
+$already_consumed_time = 0;
+if (is_array($today_consumed_time) && !empty($today_consumed_time)) {
+ foreach ($today_consumed_time as $consumed_time) {
+ $already_consumed_time += $consumed_time->timespent_duration;
+ }
+}
+
+$non_consumed_time = $current_workinghours->$today_workinghours - floor($already_consumed_time / 60);
+$non_consumed_hours = floor($non_consumed_time / 60);
+$non_consumed_minutes = ($non_consumed_time % 60);
+$non_consumed_minutes = $non_consumed_minutes < 10 ? 0 . $non_consumed_minutes : $non_consumed_minutes;
+$non_consumed_hours = $non_consumed_hours > 0 ? $non_consumed_hours : '00';
+$non_consumed_minutes = $non_consumed_minutes > 0 ? $non_consumed_minutes : '00';
+
+$already_consumed_time = $already_consumed_time / 60;
+$consumed_hours = floor($already_consumed_time / 60);
+$consumed_minutes = $already_consumed_time % 60;
+$consumed_minutes = $consumed_minutes < 10 ? 0 . $consumed_minutes : $consumed_minutes;
+$consumed_hours = $consumed_hours > 0 ? $consumed_hours : '00';
+$consumed_minutes = $consumed_minutes > 0 ? $consumed_minutes : '00';
+
$onlyopenedproject = 1; // or -1
$morewherefilter = '';
@@ -406,10 +484,11 @@
$extrafieldsobjectkey = 'projet_task';
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
-$tasksarray = $taskstatic->getTasksArray(0, 0, ($project->id ? $project->id : 0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
+$tasksarray = getFavoriteTasksArray($taskstatic->id, 0, 0, ($project->id ? $project->id : 0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid ? $search_usertoprocessid : 0), 0, $extrafields); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
if ($morewherefilter) { // Get all task without any filter, so we can show total of time spent for not visible tasks
- $tasksarraywithoutfilter = $taskstatic->getTasksArray(0, 0, ($project->id ? $project->id : 0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid ? $search_usertoprocessid : 0)); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
+ $tasksarraywithoutfilter = getFavoriteTasksArray($taskstatic->id, 0, 0, ($project->id ? $project->id : 0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid ? $search_usertoprocessid : 0)); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later.
}
+
$projectsrole = $taskstatic->getUserRolesForProjectsOrTasks($usertoprocess, 0, ($project->id ? $project->id : 0), 0, $onlyopenedproject);
$tasksrole = $taskstatic->getUserRolesForProjectsOrTasks(0, $usertoprocess, ($project->id ? $project->id : 0), 0, $onlyopenedproject);
//var_dump($usertoprocess);
@@ -454,12 +533,13 @@
print ''.$nav.'
'; // We move this before the assign to components so, the default submit button is not the assign to.
-
-print '';
-$titleassigntask = $langs->transnoentities("AssignTaskToMe");
-if ($usertoprocess->id != $user->id) {
- $titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
-}
-print '
';
-print img_picto('', 'projecttask', 'class="pictofixedwidth"');
-$formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1, 0, 0, '', '', 'all', $usertoprocess);
-print '
';
-print ' ';
-print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', 0, 'maxwidth150onsmartphone');
-print '
';
-print '
';
+//$titleassigntask = $langs->transnoentities("AssignTaskToMe");
+//if ($usertoprocess->id != $user->id) {
+// $titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
+//}
+//print '
';
+//print img_picto('', 'projecttask', 'class="pictofixedwidth"');
+//$formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1, 0, 0, '', '', 'all', $usertoprocess);
+//print '
';
+//print ' ';
+//print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', 0, 'maxwidth150onsmartphone');
+//print '
';
+//print '
';
-
+print $langs->trans('ShowOnlyFavoriteTasks');
+print '';
- print $moreforfilter;
- $parameters = array();
- $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
- print '
';
-}
+//if (!empty($moreforfilter)) {
+// print '';
+// print $moreforfilter;
+// $parameters = array();
+// $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+// print $hookmanager->resPrint;
+// print '
';
+//}
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
// This must be after the $selectedfields
-$addcolspan = 0;
-if (!empty($arrayfields['t.planned_workload']['checked'])) {
+$addcolspan = 1;
+if (!empty($arrayfields['timeconsumed']['checked'])) {
$addcolspan++;
-}
-if (!empty($arrayfields['t.progress']['checked'])) {
$addcolspan++;
}
foreach ($arrayfields as $key => $val) {
@@ -580,19 +659,15 @@
$extrafieldsobjectkey = 'projet_task';
$extrafieldsobjectprefix = 'efpt.';
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
-if (!empty($arrayfields['t.planned_workload']['checked'])) {
- print '';
$searchpicto = $form->showFilterAndCheckAddButtons(0);
@@ -612,12 +687,12 @@
$extrafieldsobjectkey = 'projet_task';
$extrafieldsobjectprefix = 'efpt.';
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-if (!empty($arrayfields['t.planned_workload']['checked'])) {
- print ' '.$langs->trans("PlannedWorkload").' ';
-}
-if (!empty($arrayfields['t.progress']['checked'])) {
- print 'trans("ProgressDeclared")).'">'.$langs->trans("ProgressDeclared").' ';
-}
+//if (!empty($arrayfields['t.planned_workload']['checked'])) {
+// print ''.$langs->trans("PlannedWorkload").' ';
+//}
+//if (!empty($arrayfields['t.progress']['checked'])) {
+// print 'trans("ProgressDeclared")).'">'.$langs->trans("ProgressDeclared").' ';
+//}
if (!empty($arrayfields['timeconsumed']['checked'])) {
print ''.$langs->trans("TimeSpent").'';
@@ -678,7 +753,13 @@
$cssonholiday .= 'onholidayafternoon ';
}
-print ' '.$langs->trans("Duration").' ';
+print ''.$langs->trans("Duration");
+print ' ';
print ''.$langs->trans("Note").' ';
//print '';
- print '';
+ print ' ';
print $langs->trans("Total");
print ' ';
if (!empty($arrayfields['timeconsumed']['checked'])) {
@@ -702,8 +783,8 @@
print '
';
}
@@ -715,7 +796,7 @@
$j = 0;
$level = 0;
- $totalforvisibletasks = projectLinesPerDay($j, 0, $usertoprocess, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restrictviewformytask, $daytoparse, $isavailable, 0, $arrayfields, $extrafields);
+ $totalforvisibletasks = doliprojectLinesPerDay($j, 0, $usertoprocess, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restrictviewformytask, $daytoparse, $isavailable, 0, $arrayfields, $extrafields);
//var_dump($totalforvisibletasks);
// Show total for all other tasks
@@ -751,7 +832,7 @@
// There is a diff between total shown on screen and total spent by user, so we add a line with all other cumulated time of user
if ($isdiff) {
print '';
- print '';
+ print ' ';
print $langs->trans("OtherFilteredTasks");
print ' ';
if (!empty($arrayfields['timeconsumed']['checked'])) {
@@ -777,7 +858,7 @@
if ($conf->use_javascript_ajax) {
print ' ';
- print '';
+ print ' ';
print $langs->trans("Total");
print ' ';
if (!empty($arrayfields['timeconsumed']['checked'])) {
@@ -790,9 +871,8 @@
print '
';
+// print ''.$langs->trans("NoAssignedTasks").'
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see '.img_previous($langs->trans("Previous")).' ';
+$nav .= ''.dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "%B %Y").' ';
+$nav .= ''.img_next($langs->trans("Next")).' ';
+$nav .= $form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1);
+$nav .= '
+ * Copyright (C) 2005-2010 Regis Houssin
+ * Copyright (C) 2010 François Legastelois
+ * Copyright (C) 2018 Frédéric France
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see '.img_previous($langs->trans("Previous"))." \n";
+$nav .= ' '.dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("WeekShort")." ".$week." \n";
+$nav .= ''.img_next($langs->trans("Next"))." \n";
+$nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' ';
+$nav .= ' ' . $langs->trans("Day") . ' ' . $langs->trans("Schedule") . ' '. $langs->trans('WorkingHours(min)') .' ';
-print $form->textwithpicto($langs->trans("Monday"), $langs->trans("WorkingHoursFormatDesc"));
+print $form->textwithpicto($langs->trans("Monday"), '');
print ' ';
print ' ';
+
print '';
-print ' ';
print '';
-print $form->textwithpicto($langs->trans("Tuesday"), $langs->trans("WorkingHoursFormatDesc"));
+print $form->textwithpicto($langs->trans("Tuesday"),'');
print ' ';
print ' ';
print '';
-print ' ';
print '';
-print $form->textwithpicto($langs->trans("Wednesday"), $langs->trans("WorkingHoursFormatDesc"));
+print $form->textwithpicto($langs->trans("Wednesday"),'');
print ' ';
print ' ';
print '';
-print ' ';
print '';
-print $form->textwithpicto($langs->trans("Thursday"), $langs->trans("WorkingHoursFormatDesc"));
+print $form->textwithpicto($langs->trans("Thursday"),'');
print ' ';
print ' ';
print '';
-print ' ';
print '';
-print $form->textwithpicto($langs->trans("Friday"), $langs->trans("WorkingHoursFormatDesc"));
+print $form->textwithpicto($langs->trans("Friday"), '');
print ' ';
print ' ';
print '';
-print ' ';
print '';
-print $form->textwithpicto($langs->trans("Saturday"), $langs->trans("WorkingHoursFormatDesc"));
+print $form->textwithpicto($langs->trans("Saturday"), '');
print ' ';
print ' ';
print '';
-print ' ';
print '';
-print $form->textwithpicto($langs->trans("Sunday"), $langs->trans("WorkingHoursFormatDesc"));
+print $form->textwithpicto($langs->trans("Sunday"),'');
print ' ';
print ' ';
print '';
-print ' ';
print '