diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php index 09da6b4a0f..fe215c2ff2 100644 --- a/module/kanban/view/viewarchivedcard.html.php +++ b/module/kanban/view/viewarchivedcard.html.php @@ -19,6 +19,7 @@ #archivedCards .kanban-item > .info {margin-top: 5px; position: relative;} #archivedCards .kanban-item > .info > .pri {height: 14px; border-width: 1px; font-size: 12px; line-height: 12px; min-width: 14px; padding: 0 1px;} #archivedCards .kanban-item > .info > .time {margin-left: 10px; font-size: 12px} +#archivedCards .kanban-item > .info.build > .time {margin-left:0px; font-size: 12px} #archivedCards .kanban-item > .info > .user {position: absolute; right: 0; top: 0} #archivedCards .card-actions {position: relative; padding: 15px 10px; padding-top: 0px;} #archivedCards .card-actions > .btn {display: block;} @@ -91,51 +92,66 @@ $app->loadLang('productplan'); title) ? $card->title : $card->name; - if(common::hasPriv($card->fromType, 'view')) echo html::a($this->createLink('productplan', 'view', "id=$card->fromID"), $name, '', "class='cardName' title='$name'"); + if(common::hasPriv($card->fromType, 'view')) echo html::a($this->createLink($card->fromType, 'view', "id=$card->fromID"), $name, '', "class='cardName' title='$name'"); if(!common::hasPriv($card->fromType, 'view')) echo "
$name
"; echo "
"; - if($card->fromType != 'release' and isset($lang->{$card->fromType}->statusList[$card->objectStatus])) echo "" . $lang->{$card->fromType}->statusList[$card->objectStatus] . ''; + if(isset($lang->{$card->fromType}->statusList[$card->objectStatus])) echo "" . $lang->{$card->fromType}->statusList[$card->objectStatus] . ''; if(isset($card->date) and !helper::isZeroDate($card->date)) echo "" . date("m/d", strtotime($card->date)) . "" ?> - end) and !helper::isZeroDate($card->begin)):?> + end) and !helper::isZeroDate($card->begin) and $card->begin != '2030-01-01' and $card->end != '2030-01-01'):?> begin)) . $lang->kanbancard->beginAB;?> - begin) and !helper::isZeroDate($card->end)):?> + begin) and !helper::isZeroDate($card->end) and $card->begin != '2030-01-01' and $card->end != '2030-01-01'):?> end)) . $lang->kanbancard->deadlineAB;?> - begin) and !helper::isZeroDate($card->end)):?> + begin) and !helper::isZeroDate($card->end) and $card->begin != '2030-01-01' and $card->end != '2030-01-01'):?> begin)) . ' ~ ' . date("m/d", strtotime($card->end));?> assignedTo); + if($card->begin == '2030-01-01' or $card->end == '2030-01-01') echo '' . $lang->{$card->fromType}->future . ''; + + if($card->fromType == '') $assignedToList = explode(',', $card->assignedTo); + if($card->fromType == 'execution') $assignedToList = $card->PM; + if($card->fromType == 'build') $assignedToList = $card->builder; + if($card->fromType == 'release' or $card->fromType == 'productplan') $assignedToList = $card->createdBy; $count = 0; $members = ''; ?> - $account) + + $account) + { + if(!isset($users[$account]) or !isset($usersAvatar[$account])) + { + unset($assignedToList[$index]); + continue; + } + $members .= $users[$account] . ','; + } + $userCount = count($assignedToList); + ?> + 0):?> +
+ 2) continue; + echo html::smallAvatar(array('avatar' => $usersAvatar[$account], 'account' => $account, 'name' => $users[$account]), 'avatar-circle'); + $count ++; + } + ?> + 2) echo "...";?> +
+ + + - 0):?> -
- 2) continue; - echo html::smallAvatar(array('avatar' => $usersAvatar[$account], 'account' => $account, 'name' => $users[$account]), 'avatar-circle'); - $count ++; + echo "
"; + echo html::smallAvatar(array('avatar' => $usersAvatar[$assignedToList], 'account' => $assignedToList, 'name' => $users[$assignedToList]), 'avatar-circle'); + echo "
"; } ?> - 2) echo "...";?> -
performable):?>