From 66ed845d5ef27e9d8dcc39864bc7393944eb01e2 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 14 Jun 2023 10:12:20 +0800
Subject: [PATCH] * Code for task #95400.

---
 module/task/config/dtable.php | 70 +++++++----------------------------
 1 file changed, 14 insertions(+), 56 deletions(-)

diff --git a/module/task/config/dtable.php b/module/task/config/dtable.php
index d1dda917c3..fe2618803e 100644
--- a/module/task/config/dtable.php
+++ b/module/task/config/dtable.php
@@ -2,55 +2,46 @@
 $config->task->dtable = new stdclass();
 
 $config->task->dtable->fieldList['id']['title']    = $lang->idAB;
-$config->task->dtable->fieldList['id']['name']     = 'id';
 $config->task->dtable->fieldList['id']['type']     = 'checkID';
 $config->task->dtable->fieldList['id']['sortType'] = 'desc';
 $config->task->dtable->fieldList['id']['checkbox'] = true;
+$config->task->dtable->fieldList['id']['required'] = true;
 
-$config->task->dtable->fieldList['name']['title']    = $lang->task->name;
-$config->task->dtable->fieldList['name']['name']     = 'name';
 $config->task->dtable->fieldList['name']['fixed']    = 'left';
 $config->task->dtable->fieldList['name']['flex']     = 1;
 $config->task->dtable->fieldList['name']['type']     = 'nestedTitle';
 $config->task->dtable->fieldList['name']['sortType'] = true;
 $config->task->dtable->fieldList['name']['link']     = array('module' => 'task', 'method' => 'view', 'params' => 'taskID={id}');
+$config->task->dtable->fieldList['name']['required'] = true;
 
 $config->task->dtable->fieldList['pri']['title']    = $lang->priAB;
-$config->task->dtable->fieldList['pri']['name']     = 'pri';
 $config->task->dtable->fieldList['pri']['type']     = 'pri';
 $config->task->dtable->fieldList['pri']['sortType'] = true;
 $config->task->dtable->fieldList['pri']['show']     = true;
 $config->task->dtable->fieldList['pri']['group']    = 1;
 
-$config->task->dtable->fieldList['type']['title']    = $lang->task->typeAB;
-$config->task->dtable->fieldList['type']['name']     = 'type';
-$config->task->dtable->fieldList['type']['type']     = 'category';
-$config->task->dtable->fieldList['type']['map']      = $lang->task->typeList;
-$config->task->dtable->fieldList['type']['sortType'] = true;
-$config->task->dtable->fieldList['type']['group']    = 1;
-
 $config->task->dtable->fieldList['status']['title']     = $lang->statusAB;
-$config->task->dtable->fieldList['status']['name']      = 'status';
 $config->task->dtable->fieldList['status']['type']      = 'status';
 $config->task->dtable->fieldList['status']['statusMap'] = $lang->task->statusList;
 $config->task->dtable->fieldList['status']['sortType']  = true;
 $config->task->dtable->fieldList['status']['show']      = true;
 $config->task->dtable->fieldList['status']['group']     = 1;
 
+$config->task->dtable->fieldList['type']['title']    = $lang->task->typeAB;
+$config->task->dtable->fieldList['type']['type']     = 'category';
+$config->task->dtable->fieldList['type']['map']      = $lang->task->typeList;
+$config->task->dtable->fieldList['type']['sortType'] = true;
+$config->task->dtable->fieldList['type']['group']    = 1;
+
 $config->task->dtable->fieldList['openedBy']['title']    = $lang->task->openedByAB;
-$config->task->dtable->fieldList['openedBy']['name']     = 'openedBy';
 $config->task->dtable->fieldList['openedBy']['type']     = 'user';
 $config->task->dtable->fieldList['openedBy']['sortType'] = true;
 $config->task->dtable->fieldList['openedBy']['group']    = 2;
 
-$config->task->dtable->fieldList['openedDate']['title']    = $lang->task->openedDate;
-$config->task->dtable->fieldList['openedDate']['name']     = 'openedDate';
 $config->task->dtable->fieldList['openedDate']['type']     = 'date';
 $config->task->dtable->fieldList['openedDate']['sortType'] = true;
 $config->task->dtable->fieldList['openedDate']['group']    = 2;
 
-$config->task->dtable->fieldList['assignedTo']['title']       = $lang->task->assignedTo;
-$config->task->dtable->fieldList['assignedTo']['name']        = 'assignedTo';
 $config->task->dtable->fieldList['assignedTo']['type']        = 'assign';
 $config->task->dtable->fieldList['assignedTo']['currentUser'] = $app->user->account;
 $config->task->dtable->fieldList['assignedTo']['assignLink']  = array('module' => 'task', 'method' => 'assignTo', 'params' => 'executionID={execution}&taskID={id}');
@@ -58,139 +49,106 @@ $config->task->dtable->fieldList['assignedTo']['sortType']    = true;
 $config->task->dtable->fieldList['assignedTo']['show']        = true;
 $config->task->dtable->fieldList['assignedTo']['group']       = 3;
 
