Skip to content

Commit

Permalink
Merge branch 'fix-kanban-cards' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@theodaviddd
theodaviddd committed Jan 7, 2025
2 parents 7cd69cf + 75203bd commit 6bd810f
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 23 deletions.
63 changes: 43 additions & 20 deletions class/kanban.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,25 +181,14 @@ public function setCategories($categories)
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 ?? '');
$objectPicto = $object->picto;
$moreData = '';

if ($object->element == 'project') {
$object->getLinesArray($user);
$tasksCounter = is_array($object->lines) ? count($object->lines) : 0;
if (is_array($object->lines) && !empty($object->lines)) {
foreach($object->lines as $task) {
$timeSpent += $task->duration_effective;
}
}
$projectDate = dol_print_date($object->date ?? time(), 'day');
$moreData = '<span class="kanban-data"><i class="fas fa-tasks"></i> ' . $tasksCounter . '</span> ';
$timeSpentInHoursAndMinutes = gmdate('H:i', $timeSpent);
$moreData .= '<span class="kanban-data"><i class="fas fa-clock"></i> ' . htmlspecialchars($timeSpentInHoursAndMinutes) . '</span> ';
$moreData .= '<span class="kanban-data"><i class="fas fa-calendar"></i> ' . $projectDate . '</span>';
}
$moreFooterData = '';
$moreBodyData = '';
$moreHeaderData = '';

$nameField = $objectMetadata['name_field'];
if (strstr($nameField, ',')) {
Expand All @@ -215,6 +204,39 @@ public function getObjectKanbanView($object, $objectMetadata) {
$objectSubtitle = $object->$nameField;
}

if ($object->element == 'project') {
$object->getLinesArray($user);
$tasksCounter = is_array($object->lines) ? count($object->lines) : 0;
if (is_array($object->lines) && !empty($object->lines)) {
foreach($object->lines as $task) {
$timeSpent += $task->duration_effective;
}
}
$projectDate = dol_print_date($object->date ?? time(), 'day');
$moreHeaderData = $object->getLibStatut(2);
$moreFooterData = '<span class="kanban-data"><i class="fas fa-tasks"></i> ' . $tasksCounter . '</span> ';
$timeSpentInHoursAndMinutes = gmdate('H:i', $timeSpent);
$moreFooterData .= '<span class="kanban-data"><i class="fas fa-clock"></i> ' . htmlspecialchars($timeSpentInHoursAndMinutes) . '</span> ';
$moreFooterData .= '<span class="kanban-data"><i class="fas fa-calendar"></i> ' . $projectDate . '</span>';
} else if ($object->element == 'ticket') {
$moreHeaderData = $object->getLibStatut(2);
$moreFooterData = '<span class="kanban-data"><i class="fas fa-calendar"></i> ' . dol_print_date($object->date_creation, 'day') . '</span>';
$userAffected->fetch($object->fk_user_assign);
$moreFooterData .= '<span class="kanban-data"> ' . $userAffected->getNomUrl(1) . '</span>';
$moreBodyData = '<br><span class="kanban-data"> ' . $object->type_label . '</span>';
} else if ($object->element == 'propal') {
$moreHeaderData .= '<span class="kanban-data"> ' . $object->getLibStatut(2) . '</span>';
$projectAffected->fetch($object->fk_project);
$moreBodyData = '<br><span class="kanban-data"> ' . $projectAffected->getNomUrl(1) . '</span>';
$moreFooterData = '<span class="kanban-data"><i class="fas fa-calendar"></i> ' . dol_print_date($object->date_creation, 'day') . '</span>';
$moreFooterData .= '<span class="kanban-data"><i class="fas fa-euro-sign"></i> ' . price($object->total_ht) . '</span>';
} else if ($object->element == 'societe') {
$moreHeaderData = $object->getLibStatut(2);
$moreFooterData .= '<span class="kanban-data"><i class="fas fa-envelope"></i> ' . $object->email . '</span>';
$moreFooterData .= '<br><span class="kanban-data"><i class="fas fa-phone"></i> ' . $object->phone . '</span>';
}


$selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']);
$actionsButton = '
<span class="fas fa-ellipsis-h edit-card actions-icon" onclick="window.digikanban.kanban.toggleCardMenu(this)"></span>
Expand All @@ -224,20 +246,21 @@ public function getObjectKanbanView($object, $objectMetadata) {
</div>
</div>
';

$return = '<div>';
$return .= '<div class="kanban-card info-box ">';
if ($selected >= 0) {
$return .= '<input hidden id="cb'.$object->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
}
$return .= '<div class="kanban-card-header">';
$return .= '<span class="kanban-card-ref">' . $objectTitle . '&nbsp;' . $actionsButton .'</span>';
$return .= '<span class="kanban-card-ref">' . $objectTitle . '&nbsp;' . $moreHeaderData . '</span>';
$return .= '<span class="kanban-card-action">' . $actionsButton .'</span>';
$return .= '</div>';
$return .= '<div class="kanban-card-body">';
$return .= '<span class="kanban-card-subtitle">' . $objectSubtitle . '</span>';
$return .= '<span class="kanban-card-subtitle">' . $moreBodyData . '</span>';
$return .= '</div>';
$return .= '<div class="kanban-card-footer">';
$return .= $moreData;
$return .= $moreFooterData;
$return .= '</div>';
$return .= '</div>';
$return .= '</div>';
Expand Down
2 changes: 1 addition & 1 deletion css/digikanban.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions css/scss/modules/_kanban.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,20 @@ body {
font-size: 14px;
color: #007bff;
margin-bottom: 5px;
display: flex;
justify-content: space-between;
align-items: center;
}

.kanban-card-header .kanban-card-ref {
display: flex;
align-items: center;
display: inline-block;
flex-grow: 1;
}

.kanban-card-header .kanban-card-action {
display: inline-flex;
justify-content: flex-end;
margin-left: auto;
}

.kanban-card-body {
Expand Down

0 comments on commit 6bd810f

Please sign in to comment.