From 3f0f7e2ad5532c1eb3c6dca0130122f45e6d99a8 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sat, 10 Aug 2019 15:41:21 +0200
Subject: [PATCH 1/9] Add progress bar for task list and visual status badges

---
 htdocs/core/lib/project.lib.php    | 148 ++++++++++++++++++++++-
 htdocs/langs/en_US/projects.lang   |   1 +
 htdocs/projet/tasks.php            |  10 +-
 htdocs/theme/eldy/global.inc.php   |  12 ++
 htdocs/theme/eldy/progress.inc.php | 185 +++++++++++++++++++++++++++++
 5 files changed, 352 insertions(+), 4 deletions(-)
 create mode 100644 htdocs/theme/eldy/progress.inc.php

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index a1b93cb0280..eb71bf3a049 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -457,6 +457,9 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				$taskstatic->progress = $lines[$i]->progress;
 				$taskstatic->fk_statut = $lines[$i]->status;
 				$taskstatic->datee = $lines[$i]->date_end;
+                $taskstatic->planned_workload= $lines[$i]->planned_workload;
+                $taskstatic->duration_effective= $lines[$i]->duration;
+
 
 				if ($showproject)
 				{
@@ -556,10 +559,15 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				print '<td class="right">';
 				if ($lines[$i]->progress != '')
 				{
-					print $lines[$i]->progress.' %';
+					print getTaskProgressBadge($taskstatic);
 				}
 				print '</td>';
 
+				// resume
+                print '<td class="right">';
+                print getTaskProgressView($taskstatic, false, false);
+                print '</td>';
+
 				if ($showbilltime)
 				{
     				// Time not billed
@@ -1943,3 +1951,141 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 		print '</table></form>';
 	}
 }
+
+/**
+ * @param $task             Task
+ * @param $label            string|bool  true = auto, false = dont display, string = replace output
+ * @param $progressNumber   string|bool  true = auto, false = dont display, string = replace output
+ * @return string
+ */
+function getTaskProgressView($task, $label = true, $progressNumber = true)
+{
+    global $langs, $conf;
+
+    $out = '';
+
+    $plannedworkloadoutputformat='allhourmin';
+    $timespentoutputformat='allhourmin';
+    if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+    if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
+
+
+
+    if ($task->progress != '')
+    {
+
+        // define progress color according to time spend vs workload
+        $progressBarClass = 'progress-bar-info';
+        if ($task->planned_workload){
+            $progressCalculated =  round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
+
+            // this conf is actually hidden, by default we use 1% for "be carefull or warning"
+            $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.01;
+
+            if($progressCalculated > doubleval($task->progress)){
+                $progressBarClass = 'progress-bar-danger';
+            }
+            elseif($progressCalculated * $warningRatio >= doubleval($task->progress)){ // warning if close at 1%
+                $progressBarClass = 'progress-bar-warning';
+            }
+            else{
+                $progressBarClass = 'progress-bar-success';
+            }
+        }
+
+        $out.= '<div class="progress-group">';
+
+        if($label !== false)
+        {
+            $out.= '    <span class="progress-text">';
+            if ($task->hasDelay()) $out.= img_warning($langs->trans("Late")).' ';
+            if($label!==true){
+                $out.= $label; // replace label by param
+            }
+            else{
+                $out.= $task->label;
+            }
+            $out.= '    </span>';
+        }
+
+
+        if($progressNumber !== false)
+        {
+            $out.= '    <span class="progress-number">';
+
+            if($progressNumber!==true){
+                $out.= $progressNumber; // replace label by param
+            }
+            else{
+                $out.= '<b title="'.$langs->trans('TimeSpent').'" >';
+                if ($task->duration_effective) $out.= convertSecondToTime($task->duration_effective, $timespentoutputformat);
+                else $out.= '--:--';
+                $out.= '</b>';
+
+                $out.= '/';
+
+                $out.= '<span title="'.$langs->trans('PlannedWorkload').'" >';
+                if ($task->planned_workload) $out.= convertSecondToTime($task->planned_workload, $plannedworkloadoutputformat);
+                else $out.= '--:--';
+            }
+
+            $out.= '    </span>';
+        }
+
+
+
+        $out.= '</span>';
+        $out.= '    <div class="progress sm">';
+        $out.= '        <div title="'.price($task->progress).'%" class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%"></div>';
+        $out.= '    </div>';
+        $out.= '</div>';
+
+    }
+
+    return $out;
+}
+/**
+ * @param $task      Task
+ * @param $label     string  empty = auto (progress), string = replace output
+ * @param $tooltip   string  empty = auto , string = replace output
+ * @return string
+ */
+function getTaskProgressBadge($task, $label = '', $tooltip = '')
+{
+    global $conf;
+
+    $out = '';
+
+    $badgeColorClass = '';
+    if ($task->progress != '')
+    {
+        // define color according to time spend vs workload
+        $badgeColorClass = 'badge ';
+        if ($task->planned_workload){
+            $progressCalculated =  round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
+
+            // this conf is actually hidden, by default we use 1% for "be carefull or warning"
+            $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.01;
+
+            if($progressCalculated > doubleval($task->progress)){
+                $badgeColorClass.= 'badge-danger';
+            }
+            elseif($progressCalculated * $warningRatio >= doubleval($task->progress)){ // warning if close at 1%
+                $badgeColorClass.= 'badge-warning';
+            }
+            else{
+                $badgeColorClass.= 'badge-success';
+            }
+        }
+    }
+
+    if(empty($label)){
+        $label = $task->progress.' %';
+    }
+
+    if(!empty($label)){
+        $out = '<span class="'.$badgeColorClass.'" >'.$label.'</span>';
+    }
+
+    return $out;
+}
\ No newline at end of file
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index ca9a1e2452f..0a33da9a5f0 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -76,6 +76,7 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
 ProgressCalculated=Calculated progress
 Time=Time
 ListOfTasks=List of tasks
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index b8ac9fb7e02..b1b802ee25c 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -746,9 +746,12 @@ elseif ($id > 0 || ! empty($ref))
 	print '<input class="flat" type="text" size="4" name="search_progresscalc" value="'.$search_progresscalc.'">';
 	print '</td>';
 
