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

Update box_task.php

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-10-14 23:27:37 +02:00 committed by GitHub
parent 0d4866c38c
commit b77d2f2ff2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/core/boxes/box_task.php
View File

@ -134,7 +134,13 @@ class box_task extends ModeleBoxes
}); });
}); });
</script>'; </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"; $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); $sql.= $this->db->plimit($max, 0);
$result = $this->db->query($sql); $result = $this->db->query($sql);
$i = 0; $i = 1;
if ($result) { if ($result) {
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
while ($objp = $this->db->fetch_object($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); $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++; $i++;
} }
} else { } 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,
);
} }
/** /**