From b030fcb03f4b3f7147c6746d3cab0c79419f55e0 Mon Sep 17 00:00:00 2001 From: dingguodong Date: Fri, 18 Aug 2023 15:01:26 +0800 Subject: [PATCH] * Rename estimate to effort except object properties and column name. --- extension/lite/task/ext/lang/de/lite.php | 2 +- extension/lite/task/ext/lang/en/lite.php | 2 +- extension/lite/task/ext/lang/fr/lite.php | 2 +- extension/lite/task/ext/lang/zh-cn/lite.php | 2 +- module/task/config/dtable.php | 2 +- module/task/control.php | 22 +++++----- module/task/lang/de.php | 4 +- module/task/lang/en.php | 4 +- module/task/lang/fr.php | 4 +- module/task/lang/vi.php | 2 +- module/task/lang/zh-cn.php | 4 +- module/task/lang/zh-tw.php | 2 +- module/task/model.php | 48 ++++++++++----------- module/task/ui/linearefforts.html.php | 2 +- module/task/ui/recordworkhour.html.php | 4 +- 15 files changed, 53 insertions(+), 53 deletions(-) diff --git a/extension/lite/task/ext/lang/de/lite.php b/extension/lite/task/ext/lang/de/lite.php index a4f0b3a012..b2e1ddd5b8 100644 --- a/extension/lite/task/ext/lang/de/lite.php +++ b/extension/lite/task/ext/lang/de/lite.php @@ -55,7 +55,7 @@ $lang->task->legendDesc = 'Task Description'; $lang->task->legendDetail = 'Task Detail'; $lang->task->confirmDelete = "Do you want to delete this task?"; -$lang->task->confirmDeleteEstimate = "Do you want to delete it?"; +$lang->task->confirmDeleteEffort = "Do you want to delete it?"; $lang->task->confirmFinish = '"Left Hour" is 0. Do you want to change the status to "Finished"?'; $lang->task->confirmRecord = '"Left Hour" is 0. Do you want to set the task as "Finished"?'; $lang->task->confirmTransfer = '"Left Hour" is 0，Do you want to transfer task?'; diff --git a/extension/lite/task/ext/lang/en/lite.php b/extension/lite/task/ext/lang/en/lite.php index a4f0b3a012..b2e1ddd5b8 100644 --- a/extension/lite/task/ext/lang/en/lite.php +++ b/extension/lite/task/ext/lang/en/lite.php @@ -55,7 +55,7 @@ $lang->task->legendDesc = 'Task Description'; $lang->task->legendDetail = 'Task Detail'; $lang->task->confirmDelete = "Do you want to delete this task?"; -$lang->task->confirmDeleteEstimate = "Do you want to delete it?"; +$lang->task->confirmDeleteEffort = "Do you want to delete it?"; $lang->task->confirmFinish = '"Left Hour" is 0. Do you want to change the status to "Finished"?'; $lang->task->confirmRecord = '"Left Hour" is 0. Do you want to set the task as "Finished"?'; $lang->task->confirmTransfer = '"Left Hour" is 0，Do you want to transfer task?'; diff --git a/extension/lite/task/ext/lang/fr/lite.php b/extension/lite/task/ext/lang/fr/lite.php index a4f0b3a012..b2e1ddd5b8 100644 --- a/extension/lite/task/ext/lang/fr/lite.php +++ b/extension/lite/task/ext/lang/fr/lite.php @@ -55,7 +55,7 @@ $lang->task->legendDesc = 'Task Description'; $lang->task->legendDetail = 'Task Detail'; $lang->task->confirmDelete = "Do you want to delete this task?"; -$lang->task->confirmDeleteEstimate = "Do you want to delete it?"; +$lang->task->confirmDeleteEffort = "Do you want to delete it?"; $lang->task->confirmFinish = '"Left Hour" is 0. Do you want to change the status to "Finished"?'; $lang->task->confirmRecord = '"Left Hour" is 0. Do you want to set the task as "Finished"?'; $lang->task->confirmTransfer = '"Left Hour" is 0，Do you want to transfer task?'; diff --git a/extension/lite/task/ext/lang/zh-cn/lite.php b/extension/lite/task/ext/lang/zh-cn/lite.php index a8e772b5d3..aed71493c9 100644 --- a/extension/lite/task/ext/lang/zh-cn/lite.php +++ b/extension/lite/task/ext/lang/zh-cn/lite.php @@ -55,7 +55,7 @@ $lang->task->legendDesc = '任务描述'; $lang->task->legendDetail = '任务详情'; $lang->task->confirmDelete = "您确定要删除这个任务吗？"; -$lang->task->confirmDeleteEstimate = "您确定要删除这个记录吗？"; +$lang->task->confirmDeleteEffort = "您确定要删除这个记录吗？"; $lang->task->confirmFinish = '"预计剩余"为0，确认将任务状态改为"已完成"吗？'; $lang->task->confirmRecord = '"剩余"为0，任务将标记为"已完成"，您确定吗？'; $lang->task->confirmTransfer = '"当前剩余"为0，任务将被转交，您确定吗？'; diff --git a/module/task/config/dtable.php b/module/task/config/dtable.php index 2dd6fdddd2..699ca1ffa2 100644 --- a/module/task/config/dtable.php +++ b/module/task/config/dtable.php @@ -212,7 +212,7 @@ $config->task->effortTable->fieldList['actions']['list']['deleteWorkhour']['orde $config->task->effortTable->fieldList['actions']['list']['deleteWorkhour']['show'] = 'clickable'; $config->task->effortTable->fieldList['actions']['list']['deleteWorkhour']['url'] = array('module' => 'task', 'method' => 'deleteWorkhour', 'params' => 'taskID={id}'); $config->task->effortTable->fieldList['actions']['list']['deleteWorkhour']['class'] = 'ajax-submit btn ghost square size-sm'; -$config->task->effortTable->fieldList['actions']['list']['deleteWorkhour']['data-confirm'] = $lang->task->confirmDeleteEstimate; +$config->task->effortTable->fieldList['actions']['list']['deleteWorkhour']['data-confirm'] = $lang->task->confirmDeleteEffort; $config->task->dtable->importTask = new stdclass(); diff --git a/module/task/control.php b/module/task/control.php index 9b42efc40b..9ff1334ddc 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -517,31 +517,31 @@ class task extends control } /** - * Delete estimate. + * 删除任务工时。Delete the work hour from the task. * - * @param int $estimateID + * @param int $effortID * @access public * @return void */ - public function deleteWorkhour(int $estimateID, $confirm = 'no') + public function deleteWorkhour(int $effortID, $confirm = 'no') { - $estimate = $this->task->getEffortByID($estimateID); - $taskID = $estimate->objectID; - $task = $this->task->getById($taskID); + $effort = $this->task->getEffortByID($effortID); + $taskID = $effort->objectID; + $task = $this->task->getById($taskID); - if($confirm == 'no' and $task->consumed - $estimate->consumed == 0) + if($confirm == 'no' and $task->consumed - $effort->consumed == 0) { - $formUrl = $this->createLink('task', 'deleteWorkhour', "estimateID=$estimateID&confirm=yes"); - return $this->send(array('result' => 'fail', 'callback' => "zui.Modal.confirm('{$this->lang->task->confirmDeleteLastEstimate}').then((res) => {if(res) $.ajaxSubmit({url: '$formUrl'});});")); + $formUrl = $this->createLink('task', 'deleteWorkhour', "effortID=$effortID&confirm=yes"); + return $this->send(array('result' => 'fail', 'callback' => "zui.Modal.confirm('{$this->lang->task->confirmDeleteLastEffort}').then((res) => {if(res) $.ajaxSubmit({url: '$formUrl'});});")); } - $changes = $this->task->deleteWorkhour($estimateID); + $changes = $this->task->deleteWorkhour($effortID); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); $actionID = $this->loadModel('action')->create('task', $taskID, 'DeleteEstimate'); $this->action->logHistory($actionID, $changes); - if($task->consumed - $estimate->consumed == 0) $this->action->create('task', $taskID, 'Adjusttasktowait'); + if($task->consumed - $effort->consumed == 0) $this->action->create('task', $taskID, 'Adjusttasktowait'); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true, 'closeModal' => true)); } diff --git a/module/task/lang/de.php b/module/task/lang/de.php index a8616d3dd8..8318518475 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -244,8 +244,8 @@ $lang->task->action->linked2revision = array('main' => '$date, linked by task->action->unlinkedfromrevision = array('main' => '$date, unlinked by $actor to Revision $extra.'); $lang->task->confirmDelete = "Möchten Sie diese Aufgabe löschen?"; -$lang->task->confirmDeleteEstimate = "Do you want to delete it?"; -$lang->task->confirmDeleteLastEstimate = "Do you want to delete the log? After deleting the last work log, the task status will be adjusted to Not Started."; +$lang->task->confirmDeleteEffort = "Do you want to delete it?"; +$lang->task->confirmDeleteLastEffort = "Do you want to delete the log? After deleting the last work log, the task status will be adjusted to Not Started."; $lang->task->copyStoryTitle = "Story kopieren"; $lang->task->afterSubmit = "Nach der Erstellung,"; $lang->task->successSaved = "Erstellt!"; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 68fc0d1ccb..1c6bc5e037 100755 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -244,8 +244,8 @@ $lang->task->action->linked2revision = array('main' => '$date, linked by task->action->unlinkedfromrevision = array('main' => '$date, unlinked by $actor to Revision $extra.'); $lang->task->confirmDelete = "Do you want to delete this task?"; -$lang->task->confirmDeleteEstimate = "Do you want to delete it?"; -$lang->task->confirmDeleteLastEstimate = "Do you want to delete the log? After deleting the last work log, the task status will be adjusted to Not Started."; +$lang->task->confirmDeleteEffort = "Do you want to delete it?"; +$lang->task->confirmDeleteLastEffort = "Do you want to delete the log? After deleting the last work log, the task status will be adjusted to Not Started."; $lang->task->copyStoryTitle = "Copy Story"; $lang->task->afterSubmit = "Next "; $lang->task->successSaved = "Created!"; diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index 1d9959f3bf..4a6d64a75a 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -244,8 +244,8 @@ $lang->task->action->linked2revision = array('main' => '$date, linked by task->action->unlinkedfromrevision = array('main' => '$date, unlinked by $actor to Revision $extra.'); $lang->task->confirmDelete = "Voulez-vous réellement supprimer cette tâche ?"; -$lang->task->confirmDeleteEstimate = "Voulez-vous la supprimer ?"; -$lang->task->confirmDeleteLastEstimate = "Do you want to delete the log? After deleting the last work log, the task status will be adjusted to Not Started."; +$lang->task->confirmDeleteEffort = "Voulez-vous la supprimer ?"; +$lang->task->confirmDeleteLastEffort = "Do you want to delete the log? After deleting the last work log, the task status will be adjusted to Not Started."; $lang->task->copyStoryTitle = 'StoryModel'; $lang->task->afterSubmit = "Suiv. "; $lang->task->successSaved = "Créée !"; diff --git a/module/task/lang/vi.php b/module/task/lang/vi.php index 58ed44bc0b..49cc22870a 100644 --- a/module/task/lang/vi.php +++ b/module/task/lang/vi.php @@ -187,7 +187,7 @@ $lang->task->legendLife = 'Toàn bộ nhiệm vụ'; $lang->task->legendDesc = 'Mô tả nhiệm vụ'; $lang->task->confirmDelete = "Bạn có muốn xóa nhiệm vụ này?"; -$lang->task->confirmDeleteEstimate = "Bạn có muốn xóa nó?"; +$lang->task->confirmDeleteEffort = "Bạn có muốn xóa nó?"; $lang->task->copyStoryTitle = "Copy"; $lang->task->afterSubmit = "Tiếp "; $lang->task->successSaved = "Đã tạo!"; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 515e3ddaec..22fded5169 100755 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -244,8 +244,8 @@ $lang->task->action->linked2revision = array('main' => '$date, 由 $lang->task->action->unlinkedfromrevision = array('main' => '$date, 由 $actor 取消关联到代码提交 $extra。'); $lang->task->confirmDelete = "您确定要删除这个任务吗？"; -$lang->task->confirmDeleteEstimate = "您确定要删除这个记录吗？"; -$lang->task->confirmDeleteLastEstimate = "您确定要删除该条日志吗？删除最后一条工时日志后，该任务状态将调整为未开始。"; +$lang->task->confirmDeleteEffort = "您确定要删除这个记录吗？"; +$lang->task->confirmDeleteLastEffort = "您确定要删除该条工时日志吗？删除最后一条工时日志后，该任务状态将调整为未开始。"; $lang->task->copyStoryTitle = "同{$lang->SRCommon}"; $lang->task->afterSubmit = "添加之后"; $lang->task->successSaved = "成功添加，"; diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php index 5060d4a083..1bfd05789e 100644 --- a/module/task/lang/zh-tw.php +++ b/module/task/lang/zh-tw.php @@ -203,7 +203,7 @@ $lang->task->legendDetail = '任務詳情'; $lang->task->legendMisc = '其他相關'; $lang->task->confirmDelete = "您確定要刪除這個任務嗎？"; -$lang->task->confirmDeleteEstimate = "您確定要刪除這個記錄嗎？"; +$lang->task->confirmDeleteEffort = "您確定要刪除這個記錄嗎？"; $lang->task->copyStoryTitle = "同{$lang->SRCommon}"; $lang->task->afterSubmit = "添加之後"; $lang->task->successSaved = "成功添加，"; diff --git a/module/task/model.php b/module/task/model.php index a88ea870a2..7eed3bc081 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -1785,30 +1785,30 @@ class taskModel extends model } /** - * Delete estimate. + * 删除工时并更新任务。 Delete the work hour from the task. * - * @param int $estimateID + * @param int $effortID * @access public * @return void */ - public function deleteWorkhour(int $estimateID) + public function deleteWorkhour(int $effortID) { - $estimate = $this->getEffortByID($estimateID); - $task = $this->getById($estimate->objectID); - $now = helper::now(); + $effort = $this->getEffortByID($effortID); + $task = $this->getById($effort->objectID); + $now = helper::now(); /* Compute the left and consumed workhour of the task. */ - $consumed = $task->consumed - $estimate->consumed; + $consumed = $task->consumed - $effort->consumed; $left = $task->left; - if($estimate->isLast) + if($effort->isLast) { - $lastTwoEstimates = $this->dao->select('*')->from(TABLE_EFFORT) - ->where('objectID')->eq($estimate->objectID) + $lastTwoEfforts = $this->dao->select('*')->from(TABLE_EFFORT) + ->where('objectID')->eq($effort->objectID) ->andWhere('objectType')->eq('task') ->orderBy('date desc,id desc')->limit(2)->fetchAll(); - $lastTwoEstimate = isset($lastTwoEstimates[1]) ? $lastTwoEstimates[1] : ''; - if($lastTwoEstimate) $left = $lastTwoEstimate->left; - if(empty($lastTwoEstimate) and $left == 0) $left = $task->estimate; + $lastTwoEfforts = isset($lastTwoEfforts[1]) ? $lastTwoEfforts[1] : ''; + if($lastTwoEfforts) $left = $lastTwoEfforts->left; + if(empty($lastTwoEfforts) and $left == 0) $left = $task->estimate; } /* Define and prepare one new task object to update the task. */ @@ -1816,7 +1816,7 @@ class taskModel extends model $data->consumed = $consumed; $data->left = $left; $data->status = ($left == 0 && $consumed != 0) ? 'done' : $task->status; - if($estimate->isLast and $consumed == 0 and $task->status != 'wait') + if($effort->isLast and $consumed == 0 and $task->status != 'wait') { $data->status = 'wait'; $data->left = $task->estimate; @@ -1829,7 +1829,7 @@ class taskModel extends model $data->closedDate = null; if($task->assignedTo == 'closed') $data->assignedTo = $this->app->user->account; } - elseif($estimate->isLast and $left != 0 and strpos('done,pause,cancel,closed', $task->status) !== false) + elseif($effort->isLast and $left != 0 and strpos('done,pause,cancel,closed', $task->status) !== false) { $data->status = 'doing'; $data->finishedBy = ''; @@ -1857,25 +1857,25 @@ class taskModel extends model if(!empty($task->team)) { /* 获取要删除的工时的团队，如果要删除的工时的用户不是团队成员则不做任何处理。*/ - $currentTeam = $this->getTeamByAccount($task->team, $estimate->account, array('effortID' => $estimateID, 'order' => $estimate->order)); + $currentTeam = $this->getTeamByAccount($task->team, $effort->account, array('effortID' => $effortID, 'order' => $effort->order)); if($currentTeam) { $left = $currentTeam->left; if($task->mode == 'multi') /* 如果任务是多人并行任务。注：多人串行任务的mode是linear。*/ { /* 获取要删除的工时对应的用户的工时信息列表。*/ - $accountEstimates = $this->getTaskEfforts($currentTeam->task, $estimate->account, $estimateID); - $lastEstimate = array_pop($accountEstimates); - if($lastEstimate->id == $estimateID) + $accountEfforts = $this->getTaskEfforts($currentTeam->task, $effort->account, $effortID); + $lastEffort = array_pop($accountEfforts); + if($lastEffort->id == $effortID) { - $lastTwoEstimate = array_pop($accountEstimates); - if($lastTwoEstimate) $left = $lastTwoEstimate->left; + $lastTwoEfforts = array_pop($accountEfforts); + if($lastTwoEfforts) $left = $lastTwoEfforts->left; } } /* 更新要删除的工时对应的用户的任务信息。*/ $newTeamInfo = new stdclass(); - $newTeamInfo->consumed = $currentTeam->consumed - $estimate->consumed; + $newTeamInfo->consumed = $currentTeam->consumed - $effort->consumed; if($currentTeam->status != 'done') $newTeamInfo->left = $left; if($currentTeam->status == 'done' and $left > 0 and $task->mode == 'multi') { @@ -1894,11 +1894,11 @@ class taskModel extends model } /* 删除工时；如果任务是多人任务，则重新计算工时。*/ - $this->dao->update(TABLE_EFFORT)->set('deleted')->eq('1')->where('id')->eq($estimateID)->exec(); + $this->dao->update(TABLE_EFFORT)->set('deleted')->eq('1')->where('id')->eq($effortID)->exec(); if(!empty($task->team)) $data = $this->computeMultipleHours($task, $data); /* 更新任务、父任务状态、需求阶段。*/ - $this->dao->update(TABLE_TASK)->data($data) ->where('id')->eq($estimate->objectID)->exec(); + $this->dao->update(TABLE_TASK)->data($data) ->where('id')->eq($effort->objectID)->exec(); if($task->parent > 0) $this->updateParentStatus($task->id); if($task->story) $this->loadModel('story')->setStage($task->story); diff --git a/module/task/ui/linearefforts.html.php b/module/task/ui/linearefforts.html.php index a7ba4cbd13..0e25464362 100644 --- a/module/task/ui/linearefforts.html.php +++ b/module/task/ui/linearefforts.html.php @@ -75,7 +75,7 @@ foreach($myCountList as $order => $count) common::hasPriv('task', 'deleteWorkhour') ? a ( setClass('btn ghost toolbar-item square size-sm ajax-submit'), - set('data-confirm', $lang->task->confirmDeleteEstimate), + set('data-confirm', $lang->task->confirmDeleteEffort), set::href(createLink('task', 'deleteWorkhour', "id={$effort->id}")), icon('trash') ) : null, diff --git a/module/task/ui/recordworkhour.html.php b/module/task/ui/recordworkhour.html.php index 04d5cb99f0..67709f1aa0 100644 --- a/module/task/ui/recordworkhour.html.php +++ b/module/task/ui/recordworkhour.html.php @@ -81,7 +81,7 @@ if($efforts) common::hasPriv('task', 'deleteWorkhour') ? a ( setClass('btn ghost toolbar-item square size-sm ajax-submit'), - set('data-confirm', $lang->task->confirmDeleteEstimate), + set('data-confirm', $lang->task->confirmDeleteEffort), set::href(createLink('task', 'deleteWorkhour', "id={$effort->id}")), icon('trash') ) : null, @@ -93,7 +93,7 @@ if($efforts) setClass('table-title'), $lang->task->committed ); - h::table + h::table ( setClass('table condensed bordered'), h::tr