diff --git a/class/kanban.class.php b/class/kanban.class.php index 5726f4c..0985d57 100644 --- a/class/kanban.class.php +++ b/class/kanban.class.php @@ -182,6 +182,7 @@ public function getObjectKanbanView($object, $objectMetadata) { global $langs; $userAffected = new User($this->db); + $projectAffected = new Project($this->db); $objectTitle = method_exists($object, 'getNomUrl') ? $object->getNomUrl(1) : $object->ref; $objectSubtitle = htmlspecialchars($object->label ?? ''); @@ -189,6 +190,20 @@ public function getObjectKanbanView($object, $objectMetadata) { $moreBodyData = ''; $moreHeaderData = ''; + $nameField = $objectMetadata['name_field']; + if (strstr($nameField, ',')) { + $nameFields = explode(', ', $nameField); + if (is_array($nameFields) && !empty($nameFields)) { + foreach ($nameFields as $subnameField) { + if ($subnameField != 'ref') { + $objectSubtitle .= $object->$subnameField . ' '; + } + } + } + } else { + $objectSubtitle = $object->$nameField; + } + if ($object->element == 'project') { $object->getLinesArray($user); $tasksCounter = is_array($object->lines) ? count($object->lines) : 0; @@ -208,21 +223,14 @@ public function getObjectKanbanView($object, $objectMetadata) { $userAffected->fetch($object->fk_user_assign); $moreFooterData .= ' ' . $userAffected->getNomUrl(1) . ''; $moreBodyData = '
' . $object->type_label . ''; + } else if ($object->element == 'propal') { + $moreHeaderData .= ' ' . $object->getLibStatut(2) . ''; + $projectAffected->fetch($object->fk_project); + $moreBodyData = '
' . $projectAffected->getNomUrl(1) . ''; + $moreFooterData = ' ' . dol_print_date($object->date_creation, 'day') . ''; + $moreFooterData .= ' ' . price($object->total_ht) . ''; } - $nameField = $objectMetadata['name_field']; - if (strstr($nameField, ',')) { - $nameFields = explode(', ', $nameField); - if (is_array($nameFields) && !empty($nameFields)) { - foreach ($nameFields as $subnameField) { - if ($subnameField != 'ref') { - $objectSubtitle .= $object->$subnameField . ' '; - } - } - } - } else { - $objectSubtitle = $object->$nameField; - } $selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']); $actionsButton = '