From 0eaf0729598dd9d347f4d26fb7b80814331b2da8 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 28 Dec 2021 17:12:16 +0800
Subject: [PATCH] * Finish task #46656.

---
 module/productplan/view/browsebylist.html.php | 8 ++++++--
 module/productplan/view/view.html.php         | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php
index 7dca90e6cf..4805256305 100644
--- a/module/productplan/view/browsebylist.html.php
+++ b/module/productplan/view/browsebylist.html.php
@@ -69,7 +69,7 @@
         $extendFields = $this->productplan->getFlowExtendFields();
         foreach($extendFields as $extendField) echo "<th>{$extendField->name}</th>";
         ?>
-        <th class='c-actions-6 text-center'><?php echo $lang->actions;?></th>
+        <th class='c-actions-9 text-center'><?php echo $lang->actions;?></th>
       </tr>
       </thead>
       <tbody>
@@ -108,8 +108,12 @@
         </td>
         <td class='c-title text-left<?php if($plan->parent == '-1') echo ' has-child';?>' title="<?php echo $plan->title?>">
           <?php
+          $suffix = '';
+          if($plan->end < helper::now()) $suffix = "<span class='label label-danger label-badge'>{$this->lang->productplan->expired}</span>";
+          if($plan->parent == '-1') $suffix .= '<a class="task-toggle" data-id="' . $plan->id . '"><i class="icon icon-angle-double-right"></i></a>';
+          if(!empty($suffix)) echo '<div class="plan-name has-prefix has-suffix">';
           echo html::a(inlink('view', "id=$plan->id"), $plan->title);
-          if($plan->parent == '-1') echo '<a class="task-toggle" data-id="' . $plan->id . '"><i class="icon icon-angle-double-right"></i></a>';
+          if(!empty($suffix)) echo $suffix . '</div>';
           ?>
         </td>
         <?php if($this->session->currentProductType != 'normal'):?>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 0f27bc3296..92010c7ec1 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -53,7 +53,7 @@
             $attr = "target='hiddenwin'";
             $isOnlyBody = false;
         }
-        $class = $plan->status == 'wait' ? $class : 'disabled';
+        $class = $plan->status == 'wait' ? (isset($class) ? $class : '' ) : 'disabled';
         common::printLink('productplan', 'start', "planID=$plan->id", "<i class='icon-play'></i>{$lang->productplan->startAB}", '', "class='btn btn-link {$class}'{$attr} title='{$lang->productplan->start}'", '', $isOnlyBody);
         $class = $plan->status == 'doing' ? '' : 'disabled';
         common::printLink('productplan', 'finish', "planID=$plan->id", "<i class='icon-checked'></i>{$lang->productplan->finishAB}", '', "class='btn btn-link {$class}' target='hiddenwin' title='{$lang->productplan->finish}'");