-$config->task->dtable->fieldList['assignedDate']['title']    = $lang->task->assignedDate;
-$config->task->dtable->fieldList['assignedDate']['name']     = 'assignedDate';
 $config->task->dtable->fieldList['assignedDate']['type']     = 'date';
 $config->task->dtable->fieldList['assignedDate']['sortType'] = true;
-$config->task->dtable->fieldList['assignedDate']['show']     = true;
 $config->task->dtable->fieldList['assignedDate']['group']    = 3;
 
-$config->task->dtable->fieldList['estStarted']['title']    = $lang->task->estStarted;
-$config->task->dtable->fieldList['estStarted']['name']     = 'estStarted';
 $config->task->dtable->fieldList['estStarted']['type']     = 'date';
 $config->task->dtable->fieldList['estStarted']['sortType'] = true;
 $config->task->dtable->fieldList['estStarted']['group']    = 4;
 
-$config->task->dtable->fieldList['realStarted']['title']    = $lang->task->realStarted;
-$config->task->dtable->fieldList['realStarted']['name']     = 'realStarted';
 $config->task->dtable->fieldList['realStarted']['type']     = 'date';
 $config->task->dtable->fieldList['realStarted']['sortType'] = true;
 $config->task->dtable->fieldList['realStarted']['group']    = 4;
 
 $config->task->dtable->fieldList['finishedBy']['title']    = $lang->task->finishedByAB;
-$config->task->dtable->fieldList['finishedBy']['name']     = 'finishedBy';
 $config->task->dtable->fieldList['finishedBy']['type']     = 'user';
 $config->task->dtable->fieldList['finishedBy']['sortType'] = true;
+$config->task->dtable->fieldList['finishedBy']['show']     = true;
 $config->task->dtable->fieldList['finishedBy']['group']    = 4;
 
 $config->task->dtable->fieldList['finishedDate']['title']    = $lang->task->finishedDateAB;
-$config->task->dtable->fieldList['finishedDate']['name']     = 'finishedDateAB';
 $config->task->dtable->fieldList['finishedDate']['type']     = 'date';
 $config->task->dtable->fieldList['finishedDate']['sortType'] = true;
 $config->task->dtable->fieldList['finishedDate']['group']    = 4;
 
 $config->task->dtable->fieldList['deadline']['title']    = $lang->task->deadlineAB;
-$config->task->dtable->fieldList['deadline']['name']     = 'deadline';
 $config->task->dtable->fieldList['deadline']['type']     = 'date';
 $config->task->dtable->fieldList['deadline']['sortType'] = true;
 $config->task->dtable->fieldList['deadline']['show']     = true;
 $config->task->dtable->fieldList['deadline']['group']    = 5;
 
 $config->task->dtable->fieldList['estimate']['title']    = $lang->task->estimateAB;
-$config->task->dtable->fieldList['estimate']['name']     = 'estimate';
 $config->task->dtable->fieldList['estimate']['type']     = 'number';
 $config->task->dtable->fieldList['estimate']['sortType'] = true;
 $config->task->dtable->fieldList['estimate']['show']     = true;
 $config->task->dtable->fieldList['estimate']['group']    = 5;
 
 $config->task->dtable->fieldList['consumed']['title']    = $lang->task->consumedAB;
-$config->task->dtable->fieldList['consumed']['name']     = 'consumed';
 $config->task->dtable->fieldList['consumed']['type']     = 'number';
 $config->task->dtable->fieldList['consumed']['sortType'] = true;
 $config->task->dtable->fieldList['consumed']['show']     = true;
 $config->task->dtable->fieldList['consumed']['group']    = 5;
 
 $config->task->dtable->fieldList['left']['title']    = $lang->task->leftAB;
-$config->task->dtable->fieldList['left']['name']     = 'left';
 $config->task->dtable->fieldList['left']['type']     = 'number';
 $config->task->dtable->fieldList['left']['sortType'] = true;
 $config->task->dtable->fieldList['left']['show']     = true;
 $config->task->dtable->fieldList['left']['group']    = 5;
 
 $config->task->dtable->fieldList['progress']['title'] = $lang->task->progressAB;
-$config->task->dtable->fieldList['progress']['name']  = 'progress';
 $config->task->dtable->fieldList['progress']['type']  = 'progress';
 $config->task->dtable->fieldList['progress']['show']  = true;
 $config->task->dtable->fieldList['progress']['group'] = 5;
 
-$config->task->dtable->fieldList['closedBy']['title']    = $lang->task->closedBy;
-$config->task->dtable->fieldList['closedBy']['name']     = 'closedBy';
 $config->task->dtable->fieldList['closedBy']['type']     = 'user';
 $config->task->dtable->fieldList['closedBy']['sortType'] = true;
 $config->task->dtable->fieldList['closedBy']['group']    = 6;
 
