From 4eedf2f08ee04ba456c1eb31ba3a94ebc7cfdb18 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Tue, 12 Jan 2021 09:46:18 +0800
Subject: [PATCH] * Finish task#8981.

---
 module/programplan/config.php | 7 +------
 module/programplan/model.php  | 8 +++-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/module/programplan/config.php b/module/programplan/config.php
index 3bac286d07..2710d95c98 100644
--- a/module/programplan/config.php
+++ b/module/programplan/config.php
@@ -5,7 +5,7 @@ $config->programplan->create->requiredFields = 'name,begin,end';
 $config->programplan->edit->requiredFields   = 'name,begin,end';
 
 $config->programplan->datatable = new stdclass();
-$config->programplan->datatable->defaultField = array('id', 'name', 'percent', 'attribute', 'milestone', 'begin', 'end', 'realBegan', 'realEnd', 'actions');
+$config->programplan->datatable->defaultField = array('id', 'name', 'percent', 'attribute', 'begin', 'end', 'realBegan', 'realEnd', 'actions');
 
 $config->programplan->datatable->fieldList['id']['title']    = 'idAB';
 $config->programplan->datatable->fieldList['id']['fixed']    = 'left';
@@ -27,11 +27,6 @@ $config->programplan->datatable->fieldList['attribute']['fixed']    = 'no';
 $config->programplan->datatable->fieldList['attribute']['width']    = '90';
 $config->programplan->datatable->fieldList['attribute']['required'] = 'no';
 
-$config->programplan->datatable->fieldList['milestone']['title']    = 'milestone';
-$config->programplan->datatable->fieldList['milestone']['fixed']    = 'no';
-$config->programplan->datatable->fieldList['milestone']['width']    = '80';
-$config->programplan->datatable->fieldList['milestone']['required'] = 'no';
-
 $config->programplan->datatable->fieldList['begin']['title']    = 'begin';
 $config->programplan->datatable->fieldList['begin']['fixed']    = 'no';
 $config->programplan->datatable->fieldList['begin']['width']    = '90';
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 48bb056df5..3dd6d65a96 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -727,7 +727,7 @@ class programplanModel extends model
         {
             $class  = 'c-' . $id;
             $title  = '';
-            $idList = array('id','name','output','percent','attribute','milestone','version','begin','end','realBegan','realEnd');
+            $idList = array('id','name','output','percent','attribute','version','begin','end','realBegan','realEnd');
             if(in_array($id,$idList))
             {
                 $class .= ' text-left';
@@ -749,8 +749,9 @@ class programplanModel extends model
                 echo sprintf('%03d', $plan->id);
                 break;
             case 'name':
+                $milestoneFlag = $plan->milestone ? " <i class='icon icon-flag' title={$this->lang->programplan->milestone}></i>" : '';
                 if($plan->grade > 1) echo '<span class="label label-badge label-light" title="' . $this->lang->programplan->children . '">' . $this->lang->programplan->childrenAB . '</span> ';
-                echo $plan->name;
+                echo $plan->name . $milestoneFlag;
                 if(!empty($plan->children)) echo '<a class="plan-toggle" data-id="' . $plan->id . '"><i class="icon icon-angle-double-right"></i></a>';
                 break;
             case 'percent':
@@ -759,9 +760,6 @@ class programplanModel extends model
             case 'attribute':
                 echo zget($this->lang->stage->typeList, $plan->attribute, '');
                 break;
-            case 'milestone':
-                echo zget($this->lang->programplan->milestoneList, $plan->milestone, 0);
-                break;
             case 'begin':
                 echo $plan->begin;
                 break;