From f87e53daac2b2ce30552c3c2907995a2e666d022 Mon Sep 17 00:00:00 2001 From: bgenere Date: Thu, 23 Feb 2017 14:45:44 +0100 Subject: [PATCH] FIX issue on version < 5 --- cultivationprogress.php | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/cultivationprogress.php b/cultivationprogress.php index 5a2612c..b6f5e0a 100644 --- a/cultivationprogress.php +++ b/cultivationprogress.php @@ -41,7 +41,7 @@ $cultivationprojectid = setIsCultivationProject(); $cultivationproject = new Project($db); $cultivationproject->fetch($cultivationprojectid); -$cultivationproject->getLinesArray($user); +//$cultivationproject->getLinesArray($user); $sort = getsort(); @@ -143,8 +143,9 @@ function displaySearchForm(Project $cultivationproject, $filter, $sort) print '' . $form->select_date($filter['dateend'], 'dateend', 0, 0, 0, "dateend", 1, 1, 1) . ''; print ''; // Tasks - $tasks = Array(); - foreach ($cultivationproject->lines as $task) { + $tasks = array(); + $lines = getProjectTasks($cultivationproject); + foreach ($lines as $task) { $tasks[$task->ref] = $task->label; array_multisort($tasks); } @@ -504,3 +505,35 @@ function getPlotProgress(Project $project, $sort, $filter) } } +function getProjectTasks(Project $project) +{ + Global $db, $conf, $user, $langs; + + $tasks = array(); + + $sql = "SELECT"; + $sql .= " pt.ref as ref,"; + $sql .= " pt.label as label"; + $sql .= " FROM " . MAIN_DB_PREFIX . "projet_task as pt "; + $sql .= " WHERE "; + $sql .= " pt.fk_projet =" . $project->id; + + $resql = $db->query($sql); + if ($resql) { + $num = $db->num_rows($resql); + $totalnboflines = $num; + + $i = 0; + while ($i < $num) { + $row = $db->fetch_object($resql); + $tasks[$i] = $row; + $i ++; + } + $db->free($resql); + return $tasks; + } else { + dol_print_error($db); + return null; + } +} +