-	print '<td class="liste_titre right">';
-	print '<input class="flat" type="text" size="4" name="search_progressdeclare" value="'.$search_progressdeclare.'">';
-	print '</td>';
+    print '<td class="liste_titre right">';
+    print '<input class="flat" type="text" size="4" name="search_progressdeclare" value="'.$search_progressdeclare.'">';
+    print '</td>';
+
+    // progress resume not searchable
+    print '<td class="liste_titre right"></td>';
 
 	if ($object->bill_time)
 	{
@@ -778,6 +781,7 @@ elseif ($id > 0 || ! empty($ref))
 	print_liste_field_titre("TimeSpent", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("ProgressCalculated", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("ProgressDeclared", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("TaskProgressSummary", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
 	if ($object->bill_time)
 	{
 	   print_liste_field_titre("TimeToBill", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index d0a0c5958ef..77ea51237d0 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -405,6 +405,16 @@ textarea.centpercent {
 .small, small {
     font-size: 85%;
 }
+
+.h1 .small, .h1 small, .h2 .small, .h2 small, .h3 .small, .h3 small, h1 .small, h1 small, h2 .small, h2 small, h3 .small, h3 small {
+    font-size: 65%;
+}
+.h1 .small, .h1 small, .h2 .small, .h2 small, .h3 .small, .h3 small, .h4 .small, .h4 small, .h5 .small, .h5 small, .h6 .small, .h6 small, h1 .small, h1 small, h2 .small, h2 small, h3 .small, h3 small, h4 .small, h4 small, h5 .small, h5 small, h6 .small, h6 small {
+    font-weight: 400;
+    line-height: 1;
+    color: #777;
+}
+
 .center {
     text-align: center;
     margin: 0px auto;
@@ -5750,3 +5760,5 @@ div.tabsElem a.tab {
 
 <?php
 include dol_buildpath($path.'/theme/'.$theme.'/dropdown.inc.php', 0);
+
+include dol_buildpath($path.'/theme/'.$theme.'/progress.inc.php', 0);
diff --git a/htdocs/theme/eldy/progress.inc.php b/htdocs/theme/eldy/progress.inc.php
new file mode 100644
index 00000000000..6cf9eb1be9d
--- /dev/null
+++ b/htdocs/theme/eldy/progress.inc.php
@@ -0,0 +1,185 @@
+<?php
+if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
+/* <style type="text/css" > */
+/*
+ progress style is based on boostrap and admin lte framework
+ */
+
+
+/*
+ * Component: Progress Bar
+ * -----------------------
+ */
+
+.progress * {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+.progress {
+    height: 20px;
+    overflow: hidden;
+    background-color: #f5f5f5;
+    background-color: rgba(0,0,0,0.1);
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
+    box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
+}
+
+.progress.spaced{
+    margin-bottom: 20px;
+}
+
+.progress-bar {
+    float: left;
+    width: 0;
+    height: 100%;
+    font-size: 12px;
+    line-height: 20px;
+    color: #fff;
+    text-align: center;
+    background-color: #337ab7;
+    -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+    box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+    -webkit-transition: width .6s ease;
+    -o-transition: width .6s ease;
+    transition: width .6s ease;
+}
+
+
+
+.progress-group > .progress{
+    clear: both;
+}
+
+.progress,
+.progress > .progress-bar {
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
+.progress,
+.progress > .progress-bar,
+.progress .progress-bar,
+.progress > .progress-bar .progress-bar {
+    border-radius: 1px;
+}
+/* size variation */
+.progress.sm,
+.progress-sm {
+    height: 10px;
+}
+.progress.sm,
+.progress-sm,
+.progress.sm .progress-bar,
+.progress-sm .progress-bar {
+    border-radius: 1px;
+}
+.progress.xs,
+.progress-xs {
+    height: 7px;
+}
+.progress.xs,
+.progress-xs,
+.progress.xs .progress-bar,
+.progress-xs .progress-bar {
+    border-radius: 1px;
+}
+.progress.xxs,
+.progress-xxs {
+    height: 3px;
+}
+.progress.xxs,
+.progress-xxs,
+.progress.xxs .progress-bar,
+.progress-xxs .progress-bar {
+    border-radius: 1px;
+}
+
+
+/* Vertical bars */
+.progress.vertical {
+    position: relative;
+    width: 30px;
+    height: 200px;
+    display: inline-block;
+    margin-right: 10px;
+}
+.progress.vertical > .progress-bar {
+    width: 100%;
+    position: absolute;
+    bottom: 0;
+}
+.progress.vertical.sm,
+.progress.vertical.progress-sm {
+    width: 20px;
+}
+.progress.vertical.xs,
+.progress.vertical.progress-xs {
+    width: 10px;
+}
+.progress.vertical.xxs,
+.progress.vertical.progress-xxs {
+    width: 3px;
+}
+.progress-group .progress-text {
+    font-weight: 600;
+}
+.progress-group .progress-number {
+    float: right;
+}
+
+/* Remove margins from progress bars when put in a table */
+.table tr > td .progress {
+    margin: 0;
+}
+.progress-bar-light-blue,
+.progress-bar-primary {
+    background-color: #3c8dbc;
+}
+.progress-striped .progress-bar-light-blue,
+.progress-striped .progress-bar-primary {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-bar-green,
+.progress-bar-success {
+    background-color: #00a65a;
+}
+.progress-striped .progress-bar-green,
+.progress-striped .progress-bar-success {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-bar-aqua,
+.progress-bar-info {
+    background-color: #00c0ef;
+}
+.progress-striped .progress-bar-aqua,
+.progress-striped .progress-bar-info {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-bar-yellow,
+.progress-bar-warning {
+    background-color: #f39c12;
+}
+.progress-striped .progress-bar-yellow,
+.progress-striped .progress-bar-warning {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-bar-red,
+.progress-bar-danger {
+    background-color: #dd4b39;
+}
+.progress-striped .progress-bar-red,
+.progress-striped .progress-bar-danger {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
\ No newline at end of file

From 09c128980257b01f98cdb0e3ed210b7a5428e89c Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sat, 10 Aug 2019 22:48:07 +0200
Subject: [PATCH 2/9] Fix task widget and improve its display

---
 htdocs/core/boxes/box_task.php       |  67 ++++++-----
 htdocs/core/lib/project.lib.php      | 163 +++++++++++++++------------
 htdocs/langs/en_US/projects.lang     |   3 +
 htdocs/theme/eldy/global.inc.php     |  18 +++
 htdocs/theme/eldy/progress.inc.php   |   2 +
 htdocs/theme/eldy/theme_vars.inc.php |  10 +-
 6 files changed, 161 insertions(+), 102 deletions(-)

diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index d07792dc991..b56193988fc 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -42,7 +42,7 @@ class box_task extends ModeleBoxes
     public $db;
 
     public $param;
-    public $enabled = 0;		// Disabled because bugged.
+    public $enabled = 1;		// enable because fixed ;-).
 
     public $info_box_head = array();
     public $info_box_contents = array();
@@ -86,21 +86,31 @@ class box_task extends ModeleBoxes
 		$totaldurationtot=0;
 
 		include_once DOL_DOCUMENT_ROOT."/projet/class/task.class.php";
+		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+        require_once DOL_DOCUMENT_ROOT."/core/lib/project.lib.php";
+        $projectstatic = new Project($this->db);
 		$taskstatic=new Task($db);
 
 
-		$textHead = $langs->trans("Tasks")."&nbsp;".date("Y");
+		$textHead = $langs->trans("CurentlyOpenedTasks");
 		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
 
 		// list the summary of the orders
 		if ($user->rights->projet->lire) {
-			// FIXME fk_statut on a task is not be used. We use the percent. This means this box is useless.
-			$sql = "SELECT pt.fk_statut, count(DISTINCT pt.rowid) as nb, sum(ptt.task_duration) as durationtot, sum(pt.planned_workload) as plannedtot";
-			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt";
-			$sql.= " WHERE pt.datec BETWEEN '".$this->db->idate(dol_get_first_day(date("Y"), 1))."' AND '".$this->db->idate(dol_get_last_day(date("Y"), 12))."'";
-			$sql.= " AND pt.rowid = ptt.fk_task";
-			$sql.= " GROUP BY pt.fk_statut ";
-			$sql.= " ORDER BY pt.fk_statut DESC";
+
+			$sql = "SELECT pt.rowid, pt.ref, pt.fk_projet, pt.fk_task_parent, pt.datec, pt.dateo, pt.datee, pt.datev, pt.label, pt.description, pt.duration_effective, pt.planned_workload, pt.progress";
+			$sql.= ", p.rowid project_id, p.ref project_ref, p.title project_title";
+
+
+			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
+			$sql.= " JOIN ".MAIN_DB_PREFIX."projet as p ON (pt.fk_projet = p.rowid)";
+
+			$sql.= " WHERE ";
+			$sql.= " pt.entity = ".$conf->entity;
+			$sql.= " AND p.fk_statut = ".Project::STATUS_VALIDATED;
+			$sql.= " AND (pt.progress < 100 OR pt.progress IS NULL ) "; // 100% is done and not displayed
+
+			$sql.= " ORDER BY pt.datee ASC, pt.dateo ASC";
 			$sql.= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
@@ -109,23 +119,31 @@ class box_task extends ModeleBoxes
 				$num = $db->num_rows($result);
                 while ($i < $num) {
                     $objp = $db->fetch_object($result);
+
+                    $taskstatic->id=$objp->rowid;
+                    $taskstatic->ref=$objp->ref;
+                    $taskstatic->label=$objp->label;
+                    $taskstatic->progress = $objp->progress;
+                    $taskstatic->fk_statut = $objp->fk_statut;
+                    $taskstatic->date_end = $objp->datee;
+                    $taskstatic->planned_workload= $objp->planned_workload;
+                    $taskstatic->duration_effective= $objp->duration_effective;
+
+                    $projectstatic->id = $objp->project_id;
+                    $projectstatic->ref = $objp->project_ref;
+                    $projectstatic->title = $objp->project_title;
+
+                    $label = $projectstatic->getNomUrl(1).' '.$taskstatic->getNomUrl(1).' '.dol_htmlentities($taskstatic->label);
+
+
                     $this->info_box_contents[$i][] = array(
                         'td' => '',
-                        'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut, 0),
+                        'text' =>getTaskProgressView($taskstatic, $label),
                     );
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="right"',
-                        'text' => $objp->nb."&nbsp;".$langs->trans("Tasks"),
-                        'url' => DOL_URL_ROOT."/projet/tasks/list.php?leftmenu=projects&viewstatut=".$objp->fk_statut,
-                    );
-					$totalnb += $objp->nb;
-					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->plannedtot, 'all', 25200, 5));
-					$totalplannedtot += $objp->plannedtot;
-					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot, 'all', 25200, 5));
-					$totaldurationtot += $objp->durationtot;
 
-					$this->info_box_contents[$i][] = array('td' => 'class="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut, 3));
+
+
 
 					$i++;
 				}
@@ -134,12 +152,7 @@ class box_task extends ModeleBoxes
             }
 		}
 
-		// Add the sum at the bottom of the boxes
-		$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => '', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
-		$this->info_box_contents[$i][] = array('td' => 'class="right" ', 'text' => number_format($totalnb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
-		$this->info_box_contents[$i][] = array('td' => 'class="right" ', 'text' => ConvertSecondToTime($totalplannedtot, 'all', 25200, 5));
-		$this->info_box_contents[$i][] = array('td' => 'class="right" ', 'text' => ConvertSecondToTime($totaldurationtot, 'all', 25200, 5));
-		$this->info_box_contents[$i][] = array('td' => '', 'text' => "");
+
 	}
 
 	/**
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index eb71bf3a049..3885797a012 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -1956,9 +1956,10 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
  * @param $task             Task
  * @param $label            string|bool  true = auto, false = dont display, string = replace output
  * @param $progressNumber   string|bool  true = auto, false = dont display, string = replace output
+ * @param $hideOnProgressNull bool
  * @return string
  */
-function getTaskProgressView($task, $label = true, $progressNumber = true)
+function getTaskProgressView($task, $label = true, $progressNumber = true, $hideOnProgressNull = false, $showPercent = false)
 {
     global $langs, $conf;
 
@@ -1969,79 +1970,91 @@ function getTaskProgressView($task, $label = true, $progressNumber = true)
     if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
     if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
 
-
-
-    if ($task->progress != '')
-    {
-
-        // define progress color according to time spend vs workload
-        $progressBarClass = 'progress-bar-info';
-        if ($task->planned_workload){
-            $progressCalculated =  round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
-
-            // this conf is actually hidden, by default we use 1% for "be carefull or warning"
-            $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.01;
-
-            if($progressCalculated > doubleval($task->progress)){
-                $progressBarClass = 'progress-bar-danger';
-            }
-            elseif($progressCalculated * $warningRatio >= doubleval($task->progress)){ // warning if close at 1%
-                $progressBarClass = 'progress-bar-warning';
-            }
-            else{
-                $progressBarClass = 'progress-bar-success';
-            }
-        }
-
-        $out.= '<div class="progress-group">';
-
-        if($label !== false)
-        {
-            $out.= '    <span class="progress-text">';
-            if ($task->hasDelay()) $out.= img_warning($langs->trans("Late")).' ';
-            if($label!==true){
-                $out.= $label; // replace label by param
-            }
-            else{
-                $out.= $task->label;
-            }
-            $out.= '    </span>';
-        }
-
-
-        if($progressNumber !== false)
-        {
-            $out.= '    <span class="progress-number">';
-
-            if($progressNumber!==true){
-                $out.= $progressNumber; // replace label by param
-            }
-            else{
-                $out.= '<b title="'.$langs->trans('TimeSpent').'" >';
-                if ($task->duration_effective) $out.= convertSecondToTime($task->duration_effective, $timespentoutputformat);
-                else $out.= '--:--';
-                $out.= '</b>';
-
-                $out.= '/';
-
-                $out.= '<span title="'.$langs->trans('PlannedWorkload').'" >';
-                if ($task->planned_workload) $out.= convertSecondToTime($task->planned_workload, $plannedworkloadoutputformat);
-                else $out.= '--:--';
-            }
-
-            $out.= '    </span>';
-        }
-
-
-
-        $out.= '</span>';
-        $out.= '    <div class="progress sm">';
-        $out.= '        <div title="'.price($task->progress).'%" class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%"></div>';
-        $out.= '    </div>';
-        $out.= '</div>';
-
+    if(empty($task->progress) && !empty($hideOnProgressNull)){
+        return '';
     }
 
+
+    $diff = '';
+
+    // define progress color according to time spend vs workload
+    $progressBarClass = 'progress-bar-info';
+    if ($task->planned_workload){
+        $progressCalculated =  round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
+
+        // this conf is actually hidden, by default we use 1% for "be carefull or warning"
+        $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.01;
+
+        $diffTitle = '<br/>'.$langs->trans('ProgressDeclared').' : '.price($task->progress).'%';
+        $diffTitle.= '<br/>'.$langs->trans('ProgressCalculated').' : '.price($progressCalculated).'%';
+
+        if($progressCalculated > doubleval($task->progress)){
+            $progressBarClass = 'progress-bar-danger';
+            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', price(abs($task->progress-$progressCalculated)).'%');
+            $diff = '<span class="text-danger classfortooltip"" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.price($task->progress-$progressCalculated).'%</span>';
+        }
+        elseif($progressCalculated * $warningRatio >= doubleval($task->progress)){ // warning if close at 1%
+            $progressBarClass = 'progress-bar-warning';
+            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', price(abs($task->progress-$progressCalculated)).'%');
+            $diff = '<span class="text-warning classfortooltip" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.price($task->progress-$progressCalculated).'%</span>';
+        }
+        else{
+            $progressBarClass = 'progress-bar-success';
+            $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', price($task->progress-$progressCalculated).'%');
+            $diff = '<span class="text-success classfortooltip" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-up"></i> '.price($task->progress-$progressCalculated).'%</span>';
+        }
+    }
+
+    $out.= '<div class="progress-group">';
+
+    if($label !== false)
+    {
+        $out.= '    <span class="progress-text">';
+        if ($task->hasDelay()) $out.= img_warning($langs->trans("Late")).' ';
+        if($label!==true){
+            $out.= $label; // replace label by param
+        }
+        else{
+            $out.= $task->getNomUrl(1).' '.dol_htmlentities($task->label);
+        }
+        $out.= '    </span>';
+    }
+
+
+    if($progressNumber !== false)
+    {
+        $out.= '    <span class="progress-number">';
+        if($progressNumber!==true){
+            $out.= $progressNumber; // replace label by param
+        }
+        else{
+
+            $out.= !empty($diff) ? $diff.' ':'';
+
+            $out.= '<b title="'.$langs->trans('TimeSpent').'" >';
+            if ($task->duration_effective) $out.= convertSecondToTime($task->duration_effective, $timespentoutputformat);
+            else $out.= '--:--';
+            $out.= '</b>';
+
+            $out.= '/';
+
+            $out.= '<span title="'.$langs->trans('PlannedWorkload').'" >';
+            if ($task->planned_workload) $out.= convertSecondToTime($task->planned_workload, $plannedworkloadoutputformat);
+            else $out.= '--:--';
+        }
+        $out.= '    </span>';
+    }
+
+
+
+    $out.= '</span>';
+    $out.= '    <div class="progress sm classfortooltip" title="'.price($task->progress).'%" >';
+    $out.= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%"></div>';
+    $out.= '    </div>';
+    $out.= '</div>';
+
+
+
     return $out;
 }
 /**
@@ -2055,10 +2068,12 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
     global $conf;
 
     $out = '';
-
+    $label = '';
     $badgeColorClass = '';
     if ($task->progress != '')
     {
+        // TODO : manage 100%
+
         // define color according to time spend vs workload
         $badgeColorClass = 'badge ';
         if ($task->planned_workload){
@@ -2080,7 +2095,7 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
     }
 
     if(empty($label)){
-        $label = $task->progress.' %';
+        $label = price($task->progress).' %';
     }
 
     if(!empty($label)){
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 0a33da9a5f0..0795390f8dd 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -77,6 +77,9 @@ MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
 TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
 Time=Time
 ListOfTasks=List of tasks
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 77ea51237d0..194cb6562df 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -493,6 +493,24 @@ textarea.centpercent {
     opacity: 0.7;
 }
 
+.text-warning{
+    color : <?php print $textWarning ; ?>
+}
+body[class*="colorblind-"] .text-warning{
+    color : <?php print $colorblind_deuteranopes_textWarning ; ?>
+}
+.text-success{
+    color : <?php print $textSuccess ; ?>
+}
+body[class*="colorblind-"] .text-success{
+    color : <?php print $colorblind_deuteranopes_textSuccess ; ?>
+}
+
+.text-danger{
+    color : <?php print $textDanger ; ?>
+}
+
+
 /* Themes for badges */
 <?php include dol_buildpath($path.'/theme/'.$theme.'/badges.inc.php', 0); ?>
 
diff --git a/htdocs/theme/eldy/progress.inc.php b/htdocs/theme/eldy/progress.inc.php
index 6cf9eb1be9d..3e330745440 100644
--- a/htdocs/theme/eldy/progress.inc.php
+++ b/htdocs/theme/eldy/progress.inc.php
@@ -129,6 +129,8 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
     float: right;
 }
 
+
+
 /* Remove margins from progress bars when put in a table */
 .table tr > td .progress {
     margin: 0;
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 712730678d3..2d829d0f4a3 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -67,6 +67,14 @@ $topMenuFontSize='1.2em';
 $toolTipBgColor='rgba(255, 255, 255, 0.96);';
 $toolTipFontColor='#333';
 
+// text color
+$textSuccess   ='#28a745';
+$colorblind_deuteranopes_textSuccess   ='#37de5d';
+$textDanger    ='#dc3545';
+$textWarning   ='#f39c12';
+$colorblind_deuteranopes_textWarning = $textWarning; // currently not tested with a color blind people so use default color
+
+
 // Badges colors
 $badgePrimary   ='#007bff';
 $badgeSecondary ='#999999';
@@ -84,7 +92,7 @@ $colorblind_deuteranopes_badgeWarning   ='#e4e411';
 
 /* default color for status : After a quick check, somme status can have oposite function according to objects
 *  So this badges status uses default value according to theme eldy status img
-*  TODO: use color definition vars above for define badges color status X -> expemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
+*  TODO: use color definition vars above for define badges color status X -> exemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
 */
 $badgeStatus0='#cbd3d3';
 $badgeStatus1='#bc9526';

From eedd065f4857531281fefeb173d73139c5acee8f Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sat, 10 Aug 2019 22:59:09 +0200
Subject: [PATCH 3/9] remove useless function usage

---
 htdocs/core/lib/project.lib.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 3885797a012..e9c594e3648 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -1985,23 +1985,23 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
         // this conf is actually hidden, by default we use 1% for "be carefull or warning"
         $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.01;
 
-        $diffTitle = '<br/>'.$langs->trans('ProgressDeclared').' : '.price($task->progress).'%';
-        $diffTitle.= '<br/>'.$langs->trans('ProgressCalculated').' : '.price($progressCalculated).'%';
+        $diffTitle = '<br/>'.$langs->trans('ProgressDeclared').' : '.$task->progress.'%';
+        $diffTitle.= '<br/>'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.'%';
 
         if($progressCalculated > doubleval($task->progress)){
             $progressBarClass = 'progress-bar-danger';
-            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', price(abs($task->progress-$progressCalculated)).'%');
-            $diff = '<span class="text-danger classfortooltip"" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.price($task->progress-$progressCalculated).'%</span>';
+            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).'%');
+            $diff = '<span class="text-danger classfortooltip"" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.($task->progress-$progressCalculated).'%</span>';
         }
         elseif($progressCalculated * $warningRatio >= doubleval($task->progress)){ // warning if close at 1%
             $progressBarClass = 'progress-bar-warning';
-            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', price(abs($task->progress-$progressCalculated)).'%');
-            $diff = '<span class="text-warning classfortooltip" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.price($task->progress-$progressCalculated).'%</span>';
+            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).'%');
+            $diff = '<span class="text-warning classfortooltip" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.($task->progress-$progressCalculated).'%</span>';
         }
         else{
             $progressBarClass = 'progress-bar-success';
-            $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', price($task->progress-$progressCalculated).'%');
-            $diff = '<span class="text-success classfortooltip" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-up"></i> '.price($task->progress-$progressCalculated).'%</span>';
+            $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress-$progressCalculated).'%');
+            $diff = '<span class="text-success classfortooltip" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-up"></i> '.($task->progress-$progressCalculated).'%</span>';
         }
     }
 
@@ -2048,7 +2048,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
 
     $out.= '</span>';
-    $out.= '    <div class="progress sm classfortooltip" title="'.price($task->progress).'%" >';
+    $out.= '    <div class="progress sm classfortooltip" title="'.doubleval($task->progress).'%" >';
     $out.= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%"></div>';
     $out.= '    </div>';
     $out.= '</div>';
@@ -2095,7 +2095,7 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
     }
 
     if(empty($label)){
-        $label = price($task->progress).' %';
+        $label = $task->progress.' %';
     }
 
     if(!empty($label)){

From 89447acaf307fc2bb7de55e75204a9fdfbd3f4e9 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sat, 10 Aug 2019 23:07:12 +0200
Subject: [PATCH 4/9] remove tooltip on progress bar

---
 htdocs/core/lib/project.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index e9c594e3648..550cad0a853 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2048,7 +2048,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
 
     $out.= '</span>';
-    $out.= '    <div class="progress sm classfortooltip" title="'.doubleval($task->progress).'%" >';
+    $out.= '    <div class="progress sm" title="'.doubleval($task->progress).'%" >';
     $out.= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%"></div>';
     $out.= '    </div>';
     $out.= '</div>';

From 53721ae6069b66a499f511134d87bf3efd381588 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sat, 10 Aug 2019 23:09:27 +0200
Subject: [PATCH 5/9] move late warning sign

---
 htdocs/core/lib/project.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 550cad0a853..7f238d9d736 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2010,7 +2010,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
     if($label !== false)
     {
         $out.= '    <span class="progress-text">';
-        if ($task->hasDelay()) $out.= img_warning($langs->trans("Late")).' ';
+
         if($label!==true){
             $out.= $label; // replace label by param
         }
@@ -2028,6 +2028,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
             $out.= $progressNumber; // replace label by param
         }
         else{
+            if ($task->hasDelay()) $out.= img_warning($langs->trans("Late")).' ';
 
             $out.= !empty($diff) ? $diff.' ':'';
 

From 3a21805a025b7324353f5bf7eff994bbdfd69f2c Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sun, 11 Aug 2019 09:46:40 +0200
Subject: [PATCH 6/9] add style to md

---
 htdocs/theme/md/progress.inc.php   |  7 +++++++
 htdocs/theme/md/style.css.php      | 19 +++++++++++++++++++
 htdocs/theme/md/theme_vars.inc.php |  7 +++++++
 3 files changed, 33 insertions(+)
 create mode 100644 htdocs/theme/md/progress.inc.php

diff --git a/htdocs/theme/md/progress.inc.php b/htdocs/theme/md/progress.inc.php
new file mode 100644
index 00000000000..ae200107c75
--- /dev/null
+++ b/htdocs/theme/md/progress.inc.php
@@ -0,0 +1,7 @@
+<?php
+if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet');
+
+include dol_buildpath($path.'/theme/eldy/progress.inc.php', 0); // actually md use same style as eldy theme
+
+?>
+/* <style type="text/css" > */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8999a73aaea..27f8d0c0598 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -690,6 +690,23 @@ textarea.centpercent {
     opacity: 0.7;
 }
 
+.text-warning{
+    color : <?php print $textWarning ; ?>
+}
+body[class*="colorblind-"] .text-warning{
+    color : <?php print $colorblind_deuteranopes_textWarning ; ?>
+}
+.text-success{
+    color : <?php print $textSuccess ; ?>
+}
+body[class*="colorblind-"] .text-success{
+    color : <?php print $colorblind_deuteranopes_textSuccess ; ?>
+}
+
+.text-danger{
+    color : <?php print $textDanger ; ?>
+}
+
 /* Themes for badges */
 .badge {
 	display: inline-block;
@@ -5860,6 +5877,8 @@ border-top-right-radius: 6px;
 
 include dol_buildpath($path.'/theme/'.$theme.'/dropdown.inc.php', 0);
 
+include dol_buildpath($path.'/theme/'.$theme.'/progress.inc.php', 0);
+
 
 
 if (is_object($db)) $db->close();
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index 95ac3abdd34..31ae1c8bf2d 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -54,3 +54,10 @@ $colortext='0,0,0';
 $colortextlink='0,0,120';
 $fontsize='14';
 $fontsizesmaller='11';
+
+// text color
+$textSuccess   ='#28a745';
+$colorblind_deuteranopes_textSuccess   ='#37de5d';
+$textDanger    ='#dc3545';
+$textWarning   ='#f39c12';
+$colorblind_deuteranopes_textWarning = $textWarning; // currently not tested with a color blind people so use default color

From f10f29f632031d71b87ebd65d3af7180421d2629 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Mon, 12 Aug 2019 01:01:16 +0200
Subject: [PATCH 7/9] Add filters

---
 htdocs/core/boxes/box_task.php   | 64 ++++++++++++++++++++++----------
 htdocs/langs/en_US/projects.lang |  2 +
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index b56193988fc..5d06e618237 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -31,10 +31,10 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
  */
 class box_task extends ModeleBoxes
 {
-    public $boxcode="projet";
+    public $boxcode="projettask";
     public $boximg="object_projecttask";
     public $boxlabel;
-    //public $depends = array("projet");
+    public $depends = array("projet");
 
     /**
      * @var DoliDB Database handler.
@@ -78,26 +78,40 @@ class box_task extends ModeleBoxes
 		global $conf, $user, $langs, $db;
 
 		$this->max=$max;
-
-		$totalMnt = 0;
-		$totalnb = 0;
-		$totalDuree=0;
-		$totalplannedtot=0;
-		$totaldurationtot=0;
-
 		include_once DOL_DOCUMENT_ROOT."/projet/class/task.class.php";
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
         require_once DOL_DOCUMENT_ROOT."/core/lib/project.lib.php";
         $projectstatic = new Project($this->db);
 		$taskstatic=new Task($db);
+        $cookie_name='boxfilter_task';
+
+        $textHead = $langs->trans("CurentlyOpenedTasks");
+
+        $filterValue='all';
+        if(in_array(GETPOST($cookie_name), array('all','im_project_contact','im_task_contact'))){
+            $filterValue = GETPOST($cookie_name);
+            $textHead.= ' : '.$langs->trans("WhichIamLinkedTo");
+        }
+        elseif(!empty($_COOKIE[$cookie_name])){
+            $filterValue = $_COOKIE[$cookie_name];
+            $textHead.= ' : '.$langs->trans("WhichIamLinkedToProject");
+        }
 
 
-		$textHead = $langs->trans("CurentlyOpenedTasks");
-		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
+		$this->info_box_head = array(
+		    'text' => $textHead,
+            'limit'=> dol_strlen($textHead),
+            'sublink'=>'',
+            'subtext'=>$langs->trans("Filter"),
+            'subpicto'=>'filter.png',
+            'subclass'=>'linkobject boxfilter',
+            'target'=>'none'	// Set '' to get target="_blank"
+        );
 
 		// list the summary of the orders
 		if ($user->rights->projet->lire) {
 
+
 			$sql = "SELECT pt.rowid, pt.ref, pt.fk_projet, pt.fk_task_parent, pt.datec, pt.dateo, pt.datee, pt.datev, pt.label, pt.description, pt.duration_effective, pt.planned_workload, pt.progress";
 			$sql.= ", p.rowid project_id, p.ref project_ref, p.title project_title";
 
@@ -105,6 +119,15 @@ class box_task extends ModeleBoxes
 			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
 			$sql.= " JOIN ".MAIN_DB_PREFIX."projet as p ON (pt.fk_projet = p.rowid)";
 
+            if($filterValue === 'im_task_contact') {
+                $sql .= " JOIN " . MAIN_DB_PREFIX . "element_contact as ec ON (ec.element_id = pt.rowid AND ec.fk_socpeople = '" . $user->id . "' )";
+                $sql .= " JOIN " . MAIN_DB_PREFIX . "c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project_task' AND tc.source = 'internal' )";
+            }
+            elseif($filterValue === 'im_project_contact') {
+                $sql .= " JOIN " . MAIN_DB_PREFIX . "element_contact as ec ON (ec.element_id = p.rowid AND ec.fk_socpeople = '" . $user->id . "' )";
+                $sql .= " JOIN " . MAIN_DB_PREFIX . "c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project' AND tc.source = 'internal' )";
+            }
+
 			$sql.= " WHERE ";
 			$sql.= " pt.entity = ".$conf->entity;
 			$sql.= " AND p.fk_statut = ".Project::STATUS_VALIDATED;
@@ -117,8 +140,7 @@ class box_task extends ModeleBoxes
 			$i = 0;
 			if ($result) {
 				$num = $db->num_rows($result);
-                while ($i < $num) {
-                    $objp = $db->fetch_object($result);
+                while ($objp = $db->fetch_object($result)) {
 
                     $taskstatic->id=$objp->rowid;
                     $taskstatic->ref=$objp->ref;
@@ -136,23 +158,25 @@ class box_task extends ModeleBoxes
                     $label = $projectstatic->getNomUrl(1).' '.$taskstatic->getNomUrl(1).' '.dol_htmlentities($taskstatic->label);
 
 
+                    $text = getTaskProgressView($taskstatic, $label);
+
+                    // set cookie by js
+                    if(empty($i)){
+                        $text.='<script >date = new Date(); date.setTime(date.getTime()+(30*86400000)); document.cookie = "'.$cookie_name.'='.$filterValue.'; expires= " + date.toGMTString() + "; path=/ "; </script>';
+                    }
+
+
                     $this->info_box_contents[$i][] = array(
                         'td' => '',
-                        'text' =>getTaskProgressView($taskstatic, $label),
+                        'text' => $text,
                     );
 
-
-
-
-
 					$i++;
 				}
 			} else {
                 dol_print_error($this->db);
             }
 		}
-
-
 	}
 
 	/**
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 0795390f8dd..4b4a787b6ad 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -81,6 +81,8 @@ CurentlyOpenedTasks=Curently opened tasks
 TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
 TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed

From 1ffb013371beb35ebb1d12c78bd76d11ca0c1be8 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Mon, 12 Aug 2019 15:24:07 +0200
Subject: [PATCH 8/9] add filter

---
 htdocs/core/boxes/box_task.php  | 54 +++++++++++++++++++++++----------
 htdocs/core/lib/project.lib.php |  7 +++--
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 5d06e618237..3a0b2c67af9 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -83,17 +83,25 @@ class box_task extends ModeleBoxes
         require_once DOL_DOCUMENT_ROOT."/core/lib/project.lib.php";
         $projectstatic = new Project($this->db);
 		$taskstatic=new Task($db);
+		$form= new Form($db);
         $cookie_name='boxfilter_task';
+        $boxcontent='';
 
         $textHead = $langs->trans("CurentlyOpenedTasks");
 
         $filterValue='all';
         if(in_array(GETPOST($cookie_name), array('all','im_project_contact','im_task_contact'))){
             $filterValue = GETPOST($cookie_name);
-            $textHead.= ' : '.$langs->trans("WhichIamLinkedTo");
         }
         elseif(!empty($_COOKIE[$cookie_name])){
             $filterValue = $_COOKIE[$cookie_name];
+        }
+
+
+        if($filterValue == 'im_task_contact'){
+            $textHead.= ' : '.$langs->trans("WhichIamLinkedTo");
+        }
+        elseif($filterValue == 'im_project_contact'){
             $textHead.= ' : '.$langs->trans("WhichIamLinkedToProject");
         }
 
@@ -110,12 +118,28 @@ class box_task extends ModeleBoxes
 
 		// list the summary of the orders
 		if ($user->rights->projet->lire) {
+            $boxcontent.= '<div id="ancor-idfilter'.$this->boxcode.'" style="display: block; position: absolute; margin-top: -100px"></div>'."\n";
+            $boxcontent.= '<div id="idfilter'.$this->boxcode.'" class="hideobject center" >'."\n";
+            $boxcontent.= '<form class="flat " method="POST" action="'.$_SERVER["PHP_SELF"].'#ancor-idfilter'.$this->boxcode.'">'."\n";
+            $boxcontent.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+            $selectArray = array('all' => $langs->trans("NoFilter"), 'im_task_contact' => $langs->trans("WhichIamLinkedTo"), 'im_project_contact' => $langs->trans("WhichIamLinkedToProject"));
+            $boxcontent.= $form->selectArray($cookie_name, $selectArray, $filterValue);
+            $boxcontent.= '<button type="submit" >'.$langs->trans("Change").'</button>';
+            $boxcontent.= '</form>'."\n";
+            $boxcontent.= '</div>'."\n";
+            $boxcontent.= '<script type="text/javascript" language="javascript">
+					jQuery(document).ready(function() {
+						jQuery("#idsubimg'.$this->boxcode.'").click(function() {
+							jQuery("#idfilter'.$this->boxcode.'").toggle();
+						});
+					});
+					</script>';
 
 
-			$sql = "SELECT pt.rowid, pt.ref, pt.fk_projet, pt.fk_task_parent, pt.datec, pt.dateo, pt.datee, pt.datev, pt.label, pt.description, pt.duration_effective, pt.planned_workload, pt.progress";
+
+            $sql = "SELECT pt.rowid, pt.ref, pt.fk_projet, pt.fk_task_parent, pt.datec, pt.dateo, pt.datee, pt.datev, pt.label, pt.description, pt.duration_effective, pt.planned_workload, pt.progress";
 			$sql.= ", p.rowid project_id, p.ref project_ref, p.title project_title";
 
-
 			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
 			$sql.= " JOIN ".MAIN_DB_PREFIX."projet as p ON (pt.fk_projet = p.rowid)";
 
@@ -157,19 +181,7 @@ class box_task extends ModeleBoxes
 
                     $label = $projectstatic->getNomUrl(1).' '.$taskstatic->getNomUrl(1).' '.dol_htmlentities($taskstatic->label);
 
-
-                    $text = getTaskProgressView($taskstatic, $label);
-
-                    // set cookie by js
-                    if(empty($i)){
-                        $text.='<script >date = new Date(); date.setTime(date.getTime()+(30*86400000)); document.cookie = "'.$cookie_name.'='.$filterValue.'; expires= " + date.toGMTString() + "; path=/ "; </script>';
-                    }
-
-
-                    $this->info_box_contents[$i][] = array(
-                        'td' => '',
-                        'text' => $text,
-                    );
+                    $boxcontent.= getTaskProgressView($taskstatic, $label, true, false, true);
 
 					$i++;
 				}
@@ -177,6 +189,16 @@ class box_task extends ModeleBoxes
                 dol_print_error($this->db);
             }
 		}
+
+        // set cookie by js
+        if(empty($i)){
+            $boxcontent.='<script >date = new Date(); date.setTime(date.getTime()+(30*86400000)); document.cookie = "'.$cookie_name.'='.$filterValue.'; expires= " + date.toGMTString() + "; path=/ "; </script>';
+        }
+
+        $this->info_box_contents[0][] = array(
+            'td' => '',
+            'text' => $boxcontent,
+        );
 	}
 
 	/**
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 7f238d9d736..04a3a13cc91 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -1957,9 +1957,11 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
  * @param $label            string|bool  true = auto, false = dont display, string = replace output
  * @param $progressNumber   string|bool  true = auto, false = dont display, string = replace output
  * @param $hideOnProgressNull bool
+ * @param $showPercent bool
+ * @param $spaced bool
  * @return string
  */
-function getTaskProgressView($task, $label = true, $progressNumber = true, $hideOnProgressNull = false, $showPercent = false)
+function getTaskProgressView($task, $label = true, $progressNumber = true, $hideOnProgressNull = false, $spaced = false)
 {
     global $langs, $conf;
 
@@ -1974,6 +1976,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
         return '';
     }
 
+    $spaced = !empty($spaced)?'spaced':'';
 
     $diff = '';
 
@@ -2049,7 +2052,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
 
     $out.= '</span>';
-    $out.= '    <div class="progress sm" title="'.doubleval($task->progress).'%" >';
+    $out.= '    <div class="progress sm '.$spaced.'" title="'.doubleval($task->progress).'%" >';
     $out.= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%"></div>';
     $out.= '    </div>';
     $out.= '</div>';

From b193f1b34ea39463f7e5377600666c9b256e0833 Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Mon, 12 Aug 2019 23:33:00 +0200
Subject: [PATCH 9/9] Fix travis

---
 htdocs/core/lib/project.lib.php    | 38 +++++++++++++++++-------------
 htdocs/theme/md/theme_vars.inc.php |  1 -
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 04a3a13cc91..91b2e27eeeb 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -1953,12 +1953,11 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 }
 
 /**
- * @param $task             Task
- * @param $label            string|bool  true = auto, false = dont display, string = replace output
- * @param $progressNumber   string|bool  true = auto, false = dont display, string = replace output
- * @param $hideOnProgressNull bool
- * @param $showPercent bool
- * @param $spaced bool
+ * @param   task                $task               Task            the task object
+ * @param   label               $label              bool|string     true = auto, false = dont display, string = replace output
+ * @param   progressNumber      $progressNumber     bool|string     true = auto, false = dont display, string = replace output
+ * @param   hideOnProgressNull  $hideOnProgressNull bool            hide if progress is null
+ * @param   spaced              $spaced             bool            used to add space at bottom (made by css)
  * @return string
  */
 function getTaskProgressView($task, $label = true, $progressNumber = true, $hideOnProgressNull = false, $spaced = false)
@@ -2062,9 +2061,9 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
     return $out;
 }
 /**
- * @param $task      Task
- * @param $label     string  empty = auto (progress), string = replace output
- * @param $tooltip   string  empty = auto , string = replace output
+ * @param task      $task      Task     the task object
+ * @param label     $label     string   empty = auto (progress), string = replace output
+ * @param tooltip   $tooltip   string   empty = auto , string = replace output
  * @return string
  */
 function getTaskProgressBadge($task, $label = '', $tooltip = '')
@@ -2072,14 +2071,13 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
     global $conf;
 
     $out = '';
-    $label = '';
-    $badgeColorClass = '';
+    $badgeClass = '';
     if ($task->progress != '')
     {
         // TODO : manage 100%
 
         // define color according to time spend vs workload
-        $badgeColorClass = 'badge ';
+        $badgeClass = 'badge ';
         if ($task->planned_workload){
             $progressCalculated =  round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
 
@@ -2087,24 +2085,30 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
             $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.01;
 
             if($progressCalculated > doubleval($task->progress)){
-                $badgeColorClass.= 'badge-danger';
+                $badgeClass.= 'badge-danger';
             }
             elseif($progressCalculated * $warningRatio >= doubleval($task->progress)){ // warning if close at 1%
-                $badgeColorClass.= 'badge-warning';
+                $badgeClass.= 'badge-warning';
             }
             else{
-                $badgeColorClass.= 'badge-success';
+                $badgeClass.= 'badge-success';
             }
         }
     }
 
+    $title = '';
+    if(!empty($tooltip)){
+        $badgeClass.= ' classfortooltip';
+        $title = 'title="'.dol_htmlentities($tooltip).'"';
+    }
+
     if(empty($label)){
         $label = $task->progress.' %';
     }
 
     if(!empty($label)){
-        $out = '<span class="'.$badgeColorClass.'" >'.$label.'</span>';
+        $out = '<span class="'.$badgeClass.'" '.$title.' >'.$label.'</span>';
     }
 
     return $out;
-}
\ No newline at end of file
+}
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index d98b1e16443..bf47e1a2807 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -86,4 +86,3 @@ $badgeStatus6='#cad2d2';
 $badgeStatus7='#baa32b';
 $badgeStatus8='#be3013';
 $badgeStatus9='#e7f0f0';
-