mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Update box_task.php
This commit is contained in:
parent
0d4866c38c
commit
b77d2f2ff2
|
|
@ -134,7 +134,13 @@ class box_task extends ModeleBoxes
|
|||
});
|
||||
});
|
||||
</script>';
|
||||
|
||||
// set cookie by js
|
||||
$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(
|
||||
'tr'=>'class="nohover"',
|
||||
'td' => 'class="nohover"',
|
||||
'textnoformat' => $boxcontent,
|
||||
);
|
||||
|
||||
|
||||
$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";
|
||||
|
|
@ -163,7 +169,7 @@ class box_task extends ModeleBoxes
|
|||
$sql.= $this->db->plimit($max, 0);
|
||||
|
||||
$result = $this->db->query($sql);
|
||||
$i = 0;
|
||||
$i = 1;
|
||||
if ($result) {
|
||||
$num = $this->db->num_rows($result);
|
||||
while ($objp = $this->db->fetch_object($result)) {
|
||||
|
|
@ -183,8 +189,12 @@ class box_task extends ModeleBoxes
|
|||
|
||||
$label = $projectstatic->getNomUrl(1).' '.$taskstatic->getNomUrl(1).' '.dol_htmlentities($taskstatic->label);
|
||||
|
||||
$boxcontent.= getTaskProgressView($taskstatic, $label, true, false, true);
|
||||
$boxcontent = getTaskProgressView($taskstatic, $label, true, false, true);
|
||||
|
||||
$this->info_box_contents[$i][] = array(
|
||||
'td' => '',
|
||||
'text' => $boxcontent,
|
||||
);
|
||||
$i++;
|
||||
}
|
||||
} else {
|
||||
|
|
@ -192,15 +202,6 @@ class box_task extends ModeleBoxes
|
|||
}
|
||||
}
|
||||
|
||||
// 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,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user