-$config->task->dtable->fieldList['closedDate']['title']    = $lang->task->closedDate;
-$config->task->dtable->fieldList['closedDate']['name']     = 'closedDate';
 $config->task->dtable->fieldList['closedDate']['type']     = 'datetime';
 $config->task->dtable->fieldList['closedDate']['sortType'] = true;
 $config->task->dtable->fieldList['closedDate']['group']    = 6;
 
-$config->task->dtable->fieldList['closedReason']['title']    = $lang->task->closedReason;
-$config->task->dtable->fieldList['closedReason']['name']     = 'closedReason';
-$config->task->dtable->fieldList['closedReason']['width']    = '120';
 $config->task->dtable->fieldList['closedReason']['type']     = 'category';
 $config->task->dtable->fieldList['closedReason']['map']      = $lang->task->reasonList;
 $config->task->dtable->fieldList['closedReason']['sortType'] = true;
 $config->task->dtable->fieldList['closedReason']['group']    = 6;
 
-$config->task->dtable->fieldList['canceledBy']['title']    = $lang->task->canceledBy;
-$config->task->dtable->fieldList['canceledBy']['name']     = 'canceledBy';
 $config->task->dtable->fieldList['canceledBy']['type']     = 'user';
 $config->task->dtable->fieldList['canceledBy']['sortType'] = true;
 $config->task->dtable->fieldList['canceledBy']['group']    = 7;
 
-$config->task->dtable->fieldList['canceledDate']['title']    = $lang->task->canceledDate;
-$config->task->dtable->fieldList['canceledDate']['name']     = 'canceledDate';
 $config->task->dtable->fieldList['canceledDate']['type']     = 'date';
 $config->task->dtable->fieldList['canceledDate']['sortType'] = true;
 $config->task->dtable->fieldList['canceledDate']['group']    = 7;
 
-$config->task->dtable->fieldList['lastEditedBy']['title']    = $lang->task->lastEditedBy;
-$config->task->dtable->fieldList['lastEditedBy']['name']     = 'lastEditedBy';
 $config->task->dtable->fieldList['lastEditedBy']['type']     = 'user';
 $config->task->dtable->fieldList['lastEditedBy']['sortType'] = true;
 $config->task->dtable->fieldList['lastEditedBy']['group']    = 8;
 
-$config->task->dtable->fieldList['lastEditedDate']['title']    = $lang->task->lastEditedDate;
-$config->task->dtable->fieldList['lastEditedDate']['name']     = 'lastEditedDate';
 $config->task->dtable->fieldList['lastEditedDate']['type']     = 'date';
 $config->task->dtable->fieldList['lastEditedDate']['sortType'] = true;
 $config->task->dtable->fieldList['lastEditedDate']['group']    = 8;
 
-$config->task->dtable->fieldList['activatedDate']['title']    = $lang->task->activatedDate;
-$config->task->dtable->fieldList['activatedDate']['name']     = 'activatedDate';
 $config->task->dtable->fieldList['activatedDate']['type']     = 'date';
 $config->task->dtable->fieldList['activatedDate']['sortType'] = true;
 $config->task->dtable->fieldList['activatedDate']['group']    = 8;
 
 $config->task->dtable->fieldList['story']['title']    = $lang->task->storyAB;
 $config->task->dtable->fieldList['story']['name']     = 'storyTitle';
-$config->task->dtable->fieldList['story']['width']    = '80';
 $config->task->dtable->fieldList['story']['type']     = 'desc';
 $config->task->dtable->fieldList['story']['sortType'] = true;
+$config->task->dtable->fieldList['story']['show']     = true;
 $config->task->dtable->fieldList['story']['group']    = 9;
 
-$config->task->dtable->fieldList['mailto']['title']    = $lang->task->mailto;
-$config->task->dtable->fieldList['mailto']['name']     = 'mailto';
 $config->task->dtable->fieldList['mailto']['type']     = 'user';
 $config->task->dtable->fieldList['mailto']['sortType'] = true;
 $config->task->dtable->fieldList['mailto']['group']    = 9;
 
-$config->task->dtable->fieldList['actions']['title'] = $lang->actions;
-$config->task->dtable->fieldList['actions']['name']  = 'actions';
-$config->task->dtable->fieldList['actions']['type']  = 'actions';
-$config->task->dtable->fieldList['actions']['list']  = $config->task->actionList;
-$config->task->dtable->fieldList['actions']['menu']  = array(array('confirmStoryChange'), array('start|restart', 'finish', 'close', 'recordWorkhour', 'edit', 'batchCreate'));
+$config->task->dtable->fieldList['actions']['type']     = 'actions';
+$config->task->dtable->fieldList['actions']['list']     = $config->task->actionList;
+$config->task->dtable->fieldList['actions']['menu']     = array(array('confirmStoryChange'), array('start|restart', 'finish', 'close', 'recordWorkhour', 'edit', 'batchCreate'));
+$config->task->dtable->fieldList['actions']['required'] = true;
 
 /* Record effort page. */
 $config->task->effortTable = new stdclass();